detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-04 11:38:43 +01:00
Code Issues Actions Packages Releases Activity

ctb gui progress call back fix

Browse Source
This commit is contained in:
maliakal_d
2019-08-21 15:40:19 +02:00
parent 434aa78a04
commit e04242c5fa
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -12,6 +12,10 @@ build
RELEASE.txt RELEASE.txt
Testing/ Testing/
ctbDict.cpp
ctbDict.h
*.pyc *.pyc
*/__pycache__/* */__pycache__/*

12
ctbGui/ctbAcquisition.cpp
View File

@@ -597,12 +597,12 @@ hframe=new TGHorizontalFrame(this, 800,50);
acqThread = new TThread("acqThread", acqThread = new TThread("acqThread",
ctbAcquisition::ThreadHandle,(void*)this); ctbAcquisition::ThreadHandle,(void*)this);
// acqThread->Run(); // acqThread->Run();
cout <<"Registering progress callback" << endl; // cout <<"Registering progress callback" << endl;
try { // try {
myDet->registerProgressCallback(&progressCallback,(void*)this); // myDet->registerProgressCallback(&progressCallback,(void*)this);
} catch (...) { // } catch (...) {
cout << "Do nothing for this error" << endl; // cout << "Do nothing for this error" << endl;
} // }
cout <<"Registering data callback" << endl; cout <<"Registering data callback" << endl;
try{ try{