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

Merge branch '3.0.1' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-12-05 16:04:26 +01:00
commit 7e932bf84b
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorGui/src/qTabPlot.cpp
View File

@ -1093,6 +1093,8 @@ void qTabPlot::EnableScanBox(){
disconnect(btnGroupPlotType,SIGNAL(buttonClicked(int)),this, SLOT(SetPlot())); disconnect(btnGroupPlotType,SIGNAL(buttonClicked(int)),this, SLOT(SetPlot()));
disconnect(boxScan, SIGNAL(toggled(bool)), this, SLOT(EnableScanBox())); disconnect(boxScan, SIGNAL(toggled(bool)), this, SLOT(EnableScanBox()));
int oldfreqvalue = myDet->setReadReceiverFrequency();
int mode0 = myDet->getScanMode(0); int mode0 = myDet->getScanMode(0);
int mode1 = myDet->getScanMode(1); int mode1 = myDet->getScanMode(1);
@ -1264,6 +1266,18 @@ void qTabPlot::EnableScanBox(){
pageHistogram_2->setEnabled(false); pageHistogram_2->setEnabled(false);
} }
// if it was set to read every frame
if (oldfreqvalue != 0 && (comboFrequency->currentIndex() != 1 || spinNthFrame->value() != oldfreqvalue)) {
disconnect(spinNthFrame, SIGNAL(editingFinished()), this, SLOT(SetFrequency()));
disconnect(comboFrequency, SIGNAL(currentIndexChanged(int)), this, SLOT(SetFrequency()));
comboFrequency->setCurrentIndex(1);
spinNthFrame->setValue(1);
SetFrequency();
connect(spinNthFrame, SIGNAL(editingFinished()), this, SLOT(SetFrequency()));
connect(comboFrequency, SIGNAL(currentIndexChanged(int)), this, SLOT(SetFrequency()));
}
connect(btnGroupPlotType,SIGNAL(buttonClicked(int)),this, SLOT(SetPlot())); connect(btnGroupPlotType,SIGNAL(buttonClicked(int)),this, SLOT(SetPlot()));
connect(boxScan, SIGNAL(toggled(bool)), this, SLOT(EnableScanBox())); connect(boxScan, SIGNAL(toggled(bool)), this, SLOT(EnableScanBox()));