Mercurial > hg > svcore

diff data/model/EditableDenseThreeDimensionalModel.h @ 1206:659372323b45 tony-2.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge latest SV 3.0 branch code
author Chris Cannam
date Fri, 19 Aug 2016 15:58:57 +0100
parents 546d4e417346
children 2ff5e411151d
line wrap: on
line diff
--- a/data/model/EditableDenseThreeDimensionalModel.h	Tue Oct 20 12:54:06 2015 +0100
+++ b/data/model/EditableDenseThreeDimensionalModel.h	Fri Aug 19 15:58:57 2016 +0100
@@ -105,11 +105,6 @@
     virtual void setMaximumLevel(float sz);
 
     /**
-     * Return true if there are data available for the given column.
-     */
-    virtual bool isColumnAvailable(int x) const { return x < getWidth(); }
-
-    /**
      * Get the set of bin values at the given column.
      */
     virtual Column getColumn(int x) const;
@@ -194,7 +189,7 @@
                        QString extraAttributes = "") const;
 
 protected:
-    typedef QVector<Column> ValueMatrix;
+    typedef std::vector<Column> ValueMatrix;
     ValueMatrix m_data;
 
     // m_trunc is used for simple compression.  If at least the top N