lasercut-scripts: comparison printrun-src/printrun/stlplater.py

-:c82943fb205f
+:cce0af6351f0
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # This file is part of the Printrun suite.
 #
 # Printrun is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 from copy import copy
 from printrun import stltool
 from printrun.objectplater import make_plater, PlaterPanel
-glview = False
+glview = '--no-gl' not in sys.argv
-if "-nogl" not in sys.argv:
+if glview:
 try:
 from printrun import stlview
-glview = True
 except:
+glview = False
 logging.warning("Could not load 3D viewer for plater:"
 + "\n" + traceback.format_exc())
 def evalme(s):
 matrix = model.translation_matrix(model.offsets).dot(matrix)
 return matrix
 class showstl(wx.Window):
 def __init__(self, parent, size, pos):
-wx.Window.__init__(self, parent, size = size, pos = pos)
+super().__init__(parent, size = size, pos = pos)
 self.i = 0
 self.parent = parent
 self.previ = 0
 self.Bind(wx.EVT_MOUSEWHEEL, self.rot)
 self.Bind(wx.EVT_MOUSE_EVENTS, self.move)
 self.triggered = 0
 self.initpos = None
 self.prevsel = -1
 def prepare_model(self, m, scale):
-m.bitmap = wx.EmptyBitmap(800, 800, 32)
+m.bitmap = wx.Bitmap(800, 800, 32)
 dc = wx.MemoryDC()
 dc.SelectObject(m.bitmap)
 dc.SetBackground(wx.Brush((0, 0, 0, 0)))
 dc.SetBrush(wx.Brush((0, 0, 0, 255)))
 dc.SetBrush(wx.Brush(wx.Colour(128, 255, 128)))
 return True
 def move(self, event):
 if event.ButtonUp(wx.MOUSE_BTN_LEFT):
 if self.initpos is not None:
-currentpos = event.GetPositionTuple()
+currentpos = event.GetPosition()
 delta = (0.5 * (currentpos[0] - self.initpos[0]),
 -0.5 * (currentpos[1] - self.initpos[1])
 )
 self.move_shape(delta)
 self.Refresh()
 self.initpos = None
 elif event.ButtonDown(wx.MOUSE_BTN_RIGHT):
 self.parent.right(event)
 elif event.Dragging():
 if self.initpos is None:
-self.initpos = event.GetPositionTuple()
+self.initpos = event.GetPosition()
 self.Refresh()
 dc = wx.ClientDC(self)
-p = event.GetPositionTuple()
+p = event.GetPosition()
 dc.DrawLine(self.initpos[0], self.initpos[1], p[0], p[1])
 del dc
 else:
 event.Skip()
 z = event.GetWheelRotation()
 s = self.parent.l.GetSelection()
 if self.prevsel != s:
 self.i = 0
 self.prevsel = s
-if z < 0:
+self.rotate_shape(-1 if z < 0 else 1) #TEST
-self.rotate_shape(-1)
-else:
-self.rotate_shape(1)
 def repaint(self, event):
 dc = wx.PaintDC(self)
 self.paint(dc = dc)
 def paint(self, coord1 = "x", coord2 = "y", dc = None):
 if dc is None:
 dc = wx.ClientDC(self)
 scale = 2
 dc.SetPen(wx.Pen(wx.Colour(100, 100, 100)))
-for i in xrange(20):
+for i in range(20):
 dc.DrawLine(0, i * scale * 10, 400, i * scale * 10)
 dc.DrawLine(i * scale * 10, 0, i * scale * 10, 400)
 dc.SetPen(wx.Pen(wx.Colour(0, 0, 0)))
-for i in xrange(4):
+for i in range(4):
 dc.DrawLine(0, i * scale * 50, 400, i * scale * 50)
 dc.DrawLine(i * scale * 50, 0, i * scale * 50, 400)
 dc.SetBrush(wx.Brush(wx.Colour(128, 255, 128)))
 dc.SetPen(wx.Pen(wx.Colour(128, 128, 128)))
 dcs = wx.MemoryDC()
 save_wildcard = _("STL files (*.stl;*.STL)|*.stl;*.STL")
 def prepare_ui(self, filenames = [], callback = None,
 parent = None, build_dimensions = None, circular_platform = False,
 simarrange_path = None, antialias_samples = 0):
-super(StlPlaterPanel, self).prepare_ui(filenames, callback, parent, build_dimensions)
+super().prepare_ui(filenames, callback, parent, build_dimensions)
 self.cutting = False
 self.cutting_axis = None
 self.cutting_dist = None
 if glview:
