Commit 03d40802 authored by Nathan/Eilisha Shiraini's avatar Nathan/Eilisha Shiraini
Browse files

Corrected a bug causing crashes when interpolating multiple images

parent 25818a57
......@@ -13,7 +13,7 @@ class ImGenerator(object):
self.interpolation = interpolation.value
self.data = data
self.quietZone = quietZone
self.qzColor = _sumtuple(i[0] for i in self.interpolation)
self.qzColor = _sumtuple(*(i[0] for i in self.interpolation))
self.dataSize = data[0].shape[0]
self.modSize = modSize
self.imageSize = (modSize * (quietZone * 2 + self.dataSize),) * 2
......@@ -24,7 +24,7 @@ class ImGenerator(object):
return self.qzColor
if modY not in range(self.quietZone, self.quietZone + self.dataSize):
return self.qzColor
return _sumtuple(self.interpolation[i][1 if data[modY - self.quietZone, modX - self.quietZone] else 0] for i, data in enumerate(self.data))
return _sumtuple(*(self.interpolation[i][1 if data[modY - self.quietZone, modX - self.quietZone] else 0] for i, data in enumerate(self.data)))
def moduleCoordinates(self, modX, modY):
for i in range(self.modSize):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment