Fix display ratio for geometry parameter in effects / transitions

svn path=/trunk/kdenlive/; revision=3822

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 1bb87a2d615d0c3c6f833030bfc57679bdbabf85..df0eb6c5f30595be5be33c55370480063a797bc7 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -1815,7 +1815,8 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr
         ClipItem *transitionClip = getClipItemAt(info.startPos, info.track);
         if (transitionClip && transitionClip->baseClip()) {
             QString size = transitionClip->baseClip()->getProperty("frame_size");
-            p.setX(size.section('x', 0, 0).toInt());
+            double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble();
+            p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5));
             p.setY(size.section('x', 1, 1).toInt());
         }
         emit transitionItemSelected(item, getPreviousVideoTrack(info.track), p, true);
@@ -2861,7 +2862,8 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
         ClipItem *transitionClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track);
         if (transitionClip && transitionClip->baseClip()) {
             QString size = transitionClip->baseClip()->getProperty("frame_size");
-            p.setX(size.section('x', 0, 0).toInt());
+            double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble();
+            p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5));
             p.setY(size.section('x', 1, 1).toInt());
         }
         emit transitionItemSelected(static_cast <Transition *>(m_dragItem), getPreviousVideoTrack(m_dragItem->track()), p);
@@ -3416,7 +3418,8 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end)
         ClipItem *transitionClip = getClipItemAt(item->startPos(), item->track());
         if (transitionClip && transitionClip->baseClip()) {
             QString size = transitionClip->baseClip()->getProperty("frame_size");
-            p.setX(size.section('x', 0, 0).toInt());
+            double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble();
+            p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5));
             p.setY(size.section('x', 1, 1).toInt());
         }
         emit transitionItemSelected(item, getPreviousVideoTrack(item->track()), p);

diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp
index bb6b32716d6af337ed23808d51e7a8c898c20e05..da0c685558bf3a3e8916838654747ffdff25d02b 100644 (file)
--- a/src/effectstackview.cpp
+++ b/src/effectstackview.cpp
@@ -142,7 +142,8 @@ void EffectStackView::slotClipItemSelected(ClipItem* c, int ix)
         if (c) {
             ix = c->selectedEffectIndex();
             QString size = c->baseClip()->getProperty("frame_size");
-            QPoint p(size.section('x', 0, 0).toInt(), size.section('x', 1, 1).toInt());
+            double factor = c->baseClip()->getProperty("aspect_ratio").toDouble();
+            QPoint p((int)(size.section('x', 0, 0).toInt() * factor + 0.5), size.section('x', 1, 1).toInt());
             m_effectedit->setFrameSize(p);
         } else ix = 0;
     }

