r2105: *** empty log message ***

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 931f2a21fdd2cb2469b62ade8d49febb2655d148..873e17f43b4260b73feb2005468df85063a437b4 100644 (file)
--- a/src/ctsim.cpp
+++ b/src/ctsim.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: ctsim.cpp,v 1.113 2002/06/03 03:58:07 kevin Exp $
+**  $Id: ctsim.cpp,v 1.114 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
@@ -70,7 +70,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.113 2002/06/03 03:58:07 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.114 2002/06/04 19:19:40 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -1058,7 +1058,7 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
   }
 }
 
-
+#if 0
 ProjectionFileDocument*
 CTSimApp::newProjectionDoc()
 {
@@ -1068,44 +1068,34 @@ CTSimApp::newProjectionDoc()
     newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
     newDoc->SetDocumentTemplate (m_pDocTemplProjection);
     newDoc->OnNewDocument();
-    if (newDoc->getView())
-      if (newDoc->getView()->getFrame())
-       newDoc->getView()->getFrame()->Show(false);
   }
   
   return newDoc;
 }
+#endif
+
+ProjectionFileDocument*
+CTSimApp::newProjectionDoc()
+{
+  ProjectionFileDocument* doc = dynamic_cast<ProjectionFileDocument*>(theApp->getDocManager()->CreateDocument (szNEW_PROJECTION_FILENAME, wxDOC_SILENT));
+  doc->getView()->getFrame()->Show(false);
+
+  return doc;
+}
 
 ImageFileDocument*
 CTSimApp::newImageDoc()
 {
-  ImageFileDocument* newDoc = dynamic_cast<ImageFileDocument*>(m_pDocTemplImage->CreateDocument (""));
-  if (newDoc) {
-    newDoc->SetDocumentName (m_pDocTemplImage->GetDocumentName());
-    newDoc->SetDocumentTemplate (m_pDocTemplImage);
-    newDoc->OnNewDocument();
-    if (newDoc->getView())
-      if (newDoc->getView()->getFrame())
-       newDoc->getView()->getFrame()->Show(false);
-  }
-  
-  return newDoc;
+  return dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument (szNEW_IMAGE_FILENAME, wxDOC_SILENT));
 }
 
 PlotFileDocument*
 CTSimApp::newPlotDoc()
 {
-  PlotFileDocument* newDoc = dynamic_cast<PlotFileDocument*>(m_pDocTemplPlot->CreateDocument (""));
-  if (newDoc) {
-    newDoc->SetDocumentName (m_pDocTemplPlot->GetDocumentName());
-    newDoc->SetDocumentTemplate (m_pDocTemplPlot);
-    newDoc->OnNewDocument();
-    if (newDoc->getView())
-      if (newDoc->getView()->getFrame())
-       newDoc->getView()->getFrame()->Show(false);
-  }
-  
-  return newDoc;
+  PlotFileDocument* doc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument (szNEW_PLOT_FILENAME, wxDOC_SILENT));
+  doc->getView()->getFrame()->Show(false);
+
+  return doc;
 }
 
 
@@ -1120,9 +1110,6 @@ CTSimApp::newTextDoc()
     newDoc->SetDocumentName (m_pDocTemplText->GetDocumentName());
     newDoc->SetDocumentTemplate (m_pDocTemplText);
     newDoc->OnNewDocument();
-    if (newDoc->getView())
-      if (newDoc->getView()->getFrame())
-       newDoc->getView()->getFrame()->Show(false);
   }
   
   return newDoc;
@@ -1137,9 +1124,6 @@ CTSimApp::newPhantomDoc()
     newDoc->SetDocumentName (m_pDocTemplPhantom->GetDocumentName());
     newDoc->SetDocumentTemplate (m_pDocTemplPhantom);
     newDoc->OnNewDocument();
-    if (newDoc->getView())
-      if (newDoc->getView()->getFrame())
-       newDoc->getView()->getFrame()->Show(false);
   }
   
   return newDoc;
@@ -1155,9 +1139,6 @@ CTSimApp::newGraph3dDoc()
     newDoc->SetDocumentName (m_pDocTemplGraph3d->GetDocumentName());
     newDoc->SetDocumentTemplate (m_pDocTemplGraph3d);
     newDoc->OnNewDocument();
-    if (newDoc->getView())
-      if (newDoc->getView()->getFrame())
-       newDoc->getView()->getFrame()->Show(false);
   }
   
   return newDoc;

diff --git a/src/docs.cpp b/src/docs.cpp
index 15ef98c1a1680d5a8a0927a36f15a3e38e6fd01f..7d8eb8820ec853654915917be0fa3dff297a5a65 100644 (file)
--- 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.40 2002/06/02 19:01:58 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,18 +71,24 @@ 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();

diff --git a/src/docs.h b/src/docs.h
index 966cdddece2ea65592bad0f17b20452588fad1ef..a297bbfa09b21dc5f4b6d9c0029e69f8d85c73f6 100644 (file)
--- a/src/docs.h
+++ b/src/docs.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: docs.h,v 1.31 2002/05/28 18:43:16 kevin Exp $
+**  $Id: docs.h,v 1.32 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
@@ -48,6 +48,12 @@ class PlotFileView;
 class TextFileView;
 class Graph3dFileView;
 
+extern const char szNEW_IMAGE_FILENAME[];
+extern const char szNEW_PROJECTION_FILENAME[];
+extern const char szNEW_GRAPH3D_FILENAME[];
+extern const char szNEW_PLOT_FILENAME[];
+
+
 class ImageFileDocument: public wxDocument
 {
 private: