diff --git a/of/Active Tripod/bin/Active_Tripod.lib b/of/Active Tripod/bin/Active_Tripod.lib index 0882de2..3679cb5 100644 Binary files a/of/Active Tripod/bin/Active_Tripod.lib and b/of/Active Tripod/bin/Active_Tripod.lib differ diff --git a/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml b/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml index 90d4365..b20e850 100644 --- a/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml +++ b/of/Active Tripod/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml @@ -84,3 +84,8 @@ Graph Text RectAlpha 140.921051025 + + 4 + Reconnect Frequency + 3134.868408203 + diff --git a/of/Active Tripod/src/data/DataManager.cpp b/of/Active Tripod/src/data/DataManager.cpp index efe7dd3..69cd59e 100644 --- a/of/Active Tripod/src/data/DataManager.cpp +++ b/of/Active Tripod/src/data/DataManager.cpp @@ -24,7 +24,7 @@ void DataManager::setup() //isPublisher0DataReceived = false; //isPublisher1DataReceived = false; - nameConcat = " dev"; + nameConcat = ""; setupSpacebrew(); @@ -39,6 +39,9 @@ void DataManager::setupSpacebrew() string name = "Active Tripod " + ofToString(appId) + nameConcat; string description = "Description goes here. Not sure why. Let me know if you see this and tell me if you need it"; + spacebrew.setAutoReconnect(true); + spacebrew.setReconnectRate(reconnectFrequency); + spacebrew.addSubscribe(publisher0Name, Spacebrew::TYPE_STRING); spacebrew.addSubscribe(publisher1Name, Spacebrew::TYPE_STRING); spacebrew.connect( host, name, description ); diff --git a/of/Active Tripod/src/data/DataManager.h b/of/Active Tripod/src/data/DataManager.h index c34a9e2..5b22f5c 100644 --- a/of/Active Tripod/src/data/DataManager.h +++ b/of/Active Tripod/src/data/DataManager.h @@ -51,6 +51,8 @@ class DataManager //bool isPublisher0DataReceived; //bool isPublisher1DataReceived; + float reconnectFrequency; + bool isDataSimulated; float perlinXScale; float perlinYScale; diff --git a/of/Active Tripod/src/gui/GUI.cpp b/of/Active Tripod/src/gui/GUI.cpp index 0f8b14b..ce9b925 100644 --- a/of/Active Tripod/src/gui/GUI.cpp +++ b/of/Active Tripod/src/gui/GUI.cpp @@ -90,6 +90,9 @@ void GUI::addGraphGlobalGUI() gui->addSlider("Graph Text RectBlue", 0, 255, &app->scene.graphTextRectCol[2], length, dim); gui->addSlider("Graph Text RectAlpha", 0, 255, &app->scene.graphTextRectCol[3], length, dim); + gui->addSpacer(length, 1); + gui->addSlider("Reconnect Frequency", 1000, 60000, &app->dataManager.reconnectFrequency, length, dim); + ofAddListener(gui->newGUIEvent, this, &GUI::graphGlobalGUIEvent); finaliseCanvas(gui, true); } diff --git a/of/Utility_Box/bin/Utility_Box.lib b/of/Utility_Box/bin/Utility_Box.lib index 67a8c19..6f43acf 100644 Binary files a/of/Utility_Box/bin/Utility_Box.lib and b/of/Utility_Box/bin/Utility_Box.lib differ diff --git a/of/Utility_Box/bin/data/GUI/CAMERAguiPagesettings.xml b/of/Utility_Box/bin/data/GUI/CAMERAguiPagesettings.xml index 62a760f..dd7dddd 100644 --- a/of/Utility_Box/bin/data/GUI/CAMERAguiPagesettings.xml +++ b/of/Utility_Box/bin/data/GUI/CAMERAguiPagesettings.xml @@ -1,7 +1,7 @@ 2 Rotation - 0 + 1 2 diff --git a/of/Utility_Box/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml b/of/Utility_Box/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml index e69de29..f6d4ea0 100644 --- a/of/Utility_Box/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml +++ b/of/Utility_Box/bin/data/GUI/GRAPH GLOBALguiPagesettings.xml @@ -0,0 +1,5 @@ + + 4 + Reconnect Frequency + 3134.868408203 + diff --git a/of/Utility_Box/obj/Release/AbstractGraph.obj b/of/Utility_Box/obj/Release/AbstractGraph.obj index 20ba8f3..0e0bd55 100644 Binary files a/of/Utility_Box/obj/Release/AbstractGraph.obj and b/of/Utility_Box/obj/Release/AbstractGraph.obj differ diff --git a/of/Utility_Box/obj/Release/CL.read.1.tlog b/of/Utility_Box/obj/Release/CL.read.1.tlog index f5fceb0..9cc29a5 100644 Binary files a/of/Utility_Box/obj/Release/CL.read.1.tlog and b/of/Utility_Box/obj/Release/CL.read.1.tlog differ diff --git a/of/Utility_Box/obj/Release/CL.write.1.tlog b/of/Utility_Box/obj/Release/CL.write.1.tlog index 1c32f88..e543c06 100644 Binary files a/of/Utility_Box/obj/Release/CL.write.1.tlog and b/of/Utility_Box/obj/Release/CL.write.1.tlog differ diff --git a/of/Utility_Box/obj/Release/DataManager.obj b/of/Utility_Box/obj/Release/DataManager.obj index 6179942..500cdcc 100644 Binary files a/of/Utility_Box/obj/Release/DataManager.obj and b/of/Utility_Box/obj/Release/DataManager.obj differ diff --git a/of/Utility_Box/obj/Release/GUI.obj b/of/Utility_Box/obj/Release/GUI.obj index e5b3499..07affc7 100644 Binary files a/of/Utility_Box/obj/Release/GUI.obj and b/of/Utility_Box/obj/Release/GUI.obj differ diff --git a/of/Utility_Box/obj/Release/Graph.obj b/of/Utility_Box/obj/Release/Graph.obj index a719e03..353e3be 100644 Binary files a/of/Utility_Box/obj/Release/Graph.obj and b/of/Utility_Box/obj/Release/Graph.obj differ diff --git a/of/Utility_Box/obj/Release/GraphManager.obj b/of/Utility_Box/obj/Release/GraphManager.obj index da07f2c..33f2871 100644 Binary files a/of/Utility_Box/obj/Release/GraphManager.obj and b/of/Utility_Box/obj/Release/GraphManager.obj differ diff --git a/of/Utility_Box/obj/Release/Scene.obj b/of/Utility_Box/obj/Release/Scene.obj index d6e8504..dc7d9cd 100644 Binary files a/of/Utility_Box/obj/Release/Scene.obj and b/of/Utility_Box/obj/Release/Scene.obj differ diff --git a/of/Utility_Box/obj/Release/Utility_Box.log b/of/Utility_Box/obj/Release/Utility_Box.log index fee88af..cb5fb85 100644 --- a/of/Utility_Box/obj/Release/Utility_Box.log +++ b/of/Utility_Box/obj/Release/Utility_Box.log @@ -1,7 +1,36 @@ -Build started 24/1/2014 2:56:50 AM. +Build started 28/1/2014 12:29:41 AM. 1>Project "C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Utility_Box\Utility_Box.vcxproj" on node 2 (Build target(s)). 1>ClCompile: - C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\CL.exe /c /I..\..\..\libs\openFrameworks /I..\..\..\libs\openFrameworks\graphics /I..\..\..\libs\openFrameworks\app /I..\..\..\libs\openFrameworks\sound /I..\..\..\libs\openFrameworks\utils /I..\..\..\libs\openFrameworks\communication /I..\..\..\libs\openFrameworks\video /I..\..\..\libs\openFrameworks\types /I..\..\..\libs\openFrameworks\math /I..\..\..\libs\openFrameworks\3d /I..\..\..\libs\openFrameworks\gl /I..\..\..\libs\openFrameworks\events /I..\..\..\libs\glut\include /I..\..\..\libs\rtAudio\include /I..\..\..\libs\quicktime\include /I..\..\..\libs\freetype\include /I..\..\..\libs\freetype\include\freetype2 /I..\..\..\libs\freeImage\include /I..\..\..\libs\fmodex\include /I..\..\..\libs\videoInput\include /I..\..\..\libs\glew\include\ /I..\..\..\libs\glu\include /I..\..\..\libs\tess2\include /I..\..\..\libs\cairo\include\cairo /I..\..\..\libs\poco\include /I..\..\..\libs\glfw\include /I..\..\..\..\libs\openssl\include /I..\..\..\addons /Isrc /Isrc\data /Isrc\gui /Isrc\visual /Isrc\visual\graph /I..\..\..\addons\ofxLibwebsockets\libs\jsoncpp /I..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json /I..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\ /I..\..\..\addons\ofxLibwebsockets\libs\openssl\openssl /I..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include /I..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets /I..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src /I..\..\..\addons\ofxLibwebsockets\src /I..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port /I..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port\win32helpers /I..\..\..\addons\ofxSpacebrew\src /I..\..\..\addons\ofxUI\src /I..\..\..\addons\ofxXmlSettings\libs /I..\..\..\addons\ofxXmlSettings\src /I..\..\..\addons\ofxFTGL\src /I..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL /I..\..\..\addons\ofxFTGL\libs\FTGL\include /I..\..\..\addons\ofxFTGL\libs\FTGL /I..\..\..\addons\ofxOsc\libs /I..\..\..\addons\ofxOsc\libs\oscpack /I..\..\..\addons\ofxOsc\libs\oscpack\src /I..\..\..\addons\ofxOsc\libs\oscpack\src\ip /I..\..\..\addons\ofxOsc\libs\oscpack\src\ip\posix /I..\..\..\addons\ofxOsc\libs\oscpack\src\ip\win32 /I..\..\..\addons\ofxOsc\libs\oscpack\src\osc /I..\..\..\addons\ofxOsc\src /Zi /nologo /W3 /WX- /O2 /Oy- /D WIN32 /D NDEBUG /D _CONSOLE /D POCO_STATIC /D CAIRO_WIN32_STATIC_BUILD /D DISABLE_SOME_FLOATING_POINT /D _UNICODE /D UNICODE /Gm- /EHsc /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"obj\Release\\" /Fd"obj\Release\vc110.pdb" /Gd /TP /analyze- /errorReport:prompt src\data\DataManager.cpp + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\CL.exe /c /I..\..\..\libs\openFrameworks /I..\..\..\libs\openFrameworks\graphics /I..\..\..\libs\openFrameworks\app /I..\..\..\libs\openFrameworks\sound /I..\..\..\libs\openFrameworks\utils /I..\..\..\libs\openFrameworks\communication /I..\..\..\libs\openFrameworks\video /I..\..\..\libs\openFrameworks\types /I..\..\..\libs\openFrameworks\math /I..\..\..\libs\openFrameworks\3d /I..\..\..\libs\openFrameworks\gl /I..\..\..\libs\openFrameworks\events /I..\..\..\libs\glut\include /I..\..\..\libs\rtAudio\include /I..\..\..\libs\quicktime\include /I..\..\..\libs\freetype\include /I..\..\..\libs\freetype\include\freetype2 /I..\..\..\libs\freeImage\include /I..\..\..\libs\fmodex\include /I..\..\..\libs\videoInput\include /I..\..\..\libs\glew\include\ /I..\..\..\libs\glu\include /I..\..\..\libs\tess2\include /I..\..\..\libs\cairo\include\cairo /I..\..\..\libs\poco\include /I..\..\..\libs\glfw\include /I..\..\..\..\libs\openssl\include /I..\..\..\addons /Isrc /Isrc\data /Isrc\gui /Isrc\visual /Isrc\visual\graph /I..\..\..\addons\ofxLibwebsockets\libs\jsoncpp /I..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json /I..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\ /I..\..\..\addons\ofxLibwebsockets\libs\openssl\openssl /I..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include /I..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets /I..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src /I..\..\..\addons\ofxLibwebsockets\src /I..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port /I..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port\win32helpers /I..\..\..\addons\ofxSpacebrew\src /I..\..\..\addons\ofxUI\src /I..\..\..\addons\ofxXmlSettings\libs /I..\..\..\addons\ofxXmlSettings\src /I..\..\..\addons\ofxFTGL\src /I..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL /I..\..\..\addons\ofxFTGL\libs\FTGL\include /I..\..\..\addons\ofxFTGL\libs\FTGL /I..\..\..\addons\ofxOsc\libs /I..\..\..\addons\ofxOsc\libs\oscpack /I..\..\..\addons\ofxOsc\libs\oscpack\src /I..\..\..\addons\ofxOsc\libs\oscpack\src\ip /I..\..\..\addons\ofxOsc\libs\oscpack\src\ip\posix /I..\..\..\addons\ofxOsc\libs\oscpack\src\ip\win32 /I..\..\..\addons\ofxOsc\libs\oscpack\src\osc /I..\..\..\addons\ofxOsc\src /Zi /nologo /W3 /WX- /O2 /Oy- /D WIN32 /D NDEBUG /D _CONSOLE /D POCO_STATIC /D CAIRO_WIN32_STATIC_BUILD /D DISABLE_SOME_FLOATING_POINT /D _UNICODE /D UNICODE /Gm- /EHsc /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"obj\Release\\" /Fd"obj\Release\vc110.pdb" /Gd /TP /analyze- /errorReport:prompt ..\..\..\addons\ofxSpacebrew\src\ofxSpacebrew.cpp src\data\DataManager.cpp src\gui\GUI.cpp src\main.cpp src\testApp.cpp src\visual\Scene.cpp src\visual\graph\AbstractGraph.cpp src\visual\graph\Graph.cpp src\visual\graph\GraphManager.cpp + ofxSpacebrew.cpp + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\openFrameworks\graphics\ofPixels.h(155): warning C4003: not enough actual parameters for macro 'max' + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\openFrameworks\graphics\ofPixels.h(156): warning C4003: not enough actual parameters for macro 'max' + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(126): warning C4250: 'Poco::InputStreamConverter' : inherits 'std::basic_istream<_Elem,_Traits>::std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\istream(74) : see declaration of 'std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(144): warning C4250: 'Poco::OutputStreamConverter' : inherits 'std::basic_ostream<_Elem,_Traits>::std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\ostream(90) : see declaration of 'std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\openFrameworks\types\ofParameter.h(155): warning C4003: not enough actual parameters for macro 'min' + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\openFrameworks\types\ofParameter.h(156): warning C4003: not enough actual parameters for macro 'max' DataManager.cpp 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(126): warning C4250: 'Poco::InputStreamConverter' : inherits 'std::basic_istream<_Elem,_Traits>::std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' via dominance with @@ -27,6 +56,183 @@ _Elem=char, _Traits=std::char_traits ] + GUI.cpp + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(126): warning C4250: 'Poco::InputStreamConverter' : inherits 'std::basic_istream<_Elem,_Traits>::std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\istream(74) : see declaration of 'std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(144): warning C4250: 'Poco::OutputStreamConverter' : inherits 'std::basic_ostream<_Elem,_Traits>::std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\ostream(90) : see declaration of 'std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + main.cpp + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(126): warning C4250: 'Poco::InputStreamConverter' : inherits 'std::basic_istream<_Elem,_Traits>::std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\istream(74) : see declaration of 'std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(144): warning C4250: 'Poco::OutputStreamConverter' : inherits 'std::basic_ostream<_Elem,_Traits>::std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\ostream(90) : see declaration of 'std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + testApp.cpp + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(126): warning C4250: 'Poco::InputStreamConverter' : inherits 'std::basic_istream<_Elem,_Traits>::std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\istream(74) : see declaration of 'std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(144): warning C4250: 'Poco::OutputStreamConverter' : inherits 'std::basic_ostream<_Elem,_Traits>::std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\ostream(90) : see declaration of 'std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + Scene.cpp + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(126): warning C4250: 'Poco::InputStreamConverter' : inherits 'std::basic_istream<_Elem,_Traits>::std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\istream(74) : see declaration of 'std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(144): warning C4250: 'Poco::OutputStreamConverter' : inherits 'std::basic_ostream<_Elem,_Traits>::std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\ostream(90) : see declaration of 'std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + AbstractGraph.cpp + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(126): warning C4250: 'Poco::InputStreamConverter' : inherits 'std::basic_istream<_Elem,_Traits>::std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\istream(74) : see declaration of 'std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(144): warning C4250: 'Poco::OutputStreamConverter' : inherits 'std::basic_ostream<_Elem,_Traits>::std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\ostream(90) : see declaration of 'std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + Graph.cpp + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(126): warning C4250: 'Poco::InputStreamConverter' : inherits 'std::basic_istream<_Elem,_Traits>::std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\istream(74) : see declaration of 'std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(144): warning C4250: 'Poco::OutputStreamConverter' : inherits 'std::basic_ostream<_Elem,_Traits>::std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\ostream(90) : see declaration of 'std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + GraphManager.cpp + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(126): warning C4250: 'Poco::InputStreamConverter' : inherits 'std::basic_istream<_Elem,_Traits>::std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\istream(74) : see declaration of 'std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + 1>C:\Users\James Alliban\Work\of_v0.8.0_vs_release\libs\poco\include\Poco/StreamConverter.h(144): warning C4250: 'Poco::OutputStreamConverter' : inherits 'std::basic_ostream<_Elem,_Traits>::std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' via dominance + with + [ + _Elem=char, + _Traits=std::char_traits + ] + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\include\ostream(90) : see declaration of 'std::basic_ostream<_Elem,_Traits>::_Add_vtordisp2' + with + [ + _Elem=char, + _Traits=std::char_traits + ] + Generating Code... + 1>c:\users\james alliban\work\of_v0.8.0_vs_release\addons\ofxspacebrew\src\ofxspacebrew.h(344): warning C4715: 'Spacebrew::getRouteUpdateTypeString' : not all control paths return a value Link: C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"bin\Utility_Box.exe" /INCREMENTAL:NO /NOLOGO /LIBPATH:..\..\..\libs\glut\lib\vs /LIBPATH:..\..\..\libs\glfw\lib\vs /LIBPATH:..\..\..\libs\rtAudio\lib\vs /LIBPATH:..\..\..\libs\FreeImage\lib\vs /LIBPATH:..\..\..\libs\freetype\lib\vs /LIBPATH:..\..\..\libs\quicktime\lib\vs /LIBPATH:..\..\..\libs\fmodex\lib\vs /LIBPATH:..\..\..\libs\videoInput\lib\vs /LIBPATH:..\..\..\libs\cairo\lib\vs /LIBPATH:..\..\..\libs\glew\lib\vs /LIBPATH:..\..\..\libs\glu\lib\vs /LIBPATH:..\..\..\libs\openssl\lib\vs /LIBPATH:..\..\..\libs\Poco\lib\vs /LIBPATH:..\..\..\libs\tess2\lib\vs /LIBPATH:..\..\..\addons\ofxFTGL\libs\FTGL\lib\vs2012 /LIBPATH:..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\lib\win32\Release "cairo-static.lib" "pixman-1.lib" msimg32.lib OpenGL32.lib GLu32.lib kernel32.lib setupapi.lib Vfw32.lib comctl32.lib glut32.lib rtAudio.lib videoInput.lib libfreetype.lib FreeImage.lib qtmlClient.lib dsound.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib glew32s.lib fmodex_vc.lib glu32.lib crypt32.lib libeay32MD.lib ssleay32MD.lib PocoFoundationmd.lib PocoNetmd.lib PocoUtilmd.lib PocoXMLmd.lib Ws2_32.lib tess2.lib glfw3.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib websockets_static.lib ZLIB.lib ftgl_static.lib /NODEFAULTLIB:PocoFoundationd.lib /NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:LIBC.lib /NODEFAULTLIB:LIBCMT /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /PDB:"bin\Utility_Box.pdb" /SUBSYSTEM:CONSOLE /OPT:REF /OPT:ICF /LTCG /TLBID:1 /DYNAMICBASE:NO /NXCOMPAT /IMPLIB:"bin\Utility_Box.lib" /MACHINE:X86 /SAFESEH obj\Release\icon.res obj\Release\ofxFTGLFont.obj @@ -106,4 +312,4 @@ Build succeeded. -Time Elapsed 00:00:07.92 +Time Elapsed 00:00:38.33 diff --git a/of/Utility_Box/obj/Release/Utility_Box.write.1.tlog b/of/Utility_Box/obj/Release/Utility_Box.write.1.tlog index 87e7fa2..0c677c0 100644 --- a/of/Utility_Box/obj/Release/Utility_Box.write.1.tlog +++ b/of/Utility_Box/obj/Release/Utility_Box.write.1.tlog @@ -1903,3 +1903,8 @@ C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Util C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Utility_Box\bin\Utility_Box.lib C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Utility_Box\bin\Utility_Box.exp C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Utility_Box\bin\Utility_Box.exp +^C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Utility_Box\Utility_Box.vcxproj +C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Utility_Box\bin\Utility_Box.lib +C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Utility_Box\bin\Utility_Box.lib +C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Utility_Box\bin\Utility_Box.exp +C:\Users\James Alliban\Work\of_v0.8.0_vs_release\CRITICAL-INFRASTRUCTURE\of\Utility_Box\bin\Utility_Box.exp diff --git a/of/Utility_Box/obj/Release/cl.command.1.tlog b/of/Utility_Box/obj/Release/cl.command.1.tlog index 2715c85..0fcf11b 100644 Binary files a/of/Utility_Box/obj/Release/cl.command.1.tlog and b/of/Utility_Box/obj/Release/cl.command.1.tlog differ diff --git a/of/Utility_Box/obj/Release/main.obj b/of/Utility_Box/obj/Release/main.obj index 0b70564..e23d123 100644 Binary files a/of/Utility_Box/obj/Release/main.obj and b/of/Utility_Box/obj/Release/main.obj differ diff --git a/of/Utility_Box/obj/Release/ofxSpacebrew.obj b/of/Utility_Box/obj/Release/ofxSpacebrew.obj index f7908c9..41bbfe6 100644 Binary files a/of/Utility_Box/obj/Release/ofxSpacebrew.obj and b/of/Utility_Box/obj/Release/ofxSpacebrew.obj differ diff --git a/of/Utility_Box/obj/Release/testApp.obj b/of/Utility_Box/obj/Release/testApp.obj index 92e6df7..bfb9cbb 100644 Binary files a/of/Utility_Box/obj/Release/testApp.obj and b/of/Utility_Box/obj/Release/testApp.obj differ diff --git a/of/Utility_Box/obj/Release/vc110.pdb b/of/Utility_Box/obj/Release/vc110.pdb index 9497cbe..2813ca8 100644 Binary files a/of/Utility_Box/obj/Release/vc110.pdb and b/of/Utility_Box/obj/Release/vc110.pdb differ diff --git a/of/Utility_Box/src/data/DataManager.cpp b/of/Utility_Box/src/data/DataManager.cpp index 3c6ca3d..f1dc700 100644 --- a/of/Utility_Box/src/data/DataManager.cpp +++ b/of/Utility_Box/src/data/DataManager.cpp @@ -26,6 +26,9 @@ void DataManager::setupSpacebrew() string host = "54.194.189.129"; // Spacebrew::SPACEBREW_CLOUD; // "localhost"; string name = "CRITICAL INFRASTRUCTURE UTILITY BOX" + subscriberDevName; string description = "Description goes here. Not sure why. Let me know if you see this and tell me if you need it"; + + spacebrew.setAutoReconnect(true); + spacebrew.setReconnectRate(reconnectFrequency); for (int i = 0; i < 30; i++) { diff --git a/of/Utility_Box/src/data/DataManager.h b/of/Utility_Box/src/data/DataManager.h index 4fd07b7..778d4c7 100644 --- a/of/Utility_Box/src/data/DataManager.h +++ b/of/Utility_Box/src/data/DataManager.h @@ -38,7 +38,7 @@ class DataManager // create your spacebrew object Spacebrew::Connection spacebrew; - + float reconnectFrequency; vector newData; //bool isPublisher0DataReceived; diff --git a/of/Utility_Box/src/gui/GUI.cpp b/of/Utility_Box/src/gui/GUI.cpp index d3ebc67..0ef2e19 100644 --- a/of/Utility_Box/src/gui/GUI.cpp +++ b/of/Utility_Box/src/gui/GUI.cpp @@ -64,6 +64,11 @@ void GUI::addGraphGlobalGUI() string title = "GRAPH GLOBAL"; ofxUICanvas* gui = getNewGUI(title); // gui->addLabel("GRAPH TEXT"); + + gui->addSpacer(length, 1); + gui->addSlider("Reconnect Frequency", 1000, 60000, &app->dataManager.reconnectFrequency, length, dim); + + //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);