Diffstat (limited to 'noncore/graphics/opie-eye/gui') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/gui/imagescrollview.cpp | 13 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/imagescrollview.h | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/noncore/graphics/opie-eye/gui/imagescrollview.cpp b/noncore/graphics/opie-eye/gui/imagescrollview.cpp index ee20f40..99fdc51 100644 --- a/noncore/graphics/opie-eye/gui/imagescrollview.cpp +++ b/noncore/graphics/opie-eye/gui/imagescrollview.cpp | |||
@@ -9,29 +9,32 @@ using namespace Opie::Core; | |||
9 | 9 | ||
10 | ImageScrollView::ImageScrollView( QWidget* parent, const char* name, WFlags f ) | 10 | ImageScrollView::ImageScrollView( QWidget* parent, const char* name, WFlags f ) |
11 | :QScrollView(parent,name,f|Qt::WRepaintNoErase ),_image_data(),_original_data(),scale_to_fit(true), | 11 | :QScrollView(parent,name,f|Qt::WRepaintNoErase ),_image_data(),_original_data(),scale_to_fit(true), |
12 | rotate_to_fit(true),first_resize_done(false) | 12 | rotate_to_fit(true),first_resize_done(false),m_lastName("") |
13 | { | 13 | { |
14 | init(); | 14 | init(); |
15 | qDebug("constructor done"); | ||
15 | } | 16 | } |
16 | 17 | ||
17 | ImageScrollView::ImageScrollView (const QImage&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit) | 18 | ImageScrollView::ImageScrollView (const QImage&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit) |
18 | :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(img),scale_to_fit(always_scale), | 19 | :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(img),scale_to_fit(always_scale), |
19 | rotate_to_fit(rfit),first_resize_done(false) | 20 | rotate_to_fit(rfit),first_resize_done(false),m_lastName("") |
20 | { | 21 | { |
21 | init(); | 22 | init(); |
22 | } | 23 | } |
23 | 24 | ||
24 | ImageScrollView::ImageScrollView (const QString&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit) | 25 | ImageScrollView::ImageScrollView (const QString&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit) |
25 | :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(img),scale_to_fit(always_scale), | 26 | :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(),scale_to_fit(always_scale), |
26 | rotate_to_fit(rfit),first_resize_done(false) | 27 | rotate_to_fit(rfit),first_resize_done(false),m_lastName("") |
27 | { | 28 | { |
28 | init(); | 29 | init(); |
30 | setImage(img); | ||
29 | } | 31 | } |
30 | 32 | ||
31 | void ImageScrollView::setImage(const QImage&img) | 33 | void ImageScrollView::setImage(const QImage&img) |
32 | { | 34 | { |
33 | _image_data = QImage(); | 35 | _image_data = QImage(); |
34 | _original_data=img; | 36 | _original_data=img; |
37 | m_lastName = ""; | ||
35 | if (first_resize_done) { | 38 | if (first_resize_done) { |
36 | generateImage(); | 39 | generateImage(); |
37 | } | 40 | } |
@@ -39,6 +42,8 @@ void ImageScrollView::setImage(const QImage&img) | |||
39 | 42 | ||
40 | void ImageScrollView::setImage( const QString& path ) { | 43 | void ImageScrollView::setImage( const QString& path ) { |
41 | odebug << "load new image " << oendl; | 44 | odebug << "load new image " << oendl; |
45 | if (m_lastName == path) return; | ||
46 | m_lastName = path; | ||
42 | _original_data.load(path); | 47 | _original_data.load(path); |
43 | _image_data = QImage(); | 48 | _image_data = QImage(); |
44 | if (first_resize_done) { | 49 | if (first_resize_done) { |
diff --git a/noncore/graphics/opie-eye/gui/imagescrollview.h b/noncore/graphics/opie-eye/gui/imagescrollview.h index dcf54ce..44f2a64 100644 --- a/noncore/graphics/opie-eye/gui/imagescrollview.h +++ b/noncore/graphics/opie-eye/gui/imagescrollview.h | |||
@@ -47,7 +47,7 @@ protected: | |||
47 | bool rotate_to_fit; | 47 | bool rotate_to_fit; |
48 | bool first_resize_done; | 48 | bool first_resize_done; |
49 | Rotation last_rot; | 49 | Rotation last_rot; |
50 | 50 | QString m_lastName; | |
51 | void rescaleImage(int w, int h); | 51 | void rescaleImage(int w, int h); |
52 | 52 | ||
53 | void rotate_into_data(Rotation r); | 53 | void rotate_into_data(Rotation r); |