X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=b2050581daf5943548d11187ccb57c3fe0eb58e6;hp=e94ca255c4563dd440d1419f2bdc099160292f5c;hb=855f0990a75750c61badd376ff35ffb39fab1c36;hpb=484b9ac2ebf8f88dbe36bdc1d3a9c1b6a2b242eb diff --git a/src/views.cpp b/src/views.cpp index e94ca25..b205058 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.24 2000/12/16 03:29:02 kevin Exp $ +** $Id: views.cpp,v 1.28 2000/12/17 23:30:48 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" @@ -54,10 +50,16 @@ #include "dialogs.h" #include "dlgprojections.h" #include "dlgreconstruct.h" -#include #include "backprojectors.h" #include "reconstruct.h" #include "timer.h" + +#if defined(MSVC) || HAVE_SSTREAM +#include +#else +#include +#endif + // ImageFileCanvas @@ -97,7 +99,7 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event) int ny = rIF.ny(); if (pt.x >= 0 && pt.x < nx && pt.y >= 0 && pt.y < ny) { - ostringstream os; + 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 @@ -134,10 +136,10 @@ 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; - os << "file: " << rFilename << "\nmin: "<getLog() << os.str().c_str(); wxMessageDialog dialogMsg (m_frame, os.str().c_str(), "Imagefile Properties", wxOK | wxICON_INFORMATION); dialogMsg.ShowModal(); @@ -397,7 +399,7 @@ PhantomView::OnProperties (wxCommandEvent& event) { const int idPhantom = GetDocument()->getPhantomID(); const wxString& namePhantom = GetDocument()->getPhantomName(); - ostringstream os; + std::ostringstream os; os << "Phantom " << namePhantom.c_str() << " (" << idPhantom << ")\n"; *theApp->getLog() << os.str().c_str(); #if DEBUG @@ -462,10 +464,10 @@ PhantomView::OnProjections (wxCommandEvent& event) } } - 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"; + 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.setRemark (os.str()); - *theApp->getLog() << os.str().c_str(); + *theApp->getLog() << os.str().c_str() << "\n"; m_frame->Lower(); ::wxYield(); @@ -512,7 +514,7 @@ PhantomView::OnRasterize (wxCommandEvent& event) pRasterDoc->Modify(true); pRasterDoc->UpdateAllViews(this); - ostringstream os; + std::ostringstream os; os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << xSize << ", YSize=" << ySize << ", nSamples=" << nSamples << "\n"; *theApp->getLog() << os.str().c_str(); } @@ -695,7 +697,7 @@ void ProjectionFileView::OnProperties (wxCommandEvent& event) { const Projections& rProj = GetDocument()->getProjections(); - ostringstream os; + 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); @@ -731,7 +733,6 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event) 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); @@ -754,7 +755,8 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event) #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 - + + Timer timerRecon; 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++) { @@ -788,11 +790,12 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event) delete pReconstruct; pReconDoc->Modify(true); pReconDoc->UpdateAllViews(this); - 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(); + 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 (Array2dFileLabel::L_HISTORY, os.str().c_str(), timerRecon.timerEnd()); + imageFile.labelAdd (Array2dFileLabel::L_HISTORY, os.str().c_str(), timerRecon.timerEnd()); + imageFile.setCalcTime (timerReconstruct.timerEnd()); } } }