juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: fail to connect default machine when start studio

Browse Source 
jira: [none]
Change-Id: Iec546016ec2852899a64c927c57ef3e79d62f9a8
(cherry picked from commit aa5cf6e0636511352bfd6c4c4ffd23cea42a8a70)
This commit is contained in:
xin.zhang
2025-09-04 11:13:16 +08:00
committed by Noisyfox
parent 13613a1831
commit 35999b7110
4 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/slic3r/GUI/GUI_App.cpp
View File

@@ -2663,7 +2663,6 @@ bool GUI_App::on_init_inner()
preset_bundle->backup_user_folder(); preset_bundle->backup_user_folder();
Bind(EVT_SET_SELECTED_MACHINE, &GUI_App::on_set_selected_machine, this);
Bind(EVT_UPDATE_MACHINE_LIST, &GUI_App::on_update_machine_list, this); Bind(EVT_UPDATE_MACHINE_LIST, &GUI_App::on_update_machine_list, this);
Bind(EVT_USER_LOGIN, &GUI_App::on_user_login, this); Bind(EVT_USER_LOGIN, &GUI_App::on_user_login, this);
Bind(EVT_USER_LOGIN_HANDLE, &GUI_App::on_user_login_handle, this); Bind(EVT_USER_LOGIN_HANDLE, &GUI_App::on_user_login_handle, this);
@@ -4306,18 +4305,6 @@ void GUI_App::enable_user_preset_folder(bool enable)
} }
} }
void GUI_App::on_set_selected_machine(wxCommandEvent &evt)
{
// Orca: do not connect to default device during app startup, because some of the lan machines might not online yet
// and user will be prompted by several "Connect XXX failed" error message.
return;
DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
if (dev) {
dev->set_selected_machine(m_agent->get_user_selected_machine());
}
}
void GUI_App::on_update_machine_list(wxCommandEvent &evt) void GUI_App::on_update_machine_list(wxCommandEvent &evt)
{ {
/* DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager(); /* DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
@@ -4338,8 +4325,6 @@ void GUI_App::on_user_login_handle(wxCommandEvent &evt)
boost::thread update_thread = boost::thread([this, dev] { boost::thread update_thread = boost::thread([this, dev] {
dev->update_user_machine_list_info(); dev->update_user_machine_list_info();
auto evt = new wxCommandEvent(EVT_SET_SELECTED_MACHINE);
wxQueueEvent(this, evt);
}); });
if (online_login) { if (online_login) {

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

@@ -468,7 +468,6 @@ public:
void handle_http_error(unsigned int status, std::string body); void handle_http_error(unsigned int status, std::string body);
void on_http_error(wxCommandEvent &evt); void on_http_error(wxCommandEvent &evt);
void on_set_selected_machine(wxCommandEvent& evt);
void on_update_machine_list(wxCommandEvent& evt); void on_update_machine_list(wxCommandEvent& evt);
void on_user_login(wxCommandEvent &evt); void on_user_login(wxCommandEvent &evt);
void on_user_login_handle(wxCommandEvent& evt); void on_user_login_handle(wxCommandEvent& evt);

1
src/slic3r/GUI/MainFrame.cpp
View File

@@ -84,7 +84,6 @@ wxDEFINE_EVENT(EVT_USER_LOGIN_HANDLE, wxCommandEvent);
wxDEFINE_EVENT(EVT_CHECK_PRIVACY_VER, wxCommandEvent); wxDEFINE_EVENT(EVT_CHECK_PRIVACY_VER, wxCommandEvent);
wxDEFINE_EVENT(EVT_CHECK_PRIVACY_SHOW, wxCommandEvent); wxDEFINE_EVENT(EVT_CHECK_PRIVACY_SHOW, wxCommandEvent);
wxDEFINE_EVENT(EVT_SHOW_IP_DIALOG, wxCommandEvent); wxDEFINE_EVENT(EVT_SHOW_IP_DIALOG, wxCommandEvent);
wxDEFINE_EVENT(EVT_SET_SELECTED_MACHINE, wxCommandEvent);
wxDEFINE_EVENT(EVT_UPDATE_MACHINE_LIST, wxCommandEvent); wxDEFINE_EVENT(EVT_UPDATE_MACHINE_LIST, wxCommandEvent);
wxDEFINE_EVENT(EVT_UPDATE_PRESET_CB, SimpleEvent); wxDEFINE_EVENT(EVT_UPDATE_PRESET_CB, SimpleEvent);

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

@@ -430,7 +430,6 @@ wxDECLARE_EVENT(EVT_USER_LOGIN_HANDLE, wxCommandEvent);
wxDECLARE_EVENT(EVT_CHECK_PRIVACY_VER, wxCommandEvent); wxDECLARE_EVENT(EVT_CHECK_PRIVACY_VER, wxCommandEvent);
wxDECLARE_EVENT(EVT_CHECK_PRIVACY_SHOW, wxCommandEvent); wxDECLARE_EVENT(EVT_CHECK_PRIVACY_SHOW, wxCommandEvent);
wxDECLARE_EVENT(EVT_SHOW_IP_DIALOG, wxCommandEvent); wxDECLARE_EVENT(EVT_SHOW_IP_DIALOG, wxCommandEvent);
wxDECLARE_EVENT(EVT_SET_SELECTED_MACHINE, wxCommandEvent);
wxDECLARE_EVENT(EVT_UPDATE_MACHINE_LIST, wxCommandEvent); wxDECLARE_EVENT(EVT_UPDATE_MACHINE_LIST, wxCommandEvent);
wxDECLARE_EVENT(EVT_UPDATE_PRESET_CB, SimpleEvent); wxDECLARE_EVENT(EVT_UPDATE_PRESET_CB, SimpleEvent);