From 1256aebd889222971825faf917ddc20e22b15b56 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Tue, 18 May 2021 12:58:14 +0200 Subject: [PATCH] Fix of some warnings --- src/slic3r/GUI/GUI_ObjectList.cpp | 5 +++-- src/slic3r/GUI/GUI_Preview.cpp | 2 +- src/slic3r/GUI/MainFrame.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 0b6235425..c371da2a7 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -2327,6 +2327,7 @@ void ObjectList::update_info_items(size_t obj_idx) should_show = printer_technology() == ptFFF && ! model_object->layer_height_profile.empty(); break; + default: break; } if (! shows && should_show) { @@ -2509,8 +2510,8 @@ void ObjectList::select_object_item(bool is_msr_gizmo) { if (wxDataViewItem item = GetSelection()) { ItemType type = m_objects_model->GetItemType(item); - bool is_volume_item = type == itVolume || type == itSettings && m_objects_model->GetItemType(m_objects_model->GetParent(item)) == itVolume; - if (is_msr_gizmo && is_volume_item || type == itObject) + bool is_volume_item = type == itVolume || (type == itSettings && m_objects_model->GetItemType(m_objects_model->GetParent(item)) == itVolume); + if ((is_msr_gizmo && is_volume_item) || type == itObject) return; if (wxDataViewItem obj_item = m_objects_model->GetTopParent(item)) { diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp index 769ab3f59..c5124cd63 100644 --- a/src/slic3r/GUI/GUI_Preview.cpp +++ b/src/slic3r/GUI/GUI_Preview.cpp @@ -675,7 +675,7 @@ void Preview::update_layers_slider(const std::vector& layers_z, bool kee if (cur_area != bottom_area && fabs(cur_area - bottom_area) > scale_(scale_(1))) break; } - if (i < size_t(0.3 * num_layers)) + if (i < int(0.3 * num_layers)) continue; // bottom layer have to be a biggest, so control relation between bottom layer and object size diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index e7065cb13..989056bfc 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -545,7 +545,7 @@ void MainFrame::init_tabpanel() m_tabpanel->Bind(wxEVT_NOTEBOOK_PAGE_CHANGED, [this](wxBookCtrlEvent& e) { #if ENABLE_VALIDATE_CUSTOM_GCODE if (int old_selection = e.GetOldSelection(); - old_selection != wxNOT_FOUND && old_selection < m_tabpanel->GetPageCount()) { + old_selection != wxNOT_FOUND && old_selection < static_cast(m_tabpanel->GetPageCount())) { Tab* old_tab = dynamic_cast(m_tabpanel->GetPage(old_selection)); if (old_tab) old_tab->validate_custom_gcodes();