detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 12:57:13 +02:00
Code Issues Actions Packages Releases Activity

added color to collapse in actions, changed angular for number of data to be received, corrected constant size scan widget

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@48 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-09-04 10:30:18 +00:00
parent a754e419fe
commit 63fadd3633
11 changed files with 683 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
slsDetectorGui/src/qScanWidget.cpp
View File

@ -231,7 +231,7 @@ void qScanWidget::EnableSizeWidgets(){
#ifdef VERBOSE
cout << "Constant Range Values" << endl;
#endif
spinSteps->setMinimum(2);
radioCustom->setText("Specific Values");
radioCustom->setPalette(normal);
radioCustom->setToolTip(customTip);
@ -245,7 +245,11 @@ void qScanWidget::EnableSizeWidgets(){
stackedLayout->setCurrentIndex(RangeValues);
SetRangeSteps();
int oldNumSteps = spinSteps->value();
//if the steps change, it calls SetRangeSteps on its own.
RangeCalculateNumSteps();
if(oldNumSteps==spinSteps->value()) SetRangeSteps();
spinSteps->setMinimum(2);
}
//custom values
else if(radioCustom->isChecked()){
@ -887,6 +891,15 @@ void qScanWidget::SetFileSteps(){
}
}
}
//ERROR IN WRITING FILENAME OR READING FILE
else{
actualNumSteps=0;
positions.resize(0);
SetScan(comboScript->currentIndex());
disconnect(spinSteps, SIGNAL(valueChanged(int)), this, SLOT(SetNSteps()));
spinSteps->setValue(actualNumSteps);
connect(spinSteps, SIGNAL(valueChanged(int)), this, SLOT(SetNSteps()));
}
}
@ -997,7 +1010,7 @@ void qScanWidget::Refresh(){
//settings values and checking for none
dispScript->setText(QString(script.c_str()));
SetScriptFile();
if(mode) SetScriptFile();
dispParameter->setText(QString(parameter.c_str()));
SetParameter();
spinPrecision->setValue(precision);