From e90fd954951c0696b2bdd8169c3343cd231e8127 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 1 Mar 2016 15:16:50 +0100 Subject: [PATCH 1/4] Profile importing now checks if it's the right file type Contributes to CURA-936 --- plugins/GCodeProfileReader/GCodeProfileReader.py | 5 +++++ plugins/LegacyProfileReader/LegacyProfileReader.py | 2 ++ 2 files changed, 7 insertions(+) diff --git a/plugins/GCodeProfileReader/GCodeProfileReader.py b/plugins/GCodeProfileReader/GCodeProfileReader.py index 7c72d0a958..b90c01ddf4 100644 --- a/plugins/GCodeProfileReader/GCodeProfileReader.py +++ b/plugins/GCodeProfileReader/GCodeProfileReader.py @@ -4,6 +4,7 @@ from UM.Application import Application #To get the machine manager to create the new profile in. from UM.Settings.Profile import Profile from UM.Settings.ProfileReader import ProfileReader +from UM.Logger import Logger import re #Regular expressions for parsing escape characters in the settings. ## A class that reads profile data from g-code files. @@ -40,6 +41,9 @@ class GCodeProfileReader(ProfileReader): # specified file was no g-code or contained no parsable profile, \code # None \endcode is returned. def read(self, file_name): + if file_name.split(".")[-1] != "gcode": + return None + prefix = ";SETTING_" + str(GCodeProfileReader.version) + " " prefix_length = len(prefix) @@ -63,5 +67,6 @@ class GCodeProfileReader(ProfileReader): try: profile.unserialise(serialised) except Exception as e: #Not a valid g-code file. + Logger.log("e", "Unable to serialise the profile: %s", str(e)) return None return profile \ No newline at end of file diff --git a/plugins/LegacyProfileReader/LegacyProfileReader.py b/plugins/LegacyProfileReader/LegacyProfileReader.py index 2fe221cd53..1d1c3126e9 100644 --- a/plugins/LegacyProfileReader/LegacyProfileReader.py +++ b/plugins/LegacyProfileReader/LegacyProfileReader.py @@ -63,6 +63,8 @@ class LegacyProfileReader(ProfileReader): # file could not be read or didn't contain a valid profile, \code None # \endcode is returned. def read(self, file_name): + if file_name.split(".")[-1] != "ini": + return None Logger.log("i", "Importing legacy profile from file " + file_name + ".") profile = Profile(machine_manager = Application.getInstance().getMachineManager(), read_only = False) #Create an empty profile. From 9c5e169f2bca0b0101ce8e8d78ff9ddb821c4d67 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 1 Mar 2016 16:24:43 +0100 Subject: [PATCH 2/4] Loaded profiles are now marked as dirty so they are saved correctly CURA-936 --- plugins/GCodeProfileReader/GCodeProfileReader.py | 5 ++++- plugins/LegacyProfileReader/LegacyProfileReader.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/GCodeProfileReader/GCodeProfileReader.py b/plugins/GCodeProfileReader/GCodeProfileReader.py index b90c01ddf4..140547a05c 100644 --- a/plugins/GCodeProfileReader/GCodeProfileReader.py +++ b/plugins/GCodeProfileReader/GCodeProfileReader.py @@ -66,7 +66,10 @@ class GCodeProfileReader(ProfileReader): profile = Profile(machine_manager = Application.getInstance().getMachineManager(), read_only = False) try: profile.unserialise(serialised) - except Exception as e: #Not a valid g-code file. + profile.setType(None) #Force type to none so it's correctly added. + profile.setReadOnly(False) + profile.setDirty(True) + except Exception as e: #Not a valid g-comachine_instance_profilede file. Logger.log("e", "Unable to serialise the profile: %s", str(e)) return None return profile \ No newline at end of file diff --git a/plugins/LegacyProfileReader/LegacyProfileReader.py b/plugins/LegacyProfileReader/LegacyProfileReader.py index 1d1c3126e9..661646bf64 100644 --- a/plugins/LegacyProfileReader/LegacyProfileReader.py +++ b/plugins/LegacyProfileReader/LegacyProfileReader.py @@ -124,5 +124,5 @@ class LegacyProfileReader(ProfileReader): if len(profile.getChangedSettings()) == 0: Logger.log("i", "A legacy profile was imported but everything evaluates to the defaults, creating an empty profile.") - + profile.setDirty(True) return profile \ No newline at end of file From a50ef02d81adc58f4f8e02a7cf00e82190eed7d9 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 2 Mar 2016 14:49:41 +0100 Subject: [PATCH 3/4] Code cleanup --- cura/ConvexHullDecorator.py | 14 ++++++++++++-- cura/ConvexHullJob.py | 8 ++++++-- cura/OneAtATimeIterator.py | 37 ++++++++++++++++++++----------------- 3 files changed, 38 insertions(+), 21 deletions(-) diff --git a/cura/ConvexHullDecorator.py b/cura/ConvexHullDecorator.py index f791441f1e..de51aacd0e 100644 --- a/cura/ConvexHullDecorator.py +++ b/cura/ConvexHullDecorator.py @@ -9,8 +9,10 @@ class ConvexHullDecorator(SceneNodeDecorator): # In case of printing all at once this is the same as the convex hull. For one at the time this is the area without the head. self._convex_hull_boundary = None - # In case of printing all at once this is the same as the convex hull. For one at the time this is area with full head + # In case of printing all at once this is the same as the convex hull. For one at the time this is area with intersection of mirrored head self._convex_hull_head = None + # In case of printing all at once this is the same as the convex hull. For one at the time this is area with intersection of full head + self._convex_hull_head_full = None self._convex_hull_node = None self._convex_hull_job = None @@ -28,6 +30,11 @@ class ConvexHullDecorator(SceneNodeDecorator): def getConvexHull(self): return self._convex_hull + def getConvexHullHeadFull(self): + if not self._convex_hull_head_full: + return self.getConvexHull() + return self._convex_hull_head_full + def getConvexHullHead(self): if not self._convex_hull_head: return self.getConvexHull() @@ -40,7 +47,10 @@ class ConvexHullDecorator(SceneNodeDecorator): def setConvexHullBoundary(self, hull): self._convex_hull_boundary = hull - + + def setConvexHullHeadFull(self, hull): + self._convex_hull_head_full = hull + def setConvexHullHead(self, hull): self._convex_hull_head = hull diff --git a/cura/ConvexHullJob.py b/cura/ConvexHullJob.py index fe9a6c279f..2ffb1e98f7 100644 --- a/cura/ConvexHullJob.py +++ b/cura/ConvexHullJob.py @@ -55,12 +55,16 @@ class ConvexHullJob(Job): # Printing one at a time and it's not an object in a group self._node.callDecoration("setConvexHullBoundary", copy.deepcopy(hull)) head_and_fans = Polygon(numpy.array(profile.getSettingValue("machine_head_with_fans_polygon"), numpy.float32)) + # Full head hull is used to actually check the order. + full_head_hull = hull.getMinkowskiHull(head_and_fans) + self._node.callDecoration("setConvexHullHeadFull", full_head_hull) mirrored = copy.deepcopy(head_and_fans) mirrored.mirror([0, 0], [0, 1]) #Mirror horizontally. mirrored.mirror([0, 0], [1, 0]) #Mirror vertically. head_and_fans = head_and_fans.intersectionConvexHulls(mirrored) - head_hull = hull.getMinkowskiHull(head_and_fans) - self._node.callDecoration("setConvexHullHead", head_hull) + # Min head hull is used for the push free + min_head_hull = hull.getMinkowskiHull(head_and_fans) + self._node.callDecoration("setConvexHullHead", min_head_hull) hull = hull.getMinkowskiHull(Polygon(numpy.array(profile.getSettingValue("machine_head_polygon"),numpy.float32))) else: self._node.callDecoration("setConvexHullHead", None) diff --git a/cura/OneAtATimeIterator.py b/cura/OneAtATimeIterator.py index 42ec14e6ff..dc09b5aa09 100644 --- a/cura/OneAtATimeIterator.py +++ b/cura/OneAtATimeIterator.py @@ -25,22 +25,23 @@ class OneAtATimeIterator(Iterator.Iterator): return if node.callDecoration("getConvexHull"): node_list.append(node) - + if len(node_list) < 2: self._node_stack = node_list[:] return - + + # Copy the list self._original_node_list = node_list[:] - + ## Initialise the hit map (pre-compute all hits between all objects) - self._hit_map = [[self._checkHit(j,i) for i in node_list] for j in node_list] - + self._hit_map = [[self._checkHit(i,j) for i in node_list] for j in node_list] + # Check if we have to files that block eachother. If this is the case, there is no solution! for a in range(0,len(node_list)): for b in range(0,len(node_list)): if a != b and self._hit_map[a][b] and self._hit_map[b][a]: return - + # Sort the original list so that items that block the most other objects are at the beginning. # This does not decrease the worst case running time, but should improve it in most cases. sorted(node_list, key = cmp_to_key(self._calculateScore)) @@ -59,44 +60,46 @@ class OneAtATimeIterator(Iterator.Iterator): # We have no more nodes to check, so quit looking. todo_node_list = None self._node_stack = new_order - + return todo_node_list.append(_ObjectOrder(new_order, new_todo_list)) - self._node_stack = [] #No result found! + self._node_stack = [] #No result found! + - # Check if first object can be printed before the provided list (using the hit map) def _checkHitMultiple(self, node, other_nodes): node_index = self._original_node_list.index(node) for other_node in other_nodes: - if self._hit_map[node_index][self._original_node_list.index(other_node)]: + other_node_index = self._original_node_list.index(other_node) + if self._hit_map[node_index][other_node_index]: return True return False - + def _checkBlockMultiple(self, node, other_nodes): node_index = self._original_node_list.index(node) for other_node in other_nodes: - if self._hit_map[self._original_node_list.index(other_node)][node_index] and node_index != self._original_node_list.index(other_node): + other_node_index = self._original_node_list.index(other_node) + if self._hit_map[other_node_index][node_index] and node_index != other_node_index: return True return False - + ## Calculate score simply sums the number of other objects it 'blocks' def _calculateScore(self, a, b): score_a = sum(self._hit_map[self._original_node_list.index(a)]) score_b = sum(self._hit_map[self._original_node_list.index(b)]) return score_a - score_b - + # Checks if A can be printed before B def _checkHit(self, a, b): if a == b: return False - + overlap = a.callDecoration("getConvexHullBoundary").intersectsPolygon(b.callDecoration("getConvexHullHead")) if overlap: return True else: return False - + ## Internal object used to keep track of a possible order in which to print objects. class _ObjectOrder(): @@ -107,4 +110,4 @@ class _ObjectOrder(): """ self.order = order self.todo = todo - + From a04a470794ec9abc74b264199c155ab32d225099 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 2 Mar 2016 14:49:54 +0100 Subject: [PATCH 4/4] Fixed order of one at a time printing CURA-900 --- cura/OneAtATimeIterator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/OneAtATimeIterator.py b/cura/OneAtATimeIterator.py index dc09b5aa09..6ecd49d8b3 100644 --- a/cura/OneAtATimeIterator.py +++ b/cura/OneAtATimeIterator.py @@ -94,7 +94,7 @@ class OneAtATimeIterator(Iterator.Iterator): if a == b: return False - overlap = a.callDecoration("getConvexHullBoundary").intersectsPolygon(b.callDecoration("getConvexHullHead")) + overlap = a.callDecoration("getConvexHullBoundary").intersectsPolygon(b.callDecoration("getConvexHullHeadFull")) if overlap: return True else: