Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Multimedia
Kdenlive
Commits
ecf1a8da
Commit
ecf1a8da
authored
May 29, 2019
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix automask bugs (initial zone incorrect and not displayed on monitor)
parent
7e5dabd4
Pipeline
#3867
passed with stage
in 13 minutes and 42 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
data/effects/automask.xml
data/effects/automask.xml
+1
-1
src/assets/view/widgets/geometryeditwidget.cpp
src/assets/view/widgets/geometryeditwidget.cpp
+2
-1
src/widgets/geometrywidget.cpp
src/widgets/geometrywidget.cpp
+1
-2
No files found.
data/effects/automask.xml
View file @
ecf1a8da
...
...
@@ -3,7 +3,7 @@
<name>
Auto Mask
</name>
<description>
Hide a selected zone and follow its movements
</description>
<author>
Zachary Drew
</author>
<parameter
type=
"geometry"
name=
"geometry"
default=
"50%
,
50%
:
50%
x
50%"
fixed=
"1"
opacity=
"false"
>
<parameter
type=
"geometry"
name=
"geometry"
default=
"50%
50%
50%
50%"
fixed=
"1"
opacity=
"false"
>
<name>
Geometry
</name>
</parameter>
<parameter
type=
"constant"
name=
"motion_est.macroblock_width"
max=
"100"
min=
"1"
default=
"16"
suffix=
"pixels"
>
...
...
src/assets/view/widgets/geometryeditwidget.cpp
View file @
ecf1a8da
...
...
@@ -41,7 +41,8 @@ GeometryEditWidget::GeometryEditWidget(std::shared_ptr<AssetParameterModel> mode
const
QString
value
=
m_model
->
data
(
m_index
,
AssetParameterModel
::
ValueRole
).
toString
().
simplified
();
int
start
=
m_model
->
data
(
m_index
,
AssetParameterModel
::
ParentInRole
).
toInt
();
int
end
=
start
+
m_model
->
data
(
m_index
,
AssetParameterModel
::
ParentDurationRole
).
toInt
();
Mlt
::
Geometry
geometry
(
value
.
toUtf8
().
data
(),
end
,
frameSize
.
width
(),
frameSize
.
height
());
QSize
profileSize
=
pCore
->
getCurrentFrameSize
();
Mlt
::
Geometry
geometry
(
value
.
toUtf8
().
data
(),
end
,
profileSize
.
width
(),
profileSize
.
height
());
Mlt
::
GeometryItem
item
;
QRect
rect
;
if
(
geometry
.
fetch
(
&
item
,
0
)
==
0
)
{
...
...
src/widgets/geometrywidget.cpp
View file @
ecf1a8da
...
...
@@ -175,6 +175,7 @@ GeometryWidget::GeometryWidget(Monitor *monitor, QPair<int, int> range, const QR
layout
->
addLayout
(
horLayout2
);
slotUpdateGeometryRect
(
rect
);
adjustSizeValue
();
slotAdjustRectKeyframeValue
();
}
void
GeometryWidget
::
slotAdjustToSource
()
...
...
@@ -377,9 +378,7 @@ void GeometryWidget::slotUpdateGeometryRect(const QRect r)
m_spinWidth
->
blockSignals
(
false
);
m_spinHeight
->
blockSignals
(
false
);
m_monitor
->
setUpEffectGeometry
(
r
);
// slotAdjustRectKeyframeValue();
emit
valueChanged
(
getValue
());
// setupMonitor();
}
void
GeometryWidget
::
setValue
(
const
QRect
r
,
double
opacity
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment