From 966bff13ec72f5bcabab6b6c1ba77a2b55604349 Mon Sep 17 00:00:00 2001 From: Steven Abadie Date: Sat, 25 Oct 2014 15:39:02 -0600 Subject: [PATCH] Changed model color to match LulzBot pallet. --- Cura/gui/sceneView.py | 8 +++++--- Cura/util/profile.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py index a994c18d..5296990c 100644 --- a/Cura/gui/sceneView.py +++ b/Cura/gui/sceneView.py @@ -891,7 +891,8 @@ class SceneView(openglGui.glGuiPanel): glDisable(GL_BLEND) glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA) - glClearColor(0.8, 0.8, 0.8, 1.0) + #scene background color + glClearColor(0.85, 0.85, 0.85, 1.0) glClearStencil(0) glClearDepth(1.0) @@ -1129,7 +1130,8 @@ class SceneView(openglGui.glGuiPanel): glEnable(GL_BLEND) if self._objectLoadShader is not None: self._objectLoadShader.bind() - glColor4f(0.2, 0.6, 1.0, 1.0) + #Model color during load animation + glColor4ub(177, 205, 54, 255) for obj in self._scene.objects(): if obj._loadAnim is None: continue @@ -1239,7 +1241,7 @@ class SceneView(openglGui.glGuiPanel): machine = profile.getMachineSetting('machine_type') - #Due to NC licensing, temporarily removing platform mesh loading for Ultimaker and Witbox + #Due to NC licensing of the stl files, temporarily removing platform mesh loading for Ultimaker and Witbox '''if machine.startswith('ultimaker'): if machine not in self._platformMesh: meshes = meshLoader.loadMeshes(resources.getPathForMesh(machine + '_platform.stl')) diff --git a/Cura/util/profile.py b/Cura/util/profile.py index ae75f74a..90f47827 100644 --- a/Cura/util/profile.py +++ b/Cura/util/profile.py @@ -478,7 +478,7 @@ setting('filament_physical_density', '1240', float, 'preference', 'hidden').setR setting('language', 'English', str, 'preference', 'hidden').setLabel(_('Language'), _('Change the language in which Cura runs. Switching language requires a restart of Cura')) setting('active_machine', '0', int, 'preference', 'hidden') -setting('model_colour', '#FFC924', str, 'preference', 'hidden').setLabel(_('Model colour'), _('Display color for first extruder')) +setting('model_colour', '#C9E240', str, 'preference', 'hidden').setLabel(_('Model colour'), _('Display color for first extruder')) setting('model_colour2', '#CB3030', str, 'preference', 'hidden').setLabel(_('Model colour (2)'), _('Display color for second extruder')) setting('model_colour3', '#DDD93C', str, 'preference', 'hidden').setLabel(_('Model colour (3)'), _('Display color for third extruder')) setting('model_colour4', '#4550D3', str, 'preference', 'hidden').setLabel(_('Model colour (4)'), _('Display color for forth extruder')) -- 2.30.2