Commit 89915f99 authored by TheDebbio's avatar TheDebbio
Browse files

broken: minors

parent 0e4968cc

.vscode/c_cpp_properties.json

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
        {

            "name": "Win32",

            "includePath": [

                "${workspaceFolder}/**"

                "${workspaceFolder}/**",

                "${workspaceFolder}/Common/Libraries/IRALibrary/include"

            ],

            "defines": [

                "_DEBUG",

Medicina/Servers/MedicinaCBand/include/MixerOperator.h

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <IRA>

#include "Configuration.h"

#include <ReceiversErrors.h>



/**

 * @brief This class enclose both mixer stages into a unique interface

Medicina/Servers/MedicinaCBand/src/MixerOperator.cpp

+36 −7
Original line number Diff line number Diff line 
#include "MixerOperator.h"

#include <LogFilter.h>

#include <ReceiverControl.h>

#include <LocalOscillatorInterfaceC.h>

#include <ManagmentDefinitionsC.h>



/** @todo Aggioranre i loge gli include del modulo, macro comprese

/** @todo Aggioranre i log gli include del modulo, macro comprese

 * Inserire nel modulo ComponetCore e verificare che sia tutto ok

 */
@@ -18,7 +22,6 @@ MixerOperator::MixerOperator(CConfiguration & p_config): 
    m_loDev_2nd= Receivers::LocalOscillator::_nil();

}





void MixerOperator::loadComponents() 

        throw (ComponentErrors::CouldntGetComponentExImpl)

{
@@ -85,9 +88,6 @@ bool MixerOperator::SetValue(const ACS::doubleSeq& p_values) 
    if (power) delete [] power;

    if (freq) delete [] freq;

    ACS_LOG(LM_FULL_INFO,"CComponentCore::setLO()",(LM_DEBUG,"SYNTHESIZER_VALUES %lf %lf",trueValue,amp));

    // make sure the synthesizer component is available

    /** @todo  questo perchè, se il device non è attivo..lo controllo prima*/

    //loadLocalOscillator(); // throw (ComponentErrors::CouldntGetComponentExImpl)

    try {

        m_loDev_1st->set(amp, trueValue);

    }
@@ -106,12 +106,41 @@ bool MixerOperator::SetValue(const ACS::doubleSeq& p_values) 


double MixerOperator::getValue()

{



    double l_power;

    double l_freq;

    try{

        m_loDev_1st->get(l_power, l_freq);

    } catch (ReceiversErrors::ReceiversErrorsEx& ex) { 

        _ADD_BACKTRACE(ReceiversErrors::LocalOscillatorErrorExImpl,impl,ex,"CComponentCore::setLO()");

        throw impl;        

    }

    return l_freq;

}



bool MixerOperator::isLocked()

{

    

    ACSErr::Completion_var comp;

    ACS::ROlong_var isLockedRef;

    CORBA::Long isLocked;

    try {

        isLockedRef=m_localOscillatorDevice->isLocked();

    }

    catch (CORBA::SystemException& ex) {

        m_localOscillatorFault=true;

        _EXCPT(ComponentErrors::CORBAProblemExImpl,impl,"CComponentCore::checkLocalOscillator()");

        impl.setName(ex._name());

        impl.setMinor(ex.minor());

        throw impl;

    }

    isLocked=isLockedRef->get_sync(comp.out());

    ACSErr::CompletionImpl complImpl(comp);

    if (!complImpl.isErrorFree()) {

        _ADD_BACKTRACE(ComponentErrors::CouldntGetAttributeExImpl,impl,complImpl,"CComponentCore::checkLocalOscillator()");

        impl.setAttributeName("isLocked");

        impl.setComponentName((const char *)m_configuration.getLocalOscillatorInstance());

        throw impl;

    }

    return isLocked;

}



/* *** PRIVATE *** */

discosspace.code-workspace

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ 
		"files.associations": {

			"*.idl": "cpp",

			"ira": "cpp",

			"map": "cpp"

			"map": "cpp",

			"bitset": "cpp"

		}

	}

}
 
 No newline at end of file