diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 05d71de18..ba7234511 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -1087,7 +1087,7 @@ void SelectMachineDialog::sync_ams_mapping_result(std::vector &res if (result.empty()) { BOOST_LOG_TRIVIAL(trace) << "ams_mapping result is empty"; for (auto it = m_materialList.begin(); it != m_materialList.end(); it++) { - wxString ams_id = "-"; + wxString ams_id = "Ext";// wxColour ams_col = wxColour(0xCE, 0xCE, 0xCE); it->second->item->set_ams_info(ams_col, ams_id); } @@ -3035,14 +3035,17 @@ void SelectMachineDialog::update_ams_check(MachineObject *obj) if (obj->has_ams()) { m_checkbox_list["use_ams"]->Show(); m_checkbox_list["use_ams"]->setValue("on"); + change_materialitem_tip(false); } else { m_checkbox_list["use_ams"]->Hide(); m_checkbox_list["use_ams"]->setValue("off"); + change_materialitem_tip(true); } }else{ m_checkbox_list["use_ams"]->Hide(); m_checkbox_list["use_ams"]->setValue("on"); + change_materialitem_tip(false); } } @@ -3641,6 +3644,23 @@ void SelectMachineDialog::set_default() Fit(); } +void SelectMachineDialog::change_materialitem_tip(bool no_ams_only_ext) +{ + MaterialHash::iterator iter = m_materialList.begin(); + while (iter != m_materialList.end()) { + int id = iter->first; + Material *item = iter->second; + if (item) { + if (no_ams_only_ext) { + item->item->SetToolTip(m_ams_tooltip_ext); + } + else { + item->item->SetToolTip(m_ams_tooltip); + } + } + iter++; + } +} void SelectMachineDialog::reset_and_sync_ams_list() { // for black list @@ -3688,7 +3708,8 @@ void SelectMachineDialog::reset_and_sync_ams_list() m_sizer_ams_mapping->Clear(); m_materialList.clear(); m_filaments.clear(); - + m_ams_tooltip =_L("Upper half area: Original\nLower half area: Filament in AMS\nAnd you can click it to modify"); + m_ams_tooltip_ext = _L("Currently only External Spool is available, color mapping is prohibited, and control pop-up drop-down boxes are also prohibited."); const auto& full_config = wxGetApp().preset_bundle->full_config(); size_t nozzle_nums = full_config.option("nozzle_diameter")->values.size(); @@ -3728,7 +3749,7 @@ void SelectMachineDialog::reset_and_sync_ams_list() item = new MaterialItem(m_filament_panel, colour_rgb, _L(display_materials[extruder])); m_sizer_ams_mapping->Add(item, 0, wxALL, FromDIP(5)); } - item->SetToolTip(_L("Upper half area: Original\nLower half area: Filament in AMS\nAnd you can click it to modify")); + item->SetToolTip(m_ams_tooltip); 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(); diff --git a/src/slic3r/GUI/SelectMachine.hpp b/src/slic3r/GUI/SelectMachine.hpp index 1128b984c..3fe724587 100644 --- a/src/slic3r/GUI/SelectMachine.hpp +++ b/src/slic3r/GUI/SelectMachine.hpp @@ -296,6 +296,8 @@ private: std::shared_ptr m_token = std::make_shared(0); std::map m_checkbox_list; + wxString m_ams_tooltip; + wxString m_ams_tooltip_ext; std::vector m_bedtype_list; std::vector m_list; std::vector m_filaments; @@ -447,6 +449,7 @@ public: void on_set_finish_mapping(wxCommandEvent& evt); void on_print_job_cancel(wxCommandEvent& evt); void set_default(); + void change_materialitem_tip(bool no_ams_only_ext); void reset_and_sync_ams_list(); void clone_thumbnail_data(); void record_edge_pixels_data(); diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp index c82c42041..6cbbf07a8 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp @@ -146,7 +146,7 @@ void SyncAmsInfoDialog::update_ams_check(MachineObject *obj) m_checkbox_list["use_ams"]->setValue("on"); } else { m_checkbox_list["use_ams"]->Hide(); - m_checkbox_list["use_ams"]->setValue("off"); + //m_checkbox_list["use_ams"]->setValue("off"); } } else { m_checkbox_list["use_ams"]->Hide(); @@ -1065,7 +1065,7 @@ SyncAmsInfoDialog::SyncAmsInfoDialog(wxWindow *parent, SyncInfo &info) : sync_ams_mapping_result(m_ams_mapping_result); }); - option_use_ams->setValue("off"); + option_use_ams->setValue("on"); m_sizer_options_timelapse->Add(option_timelapse, 0, wxEXPAND | wxBOTTOM, FromDIP(5)); m_sizer_options_other->Add(option_use_ams, 0, wxEXPAND | wxBOTTOM, FromDIP(5)); m_sizer_options_other->Add(option_auto_bed_level, 0, wxEXPAND | wxBOTTOM, FromDIP(5));