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

merge conflict from 3.0.1 to restream stop from recieveR

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-11-30 19:05:19 +01:00
commit 385e6714cc
5 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorGui/include/qDrawPlot.h
View File

@ -617,6 +617,7 @@ void saveErrorSignal(QString);
void AcquisitionErrorSignal(QString); void AcquisitionErrorSignal(QString);
void UpdatePlotSignal(); void UpdatePlotSignal();
void GainPlotSignal(bool); void GainPlotSignal(bool);
void AcquisitionFinishedSignal();
}; };

4
slsDetectorGui/include/qTabMeasurement.h
View File

@ -65,6 +65,10 @@ public:
public slots: public slots:
/** Unconnects start/stop button when acquisition is finished
*/
void AcquisitionFinished();
/** update plot is finished, /** update plot is finished,
* changes start/stop text and enables/disables all widgets * changes start/stop text and enables/disables all widgets
*/ */

1
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -330,6 +330,7 @@ void qDetectorMain::Initialization(){
// Plotting // Plotting
// When the acquisition is finished, must update the meas tab // When the acquisition is finished, must update the meas tab
connect(myPlot, SIGNAL(UpdatingPlotFinished()), this, SLOT(EnableTabs())); connect(myPlot, SIGNAL(UpdatingPlotFinished()), this, SLOT(EnableTabs()));
connect(myPlot, SIGNAL(AcquisitionFinishedSignal()), tab_measurement, SLOT(AcquisitionFinished()));
connect(myPlot, SIGNAL(UpdatingPlotFinished()), tab_measurement, SLOT(UpdateFinished())); connect(myPlot, SIGNAL(UpdatingPlotFinished()), tab_measurement, SLOT(UpdateFinished()));
//This should not be called as it will change file name to measurement when run finished //This should not be called as it will change file name to measurement when run finished
//connect(myPlot, SIGNAL(UpdatingPlotFinished()), tab_plot, SLOT(Refresh())); //connect(myPlot, SIGNAL(UpdatingPlotFinished()), tab_plot, SLOT(Refresh()));

11
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -796,7 +796,11 @@ void* qDrawPlot::DataStartAcquireThread(void *this_pointer){
} }
} }
if (((qDrawPlot*)this_pointer)->myDet->getAcquiringFlag() == true) {
((qDrawPlot*)this_pointer)->myDet->setAcquiringFlag(false);
}
((qDrawPlot*)this_pointer)->myDet->acquire(1); ((qDrawPlot*)this_pointer)->myDet->acquire(1);
return this_pointer; return this_pointer;
} }
@ -1292,6 +1296,7 @@ int qDrawPlot::AcquisitionFinished(double currentProgress, int detectorStatus){
#ifdef VERBOSE #ifdef VERBOSE
cout << "\nEntering Acquisition Finished with status " ; cout << "\nEntering Acquisition Finished with status " ;
#endif #endif
emit AcquisitionFinishedSignal();
QString status = QString(slsDetectorBase::runStatusType(slsDetectorDefs::runStatus(detectorStatus)).c_str()); QString status = QString(slsDetectorBase::runStatusType(slsDetectorDefs::runStatus(detectorStatus)).c_str());
#ifdef VERBOSE #ifdef VERBOSE
cout << status.toAscii().constData() << " and progress " << currentProgress << endl; cout << status.toAscii().constData() << " and progress " << currentProgress << endl;
@ -1304,14 +1309,12 @@ int qDrawPlot::AcquisitionFinished(double currentProgress, int detectorStatus){
//stop_signal = 1;//just to be sure //stop_signal = 1;//just to be sure
emit AcquisitionErrorSignal(status); emit AcquisitionErrorSignal(status);
} }
#ifdef VERBOSE
//all measurements are over //all measurements are over
else if(currentProgress==100){ else if(currentProgress==100){
#ifdef VERBOSE
cout << "Acquisition Finished" << endl << endl; cout << "Acquisition Finished" << endl << endl;
#endif
} }
#endif
StartStopDaqToggle(true); StartStopDaqToggle(true);
//this lets the measurement tab know its over, and to enable tabs //this lets the measurement tab know its over, and to enable tabs
emit UpdatingPlotFinished(); emit UpdatingPlotFinished();

11
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -375,6 +375,15 @@ void qTabMeasurement::startStopAcquisition(){
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabMeasurement::AcquisitionFinished(){
disconnect(btnStartStop,SIGNAL(clicked()),this,SLOT(startStopAcquisition()));
btnStartStop->setText("Wait");
}
//-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabMeasurement::UpdateFinished(){ void qTabMeasurement::UpdateFinished(){
UpdateProgress(); UpdateProgress();
disconnect(spinIndex, SIGNAL(valueChanged(int)), this, SLOT(setRunIndex(int))); disconnect(spinIndex, SIGNAL(valueChanged(int)), this, SLOT(setRunIndex(int)));
@ -382,7 +391,7 @@ void qTabMeasurement::UpdateFinished(){
connect(spinIndex, SIGNAL(valueChanged(int)), this, SLOT(setRunIndex(int))); connect(spinIndex, SIGNAL(valueChanged(int)), this, SLOT(setRunIndex(int)));
progressTimer->stop(); progressTimer->stop();
disconnect(btnStartStop,SIGNAL(clicked()),this,SLOT(startStopAcquisition())); /*disconnect(btnStartStop,SIGNAL(clicked()),this,SLOT(startStopAcquisition())); done in AcquisitionFinished() already */
btnStartStop->setText("Start"); btnStartStop->setText("Start");
btnStartStop->setIcon(*iconStart); btnStartStop->setIcon(*iconStart);
btnStartStop->setChecked(false); btnStartStop->setChecked(false);