X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.h;h=f2d70bb92603997b9ae9c6ca84d0e10dfc162cfa;hb=7c456cf1278a3dfd6149094292dffea81e795cc6;hp=7ced875d3c5ab3ab044b2d6d8633c5f90c7aafee;hpb=b361677a2f7d5b443641faec70b057f2a84dc77e;p=ctsim.git diff --git a/src/ctsim.h b/src/ctsim.h index 7ced875..f2d70bb 100644 --- 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.56 2001/03/10 23:14:16 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 @@ -53,7 +53,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 +129,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 @@ -306,14 +302,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, @@ -332,7 +337,7 @@ enum { IFMENU_IMAGE_SUBTRACT, IFMENU_IMAGE_MULTIPLY, IFMENU_IMAGE_DIVIDE, -#if wxUSE_GLCANVAS +#ifdef wxUSE_GLCANVAS IFMENU_IMAGE_CONVERT3D, #endif @@ -351,6 +356,8 @@ enum { IFMENU_FILTER_IFFT_COLS, IFMENU_FILTER_MAGNITUDE, IFMENU_FILTER_PHASE, + IFMENU_FILTER_REAL, + IFMENU_FILTER_IMAGINARY, IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER, IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER, @@ -363,7 +370,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,