- make main layout a full preview window and think about configuring capturing parameters later...adding an on-demand-applet to the taskbar would be spiffy

- portrait or landscape mode is now self-configuring thanks to life-rotation :-D

8 files changed, 87 insertions, 262 deletions

diff --git a/noncore/multimedia/camera/.cvsignore b/noncore/multimedia/camera/.cvsignore
index d89e3af..737c5b2 100644
--- a/noncore/multimedia/camera/.cvsignore
+++ b/noncore/multimedia/camera/.cvsignore
@@ -1,5 +1,5 @@
+moc
+obj
 config.in
-mainwindowbase.h
-mainwindowbase.cpp
 Makefile
 
diff --git a/noncore/multimedia/camera/camera.pro b/noncore/multimedia/camera/camera.pro
index 2d1faa3..16da0c9 100644
--- a/noncore/multimedia/camera/camera.pro
+++ b/noncore/multimedia/camera/camera.pro
@@ -1,23 +1,23 @@
 MOC_DIR         = ./moc
 OBJECTS_DIR     = ./obj
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
 CONFIG          = qt warn_on debug
 
 HEADERS         = zcameraio.h \
                   previewwidget.h \
                   mainwindow.h
 
 SOURCES         = zcameraio.cpp \
                   previewwidget.cpp \
                   mainwindow.cpp \
                   main.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2
-INTERFACES      = mainwindowbase.ui
+INTERFACES      =
 TARGET          = opiecam
 
 include ( $(OPIEDIR)/include.pro )
 
