From e6131fc5f70fff4058c6b010544e473fe67b0bd6 Mon Sep 17 00:00:00 2001 From: "lane.wei" Date: Thu, 28 Jul 2022 17:02:30 +0800 Subject: [PATCH] ENH: render: adjust the logo background color to bed's color use the color of bed's stl Change-Id: I56f1e184a27271b8bea5704f823ae7b28b656a46 --- resources/profiles/BBL/bbl-3dp-logo.svg | 77 +++++++++++-------------- src/slic3r/GUI/PartPlate.cpp | 6 +- 2 files changed, 38 insertions(+), 45 deletions(-) diff --git a/resources/profiles/BBL/bbl-3dp-logo.svg b/resources/profiles/BBL/bbl-3dp-logo.svg index f0062e3cf..d17daf639 100644 --- a/resources/profiles/BBL/bbl-3dp-logo.svg +++ b/resources/profiles/BBL/bbl-3dp-logo.svg @@ -1,43 +1,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/slic3r/GUI/PartPlate.cpp b/src/slic3r/GUI/PartPlate.cpp index 9a63a5cfe..f764c74b5 100644 --- a/src/slic3r/GUI/PartPlate.cpp +++ b/src/slic3r/GUI/PartPlate.cpp @@ -62,7 +62,7 @@ namespace GUI { class Bed3D; -std::array PartPlate::SELECT_COLOR = { 0.4196f, 0.4235f, 0.4235f, 1.0f }; +std::array PartPlate::SELECT_COLOR = { 0.2666f, 0.2784f, 0.2784f, 1.0f }; //{ 0.4196f, 0.4235f, 0.4235f, 1.0f }; std::array PartPlate::UNSELECT_COLOR = { 0.82f, 0.82f, 0.82f, 1.0f }; std::array PartPlate::DEFAULT_COLOR = { 0.5f, 0.5f, 0.5f, 1.0f }; std::array PartPlate::LINE_TOP_COLOR = { 0.89f, 0.89f, 0.89f, 1.0f }; @@ -199,11 +199,11 @@ void PartPlate::calc_gridlines(const ExPolygon& poly, const BoundingBox& pp_bbox line.append(Point(x, pp_bbox.min(1))); line.append(Point(x, pp_bbox.max(1))); - count ++; if ( (count % 5) == 0 ) axes_lines_bolder.push_back(line); else axes_lines.push_back(line); + count ++; } count = 0; for (coord_t y = pp_bbox.min(1); y <= pp_bbox.max(1); y += scale_(10.0)) { @@ -212,11 +212,11 @@ void PartPlate::calc_gridlines(const ExPolygon& poly, const BoundingBox& pp_bbox line.append(Point(pp_bbox.max(0), y)); axes_lines.push_back(line); - count ++; if ( (count % 5) == 0 ) axes_lines_bolder.push_back(line); else axes_lines.push_back(line); + count ++; } // clip with a slightly grown expolygon because our lines lay on the contours and may get erroneously clipped