Commit ca7abd35 authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by aorlati
Browse files

Fix #230, done a little rework to the SRT active surface. (#231)

parent 06d03a81

SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceCore.cpp

+3 −0
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ void SRTActiveSurfaceCore::run(void) 
            case (ActiveSurface::AS_PARABOLIC_FIXED):

                asProfileCode = 3;

                break;

            case (ActiveSurface::AS_PARK):

                asProfileCode = 4;

                break;

        }

        emit setGUIasProfileCode();

SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceGUI.ui

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
   </size>

  </property>

  <property name="windowTitle">

   <string>SRT Active Surface ver. Apr. 14</string>

   <string>SRT Active Surface</string>

  </property>

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

   <property name="geometry">

SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceGUIui.cpp

+3 −0
Original line number Diff line number Diff line
@@ -10260,6 +10260,9 @@ void SRTActiveSurfaceGUI::changeGUIasProfileCode() 
        case (3):

            ProfilelineEdit_2->setText(QApplication::translate("SRTActiveSurfaceGUI", "PARABOLIC FIXED", 0, QApplication::UnicodeUTF8));

            break;

        case (4):

            ProfilelineEdit_2->setText(QApplication::translate("SRTActiveSurfaceGUI", "PARK", 0, QApplication::UnicodeUTF8));

            break;

    }

}

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

+24 −1
Original line number Diff line number Diff line
@@ -362,8 +362,31 @@ 
   -   Tue Jun 16 11:14:42 UTC 2015 modified by jDAL

   -   Tue Jun 16 12:46:30 UTC 2015 modified by jDAL

   -   Tue Jun 16 13:00:45 UTC 2015 modified by jDAL

   -   Mon Jun 18 10:00:57 UTC 2018 modified by jDAL

   -   Mon Jun 18 10:24:27 UTC 2018 modified by jDAL

   -   Mon Jun 18 10:46:37 UTC 2018 modified by jDAL

   -   Mon Jun 18 10:59:48 UTC 2018 modified by jDAL

   -   Mon Jun 18 14:46:50 UTC 2018 modified by jDAL

   -   Thu Jun 21 08:14:37 UTC 2018 modified by jDAL

   -   Thu Jun 21 08:37:56 UTC 2018 modified by jDAL

   -   Thu Jun 21 12:05:20 UTC 2018 modified by jDAL

   -   Thu Jun 21 12:27:04 UTC 2018 modified by jDAL

   -   Thu Jun 21 12:27:56 UTC 2018 modified by jDAL

   -   Thu Jun 21 12:28:18 UTC 2018 modified by jDAL

   -   Fri Jun 22 08:39:42 UTC 2018 modified by jDAL

   -   Fri Jun 22 08:40:21 UTC 2018 modified by jDAL

   -   Fri Jun 22 08:52:18 UTC 2018 modified by jDAL

   -   Fri Jun 22 09:24:37 UTC 2018 modified by jDAL

   -   Fri Jun 22 09:37:04 UTC 2018 modified by jDAL

   -   Fri Jun 22 10:06:01 UTC 2018 modified by jDAL

   -   Fri Jun 22 13:50:49 UTC 2018 modified by jDAL

   -   Fri Jun 22 14:01:54 UTC 2018 modified by jDAL

   -   Tue Jun 26 14:22:54 UTC 2018 modified by jDAL

   -   Tue Jun 26 14:24:02 UTC 2018 modified by jDAL

   -   Tue Jun 26 14:34:39 UTC 2018 modified by jDAL

   -   Tue Jun 26 14:35:27 UTC 2018 modified by jDAL

-->

<SRTActiveSurfaceBoss xmlns="urn:schemas-cosylab-com:SRTActiveSurfaceBoss:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" WatchingThreadTime="200000" RepetitionCacheTime="2000000" RepetitionExpireTime="5000000" profile="1">

<SRTActiveSurfaceBoss xmlns="urn:schemas-cosylab-com:SRTActiveSurfaceBoss:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" WatchingThreadTime="200000" RepetitionCacheTime="2000000" RepetitionExpireTime="5000000" profile="4">

	<status />

	<enabled />

	<pprofile />

SRT/Interfaces/SRTActiveSurfaceInterface/idl/SRTActiveSurfaceBoss.midl

+3 −2
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ module ActiveSurface { 
        AS_SHAPED,

	    AS_SHAPED_FIXED,

        AS_PARABOLIC,

	AS_PARABOLIC_FIXED

	    AS_PARABOLIC_FIXED,

        AS_PARK

    };

    ACS_ENUM(TASProfile);