r158: *** empty log message ***

[ctsim.git] / src / views.cpp

diff --git a/src/views.cpp b/src/views.cpp
index 3d46d0493394ea6da58162b9ef5cdffbe261c941..536db90ca0cc6c0e88b401b27c68d13f220565df 100644 (file)
--- 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.4 2000/07/18 14:51:06 kevin Exp $
+**  $Id: views.cpp,v 1.8 2000/07/22 15:45:33 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
@@ -52,6 +52,7 @@
 #include "views.h"
 #include "dialogs.h"
 #include <sstream>
+#include "backprojectors.h"
 
 // ImageFileCanvas
 
@@ -92,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";
@@ -200,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");
@@ -374,10 +375,10 @@ PhantomView::~PhantomView(void)
 void
 PhantomView::OnProperties (wxCommandEvent& event)
 {
-  const Phantom::PhantomID idPhantom = GetDocument()->getPhantomID();
+  const int idPhantom = GetDocument()->getPhantomID();
   const string& namePhantom = GetDocument()->getPhantomName();
   ostringstream os;
-  os << "Phantom " << namePhantom << " (" << static_cast<int>(idPhantom) << ")\n";
+  os << "Phantom " << namePhantom << " (" << idPhantom << ")\n";
   *theApp->getLog() << os.str().c_str();
 #if DEBUG
   const Phantom& rPhantom = GetDocument()->getPhantom();
@@ -389,14 +390,14 @@ PhantomView::OnProperties (wxCommandEvent& event)
 void
 PhantomView::OnProjections (wxCommandEvent& event)
 {
-  DialogGetProjectionParameters dialogProjection (m_frame, 367, 320, 1, 1., Scanner::GEOMETRY_PARALLEL_STR);
+  DialogGetProjectionParameters dialogProjection (m_frame, 367, 320, 1, 1., Scanner::GEOMETRY_PARALLEL);
   int retVal = dialogProjection.ShowModal();
   if (retVal == wxID_OK) {
     int nDet = dialogProjection.getNDet();
     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));
@@ -406,6 +407,9 @@ PhantomView::OnProjections (wxCommandEvent& event)
       theScanner.collectProjections (rProj, rPhantom, 0, TRACE_NONE);
       pProjectionDoc->Modify(true);
       pProjectionDoc->UpdateAllViews(this);
+      ostringstream os;
+      os << "Projections for " << rPhantom.name() << ": nDet=" << nDet << ", nView=" << nView << ", nSamples=" << nSamples << ", RotAngle=" << dRotAngle << ", Geometry=" << sGeometry.c_str() << "\n";
+      *theApp->getLog() << os.str().c_str();
     }
   }
 }
@@ -462,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");
     
@@ -603,20 +607,31 @@ ProjectionFileView::OnProperties (wxCommandEvent& event)
 void
 ProjectionFileView::OnReconstruct (wxCommandEvent& event)
 {
-  ImageFileDocument* pReconDoc = dynamic_cast<ImageFileDocument*>(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, 256, 256, SignalFilter::FILTER_ABS_BANDLIMIT, 1., SignalFilter::FILTER_METHOD_CONVOLUTION, 3, Backprojector::INTERP_LINEAR, 1, Backprojector::BPROJ_IDIFF3);
+  int retVal = dialogReconstruction.ShowModal();
+  if (retVal == wxID_OK) {
+    int xSize = dialogReconstruction.getXSize();
+    int ySize = dialogReconstruction.getYSize();
+    wxString optFilterName = dialogReconstruction.getFilterName();
+    double optFilterParam = dialogReconstruction.getFilterParam();
+    wxString optFilterMethodName = dialogReconstruction.getFilterMethodName();
+    int optZeropad = dialogReconstruction.getZeropad();
+    wxString optInterpName = dialogReconstruction.getInterpName();
+    int optInterpParam = dialogReconstruction.getInterpParam();
+    wxString optBackprojectName = dialogReconstruction.getBackprojectName();
+    if (xSize > 0 && ySize > 0) {
+      ImageFileDocument* pReconDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+      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);
+      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";
+      *theApp->getLog() << os.str().c_str();
+    }
+  }
 }
 
 
@@ -643,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");