X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.h;h=92b13f929ecfc2ff46114dc466ae21d7ab0eb0a6;hb=befd71a7157339b52a0c40359518d5276b25d127;hp=a2b0b7fd87e2b4782db99d9e13bd157dd68c28af;hpb=d3a6bf4aa2ccd32ed7671d1d97777dfc414df51d;p=ctsim.git

diff --git a/src/ctsim.h b/src/ctsim.h
index a2b0b7f..92b13f9 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.36 2001/01/30 05:05:41 kevin Exp $
+**  $Id: ctsim.h,v 1.44 2001/02/11 21:57: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
@@ -39,6 +39,7 @@
 #include "wx/wx.h"
 #endif
 #include "wx/config.h"
+#include "wx/msw/helpchm.h"
 
 #ifdef MSVC
 #define CTSIM_MDI 1
@@ -59,6 +60,9 @@ class ProjectionFileDocument;
 class PhantomFileDocument;
 class PlotFileDocument;
 class TextFileDocument;
+#if wxUSE_GLCANVAS
+class Graph3dFileDocument;
+#endif
 
 #include <vector>
 #include "wx/docview.h"
@@ -69,7 +73,7 @@ class TextFileDocument;
 #include "dlgezplot.h"
 
 
-#if defined(__WXMSW__)
+#if defined(__WXMSW__) || defined (MSVC)
 #define CTSIM_WINHELP   1
 #endif
 
@@ -105,7 +109,7 @@ private:
   bool m_bShuttingDown;
 
 #if CTSIM_WINHELP
-  wxWinHelpController      m_winHelp;
+  wxCHMHelpController      m_winHelp;
 #endif
   wxHtmlHelpController     m_htmlHelp;
   
@@ -119,7 +123,7 @@ public:
   void OnSize (wxSizeEvent& event);
 
 #if CTSIM_WINHELP
-  wxWinHelpController&   getWinHelpController()
+  wxCHMHelpController&   getWinHelpController()
   {return m_winHelp; }
 #endif
   wxHtmlHelpController&  getHtmlHelpController()
@@ -131,6 +135,7 @@ public:
   void OnHelpTopics (wxCommandEvent& event);
   void OnHelpContents (wxCommandEvent& event);
   void OnCreatePhantom (wxCommandEvent& event);
+  void OnPreferences (wxCommandEvent& event);
   
 #if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
   void OnHelpSecondary (wxCommandEvent& event);
@@ -174,7 +179,10 @@ class CTSimApp: public wxApp
 private:
   enum { O_HELP, O_VERSION };
   static struct option ctsimOptions[];
-  
+
+  bool m_bAdvancedOptions;
+  bool m_bSetModifyNewDocs;
+
   wxDocManager* m_docManager;
   MainFrame* m_pFrame;
   wxConfig* m_pConfig;
@@ -184,10 +192,16 @@ private:
   wxDocTemplate* m_pDocTemplPhantom;
   wxDocTemplate* m_pDocTemplPlot;
   wxDocTemplate* m_pDocTemplText;
+#if wxUSE_GLCANVAS
+  wxDocTemplate* m_pDocTemplGraph3d;
+#endif
+  
   TextFileDocument* m_pLogDoc;
 
   void usage (const char* program);
-  
+  void openConfig();
+  void closeConfig();
+
 public:
   CTSimApp();
   bool OnInit();
@@ -207,16 +221,23 @@ public:
   { 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; }
+
   void setIconForFrame (wxFrame* pFrame);
   wxConfig* getConfig()
   { return m_pConfig; }
+  bool getAskDeleteNewDocs() const { return m_bSetModifyNewDocs; }
+  void setAskDeleteNewDocs(bool bAsk) { m_bSetModifyNewDocs = bAsk; }
 
   wxDocTemplate* getDocTemplImage() { return m_pDocTemplImage; }
   wxDocTemplate* getDocTemplProjection() { return m_pDocTemplProjection; }
   wxDocTemplate* getDocTemplPhantom() { return m_pDocTemplPhantom; }
   wxDocTemplate* getDocTemplPlot() { return m_pDocTemplPlot; }
   wxDocTemplate* getDocTemplText() { return m_pDocTemplText; }
+#if wxUSE_GLCANVAS
+  wxDocTemplate* getDocTemplGraph3d() { return m_pDocTemplGraph3d; }
+#endif
   TextFileDocument* getLogDoc() { return m_pLogDoc; }
 
   ProjectionFileDocument* newProjectionDoc();
@@ -224,7 +245,9 @@ public:
   PhantomFileDocument* newPhantomDoc();
   PlotFileDocument* newPlotDoc();
   TextFileDocument* newTextDoc();
-
+#if wxUSE_GLCANVAS
+  Graph3dFileDocument* newGraph3dDoc();
+#endif
 };
 
 DECLARE_APP(CTSimApp)
@@ -236,11 +259,14 @@ enum {
     MAINMENU_HELP_ABOUT = 600,
     MAINMENU_HELP_CONTENTS,
     MAINMENU_HELP_TOPICS,
+#if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
     MAINMENU_HELP_SECONDARY,
+#endif
     MAINMENU_FILE_CREATE_PHANTOM,
     
     MAINMENU_FILE_CREATE_FILTER,
     MAINMENU_FILE_EXIT,
+    MAINMENU_FILE_PREFERENCES,
     
     PJMENU_FILE_PROPERTIES,
     PJMENU_RECONSTRUCT_FBP,
@@ -269,7 +295,10 @@ enum {
     IFMENU_IMAGE_SUBTRACT,
     IFMENU_IMAGE_MULTIPLY,
     IFMENU_IMAGE_DIVIDE,
-    
+#if wxUSE_GLCANVAS
+    IFMENU_IMAGE_CONVERT3D,
+#endif
+
     IFMENU_FILTER_INVERTVALUES,
     IFMENU_FILTER_SQRT,
     IFMENU_FILTER_SQUARE,
@@ -295,6 +324,14 @@ enum {
     PLOTMENU_VIEW_SCALE_MINMAX,
     PLOTMENU_VIEW_SCALE_AUTO,
     PLOTMENU_VIEW_SCALE_FULL,    
+
+    GRAPH3D_VIEW_SURFACE,
+    GRAPH3D_VIEW_COLOR,
+    GRAPH3D_VIEW_LIGHTING,
+    GRAPH3D_VIEW_SMOOTH,
+    GRAPH3D_VIEW_SCALE_AUTO,
+    GRAPH3D_VIEW_SCALE_MINMAX,
+    GRAPH3D_VIEW_SCALE_FULL,
 };
 
 #endif