3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-18 05:45:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge d34889c70f into 97c8da4d03

Browse source
This commit is contained in:
tome9111991 2026-01-17 08:08:40 +01:00 • committed by GitHub
commit 4fb5ceff33
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/GCode.cpp
View file

@ -4422,6 +4422,8 @@ LayerResult GCode::process_layer(
bed_temp = get_highest_bed_temperature(false,print);
else
bed_temp = get_bed_temperature(first_extruder_id, false, m_config.curr_bed_type);
// ORCA: Only set bed temperature if it's greater than or equal to 0 (-1 means the feature is disabled)
if (bed_temp >= 0)
gcode += m_writer.set_bed_temperature(bed_temp);
// Mark the temperature transition from 1st to 2nd layer to be finished.
m_second_layer_things_done = true;

30
src/libslic3r/PrintConfig.cpp
View file

@ -861,60 +861,66 @@ void PrintConfigDef::init_fff_params()
def = this->add("supertack_plate_temp", coInts);
def->label = L("Other layers");
def->tooltip = L("Bed temperature for layers except the initial one. "
"A value of 0 means the filament does not support printing on the Cool Plate SuperTack.");
"A value of 0 means the filament does not support printing on the Cool Plate SuperTack. "
"A value of -1 will skip setting the temperature for subsequent layers.");
def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation
def->full_label = L("Bed temperature");
def->min = 0;
def->min = -1;
def->max = 120;
def->set_default_value(new ConfigOptionInts{35});
def = this->add("cool_plate_temp", coInts);
def->label = L("Other layers");
def->tooltip = L("Bed temperature for layers except the initial one. "
"A value of 0 means the filament does not support printing on the Cool Plate.");
"A value of 0 means the filament does not support printing on the Cool Plate. "
"A value of -1 will skip setting the temperature for subsequent layers.");
def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation
def->full_label = L("Bed temperature");
def->min = 0;
def->min = -1;
def->max = 300;
def->set_default_value(new ConfigOptionInts{ 35 });
def = this->add("textured_cool_plate_temp", coInts);
def->label = L("Other layers");
def->tooltip = L("Bed temperature for layers except the initial one. "
"A value of 0 means the filament does not support printing on the Textured Cool Plate.");
"A value of 0 means the filament does not support printing on the Textured Cool Plate. "
"A value of -1 will skip setting the temperature for subsequent layers.");
def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation
def->full_label = L("Bed temperature");
def->min = 0;
def->min = -1;
def->max = 300;
def->set_default_value(new ConfigOptionInts{ 40 });
def = this->add("eng_plate_temp", coInts);
def->label = L("Other layers");
def->tooltip = L("Bed temperature for layers except the initial one. "
"A value of 0 means the filament does not support printing on the Engineering Plate.");
"A value of 0 means the filament does not support printing on the Engineering Plate. "
"A value of -1 will skip setting the temperature for subsequent layers.");
def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation
def->full_label = L("Bed temperature");
def->min = 0;
def->min = -1;
def->max = 300;
def->set_default_value(new ConfigOptionInts{ 45 });
def = this->add("hot_plate_temp", coInts);
def->label = L("Other layers");
def->tooltip = L("Bed temperature for layers except the initial one. "
"A value of 0 means the filament does not support printing on the High Temp Plate.");
"A value of 0 means the filament does not support printing on the High Temp Plate. "
"A value of -1 will skip setting the temperature for subsequent layers.");
def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation
def->full_label = L("Bed temperature");
def->min = 0;
def->min = -1;
def->max = 300;
def->set_default_value(new ConfigOptionInts{ 45 });
def = this->add("textured_plate_temp", coInts);
def->label = L("Other layers");
def->tooltip = L("Bed temperature for layers except the initial one. "
"A value of 0 means the filament does not support printing on the Textured PEI Plate.");
"A value of 0 means the filament does not support printing on the Textured PEI Plate. "
"A value of -1 will skip setting the temperature for subsequent layers.");
def->sidetext = L(u8"\u2103" /* °C */); // degrees Celsius, CIS languages need translation
def->full_label = L("Bed temperature");
def->min = 0;
def->min = -1;
def->max = 300;
def->set_default_value(new ConfigOptionInts{45});

9
src/slic3r/GUI/Widgets/SpinInput.cpp
View file

@ -135,6 +135,15 @@ void SpinInput::SetRange(int min, int max)
{
this->min = min;
this->max = max;
if (text_ctrl) {
if (min < 0) {
wxTextValidator validator(wxFILTER_INCLUDE_CHAR_LIST);
validator.SetCharIncludes("0123456789-");
text_ctrl->SetValidator(validator);
} else {
text_ctrl->SetValidator(wxTextValidator(wxFILTER_DIGITS));
}
}
}
void SpinInput::DoSetToolTipText(wxString const &tip)