juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 03:13:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH:add "pop_sync_nozzle_and_ams_ialog" api

Browse Source 
jira: STUDIO-10016
Change-Id: I000fa5719cf631ff0c63b6379850e1915f78ddaa
(cherry picked from commit 170687352efa3e87605a2bc37eafbed3679417f9)
This commit is contained in:
zhou.xu
2025-01-20 15:52:39 +08:00
committed by Noisyfox
parent b55a0226b5
commit a8d2a0e589
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3008,25 +3008,26 @@ void Sidebar::deal_btn_sync() {
bool only_external_material; bool only_external_material;
auto ok = p->sync_extruder_list(only_external_material); auto ok = p->sync_extruder_list(only_external_material);
if (ok) { if (ok) {
SyncNozzleAndAmsDialog::InputInfo temp_na_info; pop_sync_nozzle_and_ams_ialog();
wxPoint big_btn_pt;
wxSize big_btn_size;
wxGetApp().plater()->sidebar().get_big_btn_sync_pos_size(big_btn_pt, big_btn_size);
temp_na_info.dialog_pos = big_btn_pt + wxPoint(big_btn_size.x, big_btn_size.y) + wxPoint(FromDIP(big_btn_size.x / 10.f - 5), FromDIP(big_btn_size.y / 10.f));
int same_dialog_pos_x = get_sidebar_pos_right_x()+ FromDIP(5);
temp_na_info.dialog_pos.x = same_dialog_pos_x;
temp_na_info.dialog_pos.y += FromDIP(2);
temp_na_info.only_external_material = only_external_material;
if (m_sna_dialog) {
m_sna_dialog.reset();
}
m_sna_dialog = std::make_shared<SyncNozzleAndAmsDialog>(this, temp_na_info);
m_sna_dialog->Show();
m_sna_dialog->Raise();
} }
} }
void Sidebar::pop_sync_nozzle_and_ams_ialog() {
SyncNozzleAndAmsDialog::InputInfo temp_na_info;
wxPoint big_btn_pt;
wxSize big_btn_size;
wxGetApp().plater()->sidebar().get_big_btn_sync_pos_size(big_btn_pt, big_btn_size);
temp_na_info.dialog_pos = big_btn_pt + wxPoint(big_btn_size.x, big_btn_size.y) + wxPoint(FromDIP(big_btn_size.x / 10.f - 5), FromDIP(big_btn_size.y / 10.f));
int same_dialog_pos_x = get_sidebar_pos_right_x() + FromDIP(5);
temp_na_info.dialog_pos.x = same_dialog_pos_x;
temp_na_info.dialog_pos.y += FromDIP(2);
if (m_sna_dialog) { m_sna_dialog.reset(); }
m_sna_dialog = std::make_shared<SyncNozzleAndAmsDialog>(this, temp_na_info);
m_sna_dialog->Show();
m_sna_dialog->Raise();
}
static std::vector<Search::InputInfo> get_search_inputs(ConfigOptionMode mode) static std::vector<Search::InputInfo> get_search_inputs(ConfigOptionMode mode)
{ {
std::vector<Search::InputInfo> ret {}; std::vector<Search::InputInfo> ret {};

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

@@ -204,6 +204,7 @@ public:
bool get_eject_shown() const; bool get_eject_shown() const;
bool is_multifilament(); bool is_multifilament();
void deal_btn_sync(); void deal_btn_sync();
void pop_sync_nozzle_and_ams_ialog();
void update_mode(); void update_mode();
bool is_collapsed(); bool is_collapsed();
void collapse(bool collapse); void collapse(bool collapse);