From eca7d998e102ee10fc5a765a2b8d4a2176a5e2f5 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Tue, 16 Jun 2015 14:37:02 +0200 Subject: Set up signalling to display notes in planner again. This got broken in a recent transition to more abstract models. Signed-off-by: Robert C. Helling Signed-off-by: Dirk Hohndel --- qt-ui/diveplanner.cpp | 2 ++ qt-ui/mainwindow.cpp | 4 ++-- qt-ui/mainwindow.h | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 7ab0aac86..e2a604b68 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -127,6 +127,8 @@ DivePlannerWidget::DivePlannerWidget(QWidget *parent, Qt::WindowFlags f) : QWidg plannerModel, SIGNAL(cylinderModelEdited())); connect(CylindersModel::instance(), SIGNAL(rowsRemoved(QModelIndex, int, int)), plannerModel, SIGNAL(cylinderModelEdited())); + connect(plannerModel, SIGNAL(calculatedPlanNotes()), MainWindow::instance(), SLOT(setPlanNotes())); + ui.tableWidget->setBtnToolTip(tr("Add dive data point")); connect(ui.startTime, SIGNAL(timeChanged(QTime)), plannerModel, SLOT(setStartTime(QTime))); diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 5621269b3..0095aaf97 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -619,9 +619,9 @@ void MainWindow::planCreated() refreshDisplay(); } -void MainWindow::setPlanNotes(const char *notes) +void MainWindow::setPlanNotes() { - plannerDetails()->divePlanOutput()->setHtml(notes); + plannerDetails()->divePlanOutput()->setHtml(displayed_dive.notes); } void MainWindow::printPlan() diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h index 0cdc2e1c5..68c5baed3 100644 --- a/qt-ui/mainwindow.h +++ b/qt-ui/mainwindow.h @@ -88,7 +88,6 @@ public: PlannerDetails *plannerDetails() const; void setLoadedWithFiles(bool filesFromCommandLine); bool filesFromCommandLine() const; - void setPlanNotes(const char *notes); void printPlan(); void checkSurvey(QSettings *s); void setApplicationState(const QByteArray& state); @@ -188,6 +187,8 @@ slots: void planCreated(); void setEnabledToolbar(bool arg1); void enableDiveSiteCreation(); + void setPlanNotes(); + private: Ui::MainWindow ui; -- cgit v1.2.3-70-g09d2