juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH:adjust UI in AmsMapingPopup

Browse Source 
jira: none
Change-Id: Ib2e7e642d7a1700abb92eca2546614b2fd7d2bd4
(cherry picked from commit 5c8d62097384836a1a6d496983734c4e3220baaa)
This commit is contained in:
zhou.xu
2025-03-07 15:55:23 +08:00
committed by Noisyfox
parent 1828e3b98f
commit dc9d5661c3
4 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/slic3r/GUI/SyncAmsInfoDialog.cpp
View File

@@ -1370,11 +1370,12 @@ void SyncAmsInfoDialog::deal_only_exist_ext_spool(MachineObject *obj_) {
return;
if (!m_append_color_text) { return; }
bool only_exist_ext_spool_flag = m_only_exist_ext_spool_flag = obj_->only_exist_ext_spool();
auto temp_str = only_exist_ext_spool_flag ? "" : "AMS ";
SetTitle(wxString::Format(_L("Synchronize %sFilament Information"), temp_str));
m_append_color_text->SetLabel(wxString::Format(_L("Unused %sfilaments should also be added to the filament list."), temp_str));
SetTitle(only_exist_ext_spool_flag ? _L("Synchronize Filament Information") : _L("Synchronize AMS Filament Information"));
m_append_color_text->SetLabel(only_exist_ext_spool_flag ? _L("Unused filaments should also be added to the filament list.") :
_L("Unused AMS filaments should also be added to the filament list."));
if (m_map_mode == MapModeEnum::ColorMap) {
m_tip_attention_color_map = wxString::Format(_L("Only synchronize filament type and color, not including %sslot information."), temp_str);
m_tip_attention_color_map = only_exist_ext_spool_flag ? _L("Only synchronize filament type and color, not including slot information.") :
_L("Only synchronize filament type and color, not including AMS slot information.");
m_tip_text->SetLabel(m_tip_attention_color_map);
}
@@ -2459,6 +2460,7 @@ void SyncAmsInfoDialog::update_show_status()
if (!obj_->is_info_ready()) {
if (is_timeout()) {
BOOST_LOG_TRIVIAL(error) << "check error:machine timeout";
m_ams_mapping_result.clear();
sync_ams_mapping_result(m_ams_mapping_result);
show_status(PrintDialogStatus::PrintStatusReadingTimeout);