thplot-cvs

[Tony P. <ap...@us...>]

Update of /cvsroot/thplot/thplot/src/Draw
In directory usw-pr-cvs1:/tmp/cvs-serv17611/src/Draw

Modified Files:
	Axis.cpp Axis.h Grid.cpp Grid.h 
Log Message:
Compile fixes for g++ 3.0.4


Index: Axis.cpp
===================================================================
RCS file: /cvsroot/thplot/thplot/src/Draw/Axis.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Axis.cpp	3 Jul 2002 16:13:59 -0000	1.6
--- Axis.cpp	4 Jul 2002 23:42:36 -0000	1.7
***************
*** 66,70 ****
  Axis::~Axis(void){}
  
! bool Axis::DrawGL(double min, double max, double delta, ParamList& pnames ) {
      float x2, y2;
      int i;
--- 66,71 ----
  Axis::~Axis(void){}
  
! bool Axis::DrawGL(double min, double max, double delta, 
!                    ParameterSelect::ParamList& pnames ) {
      float x2, y2;
      int i;

Index: Axis.h
===================================================================
RCS file: /cvsroot/thplot/thplot/src/Draw/Axis.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Axis.h	3 Jul 2002 13:23:40 -0000	1.4
--- Axis.h	4 Jul 2002 23:42:36 -0000	1.5
***************
*** 30,38 ****
  #include <string>
  
- //#define OGLFT_NO_QT
- //#define OGLFT_NO_SOLID
  #include <Util/OGLFT.h>
  
  #include <Main/Globals.h>
  #include <Draw/Grid.h>
  
--- 30,37 ----
  #include <string>
  
  #include <Util/OGLFT.h>
  
  #include <Main/Globals.h>
+ #include <Gui/ParameterSelect.h>
  #include <Draw/Grid.h>
  
***************
*** 48,52 ****
      void tickLabels(bool enable) { labelson = enable; }
      void setWidth(float w) { width = w; } 
!     bool DrawGL( double min, double max, double delta, ParamList& pnames);
      void setAxisLabel(string al) { axisLabel = al; }
      string getAxisLabel(void) { return axisLabel; }
--- 47,52 ----
      void tickLabels(bool enable) { labelson = enable; }
      void setWidth(float w) { width = w; } 
!     bool DrawGL( double min, double max, double delta, 
!                   ParameterSelect::ParamList& pnames);
      void setAxisLabel(string al) { axisLabel = al; }
      string getAxisLabel(void) { return axisLabel; }

Index: Grid.cpp
===================================================================
RCS file: /cvsroot/thplot/thplot/src/Draw/Grid.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Grid.cpp	4 Jul 2002 15:53:26 -0000	1.5
--- Grid.cpp	4 Jul 2002 23:42:36 -0000	1.6
***************
*** 43,47 ****
  }
  
! void Grid::setData(csvData *d, string independent, ParamList dependents) {
  	if( d != NULL ) {
      data = d;
--- 43,48 ----
  }
  
! void Grid::setData(csvData *d, string independent,
!                    ParameterSelect::ParamList dependents) {
  	if( d != NULL ) {
      data = d;

Index: Grid.h
===================================================================
RCS file: /cvsroot/thplot/thplot/src/Draw/Grid.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Grid.h	2 Jul 2002 17:20:42 -0000	1.2
--- Grid.h	4 Jul 2002 23:42:36 -0000	1.3
***************
*** 19,27 ****
  #define GRID_H
  
  #include <Draw/Axis.h>
  #include <Draw/Curve.h>
  #include <Draw/Grid.h>
  #include <Data/csvData.h>
! #include <Main/Globals.h>
  /**
    *@author Tony Peden
--- 19,29 ----
  #define GRID_H
  
+ #include <Main/Globals.h>
  #include <Draw/Axis.h>
  #include <Draw/Curve.h>
  #include <Draw/Grid.h>
  #include <Data/csvData.h>
! #include <Gui/ParameterSelect.h>
! 
  /**
    *@author Tony Peden
***************
*** 39,43 ****
      double getW(void) { return w; }
      double getH(void) { return h; }
!     void setData(csvData* d, string independent, ParamList dependents);
      void clearData(void);
      csvData* getData(void) { return data; }
--- 41,46 ----
      double getW(void) { return w; }
      double getH(void) { return h; }
!     void setData(csvData* d, string independent, 
!                      ParameterSelect::ParamList dependents);
      void clearData(void);
      csvData* getData(void) { return data; }
***************
*** 65,70 ****
    CurveList curves;
    
!   ParamList indep_names;
!   ParamList dep_names;
    
    double indep2grid,indep_max,indep_min;
--- 68,73 ----
    CurveList curves;
    
!   ParameterSelect::ParamList indep_names;
!   ParameterSelect::ParamList dep_names;
    
    double indep2grid,indep_max,indep_min;