live test

1 files changed, 10 insertions, 9 deletions

diff --git a/src/obtsDevice.cpp b/src/obtsDevice.cpp
index 85d5f18..c8255b4 100644
--- a/src/obtsDevice.cpp
+++ b/src/obtsDevice.cpp
@@ -13,7 +13,7 @@ obtsDevice::obtsDevice(string &imsi,string &imei,string &num,ofImage *_icon,ofVe
 	icon=_icon;

 	active=false;

 	calling=false;

-	exciteLevel=1.0;

+	exciteLevel=0.99;

 	lastTime=ofGetElapsedTimef();

 	printf("new device: IMSI%s\n",IMSI.c_str());

 }

@@ -76,7 +76,7 @@ void obtsDevice::excite(float amount) {
 

 void obtsDevice::draw(float timeScale)

 {

-	float decay=1.0;

+	float decay=2.0;

 	float now=ofGetElapsedTimef();

 	float timeSeg=now-lastTime;

 	lastTime=now;

@@ -91,21 +91,21 @@ void obtsDevice::draw(float timeScale)
 	ofSetColor(0x8f*rf,0x8f*rf,0x8f*rf);

 	float endPos;

 	for (vector<timeseg>::iterator i=connectionHistory.begin();i!=connectionHistory.end();i++){

-		float startPos=((*i).startTime-now)/timeScale;

-		endPos=(*i).endTime>0.0f?((*i).endTime-now)/timeScale:0.0f;

+		float startPos=((*i).startTime-now)*timeScale;

+		endPos=(*i).endTime>0.0f?((*i).endTime-now)*timeScale:0.0f;

 		ofLine(cos(coords.x)*coords.y,sin(coords.x)*coords.y,startPos,cos(coords.x)*coords.y,sin(coords.x)*coords.y,endPos);

 		//printf("%f drawing %f,%f,%f to %f,%f,%f\n",ofGetElapsedTimef(),cos(coords.x)*coords.y,sin(coords.x)*coords.y,startPos,cos(coords.x)*coords.y,sin(coords.x)*coords.y,endPos);

 	}

 	ofSetColor(0xff,0x8f,0x8f);

 	for (vector<tsms>::iterator i=smsHistory.begin();i!=smsHistory.end();i++){

-		float timepos=((*i).time-now)/timeScale;

+		float timepos=((*i).time-now)*timeScale;

 		ofLine(cos(coords.x)*coords.y,sin(coords.x)*coords.y,timepos,cos((*i).recipient->coords.x)*(*i).recipient->coords.y,sin((*i).recipient->coords.x)*(*i).recipient->coords.y,timepos);

 	}

 	

 	for (vector<tcall>::iterator i=callHistory.begin();i!=callHistory.end();i++){

-		ofSetColor(0xff,0xff,0x8f);

-		float stimepos=((*i).startTime-now)/timeScale;

-		float etimepos=((*i).endTime>0.0f?((*i).endTime-now)/timeScale:0.0f);

+		ofSetColor(0xff,0xff,0x8f,0x7f);

+		float stimepos=((*i).startTime-now)*timeScale;

+		float etimepos=((*i).endTime>0.0f?((*i).endTime-now)*timeScale:0.0f);

 		glBegin(GL_QUADS);

 			glVertex3f(cos(coords.x)*coords.y,sin(coords.x)*coords.y,stimepos);

 			glVertex3f(cos((*i).recipient->coords.x)*(*i).recipient->coords.y,sin((*i).recipient->coords.x)*(*i).recipient->coords.y,stimepos);

@@ -115,7 +115,8 @@ void obtsDevice::draw(float timeScale)
 	}

 	

 	int greylev=0x7f+((int)(128.0f*exciteLevel));

-	ofSetHexColor(greylev+(greylev<<8)+(greylev<<16));

+	//printf("%s %i\n",number.c_str(),greylev);

+	ofSetColor(greylev,greylev,greylev,0xff);

 	ofSetDrawBitmapMode(OF_BITMAPMODE_MODEL_BILLBOARD);

 	ofDrawBitmapString(number,cos(coords.x)*coords.y,sin(coords.x)*coords.y,endPos);

 	ofSetDrawBitmapMode(OF_BITMAPMODE_SIMPLE);