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: turn static into member variable

Browse source 
When the settings change, the depth axis is redrawn
to reflect metric/imperial units. To check whether the
units changed, the old length unit is saved in a static
variable. This makes no sense and allows for only one
depth axis. Make this a normal member variable that is
initialized in the constructor.

Also remove the settingsChanged() call in the constructor,
since this is a no-op (the depth unit is unchanged).

Contains a whitespace fix.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-12-24 19:13:16 +01:00 • committed by Dirk Hohndel
parent 9c0b6436fd
commit e61466e178
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
profile-widget/divecartesianaxis.cpp
View file

@ -361,17 +361,16 @@ QColor DepthAxis::colorForValue(double) const
return QColor(Qt::red); return QColor(Qt::red);
} }
DepthAxis::DepthAxis(ProfileWidget2 *widget) : DiveCartesianAxis(widget) DepthAxis::DepthAxis(ProfileWidget2 *widget) : DiveCartesianAxis(widget),
unitSystem(prefs.units.length)
{ {
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &DepthAxis::settingsChanged); connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &DepthAxis::settingsChanged);
changed = true; changed = true;
settingsChanged();
} }
void DepthAxis::settingsChanged() void DepthAxis::settingsChanged()
{ {
static int unitSystem = prefs.units.length; if (unitSystem == prefs.units.length)
if ( unitSystem == prefs.units.length )
return; return;
changed = true; changed = true;
updateTicks(); updateTicks();

1
profile-widget/divecartesianaxis.h
View file

@ -84,6 +84,7 @@ public:
private: private:
QString textForValue(double value) const override; QString textForValue(double value) const override;
QColor colorForValue(double value) const override; QColor colorForValue(double value) const override;
int unitSystem;
private private
slots: slots:
void settingsChanged(); void settingsChanged();