mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 08:47:52 -06:00
Added checking for a extruder value in ObjectList. Set value to "default" if "0" is selected.
This commit is contained in:
parent
f6633df57b
commit
fb39516c65
2 changed files with 24 additions and 21 deletions
|
@ -552,6 +552,29 @@ void ObjectDataViewModelNode::msw_rescale()
|
||||||
update_settings_digest_bitmaps();
|
update_settings_digest_bitmaps();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool ObjectDataViewModelNode::SetValue(const wxVariant& variant, unsigned col)
|
||||||
|
{
|
||||||
|
switch (col)
|
||||||
|
{
|
||||||
|
case 0: {
|
||||||
|
DataViewBitmapText data;
|
||||||
|
data << variant;
|
||||||
|
m_bmp = data.GetBitmap();
|
||||||
|
m_name = data.GetText();
|
||||||
|
return true; }
|
||||||
|
case 1: {
|
||||||
|
const wxString & val = variant.GetString();
|
||||||
|
m_extruder = val == "0" ? _(L("default")) : val;
|
||||||
|
return true; }
|
||||||
|
case 2:
|
||||||
|
m_action_icon << variant;
|
||||||
|
return true;
|
||||||
|
default:
|
||||||
|
printf("MyObjectTreeModel::SetValue: wrong column");
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
void ObjectDataViewModelNode::SetIdx(const int& idx)
|
void ObjectDataViewModelNode::SetIdx(const int& idx)
|
||||||
{
|
{
|
||||||
m_idx = idx;
|
m_idx = idx;
|
||||||
|
|
|
@ -301,27 +301,7 @@ public:
|
||||||
return m_children.GetCount();
|
return m_children.GetCount();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool SetValue(const wxVariant &variant, unsigned int col)
|
bool SetValue(const wxVariant &variant, unsigned int col);
|
||||||
{
|
|
||||||
switch (col)
|
|
||||||
{
|
|
||||||
case 0:{
|
|
||||||
DataViewBitmapText data;
|
|
||||||
data << variant;
|
|
||||||
m_bmp = data.GetBitmap();
|
|
||||||
m_name = data.GetText();
|
|
||||||
return true;}
|
|
||||||
case 1:
|
|
||||||
m_extruder = variant.GetString();
|
|
||||||
return true;
|
|
||||||
case 2:
|
|
||||||
m_action_icon << variant;
|
|
||||||
return true;
|
|
||||||
default:
|
|
||||||
printf("MyObjectTreeModel::SetValue: wrong column");
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetBitmap(const wxBitmap &icon) { m_bmp = icon; }
|
void SetBitmap(const wxBitmap &icon) { m_bmp = icon; }
|
||||||
const wxBitmap& GetBitmap() const { return m_bmp; }
|
const wxBitmap& GetBitmap() const { return m_bmp; }
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue