3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-17 09:52:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX:not map for unknown material

Browse source 
jira: STUDIO-9960
Change-Id: Ifd1b5f42676e9aa127805caa919ed2e3ef3f2900
(cherry picked from commit a3a54934e05ecd85584dfe631a4bf3242682bd8b)
This commit is contained in:
zhou.xu 2025-01-18 16:49:27 +08:00 • committed by Noisyfox
parent 67036667b5
commit ca37c4b114
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libslic3r/PresetBundle.cpp
View file

@ -1975,6 +1975,11 @@ unsigned int PresetBundle::sync_ams_list(unsigned int &unknowns, bool use_map, s
index++;
if (filament_id.empty()) {
if (use_map) {
for (int j = maps.size() - 1; j >= 0; j--) {
if (maps[j].slot_id == slot_id && maps[j].ams_id == ams_id) {
maps.erase(j);
}
}
ams_filament_presets.push_back("Generic PLA");//for unknow matieral
auto default_unknown_color = "#CECECE";
ams_filament_colors.push_back(default_unknown_color);

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

@ -1256,9 +1256,10 @@ SyncAmsInfoDialog::SyncAmsInfoDialog(wxWindow *parent, SyncInfo &info) :
m_append_color_checkbox = new ::CheckBox(this, wxID_ANY);
//m_append_color_checkbox->SetForegroundColour(wxColour(107, 107, 107, 100));
m_append_color_checkbox->SetValue(wxGetApp().app_config->get_bool("enable_append_color_by_sync_ams"));
m_append_color_checkbox->Bind(wxEVT_CHECKBOX, [this](wxCommandEvent &e) {
m_append_color_checkbox->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent &e) {
auto flag = wxGetApp().app_config->get_bool("enable_append_color_by_sync_ams");
wxGetApp().app_config->set_bool("enable_append_color_by_sync_ams",!flag);
m_append_color_checkbox->SetValue(!flag);
});
m_append_color_checkbox->Hide();
m_append_color_sizer->Add(m_append_color_checkbox, 0, wxALIGN_LEFT | wxTOP, FromDIP(4));
@ -1274,9 +1275,10 @@ SyncAmsInfoDialog::SyncAmsInfoDialog(wxWindow *parent, SyncInfo &info) :
m_merge_color_checkbox = new ::CheckBox(this, wxID_ANY);
//m_merge_color_checkbox->SetForegroundColour(wxColour(107, 107, 107, 100));
m_merge_color_checkbox->SetValue(wxGetApp().app_config->get_bool("enable_merge_color_by_sync_ams"));
m_merge_color_checkbox->Bind(wxEVT_CHECKBOX, [this](wxCommandEvent &e) {
m_merge_color_checkbox->Bind(wxEVT_TOGGLEBUTTON, [this](wxCommandEvent &e) {
auto flag = wxGetApp().app_config->get_bool("enable_merge_color_by_sync_ams");
wxGetApp().app_config->set_bool("enable_merge_color_by_sync_ams",!flag);
m_merge_color_checkbox->SetValue(!flag);
});
m_merge_color_checkbox->Hide();
m_merge_color_sizer->Add(m_merge_color_checkbox, 0, wxALIGN_LEFT | wxTOP, FromDIP(2));