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

statistics: save chart in axis class

Browse source 
The chart was passed as argument to the function recalculating
the axis labels. Instead, pass the chart in the constructor of
the axes and save it. This gains us flexibility for the future:
There will be more functions that need to access the chart (e.g.
resizing of the axes).

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-01-04 17:16:13 +01:00 • committed by Dirk Hohndel
parent 76136010bf
commit 23d781deba
3 changed files with 35 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

25
stats/statsaxis.h
View file

@ -15,13 +15,14 @@ namespace QtCharts {
class StatsAxis {
public:
virtual ~StatsAxis();
virtual void updateLabels(const QtCharts::QChart *chart) = 0;
virtual void updateLabels() = 0;
virtual QtCharts::QAbstractAxis *qaxis() = 0;
// Returns minimum and maximum of shown range, not of data points.
virtual std::pair<double, double> minMax() const;
protected:
StatsAxis(bool horizontal);
int guessNumTicks(const QtCharts::QChart *chart, const QtCharts::QAbstractAxis *axis, const std::vector<QString> &strings) const;
QtCharts::QChart *chart;
StatsAxis(QtCharts::QChart *chart, bool horizontal);
int guessNumTicks(const QtCharts::QAbstractAxis *axis, const std::vector<QString> &strings) const;
bool horizontal;
};
@ -38,27 +39,27 @@ class StatsAxisTemplate : public StatsAxis, public QAxis
class ValueAxis : public StatsAxisTemplate<QtCharts::QValueAxis> {
public:
ValueAxis(double min, double max, int decimals, bool horizontal);
ValueAxis(QtCharts::QChart *chart, double min, double max, int decimals, bool horizontal);
private:
double min, max;
int decimals;
void updateLabels(const QtCharts::QChart *chart) override;
void updateLabels() override;
std::pair<double, double> minMax() const override;
};
class CountAxis : public ValueAxis {
public:
CountAxis(int count, bool horizontal);
CountAxis(QtCharts::QChart *chart, int count, bool horizontal);
private:
int count;
void updateLabels(const QtCharts::QChart *chart) override;
void updateLabels() override;
};
class CategoryAxis : public StatsAxisTemplate<QtCharts::QBarCategoryAxis> {
public:
CategoryAxis(const std::vector<QString> &labels, bool horizontal);
CategoryAxis(QtCharts::QChart *chart, const std::vector<QString> &labels, bool horizontal);
private:
void updateLabels(const QtCharts::QChart *chart);
void updateLabels();
};
struct HistogramAxisEntry {
@ -69,9 +70,9 @@ struct HistogramAxisEntry {
class HistogramAxis : public StatsAxisTemplate<QtCharts::QCategoryAxis> {
public:
HistogramAxis(std::vector<HistogramAxisEntry> bin_values, bool horizontal);
HistogramAxis(QtCharts::QChart *chart, std::vector<HistogramAxisEntry> bin_values, bool horizontal);
private:
void updateLabels(const QtCharts::QChart *chart) override;
void updateLabels() override;
std::pair<double, double> minMax() const override;
std::vector<HistogramAxisEntry> bin_values;
int preferred_step;
@ -79,7 +80,7 @@ private:
class DateAxis : public HistogramAxis {
public:
DateAxis(double from, double to, bool horizontal);
DateAxis(QtCharts::QChart *chart, double from, double to, bool horizontal);
};
#endif