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

Fixed build under OSX

Browse source
This commit is contained in:
YuSanka 2018-12-10 14:13:01 +01:00
parent eb1518bf31
commit 5e4c6c8e2d
2 changed files with 25 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -222,12 +222,28 @@ void ObjectList::set_extruder_column_hidden(bool hide)
GetColumn(1)->SetHidden(hide); GetColumn(1)->SetHidden(hide);
} }
void ObjectList::update_extruder_in_config(const wxString& selection) void ObjectList::update_extruder_in_config(const wxDataViewItem& item/*wxString& selection*/)
{ {
if (m_objects_model->GetParent(item) == wxDataViewItem(0)) {
const int obj_idx = m_objects_model->GetIdByItem(item);
m_config = &(*m_objects)[obj_idx]->config;
}
else {
const int obj_idx = m_objects_model->GetIdByItem(m_objects_model->GetParent(item));
const int volume_id = m_objects_model->GetVolumeIdByItem(item);
if (obj_idx < 0 || volume_id < 0)
return;
m_config = &(*m_objects)[obj_idx]->volumes[volume_id]->config;
}
wxVariant variant;
m_objects_model->GetValue(variant, item, 1);
const wxString selection = variant.GetString();
if (!m_config || selection.empty()) if (!m_config || selection.empty())
return; return;
int extruder = selection.size() > 1 ? 0 : atoi(selection.c_str()); const int extruder = selection.size() > 1 ? 0 : atoi(selection.c_str());
m_config->set_key_value("extruder", new ConfigOptionInt(extruder)); m_config->set_key_value("extruder", new ConfigOptionInt(extruder));
// update scene // update scene
@ -366,11 +382,11 @@ void ObjectList::item_value_change(wxDataViewEvent& event)
{ {
wxVariant variant; wxVariant variant;
m_objects_model->GetValue(variant, event.GetItem(), 1); m_objects_model->GetValue(variant, event.GetItem(), 1);
#ifdef __WXOSX__ // #ifdef __WXOSX__
m_selected_extruder = variant.GetString(); // m_selected_extruder = variant.GetString();
#else // --> for Linux // #else // --> for Linux
update_extruder_in_config(variant.GetString()); // update_extruder_in_config(variant.GetString());
#endif //__WXOSX__ // #endif //__WXOSX__
} }
} }
@ -1632,28 +1648,7 @@ void ObjectList::update_settings_items()
void ObjectList::ItemValueChanged(wxDataViewEvent &event) void ObjectList::ItemValueChanged(wxDataViewEvent &event)
{ {
const wxDataViewItem item = event.GetItem(); update_extruder_in_config(event.GetItem());
if (m_objects_model->GetParent(item) == wxDataViewItem(0)) {
const int obj_idx = m_objects_model->GetIdByItem(item);
m_config = &(*m_objects)[obj_idx]->config;
}
else {
const int obj_idx = m_objects_model->GetIdByItem(m_objects_model->GetParent(item));
const int volume_id = m_objects_model->GetVolumeIdByItem(item);
m_config = &(*m_objects)[obj_idx]->volumes[volume_id]->config;
}
wxVariant variant;
m_objects_model->GetValue(variant, event.GetItem(), 1);
const wxString sel_extr = variant.GetString();
if (!m_config || sel_extr.empty())
return;
int extruder = sel_extr.size() > 1 ? 0 : atoi(sel_extr.c_str());
m_config->set_key_value("extruder", new ConfigOptionInt(extruder));
// update scene
wxGetApp().plater()->update();
} }
} //namespace GUI } //namespace GUI

2
src/slic3r/GUI/GUI_ObjectList.hpp
View file

@ -105,7 +105,7 @@ public:
// show/hide "Extruder" column for Objects List // show/hide "Extruder" column for Objects List
void set_extruder_column_hidden(bool hide); void set_extruder_column_hidden(bool hide);
// update extruder in current config // update extruder in current config
void update_extruder_in_config(const wxString& selection); void update_extruder_in_config(const wxDataViewItem& item/*wxString& selection*/);
void init_icons(); void init_icons();