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

FIX:deal sync_printer_preset logic when it is false 

jira: STUDIO-11017
Change-Id: Iafb0d954563e6bc2472122e98ba9a3d527f6c487
This commit is contained in:
zhou.xu 2025-03-20 17:27:14 +08:00 committed by lane.wei
parent da3819f52f
commit 78c0a845d2
3 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/ParamsPanel.cpp
View File

@ -192,15 +192,6 @@ void TipsDialog::on_dpi_changed(const wxRect &suggested_rect)
Refresh(); Refresh();
} }
void TipsDialog::on_ok(wxMouseEvent &event)
{
if (m_show_again) {
if (!m_app_key.empty())
wxGetApp().app_config->set_bool(m_app_key, m_show_again);
}
EndModal(wxID_OK);
}
void ParamsPanel::Highlighter::set_timer_owner(wxEvtHandler *owner, int timerid /* = wxID_ANY*/) void ParamsPanel::Highlighter::set_timer_owner(wxEvtHandler *owner, int timerid /* = wxID_ANY*/)
{ {
m_timer.SetOwner(owner, timerid); m_timer.SetOwner(owner, timerid);

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

@ -56,7 +56,6 @@ public:
protected: protected:
void on_dpi_changed(const wxRect &suggested_rect) override; void on_dpi_changed(const wxRect &suggested_rect) override;
void on_ok(wxMouseEvent &event);
wxBoxSizer *create_item_checkbox(wxString title, wxWindow *parent, wxString tooltip, std::string param); wxBoxSizer *create_item_checkbox(wxString title, wxWindow *parent, wxString tooltip, std::string param);
Button* add_button(wxWindowID btn_id, const wxString &label, bool set_focus = false); Button* add_button(wxWindowID btn_id, const wxString &label, bool set_focus = false);
}; };

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

@ -10892,7 +10892,6 @@ bool Plater::try_sync_preset_with_connected_printer(int& nozzle_diameter)
sync_printer_preset = true; sync_printer_preset = true;
} else { } else {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << __LINE__ << " sync_after_load_file_show_flag"; BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << __LINE__ << " sync_after_load_file_show_flag";
return false;
} }
} }
} }
@ -10901,13 +10900,14 @@ bool Plater::try_sync_preset_with_connected_printer(int& nozzle_diameter)
if (sync_printer_preset && printer_preset.get_current_printer_type(preset_bundle) == printer_type && is_approx((float) (preset_nozzle_diameter), machine_nozzle_diameter)) if (sync_printer_preset && printer_preset.get_current_printer_type(preset_bundle) == printer_type && is_approx((float) (preset_nozzle_diameter), machine_nozzle_diameter))
sync_printer_preset = false; sync_printer_preset = false;
} }
if (!sync_printer_preset)
update_objects_position_when_select_preset([&obj, machine_preset, &sync_printer_preset]() { return false;
//do sync_printer_preset
update_objects_position_when_select_preset([&obj, machine_preset]() {
machine_preset->is_visible = true; machine_preset->is_visible = true;
if (sync_printer_preset) { Tab* printer_tab = GUI::wxGetApp().get_tab(Preset::Type::TYPE_PRINTER);
Tab* printer_tab = GUI::wxGetApp().get_tab(Preset::Type::TYPE_PRINTER); printer_tab->select_preset(machine_preset->name);
printer_tab->select_preset(machine_preset->name);
}
if (obj->is_multi_extruders()) if (obj->is_multi_extruders())
GUI::wxGetApp().sidebar().sync_extruder_list(); GUI::wxGetApp().sidebar().sync_extruder_list();
}); });