juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-25 20:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into libvgcode

Browse Source 
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
This commit is contained in:
Andrew Sun
2025-11-16 22:51:31 -05:00
parent 32ce7494c0 4b1ddcdc55
commit 7408f333a6
104 changed files with 1504 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/slic3r/GUI/Plater.cpp
View File

@@ -11766,7 +11766,7 @@ void Plater::_calib_pa_pattern(const Calib_Params& params)
if (accels.empty()) {
accels.assign({accel});
const auto msg{_L("INFO:") + "\n" +
_L("No accelerations provided for calibration. Use default acceleration value ") + std::to_string(long(accel)) + wxString::FromUTF8("mm/s²")};
_L("No accelerations provided for calibration. Use default acceleration value ") + std::to_string(long(accel)) + _L(u8"mm/s²")};
get_notification_manager()->push_notification(msg.ToStdString());
} else {
// set max acceleration in case of batch mode to get correct test pattern size
@@ -11833,7 +11833,7 @@ void Plater::_calib_pa_pattern(const Calib_Params& params)
speeds.assign({speed});
const auto msg{_L("INFO:") + "\n" +
_L("No speeds provided for calibration. Use default optimal speed ") + std::to_string(long(speed)) + "mm/s"};
_L("No speeds provided for calibration. Use default optimal speed ") + std::to_string(long(speed)) + _L("mm/s")};
get_notification_manager()->push_notification(msg.ToStdString());
} else if (speeds.size() == 1) {
// If we have single value provided, set speed using global configuration.
@@ -12387,6 +12387,7 @@ void Plater::calib_retraction(const Calib_Params& params)
print_config->set_key_value("initial_layer_print_height", new ConfigOptionFloat(layer_height));
obj->config.set_key_value("layer_height", new ConfigOptionFloat(layer_height));
obj->config.set_key_value("alternate_extra_wall", new ConfigOptionBool(false));
obj->config.set_key_value("seam_position", new ConfigOptionEnum<SeamPosition>(spAligned));
changed_objects({ 0 });