diff options
| author | tassaron | 2017-07-13 00:05:11 -0400 |
|---|---|---|
| committer | tassaron | 2017-07-13 00:05:11 -0400 |
| commit | 8811b699a9c2d6b78af1e2a332d3031aef73aec4 (patch) | |
| tree | e62f318fb625c5c79314de2eb0ce4b7b93e7496c /src/components/color.py | |
| parent | 2e37dafd7036973a315b525f131850a6fb6d0b35 (diff) | |
merge consecutive static components
Diffstat (limited to 'src/components/color.py')
| -rw-r--r-- | src/components/color.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/components/color.py b/src/components/color.py index 82b45b3..da3bcf9 100644 --- a/src/components/color.py +++ b/src/components/color.py @@ -15,6 +15,7 @@ class Component(Component): def widget(self, parent): self.parent = parent + self.settings = self.parent.core.settings page = self.loadUi('color.ui') self.color1 = (0, 0, 0) @@ -42,9 +43,9 @@ class Component(Component): page.spinBox_x.valueChanged.connect(self.update) page.spinBox_y.valueChanged.connect(self.update) page.spinBox_width.setValue( - int(parent.settings.value("outputWidth"))) + int(self.settings.value("outputWidth"))) page.spinBox_height.setValue( - int(parent.settings.value("outputHeight"))) + int(self.settings.value("outputHeight"))) page.lineEdit_color1.textChanged.connect(self.update) page.lineEdit_color2.textChanged.connect(self.update) @@ -113,16 +114,16 @@ class Component(Component): super().update() def previewRender(self, previewWorker): - width = int(previewWorker.core.settings.value('outputWidth')) - height = int(previewWorker.core.settings.value('outputHeight')) + width = int(self.settings.value('outputWidth')) + height = int(self.settings.value('outputHeight')) return self.drawFrame(width, height) def properties(self): return ['static'] def frameRender(self, layerNo, frameNo): - width = int(self.worker.core.settings.value('outputWidth')) - height = int(self.worker.core.settings.value('outputHeight')) + width = int(self.settings.value('outputWidth')) + height = int(self.settings.value('outputHeight')) return self.drawFrame(width, height) def drawFrame(self, width, height): |