From b6fbf63ddd39befd415f5fd798cbdf180a65a6e7 Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Fri, 10 Aug 2018 16:31:23 +0200 Subject: [PATCH] Add setDrawGui(bool) option --- src/Application/Application.cpp | 13 ++++++++++++- src/Application/Application.h | 2 ++ src/ofxPiMapper.cpp | 4 ++++ src/ofxPiMapper.h | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/Application/Application.cpp b/src/Application/Application.cpp index e5753d7..0b9d215 100644 --- a/src/Application/Application.cpp +++ b/src/Application/Application.cpp @@ -19,6 +19,7 @@ Application::Application(){ _lastSaveTime = 0.0f; _autoSaveInterval = 60.0f; + _drawGui = true; } void Application::setup(){ @@ -66,7 +67,13 @@ ApplicationBaseMode * Application::getState(){ void Application::draw(){ _mediaServer.draw(); - _state->draw(this); + + if(_drawGui){ + _state->draw(this); + }else{ + PresentationMode::instance()->draw(this); + } + _info.draw(); } @@ -534,6 +541,10 @@ void Application::setImageSource(std::string fileName){ } } +void Application::setDrawGui(bool drawGui){ + _drawGui = drawGui; +} + void Application::addGridRow(){ if(getSurfaceManager()->getSelectedSurface() != 0){ if(getSurfaceManager()->getSelectedSurface()->getType() == diff --git a/src/Application/Application.h b/src/Application/Application.h index e5c5a06..8f8542f 100644 --- a/src/Application/Application.h +++ b/src/Application/Application.h @@ -133,6 +133,7 @@ class Application { void setFboSource(std::string sourceId); void setVideoSource(std::string fileName, bool loop); void setImageSource(std::string fileName); + void setDrawGui(bool drawGui); void addGridRow(); void addGridColumn(); void removeGridRow(); @@ -167,6 +168,7 @@ class Application { Info _info; bool _shiftKeyDown; + bool _drawGui; float _lastSaveTime; float _autoSaveInterval; diff --git a/src/ofxPiMapper.cpp b/src/ofxPiMapper.cpp index 44fd408..e8bb1e4 100644 --- a/src/ofxPiMapper.cpp +++ b/src/ofxPiMapper.cpp @@ -194,6 +194,10 @@ void ofxPiMapper::setImageSource(std::string fileName){ _application.setImageSource(fileName); } +void ofxPiMapper::setDrawGui(bool drawGui){ + _application.setDrawGui(drawGui); +} + void ofxPiMapper::reboot(){ _application.reboot(); } diff --git a/src/ofxPiMapper.h b/src/ofxPiMapper.h index a82ef33..1271dd8 100644 --- a/src/ofxPiMapper.h +++ b/src/ofxPiMapper.h @@ -88,6 +88,7 @@ class ofxPiMapper { void setFboSource(std::string sourceId); void setVideoSource(std::string fileName, bool loop); void setImageSource(std::string fileName); + void setDrawGui(bool drawGui); // System commands void reboot();