3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-25 17:18:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX:allow only External Spool color map

Browse source 
jira: STUDIO-10096
Change-Id: Ic0d2133fe688f275210df8f0a1adf1f29239598c
(cherry picked from commit 81ff3cdfce495d6847b0418ff4201d803fc8e84b)
This commit is contained in:
zhou.xu 2025-01-22 15:55:12 +08:00 • committed by Noisyfox
parent 2375ab860a
commit 4d4bf64aad
3 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/slic3r/GUI/SelectMachine.cpp
View file

@ -1085,7 +1085,7 @@ void SelectMachineDialog::sync_ams_mapping_result(std::vector<FilamentInfo> &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);
}
@ -3025,14 +3025,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);
}
}
@ -3629,6 +3632,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
@ -3676,7 +3696,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<ConfigOptionFloats>("nozzle_diameter")->values.size();
@ -3716,7 +3737,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();

3
src/slic3r/GUI/SelectMachine.hpp
View file

@ -299,6 +299,8 @@ private:
std::shared_ptr<int> m_token = std::make_shared<int>(0);
std::map<std::string, PrintOption*> m_checkbox_list;
wxString m_ams_tooltip;
wxString m_ams_tooltip_ext;
std::vector<wxString> m_bedtype_list;
std::vector<MachineObject*> m_list;
std::vector<FilamentInfo> m_filaments;
@ -450,6 +452,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();

4
src/slic3r/GUI/SyncAmsInfoDialog.cpp
View file

@ -148,7 +148,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();
@ -1067,7 +1067,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));