mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-10-24 01:01:15 -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>
75 lines
3.2 KiB
C++
75 lines
3.2 KiB
C++
#pragma once
|
|
#include "libslic3r/calib.hpp"
|
|
#include "../GUI/DeviceManager.hpp"
|
|
#include "../GUI/Jobs/PrintJob.hpp"
|
|
#include "slic3r/GUI/Jobs/Worker.hpp"
|
|
|
|
namespace Slic3r {
|
|
|
|
class ProgressIndicator;
|
|
class Preset;
|
|
|
|
namespace GUI {
|
|
class CalibInfo
|
|
{
|
|
public:
|
|
Calib_Params params;
|
|
Preset* printer_prest;
|
|
Preset* filament_prest;
|
|
Preset* print_prest;
|
|
BedType bed_type;
|
|
std::string dev_id;
|
|
std::string select_ams;
|
|
std::shared_ptr<ProgressIndicator> process_bar;
|
|
};
|
|
|
|
class CalibUtils
|
|
{
|
|
public:
|
|
CalibUtils(){};
|
|
static std::unique_ptr<Worker> print_worker;
|
|
|
|
static CalibMode get_calib_mode_by_name(const std::string name, int &cali_stage);
|
|
|
|
static void calib_PA(const X1CCalibInfos& calib_infos, int mode, wxString& error_message);
|
|
|
|
static void emit_get_PA_calib_results(float nozzle_diameter);
|
|
static bool get_PA_calib_results(std::vector<PACalibResult> &pa_calib_results);
|
|
|
|
static void emit_get_PA_calib_infos(float nozzle_diameter);
|
|
static bool get_PA_calib_tab(std::vector<PACalibResult> &pa_calib_infos);
|
|
|
|
static void emit_get_PA_calib_info(float nozzle_diameter, const std::string &filament_id);
|
|
static bool get_PA_calib_info(PACalibResult &pa_calib_info);
|
|
|
|
static void set_PA_calib_result(const std::vector<PACalibResult>& pa_calib_values, bool is_auto_cali);
|
|
static void select_PA_calib_result(const PACalibIndexInfo &pa_calib_info);
|
|
static void delete_PA_calib_result(const PACalibIndexInfo &pa_calib_info);
|
|
|
|
static void calib_flowrate_X1C(const X1CCalibInfos& calib_infos, std::string& error_message);
|
|
static void emit_get_flow_ratio_calib_results(float nozzle_diameter);
|
|
static bool get_flow_ratio_calib_results(std::vector<FlowRatioCalibResult> &flow_ratio_calib_results);
|
|
static void calib_flowrate(int pass, const CalibInfo &calib_info, wxString &error_message);
|
|
|
|
static void calib_pa_pattern(const CalibInfo &calib_info, Model &model);
|
|
|
|
static void calib_generic_PA(const CalibInfo &calib_info, wxString &error_message);
|
|
static void calib_temptue(const CalibInfo &calib_info, wxString &error_message);
|
|
static void calib_max_vol_speed(const CalibInfo &calib_info, wxString &error_message);
|
|
static void calib_VFA(const CalibInfo &calib_info, wxString &error_message);
|
|
static void calib_retraction(const CalibInfo &calib_info, wxString &error_message);
|
|
|
|
//help function
|
|
static int get_selected_calib_idx(const std::vector<PACalibResult> &pa_calib_values, int cali_idx);
|
|
static bool get_pa_k_n_value_by_cali_idx(const MachineObject* obj, int cali_idx, float& out_k, float& out_n);
|
|
|
|
static bool validate_input_k_value(wxString k_text, float* output_value);
|
|
static bool validate_input_flow_ratio(wxString flow_ratio, float* output_value);
|
|
|
|
private:
|
|
static void process_and_store_3mf(Model* model, const DynamicPrintConfig& full_config, const Calib_Params& params, wxString& error_message);
|
|
static void send_to_print(const CalibInfo &calib_info, wxString& error_message, int flow_ratio_mode = 0); // 0: none 1: coarse 2: fine
|
|
};
|
|
|
|
}
|
|
}
|