AnimatedRect: add "adjustcenter" default (Pillar Echo effect)

Fixes #891

data/effects/README.md

@@ -179,6 +179,8 @@ For double values these placeholders are avaible:
 | `showrotation` | _(default = `"0"`)_ use to enable support to 3 axis rotation |
 | `opacity`      | _(default = `"true"`)_ use to disable support of the opacity setting |
 
+You can set `default` to `"adjustcenter"`  to adjust the geometry to the frame size
+
 
 ##### `"url"`
 * url/path

data/effects/pillar_echo.xml

@@ -3,7 +3,7 @@
 	<name>Pillar Echo</name>
 	<description>Create an echo effect (blur) outside of an area of interest.</description>
 	<author>Meltytech, LLC</author>
-	<parameter type="animatedrect" name="rect" default="25% 0% 50% 100%" fixed="1" opacity="false">
+        <parameter type="animatedrect" name="rect" default="adjustcenter" fixed="1" opacity="false">
 		<name>Rectangle</name>
 	</parameter>
 	<parameter type="constant" name="blur" max="50" min="0" default="4" suffix="%">

src/assets/model/assetparametermodel.cpp

@@ -630,10 +630,28 @@ QVariant AssetParameterModel::parseAttribute(const ObjectId &owner, const QStrin
     }
     ParamType type = paramTypeFromStr(element.attribute(QStringLiteral("type")));
     QString content = element.attribute(attribute);
-    if (content.contains(QLatin1Char('%'))) {
-        std::unique_ptr<ProfileModel> &profile = pCore->getCurrentProfile();
-        int width = profile->width();
-        int height = profile->height();
+    std::unique_ptr<ProfileModel> &profile = pCore->getCurrentProfile();
+    int width = profile->width();
+    int height = profile->height();
+    if(type == ParamType::AnimatedRect && content == "adjustcenter") {
+        QSize frameSize = pCore->getItemFrameSize(owner);
+        int contentHeight;
+        int contentWidth;
+        double sourceDar = frameSize.width() / frameSize.height();
+        if (sourceDar > pCore->getCurrentDar()) {
+            // Fit to width
+            double factor = (double)width / frameSize.width() * pCore->getCurrentSar();
+            contentHeight = (int)(height * factor + 0.5);
+            contentWidth = width;
+        } else {
+            // Fit to height
+            double factor = (double)height / frameSize.height();
+            contentHeight = height;
+            contentWidth =(int)(frameSize.width() / pCore->getCurrentSar() * factor + 0.5);
+        }
+        // Center
+        content = QString("%1 %2 %3 %4").arg((width - contentWidth) / 2).arg((height - contentHeight) / 2).arg(contentWidth).arg(contentHeight);
+    } else if (content.contains(QLatin1Char('%'))) {
         int in = pCore->getItemIn(owner);
         int out = in + pCore->getItemDuration(owner) - 1;
         int frame_duration = pCore->getDurationFromString(KdenliveSettings::fade_duration());

src/bin/bin.cpp

@@ -4185,6 +4185,13 @@ size_t Bin::getClipDuration(int itemId) const
     return clip->frameDuration();
 }
 
+QSize Bin::getFrameSize(int itemId) const
+{
+    std::shared_ptr<ProjectClip> clip = m_itemModel->getClipByBinID(QString::number(itemId));
+    Q_ASSERT(clip != nullptr);
+    return clip->frameSize();
+}
+
 PlaylistState::ClipState Bin::getClipState(int itemId) const
 {
     std::shared_ptr<ProjectClip> clip = m_itemModel->getClipByBinID(QString::number(itemId));

src/bin/bin.h

@@ -220,6 +220,8 @@ public:
     const QString getBinClipName(const QString &id) const;
     /** @brief Returns the duration of a given clip. */
     size_t getClipDuration(int itemId) const;
+    /** @brief Returns the frame size of a given clip. */
+    QSize getFrameSize(int itemId) const;
     /** @brief Returns the state of a given clip: AudioOnly, VideoOnly, Disabled (Disabled means it has audio and video capabilities */
     PlaylistState::ClipState getClipState(int itemId) const;
 

src/bin/projectclip.cpp

@@ -351,6 +351,11 @@ const QString ProjectClip::url() const
     return clipUrl();
 }
 
+const QSize ProjectClip::frameSize() const
+{
+    return getFrameSize();
+}
+
 GenTime ProjectClip::duration() const
 {
     return getPlaytime();

src/bin/projectclip.h

@@ -122,6 +122,9 @@ public:
     /** @brief Returns the clip's url. */
     const QString url() const;
 
+    /** @brief Returns the clip's frame size. */
+    const QSize frameSize() const;
+
     /** @brief Returns the clip's duration. */
     GenTime duration() const;
     size_t frameDuration() const;

src/core.cpp

@@ -583,6 +583,27 @@ int Core::getItemDuration(const ObjectId &id)
     return 0;
 }
 
+QSize Core::getItemFrameSize(const ObjectId &id)
+{
+    if (!m_guiConstructed) return QSize();
+    switch (id.first) {
+    case ObjectType::TimelineClip:
+        if (m_mainWindow->getCurrentTimeline()->controller()->getModel()->isClip(id.second)) {
+            return m_mainWindow->getCurrentTimeline()->controller()->getModel()->getClipFrameSize(id.second);
+        }
+        break;
+    case ObjectType::BinClip:
+        return m_binWidget->getFrameSize(id.second);
+        break;
+    case ObjectType::TimelineTrack:
+    case ObjectType::Master:
+        return pCore->getCurrentFrameSize();
+    default:
+        qWarning() << "unhandled object type";
+    }
+    return pCore->getCurrentFrameSize();
+}
+
 int Core::getItemTrack(const ObjectId &id)
 {
     if (!m_guiConstructed) return 0;

src/core.h

@@ -175,6 +175,7 @@ public:
     int getItemIn(const ObjectId &id);
     int getItemTrack(const ObjectId &id);
     int getItemDuration(const ObjectId &id);
+    QSize getItemFrameSize(const ObjectId &id);
     /** @brief Returns the capabilities of a clip: AudioOnly, VideoOnly or Disabled if both are allowed */
     PlaylistState::ClipState getItemState(const ObjectId &id);
     /** @brief Get a list of video track names with indexes */