From a7002f4089e76efc0667d22fc10f44ada35ec1bd Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sat, 8 May 2021 09:50:00 +0200 Subject: profile: remove DiveAmbPressureItem This was replaced by the tissue map in 893bea700c98. Signed-off-by: Berthold Stoeger --- profile-widget/diveprofileitem.cpp | 43 +------------------------------------- profile-widget/diveprofileitem.h | 11 ---------- profile-widget/profilewidget2.cpp | 2 -- profile-widget/profilewidget2.h | 1 - 4 files changed, 1 insertion(+), 56 deletions(-) (limited to 'profile-widget') diff --git a/profile-widget/diveprofileitem.cpp b/profile-widget/diveprofileitem.cpp index 776fafcc9..621674b8f 100644 --- a/profile-widget/diveprofileitem.cpp +++ b/profile-widget/diveprofileitem.cpp @@ -308,47 +308,6 @@ void DivePercentageItem::paint(QPainter *painter, const QStyleOptionGraphicsItem painter->restore(); } -DiveAmbPressureItem::DiveAmbPressureItem(const DivePlotDataModel &model, const DiveCartesianAxis &hAxis, int hColumn, const DiveCartesianAxis &vAxis, int vColumn) : - AbstractProfilePolygonItem(model, hAxis, hColumn, vAxis, vColumn) -{ - QPen pen; - pen.setBrush(QBrush(getColor(::AMB_PRESSURE_LINE))); - pen.setCosmetic(true); - pen.setWidth(2); - setPen(pen); -} - -void DiveAmbPressureItem::replot(const dive *, bool) -{ - int sec = 0; - - // Ignore empty values. a heart rate of 0 would be a bad sign. - QPolygonF poly; - for (int i = 0, modelDataCount = dataModel.rowCount(); i < modelDataCount; i++) { - int hr = dataModel.index(i, vDataColumn).data().toInt(); - if (!hr) - continue; - sec = dataModel.index(i, hDataColumn).data().toInt(); - QPointF point(hAxis.posAtValue(sec), vAxis.posAtValue(hr)); - poly.append(point); - } - setPolygon(poly); - - if (texts.count()) - texts.last()->setAlignment(Qt::AlignLeft | Qt::AlignBottom); -} - -void DiveAmbPressureItem::paint(QPainter *painter, const QStyleOptionGraphicsItem*, QWidget*) -{ - if (polygon().isEmpty()) - return; - painter->save(); - painter->setPen(pen()); - painter->drawPolyline(polygon()); - painter->restore(); - connect(qPrefTechnicalDetails::instance(), &qPrefTechnicalDetails::percentagegraphChanged, this, &DiveAmbPressureItem::setVisible); -} - DiveTemperatureItem::DiveTemperatureItem(const DivePlotDataModel &model, const DiveCartesianAxis &hAxis, int hColumn, const DiveCartesianAxis &vAxis, int vColumn) : AbstractProfilePolygonItem(model, hAxis, hColumn, vAxis, vColumn) { @@ -466,7 +425,7 @@ void DiveMeanDepthItem::paint(QPainter *painter, const QStyleOptionGraphicsItem* painter->setPen(pen()); painter->drawPolyline(polygon()); painter->restore(); - connect(qPrefLog::instance(), &qPrefLog::show_average_depthChanged, this, &DiveAmbPressureItem::setVisible); + connect(qPrefLog::instance(), &qPrefLog::show_average_depthChanged, this, &DiveMeanDepthItem::setVisible); } void DiveMeanDepthItem::createTextItem() diff --git a/profile-widget/diveprofileitem.h b/profile-widget/diveprofileitem.h index ea86761bd..81452b66e 100644 --- a/profile-widget/diveprofileitem.h +++ b/profile-widget/diveprofileitem.h @@ -120,17 +120,6 @@ private: }; -class DiveAmbPressureItem : public AbstractProfilePolygonItem { - Q_OBJECT -public: - DiveAmbPressureItem(const DivePlotDataModel &model, const DiveCartesianAxis &hAxis, int hColumn, const DiveCartesianAxis &vAxis, int vColumn); - void replot(const dive *d, bool in_planner) override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; - -private: - QString visibilityKey; -}; - class DiveGasPressureItem : public AbstractProfilePolygonItem { Q_OBJECT diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index fc49d5a65..2e50b5d08 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -134,7 +134,6 @@ ProfileWidget2::ProfileWidget2(DivePlannerPointsModel *plannerModelIn, QWidget * heartBeatAxis(new DiveCartesianAxis(this)), heartBeatItem(createItem(*heartBeatAxis, DivePlotDataModel::HEARTBEAT, 1)), percentageAxis(new DiveCartesianAxis(this)), - ambPressureItem(createItem(*percentageAxis, DivePlotDataModel::AMBPRESSURE, 1)), mouseFollowerVertical(new DiveLineItem()), mouseFollowerHorizontal(new DiveLineItem()), rulerItem(new RulerItem2()), @@ -1074,7 +1073,6 @@ void ProfileWidget2::setEmptyState() toolTipItem->clearPlotInfo(); toolTipItem->setVisible(false); rulerItem->setVisible(false); - ambPressureItem->setVisible(false); mouseFollowerHorizontal->setVisible(false); mouseFollowerVertical->setVisible(false); heartBeatAxis->setVisible(false); diff --git a/profile-widget/profilewidget2.h b/profile-widget/profilewidget2.h index 4bdf4ea62..b4d60f7a2 100644 --- a/profile-widget/profilewidget2.h +++ b/profile-widget/profilewidget2.h @@ -223,7 +223,6 @@ private: DiveHeartrateItem *heartBeatItem; DiveCartesianAxis *percentageAxis; QList allPercentages; - DiveAmbPressureItem *ambPressureItem; DiveLineItem *mouseFollowerVertical; DiveLineItem *mouseFollowerHorizontal; RulerItem2 *rulerItem; -- cgit v1.2.3-70-g09d2