From 5ecd78434c8e21499de6d71eff3a63e3e52155a4 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Thu, 14 Mar 2019 09:19:21 +0100 Subject: [PATCH 1/4] Fixed #1949 --- src/libslic3r/PrintConfig.cpp | 2 +- src/slic3r/GUI/GUI_ObjectList.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 11fff2fb3..a9fc1c63f 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -405,7 +405,7 @@ void PrintConfigDef::init_fff_params() def = this->add("bottom_fill_pattern", coEnum); *def = *def_top_fill_pattern; - def->label = L("Bottom Pattern"); + def->label = L("Bottom fill pattern"); def->tooltip = L("Fill pattern for bottom infill. This only affects the bottom external visible layer, and not its adjacent solid shells."); def->cli = "bottom-fill-pattern|external-fill-pattern|solid-fill-pattern"; def->default_value = new ConfigOptionEnum(ipRectilinear); diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 57469a0c6..8fe7c2d05 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -655,9 +655,7 @@ void ObjectList::get_options_menu(settings_menu_hierarchy& settings_menu, const if (category.empty() || (category == "Extruders" && extruders_cnt == 1)) continue; - const std::string& label = opt->label.empty() ? opt->full_label : - opt->full_label.empty() ? opt->label : - opt->full_label + " " + opt->label;; + const std::string& label = !opt->full_label.empty() ? opt->full_label : opt->label; std::pair option_label(option, label); std::vector< std::pair > new_category; auto& cat_opt_label = settings_menu.find(category) == settings_menu.end() ? new_category : settings_menu.at(category); From 7cced0613a80ef4fa428127e75555ba0ac595ea7 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Thu, 14 Mar 2019 09:22:15 +0100 Subject: [PATCH 2/4] Fixed crash after deleting of the part with no extruder options in configuration --- src/slic3r/GUI/GUI_ObjectList.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 8fe7c2d05..4757c95b9 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -1761,7 +1761,8 @@ void ObjectList::delete_from_model_and_list(const std::vector& it if (item->type&itVolume) { m_objects_model->Delete(m_objects_model->GetItemByVolumeId(item->obj_idx, item->sub_obj_idx)); - if ((*m_objects)[item->obj_idx]->volumes.size() == 1) + if ((*m_objects)[item->obj_idx]->volumes.size() == 1 && + (*m_objects)[item->obj_idx]->config.has("extruder")) { const wxString extruder = wxString::Format("%d", (*m_objects)[item->obj_idx]->config.option("extruder")->value); m_objects_model->SetValue(extruder, m_objects_model->GetItemById(item->obj_idx), 1); From 594d40cec8f8f30a783cc7438170ee476dbe1c25 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Thu, 14 Mar 2019 09:36:03 +0100 Subject: [PATCH 3/4] Fixing error with sla array indexing --- src/libslic3r/SLA/SLASupportTree.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/SLA/SLASupportTree.cpp b/src/libslic3r/SLA/SLASupportTree.cpp index 5f339fc96..9f2575036 100644 --- a/src/libslic3r/SLA/SLASupportTree.cpp +++ b/src/libslic3r/SLA/SLASupportTree.cpp @@ -1411,10 +1411,11 @@ public: using libnest2d::opt::GeneticOptimizer; using libnest2d::opt::StopCriteria; - for(unsigned i = 0, fidx = filtered_indices[0]; - i < filtered_indices.size(); ++i, fidx = filtered_indices[i]) + for(unsigned i = 0, fidx = 0; i < filtered_indices.size(); ++i) { m_thr(); + + fidx = filtered_indices[i]; auto n = nmls.row(i); // for all normals we generate the spherical coordinates and From 5255f79789ec6bfc634e18a94d78900c330e8196 Mon Sep 17 00:00:00 2001 From: Vojtech Kral Date: Wed, 13 Mar 2019 17:38:41 +0100 Subject: [PATCH 4/4] Fix crash on exit, pt2 --- src/slic3r/GUI/Tab.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 56af8b4f9..6c7f246a6 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -816,6 +816,10 @@ void Tab::update_wiping_button_visibility() { // to update number of "filament" selection boxes when the number of extruders change. void Tab::on_presets_changed() { + if (wxGetApp().plater() == nullptr) { + return; + } + // Instead of PostEvent (EVT_TAB_PRESETS_CHANGED) just call update_presets wxGetApp().plater()->sidebar().update_presets(m_type); update_preset_description_line();