X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=557bc2f2ef79b548bc2ed47f8b7256d8091f4e88;hp=167c76e011ee0e04a6cb72d8cddb28b901bf493c;hb=3f6c94c6bd432ad7b7a55ad991d3b8223fb44f18;hpb=a5d437cb4228b07f8c005eaca497c317b8c19d14

diff --git a/src/views.cpp b/src/views.cpp
index 167c76e..557bc2f 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.69 2001/01/20 17:43:41 kevin Exp $
+**  $Id: views.cpp,v 1.108 2001/02/20 04:48:45 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,23 +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 = NULL;
 }
 
 void 
@@ -162,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";
   }
@@ -172,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
 {
@@ -210,6 +226,9 @@ EVT_MENU(IFMENU_IMAGE_SUBTRACT, ImageFileView::OnSubtract)
 EVT_MENU(IFMENU_IMAGE_MULTIPLY, ImageFileView::OnMultiply)
 EVT_MENU(IFMENU_IMAGE_DIVIDE, ImageFileView::OnDivide)
 EVT_MENU(IFMENU_IMAGE_SCALESIZE, ImageFileView::OnScaleSize)
+#if wxUSE_GLCANVAS
+EVT_MENU(IFMENU_IMAGE_CONVERT3D, ImageFileView::OnConvert3d)
+#endif
 #ifdef HAVE_FFT
 EVT_MENU(IFMENU_FILTER_FFT, ImageFileView::OnFFT)
 EVT_MENU(IFMENU_FILTER_IFFT, ImageFileView::OnIFFT)
@@ -229,16 +248,19 @@ EVT_MENU(IFMENU_PLOT_FFT_COL, ImageFileView::OnPlotFFTCol)
 EVT_MENU(IFMENU_PLOT_HISTOGRAM, ImageFileView::OnPlotHistogram)
 END_EVENT_TABLE()
 
-ImageFileView::ImageFileView(void) 
-: wxView(), m_canvas(NULL), m_frame(NULL), m_bMinSpecified(false), m_bMaxSpecified(false), m_pFileMenu(0)
+ImageFileView::ImageFileView() 
+: wxView(), m_pFrame(NULL), m_pCanvas(NULL), m_pFileMenu(0), m_bMinSpecified(false), m_bMaxSpecified(false)
 {
   m_iDefaultExportFormatID = ImageFile::FORMAT_PNG;
 }
 
-ImageFileView::~ImageFileView(void)
+ImageFileView::~ImageFileView()
 {
+  GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
+  GetDocumentManager()->ActivateView(this, FALSE, TRUE);
 }
 
+
 void
 ImageFileView::OnProperties (wxCommandEvent& event)
 {
@@ -246,7 +268,7 @@ ImageFileView::OnProperties (wxCommandEvent& event)
   if (rIF.nx() == 0 || rIF.ny() == 0)
     *theApp->getLog() << "Properties: empty imagefile\n";
   else {
-    const std::string& rFilename = rIF.getFilename();
+    const std::string rFilename = m_pFrame->GetTitle().c_str();
     std::ostringstream os;
     double min, max, mean, mode, median, stddev;
     rIF.statistics (rIF.getArray(), min, max, mean, mode, median, stddev);
@@ -257,16 +279,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();
   }
@@ -348,38 +369,40 @@ 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()) {
-        ImageFileDocument* pDifferenceDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
-        if (! pDifferenceDoc) {
-          sys_error (ERR_SEVERE, "Unable to create image file");
+        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;
         }
-        ImageFile& differenceImage = pDifferenceDoc->getImageFile();
-        
-        differenceImage.setArraySize (rIF.nx(), rIF.ny());
-        if (! rIF.subtractImages (rCompareIF, differenceImage)) {
-          pDifferenceDoc->DeleteAllViews();
+        ImageFileDocument* pDifferenceDoc = theApp->newImageDoc();
+        if (! pDifferenceDoc) {
+          sys_error (ERR_SEVERE, "Unable to create image file");
           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());
+        if (theApp->getAskDeleteNewDocs())
+          pDifferenceDoc->Modify (true);
+        pDifferenceDoc->UpdateAllViews (this);
+        pDifferenceDoc->getView()->OnUpdate (this, NULL);
+        pDifferenceDoc->getView()->getFrame()->Show(true);
       }
       wxMessageBox(os.str().c_str(), "Image Comparison");
     }
@@ -392,9 +415,9 @@ 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);
+  if (theApp->getAskDeleteNewDocs())
+          GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -403,9 +426,9 @@ 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);
+  if (theApp->getAskDeleteNewDocs())
+     GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -414,9 +437,9 @@ 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);
+  if (theApp->getAskDeleteNewDocs())
+     GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -425,9 +448,9 @@ 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);
+  if (theApp->getAskDeleteNewDocs())
+     GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -436,9 +459,9 @@ 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);
+  if (theApp->getAskDeleteNewDocs())
+     GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -456,7 +479,7 @@ ImageFileView::OnAdd (wxCommandEvent& event)
       ImageFile& rIF = GetDocument()->getImageFile();
       ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument();
       const ImageFile& rRHSIF = pRHSDoc->getImageFile();
-      ImageFileDocument* pNewDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+      ImageFileDocument* pNewDoc = theApp->newImageDoc();
       if (! pNewDoc) {
         sys_error (ERR_SEVERE, "Unable to create image file");
         return;
@@ -473,10 +496,11 @@ 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);
+      if (theApp->getAskDeleteNewDocs())
+        pNewDoc->Modify (true);
+      pNewDoc->UpdateAllViews (this);
+      pNewDoc->getView()->OnUpdate (this, NULL);
+      pNewDoc->getView()->getFrame()->Show(true);
     }
   }
 }
@@ -496,7 +520,7 @@ ImageFileView::OnSubtract (wxCommandEvent& event)
       ImageFile& rIF = GetDocument()->getImageFile();
       ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument();
       const ImageFile& rRHSIF = pRHSDoc->getImageFile();
-      ImageFileDocument* pNewDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+      ImageFileDocument* pNewDoc = theApp->newImageDoc();
       if (! pNewDoc) {
         sys_error (ERR_SEVERE, "Unable to create image file");
         return;
@@ -513,10 +537,11 @@ 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);
+      if (theApp->getAskDeleteNewDocs())
+        pNewDoc->Modify (true);
+      pNewDoc->UpdateAllViews (this);
+      pNewDoc->getView()->OnUpdate (this, NULL);
+      pNewDoc->getView()->getFrame()->Show(true);
     }
   }
 }
@@ -536,7 +561,7 @@ ImageFileView::OnMultiply (wxCommandEvent& event)
       ImageFile& rIF = GetDocument()->getImageFile();
       ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument();
       const ImageFile& rRHSIF = pRHSDoc->getImageFile();
