From 6c19d75359698f0b05cd46800042423d6462d7a9 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Fri, 17 Aug 2012 13:16:02 +0000 Subject: [PATCH] included high voltage for developer tab in gotthard git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@33 af1100a4-978c-4157-bff7-07162d2ba061 --- slsDetectorGui/src/qScanWidget.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/slsDetectorGui/src/qScanWidget.cpp b/slsDetectorGui/src/qScanWidget.cpp index 89d919b33..5331ca144 100644 --- a/slsDetectorGui/src/qScanWidget.cpp +++ b/slsDetectorGui/src/qScanWidget.cpp @@ -175,9 +175,9 @@ void qScanWidget::Initialization(){ //precision connect(spinPrecision, SIGNAL(valueChanged(int)), this, SLOT(SetPrecision(int))); //range values - connect(spinFrom, SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); - connect(spinTo, SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); - connect(spinSize, SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); + connect(spinFrom, SIGNAL(editingFinished()), this, SLOT(SetRangeSteps())); + connect(spinTo, SIGNAL(editingFinished()), this, SLOT(SetRangeSteps())); + connect(spinSize, SIGNAL(editingFinished()), this, SLOT(SetRangeSteps())); //custom values connect(comboCustom, SIGNAL(currentIndexChanged(int)), this, SLOT(SetCustomSteps())); connect(btnCustom, SIGNAL(clicked()), this, SLOT(DeleteCustomSteps())); @@ -510,15 +510,15 @@ void qScanWidget::SetNSteps(int num){ if(radioRange->isChecked()){ //calculate the step size and display it if(num==1){ - disconnect(spinTo, SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); + disconnect(spinTo, SIGNAL(editingFinished()), this, SLOT(SetRangeSteps())); spinTo->setValue(spinFrom->value()); - connect(spinTo, SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); + connect(spinTo, SIGNAL(editingFinished()), this, SLOT(SetRangeSteps())); }else if(num>1) num--; double stepSize = (spinTo->value()-spinFrom->value())/num; - disconnect(spinSize,SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); + disconnect(spinSize,SIGNAL(editingFinished()), this, SLOT(SetRangeSteps())); spinSize->setValue(stepSize); - connect(spinSize, SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); + connect(spinSize, SIGNAL(editingFinished()), this, SLOT(SetRangeSteps())); //set these positions SetRangeSteps(); }else if(radioCustom->isChecked()){ @@ -541,9 +541,9 @@ void qScanWidget::SetRangeSteps(){ double sizeVal = spinSize->value(); //if step size is 0, min and max should be same if(!sizeVal){ - disconnect(spinTo, SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); + disconnect(spinTo, SIGNAL(editingFinished()), this, SLOT(SetRangeSteps())); spinTo->setValue(fromVal); - connect(spinTo, SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); + connect(spinTo, SIGNAL(editingFinished()), this, SLOT(SetRangeSteps())); QString tip = rangeTip + QString("

" "Note: Increase the step size from zero to be able to change the range."); lblSize->setToolTip(tip); @@ -563,9 +563,9 @@ void qScanWidget::SetRangeSteps(){ //actualNumSteps will be negative if fromsetValue(-1*sizeVal); - connect(spinSize, SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); + connect(spinSize, SIGNAL(editingFinished()), this, SLOT(SetRangeSteps())); sizeVal = spinSize->value(); } //increment is required like vice versa in setNSteps