X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fthreadrecon.h;h=ff74bba9321bd3811c8cdfdd33030873c03db898;hp=d0987caef9e5f8f77b81d7535aacf835f6f684d1;hb=f7ee98f7d964ed361068179f0e7ea4475ed1abdf;hpb=4433641931aa27fd6a2b5ecd0102e6c5bbbccc46

diff --git a/src/threadrecon.h b/src/threadrecon.h
index d0987ca..ff74bba 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.14 2001/03/13 08:24:41 kevin Exp $
+**  $Id$
 **
 **  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
@@ -59,14 +59,14 @@ private:
   const std::string m_strInterpName;
   const int m_iInterpParam;
   const std::string m_strBackprojectName;
-  const std::string m_strLabel;
+  const wxString m_strLabel;
   ReconstructionROI m_reconROI;
   const bool m_bRebinToParallel;
 
 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,
+  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, wxChar const* pszLabel,
    ReconstructionROI* pROI, bool bRebinToParallel);
 
   virtual wxThread::ExitCode Entry();
@@ -83,7 +83,7 @@ private:
   const Projections* m_pProj;
   ProjectionFileView* m_pProjView;
   ProjectionFileDocument* m_pProjDoc;
-    
+
   const int m_iImageNX;
   const int m_iImageNY;
 
@@ -95,14 +95,14 @@ private:
   const char* const m_pszInterpName;
   const int m_iInterpParam;
   const char* const m_pszBackprojectName;
-  const char* const m_pszLabel;
+  const wxString m_strLabel;
   ReconstructionROI* m_pReconROI;
 
 public:
-   ReconstructorSupervisor (SupervisorThread* pMyThread, Projections* pProj, 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, ReconstructionROI* pReconROI);
+   ReconstructorSupervisor (SupervisorThread* pMyThread, Projections* pProj, 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, wxChar const* pszLabel, ReconstructionROI* pReconROI);
 
    virtual BackgroundWorkerThread* createWorker (int iThread, int iStartUnit, int iNumUnits);
 
@@ -131,12 +131,12 @@ private:
   ReconstructionROI* m_pReconROI;
 
 public:
-  ReconstructorWorker (ReconstructorSupervisor* pSupervisor, int iThread, int iStartView, int iNumViews) 
+  ReconstructorWorker (ReconstructorSupervisor* pSupervisor, int iThread, int iStartView, int iNumViews)
     : BackgroundWorkerThread (pSupervisor, iThread, iStartView, iNumViews)
   {}
-  
-  void SetParameters (const Projections* pProj, ProjectionFileView* pProjFile, ImageFile* pImageFile, 
-   const char* const pszFilterName, double dFilterParam, const char* const pszFilterMethod, 
+
+  void SetParameters (const Projections* pProj, 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, ReconstructionROI* pROI);
 
@@ -147,4 +147,4 @@ public:
 
 #endif // HAVE_WXTHREADS
 #endif // _THREADRECON_H_
-  
+