X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.cpp;h=e3922dafce711ee8e7c1c44a01ed10e76aa8bb50;hb=06066d9192936b4c4cc69847cd4c1f5aa7017829;hp=88e5f042fc7dc22b2a030fec80d9713b98c7b42f;hpb=29ef5a345e52e49ee9e37b347103b564321c903d;p=ctsim.git

diff --git a/src/views.cpp b/src/views.cpp
index 88e5f04..e3922da 100644
--- 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.167 2003/01/29 07:18:38 kevin Exp $
+**  $Id: views.cpp,v 1.170 2003/01/30 21:53:16 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
@@ -356,6 +356,7 @@ ImageFileView::OnScaleMinMax (wxCommandEvent& event)
     m_bMaxSpecified = true;
     m_dMinPixel = dialogMinMax.getMinimum();
     m_dMaxPixel = dialogMinMax.getMaximum();
+    OnUpdate(this, NULL);
     GetDocument()->UpdateAllViews (this);
   }
   GetDocument()->Activate();
@@ -367,6 +368,7 @@ ImageFileView::OnScaleFull (wxCommandEvent& event)
   if (m_bMinSpecified || m_bMaxSpecified) {
     m_bMinSpecified = false;
     m_bMaxSpecified = false;
+    OnUpdate(this, NULL);
     GetDocument()->UpdateAllViews (this);
   }
   GetDocument()->Activate();
@@ -424,6 +426,7 @@ ImageFileView::OnCompare (wxCommandEvent& event)
         pDifferenceImage->labelAdd (os.str().c_str());
         if (theApp->getAskDeleteNewDocs())
           pDifferenceDoc->Modify (true);
+	OnUpdate(this, NULL);
         pDifferenceDoc->UpdateAllViews(this);
 	pDifferenceDoc->getView()->setInitialClientSize();
         pDifferenceDoc->Activate();
@@ -441,6 +444,7 @@ ImageFileView::OnInvertValues (wxCommandEvent& event)
   rIF.labelAdd ("Invert Pixel Values");
   if (theApp->getAskDeleteNewDocs())
     GetDocument()->Modify (true);
+  OnUpdate(this, NULL);
   GetDocument()->UpdateAllViews (this);
   GetDocument()->Activate();
 }
@@ -453,6 +457,7 @@ ImageFileView::OnSquare (wxCommandEvent& event)
   rIF.labelAdd ("Square Pixel Values");
   if (theApp->getAskDeleteNewDocs())
     GetDocument()->Modify (true);
+  OnUpdate(this, NULL);
   GetDocument()->UpdateAllViews (this);
   GetDocument()->Activate();
 }
@@ -465,6 +470,7 @@ ImageFileView::OnSquareRoot (wxCommandEvent& event)
   rIF.labelAdd ("Square-root Pixel Values");
   if (theApp->getAskDeleteNewDocs())
     GetDocument()->Modify (true);
+  OnUpdate(this, NULL);
   GetDocument()->UpdateAllViews (this);
   GetDocument()->Activate();
 }
@@ -477,6 +483,7 @@ ImageFileView::OnLog (wxCommandEvent& event)
   rIF.labelAdd ("Logrithm base-e Pixel Values");
   if (theApp->getAskDeleteNewDocs())
     GetDocument()->Modify (true);
+  OnUpdate(this, NULL);
   GetDocument()->UpdateAllViews (this);
   GetDocument()->Activate();
 }
@@ -489,6 +496,7 @@ ImageFileView::OnExp (wxCommandEvent& event)
   rIF.labelAdd ("Exponent base-e Pixel Values");
   if (theApp->getAskDeleteNewDocs())
     GetDocument()->Modify (true);
+  OnUpdate(this, NULL);
   GetDocument()->UpdateAllViews (this);
   GetDocument()->Activate();
 }
@@ -527,6 +535,7 @@ ImageFileView::OnAdd (wxCommandEvent& event)
       *theApp->getLog() << os.str().c_str() << "\n";
       if (theApp->getAskDeleteNewDocs())
         pNewDoc->Modify (true);
+      OnUpdate(this, NULL);
       pNewDoc->UpdateAllViews (this);
       pNewDoc->getView()->setInitialClientSize();
       pNewDoc->Activate();
@@ -568,6 +577,7 @@ ImageFileView::OnSubtract (wxCommandEvent& event)
       *theApp->getLog() << os.str().c_str() << "\n";
       if (theApp->getAskDeleteNewDocs())
         pNewDoc->Modify (true);
+      OnUpdate(this, NULL);
       pNewDoc->UpdateAllViews (this);
       pNewDoc->getView()->setInitialClientSize();
       pNewDoc->Activate();
@@ -609,6 +619,7 @@ ImageFileView::OnMultiply (wxCommandEvent& event)
       *theApp->getLog() << os.str().c_str() << "\n";
       if (theApp->getAskDeleteNewDocs())
         pNewDoc->Modify (true);
+      OnUpdate(this, NULL);
       pNewDoc->UpdateAllViews (this);
       pNewDoc->getView()->setInitialClientSize();
       pNewDoc->Activate();
@@ -650,6 +661,7 @@ ImageFileView::OnDivide (wxCommandEvent& event)
       *theApp->getLog() << os.str().c_str() << "\n";
       if (theApp->getAskDeleteNewDocs())
         pNewDoc->Modify (true);
+      OnUpdate(this, NULL);
       pNewDoc->UpdateAllViews (this);
       pNewDoc->getView()->setInitialClientSize();
       pNewDoc->Activate();
@@ -669,6 +681,7 @@ ImageFileView::OnFFT (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getAskDeleteNewDocs())
     GetDocument()->Modify (true);
+  OnUpdate(this, NULL);
   GetDocument()->UpdateAllViews (this);
   GetDocument()->Activate();
 }
@@ -683,6 +696,7 @@ ImageFileView::OnIFFT (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getAskDeleteNewDocs())
     GetDocument()->Modify (true);
+  OnUpdate(this, NULL);
   GetDocument()->UpdateAllViews (this);
   GetDocument()->Activate();
 }
@@ -697,6 +711,7 @@ ImageFileView::OnFFTRows (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getAskDeleteNewDocs())
     GetDocument()->Modify (true);
+  OnUpdate(this, NULL);
   GetDocument()->UpdateAllViews (this);
   GetDocument()->Activate();
 }
@@ -711,6 +726,7 @@ ImageFileView::OnIFFTRows (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getAskDeleteNewDocs())
     GetDocument()->Modify (true);
+  OnUpdate(this, NULL);
   GetDocument()->UpdateAllViews (this);
   GetDocument()->Activate();
 }
@@ -725,6 +741,7 @@ ImageFileView::OnFFTCols (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getAskDeleteNewDocs())
     GetDocument()->Modify (true);
+  OnUpdate(this, NULL);
   GetDocument()->UpdateAllViews (this);
   GetDocument()->Activate();
 }
@@ -739,6 +756,7 @@ ImageFileView::OnIFFTCols (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getAskDeleteNewDocs())
     GetDocument()->Modify (true);
+  OnUpdate(this, NULL);
   GetDocument()->UpdateAllViews (this);
   GetDocument()->Activate();
 }
@@ -755,6 +773,7 @@ ImageFileView::OnFourier (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getAskDeleteNewDocs())
     GetDocument()->Modify (true);
+  OnUpdate(this, NULL);
   GetDocument()->UpdateAllViews (this);
   GetDocument()->Activate();
 }
@@ -770,6 +789,7 @@ ImageFileView::OnInverseFourier (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getAskDeleteNewDocs())
     GetDocument()->Modify (true);
+  OnUpdate(this, NULL);
   GetDocument()->UpdateAllViews (this);
   GetDocument()->Activate();
 }
@@ -784,6 +804,7 @@ ImageFileView::OnShuffleNaturalToFourierOrder (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getAskDeleteNewDocs())
     GetDocument()->Modify (true);
+  OnUpdate(this, NULL);
   GetDocument()->UpdateAllViews (this);
   GetDocument()->Activate();
 }
@@ -798,6 +819,7 @@ ImageFileView::OnShuffleFourierToNaturalOrder (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getAskDeleteNewDocs())
     GetDocument()->Modify (true);
+  OnUpdate(this, NULL);
   GetDocument()->UpdateAllViews (this);
   GetDocument()->Activate();
 }
@@ -812,6 +834,7 @@ ImageFileView::OnMagnitude (wxCommandEvent& event)
   m_bMaxSpecified = false;
   if (theApp->getAskDeleteNewDocs())
     GetDocument()->Modify (true);
+  OnUpdate(this, NULL);
   GetDocument()->UpdateAllViews (this);
   GetDocument()->Activate();
 }
@@ -827,6 +850,7 @@ ImageFileView::OnPhase (wxCommandEvent& event)
     m_bMaxSpecified = false;
     if (theApp->getAskDeleteNewDocs())
       GetDocument()->Modify (true);
+    OnUpdate(this, NULL);
     GetDocument()->UpdateAllViews (this);
   }
   GetDocument()->Activate();
@@ -843,6 +867,7 @@ ImageFileView::OnReal (wxCommandEvent& event)
     m_bMaxSpecified = false;
     if (theApp->getAskDeleteNewDocs())
       GetDocument()->Modify (true);
+    OnUpdate(this, NULL);
     GetDocument()->UpdateAllViews (this);
   }
   GetDocument()->Activate();
@@ -859,6 +884,7 @@ ImageFileView::OnImaginary (wxCommandEvent& event)
     m_bMaxSpecified = false;
     if (theApp->getAskDeleteNewDocs())
       GetDocument()->Modify (true);
+    OnUpdate(this, NULL);
     GetDocument()->UpdateAllViews (this);
   }
   GetDocument()->Activate();
@@ -1062,7 +1088,9 @@ void
 ImageFileView::OnDraw (wxDC* dc)
 {
   if (m_pBitmap && m_pBitmap->Ok()) {
-    *theApp->getLog() << "Drawing bitmap";
+#ifdef DEBUG    
+    *theApp->getLog() << "Drawing bitmap\n";
+#endif
     dc->DrawBitmap(*m_pBitmap, 0, 0, false);
   }
   
@@ -1118,7 +1146,9 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
       delete m_pBitmap;
       m_pBitmap = NULL;
     }
-    *theApp->getLog() << "Making new bitmap bitmap";
+#ifdef DEBUG
+    *theApp->getLog() << "Making new bitmap\n";
+#endif
     m_pBitmap = new wxBitmap (image);
     delete imageData;
     m_pCanvas->SetScrollbars(20, 20, nx/20, ny/20);
@@ -1317,6 +1347,7 @@ ImageFileView::OnScaleSize (wxCommandEvent& event)
     *theApp->getLog() << os.str().c_str() << "\n";
     if (theApp->getAskDeleteNewDocs())
       pScaledDoc->Modify (true);
+    OnUpdate(this, NULL);
     pScaledDoc->UpdateAllViews (this);
     pScaledDoc->getView()->setInitialClientSize();
     pScaledDoc->Activate();
@@ -2182,6 +2213,7 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
   pProjectionDoc->setProjections (pProj);
   if (theApp->getAskDeleteNewDocs())
     pProjectionDoc-> Modify(true);
+  OnUpdate(this, NULL);
   pProjectionDoc->UpdateAllViews (this);
   pProjectionDoc->getView()->setInitialClientSize();
   pProjectionDoc->Activate();