Utility graphs update when they receive data ...

... instead of at specified intervals

of/Utility_Box/src/data/DataManager.cpp

@@ -53,9 +53,9 @@ void DataManager::update()
 				dataObject.max = 1;
 			
 				dataObjects.push_back(dataObject);
+				app->scene.addNewData(i, dataObject);
 			}
 
-			app->scene.addNewData(dataObjects);
 		}
 	}
 	else
@@ -64,25 +64,23 @@ void DataManager::update()
 		if (ofGetElapsedTimef() >= nextDataSendTime + sendDataSpeed)
 		{
 			nextDataSendTime += sendDataSpeed;
-			app->scene.addNewData(newData);
+			//app->scene.addNewData(newData);
 
 
-			ofstream logFile;
-			logFile.open(ofToDataPath("subscriber_log.txt").c_str());
-			string str;
+			//ofstream logFile;
+			//logFile.open(ofToDataPath("subscriber_log.txt").c_str());
+			//string str;
 
-			for (int i = 0; i < newData.size(); i++)
-			{
-				DataObject data = newData[i];
-				str += ofToString(i) + " = " + data.info + "\n";
-
-			}
-			unsigned char buf = ofToChar(str);
-			// write data to txt file
-			logFile << str[0] << str <<"\n";
-
-			logFile.close();
+			//for (int i = 0; i < newData.size(); i++)
+			//{
+			//	DataObject data = newData[i];
+			//	str += ofToString(i) + " = " + data.info + "\n";
+			//}
+			//unsigned char buf = ofToChar(str);
+			//// write data to txt file
+			//logFile << str[0] << str <<"\n";
 
+			//logFile.close();
 		}
 	}
 }
@@ -137,6 +135,7 @@ void DataManager::onMessage( Spacebrew::Message & m )
 		{
 			//isPublisher0DataReceived = true;
 			newData[i] = dataObject;
+			app->scene.addNewData(i, newData[i]);
 			//printf("- - - adding %s to dataObject %i, info:%s, min:%f \n", m.name.c_str(), i, newData[i].info.c_str(), newData[i].min);
 			
 		}

of/Utility_Box/src/visual/Scene.cpp

@@ -28,8 +28,6 @@ void Scene::setup()
 	isCamAutoSwap = true;
 
 	setViewport();
-
-	//setupTitleFbo();
 }
 
 
@@ -147,9 +145,9 @@ void Scene::setViewport()
 
 
 
-void Scene::addNewData(vector<DataObject> newData)
+void Scene::addNewData(int i, DataObject newData)
 {
-	graphManager.addNewData(newData);
+	graphManager.addNewData(i, newData);
 }
 
 

of/Utility_Box/src/visual/Scene.h

@@ -26,7 +26,7 @@ public:
     void draw();
 	void setViewport();
 	void drawTextBox(string copy, string align);
-	void addNewData(vector<DataObject> newData);
+	void addNewData(int i, DataObject newData);
 	void clearGraphData();
 	void keyPressed(int key);
 	void switchCamera();

of/Utility_Box/src/visual/graph/GraphManager.cpp

@@ -51,13 +51,13 @@ void GraphManager::draw()
 
 
 
-void GraphManager::addNewData(vector<DataObject> newData)
+void GraphManager::addNewData(int i, DataObject newData)
 {
-	for (int i = 0; i < graphs.size(); i++)
-	{
+	//for (int i = 0; i < graphs.size(); i++)
+	//{
 		Graph *graph = graphs[i];
-		graph->addNewData(newData[i]);
-	}
+		graph->addNewData(newData);
+	//}
 }
 
 

of/Utility_Box/src/visual/graph/GraphManager.h

@@ -19,7 +19,7 @@ public:
 	void setup();
 	void update(ofVec3f ativeCamPos);
 	void draw();
-	void addNewData(vector<DataObject> newData);
+	void addNewData(int i, DataObject newData);
 	void clearGraphData();
 	void updateInfoText();
 	void outputData();