X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=2e0f78ab58480ada03cb6be7484eeff75a3d4c7c;hp=4e4313d8b98ec5bbf53a6ed67d38c23ffeb1ce66;hb=cbcb02ba9b76a82c9a09ce1c7712431bb215575a;hpb=af2b058715fb690c708734708ac178490371b3ad

diff --git a/src/views.cpp b/src/views.cpp
index 4e4313d..2e0f78a 100644
--- a/src/views.cpp
+++ b/src/views.cpp
@@ -7,9 +7,9 @@
 **   Date Started:  July 2000
 **
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
+**  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: views.cpp,v 1.77 2001/01/27 02:01:41 kevin Exp $
+**  $Id: views.cpp,v 1.90 2001/01/30 02:20:50 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
@@ -65,6 +65,7 @@
 
 BEGIN_EVENT_TABLE(ImageFileCanvas, wxScrolledWindow)
 EVT_MOUSE_EVENTS(ImageFileCanvas::OnMouseEvent)
+EVT_CHAR(ImageFileCanvas::OnChar)
 END_EVENT_TABLE()
 
 
@@ -75,7 +76,7 @@ ImageFileCanvas::ImageFileCanvas (ImageFileView* v, wxFrame *frame, const wxPoin
 
 ImageFileCanvas::~ImageFileCanvas()
 {
-	m_pView = NULL;
+  m_pView = NULL;
 }
 
 void 
@@ -156,6 +157,15 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event)
       DrawRubberBandCursor (dc, pt.x, yPt);
       m_xCursor = pt.x;
       m_yCursor = yPt;
+      wxMenu* pMenu = m_pView->getMenuAnalyze();
+      if (pMenu && ! pMenu->IsEnabled(IFMENU_PLOT_ROW)) {
+        pMenu->Enable (IFMENU_PLOT_ROW, true);
+        pMenu->Enable (IFMENU_PLOT_COL, true);
+        pMenu->Enable (IFMENU_COMPARE_ROW, true);
+        pMenu->Enable (IFMENU_COMPARE_COL, true);
+        pMenu->Enable (IFMENU_PLOT_FFT_ROW, true);
+        pMenu->Enable (IFMENU_PLOT_FFT_COL, true);
+      }
     } else
       *theApp->getLog() << "Mouse out of image range (" << pt.x << "," << yPt << ")\n";
   }
@@ -166,6 +176,18 @@ ImageFileCanvas::OnMouseEvent(wxMouseEvent& event)
   }
 }
 
+void
+ImageFileCanvas::OnChar (wxKeyEvent& event)
+{
+  if (event.GetKeyCode() == WXK_ESCAPE) {
+    m_xCursor = -1;
+    m_yCursor = -1;
+    if (m_pView)
+      m_pView->OnUpdate (NULL);
+  } else
+    wxScrolledWindow::OnChar (event);
+}
+
 wxSize
 ImageFileCanvas::GetBestSize() const
 {
@@ -231,7 +253,8 @@ ImageFileView::ImageFileView()
 
 ImageFileView::~ImageFileView()
 {
-  theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu);
+  GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
+  GetDocumentManager()->ActivateView(this, FALSE, TRUE);
 }
 
 void
@@ -358,7 +381,13 @@ ImageFileView::OnCompare (wxCommandEvent& event)
         
         differenceImage.setArraySize (rIF.nx(), rIF.ny());
         if (! rIF.subtractImages (rCompareIF, differenceImage)) {
-          pDifferenceDoc->DeleteAllViews();
+            pDifferenceDoc->getView()->getFrame()->Show(true);
+            GetDocumentManager()->ActivateView (pDifferenceDoc->getView(), true, false);
+            pDifferenceDoc->getView()->getFrame()->SetFocus();
+            wxCommandEvent event;
+            GetDocumentManager()->OnFileClose (event);
+            GetDocumentManager()->ActivateView (this, true, false);
+            getFrame()->SetFocus();
           return;
         }
         
@@ -371,9 +400,8 @@ ImageFileView::OnCompare (wxCommandEvent& event)
           << " and " << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str() << ": "
           << 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);
       }
@@ -388,9 +416,8 @@ ImageFileView::OnInvertValues (wxCommandEvent& event)
   ImageFile& rIF = GetDocument()->getImageFile();
   rIF.invertPixelValues (rIF);
   rIF.labelAdd ("Invert Pixel Values");
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -399,9 +426,8 @@ ImageFileView::OnSquare (wxCommandEvent& event)
   ImageFile& rIF = GetDocument()->getImageFile();
   rIF.square (rIF);
   rIF.labelAdd ("Square Pixel Values");
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -410,9 +436,8 @@ ImageFileView::OnSquareRoot (wxCommandEvent& event)
   ImageFile& rIF = GetDocument()->getImageFile();
   rIF.sqrt (rIF);
   rIF.labelAdd ("Square-root Pixel Values");
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -421,9 +446,8 @@ ImageFileView::OnLog (wxCommandEvent& event)
   ImageFile& rIF = GetDocument()->getImageFile();
   rIF.log (rIF);
   rIF.labelAdd ("Logrithm base-e Pixel Values");
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -432,9 +456,8 @@ ImageFileView::OnExp (wxCommandEvent& event)
   ImageFile& rIF = GetDocument()->getImageFile();
   rIF.exp (rIF);
   rIF.labelAdd ("Exponent base-e Pixel Values");
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -469,9 +492,8 @@ ImageFileView::OnAdd (wxCommandEvent& event)
       newImage.labelsCopy (rRHSIF, s.c_str());
       newImage.labelAdd (os.str().c_str());
       *theApp->getLog() << os.str().c_str() << "\n";
