r168: *** empty log message ***

[ctsim.git] / src / views.cpp

diff --git a/src/views.cpp b/src/views.cpp
index affcb6f72c7740461a57d83d1fc914986538a502..1ca02ebf624e834c812079968c83138b65907c2d 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.7 2000/07/20 11:17:31 kevin Exp $
+**  $Id: views.cpp,v 1.13 2000/08/02 18:06:00 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
@@ -297,7 +297,7 @@ ImageFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
                imageData[baseAddr] = imageData[baseAddr+1] = imageData[baseAddr+2] = intensity;
            }
        }
-       wxImage image (ny, nx, imageData, true);
+       wxImage image (nx, ny, imageData, true);
        m_bitmap = image.ConvertToBitmap();
        delete imageData;
        int xSize = nx;
@@ -341,7 +341,7 @@ ImageFileView::OnClose (bool deleteWindow)
 // PhantomCanvas
 
 PhantomCanvas::PhantomCanvas (PhantomView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style)
-  : wxPanel(frame, -1, pos, size, style)
+  : wxScrolledWindow(frame, -1, pos, size, style)
 {
     m_pView = v;
 }
@@ -353,6 +353,7 @@ PhantomCanvas::OnDraw(wxDC& dc)
         m_pView->OnDraw(& dc);
 }
 
+
 // PhantomView
 
 IMPLEMENT_DYNAMIC_CLASS(PhantomView, wxView)
@@ -375,10 +376,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();
@@ -390,7 +391,7 @@ 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();
@@ -404,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;
@@ -518,15 +532,8 @@ PhantomView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 
     m_frame->Show(true);
     Activate(true);
-    
-    return true;
-}
 
-void 
-PhantomView::OnDraw (wxDC* dc)
-{
-    //  if (m_bitmap.Ok())
-    //    dc->DrawBitmap (m_bitmap, 0, 0, false);
+    return true;
 }
 
 
@@ -560,6 +567,17 @@ PhantomView::OnClose (bool deleteWindow)
     return true;
 }
 
+void
+PhantomView::OnDraw (wxDC* dc)
+{
+  int xsize, ysize;
+  m_canvas->GetClientSize (&xsize, &ysize);
+  SGPDriver driver (dc, xsize, ysize);
+  SGP sgp (driver);
+  const Phantom& rPhantom = GetDocument()->getPhantom();
+  sgp.setColor (C_RED);
+  rPhantom.show (sgp);
+}
 
 // ProjectionCanvas
 
@@ -607,7 +625,7 @@ ProjectionFileView::OnProperties (wxCommandEvent& event)
 void
 ProjectionFileView::OnReconstruct (wxCommandEvent& event)
 {
-  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);
+  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();
@@ -618,7 +636,7 @@ ProjectionFileView::OnReconstruct (wxCommandEvent& event)
     int optZeropad = dialogReconstruction.getZeropad();
     wxString optInterpName = dialogReconstruction.getInterpName();
     int optInterpParam = dialogReconstruction.getInterpParam();
-    wxString optBackprojectName = dialogReconstruction.getBackprojName();
+    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();