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: make ItemPos initialization constant

Browse source 
The ItemPos structure describes the position of various chart
elements on the scene. It had two problems:

- The identifiers were starting with an underscore followed
  by a capital letter. This is reserved to the compiler.
- The global object was initialized in the ProfileWidget's
  constructor. This means that if there are multiple
  ProfileWidgets, the structure is reinitialized even though
  it is constant.

Remove the underscores (what was the point anyway?) and
initialize the structure in its own constructor. Moreover,
make the object const to drive the point home.

If this ever needs to be variable, each ProfileWidget
should get its own copy of the object.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-02-22 20:24:16 +01:00 • committed by Dirk Hohndel
parent ed8ad9ac80
commit a3d8191896
2 changed files with 101 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

202
profile-widget/profilewidget2.cpp
View file

@ -58,32 +58,33 @@
* hard coding the item on the scene with a random * hard coding the item on the scene with a random
* value. * value.
*/ */
static struct _ItemPos { const static struct ItemPos {
struct _Pos { struct Pos {
QPointF on; QPointF on;
QPointF off; QPointF off;
}; };
struct _Axis { struct Axis {
_Pos pos; Pos pos;
QLineF shrinked; QLineF shrinked;
QLineF expanded; QLineF expanded;
QLineF intermediate; QLineF intermediate;
}; };
_Pos background; Pos background;
_Pos dcLabel; Pos dcLabel;
_Pos tankBar; Pos tankBar;
_Axis depth; Axis depth;
_Axis partialPressure; Axis partialPressure;
_Axis partialPressureTissue; Axis partialPressureTissue;
_Axis partialPressureWithTankBar; Axis partialPressureWithTankBar;
_Axis percentage; Axis percentage;
_Axis percentageWithTankBar; Axis percentageWithTankBar;
_Axis time; Axis time;
_Axis cylinder; Axis cylinder;
_Axis temperature; Axis temperature;
_Axis temperatureAll; Axis temperatureAll;
_Axis heartBeat; Axis heartBeat;
_Axis heartBeatWithTankBar; Axis heartBeatWithTankBar;
ItemPos();
} itemPos; } itemPos;
// Constant describing at which z-level the thumbnails are located. // Constant describing at which z-level the thumbnails are located.
@ -154,7 +155,6 @@ ProfileWidget2::ProfileWidget2(DivePlannerPointsModel *plannerModelIn, QWidget *
init_plot_info(&plotInfo); init_plot_info(&plotInfo);
setupSceneAndFlags(); setupSceneAndFlags();
setupItemSizes();
setupItemOnScene(); setupItemOnScene();
addItemsToScene(); addItemsToScene();
scene()->installEventFilter(this); scene()->installEventFilter(this);
@ -372,7 +372,7 @@ PartialPressureGasItem *ProfileWidget2::createPPGas(int column, color_index_t co
return item; return item;
} }
void ProfileWidget2::setupItemSizes() ItemPos::ItemPos()
{ {
// Scene is *always* (double) 100 / 100. // Scene is *always* (double) 100 / 100.
// Background Config // Background Config
@ -381,119 +381,119 @@ void ProfileWidget2::setupItemSizes()
* Axis and everything else is auto-adjusted.* * Axis and everything else is auto-adjusted.*
*/ */
itemPos.background.on.setX(0); background.on.setX(0);
itemPos.background.on.setY(0); background.on.setY(0);
itemPos.background.off.setX(0); background.off.setX(0);
itemPos.background.off.setY(110); background.off.setY(110);
//Depth Axis Config //Depth Axis Config
itemPos.depth.pos.on.setX(3); depth.pos.on.setX(3);
itemPos.depth.pos.on.setY(3); depth.pos.on.setY(3);
itemPos.depth.pos.off.setX(-2); depth.pos.off.setX(-2);
itemPos.depth.pos.off.setY(3); depth.pos.off.setY(3);
itemPos.depth.expanded.setP1(QPointF(0, 0)); depth.expanded.setP1(QPointF(0, 0));
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
itemPos.depth.expanded.setP2(QPointF(0, 85)); depth.expanded.setP2(QPointF(0, 85));
#else #else
itemPos.depth.expanded.setP2(QPointF(0, 65)); depth.expanded.setP2(QPointF(0, 65));
#endif #endif
itemPos.depth.shrinked.setP1(QPointF(0, 0)); depth.shrinked.setP1(QPointF(0, 0));
itemPos.depth.shrinked.setP2(QPointF(0, 55)); depth.shrinked.setP2(QPointF(0, 55));
itemPos.depth.intermediate.setP1(QPointF(0, 0)); depth.intermediate.setP1(QPointF(0, 0));
itemPos.depth.intermediate.setP2(QPointF(0, 65)); depth.intermediate.setP2(QPointF(0, 65));
// Time Axis Config // Time Axis Config
itemPos.time.pos.on.setX(3); time.pos.on.setX(3);
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
itemPos.time.pos.on.setY(95); time.pos.on.setY(95);
#else #else
itemPos.time.pos.on.setY(89.5); time.pos.on.setY(89.5);
#endif #endif
itemPos.time.pos.off.setX(3); time.pos.off.setX(3);
itemPos.time.pos.off.setY(110); time.pos.off.setY(110);
itemPos.time.expanded.setP1(QPointF(0, 0)); time.expanded.setP1(QPointF(0, 0));
itemPos.time.expanded.setP2(QPointF(94, 0)); time.expanded.setP2(QPointF(94, 0));
// Partial Gas Axis Config // Partial Gas Axis Config
itemPos.partialPressure.pos.on.setX(97); partialPressure.pos.on.setX(97);
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
itemPos.partialPressure.pos.on.setY(75); partialPressure.pos.on.setY(75);
#else #else
itemPos.partialPressure.pos.on.setY(70); partialPressure.pos.on.setY(70);
#endif #endif
itemPos.partialPressure.pos.off.setX(110); partialPressure.pos.off.setX(110);
itemPos.partialPressure.pos.off.setY(63); partialPressure.pos.off.setY(63);
itemPos.partialPressure.expanded.setP1(QPointF(0, 0)); partialPressure.expanded.setP1(QPointF(0, 0));
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
itemPos.partialPressure.expanded.setP2(QPointF(0, 19)); partialPressure.expanded.setP2(QPointF(0, 19));
#else #else
itemPos.partialPressure.expanded.setP2(QPointF(0, 20)); partialPressure.expanded.setP2(QPointF(0, 20));
#endif #endif
itemPos.partialPressureWithTankBar = itemPos.partialPressure; partialPressureWithTankBar = partialPressure;
itemPos.partialPressureWithTankBar.expanded.setP2(QPointF(0, 17)); partialPressureWithTankBar.expanded.setP2(QPointF(0, 17));
itemPos.partialPressureTissue = itemPos.partialPressure; partialPressureTissue = partialPressure;
itemPos.partialPressureTissue.pos.on.setX(97); partialPressureTissue.pos.on.setX(97);
itemPos.partialPressureTissue.pos.on.setY(65); partialPressureTissue.pos.on.setY(65);
itemPos.partialPressureTissue.expanded.setP2(QPointF(0, 16)); partialPressureTissue.expanded.setP2(QPointF(0, 16));
// cylinder axis config // cylinder axis config
itemPos.cylinder.pos.on.setX(3); cylinder.pos.on.setX(3);
itemPos.cylinder.pos.on.setY(20); cylinder.pos.on.setY(20);
itemPos.cylinder.pos.off.setX(-10); cylinder.pos.off.setX(-10);
itemPos.cylinder.pos.off.setY(20); cylinder.pos.off.setY(20);
itemPos.cylinder.expanded.setP1(QPointF(0, 15)); cylinder.expanded.setP1(QPointF(0, 15));
itemPos.cylinder.expanded.setP2(QPointF(0, 50)); cylinder.expanded.setP2(QPointF(0, 50));
itemPos.cylinder.shrinked.setP1(QPointF(0, 0)); cylinder.shrinked.setP1(QPointF(0, 0));
itemPos.cylinder.shrinked.setP2(QPointF(0, 20)); cylinder.shrinked.setP2(QPointF(0, 20));
itemPos.cylinder.intermediate.setP1(QPointF(0, 0)); cylinder.intermediate.setP1(QPointF(0, 0));
itemPos.cylinder.intermediate.setP2(QPointF(0, 20)); cylinder.intermediate.setP2(QPointF(0, 20));
// Temperature axis config // Temperature axis config
itemPos.temperature.pos.on.setX(3); temperature.pos.on.setX(3);
itemPos.temperature.pos.off.setX(-10); temperature.pos.off.setX(-10);
itemPos.temperature.pos.off.setY(40); temperature.pos.off.setY(40);
itemPos.temperature.expanded.setP1(QPointF(0, 20)); temperature.expanded.setP1(QPointF(0, 20));
itemPos.temperature.expanded.setP2(QPointF(0, 33)); temperature.expanded.setP2(QPointF(0, 33));
itemPos.temperature.shrinked.setP1(QPointF(0, 2)); temperature.shrinked.setP1(QPointF(0, 2));
itemPos.temperature.shrinked.setP2(QPointF(0, 12)); temperature.shrinked.setP2(QPointF(0, 12));
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
itemPos.temperature.pos.on.setY(60); temperature.pos.on.setY(60);
itemPos.temperatureAll.pos.on.setY(51); temperatureAll.pos.on.setY(51);
itemPos.temperature.intermediate.setP1(QPointF(0, 2)); temperature.intermediate.setP1(QPointF(0, 2));
itemPos.temperature.intermediate.setP2(QPointF(0, 12)); temperature.intermediate.setP2(QPointF(0, 12));
#else #else
itemPos.temperature.pos.on.setY(51); temperature.pos.on.setY(51);
itemPos.temperatureAll.pos.on.setY(47); temperatureAll.pos.on.setY(47);
itemPos.temperature.intermediate.setP1(QPointF(0, 2)); temperature.intermediate.setP1(QPointF(0, 2));
itemPos.temperature.intermediate.setP2(QPointF(0, 12)); temperature.intermediate.setP2(QPointF(0, 12));
#endif #endif
// Heart rate axis config // Heart rate axis config
itemPos.heartBeat.pos.on.setX(3); heartBeat.pos.on.setX(3);
itemPos.heartBeat.pos.on.setY(82); heartBeat.pos.on.setY(82);
itemPos.heartBeat.expanded.setP1(QPointF(0, 0)); heartBeat.expanded.setP1(QPointF(0, 0));
itemPos.heartBeat.expanded.setP2(QPointF(0, 10)); heartBeat.expanded.setP2(QPointF(0, 10));
itemPos.heartBeatWithTankBar = itemPos.heartBeat; heartBeatWithTankBar = heartBeat;
itemPos.heartBeatWithTankBar.expanded.setP2(QPointF(0, 7)); heartBeatWithTankBar.expanded.setP2(QPointF(0, 7));
// Percentage axis config // Percentage axis config
itemPos.percentage.pos.on.setX(3); percentage.pos.on.setX(3);
itemPos.percentage.pos.on.setY(80); percentage.pos.on.setY(80);
itemPos.percentage.expanded.setP1(QPointF(0, 0)); percentage.expanded.setP1(QPointF(0, 0));
itemPos.percentage.expanded.setP2(QPointF(0, 15)); percentage.expanded.setP2(QPointF(0, 15));
itemPos.percentageWithTankBar = itemPos.percentage; percentageWithTankBar = percentage;
itemPos.percentageWithTankBar.expanded.setP2(QPointF(0, 11.9)); percentageWithTankBar.expanded.setP2(QPointF(0, 11.9));
itemPos.dcLabel.on.setX(3); dcLabel.on.setX(3);
itemPos.dcLabel.on.setY(100); dcLabel.on.setY(100);
itemPos.dcLabel.off.setX(-10); dcLabel.off.setX(-10);
itemPos.dcLabel.off.setY(100); dcLabel.off.setY(100);
itemPos.tankBar.on.setX(0); tankBar.on.setX(0);
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
itemPos.tankBar.on.setY(91.95); tankBar.on.setY(91.95);
#else #else
itemPos.tankBar.on.setY(86.4); tankBar.on.setY(86.4);
#endif #endif
} }

1
profile-widget/profilewidget2.h
View file

@ -159,7 +159,6 @@ private:
void scrollViewTo(const QPoint &pos); void scrollViewTo(const QPoint &pos);
void setupSceneAndFlags(); void setupSceneAndFlags();
template<typename T, class... Args> T *createItem(const DiveCartesianAxis &vAxis, int vColumn, int z, Args&&... args); template<typename T, class... Args> T *createItem(const DiveCartesianAxis &vAxis, int vColumn, int z, Args&&... args);
void setupItemSizes();
void addItemsToScene(); void addItemsToScene();
void setupItemOnScene(); void setupItemOnScene();
void disconnectTemporaryConnections(); void disconnectTemporaryConnections();