Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
7c3d36ad
Commit
7c3d36ad
authored
Aug 14, 2022
by
Julius Künzel
💬
Browse files
Fix ambiguous number -> string conversion
parent
e7d46636
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/assets/view/widgets/keyframeimport.cpp
View file @
7c3d36ad
...
...
@@ -1299,22 +1299,22 @@ void KeyframeImport::updateView()
QString
current
;
if
(
name
.
contains
(
"Position X"
)
&&
!
(
convertMode
==
ImportRoles
::
WidthOnly
||
convertMode
==
ImportRoles
::
HeightOnly
||
convertMode
==
ImportRoles
::
YOnly
))
{
current
=
kfrData
[
0
].
toDouble
()
/
frameSize
.
width
();
current
=
QString
::
number
(
kfrData
[
0
].
toDouble
()
/
frameSize
.
width
()
)
;
if
(
convertMode
==
ImportRoles
::
FullGeometry
)
{
current
=
current
.
toDouble
()
+
rect
.
w
/
frameSize
.
width
()
/
2
;
current
=
QString
::
number
(
current
.
toDouble
()
+
rect
.
w
/
frameSize
.
width
()
/
2
)
;
}
}
else
if
(
name
.
contains
(
"Position Y"
)
&&
!
(
convertMode
==
ImportRoles
::
WidthOnly
||
convertMode
==
ImportRoles
::
HeightOnly
||
convertMode
==
ImportRoles
::
XOnly
))
{
current
=
kfrData
[
1
].
toDouble
()
/
frameSize
.
height
();
current
=
QString
::
number
(
kfrData
[
1
].
toDouble
()
/
frameSize
.
height
()
)
;
if
(
convertMode
==
ImportRoles
::
FullGeometry
)
{
current
=
current
.
toDouble
()
+
rect
.
h
/
frameSize
.
height
()
/
2
;
current
=
QString
::
number
(
current
.
toDouble
()
+
rect
.
h
/
frameSize
.
height
()
/
2
)
;
}
}
else
if
(
name
.
contains
(
"Size X"
)
&&
(
convertMode
==
ImportRoles
::
FullGeometry
||
convertMode
==
ImportRoles
::
InvertedPosition
||
convertMode
==
ImportRoles
::
OffsetPosition
||
convertMode
==
ImportRoles
::
WidthOnly
))
{
current
=
kfrData
[
2
].
toDouble
()
/
frameSize
.
width
()
/
2
;
current
=
QString
::
number
(
kfrData
[
2
].
toDouble
()
/
frameSize
.
width
()
/
2
)
;
}
else
if
(
name
.
contains
(
"Size Y"
)
&&
(
convertMode
==
ImportRoles
::
FullGeometry
||
convertMode
==
ImportRoles
::
InvertedPosition
||
convertMode
==
ImportRoles
::
OffsetPosition
||
convertMode
==
ImportRoles
::
HeightOnly
))
{
current
=
kfrData
[
3
].
toDouble
()
/
frameSize
.
height
()
/
2
;
current
=
QString
::
number
(
kfrData
[
3
].
toDouble
()
/
frameSize
.
height
()
/
2
)
;
}
else
if
(
fakeRect
)
{
current
=
QString
::
number
(
animData
->
anim_get_double
(
"original"
,
frame
));
}
else
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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