[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
certi ChangeLog RTIA/ObjectManagement.cc RTIA/O...
|
From: |
certi-cvs |
|
Subject: |
certi ChangeLog RTIA/ObjectManagement.cc RTIA/O... |
|
Date: |
Tue, 06 Nov 2007 10:05:07 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: ROUSSELOT <rousse> 07/11/06 10:05:07
Modified files:
. : ChangeLog
RTIA : ObjectManagement.cc ObjectManagement.hh
TimeManagement.cc
libCERTI : ObjectClassBroadcastList.cc
libRTI : RTIambassador.cc
Log message:
reflectAttributeValues without timestamp corrected (I hope implemented)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/ChangeLog?cvsroot=certi&r1=3.31&r2=3.32
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.cc?cvsroot=certi&r1=3.28&r2=3.29
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.hh?cvsroot=certi&r1=3.15&r2=3.16
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.cc?cvsroot=certi&r1=3.19&r2=3.20
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/ObjectClassBroadcastList.cc?cvsroot=certi&r1=3.15&r2=3.16
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambassador.cc?cvsroot=certi&r1=3.55&r2=3.56
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/certi/certi/ChangeLog,v
retrieving revision 3.31
retrieving revision 3.32
diff -u -b -r3.31 -r3.32
--- ChangeLog 6 Nov 2007 08:57:24 -0000 3.31
+++ ChangeLog 6 Nov 2007 10:05:06 -0000 3.32
@@ -1,3 +1,8 @@
+2007-11-06 09:57 rousse
+
+ * ChangeLog, RTIA/FederationManagement.cc: FR : Suppression du
+ fichier temporaire FED EN : Removing FED temporary file
+
2007-11-05 15:30 rousse
* ChangeLog, RTIA/Communications.cc, RTIA/ObjectManagement.cc,
Index: RTIA/ObjectManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.cc,v
retrieving revision 3.28
retrieving revision 3.29
diff -u -b -r3.28 -r3.29
--- RTIA/ObjectManagement.cc 5 Nov 2007 14:30:04 -0000 3.28
+++ RTIA/ObjectManagement.cc 6 Nov 2007 10:05:06 -0000 3.29
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: ObjectManagement.cc,v 3.28 2007/11/05 14:30:04 rousse Exp $
+// $Id: ObjectManagement.cc,v 3.29 2007/11/06 10:05:06 rousse Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -210,7 +210,7 @@
}
// ----------------------------------------------------------------------------
-//! reflectAttributeValues.
+//! reflectAttributeValues with time
void
ObjectManagement::reflectAttributeValues(ObjectHandle the_object,
AttributeHandle *the_attributes,
@@ -229,6 +229,30 @@
req.setEventRetraction(the_event);
req.setTag(the_tag);
req.setAttributes(the_attributes, the_values, the_size);
+ // true for RAV without time
+ req.setBoolean(true);
+
+ comm->requestFederateService(&req, &rep);
+}
+
+// ----------------------------------------------------------------------------
+//! reflectAttributeValues without time
+void
+ObjectManagement::reflectAttributeValues(ObjectHandle the_object,
+ AttributeHandle *the_attributes,
+ ValueLengthPair *the_values,
+ UShort the_size,
+ const char *the_tag,
+ TypeException &)
+{
+ Message req, rep ;
+
+ req.type = Message::REFLECT_ATTRIBUTE_VALUES ;
+ req.setObject(the_object);
+ req.setTag(the_tag);
+ req.setAttributes(the_attributes, the_values, the_size);
+ // false for RAV without time
+ req.setBoolean(false);
comm->requestFederateService(&req, &rep);
}
@@ -708,4 +732,4 @@
}} // namespace certi/rtia
-// $Id: ObjectManagement.cc,v 3.28 2007/11/05 14:30:04 rousse Exp $
+// $Id: ObjectManagement.cc,v 3.29 2007/11/06 10:05:06 rousse Exp $
Index: RTIA/ObjectManagement.hh
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.hh,v
retrieving revision 3.15
retrieving revision 3.16
diff -u -b -r3.15 -r3.16
--- RTIA/ObjectManagement.hh 5 Nov 2007 14:30:04 -0000 3.15
+++ RTIA/ObjectManagement.hh 6 Nov 2007 10:05:06 -0000 3.16
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: ObjectManagement.hh,v 3.15 2007/11/05 14:30:04 rousse Exp $
+// $Id: ObjectManagement.hh,v 3.16 2007/11/06 10:05:06 rousse Exp $
// ----------------------------------------------------------------------------
#ifndef _CERTI_RTIA_OM
@@ -82,6 +82,13 @@
EventRetractionHandle theHandle,
TypeException &e);
+ void reflectAttributeValues(ObjectHandle theObjectHandle,
+ AttributeHandle *attribArray,
+ ValueLengthPair *valueArray,
+ UShort attribArraySize,
+ const char *theTag,
+ TypeException &e);
+
EventRetractionHandle
sendInteraction(InteractionClassHandle theInteraction,
ParameterHandle *paramArray,
@@ -206,4 +213,4 @@
#endif // _CERTI_RTIA_OM
-// $Id: ObjectManagement.hh,v 3.15 2007/11/05 14:30:04 rousse Exp $
+// $Id: ObjectManagement.hh,v 3.16 2007/11/06 10:05:06 rousse Exp $
Index: RTIA/TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.19
retrieving revision 3.20
diff -u -b -r3.19 -r3.20
--- RTIA/TimeManagement.cc 5 Nov 2007 14:30:04 -0000 3.19
+++ RTIA/TimeManagement.cc 6 Nov 2007 10:05:06 -0000 3.20
@@ -18,7 +18,7 @@
// along with this program ; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// $Id: TimeManagement.cc,v 3.19 2007/11/05 14:30:04 rousse Exp $
+// $Id: TimeManagement.cc,v 3.20 2007/11/06 10:05:06 rousse Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -176,6 +176,7 @@
{
ValueLengthPair *ValueArray = msg.getAttribValueArray();
+ if (msg.getBoolean())
om->reflectAttributeValues(msg.object,
msg.handleArray,
ValueArray,
@@ -184,6 +185,13 @@
msg.label,
msg.eventRetraction,
msg.exception);
+ else
+ om->reflectAttributeValues(msg.object,
+ msg.handleArray,
+ ValueArray,
+ msg.handleArraySize,
+ msg.label,
+ msg.exception);
free(ValueArray);
break ;
}
@@ -736,4 +744,4 @@
}} // namespaces
-// $Id: TimeManagement.cc,v 3.19 2007/11/05 14:30:04 rousse Exp $
+// $Id: TimeManagement.cc,v 3.20 2007/11/06 10:05:06 rousse Exp $
Index: libCERTI/ObjectClassBroadcastList.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/ObjectClassBroadcastList.cc,v
retrieving revision 3.15
retrieving revision 3.16
diff -u -b -r3.15 -r3.16
--- libCERTI/ObjectClassBroadcastList.cc 6 Jul 2007 09:25:17 -0000
3.15
+++ libCERTI/ObjectClassBroadcastList.cc 6 Nov 2007 10:05:07 -0000
3.16
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: ObjectClassBroadcastList.cc,v 3.15 2007/07/06 09:25:17 erk Exp $
+// $Id: ObjectClassBroadcastList.cc,v 3.16 2007/11/06 10:05:07 rousse Exp $
// ----------------------------------------------------------------------------
@@ -66,6 +66,7 @@
reducedMessage->federate = message->federate ;
reducedMessage->object = message->object ;
reducedMessage->date = message->date ;
+ reducedMessage->boolean = message->boolean ; // Useful ?
strcpy(reducedMessage->label, message->label);
@@ -379,4 +380,4 @@
} // namespace certi
-// $Id: ObjectClassBroadcastList.cc,v 3.15 2007/07/06 09:25:17 erk Exp $
+// $Id: ObjectClassBroadcastList.cc,v 3.16 2007/11/06 10:05:07 rousse Exp $
Index: libRTI/RTIambassador.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambassador.cc,v
retrieving revision 3.55
retrieving revision 3.56
diff -u -b -r3.55 -r3.56
--- libRTI/RTIambassador.cc 5 Nov 2007 14:30:05 -0000 3.55
+++ libRTI/RTIambassador.cc 6 Nov 2007 10:05:07 -0000 3.56
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambassador.cc,v 3.55 2007/11/05 14:30:05 rousse Exp $
+// $Id: RTIambassador.cc,v 3.56 2007/11/06 10:05:07 rousse Exp $
// ----------------------------------------------------------------------------
@@ -347,13 +347,18 @@
case Message::REFLECT_ATTRIBUTE_VALUES: {
AttributeHandleValuePairSet *attributes =
vers_Fed.getAHVPS();
+ if (vers_Fed.getBoolean())
privateRefs->fed_amb->
reflectAttributeValues(vers_Fed.getObject(),
*attributes,
vers_Fed.getFedTime(),
vers_Fed.getTag(),
vers_Fed.getEventRetraction());
-
+ else
+ privateRefs->fed_amb->
+ reflectAttributeValues(vers_Fed.getObject(),
+ *attributes,
+ vers_Fed.getTag());
delete attributes ;
} break ;
@@ -2857,4 +2862,4 @@
privateRefs->executeService(&req, &rep);
}
-// $Id: RTIambassador.cc,v 3.55 2007/11/05 14:30:05 rousse Exp $
+// $Id: RTIambassador.cc,v 3.56 2007/11/06 10:05:07 rousse Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- certi ChangeLog RTIA/ObjectManagement.cc RTIA/O...,
certi-cvs <=