-      ImageFileDocument* pNewDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+      ImageFileDocument* pNewDoc = theApp->newImageDoc();
       if (! pNewDoc) {
         sys_error (ERR_SEVERE, "Unable to create image file");
         return;
@@ -553,10 +578,11 @@ 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);
+      if (theApp->getAskDeleteNewDocs())
+        pNewDoc->Modify (true);
+      pNewDoc->UpdateAllViews (this);
+      pNewDoc->getView()->OnUpdate (this, NULL);
+      pNewDoc->getView()->getFrame()->Show(true);
     }
   }
 }
@@ -576,7 +602,7 @@ ImageFileView::OnDivide (wxCommandEvent& event)
       ImageFile& rIF = GetDocument()->getImageFile();
       ImageFileDocument* pRHSDoc = dialogGetCompare.getImageFileDocument();
       const ImageFile& rRHSIF = pRHSDoc->getImageFile();
-      ImageFileDocument* pNewDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+      ImageFileDocument* pNewDoc = theApp->newImageDoc();
       if (! pNewDoc) {
         sys_error (ERR_SEVERE, "Unable to create image file");
         return;
@@ -593,10 +619,11 @@ 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);
+      if (theApp->getAskDeleteNewDocs())
+        pNewDoc->Modify (true);
+      pNewDoc->UpdateAllViews (this);
+      pNewDoc->getView()->OnUpdate (this, NULL);
+      pNewDoc->getView()->getFrame()->Show(true);
     }
   }
 }
@@ -611,9 +638,9 @@ ImageFileView::OnFFT (wxCommandEvent& event)
   rIF.labelAdd ("FFT Image");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  if (theApp->getAskDeleteNewDocs())
+     GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -624,9 +651,9 @@ ImageFileView::OnIFFT (wxCommandEvent& event)
   rIF.labelAdd ("IFFT Image");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  if (theApp->getAskDeleteNewDocs())
+     GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -637,9 +664,9 @@ ImageFileView::OnFFTRows (wxCommandEvent& event)
   rIF.labelAdd ("FFT Rows");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  if (theApp->getAskDeleteNewDocs())
+     GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -650,9 +677,9 @@ ImageFileView::OnIFFTRows (wxCommandEvent& event)
   rIF.labelAdd ("IFFT Rows");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  if (theApp->getAskDeleteNewDocs())
+     GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -663,9 +690,9 @@ ImageFileView::OnFFTCols (wxCommandEvent& event)
   rIF.labelAdd ("FFT Columns");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  if (theApp->getAskDeleteNewDocs())
+     GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -676,9 +703,9 @@ ImageFileView::OnIFFTCols (wxCommandEvent& event)
   rIF.labelAdd ("IFFT Columns");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  if (theApp->getAskDeleteNewDocs())
+     GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 #endif
 
@@ -691,9 +718,9 @@ ImageFileView::OnFourier (wxCommandEvent& event)
   rIF.labelAdd ("Fourier Image");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  if (theApp->getAskDeleteNewDocs())
+     GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -705,9 +732,9 @@ ImageFileView::OnInverseFourier (wxCommandEvent& event)
   rIF.labelAdd ("Inverse Fourier Image");
   m_bMinSpecified = false;
   m_bMaxSpecified = false;
-  if (theApp->getSetModifyNewDocs())
-    GetDocument()->Modify(TRUE);
-  GetDocument()->UpdateAllViews(this);
+  if (theApp->getAskDeleteNewDocs())
+     GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -718,9 +745,9 @@ 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);
+  if (theApp->getAskDeleteNewDocs())
+     GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -731,9 +758,9 @@ 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);
+  if (theApp->getAskDeleteNewDocs())
+     GetDocument()->Modify (true);
+  GetDocument()->UpdateAllViews (this);
 }
 
 void
@@ -745,9 +772,9 @@ 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);
+    if (theApp->getAskDeleteNewDocs())
+       GetDocument()->Modify (true);
+    GetDocument()->UpdateAllViews (this);
   }
 }
 
@@ -760,21 +787,21 @@ 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);
+    if (theApp->getAskDeleteNewDocs())
+       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);
@@ -783,7 +810,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
@@ -793,7 +824,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");
@@ -801,6 +832,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");
@@ -809,13 +841,14 @@ 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_PREFERENCES, "Prefere&nces...");
   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");
@@ -830,14 +863,14 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   filter_menu->Append (IFMENU_FILTER_EXP, "&Exp");
   filter_menu->AppendSeparator();
 #ifdef HAVE_FFT
-  filter_menu->Append (IFMENU_FILTER_FFT, "2D &FFT");
-  filter_menu->Append (IFMENU_FILTER_IFFT, "2D &IFFT");
+  filter_menu->Append (IFMENU_FILTER_FFT, "2-D &FFT");
+  filter_menu->Append (IFMENU_FILTER_IFFT, "2-D &IFFT");
   filter_menu->Append (IFMENU_FILTER_FFT_ROWS, "FFT Rows");
   filter_menu->Append (IFMENU_FILTER_IFFT_ROWS, "IFFT Rows");
   filter_menu->Append (IFMENU_FILTER_FFT_COLS, "FFT Columns");
   filter_menu->Append (IFMENU_FILTER_IFFT_COLS, "IFFT Columns");
-  filter_menu->Append (IFMENU_FILTER_FOURIER, "F&ourier");
-  filter_menu->Append (IFMENU_FILTER_INVERSE_FOURIER, "Inverse Fo&urier");
+  filter_menu->Append (IFMENU_FILTER_FOURIER, "2-D F&ourier");
+  filter_menu->Append (IFMENU_FILTER_INVERSE_FOURIER, "2-D Inverse Fo&urier");
 #else
   filter_menu->Append (IFMENU_FILTER_FOURIER, "&Fourier");
   filter_menu->Append (IFMENU_FILTER_INVERSE_FOURIER, "&Inverse Fourier");
@@ -854,22 +887,31 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   image_menu->Append (IFMENU_IMAGE_DIVIDE, "&Divide...");
   image_menu->AppendSeparator();
   image_menu->Append (IFMENU_IMAGE_SCALESIZE, "S&cale Size...");
+#if wxUSE_GLCANVAS
+  image_menu->Append (IFMENU_IMAGE_CONVERT3D, "Convert &3-D\tCtrl-3");
+#endif
   
-  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");
-  help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H");
+  help_menu->Append (IDH_QUICKSTART, "&Quick Start");
   help_menu->Append(MAINMENU_HELP_ABOUT, "&About");
   
   wxMenuBar *menu_bar = new wxMenuBar;
@@ -878,25 +920,24 @@ 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);
   
   subframe->Centre(wxBOTH);
   
