X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fezplot.h;h=716fd3e2b361c8946448a7ecb5ea12d5edcbac6c;hb=bfcc769cf8019eabc8c65c07257c8dbee4b4c977;hp=06601db5515413c006fab7e8a9b21121bff585e6;hpb=711cae0ee02e046370fdb4d6c6f440596ff71980;p=ctsim.git

diff --git a/include/ezplot.h b/include/ezplot.h
index 06601db..716fd3e 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.10 2000/07/28 08:28:08 kevin Exp $
+**  $Id: ezplot.h,v 1.13 2000/08/31 08:38:58 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
@@ -130,12 +130,6 @@ class EZPlot {
     int clr_number;			/* color of axis number labels */
 
     // Options
-    int o_reqcurves;		/* # of curves specified in CURVES command */
-				/* default value is 1, so that a call to EZPLOT
-				   will force a plot */
-    bool o_unknowncurves;		/* TRUE when the user specifies that the 
-				   number of curves is unknown */
-
     double o_xporigin, o_yporigin;	/* origin of plot frame in NDC */
     double o_xlength, o_ylength;	/* length of plot frame in NDC */
 
@@ -211,9 +205,10 @@ class EZPlot {
     bool ezcmd (char *comm);
     int do_cmd(int lx);
     void bad_option(char *opt);
-    static void initkw(void);
+    void initPlotSettings();
 
-    int curveinteract;
+    static void initkw(void);
+    
     static bool ezset_initialized;
 
  public:
@@ -223,8 +218,10 @@ class EZPlot {
     int ezset (char *command);
 
     void addCurve (const float* x, const double* y, int num);
+    void addCurve (const double* x, const float* y, int num);
     void addCurve (const double* x, const double* y, int num);
     void addCurve (const double* y, int n);
+    void addCurve (const float* y, int n);
 
     void plot ();
 };	
@@ -248,9 +245,6 @@ class EZPlot {
 #define S_SYMBOL	-18	
 #define S_EVERY		-19
 #define S_NONE		-20
-#define S_CURVES	-21
-#define S_UNKNOWN	-22
-#define S_END		-23
 #define S_LEGEND	-24
 #define S_XLEGEND	-25
 #define S_YLEGEND	-26