diff options
author | msmit <msmit@remedy.nl> | 2010-07-22 09:15:08 +0000 |
---|---|---|
committer | msmit <msmit@remedy.nl> | 2010-07-22 09:15:08 +0000 |
commit | 98332f545fcdff26ccf697fa6d3d00750ddbf005 (patch) | |
tree | e65eefa7c16d054911922986bfb79dbaf1f077fa /CIAO | |
parent | 1c8f869d1589116633700c3a63933283ede5f97a (diff) | |
download | ATCD-98332f545fcdff26ccf697fa6d3d00750ddbf005.tar.gz |
Thu Jul 22 09:10:37 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp:
* connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp:
* connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h:
* connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp:
* connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h:
* connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl:
* connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl:
* connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html:
This tutorial now works in conjunction with the RTI Shapes Demo.
Diffstat (limited to 'CIAO')
9 files changed, 57 insertions, 16 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 2661728df68..0e474959058 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,15 @@ +Thu Jul 22 09:10:37 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl: + * connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html: + This tutorial now works in conjunction with the RTI Shapes Demo. + Thu Jul 22 08:20:36 UTC 2010 Marcel Smit <msmit@remedy.nl> * bin/ciao_tests.lst: diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp index befaedafd20..627d2db4897 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp @@ -236,7 +236,7 @@ <kind>tk_ulong</kind> </type> <value> - <ulong>1</ulong> + <ulong>10</ulong> </value> </value> </configProperty> @@ -303,6 +303,17 @@ </value> </value> </configProperty> + <configProperty> + <name>domain_id</name> + <value> + <type> + <kind>tk_long</kind> + </type> + <value> + <long>0</long> <!-- 0 to work with RTI shapes demo--> + </value> + </value> + </configProperty> </instance> <instance xmi:id="Shapes_ReceiverConnectorInstance"> @@ -322,6 +333,17 @@ </value> </value> </configProperty> + <configProperty> + <name>domain_id</name> + <value> + <type> + <kind>tk_long</kind> + </type> + <value> + <long>0</long> <!-- 0 to work with RTI shapes demo--> + </value> + </value> + </configProperty> </instance> <instance xmi:id="SenderComponentInstance"> diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp index 3307b1c41ba..601eb0738ec 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp @@ -6,6 +6,8 @@ #include "ciao/Logger/Log_Macros.h" #include "tao/ORB_Core.h" +#define MIN_SIZE 5 + namespace CIAO_Shapes_Control_comp_Impl { //============================================================ @@ -84,8 +86,15 @@ namespace CIAO_Shapes_Control_comp_Impl } else { - --this->current_size_; - this->size_increasing_ = this->current_size_ - 1 < 0; + if (this->current_size_ == MIN_SIZE) + { + this->size_increasing_ = true; + } + else + { + --this->current_size_; + this->size_increasing_ = this->current_size_ - 1 < 0; + } } } ::Shapes::Control_obj_var control = diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp index 0a8ae0aecf2..264ab304ce8 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp @@ -23,14 +23,14 @@ namespace CIAO_Shapes_Receiver_comp_Impl // Operations from ::CCM_DDS::ShapeType_Listener void info_out_data_listener_exec_i::on_many_data ( - const ::Shapes::ShapeType_msgSeq & /* an_instance */, + const ::Shapes::ShapeTypeSeq & /* an_instance */, const ::CCM_DDS::ReadInfoSeq & /* info */) { } void info_out_data_listener_exec_i::on_one_data ( - const ShapeType_msg & an_instance , + const ShapeType & an_instance , const ::CCM_DDS::ReadInfo & /* info */) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ShapeType_Listener: ") diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h index 604e4ea27f5..381853461e0 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h @@ -30,11 +30,11 @@ namespace CIAO_Shapes_Receiver_comp_Impl virtual void on_one_data ( - const ShapeType_msg & an_instance, + const ShapeType & an_instance, const ::CCM_DDS::ReadInfo & info); virtual void on_many_data ( - const ::Shapes::ShapeType_msgSeq & an_instance, + const ::Shapes::ShapeTypeSeq & an_instance, const ::CCM_DDS::ReadInfoSeq & info); }; diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h index 3d82e2aac1b..2f7b0d528bb 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h @@ -73,7 +73,7 @@ namespace CIAO_Shapes_Sender_comp_Impl ::Shapes::CCM_Sender_comp_Context_var context_; ::DDS::InstanceHandle_t instance_handle_; - ShapeType_msg square_; + ShapeType square_; ::Shapes::ReturnStatus update_square (void); diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl index a6a1db355f4..d36d678f2ec 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl @@ -12,8 +12,8 @@ module Shapes { - typedef sequence<ShapeType_msg> ShapeType_msgSeq; - module ::CCM_DDS::Typed < ::ShapeType_msg, ShapeType_msgSeq> ShapeType_conn; + typedef sequence<ShapeType> ShapeTypeSeq; + module ::CCM_DDS::Typed < ::ShapeType, ShapeTypeSeq> ShapeType_conn; }; #endif /* SHAPES_SHAPETYPE_CONN_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl index 84a18379cc9..b0938ca88b6 100755 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl @@ -10,7 +10,7 @@ #pragma DCPS_DATA_TYPE "ShapeType_msg" #pragma DCPS_DATA_KEY "ShapeType_msg color" -struct ShapeType_msg { +struct ShapeType { string color; //@key long x; long y; diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html index 68476b8d21e..04cebc50f0c 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html @@ -31,7 +31,7 @@ </ul> In this tutorial RTI DDS is used to transfer data from the sender to the receiver. Since the sender and receiver are separate components, each use a DDS4CCM connector.<br/> - The exchanged data consists of a struct (ShapeType_msg) with the following + The exchanged data consists of a struct (ShapeType) with the following members: <ul> <li>color : represents the color of the shape.</li> @@ -52,10 +52,8 @@ </p> <img width="60%" height="40%" src="./images/system.png" /> <p> - This tutorial doesn't work in conjuntion with the RTI Shapes demo - (available for download from http://www.rti.com/downloads/index.html). One - can use the Shapes example (%CIAO_ROOT%\connectors\dds4ccm\examples\Shapes) - for this. + This tutorial works in conjuntion with the RTI Shapes demo + (available for download from http://www.rti.com/downloads/index.html). </p> <h2>Directory structure</h2> |