projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r1865: *** empty log message ***
[ctsim.git]
/
src
/
ctsim.h
diff --git
a/src/ctsim.h
b/src/ctsim.h
index a4049f17a94cd0bdc12dd7b1711811718961093b..f2d70bb92603997b9ae9c6ca84d0e10dfc162cfa 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.
52 2001/02/22 15:00:20
kevin Exp $
+** $Id: ctsim.h,v 1.
63 2001/09/24 11:20:08
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
@@
-35,6
+35,13
@@
#include <dmalloc.h>
#endif
#include <dmalloc.h>
#endif
+#ifdef MSVC
+#define HAVE_WXTHREADS 1
+#else
+#undef HAVE_WXTHREADS
+#define HAVE_WXTHREADS 1
+#endif
+
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
@@
-46,7
+53,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!
@@
-101,6
+107,7
@@
private:
wxMenuItem* m_apWindowMenuItems[MAX_WINDOW_MENUITEMS];
wxDocument* m_apWindowMenuData[MAX_WINDOW_MENUITEMS];
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_iDefaultPhantomID;
int m_iDefaultFilterID;
int m_iDefaultFilterDomainID;
@@
-122,9
+129,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
@@
-142,8
+146,11
@@
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 OnHelpButton (wxCommandEvent& event);
+ void OnImport (wxCommandEvent& event);
#if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
void OnHelpSecondary (wxCommandEvent& event);
#if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
void OnHelpSecondary (wxCommandEvent& event);
@@
-199,6
+206,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;
@@
-207,8
+215,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();
@@
-292,16
+298,27
@@
enum {
MAINMENU_FILE_EXIT,
MAINMENU_FILE_PREFERENCES,
MAINMENU_LOG_EVENT,
MAINMENU_FILE_EXIT,
MAINMENU_FILE_PREFERENCES,
MAINMENU_LOG_EVENT,
-
+ MAINMENU_IMPORT,
+
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,
@@
-320,7
+337,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
@@
-339,6
+356,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,
@@
-351,7
+370,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,
@@
-360,6
+379,8
@@
enum {
GRAPH3D_VIEW_SCALE_FULL,
RECONSTRUCTION_THREAD_EVENT,
GRAPH3D_VIEW_SCALE_FULL,
RECONSTRUCTION_THREAD_EVENT,
+ NEW_IMAGEFILE_EVENT,
+ NEW_PROJECTIONFILE_EVENT,
};
#endif
};
#endif