Commit a32d72a1 authored by Marco Buttu's avatar Marco Buttu
Browse files

The derotator raises DerotatorErrors.OutOfRangeErrorEx in case of out or range

parent 1de77a3c

Common/Errors/ReceiversErrors/idl/DerotatorErrors.xml

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ 
         shortDescription="Cannot set the position" 

         description=""/>



    <ErrorCode name="OutOfRangeError" 

         shortDescription="Position out of range" 

         description=""/>



    <ErrorCode name="UnexpectedError" 

         shortDescription="Unexpected error" 

         description=""/>

Common/Interfaces/ReceiversInterface/idl/GenericDerotator.idl

+3 −1
Original line number Diff line number Diff line
@@ -138,10 +138,12 @@ module Receivers { 
         *

         * @throw ComponentErrors::ComponentErrorsEx,

	     * @throw DerotatorErrors::DerotatorErrorsEx

	     * @throw DerotatorErrors::OutOfRangeErrorEx

         */

        void setPosition(in double position) raises (

            ComponentErrors::ComponentErrorsEx,

            DerotatorErrors::DerotatorErrorsEx

            DerotatorErrors::DerotatorErrorsEx,

            DerotatorErrors::OutOfRangeErrorEx

        );

SRT/Servers/SRTKBandMFReceiver/include/SRTKBandDerotatorImpl.h

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ public: 
     void setPosition(double position) throw (

         CORBA::SystemException, 

         ComponentErrors::ComponentErrorsEx, 

         DerotatorErrors::OutOfRangeErrorEx, 

         DerotatorErrors::DerotatorErrorsEx

     );

SRT/Servers/SRTKBandMFReceiver/include/icdSocket.h

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ public: 
     */

    void setPosition(double position) throw (

         DerotatorErrors::PositioningErrorExImpl,

         DerotatorErrors::OutOfRangeErrorExImpl,

	     DerotatorErrors::CommunicationErrorExImpl

    );

SRT/Servers/SRTKBandMFReceiver/src/SRTKBandDerotatorImpl.cpp

+5 −0
Original line number Diff line number Diff line
@@ -542,6 +542,7 @@ void SRTKBandDerotatorImpl::powerOff() throw ( 
void SRTKBandDerotatorImpl::setPosition(double position) throw (

        CORBA::SystemException, 

        ComponentErrors::ComponentErrorsEx, 

        DerotatorErrors::OutOfRangeErrorEx, 

        DerotatorErrors::DerotatorErrorsEx

    )

{
@@ -557,6 +558,10 @@ void SRTKBandDerotatorImpl::setPosition(double position) throw ( 
        ex.log(LM_DEBUG);

        throw ex.getDerotatorErrorsEx();

    }

    catch (DerotatorErrors::OutOfRangeErrorExImpl& ex) {

        ex.log(LM_WARNING);

        throw ex.getOutOfRangeErrorEx();

    }

    catch (...) {

        _EXCPT(

                ComponentErrors::UnexpectedExImpl,