tempo-plotter Changeset - 2afe3010d3c1 · protofusion repositories

Changeset - 2afe3010d3c1

Parent rev.

Child rev.

[Not reviewed]

barplot

0 2 0

Hasan Yavuz ÖZDERYA - 8 years ago 2017-10-05 10:24:53
hy@ozderya.net

display values on bars

2 files changed with 38 insertions and 0 deletions:

src/barchart.cpp

src/barchart.h

0 comments (0 inline, 0 general)

src/barchart.cpp

➞

Show inline comments

@@ @@ -15,12 +15,13 @@ @@
   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;
@@ @@ -59,6 +60,38 @@ QwtColumnSymbol* BarChart::specialSymbol @@
     symbol->setLineWidth(1);
     symbol->setFrameStyle(QwtColumnSymbol::Plain);
     symbol->setPalette(QPalette(color));
     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());
     auto valueText = QwtText(valueStr, QwtText::PlainText);
     const auto textSize = valueText.textSize();
     auto r = QRectF(x1, y2, barWidth, textSize.height());
     if (y2 > y1) r.moveBottom(y2);
     // display text if there is enough space
     if (barHeight >= textSize.height() && barWidth >= textSize.width())
+    {
         valueText.draw(painter, r);
+    }
+}

src/barchart.h

➞

Show inline comments

@@ @@ -29,12 +29,17 @@ class BarChart : public QwtPlotBarChart @@
 public:
     explicit BarChart(ChannelManager* channelMan);
     void resample();
     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;
     QVector<double> chartData() const;
 };

0 comments (0 inline, 0 general)