mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
1e5191e33e
This was a user request: Sort bar charts by height of the bars. Obviously, this can only work for categorical charts, not for histograms. The UI is a break from the old concept: the sorting is chosen based on the chart, whereas for the rest of the features, the viable charts are presented based on the binning, etc. I found it confusing to have the possible charts be selected based on sorting. I.e. if a non-bin sort mode is selected, the histogram charts disappear. On the flip side, this would be more consistent. We can change it later. For value-based bar charts, there are three sort modes: by bin, by count (i.e. number of dives in that bar) and by value (i.e. length of the bar). This hopefully satisfies all needs. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
74 lines
2.2 KiB
C++
74 lines
2.2 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
// A pie chart series, which displays percentual information.
|
|
#ifndef PIE_SERIES_H
|
|
#define PIE_SERIES_H
|
|
|
|
#include "statshelper.h"
|
|
#include "statsseries.h"
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
#include <QString>
|
|
|
|
struct dive;
|
|
struct InformationBox;
|
|
class ChartPieItem;
|
|
class ChartTextItem;
|
|
class QRectF;
|
|
enum class ChartSortMode : int;
|
|
|
|
class PieSeries : public StatsSeries {
|
|
public:
|
|
// The pie series is initialized with (name, count) pairs.
|
|
// If keepOrder is false, bins will be sorted by size, otherwise the sorting
|
|
// of the shown bins will be retained. Small bins are omitted for clarity.
|
|
PieSeries(StatsView &view, StatsAxis *xAxis, StatsAxis *yAxis, const QString &categoryName,
|
|
std::vector<std::pair<QString, std::vector<dive *>>> data, ChartSortMode sortMode);
|
|
~PieSeries();
|
|
|
|
void updatePositions() override;
|
|
bool hover(QPointF pos) override;
|
|
void unhighlight() override;
|
|
bool selectItemsUnderMouse(const QPointF &point, SelectionModifier modifier) override;
|
|
|
|
std::vector<QString> binNames();
|
|
|
|
private:
|
|
// Get item under mouse pointer, or -1 if none
|
|
int getItemUnderMouse(const QPointF &f) const;
|
|
|
|
ChartItemPtr<ChartPieItem> item;
|
|
QString categoryName;
|
|
std::vector<QString> makeInfo(int idx) const;
|
|
|
|
struct Item {
|
|
ChartItemPtr<ChartTextItem> innerLabel, outerLabel;
|
|
QString name;
|
|
double angleFrom, angleTo; // In fraction of total
|
|
std::vector<dive *> dives;
|
|
QPointF innerLabelPos, outerLabelPos; // With respect to a (-1, -1)-(1, 1) rectangle.
|
|
bool selected;
|
|
Item(StatsView &view, const QString &name, int from, std::vector<dive *> dives, int totalCount,
|
|
int bin_nr, int numBins);
|
|
void updatePositions(const QPointF ¢er, double radius);
|
|
void highlight(ChartPieItem &item, int bin_nr, bool highlight, int numBins);
|
|
};
|
|
std::vector<Item> items;
|
|
int totalCount;
|
|
|
|
// Entries in the "other" group. If empty, there is no "other" group.
|
|
struct OtherItem {
|
|
QString name;
|
|
int count;
|
|
};
|
|
std::vector<OtherItem> other;
|
|
|
|
ChartItemPtr<InformationBox> information;
|
|
QPointF center; // center of drawing area
|
|
double radius; // radius of pie
|
|
int highlighted; // -1: no item highlighted
|
|
int lastClicked; // -1: no item clicked
|
|
void divesSelected(const QVector<dive *> &) override;
|
|
};
|
|
|
|
#endif
|