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

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 873e17f..5297830 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.114 2002/06/04 19:19:40 kevin Exp $
+**  $Id: ctsim.cpp,v 1.117 2002/06/20 08:22:48 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.114 2002/06/04 19:19:40 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.117 2002/06/20 08:22:48 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -119,9 +119,9 @@ CTSimApp::OnInit()
     case O_VERSION:
       std::cout << rcsindent << std::endl;
 #ifdef CTSIMVERSION
-      std::cout << "Version: CTSIMVERSION" << std::endl;
+      std::cout << "Version: " << CTSIMVERSION << std::endl;
 #elif defined(VERSION)
-      std::cout << "Version: VERSION" << std::endl;
+      std::cout << "Version: " << VERSION << std::endl;
 #endif
       exit(0);
     case O_HELP:
@@ -186,7 +186,7 @@ CTSimApp::OnInit()
     int xSize, ySize;
     m_pFrame->GetClientSize(&xSize, &ySize);
     int yLogSize = ySize / 4;
-    m_pLogDoc->getView()->getFrame()->SetClientSize (0, ySize - yLogSize, xSize, yLogSize);
+    m_pLogDoc->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
     m_pLogDoc->getView()->getFrame()->Show (true);
   } else
 #else
@@ -1077,25 +1077,40 @@ CTSimApp::newProjectionDoc()
 ProjectionFileDocument*
 CTSimApp::newProjectionDoc()
 {
-  ProjectionFileDocument* doc = dynamic_cast<ProjectionFileDocument*>(theApp->getDocManager()->CreateDocument (szNEW_PROJECTION_FILENAME, wxDOC_SILENT));
-  doc->getView()->getFrame()->Show(false);
+  ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>(m_pDocTemplProjection->CreateDocument (""));
+  if (newDoc) {
+    newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
+    newDoc->SetDocumentTemplate (m_pDocTemplProjection);
+    newDoc->OnNewDocument();
+  }
 
-  return doc;
+  return newDoc;
 }
 
 ImageFileDocument*
 CTSimApp::newImageDoc()
 {
-  return dynamic_cast<ImageFileDocument*>(theApp->getDocManager()->CreateDocument (szNEW_IMAGE_FILENAME, wxDOC_SILENT));
+  ImageFileDocument* newDoc = dynamic_cast<ImageFileDocument*>(m_pDocTemplImage->CreateDocument (""));
+  if (newDoc) {
+    newDoc->SetDocumentName (m_pDocTemplImage->GetDocumentName());
+    newDoc->SetDocumentTemplate (m_pDocTemplImage);
+    newDoc->OnNewDocument();
+  }
+
+  return newDoc;
 }
 
 PlotFileDocument*
 CTSimApp::newPlotDoc()
 {
-  PlotFileDocument* doc = dynamic_cast<PlotFileDocument*>(theApp->getDocManager()->CreateDocument (szNEW_PLOT_FILENAME, wxDOC_SILENT));
-  doc->getView()->getFrame()->Show(false);
-
-  return doc;
+  PlotFileDocument* newDoc = dynamic_cast<PlotFileDocument*>(m_pDocTemplPlot->CreateDocument (""));
+  if (newDoc) {
+    newDoc->SetDocumentName (m_pDocTemplPlot->GetDocumentName());
+    newDoc->SetDocumentTemplate (m_pDocTemplPlot);
+    newDoc->OnNewDocument();
+  }
+  
+  return newDoc;
 }
 
 
@@ -1129,8 +1144,8 @@ CTSimApp::newPhantomDoc()
   return newDoc;
 }
 
-#if wxUSE_GLCANVAS
 
+#if wxUSE_GLCANVAS
 Graph3dFileDocument*
 CTSimApp::newGraph3dDoc()
 {