-  wxAcceleratorEntry accelEntries[10];
-  accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
-  accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('S'), wxID_SAVE);
-  accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('W'), wxID_CLOSE);
-  accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('H'), MAINMENU_HELP_TOPICS);
-  accelEntries[4].Set (wxACCEL_CTRL, static_cast<int>('P'), MAINMENU_FILE_CREATE_PHANTOM);
-  accelEntries[5].Set (wxACCEL_CTRL, static_cast<int>('F'), MAINMENU_FILE_CREATE_FILTER);
-  accelEntries[6].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
-  accelEntries[7].Set (wxACCEL_CTRL, static_cast<int>('A'), IFMENU_VIEW_SCALE_AUTO);
-  accelEntries[8].Set (wxACCEL_CTRL, static_cast<int>('U'), IFMENU_VIEW_SCALE_FULL);
-  accelEntries[9].Set (wxACCEL_CTRL, static_cast<int>('E'), IFMENU_VIEW_SCALE_MINMAX);
-  wxAcceleratorTable accelTable (10, accelEntries);
+  wxAcceleratorEntry accelEntries[4];
+  accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('A'), IFMENU_VIEW_SCALE_AUTO);
+  accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('U'), IFMENU_VIEW_SCALE_FULL);
+  accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('E'), IFMENU_VIEW_SCALE_MINMAX);
+#if wxUSE_GLCANVAS
+  accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('3'), IFMENU_IMAGE_CONVERT3D);
+  wxAcceleratorTable accelTable (4, accelEntries);
+#else
+  wxAcceleratorTable accelTable (3, accelEntries);
+#endif
+
   subframe->SetAcceleratorTable (accelTable);
   
   return subframe;
@@ -906,23 +947,22 @@ 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_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;
@@ -931,24 +971,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();
@@ -979,42 +1019,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)
 {
-  if (!GetDocument()->Close())
+  //GetDocumentManager()->ActivateView (this, false, true);
+  if (! GetDocument() || ! GetDocument()->Close())
     return false;
-  
-//  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;
+    delete m_pFrame;
+    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();
@@ -1069,7 +1114,7 @@ ImageFileView::OnScaleSize (wxCommandEvent& event)
     unsigned int iNewNY = dialogGetXYSize.getYSize();
     std::ostringstream os;
     os << "Scale Size from (" << iOldNX << "," << iOldNY << ") to (" << iNewNX << "," << iNewNY << ")";
-    ImageFileDocument* pScaledDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+    ImageFileDocument* pScaledDoc = theApp->newImageDoc();
     if (! pScaledDoc) {
       sys_error (ERR_SEVERE, "Unable to create image file");
       return;
@@ -1080,23 +1125,42 @@ 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);
+    if (theApp->getAskDeleteNewDocs())
+       pScaledDoc->Modify (true);
     pScaledDoc->UpdateAllViews (this);
-    pScaledDoc->GetFirstView()->OnUpdate (this, NULL);
+    pScaledDoc->getView()->OnUpdate (this, NULL);
+    pScaledDoc->getView()->getFrame()->Show(true);
   }
 }
 
+#if wxUSE_GLCANVAS
+void
+ImageFileView::OnConvert3d (wxCommandEvent& event)
+{
+  ImageFile& rIF = GetDocument()->getImageFile();
+  Graph3dFileDocument* pGraph3d = theApp->newGraph3dDoc();
+  pGraph3d->setBadFileOpen();
+  pGraph3d->createFromImageFile (rIF);
+  pGraph3d->getView()->OnUpdate (this, NULL);
+  pGraph3d->UpdateAllViews();
+  pGraph3d->getView()->getFrame()->SetClientSize (400, 400);
+  pGraph3d->getView()->getFrame()->Show (true);
+  GetDocumentManager()->ActivateView (pGraph3d->getView(), true, false);
+  ::wxYield();
+  pGraph3d->getView()->getCanvas()->SetFocus();
+}
+#endif
+
 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();
@@ -1119,7 +1183,7 @@ ImageFileView::OnPlotRow (wxCommandEvent& event)
         pYMag[i] = ::sqrt (v[i][yCursor] * v[i][yCursor] + vImag[i][yCursor] * vImag[i][yCursor]);
       }
     }
-    PlotFileDocument* pPlotDoc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT));
+    PlotFileDocument* pPlotDoc = theApp->newPlotDoc();
     if (! pPlotDoc) {
       sys_error (ERR_SEVERE, "Internal error: unable to create Plot file");
     } else {
@@ -1165,9 +1229,11 @@ ImageFileView::OnPlotRow (wxCommandEvent& event)
       delete pYImag;
       delete pYMag;
     }
-    if (theApp->getSetModifyNewDocs())
-      pPlotDoc->Modify(true);
-    pPlotDoc->UpdateAllViews();
+    if (theApp->getAskDeleteNewDocs())
+       pPlotDoc->Modify (true);
+    pPlotDoc->UpdateAllViews ();
+    pPlotDoc->getView()->OnUpdate (this, NULL);
+    pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 
@@ -1175,12 +1241,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();
@@ -1203,7 +1269,7 @@ ImageFileView::OnPlotCol (wxCommandEvent& event)
         pYMag[i] = ::sqrt (v[xCursor][i] * v[xCursor][i] + vImag[xCursor][i] * vImag[xCursor][i]);
       }
     }
-    PlotFileDocument* pPlotDoc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT));
+    PlotFileDocument* pPlotDoc = theApp->newPlotDoc();
     if (! pPlotDoc) {
       sys_error (ERR_SEVERE, "Internal error: unable to create Plot file");
     } else {
@@ -1249,9 +1315,11 @@ ImageFileView::OnPlotCol (wxCommandEvent& event)
       delete pYImag;
       delete pYMag;
     }
-    if (theApp->getSetModifyNewDocs())
-      pPlotDoc->Modify(true);
-    pPlotDoc->UpdateAllViews();
+    if (theApp->getAskDeleteNewDocs())
+       pPlotDoc->Modify (true);
+    pPlotDoc->UpdateAllViews ();
+    pPlotDoc->getView()->OnUpdate (this, NULL);
+    pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 
@@ -1260,12 +1328,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();
@@ -1301,7 +1369,7 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event)
     Fourier::shuffleFourierToNaturalOrder (pYImag, nx);
     Fourier::shuffleFourierToNaturalOrder (pYMag, nx);
     
-    PlotFileDocument* pPlotDoc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT));
+    PlotFileDocument* pPlotDoc = theApp->newPlotDoc();
     if (! pPlotDoc) {
       sys_error (ERR_SEVERE, "Internal error: unable to create Plot file");
     } else {
@@ -1342,9 +1410,11 @@ ImageFileView::OnPlotFFTRow (wxCommandEvent& event)
     delete pYMag;
     delete [] pcIn;
     
-    if (theApp->getSetModifyNewDocs())
-      pPlotDoc->Modify(true);
-    pPlotDoc->UpdateAllViews();
+    if (theApp->getAskDeleteNewDocs())
+       pPlotDoc->Modify (true);
+    pPlotDoc->UpdateAllViews ();
+    pPlotDoc->getView()->OnUpdate (this, NULL);
+    pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 
@@ -1352,12 +1422,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();
@@ -1399,7 +1469,7 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event)
       pYMag[i] = ::sqrt (pcIn[i].re * pcIn[i].re + pcIn[i].im * pcIn[i].im);
     }
     
-    PlotFileDocument* pPlotDoc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT));
+    PlotFileDocument* pPlotDoc = theApp->newPlotDoc();
     if (! pPlotDoc) {
       sys_error (ERR_SEVERE, "Internal error: unable to create Plot file");
     } else {
@@ -1441,9 +1511,11 @@ ImageFileView::OnPlotFFTCol (wxCommandEvent& event)
     delete pdTemp;
     delete [] pcIn;
     
-    if (theApp->getSetModifyNewDocs())
-      pPlotDoc->Modify(true);
-    pPlotDoc->UpdateAllViews();
+    if (theApp->getAskDeleteNewDocs())
+       pPlotDoc->Modify (true);
+    pPlotDoc->UpdateAllViews ();
+    pPlotDoc->getView()->OnUpdate (this, NULL);
+    pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 #endif
@@ -1452,7 +1524,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;
   }
@@ -1484,7 +1556,7 @@ ImageFileView::OnCompareCol (wxCommandEvent& event)
         pY1[i] = v1[xCursor][i];
         pY2[i] = v2[xCursor][i];
       }
-      PlotFileDocument* pPlotDoc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT));
+      PlotFileDocument* pPlotDoc = theApp->newPlotDoc();
       if (! pPlotDoc) {
         sys_error (ERR_SEVERE, "Internal error: unable to create Plot file");
       } else {
@@ -1530,9 +1602,11 @@ ImageFileView::OnCompareCol (wxCommandEvent& event)
       delete pX;
       delete pY1;
       delete pY2;
-      if (theApp->getSetModifyNewDocs())
-        pPlotDoc->Modify(true);
-      pPlotDoc->UpdateAllViews();
+      if (theApp->getAskDeleteNewDocs())
+        pPlotDoc->Modify (true);
+      pPlotDoc->UpdateAllViews ();
+      pPlotDoc->getView()->OnUpdate (this, NULL);
+      pPlotDoc->getView()->getFrame()->Show(true);
     }
   }
 }
@@ -1541,7 +1615,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;
   }
@@ -1575,7 +1649,7 @@ ImageFileView::OnCompareRow (wxCommandEvent& event)
         pY1[i] = v1[i][yCursor];
         pY2[i] = v2[i][yCursor];
       }
-      PlotFileDocument* pPlotDoc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT));
+      PlotFileDocument* pPlotDoc = theApp->newPlotDoc();
       if (! pPlotDoc) {
         sys_error (ERR_SEVERE, "Internal error: unable to create Plot file");
       } else {
@@ -1620,9 +1694,11 @@ ImageFileView::OnCompareRow (wxCommandEvent& event)
       delete pX;
       delete pY1;
       delete pY2;
-      if (theApp->getSetModifyNewDocs())
-        pPlotDoc->Modify(true);
-      pPlotDoc->UpdateAllViews();
+      if (theApp->getAskDeleteNewDocs())
+        pPlotDoc->Modify (true);
+      pPlotDoc->UpdateAllViews ();
+      pPlotDoc->getView()->OnUpdate (this, NULL);
+      pPlotDoc->getView()->getFrame()->Show(true);
     }
   }
 }
@@ -1632,13 +1708,13 @@ 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();
   
   if (v != NULL && nx > 0 && ny > 0) {
-    PlotFileDocument* pPlotDoc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.plt", wxDOC_SILENT));
+    PlotFileDocument* pPlotDoc = theApp->newPlotDoc();
     if (! pPlotDoc) {
       sys_error (ERR_SEVERE, "Internal error: unable to create Plot file");
       return;
@@ -1685,16 +1761,18 @@ ImageFileView::OnPlotHistogram (wxCommandEvent& event)
       rPlotFile.addDescription (os.str().c_str());
       delete pX;
       delete pY;
-      if (theApp->getSetModifyNewDocs())
-        pPlotDoc->Modify(true);
-      pPlotDoc->UpdateAllViews();
+      if (theApp->getAskDeleteNewDocs())
+        pPlotDoc->Modify (true);
+      pPlotDoc->UpdateAllViews ();
+      pPlotDoc->getView()->OnUpdate (this, NULL);
+      pPlotDoc->getView()->getFrame()->Show(true);
   }
 }
 
 
 // PhantomCanvas
 
-PhantomCanvas::PhantomCanvas (PhantomView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style)
+PhantomCanvas::PhantomCanvas (PhantomFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style)
 : wxScrolledWindow(frame, -1, pos, size, style)
 {
   m_pView = v;
@@ -1702,10 +1780,7 @@ PhantomCanvas::PhantomCanvas (PhantomView* v, wxFrame *frame, const wxPoint& pos
 
 PhantomCanvas::~PhantomCanvas ()
 {
-  if (m_pView) {
-    wxMenu* pMenu = m_pView->getFileMenu();
-    theApp->getDocManager()->FileHistoryRemoveMenu (pMenu);
-  }
+  m_pView = NULL;
 }
 
 void 
@@ -1715,40 +1790,69 @@ PhantomCanvas::OnDraw (wxDC& dc)
     m_pView->OnDraw(& dc);
 }
 
+wxSize
+PhantomCanvas::GetBestSize() const
+{
+  if (! m_pView)
+    return wxSize(0,0);
+
+  int xSize, ySize;
+  theApp->getMainFrame()->GetClientSize (&xSize, &ySize);
+  xSize = maxValue<int> (xSize, ySize);
+  ySize = xSize = (xSize / 3);
+  return wxSize (xSize, ySize);
+}
 
-// PhantomView
 
-IMPLEMENT_DYNAMIC_CLASS(PhantomView, wxView)
 
-BEGIN_EVENT_TABLE(PhantomView, wxView)
-EVT_MENU(PHMMENU_FILE_PROPERTIES, PhantomView::OnProperties)
-EVT_MENU(PHMMENU_PROCESS_RASTERIZE, PhantomView::OnRasterize)
-EVT_MENU(PHMMENU_PROCESS_PROJECTIONS, PhantomView::OnProjections)
+// PhantomFileView
+
+IMPLEMENT_DYNAMIC_CLASS(PhantomFileView, wxView)
+
+BEGIN_EVENT_TABLE(PhantomFileView, wxView)
+EVT_MENU(PHMMENU_FILE_PROPERTIES, PhantomFileView::OnProperties)
+EVT_MENU(PHMMENU_PROCESS_RASTERIZE, PhantomFileView::OnRasterize)
+EVT_MENU(PHMMENU_PROCESS_PROJECTIONS, PhantomFileView::OnProjections)
 END_EVENT_TABLE()
 
-PhantomView::PhantomView(void) 
-: wxView(), m_canvas(NULL), m_frame(NULL), m_pFileMenu(0)
+PhantomFileView::PhantomFileView() 
+: 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_dDefaultViewRatio = 1;
+  m_dDefaultScanRatio = 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
+  m_dDefaultRasterViewRatio = 1;
 }
 
-PhantomView::~PhantomView()
+PhantomFileView::~PhantomFileView()
 {
+  GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
+  GetDocumentManager()->ActivateView(this, FALSE, TRUE);
 }
 
 void
-PhantomView::OnProperties (wxCommandEvent& event)
+PhantomFileView::OnProperties (wxCommandEvent& event)
 {
   const int idPhantom = GetDocument()->getPhantomID();
   const wxString& namePhantom = GetDocument()->getPhantomName();
@@ -1759,15 +1863,18 @@ PhantomView::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");
 }
 
 
 void
-PhantomView::OnProjections (wxCommandEvent& event)
+PhantomFileView::OnProjections (wxCommandEvent& event)
 {
-  DialogGetProjectionParameters dialogProjection (getFrameForChild(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView, m_iDefaultGeometry, m_iDefaultTrace);
+  DialogGetProjectionParameters dialogProjection (getFrameForChild(), 
+    m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, 
+    m_dDefaultFocalLength, m_dDefaultViewRatio, m_dDefaultScanRatio, m_iDefaultGeometry, 
+    m_iDefaultTrace);
   int retVal = dialogProjection.ShowModal();
   if (retVal == wxID_OK) {
     m_iDefaultNDet = dialogProjection.getNDet();
@@ -1776,122 +1883,142 @@ PhantomView::OnProjections (wxCommandEvent& event)
     m_iDefaultTrace = dialogProjection.getTrace();
     m_dDefaultRotation = dialogProjection.getRotAngle();
     m_dDefaultFocalLength = dialogProjection.getFocalLengthRatio();
-    m_dDefaultFieldOfView = dialogProjection.getFieldOfViewRatio();
+    m_dDefaultViewRatio = dialogProjection.getViewRatio();
+    m_dDefaultScanRatio = dialogProjection.getScanRatio();
     wxString sGeometry = dialogProjection.getGeometry();
     m_iDefaultGeometry = Scanner::convertGeometryNameToID (sGeometry.c_str());
     
     if (m_iDefaultNDet > 0 && m_iDefaultNView > 0 && sGeometry != "") {
       const Phantom& rPhantom = GetDocument()->getPhantom();
-      ProjectionFileDocument* pProjectionDoc = dynamic_cast<ProjectionFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.pj", wxDOC_SILENT));
-      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_dDefaultViewRatio, m_dDefaultScanRatio);
       if (theScanner.fail()) {
-        *theApp->getLog() << "Failed making scanner: " << theScanner.failMessage().c_str() << "\n";
+        wxString msg = "Failed making scanner\n";
+        msg += theScanner.failMessage().c_str();
+        *theApp->getLog() << msg << "\n";
+        wxMessageBox (msg, "Error");
         return;
       }
-      rProj.initFromScanner (theScanner);
-      m_dDefaultRotation /= PI;  // convert back to PI units
+      pProj->initFromScanner (theScanner);
+      m_dDefaultRotation /= TWOPI;  // convert back to fraction of a circle
       
       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;
           }
         }
       }
       
       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());
+      os << "Projections for " << rPhantom.name() << ": nDet=" << m_iDefaultNDet 
+        << ", nView=" << m_iDefaultNView << ", nSamples=" << m_iDefaultNSample 
+        << ", RotAngle=" << m_dDefaultRotation << ", FocalLengthRatio=" << m_dDefaultFocalLength 
+        << ", ViewRatio=" << m_dDefaultViewRatio << ", ScanRatio=" << m_dDefaultScanRatio 
+        << ", Geometry=" << sGeometry.c_str() << ", FanBeamAngle=" << 
+        convertRadiansToDegrees (theScanner.fanBeamAngle());
+      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);
+      if (theApp->getAskDeleteNewDocs())
+        pProjectionDoc-> Modify(true);
+      pProjectionDoc->UpdateAllViews (this);
     }
   }
 }
 
 
 void
-PhantomView::OnRasterize (wxCommandEvent& event)
+PhantomFileView::OnRasterize (wxCommandEvent& event)
 {
-  DialogGetRasterParameters dialogRaster (getFrameForChild(), m_iDefaultRasterNX, m_iDefaultRasterNY, m_iDefaultRasterNSamples);
+  DialogGetRasterParameters dialogRaster (getFrameForChild(), m_iDefaultRasterNX, m_iDefaultRasterNY, 
+    m_iDefaultRasterNSamples, m_dDefaultRasterViewRatio);
   int retVal = dialogRaster.ShowModal();
   if (retVal == wxID_OK) {
     m_iDefaultRasterNX = dialogRaster.getXSize();
     m_iDefaultRasterNY  = dialogRaster.getYSize();
     m_iDefaultRasterNSamples = dialogRaster.getNSamples();
+    m_dDefaultRasterViewRatio = dialogRaster.getViewRatio();
     if (m_iDefaultRasterNSamples < 1)
       m_iDefaultRasterNSamples = 1;
+    if (m_dDefaultRasterViewRatio < 0)
+      m_dDefaultRasterViewRatio = 0;
     if (m_iDefaultRasterNX > 0 && m_iDefaultRasterNY > 0) {
       const Phantom& rPhantom = GetDocument()->getPhantom();
-      ImageFileDocument* pRasterDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
-      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_dDefaultRasterViewRatio, 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);
+
+      if (theApp->getAskDeleteNewDocs())
+        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;
+        << m_iDefaultRasterNY << ", ViewRatio=" << m_dDefaultRasterViewRatio << ", 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);
@@ -1903,31 +2030,32 @@ PhantomView::OnRasterize (wxCommandEvent& event)
 
 
 PhantomCanvas* 
-PhantomView::CreateCanvas (wxView *view, wxFrame *parent)
+PhantomFileView::CreateCanvas (wxFrame *parent)
 {
   PhantomCanvas* pCanvas;
-  int width, height;
-  parent->GetClientSize(&width, &height);
-  
-  pCanvas = new PhantomCanvas (dynamic_cast<PhantomView*>(view), parent, wxPoint(0, 0), wxSize(width, height), 0);
   
+  pCanvas = new PhantomCanvas (this, parent, wxPoint(0, 0), wxSize(0,0), 0);
   pCanvas->SetBackgroundColour(*wxWHITE);
   pCanvas->Clear();
   
   return pCanvas;
 }
 
-wxFrame*
-PhantomView::CreateChildFrame(wxDocument *doc, wxView *view)
+#if CTSIM_MDI
+wxDocMDIChildFrame*
+#else
+wxDocChildFrame*
+#endif
+PhantomFileView::CreateChildFrame(wxDocument *doc, wxView *view)
 {
 #if CTSIM_MDI
-  wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(256, 256), wxDEFAULT_FRAME_STYLE);
+  wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE);
 #else
-  wxDocChildFrame *subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(256, 256), wxDEFAULT_FRAME_STYLE);
+  wxDocChildFrame *subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "Phantom Frame", wxPoint(10, 10), wxSize(0, 0), wxDEFAULT_FRAME_STYLE);
 #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");
