X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.cpp;h=873e17f43b4260b73feb2005468df85063a437b4;hb=a3b780af2224183d29ab3bdbc997003bcac680b0;hp=931f2a21fdd2cb2469b62ade8d49febb2655d148;hpb=f68afdf6eee93eb1080b6f85a2bb66610cfff5be;p=ctsim.git

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 931f2a2..873e17f 100644
--- 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;