From b85e03adfd19d5c87ecbcece52fb93392a08f8ba Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Fri, 7 Sep 2012 16:33:24 +0000 Subject: [PATCH] included images git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@53 af1100a4-978c-4157-bff7-07162d2ba061 --- slsDetectorGui/src/qDetectorMain.cpp | 1 + slsDetectorGui/src/qTabMeasurement.cpp | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index 16f876b13..8102f03fe 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -176,6 +176,7 @@ void qDetectorMain::SetUpDetector(){ //instantiate detector and set window title myDet = new multiSlsDetector(detID); string host = myDet->getHostname(detID); + cout<<"online:"<setOnline();<getSlsDetector(detID); //if hostname doesnt exist even in shared memory if(!host.length()){ diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp index 3e6b30b2f..cd0a7b43d 100644 --- a/slsDetectorGui/src/qTabMeasurement.cpp +++ b/slsDetectorGui/src/qTabMeasurement.cpp @@ -303,8 +303,6 @@ void qTabMeasurement::startStopAcquisition(){ cout << "Stopping Acquisition" << endl<< endl; #endif myDet->stopAcquisition(); - //btnStartStop->setStyleSheet("color:green"); - //btnStartStop->setStyleSheet("background:rgb(239,239,239)"); progressTimer->stop(); btnStartStop->setText("Start"); btnStartStop->setIcon(*iconStart); @@ -323,8 +321,6 @@ void qTabMeasurement::UpdateFinished(){ btnStartStop->setText("Start"); btnStartStop->setIcon(*iconStart); btnStartStop->setChecked(false); - //btnStartStop->setStyleSheet("color:green"); - //btnStartStop->setStyleSheet("background:rgb(239,239,239)"); Enable(1); connect(btnStartStop,SIGNAL(clicked()),this,SLOT(startStopAcquisition())); UpdateProgress();