-      if (theApp->getSetModifyNewDocs())
-        pNewDoc->Modify(TRUE);
-      pNewDoc->UpdateAllViews(this);
+      pNewDoc->Modify (true);
+      pNewDoc->UpdateAllViews (this);
       pNewDoc->getView()->OnUpdate (this, NULL);
       pNewDoc->getView()->getFrame()->Show(true);
     }
@@ -510,9 +532,8 @@ ImageFileView::OnSubtract (wxCommandEvent& event)
       newImage.labelsCopy (rRHSIF, s.c_str());
       newImage.labelAdd (os.str().c_str());
       *theApp->getLog() << os.str().c_str() << "\n";
-      if (theApp->getSetModifyNewDocs())
-        pNewDoc->Modify(TRUE);
-      pNewDoc->UpdateAllViews(this);
+      pNewDoc->Modify (true);
+      pNewDoc->UpdateAllViews (this);
       pNewDoc->getView()->OnUpdate (this, NULL);
       pNewDoc->getView()->getFrame()->Show(true);
     }
@@ -551,9 +572,8 @@ ImageFileView::OnMultiply (wxCommandEvent& event)
       newImage.labelsCopy (rRHSIF, s.c_str());
       newImage.labelAdd (os.str().c_str());
       *theApp->getLog() << os.str().c_str() << "\n";
-      if (theApp->getSetModifyNewDocs())
-        pNewDoc->Modify(TRUE);
-      pNewDoc->UpdateAllViews(this);
+      pNewDoc->Modify (true);
+      pNewDoc->UpdateAllViews (this);
       pNewDoc->getView()->OnUpdate (this, NULL);
       pNewDoc->getView()->getFrame()->Show(true);
     }
@@ -592,9 +612,8 @@ ImageFileView::OnDivide (wxCommandEvent& event)
       newImage.labelsCopy (rRHSIF, s.c_str());
       newImage.labelAdd (os.str().c_str());
       *theApp->getLog() << os.str().c_str() << "\n";
-      if (theApp->getSetModifyNewDocs())
-        pNewDoc->Modify(TRUE);
-      pNewDoc->UpdateAllViews(this);
+      pNewDoc->Modify (true);
+      pNewDoc->UpdateAllViews (this);
       pNewDoc->getView()->OnUpdate (this, NULL);
       pNewDoc->getView()->getFrame()->Show(true);
     }
@@ -611,9 +630,8 @@ ImageFileView::OnFFT (wxCommandEvent& event)
   rIF.labelAdd ("FFT Image");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -624,9 +642,8 @@ ImageFileView::OnIFFT (wxCommandEvent& event)
   rIF.labelAdd ("IFFT Image");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -637,9 +654,8 @@ ImageFileView::OnFFTRows (wxCommandEvent& event)
   rIF.labelAdd ("FFT Rows");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -650,9 +666,8 @@ ImageFileView::OnIFFTRows (wxCommandEvent& event)
   rIF.labelAdd ("IFFT Rows");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -663,9 +678,8 @@ ImageFileView::OnFFTCols (wxCommandEvent& event)
   rIF.labelAdd ("FFT Columns");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -676,9 +690,8 @@ ImageFileView::OnIFFTCols (wxCommandEvent& event)
   rIF.labelAdd ("IFFT Columns");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 #endif
 
@@ -691,9 +704,8 @@ ImageFileView::OnFourier (wxCommandEvent& event)
   rIF.labelAdd ("Fourier Image");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -705,9 +717,8 @@ ImageFileView::OnInverseFourier (wxCommandEvent& event)
   rIF.labelAdd ("Inverse Fourier Image");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -718,9 +729,8 @@ ImageFileView::OnShuffleNaturalToFourierOrder (wxCommandEvent& event)
   rIF.labelAdd ("Shuffle Natural To Fourier Order");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -731,9 +741,8 @@ ImageFileView::OnShuffleFourierToNaturalOrder (wxCommandEvent& event)
   rIF.labelAdd ("Shuffle Fourier To Natural Order");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -745,9 +754,8 @@ ImageFileView::OnMagnitude (wxCommandEvent& event)
     rIF.labelAdd ("Magnitude of complex-image");
     m_bMinSpecified = false;
     m_bMaxSpecified = false;
-    if (theApp->getSetModifyNewDocs())
-      GetDocument()->Modify(TRUE);
-    GetDocument()->UpdateAllViews(this);
+    GetDocument()->Modify (true);
+    GetDocument()->UpdateAllViews (this);
   }
 }
 
@@ -760,21 +768,20 @@ ImageFileView::OnPhase (wxCommandEvent& event)
     rIF.labelAdd ("Phase of complex-image");
     m_bMinSpecified = false;
     m_bMaxSpecified = false;
-    if (theApp->getSetModifyNewDocs())
-      GetDocument()->Modify(TRUE);
-    GetDocument()->UpdateAllViews(this);
+    GetDocument()->Modify (true);
+    GetDocument()->UpdateAllViews (this);
   }
 }
 
 
 ImageFileCanvas* 
-ImageFileView::CreateCanvas (wxView *view, wxFrame *parent)
+ImageFileView::CreateCanvas (wxFrame* parent)
 {
   ImageFileCanvas* pCanvas;
   int width, height;
   parent->GetClientSize(&width, &height);
   
-  pCanvas = new ImageFileCanvas (dynamic_cast<ImageFileView*>(view), parent, wxPoint(0, 0), wxSize(width, height), 0);
+  pCanvas = new ImageFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0);
   
   pCanvas->SetScrollbars(20, 20, 50, 50);
   pCanvas->SetBackgroundColour(*wxWHITE);
@@ -818,8 +825,8 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   m_pFileMenu->AppendSeparator();
   m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
 #endif
-  theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
-  theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu);
+  GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
+  GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu);
   
   wxMenu *view_menu = new wxMenu;
   view_menu->Append(IFMENU_VIEW_SCALE_MINMAX, "Display Scale S&et...\tCtrl-E");
