X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=3df51fa5e3c94227185b8acb602024602de88d15;hp=077b9db2d9955bb0df51754a0155518fd400969f;hb=a05f3cb550877e94aa118cc04b361c0c8fdb3dc3;hpb=980bef9b95bef1ab728634181a5672088fd47066 diff --git a/src/views.cpp b/src/views.cpp index 077b9db..3df51fa 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.11 2000/07/31 14:48:35 kevin Exp $ +** $Id: views.cpp,v 1.18 2000/08/31 08:38:58 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 @@ -51,6 +51,7 @@ #include "docs.h" #include "views.h" #include "dialogs.h" +#include "dlgprojections.h" #include #include "backprojectors.h" @@ -108,8 +109,8 @@ IMPLEMENT_DYNAMIC_CLASS(ImageFileView, wxView) BEGIN_EVENT_TABLE(ImageFileView, wxView) EVT_MENU(IFMENU_FILE_PROPERTIES, ImageFileView::OnProperties) - EVT_MENU(IFMENU_VIEW_WINDOW_MINMAX, ImageFileView::OnWindowMinMax) - EVT_MENU(IFMENU_VIEW_WINDOW_AUTO, ImageFileView::OnWindowAuto) + EVT_MENU(IFMENU_VIEW_SCALE_MINMAX, ImageFileView::OnScaleMinMax) + EVT_MENU(IFMENU_VIEW_SCALE_AUTO, ImageFileView::OnScaleAuto) END_EVENT_TABLE() ImageFileView::ImageFileView(void) @@ -148,13 +149,25 @@ ImageFileView::OnProperties (wxCommandEvent& event) } void -ImageFileView::OnWindowAuto (wxCommandEvent& event) +ImageFileView::OnScaleAuto (wxCommandEvent& event) { - *theApp->getLog() << "ImageFile: Window Auto\n"; + const ImageFile& rIF = GetDocument()->getImageFile(); + DialogAutoScaleParameters dialogAutoScale (m_frame, rIF, m_dAutoScaleFactor); + int iRetVal = dialogAutoScale.ShowModal(); + if (iRetVal == wxID_OK) { + m_bMinSpecified = true; + m_bMaxSpecified = true; + double dMin, dMax; + dialogAutoScale.getMinMax (&dMin, &dMax); + m_dMinPixel = dMin; + m_dMaxPixel = dMax; + m_dAutoScaleFactor = dialogAutoScale.getAutoScaleFactor(); + OnUpdate (this, NULL); + } } void -ImageFileView::OnWindowMinMax (wxCommandEvent& event) +ImageFileView::OnScaleMinMax (wxCommandEvent& event) { const ImageFile& rIF = GetDocument()->getImageFile(); double min, max; @@ -203,9 +216,9 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom..."); file_menu->Append(wxID_OPEN, "&Open..."); - file_menu->Append(wxID_CLOSE, "&Close"); file_menu->Append(wxID_SAVE, "&Save"); file_menu->Append(wxID_SAVEAS, "Save &As..."); + file_menu->Append(wxID_CLOSE, "&Close"); file_menu->AppendSeparator(); file_menu->Append(IFMENU_FILE_PROPERTIES, "P&roperties"); @@ -216,8 +229,8 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) file_menu->Append(wxID_PREVIEW, "Print Pre&view"); wxMenu *view_menu = new wxMenu; - view_menu->Append(IFMENU_VIEW_WINDOW_MINMAX, "&Set Window Min/Max"); - view_menu->Append(IFMENU_VIEW_WINDOW_AUTO, "&Auto Window..."); + view_menu->Append(IFMENU_VIEW_SCALE_MINMAX, "Display Scale &Set..."); + view_menu->Append(IFMENU_VIEW_SCALE_AUTO, "Display Scale &Auto..."); wxMenu *help_menu = new wxMenu; help_menu->Append(MAINMENU_HELP_ABOUT, "&About"); @@ -240,9 +253,11 @@ bool ImageFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) { m_frame = CreateChildFrame(doc, this); + SetFrame(m_frame); m_bMinSpecified = false; m_bMaxSpecified = false; + m_dAutoScaleFactor = 1.; int width, height; m_frame->GetClientSize(&width, &height); @@ -391,25 +406,57 @@ PhantomView::OnProperties (wxCommandEvent& event) void PhantomView::OnProjections (wxCommandEvent& event) { - DialogGetProjectionParameters dialogProjection (m_frame, 367, 320, 1, 1., Scanner::GEOMETRY_PARALLEL); + DialogGetProjectionParameters dialogProjection (m_frame, 367, 320, 1, 1., 1., 1., Scanner::GEOMETRY_PARALLEL, Trace::TRACE_NONE); 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(); + wxString sGeometry = dialogProjection.getGeometry(); if (nDet > 0 && nView > 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); + Scanner theScanner (rPhantom, sGeometry.c_str(), nDet, nView, nSamples, dRotAngle, dFocalLengthRatio, dFieldOfViewRatio); + if (theScanner.fail()) { + *theApp->getLog() << "Failed making scanner: " << theScanner.failMessage().c_str() << "\n"; + return; + } rProj.initFromScanner (theScanner); - theScanner.collectProjections (rProj, rPhantom, 0, TRACE_NONE); + + if (iTrace > Trace::TRACE_CONSOLE) { + ProjectionsDialog dialogProjections (theScanner, rProj, rPhantom, iTrace, dynamic_cast(m_frame)); + for (int iView = 0; iView < rProj.nView(); iView++) { + ::wxYield(); + ::wxYield(); + if (dialogProjections.isCancelled() || ! dialogProjections.projectView (iView)) { + pProjectionDoc->DeleteAllViews(); + return; + } + ::wxYield(); + ::wxYield(); + while (dialogProjections.isPaused()) { + ::wxYield(); + ::wxUsleep(50); + } + } + } else + theScanner.collectProjections (rProj, rPhantom, iTrace); + pProjectionDoc->Modify(true); pProjectionDoc->UpdateAllViews(this); + if (wxView* pView = pProjectionDoc->GetFirstView()) + if (wxFrame* pFrame = pView->GetFrame()) { + pFrame->SetFocus(); + } ostringstream os; - os << "Projections for " << rPhantom.name() << ": nDet=" << nDet << ", nView=" << nView << ", nSamples=" << nSamples << ", RotAngle=" << dRotAngle << ", Geometry=" << sGeometry.c_str() << "\n"; + 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(); } } @@ -433,7 +480,7 @@ PhantomView::OnRasterize (wxCommandEvent& event) ImageFile& imageFile = pRasterDoc->getImageFile(); imageFile.setArraySize (xSize, ySize); - rPhantom.convertToImagefile (imageFile, nSamples, TRACE_NONE); + rPhantom.convertToImagefile (imageFile, nSamples, Trace::TRACE_NONE); pRasterDoc->Modify(true); pRasterDoc->UpdateAllViews(this); @@ -505,7 +552,8 @@ bool PhantomView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) { m_frame = CreateChildFrame(doc, this); - + SetFrame(m_frame); + int width, height; m_frame->GetClientSize(&width, &height); m_frame->SetTitle("PhantomView"); @@ -559,7 +607,7 @@ PhantomView::OnDraw (wxDC* dc) { int xsize, ysize; m_canvas->GetClientSize (&xsize, &ysize); - SGPDriver driver (dc, "", xsize, ysize); + SGPDriver driver (dc, xsize, ysize); SGP sgp (driver); const Phantom& rPhantom = GetDocument()->getPhantom(); sgp.setColor (C_RED); @@ -604,7 +652,7 @@ ProjectionFileView::OnProperties (wxCommandEvent& event) { const Projections& rProj = GetDocument()->getProjections(); ostringstream os; - os << "ProjectionFile " << rProj.getFilename() << ": Number of Detectors = " << rProj.nDet() << ", Number of Views = " << rProj.nView() << "\n"; + rProj.printScanInfo(os); *theApp->getLog() << os.str().c_str(); } @@ -612,7 +660,11 @@ ProjectionFileView::OnProperties (wxCommandEvent& event) void ProjectionFileView::OnReconstruct (wxCommandEvent& event) { - DialogGetReconstructionParameters dialogReconstruction (m_frame, 256, 256, SignalFilter::FILTER_ABS_BANDLIMIT, 1., SignalFilter::FILTER_METHOD_CONVOLUTION, 3, Backprojector::INTERP_LINEAR, 1, Backprojector::BPROJ_IDIFF3); +#if HAVE_FFTW + DialogGetReconstructionParameters dialogReconstruction (m_frame, 256, 256, SignalFilter::FILTER_ABS_BANDLIMIT, 1., ProcessSignal::FILTER_METHOD_RFFTW, ProcessSignal::FILTER_GENERATION_INVERSE_FOURIER, 1, Backprojector::INTERP_LINEAR, 1, Backprojector::BPROJ_IDIFF3); +#else + DialogGetReconstructionParameters dialogReconstruction (m_frame, 256, 256, SignalFilter::FILTER_ABS_BANDLIMIT, 1., ProcessSignal::FILTER_METHOD_CONVOLUTION, ProcessSignal::FILTER_GENERATION_DIRECT, 1, Backprojector::INTERP_LINEAR, 1, Backprojector::BPROJ_IDIFF3); +#endif int retVal = dialogReconstruction.ShowModal(); if (retVal == wxID_OK) { int xSize = dialogReconstruction.getXSize(); @@ -621,6 +673,7 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event) double optFilterParam = dialogReconstruction.getFilterParam(); wxString optFilterMethodName = dialogReconstruction.getFilterMethodName(); int optZeropad = dialogReconstruction.getZeropad(); + wxString optFilterGenerationName = dialogReconstruction.getFilterGenerationName(); wxString optInterpName = dialogReconstruction.getInterpName(); int optInterpParam = dialogReconstruction.getInterpParam(); wxString optBackprojectName = dialogReconstruction.getBackprojectName(); @@ -629,11 +682,11 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event) ImageFile& imageFile = pReconDoc->getImageFile(); const Projections& rProj = GetDocument()->getProjections(); imageFile.setArraySize (xSize, ySize); - rProj.reconstruct (imageFile, optFilterName.c_str(), optFilterParam, optFilterMethodName.c_str(), optZeropad, optInterpName.c_str(), optInterpParam, optBackprojectName.c_str(), TRACE_NONE); + rProj.reconstruct (imageFile, optFilterName.c_str(), optFilterParam, optFilterMethodName.c_str(), optZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), optInterpParam, optBackprojectName.c_str(), Trace::TRACE_NONE); 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() << ", Zeropad=" << optZeropad << ", Interpolation=" << optInterpName.c_str() << ", InterpolationParam=" << optInterpParam << ", Backprojection=" << optBackprojectName.c_str() << "\n"; + 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(); } } @@ -665,6 +718,8 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom..."); file_menu->Append(wxID_OPEN, "&Open..."); + file_menu->Append(wxID_SAVE, "&Save"); + file_menu->Append(wxID_SAVEAS, "Save &As..."); file_menu->Append(wxID_CLOSE, "&Close"); file_menu->AppendSeparator(); @@ -701,6 +756,7 @@ bool ProjectionFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) { m_frame = CreateChildFrame(doc, this); + SetFrame(m_frame); int width, height; m_frame->GetClientSize(&width, &height);