diff options
Diffstat (limited to 'utils/wpseditor/gui/src/qwpsdrawer_static.cpp')
-rw-r--r-- | utils/wpseditor/gui/src/qwpsdrawer_static.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/utils/wpseditor/gui/src/qwpsdrawer_static.cpp b/utils/wpseditor/gui/src/qwpsdrawer_static.cpp index bf94d28a5a..a9346ae430 100644 --- a/utils/wpseditor/gui/src/qwpsdrawer_static.cpp +++ b/utils/wpseditor/gui/src/qwpsdrawer_static.cpp | |||
@@ -3,14 +3,14 @@ | |||
3 | #include <QFile> | 3 | #include <QFile> |
4 | #include <QFileInfo> | 4 | #include <QFileInfo> |
5 | #include "utils.h" | 5 | #include "utils.h" |
6 | #include "api.h" | ||
6 | 7 | ||
7 | void QWpsDrawer::putsxy(int x, int y, const unsigned char *str) { | 8 | void QWpsDrawer::putsxy(int x, int y, const unsigned char *str) { |
9 | DEBUGF3("putsxy(int x=%d, int y=%d, *str=%s)",x,y,str); | ||
8 | QPainter p(pix); | 10 | QPainter p(pix); |
9 | viewport_api avp; | 11 | viewport_api avp; |
10 | api.get_current_vp(&avp); | 12 | api.get_current_vp(&avp); |
11 | p.setPen(Qt::gray); | 13 | p.setPen(Qt::gray); |
12 | |||
13 | |||
14 | QFont font("times",avp.fontheight,QFont::Bold); | 14 | QFont font("times",avp.fontheight,QFont::Bold); |
15 | p.setFont(font); | 15 | p.setFont(font); |
16 | p.drawText(x+avp.x,y + avp.fontheight + avp.y,(char*)str); | 16 | p.drawText(x+avp.x,y + avp.fontheight + avp.y,(char*)str); |
@@ -54,7 +54,7 @@ void QWpsDrawer::vline(int x, int y1, int y2) { | |||
54 | p.drawLine(x,y1,x,y2); | 54 | p.drawLine(x,y1,x,y2); |
55 | } | 55 | } |
56 | bool QWpsDrawer::load_wps_backdrop(char* filename) { | 56 | bool QWpsDrawer::load_wps_backdrop(char* filename) { |
57 | DEBUGF2("load backdrop: %s", filename); | 57 | DEBUGF3("load backdrop: %s", filename); |
58 | QFile file(filename); | 58 | QFile file(filename); |
59 | QFileInfo info(file); | 59 | QFileInfo info(file); |
60 | file.copy(mTmpWpsString+"/"+info.fileName()); | 60 | file.copy(mTmpWpsString+"/"+info.fileName()); |
@@ -70,7 +70,6 @@ int QWpsDrawer::read_bmp_file(const char* filename,int *width, int *height) { | |||
70 | file.copy(mTmpWpsString+"/"+info.fileName()); | 70 | file.copy(mTmpWpsString+"/"+info.fileName()); |
71 | 71 | ||
72 | img.load(filename); | 72 | img.load(filename); |
73 | //qDebug()<<"QWpsDrawer::read_bmp_file"<<img.width()<<img.height(); | ||
74 | *width = img.width(); | 73 | *width = img.width(); |
75 | *height = img.height(); | 74 | *height = img.height(); |
76 | return 1; | 75 | return 1; |