X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=d60515bbb8c4c7a359061d9e9d47e5316c43ac9b;hp=3df51fa5e3c94227185b8acb602024602de88d15;hb=bfcc769cf8019eabc8c65c07257c8dbee4b4c977;hpb=a05f3cb550877e94aa118cc04b361c0c8fdb3dc3 diff --git a/src/views.cpp b/src/views.cpp index 3df51fa..d60515b 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: views.cpp,v 1.18 2000/08/31 08:38:58 kevin Exp $ +** $Id: views.cpp,v 1.19 2000/09/02 05:10:39 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 @@ -45,6 +45,7 @@ #endif #include "wx/image.h" +#include "wx/progdlg.h" #include "ct.h" #include "ctsim.h" @@ -52,8 +53,11 @@ #include "views.h" #include "dialogs.h" #include "dlgprojections.h" +#include "dlgreconstruct.h" #include #include "backprojectors.h" +#include "reconstruct.h" +#include "timer.h" // ImageFileCanvas @@ -135,16 +139,8 @@ ImageFileView::OnProperties (wxCommandEvent& event) ostringstream os; os << "file: " << rFilename << "\nmin: "<getLog() << os.str().c_str(); - - int xSize, ySize; - ostringstream osSize; - m_frame->GetSize (&xSize, &ySize); - osSize << "Frame size: (" << xSize << "," << ySize << ")\n"; - m_frame->GetClientSize (&xSize, &ySize); - osSize << "Frame Client size: (" << xSize << "," << ySize << ")\n"; - m_canvas->GetSize (&xSize, &ySize); - osSize << "Canvas size: (" << xSize << "," << ySize << ")\n"; - *theApp->getLog() << osSize.str().c_str(); + wxMessageDialog dialogMsg (m_frame, os.str().c_str(), "Imagefile Properties", wxOK | wxICON_INFORMATION); + dialogMsg.ShowModal(); } } @@ -382,6 +378,14 @@ END_EVENT_TABLE() PhantomView::PhantomView(void) : wxView(), m_canvas(NULL), m_frame(NULL) { + m_iDefaultNDet = 367; + m_iDefaultNView = 320; + m_iDefaultNSample = 2; + m_dDefaultRotation = 2; + m_dDefaultFocalLength = 2; + m_dDefaultFieldOfView = 1; + m_iDefaultGeometry = Scanner::GEOMETRY_PARALLEL; + m_iDefaultTrace = Trace::TRACE_NONE; } PhantomView::~PhantomView(void) @@ -406,31 +410,33 @@ PhantomView::OnProperties (wxCommandEvent& event) void PhantomView::OnProjections (wxCommandEvent& event) { - DialogGetProjectionParameters dialogProjection (m_frame, 367, 320, 1, 1., 1., 1., Scanner::GEOMETRY_PARALLEL, Trace::TRACE_NONE); + DialogGetProjectionParameters dialogProjection (m_frame, m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView, m_iDefaultGeometry, m_iDefaultTrace); int retVal = dialogProjection.ShowModal(); if (retVal == wxID_OK) { - int nDet = dialogProjection.getNDet(); - int nView = dialogProjection.getNView(); - int nSamples = dialogProjection.getNSamples(); - int iTrace = dialogProjection.getTrace(); - double dRotAngle = dialogProjection.getRotAngle(); - double dFocalLengthRatio = dialogProjection.getFocalLengthRatio(); - double dFieldOfViewRatio = dialogProjection.getFieldOfViewRatio(); - + m_iDefaultNDet = dialogProjection.getNDet(); + m_iDefaultNView = dialogProjection.getNView(); + m_iDefaultNSample = dialogProjection.getNSamples(); + m_iDefaultTrace = dialogProjection.getTrace(); + m_dDefaultRotation = dialogProjection.getRotAngle(); + m_dDefaultFocalLength = dialogProjection.getFocalLengthRatio(); + m_dDefaultFieldOfView = dialogProjection.getFieldOfViewRatio(); wxString sGeometry = dialogProjection.getGeometry(); - if (nDet > 0 && nView > 0 && sGeometry != "") { + m_iDefaultGeometry = Scanner::convertGeometryNameToID (sGeometry.c_str()); + + if (m_iDefaultNDet > 0 && m_iDefaultNView > 0 && sGeometry != "") { const Phantom& rPhantom = GetDocument()->getPhantom(); ProjectionFileDocument* pProjectionDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.pj", wxDOC_SILENT)); Projections& rProj = pProjectionDoc->getProjections(); - Scanner theScanner (rPhantom, sGeometry.c_str(), nDet, nView, nSamples, dRotAngle, dFocalLengthRatio, dFieldOfViewRatio); + 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); + m_dDefaultRotation /= PI; // convert back to PI units - if (iTrace > Trace::TRACE_CONSOLE) { - ProjectionsDialog dialogProjections (theScanner, rProj, rPhantom, iTrace, dynamic_cast(m_frame)); + if (m_iDefaultTrace > Trace::TRACE_CONSOLE) { + ProjectionsDialog dialogProjections (theScanner, rProj, rPhantom, m_iDefaultTrace, dynamic_cast(m_frame)); for (int iView = 0; iView < rProj.nView(); iView++) { ::wxYield(); ::wxYield(); @@ -445,19 +451,32 @@ PhantomView::OnProjections (wxCommandEvent& event) ::wxUsleep(50); } } - } else - theScanner.collectProjections (rProj, rPhantom, iTrace); + } else { + wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), rProj.nView() + 1, m_frame, wxPD_CAN_ABORT); + for (int i = 0; i < rProj.nView(); i++) { + theScanner.collectProjections (rProj, rPhantom, i, 1, true, m_iDefaultTrace); + if (! dlgProgress.Update (i+1)) { + pProjectionDoc->DeleteAllViews(); + return; + } + } + } + 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() << "\n"; + rProj.setRemark (os.str()); + *theApp->getLog() << os.str().c_str(); + + ::wxYield(); pProjectionDoc->Modify(true); pProjectionDoc->UpdateAllViews(this); + ::wxYield(); if (wxView* pView = pProjectionDoc->GetFirstView()) if (wxFrame* pFrame = pView->GetFrame()) { pFrame->SetFocus(); + pFrame->Raise(); } - ostringstream os; - os << "Projections for " << rPhantom.name() << ": nDet=" << nDet << ", nView=" << nView << ", nSamples=" << nSamples << ", RotAngle=" << dRotAngle << ", FocalLengthRatio=" << dFocalLengthRatio << ", FieldOfViewRatio=" << dFieldOfViewRatio << ", Geometry=" << sGeometry.c_str() << "\n"; - rProj.setRemark (os.str()); - *theApp->getLog() << os.str().c_str(); + m_frame->Lower(); } } } @@ -654,6 +673,8 @@ ProjectionFileView::OnProperties (wxCommandEvent& event) ostringstream os; rProj.printScanInfo(os); *theApp->getLog() << os.str().c_str(); + wxMessageDialog dialogMsg (m_frame, os.str().c_str(), "Projection File Properties", wxOK | wxICON_INFORMATION); + dialogMsg.ShowModal(); } @@ -677,17 +698,51 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event) wxString optInterpName = dialogReconstruction.getInterpName(); int optInterpParam = dialogReconstruction.getInterpParam(); wxString optBackprojectName = dialogReconstruction.getBackprojectName(); + int iTrace = dialogReconstruction.getTrace(); if (xSize > 0 && ySize > 0) { ImageFileDocument* pReconDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); ImageFile& imageFile = pReconDoc->getImageFile(); const Projections& rProj = GetDocument()->getProjections(); imageFile.setArraySize (xSize, ySize); - rProj.reconstruct (imageFile, optFilterName.c_str(), optFilterParam, optFilterMethodName.c_str(), optZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), optInterpParam, optBackprojectName.c_str(), Trace::TRACE_NONE); + Timer timerRecon; + + Reconstructor* pReconstruct = new Reconstructor (rProj, imageFile, optFilterName.c_str(), optFilterParam, optFilterMethodName.c_str(), optZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), optInterpParam, optBackprojectName.c_str(), iTrace); + if (iTrace > Trace::TRACE_CONSOLE) { + ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstruct, rProj, imageFile, iTrace, m_frame); + for (int iView = 0; iView < rProj.nView(); iView++) { + ::wxYield(); + ::wxYield(); + if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView)) { + delete pDlgReconstruct; + delete pReconstruct; + pReconDoc->DeleteAllViews(); + return; + } + ::wxYield(); + ::wxYield(); + while (pDlgReconstruct->isPaused()) { + ::wxYield(); + ::wxUsleep(50); + } + } + } else { + wxProgressDialog dlgProgress (wxString("Reconstruction"), wxString("Reconstruction Progress"), rProj.nView() + 1, m_frame, wxPD_CAN_ABORT); + for (int i = 0; i < rProj.nView(); i++) { + pReconstruct->reconstructView (i, 1); + if (! dlgProgress.Update(i + 1)) { + delete pReconstruct; + pReconDoc->DeleteAllViews(); + return; + } + } + } pReconDoc->Modify(true); pReconDoc->UpdateAllViews(this); ostringstream os; os << "Reconstruct " << rProj.getFilename() << ": xSize=" << xSize << ", ySize=" << ySize << ", Filter=" << optFilterName.c_str() << ", FilterParam=" << optFilterParam << ", FilterMethod=" << optFilterMethodName.c_str() << ", FilterGeneration=" << optFilterGenerationName.c_str() << ", Zeropad=" << optZeropad << ", Interpolation=" << optInterpName.c_str() << ", InterpolationParam=" << optInterpParam << ", Backprojection=" << optBackprojectName.c_str() << "\n"; *theApp->getLog() << os.str().c_str(); + imageFile.labelAdd (rProj.getLabel()); + imageFile.labelAdd (Array2dFileLabel::L_HISTORY, os.str().c_str(), timerRecon.timerEnd()); } } }