Cleanup imports

This commit is contained in:
Ryan Jarvis
2020-05-01 11:27:28 -07:00
parent adea82998a
commit 9ebbb439cb
25 changed files with 75 additions and 85 deletions

View File

@@ -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

View File

@@ -1,17 +1,17 @@
import subprocess
import json
import xml.etree.ElementTree as ET
import os
import collections
from random import randint
import inspect
from itertools import cycle
from omxplayer.player import OMXPlayer
from shutil import copyfile
import json
import os
import subprocess
import threading
import xml.etree.ElementTree as ET
from random import randint
from shutil import copyfile
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)

View File

@@ -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))

View File

@@ -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

View File

@@ -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")

View File

@@ -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 ")

View File

@@ -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")

View File

@@ -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

View File

@@ -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

View File

@@ -1,4 +1,3 @@
import data_centre.plugin_collection
from data_centre.plugin_collection import ActionsPlugin
class MultiActionsPlugin(ActionsPlugin):

View File

@@ -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")

View File

@@ -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")

View File

@@ -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 - ")

View File

@@ -1,4 +1,3 @@
import data_centre.plugin_collection
from data_centre.plugin_collection import ActionsPlugin, SequencePlugin
class TestPlugin(ActionsPlugin,SequencePlugin):

View File

@@ -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'))

View File

@@ -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):

View File

@@ -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()

View File

@@ -1,4 +1,3 @@
import Adafruit_GPIO.SPI as SPI
import Adafruit_MCP3008
class AnalogInput(object):

View File

@@ -1,7 +1,5 @@
import string
import datetime
import mido
import subprocess
class MidiInput(object):
def __init__(self, root, message_handler, display, actions, data):

View File

@@ -1,5 +1,5 @@
import string
import sys
class NumpadInput(object):
KEY_000_DELAY = 100

View File

@@ -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):

View File

@@ -1,8 +1,10 @@
import datetime
import fractions
import os
import subprocess
import datetime
import picamera
import fractions
class Capture(object):
PREVIEW_LAYER = 255

View File

@@ -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

View File

@@ -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='-')

View File

@@ -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):