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

separating zmqport, enabling in client and receiver works

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-11-16 15:00:59 +01:00
parent 065b4a8e0f
commit bbcf75bc09
2 changed files with 58 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorGui/include/qTabAdvanced.h
View File

@ -133,6 +133,16 @@ private slots:
*/ */
void SetRxrUDPPort(int port); void SetRxrUDPPort(int port);
/** Sets client zmq receiver port
* @param port client zmq receiver port
*/
void SetCltZmqPort(int port);
/** Sets receiver zmq transmitting port
* @param port receiver zmq transmitting port
*/
void SetRxrZmqPort(int port);
/** Sets receiver online /** Sets receiver online
* @param index 1 for online and 0 for offline * @param index 1 for online and 0 for offline
*/ */

50
slsDetectorGui/src/qTabAdvanced.cpp
View File

@ -77,6 +77,8 @@ void qTabAdvanced::SetupWidgetWindow(){
case slsDetectorDefs::MYTHEN: case slsDetectorDefs::MYTHEN:
isEnergy = true; isEnergy = true;
isAngular = true; isAngular = true;
spinZmqPort->setEnabled(false);
spinZmqPort2->setEnabled(false);
break; break;
case slsDetectorDefs::EIGER: case slsDetectorDefs::EIGER:
isEnergy = true; isEnergy = true;
@ -154,6 +156,8 @@ void qTabAdvanced::SetupWidgetWindow(){
spinStopPort->setValue(det->getStopPort()); spinStopPort->setValue(det->getStopPort());
spinTCPPort->setValue(det->getReceiverPort()); spinTCPPort->setValue(det->getReceiverPort());
spinUDPPort->setValue(atoi(det->getReceiverUDPPort().c_str())); spinUDPPort->setValue(atoi(det->getReceiverUDPPort().c_str()));
spinZmqPort->setValue(atoi(det->getClientStreamingPort().c_str()));
spinZmqPort2->setValue(atoi(det->getReceiverStreamingPort().c_str()));
cout << "Getting network information" << endl; cout << "Getting network information" << endl;
dispIP->setText(det->getDetectorIP().c_str()); dispIP->setText(det->getDetectorIP().c_str());
@ -260,12 +264,14 @@ void qTabAdvanced::Initialization(){
if((detType==slsDetectorDefs::GOTTHARD) || if((detType==slsDetectorDefs::GOTTHARD) ||
(detType==slsDetectorDefs::MOENCH) || (detType==slsDetectorDefs::MOENCH) ||
(detType==slsDetectorDefs::PROPIX) || (detType==slsDetectorDefs::PROPIX) ||
(detType==slsDetectorDefs::PROPIX) || (detType==slsDetectorDefs::JUNGFRAU) ||
(detType==slsDetectorDefs::JUNGFRAU)){ (detType==slsDetectorDefs::EIGER)){
//network //network
connect(spinTCPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrTCPPort(int))); connect(spinTCPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrTCPPort(int)));
connect(spinUDPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrUDPPort(int))); connect(spinUDPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrUDPPort(int)));
connect(spinZmqPort, SIGNAL(valueChanged(int)), this, SLOT(SetCltZmqPort(int)));
connect(spinZmqPort2, SIGNAL(valueChanged(int)), this, SLOT(SetRxrZmqPort(int)));
connect(comboRxrOnline, SIGNAL(currentIndexChanged(int)), this, SLOT(SetReceiverOnline(int))); connect(comboRxrOnline, SIGNAL(currentIndexChanged(int)), this, SLOT(SetReceiverOnline(int)));
connect(dispIP, SIGNAL(editingFinished()), this, SLOT(SetNetworkParameters())); connect(dispIP, SIGNAL(editingFinished()), this, SLOT(SetNetworkParameters()));
@ -721,6 +727,38 @@ void qTabAdvanced::SetRxrUDPPort(int port){
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabAdvanced::SetCltZmqPort(int port){
#ifdef VERBOSE
cout << "Setting Receiver UDP Port:" << port << endl;
#endif
ostringstream ss; ss << port; string sport = ss.str();
disconnect(spinZmqPort, SIGNAL(valueChanged(int)), this, SLOT(SetCltZmqPort(int)));
spinZmqPort->setValue(atoi(det->setClientStreamingPort(sport).c_str()));
qDefs::checkErrorMessage(det,"qTabAdvanced::SetCltZmqPort");
connect(spinZmqPort, SIGNAL(valueChanged(int)), this, SLOT(SetCltZmqPort(int)));
}
//-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabAdvanced::SetRxrZmqPort(int port){
#ifdef VERBOSE
cout << "Setting Receiver UDP Port:" << port << endl;
#endif
ostringstream ss; ss << port; string sport = ss.str();
disconnect(spinZmqPort2, SIGNAL(valueChanged(int)), this, SLOT(SetRxrZmqPort(int)));
spinZmqPort2->setValue(atoi(det->setReceiverStreamingPort(sport).c_str()));
qDefs::checkErrorMessage(det,"qTabAdvanced::SetRxrZmqPort");
connect(spinZmqPort2, SIGNAL(valueChanged(int)), this, SLOT(SetRxrZmqPort(int)));
}
//-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabAdvanced::SetReceiverOnline(int index){ void qTabAdvanced::SetReceiverOnline(int index){
#ifdef VERBOSE #ifdef VERBOSE
cout << "Setting Reciever Online to :" << index << endl; cout << "Setting Reciever Online to :" << index << endl;
@ -1061,6 +1099,8 @@ void qTabAdvanced::SetDetector(int index){
spinStopPort->setValue(det->getStopPort()); spinStopPort->setValue(det->getStopPort());
spinTCPPort->setValue(det->getReceiverPort()); spinTCPPort->setValue(det->getReceiverPort());
spinUDPPort->setValue(atoi(det->getReceiverUDPPort().c_str())); spinUDPPort->setValue(atoi(det->getReceiverUDPPort().c_str()));
spinZmqPort->setValue(atoi(det->getClientStreamingPort().c_str()));
spinZmqPort2->setValue(atoi(det->getReceiverStreamingPort().c_str()));
dispIP->setText(det->getDetectorIP().c_str()); dispIP->setText(det->getDetectorIP().c_str());
dispMAC->setText(det->getDetectorMAC().c_str()); dispMAC->setText(det->getDetectorMAC().c_str());
@ -1248,6 +1288,8 @@ void qTabAdvanced::Refresh(){
//disconnect //disconnect
disconnect(spinTCPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrTCPPort(int))); disconnect(spinTCPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrTCPPort(int)));
disconnect(spinUDPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrUDPPort(int))); disconnect(spinUDPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrUDPPort(int)));
disconnect(spinZmqPort, SIGNAL(valueChanged(int)), this, SLOT(SetCltZmqPort(int)));
disconnect(spinZmqPort2, SIGNAL(valueChanged(int)), this, SLOT(SetRxrZmqPort(int)));
disconnect(comboRxrOnline, SIGNAL(currentIndexChanged(int)), this, SLOT(SetReceiverOnline(int))); disconnect(comboRxrOnline, SIGNAL(currentIndexChanged(int)), this, SLOT(SetReceiverOnline(int)));
disconnect(dispIP, SIGNAL(editingFinished()), this, SLOT(SetNetworkParameters())); disconnect(dispIP, SIGNAL(editingFinished()), this, SLOT(SetNetworkParameters()));
disconnect(dispMAC, SIGNAL(editingFinished()), this, SLOT(SetNetworkParameters())); disconnect(dispMAC, SIGNAL(editingFinished()), this, SLOT(SetNetworkParameters()));
@ -1266,6 +1308,8 @@ void qTabAdvanced::Refresh(){
dispRxrHostname->setText(det->getReceiver().c_str()); dispRxrHostname->setText(det->getReceiver().c_str());
spinTCPPort->setValue(det->getReceiverPort()); spinTCPPort->setValue(det->getReceiverPort());
spinUDPPort->setValue(atoi(det->getReceiverUDPPort().c_str())); spinUDPPort->setValue(atoi(det->getReceiverUDPPort().c_str()));
spinZmqPort->setValue(atoi(det->getClientStreamingPort().c_str()));
spinZmqPort2->setValue(atoi(det->getReceiverStreamingPort().c_str()));
dispUDPIP->setText(det->getReceiverUDPIP().c_str()); dispUDPIP->setText(det->getReceiverUDPIP().c_str());
dispUDPMAC->setText(det->getReceiverUDPMAC().c_str()); dispUDPMAC->setText(det->getReceiverUDPMAC().c_str());
@ -1273,6 +1317,8 @@ void qTabAdvanced::Refresh(){
//connect //connect
connect(spinTCPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrTCPPort(int))); connect(spinTCPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrTCPPort(int)));
connect(spinUDPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrUDPPort(int))); connect(spinUDPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrUDPPort(int)));
connect(spinZmqPort, SIGNAL(valueChanged(int)), this, SLOT(SetCltZmqPort(int)));
connect(spinZmqPort2, SIGNAL(valueChanged(int)), this, SLOT(SetRxrZmqPort(int)));
connect(comboRxrOnline, SIGNAL(currentIndexChanged(int)), this, SLOT(SetReceiverOnline(int))); connect(comboRxrOnline, SIGNAL(currentIndexChanged(int)), this, SLOT(SetReceiverOnline(int)));
connect(dispIP, SIGNAL(editingFinished()), this, SLOT(SetNetworkParameters())); connect(dispIP, SIGNAL(editingFinished()), this, SLOT(SetNetworkParameters()));
connect(dispMAC, SIGNAL(editingFinished()), this, SLOT(SetNetworkParameters())); connect(dispMAC, SIGNAL(editingFinished()), this, SLOT(SetNetworkParameters()));