mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-14 13:57:13 +02:00
enabling 10Gbe for eiger, advanced settings and also mV for dacs for all detectors
This commit is contained in:
@ -29,6 +29,7 @@ qTabDataOutput::qTabDataOutput(QWidget *parent,multiSlsDetector*& detector):
|
||||
QWidget(parent),myDet(detector){
|
||||
setupUi(this);
|
||||
SetupWidgetWindow();
|
||||
Refresh();
|
||||
}
|
||||
|
||||
|
||||
@ -54,6 +55,9 @@ void qTabDataOutput::SetupWidgetWindow(){
|
||||
if((detType == slsDetectorDefs::MYTHEN)||(detType == slsDetectorDefs::GOTTHARD))
|
||||
chkAngular->setEnabled(true);
|
||||
|
||||
if(detType == slsDetectorDefs::EIGER)
|
||||
chkTenGiga->setEnabled(true);
|
||||
|
||||
/** error message **/
|
||||
red = QPalette();
|
||||
red.setColor(QPalette::Active,QPalette::WindowText,Qt::red);
|
||||
@ -157,6 +161,8 @@ void qTabDataOutput::Initialization(){
|
||||
connect(chkDiscardBad, SIGNAL(toggled(bool)), this, SLOT(DiscardBadChannels()));
|
||||
//compression
|
||||
connect(chkCompression, SIGNAL(toggled(bool)), this, SLOT(SetCompression(bool)));
|
||||
//10GbE
|
||||
connect(chkTenGiga, SIGNAL(toggled(bool)), this, SLOT(EnableTenGigabitEthernet(bool)));
|
||||
}
|
||||
|
||||
|
||||
@ -735,6 +741,27 @@ void qTabDataOutput::SetCompression(bool enable){
|
||||
//-------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
void qTabDataOutput::EnableTenGigabitEthernet(bool enable,int get){
|
||||
#ifdef VERBOSE
|
||||
cout << endl << "Enabling/Disabling 10GbE" << endl;
|
||||
#endif
|
||||
disconnect(chkTenGiga, SIGNAL(toggled(bool)), this, SLOT(EnableTenGigabitEthernet(bool)));
|
||||
int ret;
|
||||
if(get)
|
||||
ret = myDet->enableTenGigabitEthernet(-1);
|
||||
else
|
||||
ret = myDet->enableTenGigabitEthernet(enable);
|
||||
if(ret > 0) chkTenGiga->setChecked(true);
|
||||
else chkTenGiga->setChecked(false);
|
||||
connect(chkTenGiga, SIGNAL(toggled(bool)), this, SLOT(EnableTenGigabitEthernet(bool)));
|
||||
|
||||
qDefs::checkErrorMessage(myDet,"qTabDataOutput::EnableTenGigabitEthernet");
|
||||
}
|
||||
|
||||
|
||||
//-------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
void qTabDataOutput::Refresh(){
|
||||
#ifdef VERBOSE
|
||||
cout << endl << "**Updating DataOutput Tab" << endl;
|
||||
@ -808,6 +835,16 @@ void qTabDataOutput::Refresh(){
|
||||
GetCompression();
|
||||
}
|
||||
|
||||
//getting 10GbE
|
||||
if(chkTenGiga->isEnabled()){
|
||||
#ifdef VERBOSE
|
||||
cout << "Getting 10GbE enable" << endl;
|
||||
#endif
|
||||
EnableTenGigabitEthernet(-1,1);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
#ifdef VERBOSE
|
||||
cout << "**Updated DataOutput Tab" << endl << endl;
|
||||
|
Reference in New Issue
Block a user