diff options
author | Willem Ferguson <willemferguson@zoology.up.ac.za> | 2016-11-01 09:43:10 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2016-11-01 09:34:47 -0700 |
commit | 22c6568b4693ada89cd309ed6281d3def48cef48 (patch) | |
tree | c64b82f3bc748e551bdba8fa6e4e22e38e4546fb /desktop-widgets | |
parent | 654c15faa7ddfe775137f253adcd115557c5fdda (diff) | |
download | subsurface-22c6568b4693ada89cd309ed6281d3def48cef48.tar.gz |
Reorganise Preferences/Graph tab
1) Reorganise existing items in Graph tab so that all gass pressure
items are together and all profile-related items are together.
2) Provide units (mostly bar) for all settings having units.
Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'desktop-widgets')
-rw-r--r-- | desktop-widgets/preferences/preferences_graph.ui | 260 |
1 files changed, 160 insertions, 100 deletions
diff --git a/desktop-widgets/preferences/preferences_graph.ui b/desktop-widgets/preferences/preferences_graph.ui index f4a5f8f5f..1d12a8963 100644 --- a/desktop-widgets/preferences/preferences_graph.ui +++ b/desktop-widgets/preferences/preferences_graph.ui @@ -14,10 +14,10 @@ <string>Form</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> - <item> + <item> // Gas pressure options <widget class="QGroupBox" name="groupBox_4"> <property name="title"> - <string>Show</string> + <string>Gas pressure display setup</string> </property> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> @@ -38,6 +38,9 @@ <property name="singleStep"> <double>0.100000000000000</double> </property> + <property name="suffix"> + <string> bar</string> + </property> </widget> </item> <item row="1" column="0"> @@ -58,6 +61,9 @@ <property name="singleStep"> <double>0.100000000000000</double> </property> + <property name="suffix"> + <string> bar</string> + </property> </widget> </item> <item row="2" column="0"> @@ -78,6 +84,9 @@ <property name="singleStep"> <double>0.100000000000000</double> </property> + <property name="suffix"> + <string> bar</string> + </property> </widget> </item> <item row="3" column="0"> @@ -86,7 +95,7 @@ <bool>true</bool> </property> <property name="text"> - <string>Max pO₂ when showing MOD</string> + <string>pO₂ used for calculating MOD</string> </property> </widget> </item> @@ -98,74 +107,136 @@ <property name="singleStep"> <double>0.100000000000000</double> </property> + <property name="suffix"> + <string> bar</string> + </property> </widget> </item> - <item row="4" column="0" colspan="2"> - <widget class="QCheckBox" name="red_ceiling"> - <property name="enabled"> - <bool>true</bool> + <item row="4" column="0"> + <widget class="QLabel" name="label_26"> + <property name="text"> + <string>CCR options:</string> </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QLabel" name="label_26"> <property name="text"> - <string>Draw dive computer reported ceiling red</string> + <string>Default setpoint for dive planning</string> </property> </widget> </item> - <item row="5" column="0" colspan="2"> - <widget class="QCheckBox" name="display_unused_tanks"> + <item row="4" column="2"> + <widget class="QDoubleSpinBox" name="defaultSetpoint"> + <property name="suffix"> + <string> bar</string> + </property> + <property name="decimals"> + <number>2</number> + </property> + <property name="maximum"> + <double>10.000000000000000</double> + </property> + <property name="singleStep"> + <double>0.100000000000000</double> + </property> + </widget> + </item> + <item row="5" column="1" colspan="2"> // row was 8 + <widget class="QCheckBox" name="show_ccr_setpoint"> <property name="text"> - <string>Show unused cylinders in Equipment tab</string> + <string>Show setpoints when viewing pO₂</string> </property> </widget> </item> - <item row="6" column="0" colspan="2"> - <widget class="QCheckBox" name="show_average_depth"> + <item row="6" column="1" colspan="2"> // row was 9 + <widget class="QCheckBox" name="show_ccr_sensors"> <property name="text"> - <string>Show mean depth</string> + <string>Show individual O₂ sensor values when viewing pO₂</string> </property> </widget> </item> </layout> </widget> </item> - <item> + <item> // Ceiling options <widget class="QGroupBox" name="groupBox_5"> <property name="title"> - <string>Misc</string> + <string>Ceiling display setup</string> </property> <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0" colspan="2"> + <widget class="QCheckBox" name="red_ceiling"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="text"> + <string>Draw dive computer reported ceiling red</string> + </property> + </widget> + </item> <item row="1" column="0"> - <widget class="QLabel" name="label_19"> + <widget class="QLabel" name="label_18"> + <property name="enabled"> + <bool>true</bool> + </property> <property name="text"> - <string>GFLow</string> + <string>Algorithm for calculated ceiling:</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QRadioButton" name="vpmb"> + <property name="text"> + <string> VPM-B</string> </property> </widget> </item> <item row="2" column="1"> - <widget class="QSpinBox" name="gfhigh"> + <widget class="QLabel" name="label_21"> + <property name="text"> + <string>VPM-B Conservatism</string> + </property> + <property name="alignment" > + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QSpinBox" name="vpmb_conservatism"> + <property name="prefix"> + <string>+</string> + </property> <property name="minimum"> - <number>1</number> + <number>0</number> </property> <property name="maximum"> - <number>150</number> + <number>4</number> </property> </widget> </item> - <item row="8" column="0" colspan="2"> - <widget class="QCheckBox" name="show_ccr_setpoint"> + <item row="3" column="0"> + <widget class="QRadioButton" name="buehlmann"> <property name="text"> - <string>CCR: show setpoints when viewing pO₂</string> + <string> Bühlmann</string> + </property> + <property name="checked"> + <bool>true</bool> </property> </widget> </item> - <item row="7" column="0" colspan="2"> - <widget class="QCheckBox" name="gf_low_at_maxdepth"> + <item row="3" column="3"> + <widget class="QLabel" name="label_20"> <property name="text"> - <string>GFLow at max depth</string> + <string>GFHigh</string> + </property> + <property name="alignment" > + <set>Qt::AlignCenter</set> </property> </widget> </item> - <item row="1" column="1"> - <widget class="QSpinBox" name="gflow"> + <item row="3" column="4"> + <widget class="QSpinBox" name="gfhigh"> <property name="minimum"> <number>1</number> </property> @@ -174,111 +245,100 @@ </property> </widget> </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_20"> + <item row="3" column="1"> + <widget class="QLabel" name="label_19"> <property name="text"> - <string>GFHigh</string> + <string>GFLow</string> + </property> + <property name="alignment" > + <set>Qt::AlignCenter</set> </property> </widget> </item> - <item row="6" column="1"> - <widget class="QSpinBox" name="pscrfactor"> - <property name="suffix"> - <string/> + <item row="3" column="2"> + <widget class="QSpinBox" name="gflow"> + <property name="minimum"> + <number>1</number> </property> - <property name="prefix"> - <string>1:</string> + <property name="maximum"> + <number>150</number> </property> </widget> </item> - <item row="6" column="0"> - <widget class="QLabel" name="label_28"> + <item row="4" column="2" colspan="2"> + <widget class="QCheckBox" name="gf_low_at_maxdepth"> <property name="text"> - <string>pSCR ratio</string> + <string>GFLow at max depth</string> </property> </widget> </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_21"> + <item row="5" column="0"> + <widget class="QLabel" name="pSCR"> <property name="text"> - <string>VPM-B Conservatism</string> + <string>pSCR options:</string> </property> </widget> </item> - <item row="9" column="0" colspan="2"> - <widget class="QCheckBox" name="show_ccr_sensors"> + <item row="5" column="1"> + <widget class="QLabel" name="pSCR"> <property name="text"> - <string>CCR: show individual O₂ sensor values when viewing pO₂</string> + <string>Metabolic rate (ℓ O₂/min)</string> + </property> + <property name="alignment" > + <set>Qt::AlignCenter</set> </property> </widget> </item> - <item row="5" column="1"> + <item row="5" column="2"> <widget class="QDoubleSpinBox" name="psro2rate"> <property name="suffix"> - <string>ℓ/min</string> + <string> ℓ/min</string> </property> <property name="decimals"> <number>3</number> </property> </widget> </item> - <item row="4" column="0"> - <widget class="QLabel" name="label_26"> + <item row="5" column="3"> + <widget class="QLabel" name="label_28"> <property name="text"> - <string>Default CCR set-point for dive planning</string> - </property> - </widget> - </item> - <item row="4" column="1"> - <widget class="QDoubleSpinBox" name="defaultSetpoint"> - <property name="suffix"> - <string>bar</string> - </property> - <property name="decimals"> - <number>2</number> - </property> - <property name="maximum"> - <double>10.000000000000000</double> + <string>Dilution ratio</string> </property> - <property name="singleStep"> - <double>0.100000000000000</double> + <property name="alignment" > + <set>Qt::AlignCenter</set> </property> </widget> </item> - <item row="5" column="0"> - <widget class="QLabel" name="pSCR"> - <property name="text"> - <string>pSCR O₂ metabolism rate</string> + <item row="5" column="4"> + <widget class="QSpinBox" name="pscrfactor"> + <property name="suffix"> + <string/> </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QSpinBox" name="vpmb_conservatism"> <property name="prefix"> - <string>+</string> - </property> - <property name="minimum"> - <number>0</number> - </property> - <property name="maximum"> - <number>4</number> + <string>1:</string> </property> </widget> </item> - <item row="0" column="0"> - <widget class="QRadioButton" name="buehlmann"> + </layout> + </widget> + </item> + <item> // Misc group + <widget class="QGroupBox" name="groupBox_5"> + <property name="title"> + <string>Misc</string> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0" colspan="2"> + <widget class="QCheckBox" name="display_unused_tanks"> <property name="text"> - <string>Bühlmann</string> - </property> - <property name="checked"> - <bool>true</bool> + <string>Show unused cylinders in Equipment tab</string> </property> </widget> </item> - <item row="0" column="1"> - <widget class="QRadioButton" name="vpmb"> + <item row="1" column="0" colspan="2"> + <widget class="QCheckBox" name="show_average_depth"> <property name="text"> - <string>VPM-B</string> + <string>Show mean depth in Profile</string> </property> </widget> </item> @@ -305,20 +365,20 @@ <tabstop>pn2Threshold</tabstop> <tabstop>pheThreshold</tabstop> <tabstop>maxpo2</tabstop> + <tabstop>defaultSetpoint</tabstop> + <tabstop>show_ccr_setpoint</tabstop> + <tabstop>show_ccr_sensors</tabstop> <tabstop>red_ceiling</tabstop> - <tabstop>display_unused_tanks</tabstop> - <tabstop>show_average_depth</tabstop> - <tabstop>buehlmann</tabstop> <tabstop>vpmb</tabstop> + <tabstop>vpmb_conservatism</tabstop> + <tabstop>buehlmann</tabstop> <tabstop>gflow</tabstop> <tabstop>gfhigh</tabstop> - <tabstop>vpmb_conservatism</tabstop> - <tabstop>defaultSetpoint</tabstop> - <tabstop>psro2rate</tabstop> - <tabstop>pscrfactor</tabstop> <tabstop>gf_low_at_maxdepth</tabstop> - <tabstop>show_ccr_setpoint</tabstop> - <tabstop>show_ccr_sensors</tabstop> + <tabstop>pscrfactor</tabstop> + <tabstop>psro2rate</tabstop> + <tabstop>display_unused_tanks</tabstop> + <tabstop>show_average_depth</tabstop> </tabstops> <resources/> <connections/> |