layers are cleanly extracted

This commit is contained in:
Askill 2020-09-29 22:23:04 +02:00
parent 6fb5d6714e
commit 31974e4d68
5 changed files with 7 additions and 6 deletions

View File

@ -1,17 +1,18 @@
class Layer: class Layer:
#data = [(contour, (x,y,w,h)),] #data = [(contour, (x,y,w,h)),]
data = []
startFrame = None startFrame = None
lastFrame = None lastFrame = None
backgroundImage = []
def __init__(self, startFrame, data): def __init__(self, startFrame, data):
self.startFrame = startFrame self.startFrame = startFrame
self.lastFrame = startFrame self.lastFrame = startFrame
self.data = []
self.data.append(data) self.data.append(data)
print("Layer constructed") print("Layer constructed")
def add(self, frameNumber, data): def add(self, frameNumber, data):
if not (self.startFrame + len(self.data) - frameNumber < 0):
self.lastFrame = frameNumber self.lastFrame = frameNumber
self.data.append(data) self.data.append(data)

View File

@ -40,7 +40,7 @@ class LayerFactory:
print("LayerFactory: Layer knew no bounds") print("LayerFactory: Layer knew no bounds")
continue continue
if frameNumber - layer.lastFrame <= 5: if frameNumber - layer.lastFrame <= 1:
(x2,y2,w2,h2) = layer.data[-1][1] (x2,y2,w2,h2) = layer.data[-1][1]
if self.contoursOverlay((x-tol,y+h+tol), (x+w+tol,y-tol), (x2,y2+h2), (x2+w2,y2)): if self.contoursOverlay((x-tol,y+h+tol), (x+w+tol,y-tol), (x2,y2+h2), (x2+w2,y2)):
foundLayer = True foundLayer = True

Binary file not shown.

BIN
short.mp4

Binary file not shown.