projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r186: *** empty log message ***
[ctsim.git]
/
include
/
sgp.h
diff --git
a/include/sgp.h
b/include/sgp.h
index 62407526e47f75efe1c439429086382400c57a12..b026cdc6f1634cdcb67f2b08fae8b4633d28406a 100644
(file)
--- 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
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: sgp.h,v 1.1
4 2000/08/25 15:59:13
kevin Exp $
+** $Id: sgp.h,v 1.1
6 2000/08/31 08:38:58
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
**
** 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
@@
-72,7
+72,7
@@
public:
#endif
SGPDriver (const char* szWinTitle = "", int xsize = 640, int ysize = 480);
#endif
SGPDriver (const char* szWinTitle = "", int xsize = 640, int ysize = 480);
-
+
~SGPDriver ();
int getPhysicalXSize () const
~SGPDriver ();
int getPhysicalXSize () const
@@
-96,6
+96,9
@@
public:
#ifdef HAVE_WXWINDOWS
wxDC* idWX () const
{ return m_pDC; }
#ifdef HAVE_WXWINDOWS
wxDC* idWX () const
{ return m_pDC; }
+
+ void setDC (wxDC* dc)
+ { m_pDC = dc; }
#endif
};
#endif
};
@@
-105,7
+108,7
@@
class SGP {
private:
int m_iPhysicalXSize; // Physical Window size
int m_iPhysicalYSize;
private:
int m_iPhysicalXSize; // Physical Window size
int m_iPhysicalYSize;
-
const
SGPDriver m_driver;
+ SGPDriver m_driver;
double xw_min; // Window extents
double yw_min;
double xw_min; // Window extents
double yw_min;
@@
-138,7
+141,7
@@
private:
static int s_iRGBColorCount;
#if HAVE_WXWINDOWS
static int s_iRGBColorCount;
#if HAVE_WXWINDOWS
- wxPen
* m_pP
en;
+ wxPen
m_p
en;
#endif
public:
#endif
public:
@@
-171,7
+174,7
@@
public:
SGP (const SGPDriver& driver);
void drawCircle (const double r);
SGP (const SGPDriver& driver);
void drawCircle (const double r);
- void drawArc (
double start, double stop, const double r
);
+ void drawArc (
const double r, double start, double stop
);
void drawRect (double xmin, double ymin, double xmax, double ymax);
void lineAbs(double x, double y);
void moveAbs(double x, double y);
void drawRect (double xmin, double ymin, double xmax, double ymax);
void lineAbs(double x, double y);
void moveAbs(double x, double y);
@@
-195,9
+198,14
@@
public:
void setTextSize (double height);
void setTextAngle (double angle);
void setTextColor (int iFGcolor, int iBGcolor);
void setTextSize (double height);
void setTextAngle (double angle);
void setTextColor (int iFGcolor, int iBGcolor);
+ void setPenWidth (int width);
void setMarker (int idMarker, int color);
void setRasterOp (int ro);
void setMarker (int idMarker, int color);
void setRasterOp (int ro);
+ void getViewport (double &xmin, double &ymin, double& xmax, double& ymax);
+ void getTextExtent (const char *szText, double* x, double* y);
+ double getCharHeight ();
+
void ctmClear ();
void ctmSet (const TransformationMatrix2D& m);
void preTranslate (double x, double y);
void ctmClear ();
void ctmSet (const TransformationMatrix2D& m);
void preTranslate (double x, double y);
@@
-215,6
+223,10
@@
public:
void stylusNDC (double x, double y, bool beam);
void pointNDC (double x, double y);
void markerNDC (double x, double y);
void stylusNDC (double x, double y, bool beam);
void pointNDC (double x, double y);
void markerNDC (double x, double y);
+
+#if HAVE_WXWINDOWS
+ void setDC (wxDC* pDC);
+#endif
};
};