# HG changeset patch
# User Chris Cannam
# Date 1405678060 -3600
# Node ID f7590917177cca082dbee5a84ac42baab06bce4d
# Parent  22fe9bcb720666ae0dbc16c532fca0a31db8bffe# Parent  2d4af227fd32bea8cdf1b70859a2c0f26c3d5451
Merge from default branch

diff -r 22fe9bcb7206 -r f7590917177c layer/Colour3DPlotLayer.cpp
--- a/layer/Colour3DPlotLayer.cpp	Fri Jul 18 11:07:13 2014 +0100
+++ b/layer/Colour3DPlotLayer.cpp	Fri Jul 18 11:07:40 2014 +0100
@@ -78,8 +78,8 @@
     connectSignals(m_model);
 
     connect(m_model, SIGNAL(modelChanged()), this, SLOT(modelChanged()));
-    connect(m_model, SIGNAL(modelChanged(int, int)),
-	    this, SLOT(modelChanged(int, int)));
+    connect(m_model, SIGNAL(modelChangedWithin(int, int)),
+	    this, SLOT(modelChangedWithin(int, int)));
 
     m_peakResolution = 256;
     if (model->getResolution() > 512) {
@@ -135,7 +135,7 @@
 }
 
 void
-Colour3DPlotLayer::modelChanged(int startFrame, int endFrame)
+Colour3DPlotLayer::modelChangedWithin(int startFrame, int endFrame)
 {
     if (!m_colourScaleSet && m_colourScale == LinearScale) {
         if (m_model && m_model->getWidth() > 50) {
diff -r 22fe9bcb7206 -r f7590917177c layer/Colour3DPlotLayer.h
--- a/layer/Colour3DPlotLayer.h	Fri Jul 18 11:07:13 2014 +0100
+++ b/layer/Colour3DPlotLayer.h	Fri Jul 18 11:07:40 2014 +0100
@@ -168,7 +168,7 @@
     void cacheInvalid();
     void cacheInvalid(int startFrame, int endFrame);
     void modelChanged();
-    void modelChanged(int, int);
+    void modelChangedWithin(int, int);
 
 protected:
     const DenseThreeDimensionalModel *m_model; // I do not own this