From d7dd95cd9eaa223ff8b86e84e6b1b488ff79bcd5 Mon Sep 17 00:00:00 2001
From: Samuel Fadel <samuelfadel@gmail.com>
Date: Sat, 19 Dec 2015 12:29:33 +0100
Subject: New rendering (VoronoiSplat) -- incomplete.

* Added voronoi-like splatting to points: the same technique from
  Messias et al., (2014)
* It is now possible to change the projection technique during
  runtime (possible, but still requires some work)
---
 main_view.qml | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 82 insertions(+), 6 deletions(-)

(limited to 'main_view.qml')

diff --git a/main_view.qml b/main_view.qml
index 0cd29b5..62c3a67 100644
--- a/main_view.qml
+++ b/main_view.qml
@@ -6,10 +6,13 @@ import QtQuick.Layouts 1.2
 import PM 1.0
 
 ApplicationWindow {
+    id: mainWindow
     title: "Projection Manipulation"
     visible: true
-    width: 900
-    height: 600
+    minimumWidth: 900
+    minimumHeight: 600
+    maximumWidth: minimumWidth
+    maximumHeight: minimumHeight
 
     menuBar: MenuBar {
         Menu {
@@ -18,6 +21,26 @@ ApplicationWindow {
             MenuItem { action: quitAction }
         }
 
+        Menu {
+            title: "Technique"
+            MenuItem {
+                action: lampTechniqueAction
+                exclusiveGroup: techniqueGroup
+            }
+            MenuItem {
+                action: lspTechniqueAction
+                exclusiveGroup: techniqueGroup
+            }
+            MenuItem {
+                action: plmpTechniqueAction
+                exclusiveGroup: techniqueGroup
+            }
+            MenuItem {
+                action: pekalskaTechniqueAction
+                exclusiveGroup: techniqueGroup
+            }
+        }
+
         Menu {
             title: "View"
             MenuItem {
@@ -68,10 +91,18 @@ ApplicationWindow {
                 border.width: 1
                 border.color: "#cccccc"
 
+                VoronoiSplat {
+                    id: splat
+                    objectName: "splat"
+                    width: 256
+                    height: 256
+                }
+
                 Scatterplot {
                     id: plot
                     objectName: "plot"
                     anchors.fill: parent
+                    visible: false
                 }
             }
         }
@@ -107,6 +138,51 @@ ApplicationWindow {
         }
     }
 
+    ExclusiveGroup {
+        id: techniqueGroup
+
+        Action {
+            id: lampTechniqueAction
+            text: "LAMP"
+            shortcut: "Ctrl+1"
+            checked: true
+            checkable: true
+            onTriggered: {
+                Main.setTechnique(InteractionHandler.TECHNIQUE_LAMP)
+            }
+        }
+
+        Action {
+            id: lspTechniqueAction
+            text: "LSP"
+            shortcut: "Ctrl+2"
+            checkable: true
+            onTriggered: {
+                Main.setTechnique(InteractionHandler.TECHNIQUE_LSP)
+            }
+        }
+
+        Action {
+            id: plmpTechniqueAction
+            text: "PLMP"
+            shortcut: "Ctrl+3"
+            checkable: true
+            onTriggered: {
+                Main.setTechnique(InteractionHandler.TECHNIQUE_PLMP)
+            }
+        }
+
+        Action {
+            id: pekalskaTechniqueAction
+            text: "Pekalska"
+            shortcut: "Ctrl+4"
+            checkable: true
+            onTriggered: {
+                Main.setTechnique(InteractionHandler.TECHNIQUE_PEKALSKA)
+            }
+        }
+    }
+
     ExclusiveGroup {
         id: coloringGroup
 
@@ -116,7 +192,7 @@ ApplicationWindow {
             shortcut: "Shift+L"
             checked: true
             checkable: true
-            onTriggered: console.log("Labels")
+            onTriggered: console.log("stub: Labels")
         }
 
         Action {
@@ -124,7 +200,7 @@ ApplicationWindow {
             text: "Neighborhood Preservation"
             shortcut: "Shift+N"
             checkable: true
-            onTriggered: console.log("NP")
+            onTriggered: console.log("stub: NP")
         }
 
         Action {
@@ -132,7 +208,7 @@ ApplicationWindow {
             text: "Stress"
             shortcut: "Shift+S"
             checkable: true
-            onTriggered: console.log("Stress")
+            onTriggered: console.log("stub: Stress")
         }
 
         Action {
@@ -140,7 +216,7 @@ ApplicationWindow {
             text: "Silhouette"
             shortcut: "Shift+T"
             checkable: true
-            onTriggered: console.log("Silhouette")
+            onTriggered: console.log("stub: Silhouette")
         }
     }
 }
-- 
cgit v1.2.3