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

Fixes showing the Empty Profile when Add / Plan dive is cancelled.

Browse source 
for some reason the next selected dive is NULL after cancelling the
plan. I'm investigating.

This patch fixes the show of the empty profile and it also untangles
some parts of the code, keeping the mainwindow where it should belong
: the mainwindow.

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-28 15:43:32 -03:00 • committed by Dirk Hohndel
parent 2f8f632cf6
commit 1e4f744165
4 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
qt-ui/diveplanner.cpp
View file

@ -256,7 +256,7 @@ DivePlannerWidget::DivePlannerWidget(QWidget *parent, Qt::WindowFlags f) : QWidg
connect(ui.buttonBox, SIGNAL(rejected()), plannerModel, SLOT(cancelPlan()));
connect(plannerModel, SIGNAL(planCreated()), MainWindow::instance(), SLOT(removeFakeDiveForAddAndPlan()));
connect(plannerModel, SIGNAL(planCreated()), MainWindow::instance(), SLOT(showProfile()));
connect(plannerModel, SIGNAL(planCanceled()), MainWindow::instance(), SLOT(showProfile()));
connect(plannerModel, SIGNAL(planCanceled()), MainWindow::instance(), SLOT(planCanceled()));
/* set defaults. */
ui.startTime->setTime(QTime(1, 0));
@ -653,18 +653,14 @@ void DivePlannerPointsModel::cancelPlan()
return;
}
}
// we unselected all dives earlier, so restore that first and then recreate the dive list
MainWindow::instance()->removeFakeDiveForAddAndPlan();
MainWindow::instance()->dive_list()->restoreSelection();
MainWindow::instance()->dive_list()->reload(DiveTripModel::CURRENT);
MainWindow::instance()->refreshDisplay();
emit planCanceled();
if (mode != ADD) {
free(stagingDive);
stagingDive = NULL;
}
setPlanMode(NOTHING);
diveplan.dp = NULL;
emit planCanceled();
}
DivePlannerPointsModel::Mode DivePlannerPointsModel::currentMode() const

9
qt-ui/mainwindow.cpp
View file

@ -397,6 +397,15 @@ void MainWindow::removeFakeDiveForAddAndPlan()
delete_single_dive(idx);
}
void MainWindow::planCanceled()
{
removeFakeDiveForAddAndPlan();
showProfile();
dive_list()->restoreSelection();
dive_list()->reload(DiveTripModel::CURRENT);
refreshDisplay();
}
void MainWindow::on_actionDivePlanner_triggered()
{
if(!plannerStateClean())

1
qt-ui/mainwindow.h
View file

@ -152,6 +152,7 @@ slots:
void showProfile();
void editCurrentDive();
void removeFakeDiveForAddAndPlan();
void planCanceled();
private:
Ui::MainWindow ui;

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

@ -88,7 +88,8 @@ ProfileWidget2::ProfileWidget2(QWidget *parent) : QGraphicsView(parent),
rulerItem(new RulerItem2()),
isGrayscale(false),
printMode(false),
shouldCalculateMaxTime(true)
shouldCalculateMaxTime(true),
backgroundFile(":poster")
{
memset(&plotInfo, 0, sizeof(plotInfo));
@ -566,9 +567,9 @@ void ProfileWidget2::mouseReleaseEvent(QMouseEvent *event)
void ProfileWidget2::fixBackgroundPos()
{
static QPixmap toBeScaled(backgroundFile);
if (currentState != EMPTY)
return;
QPixmap toBeScaled = QPixmap(backgroundFile);
QPixmap p = toBeScaled.scaledToHeight(viewport()->height() - 40, Qt::SmoothTransformation);
int x = viewport()->width() / 2 - p.width() / 2;
int y = viewport()->height() / 2 - p.height() / 2;
@ -666,7 +667,6 @@ void ProfileWidget2::setEmptyState()
currentState = EMPTY;
MainWindow::instance()->setToolButtonsEnabled(false);
backgroundFile = QString(":poster");
fixBackgroundPos();
background->setVisible(true);
@ -684,12 +684,14 @@ void ProfileWidget2::setEmptyState()
pn2GasItem->setVisible(false);
po2GasItem->setVisible(false);
pheGasItem->setVisible(false);
Q_FOREACH (DiveCalculatedTissue *tissue, allTissues) {
tissue->setVisible(false);
}
Q_FOREACH (DiveEventItem *event, eventItems) {
event->setVisible(false);
}
#define HIDE_ALL(TYPE, CONTAINER) \
Q_FOREACH (TYPE *item, CONTAINER) item->setVisible(false);
HIDE_ALL(DiveCalculatedTissue, allTissues);
HIDE_ALL(DiveEventItem, eventItems);
HIDE_ALL(DiveHandler, handles);
HIDE_ALL(QGraphicsSimpleTextItem, gases);
#undef HIDE_ALL
}
void ProfileWidget2::setProfileState()
@ -1030,10 +1032,8 @@ void ProfileWidget2::disconnectTemporaryConnections()
disconnect(plannerModel, SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
this, SLOT(pointsRemoved(const QModelIndex &, int, int)));
Q_FOREACH (QAction *action, actionsForKeys.values()) {
Q_FOREACH (QAction *action, actionsForKeys.values())
action->setShortcut(QKeySequence());
}
}
void ProfileWidget2::pointInserted(const QModelIndex &parent, int start, int end)