From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Tue, 30 Jan 2001 05:05:41 +0000 (+0000)
Subject: r471: Fixed shutdown crash, added Revert
X-Git-Tag: debian-4.5.3-3~546
X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=d3a6bf4aa2ccd32ed7671d1d97777dfc414df51d

r471: Fixed shutdown crash, added Revert
---

diff --git a/ChangeLog b/ChangeLog
index 0e1af36..c106fd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
 	* ctsim: Added graphical About box
 
 	* ctsim: Escape key now removes cursor from image files
+
+	* ctsim: Added Revert to ImageFile menu
 	
 	* ctsim: Added accelerator (hotkeys) to frames
 
@@ -20,6 +22,8 @@
 
 	* timer.h: Add use of _ftime when compiling on MSVC
 
+	* ctsim: Fixed crash on shutdown bug
+	
 	* pjinfo: Fixed bug when doing --dump and not specifing --endview
 
 	* ctsimtext-lam: Changes for first version to compile under lam
diff --git a/libctsim/reconstruct.cpp b/libctsim/reconstruct.cpp
index 67d1414..da99f59 100644
--- a/libctsim/reconstruct.cpp
+++ b/libctsim/reconstruct.cpp
@@ -8,7 +8,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: reconstruct.cpp,v 1.10 2001/01/29 23:11:32 kevin Exp $
+**  $Id: reconstruct.cpp,v 1.11 2001/01/30 05:05:41 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
@@ -175,31 +175,35 @@ Reconstructor::reconstructView (int iStartView, int iViewCount, SGP* pSGP, bool
 
       std::ostringstream osXLength;
       osXLength << "xlength " << dGraphWidth;
+
       ezplotProj.ezset ("clear");
-      ezplotProj.ezset ("title Raw Projection");
+      ezplotProj.ezset ("title Filtered Projection");
       ezplotProj.ezset ("xticks major 5");
       ezplotProj.ezset ("xlabel ");
       ezplotProj.ezset ("ylabel ");
-      ezplotProj.ezset ("yporigin 0.1");
+      ezplotProj.ezset ("yticks major 5");
+      ezplotProj.ezset ("yporigin 0.10");
       ezplotProj.ezset ("ylength 0.45");
       ezplotProj.ezset (osXLength.str().c_str());
-      ezplotProj.ezset ("box.");
-      ezplotProj.ezset ("grid.");
-      ezplotProj.addCurve (m_adPlotXAxis, detval, m_rProj.nDet());
-      pSGP->setTextPointSize(12);
+      ezplotProj.ezset ("box");
+      ezplotProj.ezset ("grid");
+      ezplotProj.addCurve (m_adPlotXAxis, adFilteredProj,  m_nFilteredProjections);
+      pSGP->setTextPointSize (12);
       ezplotProj.plot (pSGP);
+
       ezplotProj.ezset ("clear");
-      ezplotProj.ezset ("title Filtered Projection");
+      ezplotProj.ezset ("title Raw Projection");
       ezplotProj.ezset ("xticks major 5");
+      ezplotProj.ezset ("yticks major 5");
       ezplotProj.ezset ("xlabel ");
       ezplotProj.ezset ("ylabel ");
       ezplotProj.ezset ("yporigin 0.55");
       ezplotProj.ezset ("ylength 0.45");
       ezplotProj.ezset (osXLength.str().c_str());
-      ezplotProj.ezset ("box");
-      ezplotProj.ezset ("grid");
-      ezplotProj.addCurve (m_adPlotXAxis, adFilteredProj,  m_nFilteredProjections);
-      pSGP->setTextPointSize(12);
+      ezplotProj.ezset ("box.");
+      ezplotProj.ezset ("grid.");
+      ezplotProj.addCurve (m_adPlotXAxis, detval, m_rProj.nDet());
+      pSGP->setTextPointSize (12);
       ezplotProj.plot (pSGP);
     } 
 #endif  //HAVE_SGP
diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg
index aaf56f3..91e83ce 100644
--- a/msvc/ctsim/ctsim.plg
+++ b/msvc/ctsim/ctsim.plg
@@ -3,59 +3,16 @@
 <pre>
 <h1>Build Log</h1>
 <h3>
---------------------Configuration: libctsim - Win32 Debug--------------------
+--------------------Configuration: ctsim - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP7C4.tmp" with contents
-[
-/nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "..\..\..\wx2.2.5\src\png" /I "..\..\..\wx2.2.5\src\zlib" /I "..\..\INCLUDE" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2.2.5\include" /D "_DEBUG" /D "HAVE_WXWIN" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /FR"Debug/" /Fp"Debug/libctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"C:\ctsim\libctsupport\syserror.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP7C4.tmp" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP7C5.tmp" with contents
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP8EB.tmp" with contents
 [
-/nologo /out:"Debug\libctsim.lib" 
-.\Debug\array2dfile.obj
-.\Debug\backprojectors.obj
-.\Debug\clip.obj
-.\Debug\consoleio.obj
-.\Debug\dlgezplot.obj
-.\Debug\ezplot.obj
-.\Debug\ezset.obj
-.\Debug\ezsupport.obj
-.\Debug\filter.obj
-.\Debug\fnetorderstream.obj
-.\Debug\fourier.obj
-.\Debug\getopt.obj
-.\Debug\getopt1.obj
-.\Debug\globalvars.obj
-.\Debug\hashtable.obj
-.\Debug\imagefile.obj
-.\Debug\mathfuncs.obj
-.\Debug\phantom.obj
-.\Debug\plotfile.obj
-.\Debug\pol.obj
-.\Debug\procsignal.obj
-.\Debug\projections.obj
-.\Debug\reconstruct.obj
-.\Debug\scanner.obj
-.\Debug\sgp.obj
-.\Debug\strfuncs.obj
-.\Debug\syserror.obj
-.\Debug\trace.obj
-.\Debug\transformmatrix.obj
-.\Debug\xform.obj
+/nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "\wx2.2.5\include" /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /D VERSION=\"3.0.0beta1\" /D "_DEBUG" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"3.0.0alpha5\" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"C:\ctsim\src\docs.cpp"
 ]
-Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP7C5.tmp"
-<h3>Output Window</h3>
-Compiling...
-syserror.cpp
-Creating library...
-<h3>
---------------------Configuration: ctsim - Win32 Debug--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP7C6.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP8EB.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP8EC.tmp" with contents
 [
 comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../libctsim/Debug/libctsim.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib wxd.lib xpmd.lib tiffd.lib zlibd.lib pngd.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/ctsim.pdb" /debug /machine:I386 /out:"Debug/ctsim.exe" /pdbtype:sept /libpath:"\wx2.2.5\lib" 
 .\Debug\ctsim.obj
@@ -75,8 +32,10 @@ comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib w
 \wx2.2.5\lib\xpmd.lib
 \wx2.2.5\lib\zlibd.lib
 ]
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP7C6.tmp"
+Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP8EC.tmp"
 <h3>Output Window</h3>
+Compiling...
+docs.cpp
 Linking...
 
 
diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 5d6ef6f..38c939c 100644
--- a/src/ctsim.cpp
+++ b/src/ctsim.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctsim.cpp,v 1.59 2001/01/30 01:21:37 kevin Exp $
+**  $Id: ctsim.cpp,v 1.60 2001/01/30 05:05:41 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
@@ -70,7 +70,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.59 2001/01/30 01:21:37 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.60 2001/01/30 05:05:41 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -167,6 +167,7 @@ CTSimApp::OnInit()
 		m_docManager->FileHistoryLoad(*m_pConfig);
 	
 #ifdef CTSIM_MDI
+#if 1
 	m_pLogDoc = newTextDoc();
 	if (m_pLogDoc) {
 		m_pLog = m_pLogDoc->getTextCtrl();
@@ -175,10 +176,20 @@ CTSimApp::OnInit()
 		m_pLogDoc->getView()->getFrame()->SetTitle("Log");
 		int xSize, ySize;
 		m_pFrame->GetClientSize(&xSize, &ySize);
-		int yLogSize = ySize / 3;
+		int yLogSize = ySize / 4;
 		m_pLogDoc->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
 		m_pLogDoc->getView()->getFrame()->Show (true);
 	} else
+#else
+//    wxMDIChildFrame *pLogFrame = new wxMDIChildFrame (m_pFrame, -1, "Log", wxDefaultPosition, wxSize(0,0), wxTHICK_FRAME, "Log");
+    m_pLog = new wxTextCtrl(m_pFrame->GetClientWindow(), -1, "", wxPoint(0,0), wxSize(0,0), wxTE_MULTILINE | wxTE_READONLY);
+		int xSize, ySize;
+		m_pFrame->GetClientSize(&xSize, &ySize);
+		int yLogSize = ySize / 5;
+		m_pLog->SetSize (0, ySize - yLogSize, xSize, yLogSize);
+		m_pLog->Show (true);
+    m_pLog->Enable (true);
+#endif
 #else
 		m_pLog = new wxTextCtrl (m_pFrame, -1, "Log Window\n", wxPoint(0, 0), wxSize(0,0), wxTE_MULTILINE | wxTE_READONLY);
 #endif
@@ -293,6 +304,8 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
 : wxDocParentFrame(manager, frame, id, title, pos, size, type, "MainFrame")
 #endif
 {
+  m_bShuttingDown = false;
+
 	//// Make a menubar
 	wxMenu *file_menu = new wxMenu;
 	
@@ -368,6 +381,7 @@ MainFrame::MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const
 
 MainFrame::~MainFrame()
 {
+  m_bShuttingDown = true; // Currently used so that Log Window will close
 	if (theApp->getConfig())
 		theApp->getDocManager()->FileHistorySave (*theApp->getConfig());
 	delete theApp->getDocManager();
@@ -378,17 +392,13 @@ void
 MainFrame::OnSize (wxSizeEvent& event)
 {
 #ifdef CTSIM_MDI
-	int xSize, ySize;
-	wxMDIParentFrame::GetClientSize(&xSize, &ySize);
-	
-	if (theApp->getLogDoc()) {
+    if (theApp->getLogDoc()) {
+	int xSize, ySize;	
 		GetClientSize(&xSize, &ySize);
-		int yLogSize = ySize / 3;
-		theApp->getLogDoc()->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
-		theApp->getLogDoc()->getView()->getFrame()->Show (true);
-	}
-	//GetClientWindow()->SetSize (0, 0, sizeClient.x, sizeClient.y);
-	//GetClientWindow()->Refresh();
+		int yLogSize = ySize / 4;
+		  theApp->getLogDoc()->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
+		  theApp->getLogDoc()->getView()->getFrame()->Show (true);
+    }
 #endif
 	
 #if CTSIM_MDI
@@ -776,6 +786,9 @@ CTSimApp::newProjectionDoc()
 				pFrame->Show (false);
 			}
 		}
+    newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
+    newDoc->SetDocumentTemplate (m_pDocTemplProjection);
+    newDoc->OnNewDocument();
 	}
 	
 	return newDoc;
@@ -794,6 +807,9 @@ CTSimApp::newImageDoc()
 				pFrame->Show (false);
 			}
 		}
+    newDoc->SetDocumentName (m_pDocTemplImage->GetDocumentName());
+    newDoc->SetDocumentTemplate (m_pDocTemplImage);
+    newDoc->OnNewDocument();
 	}
 	
 	return newDoc;
@@ -814,6 +830,9 @@ CTSimApp::newPlotDoc()
 				pFrame->Show (false);
 			}
 		}
