3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ENH: get result for pa and flow ratio cali

Browse source 
Change-Id: I78c967abcdaf8c75fe6b31f1697377b72ad10e06
(cherry picked from commit fb6cd5a7c71fe6e5c4e9fed71f0c61f3a7a0c8e4)
This commit is contained in:
zhimin.zeng 2023-06-20 20:28:38 +08:00 • committed by Lane.Wei
parent 03054a3b80
commit e6a03b48ad
7 changed files with 224 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/slic3r/GUI/DeviceManager.hpp
View file

@ -209,6 +209,7 @@ public:
std::string uuid;
float k = 0.0f; // k range: 0 ~ 0.5
float n = 0.0f; // k range: 0.6 ~ 2.0
int cali_idx = 0;
wxColour wx_color;
bool is_bbl;
@ -320,6 +321,7 @@ public:
std::string filament_id;
std::string setting_id;
float max_volumetric_speed;
float flow_rate = 0.98f; // for flow ratio
};
std::vector<X1CCalibInfo> calib_datas;
@ -329,6 +331,7 @@ class PACalibResult
{
public:
int tray_id;
int cali_idx;
float nozzle_diameter;
std::string filament_id;
std::string setting_id;
@ -340,7 +343,7 @@ public:
struct PACalibIndexInfo
{
int tray_id;
int index;
int cali_idx;
float nozzle_diameter;
std::string filament_id;
};
@ -654,6 +657,8 @@ public:
int total_layers = 0;
bool is_support_layer_num { false };
int cali_version = -1;
bool has_get_pa_calib_tab = false;
std::vector<PACalibResult> pa_calib_tab;
std::vector<PACalibResult> pa_calib_results;
std::vector<FlowRatioCalibResult> flow_ratio_results;
@ -821,13 +826,13 @@ public:
int command_start_pa_calibration(const X1CCalibInfos& pa_data);
int command_set_pa_calibration(const std::vector<PACalibResult>& pa_calib_values);
int command_delete_pa_calibration(const PACalibIndexInfo& pa_calib);
int command_get_pa_calibration_tab(const std::string& filament_id = "");
int command_get_pa_calibration_result();
int command_get_pa_calibration_tab(float nozzle_diameter, const std::string &filament_id = "");
int command_get_pa_calibration_result(float nozzle_diameter);
int commnad_select_pa_calibration(const PACalibIndexInfo& pa_calib_info);
// flow ratio calibration
int command_start_flow_ratio_calibration(const X1CCalibInfos& calib_data);
int command_get_flow_ratio_calibration_result();
int command_get_flow_ratio_calibration_result(float nozzle_diameter);
int command_unload_filament();