X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctgraphics%2Fsgp.cpp;h=263101fa3766e010ccd3553a5c8ed50e3b49559b;hp=4b2d5dcfea9cf1c52a8211b0a3d656dfd65ef821;hb=23f5654dacb1952c15bda92c2606fae3a55e48ad;hpb=5ec5449357eaae253d6b1026621262480e2efa63

diff --git a/libctgraphics/sgp.cpp b/libctgraphics/sgp.cpp
index 4b2d5dc..263101f 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.23 2000/12/25 21:54:26 kevin Exp $
+**  $Id: sgp.cpp,v 1.26 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
@@ -91,49 +91,59 @@ SGP::SGP (const SGPDriver& driver)
   ndc_to_mc.setIdentity();
   m_ctm.setIdentity();
 
-#if HAVE_WXWINDOWS
+#ifdef HAVE_WXWINDOWS
+  initFromDC (driver.idWX());
+#endif
+
+  setWindow (0., 0., 1., 1.);
+  setViewport (0., 0., 1., 1.);
+  moveAbs (0., 0.);
+  stylusNDC (0., 0., false);
+  
+  setTextAngle (0.);
+  setTextPointSize (12);
+  setColor (C_BLACK);
+  setLineStyle (LS_SOLID);
+}
+
+
+#ifdef HAVE_WXWINDOWS
+void
+SGP::initFromDC (wxDC* pDC)
+{
   m_pen.SetWidth (1);
 
   if (m_driver.isWX()) {
     static const double dScreenDPI = 82;
     static const double dPointsPerInch = 72.;
     m_dPointsPerPixel = dPointsPerInch / dScreenDPI;
-    const int iTestPointSize = 12;
+    const int iTestPointSize = 12;
     m_pFont = new wxFont (wxROMAN, wxNORMAL, wxNORMAL, wxNORMAL);
-    m_pFont->SetPointSize (iTestPointSize);
-    m_pFont->SetWeight (wxNORMAL);
+    m_pFont->SetPointSize (iTestPointSize);
+    m_pFont->SetWeight (wxNORMAL);
     m_pFont->SetStyle (wxNORMAL);
-    m_pFont->SetFamily (wxROMAN);
-#ifdef MSVC
-    m_pFont->SetFaceName(wxString("times new roman"));
-#endif
+    m_pFont->SetFamily (wxROMAN);
+#ifdef MSVC
+    m_pFont->SetFaceName(wxString("times new roman"));
+#endif
     m_driver.idWX()->SetFont (*m_pFont);
     double dTestCharHeight = m_driver.idWX()->GetCharHeight();
-    m_dPointsPerPixel = iTestPointSize / dTestCharHeight;
+    m_dPointsPerPixel = iTestPointSize / dTestCharHeight;
   	m_driver.idWX()->SetBackground (*wxWHITE_BRUSH);
   }
+}
 #endif
 
-  setWindow (0., 0., 1., 1.);
-  setViewport (0., 0., 1., 1.);
-  moveAbs (0., 0.);
-  stylusNDC (0., 0., false);
-  
-  setTextAngle (0.);
-  setTextPointSize (12);
-  setColor (C_BLACK);
-  setLineStyle (LS_SOLID);
-}
 
-SGP::~SGP()
-{
-#if HAVE_WXWINDOWS
-  if (m_driver.isWX()) {
-    m_driver.idWX()->SetFont (wxNullFont);
-    delete m_pFont;
-  }
-#endif
-}
+SGP::~SGP()
+{
+#if HAVE_WXWINDOWS
+  if (m_driver.isWX()) {
+    m_driver.idWX()->SetFont (wxNullFont);
+    delete m_pFont;
+  }
+#endif
+}
 
 void
 SGP::stylusNDC (double x, double y, bool beam)
@@ -179,19 +189,19 @@ SGP::eraseWindow ()
     g2_clear (m_driver.idG2());
 #endif
 #if HAVE_WXWINDOWS
-  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
+  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
 }
@@ -394,37 +404,37 @@ SGP::setMarker (int idMarke, int iColor)
 //==============================================================
 void 
 SGP::setLineStyle (int style)
-{
-  m_iLinestyle = style;
-
-#if HAVE_WXWINDOWS
-  if (m_driver.isWX()) {
-    switch (m_iLinestyle) {
-    case LS_SOLID:
-      m_pen.SetStyle (wxSOLID);
-      break;
-    case LS_DASH1:
-      m_pen.SetStyle (wxLONG_DASH);
-      break;
-    case LS_DASH2:
-      m_pen.SetStyle (wxSHORT_DASH);
-      break;
-    case LS_DASH3:
-      m_pen.SetStyle (wxDOT_DASH);
-      break;
-    case LS_DASH4:
-      m_pen.SetStyle (wxCROSS_HATCH);
-      break;
-    case LS_DOTTED:
-      m_pen.SetStyle (wxDOT);
-      break;
-    default:
-      m_pen.SetStyle (wxSOLID);
-      break;
-    }
-    m_driver.idWX()->SetPen (m_pen);
-  }
-#endif
+{
+  m_iLinestyle = style;
+
+#if HAVE_WXWINDOWS
+  if (m_driver.isWX()) {
+    switch (m_iLinestyle) {
+    case LS_SOLID:
+      m_pen.SetStyle (wxSOLID);
+      break;
+    case LS_DASH1:
+      m_pen.SetStyle (wxLONG_DASH);
+      break;
+    case LS_DASH2:
+      m_pen.SetStyle (wxSHORT_DASH);
+      break;
+    case LS_DASH3:
+      m_pen.SetStyle (wxDOT_DASH);
+      break;
+    case LS_DASH4:
+      m_pen.SetStyle (wxCROSS_HATCH);
+      break;
+    case LS_DOTTED:
+      m_pen.SetStyle (wxDOT);
+      break;
+    default:
+      m_pen.SetStyle (wxSOLID);
+      break;
+    }
+    m_driver.idWX()->SetPen (m_pen);
+  }
+#endif
 }
 
 //==============================================================
@@ -519,7 +529,8 @@ SGP::setTextPointSize (double height)
 #endif
 #if HAVE_WXWINDOWS
   if (m_driver.isWX()) {
-      m_pFont->SetPointSize (static_cast<int>(height+0.5));
+    m_iTextPointSize = static_cast<int>(height+0.5);
+      m_pFont->SetPointSize (m_iTextPointSize);
       m_driver.idWX()->SetFont (*m_pFont);
   }
 #endif
@@ -533,6 +544,11 @@ SGP::getTextExtent (const char* szText, double* worldW, double* worldH)
     wxString sText (szText);
     wxCoord deviceW, deviceH;
     m_driver.idWX()->GetTextExtent (sText, &deviceW, &deviceH);
+    if (m_dTextAngle == 90 || m_dTextAngle == -90) {
+      wxCoord temp = deviceW;
+      deviceW = deviceH;
+      deviceH = temp;
+    }
     *worldW = (xw_max - xw_min) * deviceW / static_cast<double>(m_iPhysicalXSize);;
     *worldH = (yw_max - yw_min) * deviceH / static_cast<double>(m_iPhysicalYSize);
   }
@@ -547,7 +563,7 @@ 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
@@ -563,7 +579,7 @@ 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
@@ -936,7 +952,10 @@ const unsigned char SGP::MARKER_BITMAP[MARK_COUNT][5] =
 void
 SGP::setDC (wxDC* pDC)
 {
-  if (m_driver.isWX())
+  if (m_driver.isWX()) {
     m_driver.setDC(pDC);
+    initFromDC (pDC);
+    setTextPointSize (m_iTextPointSize);
+  }
 }
 #endif