diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2015-01-11 00:01:15 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-01-10 17:27:25 -0800 |
| commit | e219bc70f863eaaa9b81ba5abc240975a128c904 (patch) | |
| tree | 682d6d981929420bbabd0021e02db3006c72d96f /qt-ui/maintab.cpp | |
| parent | bfe05b43407c419a32548af20f40e2b9e3bca045 (diff) | |
| download | subsurface-e219bc70f863eaaa9b81ba5abc240975a128c904.tar.gz | |
Refactor dctype -> divemode
... and repair a failed rebase (sorry).
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/maintab.cpp')
| -rw-r--r-- | qt-ui/maintab.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 3e49086fd..d930cbff9 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -430,7 +430,7 @@ void MainTab::updateDiveInfo(bool clear) UPDATE_TEXT(displayed_dive, buddy); UPDATE_TEMP(displayed_dive, airtemp); UPDATE_TEMP(displayed_dive, watertemp); - ui.DiveType->setCurrentIndex(displayed_dive.dc.dctype); + ui.DiveType->setCurrentIndex(displayed_dive.dc.divemode); if (!clear) { updateGpsCoordinates(&displayed_dive); @@ -514,7 +514,7 @@ void MainTab::updateDiveInfo(bool clear) ui.otuText->setText(QString("%1").arg(displayed_dive.otu)); ui.waterTemperatureText->setText(get_temperature_string(displayed_dive.watertemp, true)); ui.airTemperatureText->setText(get_temperature_string(displayed_dive.airtemp, true)); - ui.DiveType->setCurrentIndex(current_dc->dctype); + ui.DiveType->setCurrentIndex(current_dc->divemode); volume_t gases[MAX_CYLINDERS] = {}; get_gas_used(&displayed_dive, gases); QString volumes; @@ -650,7 +650,7 @@ void MainTab::updateDiveInfo(bool clear) } editMode = NONE; ui.cylinders->view()->hideColumn(CylindersModel::DEPTH); - if (get_dive_dc(&displayed_dive, dc_number)->dctype == CCR) + if (get_dive_dc(&displayed_dive, dc_number)->divemode == CCR) ui.cylinders->view()->showColumn(CylindersModel::USE); else ui.cylinders->view()->hideColumn(CylindersModel::USE); @@ -772,8 +772,8 @@ void MainTab::acceptChanges() MODIFY_SELECTED_DIVES(EDIT_VALUE(visibility)); if (displayed_dive.airtemp.mkelvin != cd->airtemp.mkelvin) MODIFY_SELECTED_DIVES(EDIT_VALUE(airtemp.mkelvin)); - if (displayed_dive.dc.dctype != cd->dc.dctype) { - MODIFY_SELECTED_DIVES(EDIT_VALUE(dc.dctype)); + if (displayed_dive.dc.divemode != cd->dc.divemode) { + MODIFY_SELECTED_DIVES(EDIT_VALUE(dc.divemode)); MODIFY_SELECTED_DIVES(update_setpoint_events(&mydive->dc)); do_replot = true; } @@ -1019,7 +1019,7 @@ void MainTab::divetype_Changed(int index) { if (editMode == IGNORE) return; - displayed_dive.dc.dctype = (enum dive_comp_type) index; + displayed_dive.dc.divemode = (enum dive_comp_type) index; update_setpoint_events(&displayed_dive.dc); markChangedWidget(ui.DiveType); } |