X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.cpp;h=0a3896c012513435375f37d1f0eec593adcb9d32;hb=ba8635d790ee847d9746c6da24b60bd4cb6d9116;hp=4e970c173bd2bb43a6739d96d5c419797c6ba51f;hpb=91fb88e205c5bc7b771faf601db8489a9278c1ab;p=ctsim.git

diff --git a/src/views.cpp b/src/views.cpp
index 4e970c1..0a3896c 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.74 2001/01/26 21:33:06 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,25 +65,18 @@
 
 BEGIN_EVENT_TABLE(ImageFileCanvas, wxScrolledWindow)
 EVT_MOUSE_EVENTS(ImageFileCanvas::OnMouseEvent)
+EVT_CHAR(ImageFileCanvas::OnChar)
 END_EVENT_TABLE()
 
 
 ImageFileCanvas::ImageFileCanvas (ImageFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style)
-: wxScrolledWindow(frame, -1, pos, size, style)
+: wxScrolledWindow(frame, -1, pos, size, style), m_pView(v), m_xCursor(-1), m_yCursor(-1)
 {
-  m_pView = v;
-  m_xCursor = -1;
-  m_yCursor = -1;
 }
 
 ImageFileCanvas::~ImageFileCanvas()
 {
-  if (m_pView) {
-    wxMenu* pMenu = m_pView->getFileMenu();
-    theApp->getDocManager()->FileHistoryRemoveMenu (pMenu);
-    m_pView->canvasClosed();
-    m_pView = NULL;
-  }
+  m_pView = NULL;
 }
 
 void 
@@ -164,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";
   }
@@ -174,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
 {
@@ -232,16 +246,18 @@ EVT_MENU(IFMENU_PLOT_HISTOGRAM, ImageFileView::OnPlotHistogram)
 END_EVENT_TABLE()
 
 ImageFileView::ImageFileView() 
-: wxView(), m_canvas(NULL), m_frame(NULL), m_bMinSpecified(false), m_bMaxSpecified(false), m_pFileMenu(0)
+: wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pFileMenu(0), m_bMinSpecified(false), m_bMaxSpecified(false)
 {
   m_iDefaultExportFormatID = ImageFile::FORMAT_PNG;
 }
 
 ImageFileView::~ImageFileView()
 {
-
+  GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
+  GetDocumentManager()->ActivateView(this, FALSE, TRUE);
 }
 
+
 void
 ImageFileView::OnProperties (wxCommandEvent& event)
 {
@@ -260,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();
   }
@@ -351,38 +366,39 @@ 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->DeleteAllViews();
-          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);
-        pDifferenceDoc->UpdateAllViews(this);
-        pDifferenceDoc->GetFirstView()->OnUpdate (this, NULL);
+        pDifferenceImage->labelAdd (os.str().c_str());
+        pDifferenceDoc->Modify (true);
+        pDifferenceDoc->UpdateAllViews (this);
+        pDifferenceDoc->getView()->OnUpdate (this, NULL);
+        pDifferenceDoc->getView()->getFrame()->Show(true);
       }
       wxMessageBox(os.str().c_str(), "Image Comparison");
     }
@@ -395,9 +411,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
@@ -406,9 +421,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
@@ -417,9 +431,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
@@ -428,9 +441,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
@@ -439,9 +451,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
@@ -476,10 +487,10 @@ 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->GetFirstView()->OnUpdate (this, NULL);
+      pNewDoc->Modify (true);
+      pNewDoc->UpdateAllViews (this);
+      pNewDoc->getView()->OnUpdate (this, NULL);
+      pNewDoc->getView()->getFrame()->Show(true);
     }
   }
 }
@@ -516,10 +527,10 @@ 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->GetFirstView()->OnUpdate (this, NULL);
+      pNewDoc->Modify (true);
+      pNewDoc->UpdateAllViews (this);
+      pNewDoc->getView()->OnUpdate (this, NULL);
+      pNewDoc->getView()->getFrame()->Show(true);
     }
   }
 }
@@ -556,10 +567,10 @@ 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->GetFirstView()->OnUpdate (this, NULL);
+      pNewDoc->Modify (true);
+      pNewDoc->UpdateAllViews (this);
+      pNewDoc->getView()->OnUpdate (this, NULL);
+      pNewDoc->getView()->getFrame()->Show(true);
     }
   }
 }
@@ -596,10 +607,10 @@ 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->GetFirstView()->OnUpdate (this, NULL);
+      pNewDoc->Modify (true);
+      pNewDoc->UpdateAllViews (this);
+      pNewDoc->getView()->OnUpdate (this, NULL);
+      pNewDoc->getView()->getFrame()->Show(true);
     }
   }
 }
@@ -614,9 +625,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
@@ -627,9 +637,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
@@ -640,9 +649,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
@@ -653,9 +661,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
@@ -666,9 +673,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
@@ -679,9 +685,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
 
@@ -694,9 +699,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
@@ -708,9 +712,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
@@ -721,9 +724,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
@@ -734,9 +736,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
@@ -748,9 +749,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);
   }
 }
 
@@ -763,21 +763,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);
@@ -786,7 +785,11 @@ ImageFileView::CreateCanvas (wxView *view, wxFrame *parent)
   return pCanvas;
 }
 
-wxFrame*
+#if CTSIM_MDI
+wxDocMDIChildFrame*
+#else
+wxDocChildFrame*
+#endif
 ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
 {
 #if CTSIM_MDI
@@ -796,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");
@@ -804,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");
@@ -812,13 +816,13 @@ 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");
 #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");
@@ -858,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");
@@ -881,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);
@@ -909,23 +919,23 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
 bool 
 ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) )
 {
-  m_frame = CreateChildFrame(doc, this);
-  SetFrame (m_frame);
+  m_pFrame = CreateChildFrame(doc, this);
+  (m_pFrame);
   
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
   m_dAutoScaleFactor = 1.;
   
   int width, height;
-  m_frame->GetClientSize (&width, &height);
-  m_frame->SetTitle("ImageFileView");
-  m_canvas = CreateCanvas (this, m_frame);
+  m_pFrame->GetClientSize (&width, &height);
+  m_pFrame->SetTitle("ImageFileView");
+  m_pCanvas = CreateCanvas (m_pFrame);
   
   int x, y;  // X requires a forced resize
-  m_frame->GetSize(&x, &y);
-  m_frame->SetSize(-1, -1, x, y);
-  m_frame->SetFocus();
-  m_frame->Show(true);
+  m_pFrame->GetSize(&x, &y);
+  m_pFrame->SetSize(-1, -1, x, y);
+  m_pFrame->SetFocus();
+  m_pFrame->Show(true);
   Activate(true);
   
   return true;
@@ -934,24 +944,24 @@ ImageFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) )
 void 
 ImageFileView::OnDraw (wxDC* dc)
 {
-  wxSize sizeWindow = m_frame->GetClientSize();
-  wxSize sizeBest = m_canvas->GetBestSize();
+  wxSize sizeWindow = m_pFrame->GetClientSize();
+  wxSize sizeBest = m_pCanvas->GetBestSize();
   if (sizeWindow.x > sizeBest.x || sizeWindow.y > sizeBest.y)
-    m_frame->SetClientSize (sizeBest);
+    m_pFrame->SetClientSize (sizeBest);
   
   if (m_bitmap.Ok())
     dc->DrawBitmap(m_bitmap, 0, 0, false);
   
   int xCursor, yCursor;
-  if (m_canvas->GetCurrentCursor (xCursor, yCursor))
-    m_canvas->DrawRubberBandCursor (*dc, xCursor, yCursor);
+  if (m_pCanvas->GetCurrentCursor (xCursor, yCursor))
+    m_pCanvas->DrawRubberBandCursor (*dc, xCursor, yCursor);
 }
 
 
 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();
@@ -982,44 +992,47 @@ ImageFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
     int xSize = nx;
     int ySize = ny;
     ySize = clamp (ySize, 0, 800);
-    m_frame->SetClientSize (xSize, ySize);
-    m_canvas->SetScrollbars(20, 20, nx/20, ny/20);
-    m_canvas->SetBackgroundColour(*wxWHITE);
+    m_pFrame->SetClientSize (xSize, ySize);
+    m_pCanvas->SetScrollbars(20, 20, nx/20, ny/20);
+    m_pCanvas->SetBackgroundColour(*wxWHITE);
   } 
   
-  if (m_canvas)
-    m_canvas->Refresh();
+  if (m_pCanvas)
+    m_pCanvas->Refresh();
 }
 
 bool 
 ImageFileView::OnClose (bool deleteWindow)
 {
+  //GetDocumentManager()->ActivateView (this, false, true);
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
-  
-  if (m_canvas) {
-  //  m_canvas->Clear();
-    m_canvas->setView(NULL);
-    m_canvas = NULL;
+
+  Activate (false);
+  if (m_pCanvas) {
+    m_pCanvas->setView(NULL);
+    m_pCanvas = NULL;
   }
   wxString s(theApp->GetAppName());
-//  if (m_frame)
-//    m_frame->SetTitle(s);
-  SetFrame(NULL);
+  if (m_pFrame)
+    m_pFrame->SetTitle(s);
   
-  Activate(false);
+  SetFrame(NULL);
   
   if (deleteWindow) {
-    delete m_frame;
-    return true;
+    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();
@@ -1085,10 +1098,10 @@ 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->GetFirstView()->OnUpdate (this, NULL);
+    pScaledDoc->getView()->OnUpdate (this, NULL);
+    pScaledDoc->getView()->getFrame()->Show(true);
   }
 }
 
@@ -1096,12 +1109,12 @@ void
 ImageFileView::OnPlotRow (wxCommandEvent& event)
 {
   int xCursor, yCursor;
-  if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) {
+  if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) {
     wxMessageBox ("No row selected. Please use left mouse button on image to select column","Error");
     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();
@@ -1170,9 +1183,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);
   }
 }
 
@@ -1180,12 +1194,12 @@ void
 ImageFileView::OnPlotCol (wxCommandEvent& event)
 {
   int xCursor, yCursor;
-  if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) {
+  if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) {
     wxMessageBox ("No column selected. Please use left mouse button on image to select column","Error");
     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();
@@ -1254,9 +1268,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);
   }
 }
 
@@ -1265,12 +1280,12 @@ void
 ImageFileView::OnPlotFFTRow (wxCommandEvent& event)
 {
   int xCursor, yCursor;
-  if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) {
+  if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) {
     wxMessageBox ("No row selected. Please use left mouse button on image to select column","Error");
     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();
@@ -1347,9 +1362,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);
   }
 }
 
@@ -1357,12 +1373,12 @@ void
 ImageFileView::OnPlotFFTCol (wxCommandEvent& event)
 {
   int xCursor, yCursor;
-  if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) {
+  if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) {
     wxMessageBox ("No column selected. Please use left mouse button on image to select column","Error");
     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();
@@ -1446,9 +1462,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
@@ -1457,7 +1474,7 @@ void
 ImageFileView::OnCompareCol (wxCommandEvent& event)
 {
   int xCursor, yCursor;
-  if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) {
+  if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) {
     wxMessageBox ("No column selected. Please use left mouse button on image to select column","Error");
     return;
   }
@@ -1535,9 +1552,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);
     }
   }
 }
@@ -1546,7 +1564,7 @@ void
 ImageFileView::OnCompareRow (wxCommandEvent& event)
 {
   int xCursor, yCursor;
-  if (! m_canvas->GetCurrentCursor (xCursor, yCursor)) {
+  if (! m_pCanvas->GetCurrentCursor (xCursor, yCursor)) {
     wxMessageBox ("No column selected. Please use left mouse button on image to select column","Error");
     return;
   }
@@ -1625,9 +1643,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);
     }
   }
 }
@@ -1637,7 +1656,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();
@@ -1690,9 +1709,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);
   }
 }
 
@@ -1707,12 +1727,7 @@ PhantomCanvas::PhantomCanvas (PhantomFileView* v, wxFrame *frame, const wxPoint&
 
 PhantomCanvas::~PhantomCanvas ()
 {
-  if (m_pView) {
-    wxMenu* pMenu = m_pView->getFileMenu();
-    theApp->getDocManager()->FileHistoryRemoveMenu (pMenu);
-    m_pView->canvasClosed();
-    m_pView = NULL;
-  }
+  m_pView = NULL;
 }
 
 void 
@@ -1734,25 +1749,37 @@ EVT_MENU(PHMMENU_PROCESS_PROJECTIONS, PhantomFileView::OnProjections)
 END_EVENT_TABLE()
 
 PhantomFileView::PhantomFileView() 
-: wxView(), m_canvas(NULL), m_frame(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;
-  m_iDefaultNSample = 2;
+#endif
+  m_iDefaultNSample = 1;
   m_dDefaultRotation = 1;
   m_dDefaultFocalLength = 2;
   m_dDefaultFieldOfView = 1;
   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()
 {
-	
+  GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
+  GetDocumentManager()->ActivateView(this, FALSE, TRUE);
 }
 
 void
@@ -1767,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");
 }
 
@@ -1790,43 +1817,37 @@ 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++) {
-          ::wxYield();
+        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->DeleteAllViews();
+            delete pProj;
             return;
           }
           ::wxYield();
-          ::wxYield();
           while (dialogProjections.isPaused()) {
             ::wxYield();
             ::wxUsleep(50);
           }
         }
       } 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->DeleteAllViews();
+            delete pProj;
             return;
           }
         }
@@ -1834,28 +1855,32 @@ 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";
       
-      m_frame->Lower();
       ::wxYield();
-      ProjectionFileView* projView = dynamic_cast<ProjectionFileView*>(pProjectionDoc->GetFirstView());
+      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->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->UpdateAllViews(this);
+      pProjectionDoc-> Modify(true);
+      pProjectionDoc->UpdateAllViews (this);
     }
   }
 }
@@ -1874,32 +1899,37 @@ 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_iDefaultRasterNX);
-      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);
-        if (! dlgProgress.Update(i+1)) {
-          pRasterDoc->DeleteAllViews();
+      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)) {
+          delete pImageFile;
           return;
         }
       }
-      if (theApp->getSetModifyNewDocs())
-        pRasterDoc->Modify(true);
-      pRasterDoc->UpdateAllViews(this);
+
+      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());
-      ImageFileView* rasterView = dynamic_cast<ImageFileView*>(pRasterDoc->GetFirstView());
+      pImageFile->labelAdd (os.str().c_str(), timer.timerEnd());
+      ImageFileView* rasterView = pRasterDoc->getView();
       if (rasterView) {
         rasterView->getFrame()->SetFocus();
         rasterView->OnUpdate (rasterView, NULL);
@@ -1911,13 +1941,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();
@@ -1925,7 +1955,11 @@ PhantomFileView::CreateCanvas (wxView *view, wxFrame *parent)
   return pCanvas;
 }
 
