** 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.6 2000/09/07 14:29:05 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
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;
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;
}