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

makng the zmq work without external flag

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-11-27 17:06:11 +01:00
commit e29371ca8d
4 changed files with 7 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
slsDetectorGui/forms/form_tab_advanced.ui
View File

@ -1350,26 +1350,6 @@ An extension given by the modules serial number will be attached.
</item> </item>
</layout> </layout>
</widget> </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>
<widget class="QWidget" name="gridLayoutWidget_7"> <widget class="QWidget" name="gridLayoutWidget_7">
<property name="geometry"> <property name="geometry">

4
slsDetectorGui/include/qTabAdvanced.h
View File

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

10
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -361,7 +361,7 @@ void qDrawPlot::SetupWidgetWindow(){
// callbacks // callbacks
// Setting the callback function to get data from detector class // Setting the callback function to get data from detector class
myDet->registerDataCallback(&(GetDataCallBack),this); myDet->registerDataCallback(&(GetDataCallBack),this); // also enables data streaming in client
//Setting the callback function to alert when acquisition finished from detector class //Setting the callback function to alert when acquisition finished from detector class
myDet->registerAcquisitionFinishedCallback(&(GetAcquisitionFinishedCallBack),this); myDet->registerAcquisitionFinishedCallback(&(GetAcquisitionFinishedCallBack),this);
//Setting the callback function to alert when each measurement finished from detector class //Setting the callback function to alert when each measurement finished from detector class
@ -373,7 +373,6 @@ void qDrawPlot::SetupWidgetWindow(){
// if receiver, enable data streaming from receiver and client // if receiver, enable data streaming from receiver and client
if(myDet->setReceiverOnline() == slsDetectorDefs::ONLINE_FLAG) { if(myDet->setReceiverOnline() == slsDetectorDefs::ONLINE_FLAG) {
myDet->enableDataStreamingFromReceiver(1); myDet->enableDataStreamingFromReceiver(1);
myDet->enableDataStreamingToClient(1);
} }
qDefs::checkErrorMessage(myDet,"qDrawPlot::SetupWidgetWindow"); qDefs::checkErrorMessage(myDet,"qDrawPlot::SetupWidgetWindow");
@ -800,13 +799,6 @@ void* qDrawPlot::DataStartAcquireThread(void *this_pointer){
qDefs::checkErrorMessage(((qDrawPlot*)this_pointer)->myDet,"qDrawPlot::DataStartAcquireThread"); qDefs::checkErrorMessage(((qDrawPlot*)this_pointer)->myDet,"qDrawPlot::DataStartAcquireThread");
return this_pointer; return this_pointer;
} }
// switch off client
((qDrawPlot*)this_pointer)->myDet->enableDataStreamingToClient(0);
// switch on client
if (((qDrawPlot*)this_pointer)->myDet->enableDataStreamingToClient(1) != 1) {
qDefs::checkErrorMessage(((qDrawPlot*)this_pointer)->myDet,"qDrawPlot::DataStartAcquireThread");
return this_pointer;
}
} }
} }

43
slsDetectorGui/src/qTabAdvanced.cpp
View File

@ -81,7 +81,6 @@ void qTabAdvanced::SetupWidgetWindow(){
spinZmqPort2->setEnabled(false); spinZmqPort2->setEnabled(false);
dispZMQIP->setEnabled(false); dispZMQIP->setEnabled(false);
dispZMQIP2->setEnabled(false); dispZMQIP2->setEnabled(false);
btnRestartStreaming->setEnabled(false);
break; break;
case slsDetectorDefs::EIGER: case slsDetectorDefs::EIGER:
isEnergy = true; isEnergy = true;
@ -284,8 +283,6 @@ void qTabAdvanced::Initialization(){
connect(dispZMQIP2, SIGNAL(editingFinished()), this, SLOT(SetReceiverZMQIP())); connect(dispZMQIP2, SIGNAL(editingFinished()), this, SLOT(SetReceiverZMQIP()));
connect(btnRxr, SIGNAL(clicked()), this, SLOT(SetReceiver())); connect(btnRxr, SIGNAL(clicked()), this, SLOT(SetReceiver()));
connect(btnRestartStreaming,SIGNAL(clicked()), this, SLOT(RestartStreaming()));
} }
@ -740,12 +737,10 @@ void qTabAdvanced::SetCltZmqPort(int port){
disconnect(spinZmqPort, SIGNAL(valueChanged(int)), this, SLOT(SetCltZmqPort(int))); disconnect(spinZmqPort, SIGNAL(valueChanged(int)), this, SLOT(SetCltZmqPort(int)));
spinZmqPort->setValue(atoi(det->setClientStreamingPort(sport).c_str())); 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"); 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))); connect(spinZmqPort, SIGNAL(valueChanged(int)), this, SLOT(SetCltZmqPort(int)));
} }
@ -761,12 +756,10 @@ void qTabAdvanced::SetRxrZmqPort(int port){
disconnect(spinZmqPort2, SIGNAL(valueChanged(int)), this, SLOT(SetRxrZmqPort(int))); disconnect(spinZmqPort2, SIGNAL(valueChanged(int)), this, SLOT(SetRxrZmqPort(int)));
spinZmqPort2->setValue(atoi(det->setReceiverStreamingPort(sport).c_str())); 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"); 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))); connect(spinZmqPort2, SIGNAL(valueChanged(int)), this, SLOT(SetRxrZmqPort(int)));
} }
@ -862,10 +855,7 @@ void qTabAdvanced::SetClientZMQIP(){
disconnect(dispZMQIP, SIGNAL(editingFinished()), this, SLOT(SetClientZMQIP())); disconnect(dispZMQIP, SIGNAL(editingFinished()), this, SLOT(SetClientZMQIP()));
dispZMQIP->setText(QString(det->setClientStreamingIP(dispZMQIP->text().toAscii().constData()).c_str())); dispZMQIP->setText(QString(det->setClientStreamingIP(dispZMQIP->text().toAscii().constData()).c_str()));
myDet->enableDataStreamingFromReceiver(false);
myDet->enableDataStreamingToClient(false); myDet->enableDataStreamingToClient(false);
myDet->enableDataStreamingFromReceiver(true);
myDet->enableDataStreamingToClient(true); myDet->enableDataStreamingToClient(true);
qDefs::checkErrorMessage(det,"qTabAdvanced::SetClientZMQIP"); qDefs::checkErrorMessage(det,"qTabAdvanced::SetClientZMQIP");
@ -884,10 +874,7 @@ void qTabAdvanced::SetReceiverZMQIP(){
dispZMQIP2->setText(QString(det->setReceiverStreamingIP(dispZMQIP2->text().toAscii().constData()).c_str())); dispZMQIP2->setText(QString(det->setReceiverStreamingIP(dispZMQIP2->text().toAscii().constData()).c_str()));
myDet->enableDataStreamingFromReceiver(false); myDet->enableDataStreamingFromReceiver(false);
myDet->enableDataStreamingToClient(false);
myDet->enableDataStreamingFromReceiver(true); myDet->enableDataStreamingFromReceiver(true);
myDet->enableDataStreamingToClient(true);
qDefs::checkErrorMessage(det,"qTabAdvanced::SetReceiverZMQIP"); qDefs::checkErrorMessage(det,"qTabAdvanced::SetReceiverZMQIP");
connect(dispZMQIP2, SIGNAL(editingFinished()), this, SLOT(SetReceiverZMQIP())); connect(dispZMQIP2, SIGNAL(editingFinished()), this, SLOT(SetReceiverZMQIP()));
@ -910,24 +897,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()));
}
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------