X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fthreadrecon.h;h=ff74bba9321bd3811c8cdfdd33030873c03db898;hp=7e78a543859efe4852ddb334604239e9b9d119bf;hb=f7ee98f7d964ed361068179f0e7ea4475ed1abdf;hpb=1a050c98763fbbc0662731b0b76953acede6f5d7 diff --git a/src/threadrecon.h b/src/threadrecon.h index 7e78a54..ff74bba 100644 --- a/src/threadrecon.h +++ b/src/threadrecon.h @@ -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, + const char* pszInterpName, int iInterpParam, const char* pszBackprojectName, wxChar const* pszLabel, ReconstructionROI* pROI, bool bRebinToParallel); virtual wxThread::ExitCode Entry(); @@ -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); + const char* pszBackprojectName, wxChar const* pszLabel, ReconstructionROI* pReconROI); virtual BackgroundWorkerThread* createWorker (int iThread, int iStartUnit, int iNumUnits);