2021-01-01 21:26:52 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
#include "pieseries.h"
|
|
|
|
#include "informationbox.h"
|
|
|
|
#include "statscolors.h"
|
statistics: convert chart to QQuickItem
It turns out that the wrong base class was used for the chart.
QQuickWidget can only be used on desktop, not in a mobile UI.
Therefore, turn this into a QQuickItem and move the container
QQuickWidget into desktop-only code.
Currently, this code is insane: The chart is rendered onto a
QGraphicsScene (as it was before), which is then rendered into
a QImage, which is transformed into a QSGTexture, which is then
projected onto the device. This is performed on every mouse
move event, since these events in general change the position
of the info-box.
The plan is to slowly convert elements such as the info-box into
QQuickItems. Browsing the QtQuick documentation, this will
not be much fun.
Also note that the rendering currently tears, flickers and has
antialiasing artifacts, most likely owing to integer (QImage)
to floating point (QGraphicsScene, QQuickItem) conversion
problems. The data flow is
QGraphicsScene (float) -> QImage (int) -> QQuickItem (float).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2021-01-07 13:38:37 +00:00
|
|
|
#include "statshelper.h"
|
2021-01-01 21:26:52 +00:00
|
|
|
#include "statstranslations.h"
|
|
|
|
#include "zvalues.h"
|
|
|
|
|
|
|
|
#include <numeric>
|
|
|
|
#include <math.h>
|
|
|
|
#include <QGraphicsEllipseItem>
|
|
|
|
#include <QLocale>
|
|
|
|
|
|
|
|
static const double pieSize = 0.9; // 1.0 = occupy full width of chart
|
|
|
|
static const double pieBorderWidth = 1.0;
|
|
|
|
static const double innerLabelRadius = 0.75; // 1.0 = at outer border of pie
|
|
|
|
static const double outerLabelRadius = 1.01; // 1.0 = at outer border of pie
|
|
|
|
|
statistics: convert chart to QQuickItem
It turns out that the wrong base class was used for the chart.
QQuickWidget can only be used on desktop, not in a mobile UI.
Therefore, turn this into a QQuickItem and move the container
QQuickWidget into desktop-only code.
Currently, this code is insane: The chart is rendered onto a
QGraphicsScene (as it was before), which is then rendered into
a QImage, which is transformed into a QSGTexture, which is then
projected onto the device. This is performed on every mouse
move event, since these events in general change the position
of the info-box.
The plan is to slowly convert elements such as the info-box into
QQuickItems. Browsing the QtQuick documentation, this will
not be much fun.
Also note that the rendering currently tears, flickers and has
antialiasing artifacts, most likely owing to integer (QImage)
to floating point (QGraphicsScene, QQuickItem) conversion
problems. The data flow is
QGraphicsScene (float) -> QImage (int) -> QQuickItem (float).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2021-01-07 13:38:37 +00:00
|
|
|
PieSeries::Item::Item(QGraphicsScene *scene, const QString &name, int from, int count, int totalCount,
|
2021-01-01 21:26:52 +00:00
|
|
|
int bin_nr, int numBins, bool labels) :
|
statistics: convert chart to QQuickItem
It turns out that the wrong base class was used for the chart.
QQuickWidget can only be used on desktop, not in a mobile UI.
Therefore, turn this into a QQuickItem and move the container
QQuickWidget into desktop-only code.
Currently, this code is insane: The chart is rendered onto a
QGraphicsScene (as it was before), which is then rendered into
a QImage, which is transformed into a QSGTexture, which is then
projected onto the device. This is performed on every mouse
move event, since these events in general change the position
of the info-box.
The plan is to slowly convert elements such as the info-box into
QQuickItems. Browsing the QtQuick documentation, this will
not be much fun.
Also note that the rendering currently tears, flickers and has
antialiasing artifacts, most likely owing to integer (QImage)
to floating point (QGraphicsScene, QQuickItem) conversion
problems. The data flow is
QGraphicsScene (float) -> QImage (int) -> QQuickItem (float).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2021-01-07 13:38:37 +00:00
|
|
|
item(createItemPtr<QGraphicsEllipseItem>(scene)),
|
2021-01-01 21:26:52 +00:00
|
|
|
name(name),
|
|
|
|
count(count)
|
|
|
|
{
|
|
|
|
QLocale loc;
|
|
|
|
// For whatever obscure reason, angles in QGraphicsEllipseItem are given as 16th of a degree...?
|
|
|
|
// Angles increase CCW, whereas pie charts usually are read CW.
|
|
|
|
item->setStartAngle(90 * 16 - (from + count) * 360 * 16 / totalCount);
|
|
|
|
item->setSpanAngle(count * 360 * 16 / totalCount);
|
|
|
|
item->setPen(QPen(::borderColor));
|
|
|
|
item->setZValue(ZValues::series);
|
|
|
|
|
|
|
|
angleTo = static_cast<double>(from + count) / totalCount;
|
|
|
|
double meanAngle = M_PI / 2.0 - (from + count / 2.0) / totalCount * M_PI * 2.0; // Note: "-" because we go CW.
|
|
|
|
innerLabelPos = QPointF(cos(meanAngle) * innerLabelRadius, -sin(meanAngle) * innerLabelRadius);
|
|
|
|
outerLabelPos = QPointF(cos(meanAngle) * outerLabelRadius, -sin(meanAngle) * outerLabelRadius);
|
|
|
|
|
|
|
|
if (labels) {
|
|
|
|
double percentage = count * 100.0 / totalCount;
|
|
|
|
QString innerLabelText = QStringLiteral("%1\%").arg(loc.toString(percentage, 'f', 1));
|
statistics: convert chart to QQuickItem
It turns out that the wrong base class was used for the chart.
QQuickWidget can only be used on desktop, not in a mobile UI.
Therefore, turn this into a QQuickItem and move the container
QQuickWidget into desktop-only code.
Currently, this code is insane: The chart is rendered onto a
QGraphicsScene (as it was before), which is then rendered into
a QImage, which is transformed into a QSGTexture, which is then
projected onto the device. This is performed on every mouse
move event, since these events in general change the position
of the info-box.
The plan is to slowly convert elements such as the info-box into
QQuickItems. Browsing the QtQuick documentation, this will
not be much fun.
Also note that the rendering currently tears, flickers and has
antialiasing artifacts, most likely owing to integer (QImage)
to floating point (QGraphicsScene, QQuickItem) conversion
problems. The data flow is
QGraphicsScene (float) -> QImage (int) -> QQuickItem (float).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2021-01-07 13:38:37 +00:00
|
|
|
innerLabel = createItemPtr<QGraphicsSimpleTextItem>(scene, innerLabelText);
|
2021-01-01 21:26:52 +00:00
|
|
|
innerLabel->setZValue(ZValues::seriesLabels);
|
|
|
|
|
statistics: convert chart to QQuickItem
It turns out that the wrong base class was used for the chart.
QQuickWidget can only be used on desktop, not in a mobile UI.
Therefore, turn this into a QQuickItem and move the container
QQuickWidget into desktop-only code.
Currently, this code is insane: The chart is rendered onto a
QGraphicsScene (as it was before), which is then rendered into
a QImage, which is transformed into a QSGTexture, which is then
projected onto the device. This is performed on every mouse
move event, since these events in general change the position
of the info-box.
The plan is to slowly convert elements such as the info-box into
QQuickItems. Browsing the QtQuick documentation, this will
not be much fun.
Also note that the rendering currently tears, flickers and has
antialiasing artifacts, most likely owing to integer (QImage)
to floating point (QGraphicsScene, QQuickItem) conversion
problems. The data flow is
QGraphicsScene (float) -> QImage (int) -> QQuickItem (float).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2021-01-07 13:38:37 +00:00
|
|
|
outerLabel = createItemPtr<QGraphicsSimpleTextItem>(scene, name);
|
2021-01-01 21:26:52 +00:00
|
|
|
outerLabel->setBrush(QBrush(darkLabelColor));
|
|
|
|
outerLabel->setZValue(ZValues::seriesLabels);
|
|
|
|
}
|
|
|
|
|
|
|
|
highlight(bin_nr, false, numBins);
|
|
|
|
}
|
|
|
|
|
|
|
|
void PieSeries::Item::updatePositions(const QRectF &rect, const QPointF ¢er, double radius)
|
|
|
|
{
|
|
|
|
item->setRect(rect);
|
|
|
|
if (innerLabel) {
|
|
|
|
QRectF labelRect = innerLabel->boundingRect();
|
|
|
|
innerLabel->setPos(center.x() + innerLabelPos.x() * radius - labelRect.width() / 2.0,
|
|
|
|
center.y() + innerLabelPos.y() * radius - labelRect.height() / 2.0);
|
|
|
|
}
|
|
|
|
if (outerLabel) {
|
|
|
|
QRectF labelRect = outerLabel->boundingRect();
|
|
|
|
QPointF pos(center.x() + outerLabelPos.x() * radius, center.y() + outerLabelPos.y() * radius);
|
|
|
|
if (outerLabelPos.x() < 0.0) {
|
|
|
|
if (outerLabelPos.y() < 0.0)
|
|
|
|
pos -= QPointF(labelRect.width(), labelRect.height());
|
|
|
|
else
|
|
|
|
pos.rx() -= labelRect.width();
|
|
|
|
} else if (outerLabelPos.y() < 0.0) {
|
|
|
|
pos.ry() -= labelRect.height();
|
|
|
|
}
|
|
|
|
|
|
|
|
outerLabel->setPos(pos);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void PieSeries::Item::highlight(int bin_nr, bool highlight, int numBins)
|
|
|
|
{
|
|
|
|
QBrush brush(highlight ? highlightedColor : binColor(bin_nr, numBins));
|
|
|
|
QPen pen(highlight ? highlightedBorderColor : ::borderColor, pieBorderWidth);
|
|
|
|
item->setBrush(brush);
|
|
|
|
item->setPen(pen);
|
|
|
|
if (innerLabel) {
|
|
|
|
QBrush labelBrush(highlight ? darkLabelColor : labelColor(bin_nr, numBins));
|
|
|
|
innerLabel->setBrush(labelBrush);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
statistics: convert chart to QQuickItem
It turns out that the wrong base class was used for the chart.
QQuickWidget can only be used on desktop, not in a mobile UI.
Therefore, turn this into a QQuickItem and move the container
QQuickWidget into desktop-only code.
Currently, this code is insane: The chart is rendered onto a
QGraphicsScene (as it was before), which is then rendered into
a QImage, which is transformed into a QSGTexture, which is then
projected onto the device. This is performed on every mouse
move event, since these events in general change the position
of the info-box.
The plan is to slowly convert elements such as the info-box into
QQuickItems. Browsing the QtQuick documentation, this will
not be much fun.
Also note that the rendering currently tears, flickers and has
antialiasing artifacts, most likely owing to integer (QImage)
to floating point (QGraphicsScene, QQuickItem) conversion
problems. The data flow is
QGraphicsScene (float) -> QImage (int) -> QQuickItem (float).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2021-01-07 13:38:37 +00:00
|
|
|
PieSeries::PieSeries(QGraphicsScene *scene, StatsAxis *xAxis, StatsAxis *yAxis, const QString &categoryName,
|
2021-01-01 21:26:52 +00:00
|
|
|
const std::vector<std::pair<QString, int>> &data, bool keepOrder, bool labels) :
|
statistics: convert chart to QQuickItem
It turns out that the wrong base class was used for the chart.
QQuickWidget can only be used on desktop, not in a mobile UI.
Therefore, turn this into a QQuickItem and move the container
QQuickWidget into desktop-only code.
Currently, this code is insane: The chart is rendered onto a
QGraphicsScene (as it was before), which is then rendered into
a QImage, which is transformed into a QSGTexture, which is then
projected onto the device. This is performed on every mouse
move event, since these events in general change the position
of the info-box.
The plan is to slowly convert elements such as the info-box into
QQuickItems. Browsing the QtQuick documentation, this will
not be much fun.
Also note that the rendering currently tears, flickers and has
antialiasing artifacts, most likely owing to integer (QImage)
to floating point (QGraphicsScene, QQuickItem) conversion
problems. The data flow is
QGraphicsScene (float) -> QImage (int) -> QQuickItem (float).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2021-01-07 13:38:37 +00:00
|
|
|
StatsSeries(scene, xAxis, yAxis),
|
2021-01-01 21:26:52 +00:00
|
|
|
categoryName(categoryName),
|
|
|
|
highlighted(-1)
|
|
|
|
{
|
|
|
|
// Pie charts with many slices are unreadable. Therefore, subsume slices under
|
|
|
|
// a certain percentage as "other". But draw a minimum number of slices
|
|
|
|
// until we reach 50% so that we never get a pie only of "other".
|
|
|
|
// This is heuristics, which might have to be optimized.
|
|
|
|
const int smallest_slice_percentage = 5; // Smaller than 5% = others. That makes at most 20 slices.
|
|
|
|
const int min_slices = 5; // Try to draw at least 5 slices until we reach 50%
|
|
|
|
|
|
|
|
// Easier to read than std::accumulate
|
|
|
|
totalCount = 0;
|
|
|
|
for (const auto &[name, count]: data)
|
|
|
|
totalCount += count;
|
|
|
|
|
|
|
|
// First of all, sort from largest to smalles slice. Instead
|
|
|
|
// of sorting the initial array, sort a list of indices, so that
|
|
|
|
// the original order can be easily reconstructed later.
|
|
|
|
std::vector<int> sorted(data.size());
|
|
|
|
std::iota(sorted.begin(), sorted.end(), 0); // Fill with 0..size-1.
|
|
|
|
// Two notes:
|
|
|
|
// - by negating the counts in the sort below, count is sorted descending.
|
|
|
|
// - do a lexicographic sort by (count, idx) so that for equal counts the order is preserved.
|
|
|
|
std::sort(sorted.begin(), sorted.end(),
|
|
|
|
[&data](int idx1, int idx2)
|
|
|
|
{ return std::make_tuple(-data[idx1].second, idx1) <
|
|
|
|
std::make_tuple(-data[idx2].second, idx2); });
|
|
|
|
auto it = std::find_if(sorted.begin(), sorted.end(),
|
|
|
|
[count=totalCount, &data, smallest_slice_percentage](int idx)
|
|
|
|
{ return data[idx].second * 100 / count < smallest_slice_percentage; });
|
|
|
|
if (it - sorted.begin() < min_slices) {
|
|
|
|
// Take minimum amount of slices below 50%...
|
|
|
|
int sum = 0;
|
|
|
|
for (auto it2 = sorted.begin(); it2 != it; ++it2)
|
|
|
|
sum += data[*it2].second;
|
|
|
|
|
|
|
|
while(it != sorted.end() && sum * 2 < totalCount && it - sorted.begin() < min_slices) {
|
|
|
|
sum += data[*it].second;
|
|
|
|
++it;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Don't do a single "other" group
|
|
|
|
if (sorted.end() - it == 1)
|
|
|
|
++it;
|
|
|
|
|
|
|
|
// Sort the main groups and the other groups back, if requested
|
|
|
|
if (keepOrder) {
|
|
|
|
std::sort(sorted.begin(), it);
|
|
|
|
std::sort(it, sorted.end());
|
|
|
|
}
|
|
|
|
|
|
|
|
int numBins = it - sorted.begin();
|
|
|
|
if (it != sorted.end())
|
|
|
|
++numBins;
|
|
|
|
items.reserve(numBins);
|
|
|
|
int act = 0;
|
|
|
|
for (auto it2 = sorted.begin(); it2 != it; ++it2) {
|
|
|
|
int count = data[*it2].second;
|
statistics: convert chart to QQuickItem
It turns out that the wrong base class was used for the chart.
QQuickWidget can only be used on desktop, not in a mobile UI.
Therefore, turn this into a QQuickItem and move the container
QQuickWidget into desktop-only code.
Currently, this code is insane: The chart is rendered onto a
QGraphicsScene (as it was before), which is then rendered into
a QImage, which is transformed into a QSGTexture, which is then
projected onto the device. This is performed on every mouse
move event, since these events in general change the position
of the info-box.
The plan is to slowly convert elements such as the info-box into
QQuickItems. Browsing the QtQuick documentation, this will
not be much fun.
Also note that the rendering currently tears, flickers and has
antialiasing artifacts, most likely owing to integer (QImage)
to floating point (QGraphicsScene, QQuickItem) conversion
problems. The data flow is
QGraphicsScene (float) -> QImage (int) -> QQuickItem (float).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2021-01-07 13:38:37 +00:00
|
|
|
items.emplace_back(scene, data[*it2].first, act, count, totalCount, (int)items.size(), numBins, labels);
|
2021-01-01 21:26:52 +00:00
|
|
|
act += count;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Register the items of the "other" group.
|
|
|
|
if (it != sorted.end()) {
|
|
|
|
other.reserve(sorted.end() - it);
|
|
|
|
for (auto it2 = it; it2 != sorted.end(); ++it2)
|
|
|
|
other.push_back({ data[*it2].first, data[*it2].second });
|
|
|
|
QString name = StatsTranslations::tr("other (%1 items)").arg(other.size());
|
statistics: convert chart to QQuickItem
It turns out that the wrong base class was used for the chart.
QQuickWidget can only be used on desktop, not in a mobile UI.
Therefore, turn this into a QQuickItem and move the container
QQuickWidget into desktop-only code.
Currently, this code is insane: The chart is rendered onto a
QGraphicsScene (as it was before), which is then rendered into
a QImage, which is transformed into a QSGTexture, which is then
projected onto the device. This is performed on every mouse
move event, since these events in general change the position
of the info-box.
The plan is to slowly convert elements such as the info-box into
QQuickItems. Browsing the QtQuick documentation, this will
not be much fun.
Also note that the rendering currently tears, flickers and has
antialiasing artifacts, most likely owing to integer (QImage)
to floating point (QGraphicsScene, QQuickItem) conversion
problems. The data flow is
QGraphicsScene (float) -> QImage (int) -> QQuickItem (float).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2021-01-07 13:38:37 +00:00
|
|
|
items.emplace_back(scene, name, act, totalCount - act, totalCount, (int)items.size(), numBins, labels);
|
2021-01-01 21:26:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
PieSeries::~PieSeries()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void PieSeries::updatePositions()
|
|
|
|
{
|
statistics: convert chart to QQuickItem
It turns out that the wrong base class was used for the chart.
QQuickWidget can only be used on desktop, not in a mobile UI.
Therefore, turn this into a QQuickItem and move the container
QQuickWidget into desktop-only code.
Currently, this code is insane: The chart is rendered onto a
QGraphicsScene (as it was before), which is then rendered into
a QImage, which is transformed into a QSGTexture, which is then
projected onto the device. This is performed on every mouse
move event, since these events in general change the position
of the info-box.
The plan is to slowly convert elements such as the info-box into
QQuickItems. Browsing the QtQuick documentation, this will
not be much fun.
Also note that the rendering currently tears, flickers and has
antialiasing artifacts, most likely owing to integer (QImage)
to floating point (QGraphicsScene, QQuickItem) conversion
problems. The data flow is
QGraphicsScene (float) -> QImage (int) -> QQuickItem (float).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2021-01-07 13:38:37 +00:00
|
|
|
QRectF plotRect = scene->sceneRect();
|
2021-01-01 21:26:52 +00:00
|
|
|
center = plotRect.center();
|
|
|
|
radius = std::min(plotRect.width(), plotRect.height()) * pieSize / 2.0;
|
|
|
|
QRectF rect(center.x() - radius, center.y() - radius, 2.0 * radius, 2.0 * radius);
|
|
|
|
for (Item &item: items)
|
|
|
|
item.updatePositions(rect, center, radius);
|
|
|
|
}
|
|
|
|
|
|
|
|
std::vector<QString> PieSeries::binNames()
|
|
|
|
{
|
|
|
|
std::vector<QString> res;
|
|
|
|
res.reserve(items.size());
|
|
|
|
for (Item &item: items)
|
|
|
|
res.push_back(item.name);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
int PieSeries::getItemUnderMouse(const QPointF &f) const
|
|
|
|
{
|
|
|
|
QPointF delta = f - center;
|
|
|
|
double len = sqrt(QPointF::dotProduct(delta, delta));
|
|
|
|
if (len > radius)
|
|
|
|
return -1;
|
|
|
|
delta /= len;
|
|
|
|
double angle = 0.25 - atan2(-delta.y(), delta.x()) / 2.0 / M_PI;
|
|
|
|
while (angle < 0.0)
|
|
|
|
angle += 1.0;
|
|
|
|
auto it = std::lower_bound(items.begin(), items.end(), angle,
|
|
|
|
[](const Item &item, double angle) { return item.angleTo < angle; });
|
|
|
|
if (it == items.end())
|
|
|
|
return -1; // Floating point rounding issues?
|
|
|
|
return it - items.begin();
|
|
|
|
}
|
|
|
|
|
|
|
|
static QString makePercentageLine(int count, int total)
|
|
|
|
{
|
|
|
|
double percentage = count * 100.0 / total;
|
|
|
|
QString countString = QString("%L1").arg(count);
|
|
|
|
QString percentageString = QString("%L1%").arg(percentage, 0, 'f', 1);
|
|
|
|
QString totalString = QString("%L1").arg(total);
|
|
|
|
return StatsTranslations::tr("%1 (%2 of %3) dives").arg(countString, percentageString, totalString);
|
|
|
|
}
|
|
|
|
|
|
|
|
std::vector<QString> PieSeries::makeInfo(int idx) const
|
|
|
|
{
|
|
|
|
std::vector<QString> res;
|
|
|
|
if (idx + 1 == (int)items.size() && !other.empty()) {
|
|
|
|
// This is the "other" bin. Format all these items and an overview item.
|
|
|
|
res.reserve(other.size() + 1);
|
|
|
|
res.push_back(QString("%1: %2").arg(StatsTranslations::tr("other"),
|
|
|
|
makePercentageLine(items[idx].count, totalCount)));
|
|
|
|
for (const OtherItem &item: other)
|
|
|
|
res.push_back(QString("%1: %2").arg(item.name,
|
|
|
|
makePercentageLine(item.count, totalCount)));
|
|
|
|
} else {
|
|
|
|
// A "normal" item.
|
|
|
|
res.reserve(2);
|
|
|
|
res.push_back(QStringLiteral("%1: %2").arg(categoryName, items[idx].name));
|
|
|
|
res.push_back(makePercentageLine(items[idx].count, totalCount));
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool PieSeries::hover(QPointF pos)
|
|
|
|
{
|
|
|
|
int index = getItemUnderMouse(pos);
|
|
|
|
if (index == highlighted) {
|
|
|
|
if (information)
|
|
|
|
information->setPos(pos);
|
|
|
|
return index >= 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
unhighlight();
|
|
|
|
highlighted = index;
|
|
|
|
|
|
|
|
// Highlight new item (if any)
|
|
|
|
if (highlighted >= 0 && highlighted < (int)items.size()) {
|
|
|
|
items[highlighted].highlight(highlighted, true, (int)items.size());
|
|
|
|
if (!information)
|
statistics: convert chart to QQuickItem
It turns out that the wrong base class was used for the chart.
QQuickWidget can only be used on desktop, not in a mobile UI.
Therefore, turn this into a QQuickItem and move the container
QQuickWidget into desktop-only code.
Currently, this code is insane: The chart is rendered onto a
QGraphicsScene (as it was before), which is then rendered into
a QImage, which is transformed into a QSGTexture, which is then
projected onto the device. This is performed on every mouse
move event, since these events in general change the position
of the info-box.
The plan is to slowly convert elements such as the info-box into
QQuickItems. Browsing the QtQuick documentation, this will
not be much fun.
Also note that the rendering currently tears, flickers and has
antialiasing artifacts, most likely owing to integer (QImage)
to floating point (QGraphicsScene, QQuickItem) conversion
problems. The data flow is
QGraphicsScene (float) -> QImage (int) -> QQuickItem (float).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2021-01-07 13:38:37 +00:00
|
|
|
information = createItemPtr<InformationBox>(scene);
|
2021-01-01 21:26:52 +00:00
|
|
|
information->setText(makeInfo(highlighted), pos);
|
|
|
|
} else {
|
|
|
|
information.reset();
|
|
|
|
}
|
|
|
|
return highlighted >= 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PieSeries::unhighlight()
|
|
|
|
{
|
|
|
|
if (highlighted >= 0 && highlighted < (int)items.size())
|
|
|
|
items[highlighted].highlight(highlighted, false, (int)items.size());
|
|
|
|
highlighted = -1;
|
|
|
|
}
|