@@ -859,17 +866,23 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   image_menu->AppendSeparator();
   image_menu->Append (IFMENU_IMAGE_SCALESIZE, "S&cale Size...");
   
-  wxMenu *analyze_menu = new wxMenu;
-  analyze_menu->Append (IFMENU_PLOT_ROW, "Plot &Row");
-  analyze_menu->Append (IFMENU_PLOT_COL, "Plot &Column");
-  analyze_menu->Append (IFMENU_PLOT_HISTOGRAM, "Plot &Histogram");
-  analyze_menu->AppendSeparator();
-  analyze_menu->Append (IFMENU_PLOT_FFT_ROW, "Plot FFT Row");
-  analyze_menu->Append (IFMENU_PLOT_FFT_COL, "Plot FFT Column");
-  analyze_menu->AppendSeparator();
-  analyze_menu->Append (IFMENU_COMPARE_IMAGES, "Compare &Images...");
-  analyze_menu->Append (IFMENU_COMPARE_ROW, "Compare &Row");
-  analyze_menu->Append (IFMENU_COMPARE_COL, "Compare &Column");
+  m_pMenuAnalyze = new wxMenu;
+  m_pMenuAnalyze->Append (IFMENU_PLOT_ROW, "Plot &Row");
+  m_pMenuAnalyze->Append (IFMENU_PLOT_COL, "Plot &Column");
+  m_pMenuAnalyze->Append (IFMENU_PLOT_HISTOGRAM, "Plot &Histogram");
+  m_pMenuAnalyze->AppendSeparator();
+  m_pMenuAnalyze->Append (IFMENU_PLOT_FFT_ROW, "Plot FFT Row");
+  m_pMenuAnalyze->Append (IFMENU_PLOT_FFT_COL, "Plot FFT Column");
+  m_pMenuAnalyze->AppendSeparator();
+  m_pMenuAnalyze->Append (IFMENU_COMPARE_IMAGES, "Compare &Images...");
+  m_pMenuAnalyze->Append (IFMENU_COMPARE_ROW, "Compare &Row");
+  m_pMenuAnalyze->Append (IFMENU_COMPARE_COL, "Compare &Column");
+  m_pMenuAnalyze->Enable (IFMENU_PLOT_ROW, false);
+  m_pMenuAnalyze->Enable (IFMENU_PLOT_COL, false);
+  m_pMenuAnalyze->Enable (IFMENU_COMPARE_ROW, false);
+  m_pMenuAnalyze->Enable (IFMENU_COMPARE_COL, false);
+  m_pMenuAnalyze->Enable (IFMENU_PLOT_FFT_ROW, false);
+  m_pMenuAnalyze->Enable (IFMENU_PLOT_FFT_COL, false);
   
   wxMenu *help_menu = new wxMenu;
   help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1");
@@ -882,7 +895,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   menu_bar->Append(view_menu, "&View");
   menu_bar->Append(image_menu, "&Image");
   menu_bar->Append(filter_menu, "Fi&lter");
-  menu_bar->Append(analyze_menu, "&Analyze");
+  menu_bar->Append(m_pMenuAnalyze, "&Analyze");
   menu_bar->Append(help_menu, "&Help");
   
   subframe->SetMenuBar(menu_bar);
@@ -911,7 +924,7 @@ bool
 ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) )
 {
   m_pFrame = CreateChildFrame(doc, this);
-  SetFrame (m_pFrame);
+  (m_pFrame);
   
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
@@ -920,7 +933,7 @@ ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) )
   int width, height;
   m_pFrame->GetClientSize (&width, &height);
   m_pFrame->SetTitle("ImageFileView");
-  m_pCanvas = CreateCanvas (this, m_pFrame);
+  m_pCanvas = CreateCanvas (m_pFrame);
   
   int x, y;  // X requires a forced resize
   m_pFrame->GetSize(&x, &y);
@@ -952,7 +965,7 @@ ImageFileView::OnDraw (wxDC* dc)
 void 
 ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 {
-  const ImageFile& rIF = dynamic_cast<ImageFileDocument*>(GetDocument())->getImageFile();
+  const ImageFile& rIF = GetDocument()->getImageFile();
   ImageFileArrayConst v = rIF.getArray();
   int nx = rIF.nx();
   int ny = rIF.ny();
@@ -995,35 +1008,35 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 bool 
 ImageFileView::OnClose (bool deleteWindow)
 {
+  //GetDocumentManager()->ActivateView (this, false, true);
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
   if (m_pCanvas) {
-    m_pCanvas->Clear();
-	m_pCanvas->Show(false);
     m_pCanvas->setView(NULL);
     m_pCanvas = NULL;
   }
   wxString s(theApp->GetAppName());
   if (m_pFrame)
     m_pFrame->SetTitle(s);
-  SetFrame(NULL);
   
+  SetFrame(NULL);
   Activate(false);
   
   if (deleteWindow) {
-	  m_pFrame->Show(false);
-	  m_pFrame->Destroy();
-//	  delete m_pFrame;
+    m_pFrame->Destroy();
     m_pFrame = NULL;
+    if (GetDocument() && GetDocument()->getBadFileOpen())
+      ::wxYield();  // wxWindows bug workaround
   }
+  
   return true;
 }
 
 void
 ImageFileView::OnExport (wxCommandEvent& event)
 {
-  ImageFile& rIF = dynamic_cast<ImageFileDocument*>(GetDocument())->getImageFile();
+  ImageFile& rIF = GetDocument()->getImageFile();
   ImageFileArrayConst v = rIF.getArray();
   int nx = rIF.nx();
   int ny = rIF.ny();
@@ -1089,8 +1102,7 @@ ImageFileView::OnScaleSize (wxCommandEvent& event)
     rScaledIF.labelAdd (os.str().c_str());
     rIF.scaleImage (rScaledIF);
     *theApp->getLog() << os.str().c_str() << "\n";
-    if (theApp->getSetModifyNewDocs())
-      pScaledDoc->Modify(TRUE);
+    pScaledDoc->Modify (true);
     pScaledDoc->UpdateAllViews (this);
     pScaledDoc->getView()->OnUpdate (this, NULL);
     pScaledDoc->getView()->getFrame()->Show(true);
@@ -1106,7 +1118,7 @@ ImageFileView::OnPlotRow (wxCommandEvent& event)
     return;
   }
   
-  const ImageFile& rIF = dynamic_cast<ImageFileDocument*>(GetDocument())->getImageFile();
+  const ImageFile& rIF = GetDocument()->getImageFile();
   ImageFileArrayConst v = rIF.getArray();
   ImageFileArrayConst vImag = rIF.getImaginaryArray();
   int nx = rIF.nx();
@@ -1175,9 +1187,10 @@ ImageFileView::OnPlotRow (wxCommandEvent& event)
       delete pYImag;
       delete pYMag;
     }
