From 2a7c9e8481739fd8248c2d4905a66e2a130f17d8 Mon Sep 17 00:00:00 2001
From: Krisjanis Rijnieks <krisjanis.rijnieks@gmail.com>
Date: Wed, 24 Aug 2016 22:22:55 +0300
Subject: [PATCH] Adjust surface selection commands to work well with the
 ScaleWidget

---
 example/bin/data/defaultSurfaces.xml | 70 ++++++++++++++--------------
 src/Commands/SelNextSurfaceCmd.cpp   |  4 ++
 src/Commands/SelNextSurfaceCmd.h     |  1 +
 src/Commands/SelPrevSurfaceCmd.cpp   |  4 ++
 src/Commands/SelPrevSurfaceCmd.h     |  1 +
 src/Commands/SelSurfaceCmd.cpp       |  4 ++
 src/Commands/SelSurfaceCmd.h         |  1 +
 7 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/example/bin/data/defaultSurfaces.xml b/example/bin/data/defaultSurfaces.xml
index 5cb11b0..6b2391a 100755
--- a/example/bin/data/defaultSurfaces.xml
+++ b/example/bin/data/defaultSurfaces.xml
@@ -1,17 +1,17 @@
 <surfaces>
-    <surface>
+    <surface type="0">
         <vertices>
             <vertex>
-                <x>97.709846497</x>
-                <y>339.636596680</y>
+                <x>144.596435547</x>
+                <y>350.618133545</y>
             </vertex>
             <vertex>
-                <x>306.630920410</x>
-                <y>105.926849365</y>
+                <x>334.612976074</x>
+                <y>138.055999756</y>
             </vertex>
             <vertex>
-                <x>41.000000000</x>
-                <y>74.000000000</y>
+                <x>93.018066406</x>
+                <y>109.018371582</y>
             </vertex>
         </vertices>
         <texCoords>
@@ -33,23 +33,23 @@
             <source-name>Custom FBO Source</source-name>
         </source>
     </surface>
-    <surface>
+    <surface type="1">
         <vertices>
             <vertex>
-                <x>306.630920410</x>
-                <y>105.926849365</y>
+                <x>370.015960693</x>
+                <y>71.820503235</y>
             </vertex>
             <vertex>
-                <x>368.000000000</x>
-                <y>177.000000000</y>
+                <x>426.714202881</x>
+                <y>137.484405518</y>
             </vertex>
             <vertex>
-                <x>344.000000000</x>
-                <y>299.000000000</y>
+                <x>404.540893555</x>
+                <y>250.199127197</y>
             </vertex>
             <vertex>
-                <x>97.709846497</x>
-                <y>339.636596680</y>
+                <x>176.995574951</x>
+                <y>287.742950439</y>
             </vertex>
         </vertices>
         <texCoords>
@@ -78,43 +78,43 @@
             <perspectiveWarping>1</perspectiveWarping>
         </properties>
     </surface>
-    <surface>
+    <surface type="2">
         <vertices>
             <vertex>
-                <x>368.000000000</x>
-                <y>177.000000000</y>
+                <x>429.168884277</x>
+                <y>232.234344482</y>
             </vertex>
             <vertex>
-                <x>523.000000000</x>
-                <y>144.000000000</y>
+                <x>493.644958496</x>
+                <y>218.507308960</y>
             </vertex>
             <vertex>
-                <x>714.000000000</x>
-                <y>143.000000000</y>
+                <x>573.095703125</x>
+                <y>218.091369629</y>
             </vertex>
             <vertex>
-                <x>344.000000000</x>
-                <y>299.000000000</y>
+                <x>419.185028076</x>
+                <y>282.983367920</y>
             </vertex>
             <vertex>
-                <x>504.000000000</x>
-                <y>304.000000000</y>
+                <x>485.740966797</x>
+                <y>285.063232422</y>
             </vertex>
             <vertex>
-                <x>721.000000000</x>
-                <y>279.000000000</y>
+                <x>576.008056641</x>
+                <y>274.663574219</y>
             </vertex>
             <vertex>
-                <x>373.000000000</x>
-                <y>398.000000000</y>
+                <x>431.248046875</x>
+                <y>324.164886475</y>
             </vertex>
             <vertex>
-                <x>550.000000000</x>
-                <y>407.000000000</y>
+                <x>504.876403809</x>
+                <y>327.908752441</y>
             </vertex>
             <vertex>
-                <x>759.000000000</x>
-                <y>365.000000000</y>
+                <x>591.815185547</x>
+                <y>310.437927246</y>
             </vertex>
         </vertices>
         <texCoords>
