mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-27 00:30:03 +02:00
script fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@74 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
parent
4e4b8b9beb
commit
c506fcf739
@ -194,7 +194,8 @@ void qActionsWidget::Refresh(){
|
|||||||
|
|
||||||
|
|
||||||
//settings values and checking for none
|
//settings values and checking for none
|
||||||
dispScript->setText(QString(script.c_str()));
|
if(QString(script.c_str()).compare("none"))
|
||||||
|
dispScript->setText(QString(script.c_str()));
|
||||||
if(mode)SetScriptFile();
|
if(mode)SetScriptFile();
|
||||||
dispParameter->setText(QString(parameter.c_str()));
|
dispParameter->setText(QString(parameter.c_str()));
|
||||||
SetParameter();
|
SetParameter();
|
||||||
|
@ -58,8 +58,8 @@ qDetectorMain::qDetectorMain(int argc, char **argv, QApplication *app, QWidget *
|
|||||||
cout << "Possible Arguments are:" << endl;
|
cout << "Possible Arguments are:" << endl;
|
||||||
cout << "-help \t\t : \t This help" << endl;
|
cout << "-help \t\t : \t This help" << endl;
|
||||||
cout << "-developer \t : \t Enables the developer tab" << endl;
|
cout << "-developer \t : \t Enables the developer tab" << endl;
|
||||||
cout << "-id i \t : \t Sets the detector to id i (the default is 0). "
|
cout << "-id i \t\t : \t Sets the multi detector id to i (the default is 0). "
|
||||||
"Required only when more than one detector is connected in parallel." << endl;
|
"Required only when more than one multi detector object is needed." << endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1202,7 +1202,8 @@ void qScanWidget::Refresh(){
|
|||||||
|
|
||||||
|
|
||||||
//settings values and checking for none
|
//settings values and checking for none
|
||||||
dispScript->setText(QString(script.c_str()));
|
if(QString(script.c_str()).compare("none"))
|
||||||
|
dispScript->setText(QString(script.c_str()));
|
||||||
if(mode) SetScriptFile();
|
if(mode) SetScriptFile();
|
||||||
dispParameter->setText(QString(parameter.c_str()));
|
dispParameter->setText(QString(parameter.c_str()));
|
||||||
SetParameter();
|
SetParameter();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user