Merge branch 'native-control'

BrewPlot.pro

@@ -1,36 +1,38 @@
-# Add more folders to ship with the application, here
-folder_01.source = qml/BrewPlot
-folder_01.target = qml
-DEPLOYMENTFOLDERS = folder_01
-
-# Additional import path used to resolve QML modules in Creator's code model
-QML_IMPORT_PATH =
-
-symbian:TARGET.UID3 = 0xE41BFE6C
-
-# Allow network access on Symbian
-symbian:TARGET.CAPABILITY += NetworkServices
-
-# Define QMLJSDEBUGGER to allow debugging of QML in debug builds
-# (This might significantly increase build time)
-# DEFINES += QMLJSDEBUGGER
-
-# If your application uses the Qt Mobility libraries, uncomment
-# the following lines and add the respective components to the 
-# MOBILITY variable. 
-# CONFIG += mobility
-# MOBILITY +=
-
-# The .cpp file which was generated for your project. Feel free to hack it.
-SOURCES += main.cpp \
-    qmllineitem.cpp
-
-# Please do not modify the following two lines. Required for deployment.
-include(qmlapplicationviewer/qmlapplicationviewer.pri)
-qtcAddDeployment()
-
-HEADERS += \
-    qmllineitem.h
-
-RESOURCES += \
-    qmlfiles.qrc
+# Add more folders to ship with the application, here
+folder_01.source = qml/BrewPlot
+folder_01.target = qml
+DEPLOYMENTFOLDERS = folder_01
+
+# Additional import path used to resolve QML modules in Creator's code model
+QML_IMPORT_PATH =
+
+symbian:TARGET.UID3 = 0xE41BFE6C
+
+# Allow network access on Symbian
+symbian:TARGET.CAPABILITY += NetworkServices
+
+# Define QMLJSDEBUGGER to allow debugging of QML in debug builds
+# (This might significantly increase build time)
+# DEFINES += QMLJSDEBUGGER
+
+# If your application uses the Qt Mobility libraries, uncomment
+# the following lines and add the respective components to the 
+# MOBILITY variable. 
+# CONFIG += mobility
+# MOBILITY +=
+
+# The .cpp file which was generated for your project. Feel free to hack it.
+SOURCES += main.cpp \
+    qmllineitem.cpp \
+    newpointcontrol.cpp
+
+# Please do not modify the following two lines. Required for deployment.
+include(qmlapplicationviewer/qmlapplicationviewer.pri)
+qtcAddDeployment()
+
+HEADERS += \
+    qmllineitem.h \
+    newpointcontrol.h
+
+RESOURCES += \
+    qmlfiles.qrc

main.cpp

@@ -2,6 +2,7 @@
 #include <QtDeclarative>
 #include "qmlapplicationviewer.h"
 #include "qmllineitem.h"
+#include "newpointcontrol.h"
 
 class QmlWindow : public QMainWindow
 {
@@ -9,13 +10,29 @@ class QmlWindow : public QMainWindow
 public:
     QmlWindow(QWidget *parent = NULL);
     Q_INVOKABLE QAction *addMenuItem(QString menu, QString item);
+signals:
+    void newPoint(QVariantMap pointDescription);
 private:
     QHash<QString,QMenu *> menus;
 };
 
 QmlWindow::QmlWindow(QWidget *parent) : QMainWindow(parent)
 {
-
+    QmlApplicationViewer *viewer = new QmlApplicationViewer;
+    viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
+    viewer->rootContext()->setContextProperty("window", this);
+    viewer->setSource(QUrl("qrc:/qml/qml/BrewPlot/main.qml"));
+    qApp->connect(viewer->engine(), SIGNAL(quit()), SLOT(quit()));
+    QWidget *central = new QWidget;
+    QHBoxLayout *layout = new QHBoxLayout;
+    NewPointControl *control = new NewPointControl;
+    layout->addWidget(control);
+    layout->addWidget(viewer);
+    central->setLayout(layout);
+    setCentralWidget(central);
+    viewer->setMinimumSize(viewer->sizeHint());
+    connect(control, SIGNAL(newPoint(QVariantMap)),
+            this, SIGNAL(newPoint(QVariantMap)));
 }
 
 QAction *QmlWindow::addMenuItem(QString menu, QString item)
@@ -44,13 +61,6 @@ int main(int argc, char *argv[])
 
     QmlWindow *window = new QmlWindow(NULL);
     window->setWindowTitle("BrewPlot");
-    QmlApplicationViewer *viewer = new QmlApplicationViewer;
-    viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
-    viewer->rootContext()->setContextProperty("window", window);
-    viewer->setSource(QUrl("qrc:/qml/qml/BrewPlot/main.qml"));
-    app.connect(viewer->engine(), SIGNAL(quit()), SLOT(quit()));
-    window->setCentralWidget(viewer);
-    viewer->setMinimumSize(viewer->sizeHint());
     window->show();
 
     return app.exec();

newpointcontrol.cpp

@@ -0,0 +1,36 @@
+#include <QBoxLayout>
+#include <QFormLayout>
+#include <QLineEdit>
+#include <QPushButton>
+#include "newpointcontrol.h"
+
+NewPointControl::NewPointControl(QWidget *parent) :
+    QWidget(parent), groundsMass(new QLineEdit), brewMass(new QLineEdit),
+    tds(new QLineEdit)
+{
+    QVBoxLayout *layout = new QVBoxLayout;
+    QFormLayout *flayout = new QFormLayout;
+    QPushButton *plot = new QPushButton(tr("Plot"));
+    flayout->addRow(tr("Mass of ground coffee:"), groundsMass);
+    flayout->addRow(tr("Mass of brewed coffee:"), brewMass);
+    flayout->addRow(tr("% total dissolved solids:"), tds);
+    layout->addLayout(flayout);
+    layout->addWidget(plot);
+    layout->addStretch();
+    setLayout(layout);
+    connect(plot, SIGNAL(clicked()), this, SLOT(plotButtonClicked()));
+}
+
+void NewPointControl::plotButtonClicked()
+{
+    QVariantMap pointDescription;
+    pointDescription.insert("groundMass", groundsMass->text());
+    pointDescription.insert("brewedMass", brewMass->text());
+    pointDescription.insert("ptds", tds->text());
+    pointDescription.insert("color", "red");
+    double extraction = (brewMass->text().toDouble() *
+            (tds->text().toDouble() / 100)) /
+            groundsMass->text().toDouble();
+    pointDescription.insert("extraction", extraction);
+    emit newPoint(pointDescription);
+}

newpointcontrol.h

@@ -0,0 +1,23 @@
+#ifndef NEWPOINTCONTROL_H
+#define NEWPOINTCONTROL_H
+
+#include <QWidget>
+#include <QVariant>
+#include <QLineEdit>
+
+class NewPointControl : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit NewPointControl(QWidget *parent = 0);
+signals:
+    void newPoint(QVariantMap pointDescription);
+public slots:
+    void plotButtonClicked();
+private:
+    QLineEdit *groundsMass;
+    QLineEdit *brewMass;
+    QLineEdit *tds;
+};
+
+#endif // NEWPOINTCONTROL_H

qml/BrewPlot/main.qml

@@ -10,8 +10,7 @@ Rectangle {
     property real sumxy : 0
     property int n : 0
 
-    width: 720
-    height: 680
+    width: 720; height: 680
 
     BrewingControlChart {
         id: graph
@@ -25,178 +24,9 @@ Rectangle {
         Column {
             spacing: 8
 
-            Row {
-                spacing: 5
-
-                Text {
-                    text: "Mass of ground coffee: "
-                }
-                TextInput {
-                    id: groundMass
-
-                    width: 30
-                    validator: DoubleValidator {
-                        bottom: 0
-                        decimals: 2
-                        notation: DoubleValidator.StandardNotation
-                    }
-                    KeyNavigation.tab: brewedMass
-
-                    Line {
-                        x1: -3; y1: groundMass.height
-                        x2: 33; y2: y1
-                        penWidth: 1
-                        color: "black"
-                    }
-                }
-            }
-            Row {
-                spacing: 5
-
-                Text {
-                    text: "Mass of brewed coffee:"
-                }
-                TextInput {
-                    id: brewedMass
-
-                    width: 30
-                    validator: DoubleValidator {
-                        bottom: 0
-                        decimals: 2
-                        notation: DoubleValidator.StandardNotation
-                    }
-                    KeyNavigation.backtab: groundMass
-                    KeyNavigation.tab: ptds
-
-                    Line {
-                        x1: -3; y1: brewedMass.height
-                        x2: 33; y2: y1
-                        penWidth: 1
-                        color: "black"
-                    }
-                }
-            }
-            Row {
-                spacing: 56
-
-                Text {
-                    text: "Percent TDS:"
-                }
-                TextInput {
-                    id: ptds
-
-                    width: 30
-                    validator: DoubleValidator {
-                        bottom: 0
-                        top: 100
-                        decimals: 2
-                        notation: DoubleValidator.StandardNotation
-                    }
-                    KeyNavigation.backtab: brewedMass
-
-                    Line {
-                        x1: -3; y1: ptds.height
-                        x2: 33; y2: y1
-                        penWidth: 1
-                        color: "black"
-                    }
-                }
-            }
-            Row {
-                spacing: 87
-
-                Text {
-                    id: colorlabel
-
-                    text: "Color:"
-                }
-                ColorPicker {
-                    id: colorpicker
-
-                    width: 37; height: colorlabel.height
-                }
-            }
-            Row {
-                id: lsfrow
-
-                visible: false
-                spacing: 1
-
-                Text {
-                    id: fitcolorlabel
-
-                    text: "Least Squares Fit Color:"
-                }
-                ColorPicker {
-                    id: fitcolorpicker
-
-                    width: 37; height: colorlabel.height
-
-                    onColorChanged: {
-                        graph.setFitColor(color)
-                    }
-                }
-            }
-            Rectangle {
-                id: plotButton
-
-                z: 0
-                anchors.horizontalCenter: parent.horizontalCenter
-                height: buttonText.height + 20; width: buttonText.width + 40
-                border.color: "black"
-                radius: 10
-
-                Text {
-                    id: buttonText
-
-                    text: "Plot This Brew"
-                    anchors {horizontalCenter: parent.horizontalCenter; verticalCenter: parent.verticalCenter}
-                }
-                MouseArea {
-                    anchors.fill: parent
-
-                    onClicked: {
-                        var extraction = (brewedMass.text * (ptds.text / 100)) / groundMass.text
-                        graph.plotPoint(extraction, (ptds.text / 100), colorpicker.color)
-                        dataViewModel.append({"color": colorpicker.color, "ptds": ptds.text, "extraction": extraction})
-                        root.n += 1
-                        root.sumy += (ptds.text / 100)
-                        root.sumx += extraction
-                        root.sumxy += ((ptds.text / 100) * extraction)
-                        root.sumxsq += Math.pow(extraction, 2)
-                        if(root.n > 1) {
-                            var a = ((root.sumy * root.sumxsq)-(root.sumx * root.sumxy))/((root.n * root.sumxsq)-Math.pow(root.sumx, 2))
-                            var b = ((root.n * root.sumxy)-(root.sumx * root.sumy))/((root.n * root.sumxsq) - Math.pow(root.sumx, 2))
-                            var x1 = 0.14
-                            var x2 = 0.26
-                            var y1 = a + (b * x1)
-                            var y2 = a + (b * x2)
-                            if(y1 < 0.008) {
-                                x1 = (0.008 - a) / b
-                                y1 = 0.008
-                            }
-                            if(y2 < 0.008) {
-                                x2 = (0.008 - a) / b
-                                y2 = 0.008
-                            }
-                            if(y1 > 0.016) {
-                                x1 = (0.016 - a) / b
-                                y1 = 0.016
-                            }
-                            if(y2 > 0.016) {
-                                x2 = (0.016 - a) / b
-                                y2 = 0.016
-                            }
-                            graph.setFit(x1, y1, x2, y2);
-                        }
-                    }
-                }
-            }
             ListView {
                 spacing: 3
-                height: 400
-                width: 100
-                z: -1
+                height: 600; width: 100
                 contentHeight: dataViewModel.count * 35
 
                 model: ListModel {
@@ -221,6 +51,7 @@ Rectangle {
             }
         }
     }
+
     Component.onCompleted: {
         var quitItem = window.addMenuItem("File", "Quit");
         quitItem.shortcut = "Ctrl+Q";
@@ -242,7 +73,42 @@ Rectangle {
         showLeastSquares.checkable = true;
         showLeastSquares.triggered.connect(function() {
             graph.setFitVisible(showLeastSquares.checked);
-            lsfrow.visible = showLeastSquares.checked;
+        });
+        window.newPoint.connect(function(pointDescription) {
+            graph.plotPoint(pointDescription.extraction,
+                            pointDescription.ptds / 100,
+                            pointDescription.color)
+            dataViewModel.append(pointDescription)
+            root.n += 1
+            root.sumy += pointDescription.ptds / 100
+            root.sumx += pointDescription.extraction
+            root.sumxy += ((pointDescription.ptds / 100) * pointDescription.extraction)
+            root.sumxsq += Math.pow(pointDescription.extraction, 2)
+            if(root.n > 1) {
+                var a = ((root.sumy * root.sumxsq)-(root.sumx * root.sumxy))/((root.n * root.sumxsq)-Math.pow(root.sumx, 2))
+                var b = ((root.n * root.sumxy)-(root.sumx * root.sumy))/((root.n * root.sumxsq) - Math.pow(root.sumx, 2))
+                var x1 = 0.14
+                var x2 = 0.26
+                var y1 = a + (b * x1)
+                var y2 = a + (b * x2)
+                if(y1 < 0.008) {
+                    x1 = (0.008 - a) / b
+                    y1 = 0.008
+                }
+                if(y2 < 0.008) {
+                    x2 = (0.008 - a) / b
+                    y2 = 0.008
+                }
+                if(y1 > 0.016) {
+                    x1 = (0.016 - a) / b
+                    y2 = 0.016
+                }
+                if(y2 > 0.016) {
+                    x2 = (0.016 - a) / b
+                    y2 = 0.016
+                }
+                graph.setFit(x1, y1, x2, y2)
+            }
         });
     }
 }