This patch does some code cleanup for the display of setpoint and o2 sensors of CCR dives. It reduces the number of additional conditional evaluations required for non-CCR dives from 18 to 2 for each of the two methods involved.
Signed-off-by: willem ferguson <[email protected]>
>From b6dd7ce88e5e28618dfd118a60477ca0f2e023bd Mon Sep 17 00:00:00 2001 From: willem ferguson <[email protected]> Date: Thu, 22 Jan 2015 17:57:05 +0200 Subject: [PATCH] Code cleanup for CCR setpoint and o2 sensor display This patch does some code cleanup for the display of setpoint and o2 sensors of CCR dives. It reduces the number of additional conditional evaluations required for non-CCR dives from 18 to 2 for each of the two methods involved. Signed-off-by: willem ferguson <[email protected]> --- qt-ui/profile/profilewidget2.cpp | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp index fbf4aaf..87ac8cf 100644 --- a/qt-ui/profile/profilewidget2.cpp +++ b/qt-ui/profile/profilewidget2.cpp @@ -521,10 +521,12 @@ void ProfileWidget2::plotDive(struct dive *d, bool force) currentdc = fake_dc(currentdc); } - o2SetpointGasItem->setVisible(prefs.show_ccr_setpoint && (currentdc->divemode == CCR) && prefs.pp_graphs.po2 && current_dive); - ccrsensor1GasItem->setVisible(prefs.show_ccr_sensors && (currentdc->divemode == CCR) && prefs.pp_graphs.po2 && current_dive); - ccrsensor2GasItem->setVisible(prefs.show_ccr_sensors && (currentdc->divemode == CCR) && prefs.pp_graphs.po2 && current_dive); - ccrsensor3GasItem->setVisible(prefs.show_ccr_sensors && (currentdc->divemode == CCR) && prefs.pp_graphs.po2 && (currentdc->no_o2sensors > 2) && current_dive); + if((currentdc->divemode == CCR) && prefs.pp_graphs.po2) { + o2SetpointGasItem->setVisible(prefs.show_ccr_setpoint && current_dive); + ccrsensor1GasItem->setVisible(prefs.show_ccr_sensors && current_dive); + ccrsensor2GasItem->setVisible(prefs.show_ccr_sensors && (currentdc->no_o2sensors > 1) && current_dive); + ccrsensor3GasItem->setVisible(prefs.show_ccr_sensors && (currentdc->no_o2sensors > 2) && current_dive); + } /* This struct holds all the data that's about to be plotted. * I'm not sure this is the best approach ( but since we are @@ -976,10 +978,13 @@ void ProfileWidget2::setProfileState() pn2GasItem->setVisible(prefs.pp_graphs.pn2); po2GasItem->setVisible(prefs.pp_graphs.po2); pheGasItem->setVisible(prefs.pp_graphs.phe); - o2SetpointGasItem->setVisible(current_dive && prefs.pp_graphs.po2 && (current_dc->divemode == CCR) && (prefs.show_ccr_setpoint)); - ccrsensor1GasItem->setVisible(prefs.show_ccr_sensors && (current_dc->divemode == CCR) && prefs.pp_graphs.po2 && current_dive); - ccrsensor2GasItem->setVisible(prefs.show_ccr_sensors && (current_dc->divemode == CCR) && prefs.pp_graphs.po2 && (current_dc->no_o2sensors > 1) && current_dive); - ccrsensor3GasItem->setVisible(prefs.show_ccr_sensors && (current_dc->divemode == CCR) && prefs.pp_graphs.po2 && (current_dc->no_o2sensors > 2) && current_dive); + + if ((current_dc->divemode == CCR) && prefs.pp_graphs.po2) { + o2SetpointGasItem->setVisible(prefs.show_ccr_setpoint && current_dive); + ccrsensor1GasItem->setVisible(prefs.show_ccr_sensors && current_dive); + ccrsensor2GasItem->setVisible(prefs.show_ccr_sensors && (current_dc->no_o2sensors > 1) && current_dive); + ccrsensor3GasItem->setVisible(prefs.show_ccr_sensors && (current_dc->no_o2sensors > 2) && current_dive); + } timeAxis->setPos(itemPos.time.pos.on); timeAxis->setLine(itemPos.time.expanded); -- 1.9.1
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
