some other fixes and improvements for guides

[kdenlive] / src / guide.cpp

diff --git a/src/guide.cpp b/src/guide.cpp
index 8bd55a89e6b6b2a130d095824bbeaadc7e690378..0e55e9017ecd30375622b7b51746d79552d24243 100644 (file)
--- a/src/guide.cpp
+++ b/src/guide.cpp
@@ -17,65 +17,84 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-
-#include <QPen>
-#include <QBrush>
+#include "guide.h"
+#include "customtrackview.h"
+#include "customtrackscene.h"
+#include "kdenlivesettings.h"
 
 #include <KDebug>
 
-#include "guide.h"
-#include "customtrackview.h"
+#include <QPen>
+#include <QBrush>
 
-Guide::Guide(CustomTrackView *view, GenTime pos, QString label, double scale, double fps, double height)
-        : QGraphicsLineItem(), m_view(view), m_position(pos), m_label(label), m_scale(scale), m_fps(fps) {
+Guide::Guide(CustomTrackView *view, GenTime pos, QString label, double fps, double height) :
+        QGraphicsLineItem(),
+        m_position(pos),
+        m_label(label),
+        m_fps(fps),
+        m_view(view)
+{
     setFlags(QGraphicsItem::ItemIsMovable);
     setToolTip(label);
     setLine(0, 0, 0, height);
-    setPos(m_position.frames(m_fps) * scale, 0);
+    setPos(m_position.frames(m_fps), 0);
     setPen(QPen(QBrush(QColor(0, 0, 200, 180)), 2));
     setZValue(999);
     setAcceptsHoverEvents(true);
+    const QFontMetrics metric = m_view->fontMetrics();
+    m_width = metric.width(' ' + m_label + ' ') + 2;
+    prepareGeometryChange();
 }
 
-
-void Guide::updatePosition(double scale) {
-    setPos(m_position.frames(m_fps) * scale, 0);
-    m_scale = scale;
-}
-
-QString Guide::label() const {
+QString Guide::label() const
+{
     return m_label;
 }
 
-GenTime Guide::position() const {
+GenTime Guide::position() const
+{
     return m_position;
 }
 
-void Guide::update(const GenTime newPos, const QString &comment) {
+CommentedTime Guide::info() const
+{
+    return CommentedTime(m_position, m_label);
+}
+
+void Guide::updateGuide(const GenTime newPos, const QString &comment)
+{
     m_position = newPos;
-    if (comment != QString()) {
+    setPos(m_position.frames(m_fps), 0);
+    if (!comment.isEmpty()) {
         m_label = comment;
         setToolTip(m_label);
+        const QFontMetrics metric = m_view->fontMetrics();
+        m_width = metric.width(' ' + m_label + ' ') + 2;
+        prepareGeometryChange();
     }
 }
 
 //virtual
-int Guide::type() const {
+int Guide::type() const
+{
     return GUIDEITEM;
 }
 
 //virtual
-void Guide::hoverEnterEvent(QGraphicsSceneHoverEvent *) {
+void Guide::hoverEnterEvent(QGraphicsSceneHoverEvent *)
+{
     setPen(QPen(QBrush(QColor(200, 0, 0, 180)), 2));
 }
 
 //virtual
-void Guide::hoverLeaveEvent(QGraphicsSceneHoverEvent *) {
+void Guide::hoverLeaveEvent(QGraphicsSceneHoverEvent *)
+{
     setPen(QPen(QBrush(QColor(0, 0, 200, 180)), 2));
 }
 
 //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();
@@ -86,3 +105,47 @@ QVariant Guide::itemChange(GraphicsItemChange change, const QVariant &value) {
     return QGraphicsItem::itemChange(change, value);
 }
 
+// virtual
+QRectF Guide::boundingRect() const
+{
+    if (KdenliveSettings::showmarkers()) {
+        QRectF rect = QGraphicsLineItem::boundingRect();
+        rect.setLeft(line().x1());
+        rect.setWidth(m_width / static_cast <CustomTrackScene*>(scene())->scale());
+        return rect;
+    } else return QGraphicsLineItem::boundingRect();
+}
+
+// virtual
+QPainterPath Guide::shape() const
+{
+    QPainterPath path;
+    path.addRect(line().x1() - pen().widthF() / 2, line().y1(), pen().widthF(), line().y2() - line().y1());
+    if (KdenliveSettings::showmarkers()) {
+        const QFontMetrics metric = m_view->fontMetrics();
+        int height = metric.height();
+        path.addRoundedRect(line().x1(), line().y1() + 10, m_width / static_cast <CustomTrackScene*>(scene())->scale(), height, 3, 3);
+    }
+    return path;
+}
+
+// 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()));
+        painter->setPen(Qt::white);
+        painter->drawText(txtBounding, Qt::AlignCenter, m_label);
+    }
+}
+