X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fviews.cpp;h=affcb6f72c7740461a57d83d1fc914986538a502;hb=27a474e0622ebb7229fd5705552021f63d8f932d;hp=9f9713ec0bc816c574594cf9102078f5994e4830;hpb=ab4a3ba2c1ba9672136b5022897f81fc55d03493;p=ctsim.git

diff --git a/src/views.cpp b/src/views.cpp
index 9f9713e..affcb6f 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.6 2000/07/19 04:33:27 kevin Exp $
+**  $Id: views.cpp,v 1.7 2000/07/20 11:17:31 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
@@ -93,7 +93,7 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event)
 
 	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";
+	  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";
@@ -201,7 +201,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
     
     wxMenu *file_menu = new wxMenu;
     
-    file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "&Create Phantom...");
+    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");
@@ -397,7 +397,7 @@ PhantomView::OnProjections (wxCommandEvent& event)
     int nView = dialogProjection.getNView();
     int nSamples = dialogProjection.getNSamples();
     double dRotAngle = dialogProjection.getRotAngle();
-    string sGeometry = dialogProjection.getGeometry();
+    wxString sGeometry = dialogProjection.getGeometry();
     if (nDet > 0 && nView > 0 && sGeometry != "") {
       const Phantom& rPhantom = GetDocument()->getPhantom();
       ProjectionFileDocument* pProjectionDoc = dynamic_cast<ProjectionFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.pj", wxDOC_SILENT));
@@ -408,7 +408,7 @@ PhantomView::OnProjections (wxCommandEvent& event)
       pProjectionDoc->Modify(true);
       pProjectionDoc->UpdateAllViews(this);
       ostringstream os;
-      os << "Projections for " << rPhantom.name() << ": nDet=" << nDet << ", nView=" << nView << ", nSamples=" << nSamples << ", RotAngle=" << dRotAngle << ", Geometry=" << sGeometry << "\n";
+      os << "Projections for " << rPhantom.name() << ": nDet=" << nDet << ", nView=" << nView << ", nSamples=" << nSamples << ", RotAngle=" << dRotAngle << ", Geometry=" << sGeometry.c_str() << "\n";
       *theApp->getLog() << os.str().c_str();
     }
   }
@@ -466,7 +466,7 @@ PhantomView::CreateChildFrame(wxDocument *doc, wxView *view)
     
     wxMenu *file_menu = new wxMenu;
     
-    file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "&Create Phantom...");
+    file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...");
     file_menu->Append(wxID_OPEN, "&Open...");
     file_menu->Append(wxID_CLOSE, "&Close");
     
@@ -612,13 +612,13 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event)
   if (retVal == wxID_OK) {
     int xSize = dialogReconstruction.getXSize();
     int ySize = dialogReconstruction.getYSize();
-    string optFilterName = dialogReconstruction.getFilterName();
+    wxString optFilterName = dialogReconstruction.getFilterName();
     double optFilterParam = dialogReconstruction.getFilterParam();
-    string optFilterMethodName = dialogReconstruction.getFilterMethodName();
+    wxString optFilterMethodName = dialogReconstruction.getFilterMethodName();
     int optZeropad = dialogReconstruction.getZeropad();
-    string optInterpName = dialogReconstruction.getInterpName();
+    wxString optInterpName = dialogReconstruction.getInterpName();
     int optInterpParam = dialogReconstruction.getInterpParam();
-    string optBackprojectName = dialogReconstruction.getBackprojName();
+    wxString optBackprojectName = dialogReconstruction.getBackprojName();
     if (xSize > 0 && ySize > 0) {
       ImageFileDocument* pReconDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
       ImageFile& imageFile = pReconDoc->getImageFile();
@@ -628,7 +628,7 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event)
       pReconDoc->Modify(true);
       pReconDoc->UpdateAllViews(this);
       ostringstream os;
-      os << "Reconstruct " << rProj.getFilename() << ": xSize=" << xSize << ", ySize=" << ySize << ", Filter=" << optFilterName << ", FilterParam=" << optFilterParam << ", FilterMethod=" << optFilterMethodName << ", Zeropad=" << optZeropad << ", Interpolation=" << optInterpName << ", InterpolationParam=" << optInterpParam << ", Backprojection=" << optBackprojectName << "\n";
+      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";
       *theApp->getLog() << os.str().c_str();
     }
   }
@@ -658,7 +658,7 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view)
     
     wxMenu *file_menu = new wxMenu;
     
-    file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "&Create Phantom...");
+    file_menu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...");
     file_menu->Append(wxID_OPEN, "&Open...");
     file_menu->Append(wxID_CLOSE, "&Close");