+    newDoc->SetDocumentName (m_pDocTemplPlot->GetDocumentName());
+    newDoc->SetDocumentTemplate (m_pDocTemplPlot);
+    newDoc->OnNewDocument();
 	}
 	
 	return newDoc;
@@ -838,6 +857,9 @@ CTSimApp::newTextDoc()
 				pFrame->Show (false);
 			}
 		}
+    newDoc->SetDocumentName (m_pDocTemplText->GetDocumentName());
+    newDoc->SetDocumentTemplate (m_pDocTemplText);
+    newDoc->OnNewDocument();
 	}
 	
 	return newDoc;
@@ -855,6 +877,9 @@ CTSimApp::newPhantomDoc()
 			if (pFrame)
 				pFrame->SetSize (0,0);
 		}
+    newDoc->SetDocumentName (m_pDocTemplPhantom->GetDocumentName());
+    newDoc->SetDocumentTemplate (m_pDocTemplPhantom);
+    newDoc->OnNewDocument();
 	}
 	
 	return newDoc;
diff --git a/src/ctsim.h b/src/ctsim.h
index 99b94b8..a2b0b7f 100644
--- a/src/ctsim.h
+++ b/src/ctsim.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: ctsim.h,v 1.35 2001/01/29 23:11:32 kevin Exp $
+**  $Id: ctsim.h,v 1.36 2001/01/30 05:05:41 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
@@ -102,6 +102,8 @@ private:
   double m_dDefaultFilterInputScale;
   double m_dDefaultFilterOutputScale;
 
+  bool m_bShuttingDown;
+
 #if CTSIM_WINHELP
   wxWinHelpController      m_winHelp;
 #endif
@@ -161,6 +163,8 @@ public:
   void OnWindowMenu19 (wxCommandEvent& event);
   
   void DoWindowMenu (int iMenuPosition, wxCommandEvent& event);
+
+  bool getShuttingDown() const { return m_bShuttingDown; }
 };
 
 
diff --git a/src/dlgprojections.cpp b/src/dlgprojections.cpp
index 5e23b99..e2d3a44 100644
--- a/src/dlgprojections.cpp
+++ b/src/dlgprojections.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: dlgprojections.cpp,v 1.21 2001/01/28 20:05:17 kevin Exp $
+**  $Id: dlgprojections.cpp,v 1.22 2001/01/30 05:05:41 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
@@ -169,6 +169,7 @@ ProjectionsDialog::showView (int iViewNumber)
 			ezplot.ezset ("box");
 			ezplot.ezset ("yticks left");
 			ezplot.ezset ("xticks major 5");
+			ezplot.ezset ("yticks major 10");
 			ezplot.addCurve (detValues, detPos, detArray.nDet());
 #if 1
       ezplot.ezset ("xporigin 0.67");
diff --git a/src/docs.cpp b/src/docs.cpp
index 88e6ba5..03ad113 100644
--- a/src/docs.cpp
+++ b/src/docs.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: docs.cpp,v 1.17 2001/01/30 02:20:50 kevin Exp $
+**  $Id: docs.cpp,v 1.18 2001/01/30 05:05:41 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
@@ -57,7 +57,7 @@ IMPLEMENT_DYNAMIC_CLASS(ImageFileDocument, wxDocument)
 
 bool ImageFileDocument::OnSaveDocument(const wxString& filename)
 {
-  if (! m_imageFile.fileWrite (filename)) {
+  if (! m_pImageFile->fileWrite (filename)) {
     *theApp->getLog() << "Unable to write image file " << filename << "\n";
     return false;
   }
@@ -71,7 +71,7 @@ bool ImageFileDocument::OnOpenDocument(const wxString& filename)
   if (! OnSaveModified())
     return false;
 
-  if (! m_imageFile.fileRead (filename.c_str())) {
+  if (! m_pImageFile->fileRead (filename.c_str())) {
     *theApp->getLog() << "Unable to read image file " << filename << "\n";
     m_bBadFileOpen = true;
     return false;
@@ -80,18 +80,20 @@ bool ImageFileDocument::OnOpenDocument(const wxString& filename)
   SetFilename(filename, true);  
   Modify(false);
   UpdateAllViews();
-  GetFirstView()->OnUpdate (GetFirstView(), NULL);
+  getView()->OnUpdate (getView(), NULL);
   m_bBadFileOpen = false;
 
   return true;
 }
 
-bool ImageFileDocument::IsModified(void) const
+bool 
+ImageFileDocument::IsModified(void) const
 {
   return wxDocument::IsModified();
 }
 
-void ImageFileDocument::Modify(bool mod)
+void 
+ImageFileDocument::Modify(bool mod)
 {
   wxDocument::Modify(mod);
 }
@@ -102,13 +104,34 @@ ImageFileDocument::getView() const
   return dynamic_cast<ImageFileView*>(GetFirstView()); 
 }
 
+
+bool
+ImageFileDocument::Revert ()
+{
+  if (IsModified()) {
+    wxString msg ("Revert to saved ");
+    msg += GetFilename();
+    msg += "?";
+    wxMessageDialog dialog (getView()->getFrame(), msg, "Are you sure?", wxYES_NO | wxNO_DEFAULT);
+    if (dialog.ShowModal() == wxID_YES) {
+      *theApp->getLog() << "Reverting to saved " << GetFilename() << "\n";
+      Modify(false);
+      OnOpenDocument (GetFilename());
+    }
+  }
+  getView()->OnUpdate (getView(), NULL);
+  UpdateAllViews();
+
+  return true;
+}
+
 // ProjectionFileDocument
 
 IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, wxDocument)
 
 bool ProjectionFileDocument::OnSaveDocument(const wxString& filename)
 {
-  if (! m_projectionFile.write (filename.c_str())) {
+  if (! m_pProjectionFile->write (filename.c_str())) {
     *theApp->getLog() << "Unable to write projection file " << filename << "\n";
     return false;
   }
@@ -122,7 +145,7 @@ bool ProjectionFileDocument::OnOpenDocument(const wxString& filename)
   if (! OnSaveModified())
     return false;
 
-  if (! m_projectionFile.read (filename.c_str())) {
+  if (! m_pProjectionFile->read (filename.c_str())) {
     *theApp->getLog() << "Unable to read projection file " << filename << "\n";
     m_bBadFileOpen = true;
     return false;
diff --git a/src/docs.h b/src/docs.h
index 9d09e87..54fa2a4 100644
--- a/src/docs.h
+++ b/src/docs.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: docs.h,v 1.16 2001/01/30 02:20:50 kevin Exp $
+**  $Id: docs.h,v 1.17 2001/01/30 05:05:41 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
@@ -50,26 +50,38 @@ class ImageFileDocument: public wxDocument
 {
 private:
     DECLARE_DYNAMIC_CLASS(ImageFileDocument)
-    ImageFile m_imageFile;
+    ImageFile* m_pImageFile;
     bool m_bBadFileOpen;
 
 public:
     virtual bool OnSaveDocument (const wxString& filename);
     virtual bool OnOpenDocument (const wxString& filename);
     virtual bool IsModified () const;
+    virtual bool Revert ();
     virtual void Modify (bool mod);
     
     ImageFileDocument () 
       : m_bBadFileOpen(false)
-    {}
-
-    virtual ~ImageFileDocument () {}
-
-    const ImageFile& getImageFile() const { return m_imageFile; }
+    {
+      m_pImageFile = new ImageFile;
+    }
+
+    virtual ~ImageFileDocument () 
+    {
+      delete m_pImageFile;
+    }
+
+    const ImageFile& getImageFile() const { return *m_pImageFile; }
+    ImageFile& getImageFile() { return *m_pImageFile; }
+    void setImageFile (ImageFile* pImageFile)
+    { 
+      delete m_pImageFile;
+      m_pImageFile = pImageFile;
+    }
 
-    ImageFile& getImageFile() { return m_imageFile; }
     ImageFileView* getView() const;
     bool getBadFileOpen() const { return m_bBadFileOpen; }
+    void setBadFileOpen() { m_bBadFileOpen = true; }
 };
 
 
@@ -77,7 +89,7 @@ class ProjectionFileDocument: public wxDocument
 {
 private:
     DECLARE_DYNAMIC_CLASS(ProjectionFileDocument)
-    Projections m_projectionFile;
+    Projections* m_pProjectionFile;
     bool m_bBadFileOpen;
 
 public:
@@ -88,15 +100,26 @@ public:
     
     ProjectionFileDocument () 
           : m_bBadFileOpen(false)
-    {}
+    {
+      m_pProjectionFile = new Projections;
+    }
+
+    virtual ~ProjectionFileDocument () 
+    {
+      delete m_pProjectionFile;
+    }
 
-    virtual ~ProjectionFileDocument () {}
+    const Projections& getProjections () const	{ return *m_pProjectionFile; }
+    Projections& getProjections () 	{ return *m_pProjectionFile; }
 
-    const Projections& getProjections () const	{ return m_projectionFile; }
-    Projections& getProjections () 	{ return m_projectionFile; }
+    void setProjections (Projections* pProjections)
+    { delete m_pProjectionFile;
+      m_pProjectionFile = pProjections;
+    }
 
     ProjectionFileView* getView() const;
     bool getBadFileOpen() const { return m_bBadFileOpen; }
+    void setBadFileOpen() { m_bBadFileOpen = true; }
 };
 
 
@@ -131,6 +154,7 @@ public:
     virtual void Modify (bool mod);
     PhantomFileView* getView() const;
     bool getBadFileOpen() const { return m_bBadFileOpen; }
+    void setBadFileOpen() { m_bBadFileOpen = true; }
 };
 
 
@@ -165,6 +189,7 @@ public:
     virtual void Modify (bool mod);
     PlotFileView* getView() const;
     bool getBadFileOpen() const { return m_bBadFileOpen; }
+    void setBadFileOpen() { m_bBadFileOpen = true; }
 };
 
 
@@ -189,6 +214,7 @@ class TextFileDocument: public wxDocument
 
   TextFileView* getView() const;
   bool getBadFileOpen() const { return m_bBadFileOpen; }
+  void setBadFileOpen() { m_bBadFileOpen = true; }
 };
 
 
diff --git a/src/views.cpp b/src/views.cpp
index 2e0f78a..28d663e 100644
--- a/src/views.cpp
+++ b/src/views.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: views.cpp,v 1.90 2001/01/30 02:20:50 kevin Exp $
+**  $Id: views.cpp,v 1.91 2001/01/30 05:05:41 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
@@ -257,6 +257,7 @@ ImageFileView::~ImageFileView()
   GetDocumentManager()->ActivateView(this, FALSE, TRUE);
 }
 
+
 void
 ImageFileView::OnProperties (wxCommandEvent& event)
 {
@@ -275,16 +276,15 @@ ImageFileView::OnProperties (wxCommandEvent& event)
       os << "Complex\n";
     else
       os << "Real\n";
-    os << "\nMinimum: "<<min<<"\nMaximum: "<<max<<"\nMean: "<<mean<<"\nMedian: "<<median<<"\nMode: "<<mode<<"\nStandard Deviation: "<<stddev << "\n";
+    os << "Minimum: "<<min<<"\nMaximum: "<<max<<"\nMean: "<<mean<<"\nMedian: "<<median<<"\nMode: "<<mode<<"\nStandard Deviation: "<<stddev << "\n";
     if (rIF.isComplex()) {
       rIF.statistics (rIF.getImaginaryArray(), min, max, mean, mode, median, stddev);
-      os << "\nImaginary: min: "<<min<<"\nmax: "<<max<<"\nmean: "<<mean<<"\nmedian: "<<median<<"\nmode: "<<mode<<"\nstddev: "<<stddev << "\n";
+      os << "Imaginary: min: "<<min<<"\nmax: "<<max<<"\nmean: "<<mean<<"\nmedian: "<<median<<"\nmode: "<<mode<<"\nstddev: "<<stddev << "\n";
     }
     if (rIF.nLabels() > 0) {
-      os << "\n";
       rIF.printLabelsBrief (os);
     }
-    *theApp->getLog() << os.str().c_str();
+    *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n";
     wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Imagefile Properties", wxOK | wxICON_INFORMATION);
     dialogMsg.ShowModal();
   }
@@ -366,40 +366,35 @@ ImageFileView::OnCompare (wxCommandEvent& event)
       os << GetFrame()->GetTitle().c_str() << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n";
       rCompareIF.statistics (min, max, mean, mode, median, stddev);
       os << pCompareDoc->GetFirstView()->GetFrame()->GetTitle().c_str() << ": minimum=" << min << ", maximum=" << max << ", mean=" << mean << ", mode=" << mode << ", median=" << median << ", stddev=" << stddev << "\n";
-      os << "\n";
       double d, r, e;
       rIF.comparativeStatistics (rCompareIF, d, r, e);
       os << "Comparative Statistics: d=" << d << ", r=" << r << ", e=" << e << "\n";
-      *theApp->getLog() << os.str().c_str();
+      *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n";
       if (dialogGetCompare.getMakeDifferenceImage()) {
+        ImageFile* pDifferenceImage = new ImageFile;
+        
+        pDifferenceImage->setArraySize (rIF.nx(), rIF.ny());
+        if (! rIF.subtractImages (rCompareIF, *pDifferenceImage)) {
+          *theApp->getLog() << "Unable to subtract images\n";
+          delete pDifferenceImage;
+          return;
+        }
         ImageFileDocument* pDifferenceDoc = theApp->newImageDoc();
         if (! pDifferenceDoc) {
           sys_error (ERR_SEVERE, "Unable to create image file");
           return;
         }
-        ImageFile& differenceImage = pDifferenceDoc->getImageFile();
-        
-        differenceImage.setArraySize (rIF.nx(), rIF.ny());
-        if (! rIF.subtractImages (rCompareIF, differenceImage)) {
-            pDifferenceDoc->getView()->getFrame()->Show(true);
-            GetDocumentManager()->ActivateView (pDifferenceDoc->getView(), true, false);
-            pDifferenceDoc->getView()->getFrame()->SetFocus();
-            wxCommandEvent event;
-            GetDocumentManager()->OnFileClose (event);
-            GetDocumentManager()->ActivateView (this, true, false);
-            getFrame()->SetFocus();
-          return;
-        }
-        
+        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());
+        pDifferenceImage->labelAdd (os.str().c_str());
         pDifferenceDoc->Modify (true);
         pDifferenceDoc->UpdateAllViews (this);
         pDifferenceDoc->getView()->OnUpdate (this, NULL);
@@ -812,6 +807,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   m_pFileMenu->Append(wxID_SAVE, "&Save\tCtrl-S");
   m_pFileMenu->Append(wxID_SAVEAS, "Save &As...");
   m_pFileMenu->Append(wxID_CLOSE, "&Close\tCtrl-W");
+  m_pFileMenu->Append(wxID_REVERT, "Re&vert");
   
   m_pFileMenu->AppendSeparator();
   m_pFileMenu->Append(IFMENU_FILE_PROPERTIES, "P&roperties");
@@ -820,7 +816,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   m_pFileMenu->AppendSeparator();
   m_pFileMenu->Append(wxID_PRINT, "&Print...");
   m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup...");
-  m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
+  m_pFileMenu->Append(wxID_PREVIEW, "Print Preview");
 #ifdef CTSIM_MDI
   m_pFileMenu->AppendSeparator();
   m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
@@ -1011,7 +1007,8 @@ ImageFileView::OnClose (bool deleteWindow)
   //GetDocumentManager()->ActivateView (this, false, true);
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
-  
+
+  Activate (false);
   if (m_pCanvas) {
     m_pCanvas->setView(NULL);
     m_pCanvas = NULL;
@@ -1021,7 +1018,6 @@ ImageFileView::OnClose (bool deleteWindow)
     m_pFrame->SetTitle(s);
   
   SetFrame(NULL);
-  Activate(false);
   
   if (deleteWindow) {
     m_pFrame->Destroy();
@@ -1798,7 +1794,7 @@ PhantomFileView::OnProperties (wxCommandEvent& event)
 #if DEBUG
   rPhantom.print (os);
 #endif
-  *theApp->getLog() << os.str().c_str() << "\n";
+  *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n";
   wxMessageBox (os.str().c_str(), "Phantom Properties");
 }
 
@@ -1821,33 +1817,23 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
     
     if (m_iDefaultNDet > 0 && m_iDefaultNView > 0 && sGeometry != "") {
       const Phantom& rPhantom = GetDocument()->getPhantom();
-      ProjectionFileDocument* pProjectionDoc = theApp->newProjectionDoc();
-      if (! pProjectionDoc) {
-        sys_error (ERR_SEVERE, "Unable to create projection document");
-        return;
-      }
-      Projections& rProj = pProjectionDoc->getProjections();
-      Scanner theScanner (rPhantom, sGeometry.c_str(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView);
+      Projections* pProj = new Projections;
+      Scanner theScanner (rPhantom, sGeometry.c_str(), m_iDefaultNDet, m_iDefaultNView, m_iDefaultNSample, 
+                          m_dDefaultRotation, m_dDefaultFocalLength, m_dDefaultFieldOfView);
       if (theScanner.fail()) {
         *theApp->getLog() << "Failed making scanner: " << theScanner.failMessage().c_str() << "\n";
         return;
       }
-      rProj.initFromScanner (theScanner);
+      pProj->initFromScanner (theScanner);
       m_dDefaultRotation /= PI;  // convert back to PI units
       
       Timer timer;
       if (m_iDefaultTrace > Trace::TRACE_CONSOLE) {
-        ProjectionsDialog dialogProjections (theScanner, rProj, rPhantom, m_iDefaultTrace, dynamic_cast<wxWindow*>(getFrameForChild()));
-        for (int iView = 0; iView < rProj.nView(); iView++) {
+        ProjectionsDialog dialogProjections (theScanner, *pProj, rPhantom, m_iDefaultTrace, dynamic_cast<wxWindow*>(getFrameForChild()));
+        for (int iView = 0; iView < pProj->nView(); iView++) {
           ::wxYield();
           if (dialogProjections.isCancelled() || ! dialogProjections.projectView (iView)) {
-            pProjectionDoc->getView()->getFrame()->Show(true);
-            GetDocumentManager()->ActivateView (pProjectionDoc->getView(), true, false);
-            pProjectionDoc->getView()->getFrame()->SetFocus();
-            wxCommandEvent event;
-            GetDocumentManager()->OnFileClose (event);
-            GetDocumentManager()->ActivateView (this, true, false);
-            getFrame()->SetFocus();
+            delete pProj;
             return;
           }
           ::wxYield();
@@ -1857,17 +1843,11 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
           }
         }
       } else {
-        wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), rProj.nView() + 1, getFrameForChild(), wxPD_CAN_ABORT);
-        for (int i = 0; i < rProj.nView(); i++) {
-          theScanner.collectProjections (rProj, rPhantom, i, 1, true, m_iDefaultTrace);
+        wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), pProj->nView() + 1, getFrameForChild(), wxPD_CAN_ABORT);
+        for (int i = 0; i < pProj->nView(); i++) {
+          theScanner.collectProjections (*pProj, rPhantom, i, 1, true, m_iDefaultTrace);
           if (! dlgProgress.Update (i+1)) {
-            pProjectionDoc->getView()->getFrame()->Show(true);
-            GetDocumentManager()->ActivateView (pProjectionDoc->getView(), true, false);
-            pProjectionDoc->getView()->getFrame()->SetFocus();
-            wxCommandEvent event;
-            GetDocumentManager()->OnFileClose (event);
-            GetDocumentManager()->ActivateView (this, true, false);
-            getFrame()->SetFocus();
+            delete pProj;
             return;
           }
         }
@@ -1875,11 +1855,17 @@ PhantomFileView::OnProjections (wxCommandEvent& event)
       
       std::ostringstream os;
       os << "Projections for " << rPhantom.name() << ": nDet=" << m_iDefaultNDet << ", nView=" << m_iDefaultNView << ", nSamples=" << m_iDefaultNSample << ", RotAngle=" << m_dDefaultRotation << ", FocalLengthRatio=" << m_dDefaultFocalLength << ", FieldOfViewRatio=" << m_dDefaultFieldOfView << ", Geometry=" << sGeometry.c_str();
-      rProj.setCalcTime (timer.timerEnd());
-      rProj.setRemark (os.str());
+      pProj->setCalcTime (timer.timerEnd());
+      pProj->setRemark (os.str());
       *theApp->getLog() << os.str().c_str() << "\n";
       
       ::wxYield();
+      ProjectionFileDocument* pProjectionDoc = theApp->newProjectionDoc();
+      if (! pProjectionDoc) {
+        sys_error (ERR_SEVERE, "Unable to create projection document");
+        return;
+      }
+      pProjectionDoc->setProjections (pProj);
       ProjectionFileView* projView = pProjectionDoc->getView();
       if (projView) {
         projView->OnUpdate (projView, NULL);
@@ -1913,28 +1899,28 @@ PhantomFileView::OnRasterize (wxCommandEvent& event)
       m_iDefaultRasterNSamples = 1;
     if (m_iDefaultRasterNX > 0 && m_iDefaultRasterNY > 0) {
       const Phantom& rPhantom = GetDocument()->getPhantom();
-      ImageFileDocument* pRasterDoc = theApp->newImageDoc();
-      if (! pRasterDoc) {
-        sys_error (ERR_SEVERE, "Unable to create image file");
-        return;
-      }
-      ImageFile& imageFile = pRasterDoc->getImageFile();
+
+      ImageFile* pImageFile = new ImageFile;
       
-      imageFile.setArraySize (m_iDefaultRasterNX, m_iDefaultRasterNY);
-      wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), imageFile.nx() + 1, getFrameForChild(), wxPD_CAN_ABORT);
+      pImageFile->setArraySize (m_iDefaultRasterNX, m_iDefaultRasterNY);
+      wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), 
+                                    pImageFile->nx() + 1, getFrameForChild(), wxPD_CAN_ABORT);
       Timer timer;
-      for (unsigned int i = 0; i < imageFile.nx(); i++) {
-        rPhantom.convertToImagefile (imageFile, m_iDefaultRasterNSamples, Trace::TRACE_NONE, i, 1, true);
+      for (unsigned int i = 0; i < pImageFile->nx(); i++) {
+        rPhantom.convertToImagefile (*pImageFile, m_iDefaultRasterNSamples, Trace::TRACE_NONE, i, 1, true);
         if (! dlgProgress.Update (i+1)) {
-          GetDocumentManager()->ActivateView (pRasterDoc->getView(), true, true);
-          pRasterDoc->getView()->getFrame()->SetFocus();
-          wxCommandEvent event;
-          GetDocumentManager()->OnFileClose (event);
-          GetDocumentManager()->ActivateView (this, true, false);
-          getFrame()->SetFocus();
+          delete pImageFile;
           return;
         }
       }
+
+      ImageFileDocument* pRasterDoc = theApp->newImageDoc();
+      if (! pRasterDoc) {
+        sys_error (ERR_SEVERE, "Unable to create image file");
+        return;
+      }
+      pRasterDoc->setImageFile (pImageFile);
+
       pRasterDoc->Modify (true);
       pRasterDoc->UpdateAllViews (this);
       pRasterDoc->getView()->getFrame()->Show(true);
@@ -1942,7 +1928,7 @@ PhantomFileView::OnRasterize (wxCommandEvent& event)
       os << "Rasterize Phantom " << rPhantom.name() << ": XSize=" << m_iDefaultRasterNX << ", YSize=" 
         << m_iDefaultRasterNY << ", nSamples=" << m_iDefaultRasterNSamples;
       *theApp->getLog() << os.str().c_str() << "\n";
-      imageFile.labelAdd (os.str().c_str(), timer.timerEnd());
+      pImageFile->labelAdd (os.str().c_str(), timer.timerEnd());
       ImageFileView* rasterView = pRasterDoc->getView();
       if (rasterView) {
         rasterView->getFrame()->SetFocus();
@@ -2076,6 +2062,7 @@ PhantomFileView::OnClose (bool deleteWindow)
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
+  Activate(false);
   if (m_pCanvas) {
     m_pCanvas->setView(NULL);
     m_pCanvas = NULL;
@@ -2085,10 +2072,9 @@ PhantomFileView::OnClose (bool deleteWindow)
     m_pFrame->SetTitle(s);
   
   SetFrame(NULL);
-  Activate(false);
   
   if (deleteWindow) {
-    m_pFrame->Destroy();
+    delete m_pFrame;
     m_pFrame = NULL;
     if (GetDocument() && GetDocument()->getBadFileOpen())
       ::wxYield();  // wxWindows bug workaround
@@ -2197,7 +2183,7 @@ ProjectionFileView::OnProperties (wxCommandEvent& event)
   const Projections& rProj = GetDocument()->getProjections();
   std::ostringstream os;
   rProj.printScanInfo(os);
-  *theApp->getLog() << os.str().c_str();
+  *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<\n";
   wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Projection File Properties", wxOK | wxICON_INFORMATION);
   dialogMsg.ShowModal();
 }
@@ -2300,31 +2286,25 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event)
     m_iDefaultBackprojector = Backprojector::convertBackprojectNameToID (optBackprojectName.c_str());
     m_iDefaultTrace = dialogReconstruction.getTrace();
     if (m_iDefaultNX > 0 && m_iDefaultNY > 0) {
-      ImageFileDocument* pReconDoc = theApp->newImageDoc();
-      if (! pReconDoc) {
-        sys_error (ERR_SEVERE, "Unable to create image file");
-        return;
-      }
-      ImageFile& imageFile = pReconDoc->getImageFile();
       const Projections& rProj = GetDocument()->getProjections();
-      imageFile.setArraySize (m_iDefaultNX, m_iDefaultNY);
+
+      ImageFile* pImageFile = new ImageFile;
+      pImageFile->setArraySize (m_iDefaultNX, m_iDefaultNY);
       
-      Reconstructor* pReconstruct = new Reconstructor (rProj, imageFile, optFilterName.c_str(), m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace);
+      Reconstructor* pReconstructor = new Reconstructor (rProj, *pImageFile, optFilterName.c_str(), m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(), optInterpName.c_str(), m_iDefaultInterpParam, optBackprojectName.c_str(), m_iDefaultTrace);
       
       Timer timerRecon;
       if (m_iDefaultTrace > Trace::TRACE_CONSOLE) {
-        ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstruct, rProj, imageFile, m_iDefaultTrace, getFrameForChild());
+        ReconstructDialog* pDlgReconstruct = new ReconstructDialog (*pReconstructor, rProj, *pImageFile, m_iDefaultTrace, getFrameForChild());
         for (int iView = 0; iView < rProj.nView(); iView++) {
-          ::wxYield();
           ::wxYield();
           if (pDlgReconstruct->isCancelled() || ! pDlgReconstruct->reconstructView (iView)) {
             delete pDlgReconstruct;
-            delete pReconstruct;
-            pReconDoc->getView()->getFrame()->Close(true);
+            delete pReconstructor;
+            delete pImageFile;
             return;
           }
           ::wxYield();
-          ::wxYield();
           while (pDlgReconstruct->isPaused()) {
             ::wxYield();
             ::wxUsleep(50);
@@ -2334,20 +2314,21 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event)
       } else {
         wxProgressDialog dlgProgress (wxString("Reconstruction"), wxString("Reconstruction Progress"), rProj.nView() + 1, getFrameForChild(), wxPD_CAN_ABORT);
         for (int i = 0; i < rProj.nView(); i++) {
-          pReconstruct->reconstructView (i, 1);
+          pReconstructor->reconstructView (i, 1);
           if (! dlgProgress.Update (i + 1)) {
-            delete pReconstruct;
-            GetDocumentManager()->ActivateView (pReconDoc->getView(), true, true);
-            pReconDoc->getView()->getFrame()->SetFocus();
-            wxCommandEvent event;
-            GetDocumentManager()->OnFileClose (event);
-            GetDocumentManager()->ActivateView (this, true, false);
-            getFrame()->SetFocus();
+            delete pReconstructor;
+            delete pImageFile;
             return;
           }
         }
       }
-      delete pReconstruct;
+      delete pReconstructor;
+      ImageFileDocument* pReconDoc = theApp->newImageDoc();
+      if (! pReconDoc) {
+        sys_error (ERR_SEVERE, "Unable to create image file");
+        return;
+      }
+      pReconDoc->setImageFile (pImageFile);
       pReconDoc->Modify (true);
       pReconDoc->UpdateAllViews (this);
       if (ImageFileView* rasterView = pReconDoc->getView()) {
@@ -2358,8 +2339,8 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event)
       std::ostringstream os;
       os << "Reconstruct " << rProj.getFilename() << ": xSize=" << m_iDefaultNX << ", ySize=" << m_iDefaultNY << ", Filter=" << optFilterName.c_str() << ", FilterParam=" << m_dDefaultFilterParam << ", FilterMethod=" << optFilterMethodName.c_str() << ", FilterGeneration=" << optFilterGenerationName.c_str() << ", Zeropad=" << m_iDefaultZeropad << ", Interpolation=" << optInterpName.c_str() << ", InterpolationParam=" << m_iDefaultInterpParam << ", Backprojection=" << optBackprojectName.c_str();
       *theApp->getLog() << os.str().c_str() << "\n";
-      imageFile.labelAdd (rProj.getLabel());
-      imageFile.labelAdd (os.str().c_str(), timerRecon.timerEnd());
+      pImageFile->labelAdd (rProj.getLabel());
+      pImageFile->labelAdd (os.str().c_str(), timerRecon.timerEnd());
     }
   }
 }
@@ -2554,6 +2535,7 @@ ProjectionFileView::OnClose (bool deleteWindow)
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
+  Activate(false);
   if (m_pCanvas) {
    	m_pCanvas->setView(NULL);
     m_pCanvas = NULL;
@@ -2563,10 +2545,9 @@ ProjectionFileView::OnClose (bool deleteWindow)
     m_pFrame->SetTitle(s);
   
   SetFrame(NULL);
-  Activate(false);
   
   if (deleteWindow) {
-    m_pFrame->Destroy();
+    delete m_pFrame;
     m_pFrame = NULL;
     if (GetDocument() && GetDocument()->getBadFileOpen())
       ::wxYield();  // wxWindows bug workaround
@@ -2628,7 +2609,7 @@ PlotFileView::OnProperties (wxCommandEvent& event)
   std::ostringstream os;
   os << "Columns: " << rPlot.getNumColumns() << ", Records: " << rPlot.getNumRecords() << "\n";
   rPlot.printHeadersBrief (os);
-  *theApp->getLog() << os.str().c_str();
+  *theApp->getLog() << ">>>>\n" << os.str().c_str() << "<<<<<\n";
   wxMessageDialog dialogMsg (getFrameForChild(), os.str().c_str(), "Plot File Properties", wxOK | wxICON_INFORMATION);
   dialogMsg.ShowModal();
 }
@@ -2884,6 +2865,7 @@ PlotFileView::OnClose (bool deleteWindow)
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
+  Activate(false);
   if (m_pCanvas) {
     m_pCanvas->setView (NULL);
     m_pCanvas = NULL;
@@ -2892,11 +2874,9 @@ PlotFileView::OnClose (bool deleteWindow)
   if (m_pFrame)
     m_pFrame->SetTitle(s);
   
-  Activate(false);
-  
   SetFrame(NULL);
   if (deleteWindow) {
-    m_pFrame->Destroy();
+    delete m_pFrame;
     m_pFrame = NULL;
     if (GetDocument() && GetDocument()->getBadFileOpen())
       ::wxYield();  // wxWindows bug workaround
@@ -2953,18 +2933,17 @@ void TextFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint)
 bool 
 TextFileView::OnClose (bool deleteWindow)
 {
-  // if (m_pFrame && m_pFrame->GetTitle() == "Log")
-  return false;
+  if (! theApp->getMainFrame()->getShuttingDown())
+    return false;
   
+  Activate(false);
   //GetDocumentManager()->ActivateView (this, false, true);
   if (! GetDocument() || ! GetDocument()->Close())
     return false;
   
-  Activate(false);
-  
   SetFrame(NULL);
   if (deleteWindow) {
-    m_pFrame->Destroy();
+    delete m_pFrame;
     m_pFrame = NULL;
     if (GetDocument() && GetDocument()->getBadFileOpen())
       ::wxYield();  // wxWindows bug workaround
@@ -2981,9 +2960,9 @@ wxDocChildFrame*
 TextFileView::CreateChildFrame (wxDocument *doc, wxView *view)
 {
 #if CTSIM_MDI
-  wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE);
+  wxDocMDIChildFrame* subframe = new wxDocMDIChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(0,0), wxDEFAULT_FRAME_STYLE, "Log");
 #else
-  wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE);
+  wxDocChildFrame* subframe = new wxDocChildFrame (doc, view, theApp->getMainFrame(), -1, "TextFile Frame", wxPoint(-1, -1), wxSize(300, 150), wxDEFAULT_FRAME_STYLE, "Log");
 #endif
   theApp->setIconForFrame (subframe);
   
diff --git a/src/views.h b/src/views.h
index ddc1d0a..3911ca6 100644
--- a/src/views.h
+++ b/src/views.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: views.h,v 1.40 2001/01/30 02:20:50 kevin Exp $
+**  $Id: views.h,v 1.41 2001/01/30 05:05:41 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
@@ -86,12 +86,12 @@ public:
   void OnUpdate(wxView *sender, wxObject *hint = NULL);
   bool OnClose (bool deleteWindow = true);
   
-  void OnScaleSize (wxCommandEvent& event);
-  void OnExport (wxCommandEvent& event);
-  
+  void OnRevert (wxCommandEvent& event);
+  void OnExport (wxCommandEvent& event);  
   void OnProperties (wxCommandEvent& event);
-  void OnCompare (wxCommandEvent& event);
-  
+
+  void OnCompare (wxCommandEvent& event);  
+  void OnScaleSize (wxCommandEvent& event);
   void OnInvertValues (wxCommandEvent& event);
   void OnSquare (wxCommandEvent& event);
   void OnSquareRoot (wxCommandEvent& event);