QIDITECH/QIDIStudio
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDIStudio.git synced 2026-02-07 12:21:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

update slic3r

Browse Source
This commit is contained in:
QIDI TECH
2025-05-08 15:05:30 +08:00
parent 126534997a
commit 011619cf23
307 changed files with 55594 additions and 19386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/slic3r/GUI/ObjectDataViewModel.cpp
View File

@@ -225,9 +225,9 @@ void ObjectDataViewModelNode::set_action_icon(bool enable)
}
// QDS
void ObjectDataViewModelNode::set_color_icon(bool enable)
void ObjectDataViewModelNode::set_color_icon(bool enable, bool force)
{
if (m_color_enable == enable)
if (!force && m_color_enable == enable)
return;
m_color_enable = enable;
if ((m_type & itObject) && enable)
@@ -236,9 +236,9 @@ void ObjectDataViewModelNode::set_color_icon(bool enable)
m_color_icon = create_scaled_bitmap("dot");
}
void ObjectDataViewModelNode::set_support_icon(bool enable)
void ObjectDataViewModelNode::set_support_icon(bool enable, bool force)
{
if (m_support_enable == enable)
if (!force && m_support_enable == enable)
return;
m_support_enable = enable;
if ((m_type & itObject) && enable)
@@ -247,9 +247,9 @@ void ObjectDataViewModelNode::set_support_icon(bool enable)
m_support_icon = create_scaled_bitmap("dot");
}
void ObjectDataViewModelNode::set_sinking_icon(bool enable)
void ObjectDataViewModelNode::set_sinking_icon(bool enable, bool force)
{
if (m_sink_enable == enable)
if (!force && m_sink_enable == enable)
return;
m_sink_enable = enable;
if ((m_type & itObject) && enable)
@@ -358,10 +358,10 @@ bool ObjectDataViewModelNode::SetValue(const wxVariant& variant, unsigned col)
return false;
}
void ObjectDataViewModelNode::SetName(const wxString &tempName)
{
void ObjectDataViewModelNode::SetName(const wxString &tempName)
{
if (m_name != tempName) {
m_name = tempName;
m_name = tempName;
}
}
@@ -515,7 +515,7 @@ wxDataViewItem ObjectDataViewModel::AddPlate(PartPlate* part_plate, wxString nam
if (!is_added) {
m_plates.push_back(plate_node);
}
wxDataViewItem plate_item(plate_node);
if (refresh) {
ItemAdded(wxDataViewItem(nullptr), plate_item);
@@ -1307,9 +1307,9 @@ wxDataViewItem ObjectDataViewModel::GetItemByPlateId(int plate_idx)
return wxDataViewItem(nullptr);
}
void ObjectDataViewModel::SetCurSelectedPlateFullName(int plate_idx, const std::string & custom_name) {
void ObjectDataViewModel::SetCurSelectedPlateFullName(int plate_idx, const std::string & custom_name) {
for (auto plate : m_plates) {
if (plate->m_plate_idx == plate_idx) {
if (plate->m_plate_idx == plate_idx) {
wxString plate_full_name =_L("Plate");
plate_full_name += wxString::Format(" %d", plate_idx + 1);
if (!custom_name.empty()) {
@@ -2116,7 +2116,7 @@ bool ObjectDataViewModel::HasInfoItem(InfoItemType type) const
ItemType ObjectDataViewModel::GetItemType(const wxDataViewItem &item) const
{
if (!item.IsOk())
if (!item.IsOk())
return itUndef;
ObjectDataViewModelNode *node = static_cast<ObjectDataViewModelNode *>(item.GetID());
return node->m_type < 0 ? itUndef : node->m_type;
@@ -2334,32 +2334,32 @@ bool ObjectDataViewModel::IsSinked(wxDataViewItem &item) const
return node->m_sink_enable;
}
void ObjectDataViewModel::SetColorPaintState(const bool painted, wxDataViewItem obj_item)
void ObjectDataViewModel::SetColorPaintState(const bool painted, wxDataViewItem obj_item, bool force)
{
ObjectDataViewModelNode* node = static_cast<ObjectDataViewModelNode*>(obj_item.GetID());
if (!node)
return;
node->set_color_icon(painted);
node->set_color_icon(painted, force);
ItemChanged(obj_item);
}
void ObjectDataViewModel::SetSupportPaintState(const bool painted, wxDataViewItem obj_item)
void ObjectDataViewModel::SetSupportPaintState(const bool painted, wxDataViewItem obj_item, bool force)
{
ObjectDataViewModelNode* node = static_cast<ObjectDataViewModelNode*>(obj_item.GetID());
if (!node)
return;
node->set_support_icon(painted);
node->set_support_icon(painted, force);
ItemChanged(obj_item);
}
void ObjectDataViewModel::SetSinkState(const bool painted, wxDataViewItem obj_item)
void ObjectDataViewModel::SetSinkState(const bool painted, wxDataViewItem obj_item, bool force)
{
ObjectDataViewModelNode *node = static_cast<ObjectDataViewModelNode *>(obj_item.GetID());
if (!node) return;
node->set_sinking_icon(painted);
node->set_sinking_icon(painted, force);
ItemChanged(obj_item);
}