** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: views.cpp,v 1.76 2001/01/27 01:51:47 kevin Exp $
+** $Id: views.cpp,v 1.79 2001/01/27 03:39:53 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
END_EVENT_TABLE()
ImageFileView::ImageFileView()
-: wxView(), m_pCanvas(NULL), m_pFrame(NULL), m_bMinSpecified(false), m_bMaxSpecified(false), m_pFileMenu(0)
+: wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pFileMenu(0), m_bMinSpecified(false), m_bMaxSpecified(false)
{
m_iDefaultExportFormatID = ImageFile::FORMAT_PNG;
}
differenceImage.setArraySize (rIF.nx(), rIF.ny());
if (! rIF.subtractImages (rCompareIF, differenceImage)) {
- pDifferenceDoc->DeleteAllViews();
+ pDifferenceDoc->getView()->getFrame()->Close(true);
return;
}
if (m_iDefaultTrace > Trace::TRACE_CONSOLE) {
ProjectionsDialog dialogProjections (theScanner, rProj, rPhantom, m_iDefaultTrace, dynamic_cast<wxWindow*>(getFrameForChild()));
for (int iView = 0; iView < rProj.nView(); iView++) {
- ::wxYield();
::wxYield();
if (dialogProjections.isCancelled() || ! dialogProjections.projectView (iView)) {
- pProjectionDoc->DeleteAllViews();
+ pProjectionDoc->getView()->getFrame()->Close(true);
return;
}
::wxYield();
- ::wxYield();
while (dialogProjections.isPaused()) {
::wxYield();
::wxUsleep(50);
for (int i = 0; i < rProj.nView(); i++) {
theScanner.collectProjections (rProj, rPhantom, i, 1, true, m_iDefaultTrace);
if (! dlgProgress.Update (i+1)) {
- pProjectionDoc->DeleteAllViews();
+ pProjectionDoc->getView()->getFrame()->Close(true);
return;
}
}
for (unsigned int i = 0; i < imageFile.nx(); i++) {
rPhantom.convertToImagefile (imageFile, m_iDefaultRasterNSamples, Trace::TRACE_NONE, i, 1, true);
if (! dlgProgress.Update(i+1)) {
- pRasterDoc->DeleteAllViews();
+ pRasterDoc->Close();
+ pRasterDoc->getView()->getFrame()->Close(true);
return;
}
}
if (m_pCanvas) {
m_pCanvas->Clear();
m_pCanvas->setView(NULL);
- m_pCanvas->Show(false);
+ m_pCanvas->Show(false);
m_pCanvas = NULL;
}
wxString s(wxTheApp->GetAppName());
if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView)) {
delete pDlgReconstruct;
delete pReconstruct;
- pReconDoc->DeleteAllViews();
+ pReconDoc->getView()->getFrame()->Close(true);
return;
}
::wxYield();
pReconstruct->reconstructView (i, 1);
if (! dlgProgress.Update(i + 1)) {
delete pReconstruct;
- pReconDoc->DeleteAllViews();
+ pReconDoc->getView()->getFrame()->Close(true);
return;
}
}