Commit ca7bbde3 authored by Andrea Orlat's avatar Andrea Orlat
Browse files

calibrationtool and noise generator ported to new DataReceivers and genericbackend interfaces

parent baf72310

Common/Servers/CalibrationTool/include/CalibrationToolImpl.h

+2 −1
Original line number Diff line number Diff line
@@ -195,11 +195,12 @@ class CalibrationToolImpl : public virtual BulkDataReceiverImpl<CalibrationTool_ 
	/**

	 * called to inform the component that a new subscan is going to start

	 * @parm prm subscan parameters structure

	 * @return the name of currently processed file

	 * @throw CORBA::SystemException

	 * @throw ComponentErrors::ComponentErrorsEx

	 * @throw ManagementErrors::ManagementErrorsEx

	 */

    virtual void startSubScan(const ::Management::TSubScanSetup & prm) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,ManagementErrors::ManagementErrorsEx);

    virtual char * startSubScan(const ::Management::TSubScanSetup & prm) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,ManagementErrors::ManagementErrorsEx);



    /**

     * Return the recording status of the component.

Common/Servers/CalibrationTool/src/CalibrationToolImpl.cpp

+3 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ void CalibrationToolImpl::startScan(const Management::TScanSetup & prm) throw (C 
	ACS_LOG(LM_FULL_INFO,"CalibrationToolImpl::startScan()",(LM_DEBUG,"START_SCAN_ISSUED"));

}



void CalibrationToolImpl::startSubScan(const ::Management::TSubScanSetup & prm) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,ManagementErrors::ManagementErrorsEx)

char * CalibrationToolImpl::startSubScan(const ::Management::TSubScanSetup & prm) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,ManagementErrors::ManagementErrorsEx)

{

	//CSecAreaResourceWrapper<CalibrationTool_private::CDataCollection> data=m_dataWrapper->Get();

	bool rec,inc,noScan,warn;
@@ -248,6 +248,8 @@ void CalibrationToolImpl::startSubScan(const ::Management::TSubScanSetup & prm) 
		ACS_LOG(LM_FULL_INFO,"CalibrationToolImpl::startSubScan()",(LM_WARNING,"UNEXPECTED_SUBSCAN_SEQUENCE"));

	}

	ACS_LOG(LM_FULL_INFO,"CalibrationToolImpl::startSubScan()",(LM_DEBUG,"START_SUBSCAN_ISSUED"));

	IRA::CString file=m_data->getFileName();

	return CORBA::string_dup((const char *)file);

}



void CalibrationToolImpl::stopScan() throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,ManagementErrors::ManagementErrorsEx)

Common/Servers/NoiseGenerator/include/NoiseGeneratorImpl.h

+5 −0
Original line number Diff line number Diff line
@@ -292,6 +292,11 @@ public: 
    virtual CORBA::Long getInputs(ACS::doubleSeq_out freq,ACS::doubleSeq_out bandWidth,ACS::longSeq_out feed,ACS::longSeq_out ifNumber) throw (CORBA::SystemException,

    		ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx);



    /**

     * This method is just a place holder for this implementation of the genericBackend interface

    */

    virtual void setTargetFileName (const char * fileName) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx);

        

	/** 

	 * Returns a reference to the time  property Implementation of IDL interface.

	 * @return pointer to read-only unsigned long long  property time

Common/Servers/NoiseGenerator/src/NoiseGeneratorImpl.cpp

+7 −0
Original line number Diff line number Diff line
@@ -226,6 +226,13 @@ void NoiseGeneratorImpl::aboutToAbort() 
	deleteAll();

}



void NoiseGeneratorImpl::setTargetFileName (const char * fileName) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,

		BackendsErrors::BackendsErrorsEx)

{

	// nothing to do

}





void NoiseGeneratorImpl::sendHeader() throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, ComponentErrors::ComponentErrorsEx)

{

	AUTO_TRACE("NoiseGeneratorImpl::sendHeader()");