X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.h;h=9ca514c855a298103492e261e826429bcc0a498d;hb=758774f7a87d488faa7412a04d07e4cce140b66c;hp=abc16fd173e41c7473195dab2232809421e8b599;hpb=52f2fdc3424cd6b5b77ad1497243e1e06739ffe6;p=ctsim.git

diff --git a/src/ctsim.h b/src/ctsim.h
index abc16fd..9ca514c 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.54 2001/03/02 21:11:50 kevin Exp $
+**  $Id: ctsim.h,v 1.57 2001/03/11 06:34:37 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
@@ -39,6 +39,7 @@
 #define HAVE_WXTHREADS 1
 #else
 #undef HAVE_WXTHREADS
+#define HAVE_WXTHREADS 1
 #endif
 
 #ifndef WX_PRECOMP
@@ -149,6 +150,8 @@ 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);
@@ -207,6 +210,7 @@ private:
   MainFrame* m_pFrame;
   wxConfig* m_pConfig;
   wxTextCtrl* m_pLog;
+  TextFileDocument* m_pLogDoc;
   wxDocTemplate* m_pDocTemplImage;
   wxDocTemplate* m_pDocTemplProjection;
   wxDocTemplate* m_pDocTemplPhantom;
@@ -215,8 +219,6 @@ private:
 #if wxUSE_GLCANVAS
   wxDocTemplate* m_pDocTemplGraph3d;
 #endif
-  
-  TextFileDocument* m_pLogDoc;
 
   void usage (const char* program);
   void openConfig();
@@ -307,6 +309,9 @@ enum {
     PJMENU_RECONSTRUCT_FOURIER,
     PJMENU_CONVERT_POLAR,
     PJMENU_CONVERT_FFT_POLAR,
+    PJMENU_CONVERT_PARALLEL,
+    PJMENU_PLOT_TTHETA_SAMPLING,
+    PJMENU_ARTIFACT_REDUCTION,
     
     IFMENU_FILE_EXPORT,
     IFMENU_FILE_PROPERTIES,
@@ -369,6 +374,8 @@ enum {
     GRAPH3D_VIEW_SCALE_FULL,
 
     RECONSTRUCTION_THREAD_EVENT,
+    NEW_IMAGEFILE_EVENT,
+    NEW_PROJECTIONFILE_EVENT,
 };
 
 #endif