X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fctsim.h;h=f3f808313a2f08c8ffcc7ea8602df453edbaf72f;hp=9895231f7f7b3c1558e5bceeb548d53d948cc162;hb=8592d9469811305fbc4a895d78a6422502451eef;hpb=512ebbafa4666521b5a8acef939e89dcec6e2643 diff --git a/src/ctsim.h b/src/ctsim.h index 9895231..f3f8083 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.64 2002/05/05 10:54:34 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 @@ -82,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 @@ -103,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; @@ -155,9 +153,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); @@ -178,7 +176,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; } @@ -228,16 +226,16 @@ 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& vecIF); bool getAdvancedOptions() const { return m_bAdvancedOptions; } void setAdvancedOptions (bool bAdv) { m_bAdvancedOptions = bAdv; } @@ -295,7 +293,7 @@ enum { MAINMENU_FILE_PREFERENCES, MAINMENU_LOG_EVENT, MAINMENU_IMPORT, - + PJMENU_FILE_PROPERTIES, PJMENU_RECONSTRUCT_FBP, PJMENU_RECONSTRUCT_FBP_REBIN, @@ -307,7 +305,7 @@ enum { PJMENU_PLOT_TTHETA_SAMPLING, PJMENU_PLOT_HISTOGRAM, PJMENU_ARTIFACT_REDUCTION, - + IFMENU_FILE_EXPORT, IFMENU_FILE_PROPERTIES, @@ -320,11 +318,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, @@ -356,7 +354,7 @@ enum { IFMENU_FILTER_IMAGINARY, IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER, IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER, - + PHMMENU_FILE_PROPERTIES, PHMMENU_PROCESS_RASTERIZE, PHMMENU_PROCESS_PROJECTIONS, @@ -364,7 +362,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,