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

included high voltage for developer tab in gotthard

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@33 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d 2012-08-17 13:16:02 +00:00
parent b21b4d066c
commit 6c19d75359
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
slsDetectorGui/src/qScanWidget.cpp
View File

@ -175,9 +175,9 @@ void qScanWidget::Initialization(){
//precision //precision
connect(spinPrecision, SIGNAL(valueChanged(int)), this, SLOT(SetPrecision(int))); connect(spinPrecision, SIGNAL(valueChanged(int)), this, SLOT(SetPrecision(int)));
//range values //range values
connect(spinFrom, SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); connect(spinFrom, SIGNAL(editingFinished()), this, SLOT(SetRangeSteps()));
connect(spinTo, SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); connect(spinTo, SIGNAL(editingFinished()), this, SLOT(SetRangeSteps()));
connect(spinSize, SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); connect(spinSize, SIGNAL(editingFinished()), this, SLOT(SetRangeSteps()));
//custom values //custom values
connect(comboCustom, SIGNAL(currentIndexChanged(int)), this, SLOT(SetCustomSteps())); connect(comboCustom, SIGNAL(currentIndexChanged(int)), this, SLOT(SetCustomSteps()));
connect(btnCustom, SIGNAL(clicked()), this, SLOT(DeleteCustomSteps())); connect(btnCustom, SIGNAL(clicked()), this, SLOT(DeleteCustomSteps()));
@ -510,15 +510,15 @@ void qScanWidget::SetNSteps(int num){
if(radioRange->isChecked()){ if(radioRange->isChecked()){
//calculate the step size and display it //calculate the step size and display it
if(num==1){ if(num==1){
disconnect(spinTo, SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); disconnect(spinTo, SIGNAL(editingFinished()), this, SLOT(SetRangeSteps()));
spinTo->setValue(spinFrom->value()); spinTo->setValue(spinFrom->value());
connect(spinTo, SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); connect(spinTo, SIGNAL(editingFinished()), this, SLOT(SetRangeSteps()));
}else if(num>1) }else if(num>1)
num--; num--;
double stepSize = (spinTo->value()-spinFrom->value())/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); spinSize->setValue(stepSize);
connect(spinSize, SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); connect(spinSize, SIGNAL(editingFinished()), this, SLOT(SetRangeSteps()));
//set these positions //set these positions
SetRangeSteps(); SetRangeSteps();
}else if(radioCustom->isChecked()){ }else if(radioCustom->isChecked()){
@ -541,9 +541,9 @@ void qScanWidget::SetRangeSteps(){
double sizeVal = spinSize->value(); double sizeVal = spinSize->value();
//if step size is 0, min and max should be same //if step size is 0, min and max should be same
if(!sizeVal){ if(!sizeVal){
disconnect(spinTo, SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); disconnect(spinTo, SIGNAL(editingFinished()), this, SLOT(SetRangeSteps()));
spinTo->setValue(fromVal); spinTo->setValue(fromVal);
connect(spinTo, SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); connect(spinTo, SIGNAL(editingFinished()), this, SLOT(SetRangeSteps()));
QString tip = rangeTip + QString("<br><br><font color=\"red\">" QString tip = rangeTip + QString("<br><br><font color=\"red\">"
"<nobr>Note: Increase the <b>step size</b> from zero to be able to change the range.</nobr></font>"); "<nobr>Note: Increase the <b>step size</b> from zero to be able to change the range.</nobr></font>");
lblSize->setToolTip(tip); lblSize->setToolTip(tip);
@ -563,9 +563,9 @@ void qScanWidget::SetRangeSteps(){
//actualNumSteps will be negative if from<to and size wasnt negative.so change it to positive //actualNumSteps will be negative if from<to and size wasnt negative.so change it to positive
if(actualNumSteps<0){ if(actualNumSteps<0){
actualNumSteps*=-1; actualNumSteps*=-1;
disconnect(spinSize,SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); disconnect(spinSize,SIGNAL(editingFinished()), this, SLOT(SetRangeSteps()));
spinSize->setValue(-1*sizeVal); spinSize->setValue(-1*sizeVal);
connect(spinSize, SIGNAL(valueChanged(double)), this, SLOT(SetRangeSteps())); connect(spinSize, SIGNAL(editingFinished()), this, SLOT(SetRangeSteps()));
sizeVal = spinSize->value(); sizeVal = spinSize->value();
} }
//increment is required like vice versa in setNSteps //increment is required like vice versa in setNSteps