-    if (theApp->getSetModifyNewDocs())
-      pPlotDoc->Modify(true);
-    pPlotDoc->UpdateAllViews();
+    pPlotDoc->Modify (true);
+    pPlotDoc->UpdateAllViews ();
+    pPlotDoc->getView()->OnUpdate (this, NULL);
+    pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 
@@ -1190,7 +1203,7 @@ ImageFileView::OnPlotCol (wxCommandEvent& event)
     return;
   }
   
-  const ImageFile& rIF = dynamic_cast<ImageFileDocument*>(GetDocument())->getImageFile();
+  const ImageFile& rIF = GetDocument()->getImageFile();
   ImageFileArrayConst v = rIF.getArray();
   ImageFileArrayConst vImag = rIF.getImaginaryArray();
   int nx = rIF.nx();
@@ -1259,9 +1272,10 @@ ImageFileView::OnPlotCol (wxCommandEvent& event)
       delete pYImag;
       delete pYMag;
     }
-    if (theApp->getSetModifyNewDocs())
-      pPlotDoc->Modify(true);
-    pPlotDoc->UpdateAllViews();
+    pPlotDoc->Modify (true);
+    pPlotDoc->UpdateAllViews ();
+    pPlotDoc->getView()->OnUpdate (this, NULL);
+    pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 
@@ -1275,7 +1289,7 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event)
     return;
   }
   
-  const ImageFile& rIF = dynamic_cast<ImageFileDocument*>(GetDocument())->getImageFile();
+  const ImageFile& rIF = GetDocument()->getImageFile();
   ImageFileArrayConst v = rIF.getArray();
   ImageFileArrayConst vImag = rIF.getImaginaryArray();
   int nx = rIF.nx();
@@ -1352,9 +1366,10 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event)
     delete pYMag;
     delete [] pcIn;
     
-    if (theApp->getSetModifyNewDocs())
-      pPlotDoc->Modify(true);
-    pPlotDoc->UpdateAllViews();
+    pPlotDoc->Modify (true);
+    pPlotDoc->UpdateAllViews ();
+    pPlotDoc->getView()->OnUpdate (this, NULL);
+    pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 
@@ -1367,7 +1382,7 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event)
     return;
   }
   
-  const ImageFile& rIF = dynamic_cast<ImageFileDocument*>(GetDocument())->getImageFile();
+  const ImageFile& rIF = GetDocument()->getImageFile();
   ImageFileArrayConst v = rIF.getArray();
   ImageFileArrayConst vImag = rIF.getImaginaryArray();
   int nx = rIF.nx();
@@ -1451,9 +1466,10 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event)
     delete pdTemp;
     delete [] pcIn;
     
-    if (theApp->getSetModifyNewDocs())
-      pPlotDoc->Modify(true);
-    pPlotDoc->UpdateAllViews();
+    pPlotDoc->Modify (true);
+    pPlotDoc->UpdateAllViews ();
+    pPlotDoc->getView()->OnUpdate (this, NULL);
+    pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 #endif
@@ -1540,9 +1556,10 @@ ImageFileView::OnCompareCol (wxCommandEvent& event)
       delete pX;
       delete pY1;
       delete pY2;
-      if (theApp->getSetModifyNewDocs())
-        pPlotDoc->Modify(true);
-      pPlotDoc->UpdateAllViews();
+      pPlotDoc->Modify (true);
+      pPlotDoc->UpdateAllViews ();
+      pPlotDoc->getView()->OnUpdate (this, NULL);
+      pPlotDoc->getView()->getFrame()->Show(true);
     }
   }
 }
@@ -1630,9 +1647,10 @@ ImageFileView::OnCompareRow (wxCommandEvent& event)
       delete pX;
       delete pY1;
       delete pY2;
-      if (theApp->getSetModifyNewDocs())
-        pPlotDoc->Modify(true);
-      pPlotDoc->UpdateAllViews();
+      pPlotDoc->Modify (true);
+      pPlotDoc->UpdateAllViews ();
+      pPlotDoc->getView()->OnUpdate (this, NULL);
+      pPlotDoc->getView()->getFrame()->Show(true);
     }
   }
 }
@@ -1642,7 +1660,7 @@ static int NUMBER_HISTOGRAM_BINS = 256;
 void
 ImageFileView::OnPlotHistogram (wxCommandEvent& event)
 { 
-  const ImageFile& rIF = dynamic_cast<ImageFileDocument*>(GetDocument())->getImageFile();
+  const ImageFile& rIF = GetDocument()->getImageFile();
   ImageFileArrayConst v = rIF.getArray();
   int nx = rIF.nx();
   int ny = rIF.ny();
@@ -1695,9 +1713,10 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event)
       rPlotFile.addDescription (os.str().c_str());
       delete pX;
       delete pY;
