mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Planner: GUI changes for improved clarity
Restructure planner GUI for improved clarity of how settings are related. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Joakim Bygdell
Dirk Hohndel
parent
097d65521a
commit
19648e28cc
1 changed files with 189 additions and 138 deletions
|
|
@ -104,15 +104,15 @@
|
||||||
<property name="horizontalSpacing">
|
<property name="horizontalSpacing">
|
||||||
<number>2</number>
|
<number>2</number>
|
||||||
</property>
|
</property>
|
||||||
<item row="0" column="0">
|
<item row="3" column="0">
|
||||||
<widget class="QLabel" name="label">
|
<widget class="QLabel" name="asc6toSurf">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>below 75% avg. depth</string>
|
<string>6m to surface</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="1">
|
<item row="3" column="1">
|
||||||
<widget class="QSpinBox" name="ascRate75">
|
<widget class="QSpinBox" name="ascRateLast6m">
|
||||||
<property name="suffix">
|
<property name="suffix">
|
||||||
<string>m/min</string>
|
<string>m/min</string>
|
||||||
</property>
|
</property>
|
||||||
|
|
@ -121,15 +121,8 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="0">
|
<item row="2" column="1">
|
||||||
<widget class="QLabel" name="label_2">
|
<widget class="QSpinBox" name="ascRateStops">
|
||||||
<property name="text">
|
|
||||||
<string>75% to 50% avg. depth</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1">
|
|
||||||
<widget class="QSpinBox" name="ascRate50">
|
|
||||||
<property name="suffix">
|
<property name="suffix">
|
||||||
<string>m/min</string>
|
<string>m/min</string>
|
||||||
</property>
|
</property>
|
||||||
|
|
@ -145,8 +138,8 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="1">
|
<item row="1" column="1">
|
||||||
<widget class="QSpinBox" name="ascRateStops">
|
<widget class="QSpinBox" name="ascRate50">
|
||||||
<property name="suffix">
|
<property name="suffix">
|
||||||
<string>m/min</string>
|
<string>m/min</string>
|
||||||
</property>
|
</property>
|
||||||
|
|
@ -155,20 +148,27 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="3" column="0">
|
<item row="0" column="1">
|
||||||
<widget class="QLabel" name="asc6toSurf">
|
<widget class="QSpinBox" name="ascRate75">
|
||||||
|
<property name="suffix">
|
||||||
|
<string>m/min</string>
|
||||||
|
</property>
|
||||||
|
<property name="minimum">
|
||||||
|
<number>1</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="label">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>6m to surface</string>
|
<string>below 75% avg. depth</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="3" column="1">
|
<item row="1" column="0">
|
||||||
<widget class="QSpinBox" name="ascRateLast6m">
|
<widget class="QLabel" name="label_2">
|
||||||
<property name="suffix">
|
<property name="text">
|
||||||
<string>m/min</string>
|
<string>75% to 50% avg. depth</string>
|
||||||
</property>
|
|
||||||
<property name="minimum">
|
|
||||||
<number>1</number>
|
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|
@ -274,71 +274,14 @@
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
<number>2</number>
|
<number>2</number>
|
||||||
</property>
|
</property>
|
||||||
<item row="6" column="1">
|
<item row="17" column="1">
|
||||||
<widget class="QLabel" name="label_16">
|
<widget class="QLabel" name="label_4">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>GF high</string>
|
<string>Min. switch duration</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="9" column="1" colspan="2">
|
<item row="19" column="1">
|
||||||
<widget class="QCheckBox" name="backgasBreaks">
|
|
||||||
<property name="text">
|
|
||||||
<string>Plan backgas breaks</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="6" column="2">
|
|
||||||
<widget class="QSpinBox" name="gfhigh">
|
|
||||||
<property name="suffix">
|
|
||||||
<string>%</string>
|
|
||||||
</property>
|
|
||||||
<property name="minimum">
|
|
||||||
<number>1</number>
|
|
||||||
</property>
|
|
||||||
<property name="maximum">
|
|
||||||
<number>150</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="8" column="1" colspan="2">
|
|
||||||
<widget class="QCheckBox" name="lastStop">
|
|
||||||
<property name="text">
|
|
||||||
<string>Last stop at 6m</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="12" column="1">
|
|
||||||
<widget class="QComboBox" name="rebreathermode">
|
|
||||||
<property name="currentText">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
<property name="maxVisibleItems">
|
|
||||||
<number>6</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="2">
|
|
||||||
<widget class="QSpinBox" name="gflow">
|
|
||||||
<property name="suffix">
|
|
||||||
<string>%</string>
|
|
||||||
</property>
|
|
||||||
<property name="minimum">
|
|
||||||
<number>1</number>
|
|
||||||
</property>
|
|
||||||
<property name="maximum">
|
|
||||||
<number>150</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="7" column="1" colspan="2">
|
|
||||||
<widget class="QCheckBox" name="drop_stone_mode">
|
|
||||||
<property name="text">
|
|
||||||
<string>Drop to first depth</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="13" column="1">
|
|
||||||
<spacer name="verticalSpacer_2">
|
<spacer name="verticalSpacer_2">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Vertical</enum>
|
<enum>Qt::Vertical</enum>
|
||||||
|
|
@ -351,10 +294,40 @@
|
||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item row="5" column="1">
|
<item row="18" column="1">
|
||||||
<widget class="QLabel" name="label_15">
|
<widget class="QComboBox" name="rebreathermode">
|
||||||
|
<property name="currentText">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="maxVisibleItems">
|
||||||
|
<number>6</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="8" column="2">
|
||||||
|
<widget class="QSpinBox" name="gflow">
|
||||||
|
<property name="suffix">
|
||||||
|
<string>%</string>
|
||||||
|
</property>
|
||||||
|
<property name="minimum">
|
||||||
|
<number>1</number>
|
||||||
|
</property>
|
||||||
|
<property name="maximum">
|
||||||
|
<number>150</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="13" column="1" colspan="2">
|
||||||
|
<widget class="QCheckBox" name="drop_stone_mode">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>GF low</string>
|
<string>Drop to first depth</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="14" column="1" colspan="2">
|
||||||
|
<widget class="QCheckBox" name="lastStop">
|
||||||
|
<property name="text">
|
||||||
|
<string>Last stop at 6m</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|
@ -365,7 +338,109 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="1">
|
<item row="8" column="1">
|
||||||
|
<widget class="QLabel" name="label_15">
|
||||||
|
<property name="text">
|
||||||
|
<string>GF low</string>
|
||||||
|
</property>
|
||||||
|
<property name="indent">
|
||||||
|
<number>26</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="15" column="1" colspan="2">
|
||||||
|
<widget class="QCheckBox" name="backgasBreaks">
|
||||||
|
<property name="text">
|
||||||
|
<string>Plan backgas breaks</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="9" column="1">
|
||||||
|
<widget class="QLabel" name="label_16">
|
||||||
|
<property name="text">
|
||||||
|
<string>GF high</string>
|
||||||
|
</property>
|
||||||
|
<property name="indent">
|
||||||
|
<number>25</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="9" column="2">
|
||||||
|
<widget class="QSpinBox" name="gfhigh">
|
||||||
|
<property name="suffix">
|
||||||
|
<string>%</string>
|
||||||
|
</property>
|
||||||
|
<property name="minimum">
|
||||||
|
<number>1</number>
|
||||||
|
</property>
|
||||||
|
<property name="maximum">
|
||||||
|
<number>150</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="16" column="1" colspan="2">
|
||||||
|
<widget class="QCheckBox" name="switch_at_req_stop">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Postpone gas change if a stop is not required</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Only switch at required stops</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="1">
|
||||||
|
<spacer name="verticalSpacer_6">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Vertical</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>20</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
<item row="12" column="1">
|
||||||
|
<spacer name="verticalSpacer_5">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Vertical</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>20</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
<item row="17" column="2">
|
||||||
|
<widget class="QSpinBox" name="min_switch_duration">
|
||||||
|
<property name="suffix">
|
||||||
|
<string>min</string>
|
||||||
|
</property>
|
||||||
|
<property name="prefix">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="minimum">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="maximum">
|
||||||
|
<number>9</number>
|
||||||
|
</property>
|
||||||
|
<property name="value">
|
||||||
|
<number>1</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="11" column="1">
|
||||||
|
<widget class="QRadioButton" name="vpmb_deco">
|
||||||
|
<property name="text">
|
||||||
|
<string>VPM-B deco</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="4" column="1">
|
||||||
<widget class="QRadioButton" name="buehlmann_deco">
|
<widget class="QRadioButton" name="buehlmann_deco">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Buehlmann deco</string>
|
<string>Buehlmann deco</string>
|
||||||
|
|
@ -375,31 +450,17 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="1">
|
<item row="1" column="1">
|
||||||
<widget class="QRadioButton" name="vpmb_deco">
|
|
||||||
<property name="text">
|
|
||||||
<string>VPM-B deco</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="1">
|
|
||||||
<widget class="QCheckBox" name="safetystop">
|
|
||||||
<property name="text">
|
|
||||||
<string>Safety stop</string>
|
|
||||||
</property>
|
|
||||||
<property name="tristate">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="1">
|
|
||||||
<widget class="QLabel" name="label_3">
|
<widget class="QLabel" name="label_3">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Reserve gas</string>
|
<string>Reserve gas</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="indent">
|
||||||
|
<number>26</number>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="4" column="2">
|
<item row="1" column="2">
|
||||||
<widget class="QSpinBox" name="reserve_gas">
|
<widget class="QSpinBox" name="reserve_gas">
|
||||||
<property name="suffix">
|
<property name="suffix">
|
||||||
<string>bar</string>
|
<string>bar</string>
|
||||||
|
|
@ -418,41 +479,31 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="10" column="1" colspan="2">
|
<item row="2" column="1" alignment="Qt::AlignHCenter">
|
||||||
<widget class="QCheckBox" name="switch_at_req_stop">
|
<widget class="QCheckBox" name="safetystop">
|
||||||
<property name="toolTip">
|
<property name="layoutDirection">
|
||||||
<string>Postpone gas change if a stop is not required</string>
|
<enum>Qt::LeftToRight</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Only switch at required stops</string>
|
<string>Safety stop</string>
|
||||||
|
</property>
|
||||||
|
<property name="tristate">
|
||||||
|
<bool>false</bool>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="11" column="1">
|
<item row="10" column="1">
|
||||||
<widget class="QLabel" name="label_4">
|
<spacer name="verticalSpacer_7">
|
||||||
<property name="text">
|
<property name="orientation">
|
||||||
<string>Min. switch duration</string>
|
<enum>Qt::Vertical</enum>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
<property name="sizeHint" stdset="0">
|
||||||
</item>
|
<size>
|
||||||
<item row="11" column="2">
|
<width>20</width>
|
||||||
<widget class="QSpinBox" name="min_switch_duration">
|
<height>20</height>
|
||||||
<property name="suffix">
|
</size>
|
||||||
<string>min</string>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="prefix">
|
</spacer>
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
<property name="minimum">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="maximum">
|
|
||||||
<number>9</number>
|
|
||||||
</property>
|
|
||||||
<property name="value">
|
|
||||||
<number>1</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue