X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=cd16c7c1d7f2588dc20732769c98571814e1872b;hp=66770686c5010bd830ae0eb371ba50888b7dd281;hb=dc034c9d0b7d9c3874a324a4c2c189a02945adc8;hpb=4b18b0a7fed4e25130c6edf7929d0df50b8c24ea diff --git a/src/views.cpp b/src/views.cpp index 6677068..cd16c7c 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.3 2000/07/18 03:14:35 kevin Exp $ +** $Id: views.cpp,v 1.25 2000/12/16 06:12:47 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 @@ -25,10 +25,6 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ -#ifdef __GNUG__ -// #pragma implementation -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -45,13 +41,19 @@ #endif #include "wx/image.h" +#include "wx/progdlg.h" #include "ct.h" #include "ctsim.h" #include "docs.h" #include "views.h" #include "dialogs.h" +#include "dlgprojections.h" +#include "dlgreconstruct.h" #include +#include "backprojectors.h" +#include "reconstruct.h" +#include "timer.h" // ImageFileCanvas @@ -84,15 +86,15 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event) wxPoint pt(event.GetLogicalPosition(dc)); - if (event.LeftUp()) { + if (event.LeftIsDown()) { const ImageFile& rIF = m_pView->GetDocument()->getImageFile(); ImageFileArrayConst v = rIF.getArray(); int nx = rIF.nx(); int ny = rIF.ny(); - if (pt.x >= 0 && pt.x < nx && pt.y >= 0 & pt.y < ny) { - ostringstream os; - os << "Image value (" << pt.x << "," << pt.y << ") = " << v[pt.x][pt.y] << "\n"; + if (pt.x >= 0 && pt.x < nx && pt.y >= 0 && pt.y < ny) { + std::ostringstream os; + os << "Image value (" << pt.x << "," << pt.y << ") = " << v[pt.x][ny - 1 - pt.y] << "\n"; *theApp->getLog() << os.str().c_str(); } else *theApp->getLog() << "Mouse out of image range (" << pt.x << "," << pt.y << ")\n"; @@ -107,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) @@ -128,22 +130,36 @@ ImageFileView::OnProperties (wxCommandEvent& event) if (rIF.nx() == 0 || rIF.ny() == 0) *theApp->getLog() << "Properties: empty imagefile\n"; else { - const string& rFilename = rIF.getFilename(); + const std::string& rFilename = rIF.getFilename(); rIF.statistics (min, max, mean, mode, median, stddev); - ostringstream os; + std::ostringstream os; os << "file: " << rFilename << "\nmin: "<getLog() << os.str().c_str(); + wxMessageDialog dialogMsg (m_frame, os.str().c_str(), "Imagefile Properties", wxOK | wxICON_INFORMATION); + dialogMsg.ShowModal(); } } 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; @@ -186,14 +202,15 @@ ImageFileView::CreateCanvas (wxView *view, wxFrame *parent) wxFrame* ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view) { - wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, theApp->getMainFrame(), -1, "ImageFile Frame", wxPoint(10, 10), wxSize(300, 300), wxDEFAULT_FRAME_STYLE); + wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, theApp->getMainFrame(), -1, "ImageFile Frame", wxPoint(-1, -1), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); wxMenu *file_menu = new wxMenu; + 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"); @@ -204,8 +221,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_AUTO, "&Window auto"); - view_menu->Append(IFMENU_VIEW_WINDOW_MINMAX, "&Set Window Min/Max"); + 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"); @@ -228,9 +245,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); @@ -275,7 +294,7 @@ ImageFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) } double scaleWidth = m_dMaxPixel - m_dMinPixel; - unsigned char imageData [nx * ny * 3]; + unsigned char* imageData = new unsigned char [nx * ny * 3]; for (int ix = 0; ix < nx; ix++) { for (int iy = 0; iy < ny; iy++) { double scaleValue = ((v[ix][iy] - m_dMinPixel) / scaleWidth) * 255; @@ -285,8 +304,16 @@ ImageFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) imageData[baseAddr] = imageData[baseAddr+1] = imageData[baseAddr+2] = intensity; } } - wxImage image (ny, nx, imageData, true); + wxImage image (nx, ny, imageData, true); m_bitmap = image.ConvertToBitmap(); + delete imageData; + int xSize = nx; + int ySize = ny; + xSize = clamp (xSize, 0, 800); + ySize = clamp (ySize, 0, 800); + m_frame->SetClientSize (xSize, ySize); + m_canvas->SetScrollbars(20, 20, nx/20, ny/20); + m_canvas->SetBackgroundColour(*wxWHITE); } if (m_canvas) @@ -333,6 +360,7 @@ PhantomCanvas::OnDraw(wxDC& dc) m_pView->OnDraw(& dc); } + // PhantomView IMPLEMENT_DYNAMIC_CLASS(PhantomView, wxView) @@ -346,6 +374,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) @@ -355,10 +391,10 @@ PhantomView::~PhantomView(void) void PhantomView::OnProperties (wxCommandEvent& event) { - const Phantom::PhantomID idPhantom = GetDocument()->getPhantomID(); - const string& namePhantom = GetDocument()->getPhantomName(); - ostringstream os; - os << "Phantom " << namePhantom << " (" << static_cast(idPhantom) << ")\n"; + const int idPhantom = GetDocument()->getPhantomID(); + const wxString& namePhantom = GetDocument()->getPhantomName(); + std::ostringstream os; + os << "Phantom " << namePhantom.c_str() << " (" << idPhantom << ")\n"; *theApp->getLog() << os.str().c_str(); #if DEBUG const Phantom& rPhantom = GetDocument()->getPhantom(); @@ -370,27 +406,113 @@ PhantomView::OnProperties (wxCommandEvent& event) void PhantomView::OnProjections (wxCommandEvent& event) { - const Phantom& rPhantom = GetDocument()->getPhantom(); - ProjectionFileDocument* pProjectionDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.pj", wxDOC_SILENT)); - Projections& rProj = pProjectionDoc->getProjections(); - Scanner theScanner (rPhantom, "parallel", 367, 320, 2, PI); - rProj.initFromScanner (theScanner); - theScanner.collectProjections (rProj, rPhantom, 0, TRACE_NONE); - pProjectionDoc->Modify(true); - pProjectionDoc->UpdateAllViews(this); + 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) { + 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(); + 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(), 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 (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(); + if (dialogProjections.isCancelled() || ! dialogProjections.projectView (iView)) { + pProjectionDoc->DeleteAllViews(); + return; + } + ::wxYield(); + ::wxYield(); + while (dialogProjections.isPaused()) { + ::wxYield(); + ::wxUsleep(50); + } + } + } 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; + } + } + } + + 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() << "\n"; + rProj.setRemark (os.str()); + *theApp->getLog() << os.str().c_str(); + + m_frame->Lower(); + ::wxYield(); + if (wxView* pView = pProjectionDoc->GetFirstView()) { + if (wxFrame* pFrame = pView->GetFrame()) { + pFrame->SetFocus(); + pFrame->Raise(); + } + theApp->getDocManager()->ActivateView (pView, true, false); + } + ::wxYield(); + pProjectionDoc->Modify(true); + pProjectionDoc->UpdateAllViews(this); + } + } } void PhantomView::OnRasterize (wxCommandEvent& event) { - const Phantom& rPhantom = GetDocument()->getPhantom(); - ImageFileDocument* pRasterDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); - ImageFile& imageFile = pRasterDoc->getImageFile(); - imageFile.setArraySize (256, 256); - rPhantom.convertToImagefile (imageFile, 1, TRACE_NONE); - pRasterDoc->Modify(true); - pRasterDoc->UpdateAllViews(this); + DialogGetRasterParameters dialogRaster (m_frame, 256, 256, 1); + int retVal = dialogRaster.ShowModal(); + if (retVal == wxID_OK) { + int xSize = dialogRaster.getXSize(); + int ySize = dialogRaster.getYSize(); + int nSamples = dialogRaster.getNSamples(); + if (nSamples < 1) + nSamples = 1; + if (xSize > 0 && ySize > 0) { + const Phantom& rPhantom = GetDocument()->getPhantom(); + ImageFileDocument* pRasterDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); + ImageFile& imageFile = pRasterDoc->getImageFile(); + + imageFile.setArraySize (xSize, ySize); + wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), imageFile.nx() + 1, m_frame, wxPD_CAN_ABORT); + for (unsigned int i = 0; i < imageFile.nx(); i++) { + rPhantom.convertToImagefile (imageFile, nSamples, Trace::TRACE_NONE, i, 1, true); + if (! dlgProgress.Update(i+1)) { + pRasterDoc->DeleteAllViews(); + return; + } + } + pRasterDoc->Modify(true); + pRasterDoc->UpdateAllViews(this); + + std::ostringstream os; + os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << xSize << ", YSize=" << ySize << ", nSamples=" << nSamples << "\n"; + *theApp->getLog() << os.str().c_str(); + } + } } @@ -403,7 +525,6 @@ PhantomView::CreateCanvas (wxView *view, wxFrame *parent) pCanvas = new PhantomCanvas (dynamic_cast(view), parent, wxPoint(0, 0), wxSize(width, height), 0); - pCanvas->SetScrollbars(20, 20, 50, 50); pCanvas->SetBackgroundColour(*wxWHITE); pCanvas->Clear(); @@ -413,10 +534,11 @@ PhantomView::CreateCanvas (wxView *view, wxFrame *parent) wxFrame* PhantomView::CreateChildFrame(wxDocument *doc, wxView *view) { - wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(300, 300), wxDEFAULT_FRAME_STYLE); + wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(256, 256), wxDEFAULT_FRAME_STYLE); wxMenu *file_menu = new wxMenu; + file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom..."); file_menu->Append(wxID_OPEN, "&Open..."); file_menu->Append(wxID_CLOSE, "&Close"); @@ -454,7 +576,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"); @@ -468,15 +591,8 @@ PhantomView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) m_frame->Show(true); Activate(true); - - return true; -} -void -PhantomView::OnDraw (wxDC* dc) -{ - // if (m_bitmap.Ok()) - // dc->DrawBitmap (m_bitmap, 0, 0, false); + return true; } @@ -510,6 +626,17 @@ PhantomView::OnClose (bool deleteWindow) return true; } +void +PhantomView::OnDraw (wxDC* dc) +{ + int xsize, ysize; + m_canvas->GetClientSize (&xsize, &ysize); + SGPDriver driver (dc, xsize, ysize); + SGP sgp (driver); + const Phantom& rPhantom = GetDocument()->getPhantom(); + sgp.setColor (C_RED); + rPhantom.show (sgp); +} // ProjectionCanvas @@ -538,6 +665,22 @@ END_EVENT_TABLE() ProjectionFileView::ProjectionFileView(void) : wxView(), m_canvas(NULL), m_frame(NULL) { + m_iDefaultNX = 256; + m_iDefaultNY = 256; + m_iDefaultFilter = SignalFilter::FILTER_ABS_BANDLIMIT; + m_dDefaultFilterParam = 1.; +#if HAVE_FFTW + m_iDefaultFilterMethod = ProcessSignal::FILTER_METHOD_RFFTW; + m_iDefaultFilterGeneration = ProcessSignal::FILTER_GENERATION_INVERSE_FOURIER; +#else + m_iDefaultFilterMethod = ProcessSignal::FILTER_METHOD_CONVOLUTION; + m_iDefaultFilterGeneration = ProcessSignal::FILTER_GENERATION_DIRECT; +#endif + m_iDefaultZeropad = 1; + m_iDefaultBackprojector = Backprojector::BPROJ_IDIFF3; + m_iDefaultInterpolation = Backprojector::INTERP_LINEAR; + m_iDefaultInterpParam = 1; + m_iDefaultTrace = Trace::TRACE_NONE; } ProjectionFileView::~ProjectionFileView(void) @@ -548,29 +691,106 @@ void 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"; + std::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(); } void ProjectionFileView::OnReconstruct (wxCommandEvent& event) { - ImageFileDocument* pReconDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); - ImageFile& imageFile = pReconDoc->getImageFile(); - const Projections& rProj = GetDocument()->getProjections(); - string optFilterName = "abs_bandlimit"; - double optFilterParam = 1.; - string optFilterMethodName = "convolution"; - int optZeropad = 3; - string optInterpName = "linear"; - int optInterpParam = 1; - string optBackprojectName = "idiff3"; - imageFile.setArraySize (256, 256); - rProj.reconstruct (imageFile, optFilterName.c_str(), optFilterParam, optFilterMethodName.c_str(), optZeropad, optInterpName.c_str(), optInterpParam, optBackprojectName.c_str(), TRACE_NONE); - pReconDoc->Modify(true); - pReconDoc->UpdateAllViews(this); + DialogGetReconstructionParameters dialogReconstruction (m_frame, 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) { + m_iDefaultNX = dialogReconstruction.getXSize(); + m_iDefaultNY = dialogReconstruction.getYSize(); + wxString optFilterName = dialogReconstruction.getFilterName(); + m_iDefaultFilter = SignalFilter::convertFilterNameToID (optFilterName.c_str()); + m_dDefaultFilterParam = dialogReconstruction.getFilterParam(); + wxString optFilterMethodName = dialogReconstruction.getFilterMethodName(); + m_iDefaultFilterMethod = ProcessSignal::convertFilterMethodNameToID(optFilterMethodName.c_str()); + m_iDefaultZeropad = dialogReconstruction.getZeropad(); + wxString optFilterGenerationName = dialogReconstruction.getFilterGenerationName(); + m_iDefaultFilterGeneration = ProcessSignal::convertFilterGenerationNameToID (optFilterGenerationName.c_str()); + wxString optInterpName = dialogReconstruction.getInterpName(); + m_iDefaultInterpolation = Backprojector::convertInterpNameToID (optInterpName.c_str()); + m_iDefaultInterpParam = dialogReconstruction.getInterpParam(); + wxString optBackprojectName = dialogReconstruction.getBackprojectName(); + m_iDefaultBackprojector = Backprojector::convertBackprojectNameToID (optBackprojectName.c_str()); + m_iDefaultTrace = dialogReconstruction.getTrace(); + if (m_iDefaultNX > 0 && m_iDefaultNY > 0) { + ImageFileDocument* pReconDoc = dynamic_cast(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT)); + ImageFile& imageFile = pReconDoc->getImageFile(); + const Projections& rProj = GetDocument()->getProjections(); + imageFile.setArraySize (m_iDefaultNX, m_iDefaultNY); + Timer timerRecon; + + if (m_iDefaultFilterMethod != ProcessSignal::FILTER_METHOD_CONVOLUTION && m_iDefaultFilterGeneration == ProcessSignal::FILTER_GENERATION_DIRECT && rProj.geometry() != Scanner::GEOMETRY_PARALLEL) { + wxMessageBox ("Sorry!\nCurrently, frequency-based filtering with direct filter generation is not support for geometries other than parallel.\nAborting command.", "Not Supported", wxOK | wxICON_WARNING, m_frame); + return; + } +#if 0 + SGPDriver* pSGPDriver = NULL; + SGP* pSGP = NULL; + wxMemoryDC* pDCPlot = NULL; + wxBitmap bitmap; + if (m_iDefaultTrace >= Trace::TRACE_PLOT) { + bitmap.Create (500, 500); + pDCPlot = new wxMemoryDC; + pDCPlot->SelectObject (bitmap); + pSGPDriver = new SGPDriver (dynamic_castpDCPlot, 500, 500); + pSGP = new SGP (*pSGPDriver); + } + 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, pSGP); + delete pSGP; +#else + 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); +#endif + + if (m_iDefaultTrace > Trace::TRACE_CONSOLE) { + ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstruct, rProj, imageFile, m_iDefaultTrace, 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); + } + } + delete pDlgReconstruct; + } 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; + } + } + } + delete pReconstruct; + pReconDoc->Modify(true); + pReconDoc->UpdateAllViews(this); + 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() << "\n"; + *theApp->getLog() << os.str().c_str(); + imageFile.labelAdd (rProj.getLabel()); + imageFile.labelAdd (Array2dFileLabel::L_HISTORY, os.str().c_str(), timerRecon.timerEnd()); + } + } } @@ -593,11 +813,14 @@ ProjectionFileView::CreateCanvas (wxView *view, wxFrame *parent) wxFrame* ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view) { - wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, theApp->getMainFrame(), -1, "Projection Frame", wxPoint(10, 10), wxSize(300, 300), wxDEFAULT_FRAME_STYLE); + wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, theApp->getMainFrame(), -1, "Projection Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE); wxMenu *file_menu = new wxMenu; + 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(); @@ -634,6 +857,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); @@ -682,20 +906,27 @@ ProjectionFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) } } - unsigned char imageData [nDet * nView * 3]; + unsigned char* imageData = new unsigned char [nDet * nView * 3]; double scale = (max - min) / 255; - for (int iy = 0; iy < nView; iy++) { - const DetectorArray& detarray = rProj.getDetectorArray(iy); + for (int iy2 = 0; iy2 < nView; iy2++) { + const DetectorArray& detarray = rProj.getDetectorArray (iy2); const DetectorValue* detval = detarray.detValues(); for (int ix = 0; ix < nDet; ix++) { int intensity = static_cast(((detval[ix] - min) / scale) + 0.5); intensity = clamp(intensity, 0, 255); - int baseAddr = (iy * nDet + ix) * 3; + int baseAddr = (iy2 * nDet + ix) * 3; imageData[baseAddr] = imageData[baseAddr+1] = imageData[baseAddr+2] = intensity; } } wxImage image (nDet, nView, imageData, true); m_bitmap = image.ConvertToBitmap(); + delete imageData; + int xSize = nDet; + int ySize = nView; + xSize = clamp (xSize, 0, 800); + ySize = clamp (ySize, 0, 800); + m_frame->SetClientSize (xSize, ySize); + m_canvas->SetScrollbars (20, 20, nDet/20, nView/20); } if (m_canvas)