1 files changed, 120 insertions, 39 deletions

diff --git a/main_view.qml b/main_view.qml
index 5afe270..49448cb 100644
--- a/main_view.qml
+++ b/main_view.qml
@@ -1,12 +1,14 @@
-import QtQuick 2.0
+import QtQuick 2.5
 import QtQuick.Controls 1.3
 import QtQuick.Dialogs 1.2
+import QtQuick.Extras 1.4
+import QtQuick.Layouts 1.2
 import PM 1.0
 
 ApplicationWindow {
     title: "Projection Manipulation"
     visible: true
-    width: 1200
+    width: 900
     height: 600
 
     menuBar: MenuBar {
@@ -14,54 +16,100 @@ ApplicationWindow {
             title: "File"
             MenuItem { action: openAction }
             MenuItem { action: savePlotAction }
-            MenuItem { action: saveDataAction }
             MenuItem { action: quitAction }
         }
+
+        Menu {
+            title: "View"
+            MenuItem {
+                action: noneColorAction
+                exclusiveGroup: coloringGroup
+            }
+            MenuItem {
+                action: npColorAction
+                exclusiveGroup: coloringGroup
+            }
+            MenuItem {
+                action: stressColorAction
+                exclusiveGroup: coloringGroup
+            }
+            MenuItem {
+                action: silhouetteColorAction
+                exclusiveGroup: coloringGroup
+            }
+        }
     }
 
-    Item {
+    ColumnLayout {
+        spacing: 10
         anchors.fill: parent
+        anchors.margins: this.spacing
 
-        Rectangle {
-            anchors.fill: subsamplePlot
-            border.width: 1
-            border.color: "#cccccc"
-            z: 0
+        RowLayout {
+            spacing: 10
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+
+            Rectangle {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                border.width: 1
+                border.color: "#cccccc"
+
+                Scatterplot {
+                    id: subsamplePlot
+                    objectName: "subsamplePlot"
+                    anchors.fill: parent
+                }
+            }
+
+            Rectangle {
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                border.width: 1
+                border.color: "#cccccc"
+
+                Scatterplot {
+                    id: plot
+                    objectName: "plot"
+                    anchors.fill: parent
+                }
+            }
         }
 
         Rectangle {
-            anchors.fill: plot
+            Layout.fillWidth: true
+            Layout.minimumHeight: 150
             border.width: 1
             border.color: "#cccccc"
-            z: 0
-        }
 
-        Scatterplot {
-            id: subsamplePlot
-            objectName: "subsamplePlot"
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            anchors.left: parent.left
-            width: 0.5 * parent.width
-            z: 1
+            HistoryGraph {
+                id: history
+                objectName: "history"
+                anchors.fill: parent
+            }
         }
+    }
+
+    FileDialog {
+        id: fileOpenDialog
+        title: "Choose a data set to load..."
+        selectMultiple: false
+        selectExisting: true
 
-        Scatterplot {
-            id: plot
-            objectName: "plot"
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            anchors.right: parent.right
-            width: 0.5 * parent.width
-            z: 1
+        onAccepted: {
+            console.log("Loading data set: " + this.fileUrl)
         }
     }
 
     FileDialog {
-        id: fileDialog
-        title: "Choose a file..."
+        id: fileSaveDialog
+        title: "Save subsample mapping..."
+        selectMultiple: false
+        selectExisting: false
+
         onAccepted: {
-            // datasetLoader.load(fileDialog.fileUrls)
+            subsamplePlot.saveToFile(this.fileUrl)
         }
     }
 
@@ -76,20 +124,53 @@ ApplicationWindow {
         id: openAction
         text: "&Open..."
         shortcut: "Ctrl+O"
-        onTriggered: fileDialog.open()
+        onTriggered: fileOpenDialog.open()
     }
 
     Action {
         id: savePlotAction
-        text: "Save &plot"
+        text: "&Save subsample"
         shortcut: "Ctrl+S"
-        onTriggered: console.log("Save plot")
+        onTriggered: {
+            console.log("Saving subsample mapping...")
+            fileSaveDialog.open()
+        }
     }
 
-    Action {
-        id: saveDataAction
-        text: "Save &data"
-        shortcut: "Ctrl+D"
-        onTriggered: console.log("Save data")
+    ExclusiveGroup {
+        id: coloringGroup
+
+        Action {
+            id: noneColorAction
+            text: "None"
+            shortcut: "Shift+O"
+            checked: true
+            checkable: true
+            onTriggered: console.log("None")
+        }
+
+        Action {
+            id: npColorAction
+            text: "Neighborhood Preservation"
+            shortcut: "Shift+N"
+            checkable: true
+            onTriggered: console.log("NP")
+        }
+
+        Action {
+            id: stressColorAction
+            text: "Stress"
+            shortcut: "Shift+S"
+            checkable: true
+            onTriggered: console.log("Stress")
+        }
+
+        Action {
+            id: silhouetteColorAction
+            text: "Silhouette"
+            shortcut: "Shift+T"
+            checkable: true
+            onTriggered: console.log("Silhouette")
+        }
     }
 }