Changeset 3275 for cgm/trunk

Timestamp:

11/03/09 13:51:30 (3 weeks ago)

Author:

jvporter

Message:

* Make iterators work the same way they do in iMesh (has_data now

returns 0 when the iterator was *already* at the end)

* Set *err when getTagHandle fails
* Allow creation of a tag with the same name as one that was previously

deleted

Location:

cgm/trunk/itaps

Files:

• CATag.cpp (modified) (2 diffs)
• iGeom.h (modified) (2 diffs)
• iGeom_CGMA.cc (modified) (4 diffs)

cgm/trunk/itaps/CATag.cpp

@@ -258 +258 @@
 {
   std::string tmp_name(tag_name);
+  TagInfo tmp_info = {tag_length, tmp_name, tag_type, NULL, true};
+
   std::map<std::string,long>::iterator mit = tagNameMap.find(tmp_name);
   if (mit != tagNameMap.end()) {
+    // we found a tag with this name; is it still active?
+    bool active = (mit->second > 0 ? tagInfo[mit->second] :
+                   presetTagInfo[-mit->second]).isActive;
     *tag_handle = mit->second;
-    iGeom_setLastError( iBase_TAG_ALREADY_EXISTS );
-    return iBase_TAG_ALREADY_EXISTS;
-  }
-    
-  TagInfo tmp_info = {tag_length, std::string(tag_name), tag_type, NULL, true};
-  tagInfo.push_back(tmp_info);
-  *tag_handle = tagInfo.size() - 1;
+    if (active) {
+      iGeom_setLastError( iBase_TAG_ALREADY_EXISTS );
+      return iBase_TAG_ALREADY_EXISTS;
+    }
+
+    tagInfo[*tag_handle] = tmp_info;
+  }
+  else {
+    // create a new tag entirely
+    tagInfo.push_back(tmp_info);
+    *tag_handle = tagInfo.size() - 1;
+
+    // put the name and handle into the map too
+    tagNameMap[std::string(tag_name)] = *tag_handle;
+  }
+
   if (default_value != NULL) {
     tagInfo[*tag_handle].defaultValue = (char *) malloc(tag_length);
     memcpy(tagInfo[*tag_handle].defaultValue, default_value, tag_length);
   }
-
-    // put the name and handle into the map too
-  tagNameMap[std::string(tag_name)] = *tag_handle;
 
   RETURN(iBase_SUCCESS);
@@ -316 +327 @@
     tagNameMap.find(std::string(tag_name));
   if (it != tagNameMap.end()) {
+    bool active = (it->second > 0 ? tagInfo[it->second] :
+                   presetTagInfo[-it->second]).isActive;
+    if (active) {
       iGeom_clearLastError();
-      return (*it).second;
-  }
-  
-  else {
-    iGeom_setLastError( iBase_TAG_NOT_FOUND );
-    return 0;
-  }
+      return it->second;
+    }
+  }
+
+  iGeom_setLastError( iBase_TAG_NOT_FOUND );
+  return 0;
 }
 

cgm/trunk/itaps/iGeom.h

@@ -1966 +1966 @@
      * \param entity_handle Pointer to an entity handle corresponding to the
      *        current value of iterator
-     * \param has_data Pointer to flag; if returned non-zero, next iterator
-     *        has an entity
+     * \param has_data Pointer to a flag indicating if the value returned
+     *        in entity_handle is valid. A non-zero value indicates the value
+     *        is valid. A zero value indicates the value is NOT valid.
      * \param *err Pointer to error type returned from function
      */
@@ -1990 +1991 @@
      * \param *entity_handles_size Pointer to occupied size of entity_handles 
      *        array
-     * \param has_data Pointer to flag; if returned non-zero, next iterator
-     *        has a non-zero number of entities
+     * \param has_data Pointer to a flag indicating if the value(s) returned
+     *        in entity_handles are valid. A non-zero value indicates the 
+     *        value(s) are valid. A zero value indicates the value(s) are NOT
+     *        valid.
      * \param *err Pointer to error type returned from function
      */

cgm/trunk/itaps/iGeom_CGMA.cc

@@ -525 +525 @@
  * @param gentity_iterator Iterator being iterated over
  * @param gentity_handle Next gentity
- * @return If true, there are more gentities, if false, this is the last one
+ * @return If true, there were more gentities, if false, the iterator was
+ *         already at the end.
  */
 void
@@ -537 +538 @@
   CGMAIterator* iterator = reinterpret_cast<CGMAIterator*>(gentity_iterator);
   RefEntity** out_handle = reinterpret_cast<RefEntity**>(gentity_handle);
-  *has_data = 1;
-  iterator->next( out_handle, *has_data );
+  *has_data = !iterator->at_end();
+  if (*has_data) {
+    int count = 1;
+    iterator->next( out_handle, count );
+  }
+  RETURN(iBase_SUCCESS);
 }
 
@@ -554 +559 @@
   CGMAIterator* iterator = reinterpret_cast<CGMAIterator*>(entArr_iterator);
   CHECK_SIZE(*entity_handles, iBase_EntityHandle, iterator->size());
-  iterator->next( (RefEntity**)*entity_handles, *entity_handles_size );
-  *has_data = iterator->at_end();
+  *has_data = !iterator->at_end();
+  if (has_data)
+    iterator->next( (RefEntity**)*entity_handles, *entity_handles_size );
+  RETURN(iBase_SUCCESS);
 }
 
@@ -1301 +1308 @@
   tag_name = tag_name_buf.c_str();
   *tag_handle = reinterpret_cast<iBase_TagHandle>(static_cast<size_t>(TM->getTagHandle( tag_name )));
-  RETURN(iBase_SUCCESS);
+
+  *err = iGeom_getLastErrorType();
 }