X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fdocs.cpp;h=82a740e7b2412aeefe854aa08c4076c35b7ee39c;hb=232b3dbd5572d95ab9023ec02f46dd145c5afc13;hp=2a340d18e758c850a3f7422dd8cef80f0b0b28d2;hpb=7e4ade1664a9e49295ee5ec249ed596d40d6db65;p=ctsim.git

diff --git a/src/docs.cpp b/src/docs.cpp
index 2a340d1..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.42 2002/06/04 19:24:03 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
@@ -49,12 +45,6 @@
 #include "threadrecon.h"
 
 
-const char szNEW_IMAGE_FILENAME[] = "___CTSIM___INTERNAL___NEW___.if";
-const char szNEW_PROJECTION_FILENAME[] = "___CTSIM___INTERNAL___NEW___.pj";
-const char szNEW_GRAPH3D_FILENAME[] = "___CTSIM___INTERNAL___NEW___.3d";
-const char szNEW_PLOT_FILENAME[] = "___CTSIM___INTERNAL___NEW___.plt";
-
-
 // ImageFileDocument
 
 IMPLEMENT_DYNAMIC_CLASS(ImageFileDocument, wxDocument)
@@ -71,16 +61,12 @@ bool ImageFileDocument::OnSaveDocument(const wxString& filename)
   return true;
 }
 
-bool ImageFileDocument::OnOpenDocument(const wxString& constFilename)
+bool ImageFileDocument::OnOpenDocument(const wxString& filename)
 {
   if (! OnSaveModified())
     return false;
 
-  wxString filename (constFilename);
-
-  if (filename == szNEW_IMAGE_FILENAME)
-    filename = "";
-  else if (! m_pImageFile->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;
@@ -131,7 +117,6 @@ ImageFileDocument::Revert ()
       OnOpenDocument (GetFilename());
     }
   }
-  //getView()->OnUpdate (getView(), NULL);
   UpdateAllViews();
 
   return true;
@@ -200,7 +185,7 @@ BackgroundProcessingDocument::cancelRunningTasks()
 
 // ProjectionFileDocument
 
-IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingTask)
+IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, BackgroundProcessingDocument)
 
 bool 
 ProjectionFileDocument::OnSaveDocument(const wxString& filename)
@@ -223,20 +208,17 @@ ProjectionFileDocument::~ProjectionFileDocument()
 }
 
 bool 
-ProjectionFileDocument::OnOpenDocument(const wxString& constFilename)
+ProjectionFileDocument::OnOpenDocument(const wxString& filename)
 {
   if (! OnSaveModified())
     return false;
 
-  wxString filename (constFilename);
-
-  if (filename == szNEW_PROJECTION_FILENAME)
-    filename = "";
-  else if (! m_pProjectionFile->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;
   }
+  m_bBadFileOpen = false;
 
   if (theApp->getVerboseLogging() && filename != "")
     *theApp->getLog() << "Read projection file " << filename << "\n";
@@ -245,7 +227,6 @@ ProjectionFileDocument::OnOpenDocument(const wxString& constFilename)
   Modify(false);
   getView()->setInitialClientSize();
   UpdateAllViews();
-  m_bBadFileOpen = false;
   
   return true;
 }
@@ -279,7 +260,7 @@ ProjectionFileDocument::Activate()
 
 // PhantomFileDocument
 
-IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingTask)
+IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingDocument)
 
 PhantomFileDocument::~PhantomFileDocument()
 {
@@ -287,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;
   }
@@ -375,20 +357,17 @@ PlotFileDocument::OnSaveDocument(const wxString& filename)
 }
 
 bool 
-PlotFileDocument::OnOpenDocument(const wxString& constFilename)
+PlotFileDocument::OnOpenDocument(const wxString& filename)
 {
   if (! OnSaveModified())
     return false;
 
-  wxString filename (constFilename);
-
-  if (filename == szNEW_PLOT_FILENAME)
-    filename = "";
-  else if (! m_plot.fileRead (filename.c_str())) {
+  if (! m_plot.fileRead (filename.c_str())) {
     *theApp->getLog() << "Unable to read plot file " << filename << "\n";
     m_bBadFileOpen = true;
     return false;
   }
+  m_bBadFileOpen = false;
 
   if (theApp->getVerboseLogging() && filename != "")
     *theApp->getLog() << "Read plot file " << filename << "\n";
@@ -396,8 +375,8 @@ PlotFileDocument::OnOpenDocument(const wxString& constFilename)
   SetFilename (filename, true);
   m_namePlot = filename.c_str();
   Modify (false);
+  getView()->setInitialClientSize();
   UpdateAllViews();
-  m_bBadFileOpen = false;
   
   return true;
 }
@@ -521,6 +500,7 @@ Graph3dFileDocument::OnOpenDocument(const wxString& filename)
 {
   SetFilename (filename, true);
   Modify (false);
+  getView()->setInitialClientSize();
   UpdateAllViews();
   m_bBadFileOpen = false;
   return true;