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

ENH:sync AMS does not checking version info 

jira:[STUDIO-9692]

Change-Id: I76be87fe219ddd79cae27a7cf5c05315efb0b331
This commit is contained in:
tao wang 2025-01-11 10:31:17 +08:00 committed by lane.wei
parent 1813163743
commit 8f2ab037fd
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/DeviceManager.cpp
View File

@ -2975,9 +2975,9 @@ void MachineObject::set_online_state(bool on_off)
if (!on_off) m_active_state = NotActive; if (!on_off) m_active_state = NotActive;
} }
bool MachineObject::is_info_ready() const bool MachineObject::is_info_ready(bool check_version) const
{ {
if (module_vers.empty()) if (check_version && module_vers.empty())
return false; return false;
std::chrono::system_clock::time_point curr_time = std::chrono::system_clock::now(); std::chrono::system_clock::time_point curr_time = std::chrono::system_clock::now();

2
src/slic3r/GUI/DeviceManager.hpp
View File

@ -1171,7 +1171,7 @@ public:
bool is_connecting(); bool is_connecting();
void set_online_state(bool on_off); void set_online_state(bool on_off);
bool is_online() { return m_is_online; } bool is_online() { return m_is_online; }
bool is_info_ready() const; bool is_info_ready(bool check_version = true) const;
bool is_camera_busy_off(); bool is_camera_busy_off();
std::vector<std::string> get_resolution_supported(); std::vector<std::string> get_resolution_supported();

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

@ -1106,7 +1106,7 @@ bool Sidebar::priv::switch_diameter(bool single)
bool Sidebar::priv::sync_extruder_list() bool Sidebar::priv::sync_extruder_list()
{ {
MachineObject *obj = wxGetApp().getDeviceManager()->get_selected_machine(); MachineObject *obj = wxGetApp().getDeviceManager()->get_selected_machine();
if (obj == nullptr || !obj->is_info_ready()) { if (obj == nullptr || !obj->is_info_ready(false)) {
MessageDialog dlg(this->plater, _L("Please select a printer in 'Device' page first."), _L("Sync extruder infomation"), wxOK | wxICON_WARNING); MessageDialog dlg(this->plater, _L("Please select a printer in 'Device' page first."), _L("Sync extruder infomation"), wxOK | wxICON_WARNING);
dlg.ShowModal(); dlg.ShowModal();
return false; return false;