tempo-plotter Changeset - 224950d13c1d · protofusion repositories

Changeset - 224950d13c1d

Parent rev.

Child rev.

[Not reviewed]

barplot

0 3 0

Hasan Yavuz ÖZDERYA - 8 years ago 2017-10-07 09:14:03
hy@ozderya.net

set border color for bars according to background

3 files changed with 14 insertions and 1 deletions:

src/barchart.cpp

src/barchart.h

src/barplot.cpp

0 comments (0 inline, 0 general)

src/barchart.cpp

➞

Show inline comments

@@ @@ -12,75 +12,82 @@ @@
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <QPalette>
 #include <qwt_scale_map.h>
 #include "barchart.h"
 BarChart::BarChart(ChannelManager* channelMan)
+{
     _channelMan = channelMan;
     setSpacing(0);
+}
 void BarChart::resample()
+{
     setSamples(chartData());
+}
 void BarChart::setBorderColor(QColor color)
+{
     borderColor = color;
+}
 QVector<double> BarChart::chartData() const
+{
     unsigned numChannels = _channelMan->numOfChannels();
     unsigned numOfSamples = _channelMan->numOfSamples();
     QVector<double> data(numChannels);
     for (unsigned i = 0; i < numChannels; i++)
+    {
         data[i] = _channelMan->channelBuffer(i)->sample(numOfSamples-1);
+    }
     return data;
+}
 QwtColumnSymbol* BarChart::specialSymbol(int sampleIndex, const QPointF& sample) const
+{
     unsigned numChannels = _channelMan->numOfChannels();
     if (sampleIndex < 0 || sampleIndex > (int) numChannels)
+    {
         return NULL;
+    }
     auto info = _channelMan->infoModel();
     auto color = info->color(sampleIndex);
     QwtColumnSymbol* symbol = new QwtColumnSymbol(QwtColumnSymbol::Box);
     symbol->setLineWidth(1);
     symbol->setFrameStyle(QwtColumnSymbol::Plain);
     symbol->setPalette(QPalette(color));
     QPalette pal(color);
     pal.setColor(QPalette::Dark, borderColor);
     symbol->setPalette(pal);
     return symbol;
+}
 void BarChart::drawSample(
         QPainter *painter, const QwtScaleMap &xMap, const QwtScaleMap &yMap,
         const QRectF &canvasRect, const QwtInterval &boundingInterval,
         int index, const QPointF &sample ) const
+{
     QwtPlotBarChart::drawSample(painter, xMap, yMap, canvasRect, boundingInterval, index, sample);
     // calculate bar size
     const double barWidth = sampleWidth(xMap, canvasRect.width(),
                                         boundingInterval.width(), sample.y());
     const double x = xMap.transform( sample.x() );
     const double x1 = x - 0.5 * barWidth;
     // const double x2 = x + 0.5 * barWidth;
     const double y1 = yMap.transform(baseline());
     const double y2 = yMap.transform(sample.y());
     const double barHeight = fabs(y2 - y1);
     // create and calculate text size
     const auto valueStr = QString::number(sample.y());

src/barchart.h

➞

Show inline comments

 /*
   Copyright © 2017 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef BARCHART_H
 #define BARCHART_H
 #include <QColor>
 #include <qwt_plot_barchart.h>
 #include <qwt_column_symbol.h>
 #include "channelmanager.h"
 class BarChart : public QwtPlotBarChart
+{
 public:
     explicit BarChart(ChannelManager* channelMan);
     void resample();
     void setBorderColor(QColor color);
     QwtColumnSymbol* specialSymbol(int sampleIndex, const QPointF&) const;
     void drawSample(
         QPainter *painter, const QwtScaleMap &xMap, const QwtScaleMap &yMap,
         const QRectF &canvasRect, const QwtInterval &boundingInterval,
         int index, const QPointF &sample ) const;
 private:
     ChannelManager* _channelMan;
     QColor borderColor;
     QVector<double> chartData() const;
 };
 #endif // BARCHART_H

src/barplot.cpp

➞

Show inline comments

@@ @@ -25,31 +25,33 @@ BarPlot::BarPlot(ChannelManager* channel @@
+{
     _channelMan = channelMan;
     barChart.attach(this);
     setAxisMaxMinor(QwtPlot::xBottom, 0);
     setAxisScaleDraw(QwtPlot::xBottom, new BarScaleDraw(channelMan));
     update();
     connect(_channelMan, &ChannelManager::dataAdded, this, &BarPlot::update);
     connect(_channelMan, &ChannelManager::numOfChannelsChanged, this, &BarPlot::update);
+}
 void BarPlot::update()
+{
     // Note: -0.99 is used instead of -1 to handle the case of `numOfChannels==1`
     setAxisScale(QwtPlot::xBottom, 0, _channelMan->numOfChannels()-0.99, 1);
     barChart.resample();
     replot();
+}
 void BarPlot::darkBackground(bool enabled)
+{
     if (enabled)
+    {
         setCanvasBackground(QBrush(Qt::black));
         barChart.setBorderColor(Qt::white);
+    }
     else
+    {
         setCanvasBackground(QBrush(Qt::white));
         barChart.setBorderColor(Qt::black);
+    }
     replot();
+}

0 comments (0 inline, 0 general)