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

profile: clip DiveProfileItems

Browse source 
Avoid "overshooting" of the profile items by linearly clipping
the first and last segment to the boundaries of the time-axis.

Sadly, quite a lot of code, because every profile item is
slightly different.

In particular the pressure-segment handling was rewritten.
It now stores the begin and end of each segment to draw
the appropriate text items.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-10-09 14:56:12 +02:00 • committed by Dirk Hohndel
parent 56f6e5051f
commit 073059f5ab
2 changed files with 216 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

26
profile-widget/diveprofileitem.h
View file

@ -40,6 +40,9 @@ public:
protected:
void makePolygon(int from, int to);
void clipStart(double &x, double &y, double next_x, double next_y) const;
void clipStop(double &x, double &y, double prev_x, double prev_y) const;
std::pair<double, double> getPoint(int i) const;
const DiveCartesianAxis &hAxis;
const DiveCartesianAxis &vAxis;
const DivePlotDataModel &dataModel;
@ -74,8 +77,9 @@ public:
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
private:
void createTextItem();
double lastRunningSum;
void createTextItem(double lastSec, double lastMeanDepth);
std::pair<double,double> getMeanDepth(int i) const;
std::pair<double,double> getNextMeanDepth(int i) const;
QString visibilityKey;
};
@ -111,13 +115,22 @@ public:
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
private:
void plotPressureValue(int mbar, int sec, QFlags<Qt::AlignmentFlag> align, double offset);
void plotGasValue(int mbar, int sec, struct gasmix gasmix, QFlags<Qt::AlignmentFlag> align, double offset);
void plotPressureValue(double mbar, double sec, QFlags<Qt::AlignmentFlag> align, double offset);
void plotGasValue(double mbar, double sec, struct gasmix gasmix, QFlags<Qt::AlignmentFlag> align, double offset);
struct PressureEntry {
double time = 0.0;
double pressure = 0.0;
};
struct Entry {
QPointF pos;
QColor col;
};
std::vector<std::vector<Entry>> polygons;
struct Segment {
int cyl;
std::vector<Entry> polygon;
PressureEntry first, last;
};
std::vector<Segment> segments;
};
class DiveCalculatedCeiling : public AbstractProfilePolygonItem {
@ -137,6 +150,9 @@ public:
DiveReportedCeiling(const DivePlotDataModel &model, const DiveCartesianAxis &hAxis, int hColumn, const DiveCartesianAxis &vAxis, int vColumn, double dpr);
void replot(const dive *d, int from, int to, bool in_planner) override;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
private:
std::pair<double,double> getTimeValue(int i) const;
std::pair<double, double> getPoint(int i) const;
};
class DiveCalculatedTissue : public DiveCalculatedCeiling {