mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/profile-widget/tankitem.h

30 lines
707 B
C
Raw Normal View History

Add SPDX header to profile widgets Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-04-27 18:26:36 +00:00
// SPDX-License-Identifier: GPL-2.0
Add initial support for a visual tracker of gas used This shows a color-coded bar at the bottom of the graph that corresponds with the active gas. Todo: - text that explicitly states gas on the left edge of the bar - better vertical positioning of the bar - ability to turn this on and off Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-15 00:22:27 +00:00
#ifndef TANKITEM_H
#define TANKITEM_H
Move subsurface-core to core and qt-mobile to mobile-widgets Having subsurface-core as a directory name really messes with autocomplete and is obviously redundant. Simmilarly, qt-mobile caused an autocomplete conflict and also was inconsistent with the desktop-widget name for the directory containing the "other" UI. And while cleaning up the resulting change in the path name for include files, I decided to clean up those even more to make them consistent overall. This could have been handled in more commits, but since this requires a make clean before the build, it seemed more sensible to do it all in one. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-05 05:02:03 +00:00
#include "profile-widget/divelineitem.h"
profile: cleanup includes in tankitem.cpp If possible, forward declare and move the include to the .cpp file. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-12-23 11:39:07 +00:00
#include "core/gas.h"
#include <QGraphicsRectItem>
#include <QBrush>
struct dive;
profile: remove last dc_number access from profile code dc_number is a global variable indicating the currently displayed dive on desktop. It makes no sense on mobile, since multiple profiles can be active at the same time. Therefore, the profile code should not access this global, but use the dc number that is passed in. This removes the last access. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-04-03 09:23:51 +00:00
struct divecomputer;
profile: cleanup includes in tankitem.cpp If possible, forward declare and move the include to the .cpp file. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-12-23 11:39:07 +00:00
class DiveCartesianAxis;
Add initial support for a visual tracker of gas used This shows a color-coded bar at the bottom of the graph that corresponds with the active gas. Todo: - text that explicitly states gas on the left edge of the bar - better vertical positioning of the bar - ability to turn this on and off Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-15 00:22:27 +00:00
profile: remove TankItem's connection to the resize signal Since the initial commit introducing TankItem, there was a connection that replotted the item if the horizontal axis sent the sizeChanged() signal. I never managed to create this signal for the horizontal axis, only for the vertical axes. Therefore remove this thing. If it turns out that we need it after all, readd it in a more deterministic way (i.e. call where it is needed). Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-12-23 11:26:12 +00:00
class TankItem : public QGraphicsRectItem
Add initial support for a visual tracker of gas used This shows a color-coded bar at the bottom of the graph that corresponds with the active gas. Todo: - text that explicitly states gas on the left edge of the bar - better vertical positioning of the bar - ability to turn this on and off Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-15 00:22:27 +00:00
{
public:
profile: rename printFontScale to dpr (device pixel ratio) The printFontScale is used to scale up fonts (and icons) when rendering to high-DPI devices. With absolute scaling, this will also be used to scale the size of different chart regions, line thickness, etc. Therefore, give it an more appropriate name. "Device pixel ratio", which is a well established term, seems to appropriately describe the concept. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2021-08-09 14:48:08 +00:00
explicit TankItem(const DiveCartesianAxis &axis, double dpr);
profile: remove last dc_number access from profile code dc_number is a global variable indicating the currently displayed dive on desktop. It makes no sense on mobile, since multiple profiles can be active at the same time. Therefore, the profile code should not access this global, but use the dc number that is passed in. This removes the last access. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-04-03 09:23:51 +00:00
void setData(const struct dive *d, const struct divecomputer *dc, int plotStartTime, int plotEndTime);
profile: start with "absolutizing" the profile layout The chart items were laid out in relative terms with respect to a fixed scene size (100.0, 100.0). This simply does not cut it when resizing the chart. Why should the axes always occupy the same fraction of the chart independent of the size. Moreover, this led to basically unmaintainable code. Resize the scene according to the viewport and do absolute placement of the items. This breaks the layout, but at least now we have a chance to fix things somewhat reasonably. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2021-08-28 21:36:09 +00:00
double height() const;
Add initial support for a visual tracker of gas used This shows a color-coded bar at the bottom of the graph that corresponds with the active gas. Todo: - text that explicitly states gas on the left edge of the bar - better vertical positioning of the bar - ability to turn this on and off Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-15 00:22:27 +00:00
private:
Cleanup: move common code into TankItem::createBar() function Calculation of the x-position and the width of the tank-bar was done outside of the function. Move it into the function to make the caller a bit more readable. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-10-27 16:48:04 +00:00
void createBar(int startTime, int stopTime, struct gasmix gas);
profile: set axis in constructor of TankItem There is no point in a separate set-axis function if we never change the axis anyway. Make the axis a const-reference to show that it can never be changed. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-12-23 11:33:05 +00:00
const DiveCartesianAxis &hAxis;
profile: rename printFontScale to dpr (device pixel ratio) The printFontScale is used to scale up fonts (and icons) when rendering to high-DPI devices. With absolute scaling, this will also be used to scale the size of different chart regions, line thickness, etc. Therefore, give it an more appropriate name. "Device pixel ratio", which is a well established term, seems to appropriately describe the concept. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2021-08-09 14:48:08 +00:00
double dpr;
Give oxygen a proper colour in the tankbar Oxygen should be representad by its own solid green colour not the yellow/green of nitrox. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-05 19:24:34 +00:00
QBrush air, nitrox, oxygen, trimix;
Add initial support for a visual tracker of gas used This shows a color-coded bar at the bottom of the graph that corresponds with the active gas. Todo: - text that explicitly states gas on the left edge of the bar - better vertical positioning of the bar - ability to turn this on and off Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-15 00:22:27 +00:00
QList<QGraphicsRectItem *> rects;
};
#endif // TANKITEM_H
Reference in a new issue Copy permalink