mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-10-18 22:31:13 -06: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>
70 lines
2.7 KiB
C++
70 lines
2.7 KiB
C++
///|/ Copyright (c) Prusa Research 2019 - 2021 Tomáš Mészáros @tamasmeszaros, David Kocík @kocikdav, Vojtěch Bubník @bubnikv
|
|
///|/
|
|
///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
|
|
///|/
|
|
#ifndef JOB_HPP
|
|
#define JOB_HPP
|
|
|
|
#include <atomic>
|
|
#include <exception>
|
|
#include <future>
|
|
|
|
#include "libslic3r/libslic3r.h"
|
|
#include "ProgressIndicator.hpp"
|
|
|
|
namespace Slic3r { namespace GUI {
|
|
|
|
// A class representing a job that is to be run in the background, not blocking
|
|
// the main thread. Running it is up to a Worker object (see Worker interface)
|
|
class Job {
|
|
public:
|
|
|
|
enum JobPrepareState {
|
|
PREPARE_STATE_DEFAULT = 0,
|
|
PREPARE_STATE_MENU = 1,
|
|
};
|
|
|
|
// A controller interface that informs the job about cancellation and
|
|
// makes it possible for the job to advertise its status.
|
|
class Ctl {
|
|
public:
|
|
virtual ~Ctl() = default;
|
|
|
|
// status update, to be used from the work thread (process() method)
|
|
virtual void update_status(int st, const std::string &msg = "") = 0;
|
|
|
|
// Returns true if the job was asked to cancel itself.
|
|
virtual bool was_canceled() const = 0;
|
|
|
|
// Orca:
|
|
virtual void clear_percent() = 0;
|
|
virtual void show_error_info(const std::string &msg, int code, const std::string &description, const std::string &extra) = 0;
|
|
|
|
// Execute a functor on the main thread. Note that the exact time of
|
|
// execution is hard to determine. This can be used to make modifications
|
|
// on the UI, like displaying some intermediate results or modify the
|
|
// cursor.
|
|
// This function returns a std::future<void> object which enables the
|
|
// caller to optionally wait for the main thread to finish the function call.
|
|
virtual std::future<void> call_on_main_thread(std::function<void()> fn) = 0;
|
|
};
|
|
|
|
virtual ~Job() = default;
|
|
|
|
// The method where the actual work of the job should be defined. This is
|
|
// run on the worker thread.
|
|
virtual void process(Ctl &ctl) = 0;
|
|
|
|
// Launched when the job is finished on the UI thread.
|
|
// If the job was cancelled, the first parameter will have a true value.
|
|
// Exceptions occuring in process() are redirected from the worker thread
|
|
// into the main (UI) thread. This method receives the exception and can
|
|
// handle it properly. Assign nullptr to this second argument before
|
|
// function return to prevent further action. Leaving it with a non-null
|
|
// value will result in rethrowing by the worker.
|
|
virtual void finalize(bool /*canceled*/, std::exception_ptr &) {}
|
|
};
|
|
|
|
}} // namespace Slic3r::GUI
|
|
|
|
#endif // JOB_HPP
|