diff --git a/noncore/multimedia/camera/mainwindow.cpp b/noncore/multimedia/camera/mainwindow.cpp
index 8578bce..7080e63 100644
--- a/noncore/multimedia/camera/mainwindow.cpp
+++ b/noncore/multimedia/camera/mainwindow.cpp
@@ -1,60 +1,89 @@
 /**********************************************************************
 ** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "mainwindow.h"
-#include "mainwindowbase.h"
+#include "previewwidget.h"
 #include "zcameraio.h"
 
 #include <qvbox.h>
 #include <qcombobox.h>
+#include <qdatastream.h>
 #include <qpushbutton.h>
 #include <qlabel.h>
 #include <qdirectpainter_qws.h>
 #include <qpe/resource.h>
+#include <qpe/qcopenvelope_qws.h>
 #include <opie/ofiledialog.h>
 
+#include <opie2/odebug.h>
+
 #include <assert.h>
 
 CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags f )
            :QMainWindow( parent, name, f )
 {
-    mw = new MainWindowBase( this, "main widget" );
-    ZCameraIO::instance()->setCaptureFrame( 240, 160, 256 );
-    setCentralWidget( mw );
-    mw->show();
+    _rotation = 270; //TODO: grab these from the actual settings
+
+    preview = new PreviewWidget( this, "camera preview widget" );
+    //setCentralWidget( preview ); <--- don't do this!
+    preview->resize( QSize( 240, 288 ) );
+    preview->show();
+
+    // construct a System Channel to receive setRotation messages
+    _sysChannel = new QCopChannel( "QPE/System", this );
+    connect( _sysChannel, SIGNAL( received( const QCString&, const QByteArray& ) ),
+             this, SLOT( systemMessage( const QCString&, const QByteArray& ) ) );
 
-    connect( mw->zoom, SIGNAL( activated( int ) ), this, SLOT( changeZoom(int) ) );
 };
 
 
 CameraMainWindow::~CameraMainWindow()
 {
 }
 
 
+void CameraMainWindow::systemMessage( const QCString& msg, const QByteArray& data )
+{
+    QDataStream stream( data, IO_ReadOnly );
+    odebug << "received system message: " << msg << oendl;
+    if ( msg == "setCurrentRotation(int)" )
+    {
+        stream >> _rotation;
+        odebug << "received setCurrentRotation(" << _rotation << ")" << oendl;
+
+        switch ( _rotation )
+        {
+            case 270: preview->resize( QSize( 240, 288 ) ); break;
+            case 180: preview->resize( QSize( 320, 208 ) ); break;
+            default: assert( 0 ); // not yet handled
+        }
+    }
+}
+
+
 void CameraMainWindow::changeZoom( int zoom )
 {
     int z;
     switch ( zoom )
     {
         case 0: z = 128; break;
         case 1: z = 256; break;
         case 2: z = 512; break;
         default: assert( 0 ); break;
     }
 
     ZCameraIO::instance()->setCaptureFrame( 240, 160, z );
 }
 
diff --git a/noncore/multimedia/camera/mainwindow.h b/noncore/multimedia/camera/mainwindow.h
index 7ccdcf8..cc12840 100644
--- a/noncore/multimedia/camera/mainwindow.h
+++ b/noncore/multimedia/camera/mainwindow.h
@@ -4,43 +4,48 @@
 ** This file is part of Opie Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qmainwindow.h>
 #include <qdatetime.h>
 #include <qimage.h>
 #include <qpixmap.h>
 
 class QIconSet;
 class QToolButton;
 class QLabel;
 class MainWindowBase;
+class QCopChannel;
+class PreviewWidget;
 
 class CameraMainWindow: public QMainWindow
 {
   Q_OBJECT
 
   public:
     CameraMainWindow( QWidget * parent = 0, const char * name = "mainwindow", WFlags f = 0 );
     virtual ~CameraMainWindow();
 
   public slots:
     void changeZoom( int );
+    void systemMessage( const QCString&, const QByteArray& );
 
   protected:
 
   private:
-    MainWindowBase* mw;
+    PreviewWidget* preview;
+    int _rotation;
+    QCopChannel* _sysChannel;
 };
 
 #endif
diff --git a/noncore/multimedia/camera/mainwindowbase.ui b/noncore/multimedia/camera/mainwindowbase.ui
deleted file mode 100644
index 8da884a..0000000
--- a/noncore/multimedia/camera/mainwindowbase.ui
+++ b/dev/null
@@ -1,246 +0,0 @@
-<!DOCTYPE UI><UI>
-<class>MainWindowBase</class>
-<widget>
-    <class>QWidget</class>
-    <property stdset="1">
-        <name>name</name>
-        <cstring>MainWindowBase</cstring>
-    </property>
-    <property stdset="1">
-        <name>geometry</name>
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>242</width>
-            <height>329</height>
-        </rect>
-    </property>
-    <property stdset="1">
-        <name>caption</name>
-        <string>Form1</string>
-    </property>
-    <property>
-        <name>layoutMargin</name>
-    </property>
-    <property>
-        <name>layoutSpacing</name>
-    </property>
-    <grid>
-        <property stdset="1">
-            <name>margin</name>
-            <number>0</number>
-        </property>
-        <property stdset="1">
-            <name>spacing</name>
-            <number>2</number>
-        </property>
-        <widget row="1"  column="0" >
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout1</cstring>
-            </property>
-            <hbox>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <widget>
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>TextLabel1</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Reso:</string>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QComboBox</class>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>240x160</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>480x320</string>
-                        </property>
-                    </item>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>resolution</cstring>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>TextLabel2</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Zoom:</string>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QComboBox</class>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Half</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Full</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Double</string>
-                        </property>
-                    </item>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>zoom</cstring>
-                    </property>
-                </widget>
-            </hbox>
-        </widget>
-        <widget row="2"  column="0" >
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout2</cstring>
-            </property>
-            <hbox>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <spacer>
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer1</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>sizeType</name>
-                        <enum>Expanding</enum>
-                    </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget>
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>PushButton1</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Take Photo</string>
-                    </property>
-                    <property stdset="1">
-                        <name>default</name>
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <spacer>
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer2</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>sizeType</name>
-                        <enum>Expanding</enum>
-                    </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-            </hbox>
-        </widget>
-        <spacer row="3"  column="0" >
-            <property>
-                <name>name</name>
-                <cstring>Spacer3</cstring>
-            </property>
-            <property stdset="1">
-                <name>orientation</name>
-                <enum>Vertical</enum>
-            </property>
-            <property stdset="1">
-                <name>sizeType</name>
-                <enum>Expanding</enum>
-            </property>
-            <property>
-                <name>sizeHint</name>
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
-            </property>
-        </spacer>
-        <widget row="0"  column="0" >
-            <class>PreviewWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>preview</cstring>
-            </property>
-        </widget>
-    </grid>
-</widget>
-<customwidgets>
-    <customwidget>
-        <class>PreviewWidget</class>
-        <header location="local">previewwidget.h</header>
-        <sizehint>
-            <width>240</width>
-            <height>160</height>
-        </sizehint>
-        <container>0</container>
-        <sizepolicy>
-            <hordata>0</hordata>
-            <verdata>0</verdata>
-        </sizepolicy>
-        <pixmap>image0</pixmap>
-    </customwidget>
-</customwidgets>
-<images>
-    <image>
-        <name>image0</name>
-        <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1ddec44f503c0ae2a154410f53d0ed20e2bf6bdb656dd6861dd23d9a66591b0587fd1654235ebded6f0edcd53e419d87ae7b1f4f9b8f906d0bfe012317426a70b07bdc2f3ec77f8ed6b89559061a0343d06a124cc105596482585094bc0ae599b04646c9018926491b2205e140c485cace25755c175d0a967b622ff900b8cc9c7d29af594ea722d589167f813aa852ba07d94b9dce296e883fe7bb163f23896753</data>
-    </image>
-</images>
-</UI>
diff --git a/noncore/multimedia/camera/previewwidget.cpp b/noncore/multimedia/camera/previewwidget.cpp
index bb84c00..cdeacf6 100644
--- a/noncore/multimedia/camera/previewwidget.cpp
+++ b/noncore/multimedia/camera/previewwidget.cpp
@@ -1,45 +1,64 @@
 /**********************************************************************
 ** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "previewwidget.h"
 #include "zcameraio.h"
 
+#include <opie2/odebug.h>
+
 PreviewWidget::PreviewWidget( QWidget * parent, const char * name, WFlags f )
            :QLabel( parent, name, f )
 {
-    setFixedSize( QSize( 240, 160 ) );
+    #ifndef QT_NO_DEBUG
+    setBackgroundColor( QColor( 255, 0, 0 ) );
+    #else
     setBackgroundMode( NoBackground );
+    #endif
+
 
     startTimer( 150 );
+    //startTimer( 2000 );
 };
 
 
 PreviewWidget::~PreviewWidget()
 {
 }
 
 
+void PreviewWidget::resizeEvent( QResizeEvent* e )
+{
+    QLabel::resizeEvent( e );
+    int w = e->size().width();
+    int h = e->size().height();
+    ZCameraIO::instance()->setCaptureFrame( e->size().width(),
+                                          e->size().height(),
+                                          256,
+                                          w < h );
+}
+
+
 void PreviewWidget::timerEvent( QTimerEvent*  )
 {
     //QDirectPainter fb( this );
     //ZCameraIO::instance()->snapshot( fb.frameBuffer() );
 
     if ( ZCameraIO::instance()->snapshot( &i ) )
     {
         p.convertFromImage( i );
         setPixmap( p );
     }
 }
 
diff --git a/noncore/multimedia/camera/previewwidget.h b/noncore/multimedia/camera/previewwidget.h
index c031d95..6b64768 100644
--- a/noncore/multimedia/camera/previewwidget.h
+++ b/noncore/multimedia/camera/previewwidget.h
@@ -1,39 +1,43 @@
 /**********************************************************************
 ** Copyright (C) 2003 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #ifndef PREVIEWWIDGET_H
 #define PREVIEWWIDGET_H
 
 #include <qlabel.h>
 #include <qimage.h>
 #include <qpixmap.h>
 
+class QTimerEvent;
+class QResizeEvent;
+
 class PreviewWidget: public QLabel
 {
   Q_OBJECT
 
   public:
     PreviewWidget( QWidget * parent = 0, const char * name = 0, WFlags f = 0 );
     virtual ~PreviewWidget();
 
   protected:
     virtual void timerEvent( QTimerEvent* );
+    virtual void resizeEvent( QResizeEvent* );
 
   private:
     QPixmap p;
     QImage i;
 };
 
 #endif
diff --git a/noncore/multimedia/camera/zcameraio.cpp b/noncore/multimedia/camera/zcameraio.cpp
index 56b2e13..51771a5 100644
--- a/noncore/multimedia/camera/zcameraio.cpp
+++ b/noncore/multimedia/camera/zcameraio.cpp
@@ -87,48 +87,49 @@ inline bool ZCameraIO::isShutterPressed()
     clearShutterLatch();
 }
 
 
 inline bool ZCameraIO::isFinderReversed() const
 {
     return _status[1] == 'M';
 }
 
 
 inline bool ZCameraIO::isCapturing() const
 {
     return _status[2] == 'C';
 }
 
 
 inline bool ZCameraIO::isAvailable() const
 {
     return _status[3] == 'A';
 }
 
 
 bool ZCameraIO::setCaptureFrame( int width, int height, int zoom, bool rot )
 {
+    odebug << "setCaptureFrame( " << width << ", " << height << ", " << zoom << ", " << rot << " )" << oendl;
     char b[100];
     sprintf( b, "%c=%d,%d,%d,%d", rot ? 'R':'S', width, height, zoom, width*2 );
     if ( write( b ) )
     {
         _width = width;
         _height = height;
         _zoom = zoom;
         _rot = rot;
         _readlen = 2 * _width * _height; // camera is fixed @ 16 bits per pixel
         return true;
     }
     return false;
 }
 
 
 void ZCameraIO::setReadMode( int mode )
 {
     char b[10];
     sprintf( b, "M=%d", mode );
     write( b, mode <= 9 ? 3 : 4 );
     if ( mode & 1 ) // STATUS bit is set
         read( _status, 4 );
 }
 
@@ -152,60 +153,73 @@ bool ZCameraIO::read( char* b, int len )
     #else
     int time = -1;
     #endif
     if ( rlen )
         odebug << "read " << rlen << " ('" << b[0] << b[1] << b[2] << b[3] << "') [" << time << " ms] from driver." << oendl;
     else
         odebug << "read nothing from driver." << oendl;
     return rlen == len;
 }
 
 
 bool ZCameraIO::write( char* buf, int len )
 {
     if ( !len )
         len = strlen( buf );
 
     odebug << "writing '" << buf << "' to driver." << oendl;
 
     return ::write( _driver, buf, len ) == len;
 }
 
 
 bool ZCameraIO::snapshot( QImage* image )
 {
-    setReadMode( IMAGE | XFLIP | YFLIP );
-    char buf[76800];
+    setReadMode( STATUS );
+
+    odebug << "finder reversed = " << isFinderReversed() << oendl;
+    odebug << "rotation = " << _rot << oendl;
+
+    if ( _rot ) // Portrait
+    {
+        setReadMode( IMAGE | isFinderReversed() ? XFLIP | YFLIP : 0 );
+    }
+    else // Landscape
+    {
+        setReadMode( IMAGE | XFLIP | YFLIP ); //isFinderReversed() ? 0 : XFLIP );
+    }
+
+    char buf[_readlen];
     char* bp = buf;
     unsigned char* p;
 
     read( bp, _readlen );
 
-    image->create( 240, 160, 16 );
-    for ( int i = 0; i < 160; ++i )
+    image->create( _width, _height, 16 );
+    for ( int i = 0; i < _height; ++i )
     {
         p = image->scanLine( i );
-        for ( int j = 0; j < 240; j++ )
+        for ( int j = 0; j < _width; j++ )
         {
             *p = *bp;
             p++;
             bp++;
             *p = *bp;
             p++;
             bp++;
         }
     }
 
     return true;
 }
 
 bool ZCameraIO::snapshot( unsigned char* buf )
 {
     setReadMode( IMAGE | XFLIP | YFLIP );
 
     read( (char*) buf, _readlen );
 
     /* //TESTCODE
     int fd = open( "/tmp/cam", O_RDONLY );
     if ( ::read( fd, (char*) buf, 76800 ) != 76800 )
         owarn << "Couldn't read image from /dev/sharp_zdc" << oendl;
     // TESTCODE */