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

included images

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@53 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d 2012-09-07 16:33:24 +00:00
parent c9db2c4272
commit b85e03adfd
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -176,6 +176,7 @@ void qDetectorMain::SetUpDetector(){
//instantiate detector and set window title //instantiate detector and set window title
myDet = new multiSlsDetector(detID); myDet = new multiSlsDetector(detID);
string host = myDet->getHostname(detID); string host = myDet->getHostname(detID);
cout<<"online:"<<myDet->setOnline();<<endl;
slsDetector *s = myDet->getSlsDetector(detID); slsDetector *s = myDet->getSlsDetector(detID);
//if hostname doesnt exist even in shared memory //if hostname doesnt exist even in shared memory
if(!host.length()){ if(!host.length()){

4
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -303,8 +303,6 @@ void qTabMeasurement::startStopAcquisition(){
cout << "Stopping Acquisition" << endl<< endl; cout << "Stopping Acquisition" << endl<< endl;
#endif #endif
myDet->stopAcquisition(); myDet->stopAcquisition();
//btnStartStop->setStyleSheet("color:green");
//btnStartStop->setStyleSheet("background:rgb(239,239,239)");
progressTimer->stop(); progressTimer->stop();
btnStartStop->setText("Start"); btnStartStop->setText("Start");
btnStartStop->setIcon(*iconStart); btnStartStop->setIcon(*iconStart);
@ -323,8 +321,6 @@ void qTabMeasurement::UpdateFinished(){
btnStartStop->setText("Start"); btnStartStop->setText("Start");
btnStartStop->setIcon(*iconStart); btnStartStop->setIcon(*iconStart);
btnStartStop->setChecked(false); btnStartStop->setChecked(false);
//btnStartStop->setStyleSheet("color:green");
//btnStartStop->setStyleSheet("background:rgb(239,239,239)");
Enable(1); Enable(1);
connect(btnStartStop,SIGNAL(clicked()),this,SLOT(startStopAcquisition())); connect(btnStartStop,SIGNAL(clicked()),this,SLOT(startStopAcquisition()));
UpdateProgress(); UpdateProgress();