Commit 235e7c5f authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle

Merge branch '1904'

parents 440c2165 0e125086
......@@ -4,64 +4,64 @@
<description>Four corners geometry engine</description>
<author>Marko Cebokli</author>
<parameter type="animated" widget="corners" name="Corner 1 X" default="0.333333333333333" min="0" max="6000" factor="6000">
<parameter type="animated" widget="corners" name="0" default="0.333333333333333" min="0" max="6000" factor="6000">
<name>Corner 1 X</name>
</parameter>
<parameter type="animated" widget="corners" name="Corner 1 Y" default="0.333333333333333" min="0" max="6000" factor="6000">
<parameter type="animated" widget="corners" name="1" default="0.333333333333333" min="0" max="6000" factor="6000">
<name>Corner 1 Y</name>
</parameter>
<parameter type="animated" widget="corners" name="Corner 2 X" default="0.666666666666667" min="0" max="6000" factor="6000">
<parameter type="animated" widget="corners" name="2" default="0.666666666666667" min="0" max="6000" factor="6000">
<name>Corner 2 X</name>
</parameter>
<parameter type="animated" widget="corners" name="Corner 2 Y" default="0.333333333333333" min="0" max="6000" factor="6000">
<parameter type="animated" widget="corners" name="3" default="0.333333333333333" min="0" max="6000" factor="6000">
<name>Corner 2 Y</name>
</parameter>
<parameter type="animated" widget="corners" name="Corner 3 X" default="0.666666666666667" min="0" max="6000" factor="6000">
<parameter type="animated" widget="corners" name="4" default="0.666666666666667" min="0" max="6000" factor="6000">
<name>Corner 3 X</name>
</parameter>
<parameter type="animated" widget="corners" name="Corner 3 Y" default="0.666666666666667" min="0" max="6000" factor="6000">
<parameter type="animated" widget="corners" name="5" default="0.666666666666667" min="0" max="6000" factor="6000">
<name>Corner 3 Y</name>
</parameter>
<parameter type="animated" widget="corners" name="Corner 4 X" default="0.333333333333333" min="0" max="6000" factor="6000">
<parameter type="animated" widget="corners" name="6" default="0.333333333333333" min="0" max="6000" factor="6000">
<name>Corner 4 X</name>
</parameter>
<parameter type="animated" widget="corners" name="Corner 4 Y" default="0.666666666666667" min="0" max="6000" factor="6000">
<parameter type="animated" widget="corners" name="7" default="0.666666666666667" min="0" max="6000" factor="6000">
<name>Corner 4 Y</name>
</parameter>
<parameter type="animated" widget="corners" name="Stretch X" default="0.5" min="0" max="2000" factor="2000">
<parameter type="animated" widget="corners" name="9" default="0.5" min="0" max="2000" factor="2000">
<name>Stretch X</name>
</parameter>
<parameter type="animated" widget="corners" name="Stretch Y" default="0.5" min="0" max="2000" factor="2000">
<parameter type="animated" widget="corners" name="10" default="0.5" min="0" max="2000" factor="2000">
<name>Stretch Y</name>
</parameter>
<parameter type="animated" widget="corners" name="Feather Alpha" default="0.05" min="0" max="100" factor="100" intimeline="1">
<parameter type="animated" widget="corners" name="13" default="0.05" min="0" max="100" factor="100" intimeline="1">
<name>Feather Alpha</name>
</parameter>
<parameter type="bool" name="Enable Stretch" default="0">
<parameter type="bool" name="8" default="0">
<name>Enable Stretch</name>
</parameter>
<parameter type="list" name="Interpolator" default="0.166" paramlist="0;0.166;0.333;0.5;0.666;0.833;1.0">
<parameter type="list" name="11" default="0.166" paramlist="0;0.166;0.333;0.5;0.666;0.833;1.0">
<paramlistdisplay>Nearest neighbor,Bilinear,Bicubic smooth,Bicubic sharp,Spline 4x4,Spline 6x6,Lanczos</paramlistdisplay>
<name>Interpolator</name>
</parameter>
<parameter type="bool" name="Transparent Background" default="1">
<parameter type="bool" name="12" default="1">
<name>Transparent Background</name>
</parameter>
<parameter type="list" name="Alpha operation" default="0.0" paramlist="0.0;0.3;0.5;0.7;1.0">
<parameter type="list" name="14" default="0.0" paramlist="0.0;0.3;0.5;0.7;1.0">
<paramlistdisplay>Write on clear,Maximum,Minimum,Add,Subtract</paramlistdisplay>
<name>Alpha operation</name>
</parameter>
......
......@@ -3,10 +3,10 @@
<name>Cartoon</name>
<description>Cartoonify video, do a form of edge detect</description>
<author>Dries Pruimboom, Jaromil</author>
<parameter type="animated" name="triplevel" max="100000" min="0" default="500">
<parameter type="animated" name="triplevel" max="100000" min="0" default="0.9999" factor="100000">
<name>Level of trip</name>
</parameter>
<parameter type="animated" name="diffspace" max="256" min="0" default="1">
<parameter type="animated" name="diffspace" max="256" min="0" default="0" factor="256">
<name>Difference space</name>
</parameter>
</effect>
......@@ -3,10 +3,10 @@
<name>Pixelize</name>
<description>Pixelize input image.</description>
<author>Gephex crew</author>
<parameter type="animated" name="BlockSizeX" default="10" min="0" max="1000">
<parameter type="animated" name="BlockSizeX" default="0.07" min="0" max="1000" factor="1000">
<name>Block Size X</name>
</parameter>
<parameter type="animated" name="BlockSizeY" default="10" min="0" max="1000">
<parameter type="animated" name="BlockSizeY" default="0.1" min="0" max="1000" factor="1000">
<name>Block Size Y</name>
</parameter>
</effect>
......@@ -146,10 +146,13 @@ bool MarkerListModel::editMarker(GenTime oldPos, GenTime pos, QString comment, i
QWriteLocker locker(&m_lock);
Q_ASSERT(m_markerList.count(oldPos) > 0);
QString oldComment = m_markerList[oldPos].first;
int oldType = m_markerList[oldPos].second;
if (comment.isEmpty()) {
comment = oldComment;
}
int oldType = m_markerList[oldPos].second;
if (type == -1) {
type = oldType;
}
if (oldPos == pos && oldComment == comment && oldType == type) return true;
Fun undo = []() { return true; };
Fun redo = []() { return true; };
......
......@@ -426,10 +426,12 @@ bool TimelineFunctions::removeSpace(const std::shared_ptr<TimelineItemModel> &ti
if (!clips.empty()) {
int clipId = *clips.begin();
if (clips.size() > 1) {
int clipsGroup = timeline->m_groups->getRootId(clipId);
int res = timeline->requestClipsGroup(clips, undo, redo);
if (res > -1) {
result = timeline->requestGroupMove(clipId, res, 0, zone.x() - zone.y(), true, true, undo, redo);
if (result) {
if (result && res != clipsGroup) {
// Only ungroup if a group was created
result = timeline->requestClipUngroup(clipId, undo, redo);
}
if (!result) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment