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

2.2.0 flutter & WCP & Network Test (#54)

Browse Source 
* Add docs about time_estimate

* Fix: Problems with graceful program exit caused by Flutter refactoring

* Add: sw_OpenBrowser() & sw_OpenOrcaWebview

* Fix: NetworkTestDialog Crash & Add: Lan Device test \ cloud test
This commit is contained in:
xiaoyeliu
2025-12-09 10:39:27 +08:00
committed by GitHub
parent f32aa81f6a
commit b43cfaaaf9
13 changed files with 4256 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/slic3r/GUI/SSWCP.cpp
View File

@@ -28,6 +28,7 @@
#include "slic3r/GUI/WebPresetDialog.hpp"
#include "slic3r/GUI/SMPhysicalPrinterDialog.hpp"
#include "slic3r/GUI/WebUrlDialog.hpp"
#include "miniz/miniz.h"
#include "slic3r/Utils/MQTT.hpp"
@@ -451,8 +452,12 @@ void SSWCP_Instance::process() {
sw_SubscribeCacheKey();
} else if (m_cmd == "sw_UnsubscribeCacheKeys") {
sw_UnsubscribeCacheKeys();
} else if (m_cmd == "sw_UploadEvent"){
} else if (m_cmd == "sw_UploadEvent") {
sw_UploadEvent();
} else if (m_cmd == "sw_OpenOrcaWebview") {
sw_OpenOrcaWebview();
} else if (m_cmd == "sw_OpenBrowser") {
sw_OpenBrowser();
}
else {
handle_general_fail();
@@ -487,6 +492,9 @@ void SSWCP_Instance::sw_UploadEvent() {
sentryReportLog(SENTRY_LOG_LEVEL(level), content, funcModule, tagKey, tagValue, traceId);
send_to_js();
finish_job();
}
catch (std::exception& e) {
@@ -494,6 +502,54 @@ void SSWCP_Instance::sw_UploadEvent() {
}
}
void SSWCP_Instance::sw_OpenBrowser() {
try {
std::string url = m_param_data.count("url") ? m_param_data["url"].get<std::string>() : "";
wxString wx_url = wxString::FromUTF8(url);
std::weak_ptr<SSWCP_Instance> weak_self = shared_from_this();
wxGetApp().CallAfter([wx_url, weak_self]() {
auto self = weak_self.lock();
if (!self) {
return;
}
bool res = wxLaunchDefaultBrowser(wx_url);
if (!res) {
self->handle_general_fail(-1, "Open browser failed");
} else {
self->send_to_js();
self->finish_job();
}
});
}
catch (std::exception& e) {
handle_general_fail();
}
}
void SSWCP_Instance::sw_OpenOrcaWebview() {
try {
std::string url = m_param_data.count("url") ? m_param_data["url"].get<std::string>() : "";
wxString wx_url = wxString::FromUTF8(url);
std::weak_ptr<SSWCP_Instance> weak_self = shared_from_this();
wxGetApp().CallAfter([wx_url, weak_self]() {
auto self = weak_self.lock();
if (!self) {
return;
}
auto dialog = new WebUrlDialog();
dialog->load_url(wx_url);
self->send_to_js();
self->finish_job();
dialog->Show();
});
}
catch (std::exception& e) {
handle_general_fail();
}
}
void SSWCP_Instance::sw_FileLog() {
try {
std::string level = m_param_data.count("level") ? m_param_data["level"].get<std::string>() : "debug";
@@ -1583,10 +1639,21 @@ void SSWCP_MachineFind_Instance::sw_StartMachineFind()
.set_retries(3)
.set_timeout(last_time >= 0.0 ? last_time/1000 : 20)
.on_reply([weak_self, unique_key](BonjourReply&& reply) {
// Check if application is still alive before processing
if (!GUI_App::m_app_alive.load()) {
return;
}
auto self = weak_self.lock();
if(!self || self->is_stop()){
return;
}
// Double check application is still alive after locking
if (!GUI_App::m_app_alive.load()) {
return;
}
json machine_data;
std::string hostname = reply.hostname;
@@ -1641,10 +1708,16 @@ void SSWCP_MachineFind_Instance::sw_StartMachineFind()
size_t vendor_pos = machine_type.find_first_of(" ");
if (vendor_pos != std::string::npos) {
std::string vendor = machine_type.substr(0, vendor_pos);
std::string machine_cover = LOCALHOST_URL + std::to_string(wxGetApp().m_page_http_server.get_port()) + "/profiles/" +
vendor + "/" + machine_type + "_cover.png";
machine_data["cover"] = machine_cover;
// Check application is still alive before accessing wxGetApp()
if (GUI_App::m_app_alive.load()) {
try {
std::string machine_cover = LOCALHOST_URL + std::to_string(wxGetApp().m_page_http_server.get_port()) + "/profiles/" +
vendor + "/" + machine_type + "_cover.png";
machine_data["cover"] = machine_cover;
} catch (...) {
// Application is shutting down, skip setting cover
}
}
}
} else {
// test
@@ -1666,6 +1739,11 @@ void SSWCP_MachineFind_Instance::sw_StartMachineFind()
machine_data["region"] = reply.txt_data["region"];
}
// Final check before adding to list
if (!GUI_App::m_app_alive.load() || !self || self->is_stop()) {
return;
}
json machine_object;
if (machine_data.count("unique_value")) {
self->add_machine_to_list(machine_object);
@@ -1677,13 +1755,26 @@ void SSWCP_MachineFind_Instance::sw_StartMachineFind()
})
.on_complete([weak_self]() {
wxGetApp().CallAfter([weak_self]() {
auto self = weak_self.lock();
if (self) {
self->onOneEngineEnd();
}
});
// Check if application is still alive before scheduling callback
if (!GUI_App::m_app_alive.load()) {
return;
}
try {
wxGetApp().CallAfter([weak_self]() {
// Check again inside the callback
if (!GUI_App::m_app_alive.load()) {
return;
}
auto self = weak_self.lock();
if (self && !self->is_stop()) {
self->onOneEngineEnd();
}
});
} catch (...) {
// Application is shutting down, ignore the callback
}
})
.lookup();
}