r348: fix linefeed problem

[ctsim.git] / libctgraphics / sgp.cpp

diff --git a/libctgraphics/sgp.cpp b/libctgraphics/sgp.cpp
index a7450936dc65d30d27bcc87d541645bbacca99ce..ec129d211837fed5ef0b492f3431b113b36b7a84 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.24 2000/12/26 21:13:15 kevin Exp $
+**  $Id: sgp.cpp,v 1.25 2001/01/02 16:02:13 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


@@ -98,18 +98,18 @@ 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 = 12;\r
+    const int iTestPointSize = 12;

     m_pFont = new wxFont (wxROMAN, wxNORMAL, wxNORMAL, wxNORMAL);
     m_pFont = new wxFont (wxROMAN, wxNORMAL, wxNORMAL, wxNORMAL);

-    m_pFont->SetPointSize (iTestPointSize);\r
-    m_pFont->SetWeight (wxNORMAL);\r
+    m_pFont->SetPointSize (iTestPointSize);
+    m_pFont->SetWeight (wxNORMAL);

     m_pFont->SetStyle (wxNORMAL);
     m_pFont->SetStyle (wxNORMAL);

-    m_pFont->SetFamily (wxROMAN);\r
-#ifdef MSVC\r
-    m_pFont->SetFaceName(wxString("times new roman"));\r
-#endif\r
+    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_driver.idWX()->SetFont (*m_pFont);
     double dTestCharHeight = m_driver.idWX()->GetCharHeight();

-    m_dPointsPerPixel = iTestPointSize / dTestCharHeight;\r
+    m_dPointsPerPixel = iTestPointSize / dTestCharHeight;

        m_driver.idWX()->SetBackground (*wxWHITE_BRUSH);
   }
 #endif
        m_driver.idWX()->SetBackground (*wxWHITE_BRUSH);
   }
 #endif


@@ -121,19 +121,19 @@ SGP::SGP (const SGPDriver& driver)
   
   setTextAngle (0.);
   setTextPointSize (12);
   
   setTextAngle (0.);
   setTextPointSize (12);

-  setColor (C_BLACK);\r
+  setColor (C_BLACK);

   setLineStyle (LS_SOLID);
 }
 
   setLineStyle (LS_SOLID);
 }
 

-SGP::~SGP()\r
-{\r
-#if HAVE_WXWINDOWS\r
-  if (m_driver.isWX()) {\r
-    m_driver.idWX()->SetFont (wxNullFont);\r
-    delete m_pFont;\r
-  }\r
-#endif\r
-}\r
+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)
 
 void
 SGP::stylusNDC (double x, double y, bool beam)


@@ -179,19 +179,19 @@ SGP::eraseWindow ()
     g2_clear (m_driver.idG2());
 #endif
 #if HAVE_WXWINDOWS
     g2_clear (m_driver.idG2());
 #endif
 #if HAVE_WXWINDOWS

-  if (m_driver.isWX()) {\r
-       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
-#if 1\r
-       wxPen pen;\r
-       pen.SetColour(255,255,255);\r
-       m_driver.idWX()->SetBrush (brushWhite);\r
-       m_driver.idWX()->DrawRectangle (0, 0, m_iPhysicalXSize, m_iPhysicalYSize);\r
-       m_driver.idWX()->SetBrush (wxNullBrush);\r
-#endif\r
+  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
 }
   }
 #endif
 }


@@ -394,37 +394,37 @@ SGP::setMarker (int idMarke, int iColor)
 //==============================================================
 void 
 SGP::setLineStyle (int style)
 //==============================================================
 void 
 SGP::setLineStyle (int style)

-{\r
-  m_iLinestyle = style;\r
-
-#if HAVE_WXWINDOWS\r
-  if (m_driver.isWX()) {\r
-    switch (m_iLinestyle) {\r
-    case LS_SOLID:\r
-      m_pen.SetStyle (wxSOLID);\r
-      break;\r
-    case LS_DASH1:\r
-      m_pen.SetStyle (wxLONG_DASH);\r
-      break;\r
-    case LS_DASH2:\r
-      m_pen.SetStyle (wxSHORT_DASH);\r
-      break;\r
-    case LS_DASH3:\r
-      m_pen.SetStyle (wxDOT_DASH);\r
-      break;\r
-    case LS_DASH4:\r
-      m_pen.SetStyle (wxCROSS_HATCH);\r
-      break;\r
-    case LS_DOTTED:\r
-      m_pen.SetStyle (wxDOT);\r
-      break;\r
-    default:\r
-      m_pen.SetStyle (wxSOLID);\r
-      break;\r
-    }\r
-    m_driver.idWX()->SetPen (m_pen);\r
-  }\r
-#endif\r
+{
+  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

 }
 
 //==============================================================
 }
 
 //==============================================================


@@ -532,11 +532,11 @@ SGP::getTextExtent (const char* szText, double* worldW, double* worldH)
   if (m_driver.isWX()) {
     wxString sText (szText);
     wxCoord deviceW, deviceH;
   if (m_driver.isWX()) {
     wxString sText (szText);
     wxCoord deviceW, deviceH;

-    m_driver.idWX()->GetTextExtent (sText, &deviceW, &deviceH);\r
-    if (m_dTextAngle == 90 || m_dTextAngle == -90) {\r
-      wxCoord temp = deviceW;\r
-      deviceW = deviceH;\r
-      deviceH = temp;\r
+    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);
     }
     *worldW = (xw_max - xw_min) * deviceW / static_cast<double>(m_iPhysicalXSize);;
     *worldH = (yw_max - yw_min) * deviceH / static_cast<double>(m_iPhysicalYSize);


@@ -552,7 +552,7 @@ SGP::getCharHeight ()
 #if HAVE_WXWINDOWS
   if (m_driver.isWX()) {
     dHeight = m_driver.idWX()->GetCharHeight();
 #if HAVE_WXWINDOWS
   if (m_driver.isWX()) {
     dHeight = m_driver.idWX()->GetCharHeight();

-    dHeight /= static_cast<double>(m_iPhysicalYSize);\r
+    dHeight /= static_cast<double>(m_iPhysicalYSize);

        dHeight /= (yv_max - yv_min); // scale to viewport;
   }
 #endif
        dHeight /= (yv_max - yv_min); // scale to viewport;
   }
 #endif


@@ -568,7 +568,7 @@ SGP::getCharWidth ()
 #if HAVE_WXWINDOWS
   if (m_driver.isWX()) {
     dWidth = m_driver.idWX()->GetCharWidth();
 #if HAVE_WXWINDOWS
   if (m_driver.isWX()) {
     dWidth = m_driver.idWX()->GetCharWidth();

-    dWidth /= static_cast<double>(m_iPhysicalXSize);\r
+    dWidth /= static_cast<double>(m_iPhysicalXSize);

        dWidth /= (xv_max - xv_min); // scale to viewport
   }
 #endif
        dWidth /= (xv_max - xv_min); // scale to viewport
   }
 #endif