From eb08ec972dc134d3f926e14fda024f9405e71692 Mon Sep 17 00:00:00 2001 From: Stefan Fuchs Date: Sat, 3 Mar 2018 14:29:51 +0100 Subject: Configure DC dialog: Change order of DCs and correct names In the configure dive computer dialog change the order of the DCs (all HW first, then Suunto) and correct the names of some HW DCs (make them the same as in the "download from DC selection list"). Plus added the OSTC Plus to the list of supported DC. Signed-off-by: Stefan Fuchs --- desktop-widgets/configuredivecomputerdialog.cpp | 32 +- desktop-widgets/configuredivecomputerdialog.ui | 2506 +++++++++++------------ 2 files changed, 1269 insertions(+), 1269 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp index 970ffb96e..138f9763a 100644 --- a/desktop-widgets/configuredivecomputerdialog.cpp +++ b/desktop-widgets/configuredivecomputerdialog.cpp @@ -417,16 +417,16 @@ void ConfigureDiveComputerDialog::populateDeviceDetails() { switch (ui.dcStackedWidget->currentIndex()) { case 0: - populateDeviceDetailsOSTC3(); + populateDeviceDetailsOSTC(); break; case 1: - populateDeviceDetailsSuuntoVyper(); + populateDeviceDetailsOSTC3(); break; case 2: - populateDeviceDetailsOSTC(); + populateDeviceDetailsOSTC4(); break; case 3: - populateDeviceDetailsOSTC4(); + populateDeviceDetailsSuuntoVyper(); break; } } @@ -954,16 +954,16 @@ void ConfigureDiveComputerDialog::reloadValues() switch (ui.dcStackedWidget->currentIndex()) { case 0: - reloadValuesOSTC3(); + reloadValuesOSTC(); break; case 1: - reloadValuesSuuntoVyper(); + reloadValuesOSTC3(); break; case 2: - reloadValuesOSTC(); + reloadValuesOSTC4(); break; case 3: - reloadValuesOSTC4(); + reloadValuesSuuntoVyper(); break; } } @@ -1431,23 +1431,23 @@ void ConfigureDiveComputerDialog::on_DiveComputerList_currentRowChanged(int curr switch (currentRow) { case 0: selected_vendor = "Heinrichs Weikamp"; - selected_product = "OSTC 3"; + selected_product = "OSTC 2N"; fw_upgrade_possible = true; break; case 1: - selected_vendor = "Suunto"; - selected_product = "Vyper"; - fw_upgrade_possible = false; - break; - case 2: selected_vendor = "Heinrichs Weikamp"; - selected_product = "OSTC 2N"; + selected_product = "OSTC 3"; fw_upgrade_possible = true; break; - case 3: + case 2: selected_vendor = "Heinrichs Weikamp"; selected_product = "OSTC 4"; fw_upgrade_possible = true; + break; + case 3: + selected_vendor = "Suunto"; + selected_product = "Vyper"; + fw_upgrade_possible = false; default: /* Not Supported */ return; diff --git a/desktop-widgets/configuredivecomputerdialog.ui b/desktop-widgets/configuredivecomputerdialog.ui index e765c2e5c..e8cc84efd 100644 --- a/desktop-widgets/configuredivecomputerdialog.ui +++ b/desktop-widgets/configuredivecomputerdialog.ui @@ -211,38 +211,38 @@ - OSTC 3,Sport,Cr,2 + OSTC Mk2/2N/2C - :dc-ostc-3-icon:dc-ostc-3-icon + :dc-ostc-2n-icon:dc-ostc-2n-icon - Suunto Vyper family + OSTC 2/3/Sport/Plus/cR - :dc-suunto-vyper-icon:dc-suunto-vyper-icon + :dc-ostc-3-icon:dc-ostc-3-icon - OSTC, Mk.2/2N/2C + OSTC 4 - :dc-ostc-2n-icon:dc-ostc-2n-icon + :dc-ostc-4-icon:dc-ostc-4-icon - OSTC 4 + Suunto Vyper family - :dc-ostc-4-icon:dc-ostc-4-icon + :dc-suunto-vyper-icon:dc-suunto-vyper-icon @@ -250,97 +250,44 @@ 0 - - + + - + 0 - + Basic settings - - - - - - Eco - - - - - Medium - - - - - High - - - - - - - - % + + + + + Serial No. - - 5 + + serialNoLineEdit - - - - - English - - - - - German - - - - - French - - - - - Italian - - - - - - - - - m/°C - - - - - ft/°F - - - - - + - Serial No. + Length - - serialNoLineEdit + + + + + + true - - + + 1 @@ -352,327 +299,187 @@ - + Firmware version - firmwareVersionLineEdit - - - - - - - - MMDDYY - - - - - DDMMYY - - - - - YYMMDD - - - - - - - - true + firmwareVersionLineEdit_3 - + - Language + Custom text - languageComboBox + customTextLlineEdit_3 - - - - Date format + + + + + 1 + 0 + - - dateFormatComboBox + + 23 - + - Brightness - - - brightnessComboBox + Number of dives - - + + - Units + Show safety stop - - unitsComboBox + + + + + + true - + - Salinity (0-5%) + Sampling rate - salinitySpinBox + samplingRateComboBox - - - - false + + + + + 0 + 0 + - - Reset device to default settings + + 1 + + + 120 + + + 10 - - - - - 1 - 0 - + + + + Date format + + dateFormatComboBox + + + + + - 230LSB/Gauss - - - - - 330LSB/Gauss - - - - - 390LSB/Gauss - - - - - 440LSB/Gauss - - - - - 660LSB/Gauss - - - - - 820LSB/Gauss + MM/DD/YY - 1090LSB/Gauss + DD/MM/YY - 1370LSB/Gauss + YY/MM/DD - - - - Qt::Vertical - - - - 20 - 177 - - - - - - - - - 1 - 0 - - - - 60 + + + + Sync dive computer time with PC - + - Compass gain + Salinity - compassGainComboBox + salinitySpinBox - - - - Computer model + + + + kg/ℓ - - - - - - Custom text + + 1.000000000000000 - - customTextLlineEdit + + 1.040000000000000 - - - - - - true + + 0.010000000000000 - - - - - OC - - - - - CC - - - - - Gauge - - - - - Apnea - - - - - - - - Dive mode + + + + Qt::Vertical - - diveModeComboBox + + + 20 + 177 + - - - - - - - 2s - - - - - 10s - - - + - + - Sampling rate - - - samplingRateComboBox - - - - - - - - Standard - - - - - Red - - - - - Green - - - - - Blue - - - - - - - - Sync dive computer time with PC + Start Depth - + - Dive mode color - - - diveModeColour - - - - - - - Show safety stop + End Depth - + - End Depth + Reset Depth - - + + false @@ -680,39 +487,18 @@ s - 60 + 10 - 240 + 250 180 - - - - Length - - - - - - - Start Depth - - - - - - - Reset Depth - - - - - + + false @@ -723,10 +509,10 @@ 1 - 2.100000000000000 + 3.000000000000000 - 6.100000000000000 + 6.500000000000000 0.100000000000000 @@ -736,8 +522,8 @@ - - + + false @@ -748,18 +534,18 @@ 1 - 1.900000000000000 + 2.500000000000000 - 3.000000000000000 + 5.000000000000000 2.900000000000000 - - + + false @@ -770,10 +556,10 @@ 1 - 8.100000000000000 + 7.500000000000000 - 15.100000000000000 + 20.100000000000001 10.100000000000000 @@ -782,29 +568,25 @@ - + Advanced settings - - - + + + - Left button sensitivity + Alt GF can be selected underwater - - + + - Always show pO₂ + Desaturation - - - - - - Alt GF can be selected underwater + + desaturationSpinBox @@ -815,73 +597,10 @@ - - - - Pressure sensor offset - - - - - - - GFLow - - - - - - - % - - - 10 - - - 100 - - - 30 - - - - - - - GFHigh - - - - - - - % - - - 60 - - - 110 - - - 85 - - - - - - - Desaturation - - - desaturationSpinBox - - - - - - - % + + + + % 60 @@ -894,7 +613,7 @@ - + Qt::Vertical @@ -908,7 +627,7 @@ - + m @@ -927,42 +646,10 @@ - - - - false - - - % - - - 60 - - - 100 - - - 60 - - - - - - - mbar - - - -20 - - - 20 - - - - + - 1 + 4 @@ -971,13 +658,38 @@ - ZH-L16+GF + Gauge + + + + + ZH-L16 CC + + + + + Apnea + + + + + L16-GF OC + + + + + L16-GF CC + + + + + PSCR-GF - + min @@ -986,6 +698,25 @@ + + + + false + + + % + + + 5 + + + 255 + + + 30 + + + @@ -996,8 +727,8 @@ - - + + % @@ -1020,7 +751,7 @@ - + false @@ -1028,13 +759,13 @@ % - 70 + 5 - 120 + 255 - 85 + 90 @@ -1045,7 +776,7 @@ - + Saturation @@ -1055,89 +786,61 @@ - - - - Flip screen - - - - + - Right button sensitivity + GFHigh - - - - MOD warning + + + + % - - - - - - Graphical speed indicator + + 10 - - - - - - Dynamic ascent rate + + 100 - - - - - - Bottom gas consumption + + 30 - + - Deco gas consumption + GFLow - - + + % - 20 + 60 - 100 + 110 - 40 + 85 - - - - % - - - 20 - - - 100 - - - 40 + + + + Graphical speed indicator - + ℓ/min @@ -1152,8 +855,8 @@ - - + + ℓ/min @@ -1168,41 +871,29 @@ - + - Temperature sensor offset + Bottom gas consumption - - - - °C - - - 1 - - - -2.000000000000000 - - - 2.000000000000000 - - - 0.100000000000000 + + + + Deco gas consumption - + Gas settings - + - + 0 @@ -1287,7 +978,7 @@ - + 0 @@ -1371,8 +1062,8 @@ - - + + 0 @@ -1394,16 +1085,6 @@ - - - - - - - - - - @@ -1434,66 +1115,9 @@ SP 3 - - - SP 4 - - - - - SP 5 - - - - - - - - O₂ in calibration gas - - - - - - - % - - - 21 - - - 100 - - - 21 - - - - - - - - Fixed setpoint - - - - - Sensor - - - - - - - - Setpoint fallback - - - true - - + Qt::Vertical @@ -1506,8 +1130,8 @@ - - + + cbar @@ -1515,15 +1139,15 @@ 120 - 160 + 180 160 - - + + cbar @@ -1531,21 +1155,21 @@ 16 - 19 + 21 19 - + pO₂ max - + pO₂ min @@ -1558,119 +1182,97 @@ - - + + - + 0 - + Basic settings - - - - - - 1 - 0 - - - - true - - - 200.000000000000000 - - - - - - - Safety level - - - - - + + + - A0 (0m - 300m) + Eco - A1 (300m - 1500m) + Medium - A2 (1500m - 3000m) + High - - - - Altitude range + + + + % - - - - - - Model + + 5 - - - - - 1 - 0 - - - - 30 - + + + + + English + + + + + German + + + + + French + + + + + Italian + + - - - - Number of dives - + + + + + m/°C + + + + + ft/°F + + - - - - Qt::Vertical - - - - 0 - 0 - - - - Serial No. - serialNoLineEdit_1 + serialNoLineEdit - + 1 @@ -1688,447 +1290,543 @@ Firmware version - firmwareVersionLineEdit_1 - - - - - - - true - - - - - - - Max. depth + firmwareVersionLineEdit - - - - true + + + + + MMDDYY + + + + + DDMMYY + + + + + YYMMDD + + + + + + + + true - - 5000 + + + + + + Language + + + languageComboBox - + - Custom text + Date format - customTextLlineEdit_1 + dateFormatComboBox - - - - - Air - - - - - Nitrox - - + + + + Brightness + + + brightnessComboBox + + + + + + + Units + + + unitsComboBox + + + + + + + Salinity (0-5%) + + + salinitySpinBox + + + + + + + false + + + Reset device to default settings + + + + + + + + 1 + 0 + + - Gauge + 230LSB/Gauss - - - - - P0 (none) + 330LSB/Gauss - P1 (medium) + 390LSB/Gauss - P2 (high) + 440LSB/Gauss - - - - - - Sample rate - - - - - - 10s + 660LSB/Gauss - 20s + 820LSB/Gauss - 30s + 1090LSB/Gauss - 60s + 1370LSB/Gauss - + + + + Qt::Vertical + + + + 20 + 177 + + + + + + + + + 1 + 0 + + + + 60 + + + + - Total dive time + Compass gain + + + compassGainComboBox - + Computer model - - - - true + + + + Custom text + + + customTextLlineEdit - - + + true - - min - - - 0 - - - 5000000 - - - + + - 24h + OC - 12h + CC + + + + + Gauge + + + + + Apnea - + - Time format + Dive mode - - - - - - Units + + diveModeComboBox - - + + - Imperial + 2s - Metric + 10s - - - - false - - - s - - - - - + + - Light - - - - - - - false + Sampling rate - - 200.000000000000000 + + samplingRateComboBox - - + + + + + Standard + + + + + Red + + + + + Green + + + + + Blue + + + + + + - Depth alarm + Sync dive computer time with PC - - + + + + Dive mode color + + + diveModeColour + + + + + + + Show safety stop + + + + + + + End Depth + + + + + false - min + s + + + 60 - 999 + 240 + + + 180 - - + + - Time alarm + Length - - - - - - - - - - - - 0 - - - - Basic settings - - - + - Serial No. - - - serialNoLineEdit + Start Depth - + - Length + Reset Depth - - - - true + + + + false + + + m + + + 1 + + + 2.100000000000000 + + + 6.100000000000000 + + + 0.100000000000000 + + + 5.100000000000000 - - - - - 1 - 0 - + + + + false - - true + + m + + + 1 + + + 1.900000000000000 + + + 3.000000000000000 + + + 2.900000000000000 - - - - Firmware version + + + + false - - firmwareVersionLineEdit_3 + + m + + + 1 + + + 8.100000000000000 + + + 15.100000000000000 + + + 10.100000000000000 - + + + + + Advanced settings + + + - Custom text - - - customTextLlineEdit_3 + Left button sensitivity - - - - - 1 - 0 - - - - 23 + + + + Always show pO₂ - - + + - Number of dives + Alt GF can be selected underwater - - + + - Show safety stop + Future TTS - - - - true + + + + Pressure sensor offset - + - Sampling rate - - - samplingRateComboBox + GFLow - - - - - 0 - 0 - + + + + % - 1 + 10 - 120 + 100 - 10 + 30 - + - Date format + GFHigh - - dateFormatComboBox - - - - - - - - MM/DD/YY - - - - - DD/MM/YY - - - - - YY/MM/DD - - - - - - Sync dive computer time with PC + + + + % + + + 60 + + + 110 + + + 85 - + - Salinity + Desaturation - salinitySpinBox + desaturationSpinBox - - + + - kg/ℓ + % - 1.000000000000000 + 60 - 1.040000000000000 + 100 - - 0.010000000000000 + + 90 - + Qt::Vertical @@ -2136,395 +1834,242 @@ 20 - 177 + 40 - - - - Start Depth + + + + m - - - - - - End Depth + + 3 + + + 6 - + - Reset Depth + Decotype - - + + false - s + % - 10 + 60 - 250 + 100 - 180 + 60 - - - - false - + + - m - - - 1 + mbar - 3.000000000000000 + -20 - 6.500000000000000 + 20 - - 0.100000000000000 + + + + + + 1 - - 5.100000000000000 + + + ZH-L16 + + + + + ZH-L16+GF + + + + + + + + min + + + 9 - - - - false + + + + Last deco - - m + + lastDecoSpinBox - - 1 + + + + + + % - 2.500000000000000 + 100 - 5.000000000000000 + 140 - 2.900000000000000 + 110 - - + + + + Alt GFLow + + + + + false - m - - - 1 + % - 7.500000000000000 + 70 - 20.100000000000001 + 120 - 10.100000000000000 + 85 - - - - - Advanced settings - - - - + + - Alt GF can be selected underwater + Alt GFHigh - + - Desaturation + Saturation - desaturationSpinBox + saturationSpinBox - - + + - Future TTS + Flip screen - - - - % + + + + Right button sensitivity - - 60 + + + + + + MOD warning - - 100 + + + + + + Graphical speed indicator - - 90 + + + + + + Dynamic ascent rate - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - m - - - 3 - - - 6 + + + + Bottom gas consumption - + - Decotype - - - - - - - 4 - - - - ZH-L16 - - - - - Gauge - - - - - ZH-L16 CC - - - - - Apnea - - - - - L16-GF OC - - - - - L16-GF CC - - - - - PSCR-GF - - - - - - - - min - - - 9 + Deco gas consumption - - - - false - + + % - 5 + 20 - 255 - - - 30 - - - - - - - Last deco - - - lastDecoSpinBox - - - - - - - % - - 100 - - 140 - - - 110 - - - - - - - Alt GFLow - - - - - - - false - - - % - - - 5 - - - 255 - - 90 - - - - - - - Alt GFHigh - - - - - - - Saturation - - - saturationSpinBox - - - - - - - GFHigh + 40 - - + + % - 10 + 20 100 - 30 - - - - - - - GFLow - - - - - - - % - - - 60 - - - 110 - - - 85 - - - - - - - Graphical speed indicator + 40 - + ℓ/min @@ -2539,8 +2084,8 @@ - - + + ℓ/min @@ -2555,29 +2100,41 @@ - + - Bottom gas consumption + Temperature sensor offset - - - - Deco gas consumption + + + + °C + + + 1 + + + -2.000000000000000 + + + 2.000000000000000 + + + 0.100000000000000 - + Gas settings - + - + 0 @@ -2662,7 +2219,7 @@ - + 0 @@ -2746,8 +2303,8 @@ - - + + 0 @@ -2769,6 +2326,16 @@ + + + + + + + + + + @@ -2799,11 +2366,68 @@ SP 3 - - - - - + + + SP 4 + + + + + SP 5 + + + + + + + + O₂ in calibration gas + + + + + + + % + + + 21 + + + 100 + + + 21 + + + + + + + + Fixed setpoint + + + + + Sensor + + + + + + + + Setpoint fallback + + + true + + + + + + Qt::Vertical @@ -2814,8 +2438,8 @@ - - + + cbar @@ -2823,15 +2447,15 @@ 120 - 180 + 160 160 - - + + cbar @@ -2839,21 +2463,21 @@ 16 - 21 + 19 19 - + pO₂ max - + pO₂ min @@ -3941,6 +3565,382 @@ + + + + + + 0 + + + + Basic settings + + + + + + + 1 + 0 + + + + true + + + 200.000000000000000 + + + + + + + Safety level + + + + + + + + A0 (0m - 300m) + + + + + A1 (300m - 1500m) + + + + + A2 (1500m - 3000m) + + + + + + + + Altitude range + + + + + + + Model + + + + + + + + 1 + 0 + + + + 30 + + + + + + + Number of dives + + + + + + + Qt::Vertical + + + + 0 + 0 + + + + + + + + Serial No. + + + serialNoLineEdit_1 + + + + + + + + 1 + 0 + + + + true + + + + + + + Firmware version + + + firmwareVersionLineEdit_1 + + + + + + + true + + + + + + + Max. depth + + + + + + + true + + + 5000 + + + + + + + Custom text + + + customTextLlineEdit_1 + + + + + + + + Air + + + + + Nitrox + + + + + Gauge + + + + + + + + + P0 (none) + + + + + P1 (medium) + + + + + P2 (high) + + + + + + + + Sample rate + + + + + + + + 10s + + + + + 20s + + + + + 30s + + + + + 60s + + + + + + + + Total dive time + + + + + + + Computer model + + + + + + + true + + + + + + + true + + + min + + + 0 + + + 5000000 + + + + + + + + 24h + + + + + 12h + + + + + + + + Time format + + + + + + + Units + + + + + + + + Imperial + + + + + Metric + + + + + + + + false + + + s + + + + + + + Light + + + + + + + false + + + 200.000000000000000 + + + + + + + Depth alarm + + + + + + + false + + + min + + + 999 + + + + + + + Time alarm + + + + + + + + + -- cgit v1.2.3-70-g09d2