juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Correct range checking for int and float Config Options + QoL changes in tooltips (#11915)

Browse Source 
* Fix float number not working properly for option min/max (#11211)

* ConfigOptionDef: min/max values type are changed from INT to FLOAT.

(cherry picked from commit f277bc80c22e0c9a067481a4301922e2c96aed47)

* Fix infinite loop and crash when `fuzzy_skin_point_distance` = 0 (SoftFever/OrcaSlicer#11069)

* Fix Linux build issue

* Fix float comparison due to precision loss

* Fix: Range check added for coInt options; Ranges and defaults added in tooltips

---------

Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
Co-authored-by: SoftFever <softfeverever@gmail.com>
This commit is contained in:
Valerii Bokhan
2026-02-23 06:06:07 +01:00
committed by GitHub
parent 5e6a8e4daf
commit 4343ddf823
7 changed files with 128 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/libslic3r/PrintConfig.cpp
View File

@@ -2159,9 +2159,9 @@ void PrintConfigDef::init_fff_params()
"You may be able to tune this value to get a nice flat surface if there is slight overflow or underflow."
"\n\nThe final object flow ratio is this value multiplied by the filament flow ratio.");
def->mode = comAdvanced;
def->max = 2;
def->min = 0.01;
def->set_default_value(new ConfigOptionFloat(1));
def->max = 2.f;
def->min = 0.01f;
def->set_default_value(new ConfigOptionFloat(1.f));
def = this->add("enable_pressure_advance", coBools);
def->label = L("Enable pressure advance");
@@ -3051,9 +3051,10 @@ void PrintConfigDef::init_fff_params()
def->category = L("Speed");
def->tooltip = L("Marlin Firmware Junction Deviation (replaces the traditional XY Jerk setting).");
def->sidetext = L("mm"); // milimeters, CIS languages need translation
def->min = 0;
def->min = 0.f;
def->max = 0.5f;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(0));
def->set_default_value(new ConfigOptionFloat(0.f));
def = this->add("outer_wall_jerk", coFloat);
def->label = L("Outer wall");
@@ -3312,10 +3313,10 @@ void PrintConfigDef::init_fff_params()
def->category = L("Others");
def->tooltip = L("The average distance between the random points introduced on each line segment.");
def->sidetext = L("mm"); // milimeters, CIS languages need translation
def->min = 0;
def->max = 5;
def->min = 0.01f; // point distance cannot be 0! Otherwise we get infinite loop + OOM due to infinite line division.
def->max = 5.f;
def->mode = comSimple;
def->set_default_value(new ConfigOptionFloat(0.3));
def->set_default_value(new ConfigOptionFloat(0.3f));
def = this->add("fuzzy_skin_first_layer", coBool);
def->label = L("Apply fuzzy skin to first layer");
@@ -3375,7 +3376,7 @@ void PrintConfigDef::init_fff_params()
def->category = L("Others");
def->tooltip = L("The base size of the coherent noise features, in mm. Higher values will result in larger features.");
def->sidetext = L("mm"); // milimeters, CIS languages need translation
def->min = 0.1;
def->min = 0.1f;
def->max = 500;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(1.0));
@@ -3393,7 +3394,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Fuzzy skin noise persistence");
def->category = L("Others");
def->tooltip = L("The decay rate for higher octaves of the coherent noise. Lower values will result in smoother noise.");
def->min = 0.01;
def->min = 0.01f;
def->max = 1;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(0.5));
@@ -4205,10 +4206,10 @@ void PrintConfigDef::init_fff_params()
def->category = L("Machine limits");
def->tooltip = L("Maximum junction deviation (M205 J, only apply if JD > 0 for Marlin Firmware\nIf your Marlin 2 printer uses Classic Jerk set this value to 0.)");
def->sidetext = L("mm"); // milimeters, CIS languages need translation
def->min = 0;
def->max = 1;
def->min = 0.f;
def->max = 0.5f;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloats { 0.01});
def->set_default_value(new ConfigOptionFloats{ 0.01f });
// M205 S... [mm/sec]
def = this->add("machine_min_extruding_rate", coFloats);
@@ -9767,13 +9768,13 @@ std::map<std::string, std::string> validate(const FullPrintConfig &cfg, bool und
case coFloatOrPercent:
{
auto *fopt = static_cast<const ConfigOptionFloat*>(opt);
out_of_range = fopt->value < optdef->min || fopt->value > optdef->max;
out_of_range = !optdef->is_value_valid(fopt->value);
break;
}
case coFloats:
case coPercents:
for (double v : static_cast<const ConfigOptionVector<double>*>(opt)->values)
if (v < optdef->min || v > optdef->max) {
if (!optdef->is_value_valid(v)) {
out_of_range = true;
break;
}
@@ -9781,12 +9782,12 @@ std::map<std::string, std::string> validate(const FullPrintConfig &cfg, bool und
case coInt:
{
auto *iopt = static_cast<const ConfigOptionInt*>(opt);
out_of_range = iopt->value < optdef->min || iopt->value > optdef->max;
out_of_range = !optdef->is_value_valid(iopt->value);
break;
}
case coInts:
for (int v : static_cast<const ConfigOptionVector<int>*>(opt)->values)
if (v < optdef->min || v > optdef->max) {
if (!optdef->is_value_valid(v)) {
out_of_range = true;
break;
}