** 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.121 2003/01/24 05:24:18 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
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
#endif
-
#include "ct.h"
#include "ctndicom.h"
#include "ctsim.h"
#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.121 2003/01/24 05:24:18 kevin Exp $";
struct option CTSimApp::ctsimOptions[] =
{
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
+#ifdef VERSION
+ std::cout << "Version: " << VERSION << std::endl;\r
+#elif defined(CTSIMVERSION)\r
std::cout << "Version: " << CTSIMVERSION << std::endl;
-#elif defined(VERSION)
- std::cout << "Version: " << VERSION << std::endl;
#endif
exit(0);
case O_HELP:
wxString helpDir;
if (! m_pConfig->Read("HelpDir", &helpDir))
- helpDir = ::wxGetCwd();
+ helpDir = ::wxGetCwd();\r
#ifdef CTSIM_WINHELP
if (! m_pFrame->getWinHelpController().Initialize(helpDir + "/ctsim"))
*m_pLog << "Cannot initialize the Windows Help system" << "\n";
-#else
- wxString docDir (DATADIR);
+#else\r
+#ifdef DATADIR
+ wxString docDir (DATADIR);\r
+#else\r
+ wxString docDir (::wxGetCwd());\r
+#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"))\r
+ *m_pLog << "Cannot initialize the HTML Help system" << "\n";
else {
if (::wxDirExists ("/tmp"))
m_pFrame->getHtmlHelpController().SetTempDir(_T("/tmp"));
m_htmlHelp.Display ("Contents");
#endif
break;
-
-
+
default:
#ifdef CTSIM_WINHELP
m_winHelp.DisplaySection (commandID);
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();
}
}
}
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";
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)\r
+ msg << "Version: " << CTSIMVERSION << "\n\n";\r
#endif
msg += "Author: Kevin Rosenberg <kevin@rosenberg.net>\nUsage: ctsim [files-to-open..] [--help]";
}
}
-#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
+\r
+// Create new documents\r
ProjectionFileDocument*
CTSimApp::newProjectionDoc()