Changeset 5403 in orxonox.OLD for trunk/src/lib/util

Timestamp:

Oct 19, 2005, 1:00:43 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk:
implemented List-addAtIteratorPosition, to add any entity in the Sorted list at a designated position (for include-sorting)
include-sort the list of added Element2D's after their layer-depth

File:

• trunk/src/lib/util/list.h (modified) (6 diffs)

trunk/src/lib/util/list.h

@@ -37 +37 @@
     void add(T* entity);
     void addAtBeginning(T* entity); //!< @todo This should be made with an ENUM
+    void addAtIteratorPosition(T* entity, tIterator<T>* itereator);
     void remove(const T* entity);
     void removeFromLast(const T* entity);
@@ -122 +123 @@
 {
   if( unlikely(entity == NULL)) return;
+
   listElement<T>* el = new listElement<T>;
   el->next = this->first;
@@ -134 +136 @@
 }
 
+/**
+ * add an entity at an iterators position
+ * @param entity the entity to add
+ * @param iterator the iterator get the Positional from
+ *
+ * this works best with an iterator walking with
+ * firstElement() ; nextStep();
+ * or
+ * lastElement(); prevStep();
+ */
+template<class T>
+    inline void tList<T>::addAtIteratorPosition(T* entity, tIterator<T>* iterator)
+{
+  // rule out unusable
+  if (unlikely(entity == NULL))
+    return;
+  // on any error (or next == NULL) add using default add-function
+  if (unlikely(iterator == NULL || iterator->getList() == NULL) ||
+      iterator->tmpEl == NULL || iterator->tmpEl->next == NULL)
+    return this->add(entity);
+  // on prev == NULL add with addAtBeginning-function
+  if (unlikely(iterator->tmpEl->prev == NULL))
+    return addAtBeginning(entity);
+  else
+  {
+    listElement<T>* el = new listElement<T>;
+    el->next = iterator->tmpEl->next;
+    el->curr = entity;
+    el->prev = iterator->tmpEl->prev;
+
+    el->next->prev = el;
+    el->prev->next = el;
+  }
+}
 
 /**
@@ -370 +406 @@
 template<class T> class tIterator
 {
+  friend class tList<T>;
   public:
     tIterator(const tList<T>* list);
@@ -380 +417 @@
     T* seekElement(const T* element);
     T* iteratorElement(const tIterator<T>* iterator);
-    bool compareListPointer(const tList<T>* list);
-
+    bool compareListPointer(const tList<T>* list) const;
+    inline const tList<T>* getList() const { return this->list; };
     /** another way to iterate through the list
      * !! THIS IS NOT MEANT FOR DELETION
@@ -554 +591 @@
 
 template<class T>
-    bool tIterator<T>::compareListPointer(const tList<T>* list)
+    bool tIterator<T>::compareListPointer(const tList<T>* list) const
 {
   return (this->list == list)?true:false;