X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctgraphics%2Fsgp.cpp;h=d3ea434b9b27a2cd8946f41b516d6d7bdced3543;hb=fd1d136a94a6d20013f38d6a997bdfefad0f5e98;hp=14cfd63e500a9f40d3dc4a94f03588017d4d68c3;hpb=e9222e8a8190ca48f30a1359badae06bcb200210;p=ctsim.git

diff --git a/libctgraphics/sgp.cpp b/libctgraphics/sgp.cpp
index 14cfd63..d3ea434 100644
--- 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
 **
-**  $Id: sgp.cpp,v 1.20 2000/12/18 05:40:30 kevin Exp $
+**  $Id: sgp.cpp,v 1.22 2000/12/18 06:47:03 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
@@ -165,12 +165,19 @@ SGP::eraseWindow ()
     g2_clear (m_driver.idG2());
 #endif
 #if HAVE_WXWINDOWS
-  if (m_driver.isWX()) {
-    wxBrush brushWhite;
+  if (m_driver.isWX()) {
+	wxBrush brushWhite;
 	brushWhite.SetColour(255,255,255);
 	m_driver.idWX()->SetBackground(brushWhite);
 	m_driver.idWX()->Clear();
 	m_driver.idWX()->SetBackground(wxNullBrush);
+#if 1
+	wxPen pen;
+	pen.SetColour(255,255,255);
+	m_driver.idWX()->SetBrush (brushWhite);
+	m_driver.idWX()->DrawRectangle (0, 0, m_iPhysicalXSize, m_iPhysicalYSize);
+	m_driver.idWX()->SetBrush (wxNullBrush);
+#endif
   }
 #endif
 }
@@ -498,10 +505,11 @@ SGP::getCharHeight ()
 #if HAVE_WXWINDOWS
   if (m_driver.isWX()) {
     dHeight = m_driver.idWX()->GetCharHeight();
-    dHeight /= static_cast<double>(m_iPhysicalYSize);
+    dHeight /= static_cast<double>(m_iPhysicalYSize);
+	dHeight /= (yv_max - yv_min); // scale to viewport;
   }
 #endif
-  dHeight *= (yw_max - yw_min);
+  dHeight *= (yw_max - yw_min);  // scale to world coordinates
   return dHeight;
 }
 
@@ -513,10 +521,11 @@ SGP::getCharWidth ()
 #if HAVE_WXWINDOWS
   if (m_driver.isWX()) {
     dWidth = m_driver.idWX()->GetCharWidth();
-    dWidth /= static_cast<double>(m_iPhysicalXSize);
+    dWidth /= static_cast<double>(m_iPhysicalXSize);
+	dWidth /= (xv_max - xv_min); // scale to viewport
   }
 #endif
-  dWidth *= (xw_max - xw_min);
+  dWidth *= (xw_max - xw_min); //scale to world coordinates
   return dWidth;
 }