-viewer = stlview.StlViewPanel(self, (580, 580),
+viewer = stlview.StlViewPanel(self, wx.DefaultSize,
 build_dimensions = self.build_dimensions,
 circular = circular_platform,
 antialias_samples = antialias_samples)
 # Cutting tool
 nrows = self.menusizer.GetRows()
 cutconfirmbutton = wx.Button(self.menupanel, label = _("Confirm cut"))
 cutconfirmbutton.Bind(wx.EVT_BUTTON, self.cut_confirm)
 cutconfirmbutton.Disable()
 self.cutconfirmbutton = cutconfirmbutton
 self.menusizer.Add(cutconfirmbutton, pos = (nrows, 1), span = (1, 1), flag = wx.EXPAND)
-cutpanel = wx.Panel(self.menupanel, -1)
+cutpanel = wx.Panel(self.menupanel)
 cutsizer = self.cutsizer = wx.BoxSizer(wx.HORIZONTAL)
 cutpanel.SetSizer(cutsizer)
 cutxplusbutton = wx.ToggleButton(cutpanel, label = _(">X"), style = wx.BU_EXACTFIT)
 cutxplusbutton.Bind(wx.EVT_TOGGLEBUTTON, lambda event: self.start_cutting_tool(event, "x", 1))
 cutsizer.Add(cutxplusbutton, 1, flag = wx.EXPAND)
 viewer = showstl(self, (580, 580), (0, 0))
 self.simarrange_path = simarrange_path
 self.set_viewer(viewer)
 def start_cutting_tool(self, event, axis, direction):
-toggle = event.GetEventObject()
+toggle = event.EventObject
-if toggle.GetValue():
+self.cutting = toggle.Value
+if toggle.Value:
 # Disable the other toggles
-for child in self.cutsizer.GetChildren():
+for child in self.cutsizer.Children:
-child = child.GetWindow()
+child = child.Window
 if child != toggle:
-child.SetValue(False)
+child.Value = False
-self.cutting = True
 self.cutting_axis = axis
-self.cutting_dist = None
 self.cutting_direction = direction
 else:
-self.cutting = False
 self.cutting_axis = None
-self.cutting_dist = None
 self.cutting_direction = None
+self.cutting_dist = None
 def cut_confirm(self, event):
 name = self.l.GetSelection()
 name = self.l.GetString(name)
 model = self.models[name]
 x, y = event.GetPosition()
 ray_near, ray_far = self.s.mouse_to_ray(x, y, local_transform = True)
 best_match = None
 best_facet = None
 best_dist = float("inf")
-for key, model in self.models.iteritems():
+for key, model in self.models.items():
 transformation = transformation_matrix(model)
 transformed = model.transform(transformation)
 if not transformed.intersect_box(ray_near, ray_far):
 logging.debug("Skipping %s for rebase search" % key)
 continue
 def autoplate(self, event = None):
 if self.simarrange_path:
 try:
 self.autoplate_simarrange()
-except Exception, e:
+except Exception as e:
 logging.warning(_("Failed to use simarrange for plating, "
 "falling back to the standard method. "
 "The error was: ") + e)
 super(StlPlaterPanel, self).autoplate()
 else:
 files = [model.filename for model in models.values()]
 command = [self.simarrange_path, "--dryrun",
 "-m",  # Pack around center
 "-x", str(int(self.build_dimensions[0])),
 "-y", str(int(self.build_dimensions[1]))] + files
-p = subprocess.Popen(command, stdout = subprocess.PIPE)
+p = subprocess.Popen(command, stdout = subprocess.PIPE, universal_newlines = True)
 pos_regexp = re.compile("File: (.*) minx: ([0-9]+), miny: ([0-9]+), minrot: ([0-9]+)")
 for line in p.stdout:
 line = line.rstrip()
 if "Generating plate" in line:
 bits = pos_regexp.match(line).groups()
 filename = bits[0]
 x = float(bits[1])
 y = float(bits[2])
 rot = -float(bits[3])
-for name, model in models.items():
+for name, model in list(models.items()):
 # FIXME: not sure this is going to work superwell with utf8
 if model.filename == filename:
 model.offsets[0] = x + self.build_dimensions[3]
 model.offsets[1] = y + self.build_dimensions[4]
 model.rot = rot

Mercurial > hg-public > lasercut-scripts / file comparison

comparison: printrun-src/printrun/stlplater.py

printrun-src/printrun/stlplater.py