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

Settings fixup: gflow and gfhigh are int

Browse source 
With the recent setting cleanup, gradient factors were set to bool, so were
saved as 1/1, rather than say 50/80. This commit fixes that.

Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Rick Walsh 2016-09-02 07:52:17 +10:00 • committed by Dirk Hohndel
parent d8a6b917a5
commit 7b3665827a
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/subsurface-qt/SettingsObjectWrapper.cpp
View file

@ -301,12 +301,12 @@ bool TechnicalDetailsSettings::calcndltts() const
return prefs.calcndltts; return prefs.calcndltts;
} }
bool TechnicalDetailsSettings::gflow() const int TechnicalDetailsSettings::gflow() const
{ {
return prefs.gflow; return prefs.gflow;
} }
bool TechnicalDetailsSettings::gfhigh() const int TechnicalDetailsSettings::gfhigh() const
{ {
return prefs.gfhigh; return prefs.gfhigh;
} }
@ -496,7 +496,7 @@ void TechnicalDetailsSettings::setCalcndltts(bool value)
emit calcndlttsChanged(value); emit calcndlttsChanged(value);
} }
void TechnicalDetailsSettings::setGflow(bool value) void TechnicalDetailsSettings::setGflow(int value)
{ {
if (value == prefs.gflow) if (value == prefs.gflow)
return; return;
@ -509,7 +509,7 @@ void TechnicalDetailsSettings::setGflow(bool value)
emit gflowChanged(value); emit gflowChanged(value);
} }
void TechnicalDetailsSettings::setGfhigh(bool value) void TechnicalDetailsSettings::setGfhigh(int value)
{ {
if (value == prefs.gfhigh) if (value == prefs.gfhigh)
return; return;

16
core/subsurface-qt/SettingsObjectWrapper.h
View file

@ -113,8 +113,8 @@ class TechnicalDetailsSettings : public QObject {
Q_PROPERTY(bool calcceiling3m READ calcceiling3m WRITE setCalcceiling3m NOTIFY calcceiling3mChanged) Q_PROPERTY(bool calcceiling3m READ calcceiling3m WRITE setCalcceiling3m NOTIFY calcceiling3mChanged)
Q_PROPERTY(bool calcalltissues READ calcalltissues WRITE setCalcalltissues NOTIFY calcalltissuesChanged) Q_PROPERTY(bool calcalltissues READ calcalltissues WRITE setCalcalltissues NOTIFY calcalltissuesChanged)
Q_PROPERTY(bool calcndltts READ calcndltts WRITE setCalcndltts NOTIFY calcndlttsChanged) Q_PROPERTY(bool calcndltts READ calcndltts WRITE setCalcndltts NOTIFY calcndlttsChanged)
Q_PROPERTY(bool gflow READ gflow WRITE setGflow NOTIFY gflowChanged) Q_PROPERTY(int gflow READ gflow WRITE setGflow NOTIFY gflowChanged)
Q_PROPERTY(bool gfhigh READ gfhigh WRITE setGfhigh NOTIFY gfhighChanged) Q_PROPERTY(int gfhigh READ gfhigh WRITE setGfhigh NOTIFY gfhighChanged)
Q_PROPERTY(bool hrgraph READ hrgraph WRITE setHRgraph NOTIFY hrgraphChanged) Q_PROPERTY(bool hrgraph READ hrgraph WRITE setHRgraph NOTIFY hrgraphChanged)
Q_PROPERTY(bool tankbar READ tankBar WRITE setTankBar NOTIFY tankBarChanged) Q_PROPERTY(bool tankbar READ tankBar WRITE setTankBar NOTIFY tankBarChanged)
Q_PROPERTY(bool percentagegraph READ percentageGraph WRITE setPercentageGraph NOTIFY percentageGraphChanged) Q_PROPERTY(bool percentagegraph READ percentageGraph WRITE setPercentageGraph NOTIFY percentageGraphChanged)
@ -139,8 +139,8 @@ public:
bool calcceiling3m() const; bool calcceiling3m() const;
bool calcalltissues() const; bool calcalltissues() const;
bool calcndltts() const; bool calcndltts() const;
bool gflow() const; int gflow() const;
bool gfhigh() const; int gfhigh() const;
bool hrgraph() const; bool hrgraph() const;
bool tankBar() const; bool tankBar() const;
bool percentageGraph() const; bool percentageGraph() const;
@ -164,8 +164,8 @@ public slots:
void setCalcceiling3m(bool value); void setCalcceiling3m(bool value);
void setCalcalltissues(bool value); void setCalcalltissues(bool value);
void setCalcndltts(bool value); void setCalcndltts(bool value);
void setGflow(bool value); void setGflow(int value);
void setGfhigh(bool value); void setGfhigh(int value);
void setHRgraph(bool value); void setHRgraph(bool value);
void setTankBar(bool value); void setTankBar(bool value);
void setPercentageGraph(bool value); void setPercentageGraph(bool value);
@ -189,8 +189,8 @@ signals:
void calcceiling3mChanged(bool value); void calcceiling3mChanged(bool value);
void calcalltissuesChanged(bool value); void calcalltissuesChanged(bool value);
void calcndlttsChanged(bool value); void calcndlttsChanged(bool value);
void gflowChanged(bool value); void gflowChanged(int value);
void gfhighChanged(bool value); void gfhighChanged(int value);
void hrgraphChanged(bool value); void hrgraphChanged(bool value);
void tankBarChanged(bool value); void tankBarChanged(bool value);
void percentageGraphChanged(bool value); void percentageGraphChanged(bool value);