X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.cpp;h=b3ce9e2d745c53d42af262b9233746f5eba1a8e5;hb=82a12d49ecd2c09c301e6513b549c358f715e764;hp=afdc4b354c273190b77ee57bd9dffb4e1ac6b3c9;hpb=67e0b59f7b40b2c2f1d0587b24b4ecf4881b3824;p=ctsim.git

diff --git a/src/ctsim.cpp b/src/ctsim.cpp
index afdc4b3..b3ce9e2 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.112 2002/06/02 17:57:02 kevin Exp $
+**  $Id$
 **
 **  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.112 2002/06/02 17:57:02 kevin Exp $";
+static const char* rcsindent = "$Id$";
 
 struct option CTSimApp::ctsimOptions[] = 
 {
@@ -111,17 +110,21 @@ CTSimApp::OnInit()
   bool bPrintFiles = false;
   // process options
   while (1) {
+#ifdef __WXMAC__
+    int c = -1;
+#else
     int c = getopt_long (argc, argv, "", ctsimOptions, NULL);
+#endif
     if (c == -1)
       break;
     
     switch (c) {
     case O_VERSION:
       std::cout << rcsindent << std::endl;
-#ifdef CTSIMVERSION
-      std::cout << "Version: CTSIMVERSION" << std::endl;
-#elif defined(VERSION)
-      std::cout << "Version: VERSION" << std::endl;
+#ifdef VERSION
+      std::cout << "Version: " << VERSION << std::endl;
+#elif defined(CTSIMVERSION)
+      std::cout << "Version: " << CTSIMVERSION << std::endl;
 #endif
       exit(0);
     case O_HELP:
@@ -186,7 +189,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
@@ -201,11 +204,16 @@ CTSimApp::OnInit()
   if (! m_pFrame->getWinHelpController().Initialize(helpDir + "/ctsim"))
     *m_pLog << "Cannot initialize the Windows Help system" << "\n";
 #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 +696,7 @@ MainFrame::showHelp (int commandID)
     m_htmlHelp.Display ("Contents");
 #endif
     break;
-    
-    
+        
   default:
 #ifdef CTSIM_WINHELP
     m_winHelp.DisplaySection (commandID);
@@ -742,9 +749,9 @@ MainFrame::DoWindowMenu (int iMenuPosition, wxCommandEvent& event)
     wxString strFilename = pDoc->GetFilename();
     const wxView* pView = pDoc->GetFirstView();
     if (pView) {
-      wxFrame* pFrame = pView->GetFrame();
-      pFrame->SetFocus();
-      pFrame->Raise();
+      wxWindow* pWindow = pView->GetFrame();
+      pWindow->SetFocus();
+      pWindow->Raise();
     }
   }
 }
@@ -1016,25 +1023,21 @@ MainFrame::OnImport (wxCommandEvent& WXUNUSED(event) )
 void 
 MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
-  long lFreeMem = ::wxGetFreeMemory() / (1024L * 1024L);
   wxString strOSDesc = ::wxGetOsDescription();
   *theApp->getLog() << "Operating System: " << strOSDesc;
-  if (lFreeMem > 0)
-    *theApp->getLog() << ",  Free Memory: " << lFreeMem << " MB";
   *theApp->getLog() << ", wxWindows: " << wxVERSION_STRING;
 #ifdef __TIMESTAMP__
   *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 +1047,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]";
     
@@ -1059,6 +1060,8 @@ MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 }
 
 
+// Create new documents
+
 ProjectionFileDocument*
 CTSimApp::newProjectionDoc()
 {
@@ -1068,7 +1071,7 @@ CTSimApp::newProjectionDoc()
     newDoc->SetDocumentTemplate (m_pDocTemplProjection);
     newDoc->OnNewDocument();
   }
-  
+
   return newDoc;
 }
 
@@ -1081,7 +1084,7 @@ CTSimApp::newImageDoc()
     newDoc->SetDocumentTemplate (m_pDocTemplImage);
     newDoc->OnNewDocument();
   }
-  
+
   return newDoc;
 }
 
@@ -1129,8 +1132,8 @@ CTSimApp::newPhantomDoc()
   return newDoc;
 }
 
-#if wxUSE_GLCANVAS
 
+#if wxUSE_GLCANVAS
 Graph3dFileDocument*
 CTSimApp::newGraph3dDoc()
 {