mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

stats: remove theme-access from QtQuick root node

Browse source 
To make the QtQuick code more general, remove the access to the
StatsTheme, which only makes sense for the statistics module.

Store the background color in a separate variable, since that
will be needed by any potential users of the code.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2023-04-16 11:24:19 +02:00
parent 1a3bc9bf71
commit 845ac82b57
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
stats/statsview.cpp
View file

@ -37,6 +37,7 @@ static const double selectionLassoWidth = 2.0; // Border between title and char
StatsView::StatsView(QQuickItem *parent) : QQuickItem(parent), StatsView::StatsView(QQuickItem *parent) : QQuickItem(parent),
backgroundDirty(true), backgroundDirty(true),
currentTheme(&getStatsTheme(false)), currentTheme(&getStatsTheme(false)),
backgroundColor(currentTheme->backgroundColor),
highlightedSeries(nullptr), highlightedSeries(nullptr),
xAxis(nullptr), xAxis(nullptr),
yAxis(nullptr), yAxis(nullptr),
@ -128,7 +129,7 @@ using ZNode = HideableQSGNode<QSGNode>;
class RootNode : public QSGNode class RootNode : public QSGNode
{ {
public: public:
RootNode(StatsView &view); RootNode(StatsView &view, QColor backgroundColor);
~RootNode(); ~RootNode();
StatsView &view; StatsView &view;
std::unique_ptr<QSGRectangleNode> backgroundNode; // solid background std::unique_ptr<QSGRectangleNode> backgroundNode; // solid background
@ -136,13 +137,12 @@ public:
std::array<std::unique_ptr<ZNode>, (size_t)ChartZValue::Count> zNodes; std::array<std::unique_ptr<ZNode>, (size_t)ChartZValue::Count> zNodes;
}; };
RootNode::RootNode(StatsView &view) : view(view) RootNode::RootNode(StatsView &view, QColor backgroundColor) : view(view)
{ {
// Add a background rectangle with a solid color. This could // Add a background rectangle with a solid color. This could
// also be done on the widget level, but would have to be done // also be done on the widget level, but would have to be done
// separately for desktop and mobile, so do it here. // separately for desktop and mobile, so do it here.
backgroundNode.reset(view.w()->createRectangleNode()); backgroundNode.reset(view.w()->createRectangleNode());
backgroundNode->setColor(view.getCurrentTheme().backgroundColor);
appendChildNode(backgroundNode.get()); appendChildNode(backgroundNode.get());
for (auto &zNode: zNodes) { for (auto &zNode: zNodes) {
@ -172,7 +172,7 @@ QSGNode *StatsView::updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNod
// This is just a copy of what is found in Qt's documentation. // This is just a copy of what is found in Qt's documentation.
RootNode *n = static_cast<RootNode *>(oldNode); RootNode *n = static_cast<RootNode *>(oldNode);
if (!n) if (!n)
n = rootNode = new RootNode(*this); n = rootNode = new RootNode(*this, backgroundColor);
// Delete all chart items that are marked for deletion. // Delete all chart items that are marked for deletion.
freeDeletedChartItems(); freeDeletedChartItems();
@ -298,10 +298,16 @@ QQuickWindow *StatsView::w() const
return window(); return window();
} }
void StatsView::setBackgroundColor(QColor color)
{
backgroundColor = color;
rootNode->backgroundNode->setColor(color);
}
void StatsView::setTheme(bool dark) void StatsView::setTheme(bool dark)
{ {
currentTheme = &getStatsTheme(dark); currentTheme = &getStatsTheme(dark);
rootNode->backgroundNode->setColor(currentTheme->backgroundColor); setBackgroundColor(currentTheme->backgroundColor);
} }
const StatsTheme &StatsView::getCurrentTheme() const const StatsTheme &StatsView::getCurrentTheme() const

2
stats/statsview.h
View file

@ -53,6 +53,7 @@ public:
QQuickWindow *w() const; // Make window available to items QQuickWindow *w() const; // Make window available to items
QSizeF size() const; QSizeF size() const;
QRectF plotArea() const; QRectF plotArea() const;
void setBackgroundColor(QColor color); // Chart must be replot for color to become effective.
void setTheme(bool dark); // Chart must be replot for theme to become effective. void setTheme(bool dark); // Chart must be replot for theme to become effective.
const StatsTheme &getCurrentTheme() const; const StatsTheme &getCurrentTheme() const;
void addQSGNode(QSGNode *node, ChartZValue z); // Must only be called in render thread! void addQSGNode(QSGNode *node, ChartZValue z); // Must only be called in render thread!
@ -143,6 +144,7 @@ private:
StatsState state; StatsState state;
const StatsTheme *currentTheme; const StatsTheme *currentTheme;
QColor backgroundColor;
std::vector<std::unique_ptr<StatsSeries>> series; std::vector<std::unique_ptr<StatsSeries>> series;
std::unique_ptr<StatsGrid> grid; std::unique_ptr<StatsGrid> grid;
std::vector<ChartItemPtr<QuartileMarker>> quartileMarkers; std::vector<ChartItemPtr<QuartileMarker>> quartileMarkers;