I believe that Tomaz is working on a ti-state option to allow people to show nothing or one of those two graphs… And IFF we were to remove this, we’d get rid of the infrastructure behind it as well. So right now
NAK from me. /D > On Jan 1, 2015, at 3:29 PM, Krzysztof Arentowicz <[email protected]> wrote: > > 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 <[email protected]> > --- > qt-ui/profile/profilewidget2.cpp | 14 -------------- > qt-ui/profile/profilewidget2.h | 1 - > 2 files changed, 15 deletions(-) > > diff --git a/qt-ui/profile/profilewidget2.cpp > b/qt-ui/profile/profilewidget2.cpp > index 5a82ae8..5bbf342 100644 > --- a/qt-ui/profile/profilewidget2.cpp > +++ b/qt-ui/profile/profilewidget2.cpp > @@ -86,7 +86,6 @@ ProfileWidget2::ProfileWidget2(QWidget *parent) : > QGraphicsView(parent), > temperatureItem(new DiveTemperatureItem()), > cylinderPressureAxis(new DiveCartesianAxis()), > gasPressureItem(new DiveGasPressureItem()), > - meanDepth(new MeanDepthLine()), > meanDepthItem(new DiveMeanDepthItem()), > diveComputerText(new DiveTextItem()), > diveCeiling(new DiveCalculatedCeiling()), > @@ -157,7 +156,6 @@ ProfileWidget2::~ProfileWidget2() > delete meanDepthItem; > delete cylinderPressureAxis; > delete gasPressureItem; > - delete meanDepth; > delete diveComputerText; > delete diveCeiling; > delete reportedCeiling; > @@ -192,7 +190,6 @@ void ProfileWidget2::addItemsToScene() > scene()->addItem(temperatureItem); > scene()->addItem(meanDepthItem); > scene()->addItem(gasPressureItem); > - scene()->addItem(meanDepth); > // 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 > // but nothing I tried worked. > @@ -273,11 +270,6 @@ void ProfileWidget2::setupItemOnScene() > cylinderPressureAxis->setTickSize(2); > 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->setX(3); > @@ -607,10 +599,6 @@ void ProfileWidget2::plotDive(struct dive *d, bool force) > > rulerItem->setPlotInfo(plotInfo); > 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->hAxis = timeAxis; > @@ -894,7 +882,6 @@ void ProfileWidget2::setEmptyState() > temperatureAxis->setVisible(false); > cylinderPressureAxis->setVisible(false); > toolTipItem->setVisible(false); > - meanDepth->setVisible(false); > diveComputerText->setVisible(false); > diveCeiling->setVisible(false); > reportedCeiling->setVisible(false); > @@ -1007,7 +994,6 @@ void ProfileWidget2::setProfileState() > > cylinderPressureAxis->setPos(itemPos.cylinder.pos.on); > heartBeatItem->setVisible(prefs.hrgraph); > - meanDepth->setVisible(true); > meanDepthItem->setVisible(prefs.show_average_depth); > > diveComputerText->setVisible(true); > diff --git a/qt-ui/profile/profilewidget2.h b/qt-ui/profile/profilewidget2.h > index 2d49206..8a04366 100644 > --- a/qt-ui/profile/profilewidget2.h > +++ b/qt-ui/profile/profilewidget2.h > @@ -165,7 +165,6 @@ private: > DiveMeanDepthItem *meanDepthItem; > DiveCartesianAxis *cylinderPressureAxis; > DiveGasPressureItem *gasPressureItem; > - MeanDepthLine *meanDepth; > QList<DiveEventItem *> eventItems; > DiveTextItem *diveComputerText; > DiveCalculatedCeiling *diveCeiling; > -- > 1.9.1 > _______________________________________________ > subsurface mailing list > [email protected] > http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface _______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
