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

qt-models: add suffix Display to unit system aware asc/desc setters

Browse source 
Change ascent/descent setter function names to set_<name>Display
to show the value is prepared for displaying (common for desktop and QML).

Signed-off-by: jan Iversen <jan@casacondor.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
jan Iversen 2020-01-20 10:48:31 +01:00 • committed by Dirk Hohndel
parent b1751ac0c6
commit d924afdf52
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
desktop-widgets/diveplanner.cpp
View file

@ -467,11 +467,11 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f)
connect(ui.display_transitions, &QAbstractButton::toggled, plannerShared::instance(), &plannerShared::set_display_transitions); connect(ui.display_transitions, &QAbstractButton::toggled, plannerShared::instance(), &plannerShared::set_display_transitions);
connect(ui.safetystop, &QAbstractButton::toggled, plannerShared::instance(), &plannerShared::set_safetystop); connect(ui.safetystop, &QAbstractButton::toggled, plannerShared::instance(), &plannerShared::set_safetystop);
connect(ui.reserve_gas, QOverload<int>::of(&QSpinBox::valueChanged), plannerShared::instance(), &plannerShared::set_reserve_gas); connect(ui.reserve_gas, QOverload<int>::of(&QSpinBox::valueChanged), plannerShared::instance(), &plannerShared::set_reserve_gas);
connect(ui.ascRate75, QOverload<int>::of(&QSpinBox::valueChanged), plannerModel, &DivePlannerPointsModel::setAscrate75); connect(ui.ascRate75, QOverload<int>::of(&QSpinBox::valueChanged), plannerModel, &DivePlannerPointsModel::setAscrate75Display);
connect(ui.ascRate50, QOverload<int>::of(&QSpinBox::valueChanged), plannerModel, &DivePlannerPointsModel::setAscrate50); connect(ui.ascRate50, QOverload<int>::of(&QSpinBox::valueChanged), plannerModel, &DivePlannerPointsModel::setAscrate50Display);
connect(ui.ascRateStops, QOverload<int>::of(&QSpinBox::valueChanged), plannerModel, &DivePlannerPointsModel::setAscratestops); connect(ui.ascRateStops, QOverload<int>::of(&QSpinBox::valueChanged), plannerModel, &DivePlannerPointsModel::setAscratestopsDisplay);
connect(ui.ascRateLast6m, QOverload<int>::of(&QSpinBox::valueChanged), plannerModel, &DivePlannerPointsModel::setAscratelast6m); connect(ui.ascRateLast6m, QOverload<int>::of(&QSpinBox::valueChanged), plannerModel, &DivePlannerPointsModel::setAscratelast6mDisplay);
connect(ui.descRate, QOverload<int>::of(&QSpinBox::valueChanged), plannerModel, &DivePlannerPointsModel::setDescrate); connect(ui.descRate, QOverload<int>::of(&QSpinBox::valueChanged), plannerModel, &DivePlannerPointsModel::setDescrateDisplay);
connect(ui.drop_stone_mode, &QAbstractButton::toggled, plannerShared::instance(), &plannerShared::set_drop_stone_mode); connect(ui.drop_stone_mode, &QAbstractButton::toggled, plannerShared::instance(), &plannerShared::set_drop_stone_mode);
connect(ui.gfhigh, QOverload<int>::of(&QSpinBox::valueChanged), plannerShared::instance(), &plannerShared::set_gfhigh); connect(ui.gfhigh, QOverload<int>::of(&QSpinBox::valueChanged), plannerShared::instance(), &plannerShared::set_gfhigh);
connect(ui.gflow, QOverload<int>::of(&QSpinBox::valueChanged), plannerShared::instance(), &plannerShared::set_gflow); connect(ui.gflow, QOverload<int>::of(&QSpinBox::valueChanged), plannerShared::instance(), &plannerShared::set_gflow);

10
qt-models/diveplannermodel.cpp
View file

@ -515,7 +515,7 @@ void DivePlannerPointsModel::setLastStop6m(bool value)
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setAscrate75(int rate) void DivePlannerPointsModel::setAscrate75Display(int rate)
{ {
qPrefDivePlanner::set_ascrate75(lrint(rate * UNIT_FACTOR)); qPrefDivePlanner::set_ascrate75(lrint(rate * UNIT_FACTOR));
emitDataChanged(); emitDataChanged();
@ -525,7 +525,7 @@ int DivePlannerPointsModel::ascrate75Display()
return lrint((float)prefs.ascrate75 / UNIT_FACTOR); return lrint((float)prefs.ascrate75 / UNIT_FACTOR);
} }
void DivePlannerPointsModel::setAscrate50(int rate) void DivePlannerPointsModel::setAscrate50Display(int rate)
{ {
qPrefDivePlanner::set_ascrate50(lrint(rate * UNIT_FACTOR)); qPrefDivePlanner::set_ascrate50(lrint(rate * UNIT_FACTOR));
emitDataChanged(); emitDataChanged();
@ -535,7 +535,7 @@ int DivePlannerPointsModel::ascrate50Display()
return lrint((float)prefs.ascrate50 / UNIT_FACTOR); return lrint((float)prefs.ascrate50 / UNIT_FACTOR);
} }
void DivePlannerPointsModel::setAscratestops(int rate) void DivePlannerPointsModel::setAscratestopsDisplay(int rate)
{ {
qPrefDivePlanner::set_ascratestops(lrint(rate * UNIT_FACTOR)); qPrefDivePlanner::set_ascratestops(lrint(rate * UNIT_FACTOR));
emitDataChanged(); emitDataChanged();
@ -545,7 +545,7 @@ int DivePlannerPointsModel::ascratestopsDisplay()
return lrint((float)prefs.ascratestops / UNIT_FACTOR); return lrint((float)prefs.ascratestops / UNIT_FACTOR);
} }
void DivePlannerPointsModel::setAscratelast6m(int rate) void DivePlannerPointsModel::setAscratelast6mDisplay(int rate)
{ {
qPrefDivePlanner::set_ascratelast6m(lrint(rate * UNIT_FACTOR)); qPrefDivePlanner::set_ascratelast6m(lrint(rate * UNIT_FACTOR));
emitDataChanged(); emitDataChanged();
@ -555,7 +555,7 @@ int DivePlannerPointsModel::ascratelast6mDisplay()
return lrint((float)prefs.ascratelast6m / UNIT_FACTOR); return lrint((float)prefs.ascratelast6m / UNIT_FACTOR);
} }
void DivePlannerPointsModel::setDescrate(int rate) void DivePlannerPointsModel::setDescrateDisplay(int rate)
{ {
qPrefDivePlanner::set_descrate(lrint(rate * UNIT_FACTOR)); qPrefDivePlanner::set_descrate(lrint(rate * UNIT_FACTOR));
emitDataChanged(); emitDataChanged();

10
qt-models/diveplannermodel.h
View file

@ -104,11 +104,11 @@ slots:
void setSurfaceSegment(int duration); void setSurfaceSegment(int duration);
void setSacFactor(double factor); void setSacFactor(double factor);
void setProblemSolvingTime(int minutes); void setProblemSolvingTime(int minutes);
void setAscrate75(int rate); void setAscrate75Display(int rate);
void setAscrate50(int rate); void setAscrate50Display(int rate);
void setAscratestops(int rate); void setAscratestopsDisplay(int rate);
void setAscratelast6m(int rate); void setAscratelast6mDisplay(int rate);
void setDescrate(int rate); void setDescrateDisplay(int rate);
signals: signals:
void planCreated(); void planCreated();