X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fdocs.cpp;h=179cc89750461dca1a20a89f22bdbf56a1a29dff;hb=7fdb0496c8582134ebd84b91de3e399c8f95dbcd;hp=c39b72b4c22db7e7c35ff090b543dc970222bc69;hpb=e4c1f7f8eb87558c3abf3bf1d20732361f425351;p=ctsim.git

diff --git a/src/docs.cpp b/src/docs.cpp
index c39b72b..179cc89 100644
--- a/src/docs.cpp
+++ b/src/docs.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: docs.cpp,v 1.2 2000/07/15 08:36:13 kevin Exp $
+**  $Id: docs.cpp,v 1.6 2000/12/18 09:55:22 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
@@ -51,7 +51,6 @@
 #include "docs.h"
 #include "views.h"
 
-
 // ImageFileDocument
 
 IMPLEMENT_DYNAMIC_CLASS(ImageFileDocument, wxDocument)
@@ -73,7 +72,7 @@ bool ImageFileDocument::OnOpenDocument(const wxString& filename)
     wxString untitledFilename = theApp->getUntitledFilename();
     SetFilename (untitledFilename, true);
   } else {
-    if (! m_imageFile.fileRead (filename)) {
+    if (! m_imageFile.fileRead (filename.c_str())) {
       *theApp->getLog() << "Unable to read image file " << filename << "\n";
       return false;
     }
@@ -81,7 +80,11 @@ bool ImageFileDocument::OnOpenDocument(const wxString& filename)
     SetFilename(filename, true);
   }
   Modify(false);
-  UpdateAllViews();
+  UpdateAllViews();
+  ImageFileView* ifView = dynamic_cast<ImageFileView*>(GetFirstView());
+  if (ifView)
+	  ifView->OnUpdate(ifView, NULL);
+
   return true;
 }
 
@@ -95,13 +98,19 @@ void ImageFileDocument::Modify(bool mod)
     wxDocument::Modify(mod);
 }
 
+bool ImageFileDocument::OnCloseDocument ()
+{
+  bool bReturn = wxDocument::OnCloseDocument();
+  return bReturn;
+}
+
 // ProjectionFileDocument
 
 IMPLEMENT_DYNAMIC_CLASS(ProjectionFileDocument, wxDocument)
 
 bool ProjectionFileDocument::OnSaveDocument(const wxString& filename)
 {
-  if (! m_projectionFile.write (filename)) {
+  if (! m_projectionFile.write (filename.c_str())) {
     *theApp->getLog() << "Unable to write projection file " << filename << "\n";
     return false;
   }
@@ -116,7 +125,7 @@ bool ProjectionFileDocument::OnOpenDocument(const wxString& filename)
     wxString untitledFilename = theApp->getUntitledFilename();
     SetFilename (untitledFilename, true);
   } else {
-    if (! m_projectionFile.read (filename)) {
+    if (! m_projectionFile.read (filename.c_str())) {
       *theApp->getLog() << "Unable to read projection file " << filename << "\n";
       return false;
     }
@@ -139,6 +148,12 @@ void ProjectionFileDocument::Modify(bool mod)
 }
 
 
+bool ProjectionFileDocument::OnCloseDocument ()
+{
+  bool bReturn = wxDocument::OnCloseDocument();
+  return bReturn;
+}
+
 // PhantomDocument
 
 IMPLEMENT_DYNAMIC_CLASS(PhantomDocument, wxDocument)
@@ -148,6 +163,7 @@ bool PhantomDocument::OnOpenDocument(const wxString& filename)
   wxString myFilename = filename;
   if (wxFile::Exists (myFilename)) {
     m_phantom.createFromFile (myFilename);
+    *theApp->getLog() << "Read phantom file " << filename << "\n";
   } else {
     myFilename.Replace (".phm", "");
     m_phantom.createFromPhantom (myFilename);
@@ -164,6 +180,12 @@ bool PhantomDocument::OnOpenDocument(const wxString& filename)
   return true;
 }
 
+bool PhantomDocument::OnCloseDocument ()
+{
+  bool bReturn = wxDocument::OnCloseDocument();
+  return bReturn;
+}
+
 bool PhantomDocument::IsModified(void) const
 {
   return wxDocument::IsModified();