detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-20 02:40:03 +02:00
Code Issues Actions Packages Releases Activity

fixed ctb gui for namespace fix

Browse Source
This commit is contained in:
maliakal_d 2022-07-05 11:29:23 +02:00
parent aa93aed4ed
commit 0358838dfb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ctbGui/ctbAcquisition.cpp
View File

@ -828,14 +828,14 @@ void ctbAcquisition::setCanvas(TCanvas* c) {
myCanvas->AddExec("dynamic",Form("((ctbAcquisition*)%p)->canvasClicked()",this)); myCanvas->AddExec("dynamic",Form("((ctbAcquisition*)%p)->canvasClicked()",this));
// myCanvas->AddExec("ex","canvasClicked()"); // 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 // return
((ctbAcquisition*)pArgs)->plotData(data,index); ((ctbAcquisition*)pArgs)->plotData(data,index);
} }
int ctbAcquisition::plotData(detectorData *data, int index) { int ctbAcquisition::plotData(sls::detectorData *data, int index) {
/* /*
****************************************************************** ******************************************************************

6
ctbGui/ctbAcquisition.h
View File

@ -28,8 +28,8 @@ class TGTextButton;
namespace sls namespace sls
{ {
class Detector; class Detector;
class detectorData;
}; };
class detectorData;
template <class dataType> class slsDetectorData; template <class dataType> class slsDetectorData;
@ -201,10 +201,10 @@ class ctbAcquisition : public TGGroupFrame {
void setBitGraph (int i ,int en, Pixel_t col); void setBitGraph (int i ,int en, Pixel_t col);
void startAcquisition(); void startAcquisition();
static void progressCallback(double,void*); 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 StopFlag;
int plotData(detectorData*, int); int plotData(sls::detectorData*, int);
void setPatternFile(const char* t); void setPatternFile(const char* t);