Browse Source

Rename SurfaceManager::clear to clearPresets

To increase readability as it was not clear what clear() does in the context of presets.
Does it clear surfaces or presets or both. Now one can use getCurrentPreset()->clear() if it
exists to clear the surfaces of the current preset.
master
Krisjanis Rijnieks 9 years ago
parent
commit
071ea03aff
  1. 20
      src/Surfaces/SurfaceManager.cpp
  2. 2
      src/Surfaces/SurfaceManager.h

20
src/Surfaces/SurfaceManager.cpp

@ -83,20 +83,14 @@ void SurfaceManager::deleteSurface(ofx::piMapper::BaseSurface * surface){
}
}
/*
* Question: Should it clear the active preset or all presets?
* Maybe creating additional methods like clearPresets() and clearActivePreset() would help.
*/
void SurfaceManager::clear(){
if(_activePresetIndex < 0){
ofLogWarning("SurfaceManager::clear", "Can not clear. No active preset.");
return;
}
while(_presets[_activePresetIndex]->size()){
delete _presets[_activePresetIndex]->back();
_presets[_activePresetIndex]->pop_back();
void SurfaceManager::clearPresets(){
for(unsigned int i = 0; i < _presets.size(); ++i){
while(_presets[i]->size()){
delete _presets[i]->back();
_presets[i]->pop_back();
}
}
_presets.clear();
}
// TODO: Do serious adjustment here. We need to save all presets. Not just the active one.

2
src/Surfaces/SurfaceManager.h

@ -39,7 +39,7 @@ class SurfaceManager {
void deselectSurface();
void saveXmlSettings(string fileName);
void setMediaServer(MediaServer * newMediaServer);
void clear();
void clearPresets();
bool loadXmlSettings(string fileName);

Loading…
Cancel
Save