[cig-commits] commit: Temporarily messing with the timestep drawing

[Mercurial]

changeset:   74:1d163b16f19c
user:        LukeHodkinson
date:        Wed Aug 27 05:12:14 2008 +0000
files:       DrawingObjects/src/TimeStep.c
description:
Temporarily messing with the timestep drawing
object so that it prints out the geomod shortened
amount instead.


diff -r 72d9e034e17b -r 1d163b16f19c DrawingObjects/src/TimeStep.c
--- a/DrawingObjects/src/TimeStep.c	Tue Aug 26 07:57:24 2008 +0000
+++ b/DrawingObjects/src/TimeStep.c	Wed Aug 27 05:12:14 2008 +0000
@@ -232,7 +232,7 @@ void _lucTimeStep_Draw( void* drawingObj
 	int time = context->timeStep;
 	double currentTime = context->currentTime;
 	/* Allocating Memory */
-	char* displayString = Memory_Alloc_Array( char, 60, "displayString");
+	char* displayString = Memory_Alloc_Array( char, 100, "displayString");
 	char* timeStepString = Memory_Alloc_Array( char, 10, "timeStepString");
  	char* currentTimeString = Memory_Alloc_Array( char, 20, "currentTimeString");
 	
@@ -241,8 +241,9 @@ void _lucTimeStep_Draw( void* drawingObj
 	char* timeStepString = malloc(10*sizeof(char));
 	char* currentTimeString = malloc(10*sizeof(char));*/
 
+#if 0
 	sprintf(timeStepString, "%d", time );	
-	sprintf(currentTimeString, "%E", currentTime );
+	sprintf(currentTimeString, "%e", currentTime );
 	
 	if(self->frame){
 		sprintf(displayString, "%s", "Frame ");
@@ -258,6 +259,9 @@ void _lucTimeStep_Draw( void* drawingObj
 		strcat(displayString, currentTimeString);
 		strcat(displayString, "\0");
 	}
+#endif
+
+        sprintf( displayString, "Shortened distance (cm): %e", currentTime * 6.9444444444444e-4 );
 	
 
 	
@@ -282,10 +286,10 @@ void _lucTimeStep_Draw( void* drawingObj
 		self->colour.blue,
 		self->colour.opacity );
 
-	glRasterPos2i( viewportInfo->width/2 , viewportInfo->height - 13 );
+	glRasterPos2i( viewportInfo->width + 20 , viewportInfo->height - 13 );
 	stringWidth = lucStringWidth( displayString );
 
-	lucMoveRaster( - stringWidth/2, -20 );
+	/*lucMoveRaster( - stringWidth/2, -20 );*/
 	lucPrintString(displayString);
 
 	/* Free the memory */