diff --git a/src/slic3r/GUI/Jobs/PrintJob.cpp b/src/slic3r/GUI/Jobs/PrintJob.cpp index b6b420969f..c903e3b139 100644 --- a/src/slic3r/GUI/Jobs/PrintJob.cpp +++ b/src/slic3r/GUI/Jobs/PrintJob.cpp @@ -716,8 +716,6 @@ void PrintJob::process(Ctl &ctl) } else { // wait for printer mqtt ready the same job id - wxGetApp().plater()->record_slice_preset("print"); - BOOST_LOG_TRIVIAL(error) << "print_job: send ok."; wxCommandEvent* evt = new wxCommandEvent(m_print_job_completed_id); if (!m_completed_evt_data.empty()) diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index d395fe104c..be308da04e 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -20746,76 +20746,6 @@ void Plater::reslice() p->preview->reload_print(); BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": finished, started slicing for plate %1%") % p->partplate_list.get_curr_plate_index(); - - record_slice_preset("slicing"); -} - -void Plater::record_slice_preset(std::string action) -{ - // record slice preset - try - { - json j; - auto printer_preset = wxGetApp().preset_bundle->printers.get_edited_preset_with_vendor_profile().preset; - if (printer_preset.is_system) { - j["printer_preset_name"] = printer_preset.name; - } - else { - j["printer_preset_name"] = printer_preset.config.opt_string("inherits"); - } - const t_config_enum_values* keys_map = print_config_def.get("curr_bed_type")->enum_keys_map; - if (keys_map) { - for (auto item : *keys_map) { - if (item.second == wxGetApp().preset_bundle->project_config.opt_enum("curr_bed_type")) { - j["curr_bed_type"] = item.first; - break; - } - } - } - auto filament_presets = wxGetApp().preset_bundle->filament_presets; - for (int i = 0; i < filament_presets.size(); ++i) { - auto filament_preset = wxGetApp().preset_bundle->filaments.find_preset(filament_presets[i]); - if (filament_preset->is_system) { - j["filament_preset_" + std::to_string(i)] = filament_preset->name; - } - else { - j["filament_preset_" + std::to_string(i)] = filament_preset->config.opt_string("inherits"); - } - } - - Preset& print_preset = wxGetApp().preset_bundle->prints.get_edited_preset(); - if (print_preset.is_system) { - j["process_preset"] = print_preset.name; - } - else { - j["process_preset"] = print_preset.config.opt_string("inherits"); - } - j["support_type"] = ConfigOptionEnum::get_enum_names().at(print_preset.config.opt_enum("support_type")); - j["sparse_infill_pattern"] = ConfigOptionEnum::get_enum_names().at(print_preset.config.opt_enum("sparse_infill_pattern")); - j["sparse_infill_density"] = print_preset.config.opt("sparse_infill_density")->value; - - j["brim_type"] = ConfigOptionEnum::get_enum_names().at(print_preset.config.opt_enum("brim_type")); - j["user_mode"] = wxGetApp().get_mode_str(); - - if (p->background_process.fff_print()) { - const DynamicPrintConfig& full_config = p->background_process.fff_print()->full_print_config(); - json values = json::array(); - if (full_config.has("different_settings_to_system")) { - std::vector different_values = full_config.option("different_settings_to_system")->values; - for (auto& item : different_values) { - values.push_back(item); - } - } - j["different_settings_to_system"] = values; - } - - j["record_event"] = action; - NetworkAgent* agent = wxGetApp().getAgent(); - } - catch (...) - { - return; - } } //BBS: add project slicing related logic diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp index 564addb0c7..a879226b42 100644 --- a/src/slic3r/GUI/Plater.hpp +++ b/src/slic3r/GUI/Plater.hpp @@ -597,7 +597,6 @@ public: bool has_toolpaths_to_export() const; void export_toolpaths_to_obj() const; void reslice(); - void record_slice_preset(std::string action); void reslice_SLA_supports(const ModelObject &object, bool postpone_error_messages = false); void reslice_SLA_hollowing(const ModelObject &object, bool postpone_error_messages = false); void reslice_SLA_until_step(SLAPrintObjectStep step, const ModelObject &object, bool postpone_error_messages = false);