Display native controls for adding points.

main.cpp

@@ -2,6 +2,7 @@
 #include <QtDeclarative>
 #include "qmlapplicationviewer.h"
 #include "qmllineitem.h"
+#include "newpointcontrol.h"
 
 class QmlWindow : public QMainWindow
 {
@@ -49,7 +50,13 @@ int main(int argc, char *argv[])
     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);
+    QWidget *central = new QWidget;
+    QHBoxLayout *layout = new QHBoxLayout;
+    NewPointControl *control = new NewPointControl;
+    layout->addWidget(control);
+    layout->addWidget(viewer);
+    central->setLayout(layout);
+    window->setCentralWidget(central);
     viewer->setMinimumSize(viewer->sizeHint());
     window->show();
 

newpointcontrol.cpp

@@ -18,4 +18,6 @@ NewPointControl::NewPointControl(QWidget *parent) :
     flayout->addRow(tr("% total dissolved solids:"), tds);
     layout->addLayout(flayout);
     layout->addWidget(plot);
+    layout->addStretch();
+    setLayout(layout);
 }

qml/BrewPlot/main.qml

@@ -19,204 +19,29 @@ Rectangle {
         width: 450; height: 600
         anchors {right: parent.right; rightMargin: 20; top: parent.top; topMargin: 20}
     }
-    Item {
-        anchors {left: parent.left; leftMargin: 10; top: parent.top; topMargin: 10}
-
-        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
+    ListView {
+        spacing: 3
+        height: 400
+        width: 100
+        z: -1
+        contentHeight: dataViewModel.count * 35
+
+        model: ListModel {
+            id: dataViewModel
+        }
+        delegate: Row {
+            spacing: 3
 
-                    width: 37; height: colorlabel.height
-                }
+            Rectangle {
+                width: 30; height: 30
+                color: dataViewModel.get(index).color
             }
-            Row {
-                id: lsfrow
-
-                visible: false
-                spacing: 1
-
+            Column {
                 Text {
-                    id: fitcolorlabel
-
-                    text: "Least Squares Fit Color:"
-                }
-                ColorPicker {
-                    id: fitcolorpicker
-
-                    width: 37; height: colorlabel.height
-
-                    onColorChanged: {
-                        graph.setFitColor(color)
-                    }
+                    text: "Strength: " + dataViewModel.get(index).ptds + "% TDS"
                 }
-            }
-            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
-                contentHeight: dataViewModel.count * 35
-
-                model: ListModel {
-                    id: dataViewModel
-                }
-                delegate: Row {
-                    spacing: 3
-
-                    Rectangle {
-                        width: 30; height: 30
-                        color: dataViewModel.get(index).color
-                    }
-                    Column {
-                        Text {
-                            text: "Strength: " + dataViewModel.get(index).ptds + "% TDS"
-                        }
-                        Text {
-                            text: "Extraction: " + Number(dataViewModel.get(index).extraction * 100).toFixed(2) + "%"
-                        }
-                    }
+                    text: "Extraction: " + Number(dataViewModel.get(index).extraction * 100).toFixed(2) + "%"
                 }
             }
         }