From 5f19539df54f0572e54e63892fb1652359fa66c6 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Thu, 21 Oct 2021 09:55:12 +0200 Subject: [PATCH 1/3] Obvious fixes to stupid warnings --- src/slic3r/GUI/DoubleSlider.cpp | 2 +- src/slic3r/GUI/GUI_ObjectList.cpp | 2 +- src/slic3r/GUI/ImGuiWrapper.cpp | 2 +- src/slic3r/GUI/OptionsGroup.cpp | 2 +- src/slic3r/GUI/Plater.cpp | 2 +- tests/libslic3r/test_config.cpp | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/slic3r/GUI/DoubleSlider.cpp b/src/slic3r/GUI/DoubleSlider.cpp index d0b29165c7..fc47484b56 100644 --- a/src/slic3r/GUI/DoubleSlider.cpp +++ b/src/slic3r/GUI/DoubleSlider.cpp @@ -2080,7 +2080,7 @@ void Control::auto_color_change() } int extruders_cnt = GUI::wxGetApp().extruders_edited_cnt(); - int extruder = 2; +// int extruder = 2; const Print& print = GUI::wxGetApp().plater()->fff_print(); for (auto object : print.objects()) { diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 83f9d1ec1a..43ebd23f2b 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -1433,7 +1433,7 @@ void ObjectList::load_subobject(ModelVolumeType type, bool from_galery/* = false selection_changed(); } /* -void ObjectList::load_part(ModelObject& model_object, std::vector& added_volumes, ModelVolumeType type, bool from_galery/* = false* /) +void ObjectList::load_part(ModelObject& model_object, std::vector& added_volumes, ModelVolumeType type, bool from_galery = false) { if (type != ModelVolumeType::MODEL_PART) return; diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp index 22dccc695a..a65991a1e6 100644 --- a/src/slic3r/GUI/ImGuiWrapper.cpp +++ b/src/slic3r/GUI/ImGuiWrapper.cpp @@ -306,7 +306,7 @@ ImVec2 ImGuiWrapper::get_item_spacing() const { const ImGuiContext &g = *GImGui; const ImGuiStyle &style = g.Style; - return g.Style.ItemSpacing; + return style.ItemSpacing; } float ImGuiWrapper::get_slider_float_height() const diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp index fd9f4b5e82..2e0d8384de 100644 --- a/src/slic3r/GUI/OptionsGroup.cpp +++ b/src/slic3r/GUI/OptionsGroup.cpp @@ -201,7 +201,7 @@ void OptionsGroup::activate_line(Line& line) if (line.is_separator()) return; - m_use_custom_ctrl_as_parent = false; + m_use_custom_ctrl_as_parent = false; if (line.full_width && ( line.widget != nullptr || diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 9a24d91cc8..0013e106c7 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -205,7 +205,7 @@ void ObjectInfo::msw_rescale() void ObjectInfo::update_warning_icon(const std::string& warning_icon_name) { - if (showing_manifold_warning_icon = !warning_icon_name.empty()) { + if ((showing_manifold_warning_icon = !warning_icon_name.empty())) { m_warning_icon_name = warning_icon_name; manifold_warning_icon->SetBitmap(create_scaled_bitmap(m_warning_icon_name)); } diff --git a/tests/libslic3r/test_config.cpp b/tests/libslic3r/test_config.cpp index 2131050844..8dfda789ee 100644 --- a/tests/libslic3r/test_config.cpp +++ b/tests/libslic3r/test_config.cpp @@ -220,7 +220,7 @@ SCENARIO("DynamicPrintConfig serialization", "[Config]") { cereal::BinaryOutputArchive oarchive(ss); oarchive(cfg); serialized = ss.str(); - } catch (std::runtime_error e) { + } catch (std::runtime_error &e) { e.what(); } @@ -230,7 +230,7 @@ SCENARIO("DynamicPrintConfig serialization", "[Config]") { std::stringstream ss(serialized); cereal::BinaryInputArchive iarchive(ss); iarchive(cfg2); - } catch (std::runtime_error e) { + } catch (std::runtime_error &e) { e.what(); } REQUIRE(cfg == cfg2); From 69721123db6e63c30f0fb42c9c10da83f054d6e0 Mon Sep 17 00:00:00 2001 From: Niall Sheridan Date: Fri, 8 Oct 2021 21:12:39 +0100 Subject: [PATCH 2/3] [fuzzy skin] Use "walls" instead of "perimeters" in option "Perimeters" has a specific meaning within Prusa Slicer, but fuzzy skin uses "perimeters" to mean "walls" which can be confusing --- src/libslic3r/PrintConfig.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index b34a6cb58e..2e3de778e0 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1244,8 +1244,8 @@ void PrintConfigDef::init_fff_params() def->enum_values.push_back("external"); def->enum_values.push_back("all"); def->enum_labels.push_back(L("None")); - def->enum_labels.push_back(L("External perimeters")); - def->enum_labels.push_back(L("All perimeters")); + def->enum_labels.push_back(L("Outside walls")); + def->enum_labels.push_back(L("All walls")); def->mode = comSimple; def->set_default_value(new ConfigOptionEnum(FuzzySkinType::None)); From 1a9a4088c2e0e8cb5609d46188d78499cb15c28c Mon Sep 17 00:00:00 2001 From: Filip Sykala Date: Thu, 21 Oct 2021 11:01:15 +0200 Subject: [PATCH 3/3] Fix translation suggestion by @Oleksandra Iushchenko --- src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp index 2c094bf784..c72f744e10 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp @@ -267,7 +267,7 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi ImGui::NewLine(); ImGui::SameLine(m_gui_cfg->bottom_left_width); - ImGui::Text(_L("%d triangles").c_str(), m_configuration.wanted_count); + ImGui::Text(_u8L("%d triangles").c_str(), m_configuration.wanted_count); m_imgui->disabled_end(); // use_count if (ImGui::Checkbox(_u8L("Show wireframe").c_str(), &m_show_wireframe)) { @@ -277,7 +277,7 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi bool is_canceling = m_state == State::canceling; m_imgui->disabled_begin(is_canceling); - if (m_imgui->button(_L("Cancel"))) { + if (m_imgui->button(_u8L("Cancel"))) { if (m_state == State::settings) { if (m_original_its.has_value()) { set_its(*m_original_its); @@ -296,7 +296,7 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi bool is_processing = m_state != State::settings; m_imgui->disabled_begin(is_processing); - if (m_imgui->button(_L("Apply"))) { + if (m_imgui->button(_u8L("Apply"))) { if (!m_is_valid_result) { m_state = State::close_on_end; process(); @@ -397,7 +397,7 @@ void GLGizmoSimplify::process() // store previous state auto plater = wxGetApp().plater(); - plater->take_snapshot(_L("Simplify ") + m_volume->name); + plater->take_snapshot(_u8L("Simplify ") + m_volume->name); plater->clear_before_change_mesh(m_obj_index); }