mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 23:33:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

profile: remove DiveAmbPressureItem

Browse source 
This was replaced by the tissue map in 893bea700c.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-05-08 09:50:00 +02:00 • committed by Robert C. Helling
parent 8b0db14f64
commit a7002f4089
8 changed files with 3 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/color.cpp
View file

@ -65,8 +65,7 @@ static QMap<color_index_t, std::array<QColor, 2>> profile_color = {
{ CALC_CEILING_SHALLOW, {{ FUNGREEN1_HIGH_TRANS, BLACK1_HIGH_TRANS }} },
{ CALC_CEILING_DEEP, {{ APPLE1_HIGH_TRANS, BLACK1_HIGH_TRANS }} },
{ TISSUE_PERCENTAGE, {{ GOVERNORBAY2, BLACK1_LOW_TRANS }} },
{ GF_LINE, {{ BLACK1, BLACK1_LOW_TRANS }} },
{ AMB_PRESSURE_LINE, {{ TUNDORA1_MED_TRANS, BLACK1_LOW_TRANS }} }
{ GF_LINE, {{ BLACK1, BLACK1_LOW_TRANS }} }
};
QColor getColor(const color_index_t i, bool isGrayscale)

3
core/color.h
View file

@ -135,8 +135,7 @@ typedef enum {
CALC_CEILING_SHALLOW,
CALC_CEILING_DEEP,
TISSUE_PERCENTAGE,
GF_LINE,
AMB_PRESSURE_LINE
GF_LINE
} color_index_t;
QColor getColor(const color_index_t i, bool isGrayscale = false);

43
profile-widget/diveprofileitem.cpp
View file

@ -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()

11
profile-widget/diveprofileitem.h
View file

@ -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

2
profile-widget/profilewidget2.cpp
View file

@ -134,7 +134,6 @@ ProfileWidget2::ProfileWidget2(DivePlannerPointsModel *plannerModelIn, QWidget *
heartBeatAxis(new DiveCartesianAxis(this)),
heartBeatItem(createItem<DiveHeartrateItem>(*heartBeatAxis, DivePlotDataModel::HEARTBEAT, 1)),
percentageAxis(new DiveCartesianAxis(this)),
ambPressureItem(createItem<DiveAmbPressureItem>(*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);

1
profile-widget/profilewidget2.h
View file

@ -223,7 +223,6 @@ private:
DiveHeartrateItem *heartBeatItem;
DiveCartesianAxis *percentageAxis;
QList<DivePercentageItem *> allPercentages;
DiveAmbPressureItem *ambPressureItem;
DiveLineItem *mouseFollowerVertical;
DiveLineItem *mouseFollowerHorizontal;
RulerItem2 *rulerItem;

4
qt-models/diveplotdatamodel.cpp
View file

@ -69,8 +69,6 @@ QVariant DivePlotDataModel::data(const QModelIndex &index, int role) const
return item.scr_OC_pO2.mbar / 1000.0;
case HEARTBEAT:
return item.heartbeat;
case AMBPRESSURE:
return AMB_PERCENTAGE;
case INSTANT_MEANDEPTH:
return item.running_sum;
}
@ -146,8 +144,6 @@ QVariant DivePlotDataModel::headerData(int section, Qt::Orientation orientation,
return tr("Sensor 2");
case CCRSENSOR3:
return tr("Sensor 3");
case AMBPRESSURE:
return tr("Ambient pressure");
case HEARTBEAT:
return tr("Heart rate");
case INSTANT_MEANDEPTH:

1
qt-models/diveplotdatamodel.h
View file

@ -67,7 +67,6 @@ public:
CCRSENSOR3,
SCR_OC_PO2,
HEARTBEAT,
AMBPRESSURE,
INSTANT_MEANDEPTH,
COLUMNS
};