Browse Source

Remove projection editor parameter from `SelSurfaceCmd`

master
Krisjanis Rijnieks 9 years ago
parent
commit
e64472462b
  1. 10
      src/Commands/SelSurfaceCmd.cpp
  2. 5
      src/Commands/SelSurfaceCmd.h

10
src/Commands/SelSurfaceCmd.cpp

@ -3,27 +3,19 @@
namespace ofx { namespace ofx {
namespace piMapper { namespace piMapper {
SelSurfaceCmd::SelSurfaceCmd(SurfaceManager * surfaceManager, SelSurfaceCmd::SelSurfaceCmd(SurfaceManager * surfaceManager, BaseSurface * surfaceToSelect){
BaseSurface * surfaceToSelect,
ProjectionEditor * projectionEditor){
_surfaceManager = surfaceManager; _surfaceManager = surfaceManager;
_surfaceToSelect = surfaceToSelect; _surfaceToSelect = surfaceToSelect;
_projectionEditor = projectionEditor;
} }
void SelSurfaceCmd::exec(){ void SelSurfaceCmd::exec(){
_prevSelectedSurface = _surfaceManager->getSelectedSurface(); _prevSelectedSurface = _surfaceManager->getSelectedSurface();
_projectionEditor->clearJoints();
_surfaceManager->selectSurface(_surfaceToSelect); _surfaceManager->selectSurface(_surfaceToSelect);
_projectionEditor->createJoints();
} }
void SelSurfaceCmd::undo(){ void SelSurfaceCmd::undo(){
ofLogNotice("SelSurfaceCmd", "undo"); ofLogNotice("SelSurfaceCmd", "undo");
_projectionEditor->clearJoints();
_surfaceManager->selectSurface(_prevSelectedSurface); _surfaceManager->selectSurface(_prevSelectedSurface);
_projectionEditor->createJoints();
_surfaceToSelect = 0; _surfaceToSelect = 0;
_prevSelectedSurface = 0; _prevSelectedSurface = 0;
} }

5
src/Commands/SelSurfaceCmd.h

@ -15,9 +15,7 @@ namespace piMapper {
class SelSurfaceCmd : public BaseUndoCmd { class SelSurfaceCmd : public BaseUndoCmd {
public: public:
SelSurfaceCmd(SurfaceManager * surfaceManager, SelSurfaceCmd(SurfaceManager * surfaceManager, BaseSurface * surfaceToSelect);
BaseSurface * surfaceToSelect,
ProjectionEditor * projectionEditor);
void exec(); void exec();
void undo(); void undo();
@ -25,7 +23,6 @@ class SelSurfaceCmd : public BaseUndoCmd {
BaseSurface * _surfaceToSelect; BaseSurface * _surfaceToSelect;
SurfaceManager * _surfaceManager; SurfaceManager * _surfaceManager;
BaseSurface * _prevSelectedSurface; BaseSurface * _prevSelectedSurface;
ProjectionEditor * _projectionEditor;
}; };

Loading…
Cancel
Save