projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r280: Initial cvs import
[ctsim.git]
/
include
/
sgp.h
diff --git
a/include/sgp.h
b/include/sgp.h
index a873d18d16e5c5529c3c5a51369903e730ea36d6..36b3b759db29c7dae3469a5f729d9dd64accd72c 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.
17 2000/09/02 05:10:39
kevin Exp $
+** $Id: sgp.h,v 1.
22 2000/12/16 06:12:47
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
@@
-36,6
+36,7
@@
#ifdef HAVE_WXWINDOWS
#include <wx/wx.h>
#ifdef HAVE_WXWINDOWS
#include <wx/wx.h>
+#include <wx/font.h>
#endif
#if HAVE_G2_H
#endif
#if HAVE_G2_H
@@
-47,12
+48,11
@@
extern "C" {
#include <string>
#include <string>
-
class SGPDriver {
private:
int m_iPhysicalXSize;
int m_iPhysicalYSize;
class SGPDriver {
private:
int m_iPhysicalXSize;
int m_iPhysicalYSize;
- string m_sWindowTitle;
+ st
d::st
ring m_sWindowTitle;
int m_idDriver;
#ifdef HAVE_WXWINDOWS
int m_idDriver;
#ifdef HAVE_WXWINDOWS
@@
-81,14
+81,14
@@
public:
int getPhysicalYSize () const
{ return m_iPhysicalYSize; }
int getPhysicalYSize () const
{ return m_iPhysicalYSize; }
- const string& getWindowTitle () const
+ const st
d::st
ring& getWindowTitle () const
{ return m_sWindowTitle; }
bool isWX () const
{ return m_sWindowTitle; }
bool isWX () const
-
{ return (m_idDriver & SGPDRIVER_WXWINDOWS
); }
+
{ return (m_idDriver & SGPDRIVER_WXWINDOWS ? true : false
); }
bool isG2 () const
bool isG2 () const
-
{ return (m_idDriver & SGPDRIVER_G2
); }
+
{ return (m_idDriver & SGPDRIVER_G2 ? true : false
); }
int idG2 () const
{ return m_idG2; }
int idG2 () const
{ return m_idG2; }
@@
-126,6
+126,7
@@
private:
double m_dCurrentWorldY;
double m_dTextAngle;
bool m_bRecalcTransform;
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()
// Master coordinates are coordinates before CTM transformation
// World coordinates are coordinates defined by setWindow()
@@
-142,6
+143,7
@@
private:
#if HAVE_WXWINDOWS
wxPen m_pen;
#if HAVE_WXWINDOWS
wxPen m_pen;
+ wxFont m_font;
#endif
public:
#endif
public:
@@
-168,7
+170,7
@@
public:
MARK_BSQUARE = 9, // big open square
MARK_BDIAMOND = 10, // big open diamond
};
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);
static const unsigned char MARKER_BITMAP[MARK_COUNT][5];
SGP (const SGPDriver& driver);
@@
-181,7
+183,7
@@
public:
void lineRel(double x, double y);
void moveRel(double x, double y);
void drawText(const char *szMessage);
void lineRel(double x, double y);
void moveRel(double x, double y);
void drawText(const char *szMessage);
- void drawText(const string& rsMessage);
+ void drawText(const st
d::st
ring& rsMessage);
void polylineAbs(double x[], double y[], int n);
void markerAbs (double x, double y);
void markerRel(double x, double y);
void polylineAbs(double x[], double y[], int n);
void markerAbs (double x, double y);
void markerRel(double x, double y);
@@
-196,6
+198,8
@@
public:
void setColor (int icol);
void setLineStyle (int style);
void setTextSize (double height);
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);
void setTextAngle (double angle);
void setTextColor (int iFGcolor, int iBGcolor);
void setPenWidth (int width);
@@
-206,6
+210,9
@@
public:
void getViewport (double& xmin, double& ymin, double& xmax, double& ymax);
void getTextExtent (const char *szText, double* x, double* y);
double getCharHeight ();
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);
void ctmClear ();
void ctmSet (const TransformationMatrix2D& m);