** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: ctsim.cpp,v 1.13 2000/09/07 14:29:05 kevin Exp $
+** $Id: ctsim.cpp,v 1.17 2000/12/17 22:30:34 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
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
-#endif
-
-#include "wx/docview.h"
+\r
+\r
+// For compilers that support precompilation, includes "wx/wx.h".\r
+#include "wx/wxprec.h"\r
+\r
+#ifdef __BORLANDC__\r
+#pragma hdrstop\r
+#endif\r
+\r
+#ifndef WX_PRECOMP\r
+#include "wx/wx.h"\r
+#endif\r
+\r
+#if !wxUSE_DOC_VIEW_ARCHITECTURE\r
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!\r
+#endif\r
+\r
+#include "ct.h"\r
#include "ctsim.h"
#include "docs.h"
#include "views.h"
#include "dialogs.h"
-#include "ctsupport.h"
+\r
#if defined(HAVE_CONFIG_H)
#include "config.h"
-#endif
+#endif\r
+\r
#if defined(HAVE_GETOPT_H) || defined(HAVE_GETOPT_LONG)
-#include <getopt.h>
+#ifdef MSVC\r
+#define __STDC__ 1\r
+#endif\r
+#include "getopt.h"\r
+#ifdef MSVC\r
+#undef __STDC__\r
#endif
-
-static const char* rcsindent = "$Id: ctsim.cpp,v 1.13 2000/09/07 14:29:05 kevin Exp $";
+#endif
+\r
+static const char* rcsindent = "$Id: ctsim.cpp,v 1.17 2000/12/17 22:30:34 kevin Exp $";
class CTSimApp* theApp = NULL;
switch (c) {
case O_VERSION:
- cout << rcsindent << endl;
+ std::cout << rcsindent << std::endl;\r
+#ifdef CTSIMVERSION\r
+ std::cout << "Version: CTSIMVERSION" << std::endl;\r
+#elif defined(VERSION)\r
+ std::cout << "Version: VERSION" << std::endl;\r
+#endif
exit(0);
case O_HELP:
case '?':
void
CTSimApp::usage(const char* program)
{
- cout << "usage: " << fileBasename(program) << " [files-to-open...] [OPTIONS]\n";
- cout << "Computed Tomography Simulator (Graphical Shell)\n";
- cout << "\n";
- cout << " --version Display version\n";
- cout << " --help Display this help message\n";
+ std::cout << "usage: " << fileBasename(program) << " [files-to-open...] [OPTIONS]\n";
+ std::cout << "Computed Tomography Simulator (Graphical Shell)\n";
+ std::cout << "\n";
+ std::cout << " --version Display version\n";
+ std::cout << " --help Display this help message\n";
}
int
void
MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
-{
- wxMessageBox("CTSim\nThe Open Source Computed Tomography Simulator\nAuthor: Kevin Rosenberg <kevin@rosenberg.net>\nUsage: ctsim [files-to-open..] [--help]", "About CTSim", wxOK | wxICON_INFORMATION, this);
+{\r
+ wxString msg = "CTSim\nThe Open Source Computed Tomography Simulator\n";\r
+#ifdef CTSIMVERSION\r
+ msg += "Version ";\r
+ msg += CTSIMVERSION;\r
+ msg += "\n\n";\r
+#elif defined(VERSION)\r
+ msg << "Version: " << VERSION << "\n\n";\r
+#endif\r
+ msg += "Author: Kevin Rosenberg <kevin@rosenberg.net>\nUsage: ctsim [files-to-open..] [--help]";\r
+
+ wxMessageBox(msg, "About CTSim", wxOK | wxICON_INFORMATION, this);
}
void