projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r3877: Auto commit for Debian build
[ctsim.git]
/
src
/
ctsim.cpp
diff --git
a/src/ctsim.cpp
b/src/ctsim.cpp
index 2dbdec7cd51b8f90a0f6fc6c5338de0f4a46fd03..d8c1a079b753ab20b33b262cf8eeb74b773561a8 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
**
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: ctsim.cpp,v 1.1
11 2002/05/08 08:55:45
kevin Exp $
+** $Id: ctsim.cpp,v 1.1
21 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
**
** 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
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
#endif
-
#include "ct.h"
#include "ctndicom.h"
#include "ctsim.h"
#include "ct.h"
#include "ctndicom.h"
#include "ctsim.h"
@@
-70,7
+69,7
@@
#endif
#endif
#endif
#endif
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.1
11 2002/05/08 08:55:45
kevin Exp $";
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.1
21 2003/01/24 05:24:18
kevin Exp $";
struct option CTSimApp::ctsimOptions[] =
{
struct option CTSimApp::ctsimOptions[] =
{
@@
-111,17
+110,21
@@
CTSimApp::OnInit()
bool bPrintFiles = false;
// process options
while (1) {
bool bPrintFiles = false;
// process options
while (1) {
+#ifdef __WXMAC__
+ int c = -1;
+#else
int c = getopt_long (argc, argv, "", ctsimOptions, NULL);
int c = getopt_long (argc, argv, "", ctsimOptions, NULL);
+#endif
if (c == -1)
break;
switch (c) {
case O_VERSION:
std::cout << rcsindent << std::endl;
if (c == -1)
break;
switch (c) {
case O_VERSION:
std::cout << rcsindent << std::endl;
-#ifdef
CTSIM
VERSION
- std::cout << "Version:
CTSIMVERSION" << std::endl;
-#elif defined(
VERSION)
- std::cout << "Version:
VERSION"
<< std::endl;
+#ifdef VERSION
+ std::cout << "Version:
" << VERSION << std::endl;
\r
+#elif defined(
CTSIMVERSION)
\r
+ std::cout << "Version:
" << CTSIMVERSION
<< std::endl;
#endif
exit(0);
case O_HELP:
#endif
exit(0);
case O_HELP:
@@
-186,7
+189,7
@@
CTSimApp::OnInit()
int xSize, ySize;
m_pFrame->GetClientSize(&xSize, &ySize);
int yLogSize = ySize / 4;
int xSize, ySize;
m_pFrame->GetClientSize(&xSize, &ySize);
int yLogSize = ySize / 4;
- m_pLogDoc->getView()->getFrame()->Set
Client
Size (0, ySize - yLogSize, xSize, yLogSize);
+ m_pLogDoc->getView()->getFrame()->SetSize (0, ySize - yLogSize, xSize, yLogSize);
m_pLogDoc->getView()->getFrame()->Show (true);
} else
#else
m_pLogDoc->getView()->getFrame()->Show (true);
} else
#else
@@
-196,16
+199,21
@@
CTSimApp::OnInit()
wxString helpDir;
if (! m_pConfig->Read("HelpDir", &helpDir))
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";
#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) &&
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"));
else {
if (::wxDirExists ("/tmp"))
m_pFrame->getHtmlHelpController().SetTempDir(_T("/tmp"));
@@
-688,8
+696,7
@@
MainFrame::showHelp (int commandID)
m_htmlHelp.Display ("Contents");
#endif
break;
m_htmlHelp.Display ("Contents");
#endif
break;
-
-
+
default:
#ifdef CTSIM_WINHELP
m_winHelp.DisplaySection (commandID);
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) {
wxString strFilename = pDoc->GetFilename();
const wxView* pView = pDoc->GetFirstView();
if (pView) {
- wx
Frame* pFrame
= pView->GetFrame();
- p
Frame
->SetFocus();
- p
Frame
->Raise();
+ wx
Window* pWindow
= pView->GetFrame();
+ p
Window
->SetFocus();
+ p
Window
->Raise();
}
}
}
}
}
}
@@
-1016,21
+1023,22
@@
MainFrame::OnImport (wxCommandEvent& WXUNUSED(event) )
void
MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
{
void
MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
{
- long lFreeMem = ::wxGetFreeMemory() / (1024L * 1024L);
wxString strOSDesc = ::wxGetOsDescription();
*theApp->getLog() << "Operating System: " << strOSDesc;
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() << ", wxWindows: " << wxVERSION_STRING;
#ifdef __TIMESTAMP__
*theApp->getLog() << ", Build Date: " << __TIMESTAMP__;
#endif
#if defined(DEBUG)
- *theApp->getLog() << ",
CTSim
Debug version";
+ *theApp->getLog() << ", Debug version";
#else
#else
- *theApp->getLog() << ", CTSim Release version";
+ *theApp->getLog() << ", Release version";
+#endif
+#ifdef VERSION
+ *theApp->getLog() << " " << VERSION;
+#elif defined(CTSIMVERSION)
+ *theApp->getLog() << " " << CTSIMVERSION;
#endif
#endif
-
*theApp->getLog() << "\n";
wxBitmap bmp (splash);
*theApp->getLog() << "\n";
wxBitmap bmp (splash);
@@
-1039,12
+1047,10
@@
MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
dlg.ShowModal();
} else {
wxString msg = "CTSim\nThe Open Source Computed Tomography Simulator\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";
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]";
#endif
msg += "Author: Kevin Rosenberg <kevin@rosenberg.net>\nUsage: ctsim [files-to-open..] [--help]";
@@
-1053,6
+1059,8
@@
MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
}
}
}
}
+
\r
+// Create new documents
\r
ProjectionFileDocument*
CTSimApp::newProjectionDoc()
ProjectionFileDocument*
CTSimApp::newProjectionDoc()
@@
-1063,7
+1071,7
@@
CTSimApp::newProjectionDoc()
newDoc->SetDocumentTemplate (m_pDocTemplProjection);
newDoc->OnNewDocument();
}
newDoc->SetDocumentTemplate (m_pDocTemplProjection);
newDoc->OnNewDocument();
}
-
+
return newDoc;
}
return newDoc;
}
@@
-1076,7
+1084,7
@@
CTSimApp::newImageDoc()
newDoc->SetDocumentTemplate (m_pDocTemplImage);
newDoc->OnNewDocument();
}
newDoc->SetDocumentTemplate (m_pDocTemplImage);
newDoc->OnNewDocument();
}
-
+
return newDoc;
}
return newDoc;
}
@@
-1124,8
+1132,8
@@
CTSimApp::newPhantomDoc()
return newDoc;
}
return newDoc;
}
-#if wxUSE_GLCANVAS
+#if wxUSE_GLCANVAS
Graph3dFileDocument*
CTSimApp::newGraph3dDoc()
{
Graph3dFileDocument*
CTSimApp::newGraph3dDoc()
{