X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.cpp;h=0a3896c012513435375f37d1f0eec593adcb9d32;hb=ba8635d790ee847d9746c6da24b60bd4cb6d9116;hp=3a6db53239f66d2a41e71578d6fca667eae89b4e;hpb=6cea1255c6f86c368631246ece6ddcaf7be00ec4;p=ctsim.git

diff --git a/src/views.cpp b/src/views.cpp
index 3a6db53..0a3896c 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.85 2001/01/28 20:05:17 kevin Exp $
+**  $Id: views.cpp,v 1.92 2001/01/30 07:32:13 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()
 
 
@@ -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
 {
@@ -235,6 +257,7 @@ ImageFileView::~ImageFileView()
   GetDocumentManager()->ActivateView(this, FALSE, TRUE);
 }
 
+
 void
 ImageFileView::OnProperties (wxCommandEvent& event)
 {
@@ -253,16 +276,15 @@ ImageFileView::OnProperties (wxCommandEvent& event)
       os << "Complex\n";
     else
       os << "Real\n";
-    os << "\nMinimum: "<<min<<"\nMaximum: "<<max<<"\nMean: "<<mean<<"\nMedian: "<<median<<"\nMode: "<<mode<<"\nStandard Deviation: "<<stddev << "\n";
+    os << "Minimum: "<<min<<"\nMaximum: "<<max<<"\nMean: "<<mean<<"\nMedian: "<<median<<"\nMode: "<<mode<<"\nStandard Deviation: "<<stddev << "\n";
     if (rIF.isComplex()) {
       rIF.statistics (rIF.getImaginaryArray(), min, max, mean, mode, median, stddev);
-      os << "\nImaginary: min: "<<min<<"\nmax: "<<max<<"\nmean: "<<mean<<"\nmedian: "<<median<<"\nmode: "<<mode<<"\nstddev: "<<stddev << "\n";
+      os << "Imaginary: min: "<<min<<"\nmax: "<<max<<"\nmean: "<<mean<<"\nmedian: "<<median<<"\nmode: "<<mode<<"\nstddev: "<<stddev << "\n";
     }
     if (rIF.nLabels() > 0) {
-      os << "\n";
       rIF.printLabelsBrief (os);
     }
-    *theApp->getLog() << os.str().c_str();
+    *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n";
     wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Imagefile Properties", wxOK | wxICON_INFORMATION);
     dialogMsg.ShowModal();
   }
@@ -344,36 +366,36 @@ ImageFileView::OnCompare (wxCommandEvent& event)
       os << GetFrame()->GetTitle().c_str() << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n";
       rCompareIF.statistics (min, max, mean, mode, median, stddev);
       os << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str() << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n";
-      os << "\n";
       double d, r, e;
       rIF.comparativeStatistics (rCompareIF, d, r, e);
       os << "Comparative Statistics: d=" << d << ", r=" << r << ", e=" << e << "\n";
-      *theApp->getLog() << os.str().c_str();
+      *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n";
       if (dialogGetCompare.getMakeDifferenceImage()) {
+        ImageFile* pDifferenceImage = new ImageFile;
+        
+        pDifferenceImage->setArraySize (rIF.nx(), rIF.ny());
+        if (! rIF.subtractImages (rCompareIF, *pDifferenceImage)) {
+          *theApp->getLog() << "Unable to subtract images\n";
+          delete pDifferenceImage;
+          return;
+        }
         ImageFileDocument* pDifferenceDoc = theApp->newImageDoc();
         if (! pDifferenceDoc) {
           sys_error (ERR_SEVERE, "Unable to create image file");
           return;
         }
-        ImageFile& differenceImage = pDifferenceDoc->getImageFile();
-        
-        differenceImage.setArraySize (rIF.nx(), rIF.ny());
-        if (! rIF.subtractImages (rCompareIF, differenceImage)) {
-          pDifferenceDoc->getView()->getFrame()->Close(true);
-          return;
-        }
-        
+        pDifferenceDoc->setImageFile (pDifferenceImage);
+
         wxString s = GetFrame()->GetTitle() + ": ";
-        differenceImage.labelsCopy (rIF, s.c_str());
+        pDifferenceImage->labelsCopy (rIF, s.c_str());
         s = pCompareDoc->GetFirstView()->GetFrame()->GetTitle() + ": ";
-        differenceImage.labelsCopy (rCompareIF, s.c_str());
+        pDifferenceImage->labelsCopy (rCompareIF, s.c_str());
         std::ostringstream osLabel;
         osLabel << "Compare image " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str() 
           << " and " << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str() << ": "
           << os.str().c_str();
-        differenceImage.labelAdd (os.str().c_str());
-        if (theApp->getSetModifyNewDocs())
-          pDifferenceDoc->Modify (true);
+        pDifferenceImage->labelAdd (os.str().c_str());
+        pDifferenceDoc->Modify (true);
         pDifferenceDoc->UpdateAllViews (this);
         pDifferenceDoc->getView()->OnUpdate (this, NULL);
         pDifferenceDoc->getView()->getFrame()->Show(true);
@@ -389,8 +411,7 @@ ImageFileView::OnInvertValues (wxCommandEvent& event)
   ImageFile& rIF = GetDocument()->getImageFile();
   rIF.invertPixelValues (rIF);
   rIF.labelAdd ("Invert Pixel Values");
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
+  GetDocument()->Modify (true);
   GetDocument()->UpdateAllViews (this);
 }
 
@@ -400,8 +421,7 @@ ImageFileView::OnSquare (wxCommandEvent& event)
   ImageFile& rIF = GetDocument()->getImageFile();
   rIF.square (rIF);
   rIF.labelAdd ("Square Pixel Values");
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
+  GetDocument()->Modify (true);
   GetDocument()->UpdateAllViews (this);
 }
 
@@ -411,8 +431,7 @@ ImageFileView::OnSquareRoot (wxCommandEvent& event)
   ImageFile& rIF = GetDocument()->getImageFile();
   rIF.sqrt (rIF);
   rIF.labelAdd ("Square-root Pixel Values");
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
+  GetDocument()->Modify (true);
   GetDocument()->UpdateAllViews (this);
 }
 
@@ -422,8 +441,7 @@ 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()->Modify (true);
   GetDocument()->UpdateAllViews (this);
 }
 
@@ -433,8 +451,7 @@ 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()->Modify (true);
   GetDocument()->UpdateAllViews (this);
 }
 
@@ -470,8 +487,7 @@ 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->Modify (true);
       pNewDoc->UpdateAllViews (this);
       pNewDoc->getView()->OnUpdate (this, NULL);
       pNewDoc->getView()->getFrame()->Show(true);
@@ -511,8 +527,7 @@ 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->Modify (true);
       pNewDoc->UpdateAllViews (this);
       pNewDoc->getView()->OnUpdate (this, NULL);
       pNewDoc->getView()->getFrame()->Show(true);
@@ -552,8 +567,7 @@ 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->Modify (true);
       pNewDoc->UpdateAllViews (this);
       pNewDoc->getView()->OnUpdate (this, NULL);
       pNewDoc->getView()->getFrame()->Show(true);
@@ -593,8 +607,7 @@ 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->Modify (true);
       pNewDoc->UpdateAllViews (this);
       pNewDoc->getView()->OnUpdate (this, NULL);
       pNewDoc->getView()->getFrame()->Show(true);
@@ -612,8 +625,7 @@ ImageFileView::OnFFT (wxCommandEvent& event)
   rIF.labelAdd ("FFT Image");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
+  GetDocument()->Modify (true);
   GetDocument()->UpdateAllViews (this);
 }
 
@@ -625,8 +637,7 @@ ImageFileView::OnIFFT (wxCommandEvent& event)
   rIF.labelAdd ("IFFT Image");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
+  GetDocument()->Modify (true);
   GetDocument()->UpdateAllViews (this);
 }
 
@@ -638,8 +649,7 @@ ImageFileView::OnFFTRows (wxCommandEvent& event)
   rIF.labelAdd ("FFT Rows");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
+  GetDocument()->Modify (true);
   GetDocument()->UpdateAllViews (this);
 }
 
@@ -651,8 +661,7 @@ ImageFileView::OnIFFTRows (wxCommandEvent& event)
   rIF.labelAdd ("IFFT Rows");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
+  GetDocument()->Modify (true);
   GetDocument()->UpdateAllViews (this);
 }
 
