X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fplotfile.h;h=b88793f43ff99d6f8713cf730b7e296ef93efc1e;hp=c60e5795cb028ed9aafea3e013748d2a6a696fbe;hb=4076fbc077adfd9ee610beef09b52d9e12c14abb;hpb=fd1d136a94a6d20013f38d6a997bdfefad0f5e98

diff --git a/include/plotfile.h b/include/plotfile.h
index c60e579..b88793f 100644
--- a/include/plotfile.h
+++ b/include/plotfile.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: plotfile.h,v 1.3 2000/12/20 20:08:48 kevin Exp $
+**  $Id: plotfile.h,v 1.5 2001/01/02 07:47:36 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
@@ -41,37 +41,30 @@
 #include <iostream>
 #include <vector>
 #include "ctsupport.h"
-#include "plotfile.h"
+#include "plotfile.h"
+
 
 // Plotfile structure:
 // 1. Lines that begin with # are comments
 // 2. ASCII file format
 // 3. Header lines begin with <tags> and end with </tags>
-// 4. Valid headers
-//      <header>    (signifies beginning of headers)
-//      <description> (multiple instances may be present)
-//      <date>
-//      <title>
-//      <xlabel>
-//      <ylabel>
-//      <filetype>plotfile</filetype>  (required)
-//      <ncolumns>  (required)
-//      <nrecords>  (required)
-//      </header>   (required, signifies end of headers)
+// 4. Valid headers
+//      <plotfile ncolumns nrecords>    (signifies beginning of plotfile)
+//      <description> (beginning of description lines)
+//      <ezset>       (signifies beginning of ezset commands)
+//      <columns>     Beginning of data columns
 // 5. Data is ASCII file format, one record per line
 //    Number of columns is variable and is set by ncolumns header
-// 6. Data begins with <plotdata> and ends with </plotdata>
+
 
 
 class PlotFile 
 {
  private:
   std::string m_strFilename;
-  std::string m_strTitle;
-  std::string m_strXLabel;
-  std::string m_strYLabel;
   std::string m_strDate;
-  std::vector<std::string> m_vecStrDescriptions;
+  std::vector<std::string> m_vecStrDescriptions;
+  std::vector<std::string> m_vecStrEzsetCommands;
   std::vector<double> m_vecCurves;
   int m_iNumColumns;
   int m_iNumRecords;
@@ -91,44 +84,20 @@ public:
   PlotFile (void);
   ~PlotFile ();
 
-  void setTitle (const std::string& title)
-    { m_strTitle = title; }
-	
-  void setTitle (const char* const title)
-  { m_strTitle = title; }
-
-  void setXLabel (const std::string& label)
-    { m_strXLabel = label; }
-	
-  void setXLabel (const char* const label)
-  { m_strXLabel = label; }
-
-  void setYLabel (const std::string& label)
-    { m_strYLabel = label; }
-
-  void setYLabel (const char* const label)
-  { m_strYLabel = label; }
-
   void setCurveSize (int iNCurves, int iNRecords);
 
-  void addDescription (const char* const pszDesc)
-    { m_vecStrDescriptions.push_back (pszDesc); }
-      
+  void addDescription (const char* const pszDesc)
+    { m_vecStrDescriptions.push_back (pszDesc); }
+
+  void addEzsetCommand (const char* const pszCmd)
+    { m_vecStrEzsetCommands.push_back (pszCmd); }
+  
   bool addColumn (int iCol, const double* const pdColumn);
 
   bool addColumn (int iCol, const float* const pdColumn);
 
   void getColumn (int iCol, double *pdColumnData) const;
 
-  const std::string& getTitle () const
-    { return m_strTitle; }
-
-  const std::string& getXLabel () const
-    { return m_strXLabel; }
-
-  const std::string& getYLabel () const
-    { return m_strXLabel; }
-
   const std::string& getDate () const
     { return m_strDate; }
 
@@ -148,6 +117,12 @@ public:
   const std::string& getDescription (int iDescIndex) const
     { return m_vecStrDescriptions[iDescIndex]; }
 
+  unsigned int getNumEzsetCommands (void) const
+      { return m_vecStrEzsetCommands.size(); }
+
+  const std::string& getEzsetCommand (int iIndex) const
+    { return m_vecStrEzsetCommands[iIndex]; }
+
   bool fileRead (const char* const filename);
 
   bool fileWrite (const char* const filename);
@@ -156,6 +131,7 @@ public:
       {  return m_strFilename; }
 
   void printHeaders (std::ostream& os) const;
+  void printHeaders (std::ostringstream& os) const;
 };