Run reindent.py on the whole repository
Guillaume Seguin
parent
ec596c5ab6
commit
8cc134955f
22
plater.py
22
plater.py
|
|
@ -336,25 +336,25 @@ class stlwin(wx.Frame):
|
|||
def center(self, event):
|
||||
i = self.l.GetSelection()
|
||||
if i != -1:
|
||||
m = self.models[self.l.GetString(i)]
|
||||
m.offsets = [100, 100, m.offsets[2]]
|
||||
self.Refresh()
|
||||
m = self.models[self.l.GetString(i)]
|
||||
m.offsets = [100, 100, m.offsets[2]]
|
||||
self.Refresh()
|
||||
|
||||
def snap(self, event):
|
||||
i = self.l.GetSelection()
|
||||
if i != -1:
|
||||
m = self.models[self.l.GetString(i)]
|
||||
m.offsets[2] = -1.0 * min(m.facetsminz)[0]
|
||||
#print m.offsets[2]
|
||||
self.Refresh()
|
||||
m = self.models[self.l.GetString(i)]
|
||||
m.offsets[2] = -1.0 * min(m.facetsminz)[0]
|
||||
#print m.offsets[2]
|
||||
self.Refresh()
|
||||
|
||||
def delete(self, event):
|
||||
i = self.l.GetSelection()
|
||||
if i != -1:
|
||||
del self.models[self.l.GetString(i)]
|
||||
self.l.Delete(i)
|
||||
self.l.Select(self.l.GetCount() - 1)
|
||||
self.Refresh()
|
||||
del self.models[self.l.GetString(i)]
|
||||
self.l.Delete(i)
|
||||
self.l.Select(self.l.GetCount() - 1)
|
||||
self.Refresh()
|
||||
|
||||
def done(self, event, cb):
|
||||
try:
|
||||
|
|
|
|||
|
|
@ -164,11 +164,11 @@ class printcore():
|
|||
self.clear = True
|
||||
if line.startswith('ok') and "T:" in line and self.tempcb:
|
||||
#callback for temp, status, whatever
|
||||
try: self.tempcb(line)
|
||||
except: pass
|
||||
try: self.tempcb(line)
|
||||
except: pass
|
||||
elif line.startswith('Error'):
|
||||
if self.errorcb:
|
||||
#callback for errors
|
||||
#callback for errors
|
||||
try: self.errorcb(line)
|
||||
except: pass
|
||||
if line.lower().startswith("resend") or line.startswith("rs"):
|
||||
|
|
|
|||
|
|
@ -2,112 +2,112 @@
|
|||
#Interactive RepRap e axis calibration program
|
||||
#(C) Nathan Zadoks 2011
|
||||
#Licensed under CC-BY-SA or GPLv2 and higher - Pick your poison.
|
||||
s=300 #Extrusion speed (mm/min)
|
||||
n=100 #Default length to extrude
|
||||
m= 0 #User-entered measured extrusion length
|
||||
k=300 #Default amount of steps per mm
|
||||
port='/dev/ttyUSB0' #Default serial port to connect to printer
|
||||
temp=210 #Default extrusion temperature
|
||||
s=300 #Extrusion speed (mm/min)
|
||||
n=100 #Default length to extrude
|
||||
m= 0 #User-entered measured extrusion length
|
||||
k=300 #Default amount of steps per mm
|
||||
port='/dev/ttyUSB0' #Default serial port to connect to printer
|
||||
temp=210 #Default extrusion temperature
|
||||
|
||||
tempmax=250 #Maximum extrusion temperature
|
||||
tempmax=250 #Maximum extrusion temperature
|
||||
|
||||
t=int(n*60)/s #Time to wait for extrusion
|
||||
|
||||
try:
|
||||
from printdummy import printcore
|
||||
from printdummy import printcore
|
||||
except ImportError:
|
||||
from printcore import printcore
|
||||
from printcore import printcore
|
||||
import time,getopt,sys,os
|
||||
|
||||
def float_input(prompt=''):
|
||||
import sys
|
||||
f=None
|
||||
while f==None:
|
||||
s=raw_input(prompt)
|
||||
try:
|
||||
f=float(s)
|
||||
except ValueError:
|
||||
sys.stderr.write("Not a valid floating-point number.\n")
|
||||
sys.stderr.flush()
|
||||
return f
|
||||
import sys
|
||||
f=None
|
||||
while f==None:
|
||||
s=raw_input(prompt)
|
||||
try:
|
||||
f=float(s)
|
||||
except ValueError:
|
||||
sys.stderr.write("Not a valid floating-point number.\n")
|
||||
sys.stderr.flush()
|
||||
return f
|
||||
def wait(t,m=''):
|
||||
import time,sys
|
||||
sys.stdout.write(m+'['+(' '*t)+']\r'+m+'[')
|
||||
sys.stdout.flush()
|
||||
for i in range(t):
|
||||
for s in ['|\b','/\b','-\b','\\\b','|']:
|
||||
sys.stdout.write(s)
|
||||
sys.stdout.flush()
|
||||
time.sleep(1.0/5)
|
||||
print
|
||||
import time,sys
|
||||
sys.stdout.write(m+'['+(' '*t)+']\r'+m+'[')
|
||||
sys.stdout.flush()
|
||||
for i in range(t):
|
||||
for s in ['|\b','/\b','-\b','\\\b','|']:
|
||||
sys.stdout.write(s)
|
||||
sys.stdout.flush()
|
||||
time.sleep(1.0/5)
|
||||
print
|
||||
def w(s):
|
||||
sys.stdout.write(s)
|
||||
sys.stdout.flush()
|
||||
sys.stdout.write(s)
|
||||
sys.stdout.flush()
|
||||
|
||||
|
||||
def heatup(p,temp,s=0):
|
||||
curtemp=gettemp(p)
|
||||
p.send_now('M109 S%03d'%temp)
|
||||
p.temp=0
|
||||
if not s: w("Heating extruder up..")
|
||||
f=False
|
||||
while curtemp<=(temp-1):
|
||||
p.send_now('M105')
|
||||
time.sleep(0.5)
|
||||
if not f:
|
||||
time.sleep(1.5)
|
||||
f=True
|
||||
curtemp=gettemp(p)
|
||||
if curtemp: w(u"\rHeating extruder up.. %3d \xb0C"%curtemp)
|
||||
if s: print
|
||||
else: print "\nReady."
|
||||
curtemp=gettemp(p)
|
||||
p.send_now('M109 S%03d'%temp)
|
||||
p.temp=0
|
||||
if not s: w("Heating extruder up..")
|
||||
f=False
|
||||
while curtemp<=(temp-1):
|
||||
p.send_now('M105')
|
||||
time.sleep(0.5)
|
||||
if not f:
|
||||
time.sleep(1.5)
|
||||
f=True
|
||||
curtemp=gettemp(p)
|
||||
if curtemp: w(u"\rHeating extruder up.. %3d \xb0C"%curtemp)
|
||||
if s: print
|
||||
else: print "\nReady."
|
||||
|
||||
def gettemp(p):
|
||||
try: p.logl
|
||||
except: setattr(p,'logl',0)
|
||||
try: p.temp
|
||||
except: setattr(p,'temp',0)
|
||||
for n in range(p.logl,len(p.log)):
|
||||
line=p.log[n]
|
||||
if 'T:' in line:
|
||||
try:
|
||||
setattr(p,'temp',int(line.split('T:')[1].split()[0]))
|
||||
except: print line
|
||||
p.logl=len(p.log)
|
||||
return p.temp
|
||||
try: p.logl
|
||||
except: setattr(p,'logl',0)
|
||||
try: p.temp
|
||||
except: setattr(p,'temp',0)
|
||||
for n in range(p.logl,len(p.log)):
|
||||
line=p.log[n]
|
||||
if 'T:' in line:
|
||||
try:
|
||||
setattr(p,'temp',int(line.split('T:')[1].split()[0]))
|
||||
except: print line
|
||||
p.logl=len(p.log)
|
||||
return p.temp
|
||||
if not os.path.exists(port):
|
||||
port=0
|
||||
port=0
|
||||
|
||||
#Parse options
|
||||
help=u"""
|
||||
%s [ -l DISTANCE ] [ -s STEPS ] [ -t TEMP ] [ -p PORT ]
|
||||
-l --length Length of filament to extrude for each calibration step (default: %d mm)
|
||||
-s --steps Initial amount of steps to use (default: %d steps)
|
||||
-t --temp Extrusion temperature in degrees Celsius (default: %d \xb0C, max %d \xb0C)
|
||||
-p --port Serial port the printer is connected to (default: %s)
|
||||
-h --help This cruft.
|
||||
-l --length Length of filament to extrude for each calibration step (default: %d mm)
|
||||
-s --steps Initial amount of steps to use (default: %d steps)
|
||||
-t --temp Extrusion temperature in degrees Celsius (default: %d \xb0C, max %d \xb0C)
|
||||
-p --port Serial port the printer is connected to (default: %s)
|
||||
-h --help This cruft.
|
||||
"""[1:-1].encode('utf-8')%(sys.argv[0],n,k,temp,tempmax,port if port else 'auto')
|
||||
try:
|
||||
opts,args=getopt.getopt(sys.argv[1:],"hl:s:t:p:",["help","length=","steps=","temp=","port="])
|
||||
opts,args=getopt.getopt(sys.argv[1:],"hl:s:t:p:",["help","length=","steps=","temp=","port="])
|
||||
except getopt.GetoptError,err:
|
||||
print str(err)
|
||||
print help
|
||||
sys.exit(2)
|
||||
print str(err)
|
||||
print help
|
||||
sys.exit(2)
|
||||
for o,a in opts:
|
||||
if o in ('-h','--help'):
|
||||
print help
|
||||
sys.exit()
|
||||
elif o in ('-l','--length'):
|
||||
n=float(a)
|
||||
elif o in ('-s','--steps'):
|
||||
k=int(a)
|
||||
elif o in ('-t','--temp'):
|
||||
temp=int(a)
|
||||
if temp>=tempmax:
|
||||
print (u'%d \xb0C? Are you insane?'.encode('utf-8')%temp)+(" That's over nine thousand!" if temp>9000 else '')
|
||||
sys.exit(255)
|
||||
elif o in ('-p','--port'):
|
||||
port=a
|
||||
if o in ('-h','--help'):
|
||||
print help
|
||||
sys.exit()
|
||||
elif o in ('-l','--length'):
|
||||
n=float(a)
|
||||
elif o in ('-s','--steps'):
|
||||
k=int(a)
|
||||
elif o in ('-t','--temp'):
|
||||
temp=int(a)
|
||||
if temp>=tempmax:
|
||||
print (u'%d \xb0C? Are you insane?'.encode('utf-8')%temp)+(" That's over nine thousand!" if temp>9000 else '')
|
||||
sys.exit(255)
|
||||
elif o in ('-p','--port'):
|
||||
port=a
|
||||
|
||||
#Show initial parameters
|
||||
print "Initial parameters"
|
||||
|
|
@ -118,34 +118,34 @@ print "Serial port: %s"%(port if port else 'auto')
|
|||
|
||||
p=None
|
||||
try:
|
||||
#Connect to printer
|
||||
w("Connecting to printer..")
|
||||
try:
|
||||
p=printcore(port,115200)
|
||||
except:
|
||||
print 'Error.'
|
||||
raise
|
||||
while not p.online:
|
||||
time.sleep(1)
|
||||
w('.')
|
||||
print " connected."
|
||||
#Connect to printer
|
||||
w("Connecting to printer..")
|
||||
try:
|
||||
p=printcore(port,115200)
|
||||
except:
|
||||
print 'Error.'
|
||||
raise
|
||||
while not p.online:
|
||||
time.sleep(1)
|
||||
w('.')
|
||||
print " connected."
|
||||
|
||||
heatup(p,temp)
|
||||
heatup(p,temp)
|
||||
|
||||
#Calibration loop
|
||||
while n!=m:
|
||||
heatup(p,temp,True)
|
||||
p.send_now("G92 E0") #Reset e axis
|
||||
p.send_now("G1 E%d F%d"%(n,s)) #Extrude length of filament
|
||||
wait(t,'Extruding.. ')
|
||||
m=float_input("How many millimeters of filament were extruded? ")
|
||||
if m==0: continue
|
||||
if n!=m:
|
||||
k=(n/m)*k
|
||||
p.send_now("M92 E%d"%int(round(k))) #Set new step count
|
||||
print "Steps per mm: %3d steps"%k #Tell user
|
||||
print 'Calibration completed.' #Yay!
|
||||
#Calibration loop
|
||||
while n!=m:
|
||||
heatup(p,temp,True)
|
||||
p.send_now("G92 E0") #Reset e axis
|
||||
p.send_now("G1 E%d F%d"%(n,s)) #Extrude length of filament
|
||||
wait(t,'Extruding.. ')
|
||||
m=float_input("How many millimeters of filament were extruded? ")
|
||||
if m==0: continue
|
||||
if n!=m:
|
||||
k=(n/m)*k
|
||||
p.send_now("M92 E%d"%int(round(k))) #Set new step count
|
||||
print "Steps per mm: %3d steps"%k #Tell user
|
||||
print 'Calibration completed.' #Yay!
|
||||
except KeyboardInterrupt:
|
||||
pass
|
||||
pass
|
||||
finally:
|
||||
if p: p.disconnect()
|
||||
if p: p.disconnect()
|
||||
|
|
|
|||
|
|
@ -263,5 +263,3 @@ class Graph(BufferedCanvas):
|
|||
self.drawextruder0temp(dc, gc)
|
||||
self.drawextruder1targettemp(dc, gc)
|
||||
self.drawextruder1temp(dc, gc)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -397,4 +397,3 @@ if __name__ == '__main__':
|
|||
main = window(open("jam.gcode"))
|
||||
main.Show()
|
||||
app.MainLoop()
|
||||
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@ def install_locale(domain):
|
|||
|
||||
def imagefile(filename):
|
||||
for prefix in ['/usr/local/share/pronterface/images', '/usr/share/pronterface/images']:
|
||||
candidate = os.path.join(prefix, filename)
|
||||
if os.path.exists(candidate):
|
||||
return candidate
|
||||
candidate = os.path.join(prefix, filename)
|
||||
if os.path.exists(candidate):
|
||||
return candidate
|
||||
local_candidate = os.path.join(os.path.dirname(__file__), "images", filename)
|
||||
if os.path.exists(local_candidate):
|
||||
return local_candidate
|
||||
|
|
@ -24,9 +24,9 @@ def imagefile(filename):
|
|||
|
||||
def lookup_file(filename, prefixes):
|
||||
for prefix in prefixes:
|
||||
candidate = os.path.join(prefix, filename)
|
||||
if os.path.exists(candidate):
|
||||
return candidate
|
||||
candidate = os.path.join(prefix, filename)
|
||||
if os.path.exists(candidate):
|
||||
return candidate
|
||||
return filename
|
||||
|
||||
def pixmapfile(filename):
|
||||
|
|
|
|||
|
|
@ -82,9 +82,9 @@ class dispframe(wx.Frame):
|
|||
|
||||
self.Refresh()
|
||||
if self.p != None and self.p.online:
|
||||
self.p.send_now("G91")
|
||||
self.p.send_now("G1 Z%f F300" % (self.thickness,))
|
||||
self.p.send_now("G90")
|
||||
self.p.send_now("G91")
|
||||
self.p.send_now("G1 Z%f F300" % (self.thickness,))
|
||||
self.p.send_now("G90")
|
||||
|
||||
def nextimg(self, event):
|
||||
if self.index < len(self.layers):
|
||||
|
|
|
|||
|
|
@ -304,14 +304,14 @@ class gcview(object):
|
|||
('v3f/static', vertices),
|
||||
('n3f/static', normals)))
|
||||
if lasth is not None:
|
||||
self.layers[lasth] = pyglet.graphics.Batch()
|
||||
indices = range(len(layertemp[lasth][0])) # [[3*i,3*i+1,3*i+2] for i in xrange(len(facets))]
|
||||
self.vlists.append(self.layers[lasth].add_indexed(len(layertemp[lasth][0]) // 3,
|
||||
GL_TRIANGLES,
|
||||
None, # group,
|
||||
indices,
|
||||
('v3f/static', layertemp[lasth][0]),
|
||||
('n3f/static', layertemp[lasth][1])))
|
||||
self.layers[lasth] = pyglet.graphics.Batch()
|
||||
indices = range(len(layertemp[lasth][0])) # [[3*i,3*i+1,3*i+2] for i in xrange(len(facets))]
|
||||
self.vlists.append(self.layers[lasth].add_indexed(len(layertemp[lasth][0]) // 3,
|
||||
GL_TRIANGLES,
|
||||
None, # group,
|
||||
indices,
|
||||
('v3f/static', layertemp[lasth][0]),
|
||||
('n3f/static', layertemp[lasth][1])))
|
||||
|
||||
def genline(self, i, h, w):
|
||||
S = i[0][:3]
|
||||
|
|
@ -356,28 +356,28 @@ class gcview(object):
|
|||
return spoints, epoints, S, E
|
||||
|
||||
def transform(self, line):
|
||||
line = line.split(";")[0]
|
||||
cur = self.prev[:]
|
||||
if len(line) > 0:
|
||||
if "G1" in line or "G0" in line or "G92" in line:
|
||||
if("X" in line):
|
||||
cur[0] = float(line.split("X")[1].split(" ")[0])
|
||||
if("Y" in line):
|
||||
cur[1] = float(line.split("Y")[1].split(" ")[0])
|
||||
if("Z" in line):
|
||||
cur[2] = float(line.split("Z")[1].split(" ")[0])
|
||||
if("E" in line):
|
||||
cur[3] = float(line.split("E")[1].split(" ")[0])
|
||||
if self.prev == cur:
|
||||
return None
|
||||
if self.fline or "G92" in line:
|
||||
self.prev = cur
|
||||
self.fline = 0
|
||||
return None
|
||||
else:
|
||||
r = [self.prev, cur]
|
||||
self.prev = cur
|
||||
return r
|
||||
line = line.split(";")[0]
|
||||
cur = self.prev[:]
|
||||
if len(line) > 0:
|
||||
if "G1" in line or "G0" in line or "G92" in line:
|
||||
if("X" in line):
|
||||
cur[0] = float(line.split("X")[1].split(" ")[0])
|
||||
if("Y" in line):
|
||||
cur[1] = float(line.split("Y")[1].split(" ")[0])
|
||||
if("Z" in line):
|
||||
cur[2] = float(line.split("Z")[1].split(" ")[0])
|
||||
if("E" in line):
|
||||
cur[3] = float(line.split("E")[1].split(" ")[0])
|
||||
if self.prev == cur:
|
||||
return None
|
||||
if self.fline or "G92" in line:
|
||||
self.prev = cur
|
||||
self.fline = 0
|
||||
return None
|
||||
else:
|
||||
r = [self.prev, cur]
|
||||
self.prev = cur
|
||||
return r
|
||||
|
||||
def delete(self):
|
||||
for i in self.vlists:
|
||||
|
|
@ -570,27 +570,27 @@ class TestGlPanel(GLPanel):
|
|||
self.initpos = None
|
||||
|
||||
elif event.Dragging() and event.RightIsDown() and event.ShiftDown():
|
||||
if self.initpos is None:
|
||||
self.initpos = event.GetPositionTuple()
|
||||
else:
|
||||
p1 = self.initpos
|
||||
p2 = event.GetPositionTuple()
|
||||
sz = self.GetClientSize()
|
||||
p1 = list(p1)
|
||||
p2 = list(p2)
|
||||
p1[1] *= -1
|
||||
p2[1] *= -1
|
||||
if self.initpos is None:
|
||||
self.initpos = event.GetPositionTuple()
|
||||
else:
|
||||
p1 = self.initpos
|
||||
p2 = event.GetPositionTuple()
|
||||
sz = self.GetClientSize()
|
||||
p1 = list(p1)
|
||||
p2 = list(p2)
|
||||
p1[1] *= -1
|
||||
p2[1] *= -1
|
||||
|
||||
self.transv = map(lambda x, y, z, c: c - self.dist * (x - y) / z, list(p1) + [0], list(p2) + [0], list(sz) + [1], self.transv)
|
||||
self.transv = map(lambda x, y, z, c: c - self.dist * (x - y) / z, list(p1) + [0], list(p2) + [0], list(sz) + [1], self.transv)
|
||||
|
||||
glLoadIdentity()
|
||||
glTranslatef(self.transv[0], self.transv[1], 0)
|
||||
glTranslatef(0, 0, self.transv[2])
|
||||
if(self.rot):
|
||||
glMultMatrixd(build_rotmatrix(self.basequat))
|
||||
glGetDoublev(GL_MODELVIEW_MATRIX, self.mvmat)
|
||||
self.rot = 1
|
||||
self.initpos = None
|
||||
glLoadIdentity()
|
||||
glTranslatef(self.transv[0], self.transv[1], 0)
|
||||
glTranslatef(0, 0, self.transv[2])
|
||||
if(self.rot):
|
||||
glMultMatrixd(build_rotmatrix(self.basequat))
|
||||
glGetDoublev(GL_MODELVIEW_MATRIX, self.mvmat)
|
||||
self.rot = 1
|
||||
self.initpos = None
|
||||
else:
|
||||
#mouse is moving without a button press
|
||||
p = event.GetPositionTuple()
|
||||
|
|
|
|||
|
|
@ -40,4 +40,3 @@ if not hasattr(wx.GraphicsPath, "AddEllipticalArc"):
|
|||
wx.GraphicsPath.AddEllipticalArc = AddEllipticalArc
|
||||
|
||||
del AddEllipticalArc
|
||||
|
||||
|
|
@ -5,4 +5,3 @@
|
|||
from pyparsing import nestedExpr
|
||||
|
||||
block = nestedExpr(opener="{", closer="}")
|
||||
|
||||
|
|
|
|||
|
|
@ -189,5 +189,3 @@ if __name__ == '__main__':
|
|||
#~ from tests.test_pathdata import *
|
||||
#~ unittest.main()
|
||||
profile()
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -237,10 +237,10 @@ class WebInterface(object):
|
|||
|
||||
def __init__(self, pface):
|
||||
if (sys.version_info[1] > 6):
|
||||
# 'allow_no_value' wasn't added until 2.7
|
||||
config = ConfigParser.SafeConfigParser(allow_no_value=True)
|
||||
# 'allow_no_value' wasn't added until 2.7
|
||||
config = ConfigParser.SafeConfigParser(allow_no_value=True)
|
||||
else:
|
||||
config = ConfigParser.SafeConfigParser()
|
||||
config = ConfigParser.SafeConfigParser()
|
||||
config.read(configfile(pface.web_auth_config or 'auth.config'))
|
||||
users[config.get("user", "user")] = config.get("user", "pass")
|
||||
self.pface = pface
|
||||
|
|
|
|||
|
|
@ -56,9 +56,9 @@ class XYButtons(BufferedCanvas):
|
|||
self.lastMove = None
|
||||
self.lastCorner = None
|
||||
|
||||
self.bgcolor = wx.Colour()
|
||||
self.bgcolor.SetFromName(bgcolor)
|
||||
self.bgcolormask = wx.Colour(self.bgcolor.Red(), self.bgcolor.Green(), self.bgcolor.Blue(), 128)
|
||||
self.bgcolor = wx.Colour()
|
||||
self.bgcolor.SetFromName(bgcolor)
|
||||
self.bgcolormask = wx.Colour(self.bgcolor.Red(), self.bgcolor.Green(), self.bgcolor.Blue(), 128)
|
||||
|
||||
BufferedCanvas.__init__(self, parent, ID)
|
||||
self.SetSize(self.bg_bmp.GetSize())
|
||||
|
|
@ -218,7 +218,7 @@ class XYButtons(BufferedCanvas):
|
|||
|
||||
|
||||
def draw(self, dc, w, h):
|
||||
dc.SetBackground(wx.Brush(self.bgcolor))
|
||||
dc.SetBackground(wx.Brush(self.bgcolor))
|
||||
dc.Clear()
|
||||
gc = wx.GraphicsContext.Create(dc)
|
||||
|
||||
|
|
|
|||
|
|
@ -42,9 +42,9 @@ class ZButtons(BufferedCanvas):
|
|||
# Remember the last clicked value, so we can repeat when spacebar pressed
|
||||
self.lastValue = None
|
||||
|
||||
self.bgcolor = wx.Colour()
|
||||
self.bgcolor.SetFromName(bgcolor)
|
||||
self.bgcolormask = wx.Colour(self.bgcolor.Red(), self.bgcolor.Green(), self.bgcolor.Blue(), 128)
|
||||
self.bgcolor = wx.Colour()
|
||||
self.bgcolor.SetFromName(bgcolor)
|
||||
self.bgcolormask = wx.Colour(self.bgcolor.Red(), self.bgcolor.Green(), self.bgcolor.Blue(), 128)
|
||||
|
||||
BufferedCanvas.__init__(self, parent, ID)
|
||||
|
||||
|
|
@ -99,7 +99,7 @@ class ZButtons(BufferedCanvas):
|
|||
return (self.lookupRange(abs(ydelta)), sign(ydelta))
|
||||
|
||||
def draw(self, dc, w, h):
|
||||
dc.SetBackground(wx.Brush(self.bgcolor))
|
||||
dc.SetBackground(wx.Brush(self.bgcolor))
|
||||
dc.Clear()
|
||||
gc = wx.GraphicsContext.Create(dc)
|
||||
if self.bg_bmp:
|
||||
|
|
|
|||
|
|
@ -82,4 +82,3 @@ if __name__ == '__main__':
|
|||
"""
|
||||
zimage("catposthtmap2.jpg","testobj.stl")
|
||||
del a
|
||||
|
||||
|
|
|
|||
|
|
@ -1248,4 +1248,3 @@ if __name__=="__main__":
|
|||
except:
|
||||
interp.p.disconnect()
|
||||
#raise
|
||||
|
||||
|
|
|
|||
|
|
@ -738,7 +738,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
|
|||
self.btemp.SetValue(i)
|
||||
for i in htemp_choices:
|
||||
if i.split()[0] == str(self.settings.last_temperature).split('.')[0] or i.split()[0] == str(self.settings.last_temperature) :
|
||||
self.htemp.SetValue(i)
|
||||
self.htemp.SetValue(i)
|
||||
|
||||
if( '(' not in self.btemp.Value):
|
||||
self.btemp.SetValue(self.btemp.Value + ' (user)')
|
||||
|
|
@ -845,7 +845,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
|
|||
self.commandbox.SetSelection(0,len(self.commandbox.history[self.commandbox.histindex]))
|
||||
elif e.GetKeyCode()==wx.WXK_DOWN:
|
||||
if self.commandbox.histindex==len(self.commandbox.history):
|
||||
self.commandbox.history+=[self.commandbox.GetValue()] #save current command
|
||||
self.commandbox.history+=[self.commandbox.GetValue()] #save current command
|
||||
if len(self.commandbox.history):
|
||||
self.commandbox.histindex=(self.commandbox.histindex+1)%len(self.commandbox.history)
|
||||
self.commandbox.SetValue(self.commandbox.history[self.commandbox.histindex])
|
||||
|
|
@ -957,10 +957,10 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
|
|||
b.SetToolTip(wx.ToolTip(_("click to add new custom button")))
|
||||
b.Bind(wx.EVT_BUTTON,self.cbutton_edit)
|
||||
else:
|
||||
b=wx.Button(self.panel,-1,".",size=(1,1))
|
||||
#b=wx.StaticText(self.panel,-1,"",size=(72,22),style=wx.ALIGN_CENTRE+wx.ST_NO_AUTORESIZE) #+wx.SIMPLE_BORDER
|
||||
b.Disable()
|
||||
#continue
|
||||
b=wx.Button(self.panel,-1,".",size=(1,1))
|
||||
#b=wx.StaticText(self.panel,-1,"",size=(72,22),style=wx.ALIGN_CENTRE+wx.ST_NO_AUTORESIZE) #+wx.SIMPLE_BORDER
|
||||
b.Disable()
|
||||
#continue
|
||||
b.custombutton=i
|
||||
b.properties=btndef
|
||||
if btndef is not None:
|
||||
|
|
@ -984,9 +984,9 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
|
|||
def nextarg(rest):
|
||||
rest=rest.lstrip()
|
||||
if rest.startswith('"'):
|
||||
return rest[1:].split('"',1)
|
||||
return rest[1:].split('"',1)
|
||||
else:
|
||||
return rest.split(None,1)
|
||||
return rest.split(None,1)
|
||||
#try:
|
||||
num,argstr=nextarg(argstr)
|
||||
num=int(num)
|
||||
|
|
@ -1518,7 +1518,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
|
|||
self.f=[i.replace("\n","").replace("\r","") for i in of]
|
||||
of.close()
|
||||
if self.p.online:
|
||||
wx.CallAfter(self.printbtn.Enable)
|
||||
wx.CallAfter(self.printbtn.Enable)
|
||||
|
||||
wx.CallAfter(self.status.SetStatusText,_("Loaded ")+self.filename+_(", %d lines") % (len(self.f),))
|
||||
wx.CallAfter(self.pausebtn.Disable)
|
||||
|
|
@ -1553,7 +1553,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
|
|||
except:
|
||||
pass
|
||||
dlg=wx.FileDialog(self,_("Open file to print"),basedir,style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
|
||||
dlg.SetWildcard(_("OBJ, STL, and GCODE files (*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ)|*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ|All Files (*.*)|*.*"))
|
||||
dlg.SetWildcard(_("OBJ, STL, and GCODE files (*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ)|*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ|All Files (*.*)|*.*"))
|
||||
if(filename is not None or dlg.ShowModal() == wx.ID_OK):
|
||||
if filename is not None:
|
||||
name=filename
|
||||
|
|
@ -1810,4 +1810,3 @@ if __name__ == '__main__':
|
|||
app.MainLoop()
|
||||
except:
|
||||
pass
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue