r463: no message

[ctsim.git] / src / views.cpp

diff --git a/src/views.cpp b/src/views.cpp
index 4b7933351df230179b7400ab496cc264b251be96..3a6db53239f66d2a41e71578d6fca667eae89b4e 100644 (file)
--- a/src/views.cpp
+++ b/src/views.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: views.cpp,v 1.84 2001/01/28 19:10:18 kevin Exp $
+**  $Id: views.cpp,v 1.85 2001/01/28 20:05:17 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
@@ -373,8 +373,8 @@ ImageFileView::OnCompare (wxCommandEvent& event)
           << os.str().c_str();
         differenceImage.labelAdd (os.str().c_str());
         if (theApp->getSetModifyNewDocs())
-          pDifferenceDoc->Modify(true);
-        pDifferenceDoc->UpdateAllViews(this);
+          pDifferenceDoc->Modify (true);
+        pDifferenceDoc->UpdateAllViews (this);
         pDifferenceDoc->getView()->OnUpdate (this, NULL);
         pDifferenceDoc->getView()->getFrame()->Show(true);
       }
@@ -391,7 +391,7 @@ ImageFileView::OnInvertValues (wxCommandEvent& event)
   rIF.labelAdd ("Invert Pixel Values");
   if (theApp->getSetModifyNewDocs())
     GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -402,7 +402,7 @@ ImageFileView::OnSquare (wxCommandEvent& event)
   rIF.labelAdd ("Square Pixel Values");
   if (theApp->getSetModifyNewDocs())
     GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -413,7 +413,7 @@ ImageFileView::OnSquareRoot (wxCommandEvent& event)
   rIF.labelAdd ("Square-root Pixel Values");
   if (theApp->getSetModifyNewDocs())
     GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -424,7 +424,7 @@ ImageFileView::OnLog (wxCommandEvent& event)
   rIF.labelAdd ("Logrithm base-e Pixel Values");
   if (theApp->getSetModifyNewDocs())
     GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -435,7 +435,7 @@ ImageFileView::OnExp (wxCommandEvent& event)
   rIF.labelAdd ("Exponent base-e Pixel Values");
   if (theApp->getSetModifyNewDocs())
     GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -472,7 +472,7 @@ ImageFileView::OnAdd (wxCommandEvent& event)
       *theApp->getLog() << os.str().c_str() << "\n";
       if (theApp->getSetModifyNewDocs())
         pNewDoc->Modify(TRUE);
-      pNewDoc->UpdateAllViews(this);
+      pNewDoc->UpdateAllViews (this);
       pNewDoc->getView()->OnUpdate (this, NULL);
       pNewDoc->getView()->getFrame()->Show(true);
     }
@@ -513,7 +513,7 @@ ImageFileView::OnSubtract (wxCommandEvent& event)
       *theApp->getLog() << os.str().c_str() << "\n";
       if (theApp->getSetModifyNewDocs())
         pNewDoc->Modify(TRUE);
-      pNewDoc->UpdateAllViews(this);
+      pNewDoc->UpdateAllViews (this);
       pNewDoc->getView()->OnUpdate (this, NULL);
       pNewDoc->getView()->getFrame()->Show(true);
     }
@@ -554,7 +554,7 @@ ImageFileView::OnMultiply (wxCommandEvent& event)
       *theApp->getLog() << os.str().c_str() << "\n";
       if (theApp->getSetModifyNewDocs())
         pNewDoc->Modify(TRUE);
-      pNewDoc->UpdateAllViews(this);
+      pNewDoc->UpdateAllViews (this);
       pNewDoc->getView()->OnUpdate (this, NULL);
       pNewDoc->getView()->getFrame()->Show(true);
     }
@@ -595,7 +595,7 @@ ImageFileView::OnDivide (wxCommandEvent& event)
       *theApp->getLog() << os.str().c_str() << "\n";
       if (theApp->getSetModifyNewDocs())
         pNewDoc->Modify(TRUE);
-      pNewDoc->UpdateAllViews(this);
+      pNewDoc->UpdateAllViews (this);
       pNewDoc->getView()->OnUpdate (this, NULL);
       pNewDoc->getView()->getFrame()->Show(true);
     }
@@ -614,7 +614,7 @@ ImageFileView::OnFFT (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getSetModifyNewDocs())
     GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -627,7 +627,7 @@ ImageFileView::OnIFFT (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getSetModifyNewDocs())
     GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -640,7 +640,7 @@ ImageFileView::OnFFTRows (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getSetModifyNewDocs())
     GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -653,7 +653,7 @@ ImageFileView::OnIFFTRows (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getSetModifyNewDocs())
     GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -666,7 +666,7 @@ ImageFileView::OnFFTCols (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getSetModifyNewDocs())
     GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -679,7 +679,7 @@ ImageFileView::OnIFFTCols (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getSetModifyNewDocs())
     GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->UpdateAllViews (this);
 }
 #endif
 
@@ -694,7 +694,7 @@ ImageFileView::OnFourier (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getSetModifyNewDocs())
     GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -708,7 +708,7 @@ ImageFileView::OnInverseFourier (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getSetModifyNewDocs())
     GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -721,7 +721,7 @@ ImageFileView::OnShuffleNaturalToFourierOrder (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getSetModifyNewDocs())
     GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -734,7 +734,7 @@ ImageFileView::OnShuffleFourierToNaturalOrder (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getSetModifyNewDocs())
     GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -748,7 +748,7 @@ ImageFileView::OnMagnitude (wxCommandEvent& event)
     m_bMaxSpecified = false;
     if (theApp->getSetModifyNewDocs())
       GetDocument()->Modify(TRUE);
-    GetDocument()->UpdateAllViews(this);
+    GetDocument()->UpdateAllViews (this);
   }
 }
 
@@ -763,7 +763,7 @@ ImageFileView::OnPhase (wxCommandEvent& event)
     m_bMaxSpecified = false;
     if (theApp->getSetModifyNewDocs())
       GetDocument()->Modify(TRUE);
-    GetDocument()->UpdateAllViews(this);
+    GetDocument()->UpdateAllViews (this);
   }
 }
 
@@ -1177,7 +1177,7 @@ ImageFileView::OnPlotRow (wxCommandEvent& event)
     }
     if (theApp->getSetModifyNewDocs())
       pPlotDoc->Modify(true);
-    pPlotDoc->UpdateAllViews();
+    pPlotDoc->UpdateAllViews ();
   }
 }
 
@@ -1261,7 +1261,7 @@ ImageFileView::OnPlotCol (wxCommandEvent& event)
     }
     if (theApp->getSetModifyNewDocs())
       pPlotDoc->Modify(true);
-    pPlotDoc->UpdateAllViews();
+    pPlotDoc->UpdateAllViews ();
   }
 }
 
@@ -1354,7 +1354,7 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event)
     
     if (theApp->getSetModifyNewDocs())
       pPlotDoc->Modify(true);
-    pPlotDoc->UpdateAllViews();
+    pPlotDoc->UpdateAllViews ();
   }
 }
 
@@ -1453,7 +1453,7 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event)
     
     if (theApp->getSetModifyNewDocs())
       pPlotDoc->Modify(true);
-    pPlotDoc->UpdateAllViews();
+    pPlotDoc->UpdateAllViews ();
   }
 }
 #endif
@@ -1542,7 +1542,7 @@ ImageFileView::OnCompareCol (wxCommandEvent& event)
       delete pY2;
       if (theApp->getSetModifyNewDocs())
         pPlotDoc->Modify(true);
-      pPlotDoc->UpdateAllViews();
+      pPlotDoc->UpdateAllViews ();
     }
   }
 }
@@ -1632,7 +1632,7 @@ ImageFileView::OnCompareRow (wxCommandEvent& event)
       delete pY2;
       if (theApp->getSetModifyNewDocs())
         pPlotDoc->Modify(true);
-      pPlotDoc->UpdateAllViews();
+      pPlotDoc->UpdateAllViews ();
     }
   }
 }
@@ -1697,7 +1697,7 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event)
       delete pY;
       if (theApp->getSetModifyNewDocs())
         pPlotDoc->Modify(true);
-      pPlotDoc->UpdateAllViews();
+      pPlotDoc->UpdateAllViews ();
   }
 }
 
@@ -1836,7 +1836,8 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
         for (int i = 0; i < rProj.nView(); i++) {
           theScanner.collectProjections (rProj, rPhantom, i, 1, true, m_iDefaultTrace);
           if (! dlgProgress.Update (i+1)) {
-            pProjectionDoc->getView()->getFrame()->Close(true);
+            pProjectionDoc->getView()->OnClose(true);
+                       delete pProjectionDoc;
             return;
           }
         }
@@ -1848,7 +1849,6 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
       rProj.setRemark (os.str());
       *theApp->getLog() << os.str().c_str() << "\n";
       
-      m_pFrame->Lower();
       ::wxYield();
       ProjectionFileView* projView = pProjectionDoc->getView();
       if (projView) {
@@ -1865,7 +1865,7 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
       ::wxYield();
       if (theApp->getSetModifyNewDocs())
         pProjectionDoc->Modify(true);
-      pProjectionDoc->UpdateAllViews(this);
+      pProjectionDoc->UpdateAllViews (this);
     }
   }
 }
@@ -1891,20 +1891,21 @@ PhantomFileView::OnRasterize (wxCommandEvent& event)
       }
       ImageFile& imageFile = pRasterDoc->getImageFile();
       
-      imageFile.setArraySize (m_iDefaultRasterNX, m_iDefaultRasterNX);
+      imageFile.setArraySize (m_iDefaultRasterNX, m_iDefaultRasterNY);
       wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), imageFile.nx() + 1, getFrameForChild(), wxPD_CAN_ABORT);
       Timer timer;
       for (unsigned int i = 0; i < imageFile.nx(); i++) {
         rPhantom.convertToImagefile (imageFile, m_iDefaultRasterNSamples, Trace::TRACE_NONE, i, 1, true);
-        if (! dlgProgress.Update(i+1)) {
+        if (! dlgProgress.Update (i+1)) {
           pRasterDoc->Close();
-          pRasterDoc->getView()->getFrame()->Close(true);
+          pRasterDoc->getView()->OnClose(true);
+                 delete pRasterDoc;
           return;
         }
       }
       if (theApp->getSetModifyNewDocs())
         pRasterDoc->Modify(true);
-      pRasterDoc->UpdateAllViews(this);
+      pRasterDoc->UpdateAllViews (this);
       pRasterDoc->getView()->getFrame()->Show(true);
       std::ostringstream os;
       os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << m_iDefaultRasterNX << ", YSize=" 
@@ -2031,7 +2032,7 @@ PhantomFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 }
 
 void 
-PhantomFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
+PhantomFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 {
   if (m_pCanvas)
     m_pCanvas->Refresh();
@@ -2199,7 +2200,7 @@ ProjectionFileView::OnConvertPolar (wxCommandEvent& event)
     rIF.labelAdd (os.str().c_str());
     if (theApp->getSetModifyNewDocs())
       pPolarDoc->Modify(true);
-    pPolarDoc->UpdateAllViews();
+    pPolarDoc->UpdateAllViews ();
     pPolarDoc->getView()->OnUpdate (this, NULL);
     pPolarDoc->getView()->getFrame()->Show(true);
   }
@@ -2234,7 +2235,7 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event)
     rIF.labelAdd (os.str().c_str());
     if (theApp->getSetModifyNewDocs())
       pPolarDoc->Modify(true);
-    pPolarDoc->UpdateAllViews();
+    pPolarDoc->UpdateAllViews ();
     pPolarDoc->getView()->OnUpdate (this, NULL);
     pPolarDoc->getView()->getFrame()->Show(true);
   }
@@ -2305,9 +2306,10 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event)
         wxProgressDialog dlgProgress (wxString("Reconstruction"), wxString("Reconstruction Progress"), rProj.nView() + 1, getFrameForChild(), wxPD_CAN_ABORT);
         for (int i = 0; i < rProj.nView(); i++) {
           pReconstruct->reconstructView (i, 1);
-          if (! dlgProgress.Update(i + 1)) {
+          if (! dlgProgress.Update (i + 1)) {
             delete pReconstruct;
-            pReconDoc->getView()->getFrame()->Close(true);
+            pReconDoc->getView()->OnClose(true);
+                       delete pReconDoc;
             return;
           }
         }
@@ -2315,7 +2317,7 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event)
       delete pReconstruct;
       if (theApp->getSetModifyNewDocs())
         pReconDoc->Modify(true);
-      pReconDoc->UpdateAllViews(this);
+      pReconDoc->UpdateAllViews (this);
       if (ImageFileView* rasterView = pReconDoc->getView()) {
         rasterView->OnUpdate (rasterView, NULL);
         rasterView->getFrame()->SetFocus();
@@ -2464,7 +2466,7 @@ ProjectionFileView::OnDraw (wxDC* dc)
 
 
 void 
-ProjectionFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
+ProjectionFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 {
   const Projections& rProj = GetDocument()->getProjections();
   const int nDet = rProj.nDet();
@@ -2910,7 +2912,7 @@ void TextFileView::OnDraw(wxDC *WXUNUSED(dc) )
 {
 }
 
-void TextFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
+void TextFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 {
 }