X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fdocs.cpp;h=0d838215f46d5730d00e647269db3fc3db46245c;hb=12c5864b8d444fae4607745bbbaa58d2382ecf24;hp=80b0d75ae827b17a044e022f2842a85ad8113c97;hpb=9ff5b5165b2c8871bd4b29ccd5ca794638414615;p=ctsim.git

diff --git a/src/docs.cpp b/src/docs.cpp
index 80b0d75..0d83821 100644
--- a/src/docs.cpp
+++ b/src/docs.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
 ** FILE IDENTIFICATION
 **
-**   Name:          doc.cpp
+**   Name:          docs.cpp
 **   Purpose:       Document routines for CTSim program
 **   Programmer:    Kevin Rosenberg
 **   Date Started:  July 2000
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: docs.cpp,v 1.36 2001/03/13 04:44:25 kevin Exp $
+**  $Id: docs.cpp,v 1.44 2003/01/23 08:03:42 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
@@ -75,12 +75,14 @@ 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();
   UpdateAllViews();
-  getView()->OnUpdate (getView(), NULL);
   m_bBadFileOpen = false;
 
   return true;
@@ -119,7 +121,6 @@ ImageFileDocument::Revert ()
       OnOpenDocument (GetFilename());
     }
   }
-  getView()->OnUpdate (getView(), NULL);
   UpdateAllViews();
 
   return true;
@@ -188,7 +189,7 @@ BackgroundProcessingDocument::cancelRunningTasks()
 
 // ProjectionFileDocument
 
-IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingTask)
+IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingDocument)
 
 bool 
 ProjectionFileDocument::OnSaveDocument(const wxString& filename)
@@ -221,13 +222,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);
+  getView()->setInitialClientSize();
   UpdateAllViews();
-  GetFirstView()->OnUpdate (GetFirstView(), NULL);
-  m_bBadFileOpen = false;
   
   return true;
 }
@@ -261,7 +264,7 @@ ProjectionFileDocument::Activate()
 
 // PhantomFileDocument
 
-IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingTask)
+IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingDocument)
 
 PhantomFileDocument::~PhantomFileDocument()
 {
@@ -269,31 +272,31 @@ 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;
   }
   m_idPhantom = m_phantom.id();
   Modify(false);
   UpdateAllViews();
-  GetFirstView()->OnUpdate (GetFirstView(), NULL);
   m_bBadFileOpen = false;
   
   return true;
@@ -368,14 +371,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;
 }