mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make the planner show something.

Browse source 
This is working in the wrong way, mostly because I'm setting the
plannermodel to ADD state ( and the planner graphic to the
correct PLAN state ), but I don't know why - when on PLAN state
on the model, things just don't work.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-05-25 17:49:26 -03:00 committed by Dirk Hohndel
parent 9b9abd5f2a
commit eec0b327a3
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
qt-ui/mainwindow.cpp
View file

@ -383,18 +383,19 @@ void MainWindow::createFakeDiveForAddAndPlan()
ui.InfoWidget->updateDiveInfo(selected_dive); ui.InfoWidget->updateDiveInfo(selected_dive);
} }
void MainWindow::on_actionDivePlanner_triggered() void MainWindow::on_actionDivePlanner_triggered()
{ {
if (!plannerStateClean()) if(!plannerStateClean())
return; return;
int i; dive_list()->rememberSelection();
struct dive *dive; dive_list()->unselectDives();
DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::PLAN); DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::ADD);
DivePlannerPointsModel::instance()->clear(); DivePlannerPointsModel::instance()->clear();
CylindersModel::instance()->clear(); CylindersModel::instance()->clear();
int i;
struct dive *dive;
for_each_dive (i, dive) { for_each_dive (i, dive) {
if (dive->selected) { if (dive->selected) {
DivePlannerPointsModel::instance()->copyCylindersFrom(dive); DivePlannerPointsModel::instance()->copyCylindersFrom(dive);
@ -402,8 +403,16 @@ void MainWindow::on_actionDivePlanner_triggered()
break; break;
} }
} }
createFakeDiveForAddAndPlan();
ui.InfoWidget->setCurrentIndex(0);
ui.infoPane->setCurrentIndex(MAINTAB);
ui.newProfile->setPlanState(); ui.newProfile->setPlanState();
ui.infoPane->setCurrentIndex(PLANNERWIDGET); ui.infoPane->setCurrentIndex(PLANNERWIDGET);
DivePlannerPointsModel::instance()->clear();
DivePlannerPointsModel::instance()->createSimpleDive();
ui.ListWidget->reload(DiveTripModel::CURRENT);
} }
void MainWindow::on_actionAddDive_triggered() void MainWindow::on_actionAddDive_triggered()

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

@ -363,7 +363,7 @@ void ProfileWidget2::plotDives(QList<dive *> dives)
//TODO: This is a temporary hack to help me understand the Planner. //TODO: This is a temporary hack to help me understand the Planner.
// It seems that each time the 'createTemporaryPlan' runs, a new // It seems that each time the 'createTemporaryPlan' runs, a new
// dive is created, and thus, we can plot that. hm... // dive is created, and thus, we can plot that. hm...
if (currentState == ADD) { if (currentState == ADD || currentState == PLAN) {
DivePlannerPointsModel *plannerModel = DivePlannerPointsModel::instance(); DivePlannerPointsModel *plannerModel = DivePlannerPointsModel::instance();
plannerModel->createTemporaryPlan(); plannerModel->createTemporaryPlan();
if (!plannerModel->getDiveplan().dp) { if (!plannerModel->getDiveplan().dp) {
@ -509,7 +509,7 @@ void ProfileWidget2::plotDives(QList<dive *> dives)
prefs.animation = animSpeedBackup; prefs.animation = animSpeedBackup;
} }
if (currentState == ADD) { // TODO: figure a way to move this from here. if (currentState == ADD || currentState == PLAN) { // TODO: figure a way to move this from here.
repositionDiveHandlers(); repositionDiveHandlers();
DivePlannerPointsModel *model = DivePlannerPointsModel::instance(); DivePlannerPointsModel *model = DivePlannerPointsModel::instance();
model->deleteTemporaryPlan(); model->deleteTemporaryPlan();