@@ -1944,10 +2072,11 @@ PhantomView::CreateChildFrame(wxDocument *doc, wxView *view)
   m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
 #ifdef CTSIM_MDI
   m_pFileMenu->AppendSeparator();
+  m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
   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");
@@ -1955,7 +2084,7 @@ PhantomView::CreateChildFrame(wxDocument *doc, wxView *view)
   
   wxMenu *help_menu = new wxMenu;
   help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1");
-  help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H");
+  help_menu->Append (IDH_QUICKSTART, "&Quick Start");
   help_menu->Append(MAINMENU_HELP_ABOUT, "&About");
   
   wxMenuBar *menu_bar = new wxMenuBar;
@@ -1967,16 +2096,10 @@ PhantomView::CreateChildFrame(wxDocument *doc, wxView *view)
   subframe->SetMenuBar(menu_bar);
   subframe->Centre(wxBOTH);
   
-  wxAcceleratorEntry accelEntries[8];
-  accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
-  accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('S'), wxID_SAVE);
-  accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('H'), MAINMENU_HELP_TOPICS);
-  accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('P'), MAINMENU_FILE_CREATE_PHANTOM);
-  accelEntries[4].Set (wxACCEL_CTRL, static_cast<int>('F'), MAINMENU_FILE_CREATE_FILTER);
-  accelEntries[5].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
-  accelEntries[6].Set (wxACCEL_CTRL, static_cast<int>('J'), PHMMENU_PROCESS_PROJECTIONS);
-  accelEntries[7].Set (wxACCEL_CTRL, static_cast<int>('R'), PHMMENU_PROCESS_RASTERIZE);
-  wxAcceleratorTable accelTable (8, accelEntries);
+  wxAcceleratorEntry accelEntries[2];
+  accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('J'), PHMMENU_PROCESS_PROJECTIONS);
+  accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('R'), PHMMENU_PROCESS_RASTERIZE);
+  wxAcceleratorTable accelTable (2, accelEntries);
   subframe->SetAcceleratorTable (accelTable);
   
   return subframe;
@@ -1984,62 +2107,68 @@ PhantomView::CreateChildFrame(wxDocument *doc, wxView *view)
 
 
 bool 
-PhantomView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
+PhantomFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 {
-  m_frame = CreateChildFrame(doc, this);
-  SetFrame(m_frame);
+  m_pFrame = CreateChildFrame(doc, this);
+  SetFrame(m_pFrame);
+  m_pCanvas = CreateCanvas (m_pFrame);
+  m_pFrame->SetClientSize (m_pCanvas->GetBestSize());
+  m_pCanvas->SetClientSize (m_pCanvas->GetBestSize());
   
-  int width, height;
-  m_frame->GetClientSize(&width, &height);
-  m_frame->SetTitle("PhantomView");
-  m_canvas = CreateCanvas (this, m_frame);
+  m_pFrame->SetTitle ("PhantomFileView");
   
 #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 
-PhantomView::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 
-PhantomView::OnClose (bool deleteWindow)
+PhantomFileView::OnClose (bool deleteWindow)
 {
-  if (!GetDocument()->Close())
+  //GetDocumentManager()->ActivateView (this, false, true);
+  if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
-//  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;
+  if (deleteWindow) {
+    delete m_pFrame;
+    m_pFrame = NULL;
+    if (GetDocument() && GetDocument()->getBadFileOpen())
+      ::wxYield();  // wxWindows bug workaround
+  }
   
   return true;
 }
 
 void
-PhantomView::OnDraw (wxDC* dc)
+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();
@@ -2057,10 +2186,7 @@ ProjectionFileCanvas::ProjectionFileCanvas (ProjectionFileView* v, wxFrame *fram
 
 ProjectionFileCanvas::~ProjectionFileCanvas ()
 {
-  if (m_pView) {
-    wxMenu* pMenu = m_pView->getFileMenu();
-    theApp->getDocManager()->FileHistoryRemoveMenu (pMenu);
-  }
+  m_pView = NULL;
 }
 
 void 
@@ -2094,11 +2220,17 @@ EVT_MENU(PJMENU_CONVERT_POLAR, ProjectionFileView::OnConvertPolar)
 EVT_MENU(PJMENU_CONVERT_FFT_POLAR, ProjectionFileView::OnConvertFFTPolar)
 END_EVENT_TABLE()
 
-ProjectionFileView::ProjectionFileView(void) 
-: wxView(), m_canvas(NULL), m_frame(NULL), m_pFileMenu(0)
+ProjectionFileView::ProjectionFileView() 
+: wxView(), m_pFrame(0), m_pCanvas(0), 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
@@ -2109,7 +2241,7 @@ ProjectionFileView::ProjectionFileView(void)
   m_iDefaultFilterGeneration = ProcessSignal::FILTER_GENERATION_DIRECT;
 #endif
   m_iDefaultZeropad = 1;
-  m_iDefaultBackprojector = Backprojector::BPROJ_IDIFF3;
+  m_iDefaultBackprojector = Backprojector::BPROJ_IDIFF;
   m_iDefaultInterpolation = Backprojector::INTERP_LINEAR;
   m_iDefaultInterpParam = 1;
   m_iDefaultTrace = Trace::TRACE_NONE;
@@ -2120,8 +2252,10 @@ ProjectionFileView::ProjectionFileView(void)
   m_iDefaultPolarZeropad = 1;
 }
 
-ProjectionFileView::~ProjectionFileView(void)
+ProjectionFileView::~ProjectionFileView()
 {
+  GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
+  GetDocumentManager()->ActivateView(this, FALSE, TRUE);;
 }
 
 void
@@ -2130,7 +2264,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();
 }
@@ -2146,7 +2280,7 @@ ProjectionFileView::OnConvertPolar (wxCommandEvent& event)
     wxString strInterpolation (dialogPolar.getInterpolationName());
     m_iDefaultPolarNX = dialogPolar.getXSize();
     m_iDefaultPolarNY = dialogPolar.getYSize();
-    ImageFileDocument* pPolarDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+    ImageFileDocument* pPolarDoc = theApp->newImageDoc();
     ImageFile& rIF = pPolarDoc->getImageFile();
     if (! pPolarDoc) {
       sys_error (ERR_SEVERE, "Unable to create image file");
@@ -2162,10 +2296,11 @@ 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);
+    if (theApp->getAskDeleteNewDocs())
+      pPolarDoc->Modify (true);
+    pPolarDoc->UpdateAllViews ();
+    pPolarDoc->getView()->OnUpdate (this, NULL);
+    pPolarDoc->getView()->getFrame()->Show(true);
   }
 }
 
@@ -2180,7 +2315,7 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event)
     m_iDefaultPolarNX = dialogPolar.getXSize();
     m_iDefaultPolarNY = dialogPolar.getYSize();
     m_iDefaultPolarZeropad = dialogPolar.getZeropad();
