2 files changed, 83 insertions, 6 deletions

diff --git a/noncore/graphics/opie-eye/gui/imagescrollview.cpp b/noncore/graphics/opie-eye/gui/imagescrollview.cpp
index 2f16d82..d034ee0 100644
--- a/noncore/graphics/opie-eye/gui/imagescrollview.cpp
+++ b/noncore/graphics/opie-eye/gui/imagescrollview.cpp
@@ -1,121 +1,187 @@
 #include "imagescrollview.h"
 
 #include <opie2/odebug.h>
+#include <opie2/oapplication.h>
+#include <opie2/owait.h>
 
 using namespace Opie::Core;
 
 #include <qimage.h>
 #include <qlayout.h>
+#include <qpe/qcopenvelope_qws.h>
 
 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("")
 {
     init();
 }
 
 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("")
 {
     _original_data.convertDepth(QPixmap::defaultDepth());
     _original_data.setAlphaBuffer(false);
     init();
 }
 
 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("")
 {
     init();
     setImage(img);
 }
 
 void ImageScrollView::setImage(const QImage&img)
 {
     _image_data = QImage();
     _original_data=img;
     _original_data.convertDepth(QPixmap::defaultDepth());
     _original_data.setAlphaBuffer(false);
     m_lastName = "";
+    image_is_jpeg = false;
+    image_scaled_loaded = false;
     if (first_resize_done) {
         generateImage();
     }
 }
 
+void ImageScrollView::loadJpeg(bool interncall)
+{
+    if (m_lastName.isEmpty()) return;
+    QImageIO iio( m_lastName, 0l );
+    QString param;
+    bool real_load = false;
+    if (scale_to_fit) {
+        if (!interncall) {
+            int wid, hei;
+            wid = QApplication::desktop()->width();
+            hei = QApplication::desktop()->height();
+            if (hei>wid) {
+                wid = hei;
+            } else {
+                hei = wid;
+            }
+            param = QString( "Fast Shrink( 7 ) Scale( %1, %2, ScaleFree)" ).arg( wid ).arg( hei );
+            odebug << "Load jpeg scaled \"" << param << "\"" << oendl;
+            iio.setParameters(param.latin1());
+            image_scaled_loaded = true;
+            real_load = true;
+        }
+    } else {
+        if (image_scaled_loaded||!interncall) {
+            odebug << "Load jpeg unscaled" << oendl;
+            real_load = true;
+        }
+        image_scaled_loaded = false;
+    }
+    if (real_load) {
+        {
+            QCopEnvelope( "QPE/System", "busy()" );
+        }
+        _original_data = iio.read() ? iio.image() : QImage();
+        {
+            QCopEnvelope env( "QPE/System", "notBusy(QString)" );
+            env << "Image loaded";
+        }
+    }
+}
+
 void ImageScrollView::setImage( const QString& path ) {
     odebug << "load new image " << oendl;
     if (m_lastName == path) return;
     m_lastName = path;
-    _original_data.load(path);
-    _original_data.convertDepth(QPixmap::defaultDepth());
-    _original_data.setAlphaBuffer(false);
+    QString itype = QImage::imageFormat(m_lastName);
+    odebug << "Image type = " << itype << oendl;
+    if (itype == "JPEG") {
+        image_is_jpeg = true;
+        loadJpeg();
+    } else {
+        {
+            QCopEnvelope( "QPE/System", "busy()" );
+        }
+        image_is_jpeg = false;
+        _original_data.load(path);
+        _original_data.convertDepth(QPixmap::defaultDepth());
+        _original_data.setAlphaBuffer(false);
+        {
+            QCopEnvelope env( "QPE/System", "notBusy(QString)" );
+            env << "Image loaded";
+        }
+    }
     _image_data = QImage();
     if (first_resize_done) {
         generateImage();
     }
 }
 
 /* should be called every time the QImage changed it content */
 void ImageScrollView::init()
 {
     odebug << "init " << oendl;
 
     /*
      * create the zoomer
      * and connect ther various signals
      */
     _zoomer = new Opie::MM::OImageZoomer( this, "The Zoomer" );
     connect(_zoomer, SIGNAL( zoomAreaRel(int,int)),
             this, SLOT(scrollBy(int,int)) );
     connect(this,SIGNAL(contentsMoving(int,int)),
             _zoomer, (SLOT(setVisiblePoint(int,int))) );
     connect(this,SIGNAL(imageSizeChanged(const QSize&)),
             _zoomer, SLOT(setImageSize(const QSize&)) );
     connect(this,SIGNAL(viewportSizeChanged(const QSize&)),
             _zoomer, SLOT(setViewPortSize(const QSize&)) );
 
     viewport()->setBackgroundColor(white);
     setFocusPolicy(QWidget::StrongFocus);
+    image_scaled_loaded = false;
+    image_is_jpeg = false;
     if (first_resize_done) {
         last_rot = Rotate0;
         generateImage();
     } else if (_original_data.size().isValid()) {
         if (image_fit_into(_original_data.size()) || !show_zoomer) _zoomer->hide();
         resizeContents(_original_data.width(),_original_data.height());
     }
 }
 
 void ImageScrollView::setAutoRotate(bool how)
 {
     /* to avoid double repaints */
     if (rotate_to_fit != how) {
         rotate_to_fit = how;
         _image_data = QImage();
         generateImage();
     }
 }
 
 void ImageScrollView::setAutoScale(bool how)
 {
     scale_to_fit = how;
     if (!how) {
         rotate_to_fit = false;
     }
     _image_data = QImage();
+    if (image_is_jpeg && how == false && image_scaled_loaded==true) {
+        loadJpeg(true);
+    }
     generateImage();
 }
 
 ImageScrollView::~ImageScrollView()
 {
 }
 
 void ImageScrollView::rescaleImage(int w, int h)
 {
     if (_image_data.width()==w && _image_data.height()==h) {
         return;
     }
     double hs = (double)h / (double)_image_data.height() ;
     double ws = (double)w / (double)_image_data.width() ;
     double scaleFactor = (hs > ws) ? ws : hs;
     int smoothW = (int)(scaleFactor * _image_data.width());
@@ -227,77 +293,85 @@ void ImageScrollView::rotate_into_data(Rotation r)
                         destData[y] = srcData[x];
                     }
                 }
                 break;
             default:
                 dest = _original_data;
                 break;
         }
 
     }
     _image_data = dest;
 }
 
 void ImageScrollView::generateImage()
 {
     Rotation r = Rotate0;
+    {
+        QCopEnvelope( "QPE/System", "busy()" );
+    }
     if (width()>height()&&_original_data.width()<_original_data.height() ||
         width()<height()&&_original_data.width()>_original_data.height()) {
         if (rotate_to_fit) r = Rotate90;
     }
+
     odebug << " r = " << r << oendl;
     if (scale_to_fit) {
         if (!_image_data.size().isValid()||width()>_image_data.width()||height()>_image_data.height()) {
             odebug << "Rescaling data" << oendl;
             if (r==Rotate0) {
                 _image_data = _original_data;
             } else {
                 rotate_into_data(r);
             }
         }
         rescaleImage(width(),height());
         resizeContents(_image_data.width(),_image_data.height());
     }  else if (!first_resize_done||r!=last_rot||_image_data.width()==0) {
         if (r==Rotate0) {
             _image_data = _original_data;
         } else {
             rotate_into_data(r);
         }
         last_rot = r;
         resizeContents(_image_data.width(),_image_data.height());
     }
     _pdata.convertFromImage(_image_data);
-    
+
 
     /*
      * update the zoomer
      */
-    check_zoomer();    
+    check_zoomer();
     emit imageSizeChanged( _image_data.size() );
     rescaleImage( 128, 128 );
     /*
      * move scrollbar
      */
     _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 );
     /*
      * invalidate
      */
     _image_data=QImage();
