Solved MC

cura/BuildVolume.py

@@ -110,10 +110,11 @@ class BuildVolume(SceneNode):
 
     def _onChangeTimerFinished(self):
         root = Application.getInstance().getController().getScene().getRoot()
-        new_scene_objects = set(node for node in BreadthFirstIterator(root) if node.getMeshData() and type(node) is SceneNode)
+        new_scene_objects = set(node for node in BreadthFirstIterator(root) if node.callDecoration("isSliceable"))
         if new_scene_objects != self._scene_objects:
             for node in new_scene_objects - self._scene_objects: #Nodes that were added to the scene.
-                node.decoratorsChanged.connect(self._onNodeDecoratorChanged)
+                self._onNodeDecoratorChanged(node)
+                node.decoratorsChanged.connect(self._onNodeDecoratorChanged)  # Make sure that decoration changes afterwards also receive the same treatment
             for node in self._scene_objects - new_scene_objects: #Nodes that were removed from the scene.
                 per_mesh_stack = node.callDecoration("getStack")
                 if per_mesh_stack:

cura/PrintInformation.py

@@ -75,6 +75,8 @@ class PrintInformation(QObject):
         Application.getInstance().getMachineManager().activeMaterialChanged.connect(self._onActiveMaterialChanged)
         self._onActiveMaterialChanged()
 
+        self._material_amounts = []
+
     currentPrintTimeChanged = pyqtSignal()
 
     preSlicedChanged = pyqtSignal()

plugins/GCodeReader/GCodeReader.py

@@ -37,7 +37,6 @@ class GCodeReader(MeshReader):
         self._message = None
         self._layer_number = 0
         self._extruder_number = 0
-        self._layer_type = LayerPolygon.Inset0Type
         self._clearValues()
         self._scene_node = None
         self._position = namedtuple('Position', ['x', 'y', 'z', 'e'])
@@ -153,7 +152,6 @@ class GCodeReader(MeshReader):
                 self._previous_z = z
         else:
             path.append([x, y, z, LayerPolygon.MoveCombingType])
-
         return self._position(x, y, z, e)
 
     # G0 and G1 should be handled exactly the same.
@@ -172,7 +170,6 @@ class GCodeReader(MeshReader):
     def _gCode92(self, position, params, path):
         if params.e is not None:
             position.e[self._extruder_number] = params.e
