# HG changeset patch # User Hasan Yavuz Ă–ZDERYA # Date 2017-10-05 08:52:44 # Node ID c901d5cbc09354f54c08e2a8cd765124bbf3b0a2 # Parent 9d8238733ad551d914ddb5002f6dcd61cb9be133 slight code reduction diff --git a/src/barplot.cpp b/src/barplot.cpp --- a/src/barplot.cpp +++ b/src/barplot.cpp @@ -31,13 +31,11 @@ BarPlot::BarPlot(ChannelManager* channel update(); connect(_channelMan, &ChannelManager::dataAdded, this, &BarPlot::update); connect(_channelMan, &ChannelManager::numOfChannelsChanged, this, &BarPlot::update); - connect(_channelMan, &ChannelManager::channelNameChanged, this, &BarPlot::update); } void BarPlot::update() { setAxisScale(QwtPlot::xBottom, 0, _channelMan->numOfChannels(), 1); - static_cast(axisScaleDraw(QwtPlot::xBottom))->updateLabels(); barChart.resample(); replot(); } diff --git a/src/barscaledraw.cpp b/src/barscaledraw.cpp --- a/src/barscaledraw.cpp +++ b/src/barscaledraw.cpp @@ -27,6 +27,12 @@ BarScaleDraw::BarScaleDraw(ChannelManage enableComponent(Backbone, false); setLabelRotation(-90); setLabelAlignment(Qt::AlignLeft | Qt::AlignVCenter); + + QObject::connect(_channelMan, &ChannelManager::channelNameChanged, + [this]() + { + invalidateCache(); + }); } QwtText BarScaleDraw::label(double value) const @@ -34,8 +40,6 @@ QwtText BarScaleDraw::label(double value int index = value; unsigned numChannels = _channelMan->numOfChannels(); - qDebug() << index; - if (index >=0 && index < (int) numChannels) { return _channelMan->channelName(index); @@ -45,8 +49,3 @@ QwtText BarScaleDraw::label(double value return QString(""); } } - -void BarScaleDraw::updateLabels() -{ - invalidateCache(); -} diff --git a/src/barscaledraw.h b/src/barscaledraw.h --- a/src/barscaledraw.h +++ b/src/barscaledraw.h @@ -32,9 +32,6 @@ public: explicit BarScaleDraw(ChannelManager* channelMan); QwtText label(double value) const; -public slots: - void updateLabels(); - private: ChannelManager* _channelMan; };