Browse Source

Rename SetApplicationStateCmd to SetApplicationModeCmd

master
Krisjanis Rijnieks 9 years ago
parent
commit
12f0d8abcf
  1. 12
      example/example.xcodeproj/project.pbxproj
  2. 8
      src/Application/Application.cpp
  3. 4
      src/Application/Application.h
  4. 2
      src/Application/Modes/PresentationMode.cpp
  5. 2
      src/Application/Modes/PresentationMode.h
  6. 10
      src/Commands/SetApplicationModeCmd.cpp
  7. 4
      src/Commands/SetApplicationModeCmd.h

12
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 = "<group>"; };
01E9E9BB1D9D535E00E1BFAE /* SelVertexCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelVertexCmd.cpp; sourceTree = "<group>"; };
01E9E9BC1D9D535E00E1BFAE /* SelVertexCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelVertexCmd.h; sourceTree = "<group>"; };
01E9E9BD1D9D535E00E1BFAE /* SetApplicationStateCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SetApplicationStateCmd.cpp; sourceTree = "<group>"; };
01E9E9BE1D9D535E00E1BFAE /* SetApplicationStateCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetApplicationStateCmd.h; sourceTree = "<group>"; };
01E9E9BD1D9D535E00E1BFAE /* SetApplicationModeCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SetApplicationModeCmd.cpp; sourceTree = "<group>"; };
01E9E9BE1D9D535E00E1BFAE /* SetApplicationModeCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetApplicationModeCmd.h; sourceTree = "<group>"; };
01E9E9BF1D9D535E00E1BFAE /* SetNextSourceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SetNextSourceCmd.cpp; sourceTree = "<group>"; };
01E9E9C01D9D535E00E1BFAE /* SetNextSourceCmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetNextSourceCmd.h; sourceTree = "<group>"; };
01E9E9C11D9D535E00E1BFAE /* SetSourceCmd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SetSourceCmd.cpp; sourceTree = "<group>"; };
@ -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 */,

8
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;

4
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;

2
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()));
}

2
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"

10
src/Commands/SetApplicationStateCmd.cpp → 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);

4
src/Commands/SetApplicationStateCmd.h → 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();
Loading…
Cancel
Save