Commit b7b03e33 authored by Guillaume Seguin's avatar Guillaume Seguin

Potential cleanup

parent ce8c3f3c
...@@ -26,7 +26,7 @@ pyglet.options['shadow_window'] = False ...@@ -26,7 +26,7 @@ pyglet.options['shadow_window'] = False
pyglet.options['debug_gl'] = False pyglet.options['debug_gl'] = False
from pyglet.gl import * from pyglet.gl import *
from . import stltool import stltool
import threading import threading
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
import wx, random import wx, random
from .bufferedcanvas import * from bufferedcanvas import *
class Graph(BufferedCanvas): class Graph(BufferedCanvas):
'''A class to show a Graph with Pronterface.''' '''A class to show a Graph with Pronterface.'''
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
import wx, time import wx, time
from printrun import gcoder from printrun import gcoder
from .printrun_utils import imagefile from printrun_utils import imagefile
ID_ABOUT = 101 ID_ABOUT = 101
ID_EXIT = 110 ID_EXIT = 110
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
import os import os
import math import math
from . import stltool import stltool
import wx import wx
from wx import glcanvas from wx import glcanvas
import time import time
......
...@@ -21,7 +21,7 @@ from pyparsing import (Literal, ...@@ -21,7 +21,7 @@ from pyparsing import (Literal,
Optional, oneOf, Group, StringEnd, Combine, Word, alphas, hexnums, Optional, oneOf, Group, StringEnd, Combine, Word, alphas, hexnums,
CaselessLiteral, SkipTo CaselessLiteral, SkipTo
) )
from .css.colour import colourValue from css.colour import colourValue
import string import string
##Paint values ##Paint values
......
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
# along with Printrun. If not, see <http://www.gnu.org/licenses/>. # along with Printrun. If not, see <http://www.gnu.org/licenses/>.
from .transform import transformList from transform import transformList
from .inline import inlineStyle from inline import inlineStyle
...@@ -16,6 +16,6 @@ ...@@ -16,6 +16,6 @@
""" CSS at-rules""" """ CSS at-rules"""
from pyparsing import Literal, Combine from pyparsing import Literal, Combine
from .identifier import identifier from identifier import identifier
atkeyword = Combine(Literal("@") + identifier) atkeyword = Combine(Literal("@") + identifier)
...@@ -26,7 +26,7 @@ import wx ...@@ -26,7 +26,7 @@ import wx
import string import string
import urllib.parse import urllib.parse
from pyparsing import nums, Literal, Optional, oneOf, Group, StringEnd, Combine, Word, alphas, hexnums from pyparsing import nums, Literal, Optional, oneOf, Group, StringEnd, Combine, Word, alphas, hexnums
from ..pathdata import number, sign from pathdata import number, sign
number = number.copy() number = number.copy()
integerConstant = Word(nums+"+-").setParseAction(lambda t:int(t[0])) integerConstant = Word(nums+"+-").setParseAction(lambda t:int(t[0]))
......
...@@ -22,7 +22,7 @@ from pyparsing import (Literal, Word, CaselessLiteral, ...@@ -22,7 +22,7 @@ from pyparsing import (Literal, Word, CaselessLiteral,
#some shared definitions from pathdata #some shared definitions from pathdata
from ..pathdata import number, maybeComma from pathdata import number, maybeComma
paren = Literal("(").suppress() paren = Literal("(").suppress()
cparen = Literal(")").suppress() cparen = Literal(")").suppress()
......
...@@ -23,11 +23,11 @@ import warnings ...@@ -23,11 +23,11 @@ import warnings
import math import math
from functools import wraps from functools import wraps
from . import pathdata import pathdata
from . import css import css
from svg.css.colour import colourValue from svg.css.colour import colourValue
from svg.css import values from svg.css import values
from .attributes import paintValue from attributes import paintValue
document = """<?xml version = "1.0" standalone = "no"?> document = """<?xml version = "1.0" standalone = "no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
# along with Printrun. If not, see <http://www.gnu.org/licenses/>. # along with Printrun. If not, see <http://www.gnu.org/licenses/>.
import wx, os, math import wx, os, math
from .bufferedcanvas import * from bufferedcanvas import *
from .printrun_utils import * from printrun_utils import *
def sign(n): def sign(n):
if n < 0: return -1 if n < 0: return -1
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
# along with Printrun. If not, see <http://www.gnu.org/licenses/>. # along with Printrun. If not, see <http://www.gnu.org/licenses/>.
import wx, os, math import wx, os, math
from .bufferedcanvas import * from bufferedcanvas import *
from .printrun_utils import * from printrun_utils import *
def sign(n): def sign(n):
if n < 0: return -1 if n < 0: return -1
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# along with Printrun. If not, see <http://www.gnu.org/licenses/>. # along with Printrun. If not, see <http://www.gnu.org/licenses/>.
import wx, math import wx, math
from .stltool import * from stltool import *
a = wx.App() a = wx.App()
def genscape(data = [[0, 1, 0, 0],[1, 0, 2, 0],[1, 0, 0, 0],[0, 1, 0, 1]], pscale = 1.0, bheight = 1.0, zscale = 1.0): def genscape(data = [[0, 1, 0, 0],[1, 0, 2, 0],[1, 0, 0, 0],[0, 1, 0, 1]], pscale = 1.0, bheight = 1.0, zscale = 1.0):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment