X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fguide.cpp;h=ba05ec6aef126841aa744ae0cbe494b013b5c1d9;hb=b6d6c25f1bd07f11a0ceaf32a3a5bcaeab367336;hp=bbc2a6bd10ff1eca5d31fcb95c8287c1cfd296a1;hpb=d5e2d9e691b22dab741ed689df6d87478ba24c9f;p=kdenlive diff --git a/src/guide.cpp b/src/guide.cpp index bbc2a6bd..ba05ec6a 100644 --- a/src/guide.cpp +++ b/src/guide.cpp @@ -17,109 +17,156 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ +#include "guide.h" +#include "customtrackview.h" +#include "kdenlivesettings.h" + +#include #include #include +#include +#include #include -#include - -#include "guide.h" -#include "customtrackview.h" -#include "customtrackscene.h" -#include "kdenlivesettings.h" - -Guide::Guide(CustomTrackView *view, GenTime pos, QString label, double fps, double height) - : QGraphicsLineItem(), m_view(view), m_position(pos), m_label(label), m_fps(fps) { - setFlags(QGraphicsItem::ItemIsMovable); +Guide::Guide(CustomTrackView *view, const GenTime &pos, const QString &label, double height) : + QGraphicsLineItem(), + m_position(pos), + m_label(label), + m_view(view), + m_pen(QPen()) +{ + setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIgnoresTransformations); +#if QT_VERSION >= 0x040600 + setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); +#endif setToolTip(label); setLine(0, 0, 0, height); - setPos(m_position.frames(m_fps), 0); - setPen(QPen(QBrush(QColor(0, 0, 200, 180)), 1)); + if (m_position < GenTime()) m_position = GenTime(); + setPos(m_position.frames(m_view->fps()), 0); + m_pen.setWidthF(0); + m_pen.setColor(QColor(0, 0, 200, 180)); + //m_pen.setCosmetic(true); + setPen(m_pen); setZValue(999); setAcceptsHoverEvents(true); const QFontMetrics metric = m_view->fontMetrics(); - m_width = metric.width(" " + m_label + " ") + 2; + m_width = metric.width(' ' + m_label + ' ') + 2; prepareGeometryChange(); } -QString Guide::label() const { +QString Guide::label() const +{ return m_label; } -GenTime Guide::position() const { +GenTime Guide::position() const +{ return m_position; } -CommentedTime Guide::info() const { +CommentedTime Guide::info() const +{ return CommentedTime(m_position, m_label); } -void Guide::updateGuide(const GenTime newPos, const QString &comment) { +void Guide::updateGuide(const GenTime &newPos, const QString &comment) +{ m_position = newPos; - setPos(m_position.frames(m_fps), 0); - if (comment != QString()) { + setPos(m_position.frames(m_view->fps()), 0); + if (!comment.isEmpty()) { m_label = comment; setToolTip(m_label); const QFontMetrics metric = m_view->fontMetrics(); - m_width = metric.width(" " + m_label + " ") + 2; + m_width = metric.width(' ' + m_label + ' ') + 2; prepareGeometryChange(); } } +void Guide::updatePos() +{ + setPos(m_position.frames(m_view->fps()), 0); +} + //virtual -int Guide::type() const { +int Guide::type() const +{ return GUIDEITEM; } //virtual -void Guide::hoverEnterEvent(QGraphicsSceneHoverEvent *) { - setPen(QPen(QBrush(QColor(200, 0, 0, 180)), 2)); +void Guide::hoverEnterEvent(QGraphicsSceneHoverEvent *) +{ + m_pen.setColor(QColor(200, 0, 0, 180)); + setPen(m_pen); } //virtual -void Guide::hoverLeaveEvent(QGraphicsSceneHoverEvent *) { - setPen(QPen(QBrush(QColor(0, 0, 200, 180)), 2)); +void Guide::hoverLeaveEvent(QGraphicsSceneHoverEvent *) +{ + m_pen.setColor(QColor(0, 0, 200, 180)); + setPen(m_pen); } //virtual -QVariant Guide::itemChange(GraphicsItemChange change, const QVariant &value) { +QVariant Guide::itemChange(GraphicsItemChange change, const QVariant &value) +{ if (change == ItemPositionChange && scene()) { // value is the new position. QPointF newPos = value.toPointF(); newPos.setY(0); newPos.setX(m_view->getSnapPointForPos(newPos.x())); + if (newPos.x() < 0.0) newPos.setX(0.0); return newPos; } return QGraphicsItem::itemChange(change, value); } // virtual -QRectF Guide::boundingRect() const { +QRectF Guide::boundingRect() const +{ + double scale = m_view->matrix().m11(); + double width = m_pen.widthF() / scale * 2; + QRectF rect(line().x1() - width / 2 , line().y1(), width, line().y2() - line().y1()); if (KdenliveSettings::showmarkers()) { - QRectF rect = QGraphicsLineItem::boundingRect(); - rect.setLeft(line().x1()); - rect.setWidth(m_width / static_cast (scene())->scale()); - return rect; - } else return QGraphicsLineItem::boundingRect(); + // +3 to cover the arc at the end of the comment + rect.setWidth(width + m_width + 3); + } + return rect; } // virtual -void Guide::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *w) { - painter->setMatrixEnabled(false); - QLineF guideline = painter->matrix().map(line()); - painter->setPen(pen()); - painter->drawLine(guideline); - //painter->fillRect(painter->matrix().mapRect(boundingRect()), QColor(200, 100, 100, 100)); - //QGraphicsLineItem::paint(painter, option, w); - if (KdenliveSettings::showmarkers()) { - QPointF p1 = guideline.p1() + QPointF(1, 0); - QRectF txtBounding = painter->boundingRect(p1.x(), p1.y() + 10, m_width, 50, Qt::AlignLeft | Qt::AlignTop, " " + m_label + " "); - QPainterPath path; - path.addRoundedRect(txtBounding, 3, 3); - painter->fillPath(path, QBrush(pen().color())); +QPainterPath Guide::shape() const +{ + QPainterPath path; + if (!scene()) return path; + double width = m_pen.widthF() * 2; + path.addRect(line().x1() - width / 2 , line().y1(), width, line().y2() - line().y1()); + if (KdenliveSettings::showmarkers() && scene()->views().count()) { + const QFontMetrics metric = m_view->fontMetrics(); + int offset = scene()->views()[0]->verticalScrollBar()->value(); + QRectF txtBounding(line().x1(), line().y1() + offset, m_width, metric.height()); + path.addRect(txtBounding); + } + return path; +} + +// virtual +void Guide::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget */*w*/) +{ + QGraphicsLineItem::paint(painter, option); + if (KdenliveSettings::showmarkers() && scene() && scene()->views().count()) { + QPointF p1 = line().p1(); + const QFontMetrics metric = m_view->fontMetrics(); + painter->setClipRect(option->rect); + // makes sure the text stays visible when scrolling vertical + int offset = scene()->views()[0]->verticalScrollBar()->value(); + + QRectF txtBounding = painter->boundingRect(p1.x(), p1.y() + offset, m_width, metric.height(), Qt::AlignLeft | Qt::AlignTop, m_label); + painter->setBrush(QBrush(m_pen.color())); + painter->drawRoundedRect(txtBounding.adjusted(-5, -5, 2, 1), 3, 3); painter->setPen(Qt::white); - painter->drawText(txtBounding, Qt::AlignCenter, m_label); + painter->drawText(txtBounding.adjusted(1, 0, 1, 0), Qt::AlignCenter, m_label); } }