-      if (theApp->getSetModifyNewDocs())
-        pPlotDoc->Modify(true);
-      pPlotDoc->UpdateAllViews();
+      pPlotDoc->Modify (true);
+      pPlotDoc->UpdateAllViews ();
+      pPlotDoc->getView()->OnUpdate (this, NULL);
+      pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 
@@ -1712,7 +1731,7 @@ PhantomCanvas::PhantomCanvas (PhantomFileView* v, wxFrame *frame, const wxPoint&
 
 PhantomCanvas::~PhantomCanvas ()
 {
-    m_pView = NULL;
+  m_pView = NULL;
 }
 
 void 
@@ -1734,10 +1753,15 @@ EVT_MENU(PHMMENU_PROCESS_PROJECTIONS, PhantomFileView::OnProjections)
 END_EVENT_TABLE()
 
 PhantomFileView::PhantomFileView() 
-: wxView(), m_pCanvas(NULL), m_pFrame(NULL), m_pFileMenu(0)
+: wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pFileMenu(0)
 {
+#if defined(DEBUG) || defined(_DEBUG)
+  m_iDefaultNDet = 165;
+  m_iDefaultNView = 180;
+#else
   m_iDefaultNDet = 367;
   m_iDefaultNView = 320;
+#endif
   m_iDefaultNSample = 1;
   m_dDefaultRotation = 1;
   m_dDefaultFocalLength = 2;
@@ -1745,14 +1769,21 @@ PhantomFileView::PhantomFileView()
   m_iDefaultGeometry = Scanner::GEOMETRY_PARALLEL;
   m_iDefaultTrace = Trace::TRACE_NONE;
   
+#ifdef DEBUG 
+  m_iDefaultRasterNX = 115;
+  m_iDefaultRasterNY = 115;
+  m_iDefaultRasterNSamples = 1;
+#else
   m_iDefaultRasterNX = 256;
   m_iDefaultRasterNY = 256;
   m_iDefaultRasterNSamples = 2;
+#endif
 }
 
 PhantomFileView::~PhantomFileView()
 {
-    theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu);
+  GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
+  GetDocumentManager()->ActivateView(this, FALSE, TRUE);
 }
 
 void
@@ -1808,14 +1839,18 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
       if (m_iDefaultTrace > Trace::TRACE_CONSOLE) {
         ProjectionsDialog dialogProjections (theScanner, rProj, rPhantom, m_iDefaultTrace, dynamic_cast<wxWindow*>(getFrameForChild()));
         for (int iView = 0; iView < rProj.nView(); iView++) {
-          ::wxYield();
           ::wxYield();
           if (dialogProjections.isCancelled() || ! dialogProjections.projectView (iView)) {
-            pProjectionDoc->DeleteAllViews();
+            pProjectionDoc->getView()->getFrame()->Show(true);
+            GetDocumentManager()->ActivateView (pProjectionDoc->getView(), true, false);
+            pProjectionDoc->getView()->getFrame()->SetFocus();
+            wxCommandEvent event;
+            GetDocumentManager()->OnFileClose (event);
+            GetDocumentManager()->ActivateView (this, true, false);
+            getFrame()->SetFocus();
             return;
           }
           ::wxYield();
-          ::wxYield();
           while (dialogProjections.isPaused()) {
             ::wxYield();
             ::wxUsleep(50);
@@ -1826,7 +1861,13 @@ 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->DeleteAllViews();
+            pProjectionDoc->getView()->getFrame()->Show(true);
+            GetDocumentManager()->ActivateView (pProjectionDoc->getView(), true, false);
+            pProjectionDoc->getView()->getFrame()->SetFocus();
+            wxCommandEvent event;
+            GetDocumentManager()->OnFileClose (event);
+            GetDocumentManager()->ActivateView (this, true, false);
+            getFrame()->SetFocus();
             return;
           }
         }
@@ -1838,25 +1879,22 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
       rProj.setRemark (os.str());
       *theApp->getLog() << os.str().c_str() << "\n";
       
-      m_pFrame->Lower();
       ::wxYield();
-      ProjectionFileView* projView = dynamic_cast<ProjectionFileView*>(pProjectionDoc->GetFirstView());
+      ProjectionFileView* projView = pProjectionDoc->getView();
       if (projView) {
-        projView->getFrame()->SetFocus();
         projView->OnUpdate (projView, NULL);
-      }
-      if (wxView* pView = pProjectionDoc->GetFirstView()) {
-        if (wxFrame* pFrame = pView->GetFrame()) {
+        if (projView->getCanvas())
+   	      projView->getCanvas()->SetClientSize (m_iDefaultNDet, m_iDefaultNView);
+        if (wxFrame* pFrame = projView->getFrame()) {
+          pFrame->Show(true);
           pFrame->SetFocus();
           pFrame->Raise();
         }
-        theApp->getDocManager()->ActivateView (pView, true, false);
+        GetDocumentManager()->ActivateView (projView, true, false);
       }
       ::wxYield();
-      if (theApp->getSetModifyNewDocs())
-        pProjectionDoc->Modify(true);
-      pProjectionDoc->getView()->getFrame()->Show(true);
-      pProjectionDoc->UpdateAllViews(this);
+      pProjectionDoc-> Modify(true);
+      pProjectionDoc->UpdateAllViews (this);
     }
   }
 }
@@ -1882,26 +1920,30 @@ 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)) {
-          pRasterDoc->DeleteAllViews();
+        if (! dlgProgress.Update (i+1)) {
+          GetDocumentManager()->ActivateView (pRasterDoc->getView(), true, true);
+          pRasterDoc->getView()->getFrame()->SetFocus();
+          wxCommandEvent event;
+          GetDocumentManager()->OnFileClose (event);
+          GetDocumentManager()->ActivateView (this, true, false);
+          getFrame()->SetFocus();
           return;
         }
       }
-      if (theApp->getSetModifyNewDocs())
-        pRasterDoc->Modify(true);
-      pRasterDoc->UpdateAllViews(this);
+      pRasterDoc->Modify (true);
+      pRasterDoc->UpdateAllViews (this);
       pRasterDoc->getView()->getFrame()->Show(true);
       std::ostringstream os;
       os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << m_iDefaultRasterNX << ", YSize=" 
         << m_iDefaultRasterNY << ", nSamples=" << m_iDefaultRasterNSamples;
       *theApp->getLog() << os.str().c_str() << "\n";
       imageFile.labelAdd (os.str().c_str(), timer.timerEnd());
-      ImageFileView* rasterView = dynamic_cast<ImageFileView*>(pRasterDoc->GetFirstView());
+      ImageFileView* rasterView = pRasterDoc->getView();
       if (rasterView) {
         rasterView->getFrame()->SetFocus();
         rasterView->OnUpdate (rasterView, NULL);
@@ -1913,13 +1955,13 @@ PhantomFileView::OnRasterize (wxCommandEvent& event)
 
 
 PhantomCanvas* 
-PhantomFileView::CreateCanvas (wxView *view, wxFrame *parent)
+PhantomFileView::CreateCanvas (wxFrame *parent)
 {
   PhantomCanvas* pCanvas;
   int width, height;
   parent->GetClientSize(&width, &height);
   
-  pCanvas = new PhantomCanvas (dynamic_cast<PhantomFileView*>(view), parent, wxPoint(0, 0), wxSize(width, height), 0);
+  pCanvas = new PhantomCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0);
   
   pCanvas->SetBackgroundColour(*wxWHITE);
   pCanvas->Clear();
@@ -1960,8 +2002,8 @@ PhantomFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   m_pFileMenu->AppendSeparator();
   m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
 #endif
-  theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
-  theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu);
+  GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
+  GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu);
   
   wxMenu *process_menu = new wxMenu;
   process_menu->Append(PHMMENU_PROCESS_RASTERIZE, "&Rasterize...\tCtrl-R");
@@ -2006,7 +2048,7 @@ PhantomFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
   int width, height;
   m_pFrame->GetClientSize(&width, &height);
   m_pFrame->SetTitle("PhantomFileView");
-  m_pCanvas = CreateCanvas (this, m_pFrame);
+  m_pCanvas = CreateCanvas (m_pFrame);
   
 #ifdef __X__
   int x, y;  // X requires a forced resize
@@ -2021,7 +2063,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();
@@ -2030,27 +2072,26 @@ PhantomFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 bool 
 PhantomFileView::OnClose (bool deleteWindow)
 {
+  //GetDocumentManager()->ActivateView (this, false, true);
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
   if (m_pCanvas) {
-    m_pCanvas->Clear();
     m_pCanvas->setView(NULL);
-	m_pCanvas->Show(false);
     m_pCanvas = NULL;
   }
   wxString s(wxTheApp->GetAppName());
   if (m_pFrame)
     m_pFrame->SetTitle(s);
-  SetFrame(NULL);
   
+  SetFrame(NULL);
   Activate(false);
   
   if (deleteWindow) {
-	  m_pFrame->Show(false);
-	  m_pFrame->Destroy();
-//    delete m_pFrame;
+    m_pFrame->Destroy();
     m_pFrame = NULL;
+    if (GetDocument() && GetDocument()->getBadFileOpen())
+      ::wxYield();  // wxWindows bug workaround
   }
   
   return true;
@@ -2078,7 +2119,7 @@ ProjectionFileCanvas::ProjectionFileCanvas (ProjectionFileView* v, wxFrame *fram
 
 ProjectionFileCanvas::~ProjectionFileCanvas ()
 {
-	m_pView = NULL;
+  m_pView = NULL;
 }
 
 void 
@@ -2115,8 +2156,14 @@ END_EVENT_TABLE()
 ProjectionFileView::ProjectionFileView() 
 : wxView(), m_pCanvas(NULL), m_pFrame(NULL), m_pFileMenu(0)
 {
+#ifdef DEBUG
+  m_iDefaultNX = 115;
+  m_iDefaultNY = 115;
+#else
   m_iDefaultNX = 256;
   m_iDefaultNY = 256;
+#endif
+  
   m_iDefaultFilter = SignalFilter::FILTER_ABS_BANDLIMIT;
   m_dDefaultFilterParam = 1.;
 #if HAVE_FFTW
@@ -2140,7 +2187,8 @@ ProjectionFileView::ProjectionFileView()
 
 ProjectionFileView::~ProjectionFileView()
 {
-	theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu);
+  GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
+  GetDocumentManager()->ActivateView(this, FALSE, TRUE);;
 }
 
 void
@@ -2181,9 +2229,8 @@ ProjectionFileView::OnConvertPolar (wxCommandEvent& event)
       << strInterpolation.c_str();
     *theApp->getLog() << os.str().c_str() << "\n";
     rIF.labelAdd (os.str().c_str());
-    if (theApp->getSetModifyNewDocs())
-      pPolarDoc->Modify(true);
-    pPolarDoc->UpdateAllViews();
+    pPolarDoc->Modify (true);
+    pPolarDoc->UpdateAllViews ();
     pPolarDoc->getView()->OnUpdate (this, NULL);
     pPolarDoc->getView()->getFrame()->Show(true);
   }
@@ -2216,12 +2263,11 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event)
       << strInterpolation.c_str() << ", zeropad=" << m_iDefaultPolarZeropad;
     *theApp->getLog() << os.str().c_str() << "\n";
     rIF.labelAdd (os.str().c_str());
