Commit 6183b98d authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Added LUT filename to SRT AS Boss and GUI

parent d7345706

SRT/CDB/alma/AS/Boss/Boss.xml

+2 −1
Original line number Diff line number Diff line
@@ -9,4 +9,5 @@ 
	<enabled />

	<pprofile />

	<tracking />

	<LUT_filename />

</SRTActiveSurfaceBoss>

SRT/Clients/SRTActiveSurfaceGUIClient/include/SRTActiveSurfaceCore.h

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ class SRTActiveSurfaceCore : public QThread 
        int setGUIActuatorStatusLabels();

        int setGUIasStatusCode(int);

        int setGUIasProfileCode(int);

        int setGUIasLUTFileName(QString);

        

	private:

	    ActiveSurface::SRTActiveSurfaceBoss_var tASBoss;

SRT/Clients/SRTActiveSurfaceGUIClient/include/SRTActiveSurfaceGUIui.h

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ class SRTActiveSurfaceGUI : public QWidget, public Ui_SRTActiveSurfaceGUI 
        void changeGUIActuatorStatusLabels();

        void changeGUIasStatusCode(int);

        void changeGUIasProfileCode(int);

        void changeGUIasLUTFileName(QString);



    private:

        SRTActiveSurfaceCore mySRTActiveSurfaceCore;

SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceCore.cpp

+12 −5
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ void SRTActiveSurfaceCore::run(void) 


    Management::ROTSystemStatus_var bossStatus_var;

    ActiveSurface::ROTASProfile_var asProfile_var;

    ACS::ROstring_var asLUTFileName_var;



    while (monitor == true)

    {
@@ -72,6 +73,9 @@ void SRTActiveSurfaceCore::run(void) 
        asProfile_var = tASBoss->pprofile();

        emit setGUIasProfileCode((int)asProfile_var->get_sync(completion.out()));



        asLUTFileName_var = tASBoss->LUT_filename();

        emit setGUIasLUTFileName(QString(asLUTFileName_var->get_sync(completion.out())));



        ACS::longSeq_var asStatus;

        tASBoss->asStatus4GUIClient(asStatus);
@@ -218,7 +222,8 @@ void SRTActiveSurfaceCore::setactuator(int circle, int actuator) 
        impl.log();

    }



    if (active == true) {

    if (active == true)

    {

        //if ((status & ENBL) == 0) {

        /*qApp->lock();

        tGUI->ActuatorStatusEnblLabel->clear();
@@ -293,7 +298,8 @@ void SRTActiveSurfaceCore::setactuator(int circle, int actuator) 
                //tGUI->ActuatorStatusRunLabel->clear();

                //tGUI->ActuatorStatusRunLabel->setText("RUNNING");

            }

            if ((status & ENBL) == 0) {

            ActuatorStatusEnblLabelCode = 1;

            /*if ((status & ENBL) == 0) {

                ActuatorStatusEnblLabelCode = -1;

                //tGUI->ActuatorStatusEnblLabel->clear();

                //tGUI->ActuatorStatusEnblLabel->setText("UNABLED");
@@ -302,7 +308,7 @@ void SRTActiveSurfaceCore::setactuator(int circle, int actuator) 
                ActuatorStatusEnblLabelCode = 1;

                //tGUI->ActuatorStatusEnblLabel->clear();

                //tGUI->ActuatorStatusEnblLabel->setText("ENABLED");

            }

            }*/

            if ((status & CAMM) == 0) {

                ActuatorStatusCammLabelCode = -1;

                //tGUI->ActuatorStatusCammLabel->clear();
@@ -323,7 +329,8 @@ void SRTActiveSurfaceCore::setactuator(int circle, int actuator) 
                //tGUI->ActuatorStatusLoopLabel->clear();

                //tGUI->ActuatorStatusLoopLabel->setText("LOOP");

            }

            if ((status & CAL) == 0) {

            if ((status & CAL) == 0)

            {

                ActuatorStatusCalLabelCode = -1;

                statusColor = true;

                //tGUI->ActuatorStatusCalLabel->clear();
@@ -361,7 +368,7 @@ void SRTActiveSurfaceCore::setactuator(int circle, int actuator) 
    else {

        active = false;

        statusColor = true;

        ActuatorStatusRunLabelCode = -1;

        ActuatorStatusRunLabelCode = 0;

        ActuatorStatusEnblLabelCode = -1;

        ActuatorStatusCammLabelCode = 0;

        ActuatorStatusLoopLabelCode = 0;

SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceGUI.ui

+94 −83
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
   <property name="geometry">

    <rect>

     <x>970</x>

     <y>15</y>

     <y>50</y>

     <width>130</width>

     <height>30</height>

    </rect>
@@ -48,7 +48,7 @@ 
   <property name="geometry">

    <rect>

     <x>970</x>

     <y>152</y>

     <y>187</y>

     <width>130</width>

     <height>20</height>

    </rect>
@@ -67,7 +67,7 @@ 
   <property name="geometry">

    <rect>

     <x>970</x>

     <y>225</y>

     <y>260</y>

     <width>130</width>

     <height>20</height>

    </rect>
@@ -89,7 +89,7 @@ 
   <property name="geometry">

    <rect>

     <x>970</x>

     <y>305</y>

     <y>340</y>

     <width>90</width>

     <height>35</height>

    </rect>
@@ -114,7 +114,7 @@ 
   <property name="geometry">

    <rect>

     <x>1065</x>

     <y>305</y>

     <y>340</y>

     <width>95</width>

     <height>35</height>

    </rect>
@@ -139,7 +139,7 @@ 
   <property name="geometry">

    <rect>

     <x>1115</x>

     <y>265</y>

     <y>300</y>

     <width>140</width>

     <height>35</height>

    </rect>
@@ -164,7 +164,7 @@ 
   <property name="geometry">

    <rect>

     <x>970</x>

     <y>265</y>

     <y>300</y>

     <width>140</width>

     <height>35</height>

    </rect>
@@ -189,7 +189,7 @@ 
   <property name="geometry">

    <rect>

     <x>1165</x>

     <y>305</y>

     <y>340</y>

     <width>90</width>

     <height>35</height>

    </rect>
@@ -211,7 +211,7 @@ 
   <property name="geometry">

    <rect>

     <x>970</x>

     <y>105</y>

     <y>140</y>

     <width>130</width>

     <height>42</height>

    </rect>
@@ -230,7 +230,7 @@ 
   <property name="geometry">

    <rect>

     <x>970</x>

     <y>60</y>

     <y>95</y>

     <width>130</width>

     <height>42</height>

    </rect>
@@ -249,7 +249,7 @@ 
   <property name="geometry">

    <rect>

     <x>970</x>

     <y>176</y>

     <y>211</y>

     <width>130</width>

     <height>20</height>

    </rect>
@@ -268,7 +268,7 @@ 
   <property name="geometry">

    <rect>

     <x>970</x>

     <y>200</y>

     <y>235</y>

     <width>130</width>

     <height>20</height>

    </rect>
@@ -287,7 +287,7 @@ 
   <property name="geometry">

    <rect>

     <x>1120</x>

     <y>15</y>

     <y>50</y>

     <width>135</width>

     <height>30</height>

    </rect>
@@ -312,7 +312,7 @@ 
   <property name="geometry">

    <rect>

     <x>1120</x>

     <y>60</y>

     <y>95</y>

     <width>30</width>

     <height>20</height>

    </rect>
@@ -331,7 +331,7 @@ 
   <property name="geometry">

    <rect>

     <x>1120</x>

     <y>82</y>

     <y>117</y>

     <width>30</width>

     <height>20</height>

    </rect>
@@ -350,7 +350,7 @@ 
   <property name="geometry">

    <rect>

     <x>1120</x>

     <y>106</y>

     <y>141</y>

     <width>30</width>

     <height>20</height>

    </rect>
@@ -369,7 +369,7 @@ 
   <property name="geometry">

    <rect>

     <x>1120</x>

     <y>127</y>

     <y>162</y>

     <width>30</width>

     <height>20</height>

    </rect>
@@ -388,7 +388,7 @@ 
   <property name="geometry">

    <rect>

     <x>1153</x>

     <y>60</y>

     <y>95</y>

     <width>100</width>

     <height>20</height>

    </rect>
@@ -407,7 +407,7 @@ 
   <property name="geometry">

    <rect>

     <x>1153</x>

     <y>82</y>

     <y>117</y>

     <width>100</width>

     <height>20</height>

    </rect>
@@ -426,7 +426,7 @@ 
   <property name="geometry">

    <rect>

     <x>1154</x>

     <y>106</y>

     <y>141</y>

     <width>100</width>

     <height>20</height>

    </rect>
@@ -445,7 +445,7 @@ 
   <property name="geometry">

    <rect>

     <x>1154</x>

     <y>127</y>

     <y>162</y>

     <width>100</width>

     <height>20</height>

    </rect>
@@ -464,7 +464,7 @@ 
   <property name="geometry">

    <rect>

     <x>1120</x>

     <y>152</y>

     <y>187</y>

     <width>135</width>

     <height>20</height>

    </rect>
@@ -483,7 +483,7 @@ 
   <property name="geometry">

    <rect>

     <x>1120</x>

     <y>176</y>

     <y>211</y>

     <width>135</width>

     <height>20</height>

    </rect>
@@ -502,7 +502,7 @@ 
   <property name="geometry">

    <rect>

     <x>1120</x>

     <y>200</y>

     <y>235</y>

     <width>135</width>

     <height>20</height>

    </rect>
@@ -521,7 +521,7 @@ 
   <property name="geometry">

    <rect>

     <x>1120</x>

     <y>225</y>

     <y>260</y>

     <width>135</width>

     <height>20</height>

    </rect>
@@ -543,7 +543,7 @@ 
   <property name="geometry">

    <rect>

     <x>970</x>

     <y>760</y>

     <y>755</y>

     <width>287</width>

     <height>32</height>

    </rect>
@@ -568883,9 +568883,6 @@ 
    <property name="text">

     <string>Calibration</string>

    </property>

    <attribute name="buttonGroup">

     <string/>

    </attribute>

   </widget>

   <widget class="QPushButton" name="StopButton">

    <property name="geometry">
@@ -569347,9 +569344,6 @@ 
    <property name="text">

     <string>Stop</string>

    </property>

    <attribute name="buttonGroup">

     <string/>

    </attribute>

   </widget>

   <widget class="QPushButton" name="ResetButton">

    <property name="geometry">
@@ -569811,9 +569805,6 @@ 
    <property name="text">

     <string>Reset</string>

    </property>

    <attribute name="buttonGroup">

     <string/>

    </attribute>

   </widget>

   <widget class="QPushButton" name="RefPosButton">

    <property name="geometry">
@@ -570275,9 +570266,6 @@ 
    <property name="text">

     <string>RefPos</string>

    </property>

    <attribute name="buttonGroup">

     <string/>

    </attribute>

   </widget>

   <widget class="QPushButton" name="TopButton">

    <property name="geometry">
@@ -570739,9 +570727,6 @@ 
    <property name="text">

     <string>Top</string>

    </property>

    <attribute name="buttonGroup">

     <string/>

    </attribute>

   </widget>

   <widget class="QPushButton" name="StowButton">

    <property name="geometry">
@@ -571203,9 +571188,6 @@ 
    <property name="text">

     <string>Stow</string>

    </property>

    <attribute name="buttonGroup">

     <string/>

    </attribute>

   </widget>

   <widget class="QPushButton" name="BottomButton">

    <property name="geometry">
@@ -571667,9 +571649,6 @@ 
    <property name="text">

     <string>Bottom</string>

    </property>

    <attribute name="buttonGroup">

     <string/>

    </attribute>

   </widget>

   <widget class="QPushButton" name="SetupButton">

    <property name="geometry">
@@ -572131,9 +572110,6 @@ 
    <property name="text">

     <string>Setup</string>

    </property>

    <attribute name="buttonGroup">

     <string/>

    </attribute>

   </widget>

   <widget class="QPushButton" name="DownButton">

    <property name="geometry">
@@ -572595,9 +572571,6 @@ 
    <property name="text">

     <string>Down</string>

    </property>

    <attribute name="buttonGroup">

     <string/>

    </attribute>

   </widget>

   <widget class="QPushButton" name="UpButton">

    <property name="geometry">
@@ -573059,9 +573032,6 @@ 
    <property name="text">

     <string>Up</string>

    </property>

    <attribute name="buttonGroup">

     <string/>

    </attribute>

   </widget>

   <widget class="QPushButton" name="MoveButton">

    <property name="geometry">
@@ -573523,9 +573493,6 @@ 
    <property name="text">

     <string>Move</string>

    </property>

    <attribute name="buttonGroup">

     <string/>

    </attribute>

   </widget>

   <widget class="QLineEdit" name="ActuatorMovelineEdit">

    <property name="geometry">
@@ -574008,9 +573975,6 @@ 
    <property name="text">

     <string>Correction</string>

    </property>

    <attribute name="buttonGroup">

     <string/>

    </attribute>

   </widget>

   <widget class="QLineEdit" name="ActuatorCorrectionlineEdit">

    <property name="geometry">
@@ -574493,9 +574457,6 @@ 
    <property name="text">

     <string>Update</string>

    </property>

    <attribute name="buttonGroup">

     <string/>

    </attribute>

   </widget>

   <widget class="QLineEdit" name="ActuatorUpdatelineEdit">

    <property name="geometry">
@@ -574523,7 +574484,7 @@ 
   <property name="geometry">

    <rect>

     <x>970</x>

     <y>830</y>

     <y>825</y>

     <width>90</width>

     <height>30</height>

    </rect>
@@ -574983,8 +574944,8 @@ 
  <widget class="QPushButton" name="stowASbutton">

   <property name="geometry">

    <rect>

     <x>1164</x>

     <y>830</y>

     <x>1170</x>

     <y>825</y>

     <width>90</width>

     <height>30</height>

    </rect>
@@ -575444,8 +575405,8 @@ 
  <widget class="QPushButton" name="stopASbutton">

   <property name="geometry">

    <rect>

     <x>1067</x>

     <y>830</y>

     <x>1070</x>

     <y>825</y>

     <width>90</width>

     <height>30</height>

    </rect>
@@ -575905,9 +575866,9 @@ 
  <widget class="QLineEdit" name="StatuslineEdit_2">

   <property name="geometry">

    <rect>

     <x>990</x>

     <x>970</x>

     <y>890</y>

     <width>120</width>

     <width>140</width>

     <height>30</height>

    </rect>

   </property>
@@ -575930,10 +575891,10 @@ 
  <widget class="QLineEdit" name="StatuslineEdit">

   <property name="geometry">

    <rect>

     <x>990</x>

     <y>870</y>

     <width>120</width>

     <height>20</height>

     <x>970</x>

     <y>860</y>

     <width>140</width>

     <height>30</height>

    </rect>

   </property>

   <property name="autoFillBackground">
@@ -575955,8 +575916,8 @@ 
  <widget class="QComboBox" name="SetProfilecomboBox">

   <property name="geometry">

    <rect>

     <x>1104</x>

     <y>792</y>

     <x>1110</x>

     <y>790</y>

     <width>151</width>

     <height>30</height>

    </rect>
@@ -575992,7 +575953,7 @@ 
   <property name="geometry">

    <rect>

     <x>970</x>

     <y>792</y>

     <y>790</y>

     <width>131</width>

     <height>30</height>

    </rect>
@@ -576453,9 +576414,9 @@ 
   <property name="geometry">

    <rect>

     <x>1120</x>

     <y>870</y>

     <width>120</width>

     <height>20</height>

     <y>860</y>

     <width>140</width>

     <height>30</height>

    </rect>

   </property>

   <property name="autoFillBackground">
@@ -576479,7 +576440,7 @@ 
    <rect>

     <x>1120</x>

     <y>890</y>

     <width>120</width>

     <width>140</width>

     <height>30</height>

    </rect>

   </property>
@@ -576499,6 +576460,56 @@ 
    <bool>true</bool>

   </property>

  </widget>

  <widget class="QLabel" name="LUTLabel">

   <property name="geometry">

    <rect>

     <x>970</x>

     <y>10</y>

     <width>131</width>

     <height>30</height>

    </rect>

   </property>

   <property name="text">

    <string>LUT File</string>

   </property>

   <property name="alignment">

    <set>Qt::AlignCenter</set>

   </property>

   <property name="wordWrap">

    <bool>false</bool>

   </property>

  </widget>

  <widget class="QLineEdit" name="LUTLabelFileName">

   <property name="geometry">

    <rect>

     <x>1074</x>

     <y>10</y>

     <width>181</width>

     <height>30</height>

    </rect>

   </property>

   <property name="font">

    <font>

     <family>Cantarell</family>

     <pointsize>12</pointsize>

    </font>

   </property>

   <property name="text">

    <string/>

   </property>

   <property name="maxLength">

    <number>32767</number>

   </property>

   <property name="frame">

    <bool>true</bool>

   </property>

   <property name="alignment">

    <set>Qt::AlignHCenter</set>

   </property>

   <property name="readOnly">

    <bool>true</bool>

   </property>

  </widget>

 </widget>

 <layoutdefault spacing="0" margin="1"/>

 <customwidgets>