author | alwin <alwin> | 2004-04-16 07:39:26 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-04-16 07:39:26 (UTC) |
commit | 9692c199f1f8b4c334687081e0d75bfbf9375ad8 (patch) (unidiff) | |
tree | 3ab64a3de58d5f266229d99d0eeae20a1d49f254 | |
parent | 7c29eeaecc8301fb500851382b3d94092ae72719 (diff) | |
download | opie-9692c199f1f8b4c334687081e0d75bfbf9375ad8.zip opie-9692c199f1f8b4c334687081e0d75bfbf9375ad8.tar.gz opie-9692c199f1f8b4c334687081e0d75bfbf9375ad8.tar.bz2 |
- displaying a busy makes no sense here. It results in double paintings
- method to set autoscale/autorotate at once
-rw-r--r-- | libopie2/opiemm/oimagescrollview.cpp | 31 | ||||
-rw-r--r-- | libopie2/opiemm/oimagescrollview.h | 13 |
2 files changed, 19 insertions, 25 deletions
diff --git a/libopie2/opiemm/oimagescrollview.cpp b/libopie2/opiemm/oimagescrollview.cpp index 30a8fba..61b2062 100644 --- a/libopie2/opiemm/oimagescrollview.cpp +++ b/libopie2/opiemm/oimagescrollview.cpp | |||
@@ -4,13 +4,12 @@ | |||
4 | #include <opie2/odebug.h> | 4 | #include <opie2/odebug.h> |
5 | #include <opie2/oapplication.h> | 5 | #include <opie2/oapplication.h> |
6 | #include <opie2/owait.h> | 6 | #include <opie2/owait.h> |
7 | 7 | ||
8 | #include <qimage.h> | 8 | #include <qimage.h> |
9 | #include <qlayout.h> | 9 | #include <qlayout.h> |
10 | #include <qpe/qcopenvelope_qws.h> | ||
11 | 10 | ||
12 | /* for usage with the bitset */ | 11 | /* for usage with the bitset */ |
13 | #define AUTO_SCALE 0 | 12 | #define AUTO_SCALE 0 |
14 | #define AUTO_ROTATE 1 | 13 | #define AUTO_ROTATE 1 |
15 | #define SHOW_ZOOMER 2 | 14 | #define SHOW_ZOOMER 2 |
16 | #define FIRST_RESIZE_DONE 3 | 15 | #define FIRST_RESIZE_DONE 3 |
@@ -107,20 +106,13 @@ void OImageScrollView::loadJpeg(bool interncall) | |||
107 | odebug << "Load jpeg unscaled" << oendl; | 106 | odebug << "Load jpeg unscaled" << oendl; |
108 | real_load = true; | 107 | real_load = true; |
109 | } | 108 | } |
110 | setImageScaledLoaded(false); | 109 | setImageScaledLoaded(false); |
111 | } | 110 | } |
112 | if (real_load) { | 111 | if (real_load) { |
113 | { | ||
114 | QCopEnvelope( "QPE/System", "busy()" ); | ||
115 | } | ||
116 | _original_data = iio.read() ? iio.image() : QImage(); | 112 | _original_data = iio.read() ? iio.image() : QImage(); |
117 | { | ||
118 | QCopEnvelope env( "QPE/System", "notBusy(QString)" ); | ||
119 | env << "Image loaded"; | ||
120 | } | ||
121 | } | 113 | } |
122 | } | 114 | } |
123 | 115 | ||
124 | void OImageScrollView::setImage( const QString& path ) { | 116 | void OImageScrollView::setImage( const QString& path ) { |
125 | odebug << "load new image " << oendl; | 117 | odebug << "load new image " << oendl; |
126 | if (m_lastName == path) return; | 118 | if (m_lastName == path) return; |
@@ -129,23 +121,16 @@ void OImageScrollView::setImage( const QString& path ) { | |||
129 | QString itype = QImage::imageFormat(m_lastName); | 121 | QString itype = QImage::imageFormat(m_lastName); |
130 | odebug << "Image type = " << itype << oendl; | 122 | odebug << "Image type = " << itype << oendl; |
131 | if (itype == "JPEG") { | 123 | if (itype == "JPEG") { |
132 | setImageIsJpeg(true); | 124 | setImageIsJpeg(true); |
133 | loadJpeg(); | 125 | loadJpeg(); |
134 | } else { | 126 | } else { |
135 | { | ||
136 | QCopEnvelope( "QPE/System", "busy()" ); | ||
137 | } | ||
138 | setImageIsJpeg(false); | 127 | setImageIsJpeg(false); |
139 | _original_data.load(path); | 128 | _original_data.load(path); |
140 | _original_data.convertDepth(QPixmap::defaultDepth()); | 129 | _original_data.convertDepth(QPixmap::defaultDepth()); |
141 | _original_data.setAlphaBuffer(false); | 130 | _original_data.setAlphaBuffer(false); |
142 | { | ||
143 | QCopEnvelope env( "QPE/System", "notBusy(QString)" ); | ||
144 | env << "Image loaded"; | ||
145 | } | ||
146 | } | 131 | } |
147 | _image_data = QImage(); | 132 | _image_data = QImage(); |
148 | if (FirstResizeDone()) { | 133 | if (FirstResizeDone()) { |
149 | generateImage(); | 134 | generateImage(); |
150 | if (isVisible()) viewport()->repaint(true); | 135 | if (isVisible()) viewport()->repaint(true); |
151 | } | 136 | } |
@@ -197,18 +182,21 @@ void OImageScrollView::setAutoRotate(bool how) | |||
197 | 182 | ||
198 | bool OImageScrollView::AutoRotate()const | 183 | bool OImageScrollView::AutoRotate()const |
199 | { | 184 | { |
200 | return m_states.testBit(AUTO_ROTATE); | 185 | return m_states.testBit(AUTO_ROTATE); |
201 | } | 186 | } |
202 | 187 | ||
188 | void OImageScrollView::setAutoScaleRotate(bool scale, bool rotate) | ||
189 | { | ||
190 | m_states.setBit(AUTO_ROTATE,rotate); | ||
191 | setAutoScale(scale); | ||
192 | } | ||
193 | |||
203 | void OImageScrollView::setAutoScale(bool how) | 194 | void OImageScrollView::setAutoScale(bool how) |
204 | { | 195 | { |
205 | m_states.setBit(AUTO_SCALE,how); | 196 | m_states.setBit(AUTO_SCALE,how); |
206 | if (!how) { | ||
207 | setAutoRotate(false); | ||
208 | } | ||
209 | _image_data = QImage(); | 197 | _image_data = QImage(); |
210 | if (ImageIsJpeg() && how == false && ImageScaledLoaded()==true) { | 198 | if (ImageIsJpeg() && how == false && ImageScaledLoaded()==true) { |
211 | loadJpeg(true); | 199 | loadJpeg(true); |
212 | } | 200 | } |
213 | generateImage(); | 201 | generateImage(); |
214 | } | 202 | } |
@@ -355,15 +343,12 @@ void OImageScrollView::generateImage() | |||
355 | _pdata = QPixmap(); | 343 | _pdata = QPixmap(); |
356 | if (_original_data.isNull()) { | 344 | if (_original_data.isNull()) { |
357 | emit imageSizeChanged( _image_data.size() ); | 345 | emit imageSizeChanged( _image_data.size() ); |
358 | if (_zoomer) _zoomer->setImage( _image_data ); | 346 | if (_zoomer) _zoomer->setImage( _image_data ); |
359 | return; | 347 | return; |
360 | } | 348 | } |
361 | { | ||
362 | QCopEnvelope( "QPE/System", "busy()" ); | ||
363 | } | ||
364 | if (width()>height()&&_original_data.width()<_original_data.height() || | 349 | if (width()>height()&&_original_data.width()<_original_data.height() || |
365 | width()<height()&&_original_data.width()>_original_data.height()) { | 350 | width()<height()&&_original_data.width()>_original_data.height()) { |
366 | if (AutoRotate()) r = Rotate90; | 351 | if (AutoRotate()) r = Rotate90; |
367 | } | 352 | } |
368 | 353 | ||
369 | 354 | ||
@@ -405,16 +390,12 @@ void OImageScrollView::generateImage() | |||
405 | _zoomer->setImage( _image_data ); | 390 | _zoomer->setImage( _image_data ); |
406 | } | 391 | } |
407 | /* | 392 | /* |
408 | * invalidate | 393 | * invalidate |
409 | */ | 394 | */ |
410 | _image_data=QImage(); | 395 | _image_data=QImage(); |
411 | { | ||
412 | QCopEnvelope env( "QPE/System", "notBusy(QString)" ); | ||
413 | env << "Image generated"; | ||
414 | } | ||
415 | } | 396 | } |
416 | 397 | ||
417 | void OImageScrollView::resizeEvent(QResizeEvent * e) | 398 | void OImageScrollView::resizeEvent(QResizeEvent * e) |
418 | { | 399 | { |
419 | odebug << "OImageScrollView resizeEvent" << oendl; | 400 | odebug << "OImageScrollView resizeEvent" << oendl; |
420 | QScrollView::resizeEvent(e); | 401 | QScrollView::resizeEvent(e); |
diff --git a/libopie2/opiemm/oimagescrollview.h b/libopie2/opiemm/oimagescrollview.h index 94fddb6..01a2d56 100644 --- a/libopie2/opiemm/oimagescrollview.h +++ b/libopie2/opiemm/oimagescrollview.h | |||
@@ -85,12 +85,25 @@ public: | |||
85 | * image will reloaded. | 85 | * image will reloaded. |
86 | * | 86 | * |
87 | * @param how true - display image scaled down otherwise not | 87 | * @param how true - display image scaled down otherwise not |
88 | */ | 88 | */ |
89 | virtual void setAutoScale(bool how); | 89 | virtual void setAutoScale(bool how); |
90 | /** | 90 | /** |
91 | * set if the image should be scaled to the size of the viewport if larger(!) | ||
92 | * and/or rotate to best fit. You avoid double repainting when you want to switch | ||
93 | * booth values. | ||
94 | * | ||
95 | * if autoscaling is set when loading a jpeg image, it will use a feature of | ||
96 | * jpeg lib to load the image scaled to display size. If switch of later the | ||
97 | * image will reloaded. | ||
98 | * | ||
99 | * @param scale true - display image scaled down otherwise not | ||
100 | * @param rotate true - the image will rotate for best fit | ||
101 | */ | ||
102 | virtual void setAutoScaleRotate(bool scale, bool rotate); | ||
103 | /** | ||
91 | * set if there should be displayed a small zoomer widget at the right bottom of | 104 | * set if there should be displayed a small zoomer widget at the right bottom of |
92 | * the view when the image is larger than the viewport. | 105 | * the view when the image is larger than the viewport. |
93 | * | 106 | * |
94 | * @param how true - display zoomer | 107 | * @param how true - display zoomer |
95 | */ | 108 | */ |
96 | virtual void setShowZoomer(bool how); | 109 | virtual void setShowZoomer(bool how); |