scopeapp-cvs

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

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

Modified Files:
	ScopeView.m TestSampler.m XYPlotView.m 
Log Message:
Minor fixes for compiling on linux


Index: ScopeView.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeView.m,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ScopeView.m	15 Jul 2002 06:01:56 -0000	1.6
--- ScopeView.m	18 Jul 2002 07:35:58 -0000	1.7
***************
*** 27,32 ****
  #import "ScopeView.h"
  
! static double_t gTimeScales[10] = {0.001,0.002,0.005,0.01,0.02,0.05,0.1};
! static double_t gVoltScales[7] = {0.01,0.02,0.05,0.1,0.2,0.5,1};
  
  // trigger channel settings
--- 27,32 ----
  #import "ScopeView.h"
  
! static double gTimeScales[10] = {0.001,0.002,0.005,0.01,0.02,0.05,0.1};
! static double gVoltScales[7] = {0.01,0.02,0.05,0.1,0.2,0.5,1};
  
  // trigger channel settings

Index: TestSampler.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/TestSampler.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestSampler.m	25 Jun 2002 01:41:30 -0000	1.4
--- TestSampler.m	18 Jul 2002 07:36:00 -0000	1.5
***************
*** 27,30 ****
--- 27,32 ----
  #import "TestSampler.h"
  
+ #include <math.h>
+ 
  // Possible values for the sampler's conditional lock
  enum
***************
*** 187,191 ****
  	myFrequency += 10 * ((float)random() / (float)INT_MAX - 0.5);
  	
! 	if(myOwner == nil) return noErr;
  	
  	for(curChannel = 0; curChannel < myChannelCount; curChannel++)
--- 189,193 ----
  	myFrequency += 10 * ((float)random() / (float)INT_MAX - 0.5);
  	
! 	if(myOwner == nil) return self;
  	
  	for(curChannel = 0; curChannel < myChannelCount; curChannel++)
***************
*** 210,214 ****
  	}
  	
! 	return noErr;
  }
  
--- 212,216 ----
  	}
  	
! 	return self;
  }
  

Index: XYPlotView.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/XYPlotView.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XYPlotView.m	15 Jul 2002 06:05:46 -0000	1.1
--- XYPlotView.m	18 Jul 2002 07:36:00 -0000	1.2
***************
*** 27,31 ****
  #import "XYPlotView.h"
  
! static double_t gVoltScales[7] = {0.01,0.02,0.05,0.1,0.2,0.5,1};
  
  @implementation XYPlotView
--- 27,31 ----
  #import "XYPlotView.h"
  
! static double gVoltScales[7] = {0.01,0.02,0.05,0.1,0.2,0.5,1};
  
  @implementation XYPlotView