X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fthreadrecon.h;h=0b56a8c69cf33649fa29a4d7fd72ff767468c3e9;hb=9ff5b5165b2c8871bd4b29ccd5ca794638414615;hp=97b36f42238a51720e2d4020191f597c90a21451;hpb=a97f1819c4f24321ba8d54a16f6534ee94404d26;p=ctsim.git

diff --git a/src/threadrecon.h b/src/threadrecon.h
index 97b36f4..0b56a8c 100644
--- 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.10 2001/02/25 19:24:01 kevin Exp $
+**  $Id: threadrecon.h,v 1.13 2001/03/11 15:27:30 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>
@@ -40,6 +43,7 @@ class ImageFile;
 class ProjectionFileDocument;
 class ReconstructorWorker;
 class ProjectionFileView;
+struct ReconstructionROI;
 
 class ReconstructorSupervisorThread : public SupervisorThread {
 private:
@@ -56,11 +60,13 @@ private:
   const int m_iInterpParam;
   const std::string m_strBackprojectName;
   const std::string m_strLabel;
+  ReconstructionROI m_reconROI;
 
 public:
   ReconstructorSupervisorThread(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);
+   const char* pszInterpName, int iInterpParam, const char* pszBackprojectName, const char* const pszLabel,
+   ReconstructionROI* pROI);
 
   virtual wxThread::ExitCode Entry();
 
@@ -73,8 +79,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;
@@ -88,11 +94,13 @@ private:
   const int m_iInterpParam;
   const char* const m_pszBackprojectName;
   const char* const m_pszLabel;
+  ReconstructionROI* m_pReconROI;
 
 public:
    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);
+   const char* pszInterpName, int iInterpParam, const char* pszBackprojectName, const char* const pszLabel,
+   ReconstructionROI* pReconROI);
 
    virtual BackgroundWorkerThread* createWorker (int iThread, int iStartUnit, int iNumUnits);
 
@@ -119,6 +127,7 @@ private:
   const char* m_pszInterpName;
   int m_iInterpParam;
   const char* m_pszBackprojectName;
+  ReconstructionROI* m_pReconROI;
 
 public:
   ReconstructorWorker (ReconstructorSupervisor* pSupervisor, int iThread, int iStartView, int iNumViews) 
@@ -128,13 +137,13 @@ public:
   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);
+   const char* pszBackprojectName, ReconstructionROI* pROI);
 
   virtual wxThread::ExitCode Entry();      // thread execution starts here
 
   virtual void OnExit();
 };
 
-
-#endif
+#endif // HAVE_WXTHREADS
+#endif // _THREADRECON_H_