From 3666f84e6546d38cc90bbcaba7845c177eb73429 Mon Sep 17 00:00:00 2001 From: Noisyfox Date: Wed, 27 Nov 2024 20:25:57 +0800 Subject: [PATCH 1/5] Fix PA pattern crash if default/first layer line width is percentage (#7592) Fix PA pattern crash if default/first layer line width is percentage (SoftFever/OrcaSlicer#7569) --- src/libslic3r/calib.hpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/calib.hpp b/src/libslic3r/calib.hpp index b26a000790..19b19cf347 100644 --- a/src/libslic3r/calib.hpp +++ b/src/libslic3r/calib.hpp @@ -266,8 +266,18 @@ public: protected: double speed_first_layer() const { return m_config.option("initial_layer_speed")->value; }; double speed_perimeter() const { return m_config.option("outer_wall_speed")->value; }; - double line_width_first_layer() const { return m_config.get_abs_value("initial_layer_line_width"); }; - double line_width() const { return m_config.get_abs_value("line_width"); }; + double line_width_first_layer() const + { + // TODO: FIXME: find out current filament/extruder? + const double nozzle_diameter = m_config.opt_float("nozzle_diameter", 0); + return m_config.get_abs_value("initial_layer_line_width", nozzle_diameter); + }; + double line_width() const + { + // TODO: FIXME: find out current filament/extruder? + const double nozzle_diameter = m_config.opt_float("nozzle_diameter", 0); + return m_config.get_abs_value("line_width", nozzle_diameter); + }; int wall_count() const { return m_config.option("wall_loops")->value; }; private: From a7b8dfa2df4c8ddb71fc7c72c603f092674b93c9 Mon Sep 17 00:00:00 2001 From: 0verflowed-stack <143296066+0verflowed-stack@users.noreply.github.com> Date: Wed, 27 Nov 2024 14:32:56 +0200 Subject: [PATCH 2/5] Fix the incorrect translation of 'Bottom' into Ukrainian (#7589) --- localization/i18n/uk/OrcaSlicer_uk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/i18n/uk/OrcaSlicer_uk.po b/localization/i18n/uk/OrcaSlicer_uk.po index f256fba815..2a4a84963c 100644 --- a/localization/i18n/uk/OrcaSlicer_uk.po +++ b/localization/i18n/uk/OrcaSlicer_uk.po @@ -4625,7 +4625,7 @@ msgstr "Вигляд зверху" #. TRN To be shown in the main menu View->Bottom msgid "Bottom" -msgstr "Ніз" +msgstr "Низ" msgid "Bottom View" msgstr "Вигляд знизу" From 4c78d687a03022981f22fe64c3d2a7d69d7c63d1 Mon Sep 17 00:00:00 2001 From: camerony Date: Wed, 27 Nov 2024 07:35:27 -0500 Subject: [PATCH 3/5] Added LDO as a Filament vendor (#7587) * Added LDO as a Filament vendor --- scripts/generate_presets_vendors.py | 1 + src/slic3r/GUI/CreatePresetsDialog.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/generate_presets_vendors.py b/scripts/generate_presets_vendors.py index 2dd53db53a..ac358ae803 100644 --- a/scripts/generate_presets_vendors.py +++ b/scripts/generate_presets_vendors.py @@ -110,6 +110,7 @@ filament_vendors = [ 'Justmaker', 'Keene Village Plastics', 'Kexcelled', + 'LDO', 'MakerBot', 'MatterHackers', 'MIKA3D', diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp index 6606d5f5f5..4161afc573 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.cpp +++ b/src/slic3r/GUI/CreatePresetsDialog.cpp @@ -50,14 +50,14 @@ static const std::vector filament_vendors = "Fil X", "GEEETECH", "Giantarm", "Gizmo Dorks", "GreenGate3D", "HATCHBOX", "Hello3D", "IC3D", "IEMAI", "IIID Max", "INLAND", "iProspect", "iSANMATE", "Justmaker", "Keene Village Plastics", - "Kexcelled", "MakerBot", "MatterHackers", "MIKA3D", "NinjaTek", - "Nobufil", "Novamaker", "OVERTURE", "OVVNYXE", "Polymaker", - "Priline", "Printed Solid", "Protopasta", "Prusament", "Push Plastic", - "R3D", "Re-pet3D", "Recreus", "Regen", "RatRig", - "Sain SMART", "SliceWorx", "Snapmaker", "SnoLabs", "Spectrum", - "SUNLU", "TTYT3D", "Tianse", "UltiMaker", "Valment", - "Verbatim", "VO3D", "Voxelab", "VOXELPLA", "YOOPAI", - "Yousu", "Ziro", "Zyltech"}; + "Kexcelled", "LDO", "MakerBot", "MatterHackers", "MIKA3D", + "NinjaTek", "Nobufil", "Novamaker", "OVERTURE", "OVVNYXE", + "Polymaker", "Priline", "Printed Solid", "Protopasta", "Prusament", + "Push Plastic", "R3D", "Re-pet3D", "Recreus", "Regen", + "RatRig", "Sain SMART", "SliceWorx", "Snapmaker", "SnoLabs", + "Spectrum", "SUNLU", "TTYT3D", "Tianse", "UltiMaker", + "Valment", "Verbatim", "VO3D", "Voxelab", "VOXELPLA", + "YOOPAI", "Yousu", "Ziro", "Zyltech"}; static const std::vector filament_types = {"PLA", "rPLA", "PLA+", "PLA Tough", "PETG", "ABS", "ASA", "FLEX", "HIPS", "PA", "PACF", "NYLON", "PVA", "PVB", "PC", "PCABS", "PCTG", "PCCF", "PHA", "PP", "PEI", "PET", From b38b9132f4903a91ebbbd2cf725d8bbbd93d8069 Mon Sep 17 00:00:00 2001 From: Noisyfox Date: Wed, 27 Nov 2024 20:39:57 +0800 Subject: [PATCH 4/5] Fix 3mf object type to conform the 3mf core spec (#7586) Fix 3mf object type. Always use "model" instead of "other" for modifiers, to conform the 3mf core spec (SoftFever/OrcaSlicer#7574) --- src/libslic3r/Format/bbs_3mf.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/Format/bbs_3mf.cpp b/src/libslic3r/Format/bbs_3mf.cpp index 206fc2aacd..f13181ad27 100644 --- a/src/libslic3r/Format/bbs_3mf.cpp +++ b/src/libslic3r/Format/bbs_3mf.cpp @@ -6813,7 +6813,12 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result) return false; } - std::string type = (volume->type() == ModelVolumeType::MODEL_PART)?"model":"other"; + // Orca#7574: always use "model" type to follow the 3MF Core Specification: + // https://github.com/3MFConsortium/spec_core/blob/20c079eef39e45ed223b8443dc9f34cbe32dc2c2/3MF%20Core%20Specification.md#3431-item-element + // > Note: items MUST NOT reference objects of type "other", either directly or recursively. + // This won't break anything because when loading the file Orca (and Bambu) simply does not care about the actual object type at all (as long as it's one of "model" & "other"); + // But PrusaSlicer requires the type to be "model". + std::string type = "model"; output_buffer += " <"; output_buffer += OBJECT_TAG; From ac5eaa38290807d7a8849464ff0760b30a280406 Mon Sep 17 00:00:00 2001 From: LyricWulf Date: Wed, 27 Nov 2024 06:28:36 -0800 Subject: [PATCH 5/5] fix: ImageGrid download button would delete instead (#7413) --- src/slic3r/GUI/ImageGrid.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/ImageGrid.cpp b/src/slic3r/GUI/ImageGrid.cpp index 15adf8c8ca..ebfdb33ea4 100644 --- a/src/slic3r/GUI/ImageGrid.cpp +++ b/src/slic3r/GUI/ImageGrid.cpp @@ -652,7 +652,8 @@ void Slic3r::GUI::ImageGrid::renderContent1(wxDC &dc, wxPoint const &pt, int ind if (hit) { texts.Add(_L("Delete")); texts.Add(secondAction); - texts.Add(thirdAction); + if (!thirdAction.IsEmpty()) + texts.Add(thirdAction); renderButtons(dc, texts, rect, m_hit_type == HIT_ACTION ? m_hit_item & 3 : -1, states); } else if (!nonHoverText.IsEmpty()) { texts.Add(nonHoverText);