diff --git a/actions.py b/actions.py index 54f29d2..658f03c 100644 --- a/actions.py +++ b/actions.py @@ -1,20 +1,20 @@ -import subprocess -import tracemalloc -import data_centre.length_setter as length_setter -from inspect import signature -import sys -import shlex +import argparse import os import re -from pythonosc import osc_message_builder +import subprocess +import sys +import threading +from inspect import signature + +import git from pythonosc import dispatcher from pythonosc import osc_server -import git -import threading -import argparse + +import data_centre.length_setter as length_setter from video_centre.capture import Capture from video_centre.of_capture import OfCapture + class Actions(object): def __init__(self, tk, message_handler, data, video_driver, shaders, display, osc_client): self.tk = tk diff --git a/data_centre/data.py b/data_centre/data.py index c93df8d..1fd77c7 100644 --- a/data_centre/data.py +++ b/data_centre/data.py @@ -1,17 +1,17 @@ -import subprocess -import json -import xml.etree.ElementTree as ET -import os import collections +import json +import os +import subprocess +import threading +import xml.etree.ElementTree as ET from random import randint -import inspect -from itertools import cycle -from omxplayer.player import OMXPlayer from shutil import copyfile -import threading + +from omxplayer.player import OMXPlayer from data_centre import plugin_collection + class AsyncWrite(threading.Thread): def __init__(self, filename, data, mode='json'): threading.Thread.__init__(self) diff --git a/data_centre/plugin_collection.py b/data_centre/plugin_collection.py index 82d6f47..2cfd559 100644 --- a/data_centre/plugin_collection.py +++ b/data_centre/plugin_collection.py @@ -1,9 +1,9 @@ import inspect -import os import pkgutil import re -from plugins.frame_manager import FrameManager, Frame +from plugins.frame_manager import FrameManager + class Plugin(object): """Base class that each plugin must inherit from. within this class @@ -197,7 +197,7 @@ class DisplayPlugin(Plugin): raise NotImplementedError def show_plugin(self, display): - from tkinter import Text, END + from tkinter import END #display_text.insert(END, 'test from DisplayPlugin') display.display_text.insert(END, '{} \n'.format(display.body_title)) diff --git a/display_centre/display.py b/display_centre/display.py index ad2766e..5f528b1 100644 --- a/display_centre/display.py +++ b/display_centre/display.py @@ -1,8 +1,10 @@ -from tkinter import Text, END import math import time +from tkinter import END, Text + import display_centre.menu as menu + class Display(object): MENU_HEIGHT = 10 SELECTOR_WIDTH = 0.47 diff --git a/dotfiles/python_for_shutting_down_osc_server.py b/dotfiles/python_for_shutting_down_osc_server.py index fd63ef4..1f288fe 100644 --- a/dotfiles/python_for_shutting_down_osc_server.py +++ b/dotfiles/python_for_shutting_down_osc_server.py @@ -1,8 +1,8 @@ -from pythonosc import osc_message_builder -from pythonosc import udp_client -from pythonosc import dispatcher import argparse +from pythonosc import udp_client + + def setup_osc_client(ip, port): client_parser = argparse.ArgumentParser() client_parser.add_argument("--ip", default=ip, help="the ip") diff --git a/plugins/LFOModulationPlugin.py b/plugins/LFOModulationPlugin.py index 34dfebe..07e8953 100644 --- a/plugins/LFOModulationPlugin.py +++ b/plugins/LFOModulationPlugin.py @@ -1,6 +1,7 @@ import math -import data_centre.plugin_collection -from data_centre.plugin_collection import ActionsPlugin, SequencePlugin, DisplayPlugin, AutomationSourcePlugin + +from data_centre.plugin_collection import ActionsPlugin, AutomationSourcePlugin, DisplayPlugin, SequencePlugin + class LFOModulationPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin, AutomationSourcePlugin): @@ -58,7 +59,7 @@ class LFOModulationPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin, Automation return ['LFOMODU','NAV_LFO'] def show_plugin(self, display, display_mode): - from tkinter import Text, END + from tkinter import END #super(DisplayPlugin).show_plugin(display, display_mode) display.display_text.insert(END, '{} \n'.format(display.body_title)) display.display_text.insert(END, "LFOModulation is ") diff --git a/plugins/ManipulatePlugin.py b/plugins/ManipulatePlugin.py index cf70d97..e2bec49 100644 --- a/plugins/ManipulatePlugin.py +++ b/plugins/ManipulatePlugin.py @@ -1,7 +1,5 @@ -import data_centre.plugin_collection from data_centre.plugin_collection import ActionsPlugin, DisplayPlugin, ModulationReceiverPlugin#, SequencePlugin #import math -from math import sin, cos, tan, log, exp, pi """ add to midi or osc mapping @@ -62,7 +60,7 @@ class ManipulatePlugin(ActionsPlugin,DisplayPlugin,ModulationReceiverPlugin): # DisplayPlugin methods def show_plugin(self, display, display_mode): - from tkinter import Text, END + from tkinter import END #super(DisplayPlugin).show_plugin(display, display_mode) display.display_text.insert(END, '{} \n'.format(display.body_title)) display.display_text.insert(END, "test from ManipulatePlugin!\n") diff --git a/plugins/MidiFeedbackAPCKey25Plugin.py b/plugins/MidiFeedbackAPCKey25Plugin.py index 58bcfb0..e8d70aa 100644 --- a/plugins/MidiFeedbackAPCKey25Plugin.py +++ b/plugins/MidiFeedbackAPCKey25Plugin.py @@ -1,7 +1,8 @@ -from data_centre import plugin_collection -from data_centre.plugin_collection import MidiFeedbackPlugin import mido +from data_centre.plugin_collection import MidiFeedbackPlugin + + class MidiFeedbackAPCKey25Plugin(MidiFeedbackPlugin): #disabled = False diff --git a/plugins/MidiFeedbackLaunchpadPlugin.py b/plugins/MidiFeedbackLaunchpadPlugin.py index 81d3209..11c78f0 100644 --- a/plugins/MidiFeedbackLaunchpadPlugin.py +++ b/plugins/MidiFeedbackLaunchpadPlugin.py @@ -1,6 +1,3 @@ -from data_centre import plugin_collection -from data_centre.plugin_collection import MidiFeedbackPlugin -import mido import plugins #from plugins.MidiFeedbackAPCKey25Plugin import MidiFeedbackAPCKey25Plugin diff --git a/plugins/MultiActionsPlugin.py b/plugins/MultiActionsPlugin.py index 41474cd..341a88e 100644 --- a/plugins/MultiActionsPlugin.py +++ b/plugins/MultiActionsPlugin.py @@ -1,4 +1,3 @@ -import data_centre.plugin_collection from data_centre.plugin_collection import ActionsPlugin class MultiActionsPlugin(ActionsPlugin): diff --git a/plugins/ShaderLoopRecordPlugin.py b/plugins/ShaderLoopRecordPlugin.py index b9760a8..bf0bc60 100644 --- a/plugins/ShaderLoopRecordPlugin.py +++ b/plugins/ShaderLoopRecordPlugin.py @@ -1,7 +1,7 @@ -import data_centre.plugin_collection from data_centre.plugin_collection import ActionsPlugin, SequencePlugin, DisplayPlugin from plugins.frame_manager import Frame + class ShaderLoopRecordPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin): MAX_CLIPS = 8 @@ -54,7 +54,7 @@ class ShaderLoopRecordPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin): return ['LOOPREC','NAV_LPRC'] def show_plugin(self, display, display_mode): - from tkinter import Text, END + from tkinter import END #super(DisplayPlugin).show_plugin(display, display_mode) display.display_text.insert(END, '{} \n'.format(display.body_title)) display.display_text.insert(END, "test from ShaderLoopRecordPlugin!\n") diff --git a/plugins/ShaderQuickPresetPlugin.py b/plugins/ShaderQuickPresetPlugin.py index 33b4c91..bff2916 100644 --- a/plugins/ShaderQuickPresetPlugin.py +++ b/plugins/ShaderQuickPresetPlugin.py @@ -1,6 +1,4 @@ -import data_centre.plugin_collection -from data_centre.plugin_collection import ActionsPlugin, SequencePlugin, DisplayPlugin -import copy +from data_centre.plugin_collection import ActionsPlugin, DisplayPlugin from plugins.frame_manager import Frame class ShaderQuickPresetPlugin(ActionsPlugin,DisplayPlugin): #,SequencePlugin): @@ -55,7 +53,7 @@ class ShaderQuickPresetPlugin(ActionsPlugin,DisplayPlugin): #,SequencePlugin): return ['QUIKSHDR',['NAV_QKSH','PLAY_SHADER']] def show_plugin(self, display, display_mode): - from tkinter import Text, END + from tkinter import END #super(DisplayPlugin).show_plugin(display, display_mode) display.display_text.insert(END, '{} \n'.format(display.body_title)) display.display_text.insert(END, "ShaderQuickPresetPlugin") diff --git a/plugins/SoundReactPlugin.py b/plugins/SoundReactPlugin.py index 54b635c..ce58f34 100644 --- a/plugins/SoundReactPlugin.py +++ b/plugins/SoundReactPlugin.py @@ -1,12 +1,10 @@ -import math -import data_centre.plugin_collection -from data_centre.plugin_collection import ActionsPlugin, SequencePlugin, DisplayPlugin, AutomationSourcePlugin - -import pyaudio -import numpy as np -from random import randint from statistics import mean +import numpy as np +import pyaudio + +from data_centre.plugin_collection import ActionsPlugin, DisplayPlugin, SequencePlugin + #import matplotlib.pyplot as plt np.set_printoptions(suppress=True) # don't use scientific notationn @@ -112,7 +110,7 @@ class SoundReactPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin): return ['SOUNDMOD','NAV_SND'] def show_plugin(self, display, display_mode): - from tkinter import Text, END + from tkinter import END #super(DisplayPlugin).show_plugin(display, display_mode) display.display_text.insert(END, '{} \n'.format(display.body_title)) display.display_text.insert(END, "SoundReactPlugin - ") diff --git a/plugins/TestPlugin.py b/plugins/TestPlugin.py index 9af4c8c..bd3bae9 100644 --- a/plugins/TestPlugin.py +++ b/plugins/TestPlugin.py @@ -1,4 +1,3 @@ -import data_centre.plugin_collection from data_centre.plugin_collection import ActionsPlugin, SequencePlugin class TestPlugin(ActionsPlugin,SequencePlugin): diff --git a/plugins/WJSendPlugin.py b/plugins/WJSendPlugin.py index 6e9a5a0..902370b 100644 --- a/plugins/WJSendPlugin.py +++ b/plugins/WJSendPlugin.py @@ -1,10 +1,11 @@ -import serial -from serial import Serial -import data_centre.plugin_collection -from data_centre.plugin_collection import ActionsPlugin, SequencePlugin, DisplayPlugin, ModulationReceiverPlugin, AutomationSourcePlugin import threading import time +import serial + +from data_centre.plugin_collection import ActionsPlugin, AutomationSourcePlugin, DisplayPlugin, ModulationReceiverPlugin, SequencePlugin + + class AsyncWriter(threading.Thread): queue = [] quit_flag = False @@ -178,7 +179,7 @@ class WJSendPlugin(ActionsPlugin, SequencePlugin, DisplayPlugin, ModulationRecei #methods for DisplayPlugin def show_plugin(self, display, display_mode): - from tkinter import Text, END + from tkinter import END display.display_text.insert(END, '{} \n'.format(display.body_title)) display.display_text.insert(END, "WJSendPlugin {}\n\n".format('ACTIVE' if self.active else 'not active')) diff --git a/plugins/frame_manager.py b/plugins/frame_manager.py index 6566441..c78be5a 100644 --- a/plugins/frame_manager.py +++ b/plugins/frame_manager.py @@ -1,5 +1,4 @@ import copy -import json from json import JSONEncoder def _default(self, obj): @@ -19,7 +18,6 @@ class Frame: DEBUG_FRAMES = False#True def __init__(self, pc): - import copy #from copy import deepcopy self.pc = pc def to_json(self): diff --git a/r_e_c_u_r.py b/r_e_c_u_r.py index 5a03e1f..9a18857 100755 --- a/r_e_c_u_r.py +++ b/r_e_c_u_r.py @@ -1,24 +1,21 @@ #!/usr/bin/python -import traceback -from tkinter import Tk, Frame -import sys -import tracemalloc import argparse +import traceback +from tkinter import Frame, Tk + from pythonosc import udp_client from actions import Actions from data_centre.data import Data from display_centre.display import Display from display_centre.messages import MessageHandler +from user_input.analog_input import AnalogInput +from user_input.midi_input import MidiInput from user_input.numpad_input import NumpadInput from user_input.osc_input import OscInput -from user_input.midi_input import MidiInput -from user_input.analog_input import AnalogInput -from video_centre.video_driver import VideoDriver -#from video_centre.capture import Capture from video_centre.shaders import Shaders -import data_centre +from video_centre.video_driver import VideoDriver # create tk object tk = Tk() diff --git a/user_input/analog_input.py b/user_input/analog_input.py index 64209cd..49afb2e 100644 --- a/user_input/analog_input.py +++ b/user_input/analog_input.py @@ -1,4 +1,3 @@ -import Adafruit_GPIO.SPI as SPI import Adafruit_MCP3008 class AnalogInput(object): diff --git a/user_input/midi_input.py b/user_input/midi_input.py index 4262141..955819d 100644 --- a/user_input/midi_input.py +++ b/user_input/midi_input.py @@ -1,7 +1,5 @@ -import string -import datetime import mido -import subprocess + class MidiInput(object): def __init__(self, root, message_handler, display, actions, data): diff --git a/user_input/numpad_input.py b/user_input/numpad_input.py index ccc0c8c..de90ee7 100644 --- a/user_input/numpad_input.py +++ b/user_input/numpad_input.py @@ -1,5 +1,5 @@ import string -import sys + class NumpadInput(object): KEY_000_DELAY = 100 diff --git a/user_input/osc_input.py b/user_input/osc_input.py index d2ba21e..a994ef4 100644 --- a/user_input/osc_input.py +++ b/user_input/osc_input.py @@ -1,12 +1,9 @@ +import argparse import string -import sys +import threading - -from pythonosc import dispatcher from pythonosc import dispatcher from pythonosc import osc_server -import threading -import argparse class OscInput(object): diff --git a/video_centre/capture.py b/video_centre/capture.py index 4028f55..88fd336 100644 --- a/video_centre/capture.py +++ b/video_centre/capture.py @@ -1,8 +1,10 @@ +import datetime +import fractions import os import subprocess -import datetime + import picamera -import fractions + class Capture(object): PREVIEW_LAYER = 255 diff --git a/video_centre/of_capture.py b/video_centre/of_capture.py index 8881dcb..312aa5c 100644 --- a/video_centre/of_capture.py +++ b/video_centre/of_capture.py @@ -1,10 +1,12 @@ -import os -import subprocess import datetime import fractions -import picamera +import os +import subprocess import time +import picamera + + class OfCapture(object): def __init__(self, root, osc_client, message_handler, data): self.root = root diff --git a/video_centre/shaders.py b/video_centre/shaders.py index 519cce6..8cc9a20 100644 --- a/video_centre/shaders.py +++ b/video_centre/shaders.py @@ -1,8 +1,10 @@ -import display_centre.menu as menu import os from statistics import mean + +import display_centre.menu as menu from data_centre.plugin_collection import ModulationReceiverPlugin + class Shaders(object): MENU_HEIGHT = 10 EMPTY_SHADER = dict(name='none',is_shader=True,shad_type='-',param_number=4,path='-') diff --git a/video_centre/video_driver.py b/video_centre/video_driver.py index 924a0b2..5d330e7 100644 --- a/video_centre/video_driver.py +++ b/video_centre/video_driver.py @@ -1,5 +1,6 @@ -from video_centre.video_player import VideoPlayer from video_centre.alt_video_player import AltVideoPlayer +from video_centre.video_player import VideoPlayer + class VideoDriver(object):