Commit 7d5b9df2 authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Some Active Surface upgrades. 

This branch is meant to gather all the active surface updates for all the three stations. This will be merged onto centos_7_compatibility whenever the upgrade is done.
parent 7e2c0e23

Common/Servers/ActiveSurfaceUSD/src/ActiveSurfaceUSDImpl.cpp

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ void USDImpl::initialize() throw (ACSErr::ACSbaseExImpl) 
            _SET_LDEF(acc,   "USDImpl::initialize()");

            _SET_LDEF(uBits, "USDImpl::initialize()");

        }

        _GET_PROP(status,m_status,"usdImpl::initialize()")

    }

    catch (ASErrors::ASErrorsEx& ex)

    {

SRT/CDB/MACI/Containers/SRTActiveSurfaceContainer01/SRTActiveSurfaceContainer01.xml

+0 −1
Original line number Diff line number Diff line
@@ -22,6 +22,5 @@ 
		flushPeriodSeconds="1"

	>

	</LoggingConfig>

	

</Container>

SRT/CDB/MACI/Containers/SRTActiveSurfaceContainer06/SRTActiveSurfaceContainer06.xml

+22 −7
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='ISO-8859-1'?>

<!--

   - History:

   -   Tue Sep 23 09:22:44 UTC 2008 modified by jDAL

-->

<Container xmlns="urn:schemas-cosylab-com:Container:1.0" xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:log="urn:schemas-cosylab-com:LoggingConfig:1.0" Timeout="30.0" ServerThreads="5" ImplLang="cpp">

<?xml version="1.0" encoding="ISO-8859-1"?>



<Container

	xmlns="urn:schemas-cosylab-com:Container:1.0"

	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"

	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

	xmlns:log="urn:schemas-cosylab-com:LoggingConfig:1.0"

	Timeout="30.0"

	ServerThreads="5"

	ImplLang="cpp">



	<Autoload>

		<cdb:e string="baci" />

	</Autoload>

	<LoggingConfig minLogLevel="5" minLogLevelLocal="10" dispatchPacketSize="0" immediateDispatchLevel="10" flushPeriodSeconds="1" />



	<LoggingConfig

		minLogLevel="5"

		minLogLevelLocal="5"

		dispatchPacketSize="0"

		immediateDispatchLevel="10"

		flushPeriodSeconds="1"

	>

	</LoggingConfig>

</Container>

SRT/CDB/MACI/Containers/SRTActiveSurfaceContainer07/SRTActiveSurfaceContainer07.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
	<LoggingConfig

		minLogLevel="5"

		minLogLevelLocal="5"

		dispatchPacketSize="10"

		dispatchPacketSize="0"

		immediateDispatchLevel="10"

		flushPeriodSeconds="1"

	>

SRT/Clients/SRTActiveSurfaceGUIClient/include/SRTActiveSurfaceCore.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ class SRTActiveSurfaceCore : public QThread 
        int ActuatorStatusCalLabelCode;



    signals:

        int setGUIActuatorColor(int, int, bool, bool);

        int setGUIActuatorColor(int, int, bool, bool, bool);

        int setGUIAllActuators(bool callfromfunction = false);

        int setGUIcircleORradius(bool callfromfunction = false);

        int setGUIActuator(bool callfromfunction = false);