3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 02:07:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

If a default color is used, the layer view now correctly uses it.

Browse source
This commit is contained in:
Jaime van Kessel 2017-07-17 11:44:54 +02:00
parent 53cec3bea4
commit afe5f56862
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/CuraEngineBackend/ProcessSlicedLayersJob.py
View file

@ -24,6 +24,7 @@ from cura import LayerPolygon
import numpy import numpy
from time import time from time import time
from cura.Settings.ExtrudersModel import ExtrudersModel
catalog = i18nCatalog("cura") catalog = i18nCatalog("cura")
@ -174,7 +175,11 @@ class ProcessSlicedLayersJob(Job):
material_color_map = numpy.zeros((len(extruders), 4), dtype=numpy.float32) material_color_map = numpy.zeros((len(extruders), 4), dtype=numpy.float32)
for extruder in extruders: for extruder in extruders:
position = int(extruder.getMetaDataEntry("position", default="0")) # Get the position position = int(extruder.getMetaDataEntry("position", default="0")) # Get the position
color_code = extruder.material.getMetaDataEntry("color_code", default="#e0e000") try:
default_color = ExtrudersModel.defaultColors[position]
except KeyError:
default_color = "#e0e000"
color_code = extruder.material.getMetaDataEntry("color_code", default=default_color)
color = colorCodeToRGBA(color_code) color = colorCodeToRGBA(color_code)
material_color_map[position, :] = color material_color_map[position, :] = color
else: else: