GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 15:45:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

change 'Perimeter' to 'Internal perimeter'

Browse Source 
fixed some typo in description output
This commit is contained in:
supermerill 2021-06-03 19:38:15 +02:00
parent 94d277766b
commit 8de7e353c0
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/ExtrusionEntity.cpp
View File

@ -268,7 +268,7 @@ std::string ExtrusionEntity::role_to_string(ExtrusionRole role)
{ {
switch (role) { switch (role) {
case erNone : return L("Unknown"); case erNone : return L("Unknown");
case erPerimeter : return L("Perimeter"); case erPerimeter : return L("Internal perimeter");
case erExternalPerimeter : return L("External perimeter"); case erExternalPerimeter : return L("External perimeter");
case erOverhangPerimeter : return L("Overhang perimeter"); case erOverhangPerimeter : return L("Overhang perimeter");
case erInternalInfill : return L("Internal infill"); 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) ExtrusionRole ExtrusionEntity::string_to_role(const std::string_view role)
{ {
if (role == L("Perimeter")) if (role == L("Perimeter") || role == L("Internal perimeter"))
return erPerimeter; return erPerimeter;
else if (role == L("External perimeter")) else if (role == L("External perimeter"))
return erExternalPerimeter; return erExternalPerimeter;

6
src/libslic3r/GCode.cpp
View File

@ -2419,7 +2419,7 @@ void GCode::process_layer(
this->set_origin(0., 0.); this->set_origin(0., 0.);
m_avoid_crossing_perimeters.use_external_mp(); 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_brim_done = true;
m_avoid_crossing_perimeters.use_external_mp(false); m_avoid_crossing_perimeters.use_external_mp(false);
// Allow a straight travel move to the first object point. // Allow a straight travel move to the first object point.
@ -3559,7 +3559,7 @@ std::vector<double> cut_corner_cache = {
std::string GCode::_extrude(const ExtrusionPath &path, const std::string &description, double speed) { 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); std::string gcode = this->_before_extrude(path, descr, speed);
// calculate extrusion length per distance unit // 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::_before_extrude(const ExtrusionPath &path, const std::string &description_in, double speed) {
std::string gcode; std::string gcode;
std::string description{ description_in }; std::string description{ description_in };
if (is_bridge(path.role()))
description += " (bridge)";
// go to first point of extrusion path // go to first point of extrusion path
if (!m_last_pos_defined || m_last_pos != path.first_point()) { if (!m_last_pos_defined || m_last_pos != path.first_point()) {

2
src/slic3r/GUI/GUI_Preview.cpp
View File

@ -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); 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( std::string feature_items = GUI::into_u8(
_L("Unknown") + "|1|" + _L("Unknown") + "|1|" +
_L("Perimeter") + "|1|" + _L("Internal perimeter") + "|1|" +
_L("External perimeter") + "|1|" + _L("External perimeter") + "|1|" +
_L("Overhang perimeter") + "|1|" + _L("Overhang perimeter") + "|1|" +
_L("Internal infill") + "|1|" + _L("Internal infill") + "|1|" +