diff --git a/src/BambuStudio.cpp b/src/BambuStudio.cpp index fc4b05d6e..6d9b0a117 100644 --- a/src/BambuStudio.cpp +++ b/src/BambuStudio.cpp @@ -5731,7 +5731,6 @@ int CLI::run(int argc, char **argv) else mode = part_plate->get_real_filament_map_mode(m_print_config); if (mode < FilamentMapMode::fmmManual) { - part_plate->set_unprintable_filament_ids(unprintable_filament_vec); std::vector conflict_filament_vector; for (int index = 0; index < new_extruder_count; index++) { diff --git a/src/libslic3r/Format/bbs_3mf.cpp b/src/libslic3r/Format/bbs_3mf.cpp index af6d0f296..6db8e6bed 100644 --- a/src/libslic3r/Format/bbs_3mf.cpp +++ b/src/libslic3r/Format/bbs_3mf.cpp @@ -300,7 +300,6 @@ static constexpr const char* OTHER_LAYERS_PRINT_SEQUENCE_NUMS_ATTR = "other_laye static constexpr const char* SPIRAL_VASE_MODE = "spiral_mode"; static constexpr const char* FILAMENT_MAP_MODE_ATTR = "filament_map_mode"; static constexpr const char* FILAMENT_MAP_ATTR = "filament_maps"; -static constexpr const char* UNPRINTABLE_FILAMENT_MAP_ATTR = "unprintable_filament_maps"; static constexpr const char* LIMIT_FILAMENT_MAP_ATTR = "limit_filament_maps"; static constexpr const char* GCODE_FILE_ATTR = "gcode_file"; static constexpr const char* THUMBNAIL_FILE_ATTR = "thumbnail_file"; @@ -4183,10 +4182,6 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result) m_curr_plater->config.set_key_value("filament_map", new ConfigOptionInts(filament_map)); } } - else if (key == UNPRINTABLE_FILAMENT_MAP_ATTR) - { - m_curr_plater->config.set_key_value("unprintable_filament_map", new ConfigOptionIntsGroups(get_vector_array_from_string(value))); - } else if (key == GCODE_FILE_ATTR) { m_curr_plater->gcode_file = value; @@ -7606,23 +7601,6 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result) stream << "\"/>\n"; } - ConfigOptionIntsGroups *unprintable_filament_maps_opt = plate_data->config.option("unprintable_filament_map"); - if (unprintable_filament_maps_opt != nullptr) { - stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << UNPRINTABLE_FILAMENT_MAP_ATTR << "\" " << VALUE_ATTR << "=\""; - const std::vector> &values = unprintable_filament_maps_opt->values; - for (size_t i = 0; i < values.size(); ++i) { - if (i > 0) - stream << "#"; - std::vector index_values = values[i]; - for (int j = 0; j < index_values.size(); ++j) { - if (j > 0) - stream << " "; - stream << index_values[j]; - } - } - stream << "\"/>\n"; - } - if (save_gcode) stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << GCODE_FILE_ATTR << "\" " << VALUE_ATTR << "=\"" << std::boolalpha << xml_escape(plate_data->gcode_file) << "\"/>\n"; if (!plate_data->gcode_file.empty()) { diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index edac06ceb..1de4bc243 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -282,7 +282,6 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n || opt_key == "extruder_ams_count" || opt_key == "filament_map_mode" || opt_key == "filament_map" - || opt_key == "unprintable_filament_map" || opt_key == "filament_adhesiveness_category" //|| opt_key == "wipe_tower_bridging" || opt_key == "wipe_tower_no_sparse_layers" diff --git a/src/libslic3r/PrintApply.cpp b/src/libslic3r/PrintApply.cpp index d9ca4e4e9..69f760d17 100644 --- a/src/libslic3r/PrintApply.cpp +++ b/src/libslic3r/PrintApply.cpp @@ -250,15 +250,6 @@ static t_config_option_keys print_config_diffs( else if ((plate_index < option_new->values.size())||(plate_index < option_old->values.size())) print_diff.emplace_back(opt_key); } - else if (opt_key == "unprintable_filament_map") { - size_t extruder_nums = new_full_config.option("nozzle_diameter")->values.size(); - std::vector> old_map = current_config.option("unprintable_filament_map")->values; - std::vector> new_map = new_full_config.option("unprintable_filament_map")->values; - old_map.resize(extruder_nums, std::vector()); - new_map.resize(extruder_nums, std::vector()); - if (old_map != new_map) - print_diff.emplace_back(opt_key); - } else print_diff.emplace_back(opt_key); } @@ -290,18 +281,6 @@ static t_config_option_keys full_print_config_diffs(const DynamicPrintConfig &cu else if ((plate_index < option_new->values.size())||(plate_index < option_old->values.size())) full_config_diff.emplace_back(opt_key); } - else if (opt_key == "unprintable_filament_map") { - size_t extruder_nums = new_full_config.option("nozzle_diameter")->values.size(); - std::vector> old_map; - if (opt_old) { - old_map = current_full_config.option("unprintable_filament_map")->values; - } - std::vector> new_map = new_full_config.option("unprintable_filament_map")->values; - old_map.resize(extruder_nums, std::vector()); - new_map.resize(extruder_nums, std::vector()); - if (old_map != new_map) - full_config_diff.emplace_back(opt_key); - } else full_config_diff.emplace_back(opt_key); } diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index d7673d0c3..01bb60fb0 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1704,12 +1704,6 @@ void PrintConfigDef::init_fff_params() def->mode = comDevelop; def->set_default_value(new ConfigOptionInts{0}); - def = this->add("unprintable_filament_map", coIntsGroups); - def->label = L("Unprintable filament map to extruder"); - def->tooltip = L("Unprintable filament map to extruder"); - def->mode = comDevelop; - def->set_default_value(new ConfigOptionIntsGroups{}); - def = this->add("filament_map_mode", coEnum); def->label = L("filament mapping mode"); def->tooltip = ("filament mapping mode used as plate param"); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index f59a973dc..036b8d6cf 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -1041,7 +1041,6 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionInts, required_nozzle_HRC)) ((ConfigOptionEnum, filament_map_mode)) ((ConfigOptionInts, filament_map)) - ((ConfigOptionIntsGroups, unprintable_filament_map)) //((ConfigOptionInts, filament_extruder_id)) ((ConfigOptionStrings, filament_extruder_variant)) ((ConfigOptionFloat, machine_load_filament_time)) diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp index cc3ffdd21..210f7cfeb 100644 --- a/src/slic3r/GUI/3DScene.cpp +++ b/src/slic3r/GUI/3DScene.cpp @@ -1942,8 +1942,6 @@ bool GLVolumeCollection::check_outside_state(const BuildVolume &build_volume, Mo unprintable_filament_vec.emplace_back(std::vector(filamnt_ids.begin(), filamnt_ids.end())); } - curr_plate->set_unprintable_filament_ids(unprintable_filament_vec); - if (object_results && !partly_objects_set.empty()) { object_results->partly_outside_objects = std::vector(partly_objects_set.begin(), partly_objects_set.end()); } diff --git a/src/slic3r/GUI/PartPlate.cpp b/src/slic3r/GUI/PartPlate.cpp index 18c31a0ef..e7d74a9f3 100644 --- a/src/slic3r/GUI/PartPlate.cpp +++ b/src/slic3r/GUI/PartPlate.cpp @@ -3108,18 +3108,6 @@ void PartPlate::clear_filament_map_mode() m_config.erase("filament_map_mode"); } -const std::vector>& PartPlate::get_unprintable_filament_ids() -{ - std::vector> & unprintabel_filament_maps = m_config.option("unprintable_filament_map", true)->values; - return unprintabel_filament_maps; -} - -void PartPlate::set_unprintable_filament_ids(const std::vector> &filament_ids) -{ - std::vector> &unprintabel_filament_maps = m_config.option("unprintable_filament_map", true)->values; - unprintabel_filament_maps = filament_ids; -} - void PartPlate::on_extruder_count_changed(int extruder_count) { if (extruder_count < 2) { diff --git a/src/slic3r/GUI/PartPlate.hpp b/src/slic3r/GUI/PartPlate.hpp index 57d7ed4e7..b35d56439 100644 --- a/src/slic3r/GUI/PartPlate.hpp +++ b/src/slic3r/GUI/PartPlate.hpp @@ -490,9 +490,6 @@ public: std::map get_diff_object_setting(); std::map get_diff_plate_setting(); - const std::vector> &get_unprintable_filament_ids(); - void set_unprintable_filament_ids(const std::vector> &filament_ids); - void on_extruder_count_changed(int extruder_count); void set_filament_count(int filament_count); void on_filament_added();