r259: MSVC modifications

[ctsim.git] / src / dlgprojections.cpp

diff --git a/src/dlgprojections.cpp b/src/dlgprojections.cpp
index 4f793342a37e3e2ad031cb284247a79242077dda..de6d0e634fbb7ef7e0179fa9ea9ca614654e5cee 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.2 2000/08/31 08:38:58 kevin Exp $
+**  $Id: dlgprojections.cpp,v 1.7 2000/12/16 03:29:02 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
@@ -58,8 +58,8 @@ static const int LAYOUT_Y_MARGIN = 4;
 
 BEGIN_EVENT_TABLE(ProjectionsDialog, wxDialog)
    EVT_BUTTON(wxID_CANCEL, ProjectionsDialog::OnCancel)
-   EVT_BUTTON(ID_BTN_PAUSE, ProjectionsDialog::OnPause)
-   EVT_BUTTON(ID_BTN_STEP, ProjectionsDialog::OnStep)
+   EVT_BUTTON(ProjectionsDialog::ID_BTN_PAUSE, ProjectionsDialog::OnPause)
+   EVT_BUTTON(ProjectionsDialog::ID_BTN_STEP, ProjectionsDialog::OnStep)
    EVT_CLOSE(ProjectionsDialog::OnClose)
    EVT_PAINT(ProjectionsDialog::OnPaint)
 END_EVENT_TABLE()
@@ -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;
@@ -106,13 +106,13 @@ ProjectionsDialog::ProjectionsDialog (Scanner& rScanner, Projections& rProj, con
     SetAutoLayout(TRUE);
     Layout();
 
-    wxSize sizeDlg (600,600);
+    wxSize sizeDlg (500,500);
     if (sizeDlg.x != sizeDlg.y) {
       sizeDlg.x = max(sizeDlg.x,sizeDlg.y);
       sizeDlg.y = max(sizeDlg.x,sizeDlg.y);
     }
     if (m_iTrace >= Trace::TRACE_PLOT)
-      sizeDlg.x += 200;
+      sizeDlg.x += 250;
 
     m_iClientX = sizeDlg.x;
     m_iClientY = sizeDlg.y;
@@ -145,26 +145,29 @@ void
 ProjectionsDialog::showView (int iViewNumber)
 {
     if ( iViewNumber < m_rProjections.nView() ) {
-       wxYield();        // update the display
+       ::wxYield();        // update the display
        m_iLastView = iViewNumber;
        if (m_iTrace >= Trace::TRACE_PLOT)
-           m_pSGP->setViewport (0, 0, 0.75, 1);
+           m_pSGP->setViewport (0, 0, 0.66, 1);
+       ::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) {
            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);
-           ezplot.ezset("xporigin 0.75");
+           ezplot.ezset("xporigin 0.66");
            ezplot.ezset("yporigin 0.10");
-           ezplot.ezset("xlength  0.25");
+           ezplot.ezset("xlength  0.34");
            ezplot.ezset("ylength  0.90");
            ezplot.ezset("grid");
            ezplot.ezset("box");
            ezplot.addCurve (detValues, detPos, detArray.nDet());
-           ezplot.plot();
+           ezplot.plot();\r
+               delete detPos;
        }
     }
 }
@@ -172,27 +175,25 @@ ProjectionsDialog::showView (int iViewNumber)
 bool
 ProjectionsDialog::projectView (int iViewNumber)
 {
+  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)
-       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 (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;
 }