[Scopeapp-cvs]scopeapp/src TraceView.m,1.3,1.4 XYPlotView.m,1.4,1.5 ScopeView.m,1.9,1.10

[<sco...@li...>]

Update of /cvsroot/scopeapp/scopeapp/src
In directory usw-pr-cvs1:/tmp/cvs-serv13306

Modified Files:
	TraceView.m XYPlotView.m ScopeView.m 
Log Message:
Use myDataStored[] in trace classes


Index: TraceView.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/TraceView.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TraceView.m	29 Jul 2002 08:54:48 -0000	1.3
--- TraceView.m	30 Jul 2002 03:58:21 -0000	1.4
***************
*** 70,76 ****
  	myCollectedData[1] = malloc(myDataWanted[1] * sizeof(Sample));
  	myDataCollected[0] = 0;
! 	myDataCollected[0] = 0;
  	myDisplayData[0] = NULL;
  	myDisplayData[1] = NULL;
  }
  
--- 70,78 ----
  	myCollectedData[1] = malloc(myDataWanted[1] * sizeof(Sample));
  	myDataCollected[0] = 0;
! 	myDataCollected[1] = 0;
  	myDisplayData[0] = NULL;
  	myDisplayData[1] = NULL;
+ 	myDataStored[0] = 0;
+ 	myDataStored[1] = 0;
  }
  
***************
*** 328,332 ****
  
  		// Override for what seems to be a bug in gnustep
! #ifdef MACOSX		
  		[self display];
  #else 
--- 330,334 ----
  
  		// Override for what seems to be a bug in gnustep
! #ifdef __APPLE__		
  		[self display];
  #else 

Index: XYPlotView.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/XYPlotView.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** XYPlotView.m	22 Jul 2002 12:33:16 -0000	1.4
--- XYPlotView.m	30 Jul 2002 03:58:21 -0000	1.5
***************
*** 116,120 ****
  	
  	for(curSample = 0;
! 		(curSample < myDataCollected[0]) && (curSample < myDataCollected[1]);
  		curSample++)
  	{
--- 116,120 ----
  	
  	for(curSample = 0;
! 		(curSample < myDataStored[0]) && (curSample < myDataStored[1]);
  		curSample++)
  	{

Index: ScopeView.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeView.m,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ScopeView.m	22 Jul 2002 12:35:21 -0000	1.9
--- ScopeView.m	30 Jul 2002 03:58:21 -0000	1.10
***************
*** 308,312 ****
  	switch(traceMode) {
  		case eTraceChannel1:
! 			for(curSample = 0; curSample < myDataWanted[0]; curSample++) {
  				curX = (float)curSample / (mySampleRate * myXScales[0]);
  				curValue = myDisplayData[0][curSample];
--- 308,312 ----
  	switch(traceMode) {
  		case eTraceChannel1:
! 			for(curSample = 0; curSample < myDataStored[0]; curSample++) {
  				curX = (float)curSample / (mySampleRate * myXScales[0]);
  				curValue = myDisplayData[0][curSample];
***************
*** 316,320 ****
  			break;
  		case eTraceChannel2:
! 			for(curSample = 0; curSample < myDataWanted[1]; curSample++) {
  				curX = (float)curSample / (mySampleRate * myXScales[0]);
  				curValue = myDisplayData[1][curSample];
--- 316,320 ----
  			break;
  		case eTraceChannel2:
! 			for(curSample = 0; curSample < myDataStored[1]; curSample++) {
  				curX = (float)curSample / (mySampleRate * myXScales[0]);
  				curValue = myDisplayData[1][curSample];
***************
*** 324,328 ****
  			break;
  		case eTraceAdd:
! 			for(curSample = 0; curSample < myDataWanted[0]; curSample++) {
  				curX = (float)curSample / (mySampleRate * myXScales[0]);
  				curValue = (myDisplayData[0][curSample] +
--- 324,328 ----
  			break;
  		case eTraceAdd:
! 			for(curSample = 0; curSample < myDataStored[0]; curSample++) {
  				curX = (float)curSample / (mySampleRate * myXScales[0]);
  				curValue = (myDisplayData[0][curSample] +
***************
*** 333,337 ****
  			break;
  		case eTraceSubtract:
! 			for(curSample = 0; curSample < myDataWanted[0]; curSample++) {
  				curX = (float)curSample / (mySampleRate * myXScales[0]);
  				curValue = (myDisplayData[0][curSample] -
--- 333,337 ----
  			break;
  		case eTraceSubtract:
! 			for(curSample = 0; curSample < myDataStored[0]; curSample++) {
  				curX = (float)curSample / (mySampleRate * myXScales[0]);
  				curValue = (myDisplayData[0][curSample] -