mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 14:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Preserve profile toggle-button state zoomed_plot across sessions.

Browse source 
Fixes #912

Signed-off-by: K. Heller <pestophagous@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
pestophagous 2015-10-05 22:21:44 -07:00 • committed by Dirk Hohndel
parent 4f287b6f80
commit e522dd1a68
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
qt-ui/mainwindow.cpp
View file

@ -1150,7 +1150,8 @@ void MainWindow::readSettings()
TOOLBOX_PREF_BUTTON(show_pictures_in_profile, show_pictures_in_profile, profTogglePicture);
TOOLBOX_PREF_BUTTON(tankbar, tankbar, profTankbar);
TOOLBOX_PREF_BUTTON(percentagegraph, percentagegraph, profTissues);
s.endGroup();
TOOLBOX_PREF_BUTTON(zoomed_plot, zoomed_plot, profScaled);
s.endGroup(); // note: why doesn't the list of 17 buttons match the order in the gui?
s.beginGroup("DiveComputer");
default_dive_computer_vendor = getSetting(s, "dive_computer_vendor");
default_dive_computer_product = getSetting(s, "dive_computer_product");
@ -1717,6 +1718,7 @@ void MainWindow::editCurrentDive()
PREF_PROFILE(QT_PREFS); \
}
// note: why doesn't the list of 17 buttons match the order in the gui? or the order above? (line 1136)
TOOLBOX_PREF_PROFILE(profCalcAllTissues, calcalltissues, calcalltissues);
TOOLBOX_PREF_PROFILE(profCalcCeiling, calcceiling, calcceiling);
TOOLBOX_PREF_PROFILE(profDcCeiling, dcceiling, dcceiling);
@ -1734,6 +1736,7 @@ TOOLBOX_PREF_PROFILE(profScaled, zoomed_plot, zoomed_plot);
TOOLBOX_PREF_PROFILE(profTogglePicture, show_pictures_in_profile, show_pictures_in_profile);
TOOLBOX_PREF_PROFILE(profTankbar, tankbar, tankbar);
TOOLBOX_PREF_PROFILE(profTissues, percentagegraph, percentagegraph);
// couldn't the args to TOOLBOX_PREF_PROFILE be made to go in the same sequence as TOOLBOX_PREF_BUTTON?
void MainWindow::turnOffNdlTts()
{

5
qt-ui/profile/profilewidget2.cpp
View file

@ -75,7 +75,7 @@ ProfileWidget2::ProfileWidget2(QWidget *parent) : QGraphicsView(parent),
background(new DivePixmapItem()),
backgroundFile(":poster"),
toolTipItem(new ToolTipItem()),
isPlotZoomed(prefs.zoomed_plot),
isPlotZoomed(prefs.zoomed_plot),// no! bad use of prefs. 'PreferencesDialog::loadSettings' NOT CALLED yet.
profileYAxis(new DepthAxis()),
gasYAxis(new PartialGasPressureAxis()),
temperatureAxis(new TemperatureAxis()),
@ -111,6 +111,9 @@ ProfileWidget2::ProfileWidget2(QWidget *parent) : QGraphicsView(parent),
shouldCalculateMaxDepth(true),
fontPrintScale(1.0)
{
// would like to be able to ASSERT here that PreferencesDialog::loadSettings has been called.
isPlotZoomed = prefs.zoomed_plot; // now it seems that 'prefs' has loaded our preferences
memset(&plotInfo, 0, sizeof(plotInfo));
setupSceneAndFlags();