-    ImageFileDocument* pPolarDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
+    ImageFileDocument* pPolarDoc = theApp->newImageDoc();
     ImageFile& rIF = pPolarDoc->getImageFile();
     if (! pPolarDoc) {
       sys_error (ERR_SEVERE, "Unable to create image file");
@@ -2196,11 +2331,13 @@ 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);
-}}
+    if (theApp->getAskDeleteNewDocs())
+      pPolarDoc->Modify (true);
+    pPolarDoc->UpdateAllViews ();
+    pPolarDoc->getView()->OnUpdate (this, NULL);
+    pPolarDoc->getView()->getFrame()->Show(true);
+  }
+}
 
 void
 ProjectionFileView::OnReconstructFourier (wxCommandEvent& event)
@@ -2211,7 +2348,10 @@ ProjectionFileView::OnReconstructFourier (wxCommandEvent& event)
 void
 ProjectionFileView::OnReconstructFBP (wxCommandEvent& event)
 {
-  DialogGetReconstructionParameters dialogReconstruction (getFrameForChild(), m_iDefaultNX, m_iDefaultNY, m_iDefaultFilter, m_dDefaultFilterParam, m_iDefaultFilterMethod, m_iDefaultFilterGeneration, m_iDefaultZeropad, m_iDefaultInterpolation, m_iDefaultInterpParam, m_iDefaultBackprojector, m_iDefaultTrace);
+  DialogGetReconstructionParameters dialogReconstruction (getFrameForChild(), m_iDefaultNX, m_iDefaultNY, 
+    m_iDefaultFilter, m_dDefaultFilterParam, m_iDefaultFilterMethod, m_iDefaultFilterGeneration, 
+    m_iDefaultZeropad, m_iDefaultInterpolation, m_iDefaultInterpParam, m_iDefaultBackprojector, 
+    m_iDefaultTrace);
   
   int retVal = dialogReconstruction.ShowModal();
   if (retVal == wxID_OK) {
@@ -2231,28 +2371,25 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event)
     wxString optBackprojectName = dialogReconstruction.getBackprojectName();
     m_iDefaultBackprojector = Backprojector::convertBackprojectNameToID (optBackprojectName.c_str());
     m_iDefaultTrace = dialogReconstruction.getTrace();
+
     if (m_iDefaultNX > 0 && m_iDefaultNY > 0) {
-      ImageFileDocument* pReconDoc = dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument("untitled.if", wxDOC_SILENT));
-      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)) {
+          if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView, true)) {
             delete pDlgReconstruct;
-            delete pReconstruct;
-            pReconDoc->DeleteAllViews();
+            delete pReconstructor;
+            delete pImageFile;
             return;
           }
           ::wxYield();
@@ -2265,42 +2402,48 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event)
         delete pDlgReconstruct;
       } 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();
+        for (int iView = 0; iView < rProj.nView(); iView++) {
+          pReconstructor->reconstructView (iView, 1);
+          if (! dlgProgress.Update (iView + 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);
+      if (theApp->getAskDeleteNewDocs())
+        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);
@@ -2309,7 +2452,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
@@ -2319,7 +2466,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");
@@ -2337,20 +2484,24 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
 #ifdef CTSIM_MDI
   m_pFileMenu->AppendSeparator();
+  m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
   m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
 #endif
+  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");
-  help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H");
+  help_menu->Append (IDH_QUICKSTART, "&Quick Start");
   help_menu->Append(MAINMENU_HELP_ABOUT, "&About");
   
   wxMenuBar *menu_bar = new wxMenuBar;
@@ -2363,19 +2514,12 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   subframe->SetMenuBar(menu_bar);  
   subframe->Centre(wxBOTH);
   
-  wxAcceleratorEntry accelEntries[11];
-  accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
-  accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('S'), wxID_SAVE);
-  accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('W'), wxID_CLOSE);
-  accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('H'), MAINMENU_HELP_TOPICS);
-  accelEntries[4].Set (wxACCEL_CTRL, static_cast<int>('P'), MAINMENU_FILE_CREATE_PHANTOM);
-  accelEntries[5].Set (wxACCEL_CTRL, static_cast<int>('F'), MAINMENU_FILE_CREATE_FILTER);
-  accelEntries[6].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
-  accelEntries[7].Set (wxACCEL_CTRL, static_cast<int>('L'), PJMENU_CONVERT_POLAR);
-  accelEntries[8].Set (wxACCEL_CTRL, static_cast<int>('I'), PJMENU_CONVERT_FFT_POLAR);
-  accelEntries[9].Set (wxACCEL_CTRL, static_cast<int>('R'), PJMENU_RECONSTRUCT_FBP);
-  accelEntries[10].Set (wxACCEL_CTRL, static_cast<int>('E'), PJMENU_RECONSTRUCT_FOURIER);
-  wxAcceleratorTable accelTable (11, accelEntries);
+  wxAcceleratorEntry accelEntries[4];
+  accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('L'), PJMENU_CONVERT_POLAR);
+  accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('I'), PJMENU_CONVERT_FFT_POLAR);
+  accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('R'), PJMENU_RECONSTRUCT_FBP);
+  accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('E'), PJMENU_RECONSTRUCT_FOURIER);
+  wxAcceleratorTable accelTable (4, accelEntries);
   subframe->SetAcceleratorTable (accelTable);
   
   return subframe;
@@ -2385,21 +2529,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;
@@ -2408,11 +2552,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);
@@ -2420,7 +2564,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();
@@ -2460,34 +2604,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)
 {
-  if (!GetDocument()->Close())
+  //GetDocumentManager()->ActivateView (this, false, true);
+  if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
-//  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;
-    return true;
+    delete m_pFrame;
+    m_pFrame = NULL;
+    if (GetDocument() && GetDocument()->getBadFileOpen())
+      ::wxYield();  // wxWindows bug workaround
   }
+
   return true;
 }
 
@@ -2502,10 +2651,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 = NULL;
 }
 
 void 
@@ -2527,17 +2673,17 @@ EVT_MENU(PLOTMENU_VIEW_SCALE_AUTO, PlotFileView::OnScaleAuto)
 EVT_MENU(PLOTMENU_VIEW_SCALE_FULL, PlotFileView::OnScaleFull)
 END_EVENT_TABLE()
 
-PlotFileView::PlotFileView(void) 
-: wxView(), m_canvas(NULL), m_frame(NULL), m_pEZPlot(NULL), m_pFileMenu(0)
+PlotFileView::PlotFileView() 
+: 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(void)
+PlotFileView::~PlotFileView()
 {
   if (m_pEZPlot)
     delete m_pEZPlot;
+  
+  GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);  
 }
 
 void
@@ -2547,7 +2693,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();
 }
@@ -2616,13 +2762,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();
@@ -2630,7 +2776,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
@@ -2640,7 +2790,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");
@@ -2658,10 +2808,11 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
 #ifdef CTSIM_MDI
   m_pFileMenu->AppendSeparator();
