From 586af74e42519b0511311df711bab2b2be962629 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 4 Sep 2000 09:24:21 +0000 Subject: [PATCH] r190: *** empty log message *** --- src/dlgprojections.cpp | 34 +++++++++++++++------------------- src/dlgreconstruct.cpp | 11 +++++++---- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/dlgprojections.cpp b/src/dlgprojections.cpp index 690d003..8875fda 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.5 2000/09/04 09:24:21 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 @@ -174,29 +174,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) { + sleep(1); } + } 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; } diff --git a/src/dlgreconstruct.cpp b/src/dlgreconstruct.cpp index 5a6d46a..b7ad2c4 100644 --- a/src/dlgreconstruct.cpp +++ b/src/dlgreconstruct.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: dlgreconstruct.cpp,v 1.3 2000/09/04 09:06:46 kevin Exp $ +** $Id: dlgreconstruct.cpp,v 1.4 2000/09/04 09:24:21 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 @@ -211,10 +211,13 @@ ReconstructDialog::showView (int iViewNumber) bool ReconstructDialog::reconstructView (int iViewNumber) { - ::wxYield(); // update the display - showView (iViewNumber); - ::wxYield(); // update the display + if (iViewNumber <= m_iLastView) // have already done this view + return true; + if (iViewNumber < m_rProjections.nView()) { + ::wxYield(); // update the display + showView (iViewNumber); + ::wxYield(); // update the display if (m_iTrace >= Trace::TRACE_PLOT) { ::wxUsleep(250); } -- 2.34.1