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

Get rid of mean depth line

Browse source 
Flat mean depth line (whole dive, not the instant one) is redundant as we now
 have a much more useful mean depth graph.

Signed-off-by: Krzysztof Arentowicz <k.arentowicz@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Krzysztof Arentowicz 2015-01-02 00:29:50 +01:00 • committed by Dirk Hohndel
parent e3378e299a
commit b6f47883c3
2 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -86,7 +86,6 @@ ProfileWidget2::ProfileWidget2(QWidget *parent) : QGraphicsView(parent),
temperatureItem(new DiveTemperatureItem()), temperatureItem(new DiveTemperatureItem()),
cylinderPressureAxis(new DiveCartesianAxis()), cylinderPressureAxis(new DiveCartesianAxis()),
gasPressureItem(new DiveGasPressureItem()), gasPressureItem(new DiveGasPressureItem()),
meanDepth(new MeanDepthLine()),
meanDepthItem(new DiveMeanDepthItem()), meanDepthItem(new DiveMeanDepthItem()),
diveComputerText(new DiveTextItem()), diveComputerText(new DiveTextItem()),
diveCeiling(new DiveCalculatedCeiling()), diveCeiling(new DiveCalculatedCeiling()),
@ -157,7 +156,6 @@ ProfileWidget2::~ProfileWidget2()
delete meanDepthItem; delete meanDepthItem;
delete cylinderPressureAxis; delete cylinderPressureAxis;
delete gasPressureItem; delete gasPressureItem;
delete meanDepth;
delete diveComputerText; delete diveComputerText;
delete diveCeiling; delete diveCeiling;
delete reportedCeiling; delete reportedCeiling;
@ -192,7 +190,6 @@ void ProfileWidget2::addItemsToScene()
scene()->addItem(temperatureItem); scene()->addItem(temperatureItem);
scene()->addItem(meanDepthItem); scene()->addItem(meanDepthItem);
scene()->addItem(gasPressureItem); scene()->addItem(gasPressureItem);
scene()->addItem(meanDepth);
// I cannot seem to figure out if an object that I find with itemAt() on the scene // I cannot seem to figure out if an object that I find with itemAt() on the scene
// is the object I am looking for - my guess is there's a simple way in Qt to do that // is the object I am looking for - my guess is there's a simple way in Qt to do that
// but nothing I tried worked. // but nothing I tried worked.
@ -273,11 +270,6 @@ void ProfileWidget2::setupItemOnScene()
cylinderPressureAxis->setTickSize(2); cylinderPressureAxis->setTickSize(2);
cylinderPressureAxis->setTickInterval(30000); cylinderPressureAxis->setTickInterval(30000);
meanDepth->setLine(0, 0, 96, 0);
meanDepth->setX(3);
meanDepth->setPen(QPen(QBrush(Qt::red), 0, Qt::SolidLine));
meanDepth->setZValue(1);
meanDepth->setAxis(profileYAxis);
instantMeanDepth->setLine(0, 0, 96, 0); instantMeanDepth->setLine(0, 0, 96, 0);
instantMeanDepth->setX(3); instantMeanDepth->setX(3);
@ -607,10 +599,6 @@ void ProfileWidget2::plotDive(struct dive *d, bool force)
rulerItem->setPlotInfo(plotInfo); rulerItem->setPlotInfo(plotInfo);
tankItem->setData(dataModel, &plotInfo, &displayed_dive); tankItem->setData(dataModel, &plotInfo, &displayed_dive);
meanDepth->setVisible(prefs.show_average_depth);
meanDepth->setMeanDepth(plotInfo.meandepth);
meanDepth->setLine(0, 0, timeAxis->posAtValue(currentdc->duration.seconds), 0);
Animations::moveTo(meanDepth,3, profileYAxis->posAtValue(plotInfo.meandepth));
instantMeanDepth->vAxis = profileYAxis; instantMeanDepth->vAxis = profileYAxis;
instantMeanDepth->hAxis = timeAxis; instantMeanDepth->hAxis = timeAxis;
@ -894,7 +882,6 @@ void ProfileWidget2::setEmptyState()
temperatureAxis->setVisible(false); temperatureAxis->setVisible(false);
cylinderPressureAxis->setVisible(false); cylinderPressureAxis->setVisible(false);
toolTipItem->setVisible(false); toolTipItem->setVisible(false);
meanDepth->setVisible(false);
diveComputerText->setVisible(false); diveComputerText->setVisible(false);
diveCeiling->setVisible(false); diveCeiling->setVisible(false);
reportedCeiling->setVisible(false); reportedCeiling->setVisible(false);
@ -1007,7 +994,6 @@ void ProfileWidget2::setProfileState()
cylinderPressureAxis->setPos(itemPos.cylinder.pos.on); cylinderPressureAxis->setPos(itemPos.cylinder.pos.on);
heartBeatItem->setVisible(prefs.hrgraph); heartBeatItem->setVisible(prefs.hrgraph);
meanDepth->setVisible(true);
meanDepthItem->setVisible(prefs.show_average_depth); meanDepthItem->setVisible(prefs.show_average_depth);
diveComputerText->setVisible(true); diveComputerText->setVisible(true);

1
qt-ui/profile/profilewidget2.h
View file

@ -165,7 +165,6 @@ private:
DiveMeanDepthItem *meanDepthItem; DiveMeanDepthItem *meanDepthItem;
DiveCartesianAxis *cylinderPressureAxis; DiveCartesianAxis *cylinderPressureAxis;
DiveGasPressureItem *gasPressureItem; DiveGasPressureItem *gasPressureItem;
MeanDepthLine *meanDepth;
QList<DiveEventItem *> eventItems; QList<DiveEventItem *> eventItems;
DiveTextItem *diveComputerText; DiveTextItem *diveComputerText;
DiveCalculatedCeiling *diveCeiling; DiveCalculatedCeiling *diveCeiling;