diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index 9add12ece..3cd1ab4ac 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -354,8 +354,14 @@ void MaterialSyncItem::render(wxDC &dc) if (mapping_txt == "-") { m_match = false; mapping_txt = _L("Unmapped"); + SetToolTip(_L("Upper half area: Original\nLower half area: The filament from original project will be used when unmapped.\nAnd you can click it to modify")); } else { m_match = true; + if (m_dropdown_allow_painted) { + SetToolTip(_L("Upper half area: Original\nLower half area: Filament in AMS\nAnd you can click it to modify")); + } else { + SetToolTip(_L("Upper half area: Original\nLower half area: Filament in AMS\nAnd you cannot click it to modify")); + } } dc.SetFont(::Label::Body_12); if (dc.GetTextExtent(m_material_name).x > GetSize().x - 10) { diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp index 59561a300..7318aa230 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp @@ -1609,6 +1609,7 @@ void SyncAmsInfoDialog::sync_ams_mapping_result(std::vector &resul bool SyncAmsInfoDialog::do_ams_mapping(MachineObject *obj_) { if (!obj_) return false; + BOOST_LOG_TRIVIAL(trace) << "SyncAmsInfoDialog:begin do_ams_mapping result"; obj_->get_ams_colors(m_cur_colors_in_thumbnail); // try color and type mapping @@ -3861,7 +3862,6 @@ void SyncAmsInfoDialog::reset_and_sync_ams_list() m_sizer_ams_mapping->Add(item, 0, wxALL, FromDIP(5)); } contronal_index++; - item->SetToolTip(_L("Upper half area: Original\nLower half area: Filament in AMS\nAnd you can click it to modify")); item->Bind(wxEVT_LEFT_UP, [this, item, materials, extruder](wxMouseEvent &e) {}); item->Bind(wxEVT_LEFT_DOWN, [this, item, materials, extruder](wxMouseEvent &e) { MaterialHash::iterator iter = m_materialList.begin(); @@ -4053,7 +4053,6 @@ void SyncAmsInfoDialog::generate_override_fix_ams_list() } contronal_index++; item->allow_paint_dropdown(false); - item->SetToolTip(_L("Upper half area: Original\nLower half area: Filament in AMS\nAnd you cannot click it to modify")); Material *material_item = new Material(); material_item->id = extruder;