-    if (theApp->getSetModifyNewDocs())
-      pPolarDoc->Modify(true);
-    pPolarDoc->UpdateAllViews();
+    pPolarDoc->Modify (true);
+    pPolarDoc->UpdateAllViews ();
     pPolarDoc->getView()->OnUpdate (this, NULL);
     pPolarDoc->getView()->getFrame()->Show(true);
-}
+  }
 }
 
 void
@@ -2274,7 +2320,7 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event)
           if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView)) {
             delete pDlgReconstruct;
             delete pReconstruct;
-            pReconDoc->DeleteAllViews();
+            pReconDoc->getView()->getFrame()->Close(true);
             return;
           }
           ::wxYield();
@@ -2289,22 +2335,25 @@ 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->DeleteAllViews();
+            GetDocumentManager()->ActivateView (pReconDoc->getView(), true, true);
+            pReconDoc->getView()->getFrame()->SetFocus();
+            wxCommandEvent event;
+            GetDocumentManager()->OnFileClose (event);
+            GetDocumentManager()->ActivateView (this, true, false);
+            getFrame()->SetFocus();
             return;
           }
         }
       }
       delete pReconstruct;
-      if (theApp->getSetModifyNewDocs())
-        pReconDoc->Modify(true);
-      pReconDoc->UpdateAllViews(this);
-      pReconDoc->getView()->getFrame()->Show(true);
-      ImageFileView* rasterView = dynamic_cast<ImageFileView*>(pReconDoc->GetFirstView());
-      if (rasterView) {
-        rasterView->getFrame()->SetFocus();
+      pReconDoc->Modify (true);
+      pReconDoc->UpdateAllViews (this);
+      if (ImageFileView* rasterView = pReconDoc->getView()) {
         rasterView->OnUpdate (rasterView, NULL);
+        rasterView->getFrame()->SetFocus();
+        rasterView->getFrame()->Show(true);
       }
       std::ostringstream os;
       os << "Reconstruct " << rProj.getFilename() << ": xSize=" << m_iDefaultNX << ", ySize=" << m_iDefaultNY << ", Filter=" << optFilterName.c_str() << ", FilterParam=" << m_dDefaultFilterParam << ", FilterMethod=" << optFilterMethodName.c_str() << ", FilterGeneration=" << optFilterGenerationName.c_str() << ", Zeropad=" << m_iDefaultZeropad << ", Interpolation=" << optInterpName.c_str() << ", InterpolationParam=" << m_iDefaultInterpParam << ", Backprojection=" << optBackprojectName.c_str();
@@ -2317,13 +2366,13 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event)
 
 
 ProjectionFileCanvas* 
-ProjectionFileView::CreateCanvas (wxView *view, wxFrame *parent)
+ProjectionFileView::CreateCanvas (wxFrame *parent)
 {
   ProjectionFileCanvas* pCanvas;
   int width, height;
   parent->GetClientSize(&width, &height);
   
-  pCanvas = new ProjectionFileCanvas (dynamic_cast<ProjectionFileView*>(view), parent, wxPoint(0, 0), wxSize(width, height), 0);
+  pCanvas = new ProjectionFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0);
   
   pCanvas->SetScrollbars(20, 20, 50, 50);
   pCanvas->SetBackgroundColour(*wxWHITE);
@@ -2366,16 +2415,17 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   m_pFileMenu->AppendSeparator();
   m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
 #endif
-  theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
-  theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu);
+  GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
+  GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu);
   
   wxMenu *convert_menu = new wxMenu;
   convert_menu->Append (PJMENU_CONVERT_POLAR, "&Polar Image...\tCtrl-L");
   convert_menu->Append (PJMENU_CONVERT_FFT_POLAR, "&FFT->Polar Image...\tCtrl-I");
   
   wxMenu *reconstruct_menu = new wxMenu;
-  reconstruct_menu->Append (PJMENU_RECONSTRUCT_FBP, "&Filtered Backprojection...\tCtrl-R");
-  reconstruct_menu->Append (PJMENU_RECONSTRUCT_FOURIER, "&Fourier...\tCtrl-E");
+  reconstruct_menu->Append (PJMENU_RECONSTRUCT_FBP, "&Filtered Backprojection...\tCtrl-R", "Reconstruct image using filtered backprojection");
+  reconstruct_menu->Append (PJMENU_RECONSTRUCT_FOURIER, "&Fourier...\tCtrl-E", "Reconstruct image using inverse Fourier");
+  reconstruct_menu->Enable (PJMENU_RECONSTRUCT_FOURIER, false);
   
   wxMenu *help_menu = new wxMenu;
   help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1");
@@ -2418,9 +2468,9 @@ ProjectionFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
   SetFrame(m_pFrame);
   
   int width, height;
-  m_pFrame->GetClientSize(&width, &height);
-  m_pFrame->SetTitle("ProjectionFileView");
-  m_pCanvas = CreateCanvas(this, m_pFrame);
+  m_pFrame->GetClientSize (&width, &height);
+  m_pFrame->SetTitle ("ProjectionFileView");
+  m_pCanvas = CreateCanvas (m_pFrame);
   
 #ifdef __X__
   int x, y;  // X requires a forced resize
@@ -2449,7 +2499,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();
@@ -2500,28 +2550,28 @@ ProjectionFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint)
 bool 
 ProjectionFileView::OnClose (bool deleteWindow)
 {
+  //GetDocumentManager()->ActivateView (this, false, true);
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
   if (m_pCanvas) {
-    m_pCanvas->Clear();
-    m_pCanvas->setView(NULL);
-	m_pCanvas->Show(false);
+   	m_pCanvas->setView(NULL);
     m_pCanvas = NULL;
   }
   wxString s(wxTheApp->GetAppName());
   if (m_pFrame)
     m_pFrame->SetTitle(s);
-//  SetFrame(NULL);
   
+  SetFrame(NULL);
   Activate(false);
   
   if (deleteWindow) {
-	  m_pFrame->Show(false);
-	  m_pFrame->Destroy();
-//	  delete m_pFrame;
+    m_pFrame->Destroy();
     m_pFrame = NULL;
+    if (GetDocument() && GetDocument()->getBadFileOpen())
+      ::wxYield();  // wxWindows bug workaround
   }
+
   return true;
 }
 
@@ -2536,7 +2586,7 @@ PlotFileCanvas::PlotFileCanvas (PlotFileView* v, wxFrame *frame, const wxPoint&
 
 PlotFileCanvas::~PlotFileCanvas ()
 {
-    m_pView = NULL;
+  m_pView = NULL;
 }
 
 void 
@@ -2567,8 +2617,8 @@ PlotFileView::~PlotFileView()
 {
   if (m_pEZPlot)
     delete m_pEZPlot;
-
-  theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu);  
+  
+  GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);  
 }
 
 void
@@ -2647,13 +2697,13 @@ PlotFileView::OnScaleFull (wxCommandEvent& event)
 
 
 PlotFileCanvas* 
-PlotFileView::CreateCanvas (wxView *view, wxFrame *parent)
+PlotFileView::CreateCanvas (wxFrame* parent)
 {
   PlotFileCanvas* pCanvas;
   int width, height;
   parent->GetClientSize(&width, &height);
   
-  pCanvas = new PlotFileCanvas (dynamic_cast<PlotFileView*>(view), parent, wxPoint(0, 0), wxSize(width, height), 0);
+  pCanvas = new PlotFileCanvas (this, parent, wxPoint(0, 0), wxSize(width, height), 0);
   
   pCanvas->SetBackgroundColour(*wxWHITE);
   pCanvas->Clear();
@@ -2695,8 +2745,8 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   m_pFileMenu->AppendSeparator();
   m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
 #endif
-  theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
-  theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu);
+  GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
+  GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu);
   
   wxMenu *view_menu = new wxMenu;
   view_menu->Append(PLOTMENU_VIEW_SCALE_MINMAX, "Display Scale &Set...\tCtrl-E");
@@ -2748,7 +2798,7 @@ PlotFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) )
   int width, height;
   m_pFrame->GetClientSize(&width, &height);
   m_pFrame->SetTitle ("Plot File");
-  m_pCanvas = CreateCanvas (this, m_pFrame);
+  m_pCanvas = CreateCanvas (m_pFrame);
   
 #ifdef __X__
   int x, y;  // X requires a forced resize
@@ -2830,28 +2880,28 @@ PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 bool 
 PlotFileView::OnClose (bool deleteWindow)
 {
+  //GetDocumentManager()->ActivateView (this, false, true);
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
   if (m_pCanvas) {
-    m_pCanvas->Clear();
     m_pCanvas->setView (NULL);
-	m_pCanvas->Show(false);
     m_pCanvas = NULL;
   }
   wxString s(wxTheApp->GetAppName());
   if (m_pFrame)
     m_pFrame->SetTitle(s);
-  SetFrame(NULL);
   
   Activate(false);
   
+  SetFrame(NULL);
   if (deleteWindow) {
-	  m_pFrame->Show(false);
-	  m_pFrame->Destroy();
-//	  delete m_pFrame;
+    m_pFrame->Destroy();
     m_pFrame = NULL;
-  }
+    if (GetDocument() && GetDocument()->getBadFileOpen())
+      ::wxYield();  // wxWindows bug workaround
+ }
+
   return true;
 }
 
@@ -2863,7 +2913,8 @@ IMPLEMENT_DYNAMIC_CLASS(TextFileView, wxView)
 
 TextFileView::~TextFileView() 
 {
-    theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu);
+  GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
+  GetDocumentManager()->ActivateView(this, FALSE, TRUE);;
 }
 
 bool TextFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
@@ -2895,29 +2946,30 @@ void TextFileView::OnDraw(wxDC *WXUNUSED(dc) )
 {
 }
 
-void TextFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
+void TextFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 {
 }
 
 bool 
 TextFileView::OnClose (bool deleteWindow)
 {
-	if (m_pFrame && m_pFrame->GetTitle() == "Log")
-       return false;
+  // if (m_pFrame && m_pFrame->GetTitle() == "Log")
+  return false;
   
+  //GetDocumentManager()->ActivateView (this, false, true);
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
-
-  m_pCanvas->Show(false);
+  
   Activate(false);
   
+  SetFrame(NULL);
   if (deleteWindow) {
-	  m_pFrame->Show(false);
-	  m_pFrame->Destroy();
-//	  delete m_pFrame;
-	m_pFrame = NULL;
-   
+    m_pFrame->Destroy();
+    m_pFrame = NULL;
+    if (GetDocument() && GetDocument()->getBadFileOpen())
+      ::wxYield();  // wxWindows bug workaround
   }
+
   return TRUE;
 }
 
@@ -2952,8 +3004,8 @@ TextFileView::CreateChildFrame (wxDocument *doc, wxView *view)
   m_pFileMenu->AppendSeparator();
   m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
 #endif
-  theApp->getDocManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
-  theApp->getDocManager()->FileHistoryUseMenu(m_pFileMenu);
+  GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
+  GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu);
   
   wxMenu *help_menu = new wxMenu;
   help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1");
@@ -2983,11 +3035,11 @@ TextFileView::CreateChildFrame (wxDocument *doc, wxView *view)
 
 // Define a constructor for my text subwindow
 TextFileCanvas::TextFileCanvas (TextFileView* v, wxFrame* frame, const wxPoint& pos, const wxSize& size, long style)
-  : wxTextCtrl (frame, -1, "", pos, size, style), m_pView(v)
+: wxTextCtrl (frame, -1, "", pos, size, style), m_pView(v)
 {
 }
 
 TextFileCanvas::~TextFileCanvas ()
 {
-	m_pView = NULL;
+  m_pView = NULL;
 }