@@ -664,8 +673,7 @@ ImageFileView::OnFFTCols (wxCommandEvent& event)
   rIF.labelAdd ("FFT Columns");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
+  GetDocument()->Modify (true);
   GetDocument()->UpdateAllViews (this);
 }
 
@@ -677,8 +685,7 @@ ImageFileView::OnIFFTCols (wxCommandEvent& event)
   rIF.labelAdd ("IFFT Columns");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
+  GetDocument()->Modify (true);
   GetDocument()->UpdateAllViews (this);
 }
 #endif
@@ -692,8 +699,7 @@ ImageFileView::OnFourier (wxCommandEvent& event)
   rIF.labelAdd ("Fourier Image");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
+  GetDocument()->Modify (true);
   GetDocument()->UpdateAllViews (this);
 }
 
@@ -706,8 +712,7 @@ ImageFileView::OnInverseFourier (wxCommandEvent& event)
   rIF.labelAdd ("Inverse Fourier Image");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
+  GetDocument()->Modify (true);
   GetDocument()->UpdateAllViews (this);
 }
 
@@ -719,8 +724,7 @@ ImageFileView::OnShuffleNaturalToFourierOrder (wxCommandEvent& event)
   rIF.labelAdd ("Shuffle Natural To Fourier Order");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
+  GetDocument()->Modify (true);
   GetDocument()->UpdateAllViews (this);
 }
 
@@ -732,8 +736,7 @@ ImageFileView::OnShuffleFourierToNaturalOrder (wxCommandEvent& event)
   rIF.labelAdd ("Shuffle Fourier To Natural Order");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
+  GetDocument()->Modify (true);
   GetDocument()->UpdateAllViews (this);
 }
 
@@ -746,8 +749,7 @@ ImageFileView::OnMagnitude (wxCommandEvent& event)
     rIF.labelAdd ("Magnitude of complex-image");
     m_bMinSpecified = false;
     m_bMaxSpecified = false;
-    if (theApp->getSetModifyNewDocs())
-      GetDocument()->Modify(TRUE);
+    GetDocument()->Modify (true);
     GetDocument()->UpdateAllViews (this);
   }
 }
@@ -761,8 +763,7 @@ ImageFileView::OnPhase (wxCommandEvent& event)
     rIF.labelAdd ("Phase of complex-image");
     m_bMinSpecified = false;
     m_bMaxSpecified = false;
-    if (theApp->getSetModifyNewDocs())
-      GetDocument()->Modify(TRUE);
+    GetDocument()->Modify (true);
     GetDocument()->UpdateAllViews (this);
   }
 }
@@ -798,7 +799,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
 #endif
   theApp->setIconForFrame (subframe);
   
-  wxMenu *m_pFileMenu = new wxMenu;
+  m_pFileMenu = new wxMenu;
   
   m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P");
   m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F");
@@ -806,6 +807,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   m_pFileMenu->Append(wxID_SAVE, "&Save\tCtrl-S");
   m_pFileMenu->Append(wxID_SAVEAS, "Save &As...");
   m_pFileMenu->Append(wxID_CLOSE, "&Close\tCtrl-W");
+  m_pFileMenu->Append(wxID_REVERT, "Re&vert");
   
   m_pFileMenu->AppendSeparator();
   m_pFileMenu->Append(IFMENU_FILE_PROPERTIES, "P&roperties");
@@ -814,7 +816,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   m_pFileMenu->AppendSeparator();
   m_pFileMenu->Append(wxID_PRINT, "&Print...");
   m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup...");
-  m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
+  m_pFileMenu->Append(wxID_PREVIEW, "Print Preview");
 #ifdef CTSIM_MDI
   m_pFileMenu->AppendSeparator();
   m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
@@ -860,17 +862,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");
@@ -883,7 +891,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);
@@ -912,7 +920,7 @@ bool
 ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) )
 {
   m_pFrame = CreateChildFrame(doc, this);
-     (m_pFrame);
+  (m_pFrame);
   
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
@@ -996,11 +1004,12 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 bool 
 ImageFileView::OnClose (bool deleteWindow)
 {
+  //GetDocumentManager()->ActivateView (this, false, true);
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
-  
+
+  Activate (false);
   if (m_pCanvas) {
-	m_pCanvas->Show(false);
     m_pCanvas->setView(NULL);
     m_pCanvas = NULL;
   }
@@ -1009,14 +1018,14 @@ ImageFileView::OnClose (bool deleteWindow)
     m_pFrame->SetTitle(s);
   
   SetFrame(NULL);
-  Activate(false);
-
+  
   if (deleteWindow) {
-    m_pFrame->Show(false);
-	::wxYield();
     m_pFrame->Destroy();
     m_pFrame = NULL;
+    if (GetDocument() && GetDocument()->getBadFileOpen())
+      ::wxYield();  // wxWindows bug workaround
   }
+  
   return true;
 }
 
@@ -1089,8 +1098,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);
@@ -1175,9 +1183,10 @@ ImageFileView::OnPlotRow (wxCommandEvent& event)
       delete pYImag;
       delete pYMag;
     }
-    if (theApp->getSetModifyNewDocs())
-      pPlotDoc->Modify(true);
+    pPlotDoc->Modify (true);
     pPlotDoc->UpdateAllViews ();
+    pPlotDoc->getView()->OnUpdate (this, NULL);
+    pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 
@@ -1259,9 +1268,10 @@ ImageFileView::OnPlotCol (wxCommandEvent& event)
       delete pYImag;
       delete pYMag;
     }
-    if (theApp->getSetModifyNewDocs())
-      pPlotDoc->Modify(true);
+    pPlotDoc->Modify (true);
     pPlotDoc->UpdateAllViews ();
+    pPlotDoc->getView()->OnUpdate (this, NULL);
+    pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 
@@ -1352,9 +1362,10 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event)
     delete pYMag;
     delete [] pcIn;
     
-    if (theApp->getSetModifyNewDocs())
-      pPlotDoc->Modify(true);
+    pPlotDoc->Modify (true);
     pPlotDoc->UpdateAllViews ();
+    pPlotDoc->getView()->OnUpdate (this, NULL);
+    pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 
@@ -1451,9 +1462,10 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event)
     delete pdTemp;
     delete [] pcIn;
     
-    if (theApp->getSetModifyNewDocs())
-      pPlotDoc->Modify(true);
+    pPlotDoc->Modify (true);
     pPlotDoc->UpdateAllViews ();
+    pPlotDoc->getView()->OnUpdate (this, NULL);
+    pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 #endif
@@ -1540,9 +1552,10 @@ ImageFileView::OnCompareCol (wxCommandEvent& event)
       delete pX;
       delete pY1;
       delete pY2;
-      if (theApp->getSetModifyNewDocs())
-        pPlotDoc->Modify(true);
+      pPlotDoc->Modify (true);
       pPlotDoc->UpdateAllViews ();
+      pPlotDoc->getView()->OnUpdate (this, NULL);
+      pPlotDoc->getView()->getFrame()->Show(true);
     }
   }
 }
@@ -1630,9 +1643,10 @@ ImageFileView::OnCompareRow (wxCommandEvent& event)
       delete pX;
       delete pY1;
       delete pY2;
-      if (theApp->getSetModifyNewDocs())
-        pPlotDoc->Modify(true);
+      pPlotDoc->Modify (true);
       pPlotDoc->UpdateAllViews ();
+      pPlotDoc->getView()->OnUpdate (this, NULL);
+      pPlotDoc->getView()->getFrame()->Show(true);
     }
   }
 }
@@ -1695,9 +1709,10 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event)
       rPlotFile.addDescription (os.str().c_str());
       delete pX;
       delete pY;
-      if (theApp->getSetModifyNewDocs())
-        pPlotDoc->Modify(true);
+      pPlotDoc->Modify (true);
       pPlotDoc->UpdateAllViews ();
+      pPlotDoc->getView()->OnUpdate (this, NULL);
+      pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 
@@ -1779,7 +1794,7 @@ PhantomFileView::OnProperties (wxCommandEvent& event)
 #if DEBUG
   rPhantom.print (os);
 #endif
-  *theApp->getLog() << os.str().c_str() << "\n";
+  *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n";
   wxMessageBox (os.str().c_str(), "Phantom Properties");
 }
 
