Browse Source

Add eraseActivePreset()

master
Krisjanis Rijnieks 9 years ago
parent
commit
c77fb4f3e2
  1. 19
      src/Surfaces/SurfaceManager.cpp
  2. 1
      src/Surfaces/SurfaceManager.h
  3. 5
      src/ofxPiMapper.cpp
  4. 1
      src/ofxPiMapper.h

19
src/Surfaces/SurfaceManager.cpp

@ -444,5 +444,24 @@ void SurfaceManager::cloneActivePreset(){
_activePresetIndex = _presets.size() - 1;
}
void SurfaceManager::eraseActivePreset(){
if(_presets.size() <= 0){
return;
}
_presets[_activePresetIndex]->clear();
_presets.erase(_presets.begin() + _activePresetIndex);
_activePresetIndex--;
if(_presets.size() > 0 && _activePresetIndex < 0){
_activePresetIndex = 0;
}
if(_activePresetIndex < 0){
createPreset();
}
}
} // namespace piMapper
} // namespace ofx

1
src/Surfaces/SurfaceManager.h

@ -73,6 +73,7 @@ class SurfaceManager {
void setNextPreset();
void setActivePreset(unsigned int i);
void cloneActivePreset();
void eraseActivePreset();
private:
BaseSurface * selectedSurface;

5
src/ofxPiMapper.cpp

@ -36,6 +36,11 @@ void ofxPiMapper::cloneActivePreset(){
_application.getSurfaceManager()->cloneActivePreset();
}
void ofxPiMapper::eraseActivePreset(){
_application.getSurfaceManager()->deselectSurface();
_application.getSurfaceManager()->eraseActivePreset();
}
bool ofxPiMapper::loadXmlSettings(string fileName){
return _application.loadXmlSettings(fileName);
}

1
src/ofxPiMapper.h

@ -41,6 +41,7 @@ class ofxPiMapper {
void setActivePreset(unsigned int i);
void setNextPreset();
void cloneActivePreset();
void eraseActivePreset();
bool loadXmlSettings(string fileName);

Loading…
Cancel
Save