Browse Source

Clean up SurfaceManagerGui

master
Krisjanis Rijnieks 9 years ago
parent
commit
207ac39b99
  1. 17
      src/Surfaces/SurfaceManagerGui.cpp
  2. 4
      src/Surfaces/SurfaceManagerGui.h

17
src/Surfaces/SurfaceManagerGui.cpp

@ -12,12 +12,10 @@ SurfaceManagerGui::SurfaceManagerGui(){
void SurfaceManagerGui::setMediaServer(MediaServer * newMediaServer){ void SurfaceManagerGui::setMediaServer(MediaServer * newMediaServer){
mediaServer = newMediaServer; mediaServer = newMediaServer;
//sourcesEditor.setMediaServer(mediaServer);
} }
void SurfaceManagerGui::setCmdManager(CmdManager * cmdManager){ void SurfaceManagerGui::setCmdManager(CmdManager * cmdManager){
_cmdManager = cmdManager; _cmdManager = cmdManager;
//sourcesEditor.setCmdManager(_cmdManager);
} }
void SurfaceManagerGui::setMode(int newGuiMode){ void SurfaceManagerGui::setMode(int newGuiMode){
@ -34,15 +32,6 @@ void SurfaceManagerGui::setMode(int newGuiMode){
} }
guiMode = newGuiMode; guiMode = newGuiMode;
/*
if(guiMode == GuiMode::SOURCE_SELECTION){
sourcesEditor.enable();
}else{
sourcesEditor.disable();
}
*/
} }
int SurfaceManagerGui::getMode(){ int SurfaceManagerGui::getMode(){
@ -57,11 +46,5 @@ void SurfaceManagerGui::stopDrag(){
bDrag = false; bDrag = false;
} }
/*
SourcesEditorWidget * SurfaceManagerGui::getSourcesEditorWidget(){
return &sourcesEditor;
}
*/
} // namespace piMapper } // namespace piMapper
} // namespace ofx } // namespace ofx

4
src/Surfaces/SurfaceManagerGui.h

@ -6,7 +6,6 @@
#include "ofGraphics.h" #include "ofGraphics.h"
#include "SurfaceManager.h" #include "SurfaceManager.h"
#include "SourcesEditorWidget.h"
#include "GuiMode.h" #include "GuiMode.h"
#include "CmdManager.h" #include "CmdManager.h"
#include "SelSurfaceCmd.h" #include "SelSurfaceCmd.h"
@ -33,15 +32,12 @@ class SurfaceManagerGui {
void startDrag(); void startDrag();
void stopDrag(); void stopDrag();
//SourcesEditorWidget * getSourcesEditorWidget();
ofVec2f clickPosition; ofVec2f clickPosition;
bool bDrag; bool bDrag;
private: private:
SurfaceManager * surfaceManager; SurfaceManager * surfaceManager;
MediaServer * mediaServer; MediaServer * mediaServer;
//SourcesEditorWidget sourcesEditor;
int guiMode; int guiMode;

Loading…
Cancel
Save