X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.cpp;h=9f9713ec0bc816c574594cf9102078f5994e4830;hb=ab4a3ba2c1ba9672136b5022897f81fc55d03493;hp=3d46d0493394ea6da58162b9ef5cdffbe261c941;hpb=16d093f9366acfccee0f701f736840bcd47c0709;p=ctsim.git

diff --git a/src/views.cpp b/src/views.cpp
index 3d46d04..9f9713e 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.4 2000/07/18 14:51:06 kevin Exp $
+**  $Id: views.cpp,v 1.6 2000/07/19 04:33:27 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
 
@@ -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 << "\n";
+      *theApp->getLog() << os.str().c_str();
     }
   }
 }
@@ -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_STR, 1., SignalFilter::FILTER_METHOD_CONVOLUTION_STR, 3, Backprojector::INTERP_LINEAR_STR, 1, Backprojector::BPROJ_IDIFF3_STR);
+  int retVal = dialogReconstruction.ShowModal();
+  if (retVal == wxID_OK) {
+    int xSize = dialogReconstruction.getXSize();
+    int ySize = dialogReconstruction.getYSize();
+    string optFilterName = dialogReconstruction.getFilterName();
+    double optFilterParam = dialogReconstruction.getFilterParam();
+    string optFilterMethodName = dialogReconstruction.getFilterMethodName();
+    int optZeropad = dialogReconstruction.getZeropad();
+    string optInterpName = dialogReconstruction.getInterpName();
+    int optInterpParam = dialogReconstruction.getInterpParam();
+    string optBackprojectName = dialogReconstruction.getBackprojName();
+    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 << ", FilterParam=" << optFilterParam << ", FilterMethod=" << optFilterMethodName << ", Zeropad=" << optZeropad << ", Interpolation=" << optInterpName << ", InterpolationParam=" << optInterpParam << ", Backprojection=" << optBackprojectName << "\n";
+      *theApp->getLog() << os.str().c_str();
+    }
+  }
 }