r2130: *** empty log message ***

[ctsim.git] / src / ctsim.cpp

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 2dbdec7cd51b8f90a0f6fc6c5338de0f4a46fd03..5297830900e048ac32a77fe7f50de50ab50441b9 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.111 2002/05/08 08:55:45 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.111 2002/05/08 08:55:45 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
@@ -1026,11 +1026,16 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
   *theApp->getLog() << ", Build Date: " << __TIMESTAMP__;
 #endif
 #if defined(DEBUG)
-  *theApp->getLog() << ", CTSim Debug version";
+  *theApp->getLog() << ", CTSim Debug version" << "\n";
 #else
-  *theApp->getLog() << ", CTSim Release version";
+  *theApp->getLog() << ", CTSim Release version" << "\n";
+#endif
+#ifdef CTSIMVERSION
+  *theApp->getLog() << "Version ";
+  *theApp->getLog() << CTSIMVERSION;
+#elif defined(VERSION)
+    *theApp->getLog() << "Version: " <<  VERSION;
 #endif
-
   *theApp->getLog() << "\n";
   
   wxBitmap bmp (splash);
@@ -1053,6 +1058,21 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
   }
 }
 
+#if 0
+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;
+}
+#endif
 
 ProjectionFileDocument*
 CTSimApp::newProjectionDoc()
@@ -1063,7 +1083,7 @@ CTSimApp::newProjectionDoc()
     newDoc->SetDocumentTemplate (m_pDocTemplProjection);
     newDoc->OnNewDocument();
   }
-  
+
   return newDoc;
 }
 
@@ -1076,7 +1096,7 @@ CTSimApp::newImageDoc()
     newDoc->SetDocumentTemplate (m_pDocTemplImage);
     newDoc->OnNewDocument();
   }
-  
+
   return newDoc;
 }
 
@@ -1124,8 +1144,8 @@ CTSimApp::newPhantomDoc()
   return newDoc;
 }
 
-#if wxUSE_GLCANVAS
 
+#if wxUSE_GLCANVAS
 Graph3dFileDocument*
 CTSimApp::newGraph3dDoc()
 {