r181: *** empty log message ***

[ctsim.git] / src / views.cpp

diff --git a/src/views.cpp b/src/views.cpp
index 077b9db2d9955bb0df51754a0155518fd400969f..0ccbc09f47e7782559a52c8ae22cec859c78d2c2 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.11 2000/07/31 14:48:35 kevin Exp $
+**  $Id: views.cpp,v 1.14 2000/08/22 07:02: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
@@ -405,7 +405,20 @@ PhantomView::OnProjections (wxCommandEvent& event)
       Projections& rProj = pProjectionDoc->getProjections();
       Scanner theScanner (rPhantom, sGeometry.c_str(), nDet, nView, nSamples, dRotAngle);
       rProj.initFromScanner (theScanner);
-      theScanner.collectProjections (rProj, rPhantom, 0, TRACE_NONE);
+
+#if 1
+      wxFrame frame (m_frame, -1, "", wxDefaultPosition, wxSize(500,500));
+      frame.Show();
+      wxClientDC dc (&frame);
+      int x, y;
+      frame.GetClientSize(&x, &y);
+      SGPDriver driver (dynamic_cast<wxDC*>(&dc), x, y);
+      SGP sgp (driver);
+      theScanner.collectProjections (rProj, rPhantom, 0, TRACE_PHM, &sgp);
+#else
+      theScanner.collectProjections (rProj, rPhantom);
+#endif
+
       pProjectionDoc->Modify(true);
       pProjectionDoc->UpdateAllViews(this);
       ostringstream os;
@@ -559,7 +572,7 @@ PhantomView::OnDraw (wxDC* dc)
 {
   int xsize, ysize;
   m_canvas->GetClientSize (&xsize, &ysize);
-  SGPDriver driver (dc, "", xsize, ysize);
+  SGPDriver driver (dc, xsize, ysize);
   SGP sgp (driver);
   const Phantom& rPhantom = GetDocument()->getPhantom();
   sgp.setColor (C_RED);
@@ -612,7 +625,7 @@ ProjectionFileView::OnProperties (wxCommandEvent& event)
 void
 ProjectionFileView::OnReconstruct (wxCommandEvent& event)
 {
-  DialogGetReconstructionParameters dialogReconstruction (m_frame, 256, 256, SignalFilter::FILTER_ABS_BANDLIMIT, 1., SignalFilter::FILTER_METHOD_CONVOLUTION, 3, Backprojector::INTERP_LINEAR, 1, Backprojector::BPROJ_IDIFF3);
+  DialogGetReconstructionParameters dialogReconstruction (m_frame, 256, 256, SignalFilter::FILTER_ABS_BANDLIMIT, 1., ProcessSignal::FILTER_METHOD_CONVOLUTION, ProcessSignal::FILTER_GENERATION_INVALID, 3, Backprojector::INTERP_LINEAR, 1, Backprojector::BPROJ_IDIFF3);
   int retVal = dialogReconstruction.ShowModal();
   if (retVal == wxID_OK) {
     int xSize = dialogReconstruction.getXSize();
@@ -621,6 +634,7 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event)
     double optFilterParam = dialogReconstruction.getFilterParam();
     wxString optFilterMethodName = dialogReconstruction.getFilterMethodName();
     int optZeropad = dialogReconstruction.getZeropad();
+    wxString optFilterGenerationName = dialogReconstruction.getFilterGenerationName();
     wxString optInterpName = dialogReconstruction.getInterpName();
     int optInterpParam = dialogReconstruction.getInterpParam();
     wxString optBackprojectName = dialogReconstruction.getBackprojectName();
@@ -629,7 +643,7 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event)
       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);
+      rProj.reconstruct (imageFile, optFilterName.c_str(), optFilterParam, optFilterMethodName.c_str(), optZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), optInterpParam, optBackprojectName.c_str(), TRACE_NONE);
       pReconDoc->Modify(true);
       pReconDoc->UpdateAllViews(this);
       ostringstream os;