mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-08-06 17:47:41 +00:00
* Rework UI jobs to make them more understandable and flexible. * Update Orca specific jobs * Fix progress issue * Fix dark mode and window radius * Update cereal version from 1.2.2 to 1.3.0 (cherry picked from commit prusa3d/PrusaSlicer@057232a275) * Initial port of Emboss gizmo * Bump up CGAL version to 5.4 (cherry picked from commit prusa3d/PrusaSlicer@1bf9dee3e7) * Fix text rotation * Fix test dragging * Add text gizmo to right click menu * Initial port of SVG gizmo * Fix text rotation * Fix Linux build * Fix "from surface" * Fix -90 rotation * Fix icon path * Fix loading font with non-ascii name * Fix storing non-utf8 font descriptor in 3mf file * Fix filtering with non-utf8 characters * Emboss: Use Orca style input dialog * Fix build on macOS * Fix tooltip color in light mode * InputText: fixed incorrect padding when FrameBorder > 0. (ocornut/imgui#4794, ocornut/imgui#3781) InputTextMultiline: fixed vertical tracking with large values of FramePadding.y. (ocornut/imgui#3781, ocornut/imgui#4794) (cherry picked from commit ocornut/imgui@072caa4a90) (cherry picked from commit ocornut/imgui@bdd2a94315) * SVG: Use Orca style input dialog * Fix job progress update * Fix crash when select editing text in preview screen * Use Orca checkbox style * Fix issue that toolbar icons are kept regenerated * Emboss: Fix text & icon alignment * SVG: Fix text & icon alignment * Emboss: fix toolbar icon mouse hover state * Add a simple subtle outline effect by drawing back faces using wireframe mode * Disable selection outlines * Show outline in white if the model color is too dark * Make the outline algorithm more reliable * Enable cull face, which fix render on Linux * Fix `disable_cullface` * Post merge fix * Optimize selection rendering * Fix scale gizmo * Emboss: Fix text rotation if base object is scaled * Fix volume synchronize * Fix emboss rotation * Emboss: Fix advance toggle * Fix text position after reopened the project * Make font style preview darker * Make font style preview selector height shorter --------- Co-authored-by: tamasmeszaros <meszaros.q@gmail.com> Co-authored-by: ocornut <omarcornut@gmail.com> Co-authored-by: SoftFever <softfeverever@gmail.com>
141 lines
4.1 KiB
C++
141 lines
4.1 KiB
C++
#include "UpgradeNetworkJob.hpp"
|
|
|
|
#include "slic3r/GUI/GUI.hpp"
|
|
#include "slic3r/GUI/GUI_App.hpp"
|
|
#include "slic3r/Utils/Http.hpp"
|
|
|
|
namespace Slic3r {
|
|
namespace GUI {
|
|
|
|
wxDEFINE_EVENT(EVT_UPGRADE_UPDATE_MESSAGE, wxCommandEvent);
|
|
wxDEFINE_EVENT(EVT_UPGRADE_NETWORK_SUCCESS, wxCommandEvent);
|
|
wxDEFINE_EVENT(EVT_DOWNLOAD_NETWORK_FAILED, wxCommandEvent);
|
|
wxDEFINE_EVENT(EVT_INSTALL_NETWORK_FAILED, wxCommandEvent);
|
|
|
|
|
|
UpgradeNetworkJob::UpgradeNetworkJob()
|
|
{
|
|
name = "plugins";
|
|
package_name = "networking_plugins.zip";
|
|
}
|
|
|
|
void UpgradeNetworkJob::on_success(std::function<void()> success)
|
|
{
|
|
m_success_fun = success;
|
|
}
|
|
|
|
void UpgradeNetworkJob::update_status(Ctl &ctl, int st, const std::string &msg)
|
|
{
|
|
BOOST_LOG_TRIVIAL(info) << "UpgradeNetworkJob: percent = " << st << "msg = " << msg;
|
|
ctl.update_status(st, msg);
|
|
wxCommandEvent event(EVT_UPGRADE_UPDATE_MESSAGE);
|
|
event.SetString(msg);
|
|
event.SetEventObject(m_event_handle);
|
|
wxPostEvent(m_event_handle, event);
|
|
}
|
|
|
|
void UpgradeNetworkJob::process(Ctl &ctl)
|
|
{
|
|
// downloading
|
|
int result = 0;
|
|
|
|
AppConfig* app_config = wxGetApp().app_config;
|
|
if (!app_config)
|
|
return;
|
|
|
|
BOOST_LOG_TRIVIAL(info) << "[UpgradeNetworkJob process]: enter";
|
|
|
|
// get temp path
|
|
fs::path target_file_path = (fs::temp_directory_path() / package_name);
|
|
fs::path tmp_path = target_file_path;
|
|
auto path_str = tmp_path.string() + wxString::Format(".%d%s", get_current_pid(), ".tmp").ToStdString();
|
|
tmp_path = fs::path(path_str);
|
|
|
|
BOOST_LOG_TRIVIAL(info) << "UpgradeNetworkJob: save netowrk_plugin to " << tmp_path.string();
|
|
|
|
auto cancel_fn = [&ctl]() {
|
|
return ctl.was_canceled();
|
|
};
|
|
int curr_percent = 0;
|
|
result = wxGetApp().download_plugin(name, package_name,
|
|
[this, &ctl, &curr_percent](int state, int percent, bool &cancel) {
|
|
if (state == InstallStatusNormal) {
|
|
update_status(ctl, percent, _u8L("Downloading"));
|
|
} else if (state == InstallStatusDownloadFailed) {
|
|
update_status(ctl, percent, _u8L("Download failed"));
|
|
} else {
|
|
update_status(ctl, percent, _u8L("Downloading"));
|
|
}
|
|
curr_percent = percent;
|
|
}, cancel_fn);
|
|
|
|
if (ctl.was_canceled()) {
|
|
update_status(ctl, 0, _u8L("Cancelled"));
|
|
wxCommandEvent event(wxEVT_CLOSE_WINDOW);
|
|
event.SetEventObject(m_event_handle);
|
|
wxPostEvent(m_event_handle, event);
|
|
return;
|
|
}
|
|
|
|
if (result < 0) {
|
|
update_status(ctl, 0, _u8L("Download failed"));
|
|
wxCommandEvent event(EVT_DOWNLOAD_NETWORK_FAILED);
|
|
event.SetEventObject(m_event_handle);
|
|
wxPostEvent(m_event_handle, event);
|
|
return;
|
|
}
|
|
|
|
result = wxGetApp().install_plugin(
|
|
name, package_name,
|
|
[this, &ctl](int state, int percent, bool &cancel) {
|
|
if (state == InstallStatusInstallCompleted) {
|
|
update_status(ctl, percent, _u8L("Install successfully."));
|
|
} else {
|
|
update_status(ctl, percent, _u8L("Installing"));
|
|
}
|
|
}, cancel_fn);
|
|
|
|
if (ctl.was_canceled()) {
|
|
update_status(ctl, 0, _u8L("Cancelled"));
|
|
wxCommandEvent event(wxEVT_CLOSE_WINDOW);
|
|
event.SetEventObject(m_event_handle);
|
|
wxPostEvent(m_event_handle, event);
|
|
return;
|
|
}
|
|
|
|
if (result != 0) {
|
|
update_status(ctl, 0, _u8L("Install failed"));
|
|
wxCommandEvent event(EVT_INSTALL_NETWORK_FAILED);
|
|
event.SetEventObject(m_event_handle);
|
|
wxPostEvent(m_event_handle, event);
|
|
return;
|
|
}
|
|
|
|
wxCommandEvent event(EVT_UPGRADE_NETWORK_SUCCESS);
|
|
event.SetEventObject(m_event_handle);
|
|
wxPostEvent(m_event_handle, event);
|
|
BOOST_LOG_TRIVIAL(info) << "[UpgradeNetworkJob process]: exit";
|
|
return;
|
|
}
|
|
|
|
void UpgradeNetworkJob::finalize(bool canceled, std::exception_ptr &eptr)
|
|
{
|
|
try {
|
|
if (eptr)
|
|
std::rethrow_exception(eptr);
|
|
eptr = nullptr;
|
|
} catch (...) {
|
|
eptr = std::current_exception();
|
|
}
|
|
|
|
if (canceled || eptr)
|
|
return;
|
|
}
|
|
|
|
void UpgradeNetworkJob::set_event_handle(wxWindow *hanle)
|
|
{
|
|
m_event_handle = hanle;
|
|
}
|
|
|
|
}} // namespace Slic3r::GUI
|