X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fdocs.h;h=670a6b21afe5594a513013b83a5159b3ec03be7b;hp=82b08b02080ffbb4e933d33d465157fec807056f;hb=HEAD;hpb=4d5f56994972346351a48730315a7d85924103ba

diff --git a/src/docs.h b/src/docs.h
index 82b08b0..670a6b2 100644
--- a/src/docs.h
+++ b/src/docs.h
@@ -7,9 +7,7 @@
 **   Date Started:  July 2000
 **
 **  This is part of the CTSim program
-**  Copyright (c) 1983-2001 Kevin Rosenberg
-**
-**  $Id: docs.h,v 1.26 2001/02/25 16:21:36 kevin Exp $
+**  Copyright (c) 1983-2009 Kevin Rosenberg
 **
 **  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
@@ -25,10 +23,6 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-#ifdef __GNUG__
-// #pragma interface
-#endif
-
 #ifndef __DOCSH__
 #define __DOCSH__
 
@@ -48,6 +42,7 @@ class PlotFileView;
 class TextFileView;
 class Graph3dFileView;
 
+
 class ImageFileDocument: public wxDocument
 {
 private:
@@ -61,14 +56,14 @@ public:
     virtual bool IsModified () const;
     virtual bool Revert ();
     virtual void Modify (bool mod);
-    
-    ImageFileDocument () 
+
+    ImageFileDocument ()
       : m_bBadFileOpen(false)
     {
       m_pImageFile = new ImageFile;
     }
 
-    virtual ~ImageFileDocument () 
+    virtual ~ImageFileDocument ()
     {
       delete m_pImageFile;
     }
@@ -76,7 +71,7 @@ public:
     const ImageFile& getImageFile() const { return *m_pImageFile; }
     ImageFile& getImageFile() { return *m_pImageFile; }
     void setImageFile (ImageFile* pImageFile)
-    { 
+    {
       delete m_pImageFile;
       m_pImageFile = pImageFile;
     }
@@ -84,16 +79,19 @@ public:
     ImageFileView* getView() const;
     bool getBadFileOpen() const { return m_bBadFileOpen; }
     void setBadFileOpen() { m_bBadFileOpen = true; }
+    void Activate();
 };
 
 class BackgroundProcessingDocument : public wxDocument
 {
 private:
     DECLARE_DYNAMIC_CLASS(BackgroundProcessingDocument)
+#ifdef HAVE_WXTHREADS
     typedef BackgroundSupervisor BackgroundObject;
     typedef std::vector<BackgroundObject*> BackgroundContainer;
     BackgroundContainer m_vecpBackgroundSupervisors;
     wxCriticalSection m_criticalSection;
+#endif
 
 public:
   BackgroundProcessingDocument()
@@ -101,8 +99,10 @@ public:
       {}
 
   void cancelRunningTasks();
-  void OnAddBackground (wxCommandEvent& event);
-  void OnRemoveBackground (wxCommandEvent& event);
+#ifdef HAVE_WXTHREADS
+  void addBackgroundSupervisor (BackgroundSupervisor* pSupervisor);
+  void removeBackgroundSupervisor (BackgroundSupervisor* pSupervisor);
+#endif
 
   DECLARE_EVENT_TABLE()
 };
@@ -113,14 +113,14 @@ private:
     DECLARE_DYNAMIC_CLASS(ProjectionFileDocument)
     Projections* m_pProjectionFile;
     bool m_bBadFileOpen;
-    
+
 public:
     virtual bool OnSaveDocument (const wxString& filename);
     virtual bool OnOpenDocument (const wxString& filename);
     virtual bool IsModified () const;
     virtual void Modify (bool mod);
-    
-    ProjectionFileDocument () 
+
+    ProjectionFileDocument ()
           : m_bBadFileOpen(false)
     {
       m_pProjectionFile = new Projections;
@@ -128,8 +128,8 @@ public:
 
     virtual ~ProjectionFileDocument ();
 
-    const Projections& getProjections () const	{ return *m_pProjectionFile; }
-    Projections& getProjections () 	{ return *m_pProjectionFile; }
+    const Projections& getProjections () const  { return *m_pProjectionFile; }
+    Projections& getProjections ()      { return *m_pProjectionFile; }
 
     void setProjections (Projections* pProjections)
     { delete m_pProjectionFile;
@@ -139,6 +139,7 @@ public:
     ProjectionFileView* getView() const;
     bool getBadFileOpen() const { return m_bBadFileOpen; }
     void setBadFileOpen() { m_bBadFileOpen = true; }
+    void Activate();
 };
 
 
@@ -152,8 +153,8 @@ private:
     bool m_bBadFileOpen;
 
 public:
-    PhantomFileDocument () 
-	: m_idPhantom(Phantom::PHM_INVALID), m_bBadFileOpen(false)
+    PhantomFileDocument ()
+        : m_idPhantom(Phantom::PHM_INVALID), m_bBadFileOpen(false)
     {}
 
     virtual ~PhantomFileDocument ();
@@ -162,9 +163,9 @@ public:
 
     const wxString& getPhantomName () const { return m_namePhantom; }
 
-    const Phantom& getPhantom () const 	{ return m_phantom; }
+    const Phantom& getPhantom () const  { return m_phantom; }
 
-    Phantom& getPhantom () 	{ return m_phantom; }
+    Phantom& getPhantom ()      { return m_phantom; }
 
     virtual bool OnOpenDocument (const wxString& filename);
     virtual bool OnSaveDocument (const wxString& filename);
@@ -173,6 +174,7 @@ public:
     PhantomFileView* getView() const;
     bool getBadFileOpen() const { return m_bBadFileOpen; }
     void setBadFileOpen() { m_bBadFileOpen = true; }
+    void Activate();
 };
 
 
@@ -185,21 +187,21 @@ private:
     bool m_bBadFileOpen;
 
 public:
-    PlotFileDocument () 
+    PlotFileDocument ()
       : m_bBadFileOpen(false)
     {}
 
-    virtual ~PlotFileDocument () 
-	{}
+    virtual ~PlotFileDocument ()
+        {}
 
     const wxString& getPlotName () const
-	{ return m_namePlot; }
+        { return m_namePlot; }
 
     const PlotFile& getPlotFile () const
-	{ return m_plot; }
+        { return m_plot; }
 
     PlotFile& getPlotFile ()
-	{ return m_plot; }
+        { return m_plot; }
 
     virtual bool OnOpenDocument (const wxString& filename);
     virtual bool OnSaveDocument (const wxString& filename);
@@ -208,6 +210,7 @@ public:
     PlotFileView* getView() const;
     bool getBadFileOpen() const { return m_bBadFileOpen; }
     void setBadFileOpen() { m_bBadFileOpen = true; }
+    void Activate();
 };
 
 
@@ -218,7 +221,7 @@ class TextFileDocument: public wxDocument
   bool m_bBadFileOpen;
 
  public:
-  TextFileDocument(void) 
+  TextFileDocument(void)
         : m_bBadFileOpen(false)
   {}
 
@@ -244,7 +247,7 @@ typedef GLfloat glTripleFloat[3];
 
 class Graph3dFileDocument: public wxDocument
 {
-  friend Graph3dFileView;
+  friend class Graph3dFileView;
 
  private:
   DECLARE_DYNAMIC_CLASS(Graph3dFileDocument)
@@ -258,8 +261,8 @@ class Graph3dFileDocument: public wxDocument
 
  public:
   Graph3dFileDocument(void);
-  virtual ~Graph3dFileDocument(void); 
- 
+  virtual ~Graph3dFileDocument(void);
+
   virtual bool OnSaveDocument (const wxString& filename);
   virtual bool OnOpenDocument (const wxString& filename);
   virtual bool IsModified () const;
@@ -273,6 +276,7 @@ class Graph3dFileDocument: public wxDocument
   int ny() const { return m_ny; }
   ImageFileArray getArray() { return m_array; }
   ImageFileArrayConst getArray() const { return m_array; }
+  void Activate();
 };
 #endif // wxUSE_GLCANVAS