Utility now clears graph if min or max change
This commit is contained in:
James Alliban
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,8 +1,8 @@
|
||||
Build started 21/1/2014 2:40:34 AM.
|
||||
Build started 22/1/2014 2:08:26 PM.
|
||||
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 src\visual\graph\GraphManager.cpp
|
||||
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 src\main.cpp src\visual\graph\Graph.cpp
|
||||
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
|
||||
[
|
||||
@@ -27,7 +27,7 @@
|
||||
_Elem=char,
|
||||
_Traits=std::char_traits<char>
|
||||
]
|
||||
GraphManager.cpp
|
||||
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
|
||||
[
|
||||
@@ -132,4 +132,4 @@
|
||||
|
||||
Build succeeded.
|
||||
|
||||
Time Elapsed 00:00:10.80
|
||||
Time Elapsed 00:00:10.40
|
||||
|
||||
@@ -1583,3 +1583,58 @@ 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
|
||||
^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
|
||||
^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
|
||||
^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
|
||||
^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
|
||||
^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
|
||||
^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
|
||||
^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
|
||||
^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
|
||||
^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
|
||||
^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
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -38,7 +38,7 @@ Graph::Graph(int _graphID)
|
||||
|
||||
void Graph::update(ofVec3f activeCamPos)
|
||||
{
|
||||
if (publisher0Data.size() > 0 && publisher0Data.back().info != "" && !isInfoTextSet)
|
||||
if (!isInfoTextSet)
|
||||
{
|
||||
isInfoTextSet = true;
|
||||
drawInfoToFbo();
|
||||
@@ -70,46 +70,17 @@ void Graph::drawGraphBody()
|
||||
{
|
||||
if (!isDrawBody) return;
|
||||
|
||||
//if (publisher0Data.size() > 1)
|
||||
//{
|
||||
//ofMesh body0 = getMesh(publisher0Data, col0);
|
||||
|
||||
//float xOffset = 0;
|
||||
//float outputMin = 0;
|
||||
//float outputMax = graphHeightMax;
|
||||
|
||||
//// draw lines
|
||||
//ofPushStyle();
|
||||
//ofPolyline poly0;
|
||||
//for (int i = 0; i < publisher0Data.size() - 1; i++)
|
||||
//{
|
||||
// if (i < publisher0Data.size() - 1)
|
||||
// {
|
||||
// ofSetLineWidth(lineThickness);
|
||||
// ofVec3f vec = ofVec3f(i * graphItemXGap - (maxGraphWidth * 0.5),
|
||||
// ofMap(publisher0Data[i].value, publisher0Data[i].min, publisher0Data[i].max, outputMin, outputMax),
|
||||
// centre.z);
|
||||
|
||||
// if (isClampYValues) vec.y = ofClamp(vec.y, outputMin, outputMax);
|
||||
//
|
||||
// poly0.addVertex(vec);
|
||||
// }
|
||||
//}
|
||||
//
|
||||
//int lineAlpha = 255;
|
||||
//if (!isDrawLines) lineAlpha = 0;
|
||||
ofPushStyle();
|
||||
|
||||
ofPushStyle();
|
||||
ofSetColor(255);
|
||||
ofSetLineWidth(2);
|
||||
|
||||
ofSetColor(255);
|
||||
ofSetLineWidth(2);
|
||||
|
||||
graphMesh.drawFaces();
|
||||
//graphMesh.drawWireframe();
|
||||
graphMesh.drawFaces();
|
||||
//graphMesh.drawWireframe();
|
||||
|
||||
//poly0.draw();
|
||||
//poly0.draw();
|
||||
|
||||
ofPopStyle();
|
||||
ofPopStyle();
|
||||
}
|
||||
|
||||
|
||||
@@ -139,12 +110,6 @@ void Graph::setFboSettings()
|
||||
|
||||
void Graph::drawInfoToFbo()
|
||||
{
|
||||
string infoText = "";
|
||||
|
||||
if (publisher0Data.size() > 0)
|
||||
{
|
||||
infoText = info;
|
||||
}
|
||||
|
||||
//printf("---- infoText = %s \n", infoText.c_str());
|
||||
|
||||
@@ -181,13 +146,19 @@ void Graph::addNewData(DataObject newData)
|
||||
if (newData.min == -999) newData.min = 0;
|
||||
if (newData.max == -999) newData.max = 0;
|
||||
|
||||
currentValue = newData.value;
|
||||
if (newData.min != currentMin || newData.max != currentMax)
|
||||
{
|
||||
if (graphMesh.getVertices().size() > 0) clear();
|
||||
}
|
||||
|
||||
currentValue = newData.value;
|
||||
currentMin = newData.min;
|
||||
currentMax = newData.max;
|
||||
|
||||
int graphMeshSize = graphMesh.getVertices().size();
|
||||
vector<ofVec3f> *meshVertices = &graphMesh.getVertices();
|
||||
vector<ofFloatColor> *meshColours = &graphMesh.getColors();
|
||||
|
||||
|
||||
// add new vertex and colour
|
||||
float xTop = (graphMeshSize == 0) ? -(maxGraphWidth * 0.5) : (graphItemXGap * ((graphMeshSize * 0.5))) - (maxGraphWidth * 0.5);
|
||||
float yTop = ofMap(newData.value, newData.min, newData.max, outputMin, outputMax);
|
||||
@@ -198,14 +169,14 @@ void Graph::addNewData(DataObject newData)
|
||||
|
||||
graphMesh.addVertex(vertexTop);
|
||||
graphMesh.addVertex(vertexBottom);
|
||||
|
||||
|
||||
ofColor col = ofColor(ofMap(graphID, 0, 29, 0, 255), ofMap(graphID, 0, 29, 255, 0), ofMap(graphID, 0, 29, 150, 50), 255);
|
||||
|
||||
//if (ofRandomuf() < 0.1) col = ofColor(ofRandom(255), ofRandom(255), ofRandom(255), 255);
|
||||
|
||||
|
||||
graphMesh.addColor(col);
|
||||
graphMesh.addColor(ofColor(col.r, col.g, col.b, 0));
|
||||
|
||||
|
||||
if (graphMeshSize * 0.5 >= maxData)
|
||||
{
|
||||
// loop through all vertices (apart from the last) and nudge them all to the left.
|
||||
@@ -219,8 +190,6 @@ void Graph::addNewData(DataObject newData)
|
||||
graphMesh.removeColor(0);
|
||||
graphMesh.removeColor(0);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -228,7 +197,7 @@ void Graph::clear()
|
||||
{
|
||||
graphMesh.clear();
|
||||
setFboSettings();
|
||||
drawInfoToFbo();
|
||||
//drawInfoToFbo();
|
||||
}
|
||||
|
||||
vector<string> Graph::explode(const string &delimiter, const string &str)
|
||||
|
||||
@@ -24,7 +24,6 @@ public:
|
||||
testApp *app;
|
||||
int graphID;
|
||||
|
||||
vector<DataObject> publisher0Data;
|
||||
int maxData; // calculated from graphWidth and graphItemXGap
|
||||
|
||||
ofFbo infoTextFbo;
|
||||
@@ -61,4 +60,6 @@ public:
|
||||
|
||||
ofMesh graphMesh;
|
||||
float currentValue;
|
||||
float currentMin;
|
||||
float currentMax;
|
||||
};
|
||||
@@ -92,27 +92,27 @@ void GraphManager::outputData()
|
||||
|
||||
string str;
|
||||
|
||||
for (int i = 0; i < graphs.size(); i++)
|
||||
{
|
||||
Graph *graph = graphs[i];
|
||||
str += graph->publisher0Data[graph->publisher0Data.size() - 1].info + "\n";
|
||||
//for (int i = 0; i < graphs.size(); i++)
|
||||
//{
|
||||
// Graph *graph = graphs[i];
|
||||
// str += graph->publisher0Data[graph->publisher0Data.size() - 1].info + "\n";
|
||||
|
||||
// print values
|
||||
str += "\nVALUES:\n\n";
|
||||
for (int j = 0; j < graph->publisher0Data.size(); j++)
|
||||
str += ofToString(j) + " = " + ofToString(graph->publisher0Data[j].value) + "\n";
|
||||
|
||||
str += "\nMIN\n\n";
|
||||
for (int j = 0; j < graph->publisher0Data.size(); j++)
|
||||
str += ofToString(j) + " = " + ofToString(graph->publisher0Data[j].min) + "\n";
|
||||
|
||||
str += "\nMAX\n\n";
|
||||
for (int j = 0; j < graph->publisher0Data.size(); j++)
|
||||
str += ofToString(j) + " = " + ofToString(graph->publisher0Data[j].max) + "\n";
|
||||
|
||||
// // print values
|
||||
// str += "\nVALUES:\n\n";
|
||||
// for (int j = 0; j < graph->publisher0Data.size(); j++)
|
||||
// str += ofToString(j) + " = " + ofToString(graph->publisher0Data[j].value) + "\n";
|
||||
//
|
||||
// str += "\nMIN\n\n";
|
||||
// for (int j = 0; j < graph->publisher0Data.size(); j++)
|
||||
// str += ofToString(j) + " = " + ofToString(graph->publisher0Data[j].min) + "\n";
|
||||
//
|
||||
// str += "\nMAX\n\n";
|
||||
// for (int j = 0; j < graph->publisher0Data.size(); j++)
|
||||
// str += ofToString(j) + " = " + ofToString(graph->publisher0Data[j].max) + "\n";
|
||||
//
|
||||
|
||||
str += "\n\n\n\n";
|
||||
}
|
||||
// str += "\n\n\n\n";
|
||||
//}
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user