diff --git a/src/Commands/SelNextSurfaceCmd.cpp b/src/Commands/SelNextSurfaceCmd.cpp
index bc18cb5..09198fc 100644
--- a/src/Commands/SelNextSurfaceCmd.cpp
+++ b/src/Commands/SelNextSurfaceCmd.cpp
@@ -10,11 +10,15 @@ SelNextSurfaceCmd::SelNextSurfaceCmd(SurfaceManager * surfaceManager){
 void SelNextSurfaceCmd::exec(){
 	_prevSelectedSurface = _surfaceManager->getSelectedSurface();
 	_surfaceManager->selectNextSurface();
+	Gui::instance()->getScaleWidget().setSurface(_surfaceManager->getSelectedSurface());
 }
 
 void SelNextSurfaceCmd::undo(){
 	ofLogNotice("SelNextSurfaceCmd", "undo");
 	_surfaceManager->selectSurface(_prevSelectedSurface);
+	if(_prevSelectedSurface != 0){
+		Gui::instance()->getScaleWidget().setSurface(_prevSelectedSurface);
+	}
 	_prevSelectedSurface = 0;
 }
 
diff --git a/src/Commands/SelNextSurfaceCmd.h b/src/Commands/SelNextSurfaceCmd.h
index ca196e2..ddd0538 100644
--- a/src/Commands/SelNextSurfaceCmd.h
+++ b/src/Commands/SelNextSurfaceCmd.h
@@ -7,6 +7,7 @@
 #include "BaseCmd.h"
 #include "BaseSurface.h"
 #include "SurfaceManager.h"
+#include "Gui.h"
 
 namespace ofx {
 namespace piMapper {
diff --git a/src/Commands/SelPrevSurfaceCmd.cpp b/src/Commands/SelPrevSurfaceCmd.cpp
index da63b0d..24cd2b6 100644
--- a/src/Commands/SelPrevSurfaceCmd.cpp
+++ b/src/Commands/SelPrevSurfaceCmd.cpp
@@ -10,11 +10,15 @@ SelPrevSurfaceCmd::SelPrevSurfaceCmd(SurfaceManager * surfaceManager){
 void SelPrevSurfaceCmd::exec(){
 	_prevSelectedSurface = _surfaceManager->getSelectedSurface();
 	_surfaceManager->selectPrevSurface();
+	Gui::instance()->getScaleWidget().setSurface(_surfaceManager->getSelectedSurface());
 }
 
 void SelPrevSurfaceCmd::undo(){
 	ofLogNotice("SelPrevSurfaceCmd", "undo");
 	_surfaceManager->selectSurface(_prevSelectedSurface);
+	if(_prevSelectedSurface != 0){
+		Gui::instance()->getScaleWidget().setSurface(_prevSelectedSurface);
+	}
 	_prevSelectedSurface = 0;
 }
 
diff --git a/src/Commands/SelPrevSurfaceCmd.h b/src/Commands/SelPrevSurfaceCmd.h
index c9ec97a..f3489ac 100644
--- a/src/Commands/SelPrevSurfaceCmd.h
+++ b/src/Commands/SelPrevSurfaceCmd.h
@@ -7,6 +7,7 @@
 #include "BaseCmd.h"
 #include "BaseSurface.h"
 #include "SurfaceManager.h"
+#include "Gui.h"
 
 namespace ofx {
 namespace piMapper {
diff --git a/src/Commands/SelSurfaceCmd.cpp b/src/Commands/SelSurfaceCmd.cpp
index 9c90de0..8235e65 100644
--- a/src/Commands/SelSurfaceCmd.cpp
+++ b/src/Commands/SelSurfaceCmd.cpp
@@ -11,11 +11,15 @@ SelSurfaceCmd::SelSurfaceCmd(SurfaceManager * surfaceManager, BaseSurface * surf
 void SelSurfaceCmd::exec(){
 	_prevSelectedSurface = _surfaceManager->getSelectedSurface();
 	_surfaceManager->selectSurface(_surfaceToSelect);
+	Gui::instance()->getScaleWidget().setSurface(_surfaceToSelect);
 }
 
 void SelSurfaceCmd::undo(){
 	ofLogNotice("SelSurfaceCmd", "undo");
 	_surfaceManager->selectSurface(_prevSelectedSurface);
+	if(_prevSelectedSurface != 0){
+		Gui::instance()->getScaleWidget().setSurface(_prevSelectedSurface);
+	}
 	_surfaceToSelect = 0;
 	_prevSelectedSurface = 0;
 }
diff --git a/src/Commands/SelSurfaceCmd.h b/src/Commands/SelSurfaceCmd.h
index 356dc31..1ff2616 100644
--- a/src/Commands/SelSurfaceCmd.h
+++ b/src/Commands/SelSurfaceCmd.h
@@ -7,6 +7,7 @@
 #include "BaseCmd.h"
 #include "BaseSurface.h"
 #include "SurfaceManager.h"
+#include "Gui.h"
 
 namespace ofx {
 namespace piMapper {