Update copyright date; remove old CVS keyword

[ctsim.git] / src / threadproj.h

diff --git a/src/threadproj.h b/src/threadproj.h
index f5c565b3c035d0283225f369533c4d62621d8c2d..c4303d30055809fc45919a77a76ca3f5919716c3 100644 (file)
--- a/src/threadproj.h
+++ b/src/threadproj.h
@@ -7,9 +7,7 @@
 **   Date Started:  February 2001
 **
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2001 Kevin Rosenberg
-**
-**  $Id$
+**  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
@@ -56,12 +54,12 @@ private:
   const double m_dCenterDetectorLength;
   const double m_dViewRatio;
   const double m_dScanRatio;
-  const std::string m_strLabel;
+  const wxString m_strLabel;
 
 public:
-  ProjectorSupervisorThread(PhantomFileView* pProjView, int iNDet, int iNView, int iOffsetView, 
+  ProjectorSupervisorThread(PhantomFileView* pProjView, int iNDet, int iNView, int iOffsetView,
    const char* pszGeometry, int iNSample, double dRotation, double dFocalLength, double dCenterDetectorLength,
-   double dViewRatio, double dScanRatio, const char* const pszLabel);
+   double dViewRatio, double dScanRatio, wxChar const* strLabel);
 
   virtual wxThread::ExitCode Entry();
 
@@ -77,7 +75,7 @@ private:
   PhantomFileView* m_pPhantomView;
   PhantomFileDocument* m_pPhantomDoc;
   Scanner* m_pScanner;
-  
+
   const int m_iNDet;
   const int m_iNView;
   const int m_iOffsetView;
@@ -88,13 +86,13 @@ private:
   const double m_dCenterDetectorLength;
   const double m_dViewRatio;
   const double m_dScanRatio;
-  const char* const m_pszLabel;
+  const wxString m_strLabel;
 
 
 public:
    ProjectorSupervisor (SupervisorThread* pThread, PhantomFileView* pProjView, int iNDet, int iNView,  int iOffsetView,
    const char* pszGeometry, int iNSample, double dRotation, double dFocalLength, double dCenterDetectorLength,
-   double dViewRatio, double dScanRatio, const char* const pszLabel);
+   double dViewRatio, double dScanRatio, wxChar const* pszLabel);
 
    virtual BackgroundWorkerThread* createWorker (int iThread, int iStartUnit, int iNumUnits);
 
@@ -127,11 +125,11 @@ private:
 
 
 public:
-  ProjectorWorker (ProjectorSupervisor* pSupervisor, int iThread, int iStartView, int iNumViews) 
+  ProjectorWorker (ProjectorSupervisor* pSupervisor, int iThread, int iStartView, int iNumViews)
     : BackgroundWorkerThread (pSupervisor, iThread, iStartView, iNumViews)
   {}
-  
-  void SetParameters (PhantomFileView* pPhantomFile, Projections* pProjections, Scanner* pScanner, 
+
+  void SetParameters (PhantomFileView* pPhantomFile, Projections* pProjections, Scanner* pScanner,
    int iNDet, int iView, int iOffsetView,
    const char* const pszGeometry, int iNSample, double dRotation, double dFocalLength, double dCenterDetectorLength,
    double dViewRatio, double dScanRatio);
@@ -144,4 +142,4 @@ public:
 
 #endif // HAVE_WXTHREADS
 #endif // _THREADPROJ_H_
-  
+