3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 00:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

GCodeViewer -> Refactoring

Browse source
This commit is contained in:
enricoturri1966 2020-04-21 12:51:58 +02:00
parent 443a511420
commit 61db595f53
2 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/slic3r/GUI/GCodeViewer.hpp
View file

@ -15,9 +15,9 @@ namespace GUI {
class GCodeViewer
{
static const std::array<std::array<float, 3>, erCount> Default_Extrusion_Role_Colors;
static const size_t Default_Range_Colors_Count = 10;
static const std::array<std::array<float, 3>, Default_Range_Colors_Count> Default_Range_Colors;
static const std::array<std::array<float, 3>, erCount> Extrusion_Role_Colors;
static const size_t Range_Colors_Count = 10;
static const std::array<std::array<float, 3>, Range_Colors_Count> Range_Colors;
// buffer containing vertices data
struct VBuffer
@ -87,14 +87,12 @@ class GCodeViewer
void update_from(const float value) { min = std::min(min, value); max = std::max(max, value); }
void reset() { min = FLT_MAX; max = -FLT_MAX; }
float step_size() const { return (max - min) / (static_cast<float>(Default_Range_Colors_Count) - 1.0f); }
std::array<float, 3> get_color_at(float value, const std::array<std::array<float, 3>, Default_Range_Colors_Count>& colors) const;
float step_size() const { return (max - min) / (static_cast<float>(Range_Colors_Count) - 1.0f); }
std::array<float, 3> get_color_at(float value) const;
};
struct Ranges
{
std::array<std::array<float, 3>, Default_Range_Colors_Count> colors;
// Color mapping by layer height.
Range height;
// Color mapping by extrusion width.
@ -115,7 +113,6 @@ class GCodeViewer
}
};
std::array<std::array<float, 3>, erCount> role_colors;
unsigned int role_visibility_flags{ 0 };
Ranges ranges;
@ -166,8 +163,6 @@ public:
~GCodeViewer() { reset(); }
bool init() {
m_extrusions.role_colors = Default_Extrusion_Role_Colors;
m_extrusions.ranges.colors = Default_Range_Colors;
set_toolpath_move_type_visible(GCodeProcessor::EMoveType::Extrude, true);
return init_shaders();
}