X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=inline;f=src%2Fctsim.cpp;h=5297830900e048ac32a77fe7f50de50ab50441b9;hb=cf73da96069292cb372f9fe2b18885f5fc16a3cf;hp=931f2a21fdd2cb2469b62ade8d49febb2655d148;hpb=f68afdf6eee93eb1080b6f85a2bb66610cfff5be;p=ctsim.git

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 931f2a2..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.113 2002/06/03 03:58:07 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.113 2002/06/03 03:58:07 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
@@ -1058,7 +1058,7 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
   }
 }
 
-
+#if 0
 ProjectionFileDocument*
 CTSimApp::newProjectionDoc()
 {
@@ -1068,13 +1068,24 @@ 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* newDoc = dynamic_cast<ProjectionFileDocument*>(m_pDocTemplProjection->CreateDocument (""));
+  if (newDoc) {
+    newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
+    newDoc->SetDocumentTemplate (m_pDocTemplProjection);
+    newDoc->OnNewDocument();
+  }
+
+  return newDoc;
+}
 
 ImageFileDocument*
 CTSimApp::newImageDoc()
@@ -1084,11 +1095,8 @@ CTSimApp::newImageDoc()
     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;
 }
 
@@ -1100,9 +1108,6 @@ CTSimApp::newPlotDoc()
     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;
@@ -1120,9 +1125,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,16 +1139,13 @@ 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;
 }
 
-#if wxUSE_GLCANVAS
 
+#if wxUSE_GLCANVAS
 Graph3dFileDocument*
 CTSimApp::newGraph3dDoc()
 {
@@ -1155,9 +1154,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;