From 0da275bf1b1dd2c956fed9d4a1051dcf3365c382 Mon Sep 17 00:00:00 2001 From: tassaron Date: Sun, 2 Jul 2017 20:46:48 -0400 Subject: [PATCH] renamed component base --- src/{components/__base__.py => component.py} | 0 src/components/color.py | 5 +++-- src/components/image.py | 5 +++-- src/components/original.py | 5 +++-- src/components/text.py | 5 +++-- src/components/video.py | 7 ++++--- 6 files changed, 16 insertions(+), 11 deletions(-) rename src/{components/__base__.py => component.py} (100%) diff --git a/src/components/__base__.py b/src/component.py similarity index 100% rename from src/components/__base__.py rename to src/component.py diff --git a/src/components/color.py b/src/components/color.py index 8a994db..bd45951 100644 --- a/src/components/color.py +++ b/src/components/color.py @@ -3,10 +3,11 @@ from PyQt5 import QtGui, QtCore, QtWidgets from PyQt5.QtGui import QColor from PIL.ImageQt import ImageQt import os -from . import __base__ + +from component import Component -class Component(__base__.Component): +class Component(Component): '''Color''' modified = QtCore.pyqtSignal(int, dict) diff --git a/src/components/image.py b/src/components/image.py index 4bb33b1..ba99113 100644 --- a/src/components/image.py +++ b/src/components/image.py @@ -1,10 +1,11 @@ from PIL import Image, ImageDraw from PyQt5 import QtGui, QtCore, QtWidgets import os -from . import __base__ + +from component import Component -class Component(__base__.Component): +class Component(Component): '''Image''' modified = QtCore.pyqtSignal(int, dict) diff --git a/src/components/original.py b/src/components/original.py index 1aa72c9..42049f3 100644 --- a/src/components/original.py +++ b/src/components/original.py @@ -3,12 +3,13 @@ from PIL import Image, ImageDraw from PyQt5 import QtGui, QtCore, QtWidgets from PyQt5.QtGui import QColor import os -from . import __base__ import time from copy import copy +from component import Component -class Component(__base__.Component): + +class Component(Component): '''Classic Visualizer''' modified = QtCore.pyqtSignal(int, dict) diff --git a/src/components/text.py b/src/components/text.py index 6c5c4eb..6be3120 100644 --- a/src/components/text.py +++ b/src/components/text.py @@ -4,10 +4,11 @@ from PyQt5 import QtGui, QtCore, QtWidgets from PIL.ImageQt import ImageQt import os import sys -from . import __base__ + +from component import Component -class Component(__base__.Component): +class Component(Component): '''Title Text''' modified = QtCore.pyqtSignal(int, dict) diff --git a/src/components/video.py b/src/components/video.py index 02bb44b..c5649c5 100644 --- a/src/components/video.py +++ b/src/components/video.py @@ -5,7 +5,8 @@ import math import subprocess import threading from queue import PriorityQueue -from . import __base__ + +from component import Component, BadComponentInit class Video: @@ -26,7 +27,7 @@ class Video: try: exec('self.%s = kwargs[arg]' % arg) except KeyError: - raise __base__.BadComponentInit(arg, self.__doc__) + raise BadComponentInit(arg, self.__doc__) self.frameNo = -1 self.currentFrame = 'None' @@ -102,7 +103,7 @@ class Video: self.lastFrame = self.currentFrame -class Component(__base__.Component): +class Component(Component): '''Video''' modified = QtCore.pyqtSignal(int, dict)