comparison data/model/SparseModel.h @ 1114:e80abd659922 3.0-integration

Merge from default branch

      * supplied one using Point::Comparator.  Other identical points
      * may remain in the model.
      */
     virtual void deletePoint(const PointType &point);
 
+    /**
+     * Return true if the given point is found in this model, false
+     * otherwise.
+     */
+    virtual bool containsPoint(const PointType &point);
+    
     virtual bool isReady(int *completion = 0) const {
         bool ready = isOK() && (m_completion == 100);
         if (completion) *completion = m_completion;
         return ready;
     }

 	if (m_sinceLastNotifyMax == -1 ||
 	    point.frame > m_sinceLastNotifyMax) {
 	    m_sinceLastNotifyMax = point.frame;
 	}
     }
+}
+
+template <typename PointType>
+bool
+SparseModel<PointType>::containsPoint(const PointType &point)
+{
+    {
+	QMutexLocker locker(&m_mutex);
+
+	PointListIterator i = m_points.lower_bound(point);
+	typename PointType::Comparator comparator;
+	while (i != m_points.end()) {
+	    if (i->frame > point.frame) break;
+	    if (!comparator(*i, point) && !comparator(point, *i)) {
+                return true;
+	    }
+	    ++i;
+	}
+    }
+
+    return false;
 }
 
 template <typename PointType>
 void
 SparseModel<PointType>::deletePoint(const PointType &point)