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

Merge remote-tracking branch 'remotes/remi/master' into dev

Browse Source
This commit is contained in:
supermerill 2020-10-05 20:23:56 +02:00
commit c6331e4194
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libslic3r/PrintConfig.cpp
View File

@ -4982,6 +4982,7 @@ std::string FullPrintConfig::validate()
out_of_range = fopt->get_abs_value(1) < optdef->min || fopt->get_abs_value(1) > optdef->max; out_of_range = fopt->get_abs_value(1) < optdef->min || fopt->get_abs_value(1) > optdef->max;
break; break;
} }
case coPercents:
case coFloats: case coFloats:
for (double v : static_cast<const ConfigOptionVector<double>*>(opt)->values) for (double v : static_cast<const ConfigOptionVector<double>*>(opt)->values)
if (v < optdef->min || v > optdef->max) { if (v < optdef->min || v > optdef->max) {
@ -4989,13 +4990,6 @@ std::string FullPrintConfig::validate()
break; break;
} }
break; break;
case coPercents:
for (double v : static_cast<const ConfigOptionVector<double>*>(opt)->values)
if (v*0.01 < optdef->min || v * 0.01 > optdef->max) {
out_of_range = true;
break;
}
break;
case coInt: case coInt:
{ {
auto *iopt = static_cast<const ConfigOptionInt*>(opt); auto *iopt = static_cast<const ConfigOptionInt*>(opt);