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

Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates

Browse Source
This commit is contained in:
enricoturri1966 2021-10-21 11:27:45 +02:00
commit 122b2077b4
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/PrintConfig.cpp
View File

@ -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>(FuzzySkinType::None));

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

@ -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()) {

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

@ -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<ModelVolume*>& added_volumes, ModelVolumeType type, bool from_galery/* = false* /)
void ObjectList::load_part(ModelObject& model_object, std::vector<ModelVolume*>& added_volumes, ModelVolumeType type, bool from_galery = false)
{
if (type != ModelVolumeType::MODEL_PART)
return;

8
src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
View File

@ -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);
}

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

@ -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

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

@ -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 ||

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

@ -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));
}

4
tests/libslic3r/test_config.cpp
View File

@ -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);