3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 09:47:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into lm_fdm_custom_supports_backend

Browse source
This commit is contained in:
Lukas Matena 2020-04-17 14:19:16 +02:00
commit 2f8a5dd6f6
6 changed files with 1160 additions and 1133 deletions
Download patch file Download diff file Expand all files Collapse all files

2270
resources/localization/PrusaSlicer.pot
View file

File diff suppressed because it is too large Load diff

BIN
resources/localization/fr/PrusaSlicer.mo
View file

Binary file not shown.

2
resources/localization/fr/PrusaSlicer_fr.po
View file

@ -6360,7 +6360,7 @@ msgstr "Redimensionner"
#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:459 #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:459
msgid "Scale factors" msgid "Scale factors"
msgstr "Facteurs de redimensionnement" msgstr "Échelle"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:196 #: src/slic3r/GUI/KBShortcutsDialog.cpp:196
msgid "" msgid ""

3
src/slic3r/GUI/GUI_App.cpp
View file

@ -925,7 +925,8 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
local_menu->AppendSeparator(); local_menu->AppendSeparator();
auto mode_menu = new wxMenu(); auto mode_menu = new wxMenu();
mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeSimple, _(L("Simple")), _(L("Simple View Mode"))); mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeSimple, _(L("Simple")), _(L("Simple View Mode")));
mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeAdvanced, _(L("Advanced")), _(L("Advanced View Mode"))); // mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeAdvanced, _(L("Advanced")), _(L("Advanced View Mode")));
mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeAdvanced, _CTX(L_CONTEXT("Advanced", "Mode"), "Mode"), _L("Advanced View Mode"));
mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeExpert, _(L("Expert")), _(L("Expert View Mode"))); mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeExpert, _(L("Expert")), _(L("Expert View Mode")));
Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { if(get_mode() == comSimple) evt.Check(true); }, config_id_base + ConfigMenuModeSimple); Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { if(get_mode() == comSimple) evt.Check(true); }, config_id_base + ConfigMenuModeSimple);
Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { if(get_mode() == comAdvanced) evt.Check(true); }, config_id_base + ConfigMenuModeAdvanced); Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { if(get_mode() == comAdvanced) evt.Check(true); }, config_id_base + ConfigMenuModeAdvanced);

15
src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
View file

@ -102,10 +102,14 @@ void GLGizmoFdmSupports::render_triangles(const Selection& selection) const
glsafe(::glPushMatrix()); glsafe(::glPushMatrix());
glsafe(::glMultMatrixd(trafo_matrix.data())); glsafe(::glMultMatrixd(trafo_matrix.data()));
glsafe(::glColor4f(0.2f, 0.2f, 1.0f, 0.5f));
m_ivas[mesh_id][0].render(); // Now render both enforcers and blockers.
glsafe(::glColor4f(1.f, 0.2f, 0.2f, 0.5f)); for (int i=0; i<2; ++i) {
m_ivas[mesh_id][1].render(); if (m_ivas[mesh_id][i].has_VBOs()) {
glsafe(::glColor4f(i ? 1.f : 0.2f, 0.2f, i ? 0.2f : 1.0f, 0.5f));
m_ivas[mesh_id][i].render();
}
}
glsafe(::glPopMatrix()); glsafe(::glPopMatrix());
} }
} }
@ -470,7 +474,8 @@ void GLGizmoFdmSupports::update_vertex_buffers(const ModelVolume* mv,
iva.push_triangle(3*triangle_cnt, 3*triangle_cnt+1, 3*triangle_cnt+2); iva.push_triangle(3*triangle_cnt, 3*triangle_cnt+1, 3*triangle_cnt+2);
++triangle_cnt; ++triangle_cnt;
} }
iva.finalize_geometry(true); if (! m_selected_facets[mesh_id].empty())
iva.finalize_geometry(true);
} }
} }

3
src/slic3r/GUI/wxExtensions.cpp
View file

@ -754,7 +754,8 @@ ModeSizer::ModeSizer(wxWindow *parent, int hgap/* = 0*/) :
std::vector < std::pair < wxString, std::string >> buttons = { std::vector < std::pair < wxString, std::string >> buttons = {
{_(L("Simple")), "mode_simple"}, {_(L("Simple")), "mode_simple"},
{_(L("Advanced")), "mode_advanced"}, // {_(L("Advanced")), "mode_advanced"},
{_CTX(L_CONTEXT("Advanced", "Mode"), "Mode"), "mode_advanced"},
{_(L("Expert")), "mode_expert"}, {_(L("Expert")), "mode_expert"},
}; };