mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-19 19:33:47 +00:00
FIX:fix is_connect_printer
jira: STUDIO-10083 Change-Id: Iea8af8a6547eeac311f41e260115f9e12832de80 (cherry picked from commit 968dc8671020cb543694f60d7faa0aafd9e55210)
This commit is contained in:
@@ -4010,18 +4010,7 @@ void SelectMachineDialog::unify_deal_thumbnail_data(ThumbnailData &input_data, T
|
|||||||
m_cur_no_light_thumbnail_data = no_light_data;
|
m_cur_no_light_thumbnail_data = no_light_data;
|
||||||
clone_thumbnail_data();
|
clone_thumbnail_data();
|
||||||
MaterialHash::iterator iter = m_materialList.begin();
|
MaterialHash::iterator iter = m_materialList.begin();
|
||||||
bool is_connect_printer = true;
|
if (m_cur_colors_in_thumbnail.size() > 0) {
|
||||||
while (iter != m_materialList.end()) {
|
|
||||||
int id = iter->first;
|
|
||||||
Material * item = iter->second;
|
|
||||||
MaterialItem *m = item->item;
|
|
||||||
if (m->m_ams_name == "-") {
|
|
||||||
is_connect_printer = false;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
iter++;
|
|
||||||
}
|
|
||||||
if (is_connect_printer) {
|
|
||||||
change_default_normal(-1, wxColour());
|
change_default_normal(-1, wxColour());
|
||||||
final_deal_edge_pixels_data(m_preview_thumbnail_data);
|
final_deal_edge_pixels_data(m_preview_thumbnail_data);
|
||||||
set_default_normal(m_preview_thumbnail_data);
|
set_default_normal(m_preview_thumbnail_data);
|
||||||
|
|||||||
@@ -4110,18 +4110,7 @@ void SyncAmsInfoDialog::unify_deal_thumbnail_data(ThumbnailData &input_data, Thu
|
|||||||
m_cur_no_light_thumbnail_data = no_light_data;
|
m_cur_no_light_thumbnail_data = no_light_data;
|
||||||
clone_thumbnail_data(allow_clone_ams_color);
|
clone_thumbnail_data(allow_clone_ams_color);
|
||||||
MaterialHash::iterator iter = m_materialList.begin();
|
MaterialHash::iterator iter = m_materialList.begin();
|
||||||
bool is_connect_printer = true;
|
if (m_cur_colors_in_thumbnail.size() > 0) {
|
||||||
while (iter != m_materialList.end()) {
|
|
||||||
int id = iter->first;
|
|
||||||
Material * item = iter->second;
|
|
||||||
auto m = item->item;
|
|
||||||
if (m->m_ams_name == "-") {
|
|
||||||
is_connect_printer = false;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
iter++;
|
|
||||||
}
|
|
||||||
if (is_connect_printer) {
|
|
||||||
change_default_normal(-1, wxColour());
|
change_default_normal(-1, wxColour());
|
||||||
final_deal_edge_pixels_data(m_preview_thumbnail_data);
|
final_deal_edge_pixels_data(m_preview_thumbnail_data);
|
||||||
set_default_normal(m_preview_thumbnail_data);
|
set_default_normal(m_preview_thumbnail_data);
|
||||||
|
|||||||
Reference in New Issue
Block a user