diff --git a/cura/ConvexHullJob.py b/cura/ConvexHullJob.py index 8d33efef39..9dfc4c0065 100644 --- a/cura/ConvexHullJob.py +++ b/cura/ConvexHullJob.py @@ -42,7 +42,7 @@ class ConvexHullJob(Job): # Don't use data below 0. # TODO; We need a better check for this as this gives poor results for meshes with long edges. vertex_data = vertex_data[vertex_data[:,1] >= 0] - hull = Polygon(numpy.rint(vertex_data[:, [0, 2]]).astype(int)) + hull = Polygon(vertex_data[:, [0, 2]]) # First, calculate the normal convex hull around the points hull = hull.getConvexHull() diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 639a8eda40..5677515a9e 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -90,10 +90,13 @@ class CuraEngineBackend(Backend): # \return list of commands and args / parameters. def getEngineCommand(self): active_machine = Application.getInstance().getMachineManager().getActiveMachineInstance() + json_path = "" if not active_machine: - return None + json_path = Resources.getPath(Resources.MachineDefinitions, "fdmprinter.json") + else: + json_path = active_machine.getMachineDefinition().getPath() - return [Preferences.getInstance().getValue("backend/location"), "connect", "127.0.0.1:{0}".format(self._port), "-j", active_machine.getMachineDefinition().getPath(), "-vv"] + return [Preferences.getInstance().getValue("backend/location"), "connect", "127.0.0.1:{0}".format(self._port), "-j", json_path, "-vv"] ## Emitted when we get a message containing print duration and material amount. This also implies the slicing has finished. # \param time The amount of time the print will take.