-
         return self._position(
             params.x if params.x is not None else position.x,
             params.y if params.y is not None else position.y,
@@ -307,11 +304,11 @@ class GCodeReader(MeshReader):
                 G = self._getInt(line, "G")
                 if G is not None:
                     current_position = self._processGCode(G, line, current_position, current_path)
+
                     # < 2 is a heuristic for a movement only, that should not be counted as a layer
                     if current_position.z > last_z and abs(current_position.z - last_z) < 2:
                         if self._createPolygon(self._current_layer_thickness, current_path, self._extruder_offsets.get(self._extruder_number, [0, 0])):
                             current_path.clear()
-
                             if not self._is_layers_in_file:
                                 self._layer_number += 1
 

resources/i18n/de/fdmextruder.def.json.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-12-28 10:51+0000\n"
+"POT-Creation-Date: 2017-03-27 17:27+0000\n"
 "PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"

resources/i18n/es/fdmextruder.def.json.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-12-28 10:51+0000\n"
+"POT-Creation-Date: 2017-03-27 17:27+0000\n"
 "PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"

resources/i18n/fdmextruder.def.json.pot

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-12-28 10:51+0000\n"
+"POT-Creation-Date: 2017-03-27 17:27+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"

resources/i18n/fdmprinter.def.json.pot

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-12-28 10:51+0000\n"
+"POT-Creation-Date: 2017-03-27 17:27+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
@@ -268,6 +268,18 @@ msgid ""
 "extruder is no longer used."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "machine_nozzle_temp_enabled label"
+msgid "Enable Nozzle Temperature Control"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_nozzle_temp_enabled description"
+msgid ""
+"Whether to control temperature from Cura. Turn this off to control nozzle "
+"temperature from outside of Cura."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "machine_nozzle_heat_up_speed label"
 msgid "Heat up speed"
@@ -856,6 +868,47 @@ msgctxt "top_bottom_pattern option zigzag"
 msgid "Zig Zag"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "top_bottom_pattern_0 label"
+msgid "Bottom Pattern Initial Layer"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "top_bottom_pattern_0 description"
+msgid "The pattern on the bottom of the print on the first layer."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "top_bottom_pattern_0 option lines"
+msgid "Lines"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "top_bottom_pattern_0 option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "top_bottom_pattern_0 option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "skin_angles label"
+msgid "Top/Bottom Line Directions"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "skin_angles description"
+msgid ""
+"A list of integer line directions to use when the top/bottom layers use the "
+"lines or zig zag pattern. Elements from the list are used sequentially as "
+"the layers progress and when the end of the list is reached, it starts at "
+"the beginning again. The list items are separated by commas and the whole "
+"list is contained in square brackets. Default is an empty list which means "
+"use the traditional default angles (45 and 135 degrees)."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "wall_0_inset label"
 msgid "Outer Wall Inset"
@@ -1124,6 +1177,22 @@ msgctxt "infill_pattern option zigzag"
 msgid "Zig Zag"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "infill_angles label"
+msgid "Infill Line Directions"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "infill_angles description"
+msgid ""
+"A list of integer line directions to use. Elements from the list are used "
+"sequentially as the layers progress and when the end of the list is reached, "
+"it starts at the beginning again. The list items are separated by commas and "
+"the whole list is contained in square brackets. Default is an empty list "
+"which means use the traditional default angles (45 and 135 degrees for the "
+"lines and zig zag patterns and 45 degrees for all other patterns)."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "sub_div_rad_mult label"
 msgid "Cubic Subdivision Radius"
@@ -1262,6 +1331,97 @@ msgid ""
 "through the surface."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "min_infill_area label"
+msgid "Minimum Infill Area"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "min_infill_area description"
+msgid "Don't generate areas of infill smaller than this (use skin instead)."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "expand_skins_into_infill label"
+msgid "Expand Skins Into Infill"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "expand_skins_into_infill description"
+msgid ""
+"Expand skin areas of top and/or bottom skin of flat surfaces. By default, "
+"skins stop under the wall lines that surround infill but this can lead to "
+"holes appearing when the infill density is low. This setting extends the "
+"skins beyond the wall lines so that the infill on the next layer rests on "
+"skin."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "expand_upper_skins label"
+msgid "Expand Upper Skins"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "expand_upper_skins description"
+msgid ""
+"Expand upper skin areas (areas with air above) so that they support infill "
+"above."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "expand_lower_skins label"
+msgid "Expand Lower Skins"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "expand_lower_skins description"
+msgid ""
+"Expand lower skin areas (areas with air below) so that they are anchored by "
+"the infill layers above and below."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "expand_skins_expand_distance label"
+msgid "Skin Expand Distance"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "expand_skins_expand_distance description"
+msgid ""
+"The distance the skins are expanded into the infill. The default distance is "
+"enough to bridge the gap between the infill lines and will stop holes "
+"appearing in the skin where it meets the wall when the infill density is "
+"low. A smaller distance will often be sufficient."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "max_skin_angle_for_expansion label"
+msgid "Maximum Skin Angle for Expansion"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "max_skin_angle_for_expansion description"
+msgid ""
+"Top and/or bottom surfaces of your object with an angle larger than this "
+"setting, won't have their top/bottom skin expanded. This avoids expanding "
+"the narrow skin areas that are created when the model surface has a near "
+"vertical slope. An angle of 0° is horizontal, while an angle of 90° is "
+"vertical."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "min_skin_width_for_expansion label"
+msgid "Minimum Skin Width for Expansion"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "min_skin_width_for_expansion description"
+msgid ""
+"Skin areas narrower than this are not expanded. This avoids expanding the "
+"narrow skin areas that are created when the model surface has a slope close "
+"to the vertical."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "material label"
 msgid "Material"
@@ -1304,8 +1464,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_print_temperature description"
-msgid ""
-"The temperature used for printing. Set at 0 to pre-heat the printer manually."
+msgid "The temperature used for printing."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -1376,8 +1535,8 @@ msgstr ""
 #: fdmprinter.def.json
 msgctxt "material_bed_temperature description"
 msgid ""
-"The temperature used for the heated build plate. Set at 0 to pre-heat the "
-"printer manually."
+"The temperature used for the heated build plate. If this is 0, the bed will "
+"not heat up for this print."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -2216,6 +2375,16 @@ msgctxt "retraction_combing option noskin"
 msgid "No Skin"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "travel_retract_before_outer_wall label"
+msgid "Retract Before Outer Wall"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "travel_retract_before_outer_wall description"
+msgid "Always retract when moving to start an outer wall."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "travel_avoid_other_parts label"
 msgid "Avoid Printed Parts When Traveling"
@@ -2671,7 +2840,7 @@ msgctxt "support_z_distance description"
 msgid ""
 "Distance from the top/bottom of the support structure to the print. This gap "
 "provides clearance to remove the supports after the model is printed. This "
-"value is rounded down to a multiple of the layer height."
+"value is rounded up to a multiple of the layer height."
 msgstr ""
 
 #: fdmprinter.def.json

resources/i18n/fi/fdmextruder.def.json.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-12-28 10:51+0000\n"
+"POT-Creation-Date: 2017-03-27 17:27+0000\n"
 "PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"

resources/i18n/fr/fdmextruder.def.json.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-12-28 10:51+0000\n"
+"POT-Creation-Date: 2017-03-27 17:27+0000\n"
 "PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"

resources/i18n/it/fdmextruder.def.json.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-12-28 10:51+0000\n"
+"POT-Creation-Date: 2017-03-27 17:27+0000\n"
 "PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"

resources/i18n/nl/fdmextruder.def.json.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-12-28 10:51+0000\n"
+"POT-Creation-Date: 2017-03-27 17:27+0000\n"
 "PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: Ruben Dulek <r.dulek@ultimaker.com>\n"
 "Language-Team: Ultimaker\n"

resources/i18n/ptbr/fdmextruder.def.json.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-12-28 10:51+0000\n"
+"POT-Creation-Date: 2017-03-27 17:27+0000\n"
 "PO-Revision-Date: 2016-01-25 05:05-0300\n"
 "Last-Translator: Cláudio Sampaio <patola@makerlinux.com.br>\n"
 "Language-Team: LANGUAGE\n"
@@ -70,12 +70,8 @@ msgstr "Posição de Início do Extrusor Absoluta"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_abs description"
-msgid ""
-"Make the extruder starting position absolute rather than relative to the "
-"last-known location of the head."
-msgstr ""
-"Faz a posição de início do extrusor ser absoluta ao invés de relativa à "
-"última posição conhecida da cabeça de impressão."
+msgid "Make the extruder starting position absolute rather than relative to the last-known location of the head."
+msgstr "Faz a posição de início do extrusor ser absoluta ao invés de relativa à última posição conhecida da cabeça de impressão."
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_start_pos_x label"
@@ -114,12 +110,8 @@ msgstr "Posição Final do Extrusor Absoluta"
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_pos_abs description"
-msgid ""
-"Make the extruder ending position absolute rather than relative to the last-"
-"known location of the head."
-msgstr ""
-"Faz a posição final do extrusor ser absoluta ao invés de relativa à última "
-"posição conhecida da cabeça de impressão."
+msgid "Make the extruder ending position absolute rather than relative to the last-known location of the head."
+msgstr "Faz a posição final do extrusor ser absoluta ao invés de relativa à última posição conhecida da cabeça de impressão."
 
 #: fdmextruder.def.json
 msgctxt "machine_extruder_end_pos_x label"
@@ -148,11 +140,8 @@ msgstr "Posição Z de Purga do Extrusor"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_z description"
-msgid ""
-"The Z coordinate of the position where the nozzle primes at the start of "
-"printing."
-msgstr ""
-"A coordenada Z da posição onde o bico faz a purga no início da impressão."
+msgid "The Z coordinate of the position where the nozzle primes at the start of printing."
+msgstr "A coordenada Z da posição onde o bico faz a purga no início da impressão."
 
 #: fdmextruder.def.json
 msgctxt "platform_adhesion label"
@@ -171,11 +160,8 @@ msgstr "Posição X de Purga do Extrusor"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_x description"
-msgid ""
-"The X coordinate of the position where the nozzle primes at the start of "
-"printing."
-msgstr ""
-"A coordenada X da posição onde o bico faz a purga no início da impressão."
+msgid "The X coordinate of the position where the nozzle primes at the start of printing."
+msgstr "A coordenada X da posição onde o bico faz a purga no início da impressão."
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_y label"
@@ -184,8 +170,5 @@ msgstr "Posição Y de Purga do Extrusor"
 
 #: fdmextruder.def.json
 msgctxt "extruder_prime_pos_y description"
-msgid ""
-"The Y coordinate of the position where the nozzle primes at the start of "
-"printing."
-msgstr ""
-"A coordenada Y da posição onde o bico faz a purga no início da impressão."
+msgid "The Y coordinate of the position where the nozzle primes at the start of printing."
+msgstr "A coordenada Y da posição onde o bico faz a purga no início da impressão."

resources/i18n/tr/fdmextruder.def.json.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-12-28 10:51+0000\n"
+"POT-Creation-Date: 2017-03-27 17:27+0000\n"
 "PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"