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

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index 5297830..eea9e60 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.117 2002/06/20 08:22:48 kevin Exp $
+**  $Id: ctsim.cpp,v 1.118 2002/06/20 11:55:44 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
@@ -46,7 +46,6 @@
 #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
 #endif
 
-
 #include "ct.h"
 #include "ctndicom.h"
 #include "ctsim.h"
@@ -70,7 +69,7 @@
 #endif
 #endif
 
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.117 2002/06/20 08:22:48 kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.118 2002/06/20 11:55:44 kevin Exp $";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -118,10 +117,10 @@ CTSimApp::OnInit()
     switch (c) {
     case O_VERSION:
       std::cout << rcsindent << std::endl;
-#ifdef CTSIMVERSION
+#ifdef VERSION
+      std::cout << "Version: " << VERSION << std::endl;
+#elif defined(CTSIMVERSION)
       std::cout << "Version: " << CTSIMVERSION << std::endl;
-#elif defined(VERSION)
-      std::cout << "Version: " << VERSION << std::endl;
 #endif
       exit(0);
     case O_HELP:
@@ -196,16 +195,21 @@ CTSimApp::OnInit()
   
   wxString helpDir;
   if (! m_pConfig->Read("HelpDir", &helpDir))
-    helpDir = ::wxGetCwd();
+    helpDir = ::wxGetCwd();
 #ifdef CTSIM_WINHELP
   if (! m_pFrame->getWinHelpController().Initialize(helpDir + "/ctsim"))
     *m_pLog << "Cannot initialize the Windows Help system" << "\n";
-#else
-  wxString docDir (DATADIR);
+#else
+#ifdef DATADIR
+  wxString docDir (DATADIR);
+#else
+  wxString docDir (::wxGetCwd());
+#endif
   wxString docFile = docDir + "ctsim.htb";
   if (! m_pFrame->getHtmlHelpController().AddBook(docFile) &&
-    ! m_pFrame->getHtmlHelpController().Initialize("/usr/share/ctsim/ctsim.htb"))
-    *m_pLog << "Cannot initialize the HTML Help system" << "\n";
+    ! m_pFrame->getHtmlHelpController().AddBook("/usr/share/ctsim/ctsim.htb") &&
+	! m_pFrame->getHtmlHelpController().AddBook("/tmp/ctsim.htb"))
+        *m_pLog << "Cannot initialize the HTML Help system" << "\n";
   else {
     if (::wxDirExists ("/tmp"))
       m_pFrame->getHtmlHelpController().SetTempDir(_T("/tmp"));
@@ -688,8 +692,7 @@ MainFrame::showHelp (int commandID)
     m_htmlHelp.Display ("Contents");
 #endif
     break;
-    
-    
+        
   default:
 #ifdef CTSIM_WINHELP
     m_winHelp.DisplaySection (commandID);
@@ -1026,15 +1029,14 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
   *theApp->getLog() << ", Build Date: " << __TIMESTAMP__;
 #endif
 #if defined(DEBUG)
-  *theApp->getLog() << ", CTSim Debug version" << "\n";
+  *theApp->getLog() << ", Debug version";
 #else
-  *theApp->getLog() << ", CTSim Release version" << "\n";
+  *theApp->getLog() << ", Release version";
 #endif
-#ifdef CTSIMVERSION
-  *theApp->getLog() << "Version ";
-  *theApp->getLog() << CTSIMVERSION;
-#elif defined(VERSION)
-    *theApp->getLog() << "Version: " <<  VERSION;
+#ifdef VERSION
+    *theApp->getLog() << " " <<  VERSION;
+#elif defined(CTSIMVERSION)
+    *theApp->getLog() << " " <<  CTSIMVERSION;
 #endif
   *theApp->getLog() << "\n";
   
@@ -1044,12 +1046,10 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
     dlg.ShowModal();
   } else {
     wxString msg = "CTSim\nThe Open Source Computed Tomography Simulator\n";
-#ifdef CTSIMVERSION
-    msg += "Version ";
-    msg += CTSIMVERSION;
-    msg += "\n\n";
-#elif defined(VERSION)
+#ifdef VERSION
     msg << "Version: " <<  VERSION << "\n\n";
+#elif defined(CTSIMVERSION)
+    msg << "Version: " <<  CTSIMVERSION << "\n\n";
 #endif
     msg += "Author: Kevin Rosenberg <kevin@rosenberg.net>\nUsage: ctsim [files-to-open..] [--help]";
     
@@ -1058,21 +1058,8 @@ 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
+
+// Create new documents
 
 ProjectionFileDocument*
 CTSimApp::newProjectionDoc()