mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 21:20:19 +00:00
e74914fdd0
Staring at the stack trace it seems that it gets into an infinite recursion when trying to recalculate after being alerted to a change on the ruler. I cannot recreate this here (not on Linux, not on Mac), but here's a random attempt to prevent the issue: simply refuse to recalculate the ruler while in Add or Plan mode. Crude, but might show us if this really is the issue. Otherwise it's easy enough to revert this change. The qDebug() in there should tell us if people on a Mac do indeed see this even without moving the ruler around in Add or Plan mode. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
188 lines
5 KiB
C++
188 lines
5 KiB
C++
#include "ruleritem.h"
|
|
#include "divetextitem.h"
|
|
#include "profilewidget2.h"
|
|
#include "preferences.h"
|
|
#include "mainwindow.h"
|
|
|
|
#include <QFont>
|
|
#include <QFontMetrics>
|
|
#include <QPainter>
|
|
#include <QGraphicsScene>
|
|
#include <QGraphicsView>
|
|
#include <QDebug>
|
|
|
|
#include <stdint.h>
|
|
|
|
#include "profile.h"
|
|
#include "display.h"
|
|
|
|
RulerNodeItem2::RulerNodeItem2() : entry(NULL), ruler(NULL)
|
|
{
|
|
memset(&pInfo, 0, sizeof(pInfo));
|
|
setRect(-8, -8, 16, 16);
|
|
setBrush(QColor(0xff, 0, 0, 127));
|
|
setPen(QColor(Qt::red));
|
|
setFlag(ItemIsMovable);
|
|
setFlag(ItemSendsGeometryChanges);
|
|
setFlag(ItemIgnoresTransformations);
|
|
}
|
|
|
|
void RulerNodeItem2::setPlotInfo(plot_info &info)
|
|
{
|
|
pInfo = info;
|
|
entry = pInfo.entry;
|
|
}
|
|
|
|
void RulerNodeItem2::setRuler(RulerItem2 *r)
|
|
{
|
|
ruler = r;
|
|
}
|
|
|
|
void RulerNodeItem2::recalculate()
|
|
{
|
|
struct plot_data *data = pInfo.entry + (pInfo.nr - 1);
|
|
uint16_t count = 0;
|
|
if (x() < 0) {
|
|
setPos(0, y());
|
|
} else if (x() > timeAxis->posAtValue(data->sec)) {
|
|
setPos(timeAxis->posAtValue(data->sec), depthAxis->posAtValue(data->depth));
|
|
} else {
|
|
data = pInfo.entry;
|
|
count = 0;
|
|
while (timeAxis->posAtValue(data->sec) < x() && count < pInfo.nr) {
|
|
data = pInfo.entry + count;
|
|
count++;
|
|
}
|
|
setPos(timeAxis->posAtValue(data->sec), depthAxis->posAtValue(data->depth));
|
|
entry = data;
|
|
}
|
|
}
|
|
|
|
QVariant RulerNodeItem2::itemChange(GraphicsItemChange change, const QVariant &value)
|
|
{
|
|
// only run this if we actually have a ruler and are not adding or planning a dive
|
|
ProfileWidget2 *profWidget = NULL;
|
|
if (scene() && scene()->views().count())
|
|
profWidget = qobject_cast<ProfileWidget2 *>(scene()->views().first());
|
|
if (ruler &&
|
|
profWidget &&
|
|
!profWidget->isAddOrPlanner() &&
|
|
change == ItemPositionHasChanged) {
|
|
recalculate();
|
|
ruler->recalculate();
|
|
} else {
|
|
if (profWidget && profWidget->isAddOrPlanner())
|
|
qDebug() << "don't recalc ruler on Add/Plan";
|
|
}
|
|
return QGraphicsEllipseItem::itemChange(change, value);
|
|
}
|
|
|
|
RulerItem2::RulerItem2() : source(new RulerNodeItem2()),
|
|
dest(new RulerNodeItem2()),
|
|
timeAxis(NULL),
|
|
depthAxis(NULL),
|
|
textItemBack(new QGraphicsRectItem(this)),
|
|
textItem(new QGraphicsSimpleTextItem(this))
|
|
{
|
|
memset(&pInfo, 0, sizeof(pInfo));
|
|
source->setRuler(this);
|
|
dest->setRuler(this);
|
|
textItem->setFlag(QGraphicsItem::ItemIgnoresTransformations);
|
|
textItemBack->setBrush(QColor(0xff, 0xff, 0xff, 190));
|
|
textItemBack->setPen(QColor(Qt::white));
|
|
textItemBack->setFlag(QGraphicsItem::ItemIgnoresTransformations);
|
|
setPen(QPen(QColor(Qt::black), 0.0));
|
|
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
|
|
}
|
|
|
|
void RulerItem2::settingsChanged()
|
|
{
|
|
ProfileWidget2 *profWidget = NULL;
|
|
if (scene() && scene()->views().count())
|
|
profWidget = qobject_cast<ProfileWidget2 *>(scene()->views().first());
|
|
setVisible(profWidget->currentState == ProfileWidget2::PROFILE ? prefs.rulergraph : false);
|
|
}
|
|
|
|
void RulerItem2::recalculate()
|
|
{
|
|
char buffer[500];
|
|
QPointF tmp;
|
|
QFont font;
|
|
QFontMetrics fm(font);
|
|
|
|
if (timeAxis == NULL || depthAxis == NULL || pInfo.nr == 0)
|
|
return;
|
|
|
|
prepareGeometryChange();
|
|
startPoint = mapFromItem(source, 0, 0);
|
|
endPoint = mapFromItem(dest, 0, 0);
|
|
|
|
if (startPoint.x() > endPoint.x()) {
|
|
tmp = endPoint;
|
|
endPoint = startPoint;
|
|
startPoint = tmp;
|
|
}
|
|
QLineF line(startPoint, endPoint);
|
|
setLine(line);
|
|
compare_samples(source->entry, dest->entry, buffer, 500, 1);
|
|
text = QString(buffer);
|
|
|
|
// draw text
|
|
QGraphicsView *view = scene()->views().first();
|
|
QPoint begin = view->mapFromScene(mapToScene(startPoint));
|
|
textItem->setText(text);
|
|
qreal tgtX = startPoint.x();
|
|
const qreal diff = begin.x() + textItem->boundingRect().width();
|
|
// clamp so that the text doesn't go out of the screen to the right
|
|
if (diff > view->width()) {
|
|
begin.setX(begin.x() - (diff - view->width()));
|
|
tgtX = mapFromScene(view->mapToScene(begin)).x();
|
|
}
|
|
// always show the text bellow the lowest of the start and end points
|
|
qreal tgtY = (startPoint.y() >= endPoint.y()) ? startPoint.y() : endPoint.y();
|
|
// this isn't exactly optimal, since we want to scale the 1.0, 4.0 distances as well
|
|
textItem->setPos(tgtX - 1.0, tgtY + 4.0);
|
|
|
|
// setup the text background
|
|
textItemBack->setVisible(startPoint.x() != endPoint.x());
|
|
textItemBack->setPos(textItem->x(), textItem->y());
|
|
textItemBack->setRect(0, 0, textItem->boundingRect().width(), textItem->boundingRect().height());
|
|
}
|
|
|
|
RulerNodeItem2 *RulerItem2::sourceNode() const
|
|
{
|
|
return source;
|
|
}
|
|
|
|
RulerNodeItem2 *RulerItem2::destNode() const
|
|
{
|
|
return dest;
|
|
}
|
|
|
|
void RulerItem2::setPlotInfo(plot_info info)
|
|
{
|
|
pInfo = info;
|
|
dest->setPlotInfo(info);
|
|
source->setPlotInfo(info);
|
|
dest->recalculate();
|
|
source->recalculate();
|
|
recalculate();
|
|
}
|
|
|
|
void RulerItem2::setAxis(DiveCartesianAxis *time, DiveCartesianAxis *depth)
|
|
{
|
|
timeAxis = time;
|
|
depthAxis = depth;
|
|
dest->depthAxis = depth;
|
|
dest->timeAxis = time;
|
|
source->depthAxis = depth;
|
|
source->timeAxis = time;
|
|
recalculate();
|
|
}
|
|
|
|
void RulerItem2::setVisible(bool visible)
|
|
{
|
|
QGraphicsLineItem::setVisible(visible);
|
|
source->setVisible(visible);
|
|
dest->setVisible(visible);
|
|
}
|