X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fctsim.h;h=8e3b357dedaedce4792397bf995a8be05d263233;hp=a4049f17a94cd0bdc12dd7b1711811718961093b;hb=1a050c98763fbbc0662731b0b76953acede6f5d7;hpb=e081109a4a541c8780aaa253b874acada5957200

diff --git a/src/ctsim.h b/src/ctsim.h
index a4049f1..8e3b357 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.52 2001/02/22 15:00:20 kevin Exp $
+**  $Id$
 **
 **  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,10 @@
 #include <dmalloc.h>
 #endif
 
+#ifdef MSVC
+#define HAVE_WXTHREADS 1
+#endif
+
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
@@ -46,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!
@@ -79,7 +82,7 @@ class Graph3dFileDocument;
 
 
 #if defined(__WXMSW__) || defined (MSVC)
-#define CTSIM_WINHELP   1
+// #define CTSIM_WINHELP   1
 #endif
 
 // Define a new frame for main window
@@ -100,11 +103,12 @@ private:
   enum { MAX_WINDOW_MENUITEMS = 20 };
   wxMenuItem* m_apWindowMenuItems[MAX_WINDOW_MENUITEMS];
   wxDocument* m_apWindowMenuData[MAX_WINDOW_MENUITEMS];
-  
+
+  int m_iDefaultImportFormat;
   int m_iDefaultPhantomID;
   int m_iDefaultFilterID;
   int m_iDefaultFilterDomainID;
-  unsigned int m_iDefaultFilterXSize;    
+  unsigned int m_iDefaultFilterXSize;
   unsigned int m_iDefaultFilterYSize;
   double m_dDefaultFilterParam;
   double m_dDefaultFilterBandwidth;
@@ -122,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
@@ -142,8 +143,11 @@ public:
   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);
 
 #if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
   void OnHelpSecondary (wxCommandEvent& event);
@@ -151,9 +155,9 @@ public:
 
   void OnCreateFilter (wxCommandEvent& event);
   void OnExit (wxCommandEvent& event);
-  
+
   void OnUpdateUI (wxUpdateUIEvent& event);
-  
+
   void OnWindowMenu0 (wxCommandEvent& event);
   void OnWindowMenu1 (wxCommandEvent& event);
   void OnWindowMenu2 (wxCommandEvent& event);
@@ -174,7 +178,7 @@ public:
   void OnWindowMenu17 (wxCommandEvent& event);
   void OnWindowMenu18 (wxCommandEvent& event);
   void OnWindowMenu19 (wxCommandEvent& event);
-  
+
   void DoWindowMenu (int iMenuPosition, wxCommandEvent& event);
 
   bool getShuttingDown() const { return m_bShuttingDown; }
@@ -199,6 +203,7 @@ private:
   MainFrame* m_pFrame;
   wxConfig* m_pConfig;
   wxTextCtrl* m_pLog;
+  TextFileDocument* m_pLogDoc;
   wxDocTemplate* m_pDocTemplImage;
   wxDocTemplate* m_pDocTemplProjection;
   wxDocTemplate* m_pDocTemplPhantom;
@@ -207,8 +212,6 @@ private:
 #if wxUSE_GLCANVAS
   wxDocTemplate* m_pDocTemplGraph3d;
 #endif
-  
-  TextFileDocument* m_pLogDoc;
 
   void usage (const char* program);
   void openConfig();
@@ -225,16 +228,16 @@ public:
   wxTextCtrl* getLog()
   { return m_pLog; }
 
-  wxDocManager* getDocManager() 
+  wxDocManager* getDocManager()
   { return m_docManager; }
-  
+
   wxString getUntitledFilename();
 
   int getNumberCPU() const { return wxThread::GetCPUCount(); }
 
   EZPlotDialog* makeEZPlotDialog()
   { return new EZPlotDialog (m_pFrame); }
-  
+
   void getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector<ImageFileDocument*>& vecIF);
   bool getAdvancedOptions() const { return m_bAdvancedOptions; }
   void setAdvancedOptions (bool bAdv) { m_bAdvancedOptions = bAdv; }
@@ -276,7 +279,6 @@ public:
 };
 
 DECLARE_APP(CTSimApp)
-
 extern class CTSimApp* theApp;
 
 enum {
@@ -292,26 +294,37 @@ enum {
     MAINMENU_FILE_EXIT,
     MAINMENU_FILE_PREFERENCES,
     MAINMENU_LOG_EVENT,
-        
+    MAINMENU_IMPORT,
+
     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,
     IFMENU_PLOT_FFT_COL,
     IFMENU_PLOT_HISTOGRAM,
-    
+
     IFMENU_VIEW_SCALE_AUTO,
     IFMENU_VIEW_SCALE_MINMAX,
     IFMENU_VIEW_SCALE_FULL,
-    
+
     IFMENU_COMPARE_IMAGES,
     IFMENU_COMPARE_ROW,
     IFMENU_COMPARE_COL,
@@ -320,7 +333,7 @@ enum {
     IFMENU_IMAGE_SUBTRACT,
     IFMENU_IMAGE_MULTIPLY,
     IFMENU_IMAGE_DIVIDE,
-#if wxUSE_GLCANVAS
+#ifdef wxUSE_GLCANVAS
     IFMENU_IMAGE_CONVERT3D,
 #endif
 
@@ -339,9 +352,11 @@ enum {
     IFMENU_FILTER_IFFT_COLS,
     IFMENU_FILTER_MAGNITUDE,
     IFMENU_FILTER_PHASE,
+    IFMENU_FILTER_REAL,
+    IFMENU_FILTER_IMAGINARY,
     IFMENU_FILTER_SHUFFLENATURALTOFOURIERORDER,
     IFMENU_FILTER_SHUFFLEFOURIERTONATURALORDER,
-    
+
     PHMMENU_FILE_PROPERTIES,
     PHMMENU_PROCESS_RASTERIZE,
     PHMMENU_PROCESS_PROJECTIONS,
@@ -349,9 +364,9 @@ enum {
     PLOTMENU_FILE_PROPERTIES,
     PLOTMENU_VIEW_SCALE_MINMAX,
     PLOTMENU_VIEW_SCALE_AUTO,
-    PLOTMENU_VIEW_SCALE_FULL,    
+    PLOTMENU_VIEW_SCALE_FULL,
 
-    GRAPH3D_VIEW_SURFACE,
+    GRAPH3D_VIEW_WIREFRAME,
     GRAPH3D_VIEW_COLOR,
     GRAPH3D_VIEW_LIGHTING,
     GRAPH3D_VIEW_SMOOTH,
@@ -360,6 +375,8 @@ enum {
     GRAPH3D_VIEW_SCALE_FULL,
 
     RECONSTRUCTION_THREAD_EVENT,
+    NEW_IMAGEFILE_EVENT,
+    NEW_PROJECTIONFILE_EVENT,
 };
 
 #endif