X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fdocs.cpp;h=7d8eb8820ec853654915917be0fa3dff297a5a65;hb=a3b780af2224183d29ab3bdbc997003bcac680b0;hp=fa46a9101415b1d5298727f6d27aa2ba3ae4f5a8;hpb=79ef6dfda2cb12c01dbc60f2ccdcef3f72a911c4;p=ctsim.git

diff --git a/src/docs.cpp b/src/docs.cpp
index fa46a91..7d8eb88 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.35 2001/03/11 18:52:03 kevin Exp $
+**  $Id: docs.cpp,v 1.41 2002/06/04 19:19:40 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,6 +49,12 @@
 #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)
@@ -65,22 +71,28 @@ bool ImageFileDocument::OnSaveDocument(const wxString& filename)
   return true;
 }
 
-bool ImageFileDocument::OnOpenDocument(const wxString& filename)
+bool ImageFileDocument::OnOpenDocument(const wxString& constFilename)
 {
   if (! OnSaveModified())
     return false;
 
-  if (! m_pImageFile->fileRead (filename.c_str())) {
+  wxString filename (constFilename);
+
+  if (filename == szNEW_IMAGE_FILENAME) {
+    filename = "";
+  } else if (! m_pImageFile->fileRead (filename.c_str())) {
     *theApp->getLog() << "Unable to read image file " << filename << "\n";
     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 +131,7 @@ ImageFileDocument::Revert ()
       OnOpenDocument (GetFilename());
     }
   }
-  getView()->OnUpdate (getView(), NULL);
+  //getView()->OnUpdate (getView(), NULL);
   UpdateAllViews();
 
   return true;
@@ -225,8 +237,8 @@ ProjectionFileDocument::OnOpenDocument(const wxString& 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;
@@ -293,7 +305,6 @@ PhantomFileDocument::OnOpenDocument(const wxString& filename)
   m_idPhantom = m_phantom.id();
   Modify(false);
   UpdateAllViews();
-  GetFirstView()->OnUpdate (GetFirstView(), NULL);
   m_bBadFileOpen = false;
   
   return true;
@@ -374,7 +385,7 @@ PlotFileDocument::OnOpenDocument(const wxString& filename)
   m_namePlot = filename.c_str();
   Modify (false);
   UpdateAllViews();
-  GetFirstView()->OnUpdate (NULL, NULL);
+  //GetFirstView()->OnUpdate (NULL, NULL);
   m_bBadFileOpen = false;
   
   return true;
@@ -437,7 +448,7 @@ TextFileDocument::OnOpenDocument(const wxString& filename)
   
   SetFilename (filename, true);
   Modify (false);
-  UpdateAllViews();
+  //  UpdateAllViews();
   m_bBadFileOpen = false;
   return true;
 }
@@ -485,8 +496,6 @@ Graph3dFileDocument::Graph3dFileDocument(void)
 
 Graph3dFileDocument::~Graph3dFileDocument() 
 {
-//    delete [] m_pVertices;
-//    delete [] m_pNormals;
 }
 
 bool 
@@ -501,7 +510,7 @@ Graph3dFileDocument::OnOpenDocument(const wxString& filename)
 {
   SetFilename (filename, true);
   Modify (false);
-  UpdateAllViews();
+  //  UpdateAllViews();
   m_bBadFileOpen = false;
   return true;
 }
@@ -522,10 +531,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();