@@ -1802,27 +1817,23 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
     
     if (m_iDefaultNDet > 0 && m_iDefaultNView > 0 && sGeometry != "") {
       const Phantom& rPhantom = GetDocument()->getPhantom();
-      ProjectionFileDocument* pProjectionDoc = theApp->newProjectionDoc();
-      if (! pProjectionDoc) {
-        sys_error (ERR_SEVERE, "Unable to create projection document");
-        return;
-      }
-      Projections& rProj = pProjectionDoc->getProjections();
-      Scanner theScanner (rPhantom, sGeometry.c_str(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView);
+      Projections* pProj = new Projections;
+      Scanner theScanner (rPhantom, sGeometry.c_str(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, 
+                          m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView);
       if (theScanner.fail()) {
         *theApp->getLog() << "Failed making scanner: " << theScanner.failMessage().c_str() << "\n";
         return;
       }
-      rProj.initFromScanner (theScanner);
+      pProj->initFromScanner (theScanner);
       m_dDefaultRotation /= PI;  // convert back to PI units
       
       Timer timer;
       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++) {
+        ProjectionsDialog dialogProjections (theScanner, *pProj, rPhantom, m_iDefaultTrace, dynamic_cast<wxWindow*>(getFrameForChild()));
+        for (int iView = 0; iView < pProj->nView(); iView++) {
           ::wxYield();
           if (dialogProjections.isCancelled() || ! dialogProjections.projectView (iView)) {
-            pProjectionDoc->getView()->getFrame()->Close(true);
+            delete pProj;
             return;
           }
           ::wxYield();
@@ -1832,12 +1843,11 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
           }
         }
       } else {
-        wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), rProj.nView() + 1, getFrameForChild(), wxPD_CAN_ABORT);
-        for (int i = 0; i < rProj.nView(); i++) {
-          theScanner.collectProjections (rProj, rPhantom, i, 1, true, m_iDefaultTrace);
+        wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), pProj->nView() + 1, getFrameForChild(), wxPD_CAN_ABORT);
+        for (int i = 0; i < pProj->nView(); i++) {
+          theScanner.collectProjections (*pProj, rPhantom, i, 1, true, m_iDefaultTrace);
           if (! dlgProgress.Update (i+1)) {
-            pProjectionDoc->getView()->OnClose(true);
-			delete pProjectionDoc;
+            delete pProj;
             return;
           }
         }
@@ -1845,15 +1855,21 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
       
       std::ostringstream os;
       os << "Projections for " << rPhantom.name() << ": nDet=" << m_iDefaultNDet << ", nView=" << m_iDefaultNView << ", nSamples=" << m_iDefaultNSample << ", RotAngle=" << m_dDefaultRotation << ", FocalLengthRatio=" << m_dDefaultFocalLength << ", FieldOfViewRatio=" << m_dDefaultFieldOfView << ", Geometry=" << sGeometry.c_str();
-      rProj.setCalcTime (timer.timerEnd());
-      rProj.setRemark (os.str());
+      pProj->setCalcTime (timer.timerEnd());
+      pProj->setRemark (os.str());
       *theApp->getLog() << os.str().c_str() << "\n";
       
       ::wxYield();
+      ProjectionFileDocument* pProjectionDoc = theApp->newProjectionDoc();
+      if (! pProjectionDoc) {
+        sys_error (ERR_SEVERE, "Unable to create projection document");
+        return;
+      }
+      pProjectionDoc->setProjections (pProj);
       ProjectionFileView* projView = pProjectionDoc->getView();
       if (projView) {
         projView->OnUpdate (projView, NULL);
-		if (projView->getCanvas())
+        if (projView->getCanvas())
    	      projView->getCanvas()->SetClientSize (m_iDefaultNDet, m_iDefaultNView);
         if (wxFrame* pFrame = projView->getFrame()) {
           pFrame->Show(true);
@@ -1863,8 +1879,7 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
         GetDocumentManager()->ActivateView (projView, true, false);
       }
       ::wxYield();
-      if (theApp->getSetModifyNewDocs())
-        pProjectionDoc->Modify(true);
+      pProjectionDoc-> Modify(true);
       pProjectionDoc->UpdateAllViews (this);
     }
   }
