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

Merge some BS1.7 changes:

Browse source 
internal_solid_infill_pattern
This commit is contained in:
SoftFever 2023-08-08 18:34:21 +08:00
parent 7ece35931e
commit bcbbbf35db
95 changed files with 44122 additions and 693 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/libslic3r/ProjectTask.hpp
View file

@ -17,6 +17,7 @@ namespace Slic3r {
class BBLProject;
class BBLProfile;
class BBLTask;
class BBLModelTask;
enum MachineBedType {
@ -95,6 +96,20 @@ enum TaskUserOptions {
OPTIONS_RECORD_TIMELAPSE = 4
};
class BBLModelTask {
public:
BBLModelTask();
~BBLModelTask() {}
int job_id;
int design_id;
int profile_id;
std::string task_id;
std::string model_id;
std::string model_name;
std::string profile_name;
};
class BBLSubTask {
public:
enum SubTaskStatus {
@ -112,6 +127,7 @@ public:
BBLSubTask(const BBLSubTask& obj) {
task_id = obj.task_id;
parent_id = obj.parent_id;
task_model_id = obj.task_model_id;
task_project_id = obj.task_project_id;
task_profile_id = obj.task_profile_id;
task_name = obj.task_name;
@ -127,9 +143,14 @@ public:
task_flow_cali = obj.task_flow_cali;
task_vibration_cali = obj.task_vibration_cali;
task_layer_inspect = obj.task_layer_inspect;
job_id = obj.job_id;
origin_model_name = obj.origin_model_name;
origin_profile_name = obj.origin_profile_name;
}
std::string task_id; /* plate id */
std::string task_model_id; /* model id */
std::string task_project_id; /* project id */
std::string task_profile_id; /* profile id*/
std::string task_name; /* task name, generally filename as task name */
@ -161,6 +182,10 @@ public:
BBLTask* parent_task_;
std::string parent_id;
int job_id;
std::string origin_model_name;
std::string origin_profile_name;
int parse_content_json(std::string json_str);
static BBLSubTask::SubTaskStatus parse_status(std::string status);
static BBLSubTask::SubTaskStatus parse_user_service_task_status(int status);
@ -186,6 +211,7 @@ public:
std::wstring task_dst_url; /* put task to dest url in machine */
BBLProfile* profile_;
std::string task_project_id;
std::string task_model_id;
std::string task_profile_id;
std::vector<BBLSubTask*> subtasks;
std::map<std::string, BBLSliceInfo*> slice_info; /* slice info of subtasks, key: plate idx, 1, 2, 3, etc... */