3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed bug with last solid part deleting

Browse source 
+ fixed building
+ deleted last ";" from the settings digest
This commit is contained in:
YuSanka 2018-11-23 11:54:06 +01:00
parent a05bda5347
commit 4575443c4c
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/GUI_ObjectList.cpp
View file

@ -333,7 +333,7 @@ void ObjectList::key_event(wxKeyEvent& event)
printf("WXK_BACK\n"); printf("WXK_BACK\n");
remove(); remove();
} }
else if (wxGetKeyState(wxKeyCode('A')) && wxGetKeyState(WXK_CONTROL)) else if (wxGetKeyState(wxKeyCode('A')) && wxGetKeyState(WXK_SHIFT))
select_item_all_children(); select_item_all_children();
else else
event.Skip(); event.Skip();
@ -1230,7 +1230,8 @@ void ObjectList::delete_from_model_and_list(const std::vector<ItemForDelete>& it
m_objects_model->Delete(m_objects_model->GetItemById(item->obj_idx)); m_objects_model->Delete(m_objects_model->GetItemById(item->obj_idx));
} }
else { else {
del_subobject_from_object(item->obj_idx, item->sub_obj_idx, item->type); if (!del_subobject_from_object(item->obj_idx, item->sub_obj_idx, item->type))
continue;
if (item->type&itVolume) if (item->type&itVolume)
{ {
m_objects_model->Delete(m_objects_model->GetItemByVolumeId(item->obj_idx, item->sub_obj_idx)); m_objects_model->Delete(m_objects_model->GetItemByVolumeId(item->obj_idx, item->sub_obj_idx));
@ -1305,7 +1306,7 @@ void ObjectList::remove()
for (auto& item : sels) for (auto& item : sels)
{ {
if (m_objects_model->GetParent(item) == wxDataViewItem(0)) if (m_objects_model->GetParent(item) == wxDataViewItem(0))
wxGetApp().plater()->remove(m_objects_model->GetIdByItem(item)); delete_from_model_and_list(itObject, m_objects_model->GetIdByItem(item), -1);
else else
del_subobject_item(item); del_subobject_item(item);
} }

1
src/slic3r/GUI/GUI_ObjectManipulation.hpp
View file

@ -6,6 +6,7 @@
#include "GUI_ObjectSettings.hpp" #include "GUI_ObjectSettings.hpp"
#include "GLCanvas3D.hpp" #include "GLCanvas3D.hpp"
class wxStaticText;
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {

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

@ -410,6 +410,8 @@ bool PrusaObjectDataViewModelNode::update_settings_digest(const std::vector<std:
for (auto& cat : m_opt_categories) for (auto& cat : m_opt_categories)
m_name += cat + "; "; m_name += cat + "; ";
if (!m_name.IsEmpty())
m_name.erase(m_name.Length()-2, 2); // Delete last "; "
wxBitmap *bmp = m_bitmap_cache->find(m_name.ToStdString()); wxBitmap *bmp = m_bitmap_cache->find(m_name.ToStdString());
if (bmp == nullptr) { if (bmp == nullptr) {