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();
PhantomFileView* m_pPhantomView;
PhantomFileDocument* m_pPhantomDoc;
Scanner* m_pScanner;
-
+
const int m_iNDet;
const int m_iNView;
const int m_iOffsetView;
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);
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);
#endif // HAVE_WXTHREADS
#endif // _THREADPROJ_H_
-
+