From 8de7e353c0d4cb19c3011e82a6d46d4221c86f98 Mon Sep 17 00:00:00 2001 From: supermerill Date: Thu, 3 Jun 2021 19:38:15 +0200 Subject: [PATCH] change 'Perimeter' to 'Internal perimeter' fixed some typo in description output --- src/libslic3r/ExtrusionEntity.cpp | 4 ++-- src/libslic3r/GCode.cpp | 6 ++---- src/slic3r/GUI/GUI_Preview.cpp | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/libslic3r/ExtrusionEntity.cpp b/src/libslic3r/ExtrusionEntity.cpp index 445d1bc5b..1cbb9e00f 100644 --- a/src/libslic3r/ExtrusionEntity.cpp +++ b/src/libslic3r/ExtrusionEntity.cpp @@ -268,7 +268,7 @@ std::string ExtrusionEntity::role_to_string(ExtrusionRole role) { switch (role) { case erNone : return L("Unknown"); - case erPerimeter : return L("Perimeter"); + case erPerimeter : return L("Internal perimeter"); case erExternalPerimeter : return L("External perimeter"); case erOverhangPerimeter : return L("Overhang perimeter"); case erInternalInfill : return L("Internal infill"); @@ -295,7 +295,7 @@ std::string ExtrusionEntity::role_to_string(ExtrusionRole role) ExtrusionRole ExtrusionEntity::string_to_role(const std::string_view role) { - if (role == L("Perimeter")) + if (role == L("Perimeter") || role == L("Internal perimeter")) return erPerimeter; else if (role == L("External perimeter")) return erExternalPerimeter; diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index dd117c1bf..938cc4fc0 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -2419,7 +2419,7 @@ void GCode::process_layer( this->set_origin(0., 0.); m_avoid_crossing_perimeters.use_external_mp(); - gcode += this->extrude_entity(print.brim(), "brim", m_config.support_material_speed.value); + gcode += this->extrude_entity(print.brim(), "Brim", m_config.support_material_speed.value); m_brim_done = true; m_avoid_crossing_perimeters.use_external_mp(false); // Allow a straight travel move to the first object point. @@ -3559,7 +3559,7 @@ std::vector cut_corner_cache = { std::string GCode::_extrude(const ExtrusionPath &path, const std::string &description, double speed) { - std::string descr = description + ExtrusionEntity::role_to_string(path.role()); + std::string descr = description.empty() ? ExtrusionEntity::role_to_string(path.role()) : description; std::string gcode = this->_before_extrude(path, descr, speed); // calculate extrusion length per distance unit @@ -3676,8 +3676,6 @@ std::string GCode::_extrude(const ExtrusionPath &path, const std::string &descri std::string GCode::_before_extrude(const ExtrusionPath &path, const std::string &description_in, double speed) { std::string gcode; std::string description{ description_in }; - if (is_bridge(path.role())) - description += " (bridge)"; // go to first point of extrusion path if (!m_last_pos_defined || m_last_pos != path.first_point()) { diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp index 4c7a61cf0..2898cc8bd 100644 --- a/src/slic3r/GUI/GUI_Preview.cpp +++ b/src/slic3r/GUI/GUI_Preview.cpp @@ -264,7 +264,7 @@ bool Preview::init(wxWindow* parent, Model* model) wxSize((m_width_screen == large ? 35: (m_width_screen == medium ?20:15)) * wxGetApp().em_unit(), -1), wxCB_READONLY); std::string feature_items = GUI::into_u8( _L("Unknown") + "|1|" + - _L("Perimeter") + "|1|" + + _L("Internal perimeter") + "|1|" + _L("External perimeter") + "|1|" + _L("Overhang perimeter") + "|1|" + _L("Internal infill") + "|1|" +