OpenGL / 3D view refactor

printrun/gcodeplater.py

@@ -23,17 +23,23 @@
 import re
 import math
 import logging
+import traceback
 
 from printrun import gcoder
 from printrun.objectplater import make_plater, PlaterPanel
-from printrun.gl.libtatlin import actors
-import printrun.gui.viz  # NOQA
-from printrun import gcview
-
 from .utils import install_locale, get_home_pos
 install_locale('pronterface')
-# Set up Internationalization using gettext
-# searching for installed locales on /usr/share; uses relative folder if not found (windows)
+
+glview = '--no-gl' not in sys.argv
+if glview:
+    try:
+        from printrun import gcview
+        from printrun.gl import actors
+    except ImportError:
+        glview = False
+        logging.warning(_("Could not load 3D viewer for plater:") +
+                        "\n" + traceback.format_exc())
+
 
 def extrusion_only(gline):
     return gline.e is not None \
@@ -76,50 +82,65 @@ def rewrite_gline(centeroffset, gline, cosr, sinr):
 
 class GcodePlaterPanel(PlaterPanel):
 
-    load_wildcard = _("GCODE files") + " (*.gcode;*.GCODE;*.g)|*.gcode;*.gco;*.g"
+    load_wildcard = _("G-Code Files") + \
+                    " (*.gcode;*.GCODE;*.gco;*.g)|*.gcode;*.GCODE;*.gco;*.g"
     save_wildcard = load_wildcard
 
     def prepare_ui(self, filenames = [], callback = None,
                    parent = None, build_dimensions = None,
                    circular_platform = False,
                    antialias_samples = 0,
-                   grid = (1, 10)):
+                   grid = (1, 10),
+                   perspective = False):
         super().prepare_ui(filenames, callback, parent, build_dimensions, cutting_tool = False)
-        viewer = gcview.GcodeViewPanel(self, build_dimensions = self.build_dimensions,
-                                       antialias_samples = antialias_samples)
+        if glview:
+            viewer = gcview.GcodeViewPanel(self, build_dimensions = self.build_dimensions,
+                                           antialias_samples = antialias_samples,
+                                           circular = circular_platform,
+                                           grid = grid,
+                                           perspective = perspective)
+        else:
+            message = "3D visualisation failed to open.\n2D visualisation is unfortunately not yet implemented.\nClick 'OK' to exit."
+            answer = wx.MessageBox(message, "GCode Plater", wx.OK, self)
+            if answer == wx.OK:
+                self.DestroyLater()
+            return
+
         self.set_viewer(viewer)
-        self.platform = actors.Platform(self.build_dimensions,
-                                        circular = circular_platform,
-                                        grid = grid)
-        self.platform_object = gcview.GCObject(self.platform)
         self.Layout()
         self.SetMinClientSize(self.topsizer.CalcMin())
         self.SetTitle(_("G-Code Plate Builder"))
 
     def get_objects(self):
-        return [self.platform_object] + list(self.models.values())
+        return list(self.models.values())
     objects = property(get_objects)
 
     def load_file(self, filename):
         with open(filename, "r") as file:
             gcode = gcoder.GCode(file, get_home_pos(self.build_dimensions))
-        model = actors.GcodeModel()
-        if gcode.filament_length > 0:
-            model.display_travels = False
-        generator = model.load_data(gcode)
-        generator_output = next(generator)
-        while generator_output is not None:
+
+        if glview:
+            model = actors.GcodeModel()
+            if gcode.filament_length > 0:
+                model.display_travels = False
+            generator = model.load_data(gcode)
             generator_output = next(generator)
-        obj = gcview.GCObject(model)
-        obj.offsets = [self.build_dimensions[3], self.build_dimensions[4], 0]
-        obj.gcode = gcode
-        obj.dims = [gcode.xmin, gcode.xmax,
-                    gcode.ymin, gcode.ymax,
-                    gcode.zmin, gcode.zmax]
-        obj.centeroffset = [-(obj.dims[1] + obj.dims[0]) / 2,
-                            -(obj.dims[3] + obj.dims[2]) / 2,
-                            0]
-        self.add_model(filename, obj)
+            while generator_output is not None:
+                generator_output = next(generator)
+            obj = gcview.GCObject(model)
+            obj.offsets = [self.build_dimensions[3], self.build_dimensions[4], 0]
+            obj.gcode = gcode
+            obj.dims = [gcode.xmin, gcode.xmax,
+                        gcode.ymin, gcode.ymax,
+                        gcode.zmin, gcode.zmax]
+            obj.centeroffset = [-(obj.dims[1] + obj.dims[0]) / 2,
+                                -(obj.dims[3] + obj.dims[2]) / 2,
+                                0]
+            self.add_model(filename, obj)
+        else:
+            model = self.s.addfile(gcode)
+
+
         wx.CallAfter(self.Refresh)
 
     def done(self, event, cb):