Mercurial > hg > svgui

diff layer/Colour3DPlotLayer.cpp @ 825:f7590917177c tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Fri, 18 Jul 2014 11:07:40 +0100
parents 2d4af227fd32
children db0759e4c6c3
line wrap: on
line diff
--- 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) {