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

somewhere

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-11-23 14:53:33 +01:00
parent fd4dd5b1e9
commit d23c9d52ed
3 changed files with 6 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
slsDetectorGui/forms/form_tab_advanced.ui
View File

@ -1314,26 +1314,6 @@ An extension given by the modules serial number will be attached.
</item>
</layout>
</widget>
<widget class="QPushButton" name="btnRestartStreaming">
<property name="geometry">
<rect>
<x>23</x>
<y>142</y>
<width>291</width>
<height>25</height>
</rect>
</property>
<property name="toolTip">
<string>Switching off and on the receiver data streaming from command line requires client sockets to be restarted as well.</string>
</property>
<property name="text">
<string>Restart Streaming (Receiver-&gt;GUI)</string>
</property>
<property name="icon">
<iconset resource="../include/icons.qrc">
<normaloff>:/icons/images/refresh.png</normaloff>:/icons/images/refresh.png</iconset>
</property>
</widget>
</widget>
<widget class="QWidget" name="gridLayoutWidget_7">
<property name="geometry">

4
slsDetectorGui/include/qTabAdvanced.h
View File

@ -162,10 +162,6 @@ private slots:
*/
void SetReceiver();
/** Restart data streaming in receiver and gui
*/
void RestartStreaming();
/** Add ROI Input if the value changed in the last slot
*/
void AddROIInputSlot(){AddROIInput(1);};

37
slsDetectorGui/src/qTabAdvanced.cpp
View File

@ -79,7 +79,6 @@ void qTabAdvanced::SetupWidgetWindow(){
isAngular = true;
spinZmqPort->setEnabled(false);
spinZmqPort2->setEnabled(false);
btnRestartStreaming->setEnabled(false);
break;
case slsDetectorDefs::EIGER:
isEnergy = true;
@ -281,8 +280,6 @@ void qTabAdvanced::Initialization(){
connect(dispUDPMAC, SIGNAL(editingFinished()), this, SLOT(SetNetworkParameters()));
connect(btnRxr, SIGNAL(clicked()), this, SLOT(SetReceiver()));
connect(btnRestartStreaming,SIGNAL(clicked()), this, SLOT(RestartStreaming()));
}
@ -737,12 +734,10 @@ void qTabAdvanced::SetCltZmqPort(int port){
disconnect(spinZmqPort, SIGNAL(valueChanged(int)), this, SLOT(SetCltZmqPort(int)));
spinZmqPort->setValue(atoi(det->setClientStreamingPort(sport).c_str()));
myDet->enableDataStreamingFromReceiver(false);
myDet->enableDataStreamingToClient(false);
myDet->enableDataStreamingFromReceiver(true);
myDet->enableDataStreamingToClient(true);
qDefs::checkErrorMessage(det,"qTabAdvanced::SetCltZmqPort");
myDet->enableDataStreamingToClient(false);
myDet->enableDataStreamingToClient(true);
qDefs::checkErrorMessage(myDet,"qTabAdvanced::SetCltZmqPort");
connect(spinZmqPort, SIGNAL(valueChanged(int)), this, SLOT(SetCltZmqPort(int)));
}
@ -758,12 +753,10 @@ void qTabAdvanced::SetRxrZmqPort(int port){
disconnect(spinZmqPort2, SIGNAL(valueChanged(int)), this, SLOT(SetRxrZmqPort(int)));
spinZmqPort2->setValue(atoi(det->setReceiverStreamingPort(sport).c_str()));
myDet->enableDataStreamingFromReceiver(false);
myDet->enableDataStreamingToClient(false);
myDet->enableDataStreamingFromReceiver(true);
myDet->enableDataStreamingToClient(true);
qDefs::checkErrorMessage(det,"qTabAdvanced::SetRxrZmqPort");
myDet->enableDataStreamingFromReceiver(false);
myDet->enableDataStreamingFromReceiver(true);
qDefs::checkErrorMessage(myDet,"qTabAdvanced::SetRxrZmqPort");
connect(spinZmqPort2, SIGNAL(valueChanged(int)), this, SLOT(SetRxrZmqPort(int)));
}
@ -865,24 +858,6 @@ void qTabAdvanced::SetReceiver(){
}
//-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabAdvanced::RestartStreaming(){
#ifdef VERBOSE
cout << "Restarting Data Streaming in Receiver and Gui" << endl;
#endif
disconnect(btnRestartStreaming,SIGNAL(clicked()), this, SLOT(RestartStreaming()));
myDet->enableDataStreamingFromReceiver(false);
myDet->enableDataStreamingToClient(false);
myDet->enableDataStreamingFromReceiver(true);
myDet->enableDataStreamingToClient(true);
connect(btnRestartStreaming,SIGNAL(clicked()), this, SLOT(RestartStreaming()));
}
//-------------------------------------------------------------------------------------------------------------------------------------------------