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

Fixed ColorPrint Legend update if Print preset was changed and model was resliced.

Browse source
This commit is contained in:
YuSanka 2019-09-05 08:56:49 +02:00
parent 09e4ac42ba
commit 1651c8db6e
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -845,22 +845,20 @@ void GLCanvas3D::LegendTexture::fill_color_print_legend_values(const GCodePrevie
{ {
auto& config = wxGetApp().preset_bundle->project_config; auto& config = wxGetApp().preset_bundle->project_config;
const std::vector<double>& color_print_values = config.option<ConfigOptionFloats>("colorprint_heights")->values; const std::vector<double>& color_print_values = config.option<ConfigOptionFloats>("colorprint_heights")->values;
const size_t values_cnt = color_print_values.size();
if (values_cnt > 0) { if (!color_print_values.empty()) {
std::vector<double> print_zs = canvas.get_current_print_zs(true); std::vector<double> print_zs = canvas.get_current_print_zs(true);
size_t z = 0; for (auto cp_value : color_print_values)
for (size_t i = 0; i < values_cnt; ++i)
{ {
double prev_z = -1.0; auto lower_b = std::lower_bound(print_zs.begin(), print_zs.end(), cp_value);
for ( ; z < print_zs.size(); ++z)
if (fabs(color_print_values[i] - print_zs[z]) < EPSILON) { if (lower_b == print_zs.end())
prev_z = z > 0 ? print_zs[z - 1] : 0.;
break;
}
if (prev_z < 0)
continue; continue;
cp_legend_values.push_back(std::pair<double, double>(prev_z, color_print_values[i])); double current_z = *lower_b;
double previous_z = lower_b == print_zs.begin() ? 0.0 : *(--lower_b);
cp_legend_values.push_back(std::pair<double, double>(previous_z, current_z));
} }
} }
} }

4
src/slic3r/GUI/wxExtensions.hpp
View file

@ -720,7 +720,9 @@ public:
const wxString& name = wxEmptyString); const wxString& name = wxEmptyString);
~DoubleSlider() {} ~DoubleSlider() {}
// permissible error for layer height /* For exporting GCode in GCodeWriter is used XYZF_NUM(val) = PRECISION(val, 3) for XYZ values.
* So, let use same value as a permissible error for layer height.
*/
static double epsilon() { return 0.0011;} static double epsilon() { return 0.0011;}
void msw_rescale(); void msw_rescale();