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

fix merge

Browse Source
This commit is contained in:
supermerill 2020-11-06 03:41:30 +01:00
parent c3dcf9864a
commit 835ffc6564
10 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libslic3r/Fill/Fill.cpp
View File

@ -138,9 +138,13 @@ std::vector<SurfaceFill> group_fills(const Layer &layer)
params.density = float(layerm.region()->config().over_bridge_flow_ratio.get_abs_value(1)); params.density = float(layerm.region()->config().over_bridge_flow_ratio.get_abs_value(1));
} }
//note: same as getRoleFromSurfaceType()
params.role = erInternalInfill; params.role = erInternalInfill;
if (is_bridge) { if (is_bridge) {
params.role = erBridgeInfill; if(surface.has_pos_bottom())
params.role = erBridgeInfill;
else
params.role = erInternalBridgeInfill;
} else if (surface.has_fill_solid()) { } else if (surface.has_fill_solid()) {
if (surface.has_pos_top()) { if (surface.has_pos_top()) {
params.role = erTopSolidInfill; params.role = erTopSolidInfill;

2
src/libslic3r/GCode/GCodeProcessor.cpp
View File

@ -1282,7 +1282,7 @@ bool GCodeProcessor::process_simplify3d_tags(const std::string_view comment)
return true; return true;
} }
// ; bridge // ; bridge (& internal bridge)
pos = comment.find(" bridge"); pos = comment.find(" bridge");
if (pos == 0) { if (pos == 0) {
m_extrusion_role = erBridgeInfill; m_extrusion_role = erBridgeInfill;

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

@ -2,7 +2,7 @@
#include "I18N.hpp" #include "I18N.hpp"
#include "libslic3r/Model.hpp" #include "libslic3r/Model.hpp"
#include "libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
#include "AppConfig.hpp" #include "libslic3r/AppConfig.hpp"
#include "GUI.hpp" #include "GUI.hpp"
#include "GUI_ObjectList.hpp" #include "GUI_ObjectList.hpp"
#include "Plater.hpp" #include "Plater.hpp"

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

@ -2,7 +2,7 @@
#include "I18N.hpp" #include "I18N.hpp"
#include "libslic3r/Model.hpp" #include "libslic3r/Model.hpp"
#include "libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
#include "AppConfig.hpp" #include "libslic3r/AppConfig.hpp"
#include "GUI.hpp" #include "GUI.hpp"
#include "GUI_ObjectList.hpp" #include "GUI_ObjectList.hpp"
#include "Plater.hpp" #include "Plater.hpp"

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

@ -2,7 +2,7 @@
#include "I18N.hpp" #include "I18N.hpp"
#include "libslic3r/Model.hpp" #include "libslic3r/Model.hpp"
#include "libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
#include "AppConfig.hpp" #include "libslic3r/AppConfig.hpp"
#include "GUI.hpp" #include "GUI.hpp"
#include "GUI_ObjectList.hpp" #include "GUI_ObjectList.hpp"
#include "Plater.hpp" #include "Plater.hpp"

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

@ -2,7 +2,7 @@
#include "I18N.hpp" #include "I18N.hpp"
#include "libslic3r/Model.hpp" #include "libslic3r/Model.hpp"
#include "libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
#include "AppConfig.hpp" #include "libslic3r/AppConfig.hpp"
#include "GUI.hpp" #include "GUI.hpp"
#include "GUI_ObjectList.hpp" #include "GUI_ObjectList.hpp"
#include "Plater.hpp" #include "Plater.hpp"

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

@ -2,7 +2,7 @@
#include "I18N.hpp" #include "I18N.hpp"
#include "libslic3r/Model.hpp" #include "libslic3r/Model.hpp"
#include "libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
#include "AppConfig.hpp" #include "libslic3r/AppConfig.hpp"
#include "GUI.hpp" #include "GUI.hpp"
#include "GUI_ObjectList.hpp" #include "GUI_ObjectList.hpp"
#include "Plater.hpp" #include "Plater.hpp"

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

@ -3,7 +3,7 @@
#include "libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
#include "libslic3r/CustomGCode.hpp" #include "libslic3r/CustomGCode.hpp"
#include "libslic3r/Model.hpp" #include "libslic3r/Model.hpp"
#include "AppConfig.hpp" #include "libslic3r/AppConfig.hpp"
#include "GUI.hpp" #include "GUI.hpp"
#include "GUI_ObjectList.hpp" #include "GUI_ObjectList.hpp"
#include "Plater.hpp" #include "Plater.hpp"

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

@ -330,21 +330,21 @@ bool Preview::init(wxWindow* parent, Model* model)
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
_L("Unknown") + "|1|" + _L("Unknown") + "|1|" +
#endif // ENABLE_GCODE_VIEWER _L("Perimeter") + "|" + #endif // ENABLE_GCODE_VIEWER _L("Perimeter") + "|" +
_L("External perimeter") + "|" + _L("External perimeter") + "|1|" +
_L("Overhang perimeter") + "|" + _L("Overhang perimeter") + "|1|" +
_L("Internal infill") + "|" + _L("Internal infill") + "|1|" +
_L("Solid infill") + "|" + _L("Solid infill") + "|1|" +
_L("Top solid infill") + "|" + _L("Top solid infill") + "|1|" +
_L("Bridge infill") + "|" + _L("Bridge infill") + "|1|" +
_L("Internal bridge infill") + "|" + _L("Internal bridge infill") + "|1|" +
_L("Thin wall") + "|" + _L("Thin wall") + "|1|" +
_L("Gap fill") + "|" + _L("Gap fill") + "|1|" +
_L("Skirt") + "|" + _L("Skirt") + "|1|" +
_L("Support material") + "|" + _L("Support material") + "|1|" +
_L(width_screen == large? "Support material interface": "Sup. mat. interface") + "|" + _L(width_screen == large? "Support material interface": "Sup. mat. interface") + "|1|" +
_L("Wipe tower") + "|" + _L("Wipe tower") + "|1|" +
_L("Mill") + "|" + _L("Mill") + "|1|" +
_L("Custom") _L("Custom") + "|1"
); );
Slic3r::GUI::create_combochecklist(m_combochecklist_features, GUI::into_u8(_L("Feature types")), feature_items); Slic3r::GUI::create_combochecklist(m_combochecklist_features, GUI::into_u8(_L("Feature types")), feature_items);

6
src/slic3r/GUI/OG_CustomCtrl.cpp
View File

@ -696,15 +696,15 @@ wxPoint OG_CustomCtrl::CtrlLine::draw_blinking_bmp(wxDC& dc, wxPoint pos, bool i
wxCoord OG_CustomCtrl::CtrlLine::draw_act_bmps(wxDC& dc, wxPoint pos, const wxBitmap& bmp_undo_to_sys, const wxBitmap& bmp_undo, bool is_blinking, size_t rect_id) wxCoord OG_CustomCtrl::CtrlLine::draw_act_bmps(wxDC& dc, wxPoint pos, const wxBitmap& bmp_undo_to_sys, const wxBitmap& bmp_undo, bool is_blinking, size_t rect_id)
{ {
wxCoord h_pos = pos.x; wxCoord h_pos = pos.x;
wxCoord v_pos = pos.y; wxCoord v_pos = pos.y + height / 2 - this->ctrl->m_bmp_blinking_sz.GetHeight() / 2;
dc.DrawBitmap(bmp_undo_to_sys, h_pos, v_pos + 5); dc.DrawBitmap(bmp_undo_to_sys, h_pos, v_pos);
int bmp_dim = get_bitmap_size(bmp_undo_to_sys).GetWidth(); int bmp_dim = get_bitmap_size(bmp_undo_to_sys).GetWidth();
rects_undo_to_sys_icon[rect_id] = wxRect(h_pos, v_pos, bmp_dim, bmp_dim); rects_undo_to_sys_icon[rect_id] = wxRect(h_pos, v_pos, bmp_dim, bmp_dim);
h_pos += bmp_dim + ctrl->m_h_gap; h_pos += bmp_dim + ctrl->m_h_gap;
dc.DrawBitmap(bmp_undo, h_pos, v_pos + 5); dc.DrawBitmap(bmp_undo, h_pos, v_pos);
bmp_dim = get_bitmap_size(bmp_undo).GetWidth(); bmp_dim = get_bitmap_size(bmp_undo).GetWidth();
rects_undo_icon[rect_id] = wxRect(h_pos, v_pos, bmp_dim, bmp_dim); rects_undo_icon[rect_id] = wxRect(h_pos, v_pos, bmp_dim, bmp_dim);