X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fdocs.cpp;fp=src%2Fdocs.cpp;h=965f4249f544ec1e4cdc85a1cb65dafa6603b8b8;hp=2a340d18e758c850a3f7422dd8cef80f0b0b28d2;hb=f3c7d22b4544bb1d5c4471bceded6dc5b9ed57fd;hpb=97a6556aa6dedac1041891ae572bed51aaa41769

diff --git a/src/docs.cpp b/src/docs.cpp
index 2a340d1..965f424 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: docs.cpp,v 1.43 2002/06/06 22:50:24 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
@@ -49,12 +49,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 +65,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 +121,6 @@ ImageFileDocument::Revert ()
       OnOpenDocument (GetFilename());
     }
   }
-  //getView()->OnUpdate (getView(), NULL);
   UpdateAllViews();
 
   return true;
@@ -223,20 +212,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 +231,6 @@ ProjectionFileDocument::OnOpenDocument(const wxString& constFilename)
   Modify(false);
   getView()->setInitialClientSize();
   UpdateAllViews();
-  m_bBadFileOpen = false;
   
   return true;
 }
@@ -287,24 +272,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 +361,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 +379,8 @@ PlotFileDocument::OnOpenDocument(const wxString& constFilename)
   SetFilename (filename, true);
   m_namePlot = filename.c_str();
   Modify (false);
+  getView()->setInitialClientSize();
   UpdateAllViews();
-  m_bBadFileOpen = false;
   
   return true;
 }