+  m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
   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");
@@ -2670,7 +2821,7 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   
   wxMenu *help_menu = new wxMenu;
   help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1");
-  help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H");
+  help_menu->Append (IDH_QUICKSTART, "&Quick Start");
   help_menu->Append(MAINMENU_HELP_ABOUT, "&About");
   
   wxMenuBar *menu_bar = new wxMenuBar;
@@ -2682,18 +2833,11 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   subframe->SetMenuBar(menu_bar);
   subframe->Centre(wxBOTH);
   
-  wxAcceleratorEntry accelEntries[10];
-  accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
-  accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('S'), wxID_SAVE);
-  accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('W'), wxID_CLOSE);
-  accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('H'), MAINMENU_HELP_TOPICS);
-  accelEntries[4].Set (wxACCEL_CTRL, static_cast<int>('P'), MAINMENU_FILE_CREATE_PHANTOM);
-  accelEntries[5].Set (wxACCEL_CTRL, static_cast<int>('F'), MAINMENU_FILE_CREATE_FILTER);
-  accelEntries[6].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
-  accelEntries[7].Set (wxACCEL_CTRL, static_cast<int>('E'), PLOTMENU_VIEW_SCALE_MINMAX);
-  accelEntries[8].Set (wxACCEL_CTRL, static_cast<int>('A'), PLOTMENU_VIEW_SCALE_AUTO);
-  accelEntries[9].Set (wxACCEL_CTRL, static_cast<int>('U'), PLOTMENU_VIEW_SCALE_FULL);
-  wxAcceleratorTable accelTable (10, accelEntries);
+  wxAcceleratorEntry accelEntries[3];
+  accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('E'), PLOTMENU_VIEW_SCALE_MINMAX);
+  accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('A'), PLOTMENU_VIEW_SCALE_AUTO);
+  accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('U'), PLOTMENU_VIEW_SCALE_FULL);
+  wxAcceleratorTable accelTable (3, accelEntries);
   subframe->SetAcceleratorTable (accelTable);
   
   return subframe;
@@ -2703,25 +2847,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;
@@ -2736,7 +2880,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)
@@ -2788,30 +2932,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)
 {
-  if (!GetDocument()->Close())
+  //GetDocumentManager()->ActivateView (this, false, true);
+  if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
-//  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;
 }
 
@@ -2819,23 +2967,23 @@ PlotFileView::OnClose (bool deleteWindow)
 ////////////////////////////////////////////////////////////////
 
 
-IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView)
+IMPLEMENT_DYNAMIC_CLASS(TextFileView, wxView)
 
-TextEditView::~TextEditView() 
+TextFileView::~TextFileView() 
 {
-  if (m_pFileMenu)
-    theApp->getDocManager()->FileHistoryRemoveMenu (m_pFileMenu);
+  GetDocumentManager()->FileHistoryRemoveMenu (m_pFileMenu);
+  GetDocumentManager()->ActivateView(this, FALSE, TRUE);;
 }
 
-bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
+bool TextFileView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 {
   m_pFrame = CreateChildFrame(doc, this);
   SetFrame (m_pFrame);
   
   int width, height;
   m_pFrame->GetClientSize(&width, &height);
-  m_pFrame->SetTitle("TextEdit");
-  m_pCanvas = new TextEditCanvas (this, m_pFrame, wxPoint(0, 0), wxSize(width, height), wxTE_MULTILINE | wxTE_READONLY);
+  m_pFrame->SetTitle("TextFile");
+  m_pCanvas = new TextFileCanvas (this, m_pFrame, wxPoint(0, 0), wxSize(width, height), wxTE_MULTILINE | wxTE_READONLY);
   m_pFrame->SetTitle("Log");
   
 #ifdef __X__
@@ -2852,43 +3000,51 @@ bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 }
 
 // Handled by wxTextWindow
-void TextEditView::OnDraw(wxDC *WXUNUSED(dc) )
+void TextFileView::OnDraw(wxDC *WXUNUSED(dc) )
 {
 }
 
-void TextEditView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
+void TextFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 {
 }
 
 bool 
-TextEditView::OnClose (bool deleteWindow)
+TextFileView::OnClose (bool deleteWindow)
 {
-  return false;
-  
-  if (!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;
-    return TRUE;
+    m_pFrame = NULL;
+    if (GetDocument() && GetDocument()->getBadFileOpen())
+      ::wxYield();  // wxWindows bug workaround
   }
+
   return TRUE;
 }
 
-wxFrame*
-TextEditView::CreateChildFrame (wxDocument *doc, wxView *view)
+#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, "TextEdit 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, "TextEdit 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");
@@ -2903,14 +3059,15 @@ TextEditView::CreateChildFrame (wxDocument *doc, wxView *view)
   m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
 #ifdef CTSIM_MDI
   m_pFileMenu->AppendSeparator();
+  m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
   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");
-  help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H");
+  help_menu->Append (IDH_QUICKSTART, "&Quick Start");
   help_menu->Append(MAINMENU_HELP_ABOUT, "&About");
   
   wxMenuBar *menu_bar = new wxMenuBar;
@@ -2920,30 +3077,18 @@ TextEditView::CreateChildFrame (wxDocument *doc, wxView *view)
   
   subframe->SetMenuBar(menu_bar);
   subframe->Centre(wxBOTH);
-  
-  wxAcceleratorEntry accelEntries[5];
-  accelEntries[0].Set (wxACCEL_CTRL, static_cast<int>('O'), wxID_OPEN);
-  accelEntries[1].Set (wxACCEL_CTRL, static_cast<int>('S'), wxID_SAVE);
-  accelEntries[2].Set (wxACCEL_CTRL, static_cast<int>('W'), wxID_CLOSE);
-  accelEntries[3].Set (wxACCEL_CTRL, static_cast<int>('H'), MAINMENU_HELP_TOPICS);
-  accelEntries[4].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS);
-  wxAcceleratorTable accelTable (5, accelEntries);
-  subframe->SetAcceleratorTable (accelTable);
-  
+    
   return subframe;
 }
 
 
 // Define a constructor for my text subwindow
-TextEditCanvas::TextEditCanvas (TextEditView* v, wxFrame* frame, const wxPoint& pos, const wxSize& size, long style)
-  : wxTextCtrl (frame, -1, "", pos, size, style), m_pView(v)
+TextFileCanvas::TextFileCanvas (TextFileView* v, wxFrame* frame, const wxPoint& pos, const wxSize& size, long style)
+: wxTextCtrl (frame, -1, "", pos, size, style), m_pView(v)
 {
 }
 
-TextEditCanvas::~TextEditCanvas ()
+TextFileCanvas::~TextFileCanvas ()
 {
-  if (m_pView) {
-    wxMenu* pMenu = m_pView->getFileMenu();
-    theApp->getDocManager()->FileHistoryRemoveMenu (pMenu);
-  }
+  m_pView = NULL;
 }