mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX:reset direct_sync when init SyncAms dialog 

jira: none
Change-Id: I38aa498a69dd60da2f7485da37e2f09f78694c1c
This commit is contained in:
zhou.xu 2025-02-14 15:13:35 +08:00 committed by lane.wei
parent a3a9d75cf0
commit 22d2db008b
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,6 +315,7 @@ bool SyncAmsInfoDialog::is_dirty_filament() {
bool SyncAmsInfoDialog::is_need_show() bool SyncAmsInfoDialog::is_need_show()
{ {
m_result.direct_sync = true;//init
if (!m_input_info.connected_printer) { if (!m_input_info.connected_printer) {
return true; return true;
} }
@ -1252,17 +1253,17 @@ SyncAmsInfoDialog::SyncAmsInfoDialog(wxWindow *parent, SyncInfo &info) :
add_two_image_control(); add_two_image_control();
wxBoxSizer * more_setting_sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer * more_setting_sizer = new wxBoxSizer(wxVERTICAL);
wxBoxSizer * advace_setting_sizer = new wxBoxSizer(wxHORIZONTAL); m_advace_setting_sizer = new wxBoxSizer(wxHORIZONTAL);
m_more_setting_tips = new wxStaticText(this, wxID_ANY, _L("Advanced settings")); m_more_setting_tips = new wxStaticText(this, wxID_ANY, _L("Advanced settings"));
m_more_setting_tips->SetForegroundColour(wxColour(0, 174, 100)); m_more_setting_tips->SetForegroundColour(wxColour(0, 174, 100));
m_more_setting_tips->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) { m_more_setting_tips->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) {
m_expand_more_settings = !m_expand_more_settings; m_expand_more_settings = !m_expand_more_settings;
update_more_setting(); update_more_setting();
}); });
advace_setting_sizer->Add(m_more_setting_tips, 0, wxALIGN_LEFT | wxTOP, FromDIP(4)); m_advace_setting_sizer->Add(m_more_setting_tips, 0, wxALIGN_LEFT | wxTOP, FromDIP(4));
m_advanced_options_icon = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("advanced_option3", this, 18), wxDefaultPosition, wxSize(FromDIP(18), FromDIP(18))); m_advanced_options_icon = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("advanced_option3", this, 18), wxDefaultPosition, wxSize(FromDIP(18), FromDIP(18)));
advace_setting_sizer->Add(m_advanced_options_icon, 0, wxALIGN_LEFT | wxTOP, FromDIP(4)); m_advace_setting_sizer->Add(m_advanced_options_icon, 0, wxALIGN_LEFT | wxTOP, FromDIP(4));
more_setting_sizer->Add(advace_setting_sizer, 0, wxALIGN_LEFT, FromDIP(0)); more_setting_sizer->Add(m_advace_setting_sizer, 0, wxALIGN_LEFT, FromDIP(0));
m_append_color_sizer = new wxBoxSizer(wxHORIZONTAL); m_append_color_sizer = new wxBoxSizer(wxHORIZONTAL);
m_append_color_sizer->AddSpacer(FromDIP(10)); m_append_color_sizer->AddSpacer(FromDIP(10));
@ -4238,7 +4239,7 @@ void SyncAmsInfoDialog::updata_thumbnail_data_after_connected_printer()
} }
void SyncAmsInfoDialog::show_advanced_settings(bool flag) { void SyncAmsInfoDialog::show_advanced_settings(bool flag) {
m_more_setting_tips->Show(flag); show_sizer(m_advace_setting_sizer, flag);
if (!flag) { if (!flag) {
show_sizer(m_append_color_sizer, false); show_sizer(m_append_color_sizer, false);
show_sizer(m_merge_color_sizer, false); show_sizer(m_merge_color_sizer, false);

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

@ -344,6 +344,7 @@ private:
CapsuleButton * m_colormap_btn = nullptr; CapsuleButton * m_colormap_btn = nullptr;
CapsuleButton * m_override_btn = nullptr; CapsuleButton * m_override_btn = nullptr;
wxBoxSizer * m_advace_setting_sizer = nullptr;
wxStaticText * m_more_setting_tips = nullptr; wxStaticText * m_more_setting_tips = nullptr;
wxStaticBitmap * m_advanced_options_icon{nullptr}; wxStaticBitmap * m_advanced_options_icon{nullptr};
wxBoxSizer * m_append_color_sizer = nullptr; wxBoxSizer * m_append_color_sizer = nullptr;