gauthiier/CRITICAL-INFRASTRUCTURE
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Configurable crosshairs added

Browse Source 
- Unit measure appended to graph values
This commit is contained in:
James Alliban
2014-01-12 20:08:05 +00:00
parent 1111d2f7e5
commit 96cadd932f
130 changed files with 5563 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
of/Utility_Box/src/gui/GUI.cpp
+325
View File
@@ -0,0 +1,325 @@
//
// gui->cpp
// emptyExample
//
// Created by James Alliban on 25/06/2013.
//
//
#include "GUI.h"
#include "testApp.h"
#include "AbstractGraph.h"
void GUI::setup()
{
app = (testApp*)ofGetAppPtr();
GUIManager::setup();
dim = 8;
addKeyboardShortcutsGUI();
addGraphGlobalGUI();
addBarGraphDesignGUI();
addBodyGraphDesignGUI();
addSeparateBodyGraphDesignGUI();
addGraphSimulationGUI();
addBackgroundGUI();
addHUDTextGUI();
addVariousGUI();
setGUIColour();
}
bool GUI::getVisible()
{
return GUIManager::getVisible();
}
void GUI::addKeyboardShortcutsGUI()
{
string title = "KEYBOARD SHORTCUTS";
ofxUICanvas* gui = getNewGUI(title);
gui->addLabel("SPACE - SHOW/HIDE GUI", OFX_UI_FONT_SMALL);
gui->addLabel("'[' - PREVIOUS GUI", OFX_UI_FONT_SMALL);
gui->addLabel("']' - NEXT GUI", OFX_UI_FONT_SMALL);
gui->addLabel("'p' - TOGGLE PAUSE ANIMATION", OFX_UI_FONT_SMALL);
gui->addLabel("'f' - TOGGLE FULLSCREEN", OFX_UI_FONT_SMALL);
gui->addLabel("'c' - CLEAR ALL GRAPH DATA", OFX_UI_FONT_SMALL);
finaliseCanvas(gui, true);
}
void GUI::addGraphGlobalGUI()
{
string title = "GRAPH GLOBAL";
ofxUICanvas* gui = getNewGUI(title);
vector<string> graphNames;
graphNames.push_back("Bar graph");
graphNames.push_back("Solid Body graph");
graphNames.push_back("Separate Body graph");
gui->addRadio("Graph Selection", graphNames, OFX_UI_ORIENTATION_VERTICAL, dim*2, dim*2);
gui->addSpacer(length, 1);
gui->addRangeSlider("Graph X begin/end (percent)", 0, 1, &AbstractGraph::minGraphPercent, &AbstractGraph::maxGraphPercent, length, dim);
gui->addLabel("GRAPH TEXT");
gui->addSpacer(length, 1);
gui->addSlider("Size", 5, 50, &app->scene.graphTextSize, length, dim);
gui->addSlider("Red", 0, 255, &app->scene.graphTextColour[0], length, dim);
gui->addSlider("Green", 0, 255, &app->scene.graphTextColour[1], length, dim);
gui->addSlider("Blue", 0, 255, &app->scene.graphTextColour[2], length, dim);
gui->addSlider("Alpha", 0, 255, &app->scene.graphTextColour[3], length, dim);
ofAddListener(gui->newGUIEvent, this, &GUI::graphGlobalGUIEvent);
finaliseCanvas(gui, true);
}
void GUI::addBarGraphDesignGUI()
{
string title = "BAR GRAPH DESIGN";
ofxUICanvas* gui = getNewGUI(title);
gui->addSlider("Graph Item X Gap", 5, 50, &app->scene.barGraph.graphItemXGap, length, dim);
gui->addSlider("BarWidth", 2, 50, &app->scene.barGraph.barWidth, length, dim);
gui->addSlider("Graph Height Max", 0, 1, &app->scene.barGraph.graphHeightMax, length, dim);
gui->addSlider("Data send speed (seconds)", 0.1, 20, &app->scene.barGraph.sendDataSpeed, length, dim);
gui->addSpacer(length, 1);
gui->addSlider("Data0 red", 0, 255, &app->scene.barGraph.col0[0], length, dim);
gui->addSlider("Data0 green", 0, 255, &app->scene.barGraph.col0[1], length, dim);
gui->addSlider("Data0 blue", 0, 255, &app->scene.barGraph.col0[2], length, dim);
gui->addSlider("Data0 alpha", 0, 255, &app->scene.barGraph.col0[3], length, dim);
gui->addSpacer(length, 1);
gui->addSlider("Data1 red", 0, 255, &app->scene.barGraph.col1[0], length, dim);
gui->addSlider("Data1 green", 0, 255, &app->scene.barGraph.col1[1], length, dim);
gui->addSlider("Data1 blue", 0, 255, &app->scene.barGraph.col1[2], length, dim);
gui->addSlider("Data1 alpha", 0, 255, &app->scene.barGraph.col1[3], length, dim);
finaliseCanvas(gui, true);
}
void GUI::addBodyGraphDesignGUI()
{
string title = "BODY GRAPH DESIGN";
ofxUICanvas* gui = getNewGUI(title);
gui->addToggle("Toggle Draw Body", &app->scene.bodyGraph.isDrawBody, toggleDim, toggleDim);
gui->addToggle("Toggle Draw Lines", &app->scene.bodyGraph.isDrawLines, toggleDim, toggleDim);
gui->addSlider("Graph Item X Gap", 5, 50, &app->scene.bodyGraph.graphItemXGap, length, dim);
gui->addSlider("Line width", 1, 50, &app->scene.bodyGraph.lineWidth, length, dim);
gui->addSlider("Graph Height Max", 0, 1, &app->scene.bodyGraph.graphHeightMax, length, dim);
gui->addSlider("Data send speed (seconds)", 0.1, 20, &app->scene.bodyGraph.sendDataSpeed, length, dim);
gui->addSpacer(length, 1);
gui->addSlider("Data0 red", 0, 255, &app->scene.bodyGraph.col0[0], length, dim);
gui->addSlider("Data0 green", 0, 255, &app->scene.bodyGraph.col0[1], length, dim);
gui->addSlider("Data0 blue", 0, 255, &app->scene.bodyGraph.col0[2], length, dim);
gui->addSlider("Data0 alpha", 0, 255, &app->scene.bodyGraph.col0[3], length, dim);
gui->addSpacer(length, 1);
gui->addSlider("Data1 red", 0, 255, &app->scene.bodyGraph.col1[0], length, dim);
gui->addSlider("Data1 green", 0, 255, &app->scene.bodyGraph.col1[1], length, dim);
gui->addSlider("Data1 blue", 0, 255, &app->scene.bodyGraph.col1[2], length, dim);
gui->addSlider("Data1 alpha", 0, 255, &app->scene.bodyGraph.col1[3], length, dim);
finaliseCanvas(gui, true);
}
void GUI::addSeparateBodyGraphDesignGUI()
{
string title = "SEPARATE BODY GRAPH DESIGN";
ofxUICanvas* gui = getNewGUI(title);
gui->addToggle("Toggle Draw Lines", &app->scene.separateBodyGraph.isDrawLines, toggleDim, toggleDim);
gui->addSlider("Graph Item X Gap", 5, 50, &app->scene.separateBodyGraph.graphItemXGap, length, dim);
gui->addSlider("Line width", 1, 50, &app->scene.separateBodyGraph.lineWidth, length, dim);
gui->addSlider("Graph Height Max", 0, 1, &app->scene.separateBodyGraph.graphHeightMax, length, dim);
gui->addSlider("Graph bottom end (percent)", 0, 2, &app->scene.separateBodyGraph.graphEndPercent, length, dim);
gui->addSlider("Data send speed (seconds)", 0.1, 20, &app->scene.separateBodyGraph.sendDataSpeed, length, dim);
gui->addSpacer(length, 1);
gui->addSlider("Data0 red", 0, 255, &app->scene.separateBodyGraph.col0[0], length, dim);
gui->addSlider("Data0 green", 0, 255, &app->scene.separateBodyGraph.col0[1], length, dim);
gui->addSlider("Data0 blue", 0, 255, &app->scene.separateBodyGraph.col0[2], length, dim);
gui->addSlider("Data0 alpha", 0, 255, &app->scene.separateBodyGraph.col0[3], length, dim);
gui->addSpacer(length, 1);
gui->addSlider("Data1 red", 0, 255, &app->scene.separateBodyGraph.col1[0], length, dim);
gui->addSlider("Data1 green", 0, 255, &app->scene.separateBodyGraph.col1[1], length, dim);
gui->addSlider("Data1 blue", 0, 255, &app->scene.separateBodyGraph.col1[2], length, dim);
gui->addSlider("Data1 alpha", 0, 255, &app->scene.separateBodyGraph.col1[3], length, dim);
finaliseCanvas(gui, true);
}
void GUI::addGraphSimulationGUI()
{
string title = "SIMULATION";
ofxUICanvas* gui = getNewGUI(title);
gui->addToggle("Toggle Data Simulation", &app->dataManager.isDataSimulated, toggleDim, toggleDim);
gui->addSlider("Speed (data per frame)", 1, 60, &app->dataManager.simulationSpeed, length, dim);
gui->addSlider("Perlin X Scale (data size)", 0.001, 0.5, &app->dataManager.perlinXScale, length, dim);
gui->addSlider("Perlin Y Scale (time f)", 0.001, 0.5, &app->dataManager.perlinYScale, length, dim);
finaliseCanvas(gui, true);
}
void GUI::addBackgroundGUI()
{
string title = "BACKGROUND";
ofxUICanvas* gui = getNewGUI(title);
gui->addToggle("Toggle Video Visibility", &app->scene.isVideoVisible, toggleDim, toggleDim);
gui->addToggle("Toggle Image Visibility", &app->scene.isImageVisible, toggleDim, toggleDim);
gui->addSlider("Video/Image Width Percent", 0, 2, &app->scene.videoWidthPercentage, length, dim);
gui->addSlider("Video/Image Height Percent", 0, 2, &app->scene.videoHeightPercentage, length, dim);
gui->addLabel("VIDEO IMAGE SETTINGS");
gui->addSlider("Brightness", 0, 2, &app->scene.brightness, length, dim);
gui->addSlider("Contrast", 0, 2, &app->scene.contrast, length, dim);
gui->addSlider("Saturation", 0, 2, &app->scene.saturation, length, dim);
gui->addSlider("Red", 0, 2, &app->scene.red, length, dim);
gui->addSlider("Green", 0, 2, &app->scene.green, length, dim);
gui->addSlider("Blue", 0, 2, &app->scene.blue, length, dim);
gui->addSlider("Alpha", 0, 2, &app->scene.alpha, length, dim);
gui->addSpacer(length, 1);
gui->addLabel("HUD BACKGROUND SETTINGS");
gui->addSlider("Red .", 0, 255, &app->scene.hudColour[0], length, dim);
gui->addSlider("Green .", 0, 255, &app->scene.hudColour[1], length, dim);
gui->addSlider("Blue .", 0, 255, &app->scene.hudColour[2], length, dim);
gui->addSlider("Alpha .", 0, 255, &app->scene.hudColour[3], length, dim);
gui->addSlider("Hole Width Percent", 0, 2, &app->scene.hudHoleWidthPercentage, length, dim);
gui->addSlider("Hole Height Percent", 0, 2, &app->scene.hudHoleHeightPercentage, length, dim);
gui->addSlider("Circle Point Size", 0, 100, &app->scene.circlePointSize, length, dim);
gui->addLabel("CROSSHAIRS SETTINGS");
gui->addSlider("Line Width", 0, 10, &app->scene.crosshairLineWidth, length, dim);
gui->addSlider("Alpha ..", 0, 255, &app->scene.crosshairAlpha, length, dim);
gui->addSlider("Circle Size", 0, 100, &app->scene.crosshairCircleSize, length, dim);
ofAddListener(gui->newGUIEvent, this, &GUI::variousGUIEvent);
finaliseCanvas(gui, true);
}
void GUI::addHUDTextGUI()
{
string title = "HUD TEXT";
ofxUICanvas* gui = getNewGUI(title);
gui->addSlider("X Margin", 0, 500, &app->scene.xMargin, length, dim);
gui->addSlider("Y Margin", 0, 500, &app->scene.yMargin, length, dim);
gui->addSlider("Y Margin Bottom Offset", 0, 300, &app->scene.yMarginBottomOffset, length, dim);
gui->addSlider("Line Length", 50, 500, &app->scene.lineLength, length, dim);
gui->addSlider("Line Spacing", 0, 10, &app->scene.lineSpacing, length, dim);
gui->addSlider("Text Size", 10, 100, &app->scene.textSize, length, dim);
gui->addSlider("Value average amount", 2, 150, &app->scene.averageAmount, length, dim);
gui->addSpacer(length, 1);
gui->addSlider("Red", 0, 255, &app->scene.textColour[0], length, dim);
gui->addSlider("Green", 0, 255, &app->scene.textColour[1], length, dim);
gui->addSlider("Blue", 0, 255, &app->scene.textColour[2], length, dim);
gui->addSlider("Alpha", 0, 255, &app->scene.textColour[3], length, dim);
gui->addSpacer(length, 1);
gui->addLabel("COLOUR KEY");
gui->addSlider("Top Colour Box Y Offset", -300, 300, &app->scene.topColourBoxXOffset, length, dim);
gui->addSlider("Bottom Colour Box Y Offset", -300, 300, &app->scene.bottomColourBoxXOffset, length, dim);
gui->addSlider("Colour Box Thickness", 1, 50, &app->scene.colourBoxThickness, length, dim);
ofAddListener(gui->newGUIEvent, this, &GUI::variousGUIEvent);
finaliseCanvas(gui, true);
}
void GUI::addVariousGUI()
{
string title = "VARIOUS";
ofxUICanvas* gui = getNewGUI(title);
//gui->addLabel("GRID");
//gui->addToggle("GRID VISIBLE", &app->scene.isGridVisible, toggleDim, toggleDim);
//gui->addSlider("GRID ALPHA", 0, 255, &app->scene.gridAlpha, length, dim);
gui->addLabel("GUI DESIGN");
gui->addSlider("RED", 0, 255, 255, length, dim);
gui->addSlider("GREEN", 0, 255, 1, length, dim);
gui->addSlider("BLUE", 0, 255, 1, length, dim);
gui->addSlider("ALPHA", 0, 255, 255, length, dim);
ofAddListener(gui->newGUIEvent, this, &GUI::variousGUIEvent);
finaliseCanvas(gui, true);
}
void GUI::graphGlobalGUIEvent(ofxUIEventArgs &e)
{
string name = e.widget->getName();
ofxUIToggle *toggle = (ofxUIToggle *) e.widget;
if (name == "Bar graph")
{
//ofxUIToggle *toggle = (ofxUIToggle *) e.widget;
if (toggle->getValue()) app->scene.activeGraph = &app->scene.barGraph;
}
else if (name == "Solid Body graph")
{
printf("------------------- Solid Body graph\n");
if (toggle->getValue()) app->scene.activeGraph = &app->scene.bodyGraph;
}
else if (name == "Separate Body graph")
{
printf("------------------- Line fade graph\n");
if (toggle->getValue()) app->scene.activeGraph = &app->scene.separateBodyGraph;
}
}
void GUI::variousGUIEvent(ofxUIEventArgs &e)
{
string name = e.widget->getName();
if (name == "RED")
{
ofxUISlider *slider = (ofxUISlider *) e.widget;
color.r = slider->getScaledValue();
setGUIColour();
}
else if (name == "GREEN")
{
ofxUISlider *slider = (ofxUISlider *) e.widget;
color.g = slider->getScaledValue();
setGUIColour();
}
else if (name == "BLUE")
{
ofxUISlider *slider = (ofxUISlider *) e.widget;
color.b = slider->getScaledValue();
setGUIColour();
}
else if (name == "ALPHA")
{
ofxUISlider *slider = (ofxUISlider *) e.widget;
color.a = slider->getScaledValue();
setGUIColour();
}
}
of/Utility_Box/src/gui/GUI.h
+39
View File
@@ -0,0 +1,39 @@
//
// GUI.h
// emptyExample
//
// Created by James Alliban on 25/06/2013.
//
//
#pragma once
#include "ofMain.h"
#include "GUIManager.h"
class testApp;
class GUI : GUIManager
{
public:
virtual void setup();
virtual bool getVisible();
void addKeyboardShortcutsGUI();
void addGraphGlobalGUI();
void addBarGraphDesignGUI();
void addBodyGraphDesignGUI();
void addSeparateBodyGraphDesignGUI();
void addGraphSimulationGUI();
void addBackgroundGUI();
void addHUDTextGUI();
void addVariousGUI();
void graphGlobalGUIEvent(ofxUIEventArgs &e);
void variousGUIEvent(ofxUIEventArgs &e);
testApp* app;
vector<string> publishers;
};
of/Utility_Box/src/gui/GUIManager.cpp
+204
View File
@@ -0,0 +1,204 @@
//
// GUIManager.cpp
//
// Created by James Alliban on 25/06/2013.
//
#include "GUIManager.h"
void GUIManager::setup()
{
ofAddListener(ofEvents().keyPressed, this, &GUIManager::keyPressed);
ofAddListener(ofEvents().exit, this, &GUIManager::exit);
currentUIID = 0;
dim = 16;
toggleDim = 16;
canvasW = 320;
canvasH = ofGetScreenHeight();
xInit = OFX_UI_GLOBAL_WIDGET_SPACING;
length = canvasW - xInit* 2;
toggleSize = 32;
spacerW = canvasW - xInit* 2;
spacerH = 1;
color = ofColor(100, 100, 210, 230);
isVisible = false;
isAutoSave = true;
buildTopBarGUI();
}
bool GUIManager::getVisible()
{
return isVisible;
}
void GUIManager::buildTopBarGUI()
{
topBarGui = new ofxUICanvas(canvasW, 0, 600, 146);
topBarGui->setColorBack(color);
topBarGui->setName(TOP_TITLE);
topBarGui->addWidgetRight(new ofxUIFPS(OFX_UI_FONT_MEDIUM));
topBarGui->addWidgetRight(new ofxUILabelToggle(true, TOP_AUTO_SAVE));
topBarGui->addWidgetRight(new ofxUILabelButton(false, TOP_SAVE));
topBarGui->addWidgetRight(new ofxUILabelButton(false, TOP_PREVIOUS));
topBarGui->addWidgetRight(new ofxUILabelButton(false, TOP_NEXT));
topBarGui->autoSizeToFitWidgets();
ofAddListener(topBarGui->newGUIEvent, this, &GUIManager::topBarGUIEvent);
finaliseCanvas(topBarGui, false);
}
ofxUICanvas* GUIManager::getNewGUI(string title)
{
ofxUICanvas* gui = new ofxUICanvas(0, 0, canvasW, canvasH);
gui->setColorBack(color);
gui->setName(title);
gui->addWidgetDown(new ofxUILabel(gui->getName(), OFX_UI_FONT_MEDIUM));
gui->addSpacer(spacerW, spacerH);
return gui;
}
void GUIManager::finaliseCanvas(ofxUICanvas* gui, bool isAddedToArray)
{
string name = gui->getName();
string xmlPath = "GUI/" + name + "GuiPageSettings.xml";
gui->loadSettings(xmlPath);
gui->setVisible(false);
gui->autoSizeToFitWidgets();
if (isAddedToArray) guiPages.push_back(gui);
}
void GUIManager::topBarGUIEvent(ofxUIEventArgs &e) //---------------- Top bar
{
string name = e.widget->getName();
if (name == TOP_AUTO_SAVE)
{
ofxUIToggle *toggle = (ofxUIToggle *)e.widget;
isAutoSave = toggle->getValue();
}
else if (name == TOP_SAVE)
{
saveSettings();
}
else if (name == TOP_NEXT)
{
ofxUIButton *button = (ofxUIButton *)e.widget;
if (button->getValue()) nextPage();
}
else if (name == TOP_PREVIOUS)
{
ofxUIButton *button = (ofxUIButton *)e.widget;
if (button->getValue()) previousPage();
}
}
void GUIManager::keyPressed(ofKeyEventArgs& eventArgs) //int key)
{
printf("keyPressed - key = %c \n", eventArgs.key);
switch (eventArgs.key)
{
case '[':
previousPage();
break;
case ']':
nextPage();
break;
case ' ':
toggleVisible();
}
}
void GUIManager::nextPage()
{
printf("next\n");
++currentUIID;
showGUI();
}
void GUIManager::previousPage()
{
printf("prev\n");
--currentUIID;
if (currentUIID < 0) currentUIID = guiPages.size() - 1;
showGUI();
}
void GUIManager::showGUI()
{
for (int i = 0; i < (int)guiPages.size(); i++)
{
guiPages[i]->setVisible(false);
}
isVisible = true;
if (guiPages.size() > 0)
{
int newVisibleGUIID = currentUIID % (int)guiPages.size();
guiPages[newVisibleGUIID]->setVisible(true);
}
topBarGui->setVisible(true);
}
void GUIManager::toggleVisible()
{
isVisible = !isVisible;
if (isVisible)
{
showGUI();
}
else
{
for (int i = 0; i < (int)guiPages.size(); i++)
{
guiPages[i]->setVisible(false);
}
topBarGui->setVisible(false);
}
}
void GUIManager::saveSettings()
{
for (int i = 0; i < (int)guiPages.size(); i++)
{
string xmlPath = "GUI/" + guiPages[i]->getName() + "guiPagesettings.xml";
guiPages[i]->saveSettings(xmlPath);
}
//topBarGui->saveSettings("GUI/" + topBarGui->getName() + "guiPagesettings.xml");
}
void GUIManager::setGUIColour()
{
for (int i = 0; i < (int)guiPages.size(); i++)
{
guiPages[i]->setColorBack(color);
}
topBarGui->setColorBack(color);
}
void GUIManager::exit(ofEventArgs& eventArgs)
{
if (isAutoSave) saveSettings();
delete topBarGui;
for (int i = 0; i < guiPages.size(); i++)
delete guiPages[i];
}
of/Utility_Box/src/gui/GUIManager.h
+67
View File
@@ -0,0 +1,67 @@
//
// GUIManager.h
//
// Created by James Alliban on 25/06/2013.
//
#pragma once
#include "ofMain.h"
#include "ofEvents.h"
#include "ofxUI.h"
// gui titles
#define TOP_TITLE "TOP"
#define TOP_AUTO_SAVE "AUTO SAVE"
#define TOP_SAVE "SAVE"
#define TOP_NEXT "NEXT"
#define TOP_PREVIOUS "PREV"
class GUIManager
{
public:
//GUIManager();
virtual void setup();
virtual bool getVisible();
ofColor color;
protected:
virtual void buildTopBarGUI();
virtual ofxUICanvas* getNewGUI(string title);
virtual void keyPressed(ofKeyEventArgs& eventArgs);
virtual void exit(ofEventArgs& eventArgs);
virtual void finaliseCanvas(ofxUICanvas* gui, bool isAddedToArray);
virtual void topBarGUIEvent(ofxUIEventArgs &e);
void guiEvent(ofxUIEventArgs &e);
void nextPage();
void previousPage();
void showGUI();
void toggleVisible();
void saveSettings();
void setGUIColour();
ofxUICanvas* topBarGui;
vector<ofxUICanvas *> guiPages;
int currentUIID;
float dim;
float toggleDim;
float xInit;
float length;
float canvasW;
float canvasH;
float toggleSize;
float spacerW, spacerH;
bool isVisible;
bool isAutoSave;
};