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

UI restructure: correctly setup planning

Browse source 
I had tested this mostly with add dive and completely forgot to track the
same changes in the planning routine. Oops.

This allowed to get rid of a no longer useful helper as well.

Fixes #594

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-07-04 06:53:33 -07:00
parent 9b4bd80e84
commit 0cfea5205d
1 changed files with 7 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
qt-ui/mainwindow.cpp
View file

@ -391,33 +391,9 @@ bool MainWindow::plannerStateClean()
return true; return true;
} }
// setup displayed_dive so we can start planning with it
void MainWindow::createFakeDiveForAddAndPlan()
{
clear_dive(&displayed_dive);
displayed_dive.when = QDateTime::currentMSecsSinceEpoch() / 1000L + gettimezoneoffset() + 3600;
displayed_dive.dc.model = "manually added dive"; // don't translate! this is stored in the XML file
// now show the mostly empty main tab
ui.InfoWidget->updateDiveInfo();
#if 0 // don't want to do any of this, I think
// select this new dive (but remember the old selection
ui.ListWidget->rememberSelection();
ui.ListWidget->unselectDives();
ui.ListWidget->reload(DiveTripModel::CURRENT);
ui.ListWidget->selectDives(QList<int>() << dive_table.nr - 1);
ui.InfoWidget->updateDiveInfo();
showProfile();
#endif
}
void MainWindow::planCanceled() void MainWindow::planCanceled()
{ {
showProfile(); showProfile();
#if 0 // shouldn't need this
ui.ListWidget->reload(DiveTripModel::CURRENT);
ui.ListWidget->restoreSelection();
#endif
refreshDisplay(); refreshDisplay();
} }
@ -458,23 +434,23 @@ void MainWindow::on_actionDivePlanner_triggered()
ui.ListWidget->endSearch(); ui.ListWidget->endSearch();
// put us in PLAN mode // put us in PLAN mode
DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::PLAN); DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::PLAN);
// clean out the dive and give it an id and the correct dc model
clear_dive(&displayed_dive);
displayed_dive.id = dive_getUniqID(&displayed_dive);
displayed_dive.dc.model = "planned dive"; // don't translate! this is stored in the XML file
ui.newProfile->setPlanState(); ui.newProfile->setPlanState();
ui.infoPane->setCurrentIndex(PLANNERWIDGET); ui.infoPane->setCurrentIndex(PLANNERWIDGET);
// set up the staging dive and clean up the widgets
DivePlannerPointsModel::instance()->clear();
// setup the staging dive cylinders from the selected dive // setup the staging dive cylinders from the selected dive
DivePlannerPointsModel::instance()->clear();
DivePlannerPointsModel::instance()->setupCylinders(); DivePlannerPointsModel::instance()->setupCylinders();
// create a simple starting dive, using the first gas from the just copied cylidners // create a simple starting dive, using the first gas from the just copied cylidners
DivePlannerPointsModel::instance()->setupStartTime(); DivePlannerPointsModel::instance()->setupStartTime();
createFakeDiveForAddAndPlan();
DivePlannerPointsModel::instance()->createSimpleDive(); DivePlannerPointsModel::instance()->createSimpleDive();
// reload and then disable the dive list
ui.ListWidget->reload(DiveTripModel::CURRENT);
ui.ListWidget->setEnabled(false);
ui.diveListPane->setCurrentIndex(1); // switch to the plan output ui.diveListPane->setCurrentIndex(1); // switch to the plan output
ui.globePane->setCurrentIndex(1); ui.globePane->setCurrentIndex(1);
#ifdef NO_MARBLE #ifdef NO_MARBLE