@@ -1884,34 +1899,36 @@ PhantomFileView::OnRasterize (wxCommandEvent& event)
       m_iDefaultRasterNSamples = 1;
     if (m_iDefaultRasterNX > 0 && m_iDefaultRasterNY > 0) {
       const Phantom& rPhantom = GetDocument()->getPhantom();
-      ImageFileDocument* pRasterDoc = theApp->newImageDoc();
-      if (! pRasterDoc) {
-        sys_error (ERR_SEVERE, "Unable to create image file");
-        return;
-      }
-      ImageFile& imageFile = pRasterDoc->getImageFile();
+
+      ImageFile* pImageFile = new ImageFile;
       
-      imageFile.setArraySize (m_iDefaultRasterNX, m_iDefaultRasterNY);
-      wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), imageFile.nx() + 1, getFrameForChild(), wxPD_CAN_ABORT);
+      pImageFile->setArraySize (m_iDefaultRasterNX, m_iDefaultRasterNY);
+      wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), 
+                                    pImageFile->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);
+      for (unsigned int i = 0; i < pImageFile->nx(); i++) {
+        rPhantom.convertToImagefile (*pImageFile, m_iDefaultRasterNSamples, Trace::TRACE_NONE, i, 1, true);
         if (! dlgProgress.Update (i+1)) {
-          pRasterDoc->Close();
-          pRasterDoc->getView()->OnClose(true);
-		  delete pRasterDoc;
+          delete pImageFile;
           return;
         }
       }
-      if (theApp->getSetModifyNewDocs())
-        pRasterDoc->Modify(true);
+
+      ImageFileDocument* pRasterDoc = theApp->newImageDoc();
+      if (! pRasterDoc) {
+        sys_error (ERR_SEVERE, "Unable to create image file");
+        return;
+      }
+      pRasterDoc->setImageFile (pImageFile);
+
+      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());
+      pImageFile->labelAdd (os.str().c_str(), timer.timerEnd());
       ImageFileView* rasterView = pRasterDoc->getView();
       if (rasterView) {
         rasterView->getFrame()->SetFocus();
@@ -1952,7 +1969,7 @@ PhantomFileView::CreateChildFrame(wxDocument *doc, wxView *view)
 #endif
   theApp->setIconForFrame (subframe);
   
-  wxMenu *m_pFileMenu = new wxMenu;
+  m_pFileMenu = new wxMenu;
   
   m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P");
   m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F");
@@ -2041,11 +2058,12 @@ PhantomFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 bool 
 PhantomFileView::OnClose (bool deleteWindow)
 {
+  //GetDocumentManager()->ActivateView (this, false, true);
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
+  Activate(false);
   if (m_pCanvas) {
-	m_pCanvas->Show(false);
     m_pCanvas->setView(NULL);
     m_pCanvas = NULL;
   }
@@ -2054,13 +2072,12 @@ PhantomFileView::OnClose (bool deleteWindow)
     m_pFrame->SetTitle(s);
   
   SetFrame(NULL);
-  Activate(false);
   
   if (deleteWindow) {
-   m_pFrame->Show(false);
-	::wxYield();
-     m_pFrame->Destroy();
+    delete m_pFrame;
     m_pFrame = NULL;
+    if (GetDocument() && GetDocument()->getBadFileOpen())
+      ::wxYield();  // wxWindows bug workaround
   }
   
   return true;
@@ -2132,7 +2149,7 @@ ProjectionFileView::ProjectionFileView()
   m_iDefaultNX = 256;
   m_iDefaultNY = 256;
 #endif
-
+  
   m_iDefaultFilter = SignalFilter::FILTER_ABS_BANDLIMIT;
   m_dDefaultFilterParam = 1.;
 #if HAVE_FFTW
@@ -2166,7 +2183,7 @@ ProjectionFileView::OnProperties (wxCommandEvent& event)
   const Projections& rProj = GetDocument()->getProjections();
   std::ostringstream os;
   rProj.printScanInfo(os);
-  *theApp->getLog() << os.str().c_str();
+  *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n";
   wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Projection File Properties", wxOK | wxICON_INFORMATION);
   dialogMsg.ShowModal();
 }
@@ -2198,8 +2215,7 @@ 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->Modify (true);
     pPolarDoc->UpdateAllViews ();
     pPolarDoc->getView()->OnUpdate (this, NULL);
     pPolarDoc->getView()->getFrame()->Show(true);
@@ -2233,8 +2249,7 @@ 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->Modify (true);
     pPolarDoc->UpdateAllViews ();
     pPolarDoc->getView()->OnUpdate (this, NULL);
     pPolarDoc->getView()->getFrame()->Show(true);
@@ -2271,31 +2286,25 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event)
     m_iDefaultBackprojector = Backprojector::convertBackprojectNameToID (optBackprojectName.c_str());
     m_iDefaultTrace = dialogReconstruction.getTrace();
     if (m_iDefaultNX > 0 && m_iDefaultNY > 0) {
-      ImageFileDocument* pReconDoc = theApp->newImageDoc();
-      if (! pReconDoc) {
-        sys_error (ERR_SEVERE, "Unable to create image file");
-        return;
-      }
-      ImageFile& imageFile = pReconDoc->getImageFile();
       const Projections& rProj = GetDocument()->getProjections();
-      imageFile.setArraySize (m_iDefaultNX, m_iDefaultNY);
+
+      ImageFile* pImageFile = new ImageFile;
+      pImageFile->setArraySize (m_iDefaultNX, m_iDefaultNY);
       
-      Reconstructor* pReconstruct = new Reconstructor (rProj, imageFile, optFilterName.c_str(), m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace);
+      Reconstructor* pReconstructor = new Reconstructor (rProj, *pImageFile, optFilterName.c_str(), m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace);
       
       Timer timerRecon;
       if (m_iDefaultTrace > Trace::TRACE_CONSOLE) {
-        ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstruct, rProj, imageFile, m_iDefaultTrace, getFrameForChild());
+        ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstructor, rProj, *pImageFile, m_iDefaultTrace, getFrameForChild());
         for (int iView = 0; iView < rProj.nView(); iView++) {
-          ::wxYield();
           ::wxYield();
           if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView)) {
             delete pDlgReconstruct;
-            delete pReconstruct;
-            pReconDoc->getView()->getFrame()->Close(true);
+            delete pReconstructor;
+            delete pImageFile;
             return;
           }
           ::wxYield();
-          ::wxYield();
           while (pDlgReconstruct->isPaused()) {
             ::wxYield();
             ::wxUsleep(50);
@@ -2305,18 +2314,22 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event)
       } else {
         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);
+          pReconstructor->reconstructView (i, 1);
           if (! dlgProgress.Update (i + 1)) {
-            delete pReconstruct;
-            pReconDoc->getView()->OnClose(true);
-			delete pReconDoc;
+            delete pReconstructor;
+            delete pImageFile;
             return;
           }
         }
       }
-      delete pReconstruct;
-      if (theApp->getSetModifyNewDocs())
-        pReconDoc->Modify(true);
+      delete pReconstructor;
+      ImageFileDocument* pReconDoc = theApp->newImageDoc();
+      if (! pReconDoc) {
+        sys_error (ERR_SEVERE, "Unable to create image file");
+        return;
+      }
+      pReconDoc->setImageFile (pImageFile);
+      pReconDoc->Modify (true);
       pReconDoc->UpdateAllViews (this);
       if (ImageFileView* rasterView = pReconDoc->getView()) {
         rasterView->OnUpdate (rasterView, NULL);
@@ -2326,8 +2339,8 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event)
       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();
       *theApp->getLog() << os.str().c_str() << "\n";
-      imageFile.labelAdd (rProj.getLabel());
-      imageFile.labelAdd (os.str().c_str(), timerRecon.timerEnd());
+      pImageFile->labelAdd (rProj.getLabel());
+      pImageFile->labelAdd (os.str().c_str(), timerRecon.timerEnd());
     }
   }
 }
@@ -2363,7 +2376,7 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view)
 #endif
   theApp->setIconForFrame (subframe);
   
-  wxMenu *m_pFileMenu = new wxMenu;
+  m_pFileMenu = new wxMenu;
   
   m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P");
   m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F");
