r7061: initial property settings

[ctsim.git] / include / plotfile.h

diff --git a/include/plotfile.h b/include/plotfile.h
index b88793f43ff99d6f8713cf730b7e296ef93efc1e..2643081e7ea39adcd14e21063de012f2a0fab78a 100644 (file)
--- a/include/plotfile.h
+++ b/include/plotfile.h
@@ -7,9 +7,9 @@
 **     Date Started: Dec 2000
 **
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
+**  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: plotfile.h,v 1.5 2001/01/02 07:47:36 kevin Exp $
+**  $Id$
 **
 **  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,97 +41,103 @@
 #include <iostream>
 #include <vector>
 #include "ctsupport.h"
-#include "plotfile.h"\r
+#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\r
+// 4. Valid headers
 //      <plotfile ncolumns nrecords>    (signifies beginning of plotfile)
-//      <description> (beginning of description lines)\r
-//      <ezset>       (signifies beginning of ezset commands)\r
+//      <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
-\r
+
 
 
 class PlotFile 
 {
- private:
+private:
   std::string m_strFilename;
   std::string m_strDate;
-  std::vector<std::string> m_vecStrDescriptions;\r
+  std::vector<std::string> m_vecStrDescriptions;
   std::vector<std::string> m_vecStrEzsetCommands;
   std::vector<double> m_vecCurves;
   int m_iNumColumns;
   int m_iNumRecords;
-
+  bool m_bScatterPlot;
+  
   bool headerRead (std::iostream& os);
   bool headerWrite (std::iostream& os);
   bool columnsRead (std::iostream& os);
   bool columnsWrite (std::iostream& os);
-
+  
   void initHeaders ();
-
+  
   PlotFile (const PlotFile& rhs);        // copy constructor
   PlotFile& operator= (const PlotFile&); // assignment operator
-
+  
 public:
   PlotFile (int iNColumns, int iNRecords);
   PlotFile (void);
   ~PlotFile ();
-
-  void setCurveSize (int iNCurves, int iNRecords);
-
-  void addDescription (const char* const pszDesc)\r
-    { m_vecStrDescriptions.push_back (pszDesc); }\r
-\r
-  void addEzsetCommand (const char* const pszCmd)\r
-    { m_vecStrEzsetCommands.push_back (pszCmd); }\r
+  
+  void setCurveSize (int iNCurves, int iNRecords, bool bScatterPlot = false);
+  
+  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);\r
-\r
-  void getColumn (int iCol, double *pdColumnData) const;\r
-\r
+  
+  bool addColumn (int iCol, const float* const pdColumn);
+  
+  void getColumn (int iCol, double *pdColumnData) const;
+  
   const std::string& getDate () const
-    { return m_strDate; }
-
+  { return m_strDate; }
+  
   int getNumColumns () const
-    { return m_iNumColumns; }
-
+  { return m_iNumColumns; }
+  
   int getNumRecords () const
-    { return m_iNumRecords; }
-\r
-  bool getMinMax (int startingCol, double& min, double& max) const;\r
-\r
-  bool statistics (int startingCol, double& min, double& max, double& mean, double& mode, double& median, double &stddev) const;\r
-
+  { return m_iNumRecords; }
+  
+  bool getIsScatterPlot() const
+  { return m_bScatterPlot; }
+  
+  bool getMinMax (int startingCol, double& min, double& max) const;
+  
+  bool statistics (int startingCol, double& min, double& max, double& mean, double& mode, double& median, double &stddev) const;
+  
   unsigned int getNumDescriptions (void) const
-      { return m_vecStrDescriptions.size(); }
-
+  { return m_vecStrDescriptions.size(); }
+  
   const std::string& getDescription (int iDescIndex) const
-    { return m_vecStrDescriptions[iDescIndex]; }
-
-  unsigned int getNumEzsetCommands (void) const\r
-      { return m_vecStrEzsetCommands.size(); }\r
-\r
-  const std::string& getEzsetCommand (int iIndex) const\r
-    { return m_vecStrEzsetCommands[iIndex]; }\r
-\r
+  { 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);
-
+  
   const std::string& getFilename (void) const 
-      {  return m_strFilename; }
-
+  {  return m_strFilename; }
+  
   void printHeaders (std::ostream& os) const;
   void printHeaders (std::ostringstream& os) const;
+  void printHeadersBrief (std::ostream& os) const;
+  void printHeadersBrief (std::ostringstream& os) const;
 };