From 377756464e7f6ebca6806e36dd09e80ecbd26d5d Mon Sep 17 00:00:00 2001 From: Arthur Date: Wed, 6 Mar 2024 11:01:27 +0800 Subject: [PATCH] NEW: add rounded rectangle model Rounded rectangle can be used to create some frequently contacted models. Also add icons for some objects. jira: none Change-Id: I59dec8d6d892f8fb975b0723ea2cd85ccfc65d28 (cherry picked from commit 83830b844d3720f99651174daa3b1ac81e64e5d7) --- resources/model/Cone.png | Bin 0 -> 8964 bytes resources/model/Cube.png | Bin 0 -> 1883 bytes resources/model/Cylinder.png | Bin 0 -> 1489 bytes resources/model/Disc.png | Bin 0 -> 1455 bytes resources/model/Sphere.png | Bin 0 -> 4006 bytes resources/model/Torus.png | Bin 0 -> 18433 bytes resources/model/rounded_rectangle.png | Bin 0 -> 1851 bytes resources/model/rounded_rectangle.stl | Bin 0 -> 6284 bytes src/slic3r/GUI/GUI_Factories.cpp | 6 ++++-- src/slic3r/GUI/GUI_ObjectList.cpp | 2 ++ 10 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 resources/model/Cone.png create mode 100644 resources/model/Cube.png create mode 100644 resources/model/Cylinder.png create mode 100644 resources/model/Disc.png create mode 100644 resources/model/Sphere.png create mode 100644 resources/model/Torus.png create mode 100644 resources/model/rounded_rectangle.png create mode 100644 resources/model/rounded_rectangle.stl diff --git a/resources/model/Cone.png b/resources/model/Cone.png new file mode 100644 index 0000000000000000000000000000000000000000..87bc51d464440a6a195b20088d3a0dbe22e1cdcb GIT binary patch literal 8964 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 literal 0 HcmV?d00001 diff --git a/resources/model/rounded_rectangle.png b/resources/model/rounded_rectangle.png new file mode 100644 index 0000000000000000000000000000000000000000..21190f16a52019198da78da420d8bcf1903ec7dc GIT binary patch literal 1851 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 literal 0 HcmV?d00001 diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index 5e1804a50..dc842641e 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -484,10 +484,12 @@ wxMenu* MenuFactory::append_submenu_add_generic(wxMenu* menu, ModelVolumeType ty sub_menu->AppendSeparator(); } - for (auto &item : {L("Cube"), L("Cylinder"), L("Sphere"), L("Cone"), L("Disc"),L("Torus")}) + std::vector icons = { "cube", "Cylinder", "Sphere", "Cone", "Disc", "Torus", "rounded_rectangle" }; + size_t i = 0; + for (auto &item : {L("Cube"), L("Cylinder"), L("Sphere"), L("Cone"), L("Disc"),L("Torus"),L("Rounded Rectangle") }) { append_menu_item(sub_menu, wxID_ANY, _(item), "", - [type, item](wxCommandEvent&) { obj_list()->load_generic_subobject(item, type); }, "", menu); + [type, item](wxCommandEvent&) { obj_list()->load_generic_subobject(item, type); }, Slic3r::resources_dir() + "/model/" + icons[i++] + ".png", menu); } if (type == ModelVolumeType::INVALID) { diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index de0e56a1f..a0ca20de5 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -2104,6 +2104,8 @@ static TriangleMesh create_mesh(const std::string& type_name, const BoundingBoxf mesh.ReadSTLFile((Slic3r::resources_dir() + "/model/Disc.stl").c_str(), true, nullptr); else if (type_name == "Torus") mesh.ReadSTLFile((Slic3r::resources_dir() + "/model/torus.stl").c_str(), true, nullptr); + else if (type_name == "Rounded Rectangle") + mesh.ReadSTLFile((Slic3r::resources_dir() + "/model/rounded_rectangle.stl").c_str(), true, nullptr); else if (type_name == "Bambu Cube") mesh.ReadSTLFile((Slic3r::resources_dir() + "/model/Bambu_Cube.stl").c_str(), true, nullptr); else if (type_name == "Bambu Cube V2")