@@ -2391,8 +2404,9 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   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");
@@ -2517,12 +2531,13 @@ ProjectionFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint)
 bool 
 ProjectionFileView::OnClose (bool deleteWindow)
 {
+  //GetDocumentManager()->ActivateView (this, false, true);
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
+  Activate(false);
   if (m_pCanvas) {
-	m_pCanvas->Show(false);
-    m_pCanvas->setView(NULL);
+   	m_pCanvas->setView(NULL);
     m_pCanvas = NULL;
   }
   wxString s(wxTheApp->GetAppName());
@@ -2530,14 +2545,14 @@ ProjectionFileView::OnClose (bool deleteWindow)
     m_pFrame->SetTitle(s);
   
   SetFrame(NULL);
-  Activate(false);
   
   if (deleteWindow) {
-    m_pFrame->Show(false);
-	::wxYield();
-    m_pFrame->Destroy();
+    delete m_pFrame;
     m_pFrame = NULL;
+    if (GetDocument() && GetDocument()->getBadFileOpen())
+      ::wxYield();  // wxWindows bug workaround
   }
+
   return true;
 }
 
@@ -2594,7 +2609,7 @@ PlotFileView::OnProperties (wxCommandEvent& event)
   std::ostringstream os;
   os << "Columns: " << rPlot.getNumColumns() << ", Records: " << rPlot.getNumRecords() << "\n";
   rPlot.printHeadersBrief (os);
-  *theApp->getLog() << os.str().c_str();
+  *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<<\n";
   wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Plot File Properties", wxOK | wxICON_INFORMATION);
   dialogMsg.ShowModal();
 }
@@ -2691,7 +2706,7 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view)
 #endif
   theApp->setIconForFrame (subframe);
   
-  wxMenu *m_pFileMenu = new wxMenu;
+  m_pFileMenu = new wxMenu;
   
   m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P");
   m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F");
@@ -2846,11 +2861,12 @@ PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 bool 
 PlotFileView::OnClose (bool deleteWindow)
 {
+  //GetDocumentManager()->ActivateView (this, false, true);
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
+  Activate(false);
   if (m_pCanvas) {
-	m_pCanvas->Show(false);
     m_pCanvas->setView (NULL);
     m_pCanvas = NULL;
   }
@@ -2858,16 +2874,14 @@ PlotFileView::OnClose (bool deleteWindow)
   if (m_pFrame)
     m_pFrame->SetTitle(s);
   
-  Activate(false);
-  
-  m_pFrame->SetView(NULL);
-   SetFrame(NULL);
+  SetFrame(NULL);
   if (deleteWindow) {
-    m_pFrame->Show(false);
-	::wxYield();
-     m_pFrame->Destroy();
+    delete m_pFrame;
     m_pFrame = NULL;
-  }
+    if (GetDocument() && GetDocument()->getBadFileOpen())
+      ::wxYield();  // wxWindows bug workaround
+ }
+
   return true;
 }
 
@@ -2919,24 +2933,22 @@ void TextFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint)
 bool 
 TextFileView::OnClose (bool deleteWindow)
 {
- // if (m_pFrame && m_pFrame->GetTitle() == "Log")
+  if (! theApp->getMainFrame()->getShuttingDown())
     return false;
   
+  Activate(false);
+  //GetDocumentManager()->ActivateView (this, false, true);
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
-  m_pCanvas->Show(false);
-  Activate(false);
-
   SetFrame(NULL);
-  m_pFrame->SetView(NULL);
   if (deleteWindow) {
-    m_pFrame->Show(false);
-	::wxYield();
-     m_pFrame->Destroy();
+    delete m_pFrame;
     m_pFrame = NULL;
-    
+    if (GetDocument() && GetDocument()->getBadFileOpen())
+      ::wxYield();  // wxWindows bug workaround
   }
+
   return TRUE;
 }
 
@@ -2948,13 +2960,13 @@ wxDocChildFrame*
 TextFileView::CreateChildFrame (wxDocument *doc, wxView *view)
 {
 #if CTSIM_MDI
-  wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE);
+  wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(0,0), wxDEFAULT_FRAME_STYLE, "Log");
 #else
-  wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE);
+  wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE, "Log");
 #endif
   theApp->setIconForFrame (subframe);
   
-  wxMenu *m_pFileMenu = new wxMenu;
+ m_pFileMenu = new wxMenu;
   
   m_pFileMenu->Append(MAINMENU_FILE_CREATE_PHANTOM, "Cr&eate Phantom...\tCtrl-P");
   m_pFileMenu->Append(MAINMENU_FILE_CREATE_FILTER, "Create &Filter...\tCtrl-F");