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

Report CNS in dive info tab

Browse source 
This adds a maxcnsText widget under infoTab and populates it.

Note that I manually edited maintab.ui to display CNS and OTU
next to each other and right after gas data.

Signed-off-by: Gaetan Bisson <bisson@archlinux.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Gaetan Bisson 2014-09-12 11:58:33 -10:00 • committed by Dirk Hohndel
parent 434e7a6a71
commit ae6b0468b1
2 changed files with 47 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt-ui/maintab.cpp
View file

@ -319,6 +319,7 @@ void MainTab::clearInfo()
{ {
ui.sacText->clear(); ui.sacText->clear();
ui.otuText->clear(); ui.otuText->clear();
ui.maxcnsText->clear();
ui.oxygenHeliumText->clear(); ui.oxygenHeliumText->clear();
ui.gasUsedText->clear(); ui.gasUsedText->clear();
ui.dateText->clear(); ui.dateText->clear();
@ -475,6 +476,7 @@ void MainTab::updateDiveInfo(bool clear)
} }
ui.maximumDepthText->setText(get_depth_string(displayed_dive.maxdepth, true)); ui.maximumDepthText->setText(get_depth_string(displayed_dive.maxdepth, true));
ui.averageDepthText->setText(get_depth_string(displayed_dive.meandepth, true)); ui.averageDepthText->setText(get_depth_string(displayed_dive.meandepth, true));
ui.maxcnsText->setText(QString("%1\%").arg(displayed_dive.maxcns));
ui.otuText->setText(QString("%1").arg(displayed_dive.otu)); ui.otuText->setText(QString("%1").arg(displayed_dive.otu));
ui.waterTemperatureText->setText(get_temperature_string(displayed_dive.watertemp, true)); ui.waterTemperatureText->setText(get_temperature_string(displayed_dive.watertemp, true));
ui.airTemperatureText->setText(get_temperature_string(displayed_dive.airtemp, true)); ui.airTemperatureText->setText(get_temperature_string(displayed_dive.airtemp, true));

71
qt-ui/maintab.ui
View file

@ -532,13 +532,13 @@
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QGroupBox" name="groupBox_6"> <widget class="QGroupBox" name="groupBox_15">
<property name="title"> <property name="title">
<string>Max. depth</string> <string>CNS</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_7"> <layout class="QHBoxLayout" name="horizontalLayout_14">
<item> <item>
<widget class="QLabel" name="maximumDepthText"> <widget class="QLabel" name="maxcnsText">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
@ -551,25 +551,6 @@
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QGroupBox" name="groupBox_7">
<property name="title">
<string>Avg. depth</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QLabel" name="averageDepthText">
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="2">
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="title"> <property name="title">
<string>OTU</string> <string>OTU</string>
@ -588,7 +569,45 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="2">
<widget class="QGroupBox" name="groupBox_6">
<property name="title">
<string>Max. depth</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QLabel" name="maximumDepthText">
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QGroupBox" name="groupBox_7">
<property name="title">
<string>Avg. depth</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QLabel" name="averageDepthText">
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="1">
<widget class="QGroupBox" name="groupBox_10"> <widget class="QGroupBox" name="groupBox_10">
<property name="title"> <property name="title">
<string>Air pressure</string> <string>Air pressure</string>
@ -607,7 +626,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="2">
<widget class="QGroupBox" name="groupBox_9"> <widget class="QGroupBox" name="groupBox_9">
<property name="title"> <property name="title">
<string>Air temp.</string> <string>Air temp.</string>
@ -626,7 +645,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="2"> <item row="4" column="0">
<widget class="QGroupBox" name="groupBox_8"> <widget class="QGroupBox" name="groupBox_8">
<property name="title"> <property name="title">
<string>Water temp.</string> <string>Water temp.</string>
@ -664,7 +683,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="4" column="1">
<widget class="QGroupBox" name="groupBox_1"> <widget class="QGroupBox" name="groupBox_1">
<property name="title"> <property name="title">
<string>Salinity</string> <string>Salinity</string>