GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-15 02:16:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bring back "Filament" in the combobox selector for color preview, also it was preventing colorprint from working.

Browse Source
This commit is contained in:
supermerill 2019-10-09 17:16:38 +02:00
parent d963b0f2a3
commit f353423e49
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/slic3r/GUI/GUI_Preview.cpp
View File

@ -223,6 +223,7 @@ bool Preview::init(wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view
m_choice_view_type->Append(_(L("Speed"))); m_choice_view_type->Append(_(L("Speed")));
m_choice_view_type->Append(_(L("Volumetric flow rate"))); m_choice_view_type->Append(_(L("Volumetric flow rate")));
m_choice_view_type->Append(_(L("Tool"))); m_choice_view_type->Append(_(L("Tool")));
m_choice_view_type->Append(_(L("Filament")));
m_choice_view_type->Append(_(L("Color Print"))); m_choice_view_type->Append(_(L("Color Print")));
m_choice_view_type->SetSelection(0); m_choice_view_type->SetSelection(0);
@ -785,7 +786,26 @@ void Preview::load_print_as_fff(bool keep_z_range)
color_print_values = config.option<ConfigOptionFloats>("colorprint_heights")->values; color_print_values = config.option<ConfigOptionFloats>("colorprint_heights")->values;
} }
} }
else if (gcode_preview_data_valid || (m_gcode_preview_data->extrusion.view_type == GCodePreviewData::Extrusion::Tool) ) else if ((m_gcode_preview_data->extrusion.view_type == GCodePreviewData::Extrusion::Filament))
{
const ConfigOptionStrings* extruders_opt = dynamic_cast<const ConfigOptionStrings*>(m_config->option("extruder_colour"));
const ConfigOptionStrings* filamemts_opt = dynamic_cast<const ConfigOptionStrings*>(m_config->option("filament_colour"));
unsigned int colors_count = std::max((unsigned int)extruders_opt->values.size(), (unsigned int)filamemts_opt->values.size());
unsigned char rgb[3];
for (unsigned int i = 0; i < colors_count; ++i)
{
std::string color = m_config->opt_string("filament_colour", i);
if (!PresetBundle::parse_color(color, rgb))
{
color = "#FFFFFF";
}
colors.emplace_back(color);
}
color_print_values.clear();
}
else if (gcode_preview_data_valid || (m_gcode_preview_data->extrusion.view_type == GCodePreviewData::Extrusion::Tool))
{ {
const ConfigOptionStrings* extruders_opt = dynamic_cast<const ConfigOptionStrings*>(m_config->option("extruder_colour")); const ConfigOptionStrings* extruders_opt = dynamic_cast<const ConfigOptionStrings*>(m_config->option("extruder_colour"));
const ConfigOptionStrings* filamemts_opt = dynamic_cast<const ConfigOptionStrings*>(m_config->option("filament_colour")); const ConfigOptionStrings* filamemts_opt = dynamic_cast<const ConfigOptionStrings*>(m_config->option("filament_colour"));