From b3bc344ed70e3f772343c3067031c2c375c7bef7 Mon Sep 17 00:00:00 2001
From: Krisjanis Rijnieks <krisjanis.rijnieks@gmail.com>
Date: Tue, 24 Jan 2017 20:08:48 +0100
Subject: [PATCH] Add ofxPiMapper::duplicateSurface()

---
 src/Application/Application.cpp                 | 9 +++++++++
 src/Application/Application.h                   | 1 +
 src/Application/Modes/ProjectionMappingMode.cpp | 7 +------
 src/ofxPiMapper.cpp                             | 4 ++++
 src/ofxPiMapper.h                               | 1 +
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/Application/Application.cpp b/src/Application/Application.cpp
index 41f8414..9e2d44c 100644
--- a/src/Application/Application.cpp
+++ b/src/Application/Application.cpp
@@ -345,5 +345,14 @@ void Application::moveLayerDown(){
 	}
 }
 
+void Application::duplicateSurface(){
+	if(getSurfaceManager()->getSelectedSurface() != 0){
+		getCmdManager()->exec(
+		 new DuplicateSurfaceCmd(
+		  getSurfaceManager()->getSelectedSurface(),
+		  getSurfaceManager()));
+	}
+}
+
 } // namespace piMapper
 } // namespace ofx
diff --git a/src/Application/Application.h b/src/Application/Application.h
index 5662c56..c4ae48f 100644
--- a/src/Application/Application.h
+++ b/src/Application/Application.h
@@ -77,6 +77,7 @@ class Application : public KeyListener {
 		void setSourceMode();
 		void moveLayerUp();
 		void moveLayerDown();
+		void duplicateSurface();
 	
 		void setPreset(unsigned int i);
 		void setNextPreset();
diff --git a/src/Application/Modes/ProjectionMappingMode.cpp b/src/Application/Modes/ProjectionMappingMode.cpp
index 01ef353..c6e6805 100644
--- a/src/Application/Modes/ProjectionMappingMode.cpp
+++ b/src/Application/Modes/ProjectionMappingMode.cpp
@@ -221,12 +221,7 @@ void ProjectionMappingMode::onKeyPressed(Application * app, ofKeyEventArgs & arg
 		 break;
 	
 	 case 'd':
-		 if(app->getSurfaceManager()->getSelectedSurface() != 0){
-			app->getCmdManager()->exec(
-				new DuplicateSurfaceCmd(
-					app->getSurfaceManager()->getSelectedSurface(),
-					app->getSurfaceManager()));
-		 }
+		 app->duplicateSurface();
 		 break;
 		 
 	 case '0': // Move selected surface up the layer stack
diff --git a/src/ofxPiMapper.cpp b/src/ofxPiMapper.cpp
index e93d65d..2d44ede 100644
--- a/src/ofxPiMapper.cpp
+++ b/src/ofxPiMapper.cpp
@@ -91,6 +91,10 @@ void ofxPiMapper::selectPrevSurface(){
 	_application.getState()->selectPrevSurface(&_application);
 }
 
+void ofxPiMapper::duplicateSurface(){
+	_application.duplicateSurface();
+}
+
 void ofxPiMapper::selectNextVertex(){
 	_application.getState()->selectNextVertex(&_application);
 }
diff --git a/src/ofxPiMapper.h b/src/ofxPiMapper.h
index 170264c..20ebcdf 100644
--- a/src/ofxPiMapper.h
+++ b/src/ofxPiMapper.h
@@ -49,6 +49,7 @@ class ofxPiMapper {
 		void selectSurface(int i);
 		void selectNextSurface();
 		void selectPrevSurface();
+		void duplicateSurface();
 		void selectNextVertex();
 		void selectPrevVertex();
 		void moveLayerUp();