-wxFrame*
+#if CTSIM_MDI
+wxDocMDIChildFrame*
+#else
+wxDocChildFrame*
+#endif
 PhantomFileView::CreateChildFrame(wxDocument *doc, wxView *view)
 {
 #if CTSIM_MDI
@@ -1935,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");
@@ -1954,8 +1988,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");
@@ -1994,54 +2028,56 @@ PhantomFileView::CreateChildFrame(wxDocument *doc, wxView *view)
 bool 
 PhantomFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 {
-  m_frame = CreateChildFrame(doc, this);
-  SetFrame(m_frame);
+  m_pFrame = CreateChildFrame(doc, this);
+  SetFrame(m_pFrame);
   
   int width, height;
-  m_frame->GetClientSize(&width, &height);
-  m_frame->SetTitle("PhantomFileView");
-  m_canvas = CreateCanvas (this, m_frame);
+  m_pFrame->GetClientSize(&width, &height);
+  m_pFrame->SetTitle("PhantomFileView");
+  m_pCanvas = CreateCanvas (m_pFrame);
   
 #ifdef __X__
   int x, y;  // X requires a forced resize
-  m_frame->GetSize(&x, &y);
-  m_frame->SetSize(-1, -1, x, y);
+  m_pFrame->GetSize(&x, &y);
+  m_pFrame->SetSize(-1, -1, x, y);
 #endif
   
-  m_frame->Show(true);
+  m_pFrame->Show(true);
   Activate(true);
   
   return true;
 }
 
 void 
-PhantomFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
+PhantomFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 {
-  if (m_canvas)
-    m_canvas->Refresh();
+  if (m_pCanvas)
+    m_pCanvas->Refresh();
 }
 
 bool 
 PhantomFileView::OnClose (bool deleteWindow)
 {
+  //GetDocumentManager()->ActivateView (this, false, true);
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
-  if (m_canvas) {
-    m_canvas->Clear();
-    m_canvas->setView(NULL);
-    m_canvas = NULL;
+  Activate(false);
+  if (m_pCanvas) {
+    m_pCanvas->setView(NULL);
+    m_pCanvas = NULL;
   }
   wxString s(wxTheApp->GetAppName());
-  if (m_frame)
-    m_frame->SetTitle(s);
-  SetFrame(NULL);
+  if (m_pFrame)
+    m_pFrame->SetTitle(s);
   
-  Activate(false);
+  SetFrame(NULL);
   
   if (deleteWindow) {
-    delete m_frame;
-    m_frame = NULL;
+    delete m_pFrame;
+    m_pFrame = NULL;
+    if (GetDocument() && GetDocument()->getBadFileOpen())
+      ::wxYield();  // wxWindows bug workaround
   }
   
   return true;
@@ -2051,7 +2087,7 @@ void
 PhantomFileView::OnDraw (wxDC* dc)
 {
   int xsize, ysize;
-  m_canvas->GetClientSize (&xsize, &ysize);
+  m_pCanvas->GetClientSize (&xsize, &ysize);
   SGPDriver driver (dc, xsize, ysize);
   SGP sgp (driver);
   const Phantom& rPhantom = GetDocument()->getPhantom();
@@ -2069,12 +2105,7 @@ ProjectionFileCanvas::ProjectionFileCanvas (ProjectionFileView* v, wxFrame *fram
 
 ProjectionFileCanvas::~ProjectionFileCanvas ()
 {
-  if (m_pView) {
-    wxMenu* pMenu = m_pView->getFileMenu();
-    theApp->getDocManager()->FileHistoryRemoveMenu (pMenu);
-    m_pView->canvasClosed();
-    m_pView = NULL;
-  }
+  m_pView = NULL;
 }
 
 void 
@@ -2109,10 +2140,16 @@ EVT_MENU(PJMENU_CONVERT_FFT_POLAR, ProjectionFileView::OnConvertFFTPolar)
 END_EVENT_TABLE()
 
 ProjectionFileView::ProjectionFileView() 
-: wxView(), m_canvas(NULL), m_frame(NULL), m_pFileMenu(0)
+: 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
@@ -2136,7 +2173,8 @@ ProjectionFileView::ProjectionFileView()
 
 ProjectionFileView::~ProjectionFileView()
 {
-	
+  GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
+  GetDocumentManager()->ActivateView(this, FALSE, TRUE);;
 }
 
 void
@@ -2145,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();
 }
@@ -2177,10 +2215,10 @@ 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->GetFirstView()->OnUpdate (this, NULL);
+    pPolarDoc->Modify (true);
+    pPolarDoc->UpdateAllViews ();
+    pPolarDoc->getView()->OnUpdate (this, NULL);
+    pPolarDoc->getView()->getFrame()->Show(true);
   }
 }
 
@@ -2211,11 +2249,12 @@ 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->GetFirstView()->OnUpdate (this, NULL);
-}}
+    pPolarDoc->Modify (true);
+    pPolarDoc->UpdateAllViews ();
+    pPolarDoc->getView()->OnUpdate (this, NULL);
+    pPolarDoc->getView()->getFrame()->Show(true);
+  }
+}
 
 void
 ProjectionFileView::OnReconstructFourier (wxCommandEvent& event)
