projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lintian warning fixes
[ctsim.git]
/
src
/
ctsim.h
diff --git
a/src/ctsim.h
b/src/ctsim.h
index b7d20a9d31a7e6c5654085bd33ba6cad47fd953c..8e3b357dedaedce4792397bf995a8be05d263233 100644
(file)
--- a/
src/ctsim.h
+++ b/
src/ctsim.h
@@
-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.h,v 1.59 2001/03/13 08:24:41 kevin Exp
$
+** $Id$
**
** 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
@@
-37,9
+37,6
@@
#ifdef MSVC
#define HAVE_WXTHREADS 1
#ifdef MSVC
#define HAVE_WXTHREADS 1
-#else
-#undef HAVE_WXTHREADS
-#define HAVE_WXTHREADS 1
#endif
#ifndef WX_PRECOMP
#endif
#ifndef WX_PRECOMP
@@
-53,7
+50,6
@@
#ifdef MSVC
#define CTSIM_MDI 1
#endif
#ifdef MSVC
#define CTSIM_MDI 1
#endif
-#define CTSIM_CUSTOM_MRU 1
#if defined(CTSIM_MDI) && !wxUSE_MDI_ARCHITECTURE
#error You must set wxUSE_MDI_ARCHITECTURE to 1 in setup.h!
#if defined(CTSIM_MDI) && !wxUSE_MDI_ARCHITECTURE
#error You must set wxUSE_MDI_ARCHITECTURE to 1 in setup.h!
@@
-86,7
+82,7
@@
class Graph3dFileDocument;
#if defined(__WXMSW__) || defined (MSVC)
#if defined(__WXMSW__) || defined (MSVC)
-#define CTSIM_WINHELP 1
+
//
#define CTSIM_WINHELP 1
#endif
// Define a new frame for main window
#endif
// Define a new frame for main window
@@
-107,12
+103,12
@@
private:
enum { MAX_WINDOW_MENUITEMS = 20 };
wxMenuItem* m_apWindowMenuItems[MAX_WINDOW_MENUITEMS];
wxDocument* m_apWindowMenuData[MAX_WINDOW_MENUITEMS];
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;
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;
unsigned int m_iDefaultFilterYSize;
double m_dDefaultFilterParam;
double m_dDefaultFilterBandwidth;
@@
-130,9
+126,6
@@
public:
MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type);
virtual ~MainFrame();
MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type);
virtual ~MainFrame();
-#ifdef CTSIM_CUSTOM_MRU
- void OnMRUFile (wxCommandEvent& event);
-#endif
void OnSize (wxSizeEvent& event);
#if CTSIM_WINHELP
void OnSize (wxSizeEvent& event);
#if CTSIM_WINHELP
@@
-162,9
+155,9
@@
public:
void OnCreateFilter (wxCommandEvent& event);
void OnExit (wxCommandEvent& event);
void OnCreateFilter (wxCommandEvent& event);
void OnExit (wxCommandEvent& event);
-
+
void OnUpdateUI (wxUpdateUIEvent& event);
void OnUpdateUI (wxUpdateUIEvent& event);
-
+
void OnWindowMenu0 (wxCommandEvent& event);
void OnWindowMenu1 (wxCommandEvent& event);
void OnWindowMenu2 (wxCommandEvent& event);
void OnWindowMenu0 (wxCommandEvent& event);
void OnWindowMenu1 (wxCommandEvent& event);
void OnWindowMenu2 (wxCommandEvent& event);
@@
-185,7
+178,7
@@
public:
void OnWindowMenu17 (wxCommandEvent& event);
void OnWindowMenu18 (wxCommandEvent& event);
void OnWindowMenu19 (wxCommandEvent& event);
void OnWindowMenu17 (wxCommandEvent& event);
void OnWindowMenu18 (wxCommandEvent& event);
void OnWindowMenu19 (wxCommandEvent& event);
-
+
void DoWindowMenu (int iMenuPosition, wxCommandEvent& event);
bool getShuttingDown() const { return m_bShuttingDown; }
void DoWindowMenu (int iMenuPosition, wxCommandEvent& event);
bool getShuttingDown() const { return m_bShuttingDown; }
@@
-235,16
+228,16
@@
public:
wxTextCtrl* getLog()
{ return m_pLog; }
wxTextCtrl* getLog()
{ return m_pLog; }
- wxDocManager* getDocManager()
+ wxDocManager* getDocManager()
{ return m_docManager; }
{ return m_docManager; }
-
+
wxString getUntitledFilename();
int getNumberCPU() const { return wxThread::GetCPUCount(); }
EZPlotDialog* makeEZPlotDialog()
{ return new EZPlotDialog (m_pFrame); }
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; }
void getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector<ImageFileDocument*>& vecIF);
bool getAdvancedOptions() const { return m_bAdvancedOptions; }
void setAdvancedOptions (bool bAdv) { m_bAdvancedOptions = bAdv; }
@@
-286,7
+279,6
@@
public:
};
DECLARE_APP(CTSimApp)
};
DECLARE_APP(CTSimApp)
-
extern class CTSimApp* theApp;
enum {
extern class CTSimApp* theApp;
enum {
@@
-303,17
+295,19
@@
enum {
MAINMENU_FILE_PREFERENCES,
MAINMENU_LOG_EVENT,
MAINMENU_IMPORT,
MAINMENU_FILE_PREFERENCES,
MAINMENU_LOG_EVENT,
MAINMENU_IMPORT,
-
+
PJMENU_FILE_PROPERTIES,
PJMENU_RECONSTRUCT_FBP,
PJMENU_RECONSTRUCT_FBP_REBIN,
PJMENU_RECONSTRUCT_FOURIER,
PJMENU_FILE_PROPERTIES,
PJMENU_RECONSTRUCT_FBP,
PJMENU_RECONSTRUCT_FBP_REBIN,
PJMENU_RECONSTRUCT_FOURIER,
+ PJMENU_CONVERT_RECTANGULAR,
PJMENU_CONVERT_POLAR,
PJMENU_CONVERT_FFT_POLAR,
PJMENU_CONVERT_PARALLEL,
PJMENU_PLOT_TTHETA_SAMPLING,
PJMENU_CONVERT_POLAR,
PJMENU_CONVERT_FFT_POLAR,
PJMENU_CONVERT_PARALLEL,
PJMENU_PLOT_TTHETA_SAMPLING,
+ PJMENU_PLOT_HISTOGRAM,
PJMENU_ARTIFACT_REDUCTION,
PJMENU_ARTIFACT_REDUCTION,
-
+
IFMENU_FILE_EXPORT,
IFMENU_FILE_PROPERTIES,
IFMENU_FILE_EXPORT,
IFMENU_FILE_PROPERTIES,
@@
-326,11
+320,11
@@
enum {
IFMENU_PLOT_FFT_ROW,
IFMENU_PLOT_FFT_COL,
IFMENU_PLOT_HISTOGRAM,
IFMENU_PLOT_FFT_ROW,
IFMENU_PLOT_FFT_COL,
IFMENU_PLOT_HISTOGRAM,
-
+
IFMENU_VIEW_SCALE_AUTO,
IFMENU_VIEW_SCALE_MINMAX,
IFMENU_VIEW_SCALE_FULL,
IFMENU_VIEW_SCALE_AUTO,
IFMENU_VIEW_SCALE_MINMAX,
IFMENU_VIEW_SCALE_FULL,
-
+
IFMENU_COMPARE_IMAGES,
IFMENU_COMPARE_ROW,
IFMENU_COMPARE_COL,
IFMENU_COMPARE_IMAGES,
IFMENU_COMPARE_ROW,
IFMENU_COMPARE_COL,
@@
-339,7
+333,7
@@
enum {
IFMENU_IMAGE_SUBTRACT,
IFMENU_IMAGE_MULTIPLY,
IFMENU_IMAGE_DIVIDE,
IFMENU_IMAGE_SUBTRACT,
IFMENU_IMAGE_MULTIPLY,
IFMENU_IMAGE_DIVIDE,
-#if wxUSE_GLCANVAS
+#if
def
wxUSE_GLCANVAS
IFMENU_IMAGE_CONVERT3D,
#endif
IFMENU_IMAGE_CONVERT3D,
#endif
@@
-358,9
+352,11
@@
enum {
IFMENU_FILTER_IFFT_COLS,
IFMENU_FILTER_MAGNITUDE,
IFMENU_FILTER_PHASE,
IFMENU_FILTER_IFFT_COLS,
IFMENU_FILTER_MAGNITUDE,
IFMENU_FILTER_PHASE,
+ IFMENU_FILTER_REAL,
+ IFMENU_FILTER_IMAGINARY,
IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER,
IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER,
IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER,
IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER,
-
+
PHMMENU_FILE_PROPERTIES,
PHMMENU_PROCESS_RASTERIZE,
PHMMENU_PROCESS_PROJECTIONS,
PHMMENU_FILE_PROPERTIES,
PHMMENU_PROCESS_RASTERIZE,
PHMMENU_PROCESS_PROJECTIONS,
@@
-368,9
+364,9
@@
enum {
PLOTMENU_FILE_PROPERTIES,
PLOTMENU_VIEW_SCALE_MINMAX,
PLOTMENU_VIEW_SCALE_AUTO,
PLOTMENU_FILE_PROPERTIES,
PLOTMENU_VIEW_SCALE_MINMAX,
PLOTMENU_VIEW_SCALE_AUTO,
- PLOTMENU_VIEW_SCALE_FULL,
+ PLOTMENU_VIEW_SCALE_FULL,
- GRAPH3D_VIEW_
SURFAC
E,
+ GRAPH3D_VIEW_
WIREFRAM
E,
GRAPH3D_VIEW_COLOR,
GRAPH3D_VIEW_LIGHTING,
GRAPH3D_VIEW_SMOOTH,
GRAPH3D_VIEW_COLOR,
GRAPH3D_VIEW_LIGHTING,
GRAPH3D_VIEW_SMOOTH,