From 5eb5ab6c27ffa1138f0d23048120aed746854fec Mon Sep 17 00:00:00 2001
From: Michael Demetriou <qwazix@blackiii.WAG320N>
Date: Sun, 9 Sep 2012 13:55:46 +0300
Subject: [PATCH] Settings White balance settings animation focus on tap

---
 CameraParameters.cpp                     |  23 ++++
 CameraParameters.h                       |   8 ++
 CameraThread.cpp                         |  63 +++++----
 CameraThread.h                           |   6 +
 qtc_packaging/debian_harmattan/changelog |   5 +
 rawcam.cpp                               |  39 +++++-
 rawcam.pro                               |   3 +-
 settings.png                             | Bin 2536 -> 1629 bytes
 settings.qml                             | 158 +++++++++++++++++++++++
 style.css                                |   7 +
 10 files changed, 281 insertions(+), 31 deletions(-)
 create mode 100644 settings.qml

diff --git a/CameraParameters.cpp b/CameraParameters.cpp
index 025e992..09cd022 100644
--- a/CameraParameters.cpp
+++ b/CameraParameters.cpp
@@ -4,6 +4,7 @@
 
 #include <QDesktopServices>
 #include <QUrl>
+#include <QSettings>
 
 CameraParameters::CameraParameters() {
     // Set default modes and values
@@ -101,6 +102,18 @@ int CameraParameters::getExposureValue(float val){
     return (int)abs(powf((val-gamma)/alpha,1/beta));
 }
 
+void CameraParameters::setExposureCompensation(float compensation){
+    this->exposure.compensation = compensation;
+}
+
+void CameraParameters::setWhiteBalance(int wb){
+    this->whiteBalance.value = wb;
+}
+
+void CameraParameters::setWhiteBalanceMode(int wbmode){
+    this->whiteBalance.mode = wbmode;
+}
+
 void CameraParameters::setGainMode(int mode){
     this->gain.mode = mode;
 }
@@ -168,3 +181,13 @@ void CameraParameters::setLastPicture(QString lastPic){
     this->lastPicture = lastPic;
 }
 
+QVariant CameraParameters::getSetting(QString key, QVariant defaultval){
+    QSettings settings;
+    return settings.value(key, defaultval);
+}
+
+void CameraParameters::setSetting(QString key, QVariant val){
+    QSettings settings;
+    settings.setValue(key, val);
+}
+
diff --git a/CameraParameters.h b/CameraParameters.h
index 8280b2a..e263854 100644
--- a/CameraParameters.h
+++ b/CameraParameters.h
@@ -5,6 +5,7 @@
 #include <QMutex>
 #include <QString>
 #include <QPoint>
+#include <QVariant>
 
 /* The requested state of the camera. All communication between the UI
  * and the camera control thread passes through a single instance of
@@ -30,6 +31,7 @@ class CameraParameters : public QObject {
         float value;
         // If in HDR mode, how many shots to take
         int hdrShots;
+        float compensation;
 
         QString toString(float val);
     } exposure;
@@ -92,6 +94,7 @@ public slots:
     void setExposureModeMan();
     void setExposureValue(float);
     void setExposureValue(int);
+    void setExposureCompensation(float);
 
     void setGainMode(int);
     void setGainModeAuto();
@@ -107,6 +110,9 @@ public slots:
     void setFocusValue(int);
     void setFocusSpot(int, int);
 
+    void setWhiteBalance(int);
+    void setWhiteBalanceMode(int);
+
     void setFlashOff();
     void setFlashHalf();
     void setFlashFull();
@@ -114,6 +120,8 @@ public slots:
 
     void openLastPicture();
     void setLastPicture(QString);
+    QVariant getSetting(QString, QVariant);
+    void setSetting(QString, QVariant);
 
 signals:
     // A signal signifying that the camera parameters have changed.
diff --git a/CameraThread.cpp b/CameraThread.cpp
index 749f5a5..b8c0d35 100644
--- a/CameraThread.cpp
+++ b/CameraThread.cpp
@@ -10,6 +10,7 @@
 #include <iostream>
 #include <QQueue>
 #include <qmath.h>
+#include <QSettings>
 
 #include "OverlayWidget.h"
 #include "CameraParameters.h"
@@ -65,6 +66,7 @@ void CameraThread::run() {
     viewfinder.histogram.region = FCam::Rect(0, 0, 640, 480);
     viewfinder.sharpness.enabled = true;
     viewfinder.sharpness.size = FCam::Size(16, 12);
+    viewfinder.whiteBalance = parameters->whiteBalance.value;
 
     // A full res photograph. We'll set the exposure, frameTime, and
     // gain later, after we meter. Default parameters apply (no
@@ -115,7 +117,7 @@ void CameraThread::run() {
 		    // use the metering the viewfinder has been doing
 		    photo.exposure  = viewfinder.exposure;
 		    photo.gain      = viewfinder.gain;
-		    photo.whiteBalance = viewfinder.whiteBalance;
+            photo.whiteBalance = viewfinder.whiteBalance;
             if (parameters->flash.mode != CameraParameters::Flash::OFF) photo.addAction(fire);
 
 		    sensor.capture(photo);
@@ -128,41 +130,47 @@ void CameraThread::run() {
             f = sensor.getFrame();
             // filewriter doesn't emit a signal when it finishes saving a file so we use a hackish way;
             //qDebug()<< "before dequeure" <<  pictureNames;
-            if (!pictureNames.isEmpty() && pictureNames.length()*2 > writer.savesPending()) emit pictureSaved(QString(pictureNames.dequeue()));
+            if (!pictureNames.isEmpty() && pictureNames.length() > writer.savesPending()) {
+                QString newFile = QString(pictureNames.dequeue());
+                if (newFile.endsWith(".jpg")) emit pictureSaved(newFile);
+            }
 
 		    if (f.shot().id == photo.id) {
-			// Our photo came back, asynchronously save it to disk
-			// with a unique filename. We use the exposure start
-			// time for now just so we don't have to keep a
-			// globally unique numbering.
-			if (!f.image().valid()) {
-			    printf("ERROR: Photo dropped!\n");
-			    continue;
-			} else {
-			    printf("Got a full-res frame\n");
-			}
-
-
-            char fname[256];
-            // Save it as a JPEG
-            snprintf(fname, 255, "%s/MyDocs/DCIM/photo_%s.jpg", getenv("HOME"),
-                 f.exposureStartTime().toString().c_str());
-            writer.saveJPEG(f, fname, 90);
-            // filewriter doesn't emit a signal when it finishes saving a file so we use a hackish way;
-            pictureNames.enqueue(QString(fname));
-            //qDebug()<< "after enqueue" <<  pictureNames;
+                // Our photo came back, asynchronously save it to disk
+                // with a unique filename. We use the exposure start
+                // time for now just so we don't have to keep a
+                // globally unique numbering.
+                if (!f.image().valid()) {
+                    printf("ERROR: Photo dropped!\n");
+                    continue;
+                } else {
+                    printf("Got a full-res frame\n");
+                }
 
-			// Save it as a DNG
-            snprintf(fname, 255, "%s/MyDocs/DCIM/photo_%s.dng", getenv("HOME"),
+                QSettings settings;
+                char fname[256];
+                // Save it as a JPEG
+                snprintf(fname, 255, "%s/MyDocs/DCIM/photo_%s.jpg", getenv("HOME"),
+                     f.exposureStartTime().toString().c_str());
+                writer.saveJPEG(f, fname, 90);
+                // filewriter doesn't emit a signal when it finishes saving a file so we use a hackish way;
+                pictureNames.enqueue(QString(fname));
+                //qDebug()<< "after enqueue" <<  pictureNames;
+
+                // Save it as a DNG
+                snprintf(fname, 255, "%s/MyDocs/DCIM/photo_%s.dng", getenv("HOME"),
                  f.exposureStartTime().toString().c_str());
-            writer.saveDNG(f, fname);
+                if (settings.value("saveDng",true)== true) {
+                    writer.saveDNG(f, fname);
+                    pictureNames.enqueue(QString(fname));
+                }
 
 		    } else if (f.shot().id == viewfinder.id) {
 
 			// update the autofocus and metering algorithms
             autoFocus.update(f);
 
-            autoExpose(&viewfinder, f, sensor.maxGain(),  sensor.maxExposure(), 0.5);
+            autoExpose(&viewfinder, f, sensor.maxGain(),  sensor.maxExposure(), 0.5);//, parameters->exposure.compensation);
 
             if (parameters->exposure.mode == parameters->exposure.AUTO && parameters->gain.mode == parameters->gain.AUTO) {
                 //we auto expose anyway and then modify the values so nothing left to be done here
@@ -188,7 +196,8 @@ void CameraThread::run() {
                     viewfinder.gain = newGain;
                 }
             }
-			autoWhiteBalance(&viewfinder, f);
+            if (parameters->whiteBalance.mode == parameters->whiteBalance.AUTO) autoWhiteBalance(&viewfinder, f);
+            else viewfinder.whiteBalance = parameters->whiteBalance.value;
 
             QString humanReadableExposure;
             if (viewfinder.exposure >= 1000000) {
diff --git a/CameraThread.h b/CameraThread.h
index 7b7a437..ba59364 100644
--- a/CameraThread.h
+++ b/CameraThread.h
@@ -9,6 +9,7 @@
 #include <FCam/N9.h>
 #include "CameraParameters.h"
 #include <QString>
+#include <QSettings>
 
 class OverlayWidget;
 
@@ -52,6 +53,11 @@ public slots:
     void focus_on() {
         focus = true;
     }
+
+    void focus_on_tap() {
+        QSettings settings;
+        if(settings.value("focusOnTap",false) == true) focus = true;
+    }
 	    
     void snapshot() {
         takeSnapshot = true;
diff --git a/qtc_packaging/debian_harmattan/changelog b/qtc_packaging/debian_harmattan/changelog
index ad0b3aa..2008644 100644
--- a/qtc_packaging/debian_harmattan/changelog
+++ b/qtc_packaging/debian_harmattan/changelog
@@ -1,3 +1,8 @@
+rawcam (0.0.6) unstable; urgency=low
+  * Switching to manual mode from auto keeps current values
+
+ -- Michael Demetriou <qwazix@unknown>  Sun, 09 Sep 2012 11:23:00 +0300
+
 rawcam (0.0.5) unstable; urgency=low
   * <Add change description here>
 
diff --git a/rawcam.cpp b/rawcam.cpp
index 585c28a..c1e3381 100644
--- a/rawcam.cpp
+++ b/rawcam.cpp
@@ -12,6 +12,9 @@
 #include <QSlider>
 #include <QDebug>
 #include <QSettings>
+#include <QtDeclarative/QDeclarativeView>
+#include <QtDeclarative/QDeclarativeContext>
+#include <QPropertyAnimation>
 
 #include "CameraThread.h"
 #include "ExampleOverlayWidget.h"
@@ -55,10 +58,12 @@ QString readFile(QString filename) {
 
 int main(int argc, char **argv) {
     QApplication app(argc, argv);
+    QCoreApplication::setOrganizationName("oob");
+    QCoreApplication::setApplicationName("rawcam");
 
     // Make the main window
     QWidget *window = new QWidget;
-    QSettings settings("oob", "rawcam");
+    QSettings settings;
 
     QHBoxLayout *layout = new QHBoxLayout(window);
     layout->setContentsMargins(0, 0, 0, 0);
@@ -86,11 +91,17 @@ int main(int argc, char **argv) {
     gallery->setObjectName("gallery");
     gallery->hide();
 
+    // settings button
+    QPushButton* settingsBtn = new QPushButton("", window);
+    settingsBtn->move(780, 340);
+    settingsBtn->setObjectName("settings");
+
     // shutter button
     QPushButton* shutter = new QPushButton(QIcon("/opt/rawcam/shutter.png"),"",window);
     shutter->setIconSize(QSize(90,90));
     shutter->move(750,200);
     shutter->setObjectName("shutter");
+    QObject::connect(shutter, SIGNAL(pressed()), cameraThread, SLOT(focus_on_tap()));
     QObject::connect(shutter, SIGNAL(released()), cameraThread, SLOT(snapshot()));
 
 //    t->setStyleSheet("min-height: 100px;"
@@ -103,7 +114,7 @@ int main(int argc, char **argv) {
 
     MyProximitySensor *prx = new MyProximitySensor();
     QObject::connect(prx, SIGNAL(sensorClosed()), cameraThread, SLOT(focus_on()));
-    QObject::connect(prx, SIGNAL(sensorOpen()), cameraThread, SLOT(focus_off()));
+//    QObject::connect(prx, SIGNAL(sensorOpen()), cameraThread, SLOT(focus_off()));
     prx->start();
 
     //exposure info label
@@ -302,7 +313,29 @@ int main(int argc, char **argv) {
     help->setFont(QFont("Nokia Pure Text", 20, 200, false));
     help->resize(320,80);
     help->setObjectName("help");
-
+    if (settings.value("showHelp",true)==false) help->hide();
+
+    QDeclarativeView *qmlView = new QDeclarativeView(window);
+    qmlView->rootContext()->setContextProperty("params", params);
+    qmlView->setSource(QUrl::fromLocalFile("/opt/rawcam/settings.qml"));
+    qmlView->hide();
+//    qmlView->resize(700,350);
+    qmlView->move(60, 0);
+    QObject::connect(settingsBtn,SIGNAL(clicked()), qmlView, SLOT(show()));
+    //QObject::connect(overlay, SIGNAL(focus(int, int)), qmlView, SLOT(hide()));
+
+    QPropertyAnimation openani(qmlView, "geometry");
+    openani.setDuration(200);
+    openani.setStartValue(QRect(60, 0, 700, 0));
+    openani.setEndValue(QRect(60, 0, 700, 350));
+    QObject::connect(settingsBtn,SIGNAL(clicked()), &openani, SLOT(start()));
+
+    QPropertyAnimation closeani(qmlView, "geometry");
+    closeani.setDuration(200);
+    closeani.setStartValue(QRect(60, 0, 700, 350));
+    closeani.setEndValue(QRect(60, 0, 700, 0));
+    QObject::connect(overlay, SIGNAL(focus(int, int)), &closeani, SLOT(start()));
+    QObject::connect(&closeani, SIGNAL(finished()), qmlView, SLOT(hide()));
 
     QTimer::singleShot(8000, help, SLOT(hide()));
     QObject::connect(help, SIGNAL(clicked()), help, SLOT(hide()));
diff --git a/rawcam.pro b/rawcam.pro
index 27061d1..ab593d3 100644
--- a/rawcam.pro
+++ b/rawcam.pro
@@ -8,6 +8,7 @@ INCLUDEPATH += ../../include
 
 
 CONFIG += debug warn_on
+QT += declarative
 
 CONFIG += qt mobility
 LIBS += -lpthread -L../.. -ljpeg -lFCam
@@ -52,7 +53,7 @@ style.files  = style.css \
                flashFull.png flashFullGrey.png \
                flashHalf.png flashHalfGrey.png \
                backCurtain.png backCurtainGrey.png \
-               gallery.png settings.png
+               gallery.png settings.png settings.qml
 
 
 #
diff --git a/settings.png b/settings.png
index 119f1b3fcebda079ce6d9fc85f9ec1872f5e1e66..714db6b9d84f028e26ea88aea0e585758341832a 100644
GIT binary patch
delta 1592
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

delta 2526
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

diff --git a/settings.qml b/settings.qml
new file mode 100644
index 0000000..b108749
--- /dev/null
+++ b/settings.qml
@@ -0,0 +1,158 @@
+// import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
+import QtQuick 1.1
+import com.nokia.meego 1.0
+
+Rectangle {
+    width: 700
+    height: 350
+    color: "black";
+    Column{
+        anchors.fill: parent;
+        anchors.margins: 20
+        spacing: 10
+
+        Row {
+            id: rowRow
+            spacing: 10
+            width: parent.width;
+            height: childrenRect.height
+
+            Switch {
+                id: dngSw
+                checked: params.getSetting("saveDng",true);
+                onCheckedChanged: params.setSetting("saveDng",checked)
+            }
+
+            Text {
+                color: "white"
+                width: rowRow.width - rowRow.spacing - dngSw.width
+                height: dngSw.height
+                verticalAlignment: Text.AlignVCenter
+                text: dngSw.checked ? ".dng file save enabled" : ".dng file save disabled"
+                font.pixelSize: 20
+            }
+        }
+        Row {
+            id: row2
+            spacing: 10
+            width: parent.width;
+            height: childrenRect.height
+
+            Switch {
+                id: helpSw
+                checked: params.getSetting("showHelp",true);
+                onCheckedChanged: params.setSetting("showHelp",checked)
+            }
+
+            Text {
+                color: "white"
+                width: row2.width - row2.spacing - helpSw.width
+                height: helpSw.height
+                verticalAlignment: Text.AlignVCenter
+                text: helpSw.checked ? "Focus help baloon on" : "Focus help baloon off"
+                font.pixelSize:20
+            }
+        }
+        Row {
+            id: row3
+            spacing: 10
+            width: parent.width;
+            height: childrenRect.height
+
+            Switch {
+                id: focusOnTapSw
+                checked: params.getSetting("focusOnTap",false);
+                onCheckedChanged: params.setSetting("focusOnTap",checked)
+            }
+
+            Text {
+                color: "white"
+                height: focusOnTapSw.height
+                verticalAlignment: Text.AlignVCenter
+                text: focusOnTapSw.checked ? "Focus on capture on" : "Focus on capture off"
+                font.pixelSize: 20
+            }
+        }
+        Row {
+            spacing: 20
+            Text {
+                color: "white"
+                text: "White balance";
+                font.pixelSize:20
+                anchors.verticalCenter: parent.verticalCenter
+            }
+            Switch {
+                id: wbSwitch
+                checked: true
+                onCheckedChanged: params.setWhiteBalanceMode(checked?0:1)
+            }
+
+            Rectangle {
+                Text {
+
+                    anchors.horizontalCenter: parent.horizontalCenter;
+                    anchors.verticalCenter: parent.verticalCenter;
+                    text: (wbSwitch.checked?"Auto":(Math.round(wbSlider.value)) + "K")
+                    font.pixelSize : 17
+                    color: "#000"
+
+                }
+                anchors.verticalCenter: parent.verticalCenter
+                color: "#999";
+                border.color: "#222"
+                radius: 11
+                width: 80
+                height: 30
+
+            }
+        }
+        Row {
+            Slider {
+                id: wbSlider
+                minimumValue: 3000
+                maximumValue: 8000
+                value: 6500
+                width: 600
+                stepSize: 100
+                valueIndicatorVisible: false
+                onValueChanged: params.setWhiteBalance(value);
+            }
+        }
+//        Row {
+//            spacing: 20
+//            Text {
+//                text: "Exposure compensation";
+//                font.pixelSize: 20
+//            }
+//            Rectangle {
+//                Text {
+
+//                    anchors.horizontalCenter: parent.horizontalCenter;
+//                    anchors.verticalCenter: parent.verticalCenter;
+//                    text: (expComp.value>0?"+":"") + (Math.round(expComp.value*100)/100) + " eV"
+//                    font.pixelSize : 17
+//                    color: "#fff"
+//                }
+//                color: "#444444";
+//                border.color: "#dddddd"
+//                radius: 11
+//                width: 80
+//                height: 30
+
+//            }
+//        }
+//        Row {
+//            Slider {
+//                id: expComp
+//                maximumValue: +4
+//                minimumValue: -4
+//                value: 0
+//                width: 600
+//                stepSize: 0.333333333333333
+//                valueIndicatorVisible: false
+//                onValueChanged: params.setExposureCompensation(value);
+//            }
+//        }
+        Component.onCompleted: theme.inverted = true;
+    }
+}
diff --git a/style.css b/style.css
index 3df9bb1..0444b58 100644
--- a/style.css
+++ b/style.css
@@ -89,6 +89,13 @@ QPushButton#gallery{
     border: 0 none
 }
 
+QPushButton#settings{
+    min-width: 50px;
+    min-height: 50px;
+    background: url("/opt/rawcam/settings.png") no-repeat transparent;
+    border: 0 none
+}
+
 
 
 QLabel {