aboutsummaryrefslogtreecommitdiff
path: root/components/image.py
diff options
context:
space:
mode:
authortassaron2017-06-04 13:00:36 -0400
committertassaron2017-06-04 13:00:36 -0400
commit39e66ffa2d07b87b57ed90b369ab26aedf0a69e8 (patch)
treef11cf59368997a9b0dbd6cfd4cb9dd3e45f03583 /components/image.py
parent443c65455a1cae8ccaea0f0af7cdda3919c709f8 (diff)
video component almost working, rm hardcoded backgrounds
Diffstat (limited to 'components/image.py')
-rw-r--r--components/image.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/components/image.py b/components/image.py
index 021bb9e..ffbb117 100644
--- a/components/image.py
+++ b/components/image.py
@@ -27,8 +27,12 @@ class Component(__base__.Component):
width = int(previewWorker.core.settings.value('outputWidth'))
height = int(previewWorker.core.settings.value('outputHeight'))
return self.drawFrame(width, height)
-
- def frameRender(self, moduleNo, frameNo):
+
+ def preFrameRender(self, **kwargs):
+ super().preFrameRender(**kwargs)
+ return ['static']
+
+ def frameRender(self, moduleNo, arrayNo, frameNo):
width = int(self.worker.core.settings.value('outputWidth'))
height = int(self.worker.core.settings.value('outputHeight'))
return self.drawFrame(width, height)
@@ -49,12 +53,6 @@ class Component(__base__.Component):
return {
'image' : self.imagePath,
}
-
- def cancel(self):
- self.canceled = True
-
- def reset(self):
- self.canceled = False
def pickImage(self):
imgDir = self.settings.value("backgroundDir", os.path.expanduser("~"))