@@ -2247,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->DeleteAllViews();
+            delete pReconstructor;
+            delete pImageFile;
             return;
           }
           ::wxYield();
-          ::wxYield();
           while (pDlgReconstruct->isPaused()) {
             ::wxYield();
             ::wxUsleep(50);
@@ -2281,41 +2314,46 @@ 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);
-          if (! dlgProgress.Update(i + 1)) {
-            delete pReconstruct;
-            pReconDoc->DeleteAllViews();
+          pReconstructor->reconstructView (i, 1);
+          if (! dlgProgress.Update (i + 1)) {
+            delete pReconstructor;
+            delete pImageFile;
             return;
           }
         }
       }
-      delete pReconstruct;
-      if (theApp->getSetModifyNewDocs())
-        pReconDoc->Modify(true);
-      pReconDoc->UpdateAllViews(this);
-      ImageFileView* rasterView = dynamic_cast<ImageFileView*>(pReconDoc->GetFirstView());
-      if (rasterView) {
-        rasterView->getFrame()->SetFocus();
+      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);
+        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();
       *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());
     }
   }
 }
 
 
 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);
@@ -2324,7 +2362,11 @@ ProjectionFileView::CreateCanvas (wxView *view, wxFrame *parent)
   return pCanvas;
 }
 
-wxFrame*
+#if CTSIM_MDI
+wxDocMDIChildFrame*
+#else
+wxDocChildFrame*
+#endif
 ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view)
 {
 #ifdef CTSIM_MDI
@@ -2334,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");
@@ -2354,16 +2396,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");
@@ -2402,21 +2445,21 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view)
 bool 
 ProjectionFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 {
-  m_frame = CreateChildFrame(doc, this);
-  SetFrame(m_frame);
+  m_pFrame = CreateChildFrame(doc, this);
+  SetFrame(m_pFrame);
   
   int width, height;
-  m_frame->GetClientSize(&width, &height);
-  m_frame->SetTitle("ProjectionFileView");
-  m_canvas = CreateCanvas(this, m_frame);
+  m_pFrame->GetClientSize (&width, &height);
+  m_pFrame->SetTitle ("ProjectionFileView");
+  m_pCanvas = CreateCanvas (m_pFrame);
   
 #ifdef __X__
   int x, y;  // X requires a forced resize
-  m_frame->GetSize(&x, &y);
-  m_frame->SetSize(-1, -1, x, y);
+  m_pFrame->GetSize(&x, &y);
+  m_pFrame->SetSize(-1, -1, x, y);
 #endif
   
-  m_frame->Show(true);
+  m_pFrame->Show(true);
   Activate(true);
   
   return true;
@@ -2425,11 +2468,11 @@ ProjectionFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 void 
 ProjectionFileView::OnDraw (wxDC* dc)
 {
-  wxSize clientSize = m_frame->GetClientSize();
-  wxSize bestSize = m_canvas->GetBestSize();
+  wxSize clientSize = m_pFrame->GetClientSize();
+  wxSize bestSize = m_pCanvas->GetBestSize();
   
   if (clientSize.x > bestSize.x || clientSize.y > bestSize.y)
-    m_frame->SetClientSize (bestSize);
+    m_pFrame->SetClientSize (bestSize);
   
   if (m_bitmap.Ok())
     dc->DrawBitmap (m_bitmap, 0, 0, false);
@@ -2437,7 +2480,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();
@@ -2477,36 +2520,39 @@ ProjectionFileView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint)
     int ySize = nView;
     xSize = clamp (xSize, 0, 800);
     ySize = clamp (ySize, 0, 800);
-    m_frame->SetClientSize (xSize, ySize);
-    m_canvas->SetScrollbars (20, 20, nDet/20, nView/20);
+    m_pFrame->SetClientSize (xSize, ySize);
+    m_pCanvas->SetScrollbars (20, 20, nDet/20, nView/20);
   }
   
-  if (m_canvas)
-    m_canvas->Refresh();
+  if (m_pCanvas)
+    m_pCanvas->Refresh();
 }
 
 bool 
 ProjectionFileView::OnClose (bool deleteWindow)
 {
+  //GetDocumentManager()->ActivateView (this, false, true);
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
-  if (m_canvas) {
-    //m_canvas->Clear();
-    m_canvas->setView(NULL);
-    m_canvas = NULL;
+  Activate(false);
+  if (m_pCanvas) {
+   	m_pCanvas->setView(NULL);
+    m_pCanvas = NULL;
   }
-//  wxString s(wxTheApp->GetAppName());
-//  if (m_frame)
-//    m_frame->SetTitle(s);
-  SetFrame(NULL);
+  wxString s(wxTheApp->GetAppName());
+  if (m_pFrame)
+    m_pFrame->SetTitle(s);
   
-  Activate(false);
+  SetFrame(NULL);
   
   if (deleteWindow) {
-    delete m_frame;
-    return true;
+    delete m_pFrame;
+    m_pFrame = NULL;
+    if (GetDocument() && GetDocument()->getBadFileOpen())
+      ::wxYield();  // wxWindows bug workaround
   }
+
   return true;
 }
 
@@ -2521,12 +2567,7 @@ PlotFileCanvas::PlotFileCanvas (PlotFileView* v, wxFrame *frame, const wxPoint&
 
 PlotFileCanvas::~PlotFileCanvas ()
 {
-  if (m_pView) {
-    wxMenu* pMenu = m_pView->getFileMenu();
-    theApp->getDocManager()->FileHistoryRemoveMenu (pMenu);
-    m_pView->canvasClosed();
-    m_pView = NULL;
-  }
+  m_pView = NULL;
 }
 
 void 
@@ -2549,18 +2590,16 @@ EVT_MENU(PLOTMENU_VIEW_SCALE_FULL, PlotFileView::OnScaleFull)
 END_EVENT_TABLE()
 
 PlotFileView::PlotFileView() 
-: wxView(), m_canvas(NULL), m_frame(NULL), m_pEZPlot(NULL), m_pFileMenu(0)
+: wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pEZPlot(NULL), m_pFileMenu(0), m_bMinSpecified(false), m_bMaxSpecified(false)
 {
-  m_bMinSpecified = false;
-  m_bMaxSpecified = false;
 }
 
 PlotFileView::~PlotFileView()
 {
   if (m_pEZPlot)
     delete m_pEZPlot;
-
   
+  GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);  
 }
 
 void
@@ -2570,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();
 }
@@ -2639,13 +2678,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();
@@ -2653,7 +2692,11 @@ PlotFileView::CreateCanvas (wxView *view, wxFrame *parent)
   return pCanvas;
 }
 
