bugfix #139 (allow beta config when release is higher.

update tooltip for ironing presets
This commit is contained in:
supermerill 2020-01-12 21:26:35 +01:00
parent 2c287a1186
commit 6bd13bdbd5
2 changed files with 7 additions and 5 deletions

View File

@ -1234,7 +1234,8 @@ void PrintConfigDef::init_fff_params()
def->label = L("width"); def->label = L("width");
def->full_label = L("Ironing width"); def->full_label = L("Ironing width");
def->category = OptionCategory::infill; def->category = OptionCategory::infill;
def->tooltip = L("This is the width of the ironing pass, in a % of the top extrusion width, should not be more than 50%."); def->tooltip = L("This is the width of the ironing pass, in a % of the top extrusion width, should not be more than 50%"
" (two times more lines, 50% overlap). It's not necessary to go below 25% (four times more lines, 75% overlap)");
def->min = 0; def->min = 0;
def->mode = comExpert; def->mode = comExpert;
def->set_default_value(new ConfigOptionFloatOrPercent(50, true)); def->set_default_value(new ConfigOptionFloatOrPercent(50, true));
@ -1243,8 +1244,9 @@ void PrintConfigDef::init_fff_params()
def->label = L("distribution"); def->label = L("distribution");
def->full_label = L("Ironing flow distribution"); def->full_label = L("Ironing flow distribution");
def->category = OptionCategory::infill; def->category = OptionCategory::infill;
def->tooltip = L("This is the percentage of the flow that is used for the second ironing pass. Typical 0-20%. " def->tooltip = L("This is the percentage of the flow that is used for the second ironing pass. Typical 10-20%. "
"Should not be higher than 20%, unless you have your top extrusion width greatly superior to your nozzle width."); "Should not be higher than 20%, unless you have your top extrusion width greatly superior to your nozzle width. "
"A value too low and your extruder will eat the filament. A value too high and the first pass won't print well.");
//def->min = 0; //def->min = 0;
//def->max = 0.9; //def->max = 0.9;
def->mode = comExpert; def->mode = comExpert;

View File

@ -53,8 +53,8 @@ bool Version::is_slic3r_supported(const Semver &slic3r_version) const
// Released config is always supported. // Released config is always supported.
return true; return true;
else if (prerelease_slic3r == nullptr) else if (prerelease_slic3r == nullptr)
// Released slic3r only supports released configs. // Released slic3r only supports released configs unless it's far ahead.
return false; return slic3r_version >= min_slic3r_version;
// Compare the pre-release status of Slic3r against the config. // Compare the pre-release status of Slic3r against the config.
// If the prerelease status of slic3r is lexicographically lower or equal // If the prerelease status of slic3r is lexicographically lower or equal
// to the prerelease status of the config, accept it. // to the prerelease status of the config, accept it.