X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fdocs.cpp;h=82a740e7b2412aeefe854aa08c4076c35b7ee39c;hb=a2bb680d159717dbd81e3ad179cb28adbf3a3e9a;hp=5a73fe819f39ed0c337e040d64e0aeaf8b4c5b83;hpb=67e0b59f7b40b2c2f1d0587b24b4ecf4881b3824;p=ctsim.git

diff --git a/src/docs.cpp b/src/docs.cpp
index 5a73fe8..82a740e 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.39 2002/06/02 17:57:02 kevin Exp $
+**  $Id$
 **
 **  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
@@ -25,10 +25,6 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-#ifdef __GNUG__
-// #pragma implementation
-#endif
-
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
@@ -75,8 +71,10 @@ bool ImageFileDocument::OnOpenDocument(const wxString& filename)
     m_bBadFileOpen = true;
     return false;
   }
-  if (theApp->getVerboseLogging())
+  
+  if (theApp->getVerboseLogging() && filename != "")
     *theApp->getLog() << "Read image file " << filename << "\n";
+  
   SetFilename(filename, true);  
   Modify(false);
   getView()->setInitialClientSize();
@@ -119,7 +117,6 @@ ImageFileDocument::Revert ()
       OnOpenDocument (GetFilename());
     }
   }
-  //getView()->OnUpdate (getView(), NULL);
   UpdateAllViews();
 
   return true;
@@ -188,7 +185,7 @@ BackgroundProcessingDocument::cancelRunningTasks()
 
 // ProjectionFileDocument
 
-IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingTask)
+IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingDocument)
 
 bool 
 ProjectionFileDocument::OnSaveDocument(const wxString& filename)
@@ -221,13 +218,15 @@ ProjectionFileDocument::OnOpenDocument(const wxString& filename)
     m_bBadFileOpen = true;
     return false;
   }
-  if (theApp->getVerboseLogging())
+  m_bBadFileOpen = false;
+
+  if (theApp->getVerboseLogging() && filename != "")
     *theApp->getLog() << "Read projection file " << filename << "\n";
+
   SetFilename(filename, true);
   Modify(false);
-  UpdateAllViews();
   getView()->setInitialClientSize();
-  m_bBadFileOpen = false;
+  UpdateAllViews();
   
   return true;
 }
@@ -261,7 +260,7 @@ ProjectionFileDocument::Activate()
 
 // PhantomFileDocument
 
-IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingTask)
+IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingDocument)
 
 PhantomFileDocument::~PhantomFileDocument()
 {
@@ -269,24 +268,25 @@ PhantomFileDocument::~PhantomFileDocument()
 }
 
 bool 
-PhantomFileDocument::OnOpenDocument(const wxString& filename)
+PhantomFileDocument::OnOpenDocument(const wxString& constFilename)
 {
   if (! OnSaveModified())
     return false;
 
-  wxString myFilename = filename;
-  if (wxFile::Exists (myFilename)) {
-    m_phantom.createFromFile (myFilename);
+  wxString filename (constFilename);
+
+  if (wxFile::Exists (filename)) {
+    m_phantom.createFromFile (filename);
     if (theApp->getVerboseLogging())
       *theApp->getLog() << "Read phantom file " << filename << "\n";
   } else {
-    myFilename.Replace (".phm", "");
-    m_phantom.createFromPhantom (myFilename);
+    filename.Replace (".phm", "");
+    m_phantom.createFromPhantom (filename);
   }
-  m_namePhantom = myFilename;
-  SetFilename (myFilename, true);
+  m_namePhantom = filename;
+  SetFilename (filename, true);
   if (m_phantom.fail()) {
-    *theApp->getLog() << "Failure creating phantom " << myFilename << "\n";
+    *theApp->getLog() << "Failure creating phantom " << filename << "\n";
     m_bBadFileOpen = true;
     return false;
   }
@@ -367,14 +367,16 @@ PlotFileDocument::OnOpenDocument(const wxString& filename)
     m_bBadFileOpen = true;
     return false;
   }
-  if (theApp->getVerboseLogging())
+  m_bBadFileOpen = false;
+
+  if (theApp->getVerboseLogging() && filename != "")
     *theApp->getLog() << "Read plot file " << filename << "\n";
+
   SetFilename (filename, true);
   m_namePlot = filename.c_str();
   Modify (false);
+  getView()->setInitialClientSize();
   UpdateAllViews();
-  //GetFirstView()->OnUpdate (NULL, NULL);
-  m_bBadFileOpen = false;
   
   return true;
 }
@@ -436,7 +438,7 @@ TextFileDocument::OnOpenDocument(const wxString& filename)
   
   SetFilename (filename, true);
   Modify (false);
-  //  UpdateAllViews();
+  UpdateAllViews();
   m_bBadFileOpen = false;
   return true;
 }
@@ -498,7 +500,8 @@ Graph3dFileDocument::OnOpenDocument(const wxString& filename)
 {
   SetFilename (filename, true);
   Modify (false);
-  //  UpdateAllViews();
+  getView()->setInitialClientSize();
+  UpdateAllViews();
   m_bBadFileOpen = false;
   return true;
 }