r292: *** empty log message ***

[ctsim.git] / src / dlgprojections.cpp

diff --git a/src/dlgprojections.cpp b/src/dlgprojections.cpp
index 702befa5cfb6cfb2bc6e7a847e8ef72ee7e978c5..6ac73fdcac33456145aa4120180e2f7fb94b08c3 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
 **
-**  $Id: dlgprojections.cpp,v 1.6 2000/09/07 14:29:05 kevin Exp $
+**  $Id: dlgprojections.cpp,v 1.9 2000/12/18 02:23:43 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
@@ -117,7 +117,6 @@ ProjectionsDialog::ProjectionsDialog (Scanner& rScanner, Projections& rProj, con
     m_iClientX = sizeDlg.x;
     m_iClientY = sizeDlg.y;
     SetClientSize(sizeDlg);
-    m_bitmap.Create (m_iClientX, m_iClientY); // save a copy of screen
 
     Centre(wxCENTER_FRAME | wxBOTH);
 
@@ -127,6 +126,7 @@ ProjectionsDialog::ProjectionsDialog (Scanner& rScanner, Projections& rProj, con
     Show(TRUE);
     Enable(TRUE); // enable this window
 
+    m_bitmap.Create (m_iClientX, m_iClientY); // save a copy of screen\r
     m_pDC = dynamic_cast<wxDC*> (new wxClientDC (this));
     int x, y;
     this->GetClientSize(&x, &y);
@@ -149,13 +149,14 @@ ProjectionsDialog::showView (int iViewNumber)
        m_iLastView = iViewNumber;
        if (m_iTrace >= Trace::TRACE_PLOT)
            m_pSGP->setViewport (0, 0, 0.66, 1);
-       ::wxYield();        // update the display
+       ::wxYield();        // update the display\r
+ //   m_pSGP->setTextSize (1/100.);\r
        m_rScanner.collectProjections (m_rProjections, m_rPhantom, iViewNumber, 1, true, m_iTrace, m_pSGP);
        ::wxYield();        // update the display
        if (m_iTrace >= Trace::TRACE_PLOT) {
            const DetectorArray& detArray = m_rProjections.getDetectorArray (iViewNumber);
            const DetectorValue* detValues = detArray.detValues();
-           double detPos [detArray.nDet()];
+           double* detPos = new double [detArray.nDet()];
            for (int i = 0; i < detArray.nDet(); i++)
                detPos[i] = i;
            EZPlot ezplot (*m_pSGP);
@@ -166,7 +167,8 @@ ProjectionsDialog::showView (int iViewNumber)
            ezplot.ezset("grid");
            ezplot.ezset("box");
            ezplot.addCurve (detValues, detPos, detArray.nDet());
-           ezplot.plot();
+           ezplot.plot();\r
+               delete detPos;
        }
     }
 }
@@ -276,7 +278,7 @@ void ProjectionsDialog::OnClose(wxCloseEvent& event)
 void
 ProjectionsDialog::OnPaint (wxPaintEvent& event)
 {
-  wxPaintDC paintDC (this);
+  wxPaintDC paintDC (this);\r
   if (m_state == Paused) {
     paintDC.DrawBitmap(m_bitmap, 0, 0, false);
   }