#include "wx/image.h"
#include "wx/filesys.h"
#include "wx/fs_zip.h"
+#include "wx/cmdline.h"
#ifdef __WXMSW__
#include "wx/msw/helpchm.h"
#endif
#endif
#endif
-static const char* rcsindent = "$Id$";
-
-struct option CTSimApp::ctsimOptions[] =
-{
- {"help", 0, 0, O_HELP},
- {"version", 0, 0, O_VERSION},
- {"print", 0, 0, O_PRINT},
- {0, 0, 0, 0}
-};
IMPLEMENT_APP(CTSimApp)
CTSimApp::CTSimApp()
: m_bAdvancedOptions(false), m_bSetModifyNewDocs(true),
m_bVerboseLogging(false), m_bShowStartupTips(true),
-m_iCurrentTip(0), m_bUseBackgroundTasks(false),
-m_docManager(NULL), m_pFrame(NULL), m_pConfig(0), m_pLog(0), m_pLogDoc(0)
+ m_iCurrentTip(0), m_bUseBackgroundTasks(false),
+ m_docManager(NULL), m_pFrame(NULL), m_pConfig(0), m_pLog(0), m_pLogDoc(0),
+ m_bPrintCmdLineImages(false), m_bCmdLineVerboseFlag(false)
{
theApp = this;
}
#include <sys/resource.h>
#endif
+
+void CTSimApp::OnInitCmdLine(wxCmdLineParser& parser)
+{
+ static const wxCmdLineEntryDesc cmdLineDesc[] = {
+ { wxCMD_LINE_SWITCH, _T("l"), _T("verbose"), _T("verbose logging") },
+ { wxCMD_LINE_SWITCH, _T("v"), _T("version"), _T("print version") },
+ { wxCMD_LINE_SWITCH, _T("p"), _T("print"), _T("print images from command line"),
+ wxCMD_LINE_VAL_NONE,
+ wxCMD_LINE_PARAM_OPTIONAL },
+ { wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("print this help message"),
+ wxCMD_LINE_VAL_NONE,
+ wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_OPTION_HELP },
+ { wxCMD_LINE_PARAM, NULL, NULL, _T("input file"),
+ wxCMD_LINE_VAL_STRING,
+ wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
+ { wxCMD_LINE_NONE }
+ };
+
+ parser.SetDesc(cmdLineDesc);
+}
+
+bool CTSimApp::OnCmdLineParsed(wxCmdLineParser& parser)
+{
+ if (wxApp::OnCmdLineParsed(parser) == false)
+ return false;
+
+ if (parser.Found(_T("version"))) {
+#ifdef VERSION
+ std::cout << "Version: " << VERSION << std::endl;
+#elif defined(CTSIMVERSION)
+ std::cout << "Version: " << CTSIMVERSION << std::endl;
+#else
+ std::cout << "Version: " << "Unknown" << std::endl;
+#endif
+ return false;
+ }
+ if (parser.Found(_T("print"))) {
+ m_bPrintCmdLineImages = true;
+ }
+ if (parser.Found(_T("verbose"))) {
+ m_bCmdLineVerboseFlag = true;
+ }
+
+ return true;
+}
+
bool
CTSimApp::OnInit()
{
- wxApp::OnInit();
+ if (! wxApp::OnInit())
+ return false;
#ifdef HAVE_SETPRIORITY
setpriority (PRIO_PROCESS, 0, 15); // set to low scheduling priority
openConfig();
g_bRunningWXWindows = true;
- bool bPrintFiles = false;
- // process options
- while (1) {
-#ifdef __WXMAC__
- int c = -1;
-#else
- char** cargv = new char* [argc];
- for (int i = 0; i < argc; i++) {
- const char* p = wxConvUTF8.cWX2MB(argv[i]);
- cargv[i] = new char [strlen(p)+1];
- strcpy(cargv[i], p);
- }
- int c = getopt_long (argc, cargv, "", ctsimOptions, NULL);
- for (int i = 0; i < argc; i++) {
- delete cargv[i];
- }
- delete cargv;
-
-#endif
- if (c == -1)
- break;
-
- switch (c) {
- case O_VERSION:
- std::cout << rcsindent << 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:
- case '?':
- usage (wxConvCurrent->cWX2MB(argv[0]));
- exit (0);
- case O_PRINT:
- bPrintFiles = true;
- break;
- default:
- usage (wxConvCurrent->cWX2MB(argv[0]));
- exit (1);
- }
- }
-
m_docManager = new wxDocManager (wxDEFAULT_DOCMAN_FLAGS, true);
m_pDocTemplImage = new wxDocTemplate (m_docManager, _T("ImageFile"), _T("*.if"), _T(""), _T("if"), _T("ImageFile"), _T("ImageView"), CLASSINFO(ImageFileDocument), CLASSINFO(ImageFileView));
for (int i = optind + 1; i <= argc; i++) {
wxString filename = argv [i - 1];
wxDocument* pNewDoc = m_docManager->CreateDocument (filename, wxDOC_SILENT);
- if (bPrintFiles) {
+ if (m_bPrintCmdLineImages) {
wxView* pNewView = pNewDoc->GetFirstView();
wxPrintout *printout = pNewView->OnCreatePrintout();
if (printout) {
m_docManager->OnFileClose (nullEvent);
}
}
- if (bPrintFiles) {
+ if (m_bPrintCmdLineImages) {
wxCommandEvent closeEvent;
closeEvent.SetInt (MAINMENU_FILE_EXIT);
m_pFrame->AddPendingEvent(closeEvent);
}
-wxString
-CTSimApp::getUntitledFilename()
-{
- static int untitledNumber = 1;
-
- wxString filename (_T("Untitled"));
- filename << untitledNumber++;
-
- return (filename);
-}
-
-
// Top-level window for CTSim
#if CTSIM_MDI
m_dDefaultFilterBandwidth
<< _T(", inputScale=") << m_dDefaultFilterInputScale << _T(", outputScale=") << m_dDefaultFilterOutputScale;
*theApp->getLog() << os << _T("\n");
- wxString filename = _T("untitled.if");
ImageFileDocument* pFilterDoc = theApp->newImageDoc();
pFilterDoc->setBadFileOpen();
if (! pFilterDoc) {
return;
}
-#if WXWIN_COMPATIBILITY_2_4
- wxString strFilename = wxFileSelector (wxString(wxConvUTF8.cMB2WX("Import Filename")), wxString(wxConvUTF8.cMB2WX("")),
- wxString(wxConvUTF8.cMB2WX("")), strExt, strWildcard, wxHIDE_READONLY | wxOPEN);
-#else
wxString strFilename = wxFileSelector (wxString(wxConvUTF8.cMB2WX("Import Filename")), wxString(wxConvUTF8.cMB2WX("")),
wxString(wxConvUTF8.cMB2WX("")), strExt, strWildcard, wxOPEN);
-#endif
if (! strFilename.IsEmpty()) {
if (m_iDefaultImportFormat == ImageFile::IMPORT_FORMAT_PPM || m_iDefaultImportFormat == ImageFile::IMPORT_FORMAT_PNG) {
ProjectionFileDocument*
CTSimApp::newProjectionDoc()
{
- ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>(m_pDocTemplProjection->CreateDocument (_T("")));
+ wxString fname;
+ m_docManager->MakeDefaultName(fname);
+ fname += _T(".pj");
+ ProjectionFileDocument* newDoc = dynamic_cast<ProjectionFileDocument*>(m_pDocTemplProjection->CreateDocument (fname));
if (newDoc) {
newDoc->SetDocumentName (m_pDocTemplProjection->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplProjection);
newDoc->OnNewDocument();
+ newDoc->SetFilename(fname);
}
return newDoc;
ImageFileDocument*
CTSimApp::newImageDoc()
{
- ImageFileDocument* newDoc = dynamic_cast<ImageFileDocument*>(m_pDocTemplImage->CreateDocument (_T("")));
+ wxString fname;
+ m_docManager->MakeDefaultName(fname);
+ fname += _T(".if");
+ ImageFileDocument* newDoc = dynamic_cast<ImageFileDocument*>(m_pDocTemplImage->CreateDocument (fname));
if (newDoc) {
newDoc->SetDocumentName (m_pDocTemplImage->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplImage);
newDoc->OnNewDocument();
+ newDoc->SetFilename(fname);
}
return newDoc;
PlotFileDocument*
CTSimApp::newPlotDoc()
{
- PlotFileDocument* newDoc = dynamic_cast<PlotFileDocument*>(m_pDocTemplPlot->CreateDocument (_T("")));
+ wxString fname;
+ m_docManager->MakeDefaultName(fname);
+ fname += _T(".plt");
+ PlotFileDocument* newDoc = dynamic_cast<PlotFileDocument*>(m_pDocTemplPlot->CreateDocument (fname));
if (newDoc) {
newDoc->SetDocumentName (m_pDocTemplPlot->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplPlot);
newDoc->OnNewDocument();
+ newDoc->SetFilename(fname);
}
return newDoc;
TextFileDocument*
CTSimApp::newTextDoc()
{
- wxString strFilename (getUntitledFilename());
- strFilename += wxString(".txt", *wxConvCurrent);
+ wxString fname;
+ m_docManager->MakeDefaultName(fname);
+ fname += _T(".txt");
- TextFileDocument* newDoc = dynamic_cast<TextFileDocument*>(m_pDocTemplText->CreateDocument (_T("")));
+ TextFileDocument* newDoc = dynamic_cast<TextFileDocument*>(m_pDocTemplText->CreateDocument (fname));
if (newDoc) {
newDoc->SetDocumentName (m_pDocTemplText->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplText);
newDoc->OnNewDocument();
+ newDoc->SetFilename (fname);
}
return newDoc;
PhantomFileDocument*
CTSimApp::newPhantomDoc()
{
- PhantomFileDocument* newDoc = dynamic_cast<PhantomFileDocument*>(m_pDocTemplPhantom->CreateDocument (_T("")));
+ wxString fname;
+ m_docManager->MakeDefaultName(fname);
+ fname += _T(".phm");
+ PhantomFileDocument* newDoc = dynamic_cast<PhantomFileDocument*>(m_pDocTemplPhantom->CreateDocument (fname));
if (newDoc) {
newDoc->SetDocumentName (m_pDocTemplPhantom->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplPhantom);
newDoc->OnNewDocument();
+ newDoc->SetFilename(fname);
}
return newDoc;
Graph3dFileDocument*
CTSimApp::newGraph3dDoc()
{
- Graph3dFileDocument* newDoc = dynamic_cast<Graph3dFileDocument*>(m_pDocTemplGraph3d->CreateDocument (_T("")));
+ wxString fname;
+ m_docManager->MakeDefaultName(fname);
+ fname += _T(".g3d");
+ Graph3dFileDocument* newDoc = dynamic_cast<Graph3dFileDocument*>(m_pDocTemplGraph3d->CreateDocument (fname));
if (newDoc) {
newDoc->SetDocumentName (m_pDocTemplGraph3d->GetDocumentName());
newDoc->SetDocumentTemplate (m_pDocTemplGraph3d);
newDoc->OnNewDocument();
+ newDoc->SetFilename(fname);
}
return newDoc;
}
+
#endif