Test: ON

s4dl/Show.py

@@ -3862,6 +3862,11 @@ 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 #1:",DiarTools.sameDiar(valueTmp,DiarTools.releaseFramesAccordingToDiar(diarRef,valueTmp)))
+                    if not DiarTools.sameDiar(valueTmp,DiarTools.releaseFramesAccordingToDiar(diarRef,valueTmp)):
+                        print(valueTmp)
+                        print(DiarTools.releaseFramesAccordingToDiar(diarRef,valueTmp))
+                        return
                     # verifie que la valueRef ne se trouve pas recouvert par la tolerance
                     if not DiarTools.segmentExistsAccordingToTolerance(valueRef,tolerance):
                         for z in listHypRefSegment:
@@ -3969,6 +3974,7 @@ class Show(object):
                         if not DiarTools.sameDiar(valueTmp,DiarTools.releaseFramesAccordingToDiar(diarRef,valueTmp)):
                             print(valueTmp)
                             print(DiarTools.releaseFramesAccordingToDiar(diarRef,valueTmp))
+                            return
                         for idx,z in enumerate(listIndexHypRefSegment):
                             # partie affectation
                             applyChange=False
@@ -4278,7 +4284,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:                
@@ -4382,7 +4388,11 @@ class Show(object):
                                     if actionsIncremental:
                                         actionsIncrementalSegmentationBoundaryMergeThrTurn.append(copy.deepcopy([newSegment,listTmp[y]]))
                                     newSegment,valueTmp=DiarTools.mergeSegment(newSegment,listTmp[y],valueTmp)
-                    
+                    print("SAME #2:",DiarTools.sameDiar(valueTmp,DiarTools.releaseFramesAccordingToDiar(diarRef,valueTmp)))
+                    if not DiarTools.sameDiar(valueTmp,DiarTools.releaseFramesAccordingToDiar(diarRef,valueTmp)):
+                        print(valueTmp)
+                        print(DiarTools.releaseFramesAccordingToDiar(diarRef,valueTmp))
+                        return
                 # MAJ diar
                 value=valueTmp