comparison data/model/EditableDenseThreeDimensionalModel.cpp @ 536:beb51f558e9c

* Change QMutex in Editable DTDM to a read/write lock

 
 #include "base/LogRange.h"
 
 #include <QTextStream>
 #include <QStringList>
+#include <QReadLocker>
+#include <QWriteLocker>
 
 #include <iostream>
 
 #include <cmath>
 #include <cassert>

 }
 
 Model *
 EditableDenseThreeDimensionalModel::clone() const
 {
-    QMutexLocker locker(&m_mutex);
+    QReadLocker locker(&m_lock);
 
     EditableDenseThreeDimensionalModel *model =
         new EditableDenseThreeDimensionalModel
 	(m_sampleRate, m_resolution, m_yBinCount, m_compression);
 

 }
 
 EditableDenseThreeDimensionalModel::Column
 EditableDenseThreeDimensionalModel::getColumn(size_t index) const
 {
-    QMutexLocker locker(&m_mutex);
+    QReadLocker locker(&m_lock);
     if (index >= m_data.size()) return Column();
     return expandAndRetrieve(index);
 }
 
 float

 
 void
 EditableDenseThreeDimensionalModel::setColumn(size_t index,
                                               const Column &values)
 {
-    QMutexLocker locker(&m_mutex);
+    QWriteLocker locker(&m_lock);
 
     while (index >= m_data.size()) {
 	m_data.push_back(Column());
         m_trunc.push_back(0);
     }

 }
 
 bool
 EditableDenseThreeDimensionalModel::shouldUseLogValueScale() const
 {
-    QMutexLocker locker(&m_mutex);
+    QReadLocker locker(&m_lock);
 
     QVector<float> sample;
     QVector<int> n;
     
     for (int i = 0; i < 10; ++i) {

 }
 
 QString
 EditableDenseThreeDimensionalModel::toDelimitedDataString(QString delimiter) const
 {
-    QMutexLocker locker(&m_mutex);
+    QReadLocker locker(&m_lock);
     QString s;
     for (size_t i = 0; i < m_data.size(); ++i) {
         QStringList list;
 	for (size_t j = 0; j < m_data.at(i).size(); ++j) {
             list << QString("%1").arg(m_data.at(i).at(j));

 void
 EditableDenseThreeDimensionalModel::toXml(QTextStream &out,
                                           QString indent,
                                           QString extraAttributes) const
 {
-    QMutexLocker locker(&m_mutex);
+    QReadLocker locker(&m_lock);
 
     // For historical reasons we read and write "resolution" as "windowSize"
 
     std::cerr << "EditableDenseThreeDimensionalModel::toXml" << std::endl;