Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Pierre-Alexandre Broux
s4dl
Commits
7d9f62ee
Commit
7d9f62ee
authored
Apr 26, 2018
by
Sulfyderz
Browse files
Test: ON
parent
bf5dffd9
Changes
1
Hide whitespace changes
Inline
Side-by-side
s4dl/Show.py
View file @
7d9f62ee
...
...
@@ -3862,7 +3862,6 @@ class Show(object):
# si 1 alors affectation + move bound si besoin/et ou create bound sur stop
# si > 1 alors affectation + move bound si besoin/et ou create bound sur stop + merge
else
:
print
(
"SAME IN:"
,
DiarTools
.
sameDiar
(
valueTmp
,
diarRef
))
# verifie que la valueRef ne se trouve pas recouvert par la tolerance
if
not
DiarTools
.
segmentExistsAccordingToTolerance
(
valueRef
,
tolerance
):
for
z
in
listHypRefSegment
:
...
...
@@ -3925,7 +3924,6 @@ class Show(object):
valueTmp
=
DiarTools
.
dropSegment
(
u
,
valueTmp
)
elif
u
[
'start'
]
>=
(
valueRef
[
'stop'
]
+
tolerance
):
break
print
(
"SAME OUT1:"
,
DiarTools
.
sameDiar
(
valueTmp
,
diarRef
))
else
:
# permet de savoir si on fait les traitements pour des segments avec des mauvaises frontieres
perfectBoundary
=
False
...
...
@@ -3967,8 +3965,7 @@ class Show(object):
elif
tolerance
!=
0
and
y
[
'start'
]
>=
(
valueRef
[
'start'
]
-
tolerance
):
listIndexHypRefSegment
.
append
(
idx
)
print
(
"SAME OUT2:"
,
DiarTools
.
sameDiar
(
valueTmp
,
diarRef
))
print
(
"SAME IN:"
,
DiarTools
.
sameDiar
(
valueTmp
,
DiarTools
.
releaseFramesAccordingToDiar
(
diarRef
,
valueTmp
)))
for
idx
,
z
in
enumerate
(
listIndexHypRefSegment
):
# partie affectation
applyChange
=
False
...
...
@@ -4278,7 +4275,7 @@ class Show(object):
valueTmp
=
DiarTools
.
dropSegment
(
valueTmp
[
z
],
valueTmp
)
valueTmp
.
append_seg
(
segmentTmp
)
valueTmp
.
sort
()
print
(
"SAME OUT:"
,
DiarTools
.
sameDiar
(
valueTmp
,
DiarTools
.
releaseFramesAccordingToDiar
(
diarRef
,
valueTmp
)))
if
not
perfectBoundary
:
...
...
Write
Preview
Supports
Markdown
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