diff --git a/src/geometryval.cpp b/src/geometryval.cpp
index 213d65fe29f2e1c4400b69051446845cea8e83a7..db7c23437f26134aaba7bc90e24ff2d6874bffca 100644 (file)
--- a/src/geometryval.cpp
+++ b/src/geometryval.cpp
@@ -57,11 +57,12 @@ Geometryval::Geometryval(const MltVideoProfile profile, QPoint frame_size, QWidg
     m_scene = new GraphicsSceneRectMove(this);
     m_scene->setTool(TITLE_SELECT);
     view->setScene(m_scene);
-    QGraphicsRectItem *m_frameBorder = new QGraphicsRectItem(QRectF(0, 0, profile.width, profile.height));
-    m_frameBorder->setZValue(-1100);
-    m_frameBorder->setBrush(QColor(255, 255, 0, 30));
-    m_frameBorder->setPen(QPen(QBrush(QColor(255, 255, 255, 255)), 1.0, Qt::DashLine));
-    m_scene->addItem(m_frameBorder);
+    m_realWidth = (int)(profile.height * profile.display_aspect_num / (double) profile.display_aspect_den);
+    QGraphicsRectItem *frameBorder = new QGraphicsRectItem(QRectF(0, 0, m_realWidth, profile.height));
+    frameBorder->setZValue(-1100);
+    frameBorder->setBrush(QColor(255, 255, 0, 30));
+    frameBorder->setPen(QPen(QBrush(QColor(255, 255, 255, 255)), 1.0, Qt::DashLine));
+    m_scene->addItem(frameBorder);
 
     m_ui.buttonNext->setIcon(KIcon("media-skip-forward"));
     m_ui.buttonNext->setToolTip(i18n("Go to next keyframe"));
@@ -109,7 +110,7 @@ Geometryval::Geometryval(const MltVideoProfile profile, QPoint frame_size, QWidg
     QRectF srect = view->sceneRect();
     view->setSceneRect(srect.x(), -srect.height() / 3 + 10, srect.width(), srect.height() + srect.height() / 3 * 2 - 10);
     m_scene->setZoom(sc);
-    view->centerOn(m_frameBorder);
+    view->centerOn(frameBorder);
     connect(m_ui.buttonNext , SIGNAL(clicked()) , this , SLOT(slotNextFrame()));
     connect(m_ui.buttonPrevious , SIGNAL(clicked()) , this , SLOT(slotPreviousFrame()));
     connect(m_ui.buttonDelete , SIGNAL(clicked()) , this , SLOT(slotDeleteFrame()));
@@ -145,7 +146,7 @@ void Geometryval::slotAlignCenter()
         // no keyframe under cursor
         return;
     }
-    m_paramRect->setPos((m_profile.width - m_paramRect->rect().width()) / 2, (m_profile.height - m_paramRect->rect().height()) / 2);
+    m_paramRect->setPos((m_realWidth - m_paramRect->rect().width()) / 2, (m_profile.height - m_paramRect->rect().height()) / 2);
     slotUpdateTransitionProperties();
 }
 
@@ -158,7 +159,7 @@ void Geometryval::slotAlignHCenter()
         // no keyframe under cursor
         return;
     }
-    m_paramRect->setPos((m_profile.width - m_paramRect->rect().width()) / 2, m_paramRect->pos().y());
+    m_paramRect->setPos((m_realWidth - m_paramRect->rect().width()) / 2, m_paramRect->pos().y());
     slotUpdateTransitionProperties();
 }
 
@@ -223,7 +224,7 @@ void Geometryval::slotAlignRight()
         // no keyframe under cursor
         return;
     }
-    m_paramRect->setPos(m_profile.width - m_paramRect->rect().width(), m_paramRect->pos().y());
+    m_paramRect->setPos(m_realWidth - m_paramRect->rect().width(), m_paramRect->pos().y());
     slotUpdateTransitionProperties();
 }
 
@@ -236,7 +237,7 @@ void Geometryval::slotResize50()
         // no keyframe under cursor
         return;
     }
-    m_paramRect->setRect(0, 0, m_profile.width / 2, m_profile.height / 2);
+    m_paramRect->setRect(0, 0, m_realWidth / 2, m_profile.height / 2);
     slotUpdateTransitionProperties();
 }
 
@@ -249,7 +250,7 @@ void Geometryval::slotResize100()
         // no keyframe under cursor
         return;
     }
-    m_paramRect->setRect(0, 0, m_profile.width, m_profile.height);
+    m_paramRect->setRect(0, 0, m_realWidth, m_profile.height);
     slotUpdateTransitionProperties();
 }
 
@@ -262,7 +263,7 @@ void Geometryval::slotResize200()
         // no keyframe under cursor
         return;
     }
-    m_paramRect->setRect(0, 0, m_profile.width * 2, m_profile.height * 2);
+    m_paramRect->setRect(0, 0, m_realWidth * 2, m_profile.height * 2);
     slotUpdateTransitionProperties();
 }
 
@@ -289,11 +290,11 @@ void Geometryval::slotResizeCustom()
         // no keyframe under cursor
         return;
     }
-    int scale = m_paramRect->rect().width() * 100 / m_profile.width;
+    int scale = m_paramRect->rect().width() * 100 / m_realWidth;
     bool ok;
     scale =  QInputDialog::getInteger(this, i18n("Resize..."), i18n("Scale"), scale, 1, 2147483647, 10, &ok);
     if (!ok) return;
-    m_paramRect->setRect(0, 0, m_profile.width * scale / 100, m_profile.height * scale / 100);
+    m_paramRect->setRect(0, 0, m_realWidth * scale / 100, m_profile.height * scale / 100);
     slotUpdateTransitionProperties();
 }
 
@@ -342,8 +343,9 @@ void Geometryval::slotPositionChanged(int pos, bool seek)
         m_alignMenu->setEnabled(true);
         m_editGeom->setEnabled(true);
     }
-    m_paramRect->setPos(item.x(), item.y());
-    m_paramRect->setRect(0, 0, item.w(), item.h());
+    double dar = (m_profile.height * m_profile.display_aspect_num / (double) m_profile.display_aspect_den) / (double) m_profile.width;
+    m_paramRect->setPos(item.x() * dar, item.y());
+    m_paramRect->setRect(0, 0, item.w() * dar, item.h());
     m_ui.spinTransp->setValue(item.mix());
     m_paramRect->setBrush(QColor(255, 0, 0, item.mix()));
 }
@@ -485,13 +487,14 @@ void Geometryval::updateTransitionPath()
     int pos = 0;
     int counter = 0;
     QPainterPath path;
+    double dar = (m_profile.height * m_profile.display_aspect_num / (double) m_profile.display_aspect_den) / (double) m_profile.width;
     while (true) {
         if (m_geom->next_key(&item, pos) == 1) break;
         pos = item.frame();
         if (counter == 0) {
-            path.moveTo(item.x() + item.w() / 2, item.y() + item.h() / 2);
+            path.moveTo(item.x() * dar + item.w() * dar / 2, item.y() + item.h() / 2);
         } else {
-            path.lineTo(item.x() + item.w() / 2, item.y() + item.h() / 2);
+            path.lineTo(item.x() * dar + item.w() * dar / 2, item.y() + item.h() / 2);
         }
         counter++;
         pos++;
@@ -508,10 +511,11 @@ void Geometryval::slotUpdateTransitionProperties()
         // no keyframe under cursor
         return;
     }
+    double dar = (double) m_profile.width / (m_profile.height * m_profile.display_aspect_num / (double) m_profile.display_aspect_den);
     QRectF r = m_paramRect->rect().normalized();
-    item.x(m_paramRect->pos().x());
+    item.x(m_paramRect->pos().x() * dar);
     item.y(m_paramRect->pos().y());
-    item.w(r.width());
+    item.w(r.width() * dar);
     item.h(r.height());
     m_geom->insert(item);
     updateTransitionPath();
@@ -560,7 +564,7 @@ void Geometryval::slotResetPosition()
     m_view.value_y->setValue(0);
 
     if (m_frameSize.isNull()) {
-        m_view.value_width->setValue(m_profile.width);
+        m_view.value_width->setValue(m_realWidth);
         m_view.value_height->setValue(m_profile.height);
     } else {
         m_view.value_width->setValue(m_frameSize.x());

diff --git a/src/geometryval.h b/src/geometryval.h
index 4d478583cad74ee174ff796142cc7db18ec6905c..17a54ac2abdcf985fb4214181abfeb7261b68dc8 100644 (file)
--- a/src/geometryval.h
+++ b/src/geometryval.h
@@ -49,6 +49,7 @@ public:
 private:
     Ui::Geometryval m_ui;
     MltVideoProfile m_profile;
+    int m_realWidth;
     GraphicsSceneRectMove *m_scene;
     QGraphicsRectItem *m_paramRect;
     Mlt::Geometry *m_geom;