-wxFrame*
+#if CTSIM_MDI
+wxDocMDIChildFrame*
+#else
+wxDocChildFrame*
+#endif
 PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view)
 {
 #ifdef CTSIM_MDI
@@ -2663,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");
@@ -2683,8 +2726,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");
@@ -2726,25 +2769,25 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view)
 bool 
 PlotFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) )
 {
-  m_frame = CreateChildFrame(doc, this);
-  SetFrame(m_frame);
+  m_pFrame = CreateChildFrame(doc, this);
+  SetFrame(m_pFrame);
   
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
   m_dAutoScaleFactor = 1.;
   
   int width, height;
-  m_frame->GetClientSize(&width, &height);
-  m_frame->SetTitle ("Plot File");
-  m_canvas = CreateCanvas (this, m_frame);
+  m_pFrame->GetClientSize(&width, &height);
+  m_pFrame->SetTitle ("Plot File");
+  m_pCanvas = CreateCanvas (m_pFrame);
   
 #ifdef __X__
   int x, y;  // X requires a forced resize
-  m_frame->GetSize(&x, &y);
-  m_frame->SetSize(-1, -1, x, y);
+  m_pFrame->GetSize(&x, &y);
+  m_pFrame->SetSize(-1, -1, x, y);
 #endif
   
-  m_frame->Show(true);
+  m_pFrame->Show(true);
   Activate(true);
   
   return true;
@@ -2759,7 +2802,7 @@ PlotFileView::OnDraw (wxDC* dc)
   
   if (iNColumns > 0 && iNRecords > 0) {
     int xsize, ysize;
-    m_canvas->GetClientSize (&xsize, &ysize);
+    m_pCanvas->GetClientSize (&xsize, &ysize);
     SGPDriver driver (dc, xsize, ysize);
     SGP sgp (driver);
     if (m_pEZPlot)
@@ -2811,32 +2854,34 @@ PlotFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
     delete pdY;
   }
   
-  if (m_canvas)
-    m_canvas->Refresh();
+  if (m_pCanvas)
+    m_pCanvas->Refresh();
 }
 
 bool 
 PlotFileView::OnClose (bool deleteWindow)
 {
+  //GetDocumentManager()->ActivateView (this, false, true);
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
-  if (m_canvas) {
-    //m_canvas->Clear();
-    m_canvas->setView (NULL);
-    m_canvas = NULL;
-  }
-//  wxString s(wxTheApp->GetAppName());
-//  if (m_frame)
-//    m_frame->SetTitle(s);
-  SetFrame(NULL);
-  
   Activate(false);
+  if (m_pCanvas) {
+    m_pCanvas->setView (NULL);
+    m_pCanvas = NULL;
+  }
+  wxString s(wxTheApp->GetAppName());
+  if (m_pFrame)
+    m_pFrame->SetTitle(s);
   
+  SetFrame(NULL);
   if (deleteWindow) {
-    delete m_frame;
-    return true;
-  }
+    delete m_pFrame;
+    m_pFrame = NULL;
+    if (GetDocument() && GetDocument()->getBadFileOpen())
+      ::wxYield();  // wxWindows bug workaround
+ }
+
   return true;
 }
 
@@ -2848,7 +2893,8 @@ IMPLEMENT_DYNAMIC_CLASS(TextFileView, wxView)
 
 TextFileView::~TextFileView() 
 {
-	
+  GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
+  GetDocumentManager()->ActivateView(this, FALSE, TRUE);;
 }
 
 bool TextFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
@@ -2880,41 +2926,47 @@ 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 (! GetDocument() || ! GetDocument()->Close())
+  if (! theApp->getMainFrame()->getShuttingDown())
     return false;
   
   Activate(false);
+  //GetDocumentManager()->ActivateView (this, false, true);
+  if (! GetDocument() || ! GetDocument()->Close())
+    return false;
   
-  if (deleteWindow)
-  {
+  SetFrame(NULL);
+  if (deleteWindow) {
     delete m_pFrame;
-	m_pFrame = NULL;
-   
+    m_pFrame = NULL;
+    if (GetDocument() && GetDocument()->getBadFileOpen())
+      ::wxYield();  // wxWindows bug workaround
   }
+
   return TRUE;
 }
 
-wxFrame*
+#if CTSIM_MDI
+wxDocMDIChildFrame*
+#else
+wxDocChildFrame*
+#endif
 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");
@@ -2931,8 +2983,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");
@@ -2962,16 +3014,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 ()
 {
-  if (m_pView) {
-    wxMenu* pMenu = m_pView->getFileMenu();
-    theApp->getDocManager()->FileHistoryRemoveMenu (pMenu);
-    m_pView->canvasClosed();
-    m_pView = NULL;
-  }
+  m_pView = NULL;
 }