mostly all basics done

1 files changed, 149 insertions, 63 deletions

diff --git a/noncore/graphics/opie-eye/gui/imagescrollview.cpp b/noncore/graphics/opie-eye/gui/imagescrollview.cpp
index d034ee0..3bb07a7 100644
--- a/noncore/graphics/opie-eye/gui/imagescrollview.cpp
+++ b/noncore/graphics/opie-eye/gui/imagescrollview.cpp
@@ -2,2 +2,4 @@
 
+#include "lib/oimagezoomer.h"
+
 #include <opie2/odebug.h>
@@ -6,4 +8,2 @@
 
-using namespace Opie::Core;
-
 #include <qimage.h>
@@ -12,6 +12,25 @@ using namespace Opie::Core;
 
-ImageScrollView::ImageScrollView( QWidget* parent, const char* name,  WFlags f )
-    :QScrollView(parent,name,f|Qt::WRepaintNoErase ),_image_data(),_original_data(),scale_to_fit(true),
-     rotate_to_fit(true),show_zoomer(true),first_resize_done(false),m_lastName("")
+/* for usage with the bitset */
+#define AUTO_SCALE 0
+#define AUTO_ROTATE 1
+#define SHOW_ZOOMER 2
+#define FIRST_RESIZE_DONE 3
+#define IMAGE_IS_JPEG 4
+#define IMAGE_SCALED_LOADED 5
+
+#define SCROLLVIEW_BITSET_SIZE 6
+
+namespace Opie {
+namespace MM {
+OImageScrollView::OImageScrollView( QWidget* parent, const char* name,  WFlags f )
+    :QScrollView(parent,name,f|Qt::WRepaintNoErase ),_image_data(),_original_data(),
+    m_states(SCROLLVIEW_BITSET_SIZE),m_lastName("")
 {
+    _zoomer = 0;
+    m_states[AUTO_SCALE]=true;
+    m_states[AUTO_ROTATE]=true;
+    m_states[FIRST_RESIZE_DONE]=false;
+    m_states[IMAGE_IS_JPEG]=false;
+    m_states[IMAGE_SCALED_LOADED]=false;
+    m_states[SHOW_ZOOMER]=true;
     init();
@@ -19,6 +38,13 @@ ImageScrollView::ImageScrollView( QWidget* parent, const char* name,  WFlags f )
 
-ImageScrollView::ImageScrollView (const QImage&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit)
-    :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(img),scale_to_fit(always_scale),
-    rotate_to_fit(rfit),show_zoomer(true),first_resize_done(false),m_lastName("")
+OImageScrollView::OImageScrollView (const QImage&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit)
+    :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(img),
+     m_states(SCROLLVIEW_BITSET_SIZE),m_lastName("")
 {
+    _zoomer = 0;
+    m_states[AUTO_SCALE]=always_scale;
+    m_states[AUTO_ROTATE]=rfit;
+    m_states[FIRST_RESIZE_DONE]=false;
+    m_states[IMAGE_IS_JPEG]=false;
+    m_states[IMAGE_SCALED_LOADED]=false;
+    m_states[SHOW_ZOOMER]=true;
     _original_data.convertDepth(QPixmap::defaultDepth());
@@ -28,6 +54,13 @@ ImageScrollView::ImageScrollView (const QImage&img, QWidget * parent, const char
 
-ImageScrollView::ImageScrollView (const QString&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit)
-    :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(),scale_to_fit(always_scale),
-    rotate_to_fit(rfit),show_zoomer(true),first_resize_done(false),m_lastName("")
+OImageScrollView::OImageScrollView (const QString&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit)
+    :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(),m_states(SCROLLVIEW_BITSET_SIZE),m_lastName("")
 {
+    _zoomer = 0;
+    m_states.resize(SCROLLVIEW_BITSET_SIZE);
+    m_states[AUTO_SCALE]=always_scale;
+    m_states[AUTO_ROTATE]=rfit;
+    m_states[FIRST_RESIZE_DONE]=false;
+    m_states[IMAGE_IS_JPEG]=false;
+    m_states[IMAGE_SCALED_LOADED]=false;
+    m_states[SHOW_ZOOMER]=true;
     init();
@@ -36,3 +69,3 @@ ImageScrollView::ImageScrollView (const QString&img, QWidget * parent, const cha
 
-void ImageScrollView::setImage(const QImage&img)
+void OImageScrollView::setImage(const QImage&img)
 {
@@ -43,5 +76,5 @@ void ImageScrollView::setImage(const QImage&img)
     m_lastName = "";
-    image_is_jpeg = false;
-    image_scaled_loaded = false;
-    if (first_resize_done) {
+    setImageIsJpeg(false);
+    setImageScaledLoaded(false);
+    if (FirstResizeDone()) {
         generateImage();
@@ -50,3 +83,3 @@ void ImageScrollView::setImage(const QImage&img)
 
-void ImageScrollView::loadJpeg(bool interncall)
+void OImageScrollView::loadJpeg(bool interncall)
 {
@@ -56,3 +89,3 @@ void ImageScrollView::loadJpeg(bool interncall)
     bool real_load = false;
-    if (scale_to_fit) {
+    if (AutoScale()) {
         if (!interncall) {
@@ -69,3 +102,3 @@ void ImageScrollView::loadJpeg(bool interncall)
             iio.setParameters(param.latin1());
-            image_scaled_loaded = true;
+            setImageScaledLoaded(true);
             real_load = true;
@@ -73,3 +106,3 @@ void ImageScrollView::loadJpeg(bool interncall)
     } else {
-        if (image_scaled_loaded||!interncall) {
+        if (ImageScaledLoaded()||!interncall) {
             odebug << "Load jpeg unscaled" << oendl;
@@ -77,3 +110,3 @@ void ImageScrollView::loadJpeg(bool interncall)
         }
-        image_scaled_loaded = false;
+        setImageScaledLoaded(false);
     }
@@ -91,3 +124,3 @@ void ImageScrollView::loadJpeg(bool interncall)
 
-void ImageScrollView::setImage( const QString& path ) {
+void OImageScrollView::setImage( const QString& path ) {
     odebug << "load new image " << oendl;
@@ -98,3 +131,3 @@ void ImageScrollView::setImage( const QString& path ) {
     if (itype == "JPEG") {
-        image_is_jpeg = true;
+        setImageIsJpeg(true);
         loadJpeg();
@@ -104,3 +137,3 @@ void ImageScrollView::setImage( const QString& path ) {
         }
-        image_is_jpeg = false;
+        setImageIsJpeg(false);
         _original_data.load(path);
@@ -114,3 +147,3 @@ void ImageScrollView::setImage( const QString& path ) {
     _image_data = QImage();
-    if (first_resize_done) {
+    if (FirstResizeDone()) {
         generateImage();
@@ -120,3 +153,3 @@ void ImageScrollView::setImage( const QString& path ) {
 /* should be called every time the QImage changed it content */
-void ImageScrollView::init()
+void OImageScrollView::init()
 {
@@ -131,2 +164,4 @@ void ImageScrollView::init()
             this, SLOT(scrollBy(int,int)) );
+    connect(_zoomer, SIGNAL( zoomArea(int,int)),
+            this, SLOT(center(int,int)) );
     connect(this,SIGNAL(contentsMoving(int,int)),
@@ -140,9 +175,9 @@ void ImageScrollView::init()
     setFocusPolicy(QWidget::StrongFocus);
-    image_scaled_loaded = false;
-    image_is_jpeg = false;
-    if (first_resize_done) {
-        last_rot = Rotate0;
+    setImageScaledLoaded(false);
+    setImageIsJpeg(false);
+    if (FirstResizeDone()) {
+        m_last_rot = Rotate0;
         generateImage();
     } else if (_original_data.size().isValid()) {
-        if (image_fit_into(_original_data.size()) || !show_zoomer) _zoomer->hide();
+        if (image_fit_into(_original_data.size()) || !ShowZoomer()) _zoomer->hide();
         resizeContents(_original_data.width(),_original_data.height());
@@ -151,7 +186,7 @@ void ImageScrollView::init()
 
-void ImageScrollView::setAutoRotate(bool how)
+void OImageScrollView::setAutoRotate(bool how)
 {
     /* to avoid double repaints */
-    if (rotate_to_fit != how) {
-        rotate_to_fit = how;
+    if (AutoRotate() != how) {
+        m_states.setBit(AUTO_ROTATE,how);
         _image_data = QImage();
@@ -161,10 +196,15 @@ void ImageScrollView::setAutoRotate(bool how)
 
-void ImageScrollView::setAutoScale(bool how)
+bool OImageScrollView::AutoRotate()const
+{
+    return m_states.testBit(AUTO_ROTATE);
+}
+
+void OImageScrollView::setAutoScale(bool how)
 {
-    scale_to_fit = how;
+    m_states.setBit(AUTO_SCALE,how);
     if (!how) {
-        rotate_to_fit = false;
+        setAutoRotate(false);
     }
     _image_data = QImage();
-    if (image_is_jpeg && how == false && image_scaled_loaded==true) {
+    if (ImageIsJpeg() && how == false && ImageScaledLoaded()==true) {
         loadJpeg(true);
@@ -174,3 +214,8 @@ void ImageScrollView::setAutoScale(bool how)
 
-ImageScrollView::~ImageScrollView()
+bool OImageScrollView::AutoScale()const
+{
+    return m_states.testBit(AUTO_SCALE);
+}
+
+OImageScrollView::~OImageScrollView()
 {
@@ -178,3 +223,3 @@ ImageScrollView::~ImageScrollView()
 
-void ImageScrollView::rescaleImage(int w, int h)
+void OImageScrollView::rescaleImage(int w, int h)
 {
@@ -191,3 +236,3 @@ void ImageScrollView::rescaleImage(int w, int h)
 
-void ImageScrollView::rotate_into_data(Rotation r)
+void OImageScrollView::rotate_into_data(Rotation r)
 {
@@ -305,5 +350,6 @@ void ImageScrollView::rotate_into_data(Rotation r)
 
-void ImageScrollView::generateImage()
+void OImageScrollView::generateImage()
 {
     Rotation r = Rotate0;
+    if (_original_data.isNull()) return;
     {
@@ -313,3 +359,3 @@ void ImageScrollView::generateImage()
         width()<height()&&_original_data.width()>_original_data.height()) {
-        if (rotate_to_fit) r = Rotate90;
+        if (AutoRotate()) r = Rotate90;
     }
@@ -317,3 +363,3 @@ void ImageScrollView::generateImage()
     odebug << " r = " << r << oendl;
-    if (scale_to_fit) {
+    if (AutoScale()) {
         if (!_image_data.size().isValid()||width()>_image_data.width()||height()>_image_data.height()) {
@@ -328,3 +374,3 @@ void ImageScrollView::generateImage()
         resizeContents(_image_data.width(),_image_data.height());
-    }  else if (!first_resize_done||r!=last_rot||_image_data.width()==0) {
+    }  else if (!FirstResizeDone()||r!=m_last_rot||_image_data.width()==0) {
         if (r==Rotate0) {
@@ -334,3 +380,3 @@ void ImageScrollView::generateImage()
         }
-        last_rot = r;
+        m_last_rot = r;
         resizeContents(_image_data.width(),_image_data.height());
@@ -349,6 +395,7 @@ void ImageScrollView::generateImage()
      */
-    _zoomer->setGeometry( viewport()->width()-_image_data.width()/2, viewport()->height()-_image_data.height()/2,
-         _image_data.width()/2, _image_data.height()/2 );
-
-    _zoomer->setImage( _image_data );
+     if (_zoomer) {
+        _zoomer->setGeometry( viewport()->width()-_image_data.width()/2, viewport()->height()-_image_data.height()/2,
+             _image_data.width()/2, _image_data.height()/2 );
+        _zoomer->setImage( _image_data );
+     }
     /*
@@ -363,8 +410,8 @@ void ImageScrollView::generateImage()
 
-void ImageScrollView::resizeEvent(QResizeEvent * e)
+void OImageScrollView::resizeEvent(QResizeEvent * e)
 {
-    odebug << "ImageScrollView resizeEvent" << oendl;
+    odebug << "OImageScrollView resizeEvent" << oendl;
     QScrollView::resizeEvent(e);
     generateImage();
-    first_resize_done = true;
+    setFirstResizeDone(true);
     emit viewportSizeChanged( viewport()->size() );
@@ -373,3 +420,3 @@ void ImageScrollView::resizeEvent(QResizeEvent * e)
 
-void ImageScrollView::keyPressEvent(QKeyEvent * e)
+void OImageScrollView::keyPressEvent(QKeyEvent * e)
 {
@@ -396,3 +443,3 @@ void ImageScrollView::keyPressEvent(QKeyEvent * e)
 
-void ImageScrollView::drawContents(QPainter * p, int clipx, int clipy, int clipw, int cliph)
+void OImageScrollView::drawContents(QPainter * p, int clipx, int clipy, int clipw, int cliph)
 {
@@ -429,3 +476,3 @@ void ImageScrollView::drawContents(QPainter * p, int clipx, int clipy, int clipw
 /* using the real geometry points and not the translated points is wanted! */
-void ImageScrollView::viewportMouseMoveEvent(QMouseEvent* e)
+void OImageScrollView::viewportMouseMoveEvent(QMouseEvent* e)
 {
@@ -458,3 +505,3 @@ void ImageScrollView::viewportMouseMoveEvent(QMouseEvent* e)
 
-void ImageScrollView::contentsMousePressEvent ( QMouseEvent * e)
+void OImageScrollView::contentsMousePressEvent ( QMouseEvent * e)
 {
@@ -470,3 +517,3 @@ void ImageScrollView::contentsMousePressEvent ( QMouseEvent * e)
 
-void ImageScrollView::setDestructiveClose() {
+void OImageScrollView::setDestructiveClose() {
     WFlags fl = getWFlags();
@@ -478,3 +525,3 @@ void ImageScrollView::setDestructiveClose() {
 
-bool ImageScrollView::image_fit_into(const QSize&s )
+bool OImageScrollView::image_fit_into(const QSize&s )
 {
@@ -486,5 +533,5 @@ bool ImageScrollView::image_fit_into(const QSize&s )
 
-void ImageScrollView::setShowZoomer(bool how)
+void OImageScrollView::setShowZoomer(bool how)
 {
-    show_zoomer = how;
+    m_states.setBit(SHOW_ZOOMER,how);
     check_zoomer();
@@ -492,7 +539,13 @@ void ImageScrollView::setShowZoomer(bool how)
 
-void ImageScrollView::check_zoomer()
+bool OImageScrollView::ShowZoomer()const
+{
+    return m_states.testBit(SHOW_ZOOMER);
+}
+
+void OImageScrollView::check_zoomer()
 {
-    if ( (!show_zoomer||image_fit_into(_pdata.size()) ) && _zoomer->isVisible()) {
+    if (!_zoomer) return;
+    if ( (!ShowZoomer()||image_fit_into(_pdata.size()) ) && _zoomer->isVisible()) {
         _zoomer->hide();
-    } else if ( show_zoomer && !image_fit_into(_pdata.size()) && _zoomer->isHidden()){
+    } else if ( ShowZoomer() && !image_fit_into(_pdata.size()) && _zoomer->isHidden()){
         _zoomer->show();
@@ -500 +553,34 @@ void ImageScrollView::check_zoomer()
 }
+
+bool OImageScrollView::FirstResizeDone()const
+{
+    return m_states.testBit(FIRST_RESIZE_DONE);
+}
+
+void OImageScrollView::setFirstResizeDone(bool how)
+{
+    m_states.setBit(FIRST_RESIZE_DONE,how);
+}
+
+bool OImageScrollView::ImageIsJpeg()const
+{
+    return m_states.testBit(IMAGE_IS_JPEG);
+}
+
+void OImageScrollView::setImageIsJpeg(bool how)
+{
+    m_states.setBit(IMAGE_IS_JPEG,how);
+}
+
+bool OImageScrollView::ImageScaledLoaded()const
+{
+    return m_states.testBit(IMAGE_SCALED_LOADED);
+}
+
+void OImageScrollView::setImageScaledLoaded(bool how)
+{
+    m_states.setBit(IMAGE_SCALED_LOADED,how);
+}
+
+} // namespace MM
+} // namespace Opie