r627: no message

[ctsim.git] / src / threadrecon.h

diff --git a/src/threadrecon.h b/src/threadrecon.h
index f4f91057787b14351797669be6655b00b17796df..89c58fe61ff27e3788b9a78a2453ec793627cac0 100644 (file)
--- a/src/threadrecon.h
+++ b/src/threadrecon.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2001 Kevin Rosenberg
 **
-**  $Id: threadrecon.h,v 1.8 2001/02/25 06:32:12 kevin Exp $
+**  $Id: threadrecon.h,v 1.12 2001/03/05 19:14:40 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
@@ -28,6 +28,9 @@
 #ifndef _THREADRECON_H
 #define _THREADRECON_H
 
+#ifdef HAVE_WXTHREADS
+
+
 #include <vector>
 #include <wx/thread.h>
 #include <wx/progdlg.h>
@@ -73,8 +76,8 @@ class ReconstructorSupervisor : public BackgroundSupervisor {
 private:
 
   std::vector<ImageFile*> m_vecpChildImageFile;
-  ProjectionFileDocument* m_pProjDoc;
   ProjectionFileView* m_pProjView;
+  ProjectionFileDocument* m_pProjDoc;
     
   const int m_iImageNX;
   const int m_iImageNY;
@@ -90,7 +93,7 @@ private:
   const char* const m_pszLabel;
 
 public:
-   ReconstructorSupervisor (ProjectionFileView* pProjView, int iNX, int iNY, const char* pszFilterName, 
+   ReconstructorSupervisor (SupervisorThread* pMyThread, ProjectionFileView* pProjView, int iNX, int iNY, const char* pszFilterName, 
    double dFilterParam, const char* pszFilterMethod, int iZeropad, const char* pszFilterGenerationName, 
    const char* pszInterpName, int iInterpParam, const char* pszBackprojectName, const char* const pszLabel);
 
@@ -125,7 +128,7 @@ public:
     : BackgroundWorkerThread (pSupervisor, iThread, iStartView, iNumViews)
   {}
   
-  SetParameters (ProjectionFileView* pProjFile, ImageFile* pImageFile, 
+  void SetParameters (ProjectionFileView* pProjFile, ImageFile* pImageFile, 
    const char* const pszFilterName, double dFilterParam, const char* const pszFilterMethod, 
    int iZeropad, const char* const pszFilterGenerationName, const char* const pszInterpName, int iInterpParam,
    const char* pszBackprojectName);
@@ -135,6 +138,6 @@ public:
   virtual void OnExit();
 };
 
-
-#endif
+#endif // HAVE_WXTHREADS
+#endif // _THREADRECON_H_