r348: fix linefeed problem

[ctsim.git] / src / dlgprojections.cpp

diff --git a/src/dlgprojections.cpp b/src/dlgprojections.cpp
index 489d912b99097fb16eaddef99bac7057f52b3dfb..fb2f8cdf9835d221e3eb5d8369b8c198c62c520c 100644 (file)
--- a/src/dlgprojections.cpp
+++ b/src/dlgprojections.cpp
@@ -9,7 +9,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: dlgprojections.cpp,v 1.14 2000/12/29 15:45:06 kevin Exp $
+**  $Id: dlgprojections.cpp,v 1.15 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


@@ -126,7 +126,7 @@ ProjectionsDialog::ProjectionsDialog (Scanner& rScanner, Projections& rProj, con
     Show(TRUE);
     Enable(TRUE); // enable this window
        
     Show(TRUE);
     Enable(TRUE); // enable this window
        

-    m_bitmap.Create (m_iClientX, m_iClientY); // save a copy of screen\r
+    m_bitmap.Create (m_iClientX, m_iClientY); // save a copy of screen

     m_pDC = dynamic_cast<wxDC*> (new wxClientDC (this));
     int x, y;
     this->GetClientSize(&x, &y);
     m_pDC = dynamic_cast<wxDC*> (new wxClientDC (this));
     int x, y;
     this->GetClientSize(&x, &y);


@@ -145,8 +145,8 @@ void
 ProjectionsDialog::showView (int iViewNumber)
 {
     if ( iViewNumber < m_rProjections.nView() ) {
 ProjectionsDialog::showView (int iViewNumber)
 {
     if ( iViewNumber < m_rProjections.nView() ) {

-               m_iLastView = iViewNumber;\r
-               ::wxYield();        // update the display\r
+               m_iLastView = iViewNumber;
+               ::wxYield();        // update the display

                m_pSGP->eraseWindow();
                m_btnPause->Refresh();
                m_btnStep->Refresh();
                m_pSGP->eraseWindow();
                m_btnPause->Refresh();
                m_btnStep->Refresh();


@@ -154,7 +154,7 @@ ProjectionsDialog::showView (int iViewNumber)
 
                if (m_iTrace >= Trace::TRACE_PLOT)
                        m_pSGP->setViewport (0, 0, 0.66, 1);
 
                if (m_iTrace >= Trace::TRACE_PLOT)
                        m_pSGP->setViewport (0, 0, 0.66, 1);

-               ::wxYield();        // update the display\r
+               ::wxYield();        // update the display

                m_rScanner.collectProjections (m_rProjections, m_rPhantom, iViewNumber, 1, true, m_iTrace, m_pSGP);
                ::wxYield();        // update the display
                if (m_iTrace >= Trace::TRACE_PLOT) {
                m_rScanner.collectProjections (m_rProjections, m_rPhantom, iViewNumber, 1, true, m_iTrace, m_pSGP);
                ::wxYield();        // update the display
                if (m_iTrace >= Trace::TRACE_PLOT) {


@@ -165,11 +165,11 @@ ProjectionsDialog::showView (int iViewNumber)
                                detPos[i] = i;
                        EZPlot ezplot;
                        ezplot.ezset ("grid");
                                detPos[i] = i;
                        EZPlot ezplot;
                        ezplot.ezset ("grid");

-                       ezplot.ezset ("box");\r
+                       ezplot.ezset ("box");

                        ezplot.ezset ("yticks left");
                        ezplot.ezset ("yticks left");

-                       ezplot.addCurve (detValues, detPos, detArray.nDet());\r
+                       ezplot.addCurve (detValues, detPos, detArray.nDet());

                        m_pSGP->setViewport (0.67, 0.1, 1., 1.);
                        m_pSGP->setViewport (0.67, 0.1, 1., 1.);

-                       ezplot.plot (m_pSGP);\r
+                       ezplot.plot (m_pSGP);

                        delete detPos;
                }
     }
                        delete detPos;
                }
     }


@@ -232,8 +232,8 @@ ProjectionsDialog::OnPause (wxCommandEvent& event)
                showView (m_iLastView);
                m_state = Paused;
                m_btnPause->SetLabel (wxString("Resume"));
                showView (m_iLastView);
                m_state = Paused;
                m_btnPause->SetLabel (wxString("Resume"));

-               m_pSGP->setDC (m_pDC);\r
-               m_memoryDC.SelectObject(wxNullBitmap);\r
+               m_pSGP->setDC (m_pDC);
+               m_memoryDC.SelectObject(wxNullBitmap);

        } else if (m_state == Paused) {
                m_state = Continue;
                m_btnPause->SetLabel (wxString("Pause"));
        } else if (m_state == Paused) {
                m_state = Continue;
                m_btnPause->SetLabel (wxString("Pause"));


@@ -248,22 +248,22 @@ ProjectionsDialog::OnStep (wxCommandEvent& event)
        } else if (m_state == Continue) {
                m_memoryDC.SelectObject (m_bitmap);       // in memoryDC
                m_pSGP->setDC (&m_memoryDC);
        } else if (m_state == Continue) {
                m_memoryDC.SelectObject (m_bitmap);       // in memoryDC
                m_pSGP->setDC (&m_memoryDC);

-               m_memoryDC.SetFont (*wxSWISS_FONT);\r
+               m_memoryDC.SetFont (*wxSWISS_FONT);

                showView (m_iLastView);
                // m_rScanner.collectProjections (m_rProjections, m_rPhantom, m_iLastView, 1, true, m_iTrace, m_pSGP);
                m_state = Paused;
                m_btnPause->SetLabel (wxString("Resume"));
                showView (m_iLastView);
                // m_rScanner.collectProjections (m_rProjections, m_rPhantom, m_iLastView, 1, true, m_iTrace, m_pSGP);
                m_state = Paused;
                m_btnPause->SetLabel (wxString("Resume"));

-               m_pSGP->setDC (m_pDC);\r
-               m_memoryDC.SelectObject(wxNullBitmap);\r
-               Refresh();\r
+               m_pSGP->setDC (m_pDC);
+               m_memoryDC.SelectObject(wxNullBitmap);
+               Refresh();

        } else if (m_state == Paused) {
        } else if (m_state == Paused) {

-               m_memoryDC.SelectObject (m_bitmap);       // in memoryDC\r
-               m_pSGP->setDC (&m_memoryDC);\r
-               m_memoryDC.SetFont (*wxSWISS_FONT);\r
+               m_memoryDC.SelectObject (m_bitmap);       // in memoryDC
+               m_pSGP->setDC (&m_memoryDC);
+               m_memoryDC.SetFont (*wxSWISS_FONT);

                projectView (m_iLastView + 1);
                projectView (m_iLastView + 1);

-               m_pSGP->setDC (m_pDC);\r
-               m_memoryDC.SelectObject(wxNullBitmap);\r
-               Refresh();\r
+               m_pSGP->setDC (m_pDC);
+               m_memoryDC.SelectObject(wxNullBitmap);
+               Refresh();

        }
 }
 
        }
 }
 


@@ -280,7 +280,7 @@ void ProjectionsDialog::OnClose(wxCloseEvent& event)
 void
 ProjectionsDialog::OnPaint (wxPaintEvent& event)
 {
 void
 ProjectionsDialog::OnPaint (wxPaintEvent& event)
 {

-       wxPaintDC paintDC (this);\r
+       wxPaintDC paintDC (this);

        if (m_state == Paused) {
                paintDC.DrawBitmap (m_bitmap, 0, 0, false);
        }
        if (m_state == Paused) {
                paintDC.DrawBitmap (m_bitmap, 0, 0, false);
        }