Browse Source

Rename setActivePreset to setPreset

master
Krisjanis Rijnieks 9 years ago
parent
commit
1a1928259f
  1. 4
      src/Application/Application.cpp
  2. 2
      src/Application/Application.h
  3. 4
      src/Commands/SetActivePresetCmd.cpp
  4. 2
      src/Surfaces/SurfaceManager.cpp
  5. 2
      src/Surfaces/SurfaceManager.h
  6. 4
      src/ofxPiMapper.cpp
  7. 2
      src/ofxPiMapper.h

4
src/Application/Application.cpp

@ -238,7 +238,7 @@ void Application::onCharacterReceived(KeyListenerEventData & e){
onKeyPressed(args);
}
void Application::setActivePreset(unsigned int i){
void Application::setPreset(unsigned int i){
_cmdManager.exec(new SetActivePresetCmd(this, i));
}
@ -253,7 +253,7 @@ void Application::setNextPreset(){
}else{
activePreset += 1;
}
setActivePreset(activePreset);
setPreset(activePreset);
}
bool Application::loadXmlSettings(string fileName){

2
src/Application/Application.h

@ -76,7 +76,7 @@ class Application : public KeyListener {
void setProjectionMode();
void setSourceMode();
void setActivePreset(unsigned int i);
void setPreset(unsigned int i);
void setNextPreset();
protected:

4
src/Commands/SetActivePresetCmd.cpp

@ -13,12 +13,12 @@ void SetActivePresetCmd::exec(){
_prevPresetIndex = _app->getSurfaceManager()->getActivePresetIndex();
_app->getSurfaceManager()->deselectSurface();
_selectedSurfaceIndex = _app->getSurfaceManager()->getSelectedSurfaceIndex();
_app->getSurfaceManager()->setActivePreset(_newPresetIndex);
_app->getSurfaceManager()->setPreset(_newPresetIndex);
}
void SetActivePresetCmd::undo(){
ofLogNotice("SetActivePresetCmd", "undo");
_app->getSurfaceManager()->setActivePreset(_prevPresetIndex);
_app->getSurfaceManager()->setPreset(_prevPresetIndex);
_app->getSurfaceManager()->selectSurface(_selectedSurfaceIndex);
}

2
src/Surfaces/SurfaceManager.cpp

@ -434,7 +434,7 @@ void SurfaceManager::setNextPreset(){
// TODO: Create command for this.
}
void SurfaceManager::setActivePreset(unsigned int i){
void SurfaceManager::setPreset(unsigned int i){
if(_presets.size() <= 1){
throw runtime_error("ofxPiMapper: No presets to set.");
}

2
src/Surfaces/SurfaceManager.h

@ -72,7 +72,7 @@ class SurfaceManager {
SurfaceStack * getPresetAt(unsigned int i);
void setNextPreset();
void setActivePreset(unsigned int i);
void setPreset(unsigned int i);
void cloneActivePreset();
void eraseActivePreset();

4
src/ofxPiMapper.cpp

@ -22,8 +22,8 @@ void ofxPiMapper::registerFboSource(ofx::piMapper::FboSource * fboSource){
_application.addFboSource(fboSource);
}
void ofxPiMapper::setActivePreset(unsigned int i){
_application.setActivePreset(i);
void ofxPiMapper::setPreset(unsigned int i){
_application.setPreset(i);
}
void ofxPiMapper::setNextPreset(){

2
src/ofxPiMapper.h

@ -49,7 +49,7 @@ class ofxPiMapper {
// Presets
unsigned int getNumPresets();
unsigned int getActivePresetIndex();
void setActivePreset(unsigned int i);
void setPreset(unsigned int i);
void setNextPreset();
void cloneActivePreset();
void eraseActivePreset();

Loading…
Cancel
Save