Update of default density value for PLA.

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index 1978ed0101828d858015811b114e2028da001e3c..55025cf2fceac1aecf8e57dd698f01347da9243f 100644 (file)
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -1201,11 +1201,16 @@ void main(void)
 
                pointList = numpy.zeros((0,3), numpy.float32)
                for path in layer:
-                       if path['type'] == 'move' or path['type'] == 'retract':
-                               a = path['points']
+                       if path['type'] == 'move':
+                               a = path['points'] + numpy.array([0,0,0.01], numpy.float32)
                                a = numpy.concatenate((a[:-1], a[1:]), 1)
                                a = a.reshape((len(a) * 2, 3))
                                pointList = numpy.concatenate((pointList, a))
+#                      if path['type'] == 'retract':
+#                              a = path['points'] + numpy.array([0,0,0.01], numpy.float32)
+#                              a = numpy.concatenate((a[:-1], a[1:] + numpy.array([0,0,0.3], numpy.float32)), 1)
+#                              a = a.reshape((len(a) * 2, 3))
+#                              pointList = numpy.concatenate((pointList, a))
                ret.append(opengl.GLVBO(pointList))
 
                return ret

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index 62052ef8ad55f1161ecf6987a9ca828b4dbd0acc..9a47b6e2bd3480c11b492522c98067bcbae8cb08 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -262,7 +262,7 @@ setting('extruder_offset_x2', '0.0', float, 'preference', 'hidden').setLabel('Of
 setting('extruder_offset_y2', '0.0', float, 'preference', 'hidden').setLabel('Offset Y', 'The offset of your secondary extruder compared to the primary.')
 setting('extruder_offset_x3', '0.0', float, 'preference', 'hidden').setLabel('Offset X', 'The offset of your secondary extruder compared to the primary.')
 setting('extruder_offset_y3', '0.0', float, 'preference', 'hidden').setLabel('Offset Y', 'The offset of your secondary extruder compared to the primary.')
-setting('filament_physical_density', '1300', float, 'preference', 'hidden').setRange(500.0, 3000.0).setLabel('Density (kg/m3)', 'Weight of the filament per m3. Around 1300 for PLA. And around 1040 for ABS. This value is used to estimate the weight if the filament used for the print.')
+setting('filament_physical_density', '1240', float, 'preference', 'hidden').setRange(500.0, 3000.0).setLabel('Density (kg/m3)', 'Weight of the filament per m3. Around 1240 for PLA. And around 1040 for ABS. This value is used to estimate the weight if the filament used for the print.')
 setting('steps_per_e', '0', float, 'preference', 'hidden').setLabel('E-Steps per 1mm filament', 'Amount of steps per mm filament extrusion')
 setting('serial_port', 'AUTO', str, 'preference', 'hidden').setLabel('Serial port', 'Serial port to use for communication with the printer')
 setting('serial_port_auto', '', str, 'preference', 'hidden')