X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fsgp.h;h=ee6594ea0214d773d716c66c0e8c3dc2a8ba4423;hb=82a12d49ecd2c09c301e6513b549c358f715e764;hp=611654ef81b530562ccd8d6c6786758841c8f6b6;hpb=23f5654dacb1952c15bda92c2606fae3a55e48ad;p=ctsim.git

diff --git a/include/sgp.h b/include/sgp.h
index 611654e..ee6594e 100644
--- a/include/sgp.h
+++ b/include/sgp.h
@@ -7,9 +7,9 @@
 **      Date Started: 1984
 **
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
+**  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: sgp.h,v 1.25 2001/01/04 21:28:41 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
@@ -103,7 +103,7 @@ public:
 };
 
 
-class RGBColor;
+class SGP_RGBColor;
 class SGP {
 private:
   int m_iPhysicalXSize;   // Physical Window size 
@@ -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()
@@ -140,7 +141,7 @@ private:
   
   void calc_transform ();
 
-  static RGBColor s_aRGBColor[];
+  static SGP_RGBColor s_aRGBColor[];
   static int s_iRGBColorCount;
 
 #if HAVE_WXWINDOWS
@@ -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);
@@ -282,14 +283,14 @@ enum RasterOp {
 };
 
 
-class RGBColor {
+class SGP_RGBColor {
  private:
   short int r;
   short int g;
   short int b;
 
  public:
-  RGBColor (int r, int g, int b)
+  SGP_RGBColor (int r, int g, int b)
     : r(r), g(g), b(b)
     {}