juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-14 12:37:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH:add "only_external_material" logic

Browse Source 
jira: STUDIO-9985
Change-Id: Iac15989bea39d1571eab66199737472381832017
(cherry picked from commit d317055f421ba2037f983ad1d99cd0e268b7274b)
This commit is contained in:
zhou.xu
2025-01-18 18:21:53 +08:00
committed by Noisyfox
parent a071fd14ac
commit a90639130a
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/slic3r/GUI/Plater.cpp
View File

@@ -482,7 +482,7 @@ struct Sidebar::priv
void jump_to_object(ObjectDataViewModelNode* item); void jump_to_object(ObjectDataViewModelNode* item);
void can_search(); void can_search();
bool sync_extruder_list(); bool sync_extruder_list(bool &only_external_material);
void update_sync_status(const MachineObject* obj); void update_sync_status(const MachineObject* obj);
#ifdef _WIN32 #ifdef _WIN32
@@ -1109,7 +1109,7 @@ void ExtruderGroup::sync_ams(MachineObject const *obj, std::vector<Ams *> const
update_ams(); update_ams();
} }
bool Sidebar::priv::sync_extruder_list() bool Sidebar::priv::sync_extruder_list(bool &only_external_material)
{ {
auto printer_tab = dynamic_cast<TabPrinter *>(wxGetApp().get_tab(Preset::TYPE_PRINTER)); auto printer_tab = dynamic_cast<TabPrinter *>(wxGetApp().get_tab(Preset::TYPE_PRINTER));
printer_tab->set_extruder_volume_type(0, NozzleVolumeType::nvtHighFlow); printer_tab->set_extruder_volume_type(0, NozzleVolumeType::nvtHighFlow);
@@ -1167,7 +1167,10 @@ bool Sidebar::priv::sync_extruder_list()
++deputy_4; ++deputy_4;
} }
} }
only_external_material = false;
if (obj->amsList.size() == 0) {
only_external_material = true;
}
int main_index = obj->is_main_extruder_on_left() ? 0 : 1; int main_index = obj->is_main_extruder_on_left() ? 0 : 1;
int deputy_index = obj->is_main_extruder_on_left() ? 1 : 0; int deputy_index = obj->is_main_extruder_on_left() ? 1 : 0;
AMSCountPopupWindow::SetAMSCount(deputy_index, deputy_4, deputy_1); AMSCountPopupWindow::SetAMSCount(deputy_index, deputy_4, deputy_1);
@@ -2636,7 +2639,8 @@ std::map<int, DynamicPrintConfig> Sidebar::build_filament_ams_list(MachineObject
bool Sidebar::sync_extruder_list() bool Sidebar::sync_extruder_list()
{ {
return p->sync_extruder_list(); bool only_external_material;
return p->sync_extruder_list(only_external_material);
} }
bool Sidebar::need_auto_sync_extruder_list_after_connect_priner(const MachineObject *obj) bool Sidebar::need_auto_sync_extruder_list_after_connect_priner(const MachineObject *obj)
@@ -2980,7 +2984,8 @@ bool Sidebar::is_multifilament()
} }
void Sidebar::deal_btn_sync() { void Sidebar::deal_btn_sync() {
auto ok = p->sync_extruder_list(); bool only_external_material;
auto ok = p->sync_extruder_list(only_external_material);
if (ok) { if (ok) {
SyncNozzleAndAmsDialog::InputInfo temp_na_info; SyncNozzleAndAmsDialog::InputInfo temp_na_info;
wxPoint big_btn_pt; wxPoint big_btn_pt;
@@ -2994,7 +2999,7 @@ void Sidebar::deal_btn_sync() {
auto cur_dialog_pos = small_btn_pt + wxPoint(small_btn_size.x * 3.6 + 5, 0); auto cur_dialog_pos = small_btn_pt + wxPoint(small_btn_size.x * 3.6 + 5, 0);
temp_na_info.dialog_pos.x = cur_dialog_pos.x; temp_na_info.dialog_pos.x = cur_dialog_pos.x;
temp_na_info.dialog_pos.y += FromDIP(2); temp_na_info.dialog_pos.y += FromDIP(2);
temp_na_info.only_external_material = only_external_material;
if (m_sna_dialog) { if (m_sna_dialog) {
m_sna_dialog.reset(); m_sna_dialog.reset();
} }

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

@@ -4377,7 +4377,7 @@ SyncNozzleAndAmsDialog::SyncNozzleAndAmsDialog(wxWindow *parent, InputInfo &inpu
std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(23, 25, 22), StateColor::Pressed), std::pair<wxColour, int>(wxColour(43, 45, 42), StateColor::Hovered), StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(23, 25, 22), StateColor::Pressed), std::pair<wxColour, int>(wxColour(43, 45, 42), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(23, 25, 22), StateColor::Normal)); std::pair<wxColour, int>(wxColour(23, 25, 22), StateColor::Normal));
m_button_ok = new Button(this, _L("Sync AMS filament")); m_button_ok = new Button(this, m_input_info.only_external_material ? _L("Sync filament") : _L("Sync AMS filament"));
m_button_ok->SetBackgroundColor(btn_bg_green); m_button_ok->SetBackgroundColor(btn_bg_green);
m_button_ok->SetBorderWidth(0); m_button_ok->SetBorderWidth(0);
m_button_ok->SetTextColor(wxColour(0xFEFEFE)); m_button_ok->SetTextColor(wxColour(0xFEFEFE));

1
src/slic3r/GUI/SyncAmsInfoDialog.hpp
View File

@@ -355,6 +355,7 @@ public:
struct InputInfo struct InputInfo
{ {
wxPoint dialog_pos{wxPoint(400, 200)}; wxPoint dialog_pos{wxPoint(400, 200)};
bool only_external_material = false;
}; };
struct ResultInfo struct ResultInfo
{}; {};