X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.h;h=4425db3200d1ce43fd0c157c915299498f8a5e8c;hb=e74fec298090c956a06ac16e89a482cd89e3056b;hp=aa349c1154b5da187eb0ec5492a4297d41b2e156;hpb=9b2bb510160bdb56f04847f5b55ab61dd8a47976;p=ctsim.git

diff --git a/src/ctsim.h b/src/ctsim.h
index aa349c1..4425db3 100644
--- a/src/ctsim.h
+++ b/src/ctsim.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctsim.h,v 1.17 2001/01/02 05:34:57 kevin Exp $
+**  $Id: ctsim.h,v 1.19 2001/01/02 13:16:43 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
@@ -36,11 +36,15 @@
 #endif
 
 class wxMenu;
-class wxDocument;
-class ImageFileDocument;
-#include <vector>
+class wxDocument;
+
+class ImageFileDocument;
+
+#include <vector>
+
+
+#include "wx/docview.h"
 
-#include "wx/docview.h"
 
 // Define a new frame for main window
 class MainFrame: public wxDocParentFrame
@@ -53,23 +57,26 @@ private:
     enum { MAX_WINDOW_MENUITEMS = 20 };
     wxMenuItem* m_apWindowMenuItems[MAX_WINDOW_MENUITEMS];
     wxDocument* m_apWindowMenuData[MAX_WINDOW_MENUITEMS];
-
-    int m_iDefaultPhantomID;
-    int m_iDefaultFilterID;
-    int m_iDefaultFilterDomainID;
-    unsigned int m_iDefaultFilterXSize;    
-    unsigned int m_iDefaultFilterYSize;
-    double m_dDefaultFilterParam;
-    double m_dDefaultFilterBandwidth;
-    double m_dDefaultFilterInputScale;
-    double m_dDefaultFilterOutputScale;
+
+
+    int m_iDefaultPhantomID;
+    int m_iDefaultFilterID;
+    int m_iDefaultFilterDomainID;
+    unsigned int m_iDefaultFilterXSize;    
+    unsigned int m_iDefaultFilterYSize;
+    double m_dDefaultFilterParam;
+    double m_dDefaultFilterBandwidth;
+    double m_dDefaultFilterInputScale;
+    double m_dDefaultFilterOutputScale;
+
 
 public:
     MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type);
     
     void OnAbout (wxCommandEvent& event);
     void OnHelpContents (wxCommandEvent& event);
-    void OnCreatePhantom (wxCommandEvent& event);
+    void OnCreatePhantom (wxCommandEvent& event);
+
     void OnCreateFilter (wxCommandEvent& event);
     void OnExit (wxCommandEvent& event);
 
@@ -120,11 +127,16 @@ public:
 	{ return m_docManager; }
 
     wxString getUntitledFilename();
-
-    void getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector<ImageFileDocument*>& vecIF);
-
-    bool getSetModifyNewDocs() const
-    { return false; }
+
+
+    void getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector<ImageFileDocument*>& vecIF);
+
+
+
+    bool getSetModifyNewDocs() const
+
+    { return true; }
+
 
 private:
     wxDocManager* m_docManager;
@@ -143,46 +155,56 @@ extern class CTSimApp* theApp;
 
 
 enum {
-    MAINMENU_HELP_ABOUT = 500,
-    MAINMENU_HELP_CONTENTS,
-    MAINMENU_FILE_CREATE_PHANTOM,
-    MAINMENU_FILE_CREATE_FILTER,
-    MAINMENU_FILE_EXIT,
-    IFMENU_FILE_PROPERTIES,
-    PJMENU_FILE_PROPERTIES,
-    PHMMENU_FILE_PROPERTIES,
-    PJMENU_PROCESS_RECONSTRUCT,
-    IFMENU_FILE_EXPORT,
-	IFMENU_PLOT_ROW,
+  MAINMENU_HELP_ABOUT = 500,
+  MAINMENU_HELP_CONTENTS,
+  MAINMENU_FILE_CREATE_PHANTOM,
+
+  MAINMENU_FILE_CREATE_FILTER,
+  MAINMENU_FILE_EXIT,
+
+  IFMENU_FILE_PROPERTIES,
+  PJMENU_FILE_PROPERTIES,
+  PHMMENU_FILE_PROPERTIES,
+  PJMENU_PROCESS_RECONSTRUCT,
+
+  IFMENU_FILE_EXPORT,
+
+	IFMENU_PLOT_ROW,
 	IFMENU_PLOT_COL,
-    IFMENU_VIEW_SCALE_AUTO,
-    IFMENU_VIEW_SCALE_MINMAX,
-	IFMENU_COMPARE_IMAGES,
-	IFMENU_COMPARE_ROW,
-	IFMENU_COMPARE_COL,
-  IFMENU_PROCESS_INVERTVALUES,
-  IFMENU_PROCESS_SQRT,
-  IFMENU_PROCESS_SQUARE,
-  IFMENU_PROCESS_LOG,
-  IFMENU_PROCESS_EXP,
-  IFMENU_PROCESS_MULTIPLY,
-  IFMENU_PROCESS_SUBTRACT,
-  IFMENU_PROCESS_SCALESIZE,
-  IFMENU_PROCESS_DIVIDE,
-  IFMENU_PROCESS_ADD,
-  IFMENU_PROCESS_FOURIER,
-  IFMENU_PROCESS_INVERSE_FOURIER,
-  IFMENU_PROCESS_FFT,
-  IFMENU_PROCESS_IFFT,
-  IFMENU_PROCESS_MAGNITUDE,
-  IFMENU_PROCESS_PHASE,
-  IFMENU_PROCESS_SHUFFLENATURALTOFOURIERORDER,
-  IFMENU_PROCESS_SHUFFLEFOURIERTONATURALORDER,
-    PHMMENU_PROCESS_RASTERIZE,
-    PHMMENU_PROCESS_PROJECTIONS,
-	PLOTMENU_VIEW_SCALE_MINMAX,
+  IFMENU_PLOT_HISTOGRAM,
+
+  IFMENU_VIEW_SCALE_AUTO,
+  IFMENU_VIEW_SCALE_MINMAX,
+
+	IFMENU_COMPARE_IMAGES,
+	IFMENU_COMPARE_ROW,
+	IFMENU_COMPARE_COL,
+  IFMENU_IMAGE_SCALESIZE,
+  IFMENU_IMAGE_ADD,
+  IFMENU_IMAGE_SUBTRACT,
+  IFMENU_IMAGE_MULTIPLY,
+  IFMENU_IMAGE_DIVIDE,
+
+  IFMENU_FILTER_INVERTVALUES,
+  IFMENU_FILTER_SQRT,
+  IFMENU_FILTER_SQUARE,
+  IFMENU_FILTER_LOG,
+  IFMENU_FILTER_EXP,
+  IFMENU_FILTER_FOURIER,
+  IFMENU_FILTER_INVERSE_FOURIER,
+  IFMENU_FILTER_FFT,
+  IFMENU_FILTER_IFFT,
+  IFMENU_FILTER_MAGNITUDE,
+  IFMENU_FILTER_PHASE,
+  IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER,
+  IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER,
+
+  PHMMENU_PROCESS_RASTERIZE,
+  PHMMENU_PROCESS_PROJECTIONS,
+
+	PLOTMENU_VIEW_SCALE_MINMAX,
 	PLOTMENU_VIEW_SCALE_AUTO,
-    MAINMENU_WINDOW_BASE,
+  MAINMENU_WINDOW_BASE,
 };
 
 #endif