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

diff --git a/src/docs.cpp b/src/docs.cpp
index aa70dbf..965f424 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.34 2001/03/11 17:55:29 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
@@ -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;
@@ -104,14 +106,6 @@ ImageFileDocument::getView() const
   return dynamic_cast<ImageFileView*>(GetFirstView()); 
 }
 
-void
-ImageFileDocument::Activate()
-{
-#if CTSIM_MDI
-  getView()->getFrame()->Activate();
-#endif
-};
-
 bool
 ImageFileDocument::Revert ()
 {
@@ -127,12 +121,19 @@ ImageFileDocument::Revert ()
       OnOpenDocument (GetFilename());
     }
   }
-  getView()->OnUpdate (getView(), NULL);
   UpdateAllViews();
 
   return true;
 }
 
+void
+ImageFileDocument::Activate()
+{
+#if CTSIM_MDI
+  getView()->getFrame()->Activate();
+#endif
+};
+
 // BackgroundProcessingDocument - Base Class
 
 IMPLEMENT_DYNAMIC_CLASS(BackgroundProcessingDocument, wxDocument)
@@ -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;
 }
@@ -251,6 +254,14 @@ ProjectionFileDocument::getView() const
   return dynamic_cast<ProjectionFileView*>(GetFirstView()); 
 }
 
+void
+ProjectionFileDocument::Activate()
+{
+#if CTSIM_MDI
+  getView()->getFrame()->Activate();
+#endif
+};
+
 // PhantomFileDocument
 
 IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingTask)
@@ -261,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;
@@ -323,6 +334,14 @@ PhantomFileDocument::getView() const
   return dynamic_cast<PhantomFileView*>(GetFirstView()); 
 }
 
+void
+PhantomFileDocument::Activate()
+{
+#if CTSIM_MDI
+  getView()->getFrame()->Activate();
+#endif
+};
+
 // PlotFileDocument
 
 IMPLEMENT_DYNAMIC_CLASS(PlotFileDocument, wxDocument)
@@ -352,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;
 }
@@ -383,6 +404,14 @@ PlotFileDocument::getView() const
   return dynamic_cast<PlotFileView*>(GetFirstView()); 
 }
 
+void
+PlotFileDocument::Activate()
+{
+#if CTSIM_MDI
+  getView()->getFrame()->Activate();
+#endif
+};
+
 //////////////////////////////////////////////////////////////////////////
 //
 // TextFileDocument
@@ -461,8 +490,6 @@ Graph3dFileDocument::Graph3dFileDocument(void)
 
 Graph3dFileDocument::~Graph3dFileDocument() 
 {
-//    delete [] m_pVertices;
-//    delete [] m_pNormals;
 }
 
 bool 
@@ -498,10 +525,6 @@ Graph3dFileDocument::getView() const
 bool
 Graph3dFileDocument::createFromImageFile (const ImageFile& rImageFile)
 {
-//  delete [] m_pVertices;
-//  delete [] m_pNormals;
-
-
   m_nx = rImageFile.nx();
   m_ny = rImageFile.ny();
   m_array = rImageFile.getArray();
@@ -509,4 +532,13 @@ Graph3dFileDocument::createFromImageFile (const ImageFile& rImageFile)
   return true;
 }
 
+void
+Graph3dFileDocument::Activate()
+{
+#if CTSIM_MDI
+  getView()->getFrame()->Activate();
+#endif
+};
+
+
 #endif // wxUSE_GLCANVAS