[PATCH 00/11] Use cylinder index in divedatapoint structure and best mix patches

Rick Walsh rickmwalsh at gmail.com
Wed Jul 6 05:40:27 PDT 2016


The first patch in this series changes the divedatapoint structure to include the cylinder index instead of the gasmix. This requires a number of changes, but simplifies the planner code overall and makes it easier to manage modifying multiple cylinders without model getting lost. The third patch takes advantage of this and fixes #970 (update cylinder deco MOD when the deco pO2 is changed).

The remaining patches are reworked from my previous series improving handling of "best mixes", taking into consideration feedback from Robert and Anton.

Cheers,

Rick


Rick Walsh (11):
  Have divedatapoint store cylinder id instead of gasmix
  Update TestPlan for divedatapoint storing cylinder id instead of
    gasmix
  Update gas deco MOD when deco pO2 is changed
  Add function to calculate gas maximum narcotic depth
  Add MOD and MND fields to cylindermodel
  Be more clear about deco MOD / switch depth and bottom MOD
  Validate O2 in best mix
  Planner: automate calculation of best mix for max depth
  Fixup: don't capitalise best_He
  Planner: update cylinder mixes and MND and MOD when prefs are changed
  Planner: update maxdepth and best mixes when profile changed by mouse

 core/dive.c                                  |   7 +-
 core/dive.h                                  |  21 ++++-
 core/planner.c                               |  94 ++++++++++---------
 core/planner.h                               |   1 +
 core/pref.h                                  |   2 +-
 core/qthelper.cpp                            |   5 +-
 core/qthelper.h                              |   2 +-
 core/subsurface-qt/SettingsObjectWrapper.cpp |   4 +-
 core/subsurfacestartup.c                     |   2 +-
 desktop-widgets/diveplanner.cpp              |  19 +++-
 desktop-widgets/modeldelegates.cpp           |   2 +-
 profile-widget/profilewidget2.cpp            |   2 +-
 qt-models/cylindermodel.cpp                  | 119 ++++++++++++++++++++----
 qt-models/cylindermodel.h                    |   4 +
 qt-models/diveplannermodel.cpp               | 134 ++++++++++-----------------
 qt-models/diveplannermodel.h                 |   7 +-
 terms                                        |   8 +-
 tests/testplan.cpp                           |  66 ++++++-------
 18 files changed, 295 insertions(+), 204 deletions(-)

-- 
2.7.4



More information about the subsurface mailing list