r631: no message

[ctsim.git] / include / sgp.h

diff --git a/include/sgp.h b/include/sgp.h
index 67f1b7c81ed9af6df9d3295ccb56c87fac85cc9b..9e4f8b9fa60eb80ac1620c39ea9a630ef46f5d4d 100644 (file)
--- a/include/sgp.h
+++ b/include/sgp.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: sgp.h,v 1.26 2001/01/28 19:10:18 kevin Exp $
+**  $Id: sgp.h,v 1.27 2001/03/11 15:27:30 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
@@ -129,6 +129,7 @@ private:
   bool m_bRecalcTransform;
   double m_dPointsPerPixel;  // points (72pt/in) per screen pixel;
   int m_iLinestyle;
+  int m_iMarker;
 
   // Master coordinates are coordinates before CTM transformation
   // World coordinates are coordinates defined by setWindow()
@@ -162,17 +163,17 @@ public:
   };
 
   enum {            // Codes for marker symbols
-      MARK_POINT = 0,  // small dot 
-      MARK_SQUARE = 1, // empty square 
-      MARK_FSQUARE = 2,        // filled square 
-      MARK_DIAMOND = 3,        // empty diamond 
-      MARK_FDIAMOND = 4,       // filled diamond 
-      MARK_CROSS =  5, // cross 
-      MARK_XCROSS = 6, // x 
-      MARK_CIRCLE = 7,    // open circle 
-      MARK_FCIRCLE = 8,        // filled circle 
-      MARK_BSQUARE = 9,        // big open square 
-      MARK_BDIAMOND = 10,      // big open diamond 
+      MARKER_POINT = 0,        // small dot 
+      MARKER_SQUARE = 1,       // empty square 
+      MARKER_FSQUARE = 2,      // filled square 
+      MARKER_DIAMOND = 3,      // empty diamond 
+      MARKER_FDIAMOND = 4,     // filled diamond 
+      MARKER_CROSS =  5,       // cross 
+      MARKER_XCROSS = 6,       // x 
+      MARKER_CIRCLE = 7,    // open circle 
+      MARKER_FCIRCLE = 8,      // filled circle 
+      MARKER_BSQUARE = 9,      // big open square 
+      MARKER_BDIAMOND = 10,    // big open diamond 
   };
   enum  { MARK_COUNT = 11, };
   static const unsigned char MARKER_BITMAP[MARK_COUNT][5];
@@ -208,7 +209,7 @@ public:
   void setTextAngle (double angle);
   void setTextColor (int iFGcolor, int iBGcolor);
   void setPenWidth (int width);
-  void setMarker (int idMarker, int color);
+  void setMarker (int idMarker);
   void setRasterOp (int ro);
 
   void getWindow (double& xmin, double& ymin, double& xmax, double& ymax);