X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fctsim.h;h=2352c7e7bd0cb31134074632d2b88c610d5cd43e;hp=f2d70bb92603997b9ae9c6ca84d0e10dfc162cfa;hb=4b49778f44b9149451ba36e5f1bd7830c74c8fee;hpb=7c456cf1278a3dfd6149094292dffea81e795cc6

diff --git a/src/ctsim.h b/src/ctsim.h
index f2d70bb..2352c7e 100644
--- a/src/ctsim.h
+++ b/src/ctsim.h
@@ -7,9 +7,7 @@
 **   Date Started:  July 2000
 **
 **  This is part of the CTSim program
-**  Copyright (c) 1983-2001 Kevin Rosenberg
-**
-**  $Id: ctsim.h,v 1.63 2001/09/24 11:20:08 kevin Exp $
+**  Copyright (c) 1983-2009 Kevin Rosenberg
 **
 **  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
@@ -37,9 +35,6 @@
 
 #ifdef MSVC
 #define HAVE_WXTHREADS 1
-#else
-#undef HAVE_WXTHREADS
-#define HAVE_WXTHREADS 1
 #endif
 
 #ifndef WX_PRECOMP
@@ -85,7 +80,7 @@ class Graph3dFileDocument;
 
 
 #if defined(__WXMSW__) || defined (MSVC)
-#define CTSIM_WINHELP   1
+// #define CTSIM_WINHELP   1
 #endif
 
 // Define a new frame for main window
@@ -106,12 +101,12 @@ private:
   enum { MAX_WINDOW_MENUITEMS = 20 };
   wxMenuItem* m_apWindowMenuItems[MAX_WINDOW_MENUITEMS];
   wxDocument* m_apWindowMenuData[MAX_WINDOW_MENUITEMS];
-  
+
   int m_iDefaultImportFormat;
   int m_iDefaultPhantomID;
   int m_iDefaultFilterID;
   int m_iDefaultFilterDomainID;
-  unsigned int m_iDefaultFilterXSize;    
+  unsigned int m_iDefaultFilterXSize;
   unsigned int m_iDefaultFilterYSize;
   double m_dDefaultFilterParam;
   double m_dDefaultFilterBandwidth;
@@ -129,6 +124,13 @@ public:
   MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type);
   virtual ~MainFrame();
 
+#if wxCHECK_VERSION(2,9,0)
+  // Needed for wx3.0
+  void OnMRUFile(wxCommandEvent& event) {
+      if (m_docManager) m_docManager->OnMRUFile(event);
+  }
+#endif
+
   void OnSize (wxSizeEvent& event);
 
 #if CTSIM_WINHELP
@@ -158,9 +160,9 @@ public:
 
   void OnCreateFilter (wxCommandEvent& event);
   void OnExit (wxCommandEvent& event);
-  
+
   void OnUpdateUI (wxUpdateUIEvent& event);
-  
+
   void OnWindowMenu0 (wxCommandEvent& event);
   void OnWindowMenu1 (wxCommandEvent& event);
   void OnWindowMenu2 (wxCommandEvent& event);
@@ -181,7 +183,7 @@ public:
   void OnWindowMenu17 (wxCommandEvent& event);
   void OnWindowMenu18 (wxCommandEvent& event);
   void OnWindowMenu19 (wxCommandEvent& event);
-  
+
   void DoWindowMenu (int iMenuPosition, wxCommandEvent& event);
 
   bool getShuttingDown() const { return m_bShuttingDown; }
@@ -220,9 +222,15 @@ private:
   void openConfig();
   void closeConfig();
   BackgroundManager*  m_pBackgroundMgr;
+  bool m_bPrintCmdLineImages;
+  bool m_bCmdLineVerboseFlag;
+
+  wxDocument* newDocumentHelper (wxDocTemplate* tmpl);
 
 public:
   CTSimApp();
+  void OnInitCmdLine(wxCmdLineParser& parser);
+  bool OnCmdLineParsed(wxCmdLineParser& parser);
   bool OnInit();
   int OnExit();
   MainFrame* getMainFrame() const
@@ -231,20 +239,18 @@ public:
   wxTextCtrl* getLog()
   { return m_pLog; }
 
-  wxDocManager* getDocManager() 
+  wxDocManager* getDocManager()
   { return m_docManager; }
-  
-  wxString getUntitledFilename();
 
   int getNumberCPU() const { return wxThread::GetCPUCount(); }
 
   EZPlotDialog* makeEZPlotDialog()
   { return new EZPlotDialog (m_pFrame); }
-  
+
   void getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector<ImageFileDocument*>& vecIF);
   bool getAdvancedOptions() const { return m_bAdvancedOptions; }
   void setAdvancedOptions (bool bAdv) { m_bAdvancedOptions = bAdv; }
-  bool getVerboseLogging() const { return m_bVerboseLogging; }
+  bool getVerboseLogging() const { return m_bVerboseLogging || m_bCmdLineVerboseFlag; }
   void setVerboseLogging (bool bVerbose) { m_bVerboseLogging = bVerbose; }
   bool getStartupTips() const { return m_bShowStartupTips; }
   void setStartupTips(bool bTips) { m_bShowStartupTips = bTips; }
@@ -282,7 +288,6 @@ public:
 };
 
 DECLARE_APP(CTSimApp)
-
 extern class CTSimApp* theApp;
 
 enum {
@@ -299,7 +304,7 @@ enum {
     MAINMENU_FILE_PREFERENCES,
     MAINMENU_LOG_EVENT,
     MAINMENU_IMPORT,
-    
+
     PJMENU_FILE_PROPERTIES,
     PJMENU_RECONSTRUCT_FBP,
     PJMENU_RECONSTRUCT_FBP_REBIN,
@@ -311,7 +316,7 @@ enum {
     PJMENU_PLOT_TTHETA_SAMPLING,
     PJMENU_PLOT_HISTOGRAM,
     PJMENU_ARTIFACT_REDUCTION,
-    
+
     IFMENU_FILE_EXPORT,
     IFMENU_FILE_PROPERTIES,
 
@@ -324,11 +329,11 @@ enum {
     IFMENU_PLOT_FFT_ROW,
     IFMENU_PLOT_FFT_COL,
     IFMENU_PLOT_HISTOGRAM,
-    
+
     IFMENU_VIEW_SCALE_AUTO,
     IFMENU_VIEW_SCALE_MINMAX,
     IFMENU_VIEW_SCALE_FULL,
-    
+
     IFMENU_COMPARE_IMAGES,
     IFMENU_COMPARE_ROW,
     IFMENU_COMPARE_COL,
@@ -360,7 +365,7 @@ enum {
     IFMENU_FILTER_IMAGINARY,
     IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER,
     IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER,
-    
+
     PHMMENU_FILE_PROPERTIES,
     PHMMENU_PROCESS_RASTERIZE,
     PHMMENU_PROCESS_PROJECTIONS,
@@ -368,7 +373,7 @@ enum {
     PLOTMENU_FILE_PROPERTIES,
     PLOTMENU_VIEW_SCALE_MINMAX,
     PLOTMENU_VIEW_SCALE_AUTO,
-    PLOTMENU_VIEW_SCALE_FULL,    
+    PLOTMENU_VIEW_SCALE_FULL,
 
     GRAPH3D_VIEW_WIREFRAME,
     GRAPH3D_VIEW_COLOR,