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: remove SettingsObjectWrapper and update qPref calls

Browse source 
remove use of SettingsObjectWrapper::
remove include of SettingsObjectWrapper.h
use qPrefFoo:: for setters and getters
replace prefs.foo with qPrefXYZ::foo() where feasible
(this expands to the same code, but gives us more control
over the variable).

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-08-15 11:52:05 +02:00 • committed by Dirk Hohndel
parent 6aee600aa7
commit 50c58b4065
1 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

47
qt-models/diveplannermodel.cpp
View file

@ -6,7 +6,7 @@
#include "qt-models/models.h" #include "qt-models/models.h"
#include "core/device.h" #include "core/device.h"
#include "core/qthelper.h" #include "core/qthelper.h"
#include "core/subsurface-qt/SettingsObjectWrapper.h" #include "core/settings/qPrefDivePlanner.h"
#include "core/gettextfromc.h" #include "core/gettextfromc.h"
#include <QApplication> #include <QApplication>
#include <QTextDocument> #include <QTextDocument>
@ -427,26 +427,26 @@ void DivePlannerPointsModel::emitDataChanged()
void DivePlannerPointsModel::setBottomSac(double sac) void DivePlannerPointsModel::setBottomSac(double sac)
{ {
diveplan.bottomsac = units_to_sac(sac); diveplan.bottomsac = units_to_sac(sac);
qPrefDivePlanner::instance()->set_bottomsac(diveplan.bottomsac); qPrefDivePlanner::set_bottomsac(diveplan.bottomsac);
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setDecoSac(double sac) void DivePlannerPointsModel::setDecoSac(double sac)
{ {
diveplan.decosac = units_to_sac(sac); diveplan.decosac = units_to_sac(sac);
qPrefDivePlanner::instance()->set_decosac(diveplan.decosac); qPrefDivePlanner::set_decosac(diveplan.decosac);
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setSacFactor(double factor) void DivePlannerPointsModel::setSacFactor(double factor)
{ {
qPrefDivePlanner::instance()->set_sacfactor((int) round(factor * 100)); qPrefDivePlanner::set_sacfactor((int) round(factor * 100));
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setProblemSolvingTime(int minutes) void DivePlannerPointsModel::setProblemSolvingTime(int minutes)
{ {
qPrefDivePlanner::instance()->set_problemsolvingtime(minutes); qPrefDivePlanner::set_problemsolvingtime(minutes);
emitDataChanged(); emitDataChanged();
} }
@ -504,96 +504,95 @@ int DivePlannerPointsModel::getSurfacePressure()
void DivePlannerPointsModel::setLastStop6m(bool value) void DivePlannerPointsModel::setLastStop6m(bool value)
{ {
qPrefDivePlanner::instance()->set_last_stop(value); qPrefDivePlanner::set_last_stop(value);
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setAscrate75(int rate) void DivePlannerPointsModel::setAscrate75(int rate)
{ {
qPrefDivePlanner::instance()->set_ascrate75(lrint(rate * UNIT_FACTOR)); qPrefDivePlanner::set_ascrate75(lrint(rate * UNIT_FACTOR));
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setAscrate50(int rate) void DivePlannerPointsModel::setAscrate50(int rate)
{ {
qPrefDivePlanner::instance()->set_ascrate50(lrint(rate * UNIT_FACTOR)); qPrefDivePlanner::set_ascrate50(lrint(rate * UNIT_FACTOR));
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setAscratestops(int rate) void DivePlannerPointsModel::setAscratestops(int rate)
{ {
qPrefDivePlanner::instance()->set_ascratestops(lrint(rate * UNIT_FACTOR)); qPrefDivePlanner::set_ascratestops(lrint(rate * UNIT_FACTOR));
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setAscratelast6m(int rate) void DivePlannerPointsModel::setAscratelast6m(int rate)
{ {
qPrefDivePlanner::instance()->set_ascratelast6m(lrint(rate * UNIT_FACTOR)); qPrefDivePlanner::set_ascratelast6m(lrint(rate * UNIT_FACTOR));
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setDescrate(int rate) void DivePlannerPointsModel::setDescrate(int rate)
{ {
qPrefDivePlanner::instance()->set_descrate(lrint(rate * UNIT_FACTOR)); qPrefDivePlanner::set_descrate(lrint(rate * UNIT_FACTOR));
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setVerbatim(bool value) void DivePlannerPointsModel::setVerbatim(bool value)
{ {
qPrefDivePlanner::instance()->set_verbatim_plan(value); qPrefDivePlanner::set_verbatim_plan(value);
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setDisplayRuntime(bool value) void DivePlannerPointsModel::setDisplayRuntime(bool value)
{ {
qPrefDivePlanner::instance()->set_display_runtime(value); qPrefDivePlanner::set_display_runtime(value);
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setDisplayDuration(bool value) void DivePlannerPointsModel::setDisplayDuration(bool value)
{ {
qPrefDivePlanner::instance()->set_display_duration(value); qPrefDivePlanner::set_display_duration(value);
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setDisplayTransitions(bool value) void DivePlannerPointsModel::setDisplayTransitions(bool value)
{ {
qPrefDivePlanner::instance()->set_display_transitions(value); qPrefDivePlanner::set_display_transitions(value);
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setDisplayVariations(bool value) void DivePlannerPointsModel::setDisplayVariations(bool value)
{ {
qPrefDivePlanner::instance()->set_display_variations(value); qPrefDivePlanner::set_display_variations(value);
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setDecoMode(int mode) void DivePlannerPointsModel::setDecoMode(int mode)
{ {
qPrefDivePlanner::instance()->set_planner_deco_mode(deco_mode(mode)); qPrefDivePlanner::set_planner_deco_mode(deco_mode(mode));
emit recreationChanged(mode == int(prefs.planner_deco_mode)); emit recreationChanged(mode == int(prefs.planner_deco_mode));
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setSafetyStop(bool value) void DivePlannerPointsModel::setSafetyStop(bool value)
{ {
qPrefDivePlanner::instance()->set_safetystop(value); qPrefDivePlanner::set_safetystop(value);
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setReserveGas(int reserve) void DivePlannerPointsModel::setReserveGas(int reserve)
{ {
auto planner = qPrefDivePlanner::instance();
if (prefs.units.pressure == units::BAR) if (prefs.units.pressure == units::BAR)
planner->set_reserve_gas(reserve * 1000); qPrefDivePlanner::set_reserve_gas(reserve * 1000);
else else
planner->set_reserve_gas(psi_to_mbar(reserve)); qPrefDivePlanner::set_reserve_gas(psi_to_mbar(reserve));
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setDropStoneMode(bool value) void DivePlannerPointsModel::setDropStoneMode(bool value)
{ {
qPrefDivePlanner::instance()->set_drop_stone_mode(value); qPrefDivePlanner::set_drop_stone_mode(value);
if (prefs.drop_stone_mode) { if (prefs.drop_stone_mode) {
/* Remove the first entry if we enable drop_stone_mode */ /* Remove the first entry if we enable drop_stone_mode */
if (rowCount() >= 2) { if (rowCount() >= 2) {
@ -615,13 +614,13 @@ void DivePlannerPointsModel::setDropStoneMode(bool value)
void DivePlannerPointsModel::setSwitchAtReqStop(bool value) void DivePlannerPointsModel::setSwitchAtReqStop(bool value)
{ {
qPrefDivePlanner::instance()->set_switch_at_req_stop(value); qPrefDivePlanner::set_switch_at_req_stop(value);
emitDataChanged(); emitDataChanged();
} }
void DivePlannerPointsModel::setMinSwitchDuration(int duration) void DivePlannerPointsModel::setMinSwitchDuration(int duration)
{ {
qPrefDivePlanner::instance()->set_min_switch_duration(duration * 60); qPrefDivePlanner::set_min_switch_duration(duration * 60);
emitDataChanged(); emitDataChanged();
} }