+    {
+        QCopEnvelope env( "QPE/System", "notBusy(QString)" );
+        env << "Image generated";
+    }
 }
 
 void ImageScrollView::resizeEvent(QResizeEvent * e)
 {
     odebug << "ImageScrollView resizeEvent" << oendl;
     QScrollView::resizeEvent(e);
     generateImage();
     first_resize_done = true;
     emit viewportSizeChanged( viewport()->size() );
 
 }
 
 void ImageScrollView::keyPressEvent(QKeyEvent * e)
 {
     if (!e) return;
     int dx = horizontalScrollBar()->lineStep();
diff --git a/noncore/graphics/opie-eye/gui/imagescrollview.h b/noncore/graphics/opie-eye/gui/imagescrollview.h
index e209dfb..f6e187d 100644
--- a/noncore/graphics/opie-eye/gui/imagescrollview.h
+++ b/noncore/graphics/opie-eye/gui/imagescrollview.h
@@ -44,32 +44,35 @@ signals:
 
 protected:
     virtual void drawContents ( QPainter * p, int clipx, int clipy, int clipw, int cliph );
     void init();
 
     Opie::MM::OImageZoomer *_zoomer;
     QImage _image_data;
     QImage _original_data;
     QPixmap _pdata;
 
     int _mouseStartPosX,_mouseStartPosY;
 
     bool scale_to_fit;
     bool rotate_to_fit;
     bool show_zoomer;
     bool first_resize_done;
+    bool image_is_jpeg;
+    bool image_scaled_loaded;
     Rotation last_rot;
     QString m_lastName;
     virtual void rescaleImage(int w, int h);
 
     virtual void rotate_into_data(Rotation r);
     virtual void generateImage();
+    virtual void loadJpeg(bool interncall = false);
     bool image_fit_into(const QSize&s);
     void check_zoomer();
 
 protected slots:
     virtual void viewportMouseMoveEvent(QMouseEvent* e);
     virtual void contentsMousePressEvent ( QMouseEvent * e);
     virtual void resizeEvent(QResizeEvent * e);
     virtual void keyPressEvent(QKeyEvent * e);
 };
 #endif