X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=cd16c7c1d7f2588dc20732769c98571814e1872b;hp=2edb737e0e0c74af7c010acf7a521b75dddb0884;hb=dc034c9d0b7d9c3874a324a4c2c189a02945adc8;hpb=98f894fe74f1a532f5e6d69cca0404d9a58893e7

diff --git a/src/views.cpp b/src/views.cpp
index 2edb737..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.22 2000/09/07 01:28:33 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"
 
@@ -96,8 +92,8 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event)
 	int nx = rIF.nx();
 	int ny = rIF.ny();
 
-	if (pt.x >= 0 && pt.x < nx && pt.y >= 0 & pt.y < ny) {
-	  ostringstream os;
+	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
@@ -134,9 +130,9 @@ 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: "<<min<<"\nmax: "<<max<<"\nmean: "<<mean<<"\nmode: "<<mode<<"\nstddev: "<<stddev << "\n";
     *theApp->getLog() << os.str().c_str();
     wxMessageDialog dialogMsg (m_frame, os.str().c_str(), "Imagefile Properties", wxOK | wxICON_INFORMATION);
@@ -396,9 +392,9 @@ void
 PhantomView::OnProperties (wxCommandEvent& event)
 {
   const int idPhantom = GetDocument()->getPhantomID();
-  const string& namePhantom = GetDocument()->getPhantomName();
-  ostringstream os;
-  os << "Phantom " << namePhantom << " (" << idPhantom << ")\n";
+  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();
@@ -462,7 +458,7 @@ PhantomView::OnProjections (wxCommandEvent& event)
 	}
       }
 
-      ostringstream os;
+      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();
@@ -512,7 +508,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 +691,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);
@@ -788,7 +784,7 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event)
       delete pReconstruct;
       pReconDoc->Modify(true);
       pReconDoc->UpdateAllViews(this);
-      ostringstream os;
+      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());
@@ -912,13 +908,13 @@ ProjectionFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint)
 
 	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<int>(((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;
 	    }
 	}