mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
2d8e343221
This has become a bit of a catch-all overhaul of a large portion of the planner - I started out wanting to improve the CCR mode, but then as I started pulling all the other threads that needed addressing started to come with it. Improve how the gas selection is handled when planning dives in CCR mode, by making the type (OC / CCR) of segments dependent on the gas use type that was set for the selected gas. Add a preference to allow the user to chose to use OC gases as diluent, in a similar fashion to the original implementation. Hide gases that cannot be used in the currently selected dive mode in all drop downs. Include usage type in gas names if this is needed. Hide columns and disable elements in the 'Dive planner points' table if they can they can not be edited in the curently selected dive mode. Visually identify gases and usage types that are not appropriate for the currently selected dive mode. Move the 'Dive mode' selection to the top of the planner view, to accommodate the fact that this is a property of the dive and not a planner setting. Show a warning instead of the dive plan if the plan contains gases that are not usable in the selected dive mode. Fix the data entry for the setpoint in the 'Dive planner points' table. Fix problems with enabling / disabling planner settings when switching between dive modes. Refactor some names to make them more appropriate for their current usage. One point that is still open is to hide gas usage graphs in the planner profile if the gas isn't used for OC, as there is no way to meaningfully interpolate such usage. Signed-off-by: Michael Keller <github@ike.ch>
317 lines
9.2 KiB
XML
317 lines
9.2 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
||
<ui version="4.0">
|
||
<class>DivePlanner</class>
|
||
<widget class="QWidget" name="DivePlanner">
|
||
<property name="enabled">
|
||
<bool>true</bool>
|
||
</property>
|
||
<property name="geometry">
|
||
<rect>
|
||
<x>0</x>
|
||
<y>0</y>
|
||
<width>515</width>
|
||
<height>591</height>
|
||
</rect>
|
||
</property>
|
||
<layout class="QGridLayout" name="gridLayout">
|
||
<property name="leftMargin">
|
||
<number>5</number>
|
||
</property>
|
||
<property name="topMargin">
|
||
<number>5</number>
|
||
</property>
|
||
<property name="rightMargin">
|
||
<number>5</number>
|
||
</property>
|
||
<property name="bottomMargin">
|
||
<number>5</number>
|
||
</property>
|
||
<property name="spacing">
|
||
<number>0</number>
|
||
</property>
|
||
<item row="6" column="1">
|
||
<widget class="QScrollArea" name="scrollArea">
|
||
<property name="frameShape">
|
||
<enum>QFrame::NoFrame</enum>
|
||
</property>
|
||
<property name="frameShadow">
|
||
<enum>QFrame::Plain</enum>
|
||
</property>
|
||
<property name="widgetResizable">
|
||
<bool>true</bool>
|
||
</property>
|
||
<widget class="QWidget" name="scrollAreaWidgetContents">
|
||
<property name="geometry">
|
||
<rect>
|
||
<x>0</x>
|
||
<y>0</y>
|
||
<width>505</width>
|
||
<height>581</height>
|
||
</rect>
|
||
</property>
|
||
<layout class="QGridLayout" name="gridLayout_2">
|
||
<property name="leftMargin">
|
||
<number>0</number>
|
||
</property>
|
||
<property name="topMargin">
|
||
<number>0</number>
|
||
</property>
|
||
<property name="rightMargin">
|
||
<number>0</number>
|
||
</property>
|
||
<property name="bottomMargin">
|
||
<number>0</number>
|
||
</property>
|
||
<item row="0" column="0" colspan="2">
|
||
<widget class="QLabel" name="label">
|
||
<property name="sizePolicy">
|
||
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
|
||
<horstretch>0</horstretch>
|
||
<verstretch>0</verstretch>
|
||
</sizepolicy>
|
||
</property>
|
||
<property name="text">
|
||
<string>Planned dive time</string>
|
||
</property>
|
||
</widget>
|
||
</item>
|
||
<item row="1" column="0">
|
||
<widget class="QDateEdit" name="dateEdit">
|
||
<property name="sizePolicy">
|
||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||
<horstretch>0</horstretch>
|
||
<verstretch>0</verstretch>
|
||
</sizepolicy>
|
||
</property>
|
||
<property name="calendarPopup">
|
||
<bool>true</bool>
|
||
</property>
|
||
</widget>
|
||
</item>
|
||
<item row="1" column="1">
|
||
<widget class="QTimeEdit" name="startTime">
|
||
<property name="sizePolicy">
|
||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||
<horstretch>0</horstretch>
|
||
<verstretch>0</verstretch>
|
||
</sizepolicy>
|
||
</property>
|
||
</widget>
|
||
</item>
|
||
<item row="0" column="2">
|
||
<widget class="QLabel" name="label_4">
|
||
<property name="sizePolicy">
|
||
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
|
||
<horstretch>0</horstretch>
|
||
<verstretch>0</verstretch>
|
||
</sizepolicy>
|
||
</property>
|
||
<property name="text">
|
||
<string>Dive mode</string>
|
||
</property>
|
||
</widget>
|
||
</item>
|
||
<item row="1" column="2">
|
||
<widget class="QComboBox" name="divemode">
|
||
<property name="currentText">
|
||
<string/>
|
||
</property>
|
||
<property name="maxVisibleItems">
|
||
<number>6</number>
|
||
</property>
|
||
</widget>
|
||
</item>
|
||
<item row="1" column="3" colspan="2">
|
||
<widget class="QDialogButtonBox" name="buttonBox">
|
||
<property name="sizePolicy">
|
||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||
<horstretch>0</horstretch>
|
||
<verstretch>0</verstretch>
|
||
</sizepolicy>
|
||
</property>
|
||
<property name="standardButtons">
|
||
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
|
||
</property>
|
||
</widget>
|
||
</item>
|
||
<item row="2" column="0">
|
||
<widget class="QLabel" name="label_2">
|
||
<property name="text">
|
||
<string>ATM pressure</string>
|
||
</property>
|
||
</widget>
|
||
</item>
|
||
<item row="2" column="1">
|
||
<widget class="QLabel" name="label_7">
|
||
<property name="text">
|
||
<string>Altitude</string>
|
||
</property>
|
||
</widget>
|
||
</item>
|
||
<item row="2" column="3">
|
||
<widget class="QLabel" name="label_3">
|
||
<property name="text">
|
||
<string>Water type</string>
|
||
</property>
|
||
</widget>
|
||
</item>
|
||
<item row="3" column="0">
|
||
<widget class="QSpinBox" name="ATMPressure">
|
||
<property name="sizePolicy">
|
||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||
<horstretch>0</horstretch>
|
||
<verstretch>0</verstretch>
|
||
</sizepolicy>
|
||
</property>
|
||
<property name="suffix">
|
||
<string>mbar</string>
|
||
</property>
|
||
<property name="minimum">
|
||
<number>689</number>
|
||
</property>
|
||
<property name="maximum">
|
||
<number>1100</number>
|
||
</property>
|
||
</widget>
|
||
</item>
|
||
<item row="3" column="1">
|
||
<widget class="QSpinBox" name="atmHeight">
|
||
<property name="sizePolicy">
|
||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||
<horstretch>0</horstretch>
|
||
<verstretch>0</verstretch>
|
||
</sizepolicy>
|
||
</property>
|
||
<property name="suffix">
|
||
<string>m</string>
|
||
</property>
|
||
<property name="minimum">
|
||
<number>-100</number>
|
||
</property>
|
||
<property name="maximum">
|
||
<number>3000</number>
|
||
</property>
|
||
<property name="singleStep">
|
||
<number>10</number>
|
||
</property>
|
||
</widget>
|
||
</item>
|
||
<item row="3" column="3">
|
||
<widget class="QComboBox" name="waterType">
|
||
<item>
|
||
<property name="text">
|
||
<string>Fresh water</string>
|
||
</property>
|
||
</item>
|
||
<item>
|
||
<property name="text">
|
||
<string>Sea water</string>
|
||
</property>
|
||
</item>
|
||
<item>
|
||
<property name="text">
|
||
<string>EN13319</string>
|
||
</property>
|
||
</item>
|
||
<item>
|
||
<property name="text">
|
||
<string>Custom</string>
|
||
</property>
|
||
</item>
|
||
</widget>
|
||
</item>
|
||
<item row="3" column="4">
|
||
<widget class="QDoubleSpinBox" name="customSalinity">
|
||
<property name="enabled">
|
||
<bool>false</bool>
|
||
</property>
|
||
<property name="sizePolicy">
|
||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||
<horstretch>0</horstretch>
|
||
<verstretch>0</verstretch>
|
||
</sizepolicy>
|
||
</property>
|
||
<property name="maximumSize">
|
||
<size>
|
||
<width>100</width>
|
||
<height>16777215</height>
|
||
</size>
|
||
</property>
|
||
<property name="toolTip">
|
||
<string extracomment="Custom water density"/>
|
||
</property>
|
||
<property name="suffix">
|
||
<string>kg/ℓ</string>
|
||
</property>
|
||
<property name="minimum">
|
||
<double>0.990000000000000</double>
|
||
</property>
|
||
<property name="maximum">
|
||
<double>1.300000000000000</double>
|
||
</property>
|
||
<property name="singleStep">
|
||
<double>0.010000000000000</double>
|
||
</property>
|
||
<property name="value">
|
||
<double>1.000000000000000</double>
|
||
</property>
|
||
<property name="decimals">
|
||
<double>3</double>
|
||
</property>
|
||
</widget>
|
||
</item>
|
||
<item row="4" column="0" colspan="5">
|
||
<widget class="TableView" name="cylinderTableWidget" native="true">
|
||
<property name="sizePolicy">
|
||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
|
||
<horstretch>0</horstretch>
|
||
<verstretch>0</verstretch>
|
||
</sizepolicy>
|
||
</property>
|
||
<property name="minimumSize">
|
||
<size>
|
||
<width>0</width>
|
||
<height>50</height>
|
||
</size>
|
||
</property>
|
||
</widget>
|
||
</item>
|
||
<item row="5" column="0" colspan="5">
|
||
<widget class="TableView" name="tableWidget" native="true">
|
||
<property name="sizePolicy">
|
||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
|
||
<horstretch>0</horstretch>
|
||
<verstretch>0</verstretch>
|
||
</sizepolicy>
|
||
</property>
|
||
<property name="minimumSize">
|
||
<size>
|
||
<width>0</width>
|
||
<height>50</height>
|
||
</size>
|
||
</property>
|
||
</widget>
|
||
</item>
|
||
</layout>
|
||
</widget>
|
||
</widget>
|
||
</item>
|
||
</layout>
|
||
</widget>
|
||
<customwidgets>
|
||
<customwidget>
|
||
<class>TableView</class>
|
||
<extends>QWidget</extends>
|
||
<header>desktop-widgets/tableview.h</header>
|
||
<container>1</container>
|
||
</customwidget>
|
||
</customwidgets>
|
||
<tabstops>
|
||
<tabstop>startTime</tabstop>
|
||
<tabstop>divemode</tabstop>
|
||
<tabstop>buttonBox</tabstop>
|
||
<tabstop>scrollArea</tabstop>
|
||
</tabstops>
|
||
<resources/>
|
||
<connections/>
|
||
</ui>
|