diff options
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 1 | ||||
| -rw-r--r-- | profile-widget/diveprofileitem.cpp | 9 | ||||
| -rw-r--r-- | profile-widget/diveprofileitem.h | 8 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 9 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.h | 2 |
5 files changed, 21 insertions, 8 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 32ad5e30a..e1f82fdf1 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -181,6 +181,7 @@ MainWindow::MainWindow() : QMainWindow(), connect(ui.actionRecent3, SIGNAL(triggered(bool)), this, SLOT(recentFileTriggered(bool))); connect(ui.actionRecent4, SIGNAL(triggered(bool)), this, SLOT(recentFileTriggered(bool))); connect(information(), SIGNAL(addDiveFinished()), graphics(), SLOT(setProfileState())); + connect(information(), SIGNAL(dateTimeChanged()), graphics(), SLOT(dateTimeChanged())); connect(DivePlannerPointsModel::instance(), SIGNAL(planCreated()), this, SLOT(planCreated())); connect(DivePlannerPointsModel::instance(), SIGNAL(planCanceled()), this, SLOT(planCanceled())); connect(plannerDetails->printPlan(), SIGNAL(pressed()), divePlannerWidget(), SLOT(printDecoPlan())); diff --git a/profile-widget/diveprofileitem.cpp b/profile-widget/diveprofileitem.cpp index 9805c4df5..ddc771ab2 100644 --- a/profile-widget/diveprofileitem.cpp +++ b/profile-widget/diveprofileitem.cpp @@ -791,15 +791,16 @@ void DiveGasPressureItem::paint(QPainter *painter, const QStyleOptionGraphicsIte painter->restore(); } -DiveCalculatedCeiling::DiveCalculatedCeiling() : is3mIncrement(false) +DiveCalculatedCeiling::DiveCalculatedCeiling(ProfileWidget2 *widget) : + profileWidget(widget), + is3mIncrement(false) { settingsChanged(); } void DiveCalculatedCeiling::modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) { - if (MainWindow::instance()->information()) - connect(MainWindow::instance()->information(), SIGNAL(dateTimeChanged()), this, SLOT(recalc()), Qt::UniqueConnection); + connect(profileWidget, SIGNAL(dateTimeChangedItems()), this, SLOT(recalc()), Qt::UniqueConnection); // We don't have enougth data to calculate things, quit. if (!shouldCalculateStuff(topLeft, bottomRight)) @@ -830,7 +831,7 @@ void DiveCalculatedCeiling::paint(QPainter *painter, const QStyleOptionGraphicsI QGraphicsPolygonItem::paint(painter, option, widget); } -DiveCalculatedTissue::DiveCalculatedTissue() +DiveCalculatedTissue::DiveCalculatedTissue(ProfileWidget2 *widget) : DiveCalculatedCeiling(widget) { settingsChanged(); } diff --git a/profile-widget/diveprofileitem.h b/profile-widget/diveprofileitem.h index 0bba7f7a3..8f9a56f6e 100644 --- a/profile-widget/diveprofileitem.h +++ b/profile-widget/diveprofileitem.h @@ -21,6 +21,7 @@ This is a generically item and should be used as a base for others, I think... */ +class ProfileWidget2; class DivePlotDataModel; class DiveTextItem; class DiveCartesianAxis; @@ -175,7 +176,7 @@ class DiveCalculatedCeiling : public AbstractProfilePolygonItem { Q_OBJECT public: - DiveCalculatedCeiling(); + DiveCalculatedCeiling(ProfileWidget2 *profileWidget); virtual void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()); virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); virtual void settingsChanged(); @@ -184,6 +185,9 @@ public slots: void recalc(); +protected: + ProfileWidget2 *profileWidget; + private: bool is3mIncrement; }; @@ -200,7 +204,7 @@ public: class DiveCalculatedTissue : public DiveCalculatedCeiling { Q_OBJECT public: - DiveCalculatedTissue(); + DiveCalculatedTissue(ProfileWidget2 *profileWidget); virtual void settingsChanged(); }; diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 6b83508b4..177ceab75 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -92,7 +92,7 @@ ProfileWidget2::ProfileWidget2(QWidget *parent) : QGraphicsView(parent), cylinderPressureAxis(new DiveCartesianAxis(this)), gasPressureItem(new DiveGasPressureItem()), diveComputerText(new DiveTextItem()), - diveCeiling(new DiveCalculatedCeiling()), + diveCeiling(new DiveCalculatedCeiling(this)), decoModelParameters(new DiveTextItem()), reportedCeiling(new DiveReportedCeiling()), pn2GasItem(new PartialPressureGasItem()), @@ -302,7 +302,7 @@ void ProfileWidget2::setupItemOnScene() setupItem(reportedCeiling, timeAxis, profileYAxis, dataModel, DivePlotDataModel::CEILING, DivePlotDataModel::TIME, 1); setupItem(diveCeiling, timeAxis, profileYAxis, dataModel, DivePlotDataModel::CEILING, DivePlotDataModel::TIME, 1); for (int i = 0; i < 16; i++) { - DiveCalculatedTissue *tissueItem = new DiveCalculatedTissue(); + DiveCalculatedTissue *tissueItem = new DiveCalculatedTissue(this); setupItem(tissueItem, timeAxis, profileYAxis, dataModel, DivePlotDataModel::TISSUE_1 + i, DivePlotDataModel::TIME, 1 + i); allTissues.append(tissueItem); DivePercentageItem *percentageItem = new DivePercentageItem(i); @@ -708,6 +708,11 @@ void ProfileWidget2::recalcCeiling() diveCeiling->recalc(); } +void ProfileWidget2::dateTimeChanged() +{ + emit dateTimeChangedItems(); +} + void ProfileWidget2::settingsChanged() { // if we are showing calculated ceilings then we have to replot() diff --git a/profile-widget/profilewidget2.h b/profile-widget/profilewidget2.h index 7b7030a7f..c73d675bb 100644 --- a/profile-widget/profilewidget2.h +++ b/profile-widget/profilewidget2.h @@ -97,9 +97,11 @@ signals: void refreshDisplay(bool recreateDivelist); void updateDiveInfo(bool clear); void editCurrentDive(); + void dateTimeChangedItems(); public slots: // Necessary to call from QAction's signals. + void dateTimeChanged(); void settingsChanged(); void setEmptyState(); void setProfileState(); |