comparison data/model/SparseModel.h @ 1239:5261a7791f1c 3.0-integration

Merge from branch piper

 SparseModel<PointType>::setResolution(int resolution)
 {
     {
 	QMutexLocker locker(&m_mutex);
 	m_resolution = resolution;
-    }
-    m_rows.clear();
+        m_rows.clear();
+    }
     emit modelChanged();
 }
 
 template <typename PointType>
 void

 {
     {
 	QMutexLocker locker(&m_mutex);
 	m_points.clear();
         m_pointCount = 0;
-    }
-    m_rows.clear();
+        m_rows.clear();
+    }
     emit modelChanged();
 }
 
 template <typename PointType>
 void
 SparseModel<PointType>::addPoint(const PointType &point)
 {
-    {
-	QMutexLocker locker(&m_mutex);
-	m_points.insert(point);
-        m_pointCount++;
-        if (point.getLabel() != "") m_hasTextLabels = true;
-    }
+    QMutexLocker locker(&m_mutex);
+
+    m_points.insert(point);
+    m_pointCount++;
+    if (point.getLabel() != "") m_hasTextLabels = true;
 
     // Even though this model is nominally sparse, there may still be
     // too many signals going on here (especially as they'll probably
     // be queued from one thread to another), which is why we need the
     // notifyOnAdd as an option rather than a necessity (the

 
 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;
+    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)
+{
+    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)) {
+            m_points.erase(i);
+            m_pointCount--;
+            break;
 	    }
-	    ++i;
-	}
-    }
-
-    return false;
-}
-
-template <typename PointType>
-void
-SparseModel<PointType>::deletePoint(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)) {
-		m_points.erase(i);
-                m_pointCount--;
-		break;
-	    }
-	    ++i;
-	}
-    }
+        ++i;
+    }
+
 //    std::cout << "SparseOneDimensionalModel: emit modelChanged("
 //	      << point.frame << ")" << std::endl;
     m_rows.clear(); //!!! inefficient
     emit modelChangedWithin(point.frame, point.frame + m_resolution);
 }

 template <typename PointType>
 void
 SparseModel<PointType>::setCompletion(int completion, bool update)
 {
 //    std::cerr << "SparseModel::setCompletion(" << completion << ")" << std::endl;
+
+    QMutexLocker locker(&m_mutex);
 
     if (m_completion != completion) {
 	m_completion = completion;
 
 	if (completion == 100) {