X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fdlgprojections.cpp;h=b816ae0ba6a88476d88ae0e8bf38638235002d3a;hb=92a0f68cb5d5062787b0cbb2664fafe2b2c9ae37;hp=690d003d0a3686b90879e45c09942f1b0dc01156;hpb=c149735f56364c224ec6847d0f32ba06af86dc5b;p=ctsim.git

diff --git a/src/dlgprojections.cpp b/src/dlgprojections.cpp
index 690d003..b816ae0 100644
--- 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.4 2000/09/02 16:40:36 kevin Exp $
+**  $Id: dlgprojections.cpp,v 1.8 2000/12/17 22:30:34 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
@@ -68,7 +68,7 @@ IMPLEMENT_CLASS(ProjectionsDialog, wxDialog)
 
 
 ProjectionsDialog::ProjectionsDialog (Scanner& rScanner, Projections& rProj, const Phantom& rPhantom, const int iTrace, wxWindow *parent)
-    : wxDialog(parent, -1, "Collect Projections"), m_rScanner(rScanner), m_rProjections(rProj), m_rPhantom(rPhantom), m_pSGPDriver(NULL), m_pSGP(NULL), m_iTrace(iTrace), m_pDC(NULL), m_btnAbort(0), m_btnPause(0), m_btnStep(0)
+    : wxDialog(parent, -1, "Collect Projections", wxDefaultPosition), m_rScanner(rScanner), m_rProjections(rProj), m_rPhantom(rPhantom), m_pSGPDriver(NULL), m_pSGP(NULL), m_iTrace(iTrace), m_pDC(NULL), m_btnAbort(0), m_btnPause(0), m_btnStep(0)
 {
     m_state = Continue;
     m_iLastView = -1;
@@ -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
     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
+    m_pSGP->setTextSize (1/25.);
 	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();
+		delete detPos;
 	}
     }
 }
@@ -174,29 +176,25 @@ ProjectionsDialog::showView (int iViewNumber)
 bool
 ProjectionsDialog::projectView (int iViewNumber)
 {
-    if (iViewNumber < m_rProjections.nView()) {
-      showView (iViewNumber);
-      wxYield();        // update the display
-      if (m_iTrace >= Trace::TRACE_PLOT) {
-	sleep(1);
-      }
-    } else {
-      m_state = Finished;    // so that we return TRUE below and 
-      // that [Cancel] handler knew what to do
-#if 0
-      if ( m_btnAbort ) 
-	m_btnAbort->SetLabel(_("Close")); // tell the user what he should do...
-      wxYield();
-      
-      (void)ShowModal();
-#endif
+  if (iViewNumber <= m_iLastView)  // already done this view
+    return true;
+
+  if (iViewNumber < m_rProjections.nView()) {
+    showView (iViewNumber);
+    wxYield();        // update the display
+    if (m_iTrace >= Trace::TRACE_PLOT) {
+      ::wxUsleep(500);
     }
+  } else {
+    m_state = Finished;    // so that we return TRUE below and 
+    // that [Cancel] handler knew what to do
+  }
     
 #ifdef __WXMAC__
-    MacUpdateImmediately();
+  MacUpdateImmediately();
 #endif
     
-    return m_state != Cancelled;
+  return m_state != Cancelled;
 }