projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r1020: *** empty log message ***
[ctsim.git]
/
src
/
ctsim.h
diff --git
a/src/ctsim.h
b/src/ctsim.h
index abc16fd173e41c7473195dab2232809421e8b599..5b49cdc5c929994069f7c202221dea708fdee930 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.
54 2001/03/02 21:11:50
kevin Exp $
+** $Id: ctsim.h,v 1.
62 2001/03/30 19:15:23
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
**
** 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
@@
-39,6
+39,7
@@
#define HAVE_WXTHREADS 1
#else
#undef HAVE_WXTHREADS
#define HAVE_WXTHREADS 1
#else
#undef HAVE_WXTHREADS
+#define HAVE_WXTHREADS 1
#endif
#ifndef WX_PRECOMP
#endif
#ifndef WX_PRECOMP
@@
-149,6
+150,8
@@
public:
void OnCreatePhantom (wxCommandEvent& event);
void OnPreferences (wxCommandEvent& event);
void OnLogEvent (wxCommandEvent& event); // used by thread children
void OnCreatePhantom (wxCommandEvent& event);
void OnPreferences (wxCommandEvent& event);
void OnLogEvent (wxCommandEvent& event); // used by thread children
+ void OnNewImageFile (wxCommandEvent& event);
+ void OnNewProjectionFile (wxCommandEvent& event);
void OnHelpButton (wxCommandEvent& event);
void OnImport (wxCommandEvent& event);
void OnHelpButton (wxCommandEvent& event);
void OnImport (wxCommandEvent& event);
@@
-207,6
+210,7
@@
private:
MainFrame* m_pFrame;
wxConfig* m_pConfig;
wxTextCtrl* m_pLog;
MainFrame* m_pFrame;
wxConfig* m_pConfig;
wxTextCtrl* m_pLog;
+ TextFileDocument* m_pLogDoc;
wxDocTemplate* m_pDocTemplImage;
wxDocTemplate* m_pDocTemplProjection;
wxDocTemplate* m_pDocTemplPhantom;
wxDocTemplate* m_pDocTemplImage;
wxDocTemplate* m_pDocTemplProjection;
wxDocTemplate* m_pDocTemplPhantom;
@@
-215,8
+219,6
@@
private:
#if wxUSE_GLCANVAS
wxDocTemplate* m_pDocTemplGraph3d;
#endif
#if wxUSE_GLCANVAS
wxDocTemplate* m_pDocTemplGraph3d;
#endif
-
- TextFileDocument* m_pLogDoc;
void usage (const char* program);
void openConfig();
void usage (const char* program);
void openConfig();
@@
-304,13
+306,23
@@
enum {
PJMENU_FILE_PROPERTIES,
PJMENU_RECONSTRUCT_FBP,
PJMENU_FILE_PROPERTIES,
PJMENU_RECONSTRUCT_FBP,
+ PJMENU_RECONSTRUCT_FBP_REBIN,
PJMENU_RECONSTRUCT_FOURIER,
PJMENU_RECONSTRUCT_FOURIER,
+ PJMENU_CONVERT_RECTANGULAR,
PJMENU_CONVERT_POLAR,
PJMENU_CONVERT_FFT_POLAR,
PJMENU_CONVERT_POLAR,
PJMENU_CONVERT_FFT_POLAR,
+ PJMENU_CONVERT_PARALLEL,
+ PJMENU_PLOT_TTHETA_SAMPLING,
+ PJMENU_PLOT_HISTOGRAM,
+ PJMENU_ARTIFACT_REDUCTION,
IFMENU_FILE_EXPORT,
IFMENU_FILE_PROPERTIES,
IFMENU_FILE_EXPORT,
IFMENU_FILE_PROPERTIES,
-
+
+ IFMENU_EDIT_COPY,
+ IFMENU_EDIT_CUT,
+ IFMENU_EDIT_PASTE,
+
IFMENU_PLOT_ROW,
IFMENU_PLOT_COL,
IFMENU_PLOT_FFT_ROW,
IFMENU_PLOT_ROW,
IFMENU_PLOT_COL,
IFMENU_PLOT_FFT_ROW,
@@
-329,7
+341,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
@@
-348,6
+360,8
@@
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,
@@
-360,7
+374,7
@@
enum {
PLOTMENU_VIEW_SCALE_AUTO,
PLOTMENU_VIEW_SCALE_FULL,
PLOTMENU_VIEW_SCALE_AUTO,
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,
@@
-369,6
+383,8
@@
enum {
GRAPH3D_VIEW_SCALE_FULL,
RECONSTRUCTION_THREAD_EVENT,
GRAPH3D_VIEW_SCALE_FULL,
RECONSTRUCTION_THREAD_EVENT,
+ NEW_IMAGEFILE_EVENT,
+ NEW_PROJECTIONFILE_EVENT,
};
#endif
};
#endif