X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.h;h=abc16fd173e41c7473195dab2232809421e8b599;hb=52f2fdc3424cd6b5b77ad1497243e1e06739ffe6;hp=9768970a97d9c20b7008cf87ce993dec8e9fd947;hpb=0730f9f3adbf326b9d4bac754634399ad688efd1;p=ctsim.git

diff --git a/src/ctsim.h b/src/ctsim.h
index 9768970..abc16fd 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.51 2001/02/22 11:05:38 kevin Exp $
+**  $Id: ctsim.h,v 1.54 2001/03/02 21:11:50 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
@@ -35,6 +35,12 @@
 #include <dmalloc.h>
 #endif
 
+#ifdef MSVC
+#define HAVE_WXTHREADS 1
+#else
+#undef HAVE_WXTHREADS
+#endif
+
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
@@ -62,6 +68,8 @@ class ProjectionFileDocument;
 class PhantomFileDocument;
 class PlotFileDocument;
 class TextFileDocument;
+class BackgroundManager;
+
 #if wxUSE_GLCANVAS
 class Graph3dFileDocument;
 #endif
@@ -99,6 +107,7 @@ private:
   wxMenuItem* m_apWindowMenuItems[MAX_WINDOW_MENUITEMS];
   wxDocument* m_apWindowMenuData[MAX_WINDOW_MENUITEMS];
   
+  int m_iDefaultImportFormat;
   int m_iDefaultPhantomID;
   int m_iDefaultFilterID;
   int m_iDefaultFilterDomainID;
@@ -115,7 +124,7 @@ private:
   wxCHMHelpController      m_winHelp;
 #endif
   wxHtmlHelpController     m_htmlHelp;
-  
+
 public:
   MainFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long type);
   virtual ~MainFrame();
@@ -142,6 +151,7 @@ public:
   void OnLogEvent (wxCommandEvent& event);  // used by thread children
 
   void OnHelpButton (wxCommandEvent& event);
+  void OnImport (wxCommandEvent& event);
 
 #if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
   void OnHelpSecondary (wxCommandEvent& event);
@@ -191,6 +201,7 @@ private:
   bool m_bVerboseLogging;
   bool m_bShowStartupTips;
   long m_iCurrentTip;
+  bool m_bUseBackgroundTasks;
 
   wxDocManager* m_docManager;
   MainFrame* m_pFrame;
@@ -210,6 +221,7 @@ private:
   void usage (const char* program);
   void openConfig();
   void closeConfig();
+  BackgroundManager*  m_pBackgroundMgr;
 
 public:
   CTSimApp();
@@ -238,6 +250,10 @@ public:
   void setVerboseLogging (bool bVerbose) { m_bVerboseLogging = bVerbose; }
   bool getStartupTips() const { return m_bShowStartupTips; }
   void setStartupTips(bool bTips) { m_bShowStartupTips = bTips; }
+  bool getUseBackgroundTasks() const { return m_bUseBackgroundTasks; }
+  void setUseBackgroundTasks(bool bBkgd) { m_bUseBackgroundTasks = bBkgd; }
+
+  BackgroundManager* getBackgroundManager() {return m_pBackgroundMgr;}
 
   void ShowTips();
 
@@ -284,7 +300,8 @@ enum {
     MAINMENU_FILE_EXIT,
     MAINMENU_FILE_PREFERENCES,
     MAINMENU_LOG_EVENT,
-        
+    MAINMENU_IMPORT,
+    
     PJMENU_FILE_PROPERTIES,
     PJMENU_RECONSTRUCT_FBP,
     PJMENU_RECONSTRUCT_FOURIER,