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 d9c9caad553a7b466eb5d257411d51bb48fc16c9..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.
15 2000/09/07 04:59:42
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
@@
-52,14
+52,14
@@
RGBColor SGP::s_aRGBColor[] =
int SGP::s_iRGBColorCount = sizeof(s_aRGBColor) / sizeof(class RGBColor);
#ifdef HAVE_WXWINDOWS
int SGP::s_iRGBColorCount = sizeof(s_aRGBColor) / sizeof(class RGBColor);
#ifdef HAVE_WXWINDOWS
-SGPDriver::SGPDriver (wxDC* pDC, int xsize
= 640, int ysize = 480
)
+SGPDriver::SGPDriver (wxDC* pDC, int xsize
, int ysize
)
: m_iPhysicalXSize(xsize), m_iPhysicalYSize(ysize), m_idDriver(0), m_pDC(pDC)
{
m_idDriver |= SGPDRIVER_WXWINDOWS;
}
#endif
: m_iPhysicalXSize(xsize), m_iPhysicalYSize(ysize), m_idDriver(0), m_pDC(pDC)
{
m_idDriver |= SGPDRIVER_WXWINDOWS;
}
#endif
-SGPDriver::SGPDriver (const char* szWinTitle
= "", int xsize = 640, int ysize = 480
)
+SGPDriver::SGPDriver (const char* szWinTitle
, int xsize, int ysize
)
: m_iPhysicalXSize(xsize), m_iPhysicalYSize(ysize), m_sWindowTitle(szWinTitle), m_idDriver(0)
{
#ifdef HAVE_G2_H
: m_iPhysicalXSize(xsize), m_iPhysicalYSize(ysize), m_sWindowTitle(szWinTitle), m_idDriver(0)
{
#ifdef HAVE_G2_H
@@
-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));
@@
-460,7
+468,7
@@
SGP::setTextPointSize (double height)
#endif
#if HAVE_WXWINDOWS
if (m_driver.isWX()) {
#endif
#if HAVE_WXWINDOWS
if (m_driver.isWX()) {
- m_font.SetPointSize (
height
);
+ m_font.SetPointSize (
static_cast<int>(height+0.5)
);
m_driver.idWX()->SetFont (m_font);
}
#endif
m_driver.idWX()->SetFont (m_font);
}
#endif
@@
-596,7
+604,7
@@
SGP::pointRel (double x, double y)
void
void
-SGP::drawText (const string& rsMessage)
+SGP::drawText (const st
d::st
ring& rsMessage)
{
drawText (rsMessage.c_str());
}
{
drawText (rsMessage.c_str());
}