[cgma-dev] r2574 - in cgm/trunk/itaps: . SIDL
kraftche at mcs.anl.gov
kraftche at mcs.anl.gov
Mon Jan 26 13:19:09 CST 2009
Author: kraftche
Date: 2009-01-26 13:19:09 -0600 (Mon, 26 Jan 2009)
New Revision: 2574
Modified:
cgm/trunk/itaps/SIDL/iBase.sidl
cgm/trunk/itaps/iBase.h
cgm/trunk/itaps/iGeom.h
Log:
update iGeom for iBase changes
Modified: cgm/trunk/itaps/SIDL/iBase.sidl
===================================================================
--- cgm/trunk/itaps/SIDL/iBase.sidl 2009-01-26 19:15:35 UTC (rev 2573)
+++ cgm/trunk/itaps/SIDL/iBase.sidl 2009-01-26 19:19:09 UTC (rev 2574)
@@ -1,3 +1,14 @@
+/**
+ * Copyright 2006 Sandia Corporation. Under the terms of Contract
+ * DE-AC04-94AL85000 with Sandia Coroporation, the U.S. Government
+ * retains certain rights in this software.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ */
//========================================================
// iBase PACKAGE --
// ITAPS UTITLIES COMMON ACROSS INTERFACES
@@ -4,7 +15,7 @@
// ERRORS, TAGS
//========================================================
-package iBase version 0.7
+package iBase version 0.8
{
enum EntityType {
VERTEX,
@@ -273,20 +284,20 @@
// add and remove entities
void addEntToSet(in opaque entity_handle,
- inout opaque entity_set) throws iBase.Error;
+ in opaque entity_set) throws iBase.Error;
// if the entity isn't in the set, don't throw an error
void rmvEntFromSet( in opaque entity_handle,
- inout opaque entity_set) throws iBase.Error;
+ in opaque entity_set) throws iBase.Error;
void addEntArrToSet( in array<opaque> entity_handles,
in int entity_handles_size,
- inout opaque entity_set) throws iBase.Error;
+ in opaque entity_set) throws iBase.Error;
// if the entity isn't in the set, don't throw an error
void rmvEntArrFromSet( in array<opaque> entity_handles,
in int entity_handles_size,
- inout opaque entity_set) throws iBase.Error;
+ in opaque entity_set) throws iBase.Error;
// all entity sets are contained in root set
// root set is contained in no other sets
@@ -295,12 +306,12 @@
// add/remove entity sets
void addEntSet( in opaque entity_set_to_add,
- inout opaque entity_set_handle)
+ in opaque entity_set_handle)
throws iBase.Error;
// if the entity set isn't in the set, don't throw an error
void rmvEntSet( in opaque entity_set_to_remove,
- inout opaque entity_set_handle)
+ in opaque entity_set_handle)
throws iBase.Error;
// check whether an entity is contained in the entity set
@@ -308,6 +319,13 @@
in opaque entity_handle,
out int is_contained) throws iBase.Error;
+ // check whether entities are contained in the entity set
+ void isEntArrContained( in opaque containing_set,
+ in array<opaque> entity_handles,
+ in int entity_handles_size,
+ inout array<int> is_contained,
+ out int is_contained_size );
+
// check whether an entity set is contained in another
void isEntSetContained(in opaque containing_entity_set,
in opaque contained_entity_set,
@@ -321,15 +339,15 @@
// Root set cannot be a child or parent
// don't throw error if parent/child already exists
- void addPrntChld( inout opaque parent_entity_set,
- inout opaque child_entity_set) throws iBase.Error;
+ void addPrntChld( in opaque parent_entity_set,
+ in opaque child_entity_set) throws iBase.Error;
// don't throw error if parent/child link doesn't exist
- void rmvPrntChld( inout opaque parent_entity_set,
- inout opaque child_entity_set) throws iBase.Error;
+ void rmvPrntChld( in opaque parent_entity_set,
+ in opaque child_entity_set) throws iBase.Error;
void isChildOf( in opaque parent_entity_set,
- in opaque child_entity_set,
+ in opaque child_entity_set,
out int is_child) throws iBase.Error;
void getNumChld( in opaque entity_set, in int num_hops,
Modified: cgm/trunk/itaps/iBase.h
===================================================================
--- cgm/trunk/itaps/iBase.h 2009-01-26 19:15:35 UTC (rev 2573)
+++ cgm/trunk/itaps/iBase.h 2009-01-26 19:19:09 UTC (rev 2574)
@@ -15,10 +15,10 @@
* TYPEDEF'S
*==========================================================
*/
- typedef void* iBase_Instance;
- typedef void* iBase_EntityHandle;
- typedef void* iBase_EntitySetHandle;
- typedef void* iBase_TagHandle;
+ typedef struct iBase_Instance_Private* iBase_Instance;
+ typedef struct iBase_EntityHandle_Private* iBase_EntityHandle;
+ typedef struct iBase_EntitySetHandle_Private* iBase_EntitySetHandle;
+ typedef struct iBase_TagHandle_Private* iBase_TagHandle;
/*==========================================================
* ENTITYTYPE ENUMERATION
@@ -64,8 +64,6 @@
enum iBase_ErrorActions {
iBase_SILENT,
iBase_WARN_ONLY,
- iBase_ABORT_ON_ERROR,
- iBase_PRINT_AND_THROW_ERROR,
iBase_THROW_ERROR
};
Modified: cgm/trunk/itaps/iGeom.h
===================================================================
--- cgm/trunk/itaps/iGeom.h 2009-01-26 19:15:35 UTC (rev 2573)
+++ cgm/trunk/itaps/iGeom.h 2009-01-26 19:19:09 UTC (rev 2574)
@@ -71,19 +71,19 @@
*
* Type used to store iGeom interface handle
*/
- typedef void* iGeom_Instance;
+ typedef struct iGeom_Instance_Private* iGeom_Instance;
/**\brief Type used to store an iterator returned by iGeom
*
* Type used to store an iterator returned by iGeom
*/
- typedef void* iGeom_EntityIterator;
+ typedef struct iGeom_EntityIterator_Private* iGeom_EntityIterator;
/**\brief Type used to store an array iterator returned by iGeom
*
* Type used to store an array iterator returned by iGeom
*/
- typedef void* iGeom_EntityArrIterator;
+ typedef struct iGeom_EntityArrIterator_Private* iGeom_EntityArrIterator;
/**\brief Get a description of the error returned from the last iGeom function
*
@@ -2299,7 +2299,7 @@
*/
void iGeom_addEntToSet(iGeom_Instance instance,
iBase_EntityHandle entity_handle,
- iBase_EntitySetHandle* entity_set,
+ iBase_EntitySetHandle entity_set,
int *err);
/**\brief Remove an entity from a set
@@ -2313,7 +2313,7 @@
*/
void iGeom_rmvEntFromSet(iGeom_Instance instance,
iBase_EntityHandle entity_handle,
- iBase_EntitySetHandle* entity_set,
+ iBase_EntitySetHandle entity_set,
int *err);
@@ -2329,7 +2329,7 @@
void iGeom_addEntArrToSet(iGeom_Instance instance,
const iBase_EntityHandle* entity_handles,
int entity_handles_size,
- iBase_EntitySetHandle* entity_set,
+ iBase_EntitySetHandle entity_set,
int *err);
@@ -2345,7 +2345,7 @@
void iGeom_rmvEntArrFromSet(iGeom_Instance instance,
const iBase_EntityHandle* entity_handles,
int entity_handles_size,
- iBase_EntitySetHandle* entity_set,
+ iBase_EntitySetHandle entity_set,
int *err);
@@ -2358,8 +2358,8 @@
* \param *err Pointer to error type returned from function
*/
void iGeom_addEntSet(iGeom_Instance instance,
- iBase_EntityHandle entity_set_to_add,
- iBase_EntitySetHandle* entity_set_handle,
+ iBase_EntitySetHandle entity_set_to_add,
+ iBase_EntitySetHandle entity_set_handle,
int *err);
@@ -2373,7 +2373,7 @@
*/
void iGeom_rmvEntSet(iGeom_Instance instance,
iBase_EntitySetHandle entity_set_to_remove,
- iBase_EntitySetHandle* entity_set_handle,
+ iBase_EntitySetHandle entity_set_handle,
int *err);
/**\brief Return whether an entity is contained in another set
@@ -2389,7 +2389,7 @@
*/
void iGeom_isEntContained(iGeom_Instance instance,
iBase_EntitySetHandle containing_entity_set,
- iBase_EntitySetHandle contained_entity,
+ iBase_EntityHandle contained_entity,
int *is_contained,
int *err);
@@ -2420,8 +2420,8 @@
* \param *err Pointer to error type returned from function
*/
void iGeom_addPrntChld(iGeom_Instance instance,
- iBase_EntitySetHandle* parent_entity_set,
- iBase_EntitySetHandle* child_entity_set,
+ iBase_EntitySetHandle parent_entity_set,
+ iBase_EntitySetHandle child_entity_set,
int *err);
/**\brief Remove parent/child links between two sets
@@ -2433,8 +2433,8 @@
* \param *err Pointer to error type returned from function
*/
void iGeom_rmvPrntChld(iGeom_Instance instance,
- iBase_EntitySetHandle* parent_entity_set,
- iBase_EntitySetHandle* child_entity_set,
+ iBase_EntitySetHandle parent_entity_set,
+ iBase_EntitySetHandle child_entity_set,
int *err);
/**\brief Return whether two sets are related by parent/child links
More information about the cgma-dev
mailing list