r1948: *** empty log message ***

[ctsim.git] / src / ctsim.h

diff --git a/src/ctsim.h b/src/ctsim.h
index ee871cbf3e4d794a7f090174d0e73cd1d2d4c558..9895231f7f7b3c1558e5bceeb548d53d948cc162 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
 **
-**  $Id: ctsim.h,v 1.55 2001/03/04 03:14:47 kevin Exp $
+**  $Id: ctsim.h,v 1.64 2002/05/05 10:54:34 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
@@ -37,9 +37,6 @@
 
 #ifdef MSVC
 #define HAVE_WXTHREADS 1
-#else
-#undef HAVE_WXTHREADS
-#define HAVE_WXTHREADS 1
 #endif
 
 #ifndef WX_PRECOMP
@@ -53,7 +50,6 @@
 #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!
@@ -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();
 
-#ifdef CTSIM_CUSTOM_MRU
-  void OnMRUFile (wxCommandEvent& event);
-#endif
   void OnSize (wxSizeEvent& event);
 
 #if CTSIM_WINHELP
@@ -286,7 +279,6 @@ public:
 };
 
 DECLARE_APP(CTSimApp)
-
 extern class CTSimApp* theApp;
 
 enum {
@@ -306,13 +298,23 @@ enum {
     
     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_PLOT_HISTOGRAM,
+    PJMENU_ARTIFACT_REDUCTION,
     
     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,
@@ -331,7 +333,7 @@ enum {
     IFMENU_IMAGE_SUBTRACT,
     IFMENU_IMAGE_MULTIPLY,
     IFMENU_IMAGE_DIVIDE,
-#if wxUSE_GLCANVAS
+#ifdef wxUSE_GLCANVAS
     IFMENU_IMAGE_CONVERT3D,
 #endif
 
@@ -350,6 +352,8 @@ enum {
     IFMENU_FILTER_IFFT_COLS,
     IFMENU_FILTER_MAGNITUDE,
     IFMENU_FILTER_PHASE,
+    IFMENU_FILTER_REAL,
+    IFMENU_FILTER_IMAGINARY,
     IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER,
     IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER,
     
@@ -362,7 +366,7 @@ enum {
     PLOTMENU_VIEW_SCALE_AUTO,
     PLOTMENU_VIEW_SCALE_FULL,    
 
-    GRAPH3D_VIEW_SURFACE,
+    GRAPH3D_VIEW_WIREFRAME,
     GRAPH3D_VIEW_COLOR,
     GRAPH3D_VIEW_LIGHTING,
     GRAPH3D_VIEW_SMOOTH,