Commit e04808ce authored by garciay's avatar garciay
Browse files

Review IVIM, MAPEM/SPATEM and SREM/SSEM

parent 96a3256c

ccsrc/Ports/LibIts_ports/AdapterControlPort.cc

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 
*/

#include "AdapterControlPort_CAM.partC"

#include "AdapterControlPort_DENM.partC"

#include "AdapterControlPort_IVIM.partC"

#include "AdapterControlPort_MapemSpatem.partC"

#include "AdapterControlPort_SremSsem.partC"

#include "AdapterControlPort_GN.partC"

/*

#include "AdapterControlPort_IVIM.partC"

ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.partC

+9 −9
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ namespace LibItsIvim__TestSystem { 
    loggers::get_instance().set_stop_time(_time_key, duration);

  }



  void UpperTesterPort::outgoing_send(const LibItsIvim__TypesAndValues::UtIvimChangePosition& send_par)

  void UpperTesterPort::outgoing_send(const LibItsIvim__TypesAndValues::UtIvimTrigger& send_par)

  {

    loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par);
@@ -102,7 +102,7 @@ namespace LibItsIvim__TestSystem { 
    loggers::get_instance().set_stop_time(_time_key, duration);

  }



  void UpperTesterPort::outgoing_send(const LibItsIvim__TypesAndValues::UtIvimTrigger& send_par)

  void UpperTesterPort::outgoing_send(const LibItsIvim__TypesAndValues::UtIvimUpdate& send_par)

  {

    loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par);
@@ -112,14 +112,14 @@ namespace LibItsIvim__TestSystem { 
    loggers::get_instance().set_stop_time(_time_key, duration);

  }



  void UpperTesterPort::outgoing_send(const LibItsIvim__TypesAndValues::UtActivatePositionTime& /*send_par*/)

  {



  }



  void UpperTesterPort::outgoing_send(const LibItsIvim__TypesAndValues::UtDeactivatePositionTime& /*send_par*/)

  void UpperTesterPort::outgoing_send(const LibItsIvim__TypesAndValues::UtIvimTermination& send_par)

  {

    loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par);

    

    float duration;

    loggers::get_instance().set_start_time(_time_key);

    static_cast<UpperTesterIvimLayer *>(_layer)->sendMsg(send_par, _layer_params);

    loggers::get_instance().set_stop_time(_time_key, duration);

  }



  void UpperTesterPort::receiveMsg (const Base_Type& p_ind, const Params& p_params) {

ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.partH

+7 −4
Original line number Diff line number Diff line
@@ -3,6 +3,11 @@ 
namespace LibItsIvim__TestSystem {



class UpperTesterPort : public UpperTesterPort_BASE {

  Params _cfg_params;

  Params _layer_params;

  Layer * _layer;

  std::string _time_key;

  

public:

	UpperTesterPort(const char *par_port_name = NULL);

	~UpperTesterPort();
@@ -10,6 +15,8 @@ public: 
	void set_parameter(const char *parameter_name,

		const char *parameter_value);



    void receiveMsg (const Base_Type&, const Params&);



private:

	/* void Handle_Fd_Event(int fd, boolean is_readable,

		boolean is_writable, boolean is_error); */
@@ -26,10 +33,6 @@ protected: 


	void outgoing_send(const LibItsIvim__TypesAndValues::UtIvimInitialize& send_par);

	

 /*   void outgoing_send(const LibItsCommon__TypesAndValues::UtIvimChangePosition& send_par);



    void outgoing_send(const LibItsCommon__TypesAndValues::UtIvimChangePseudonym& send_par);*/



	void outgoing_send(const LibItsIvim__TypesAndValues::UtIvimTrigger& send_par);

  

  void outgoing_send(const LibItsIvim__TypesAndValues::UtIvimUpdate& send_par);

ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.partH

+5 −0
Original line number Diff line number Diff line
@@ -3,6 +3,11 @@ 
namespace LibItsMapemSpatem__TestSystem {



class UpperTesterPort : public UpperTesterPort_BASE {

  Params _cfg_params;

  Params _layer_params;

  Layer * _layer;

  std::string _time_key;

  

public:

	UpperTesterPort(const char *par_port_name = NULL);

	~UpperTesterPort();

ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.partC

+14 −4
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ namespace LibItsSremSsem__TestSystem { 


  }



  void UpperTesterPort::outgoing_send(const LibItsSremSsem__TypesAndValues::UtSremSsemInitialize& send_par)

  void UpperTesterPort::outgoing_send(const LibItsSremSsem__TypesAndValues::UtSremInitialize& send_par)

  {

    loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par);
@@ -92,7 +92,17 @@ namespace LibItsSremSsem__TestSystem { 
    loggers::get_instance().set_stop_time(_time_key, duration);

  }



  void UpperTesterPort::outgoing_send(const LibItsSremSsem__TypesAndValues::UtSremSsemTrigger& send_par)

  void UpperTesterPort::outgoing_send(const LibItsSremSsem__TypesAndValues::UtSremTrigger& send_par)

  {

    loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par);

    

    float duration;

    loggers::get_instance().set_start_time(_time_key);

    static_cast<UpperTesterSremSsemLayer *>(_layer)->sendMsg(send_par, _layer_params);

    loggers::get_instance().set_stop_time(_time_key, duration);

  }



  void UpperTesterPort::outgoing_send(const LibItsSremSsem__TypesAndValues::UtSremUpdate& send_par)

  {

    loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par);
@@ -110,8 +120,8 @@ namespace LibItsSremSsem__TestSystem { 
    }



    loggers::get_instance().log("UpperTesterPort_SremSsem::receive_msg: %s", p_ind.get_descriptor()->name);

    if (std::string(p_ind.get_descriptor()->name).compare("@LibItsSremSsem_TypesAndValues.UtSremSsemResults") == 0) { // TODO To be refined

      incoming_message((LibItsSremSsem__TypesAndValues::UtSremSsemResults&)p_ind);

    if (std::string(p_ind.get_descriptor()->name).compare("@LibItsSremSsem_TypesAndValues.UtSremResults") == 0) { // TODO To be refined

      incoming_message((LibItsSremSsem__TypesAndValues::UtSremResults&)p_ind);

    } // TODO Implement UtSremSsemEventInd part

  }