From 4d5266f75529aaf75be7c05395707aeccc1ab046 Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Sat, 5 Mar 2016 22:29:03 +0100 Subject: [PATCH] Clean up, rm `duplicateSurface` method from `CommandManager` --- src/Commands/DuplicateSurfaceCmd.cpp | 4 +++- src/Surfaces/SurfaceManager.cpp | 6 ------ src/Surfaces/SurfaceManager.h | 1 - 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/Commands/DuplicateSurfaceCmd.cpp b/src/Commands/DuplicateSurfaceCmd.cpp index 124b898..c907ac5 100644 --- a/src/Commands/DuplicateSurfaceCmd.cpp +++ b/src/Commands/DuplicateSurfaceCmd.cpp @@ -9,7 +9,9 @@ DuplicateSurfaceCmd::DuplicateSurfaceCmd(BaseSurface * surface, SurfaceManager * } void DuplicateSurfaceCmd::exec(){ - _duplicate = _surfaceManager->duplicateSurface(_surface); + ofLogNotice("DuplicateSurfaceCmd", "exec"); + _duplicate = _surface->clone(); + _surfaceManager->addSurface(_duplicate); _duplicate->moveBy(ofVec2f(10.0f, 10.0f)); _surfaceManager->selectSurface(_duplicate); } diff --git a/src/Surfaces/SurfaceManager.cpp b/src/Surfaces/SurfaceManager.cpp index 0c6ab47..df07c24 100644 --- a/src/Surfaces/SurfaceManager.cpp +++ b/src/Surfaces/SurfaceManager.cpp @@ -166,12 +166,6 @@ BaseSurface * SurfaceManager::getSelectedSurface(){ return selectedSurface; } -BaseSurface * SurfaceManager::duplicateSurface(BaseSurface * surface){ - BaseSurface * duplicate = surface->clone(); - addSurface(duplicate); - return duplicate; -} - // TODO: select vertex should be implemented ad BaseSurface level void SurfaceManager::selectNextVertex(){ if(selectedSurface == 0){ diff --git a/src/Surfaces/SurfaceManager.h b/src/Surfaces/SurfaceManager.h index 82068ea..17076bf 100644 --- a/src/Surfaces/SurfaceManager.h +++ b/src/Surfaces/SurfaceManager.h @@ -43,7 +43,6 @@ class SurfaceManager { BaseSurface * selectNextSurface(); BaseSurface * selectPrevSurface(); BaseSurface * getSelectedSurface(); - BaseSurface * duplicateSurface(BaseSurface * surface); // These should trigger an event for the GUI layer to catch void selectNextVertex();