From 0358838dfb40e046a98edef8e5691eb357a3aea0 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 5 Jul 2022 11:29:23 +0200 Subject: [PATCH] fixed ctb gui for namespace fix --- ctbGui/ctbAcquisition.cpp | 4 ++-- ctbGui/ctbAcquisition.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ctbGui/ctbAcquisition.cpp b/ctbGui/ctbAcquisition.cpp index d545ac680..f50505211 100644 --- a/ctbGui/ctbAcquisition.cpp +++ b/ctbGui/ctbAcquisition.cpp @@ -828,14 +828,14 @@ void ctbAcquisition::setCanvas(TCanvas* c) { myCanvas->AddExec("dynamic",Form("((ctbAcquisition*)%p)->canvasClicked()",this)); // myCanvas->AddExec("ex","canvasClicked()"); } -void ctbAcquisition::dataCallback(detectorData *data, long unsigned int index, unsigned int dum, void* pArgs) { +void ctbAcquisition::dataCallback(sls::detectorData *data, long unsigned int index, unsigned int dum, void* pArgs) { // return ((ctbAcquisition*)pArgs)->plotData(data,index); } -int ctbAcquisition::plotData(detectorData *data, int index) { +int ctbAcquisition::plotData(sls::detectorData *data, int index) { /* ****************************************************************** diff --git a/ctbGui/ctbAcquisition.h b/ctbGui/ctbAcquisition.h index 7693b177b..3d5524eda 100644 --- a/ctbGui/ctbAcquisition.h +++ b/ctbGui/ctbAcquisition.h @@ -28,8 +28,8 @@ class TGTextButton; namespace sls { class Detector; + class detectorData; }; -class detectorData; template class slsDetectorData; @@ -201,10 +201,10 @@ class ctbAcquisition : public TGGroupFrame { void setBitGraph (int i ,int en, Pixel_t col); void startAcquisition(); static void progressCallback(double,void*); - static void dataCallback(detectorData*, long unsigned int, unsigned int, void*); + static void dataCallback(sls::detectorData*, long unsigned int, unsigned int, void*); int StopFlag; - int plotData(detectorData*, int); + int plotData(sls::detectorData*, int); void setPatternFile(const char* t);