X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fsgp.h;h=f30f582e3df2762114744de2b698a86ca596c29d;hp=a873d18d16e5c5529c3c5a51369903e730ea36d6;hb=ee0105d74fec9d6bfd236e22e9e1d315e46c568e;hpb=bfcc769cf8019eabc8c65c07257c8dbee4b4c977

diff --git a/include/sgp.h b/include/sgp.h
index a873d18..f30f582 100644
--- a/include/sgp.h
+++ b/include/sgp.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: sgp.h,v 1.17 2000/09/02 05:10:39 kevin Exp $
+**  $Id: sgp.h,v 1.20 2000/12/06 01:46:43 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
@@ -36,6 +36,7 @@
 
 #ifdef HAVE_WXWINDOWS
 #include <wx/wx.h>
+#include <wx/font.h>
 #endif
 
 #if HAVE_G2_H
@@ -46,7 +47,7 @@ extern "C" {
 #endif
 
 #include <string>
-
+using namespace std;
 
 class SGPDriver {
 private:
@@ -126,6 +127,7 @@ private:
   double m_dCurrentWorldY;
   double m_dTextAngle;
   bool m_bRecalcTransform;
+  double m_dPointsPerPixel;  // points (72pt/in) per screen pixel;
 
   // Master coordinates are coordinates before CTM transformation
   // World coordinates are coordinates defined by setWindow()
@@ -142,6 +144,7 @@ private:
 
 #if HAVE_WXWINDOWS
   wxPen m_pen;
+  wxFont m_font;
 #endif
 
 public:
@@ -168,7 +171,7 @@ public:
       MARK_BSQUARE = 9,	// big open square 
       MARK_BDIAMOND = 10,	// big open diamond 
   };
-  static const int MARK_COUNT = 11;
+  enum  { MARK_COUNT = 11, };
   static const unsigned char MARKER_BITMAP[MARK_COUNT][5];
 
   SGP (const SGPDriver& driver);
@@ -196,6 +199,8 @@ public:
   void setColor (int icol);
   void setLineStyle (int style);
   void setTextSize (double height);
+  void setTextNDCSize (double height);
+  void setTextPointSize (double height);
   void setTextAngle (double angle);
   void setTextColor (int iFGcolor, int iBGcolor);
   void setPenWidth (int width);
@@ -206,6 +211,9 @@ public:
   void getViewport (double& xmin, double& ymin, double& xmax, double& ymax);
   void getTextExtent (const char *szText, double* x, double* y);
   double getCharHeight ();
+  double getCharWidth ();
+  SGPDriver& getDriver() {return m_driver;}
+  const SGPDriver& getDriver() const {return m_driver;}
 
   void ctmClear ();
   void ctmSet (const TransformationMatrix2D& m);