X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fezplot.h;h=67c6e31306272acf0753bbd4cd22bf9d6d175db0;hb=739e435359d44546dd812fff8c86b815a214d587;hp=11f95ba4f4bebdec4343b2d8b372d6d57be150bf;hpb=ee0105d74fec9d6bfd236e22e9e1d315e46c568e;p=ctsim.git

diff --git a/include/ezplot.h b/include/ezplot.h
index 11f95ba..67c6e31 100644
--- a/include/ezplot.h
+++ b/include/ezplot.h
@@ -7,7 +7,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ezplot.h,v 1.16 2000/12/06 01:46:43 kevin Exp $
+**  $Id: ezplot.h,v 1.19 2000/12/20 14:39:09 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -44,9 +44,9 @@ class EZPlotCurve {
     int m_iSymbol;
     int m_iSymbolFreq;
     int m_iColor;
-    string m_sLegend;
+    std::string m_sLegend;
 
-    EZPlotCurve (const double* x, const double* y, int n, int color, int linestyle, int symbol, int sumbolFreq, const string& legend);
+    EZPlotCurve (const double* x, const double* y, int n, int color, int linestyle, int symbol, int sumbolFreq, const std::string& legend);
 
     ~EZPlotCurve();
 };
@@ -111,15 +111,14 @@ class EZPlotCurve {
  *---------------------------------------------------------------------------*/
 
 #include <vector>
-using namespace std;
 
-typedef vector<EZPlotCurve*>::iterator EZPlotCurveIterator;
-typedef vector<EZPlotCurve*>::const_iterator EZPlotCurveConstIterator;
+typedef std::vector<EZPlotCurve*>::iterator EZPlotCurveIterator;
+typedef std::vector<EZPlotCurve*>::const_iterator EZPlotCurveConstIterator;
 
 class SGP;
 class EZPlot {
  private:
-    vector<class EZPlotCurve*> m_vecCurves;
+	 std::vector<class EZPlotCurve*> m_vecCurves;
 
     // Colors
     int clr_axis;			// color of all axis lines 
@@ -133,10 +132,10 @@ class EZPlot {
     double o_xporigin, o_yporigin;	// origin of plot frame in NDC 
     double o_xlength, o_ylength;	// length of plot frame in NDC 
 
-    string c_xlabel;	// label for x axis 
-    string c_ylabel;	// label for y axis 
-    string c_title;		// title to print above graph 
-    string c_legend;;	// current legend specified 
+    std::string c_xlabel;	// label for x axis 
+    std::string c_ylabel;	// label for y axis 
+    std::string c_title;		// title to print above graph 
+    std::string c_legend;;	// current legend specified 
     
     int o_linestyle, o_color;	// style to use for curves all subsequent curves to EZPLOT 
     int o_xaxis, o_yaxis;		// Specifies where axis & labels are drawn 
@@ -207,8 +206,8 @@ class EZPlot {
 
     void clearCurves ();
 
-    bool ezcmd (char *comm);
-    int do_cmd(int lx);
+    bool ezcmd (const char const *comm);
+    bool do_cmd(int lx);
     void bad_option(char *opt);
     void initPlotSettings();
 
@@ -226,7 +225,8 @@ class EZPlot {
     EZPlot (SGP& sgp);
     ~EZPlot ();
 
-    int ezset (char *command);
+	bool ezset (const std::string& command);
+    bool ezset (const char const *command);
 
     void addCurve (const float* x, const double* y, int num);
     void addCurve (const double* x, const float* y, int num);