projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r295: *** empty log message ***
[ctsim.git]
/
libctgraphics
/
sgp.cpp
diff --git
a/libctgraphics/sgp.cpp
b/libctgraphics/sgp.cpp
index ad33f758cda20e764a55cc52909ad788c8feaa6b..14cfd63e500a9f40d3dc4a94f03588017d4d68c3 100644
(file)
--- a/
libctgraphics/sgp.cpp
+++ b/
libctgraphics/sgp.cpp
@@
-7,7
+7,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.cpp,v 1.
18 2000/12/16 06:12:47
kevin Exp $
+** $Id: sgp.cpp,v 1.
20 2000/12/18 05:40:30
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
@@
-99,11
+99,14
@@
SGP::SGP (const SGPDriver& driver)
static const double dScreenDPI = 82;
static const double dPointsPerInch = 72.;
m_dPointsPerPixel = dPointsPerInch / dScreenDPI;
static const double dScreenDPI = 82;
static const double dPointsPerInch = 72.;
m_dPointsPerPixel = dPointsPerInch / dScreenDPI;
- const int iTestPointSize =
7
2;
+ const int iTestPointSize =
1
2;
m_font.SetPointSize (iTestPointSize);
m_driver.idWX()->SetFont(m_font);
double dTestCharHeight = m_driver.idWX()->GetCharHeight();
m_font.SetPointSize (iTestPointSize);
m_driver.idWX()->SetFont(m_font);
double dTestCharHeight = m_driver.idWX()->GetCharHeight();
- m_dPointsPerPixel = iTestPointSize / dTestCharHeight;
+ m_dPointsPerPixel = iTestPointSize / dTestCharHeight;
\r
+// wxWHITE_BRUSH->SetColour (255, 255, 255);
\r
+// wxWHITE_BRUSH->SetStyle (wxSOLID);
\r
+ m_driver.idWX()->SetBackground (*wxWHITE_BRUSH);
}
#endif
}
#endif
@@
-162,8
+165,13
@@
SGP::eraseWindow ()
g2_clear (m_driver.idG2());
#endif
#if HAVE_WXWINDOWS
g2_clear (m_driver.idG2());
#endif
#if HAVE_WXWINDOWS
- if (m_driver.isWX())
- m_driver.idWX()->Clear();
+ if (m_driver.isWX()) {
+ wxBrush brushWhite;
\r
+ brushWhite.SetColour(255,255,255);
\r
+ m_driver.idWX()->SetBackground(brushWhite);
\r
+ m_driver.idWX()->Clear();
\r
+ m_driver.idWX()->SetBackground(wxNullBrush);
\r
+ }
#endif
}
#endif
}
@@
-419,7
+427,7
@@
SGP::moveRel (double x, double y)
void
SGP::setTextSize (double height)
{
void
SGP::setTextSize (double height)
{
- height /= (
xw_max - xw_min);
+ height /= (
yw_max - yw_min); // convert to NDC
#if HAVE_G2_H
if (m_driver.isG2())
g2_set_font_size(m_driver.idG2(), (height * m_iPhysicalYSize));
#if HAVE_G2_H
if (m_driver.isG2())
g2_set_font_size(m_driver.idG2(), (height * m_iPhysicalYSize));