X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=inline;f=src%2Fthreadproj.h;h=b3e048e0ac84682ad0dda77f275d64a7b4b55fb7;hb=f7ee98f7d964ed361068179f0e7ea4475ed1abdf;hp=805718e49602a1336733bcaa37d8c41a4b13c51d;hpb=37d0a9642338bd25e4185f8c96fbef445d6988ff;p=ctsim.git diff --git a/src/threadproj.h b/src/threadproj.h index 805718e..b3e048e 100644 --- a/src/threadproj.h +++ b/src/threadproj.h @@ -56,12 +56,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, 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(); @@ -88,13 +88,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);