projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r465: no message
[ctsim.git]
/
include
/
sgp.h
diff --git
a/include/sgp.h
b/include/sgp.h
index 2a1472b20ee9ba80c4c144b80d09e3d8d5e86266..67f1b7c81ed9af6df9d3295ccb56c87fac85cc9b 100644
(file)
--- a/
include/sgp.h
+++ b/
include/sgp.h
@@
-7,9
+7,9
@@
** Date Started: 1984
**
** This is part of the CTSim program
** 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.2
3 2000/12/25 21:54:26
kevin Exp $
+** $Id: sgp.h,v 1.2
6 2001/01/28 19:10:18
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
@@
-125,9
+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;
\r
+ 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()
@@
-145,6
+146,8
@@
private:
#if HAVE_WXWINDOWS
wxPen m_pen;
wxFont* m_pFont;
#if HAVE_WXWINDOWS
wxPen m_pen;
wxFont* m_pFont;
+
+ void initFromDC (wxDC* pDC);
#endif
public:
#endif
public:
@@
-175,7
+178,7
@@
public:
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();
\r
+ ~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);