From 12f0d8abcf119d951dec8a9d75c1a1c9d1505acf Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Fri, 30 Sep 2016 09:26:18 +0300 Subject: [PATCH] Rename SetApplicationStateCmd to SetApplicationModeCmd --- example/example.xcodeproj/project.pbxproj | 12 ++++++------ src/Application/Application.cpp | 8 ++++---- src/Application/Application.h | 4 ++-- src/Application/Modes/PresentationMode.cpp | 2 +- src/Application/Modes/PresentationMode.h | 2 +- ...icationStateCmd.cpp => SetApplicationModeCmd.cpp} | 10 +++++----- ...ApplicationStateCmd.h => SetApplicationModeCmd.h} | 4 ++-- 7 files changed, 21 insertions(+), 21 deletions(-) rename src/Commands/{SetApplicationStateCmd.cpp => SetApplicationModeCmd.cpp} (85%) rename src/Commands/{SetApplicationStateCmd.h => SetApplicationModeCmd.h} (81%) diff --git a/example/example.xcodeproj/project.pbxproj b/example/example.xcodeproj/project.pbxproj index f0f6b17..72a97a6 100644 --- a/example/example.xcodeproj/project.pbxproj +++ b/example/example.xcodeproj/project.pbxproj @@ -69,7 +69,7 @@ 01E9EA321D9D535E00E1BFAE /* SelPrevVertexCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01E9E9B71D9D535E00E1BFAE /* SelPrevVertexCmd.cpp */; }; 01E9EA331D9D535E00E1BFAE /* SelSurfaceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01E9E9B91D9D535E00E1BFAE /* SelSurfaceCmd.cpp */; }; 01E9EA341D9D535E00E1BFAE /* SelVertexCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01E9E9BB1D9D535E00E1BFAE /* SelVertexCmd.cpp */; }; - 01E9EA351D9D535E00E1BFAE /* SetApplicationStateCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01E9E9BD1D9D535E00E1BFAE /* SetApplicationStateCmd.cpp */; }; + 01E9EA351D9D535E00E1BFAE /* SetApplicationModeCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01E9E9BD1D9D535E00E1BFAE /* SetApplicationModeCmd.cpp */; }; 01E9EA361D9D535E00E1BFAE /* SetNextSourceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01E9E9BF1D9D535E00E1BFAE /* SetNextSourceCmd.cpp */; }; 01E9EA371D9D535E00E1BFAE /* SetSourceCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01E9E9C11D9D535E00E1BFAE /* SetSourceCmd.cpp */; }; 01E9EA381D9D535E00E1BFAE /* SetTexMapDrawModeCmd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01E9E9C31D9D535E00E1BFAE /* SetTexMapDrawModeCmd.cpp */; }; @@ -303,8 +303,8 @@ 01E9E9BA1D9D535E00E1BFAE /* SelSurfaceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelSurfaceCmd.h; sourceTree = ""; }; 01E9E9BB1D9D535E00E1BFAE /* SelVertexCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelVertexCmd.cpp; sourceTree = ""; }; 01E9E9BC1D9D535E00E1BFAE /* SelVertexCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelVertexCmd.h; sourceTree = ""; }; - 01E9E9BD1D9D535E00E1BFAE /* SetApplicationStateCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SetApplicationStateCmd.cpp; sourceTree = ""; }; - 01E9E9BE1D9D535E00E1BFAE /* SetApplicationStateCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetApplicationStateCmd.h; sourceTree = ""; }; + 01E9E9BD1D9D535E00E1BFAE /* SetApplicationModeCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SetApplicationModeCmd.cpp; sourceTree = ""; }; + 01E9E9BE1D9D535E00E1BFAE /* SetApplicationModeCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetApplicationModeCmd.h; sourceTree = ""; }; 01E9E9BF1D9D535E00E1BFAE /* SetNextSourceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SetNextSourceCmd.cpp; sourceTree = ""; }; 01E9E9C01D9D535E00E1BFAE /* SetNextSourceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetNextSourceCmd.h; sourceTree = ""; }; 01E9E9C11D9D535E00E1BFAE /* SetSourceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SetSourceCmd.cpp; sourceTree = ""; }; @@ -768,8 +768,8 @@ 01E9E9BA1D9D535E00E1BFAE /* SelSurfaceCmd.h */, 01E9E9BB1D9D535E00E1BFAE /* SelVertexCmd.cpp */, 01E9E9BC1D9D535E00E1BFAE /* SelVertexCmd.h */, - 01E9E9BD1D9D535E00E1BFAE /* SetApplicationStateCmd.cpp */, - 01E9E9BE1D9D535E00E1BFAE /* SetApplicationStateCmd.h */, + 01E9E9BD1D9D535E00E1BFAE /* SetApplicationModeCmd.cpp */, + 01E9E9BE1D9D535E00E1BFAE /* SetApplicationModeCmd.h */, 01E9E9BF1D9D535E00E1BFAE /* SetNextSourceCmd.cpp */, 01E9E9C01D9D535E00E1BFAE /* SetNextSourceCmd.h */, 01E9E9C11D9D535E00E1BFAE /* SetSourceCmd.cpp */, @@ -1204,7 +1204,7 @@ 0130C9691CE65AA600911E17 /* lz4.c in Sources */, 01E9EA431D9D535E00E1BFAE /* TextureEditorWidget.cpp in Sources */, 01E9EA171D9D535E00E1BFAE /* ProjectionMappingMode.cpp in Sources */, - 01E9EA351D9D535E00E1BFAE /* SetApplicationStateCmd.cpp in Sources */, + 01E9EA351D9D535E00E1BFAE /* SetApplicationModeCmd.cpp in Sources */, 01E9EA471D9D535E00E1BFAE /* MediaServer.cpp in Sources */, 0130C9791CE65AA600911E17 /* HiddenFileFilter.cpp in Sources */, 01E9EA251D9D535E00E1BFAE /* MvLayerUpCmd.cpp in Sources */, diff --git a/src/Application/Application.cpp b/src/Application/Application.cpp index e5aa039..9d7e792 100644 --- a/src/Application/Application.cpp +++ b/src/Application/Application.cpp @@ -94,25 +94,25 @@ void Application::onKeyPressed(ofKeyEventArgs & args){ case '1': _cmdManager.exec( - new ofx::piMapper::SetApplicationStateCmd( + new ofx::piMapper::SetApplicationModeCmd( this, PresentationMode::instance())); break; case '2': _cmdManager.exec( - new ofx::piMapper::SetApplicationStateCmd( + new ofx::piMapper::SetApplicationModeCmd( this, TextureMappingMode::instance())); break; case '3': _cmdManager.exec( - new ofx::piMapper::SetApplicationStateCmd( + new ofx::piMapper::SetApplicationModeCmd( this, ProjectionMappingMode::instance())); break; case '4': _cmdManager.exec( - new ofx::piMapper::SetApplicationStateCmd( + new ofx::piMapper::SetApplicationModeCmd( this, SourceSelectionMode::instance())); break; diff --git a/src/Application/Application.h b/src/Application/Application.h index 4d75cf8..4c61537 100644 --- a/src/Application/Application.h +++ b/src/Application/Application.h @@ -3,7 +3,7 @@ #include "ofEvents.h" #include "ofLog.h" -#include "SetApplicationStateCmd.h" +#include "SetApplicationModeCmd.h" #include "ClearSurfacesCmd.h" #include "ApplicationBaseMode.h" @@ -74,7 +74,7 @@ class Application : public KeyListener { private: friend class ApplicationBaseMode; - friend class SetApplicationStateCmd; + friend class SetApplicationModeCmd; ApplicationBaseMode * _state; diff --git a/src/Application/Modes/PresentationMode.cpp b/src/Application/Modes/PresentationMode.cpp index 57e0375..f7c426f 100644 --- a/src/Application/Modes/PresentationMode.cpp +++ b/src/Application/Modes/PresentationMode.cpp @@ -21,7 +21,7 @@ void PresentationMode::draw(Application * app){ void PresentationMode::onMousePressed(Application * app, ofMouseEventArgs & args){ app->getCmdManager()->exec( - new ofx::piMapper::SetApplicationStateCmd( + new ofx::piMapper::SetApplicationModeCmd( app, ProjectionMappingMode::instance())); } diff --git a/src/Application/Modes/PresentationMode.h b/src/Application/Modes/PresentationMode.h index 27a9faa..ffb5de7 100644 --- a/src/Application/Modes/PresentationMode.h +++ b/src/Application/Modes/PresentationMode.h @@ -4,7 +4,7 @@ #include "ofEvents.h" #include "ofLog.h" #include "ofGraphics.h" -#include "SetApplicationStateCmd.h" +#include "SetApplicationModeCmd.h" #include "ProjectionMappingMode.h" #include "GuiMode.h" diff --git a/src/Commands/SetApplicationStateCmd.cpp b/src/Commands/SetApplicationModeCmd.cpp similarity index 85% rename from src/Commands/SetApplicationStateCmd.cpp rename to src/Commands/SetApplicationModeCmd.cpp index a548ad0..2a8316f 100644 --- a/src/Commands/SetApplicationStateCmd.cpp +++ b/src/Commands/SetApplicationModeCmd.cpp @@ -1,9 +1,9 @@ -#include "SetApplicationStateCmd.h" +#include "SetApplicationModeCmd.h" namespace ofx { namespace piMapper { -SetApplicationStateCmd::SetApplicationStateCmd(Application * app, +SetApplicationModeCmd::SetApplicationModeCmd(Application * app, ApplicationBaseMode * st){ _application = app; @@ -11,7 +11,7 @@ SetApplicationStateCmd::SetApplicationStateCmd(Application * app, _applicationState = st; } -void SetApplicationStateCmd::exec(){ +void SetApplicationModeCmd::exec(){ _prevApplicationState = _application->getState(); _application->setState(_applicationState); _applicationState->setTranslation(ofPoint(0, 0)); @@ -33,8 +33,8 @@ void SetApplicationStateCmd::exec(){ } } -void SetApplicationStateCmd::undo(){ - ofLogNotice("SetApplicationStateCmd", "undo"); +void SetApplicationModeCmd::undo(){ + ofLogNotice("SetApplicationModeCmd", "undo"); _application->setState(_prevApplicationState); _application->getState()->setTranslation(_translation); diff --git a/src/Commands/SetApplicationStateCmd.h b/src/Commands/SetApplicationModeCmd.h similarity index 81% rename from src/Commands/SetApplicationStateCmd.h rename to src/Commands/SetApplicationModeCmd.h index 7ba094d..913ebfa 100644 --- a/src/Commands/SetApplicationStateCmd.h +++ b/src/Commands/SetApplicationModeCmd.h @@ -9,10 +9,10 @@ namespace piMapper { class Application; class ApplicationBaseMode; -class SetApplicationStateCmd : public BaseUndoCmd { +class SetApplicationModeCmd : public BaseUndoCmd { public: - SetApplicationStateCmd(Application * app, + SetApplicationModeCmd(Application * app, ApplicationBaseMode * st); void exec();