From e64472462bb64f2e138e5732313d9133d555cca6 Mon Sep 17 00:00:00 2001
From: Krisjanis Rijnieks <krisjanis.rijnieks@gmail.com>
Date: Wed, 3 Feb 2016 20:55:55 +0100
Subject: [PATCH] Remove projection editor parameter from `SelSurfaceCmd`
---
src/Commands/SelSurfaceCmd.cpp | 10 +---------
src/Commands/SelSurfaceCmd.h | 5 +----
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/src/Commands/SelSurfaceCmd.cpp b/src/Commands/SelSurfaceCmd.cpp
index 89f4db2..9c90de0 100644
--- a/src/Commands/SelSurfaceCmd.cpp
+++ b/src/Commands/SelSurfaceCmd.cpp
@@ -3,27 +3,19 @@
namespace ofx {
namespace piMapper {
-SelSurfaceCmd::SelSurfaceCmd(SurfaceManager * surfaceManager,
- BaseSurface * surfaceToSelect,
- ProjectionEditor * projectionEditor){
-
+SelSurfaceCmd::SelSurfaceCmd(SurfaceManager * surfaceManager, BaseSurface * surfaceToSelect){
_surfaceManager = surfaceManager;
_surfaceToSelect = surfaceToSelect;
- _projectionEditor = projectionEditor;
}
void SelSurfaceCmd::exec(){
_prevSelectedSurface = _surfaceManager->getSelectedSurface();
- _projectionEditor->clearJoints();
_surfaceManager->selectSurface(_surfaceToSelect);
- _projectionEditor->createJoints();
}
void SelSurfaceCmd::undo(){
ofLogNotice("SelSurfaceCmd", "undo");
- _projectionEditor->clearJoints();
_surfaceManager->selectSurface(_prevSelectedSurface);
- _projectionEditor->createJoints();
_surfaceToSelect = 0;
_prevSelectedSurface = 0;
}
diff --git a/src/Commands/SelSurfaceCmd.h b/src/Commands/SelSurfaceCmd.h
index cd8e1a7..756b80b 100644
--- a/src/Commands/SelSurfaceCmd.h
+++ b/src/Commands/SelSurfaceCmd.h
@@ -15,9 +15,7 @@ namespace piMapper {
class SelSurfaceCmd : public BaseUndoCmd {
public:
- SelSurfaceCmd(SurfaceManager * surfaceManager,
- BaseSurface * surfaceToSelect,
- ProjectionEditor * projectionEditor);
+ SelSurfaceCmd(SurfaceManager * surfaceManager, BaseSurface * surfaceToSelect);
void exec();
void undo();
@@ -25,7 +23,6 @@ class SelSurfaceCmd : public BaseUndoCmd {
BaseSurface * _surfaceToSelect;
SurfaceManager * _surfaceManager;
BaseSurface * _prevSelectedSurface;
- ProjectionEditor * _projectionEditor;
};