mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-10-19 14:51:11 -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>
90 lines
2.3 KiB
C++
90 lines
2.3 KiB
C++
///|/ Copyright (c) Prusa Research 2020 - 2023 Tomáš Mészáros @tamasmeszaros, David Kocík @kocikdav
|
|
///|/
|
|
///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
|
|
///|/
|
|
#ifndef ARRANGEJOB_HPP
|
|
#define ARRANGEJOB_HPP
|
|
|
|
|
|
#include <optional>
|
|
|
|
#include "Job.hpp"
|
|
#include "libslic3r/Arrange.hpp"
|
|
|
|
namespace Slic3r {
|
|
|
|
class ModelInstance;
|
|
|
|
namespace GUI {
|
|
|
|
class Plater;
|
|
|
|
class ArrangeJob : public Job
|
|
{
|
|
using ArrangePolygon = arrangement::ArrangePolygon;
|
|
using ArrangePolygons = arrangement::ArrangePolygons;
|
|
|
|
//BBS: add locked logic
|
|
ArrangePolygons m_selected, m_unselected, m_unprintable, m_locked;
|
|
std::vector<ModelInstance*> m_unarranged;
|
|
std::map<int, ArrangePolygons> m_selected_groups; // groups of selected items for sequential printing
|
|
arrangement::ArrangeParams params;
|
|
int current_plate_index = 0;
|
|
Polygon bed_poly;
|
|
Plater *m_plater;
|
|
|
|
// BBS: add flag for whether on current part plate
|
|
bool only_on_partplate{false};
|
|
|
|
// clear m_selected and m_unselected, reserve space for next usage
|
|
void clear_input();
|
|
|
|
// Prepare the selected and unselected items separately. If nothing is
|
|
// selected, behaves as if everything would be selected.
|
|
void prepare_selected();
|
|
|
|
void prepare_all();
|
|
|
|
//BBS:prepare the items from current selected partplate
|
|
void prepare_partplate();
|
|
void prepare_wipe_tower();
|
|
|
|
ArrangePolygon prepare_arrange_polygon(void* instance);
|
|
|
|
protected:
|
|
|
|
void check_unprintable();
|
|
|
|
public:
|
|
|
|
void prepare();
|
|
|
|
void process(Ctl &ctl) override;
|
|
|
|
ArrangeJob();
|
|
|
|
int status_range() const
|
|
{
|
|
// ensure finalize() is called after all operations in process() is finished.
|
|
return int(m_selected.size() + m_unprintable.size() + 1);
|
|
}
|
|
|
|
void finalize(bool canceled, std::exception_ptr &e) override;
|
|
};
|
|
|
|
std::optional<arrangement::ArrangePolygon> get_wipe_tower_arrangepoly(const Plater &);
|
|
|
|
// The gap between logical beds in the x axis expressed in ratio of
|
|
// the current bed width.
|
|
static const constexpr double LOGICAL_BED_GAP = 1. / 5.;
|
|
|
|
//BBS: add sudoku-style strides for x and y
|
|
// Stride between logical beds
|
|
double bed_stride_x(const Plater* plater);
|
|
double bed_stride_y(const Plater* plater);
|
|
|
|
arrangement::ArrangeParams init_arrange_params(Plater *p);
|
|
|
|
}} // namespace Slic3r::GUI
|
|
|
|
#endif // ARRANGEJOB_HPP
|