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

included set all trimbits

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-09-10 12:53:18 +02:00
parent 1c41ea8898
commit 754d0b7911
3 changed files with 116 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
slsDetectorGui/forms/form_tab_advanced.ui
View File

@ -51,7 +51,7 @@
<enum>QTabWidget::North</enum>
</property>
<property name="currentIndex">
<number>3</number>
<number>1</number>
</property>
<property name="elideMode">
<enum>Qt::ElideLeft</enum>
@ -77,7 +77,7 @@
<rect>
<x>25</x>
<y>20</y>
<width>313</width>
<width>320</width>
<height>31</height>
</rect>
</property>
@ -124,7 +124,7 @@
<rect>
<x>5</x>
<y>10</y>
<width>746</width>
<width>467</width>
<height>66</height>
</rect>
</property>
@ -140,9 +140,9 @@
<widget class="QWidget" name="horizontalLayoutWidget">
<property name="geometry">
<rect>
<x>510</x>
<x>230</x>
<y>15</y>
<width>211</width>
<width>228</width>
<height>44</height>
</rect>
</property>
@ -169,7 +169,7 @@ Updates plot with Trimbits from Shared Memory, not from Detector.
</property>
<property name="iconSize">
<size>
<width>16</width>
<width>24</width>
<height>16</height>
</size>
</property>
@ -740,6 +740,54 @@ An extension given by the modules serial number will be attached.
</layout>
</widget>
</widget>
<widget class="QGroupBox" name="boxSetAllTrimbits">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry">
<rect>
<x>518</x>
<y>10</y>
<width>233</width>
<height>66</height>
</rect>
</property>
<property name="title">
<string>Developer Option</string>
</property>
<property name="checkable">
<bool>false</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>12</x>
<y>28</y>
<width>94</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Set All trimbits:</string>
</property>
</widget>
<widget class="QSpinBox" name="spinSetAllTrimbits">
<property name="geometry">
<rect>
<x>121</x>
<y>24</y>
<width>86</width>
<height>25</height>
</rect>
</property>
<property name="maximum">
<number>63</number>
</property>
</widget>
</widget>
</widget>
<widget class="QWidget" name="tab_5">
<attribute name="title">
@ -931,7 +979,7 @@ An extension given by the modules serial number will be attached.
</property>
<layout class="QGridLayout" name="gridLayout_8">
<property name="verticalSpacing">
<number>-1</number>
<number>6</number>
</property>
<item row="1" column="0">
<widget class="QLabel" name="label_8">
@ -1218,7 +1266,7 @@ An extension given by the modules serial number will be attached.
</property>
<layout class="QGridLayout" name="gridLayout_6">
<property name="verticalSpacing">
<number>-1</number>
<number>6</number>
</property>
<item row="0" column="4">
<widget class="QComboBox" name="comboOnline">

8
slsDetectorGui/include/qTabAdvanced.h
View File

@ -63,6 +63,10 @@ private:
*/
int validateBeforeTrimming();
/** update the setalltrimbits value from server
*/
void updateAllTrimbitsFromServer();
private slots:
@ -172,6 +176,10 @@ private slots:
*/
void SetDetector(int index);
/** Set all trimbits to a value
*/
void SetAllTrimbits();
private:
/** The multi detector object */
multiSlsDetector *myDet;

54
slsDetectorGui/src/qTabAdvanced.cpp
View File

@ -58,6 +58,7 @@ void qTabAdvanced::SetupWidgetWindow(){
dispIP->setEnabled(false);
dispMAC->setEnabled(false);
boxRxr->setEnabled(false);
boxSetAllTrimbits->setEnabled(false);
red = QPalette();
@ -73,7 +74,10 @@ void qTabAdvanced::SetupWidgetWindow(){
detType = myDet->getDetectorsType();
switch(detType){
case slsDetectorDefs::MYTHEN: isEnergy = true; isAngular = true; break;
case slsDetectorDefs::MYTHEN:
isEnergy = true;
isAngular = true;
break;
case slsDetectorDefs::EIGER:
isEnergy = true;
isAngular = false;
@ -82,6 +86,7 @@ void qTabAdvanced::SetupWidgetWindow(){
dispIP->setEnabled(true);
dispMAC->setEnabled(true);
boxRxr->setEnabled(true);
boxSetAllTrimbits->setEnabled(true);
break;
case slsDetectorDefs::MOENCH:
isEnergy = false;
@ -177,7 +182,6 @@ void qTabAdvanced::SetupWidgetWindow(){
cout << "Getting ROI" << endl;
updateROIList();
// print receiver configurations
if(myDet->getDetectorsType() != slsDetectorDefs::MYTHEN){
cout << endl;
@ -216,6 +220,10 @@ void qTabAdvanced::Initialization(){
connect(dispFile, SIGNAL(editingFinished()), this, SLOT(SetOutputFile()));
connect(btnFile, SIGNAL(clicked()), this, SLOT(BrowseOutputFile()));
//setalltrimbits
if(boxSetAllTrimbits->isEnabled())
connect(spinSetAllTrimbits, SIGNAL(editingFinished()), this, SLOT(SetAllTrimbits()));
//enable trimming method group box
connect(boxTrimming, SIGNAL(toggled(bool)), this, SLOT(EnableTrimming(bool)));
@ -1088,6 +1096,45 @@ void qTabAdvanced::SetDetector(int index){
//-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabAdvanced::SetAllTrimbits(){
#ifdef VERBOSE
cout<<"Set all trimbits to " << spinSetAllTrimbits->value() << endl;
#endif
myDet->setAllTrimbits(spinSetAllTrimbits->value());
qDefs::checkErrorMessage(myDet,"qTabAdvanced::SetAllTrimbits");
updateAllTrimbitsFromServer();
}
//-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabAdvanced::updateAllTrimbitsFromServer(){
#ifdef VERBOSE
cout<<"Getting all trimbits value" << endl;
#endif
disconnect(spinSetAllTrimbits, SIGNAL(editingFinished()), this, SLOT(SetAllTrimbits()));
int ret = myDet->setAllTrimbits(-1);
qDefs::checkErrorMessage(myDet,"qTabAdvanced::updateAllTrimbitsFromServer");
if(ret<0){
qDefs::Message(qDefs::WARNING,"Inconsistent value from alltrimbits value.\n"
"Setting it for all detectors involved to 0.","qTabAdvanced::updateAllTrimbitsFromServer");
//set to default
spinSetAllTrimbits->setValue(0);
myDet->setAllTrimbits(0);
qDefs::checkErrorMessage(myDet,"qTabAdvanced::updateAllTrimbitsFromServer");
}else
spinSetAllTrimbits->setValue(ret);
connect(spinSetAllTrimbits, SIGNAL(editingFinished()), this, SLOT(SetAllTrimbits()));
}
//-------------------------------------------------------------------------------------------------------------------------------------------------
void qTabAdvanced::Refresh(){
@ -1261,6 +1308,9 @@ void qTabAdvanced::Refresh(){
#endif
updateROIList();
//update alltirmbits from server
if(boxSetAllTrimbits->isEnabled())
updateAllTrimbitsFromServer();
#ifdef VERBOSE
cout << "**Updated Advanced Tab" << endl << endl;