** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: views.cpp,v 1.99 2001/02/08 06:25:07 kevin Exp $
+** $Id: views.cpp,v 1.110 2001/02/20 18:10:45 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
if (rIF.nx() == 0 || rIF.ny() == 0)
*theApp->getLog() << "Properties: empty imagefile\n";
else {
- const std::string& rFilename = rIF.getFilename();
+ const std::string rFilename = m_pFrame->GetTitle().c_str();
std::ostringstream os;
double min, max, mean, mode, median, stddev;
rIF.statistics (rIF.getArray(), min, max, mean, mode, median, stddev);
<< " and " << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str() << ": "
<< os.str().c_str();
pDifferenceImage->labelAdd (os.str().c_str());
- pDifferenceDoc->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ pDifferenceDoc->Modify (true);
pDifferenceDoc->UpdateAllViews (this);
pDifferenceDoc->getView()->OnUpdate (this, NULL);
pDifferenceDoc->getView()->getFrame()->Show(true);
ImageFile& rIF = GetDocument()->getImageFile();
rIF.invertPixelValues (rIF);
rIF.labelAdd ("Invert Pixel Values");
- GetDocument()->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ GetDocument()->Modify (true);
GetDocument()->UpdateAllViews (this);
}
ImageFile& rIF = GetDocument()->getImageFile();
rIF.square (rIF);
rIF.labelAdd ("Square Pixel Values");
- GetDocument()->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ GetDocument()->Modify (true);
GetDocument()->UpdateAllViews (this);
}
ImageFile& rIF = GetDocument()->getImageFile();
rIF.sqrt (rIF);
rIF.labelAdd ("Square-root Pixel Values");
- GetDocument()->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ GetDocument()->Modify (true);
GetDocument()->UpdateAllViews (this);
}
ImageFile& rIF = GetDocument()->getImageFile();
rIF.log (rIF);
rIF.labelAdd ("Logrithm base-e Pixel Values");
- GetDocument()->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ GetDocument()->Modify (true);
GetDocument()->UpdateAllViews (this);
}
ImageFile& rIF = GetDocument()->getImageFile();
rIF.exp (rIF);
rIF.labelAdd ("Exponent base-e Pixel Values");
- GetDocument()->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ GetDocument()->Modify (true);
GetDocument()->UpdateAllViews (this);
}
newImage.labelsCopy (rRHSIF, s.c_str());
newImage.labelAdd (os.str().c_str());
*theApp->getLog() << os.str().c_str() << "\n";
- pNewDoc->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ pNewDoc->Modify (true);
pNewDoc->UpdateAllViews (this);
pNewDoc->getView()->OnUpdate (this, NULL);
pNewDoc->getView()->getFrame()->Show(true);
newImage.labelsCopy (rRHSIF, s.c_str());
newImage.labelAdd (os.str().c_str());
*theApp->getLog() << os.str().c_str() << "\n";
- pNewDoc->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ pNewDoc->Modify (true);
pNewDoc->UpdateAllViews (this);
pNewDoc->getView()->OnUpdate (this, NULL);
pNewDoc->getView()->getFrame()->Show(true);
newImage.labelsCopy (rRHSIF, s.c_str());
newImage.labelAdd (os.str().c_str());
*theApp->getLog() << os.str().c_str() << "\n";
- pNewDoc->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ pNewDoc->Modify (true);
pNewDoc->UpdateAllViews (this);
pNewDoc->getView()->OnUpdate (this, NULL);
pNewDoc->getView()->getFrame()->Show(true);
newImage.labelsCopy (rRHSIF, s.c_str());
newImage.labelAdd (os.str().c_str());
*theApp->getLog() << os.str().c_str() << "\n";
- pNewDoc->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ pNewDoc->Modify (true);
pNewDoc->UpdateAllViews (this);
pNewDoc->getView()->OnUpdate (this, NULL);
pNewDoc->getView()->getFrame()->Show(true);
rIF.labelAdd ("FFT Image");
m_bMinSpecified = false;
m_bMaxSpecified = false;
- GetDocument()->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ GetDocument()->Modify (true);
GetDocument()->UpdateAllViews (this);
}
rIF.labelAdd ("IFFT Image");
m_bMinSpecified = false;
m_bMaxSpecified = false;
- GetDocument()->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ GetDocument()->Modify (true);
GetDocument()->UpdateAllViews (this);
}
rIF.labelAdd ("FFT Rows");
m_bMinSpecified = false;
m_bMaxSpecified = false;
- GetDocument()->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ GetDocument()->Modify (true);
GetDocument()->UpdateAllViews (this);
}
rIF.labelAdd ("IFFT Rows");
m_bMinSpecified = false;
m_bMaxSpecified = false;
- GetDocument()->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ GetDocument()->Modify (true);
GetDocument()->UpdateAllViews (this);
}
rIF.labelAdd ("FFT Columns");
m_bMinSpecified = false;
m_bMaxSpecified = false;
- GetDocument()->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ GetDocument()->Modify (true);
GetDocument()->UpdateAllViews (this);
}
rIF.labelAdd ("IFFT Columns");
m_bMinSpecified = false;
m_bMaxSpecified = false;
- GetDocument()->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ GetDocument()->Modify (true);
GetDocument()->UpdateAllViews (this);
}
#endif
rIF.labelAdd ("Fourier Image");
m_bMinSpecified = false;
m_bMaxSpecified = false;
- GetDocument()->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ GetDocument()->Modify (true);
GetDocument()->UpdateAllViews (this);
}
rIF.labelAdd ("Inverse Fourier Image");
m_bMinSpecified = false;
m_bMaxSpecified = false;
- GetDocument()->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ GetDocument()->Modify (true);
GetDocument()->UpdateAllViews (this);
}
rIF.labelAdd ("Shuffle Natural To Fourier Order");
m_bMinSpecified = false;
m_bMaxSpecified = false;
- GetDocument()->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ GetDocument()->Modify (true);
GetDocument()->UpdateAllViews (this);
}
rIF.labelAdd ("Shuffle Fourier To Natural Order");
m_bMinSpecified = false;
m_bMaxSpecified = false;
- GetDocument()->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ GetDocument()->Modify (true);
GetDocument()->UpdateAllViews (this);
}
rIF.labelAdd ("Magnitude of complex-image");
m_bMinSpecified = false;
m_bMaxSpecified = false;
- GetDocument()->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ GetDocument()->Modify (true);
GetDocument()->UpdateAllViews (this);
}
}
rIF.labelAdd ("Phase of complex-image");
m_bMinSpecified = false;
m_bMaxSpecified = false;
- GetDocument()->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ GetDocument()->Modify (true);
GetDocument()->UpdateAllViews (this);
}
}
m_pFileMenu->Append(wxID_PREVIEW, "Print Preview");
#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
+ m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
#endif
GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
filter_menu->Append (IFMENU_FILTER_EXP, "&Exp");
filter_menu->AppendSeparator();
#ifdef HAVE_FFT
- filter_menu->Append (IFMENU_FILTER_FFT, "2D &FFT");
- filter_menu->Append (IFMENU_FILTER_IFFT, "2D &IFFT");
+ filter_menu->Append (IFMENU_FILTER_FFT, "2-D &FFT");
+ filter_menu->Append (IFMENU_FILTER_IFFT, "2-D &IFFT");
filter_menu->Append (IFMENU_FILTER_FFT_ROWS, "FFT Rows");
filter_menu->Append (IFMENU_FILTER_IFFT_ROWS, "IFFT Rows");
filter_menu->Append (IFMENU_FILTER_FFT_COLS, "FFT Columns");
filter_menu->Append (IFMENU_FILTER_IFFT_COLS, "IFFT Columns");
- filter_menu->Append (IFMENU_FILTER_FOURIER, "F&ourier");
- filter_menu->Append (IFMENU_FILTER_INVERSE_FOURIER, "Inverse Fo&urier");
+ filter_menu->Append (IFMENU_FILTER_FOURIER, "2-D F&ourier");
+ filter_menu->Append (IFMENU_FILTER_INVERSE_FOURIER, "2-D Inverse Fo&urier");
#else
filter_menu->Append (IFMENU_FILTER_FOURIER, "&Fourier");
filter_menu->Append (IFMENU_FILTER_INVERSE_FOURIER, "&Inverse Fourier");
wxMenu *help_menu = new wxMenu;
help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1");
- help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H");
+ help_menu->Append (IDH_QUICKSTART, "&Quick Start");
help_menu->Append(MAINMENU_HELP_ABOUT, "&About");
wxMenuBar *menu_bar = new wxMenuBar;
subframe->Centre(wxBOTH);
- wxAcceleratorEntry accelEntries[11];
- accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
- accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('S'), wxID_SAVE);
- accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('W'), wxID_CLOSE);
- accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('H'), MAINMENU_HELP_TOPICS);
- accelEntries[4].Set (wxACCEL_CTRL, static_cast<int>('P'), MAINMENU_FILE_CREATE_PHANTOM);
- accelEntries[5].Set (wxACCEL_CTRL, static_cast<int>('F'), MAINMENU_FILE_CREATE_FILTER);
- accelEntries[6].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
- accelEntries[7].Set (wxACCEL_CTRL, static_cast<int>('A'), IFMENU_VIEW_SCALE_AUTO);
- accelEntries[8].Set (wxACCEL_CTRL, static_cast<int>('U'), IFMENU_VIEW_SCALE_FULL);
- accelEntries[9].Set (wxACCEL_CTRL, static_cast<int>('E'), IFMENU_VIEW_SCALE_MINMAX);
+ wxAcceleratorEntry accelEntries[4];
+ accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('A'), IFMENU_VIEW_SCALE_AUTO);
+ accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('U'), IFMENU_VIEW_SCALE_FULL);
+ accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('E'), IFMENU_VIEW_SCALE_MINMAX);
#if wxUSE_GLCANVAS
- accelEntries[10].Set (wxACCEL_CTRL, static_cast<int>('3'), IFMENU_IMAGE_CONVERT3D);
- wxAcceleratorTable accelTable (11, accelEntries);
+ accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('3'), IFMENU_IMAGE_CONVERT3D);
+ wxAcceleratorTable accelTable (4, accelEntries);
#else
- wxAcceleratorTable accelTable (10, accelEntries);
+ wxAcceleratorTable accelTable (3, accelEntries);
#endif
subframe->SetAcceleratorTable (accelTable);
rScaledIF.labelAdd (os.str().c_str());
rIF.scaleImage (rScaledIF);
*theApp->getLog() << os.str().c_str() << "\n";
- pScaledDoc->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ pScaledDoc->Modify (true);
pScaledDoc->UpdateAllViews (this);
pScaledDoc->getView()->OnUpdate (this, NULL);
pScaledDoc->getView()->getFrame()->Show(true);
delete pYImag;
delete pYMag;
}
- pPlotDoc->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ pPlotDoc->Modify (true);
pPlotDoc->UpdateAllViews ();
pPlotDoc->getView()->OnUpdate (this, NULL);
pPlotDoc->getView()->getFrame()->Show(true);
delete pYImag;
delete pYMag;
}
- pPlotDoc->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ pPlotDoc->Modify (true);
pPlotDoc->UpdateAllViews ();
pPlotDoc->getView()->OnUpdate (this, NULL);
pPlotDoc->getView()->getFrame()->Show(true);
delete pYMag;
delete [] pcIn;
- pPlotDoc->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ pPlotDoc->Modify (true);
pPlotDoc->UpdateAllViews ();
pPlotDoc->getView()->OnUpdate (this, NULL);
pPlotDoc->getView()->getFrame()->Show(true);
delete pdTemp;
delete [] pcIn;
- pPlotDoc->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ pPlotDoc->Modify (true);
pPlotDoc->UpdateAllViews ();
pPlotDoc->getView()->OnUpdate (this, NULL);
pPlotDoc->getView()->getFrame()->Show(true);
delete pX;
delete pY1;
delete pY2;
- pPlotDoc->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ pPlotDoc->Modify (true);
pPlotDoc->UpdateAllViews ();
pPlotDoc->getView()->OnUpdate (this, NULL);
pPlotDoc->getView()->getFrame()->Show(true);
delete pX;
delete pY1;
delete pY2;
- pPlotDoc->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ pPlotDoc->Modify (true);
pPlotDoc->UpdateAllViews ();
pPlotDoc->getView()->OnUpdate (this, NULL);
pPlotDoc->getView()->getFrame()->Show(true);
rPlotFile.addDescription (os.str().c_str());
delete pX;
delete pY;
- pPlotDoc->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ pPlotDoc->Modify (true);
pPlotDoc->UpdateAllViews ();
pPlotDoc->getView()->OnUpdate (this, NULL);
pPlotDoc->getView()->getFrame()->Show(true);
m_iDefaultNDet = 367;
m_iDefaultNView = 320;
#endif
- m_iDefaultNSample = 1;
+ m_iDefaultNSample = 2;
m_dDefaultRotation = 1;
m_dDefaultFocalLength = 2;
m_dDefaultViewRatio = 1;
return;
}
pProj->initFromScanner (theScanner);
- m_dDefaultRotation /= PI; // convert back to PI units
+ m_dDefaultRotation /= TWOPI; // convert back to fraction of a circle
Timer timer;
if (m_iDefaultTrace > Trace::TRACE_CONSOLE) {
GetDocumentManager()->ActivateView (projView, true, false);
}
::wxYield();
- pProjectionDoc-> Modify(true);
+ if (theApp->getAskDeleteNewDocs())
+ pProjectionDoc-> Modify(true);
pProjectionDoc->UpdateAllViews (this);
}
}
}
pRasterDoc->setImageFile (pImageFile);
- pRasterDoc->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ pRasterDoc->Modify (true);
pRasterDoc->UpdateAllViews (this);
pRasterDoc->getView()->getFrame()->Show(true);
std::ostringstream os;
m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
+ m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
#endif
GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
wxMenu *help_menu = new wxMenu;
help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1");
- help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H");
+ help_menu->Append (IDH_QUICKSTART, "&Quick Start");
help_menu->Append(MAINMENU_HELP_ABOUT, "&About");
wxMenuBar *menu_bar = new wxMenuBar;
subframe->SetMenuBar(menu_bar);
subframe->Centre(wxBOTH);
- wxAcceleratorEntry accelEntries[8];
- accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
- accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('S'), wxID_SAVE);
- accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('H'), MAINMENU_HELP_TOPICS);
- accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('P'), MAINMENU_FILE_CREATE_PHANTOM);
- accelEntries[4].Set (wxACCEL_CTRL, static_cast<int>('F'), MAINMENU_FILE_CREATE_FILTER);
- accelEntries[5].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
- accelEntries[6].Set (wxACCEL_CTRL, static_cast<int>('J'), PHMMENU_PROCESS_PROJECTIONS);
- accelEntries[7].Set (wxACCEL_CTRL, static_cast<int>('R'), PHMMENU_PROCESS_RASTERIZE);
- wxAcceleratorTable accelTable (8, accelEntries);
+ wxAcceleratorEntry accelEntries[2];
+ accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('J'), PHMMENU_PROCESS_PROJECTIONS);
+ accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('R'), PHMMENU_PROCESS_RASTERIZE);
+ wxAcceleratorTable accelTable (2, accelEntries);
subframe->SetAcceleratorTable (accelTable);
return subframe;
m_iDefaultFilterGeneration = ProcessSignal::FILTER_GENERATION_DIRECT;
#endif
m_iDefaultZeropad = 1;
- m_iDefaultBackprojector = Backprojector::BPROJ_IDIFF3;
+ m_iDefaultBackprojector = Backprojector::BPROJ_IDIFF;
m_iDefaultInterpolation = Backprojector::INTERP_LINEAR;
m_iDefaultInterpParam = 1;
m_iDefaultTrace = Trace::TRACE_NONE;
m_iDefaultPolarNX = dialogPolar.getXSize();
m_iDefaultPolarNY = dialogPolar.getYSize();
ImageFileDocument* pPolarDoc = theApp->newImageDoc();
- ImageFile& rIF = pPolarDoc->getImageFile();
+ ImageFile* pIF = new ImageFile (m_iDefaultPolarNX, m_iDefaultPolarNY);
+ m_iDefaultPolarInterpolation = Projections::convertInterpNameToID (strInterpolation.c_str());
+ if (! rProj.convertPolar (*pIF, m_iDefaultPolarInterpolation)) {
+ delete pIF;
+ *theApp->getLog() << "Error converting to Polar\n";
+ return;
+ }
+ pPolarDoc = theApp->newImageDoc ();
if (! pPolarDoc) {
sys_error (ERR_SEVERE, "Unable to create image file");
return;
}
- rIF.setArraySize (m_iDefaultPolarNX, m_iDefaultPolarNY);
- m_iDefaultPolarInterpolation = Projections::convertInterpNameToID (strInterpolation.c_str());
- rProj.convertPolar (rIF, m_iDefaultPolarInterpolation);
- rIF.labelAdd (rProj.getLabel().getLabelString().c_str(), rProj.calcTime());
+ pPolarDoc->setImageFile (pIF);
+ pIF->labelAdd (rProj.getLabel().getLabelString().c_str(), rProj.calcTime());
std::ostringstream os;
os << "Convert projection file " << GetFrame()->GetTitle().c_str() << " to polar image: xSize="
<< m_iDefaultPolarNX << ", ySize=" << m_iDefaultPolarNY << ", interpolation="
<< strInterpolation.c_str();
*theApp->getLog() << os.str().c_str() << "\n";
- rIF.labelAdd (os.str().c_str());
- pPolarDoc->Modify (true);
+ pIF->labelAdd (os.str().c_str());
+ if (theApp->getAskDeleteNewDocs())
+ pPolarDoc->Modify (true);
pPolarDoc->UpdateAllViews ();
pPolarDoc->getView()->OnUpdate (this, NULL);
pPolarDoc->getView()->getFrame()->Show(true);
m_iDefaultPolarNX = dialogPolar.getXSize();
m_iDefaultPolarNY = dialogPolar.getYSize();
m_iDefaultPolarZeropad = dialogPolar.getZeropad();
+ ImageFile* pIF = new ImageFile (m_iDefaultPolarNX, m_iDefaultPolarNY);
+
+ m_iDefaultPolarInterpolation = Projections::convertInterpNameToID (strInterpolation.c_str());
+ if (! rProj.convertFFTPolar (*pIF, m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad)) {
+ delete pIF;
+ *theApp->getLog() << "Error converting to polar\n";
+ return;
+ }
ImageFileDocument* pPolarDoc = theApp->newImageDoc();
- ImageFile& rIF = pPolarDoc->getImageFile();
if (! pPolarDoc) {
sys_error (ERR_SEVERE, "Unable to create image file");
return;
}
- rIF.setArraySize (m_iDefaultPolarNX, m_iDefaultPolarNY);
- m_iDefaultPolarInterpolation = Projections::convertInterpNameToID (strInterpolation.c_str());
- rProj.convertFFTPolar (rIF, m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad);
- rIF.labelAdd (rProj.getLabel().getLabelString().c_str(), rProj.calcTime());
+ pPolarDoc->setImageFile (pIF);
+ pIF->labelAdd (rProj.getLabel().getLabelString().c_str(), rProj.calcTime());
std::ostringstream os;
os << "Convert projection file " << GetFrame()->GetTitle().c_str() << " to FFT polar image: xSize="
<< m_iDefaultPolarNX << ", ySize=" << m_iDefaultPolarNY << ", interpolation="
<< strInterpolation.c_str() << ", zeropad=" << m_iDefaultPolarZeropad;
*theApp->getLog() << os.str().c_str() << "\n";
- rIF.labelAdd (os.str().c_str());
- pPolarDoc->Modify (true);
+ pIF->labelAdd (os.str().c_str());
+ if (theApp->getAskDeleteNewDocs())
+ pPolarDoc->Modify (true);
pPolarDoc->UpdateAllViews ();
pPolarDoc->getView()->OnUpdate (this, NULL);
pPolarDoc->getView()->getFrame()->Show(true);
void
ProjectionFileView::OnReconstructFBP (wxCommandEvent& event)
{
- DialogGetReconstructionParameters dialogReconstruction (getFrameForChild(), m_iDefaultNX, m_iDefaultNY, m_iDefaultFilter, m_dDefaultFilterParam, m_iDefaultFilterMethod, m_iDefaultFilterGeneration, m_iDefaultZeropad, m_iDefaultInterpolation, m_iDefaultInterpParam, m_iDefaultBackprojector, m_iDefaultTrace);
+ DialogGetReconstructionParameters dialogReconstruction (getFrameForChild(), m_iDefaultNX, m_iDefaultNY,
+ m_iDefaultFilter, m_dDefaultFilterParam, m_iDefaultFilterMethod, m_iDefaultFilterGeneration,
+ m_iDefaultZeropad, m_iDefaultInterpolation, m_iDefaultInterpParam, m_iDefaultBackprojector,
+ m_iDefaultTrace);
int retVal = dialogReconstruction.ShowModal();
if (retVal == wxID_OK) {
wxString optBackprojectName = dialogReconstruction.getBackprojectName();
m_iDefaultBackprojector = Backprojector::convertBackprojectNameToID (optBackprojectName.c_str());
m_iDefaultTrace = dialogReconstruction.getTrace();
+
if (m_iDefaultNX > 0 && m_iDefaultNY > 0) {
const Projections& rProj = GetDocument()->getProjections();
-
ImageFile* pImageFile = new ImageFile;
pImageFile->setArraySize (m_iDefaultNX, m_iDefaultNY);
- Reconstructor* pReconstructor = new Reconstructor (rProj, *pImageFile, optFilterName.c_str(), m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace);
+ Reconstructor* pReconstructor = new Reconstructor (rProj, *pImageFile, optFilterName.c_str(),
+ m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(),
+ optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace);
Timer timerRecon;
if (m_iDefaultTrace > Trace::TRACE_CONSOLE) {
ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstructor, rProj, *pImageFile, m_iDefaultTrace, getFrameForChild());
for (int iView = 0; iView < rProj.nView(); iView++) {
::wxYield();
- if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView)) {
+ if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView, true)) {
delete pDlgReconstruct;
delete pReconstructor;
delete pImageFile;
return;
}
::wxYield();
+ ::wxYield();
while (pDlgReconstruct->isPaused()) {
::wxYield();
::wxUsleep(50);
delete pDlgReconstruct;
} else {
wxProgressDialog dlgProgress (wxString("Reconstruction"), wxString("Reconstruction Progress"), rProj.nView() + 1, getFrameForChild(), wxPD_CAN_ABORT);
- for (int i = 0; i < rProj.nView(); i++) {
- pReconstructor->reconstructView (i, 1);
- if (! dlgProgress.Update (i + 1)) {
+ for (int iView = 0; iView < rProj.nView(); iView++) {
+ pReconstructor->reconstructView (iView, 1);
+ if (! dlgProgress.Update (iView + 1)) {
delete pReconstructor;
delete pImageFile;
return;
return;
}
pReconDoc->setImageFile (pImageFile);
- pReconDoc->Modify (true);
+ if (theApp->getAskDeleteNewDocs())
+ pReconDoc->Modify (true);
pReconDoc->UpdateAllViews (this);
if (ImageFileView* rasterView = pReconDoc->getView()) {
rasterView->OnUpdate (rasterView, NULL);
m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
+ m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
#endif
GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
wxMenu *help_menu = new wxMenu;
help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1");
- help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H");
+ help_menu->Append (IDH_QUICKSTART, "&Quick Start");
help_menu->Append(MAINMENU_HELP_ABOUT, "&About");
wxMenuBar *menu_bar = new wxMenuBar;
subframe->SetMenuBar(menu_bar);
subframe->Centre(wxBOTH);
- wxAcceleratorEntry accelEntries[11];
- accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
- accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('S'), wxID_SAVE);
- accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('W'), wxID_CLOSE);
- accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('H'), MAINMENU_HELP_TOPICS);
- accelEntries[4].Set (wxACCEL_CTRL, static_cast<int>('P'), MAINMENU_FILE_CREATE_PHANTOM);
- accelEntries[5].Set (wxACCEL_CTRL, static_cast<int>('F'), MAINMENU_FILE_CREATE_FILTER);
- accelEntries[6].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
- accelEntries[7].Set (wxACCEL_CTRL, static_cast<int>('L'), PJMENU_CONVERT_POLAR);
- accelEntries[8].Set (wxACCEL_CTRL, static_cast<int>('I'), PJMENU_CONVERT_FFT_POLAR);
- accelEntries[9].Set (wxACCEL_CTRL, static_cast<int>('R'), PJMENU_RECONSTRUCT_FBP);
- accelEntries[10].Set (wxACCEL_CTRL, static_cast<int>('E'), PJMENU_RECONSTRUCT_FOURIER);
- wxAcceleratorTable accelTable (11, accelEntries);
+ wxAcceleratorEntry accelEntries[4];
+ accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('L'), PJMENU_CONVERT_POLAR);
+ accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('I'), PJMENU_CONVERT_FFT_POLAR);
+ accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('R'), PJMENU_RECONSTRUCT_FBP);
+ accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('E'), PJMENU_RECONSTRUCT_FOURIER);
+ wxAcceleratorTable accelTable (4, accelEntries);
subframe->SetAcceleratorTable (accelTable);
return subframe;
m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
+ m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
#endif
GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
wxMenu *help_menu = new wxMenu;
help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1");
- help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H");
+ help_menu->Append (IDH_QUICKSTART, "&Quick Start");
help_menu->Append(MAINMENU_HELP_ABOUT, "&About");
wxMenuBar *menu_bar = new wxMenuBar;
subframe->SetMenuBar(menu_bar);
subframe->Centre(wxBOTH);
- wxAcceleratorEntry accelEntries[10];
- accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
- accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('S'), wxID_SAVE);
- accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('W'), wxID_CLOSE);
- accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('H'), MAINMENU_HELP_TOPICS);
- accelEntries[4].Set (wxACCEL_CTRL, static_cast<int>('P'), MAINMENU_FILE_CREATE_PHANTOM);
- accelEntries[5].Set (wxACCEL_CTRL, static_cast<int>('F'), MAINMENU_FILE_CREATE_FILTER);
- accelEntries[6].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
- accelEntries[7].Set (wxACCEL_CTRL, static_cast<int>('E'), PLOTMENU_VIEW_SCALE_MINMAX);
- accelEntries[8].Set (wxACCEL_CTRL, static_cast<int>('A'), PLOTMENU_VIEW_SCALE_AUTO);
- accelEntries[9].Set (wxACCEL_CTRL, static_cast<int>('U'), PLOTMENU_VIEW_SCALE_FULL);
- wxAcceleratorTable accelTable (10, accelEntries);
+ wxAcceleratorEntry accelEntries[3];
+ accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('E'), PLOTMENU_VIEW_SCALE_MINMAX);
+ accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('A'), PLOTMENU_VIEW_SCALE_AUTO);
+ accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('U'), PLOTMENU_VIEW_SCALE_FULL);
+ wxAcceleratorTable accelTable (3, accelEntries);
subframe->SetAcceleratorTable (accelTable);
return subframe;
m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
+ m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
#endif
GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
wxMenu *help_menu = new wxMenu;
help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1");
- help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H");
+ help_menu->Append (IDH_QUICKSTART, "&Quick Start");
help_menu->Append(MAINMENU_HELP_ABOUT, "&About");
wxMenuBar *menu_bar = new wxMenuBar;
subframe->SetMenuBar(menu_bar);
subframe->Centre(wxBOTH);
-
- wxAcceleratorEntry accelEntries[5];
- accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
- accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('S'), wxID_SAVE);
- accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('W'), wxID_CLOSE);
- accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('H'), MAINMENU_HELP_TOPICS);
- accelEntries[4].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
- wxAcceleratorTable accelTable (5, accelEntries);
- subframe->SetAcceleratorTable (accelTable);
-
+
return subframe;
}