X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.cpp;h=28d663e7009e842f7b8291190cf13c3948c1c7ab;hb=d3a6bf4aa2ccd32ed7671d1d97777dfc414df51d;hp=2e0f78ab58480ada03cb6be7484eeff75a3d4c7c;hpb=cbcb02ba9b76a82c9a09ce1c7712431bb215575a;p=ctsim.git diff --git a/src/views.cpp b/src/views.cpp index 2e0f78a..28d663e 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: views.cpp,v 1.90 2001/01/30 02:20:50 kevin Exp $ +** $Id: views.cpp,v 1.91 2001/01/30 05:05:41 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 @@ -257,6 +257,7 @@ ImageFileView::~ImageFileView() GetDocumentManager()->ActivateView(this, FALSE, TRUE); } + void ImageFileView::OnProperties (wxCommandEvent& event) { @@ -275,16 +276,15 @@ ImageFileView::OnProperties (wxCommandEvent& event) os << "Complex\n"; else os << "Real\n"; - os << "\nMinimum: "< 0) { - os << "\n"; rIF.printLabelsBrief (os); } - *theApp->getLog() << os.str().c_str(); + *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n"; wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Imagefile Properties", wxOK | wxICON_INFORMATION); dialogMsg.ShowModal(); } @@ -366,40 +366,35 @@ ImageFileView::OnCompare (wxCommandEvent& event) os << GetFrame()->GetTitle().c_str() << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n"; rCompareIF.statistics (min, max, mean, mode, median, stddev); os << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str() << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n"; - os << "\n"; double d, r, e; rIF.comparativeStatistics (rCompareIF, d, r, e); os << "Comparative Statistics: d=" << d << ", r=" << r << ", e=" << e << "\n"; - *theApp->getLog() << os.str().c_str(); + *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n"; if (dialogGetCompare.getMakeDifferenceImage()) { + ImageFile* pDifferenceImage = new ImageFile; + + pDifferenceImage->setArraySize (rIF.nx(), rIF.ny()); + if (! rIF.subtractImages (rCompareIF, *pDifferenceImage)) { + *theApp->getLog() << "Unable to subtract images\n"; + delete pDifferenceImage; + return; + } ImageFileDocument* pDifferenceDoc = theApp->newImageDoc(); if (! pDifferenceDoc) { sys_error (ERR_SEVERE, "Unable to create image file"); return; } - ImageFile& differenceImage = pDifferenceDoc->getImageFile(); - - differenceImage.setArraySize (rIF.nx(), rIF.ny()); - if (! rIF.subtractImages (rCompareIF, differenceImage)) { - pDifferenceDoc->getView()->getFrame()->Show(true); - GetDocumentManager()->ActivateView (pDifferenceDoc->getView(), true, false); - pDifferenceDoc->getView()->getFrame()->SetFocus(); - wxCommandEvent event; - GetDocumentManager()->OnFileClose (event); - GetDocumentManager()->ActivateView (this, true, false); - getFrame()->SetFocus(); - return; - } - + pDifferenceDoc->setImageFile (pDifferenceImage); + wxString s = GetFrame()->GetTitle() + ": "; - differenceImage.labelsCopy (rIF, s.c_str()); + pDifferenceImage->labelsCopy (rIF, s.c_str()); s = pCompareDoc->GetFirstView()->GetFrame()->GetTitle() + ": "; - differenceImage.labelsCopy (rCompareIF, s.c_str()); + pDifferenceImage->labelsCopy (rCompareIF, s.c_str()); std::ostringstream osLabel; osLabel << "Compare image " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() << " and " << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str() << ": " << os.str().c_str(); - differenceImage.labelAdd (os.str().c_str()); + pDifferenceImage->labelAdd (os.str().c_str()); pDifferenceDoc->Modify (true); pDifferenceDoc->UpdateAllViews (this); pDifferenceDoc->getView()->OnUpdate (this, NULL); @@ -812,6 +807,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) m_pFileMenu->Append(wxID_SAVE, "&Save\tCtrl-S"); m_pFileMenu->Append(wxID_SAVEAS, "Save &As..."); m_pFileMenu->Append(wxID_CLOSE, "&Close\tCtrl-W"); + m_pFileMenu->Append(wxID_REVERT, "Re&vert"); m_pFileMenu->AppendSeparator(); m_pFileMenu->Append(IFMENU_FILE_PROPERTIES, "P&roperties"); @@ -820,7 +816,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) m_pFileMenu->AppendSeparator(); m_pFileMenu->Append(wxID_PRINT, "&Print..."); m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup..."); - m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view"); + m_pFileMenu->Append(wxID_PREVIEW, "Print Preview"); #ifdef CTSIM_MDI m_pFileMenu->AppendSeparator(); m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit"); @@ -1011,7 +1007,8 @@ ImageFileView::OnClose (bool deleteWindow) //GetDocumentManager()->ActivateView (this, false, true); if (! GetDocument() || ! GetDocument()->Close()) return false; - + + Activate (false); if (m_pCanvas) { m_pCanvas->setView(NULL); m_pCanvas = NULL; @@ -1021,7 +1018,6 @@ ImageFileView::OnClose (bool deleteWindow) m_pFrame->SetTitle(s); SetFrame(NULL); - Activate(false); if (deleteWindow) { m_pFrame->Destroy(); @@ -1798,7 +1794,7 @@ PhantomFileView::OnProperties (wxCommandEvent& event) #if DEBUG rPhantom.print (os); #endif - *theApp->getLog() << os.str().c_str() << "\n"; + *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n"; wxMessageBox (os.str().c_str(), "Phantom Properties"); } @@ -1821,33 +1817,23 @@ PhantomFileView::OnProjections (wxCommandEvent& event) if (m_iDefaultNDet > 0 && m_iDefaultNView > 0 && sGeometry != "") { const Phantom& rPhantom = GetDocument()->getPhantom(); - ProjectionFileDocument* pProjectionDoc = theApp->newProjectionDoc(); - if (! pProjectionDoc) { - sys_error (ERR_SEVERE, "Unable to create projection document"); - return; - } - Projections& rProj = pProjectionDoc->getProjections(); - Scanner theScanner (rPhantom, sGeometry.c_str(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView); + Projections* pProj = new Projections; + Scanner theScanner (rPhantom, sGeometry.c_str(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, + m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView); if (theScanner.fail()) { *theApp->getLog() << "Failed making scanner: " << theScanner.failMessage().c_str() << "\n"; return; } - rProj.initFromScanner (theScanner); + pProj->initFromScanner (theScanner); m_dDefaultRotation /= PI; // convert back to PI units Timer timer; if (m_iDefaultTrace > Trace::TRACE_CONSOLE) { - ProjectionsDialog dialogProjections (theScanner, rProj, rPhantom, m_iDefaultTrace, dynamic_cast(getFrameForChild())); - for (int iView = 0; iView < rProj.nView(); iView++) { + ProjectionsDialog dialogProjections (theScanner, *pProj, rPhantom, m_iDefaultTrace, dynamic_cast(getFrameForChild())); + for (int iView = 0; iView < pProj->nView(); iView++) { ::wxYield(); if (dialogProjections.isCancelled() || ! dialogProjections.projectView (iView)) { - pProjectionDoc->getView()->getFrame()->Show(true); - GetDocumentManager()->ActivateView (pProjectionDoc->getView(), true, false); - pProjectionDoc->getView()->getFrame()->SetFocus(); - wxCommandEvent event; - GetDocumentManager()->OnFileClose (event); - GetDocumentManager()->ActivateView (this, true, false); - getFrame()->SetFocus(); + delete pProj; return; } ::wxYield(); @@ -1857,17 +1843,11 @@ PhantomFileView::OnProjections (wxCommandEvent& event) } } } else { - wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), rProj.nView() + 1, getFrameForChild(), wxPD_CAN_ABORT); - for (int i = 0; i < rProj.nView(); i++) { - theScanner.collectProjections (rProj, rPhantom, i, 1, true, m_iDefaultTrace); + wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), pProj->nView() + 1, getFrameForChild(), wxPD_CAN_ABORT); + for (int i = 0; i < pProj->nView(); i++) { + theScanner.collectProjections (*pProj, rPhantom, i, 1, true, m_iDefaultTrace); if (! dlgProgress.Update (i+1)) { - pProjectionDoc->getView()->getFrame()->Show(true); - GetDocumentManager()->ActivateView (pProjectionDoc->getView(), true, false); - pProjectionDoc->getView()->getFrame()->SetFocus(); - wxCommandEvent event; - GetDocumentManager()->OnFileClose (event); - GetDocumentManager()->ActivateView (this, true, false); - getFrame()->SetFocus(); + delete pProj; return; } } @@ -1875,11 +1855,17 @@ PhantomFileView::OnProjections (wxCommandEvent& event) std::ostringstream os; os << "Projections for " << rPhantom.name() << ": nDet=" << m_iDefaultNDet << ", nView=" << m_iDefaultNView << ", nSamples=" << m_iDefaultNSample << ", RotAngle=" << m_dDefaultRotation << ", FocalLengthRatio=" << m_dDefaultFocalLength << ", FieldOfViewRatio=" << m_dDefaultFieldOfView << ", Geometry=" << sGeometry.c_str(); - rProj.setCalcTime (timer.timerEnd()); - rProj.setRemark (os.str()); + pProj->setCalcTime (timer.timerEnd()); + pProj->setRemark (os.str()); *theApp->getLog() << os.str().c_str() << "\n"; ::wxYield(); + ProjectionFileDocument* pProjectionDoc = theApp->newProjectionDoc(); + if (! pProjectionDoc) { + sys_error (ERR_SEVERE, "Unable to create projection document"); + return; + } + pProjectionDoc->setProjections (pProj); ProjectionFileView* projView = pProjectionDoc->getView(); if (projView) { projView->OnUpdate (projView, NULL); @@ -1913,28 +1899,28 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) m_iDefaultRasterNSamples = 1; if (m_iDefaultRasterNX > 0 && m_iDefaultRasterNY > 0) { const Phantom& rPhantom = GetDocument()->getPhantom(); - ImageFileDocument* pRasterDoc = theApp->newImageDoc(); - if (! pRasterDoc) { - sys_error (ERR_SEVERE, "Unable to create image file"); - return; - } - ImageFile& imageFile = pRasterDoc->getImageFile(); + + ImageFile* pImageFile = new ImageFile; - imageFile.setArraySize (m_iDefaultRasterNX, m_iDefaultRasterNY); - wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), imageFile.nx() + 1, getFrameForChild(), wxPD_CAN_ABORT); + pImageFile->setArraySize (m_iDefaultRasterNX, m_iDefaultRasterNY); + wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), + pImageFile->nx() + 1, getFrameForChild(), wxPD_CAN_ABORT); Timer timer; - for (unsigned int i = 0; i < imageFile.nx(); i++) { - rPhantom.convertToImagefile (imageFile, m_iDefaultRasterNSamples, Trace::TRACE_NONE, i, 1, true); + for (unsigned int i = 0; i < pImageFile->nx(); i++) { + rPhantom.convertToImagefile (*pImageFile, m_iDefaultRasterNSamples, Trace::TRACE_NONE, i, 1, true); if (! dlgProgress.Update (i+1)) { - GetDocumentManager()->ActivateView (pRasterDoc->getView(), true, true); - pRasterDoc->getView()->getFrame()->SetFocus(); - wxCommandEvent event; - GetDocumentManager()->OnFileClose (event); - GetDocumentManager()->ActivateView (this, true, false); - getFrame()->SetFocus(); + delete pImageFile; return; } } + + ImageFileDocument* pRasterDoc = theApp->newImageDoc(); + if (! pRasterDoc) { + sys_error (ERR_SEVERE, "Unable to create image file"); + return; + } + pRasterDoc->setImageFile (pImageFile); + pRasterDoc->Modify (true); pRasterDoc->UpdateAllViews (this); pRasterDoc->getView()->getFrame()->Show(true); @@ -1942,7 +1928,7 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << m_iDefaultRasterNX << ", YSize=" << m_iDefaultRasterNY << ", nSamples=" << m_iDefaultRasterNSamples; *theApp->getLog() << os.str().c_str() << "\n"; - imageFile.labelAdd (os.str().c_str(), timer.timerEnd()); + pImageFile->labelAdd (os.str().c_str(), timer.timerEnd()); ImageFileView* rasterView = pRasterDoc->getView(); if (rasterView) { rasterView->getFrame()->SetFocus(); @@ -2076,6 +2062,7 @@ PhantomFileView::OnClose (bool deleteWindow) if (! GetDocument() || ! GetDocument()->Close()) return false; + Activate(false); if (m_pCanvas) { m_pCanvas->setView(NULL); m_pCanvas = NULL; @@ -2085,10 +2072,9 @@ PhantomFileView::OnClose (bool deleteWindow) m_pFrame->SetTitle(s); SetFrame(NULL); - Activate(false); if (deleteWindow) { - m_pFrame->Destroy(); + delete m_pFrame; m_pFrame = NULL; if (GetDocument() && GetDocument()->getBadFileOpen()) ::wxYield(); // wxWindows bug workaround @@ -2197,7 +2183,7 @@ ProjectionFileView::OnProperties (wxCommandEvent& event) const Projections& rProj = GetDocument()->getProjections(); std::ostringstream os; rProj.printScanInfo(os); - *theApp->getLog() << os.str().c_str(); + *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n"; wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Projection File Properties", wxOK | wxICON_INFORMATION); dialogMsg.ShowModal(); } @@ -2300,31 +2286,25 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) m_iDefaultBackprojector = Backprojector::convertBackprojectNameToID (optBackprojectName.c_str()); m_iDefaultTrace = dialogReconstruction.getTrace(); if (m_iDefaultNX > 0 && m_iDefaultNY > 0) { - ImageFileDocument* pReconDoc = theApp->newImageDoc(); - if (! pReconDoc) { - sys_error (ERR_SEVERE, "Unable to create image file"); - return; - } - ImageFile& imageFile = pReconDoc->getImageFile(); const Projections& rProj = GetDocument()->getProjections(); - imageFile.setArraySize (m_iDefaultNX, m_iDefaultNY); + + ImageFile* pImageFile = new ImageFile; + pImageFile->setArraySize (m_iDefaultNX, m_iDefaultNY); - Reconstructor* pReconstruct = new Reconstructor (rProj, imageFile, 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 (*pReconstruct, rProj, imageFile, m_iDefaultTrace, getFrameForChild()); + ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstructor, rProj, *pImageFile, m_iDefaultTrace, getFrameForChild()); for (int iView = 0; iView < rProj.nView(); iView++) { - ::wxYield(); ::wxYield(); if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView)) { delete pDlgReconstruct; - delete pReconstruct; - pReconDoc->getView()->getFrame()->Close(true); + delete pReconstructor; + delete pImageFile; return; } ::wxYield(); - ::wxYield(); while (pDlgReconstruct->isPaused()) { ::wxYield(); ::wxUsleep(50); @@ -2334,20 +2314,21 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) } else { wxProgressDialog dlgProgress (wxString("Reconstruction"), wxString("Reconstruction Progress"), rProj.nView() + 1, getFrameForChild(), wxPD_CAN_ABORT); for (int i = 0; i < rProj.nView(); i++) { - pReconstruct->reconstructView (i, 1); + pReconstructor->reconstructView (i, 1); if (! dlgProgress.Update (i + 1)) { - delete pReconstruct; - GetDocumentManager()->ActivateView (pReconDoc->getView(), true, true); - pReconDoc->getView()->getFrame()->SetFocus(); - wxCommandEvent event; - GetDocumentManager()->OnFileClose (event); - GetDocumentManager()->ActivateView (this, true, false); - getFrame()->SetFocus(); + delete pReconstructor; + delete pImageFile; return; } } } - delete pReconstruct; + delete pReconstructor; + ImageFileDocument* pReconDoc = theApp->newImageDoc(); + if (! pReconDoc) { + sys_error (ERR_SEVERE, "Unable to create image file"); + return; + } + pReconDoc->setImageFile (pImageFile); pReconDoc->Modify (true); pReconDoc->UpdateAllViews (this); if (ImageFileView* rasterView = pReconDoc->getView()) { @@ -2358,8 +2339,8 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) std::ostringstream os; os << "Reconstruct " << rProj.getFilename() << ": xSize=" << m_iDefaultNX << ", ySize=" << m_iDefaultNY << ", Filter=" << optFilterName.c_str() << ", FilterParam=" << m_dDefaultFilterParam << ", FilterMethod=" << optFilterMethodName.c_str() << ", FilterGeneration=" << optFilterGenerationName.c_str() << ", Zeropad=" << m_iDefaultZeropad << ", Interpolation=" << optInterpName.c_str() << ", InterpolationParam=" << m_iDefaultInterpParam << ", Backprojection=" << optBackprojectName.c_str(); *theApp->getLog() << os.str().c_str() << "\n"; - imageFile.labelAdd (rProj.getLabel()); - imageFile.labelAdd (os.str().c_str(), timerRecon.timerEnd()); + pImageFile->labelAdd (rProj.getLabel()); + pImageFile->labelAdd (os.str().c_str(), timerRecon.timerEnd()); } } } @@ -2554,6 +2535,7 @@ ProjectionFileView::OnClose (bool deleteWindow) if (! GetDocument() || ! GetDocument()->Close()) return false; + Activate(false); if (m_pCanvas) { m_pCanvas->setView(NULL); m_pCanvas = NULL; @@ -2563,10 +2545,9 @@ ProjectionFileView::OnClose (bool deleteWindow) m_pFrame->SetTitle(s); SetFrame(NULL); - Activate(false); if (deleteWindow) { - m_pFrame->Destroy(); + delete m_pFrame; m_pFrame = NULL; if (GetDocument() && GetDocument()->getBadFileOpen()) ::wxYield(); // wxWindows bug workaround @@ -2628,7 +2609,7 @@ PlotFileView::OnProperties (wxCommandEvent& event) std::ostringstream os; os << "Columns: " << rPlot.getNumColumns() << ", Records: " << rPlot.getNumRecords() << "\n"; rPlot.printHeadersBrief (os); - *theApp->getLog() << os.str().c_str(); + *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<<\n"; wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Plot File Properties", wxOK | wxICON_INFORMATION); dialogMsg.ShowModal(); } @@ -2884,6 +2865,7 @@ PlotFileView::OnClose (bool deleteWindow) if (! GetDocument() || ! GetDocument()->Close()) return false; + Activate(false); if (m_pCanvas) { m_pCanvas->setView (NULL); m_pCanvas = NULL; @@ -2892,11 +2874,9 @@ PlotFileView::OnClose (bool deleteWindow) if (m_pFrame) m_pFrame->SetTitle(s); - Activate(false); - SetFrame(NULL); if (deleteWindow) { - m_pFrame->Destroy(); + delete m_pFrame; m_pFrame = NULL; if (GetDocument() && GetDocument()->getBadFileOpen()) ::wxYield(); // wxWindows bug workaround @@ -2953,18 +2933,17 @@ void TextFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) bool TextFileView::OnClose (bool deleteWindow) { - // if (m_pFrame && m_pFrame->GetTitle() == "Log") - return false; + if (! theApp->getMainFrame()->getShuttingDown()) + return false; + Activate(false); //GetDocumentManager()->ActivateView (this, false, true); if (! GetDocument() || ! GetDocument()->Close()) return false; - Activate(false); - SetFrame(NULL); if (deleteWindow) { - m_pFrame->Destroy(); + delete m_pFrame; m_pFrame = NULL; if (GetDocument() && GetDocument()->getBadFileOpen()) ::wxYield(); // wxWindows bug workaround @@ -2981,9 +2960,9 @@ wxDocChildFrame* TextFileView::CreateChildFrame (wxDocument *doc, wxView *view) { #if CTSIM_MDI - wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE); + wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(0,0), wxDEFAULT_FRAME_STYLE, "Log"); #else - wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE); + wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE, "Log"); #endif theApp->setIconForFrame (subframe);