projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r358: no message
[ctsim.git]
/
include
/
sgp.h
diff --git
a/include/sgp.h
b/include/sgp.h
index fce79a67509b650629d45c3d1ad8cd6e4cdb0aac..611654ef81b530562ccd8d6c6786758841c8f6b6 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.
18 2000/09/04 09:06:46
kevin Exp $
+** $Id: sgp.h,v 1.
25 2001/01/04 21:28:41
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
@@
-48,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
@@
-82,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,8
+125,10
@@
private:
double m_dCurrentWorldX;
double m_dCurrentWorldY;
double m_dTextAngle;
double m_dCurrentWorldX;
double m_dCurrentWorldY;
double m_dTextAngle;
+ int m_iTextPointSize;
bool m_bRecalcTransform;
double m_dPointsPerPixel; // points (72pt/in) per screen pixel;
bool m_bRecalcTransform;
double m_dPointsPerPixel; // points (72pt/in) per screen pixel;
+ int m_iLinestyle;
// 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()
@@
-144,7
+145,9
@@
private:
#if HAVE_WXWINDOWS
wxPen m_pen;
#if HAVE_WXWINDOWS
wxPen m_pen;
- wxFont m_font;
+ wxFont* m_pFont;
+
+ void initFromDC (wxDC* pDC);
#endif
public:
#endif
public:
@@
-171,10
+174,11
@@
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);
+ ~SGP();
void drawCircle (const double r);
void drawArc (const double r, double start, double stop);
void drawCircle (const double r);
void drawArc (const double r, double start, double stop);
@@
-184,7
+188,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);