Browse Source

Rename SetActivePresetCmd to SetPresetCmd

master
Krisjanis Rijnieks 9 years ago
parent
commit
19c47ff611
  1. 1094
      example/example.xcodeproj/project.pbxproj
  2. 2
      src/Application/Application.cpp
  3. 2
      src/Application/Application.h
  4. 12
      src/Commands/SetPresetCmd.cpp
  5. 6
      src/Commands/SetPresetCmd.h

1094
example/example.xcodeproj/project.pbxproj

File diff suppressed because it is too large

2
src/Application/Application.cpp

@ -239,7 +239,7 @@ void Application::onCharacterReceived(KeyListenerEventData & e){
}
void Application::setPreset(unsigned int i){
_cmdManager.exec(new SetActivePresetCmd(this, i));
_cmdManager.exec(new SetPresetCmd(this, i));
}
void Application::setNextPreset(){

2
src/Application/Application.h

@ -5,7 +5,7 @@
#include "SetApplicationModeCmd.h"
#include "ClearSurfacesCmd.h"
#include "SetActivePresetCmd.h"
#include "SetPresetCmd.h"
#include "ApplicationBaseMode.h"
#include "PresentationMode.h"

12
src/Commands/SetActivePresetCmd.cpp → src/Commands/SetPresetCmd.cpp

@ -1,23 +1,23 @@
#include "SetActivePresetCmd.h"
#include "SetPresetCmd.h"
namespace ofx {
namespace piMapper {
SetActivePresetCmd::SetActivePresetCmd(Application * app, unsigned int pi){
SetPresetCmd::SetPresetCmd(Application * app, unsigned int pi){
_app = app;
_newPresetIndex = pi;
}
void SetActivePresetCmd::exec(){
ofLogNotice("SetActivePresetCmd", "exec");
void SetPresetCmd::exec(){
ofLogNotice("SetPresetCmd", "exec");
_prevPresetIndex = _app->getSurfaceManager()->getActivePresetIndex();
_app->getSurfaceManager()->deselectSurface();
_selectedSurfaceIndex = _app->getSurfaceManager()->getSelectedSurfaceIndex();
_app->getSurfaceManager()->setPreset(_newPresetIndex);
}
void SetActivePresetCmd::undo(){
ofLogNotice("SetActivePresetCmd", "undo");
void SetPresetCmd::undo(){
ofLogNotice("SetPresetCmd", "undo");
_app->getSurfaceManager()->setPreset(_prevPresetIndex);
_app->getSurfaceManager()->selectSurface(_selectedSurfaceIndex);
}

6
src/Commands/SetActivePresetCmd.h → src/Commands/SetPresetCmd.h

@ -1,4 +1,4 @@
// SetActivePresetCmd
// SetPresetCmd
// Sets active preset, stores previous preset index and restores it on undo.
// Created by Krisjanis Rijnieks 2016-10-07
// At the ORA bar in Berlin. Waiting for Park to celebrate his birthday.
@ -14,10 +14,10 @@ namespace piMapper {
class Application;
class SetActivePresetCmd : public BaseUndoCmd {
class SetPresetCmd : public BaseUndoCmd {
public:
SetActivePresetCmd(Application * app, unsigned int pi);
SetPresetCmd(Application * app, unsigned int pi);
void exec();
void undo();
Loading…
Cancel
Save