From a2d2e58b91aa2ab3fa06778c23b2e9d79d5668b5 Mon Sep 17 00:00:00 2001 From: supermerill Date: Thu, 25 Jan 2024 11:58:10 +0100 Subject: [PATCH 01/28] Fix loading preset with wrong keys erasing good preset values. supermerill/SuperSlicer#4079 --- src/libslic3r/Preset.cpp | 2 +- src/libslic3r/PrintConfig.cpp | 3 +-- src/slic3r/GUI/Tab.cpp | 10 ++++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index fbcb25e6b2e..b7bb188cd5b 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -1068,7 +1068,7 @@ void PresetCollection::load_presets( preset.config.apply(std::move(config)); Preset::normalize(preset.config); // Report configuration fields, which are misplaced into a wrong group. - std::string incorrect_keys = Preset::remove_invalid_keys(config, default_preset.config); + std::string incorrect_keys = Preset::remove_invalid_keys(preset.config, default_preset.config); if (! incorrect_keys.empty()) BOOST_LOG_TRIVIAL(error) << "Error in a preset file: The preset \"" << preset.file << "\" contains the following incorrect keys: " << incorrect_keys << ", which were removed"; diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 8fab71f50df..f4e16894ea2 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -8463,8 +8463,7 @@ void DynamicPrintConfig::set_num_extruders(unsigned int num_extruders) // empty fields there, if not defined by the system profile. continue; auto* opt = this->option(key, false); - assert(opt != nullptr); - assert(opt->is_vector()); + assert(opt != nullptr && opt->is_vector()); if (opt != nullptr && opt->is_vector()) static_cast(opt)->resize(num_extruders, defaults.option(key)); } diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 2841f49ef46..ce83e16e488 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -1939,15 +1939,17 @@ std::vector Tab::create_pages(std::string setting_type_nam // Change of this option influences for an update of "Sliced Info" wxGetApp().sidebar().update_sliced_info_sizer(); wxGetApp().sidebar().Layout(); - } else - on_value_change(opt_key, value); + } + // this will be done by the lambda added by new_optgroup() + //else on_value_change(opt_key, value); }); } else if (params[i] == "validate_gcode") { current_group->m_on_change = set_or_add(current_group->m_on_change, [this, ¤t_group](t_config_option_key opt_key, boost::any value) { //validate_custom_gcode_cb(this, current_group, opt_key, value); this->validate_custom_gcodes_was_shown = !Tab::validate_custom_gcode(current_group->title, boost::any_cast(value)); - this->update_dirty(); - this->on_value_change(opt_key, value); + // these will be done by the lambda added by new_optgroup() + //this->update_dirty(); + //this->on_value_change(opt_key, value); }); } } From b16868f304bb4381eab45c6fe860b87e7cfd4655 Mon Sep 17 00:00:00 2001 From: supermerill Date: Thu, 25 Jan 2024 12:18:42 +0100 Subject: [PATCH 02/28] Fix Single extruder MM setup tab not shown at startup supermerill/SuperSlicer#4086 --- src/slic3r/GUI/Tab.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index ce83e16e488..20077cf3636 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -3322,11 +3322,10 @@ void TabPrinter::build_unregular_pages(bool from_initial_build/* = false*/) } m_has_single_extruder_MM_page = false; } - if (from_initial_build || - (m_extruders_count > 1 && m_config->opt_bool("single_extruder_multi_material") && !m_has_single_extruder_MM_page)) { + if (m_extruders_count > 1 && m_config->opt_bool("single_extruder_multi_material") && !m_has_single_extruder_MM_page) { // create a page, but pretend it's an extruder page, so we can add it to m_pages ourselves - auto page = create_options_page(L("Single extruder MM setup"), "printer"); - auto optgroup = page->new_optgroup(L("Single extruder multimaterial parameters")); + PageShp page = create_options_page(L("Single extruder MM setup"), "printer"); + ConfigOptionsGroupShp optgroup = page->new_optgroup(L("Single extruder multimaterial parameters")); optgroup->append_single_option_line("cooling_tube_retraction"); optgroup->append_single_option_line("cooling_tube_length"); optgroup->append_single_option_line("parking_pos_retraction"); @@ -3337,12 +3336,8 @@ void TabPrinter::build_unregular_pages(bool from_initial_build/* = false*/) optgroup->append_single_option_line("wipe_advanced_nozzle_melted_volume"); optgroup->append_single_option_line("wipe_advanced_multiplier"); optgroup->append_single_option_line("wipe_advanced_algo"); - if (from_initial_build) { - page->clear(); - } else { - m_pages.insert(m_pages.begin() + n_before_extruders, page); - m_has_single_extruder_MM_page = true; - } + m_pages.insert(m_pages.begin() + n_before_extruders, page); + m_has_single_extruder_MM_page = true; changed = true; } if(m_has_single_extruder_MM_page) From 84949720bafbfad8965a0349d0b1c48a1ce49730 Mon Sep 17 00:00:00 2001 From: supermerill Date: Fri, 26 Jan 2024 11:43:28 +0100 Subject: [PATCH 03/28] avoid_crossing_perimeters improvements: . now can follow the external perimeter to avoid top surfaces . can go over top surface at the start & end if the distance is much less than the strait travel (rare case) --- src/libslic3r/Fill/Fill.cpp | 4 +- .../GCode/AvoidCrossingPerimeters.cpp | 144 ++++++++++++++++-- .../GCode/AvoidCrossingPerimeters.hpp | 5 + 3 files changed, 135 insertions(+), 18 deletions(-) diff --git a/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp index 7347aff31ca..3831fd0f6db 100644 --- a/src/libslic3r/Fill/Fill.cpp +++ b/src/libslic3r/Fill/Fill.cpp @@ -697,8 +697,8 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive: for(auto &t : temp) real_surface += t.area(); assert(compute_volume.volume < unscaled(unscaled(surface_fill.surface.area())) * surface_fill.params.layer_height + EPSILON); double area = unscaled(unscaled(real_surface)); - assert(compute_volume.volume < area * surface_fill.params.layer_height * 1.001); - assert(compute_volume.volume > area * surface_fill.params.layer_height * 0.999 || area < std::max(1.,surface_fill.params.config->solid_infill_below_area.value)); + assert(compute_volume.volume <= area * surface_fill.params.layer_height * 1.001); + assert(compute_volume.volume >= area * surface_fill.params.layer_height * 0.999 || area < std::max(1.,surface_fill.params.config->solid_infill_below_area.value)); } #endif } diff --git a/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp b/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp index aa319ed52e3..e88aa6dc0dd 100644 --- a/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp +++ b/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp @@ -158,6 +158,41 @@ struct MinDistanceVisitor double max_distance_squared = std::numeric_limits::max(); }; +// Finding if any intersection with Polyline +struct AnyIntersectionsVisitor +{ + + AnyIntersectionsVisitor(const EdgeGrid::Grid &grid, const Polyline &travel_polyline) + : grid(grid), travel_polyline(travel_polyline), has_intersection(false) + { } + + void reset() { + has_intersection = false; + } + + bool operator()(coord_t iy, coord_t ix) + { + if (has_intersection) + return false; + // Called with a row and column of the grid cell, which is intersected by a line. + auto cell_data_range = grid.cell_data_range(iy, ix); + for (auto it_contour_and_segment = cell_data_range.first; it_contour_and_segment != cell_data_range.second; ++it_contour_and_segment) { + Point intersection_point; + for(const Line &travel_line : travel_polyline.lines()) + if (travel_line.intersection(grid.line(*it_contour_and_segment), &intersection_point)) { + has_intersection = true; + return false; + } + } + // Continue traversing the grid along the edge. + return true; + } + + const EdgeGrid::Grid &grid; + bool has_intersection; + Polyline travel_polyline; +}; + // Returns sorted list of closest lines to a passed point within a passed radius static std::vector get_closest_lines_in_radius(const EdgeGrid::Grid &grid, const Point ¢er, float search_radius) { @@ -537,7 +572,7 @@ bool find_point_on_boundary(Point& pt_to_move, const AvoidCrossingPerimeters::Bo EdgeGrid::Grid::ClosestPointResult pt_closest = boundary.grid.closest_point_signed_distance(pt_to_move, max_dist); Point contour_pt; if (pt_closest.contour_idx == size_t(-1)) { - //manual search on edges + // manual search on edges : bool found = false; for (const std::pair& bound : boundary.boundary_growth) if (bound.first.contains(pt_to_move)) { @@ -563,9 +598,16 @@ bool find_point_on_boundary(Point& pt_to_move, const AvoidCrossingPerimeters::Bo } break; } - if (!found) { - return false; + if (found) { + if (boundary.grid.bbox().contains(contour_pt)) { + //push it a bit to be sure it's inside + Line l{ pt_to_move, contour_pt }; + l.extend_end(SCALED_EPSILON); + pt_to_move = l.b; + assert(boundary.grid.bbox().contains(pt_to_move)); + } } + return boundary.grid.bbox().contains(pt_to_move); } else { const EdgeGrid::Contour& pts = boundary.grid.contours()[pt_closest.contour_idx]; contour_pt = pts.segment_start(pt_closest.start_point_idx).interpolate(pt_closest.t, pts.segment_end(pt_closest.start_point_idx)); @@ -574,6 +616,7 @@ bool find_point_on_boundary(Point& pt_to_move, const AvoidCrossingPerimeters::Bo Line l{ pt_to_move, contour_pt }; l.extend_end(SCALED_EPSILON); pt_to_move = l.b; + assert(boundary.grid.bbox().contains(pt_to_move)); } return true; } @@ -594,10 +637,58 @@ static size_t avoid_perimeters_inner(const AvoidCrossingPerimeters::Boundary &bo //ensure that start & end are inside if(extrusion_spacing > 0) - if (!find_point_on_boundary(start, boundary, (extrusion_spacing * 3)/2) || !find_point_on_boundary(end, boundary, (extrusion_spacing * 3) / 2)) { - BOOST_LOG_TRIVIAL(info) << "Fail to find a point in the contour for avoid_perimeter."; - result_out = { {start,-1}, {end,-1} }; - return 0; + if (!edge_grid.bbox().contains(start) || !edge_grid.bbox().contains(end) + || !find_point_on_boundary(start, boundary, (extrusion_spacing * 3) / 2) + || !find_point_on_boundary(end, boundary, (extrusion_spacing * 3) / 2)) { + //can't find one, but maybe we can find something better than nothing. + coordf_t dist = start.distance_to(end); + EdgeGrid::Grid::ClosestPointResult pt_closest_start = boundary.grid.closest_point_signed_distance(start, dist/2); + EdgeGrid::Grid::ClosestPointResult pt_closest_end = boundary.grid.closest_point_signed_distance(end, dist/2); + // Is it useful enough? + bool find_better = false; + if (pt_closest_start.distance + pt_closest_end.distance < dist / 2) { + const EdgeGrid::Contour& pts_start = boundary.grid.contours()[pt_closest_start.contour_idx]; + Point new_start = pts_start.segment_start(pt_closest_start.start_point_idx).interpolate(pt_closest_start.t, pts_start.segment_end(pt_closest_start.start_point_idx)); + const EdgeGrid::Contour& pts_end = boundary.grid.contours()[pt_closest_end.contour_idx]; + Point new_end = pts_start.segment_start(pt_closest_end.start_point_idx).interpolate(pt_closest_end.t, pts_start.segment_end(pt_closest_end.start_point_idx)); + // check if travel top + AnyIntersectionsVisitor visitor(boundary.to_avoid_grid, Polyline{start, new_start, new_end, end}); + if(boundary.to_avoid_grid.bbox().contains(start) && boundary.to_avoid_grid.bbox().contains(new_start)) + boundary.to_avoid_grid.visit_cells_intersecting_line(start, new_start, visitor); //TODO is this the right way to use it? + if(boundary.to_avoid_grid.bbox().contains(new_start) && boundary.to_avoid_grid.bbox().contains(new_end)) + boundary.to_avoid_grid.visit_cells_intersecting_line(new_start, new_end, visitor); + if(boundary.to_avoid_grid.bbox().contains(new_end) && boundary.to_avoid_grid.bbox().contains(end)) + boundary.to_avoid_grid.visit_cells_intersecting_line(new_end, end, visitor); + if (visitor.has_intersection) { + // go over avoid area, check if it's more or less than the dumb travel + Polylines lines = diff_pl({Polyline{start, end}}, boundary.to_avoid); + coordf_t old_dist_over_top = 0; + for(const Polyline &pl : lines) + old_dist_over_top += pl.length(); + //check if it's not obviously worse + if (old_dist_over_top > 0) { + lines = diff_pl({Polyline{start, new_start, new_end, end}}, boundary.to_avoid); + coordf_t new_dist_over_top = 0; + for (const Polyline &pl : lines) new_dist_over_top += pl.length(); + // check if it's really better + if (new_dist_over_top < old_dist_over_top / 2) { + // really better! + find_better = true; + start = new_start; + end = new_end; + } + } + } else { + find_better = true; + start = new_start; + end = new_end; + } + } + if (!find_better) { + BOOST_LOG_TRIVIAL(debug) << "Fail to find a point in the contour for avoid_perimeter."; + result_out = {{start, -1}, {end, -1}}; + return 0; + } } // Find all intersections between boundaries and the line segment, sort them along the line segment. @@ -1110,7 +1201,7 @@ static std::vector> inner_offset(const ExPolygon //#define INCLUDE_SUPPORTS_IN_BOUNDARY // called by AvoidCrossingPerimeters::travel_to() -static ExPolygons get_boundary(const Layer &layer, std::vector> &slice_2_boundary) +static ExPolygons get_boundary(const Layer &layer, std::vector> &slice_2_boundary, ExPolygons &to_avoid) { const float perimeter_spacing = get_perimeter_spacing(layer); const float perimeter_offset = perimeter_spacing / 2.f; @@ -1118,6 +1209,7 @@ static ExPolygons get_boundary(const Layer &layer, std::vector &old_2_new_expoly : old_2_new_expolygons) { + assert(old_2_new_expoly.first.contains(old_2_new_expoly.second.contour.split_at_index(0))); boundary.push_back(old_2_new_expoly.second); slice_2_boundary.push_back(std::move(old_2_new_expoly)); } @@ -1147,13 +1239,26 @@ static ExPolygons get_boundary(const Layer &layer, std::vector 0) { ExPolygons top_layer_polygons; top_layer_polygons.reserve(polygons_count); - for (const LayerRegion *layer_region : layer.regions()) - if(layer_region->region().config().avoid_crossing_top) - for (const Surface &surface : layer_region->fill_surfaces.surfaces) - if (surface.has_pos_top()) top_layer_polygons.emplace_back(surface.expolygon); - + for (const LayerRegion *layer_region : layer.regions()) { + if (layer_region->region().config().avoid_crossing_top) { + for (const Surface &surface : layer_region->fill_surfaces.surfaces) { + if (surface.has_pos_top()) { + ExPolygons offseted_top = offset_ex(surface.expolygon, -perimeter_offset); + // still get a perimeter width to travel (unless no perimeters or post-process ironing) + if (layer_region->region().config().perimeters > 0 && !layer_region->region().config().ironing) { + append(boundary, + diff_ex(offset_ex(surface.expolygon, perimeter_offset / 2), offseted_top)); + } + append(top_layer_polygons, offseted_top); + } + } + } + } + top_layer_polygons = union_ex(top_layer_polygons); - return diff_ex(boundary, offset_ex(top_layer_polygons, -perimeter_offset)); + boundary = union_ex(boundary); + append(to_avoid, top_layer_polygons); + return diff_ex(boundary, top_layer_polygons); } return boundary; @@ -1233,9 +1338,16 @@ static void init_boundary(AvoidCrossingPerimeters::Boundary *boundary, Polygons bbox.offset(SCALED_EPSILON); boundary->bbox = BoundingBoxf(bbox.min.cast(), bbox.max.cast()); boundary->grid.set_bbox(bbox); - // FIXME 1mm grid? + // FIXME 1mm grid? -> use nozzle size or extrusion width boundary->grid.create(boundary->boundaries, coord_t(scale_(1.))); init_boundary_distances(boundary); + + boundary->to_avoid = union_ex(boundary->to_avoid); + bbox = BoundingBox(get_extents(boundary->to_avoid)); + bbox.offset(SCALED_EPSILON); + boundary->to_avoid_grid.set_bbox(bbox); + // FIXME 1mm grid? -> use nozzle size or extrusion width + boundary->to_avoid_grid.create(to_polygons(boundary->to_avoid), coord_t(scale_(1.))); } // Plan travel, which avoids perimeter crossings by following the boundaries of the layer. @@ -1264,7 +1376,7 @@ Polyline AvoidCrossingPerimeters::travel_to(const GCode &gcodegen, const Point & // Initialize m_internal only when it is necessary. if (m_internal.boundaries.empty()) { std::vector> boundary_growth; - init_boundary(&m_internal, to_polygons(get_boundary(*gcodegen.layer(), boundary_growth))); + init_boundary(&m_internal, to_polygons(get_boundary(*gcodegen.layer(), boundary_growth, m_internal.to_avoid))); m_internal.boundary_growth = std::move(boundary_growth); } diff --git a/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp b/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp index 8964b294114..7fc09312211 100644 --- a/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp +++ b/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp @@ -45,12 +45,17 @@ class AvoidCrossingPerimeters EdgeGrid::Grid grid; //used to move the point inside the boundary std::vector> boundary_growth; + // area (top) where you don't want to travel, even more so than over voids. + ExPolygons to_avoid; + // Used for detection of intersection between line and any polygon from to_avoid + EdgeGrid::Grid to_avoid_grid; void clear() { boundaries.clear(); boundaries_params.clear(); boundary_growth.clear(); + to_avoid.clear(); } }; From 8993fa082b169085af4990229a438ce7adadfded Mon Sep 17 00:00:00 2001 From: supermerill Date: Fri, 26 Jan 2024 14:09:15 +0100 Subject: [PATCH 04/28] Protect GUI_App owned pointer inside unique_ptr --- src/slic3r/GUI/3DBed.cpp | 2 +- src/slic3r/GUI/ConfigWizard.cpp | 6 ++--- src/slic3r/GUI/DesktopIntegrationDialog.cpp | 6 ++--- src/slic3r/GUI/GCodeViewer.cpp | 2 +- src/slic3r/GUI/GLCanvas3D.cpp | 4 ++-- src/slic3r/GUI/GUI.cpp | 2 +- src/slic3r/GUI/GUI_App.cpp | 25 +++++---------------- src/slic3r/GUI/GUI_App.hpp | 9 ++++---- src/slic3r/GUI/GUI_Init.cpp | 2 +- src/slic3r/GUI/Plater.cpp | 4 ++-- src/slic3r/GUI/PresetComboBoxes.cpp | 2 +- src/slic3r/GUI/PrintHostDialogs.cpp | 8 +++---- src/slic3r/GUI/Tab.cpp | 2 +- src/slic3r/GUI/Tab.hpp | 2 +- src/slic3r/GUI/UnsavedChangesDialog.cpp | 2 +- src/slic3r/Utils/PresetUpdater.cpp | 8 +++---- 16 files changed, 36 insertions(+), 50 deletions(-) diff --git a/src/slic3r/GUI/3DBed.cpp b/src/slic3r/GUI/3DBed.cpp index 6bd072654fd..15f3b9f58fe 100644 --- a/src/slic3r/GUI/3DBed.cpp +++ b/src/slic3r/GUI/3DBed.cpp @@ -382,7 +382,7 @@ void Bed3D::calc_gridlines(const ExPolygon& poly, const BoundingBox& bed_bbox) // return the print bed model. std::tuple Bed3D::detect_type(const Pointfs& shape) { - auto bundle = wxGetApp().preset_bundle; + auto bundle = wxGetApp().preset_bundle.get(); if (bundle != nullptr && bundle->printers.size() > bundle->printers.get_selected_idx()) { const Preset* curr = &bundle->printers.get_selected_preset(); while (curr != nullptr) { diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp index 8bc942a6180..7fd3a62b922 100644 --- a/src/slic3r/GUI/ConfigWizard.cpp +++ b/src/slic3r/GUI/ConfigWizard.cpp @@ -1229,7 +1229,7 @@ PageUpdate::PageUpdate(ConfigWizard *parent) , version_check(true) , preset_update(true) { - const AppConfig *app_config = wxGetApp().app_config; + const AppConfig *app_config = wxGetApp().app_config.get(); auto boldfont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); boldfont.SetWeight(wxFONTWEIGHT_BOLD); @@ -2018,7 +2018,7 @@ void ConfigWizard::priv::load_vendors() bundles = BundleMap::load(); // Load up the set of vendors / models / variants the user has had enabled up till now - AppConfig *app_config = wxGetApp().app_config; + AppConfig *app_config = wxGetApp().app_config.get(); appconfig_new.set_vendors(*app_config); // Initialize the is_visible flag in printer Presets @@ -3144,7 +3144,7 @@ bool ConfigWizard::run(RunReason reason, StartPage start_page) if (ShowModal() == wxID_OK) { bool apply_keeped_changes = false; - if (! p->apply_config(app.app_config, app.preset_bundle, app.preset_updater, apply_keeped_changes)) + if (! p->apply_config(app.app_config.get(), app.preset_bundle.get(), app.preset_updater.get(), apply_keeped_changes)) return false; if (apply_keeped_changes) diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp b/src/slic3r/GUI/DesktopIntegrationDialog.cpp index fcb7472e649..9abd75d1e1b 100644 --- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp +++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp @@ -202,7 +202,7 @@ bool create_desktop_file(const std::string& path, const std::string& data) // methods that actually do / undo desktop integration. Static to be accesible from anywhere. bool DesktopIntegrationDialog::is_integrated() { - const AppConfig *app_config = wxGetApp().app_config; + const AppConfig *app_config = wxGetApp().app_config.get(); std::string path(app_config->get("desktop_integration_app_path")); BOOST_LOG_TRIVIAL(debug) << "Desktop integration desktop file path: " << path; @@ -259,7 +259,7 @@ void DesktopIntegrationDialog::perform_desktop_integration() resolve_path_from_var("XDG_DATA_HOME", target_candidates); resolve_path_from_var("XDG_DATA_DIRS", target_candidates); - AppConfig *app_config = wxGetApp().app_config; + AppConfig *app_config = wxGetApp().app_config.get(); // suffix string to create different desktop file for alpha, beta. std::string version_suffix; @@ -424,7 +424,7 @@ void DesktopIntegrationDialog::perform_desktop_integration() } void DesktopIntegrationDialog::undo_desktop_intgration() { - const AppConfig *app_config = wxGetApp().app_config; + const AppConfig *app_config = wxGetApp().app_config.get(); // slicer .desktop std::string path = std::string(app_config->get("desktop_integration_app_path")); if (!path.empty()) { diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index d8fd58a80d2..a1ac5a18580 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -766,7 +766,7 @@ void GCodeViewer::load(const GCodeProcessorResult& gcode_result, const Print& pr if (!gcode_result.bed_shape.empty()) { // bed shape detected in the gcode bed_shape = gcode_result.bed_shape; - const auto bundle = wxGetApp().preset_bundle; + const auto bundle = wxGetApp().preset_bundle.get(); if (bundle != nullptr && !m_settings_ids.printer.empty()) { const Preset* preset = bundle->printers.find_preset(m_settings_ids.printer); if (preset != nullptr) { diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index d8fdd9708a5..a831834d481 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -1076,7 +1076,7 @@ void GLCanvas3D::set_last_arrange_settings(float new_value) { } ptr->previously_used_distance = new_value; - auto& appcfg = wxGetApp().app_config; + AppConfig *appcfg = wxGetApp().app_config.get(); std::string dist_key = "min_object_distance", rot_key = "enable_rotation"; dist_key += postfix; rot_key += postfix; @@ -3139,7 +3139,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt) m_dirty = true; }; - auto* app_config = GUI::wxGetApp().app_config; + auto* app_config = GUI::wxGetApp().app_config.get(); bool focus_platter_on_mouse = app_config->get("focus_platter_on_mouse") == "1"; if (m_gizmos.on_mouse(evt)) { if (focus_platter_on_mouse) { diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp index f785487ce54..54bf516ad05 100644 --- a/src/slic3r/GUI/GUI.cpp +++ b/src/slic3r/GUI/GUI.cpp @@ -331,7 +331,7 @@ void combochecklist_set_flags(wxComboCtrl* comboCtrl, unsigned int flags) AppConfig* get_app_config() { - return wxGetApp().app_config; + return wxGetApp().app_config.get(); } wxString from_u8(const std::string &str) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index b6b806c6afc..0cd25fee63f 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -789,7 +789,7 @@ void GUI_App::post_init() return; CallAfter([this] { bool cw_showed = this->config_wizard_startup(); - this->preset_updater->sync(preset_bundle); + this->preset_updater->sync(preset_bundle.get()); if (! cw_showed) { // The CallAfter is needed as well, without it, GL extensions did not show. // Also, we only want to show this when the wizard does not, so the new user @@ -832,18 +832,6 @@ GUI_App::GUI_App(EAppMode mode) m_imgui.reset(new ImGuiWrapper{}); } -GUI_App::~GUI_App() -{ - if (app_config != nullptr) - delete app_config; - - if (preset_bundle != nullptr) - delete preset_bundle; - - if (preset_updater != nullptr) - delete preset_updater; -} - // If formatted for github, plaintext with OpenGL extensions enclosed into
. // Otherwise HTML formatted for the system info dialog. std::string GUI_App::get_gl_info(bool for_github) @@ -928,7 +916,7 @@ void GUI_App::init_app_config() } if (!app_config) - app_config = new AppConfig(is_editor() ? AppConfig::EAppMode::Editor : AppConfig::EAppMode::GCodeViewer); + app_config.reset(new AppConfig(is_editor() ? AppConfig::EAppMode::Editor : AppConfig::EAppMode::GCodeViewer)); // load settings m_app_conf_exists = app_config->exists(); @@ -1233,7 +1221,7 @@ bool GUI_App::on_init_inner() scrn->SetText(_L("Loading configuration") + dots); } - preset_bundle = new PresetBundle(); + preset_bundle.reset(new PresetBundle()); // just checking for existence of Slic3r::data_dir is not enough : it may be an empty directory // supplied as argument to --datadir; in that case we should still run the wizard @@ -1252,7 +1240,7 @@ bool GUI_App::on_init_inner() associate_stl_files(); #endif // __WXMSW__ - preset_updater = new PresetUpdater(); + preset_updater.reset(new PresetUpdater()); Bind(EVT_SLIC3R_VERSION_ONLINE, [this](const wxCommandEvent& evt) { app_config->set("version_online", into_u8(evt.GetString())); app_config->save(); @@ -2984,9 +2972,8 @@ void GUI_App::OSXStoreOpenFiles(const wxArrayString &fileNames) // just G-codes were passed. Switch to G-code viewer mode. m_app_mode = EAppMode::GCodeViewer; unlock_lockfile(get_instance_hash_string() + ".lock", data_dir() + "/cache/"); - if(app_config != nullptr) - delete app_config; - app_config = nullptr; + if(app_config) + app_config.reset(); init_app_config(); } wxApp::OSXStoreOpenFiles(fileNames); diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index d512004dbbf..1e50910989c 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -169,7 +169,6 @@ class GUI_App : public wxApp bool initialized() const { return m_initialized; } explicit GUI_App(EAppMode mode = EAppMode::Editor); - ~GUI_App() override; EAppMode get_app_mode() const { return m_app_mode; } bool is_editor() const { return m_app_mode == EAppMode::Editor; } @@ -321,15 +320,15 @@ class GUI_App : public wxApp // Parameters extracted from the command line to be passed to GUI after initialization. GUI_InitParams* init_params { nullptr }; - AppConfig* app_config{ nullptr }; - PresetBundle* preset_bundle{ nullptr }; - PresetUpdater* preset_updater{ nullptr }; + std::unique_ptr app_config; + std::unique_ptr preset_bundle; + std::unique_ptr preset_updater; MainFrame* mainframe{ nullptr }; Plater* plater_{ nullptr }; std::mutex not_modal_dialog_mutex; wxDialog* not_modal_dialog = nullptr; - PresetUpdater* get_preset_updater() { return preset_updater; } + PresetUpdater* get_preset_updater() { return preset_updater.get(); } wxBookCtrlBase* tab_panel() const ; int extruders_cnt() const; diff --git a/src/slic3r/GUI/GUI_Init.cpp b/src/slic3r/GUI/GUI_Init.cpp index e169d1bb3fb..0acb201f7bc 100644 --- a/src/slic3r/GUI/GUI_Init.cpp +++ b/src/slic3r/GUI/GUI_Init.cpp @@ -74,7 +74,7 @@ int GUI_Run(GUI_InitParams ¶ms) gui->init_params = ¶ms; #ifdef WIN32 - test_win32_dll_loaded(gui->app_config); + test_win32_dll_loaded(gui->app_config.get()); #endif return wxEntry(params.argc, params.argv); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index c07651e9219..5c460abfd71 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -2526,7 +2526,7 @@ std::vector Plater::priv::load_files(const std::vector& input_ if (load_config) { if (!config.empty()) { Preset::normalize(config); - PresetBundle* preset_bundle = wxGetApp().preset_bundle; + PresetBundle* preset_bundle = wxGetApp().preset_bundle.get(); preset_bundle->load_config_model(filename.string(), std::move(config)); { // After loading of the presets from project, check if they are visible. @@ -5053,7 +5053,7 @@ void Plater::priv::undo_redo_to(std::vector::const_iterator this->undo_redo_stack().redo(model, this->view3D->get_canvas3d()->get_gizmos_manager(), it_snapshot->timestamp)) { if (printer_technology_changed) { // Switch to the other printer technology. Switch to the last printer active for that particular technology. - AppConfig *app_config = wxGetApp().app_config; + AppConfig *app_config = wxGetApp().app_config.get(); app_config->set("presets", "printer", (new_printer_technology == ptFFF) ? m_last_fff_printer_profile_name : m_last_sla_printer_profile_name); //FIXME Why are we reloading the whole preset bundle here? Please document. This is fishy and it is unnecessarily expensive. // Anyways, don't report any config value substitutions, they have been already reported to the user at application start up. diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp index 36240abf9f8..9981ac5c48c 100644 --- a/src/slic3r/GUI/PresetComboBoxes.cpp +++ b/src/slic3r/GUI/PresetComboBoxes.cpp @@ -75,7 +75,7 @@ PresetComboBox::PresetComboBox(wxWindow* parent, Preset::Type preset_type, const m_type(preset_type), m_last_selected(wxNOT_FOUND), m_em_unit(em_unit(this)), - m_preset_bundle(preset_bundle ? preset_bundle : wxGetApp().preset_bundle) + m_preset_bundle(preset_bundle ? preset_bundle : wxGetApp().preset_bundle.get()) { switch (m_type) { diff --git a/src/slic3r/GUI/PrintHostDialogs.cpp b/src/slic3r/GUI/PrintHostDialogs.cpp index 87bef23dc6e..eb7308db6ae 100644 --- a/src/slic3r/GUI/PrintHostDialogs.cpp +++ b/src/slic3r/GUI/PrintHostDialogs.cpp @@ -46,7 +46,7 @@ PrintHostSendDialog::PrintHostSendDialog(const fs::path &path, PrintHostPostUplo #ifdef __APPLE__ txt_filename->OSXDisableAllSmartSubstitutions(); #endif - const AppConfig *app_config = wxGetApp().app_config; + const AppConfig *app_config = wxGetApp().app_config.get(); auto *label_dir_hint = new wxStaticText(this, wxID_ANY, _L("Use forward slashes ( / ) as a directory separator if needed.")); label_dir_hint->Wrap(CONTENT_WIDTH * wxGetApp().em_unit()); @@ -175,7 +175,7 @@ void PrintHostSendDialog::EndModal(int ret) else path = path.SubString(0, last_slash); - AppConfig *app_config = wxGetApp().app_config; + AppConfig *app_config = wxGetApp().app_config.get(); app_config->set("recent", CONFIG_KEY_PATH, into_u8(path)); if (combo_groups != nullptr) { @@ -468,7 +468,7 @@ void PrintHostQueueDialog::get_active_jobs(std::vectorset("print_host_queue_dialog_height", std::to_string(this->GetSize().x / em)); @@ -489,7 +489,7 @@ void PrintHostQueueDialog::save_user_data(int udt) } bool PrintHostQueueDialog::load_user_data(int udt, std::vector& vector) { - auto* app_config = wxGetApp().app_config; + auto* app_config = wxGetApp().app_config.get(); auto hasget = [app_config](const std::string& name, std::vector& vector)->bool { if (app_config->has(name)) { vector.push_back(std::stoi(app_config->get(name))); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 20077cf3636..d8d3a461ff5 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -169,7 +169,7 @@ void Tab::create_preset_tab() SetDoubleBuffered(true); #endif //__WINDOWS__ - m_preset_bundle = wxGetApp().preset_bundle; + m_preset_bundle = wxGetApp().preset_bundle.get(); // Vertical sizer to hold the choice menu and the rest of the page. #ifdef __WXOSX__ diff --git a/src/slic3r/GUI/Tab.hpp b/src/slic3r/GUI/Tab.hpp index bbbb21f795b..9c445ce71e0 100644 --- a/src/slic3r/GUI/Tab.hpp +++ b/src/slic3r/GUI/Tab.hpp @@ -365,7 +365,7 @@ class Tab: public wxPanel DynamicPrintConfig* m_config; public: - PresetBundle* m_preset_bundle; + PresetBundle* m_preset_bundle; //note: it's managed by the GUI_App, we don't own it. bool m_show_btn_incompatible_presets = false; PresetCollection* m_presets = nullptr; ogStaticText* m_parent_preset_description_line = nullptr; diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp index 96725c07d30..9998240e72c 100644 --- a/src/slic3r/GUI/UnsavedChangesDialog.cpp +++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp @@ -1437,7 +1437,7 @@ FullCompareDialog::FullCompareDialog(const wxString& option_name, const wxString static PresetCollection* get_preset_collection(Preset::Type type, PresetBundle* preset_bundle = nullptr) { if (!preset_bundle) - preset_bundle = wxGetApp().preset_bundle; + preset_bundle = wxGetApp().preset_bundle.get(); return type == Preset::Type::TYPE_FFF_PRINT ? &preset_bundle->fff_prints : type == Preset::Type::TYPE_SLA_PRINT ? &preset_bundle->sla_prints : type == Preset::Type::TYPE_FFF_FILAMENT ? &preset_bundle->filaments : diff --git a/src/slic3r/Utils/PresetUpdater.cpp b/src/slic3r/Utils/PresetUpdater.cpp index 485837625f8..b42716370a0 100644 --- a/src/slic3r/Utils/PresetUpdater.cpp +++ b/src/slic3r/Utils/PresetUpdater.cpp @@ -182,7 +182,7 @@ PresetUpdater::priv::priv() , vendor_path(fs::path(Slic3r::data_dir()) / "vendor") , cancel(false) { - set_download_prefs(GUI::wxGetApp().app_config); + set_download_prefs(GUI::wxGetApp().app_config.get()); // Install indicies from resources. Only installs those that are either missing or older than in resources. check_install_indices(); // Load indices from the cache directory. @@ -842,7 +842,7 @@ PresetUpdater::~PresetUpdater() void PresetUpdater::sync(PresetBundle *preset_bundle) { - p->set_download_prefs(GUI::wxGetApp().app_config); + p->set_download_prefs(GUI::wxGetApp().app_config.get()); if (!p->enabled_version_check && !p->enabled_config_update) { return; } // Copy the whole vendors data for use in the background thread @@ -861,7 +861,7 @@ void PresetUpdater::slic3r_update_notify() { if (! p->enabled_version_check) return; - auto* app_config = GUI::wxGetApp().app_config; + auto* app_config = GUI::wxGetApp().app_config.get(); const auto ver_online_str = app_config->get("version_online"); const auto ver_online = Semver::parse(ver_online_str); const auto ver_online_seen = Semver::parse(app_config->get("version_online_seen")); @@ -889,7 +889,7 @@ static bool reload_configs_update_gui() return false; // Reload global configuration - auto* app_config = GUI::wxGetApp().app_config; + auto* app_config = GUI::wxGetApp().app_config.get(); // System profiles should not trigger any substitutions, user profiles may trigger substitutions, but these substitutions // were already presented to the user on application start up. Just do substitutions now and keep quiet about it. // However throw on substitutions in system profiles, those shall never happen with system profiles installed over the air. From fc7cdcab74ef51d84be30b9ba4f5fceb8839a3cd Mon Sep 17 00:00:00 2001 From: supermerill Date: Fri, 26 Jan 2024 14:14:13 +0100 Subject: [PATCH 05/28] Change app default: hide_slice_tooltip to 1 for windows, compress_png_texture to 0 for amd graphics --- src/libslic3r/AppConfig.cpp | 19 ++++++++++-- src/libslic3r/AppConfig.hpp | 27 ++++++++++++++++- src/slic3r/GUI/GUI_App.cpp | 58 +++++++++++++++++++++++++++++++++---- src/slic3r/GUI/GUI_App.hpp | 2 -- 4 files changed, 95 insertions(+), 11 deletions(-) diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index 75e7b1080b9..10dbaa57e9a 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -360,9 +360,9 @@ void AppConfig::set_defaults() if (get("check_blacklisted_library").empty()) set("check_blacklisted_library", "1"); #endif // _WIN32 - - if (get("compress_png_texture").empty()) - set("compress_png_texture", "1"); + //disable by default if amd graphic card detected, but can't know before the opengl is launched + //if (get("compress_png_texture").empty()) + //set("compress_png_texture", (m_hardware&hGpuAmd) == hGpuAmd ? "0" : "1"); // remove old 'use_legacy_opengl' parameter from this config, if present if (!get("use_legacy_opengl").empty()) @@ -458,7 +458,11 @@ void AppConfig::set_defaults() set("use_rich_tooltip", "0"); if (get("hide_slice_tooltip").empty()) +#ifdef _WIN32 + set("hide_slice_tooltip", "1"); +#else set("hide_slice_tooltip", "0"); +#endif // _WIN32 if (get("show_layer_height_doubleslider").empty()) set("show_layer_height_doubleslider", "1"); @@ -614,6 +618,15 @@ void AppConfig::set_defaults() erase("", "object_settings_size"); } +void AppConfig::set_hardware_type(HardwareType hard) { + this->m_hardware = hard; + // Set default that depends on hardware type + + //disable by default if amd graphic card detected, but can't know before the opengl is launched + if (get("compress_png_texture").empty() && (m_hardware&hHasGpu) != 0) + set("compress_png_texture", (m_hardware&hGpuAmd) == hGpuAmd ? "0" : "1"); +} + void AppConfig::init_ui_layout() { boost::filesystem::path resources_dir_path = boost::filesystem::path(resources_dir()) / "ui_layout"; if (!boost::filesystem::is_directory(resources_dir_path)) { diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp index e90ab738810..2b52956fb17 100644 --- a/src/libslic3r/AppConfig.hpp +++ b/src/libslic3r/AppConfig.hpp @@ -27,6 +27,25 @@ class AppConfig Highlight, }; + enum HardwareType : uint8_t + { + //first 4 bits for cpu + hHasCpu = uint8_t(0x0F), + hCpuIntel = 1, + hCpuAmd = 2, + hCpuApple = 3, + hCpuArmGeneric = 4, + hCpuOther = 5, + //last 4 bits for gpu + hHasGpu = uint8_t(0xF0), + hGpuIntel = 1 << 4, + hGpuAmd = 2 << 4, + hGpuApple = 3 << 4, + hGpuArmGeneric = 4 << 4, + hGpuOther = 5 << 4, + hGpuNvidia = 6 << 4, + }; + struct ConfigFileInfo { bool correct_checksum{ false }; bool contains_null{ false }; @@ -190,12 +209,16 @@ class AppConfig LayoutEntry get_ui_layout(); std::vector get_ui_layouts() { return m_ui_layout; } - //tags + // Tags std::vector tags() { return m_tags; } // splashscreen std::string splashscreen(bool is_editor); + // Hardware + HardwareType hardware() { return m_hardware; } + void set_hardware_type(HardwareType hard); + // Returns true if the user's data directory comes from before Slic3r 1.40.0 (no updating) bool legacy_datadir() const { return m_legacy_datadir; } void set_legacy_datadir(bool value) { m_legacy_datadir = value; } @@ -281,6 +304,8 @@ class AppConfig std::vector m_tags; //splashscreen std::pair m_default_splashscreen; + // hardware type + HardwareType m_hardware; }; } // namespace Slic3r diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 0cd25fee63f..642794af3eb 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -846,13 +846,43 @@ wxGLContext* GUI_App::init_glcontext(wxGLCanvas& canvas) bool GUI_App::init_opengl() { + bool initialized = m_opengl_mgr.init_gl(); + if (!m_opengl_initialized && initialized) { + AppConfig::HardwareType hard_cpu = AppConfig::HardwareType::hCpuOther; // TODO for x86 if needed + AppConfig::HardwareType hard_gpu = AppConfig::HardwareType::hGpuOther; + // Delayed init for x86 +#ifdef __APPLE__ + // intel apple + hard_cpu = AppConfig::HardwareType::hCpuIntel; + try { + std::string gpu_vendor = OpenGLManager::get_gl_info().get_vendor(); + if (boost::contains(gpu_vendor, "Intel") || boost::contains(gpu_vendor, "INTEL")) + hard_gpu = AppConfig::HardwareType::hGpuIntel; + if (boost::contains(gpu_vendor, "ATI") || boost::contains(gpu_vendor, "AMD")) + hard_gpu = AppConfig::HardwareType::hGpuAmd; + } catch (std::exception ex) {} +#else + try { + std::string gpu_vendor = OpenGLManager::get_gl_info().get_vendor(); + if (boost::contains(gpu_vendor, "Intel") || boost::contains(gpu_vendor, "INTEL")) + hard_gpu = AppConfig::HardwareType::hGpuIntel; + if (boost::contains(gpu_vendor, "ATI") || boost::contains(gpu_vendor, "AMD")) + hard_gpu = AppConfig::HardwareType::hGpuAmd; + if (boost::contains(gpu_vendor, "Nvidia") || boost::contains(gpu_vendor, "NVIDIA")) + hard_gpu = AppConfig::HardwareType::hGpuNvidia; + if (boost::contains(gpu_vendor, "Apple") || boost::contains(gpu_vendor, "APPLE")) { + assert(false); // apple gpu are only in _M_ARM64 + } + } catch (std::exception ex) {} +#endif + app_config->set_hardware_type(AppConfig::HardwareType(hard_cpu + hard_gpu)); + } #ifdef __linux__ - bool status = m_opengl_mgr.init_gl(); m_opengl_initialized = true; - return status; #else - return m_opengl_mgr.init_gl(); + m_opengl_initialized = initialized; #endif + return initialized; } // gets path to PrusaSlicer.ini, returns semver from first line comment @@ -915,9 +945,27 @@ void GUI_App::init_app_config() m_datadir_redefined = true; } - if (!app_config) + if (!app_config) { app_config.reset(new AppConfig(is_editor() ? AppConfig::EAppMode::Editor : AppConfig::EAppMode::GCodeViewer)); - + AppConfig::HardwareType hard_cpu = AppConfig::HardwareType::hCpuOther; // TODO for x86 if needed + AppConfig::HardwareType hard_gpu = AppConfig::HardwareType::hGpuOther; +#ifdef _M_ARM64 +#ifdef __APPLE__ + // Arm apple + hard_cpu = AppConfig::HardwareType::hCpuApple; + hard_gpu = AppConfig::HardwareType::hGpuApple; + app_config->set_hardware_type(AppConfig::HardwareType(hard_cpu + hard_gpu)); +#else + // Arm + hard_cpu = AppConfig::HardwareType::hCpuArmGeneric; + hard_gpu = AppConfig::HardwareType::hGpuArmGeneric; + app_config->set_hardware_type(AppConfig::HardwareType(hard_cpu + hard_gpu)); +#endif +#else + // x86 (not-apple) + //can't know the gpu before the openg init, so it's delayed. until it +#endif + } // load settings m_app_conf_exists = app_config->exists(); if (m_app_conf_exists) { diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index 1e50910989c..085da89e0c9 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -117,9 +117,7 @@ class GUI_App : public wxApp bool m_app_conf_exists{ false }; EAppMode m_app_mode{ EAppMode::Editor }; bool m_is_recreating_gui{ false }; -#ifdef __linux__ bool m_opengl_initialized{ false }; -#endif wxColour m_color_label_modified; wxColour m_color_label_sys; From da109e31d0381ef9c8b2c0997182bebca883ef5a Mon Sep 17 00:00:00 2001 From: supermerill Date: Fri, 26 Jan 2024 14:44:36 +0100 Subject: [PATCH 06/28] from_prusa: set extrusion_spacing settings to phony --- src/libslic3r/PrintConfig.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index f4e16894ea2..fa6d4b57665 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -7816,10 +7816,20 @@ void _convert_from_prusa(CONFIG_CLASS& conf, const DynamicPrintConfig& global_co const ConfigOptionDef* def = print_config_def.get(entry.first); if (def) { ConfigOption* opt_new = def->default_value.get()->clone(); - opt_new->deserialize(entry.second); + opt_new->deserialize(entry.second); // note: deserialize don't set phony, only the ConfigBase::set_deserialize* conf.set_key_value(entry.first, opt_new); } } + // set phony entries + for (const t_config_option_key &opt_key : + {"extrusion_spacing", "perimeter_extrusion_spacing", "external_perimeter_extrusion_spacing", + "first_layer_extrusion_spacing", "infill_extrusion_spacing", "solid_infill_extrusion_spacing", + "top_infill_extrusion_spacing"}) { + ConfigOption* opt_new = print_config_def.get(opt_key)->default_value.get()->clone(); + opt_new->deserialize(""); // note: deserialize don't set phony, only the ConfigBase::set_deserialize* + opt_new->set_phony(true); + conf.set_key_value(opt_key, opt_new); + } } void DynamicPrintConfig::convert_from_prusa() { From a78a5d770f5c78c4a97bbc1442a8c707b300d33a Mon Sep 17 00:00:00 2001 From: supermerill Date: Fri, 26 Jan 2024 15:09:13 +0100 Subject: [PATCH 07/28] Fix concurrent script execution. --- src/slic3r/GUI/ScriptExecutor.cpp | 82 ++++++++++++++----------------- 1 file changed, 38 insertions(+), 44 deletions(-) diff --git a/src/slic3r/GUI/ScriptExecutor.cpp b/src/slic3r/GUI/ScriptExecutor.cpp index e22e5eb1310..8e8ee0e40fc 100644 --- a/src/slic3r/GUI/ScriptExecutor.cpp +++ b/src/slic3r/GUI/ScriptExecutor.cpp @@ -29,7 +29,8 @@ void as_message_callback(const AngelScript::asSMessageInfo* msg, void* param) printf("%s (%d, %d) : %s : %s\n", msg->section, msg->row, msg->col, type, msg->message); } -//FIXME put script methods in the ScriptContainer class so there isn't this dangerous global var here. +//TODO find a way to put script methods in the ScriptContainer class so there isn't this mutex-locked global var. +std::mutex current_script_mutex; ScriptContainer* current_script; void as_print(std::string& str) { @@ -853,16 +854,21 @@ void ScriptContainer::call_script_function_set(const ConfigOptionDef& def, const break; } } - // init globals for script exec (TODO find a way to change that) - current_script = this; m_need_refresh = false; m_to_update.clear(); for (Tab* tab : wxGetApp().tabs_list) if (tab->completed()) m_to_update[tab->type()] = {}; m_can_set = true; - // exec - /*int res = */ctx->Execute(); + // init globals for script exec (TODO find a way to change that) + assert(current_script == nullptr); + { + std::lock_guard lock(current_script_mutex); + current_script = this; + // exec + /*int res = */ ctx->Execute(); + current_script = nullptr; + } m_can_set = false; std::map to_update = m_to_update; m_to_update.clear(); @@ -916,8 +922,15 @@ bool ScriptContainer::call_script_function_reset(const ConfigOptionDef& def) } ctx->Prepare(func); m_can_set = true; - // exec - /*int res = */ctx->Execute(); + // init globals for script exec (TODO find a way to change that) + assert(current_script == nullptr); + { + std::lock_guard lock(current_script_mutex); + current_script = this; + // exec + /*int res = */ ctx->Execute(); + current_script = nullptr; + } m_can_set = false; std::map to_update = m_to_update; m_to_update.clear(); @@ -957,37 +970,6 @@ bool ScriptContainer::call_script_function_reset(const ConfigOptionDef& def) } return true; } - -//void ScriptContainer::call_script_function_refresh(const std::string& def_id) -//{ -// std::string func_name = ("int " + def_id + "_refresh()"); -// AngelScript::asIScriptFunction* func = m_script_module->GetFunctionByDecl(func_name.c_str()); -// if (func == nullptr) { -// BOOST_LOG_TRIVIAL(error) << "Error, can't find function '" << func_name << "' in the script file"; -// return; -// } -// AngelScript::asIScriptContext* ctx = m_script_engine->CreateContext(); -// if (ctx == nullptr) { -// BOOST_LOG_TRIVIAL(error) << "Error, can't create script context for function '" << func_name << "'"; -// return; -// } -// ctx->Prepare(func); -// // init globals for script exec (TODO find a way to change that) -// script_current_tab = m_tab; -// current_script->tech() = m_tech; -// // exec -// int res = ctx->Execute(); -// int ret = ctx->GetReturnDWord(); -// if (ret >= 0) { -// m_tab->set_value(def_id, unsigned char(ret)); -// } else { -// m_tab->set_value(def_id, unsigned char(2)); -// } -// //TODO: add the keyt into a collection of dirty script-widget in our tab. Then, ask for update_dirty() and add the code to use that collection in update_changed_ui -// m_tab->add_dirty_setting(def_id); -// //m_tab->update_dirty(); -// //m_tab-> -//} boost::any ScriptContainer::call_script_function_get_value(const ConfigOptionDef& def) { @@ -1044,10 +1026,15 @@ boost::any ScriptContainer::call_script_function_get_value(const ConfigOptionDef case coEnum: ctx->SetArgObject(0, &ret_str); break; } // init globals for script exec (TODO find a way to change that) - current_script = this; - m_need_refresh = false; - // exec - int res = ctx->Execute(); + assert(current_script == nullptr); + { + std::lock_guard lock(current_script_mutex); + current_script = this; + m_need_refresh = false; + // exec + int res = ctx->Execute(); + current_script = nullptr; + } int32_t ret_int; float ret_float; boost::any opt_val; @@ -1149,8 +1136,15 @@ void ScriptContainer::refresh(const ConfigOptionDef& def, boost::any value) return true; } ctx->Prepare(func); - // exec - /*int res = */ ctx->Execute(); + // init globals for script exec (TODO find a way to change that) + assert(current_script == nullptr); + { + std::lock_guard lock(current_script_mutex); + current_script = this; + // exec + /*int res = */ ctx->Execute(); + current_script = nullptr; + } uint8_t ret = ctx->GetReturnByte(); return ret != 0; } From 845c7a8a62c1642071e3177528fe9e7fef104473 Mon Sep 17 00:00:00 2001 From: supermerill Date: Fri, 26 Jan 2024 15:27:44 +0100 Subject: [PATCH 08/28] default fan_printer_min_speed to 0 --- src/libslic3r/PrintConfig.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index fa6d4b57665..36d166a7a2b 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -4295,7 +4295,7 @@ void PrintConfigDef::init_fff_params() def->min = 0; def->max = 100; def->mode = comSimpleAE | comSuSi; - def->set_default_value(new ConfigOptionInt(35)); + def->set_default_value(new ConfigOptionInt(0)); def = this->add("printer_model", coString); def->label = L("Printer type"); From 72bf0039c7a1a3127690c9cef4e1994a3b13a198 Mon Sep 17 00:00:00 2001 From: supermerill Date: Fri, 26 Jan 2024 15:39:31 +0100 Subject: [PATCH 09/28] fix basic profile --- resources/profiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/profiles b/resources/profiles index 22a3c028573..9e3f0c53e5f 160000 --- a/resources/profiles +++ b/resources/profiles @@ -1 +1 @@ -Subproject commit 22a3c0285734468a340b7d798cb387b392e32789 +Subproject commit 9e3f0c53e5f9a3a9ed7abc25548ab65cba611c0b From 3bdc368af1fc347102c625d78aea218a70fe493b Mon Sep 17 00:00:00 2001 From: supermerill Date: Sat, 27 Jan 2024 18:22:18 +0100 Subject: [PATCH 10/28] fix full-fill assert --- src/libslic3r/Fill/Fill.cpp | 8 +++++--- src/libslic3r/Fill/FillBase.cpp | 5 ++++- src/libslic3r/Fill/FillBase.hpp | 3 +++ src/libslic3r/Fill/FillSmooth.cpp | 3 +++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp index 3831fd0f6db..267121f0aed 100644 --- a/src/libslic3r/Fill/Fill.cpp +++ b/src/libslic3r/Fill/Fill.cpp @@ -692,13 +692,15 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive: fills_by_priority[(size_t)surface_fill.params.priority]->entities()[idx]->visit(compute_volume); fills_by_priority[(size_t)surface_fill.params.priority]->entities()[idx]->visit(compute_volume_no_gap_fill); } - ExPolygons temp = intersection_ex(ExPolygons{surface_fill.surface.expolygon}, f->no_overlap_expolygons); + ExPolygons temp = f->no_overlap_expolygons.empty() ? + ExPolygons{surface_fill.surface.expolygon} : + intersection_ex(ExPolygons{surface_fill.surface.expolygon}, f->no_overlap_expolygons); double real_surface = 0; for(auto &t : temp) real_surface += t.area(); assert(compute_volume.volume < unscaled(unscaled(surface_fill.surface.area())) * surface_fill.params.layer_height + EPSILON); double area = unscaled(unscaled(real_surface)); - assert(compute_volume.volume <= area * surface_fill.params.layer_height * 1.001); - assert(compute_volume.volume >= area * surface_fill.params.layer_height * 0.999 || area < std::max(1.,surface_fill.params.config->solid_infill_below_area.value)); + assert(compute_volume.volume <= area * surface_fill.params.layer_height * 1.001 || f->debug_verify_flow_mult <= 0.8); + assert(compute_volume.volume >= area * surface_fill.params.layer_height * 0.999 || f->debug_verify_flow_mult >= 1.3 || area < std::max(1.,surface_fill.params.config->solid_infill_below_area.value)); } #endif } diff --git a/src/libslic3r/Fill/FillBase.cpp b/src/libslic3r/Fill/FillBase.cpp index 3538e777f23..1ef1482db3a 100644 --- a/src/libslic3r/Fill/FillBase.cpp +++ b/src/libslic3r/Fill/FillBase.cpp @@ -215,8 +215,8 @@ void Fill::fill_surface_extrusion(const Surface *surface, const FillParams ¶ // ensure it doesn't over or under-extrude - double mult_flow = 1; if (!params.dont_adjust && params.full_infill() && !params.flow.bridge() && params.fill_exactly) { + double mult_flow = 1; // compute real volume double polyline_volume = compute_unscaled_volume_to_fill(surface, params); if (extruded_volume != 0 && polyline_volume != 0) mult_flow *= polyline_volume / extruded_volume; @@ -282,6 +282,9 @@ void Fill::fill_surface_extrusion(const Surface *surface, const FillParams ¶ if (mult_flow < 0.8) mult_flow = 0.8; BOOST_LOG_TRIVIAL(info) << "Layer " << layer_id << ": Fill process extrude " << extruded_volume << " mm3 for a volume of " << polyline_volume << " mm3 : we mult the flow by " << mult_flow; } +#if _DEBUG + this->debug_verify_flow_mult = mult_flow; +#endif // Save into layer. auto* eec = new ExtrusionEntityCollection(); diff --git a/src/libslic3r/Fill/FillBase.hpp b/src/libslic3r/Fill/FillBase.hpp index 83dc11161bf..e7aa5dd4c77 100644 --- a/src/libslic3r/Fill/FillBase.hpp +++ b/src/libslic3r/Fill/FillBase.hpp @@ -124,6 +124,9 @@ class Fill // Octree builds on mesh for usage in the adaptive cubic infill FillAdaptive::Octree* adapt_fill_octree = nullptr; +#if _DEBUG + mutable double debug_verify_flow_mult = 0; +#endif protected: // in unscaled coordinates, please use init (after settings all others settings) as some algos want to modify the value coordf_t spacing_priv; diff --git a/src/libslic3r/Fill/FillSmooth.cpp b/src/libslic3r/Fill/FillSmooth.cpp index 7f9ec7e4ab6..e2577632813 100644 --- a/src/libslic3r/Fill/FillSmooth.cpp +++ b/src/libslic3r/Fill/FillSmooth.cpp @@ -114,6 +114,9 @@ namespace Slic3r { BOOST_LOG_TRIVIAL(info) << "Layer " << layer_id << " Ironing process " << idx << " extrude " << extruded_volume << " mm3 for a volume of " << volume_to_occupy << " mm3 : we mult the flow by " << mult_flow; } +#if _DEBUG + this->debug_verify_flow_mult = mult_flow; +#endif extrusion_entities_append_paths( eec, std::move(polylines_layer), good_role, From 70375e2f41859fcf31eaa1fb4412e0aab35d98be Mon Sep 17 00:00:00 2001 From: supermerill Date: Wed, 24 Jan 2024 19:34:56 +0100 Subject: [PATCH 11/28] bambu/orca 3mf import: include orca 3mf reader & adaptations to translate to SuperSlicer settings. --- src/libslic3r/CMakeLists.txt | 4 + src/libslic3r/Config.cpp | 6 +- src/libslic3r/ExtrusionEntityCollection.hpp | 4 +- src/libslic3r/Format/3mf.cpp | 105 +- src/libslic3r/Format/BBConfig.cpp | 747 ++ src/libslic3r/Format/BBConfig.hpp | 45 + src/libslic3r/Format/bbs_3mf.cpp | 8829 ++++++++++++++++ src/libslic3r/Format/bbs_3mf.hpp | 315 + src/libslic3r/GCode/GCodeProcessor.cpp | 2 +- src/libslic3r/Model.cpp | 6 +- src/libslic3r/Model.hpp | 2 +- src/libslic3r/ObjectID.hpp | 62 +- src/libslic3r/Preset.hpp | 3 +- src/libslic3r/PresetBundle.cpp | 6 +- src/libslic3r/PrintConfig.cpp | 36 +- src/libslic3r/PrintConfig.hpp | 6 +- src/libslic3r/SupportMaterial.cpp | 13 +- src/libslic3r/TriangleMesh.hpp | 4 + src/miniz/ChangeLog.md | 6 + src/miniz/miniz.c | 36 +- src/miniz/miniz.h | 8 + src/nlohmann/adl_serializer.hpp | 73 + src/nlohmann/byte_container_with_subtype.hpp | 169 + src/nlohmann/detail/conversions/from_json.hpp | 482 + src/nlohmann/detail/conversions/to_chars.hpp | 1110 ++ src/nlohmann/detail/conversions/to_json.hpp | 420 + src/nlohmann/detail/exceptions.hpp | 429 + src/nlohmann/detail/hash.hpp | 122 + src/nlohmann/detail/input/binary_reader.hpp | 2524 +++++ src/nlohmann/detail/input/input_adapters.hpp | 483 + src/nlohmann/detail/input/json_sax.hpp | 711 ++ src/nlohmann/detail/input/lexer.hpp | 1623 +++ src/nlohmann/detail/input/parser.hpp | 499 + src/nlohmann/detail/input/position_t.hpp | 27 + .../detail/iterators/internal_iterator.hpp | 25 + src/nlohmann/detail/iterators/iter_impl.hpp | 739 ++ .../detail/iterators/iteration_proxy.hpp | 189 + .../detail/iterators/iterator_traits.hpp | 51 + .../iterators/json_reverse_iterator.hpp | 119 + .../detail/iterators/primitive_iterator.hpp | 123 + src/nlohmann/detail/json_pointer.hpp | 989 ++ src/nlohmann/detail/json_ref.hpp | 68 + src/nlohmann/detail/macro_scope.hpp | 347 + src/nlohmann/detail/macro_unscope.hpp | 24 + src/nlohmann/detail/meta/call_std/begin.hpp | 8 + src/nlohmann/detail/meta/call_std/end.hpp | 8 + src/nlohmann/detail/meta/cpp_future.hpp | 154 + src/nlohmann/detail/meta/detected.hpp | 61 + src/nlohmann/detail/meta/identity_tag.hpp | 10 + src/nlohmann/detail/meta/is_sax.hpp | 149 + src/nlohmann/detail/meta/type_traits.hpp | 474 + src/nlohmann/detail/meta/void_t.hpp | 13 + src/nlohmann/detail/output/binary_writer.hpp | 1635 +++ .../detail/output/output_adapters.hpp | 138 + src/nlohmann/detail/output/serializer.hpp | 956 ++ src/nlohmann/detail/string_escape.hpp | 63 + src/nlohmann/detail/value_t.hpp | 81 + src/nlohmann/json.hpp | 9076 +++++++++++++++++ src/nlohmann/json_fwd.hpp | 78 + src/nlohmann/ordered_map.hpp | 190 + src/nlohmann/thirdparty/hedley/hedley.hpp | 2044 ++++ .../thirdparty/hedley/hedley_undef.hpp | 150 + 62 files changed, 36816 insertions(+), 63 deletions(-) create mode 100644 src/libslic3r/Format/BBConfig.cpp create mode 100644 src/libslic3r/Format/BBConfig.hpp create mode 100644 src/libslic3r/Format/bbs_3mf.cpp create mode 100644 src/libslic3r/Format/bbs_3mf.hpp create mode 100644 src/nlohmann/adl_serializer.hpp create mode 100644 src/nlohmann/byte_container_with_subtype.hpp create mode 100644 src/nlohmann/detail/conversions/from_json.hpp create mode 100644 src/nlohmann/detail/conversions/to_chars.hpp create mode 100644 src/nlohmann/detail/conversions/to_json.hpp create mode 100644 src/nlohmann/detail/exceptions.hpp create mode 100644 src/nlohmann/detail/hash.hpp create mode 100644 src/nlohmann/detail/input/binary_reader.hpp create mode 100644 src/nlohmann/detail/input/input_adapters.hpp create mode 100644 src/nlohmann/detail/input/json_sax.hpp create mode 100644 src/nlohmann/detail/input/lexer.hpp create mode 100644 src/nlohmann/detail/input/parser.hpp create mode 100644 src/nlohmann/detail/input/position_t.hpp create mode 100644 src/nlohmann/detail/iterators/internal_iterator.hpp create mode 100644 src/nlohmann/detail/iterators/iter_impl.hpp create mode 100644 src/nlohmann/detail/iterators/iteration_proxy.hpp create mode 100644 src/nlohmann/detail/iterators/iterator_traits.hpp create mode 100644 src/nlohmann/detail/iterators/json_reverse_iterator.hpp create mode 100644 src/nlohmann/detail/iterators/primitive_iterator.hpp create mode 100644 src/nlohmann/detail/json_pointer.hpp create mode 100644 src/nlohmann/detail/json_ref.hpp create mode 100644 src/nlohmann/detail/macro_scope.hpp create mode 100644 src/nlohmann/detail/macro_unscope.hpp create mode 100644 src/nlohmann/detail/meta/call_std/begin.hpp create mode 100644 src/nlohmann/detail/meta/call_std/end.hpp create mode 100644 src/nlohmann/detail/meta/cpp_future.hpp create mode 100644 src/nlohmann/detail/meta/detected.hpp create mode 100644 src/nlohmann/detail/meta/identity_tag.hpp create mode 100644 src/nlohmann/detail/meta/is_sax.hpp create mode 100644 src/nlohmann/detail/meta/type_traits.hpp create mode 100644 src/nlohmann/detail/meta/void_t.hpp create mode 100644 src/nlohmann/detail/output/binary_writer.hpp create mode 100644 src/nlohmann/detail/output/output_adapters.hpp create mode 100644 src/nlohmann/detail/output/serializer.hpp create mode 100644 src/nlohmann/detail/string_escape.hpp create mode 100644 src/nlohmann/detail/value_t.hpp create mode 100644 src/nlohmann/json.hpp create mode 100644 src/nlohmann/json_fwd.hpp create mode 100644 src/nlohmann/ordered_map.hpp create mode 100644 src/nlohmann/thirdparty/hedley/hedley.hpp create mode 100644 src/nlohmann/thirdparty/hedley/hedley_undef.hpp diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index 0ab558453b8..84be9c12e5c 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -95,6 +95,10 @@ add_library(libslic3r STATIC Format/3mf.hpp Format/AMF.cpp Format/AMF.hpp + Format/BBConfig.cpp + Format/BBConfig.hpp + Format/bbs_3mf.hpp + Format/bbs_3mf.cpp Format/OBJ.cpp Format/OBJ.hpp Format/objparser.cpp diff --git a/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp index ea0d1216448..234b44324bd 100644 --- a/src/libslic3r/Config.cpp +++ b/src/libslic3r/Config.cpp @@ -114,7 +114,7 @@ std::string escape_strings_cstyle(const std::vector &strs) bool should_quote = strs.size() == 1 && str.empty(); for (size_t i = 0; i < str.size(); ++ i) { char c = str[i]; - if (c == ' ' || c == ';' || c == '\t' || c == '\\' || c == '"' || c == '\r' || c == '\n') { + if (c == ' ' || c == ';' || c == ',' || c == '\t' || c == '\\' || c == '"' || c == '\r' || c == '\n') { should_quote = true; break; } @@ -212,7 +212,7 @@ bool unescape_strings_cstyle(const std::string &str, std::vector &o } else { for (; i < str.size(); ++ i) { c = str[i]; - if (c == ';') + if (c == ';' || c == ',') break; buf.push_back(c); } @@ -229,7 +229,7 @@ bool unescape_strings_cstyle(const std::string &str, std::vector &o return true; c = str[i]; } - if (c != ';') + if (c != ';' && c != ',') return false; if (++ i == str.size()) { // Emit one additional empty string. diff --git a/src/libslic3r/ExtrusionEntityCollection.hpp b/src/libslic3r/ExtrusionEntityCollection.hpp index 247c702b182..9f7c8226499 100644 --- a/src/libslic3r/ExtrusionEntityCollection.hpp +++ b/src/libslic3r/ExtrusionEntityCollection.hpp @@ -152,8 +152,8 @@ class ExtrusionEntityCollection : public ExtrusionEntity throw Slic3r::RuntimeError("Calling length() on a ExtrusionEntityCollection"); return 0.; } - virtual void visit(ExtrusionVisitor &visitor) { visitor.use(*this); }; - virtual void visit(ExtrusionVisitorConst &visitor) const { visitor.use(*this); }; + virtual void visit(ExtrusionVisitor &visitor) override { visitor.use(*this); }; + virtual void visit(ExtrusionVisitorConst &visitor) const override{ visitor.use(*this); }; }; //// visitors ///// diff --git a/src/libslic3r/Format/3mf.cpp b/src/libslic3r/Format/3mf.cpp index d827cdab641..4bc4335d393 100644 --- a/src/libslic3r/Format/3mf.cpp +++ b/src/libslic3r/Format/3mf.cpp @@ -9,11 +9,11 @@ #include "../PrintConfig.hpp" #include "../Semver.hpp" #include "../Time.hpp" +#include "BBConfig.hpp" #include "../I18N.hpp" #include "3mf.hpp" - #include #include @@ -37,6 +37,8 @@ namespace pt = boost::property_tree; #include +#include "bbs_3mf.hpp" + // Slightly faster than sprintf("%.9g"), but there is an issue with the karma floating point formatter, // https://github.com/boostorg/spirit/pull/586 // where the exported string is one digit shorter than it should be to guarantee lossless round trip. @@ -53,6 +55,7 @@ const unsigned int VERSION_3MF = 1; // Allow loading version 2 file as well. const unsigned int VERSION_3MF_COMPATIBLE = 2; const char* SLIC3RPE_3MF_VERSION = "slic3rpe:Version3mf"; // definition of the metadata name saved into .model file +const char* BB_3MF_VERSION = "BambuStudio:3mfVersion"; // definition of the metadata name saved into .model file // Painting gizmos data version numbers // 0 : 3MF files saved by older PrusaSlicer or the painting gizmo wasn't used. No version definition in them. @@ -71,16 +74,24 @@ const std::string MODEL_FILE = "3D/3dmodel.model"; // << this is the only format const std::string CONTENT_TYPES_FILE = "[Content_Types].xml"; const std::string RELATIONSHIPS_FILE = "_rels/.rels"; const std::string THUMBNAIL_FILE = "Metadata/thumbnail.png"; -const std::string SLIC3R_PRINT_CONFIG_FILE = "Metadata/Slic3r.config"; -const std::string SLIC3R_MODEL_CONFIG_FILE = "Metadata/Slic3r_model.config"; -const std::string SLIC3R_LAYER_CONFIG_RANGES_FILE = "Metadata/Slic3r_layer_config_ranges.xml"; -const std::string SUPER_PRINT_CONFIG_FILE = "Metadata/SuperSlicer.config"; -const std::string SUPER_MODEL_CONFIG_FILE = "Metadata/SuperSlicer_model.config"; -const std::string SUPER_LAYER_CONFIG_RANGES_FILE = "Metadata/SuperSlicer_layer_config_ranges.xml"; -const std::string PRUSA_PRINT_CONFIG_FILE = "Metadata/Slic3r_PE.config"; -const std::string PRUSA_MODEL_CONFIG_FILE = "Metadata/Slic3r_PE_model.config"; -const std::string PRUSA_LAYER_CONFIG_RANGES_FILE = "Metadata/Prusa_Slicer_layer_config_ranges.xml"; + +const std::string SLIC3R_PRINT_CONFIG_FILE = "Metadata/Slic3r.config"; // gcode-style +const std::string SUPER_PRINT_CONFIG_FILE = "Metadata/SuperSlicer.config"; // gcode-style +const std::string PRUSA_PRINT_CONFIG_FILE = "Metadata/Slic3r_PE.config"; // gcode-style +const std::string BBS_PROJECT_CONFIG_FILE = "Metadata/project_settings.config"; // json + +const std::string SLIC3R_MODEL_CONFIG_FILE = "Metadata/Slic3r_model.config"; // xml +const std::string SUPER_MODEL_CONFIG_FILE = "Metadata/SuperSlicer_model.config"; // xml +const std::string PRUSA_MODEL_CONFIG_FILE = "Metadata/Slic3r_PE_model.config"; // xml +const std::string BBS_MODEL_CONFIG_FILE = "Metadata/model_settings.config"; // xml + +const std::string SLIC3R_LAYER_CONFIG_RANGES_FILE = "Metadata/Slic3r_layer_config_ranges.xml"; // xml +const std::string SUPER_LAYER_CONFIG_RANGES_FILE = "Metadata/SuperSlicer_layer_config_ranges.xml"; // xml +const std::string PRUSA_LAYER_CONFIG_RANGES_FILE = "Metadata/Prusa_Slicer_layer_config_ranges.xml"; // xml +const std::string BBS_LAYER_CONFIG_RANGES_FILE = "Metadata/layer_config_ranges.xml"; // xml + const std::string LAYER_HEIGHTS_PROFILE_FILE = "Metadata/Slic3r_PE_layer_heights_profile.txt"; + const std::string SLA_SUPPORT_POINTS_FILE = "Metadata/Slic3r_PE_sla_support_points.txt"; const std::string SLA_DRAIN_HOLES_FILE = "Metadata/Slic3r_PE_sla_drain_holes.txt"; const std::string CUSTOM_GCODE_PER_PRINT_Z_FILE = "Metadata/Prusa_Slicer_custom_gcode_per_print_z.xml"; @@ -169,6 +180,12 @@ class version_error : public Slic3r::FileIOError version_error(const char* what_arg) : Slic3r::FileIOError(what_arg) {} }; +class bambu_version_error : public version_error +{ +public: + bambu_version_error(const std::string& what_arg) : version_error(what_arg) {} + bambu_version_error(const char* what_arg) : version_error(what_arg) {} +}; const char* get_attribute_value_charptr(const char** attributes, unsigned int attributes_size, const char* attribute_key) { if ((attributes == nullptr) || (attributes_size == 0) || (attributes_size % 2 != 0) || (attribute_key == nullptr)) @@ -659,6 +676,34 @@ namespace Slic3r { add_error("Archive does not contain a valid model"); return false; } + } catch (const bambu_version_error &e) { + // ensure the zip archive is closed and rethrow the exception + close_zip_reader(&archive); + // First, Try to parse it with bambu parser + PlateDataPtrs plates; + std::vector project_presets; + bool is_bbl_3mf = true; + Semver file_version; + std::function Import3mfProgressFn = + [](int import_stage, int current, int total, bool &cancel) { + BOOST_LOG_TRIVIAL(info) << "import BBS 3mf: stage " << import_stage + << ", current: " << current << " / " << total; + }; + bool result = load_bbs_3mf(filename.c_str(), + &config, + &config_substitutions, + &model, + &plates, + &project_presets, + &is_bbl_3mf, + &file_version, + Import3mfProgressFn, + LoadStrategy::Default | LoadStrategy::LoadModel | LoadStrategy::LoadConfig, + /*BBLProject *project = nullptr,*/ + 0); + if(!result) + throw Slic3r::FileIOError(e.what()); + return true; } catch (const std::exception& e) { @@ -769,16 +814,19 @@ namespace Slic3r { return true; }; bool use_prusa_config = false; - if (!print_config_parsed) + if (!print_config_parsed) { if (!read_from_other_storage(SUPER_PRINT_CONFIG_FILE, SUPER_MODEL_CONFIG_FILE, SUPER_LAYER_CONFIG_RANGES_FILE, false)) return false; - if (!print_config_parsed) + } + if (!print_config_parsed) { if (!read_from_other_storage(PRUSA_PRINT_CONFIG_FILE, PRUSA_MODEL_CONFIG_FILE, PRUSA_LAYER_CONFIG_RANGES_FILE, true)) return false; - else { + if (print_config_parsed) { + //succeed to read prusa use_prusa_config = true; - config.convert_from_prusa(); + config.convert_from_prusa(true); } + } close_zip_reader(&archive); @@ -853,7 +901,7 @@ namespace Slic3r { IdToSlaSupportPointsMap::iterator obj_sla_support_points = m_sla_support_points.find(object.second + 1); if (obj_sla_support_points != m_sla_support_points.end() && !obj_sla_support_points->second.empty()) { model_object->sla_support_points = std::move(obj_sla_support_points->second); - model_object->sla_points_status = sla::PointsStatus::UserModified; + model_object->sla_points_status = sla::PointsStatus::UserModified; } IdToSlaDrainHolesMap::iterator obj_drain_holes = m_sla_drain_holes.find(object.second + 1); @@ -861,7 +909,7 @@ namespace Slic3r { model_object->sla_drain_holes = std::move(obj_drain_holes->second); } - ObjectMetadata::VolumeMetadataList volumes; + ObjectMetadata::VolumeMetadataList volumes; ObjectMetadata::VolumeMetadataList* volumes_ptr = nullptr; IdToMetadataMap::iterator obj_metadata = m_objects_metadata.find(object.first); @@ -870,11 +918,11 @@ namespace Slic3r { // apply object's name and config data for (const Metadata& metadata : obj_metadata->second.metadata) { - if (metadata.key == "name") - model_object->name = metadata.value; - else - model_object->config.set_deserialize(metadata.key, metadata.value, config_substitutions); - } + if (metadata.key == "name") + model_object->name = metadata.value; + else + model_object->config.set_deserialize(metadata.key, metadata.value, config_substitutions); + } // select object's detected volumes volumes_ptr = &obj_metadata->second.volumes; @@ -893,11 +941,11 @@ namespace Slic3r { return false; if (use_prusa_config) { - model_object->config.convert_from_prusa(config); + model_object->config.convert_from_prusa(config, false); for (ModelVolume* volume : model_object->volumes) - volume->config.convert_from_prusa(config); + volume->config.convert_from_prusa(config, false); for (auto entry : model_object->layer_config_ranges) - entry.second.convert_from_prusa(config); + entry.second.convert_from_prusa(config, false); } } @@ -969,10 +1017,15 @@ namespace Slic3r { return n; }, &data, 0); } + catch (const bambu_version_error& e) + { + // rethrow the exception + throw e; + } catch (const version_error& e) { // rethrow the exception - throw Slic3r::FileIOError(e.what()); + throw e; } catch (std::exception& e) { @@ -1830,6 +1883,8 @@ namespace Slic3r { const std::string msg = (boost::format("The selected 3mf file has been saved with a newer version of %1% and is not compatible.") % std::string(SLIC3R_APP_NAME)).str(); throw version_error(msg); } + } else if (m_curr_metadata_name == BB_3MF_VERSION) { + throw bambu_version_error("bambu 3mf"); } else if (m_curr_metadata_name == "Application") { // Generator application of the 3MF. // SLIC3R_APP_KEY - SLIC3R_VERSION diff --git a/src/libslic3r/Format/BBConfig.cpp b/src/libslic3r/Format/BBConfig.cpp new file mode 100644 index 00000000000..9944b185f3a --- /dev/null +++ b/src/libslic3r/Format/BBConfig.cpp @@ -0,0 +1,747 @@ +#include "BBConfig.hpp" + +#include "../Model.hpp" +#include "../PrintConfig.hpp" +#include "../Config.hpp" + +#include "../../nlohmann/json.hpp" + +#include +#include + +namespace Slic3r { + +namespace BBConfiguration { +// BBS: add json support +#define BBL_JSON_KEY_VERSION "version" +#define BBL_JSON_KEY_IS_CUSTOM "is_custom_defined" +#define BBL_JSON_KEY_URL "url" +#define BBL_JSON_KEY_NAME "name" +#define BBL_JSON_KEY_DESCRIPTION "description" +#define BBL_JSON_KEY_FORCE_UPDATE "force_update" +#define BBL_JSON_KEY_MACHINE_MODEL_LIST "machine_model_list" +#define BBL_JSON_KEY_PROCESS_LIST "process_list" +#define BBL_JSON_KEY_SUB_PATH "sub_path" +#define BBL_JSON_KEY_FILAMENT_LIST "filament_list" +#define BBL_JSON_KEY_MACHINE_LIST "machine_list" +#define BBL_JSON_KEY_TYPE "type" +#define BBL_JSON_KEY_FROM "from" +#define BBL_JSON_KEY_SETTING_ID "setting_id" +#define BBL_JSON_KEY_BASE_ID "base_id" +#define BBL_JSON_KEY_USER_ID "user_id" +#define BBL_JSON_KEY_FILAMENT_ID "filament_id" +#define BBL_JSON_KEY_UPDATE_TIME "updated_time" +#define BBL_JSON_KEY_INHERITS "inherits" +#define BBL_JSON_KEY_INSTANTIATION "instantiation" +#define BBL_JSON_KEY_NOZZLE_DIAMETER "nozzle_diameter" +#define BBL_JSON_KEY_PRINTER_TECH "machine_tech" +#define BBL_JSON_KEY_FAMILY "family" +#define BBL_JSON_KEY_BED_MODEL "bed_model" +#define BBL_JSON_KEY_BED_TEXTURE "bed_texture" +#define BBL_JSON_KEY_HOTEND_MODEL "hotend_model" +#define BBL_JSON_KEY_DEFAULT_MATERIALS "default_materials" +#define BBL_JSON_KEY_MODEL_ID "model_id" + +std::map key_translation_map; +std::map> value_translation_map; +// std::map&, std::map>&, const std::string&, const std::string&)>> transform_complicated; std::map&, std::map>&, const +// std::string&, const std::vector&)>> transform_vector_complicated; +bool is_init = false; + +void init() +{ + //list from https://github.com/theophile/SuperSlicer_to_Orca_scripts/blob/main/superslicer_to_orca.pl + // print + key_translation_map["enable_arc_fitting"] = "arc_fitting"; + key_translation_map["bottom_shell_layers"] = "bottom_solid_layers"; + key_translation_map["bottom_shell_thickness"] = "bottom_solid_min_thickness"; + //key_translation_map["bridge_acceleration"] = "bridge_acceleration"; + //key_translation_map["bridge_angle"] = "bridge_angle"; + key_translation_map["bridge_density"] = "bridge_overlap_min"; + key_translation_map["bridge_no_support"] = "dont_support_bridges"; + key_translation_map["internal_bridge_speed"] = "bridge_speed_internal"; + //key_translation_map["brim_ears"] = "brim_ears"; + //key_translation_map["brim_ears_detection_length"] = "brim_ears_detection_length"; + //key_translation_map["brim_ears_max_angle"] = "brim_ears_max_angle"; + key_translation_map["brim_object_gap"] = "brim_separation"; + key_translation_map["brim_width"] = "brim_width"; + key_translation_map["skirt_speed"] = "brim_speed"; + //key_translation_map["compatible_printers_condition"] = "compatible_printers_condition"; + //key_translation_map["compatible_printers"] = "compatible_printers"; + //key_translation_map["default_acceleration"] = "default_acceleration"; + key_translation_map["detect_overhang_wall"] = "overhangs"; // will go to handle_legacy + key_translation_map["detect_thin_wall"] = "thin_walls"; + //key_translation_map["draft_shield"] = "draft_shield"; + //key_translation_map["elefant_foot_compensation"] // will go to handle_legacy = "first_layer_size_compensation"; + key_translation_map["enable_overhang_speed"] = "enable_dynamic_overhang_speeds"; //2.7 + //key_translation_map["extra_perimeters_on_overhangs"] = "extra_perimeters_on_overhangs"; + key_translation_map["enable_prime_tower"] = "wipe_tower"; + //key_translation_map["wipe_speed"] = "wipe_speed"; + //key_translation_map["ensure_vertical_shell_thickness"] = "ensure_vertical_shell_thickness"; + key_translation_map["filter_out_gap_fill"] = "gap_fill_min_length"; + //key_translation_map["gcode_comments"] = "gcode_comments"; + //key_translation_map["gcode_label_objects"] = "gcode_label_objects"; + //key_translation_map["infill_anchor_max"] = "infill_anchor_max"; + //key_translation_map["infill_anchor"] = "infill_anchor"; + key_translation_map["infill_direction"] = "fill_angle"; + key_translation_map["infill_wall_overlap"] = "infill_overlap"; + //key_translation_map["inherits"] = "inherits"; + key_translation_map["line_width"] = "extrusion_width"; + key_translation_map["print_flow_ratio"] = "extrusion_multiplier"; + key_translation_map["initial_layer_acceleration"] = "first_layer_acceleration"; + key_translation_map["initial_layer_line_width"] = "first_layer_extrusion_width"; + key_translation_map["initial_layer_print_height"] = "first_layer_height"; + //key_translation_map["interface_shells"] = "interface_shells"; + key_translation_map["inner_wall_line_width"] = "perimeter_extrusion_width"; + //key_translation_map["seam_gap"] = "seam_gap"; + key_translation_map["internal_solid_infill_acceleration"] = "solid_infill_acceleration"; + key_translation_map["internal_solid_infill_line_width"] = "solid_infill_extrusion_width"; + key_translation_map["ironing_flow"] = "ironing_flowrate"; + key_translation_map["ironing_spacing"] = "ironing_spacing"; + key_translation_map["ironing_speed"] = "ironing_speed"; + //key_translation_map["layer_height"] = "layer_height"; + key_translation_map["max_travel_detour_distance"] = "avoid_crossing_perimeters_max_detour"; + //key_translation_map["min_bead_width"] = "min_bead_width"; + //key_translation_map["min_feature_size"] = "min_feature_size"; + key_translation_map["minimum_sparse_infill_area"] = "solid_infill_below_area"; + key_translation_map["only_one_wall_first_layer"] = "only_one_perimeter_first_layer"; + key_translation_map["only_one_wall_top"] = "only_one_perimeter_top"; + //key_translation_map["ooze_prevention"] = "ooze_prevention"; + key_translation_map["overhang_reverse"] = "overhangs_reverse"; + key_translation_map["overhang_reverse_threshold"] = "overhangs_reverse_threshold"; + key_translation_map["inner_wall_acceleration"] = "perimeter_acceleration"; + key_translation_map["outer_wall_acceleration"] = "external_perimeter_acceleration"; + key_translation_map["outer_wall_line_width"] = "external_perimeter_extrusion_width"; + //key_translation_map["post_process"] = "post_process"; + key_translation_map["prime_tower_brim_width"] = "wipe_tower_brim_width"; + key_translation_map["prime_tower_width"] = "wipe_tower_width"; + //key_translation_map["raft_contact_distance"] = "raft_contact_distance"; + //key_translation_map["raft_expansion"] = "raft_expansion"; + //key_translation_map["raft_first_layer_density"] = "raft_first_layer_density"; + //key_translation_map["raft_first_layer_expansion"] = "raft_first_layer_expansion"; + //key_translation_map["raft_layers"] = "raft_layers"; + key_translation_map["reduce_crossing_wall"] = "avoid_crossing_perimeters"; + key_translation_map["reduce_infill_retraction"] = "only_retract_when_crossing_perimeters"; + //key_translation_map["resolution"] = "resolution"; + //key_translation_map["seam_position"] = "seam_position"; + //key_translation_map["skirt_distance"] = "skirt_distance"; + //key_translation_map["skirt_height"] = "skirt_height"; + key_translation_map["skirt_loops"] = "skirts"; + //key_translation_map["slice_closing_radius"] = "slice_closing_radius"; + //key_translation_map["slicing_mode"] = "slicing_mode"; + key_translation_map["small_perimeter_threshold"] = "small_perimeter_min_length"; + key_translation_map["sparse_infill_acceleration"] = "infill_acceleration"; + key_translation_map["sparse_infill_density"] = "fill_density"; + key_translation_map["sparse_infill_line_width"] = "infill_extrusion_width"; + //key_translation_map["staggered_inner_seams"] = "staggered_inner_seams"; + //key_translation_map["standby_temperature_delta"] = "standby_temperature_delta"; + //key_translation_map["hole_to_polyhole"] = "hole_to_polyhole"; + //key_translation_map["hole_to_polyhole_threshold"] = "hole_to_polyhole_threshold"; + //key_translation_map["hole_to_polyhole_twisted"] = "hole_to_polyhole_twisted"; + key_translation_map["enable_support"] = "support_material"; + key_translation_map["support_angle"] = "support_material_angle"; + key_translation_map["enforce_support_layers"] = "support_material_enforce_layers"; + key_translation_map["support_base_pattern_spacing"] = "support_material_spacing"; + key_translation_map["support_top_z_distance"] = "support_material_contact_distance"; + key_translation_map["support_bottom_z_distance"] = "support_material_bottom_contact_distance"; + key_translation_map["support_interface_bottom_layers"] = "support_material_bottom_interface_layers"; + key_translation_map["support_interface_loop_pattern"] = "support_material_interface_contact_loops"; + key_translation_map["support_interface_spacing"] = "support_material_interface_spacing"; + key_translation_map["support_interface_top_layers"] = "support_material_interface_layers"; + key_translation_map["support_line_width"] = "support_material_extrusion_width"; + key_translation_map["support_on_build_plate_only"] = "support_material_buildplate_only"; + key_translation_map["support_threshold_angle"] = "support_material_threshold"; + //key_translation_map["thick_bridges"] = "thick_bridges"; //handled by from_prusa + key_translation_map["top_shell_layers"] = "top_solid_layers"; + key_translation_map["top_shell_thickness"] = "top_solid_min_thickness"; + key_translation_map["top_surface_acceleration"] = "top_solid_infill_acceleration"; + key_translation_map["top_surface_line_width"] = "top_infill_extrusion_width"; + //key_translation_map["min_width_top_surface"] = "min_width_top_surface"; + //key_translation_map["travel_acceleration"] = "travel_acceleration"; + //key_translation_map["travel_speed_z"] = "travel_speed_z"; + //key_translation_map["travel_speed"] = "travel_speed"; + key_translation_map["tree_support_branch_angle"] = "support_tree_angle"; //2.7 + key_translation_map["tree_support_angle_slow"] = "support_tree_angle_slow"; + key_translation_map["tree_support_branch_diameter"] = "support_tree_branch_diameter"; + key_translation_map["tree_support_branch_diameter_angle"] = "support_tree_branch_diameter_angle"; + key_translation_map["tree_support_branch_diameter_double_wall"] = "support_tree_branch_diameter_double_wall"; + key_translation_map["tree_support_tip_diameter"] = "support_tree_tip_diameter"; + key_translation_map["tree_support_top_rate"] = "support_tree_top_rate"; + //key_translation_map["wall_distribution_count"] = "wall_distribution_count"; + key_translation_map["wall_generator"] = "perimeter_generator"; + key_translation_map["wall_loops"] = "perimeters"; + //key_translation_map["wall_transition_angle"] = "wall_transition_angle"; + //key_translation_map["wall_transition_filter_deviation"] = "wall_transition_filter_deviation"; + //key_translation_map["wall_transition_length"] = "wall_transition_length"; + //key_translation_map["wipe_tower_no_sparse_layers"] = "wipe_tower_no_sparse_layers"; + key_translation_map["xy_contour_compensation"] = "xy_size_compensation"; + //key_translation_map["z_offset"] = "z_offset"; + key_translation_map["xy_hole_compensation"] = "xy_inner_size_compensation"; + key_translation_map["independent_support_layer_height"] = "support_material_layer_height"; + key_translation_map["sparse_infill_pattern"] = "fill_pattern"; + key_translation_map["filename_format"] = "output_filename_format"; + key_translation_map["support_base_pattern"] = "support_material_pattern"; + key_translation_map["support_interface_pattern"] = "support_material_interface_pattern"; + key_translation_map["top_surface_pattern"] = "top_fill_pattern"; + key_translation_map["support_object_xy_distance"] = "support_material_xy_spacing"; + key_translation_map["fuzzy_skin_point_distance"] = "fuzzy_skin_point_dist"; + //key_translation_map["fuzzy_skin_thickness"] = "fuzzy_skin_thickness"; + //key_translation_map["fuzzy_skin"] = "fuzzy_skin"; + key_translation_map["bottom_surface_pattern"] = "bottom_fill_pattern"; + key_translation_map["bridge_flow"] = "bridge_flow_ratio"; + key_translation_map["top_solid_infill_flow_ratio"] = "fill_top_flow_ratio"; + key_translation_map["bottom_solid_infill_flow_ratio"] = "initial_layer_flow_ratio"; + key_translation_map["infill_combination"] = "infill_every_layers"; + key_translation_map["print_sequence"] = "complete_objects"; + //key_translation_map["brim_type"] = "brim_type"; //handled by from_prusa + //key_translation_map["notes"] = "notes"; + //key_translation_map["support_material_style"] = "support_material_style"; + //key_translation_map["ironing"] = "ironing"; + //key_translation_map["ironing_type"] = "ironing_type"; + //key_translation_map["ironing_angle"] = "ironing_angle"; + //key_translation_map["external_perimeters_first"] = "external_perimeters_first"; + //key_translation_map["infill_first"] = "infill_first"; + + //speeds + key_translation_map["inner_wall_speed"] = "perimeter_speed"; + key_translation_map["outer_wall_speed"] = "external_perimeter_speed"; + //key_translation_map["small_perimeter_speed"] = "small_perimeter_speed"; + key_translation_map["internal_solid_infill_speed"] = "solid_infill_speed"; + key_translation_map["sparse_infill_speed"] = "infill_speed"; + key_translation_map["top_surface_speed"] = "top_solid_infill_speed"; + key_translation_map["gap_infill_speed"] = "gap_fill_speed"; + key_translation_map["support_speed"] = "support_material_speed"; + key_translation_map["support_interface_speed"] = "support_material_interface_speed"; + //key_translation_map["bridge_speed"] = "bridge_speed"; + key_translation_map["initial_layer_speed"] = "first_layer_speed"; + key_translation_map["initial_layer_infill_speed"] = "first_layer_infill_speed"; + +// 'filament' = > + key_translation_map["hot_plate_temp"] = "bed_temperature"; + key_translation_map["cool_plate_temp"] = "bed_temperature"; + key_translation_map["eng_plate_temp"] = "bed_temperature"; + key_translation_map["textured_plate_temp"] = "bed_temperature"; + key_translation_map["overhang_fan_speed"] = "bridge_fan_speed"; + //key_translation_map["chamber_temperature"] = "chamber_temperature"; + key_translation_map["close_fan_the_first_x_layers"] = "disable_fan_first_layers"; + key_translation_map["filament_end_gcode"] = "end_filament_gcode"; + key_translation_map["overhang_fan_threshold"] = "external_perimeter_fan_speed"; + key_translation_map["filament_flow_ratio"] = "extrusion_multiplier"; + key_translation_map["reduce_fan_stop_start_freq"] = "fan_always_on"; + key_translation_map["fan_cooling_layer_time"] = "fan_below_layer_time"; + //key_translation_map["fan_speedup_time"] = "fan_speedup_time"; + //key_translation_map["fan_speedup_overhangs"] = "fan_speedup_overhangs"; + //key_translation_map["fan_kickstart"] = "fan_kickstart"; + key_translation_map["default_filament_colour"] = "filament_colour"; + //key_translation_map["filament_cost"] = "filament_cost"; + //key_translation_map["filament_density"] = "filament_density"; + key_translation_map["filament_deretraction_speed"] = "filament_deretract_speed"; + //key_translation_map["filament_diameter"] = "filament_diameter"; + //key_translation_map["filament_max_volumetric_speed"] = "filament_max_volumetric_speed"; + //key_translation_map["filament_notes"] = "filament_notes"; + key_translation_map["filament_retraction_minimum_travel"] = "filament_retract_before_travel"; + //key_translation_map["filament_retract_before_wipe"] = "filament_retract_before_wipe"; + key_translation_map["filament_retract_when_changing_layer"] = "filament_retract_layer_change"; + key_translation_map["filament_retraction_length"] = "filament_retract_length"; + key_translation_map["filament_z_hop"] = "filament_retract_lift"; + //key_translation_map["filament_retract_lift_above"] = "filament_retract_lift_above"; + //key_translation_map["filament_retract_lift_below"] = "filament_retract_lift_below"; + //key_translation_map["filament_retract_restart_extra"] = "filament_retract_restart_extra"; + key_translation_map["filament_retraction_speed"] = "filament_retract_speed"; + //key_translation_map["filament_shrink"] = "filament_shrink"; + //key_translation_map["filament_soluble"] = "filament_soluble"; + //key_translation_map["filament_type"] = "filament_type"; + //key_translation_map["filament_wipe"] = "filament_wipe"; + key_translation_map["hot_plate_temp_initial_layer"] = "first_layer_bed_temperature"; + key_translation_map["cool_plate_temp_initial_layer"] = "first_layer_bed_temperature"; + key_translation_map["eng_plate_temp_initial_layer"] = "first_layer_bed_temperature"; + key_translation_map["textured_plate_temp_initial_layer"] = "first_layer_bed_temperature"; + key_translation_map["nozzle_temperature_initial_layer"] = "first_layer_temperature"; + //key_translation_map["full_fan_speed_layer"] = "full_fan_speed_layer"; + //key_translation_map["inherits"] = "inherits"; + key_translation_map["fan_max_speed"] = "max_fan_speed"; + key_translation_map["fan_min_speed"] = "default_fan_speed"; + key_translation_map["slow_down_min_speed"] = "min_print_speed"; + key_translation_map["slow_down_layer_time"] = "slowdown_below_layer_time"; + key_translation_map["filament_start_gcode"] = "start_filament_gcode"; + //key_translation_map["support_material_interface_fan_speed"] = "support_material_interface_fan_speed"; + key_translation_map["nozzle_temperature"] = "temperature"; + //key_translation_map["compatible_printers_condition"] = "compatible_printers_condition"; + //key_translation_map["compatible_printers"] = "compatible_printers"; + //key_translation_map["compatible_prints_condition"] = "compatible_prints_condition"; + //key_translation_map["compatible_prints"] = "compatible_prints"; + //key_translation_map["filament_vendor"] = "filament_vendor"; + //key_translation_map["filament_minimal_purge_on_wipe_tower"] = "filament_minimal_purge_on_wipe_tower"; + +// 'printer' = > + //key_translation_map["bed_custom_model"] = "bed_custom_model"; + //key_translation_map["bed_custom_texture"] = "bed_custom_texture"; + key_translation_map["before_layer_change_gcode"] = "before_layer_gcode"; + key_translation_map["change_filament_gcode"] = "toolchange_gcode"; + //key_translation_map["default_filament_profile"] = "default_filament_profile"; + //key_translation_map["default_print_profile"] = "default_print_profile"; + key_translation_map["deretraction_speed"] = "deretract_speed"; + //key_translation_map["gcode_flavor"] = "gcode_flavor"; + //key_translation_map["inherits"] = "inherits"; + key_translation_map["layer_change_gcode"] = "layer_gcode"; + key_translation_map["change_extrusion_role_gcode"] = "feature_gcode"; + key_translation_map["machine_end_gcode"] = "end_gcode"; + key_translation_map["machine_max_acceleration_e"] = "machine_max_acceleration_e"; + key_translation_map["machine_max_acceleration_extruding"] = "machine_max_acceleration_extruding"; + key_translation_map["machine_max_acceleration_retracting"] = "machine_max_acceleration_retracting"; + key_translation_map["machine_max_acceleration_travel"] = "machine_max_acceleration_travel"; + key_translation_map["machine_max_acceleration_x"] = "machine_max_acceleration_x"; + key_translation_map["machine_max_acceleration_y"] = "machine_max_acceleration_y"; + key_translation_map["machine_max_acceleration_z"] = "machine_max_acceleration_z"; + key_translation_map["machine_max_speed_e"] = "machine_max_feedrate_e"; + key_translation_map["machine_max_speed_x"] = "machine_max_feedrate_x"; + key_translation_map["machine_max_speed_y"] = "machine_max_feedrate_y"; + key_translation_map["machine_max_speed_z"] = "machine_max_feedrate_z"; + key_translation_map["machine_max_jerk_e"] = "machine_max_jerk_e"; + key_translation_map["machine_max_jerk_x"] = "machine_max_jerk_x"; + key_translation_map["machine_max_jerk_y"] = "machine_max_jerk_y"; + key_translation_map["machine_max_jerk_z"] = "machine_max_jerk_z"; + key_translation_map["machine_min_extruding_rate"] = "machine_min_extruding_rate"; + key_translation_map["machine_min_travel_rate"] = "machine_min_travel_rate"; + key_translation_map["machine_pause_gcode"] = "pause_print_gcode"; + key_translation_map["machine_start_gcode"] = "start_gcode"; + key_translation_map["max_layer_height"] = "max_layer_height"; + key_translation_map["min_layer_height"] = "min_layer_height"; + key_translation_map["nozzle_diameter"] = "nozzle_diameter"; + key_translation_map["print_host"] = "print_host"; + key_translation_map["printer_notes"] = "printer_notes"; + key_translation_map["printable_area"] = "bed_shape"; + key_translation_map["printable_height"] = "max_print_height"; + key_translation_map["printer_technology"] = "printer_technology"; + key_translation_map["printer_variant"] = "printer_variant"; + key_translation_map["retract_before_wipe"] = "retract_before_wipe"; + key_translation_map["retract_length_toolchange"] = "retract_length_toolchange"; + key_translation_map["retract_restart_extra_toolchange"] = "retract_restart_extra_toolchange"; + key_translation_map["retract_restart_extra"] = "retract_restart_extra"; + key_translation_map["retract_when_changing_layer"] = "retract_layer_change"; + key_translation_map["retraction_length"] = "retract_length"; + key_translation_map["z_hop"] = "retract_lift"; + key_translation_map["retract_lift_enforce"] = "retract_lift_top"; + key_translation_map["retraction_minimum_travel"] = "retract_before_travel"; + key_translation_map["retraction_speed"] = "retract_speed"; + key_translation_map["silent_mode"] = "silent_mode"; + key_translation_map["single_extruder_multi_material"] = "single_extruder_multi_material"; + key_translation_map["thumbnails"] = "thumbnails"; //TOCHECK + key_translation_map["thumbnails_format"] = "thumbnails_format"; + key_translation_map["template_custom_gcode"] = "template_custom_gcode"; + key_translation_map["use_firmware_retraction"] = "use_firmware_retraction"; + key_translation_map["use_relative_e_distances"] = "use_relative_e_distances"; + key_translation_map["wipe"] = "wipe"; + +// 'physical_printer' => { + // host_type => 1, + // print_host => 1, + // printer_technology => 1, + // printhost_apikey => 1, + // printhost_authorization_type => 1, + // printhost_cafile => 1, + // printhost_password => 1, + // printhost_port => 1, + // printhost_ssl_ignore_revoke => 1, + // printhost_user => 1, + //} + +//#Printer parameters that may be comma - separated lists +//my %multivalue_params = ( +//key_translation_map["single"]="max_layer_height"; +//key_translation_map["single"]="min_layer_height"; +//key_translation_map["single"]="deretract_speed"; +//key_translation_map["single"]="default_filament_profile"; +//key_translation_map["array"]="machine_max_acceleration_e"; +//key_translation_map["array"]="machine_max_acceleration_extruding"; +//key_translation_map["array"]="machine_max_acceleration_extruding"; +//key_translation_map["array"]="machine_max_acceleration_retracting"; +//key_translation_map["array"]="machine_max_acceleration_travel"; +//key_translation_map["array"]="machine_max_acceleration_x"; +//key_translation_map["array"]="machine_max_acceleration_y"; +//key_translation_map["array"]="machine_max_acceleration_z"; +//key_translation_map["array"]="machine_max_feedrate_e"; +//key_translation_map["array"]="machine_max_feedrate_x"; +//key_translation_map["array"]="machine_max_feedrate_y"; +//key_translation_map["array"]="machine_max_feedrate_z"; +//key_translation_map["array"]="machine_max_jerk_e"; +//key_translation_map["array"]="machine_max_jerk_x"; +//key_translation_map["array"]="machine_max_jerk_y"; +//key_translation_map["array"]="machine_max_jerk_z"; +//key_translation_map["array"]="machine_min_extruding_rate"; +//key_translation_map["array"]="machine_min_travel_rate"; +//key_translation_map["single"]="nozzle_diameter"; +//key_translation_map["array"]="bed_shape"; +//key_translation_map["single"]="retract_before_wipe"; +//key_translation_map["single"]="retract_length_toolchange"; +//key_translation_map["single"]="retract_restart_extra_toolchange"; +//key_translation_map["single"]="retract_restart_extra"; +//key_translation_map["single"]="retract_layer_change"; +//key_translation_map["single"]="retract_length"; +//key_translation_map["single"]="retract_lift"; +//key_translation_map["single"]="retract_before_travel"; +//key_translation_map["single"]="retract_speed"; +//key_translation_map["array"]="thumbnails"; +//key_translation_map["single"]="extruder_offset"; +//key_translation_map["single"]="retract_lift_above"; +//key_translation_map["single"]="retract_lift_below"; +//key_translation_map["single"]="wipe"; + //patern + value_translation_map["fill_pattern"]["monotonicline"] = "monotoniclines"; //2.7 + value_translation_map["fill_pattern"]["zig-zag"] = "rectilinear"; + value_translation_map["fill_pattern"]["tri-hexagon"] = "stars"; + //value_translation_map["fill_pattern"]["rectilinear-grid"] = "???"; //can't convert let the config_substitutions emit the warning + value_translation_map["top_fill_pattern"] = value_translation_map["fill_pattern"]; + value_translation_map["bottom_fill_pattern"] = value_translation_map["fill_pattern"]; + value_translation_map["solid_fill_pattern"] = value_translation_map["fill_pattern"]; + value_translation_map["brim_ears_pattern"] = value_translation_map["fill_pattern"]; + value_translation_map["bridge_fill_pattern"] = value_translation_map["fill_pattern"]; + value_translation_map["support_material_interface_pattern"] = value_translation_map["fill_pattern"]; + //specific + value_translation_map["fill_pattern"]["default"] = "gyroid"; + value_translation_map["top_fill_pattern"]["default"] = "monotonic"; + value_translation_map["bottom_fill_pattern"]["default"] = "monotonic"; + value_translation_map["solid_fill_pattern"]["default"] = "rectilinear"; + value_translation_map["brim_ears_pattern"]["default"] = "concentric"; + value_translation_map["bridge_fill_pattern"]["default"] = "rectilinear"; + value_translation_map["support_material_interface_pattern"]["default"] = "auto"; + //value_translation_map["support_material_interface_pattern"]["rectilinear_interlaced"] = "???"; //can't convert let the config_substitutions emit the warning + + //others + value_translation_map["support_material_pattern"]["default"] = "rectilinear"; + //value_translation_map["support_material_pattern"]["lightning"] = ""; //can't convert, let the config_substitutions emit the warning + //value_translation_map["support_material_pattern"]["hollow"] = ""; //can't convert, let the config_substitutions emit the warning + value_translation_map["seam_position"]["back"] = "rear"; + value_translation_map["filament_type"]["TPU"] = "FLEX"; + value_translation_map["support_material_style"]["normal"] = "grid"; + value_translation_map["support_material_style"]["default"] = "grid"; + value_translation_map["support_material_style"]["tree"] = "snug"; // organic in 2.7 + value_translation_map["support_material_style"]["organic"] = "snug"; // organic in 2.7 + value_translation_map["retract_lift_top"]["Bottom Only"] = "Not on top"; + value_translation_map["retract_lift_top"]["Top Only"] = "Only on top"; + value_translation_map["thumbnails_format"]["BTT_TFT"] = "BIQU"; + value_translation_map["complete_objects"]["by layer"] = "0"; + value_translation_map["complete_objects"]["by object"] = "1"; +} + +void complicated_convert(t_config_option_key &opt_key, std::string &value, const std::map &input, std::map &output) +{ + + if ("ironing_type" == opt_key && "no ironing" == value) { + value = "top"; + output["ironing"] = "0"; + assert(input.find("ironing") == input.end() || input.find("ironing")->second == "0"); + } +} + +//settings from orca that I can't convert +// ironing_pattern + + +} // BBconfiguration + +bool read_json_file_bambu(const std_path &temp_file, + DynamicPrintConfig & config, + ConfigSubstitutionContext & config_substitutions, + bool with_phony) +{ + using namespace BBConfiguration; + if (!is_init) // not thread-safe + init(); + + std::map key_values; + std::map> key_vector_values; + // read entries into map + + nlohmann::json j; + std::list different_settings_append; + std::string new_support_style; + std::string is_infill_first; + std::string get_wall_sequence; + bool is_project_settings = false; + + CNumericLocalesSetter locales_setter; + + try { + std_ifstream ifs(GET_STD_PATH_FOR_IFSTREAM(temp_file)); + ifs >> j; + ifs.close(); + + const ConfigDef *config_def = config.def(); + if (config_def == nullptr) { + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": no config defs!"; + return false; + } + // parse the json elements + for (auto it = j.begin(); it != j.end(); it++) { + if (boost::iequals(it.key(), BBL_JSON_KEY_VERSION)) { + key_values.emplace(BBL_JSON_KEY_VERSION, it.value()); + } else if (boost::iequals(it.key(), BBL_JSON_KEY_IS_CUSTOM)) { + key_values.emplace(BBL_JSON_KEY_IS_CUSTOM, it.value()); + } else if (boost::iequals(it.key(), BBL_JSON_KEY_NAME)) { + key_values.emplace(BBL_JSON_KEY_NAME, it.value()); + if (it.value() == "project_settings") + is_project_settings = true; + } else if (boost::iequals(it.key(), BBL_JSON_KEY_URL)) { + key_values.emplace(BBL_JSON_KEY_URL, it.value()); + } else if (boost::iequals(it.key(), BBL_JSON_KEY_TYPE)) { + key_values.emplace(BBL_JSON_KEY_TYPE, it.value()); + } else if (boost::iequals(it.key(), BBL_JSON_KEY_SETTING_ID)) { + key_values.emplace(BBL_JSON_KEY_SETTING_ID, it.value()); + } else if (boost::iequals(it.key(), BBL_JSON_KEY_FILAMENT_ID)) { + key_values.emplace(BBL_JSON_KEY_FILAMENT_ID, it.value()); + } else if (boost::iequals(it.key(), BBL_JSON_KEY_FROM)) { + key_values.emplace(BBL_JSON_KEY_FROM, it.value()); + } else if (boost::iequals(it.key(), BBL_JSON_KEY_INSTANTIATION)) { + key_values.emplace(BBL_JSON_KEY_INSTANTIATION, it.value()); + } else if (/*!load_inherits_to_config &&*/ boost::iequals(it.key(), BBL_JSON_KEY_INHERITS)) { + key_values.emplace(BBL_JSON_KEY_INHERITS, it.value()); + } else if (it.value().is_string()) { + key_values.emplace(it.key(), it.value()); + } else if (it.value().is_array()) { + // std::string value_str; + // bool first = true, use_comma = true; + for (auto iter = it.value().begin(); iter != it.value().end(); iter++) { + if (iter.value().is_string()) { + key_vector_values[it.key()].push_back(iter.value()); + } else { + // should not happen + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": parse " << temp_file + << " error, invalid json array for " << it.key(); + break; + } + } + } else { + // should not happen + BOOST_LOG_TRIVIAL(error) + << __FUNCTION__ << ": parse " << temp_file << " error, invalid json type for " << it.key(); + } + } + } catch (const std_ifstream::failure &err) { + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": parse " << temp_file + << " got a ifstream error, reason = " << err.what(); + } catch (nlohmann::detail::parse_error &err) { + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": parse " << temp_file + << " got a nlohmann::detail::parse_error, reason = " << err.what(); + } catch (std::exception &err) { + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": parse " << temp_file + << " got a generic exception, reason = " << err.what(); + } + + // transform entries into susi config + std::map good_key_values; + std::map> good_key_vector_values; + for (auto &entry : key_values) { + t_config_option_key opt_key = entry.first; + std::string value = entry.second; + if (auto it = key_translation_map.find(opt_key); it != key_translation_map.end()) + opt_key = it->second; + PrintConfigDef::handle_legacy(opt_key, value); + + complicated_convert(opt_key, value, key_values, good_key_values); + + if (auto it_key = value_translation_map.find(opt_key); it_key != value_translation_map.end()) + if (auto it_val = it_key->second.find(value); it_val != it_key->second.end()) + value = it_val->second; + + if (!opt_key.empty()) + good_key_values[opt_key] = value; + } + + for (auto &entry : key_vector_values) { + t_config_option_key key = entry.first; + std::vector values = entry.second; + if (auto it = key_translation_map.find(key); it != key_translation_map.end()) + key = it->second; + std::string check_val = values[0]; + PrintConfigDef::handle_legacy(key, values[0]); + assert(check_val == values[0]); // can't change a vec value, sadly. + if (!key.empty()) + good_key_vector_values[key] = values; + } + + // check how to serialize the array (string use ';', others ',') + const ConfigDef *config_def = config.def(); + for (auto &entry : good_key_vector_values) { + assert(!entry.first.empty()); + t_config_option_key opt_key = entry.first; + std::string value_str; + bool valid = true, first = true, use_comma = true; + // bool test2 = (it.key() == std::string("filament_end_gcode")); + const ConfigOptionDef *optdef = config_def->get(entry.first); + if (optdef == nullptr) { + // If we didn't find an option, look for any other option having this as an alias. + for (const auto &opt : config_def->options) { + for (const t_config_option_key &opt_key2 : opt.second.aliases) { + if (opt_key2 == opt_key) { + opt_key = opt.first; + optdef = &opt.second; + break; + } + } + if (optdef != nullptr) + break; + } + } + + if (optdef && optdef->type == coStrings) { + use_comma = false; + } + for (const std::string &val : entry.second) { + if (!first) { + if (use_comma) + value_str += ","; + else + value_str += ";"; + } else + first = false; + + if (use_comma) + value_str += val; + else { + value_str += "\""; + value_str += escape_string_cstyle(val); + value_str += "\""; + } + } + if (valid) + good_key_values[opt_key] = value_str; + } + + // push these into config + for (auto &entry : good_key_values) { + config.set_deserialize(entry.first, entry.second, config_substitutions); + } + + // final transform + config.convert_from_prusa(with_phony); + + return true; +} + + +std::map read_ini_file_bambu(const std_path &temp_file) +{ + boost::property_tree::ptree tree; + std_ifstream ifs(GET_STD_PATH_FOR_IFSTREAM(temp_file)); + boost::property_tree::read_ini(ifs, tree); + //return this->load(tree, compatibility_rule); + + std::map key_values; + for (const boost::property_tree::ptree::value_type &v : tree) { + key_values[v.first] = v.second.get_value(); + } + return key_values; +} + +bool convert_settings_from_bambu(std::map bambu_settings_serialized, + DynamicPrintConfig & print_config, + ConfigSubstitutionContext & config_substitutions, + bool with_phony) +{ + using namespace BBConfiguration; + if (!is_init) // not thread-safe + init(); + + // transform entries into susi config + std::map good_key_values; + for (auto &entry : bambu_settings_serialized) { + t_config_option_key opt_key = entry.first; + std::string value = entry.second; + if (auto it = key_translation_map.find(opt_key); it != key_translation_map.end()) + opt_key = it->second; + PrintConfigDef::handle_legacy(opt_key, value); + + complicated_convert(opt_key, value, bambu_settings_serialized, good_key_values); + + if (auto it_key = value_translation_map.find(opt_key); it_key != value_translation_map.end()) + if (auto it_val = it_key->second.find(value); it_val != it_key->second.end()) + value = it_val->second; + + if (!opt_key.empty()) + good_key_values[opt_key] = value; + } + + + // push these into config + for (auto &entry : good_key_values) { + print_config.set_deserialize(entry.first, entry.second, config_substitutions); + } + + // final transform + print_config.convert_from_prusa(with_phony); + return true; +} + +bool convert_settings_from_bambu(std::map bambu_settings_serialized, + const DynamicPrintConfig & print_config, + ModelConfigObject & object_config, + ConfigSubstitutionContext & config_substitutions, + bool with_phony) +{ + using namespace BBConfiguration; + if (!is_init) // not thread-safe + init(); + + // transform entries into susi config + std::map good_key_values; + for (auto &entry : bambu_settings_serialized) { + t_config_option_key opt_key = entry.first; + std::string value = entry.second; + if (auto it = key_translation_map.find(opt_key); it != key_translation_map.end()) + opt_key = it->second; + PrintConfigDef::handle_legacy(opt_key, value); + + complicated_convert(opt_key, value, bambu_settings_serialized, good_key_values); + + if (auto it_key = value_translation_map.find(opt_key); it_key != value_translation_map.end()) + if (auto it_val = it_key->second.find(value); it_val != it_key->second.end()) + value = it_val->second; + + if (!opt_key.empty()) + good_key_values[opt_key] = value; + } + + + // push these into config + for (auto &entry : good_key_values) { + object_config.set_deserialize(entry.first, entry.second, config_substitutions); + } + + // final transform + object_config.convert_from_prusa(print_config, with_phony); + return true; +} + +std_path get_temp_file(Model &model) +{ +#ifdef __APPLE__ + std_path temp_path = boost::filesystem::temp_directory_path(); +#else + std_path temp_path = std::filesystem::temp_directory_path(); +#endif + std::string model_name = ""; + for (const ModelObject *model_object : model.objects) { + model_name = model_object->get_export_filename(); + if (!model_name.empty()) { + break; + } + } + return temp_path / (model_name + std::string("_temp_conf.config")); +} + +std_path extract_file(Model &model, mz_zip_archive &archive, const mz_zip_archive_file_stat &stat) +{ + std_path temp_path = get_temp_file(model); + mz_bool res = mz_zip_reader_extract_to_file(&archive, stat.m_file_index, temp_path.string().c_str(), 0); + if (res == 0) { + //add_error("Error while extract project config file to temp file"); + return ""; + } + return temp_path; +} + +} // namespace Slic3r + diff --git a/src/libslic3r/Format/BBConfig.hpp b/src/libslic3r/Format/BBConfig.hpp new file mode 100644 index 00000000000..a4b27675c7d --- /dev/null +++ b/src/libslic3r/Format/BBConfig.hpp @@ -0,0 +1,45 @@ +#ifndef slic3r_Format_BBconfig_hpp_ +#define slic3r_Format_BBconfig_hpp_ + +#include "miniz_extension.hpp" + +#ifdef __APPLE__ + #include + typedef boost::filesystem::path std_path; + typedef boost::nowide::ifstream std_ifstream; + #define GET_STD_PATH_FOR_IFSTREAM(PARAM) PARAM.string() +#else + #include + typedef std::filesystem::path std_path; + typedef std::ifstream std_ifstream; + #define GET_STD_PATH_FOR_IFSTREAM(PARAM) PARAM +#endif + +namespace Slic3r { +class DynamicPrintConfig; +class Model; +class ModelConfigObject; + +bool read_json_file_bambu(const std_path &temp_file, + DynamicPrintConfig & config, + ConfigSubstitutionContext & config_substitutions, + bool with_phony); + +std::map read_ini_file_bambu(const std_path &temp_file); + +bool convert_settings_from_bambu(std::map bambu_settings_serialized, + DynamicPrintConfig & print_config, + ConfigSubstitutionContext & config_substitutions, + bool with_phony); + +bool convert_settings_from_bambu(std::map bambu_settings_serialized, + const DynamicPrintConfig & print_config, + ModelConfigObject & object_config, + ConfigSubstitutionContext & config_substitutions, + bool with_phony); + +std_path get_temp_file(Model &model); +std_path extract_file(Model &model, mz_zip_archive &archive, const mz_zip_archive_file_stat &stat); +} // namespace Slic3r + +#endif /* slic3r_Format_BBconfig_hpp_ */ diff --git a/src/libslic3r/Format/bbs_3mf.cpp b/src/libslic3r/Format/bbs_3mf.cpp new file mode 100644 index 00000000000..d12342bfa0a --- /dev/null +++ b/src/libslic3r/Format/bbs_3mf.cpp @@ -0,0 +1,8829 @@ +///|/ Copyright (c) Prusa Research 2018 - 2023 Oleksandra Iushchenko @YuSanka, David Kocík @kocikdav, Enrico Turri @enricoturri1966, Lukáš MatÄ›na @lukasmatena, Lukáš Hejl @hejllukas, Filip Sykala @Jony01, VojtÄ›ch Bubník @bubnikv, Tomáš Mészáros @tamasmeszaros +///|/ Copyright (c) 2020 Henner Zeller +///|/ +///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher +///|/ +#include "bbs_3mf.hpp" + +#include "../libslic3r.h" +#include "../Exception.hpp" +#include "../Model.hpp" +#include "../Preset.hpp" +#include "../Utils.hpp" +#include "../LocalesUtils.hpp" +#include "../GCode.hpp" +#include "../GCode/GCodeProcessor.hpp" +#include "../GCode/ThumbnailData.hpp" +#include "../Geometry.hpp" +#include "../Semver.hpp" +#include "../Time.hpp" +#include "BBConfig.hpp" + +#include "../I18N.hpp" + + +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +//#include + +namespace pt = boost::property_tree; + +#include + +#include +#include +#include "miniz_extension.hpp" +#include "nlohmann/json.hpp" + +//#include "TextConfiguration.hpp" //Susi_not_impl +//#include "EmbossShape.hpp" //Susi_not_impl +//#include "ExPolygonSerialize.hpp" //Susi_not_impl + +//#include "NSVGUtils.hpp" + +#include + +// Slightly faster than sprintf("%.9g"), but there is an issue with the karma floating point formatter, +// https://github.com/boostorg/spirit/pull/586 +// where the exported string is one digit shorter than it should be to guarantee lossless round trip. +// The code is left here for the ocasion boost guys improve. +#define EXPORT_3MF_USE_SPIRIT_KARMA_FP 0 + +#define WRITE_ZIP_LANGUAGE_ENCODING 1 + +// @see https://commons.apache.org/proper/commons-compress/apidocs/src-html/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.html +struct ZipUnicodePathExtraField +{ + static std::string encode(std::string const& u8path, std::string const& path) { + std::string extra; + if (u8path != path) { + // 0x7075 - for Unicode filenames + extra.push_back('\x75'); + extra.push_back('\x70'); + boost::uint16_t len = 5 + u8path.length(); + extra.push_back((char)(len & 0xff)); + extra.push_back((char)(len >> 8)); + auto crc = mz_crc32(0, (unsigned char *) path.c_str(), path.length()); + extra.push_back('\x01'); // version 1 + extra.append((char *)&crc, (char *)&crc + 4); // Little Endian + extra.append(u8path); + } + return extra; + } + static std::string decode(std::string const& extra, std::string const& path = {}) { + char const * p = extra.data(); + char const * e = p + extra.length(); + while (p + 4 < e) { + boost::uint16_t len = ((boost::uint16_t)p[2]) | ((boost::uint16_t)p[3] << 8); + if (p[0] == '\x75' && p[1] == '\x70' && len >= 5 && p + 4 + len < e && p[4] == '\x01') { + return std::string(p + 9, p + 4 + len); + } + else { + p += 4 + len; + } + } + return Slic3r::decode_path(path.c_str()); + } +}; + + + +//FIXME this has potentially O(n^2) time complexity! +std::string xml_escape(std::string text, bool is_marked/* = false*/) +{ + std::string::size_type pos = 0; + for (;;) + { + pos = text.find_first_of("\"\'&<>", pos); + if (pos == std::string::npos) + break; + + std::string replacement; + switch (text[pos]) + { + case '\"': replacement = """; break; + case '\'': replacement = "'"; break; + case '&': replacement = "&"; break; + case '<': replacement = is_marked ? "<" :"<"; break; + case '>': replacement = is_marked ? ">" :">"; break; + default: break; + } + + text.replace(pos, 1, replacement); + pos += replacement.size(); + } + + return text; +} + +// Definition of escape symbols https://www.w3.org/TR/REC-xml/#AVNormalize +// During the read of xml attribute normalization of white spaces is applied +// Soo for not lose white space character it is escaped before store +std::string xml_escape_double_quotes_attribute_value(std::string text) +{ + std::string::size_type pos = 0; + for (;;) { + pos = text.find_first_of("\"&<\r\n\t", pos); + if (pos == std::string::npos) break; + + std::string replacement; + switch (text[pos]) { + case '\"': replacement = """; break; + case '&': replacement = "&"; break; + case '<': replacement = "<"; break; + case '\r': replacement = " "; break; + case '\n': replacement = " "; break; + case '\t': replacement = " "; break; + default: break; + } + + text.replace(pos, 1, replacement); + pos += replacement.size(); + } + + return text; +} + +std::string xml_unescape(std::string s) +{ + std::string ret; + std::string::size_type i = 0; + std::string::size_type pos = 0; + while (i < s.size()) { + std::string rep; + if (s[i] == '&') { + if (s.substr(i, 4) == "<") { + ret += s.substr(pos, i - pos) + "<"; + i += 4; + pos = i; + } + else if (s.substr(i, 4) == ">") { + ret += s.substr(pos, i - pos) + ">"; + i += 4; + pos = i; + } + else if (s.substr(i, 5) == "&") { + ret += s.substr(pos, i - pos) + "&"; + i += 5; + pos = i; + } + else { + ++i; + } + } + else { + ++i; + } + } + + ret += s.substr(pos); + return ret; +} + +void save_string_file(const std_path& p, const std::string& str) +{ + boost::nowide::ofstream file; + file.exceptions(std::ios_base::failbit | std::ios_base::badbit); + file.open(p.generic_string(), std::ios_base::binary); + file.write(str.c_str(), str.size()); +} + +#define BBL_JSON_KEY_VERSION "version" + +// VERSION NUMBERS +// 0 : .3mf, files saved by older slic3r or other applications. No version definition in them. +// 1 : Introduction of 3mf versioning. No other change in data saved into 3mf files. +// 2 : Volumes' matrices and source data added to Metadata/Slic3r_PE_model.config file, meshes transformed back to their coordinate system on loading. +// WARNING !! -> the version number has been rolled back to 1 +// the next change should use 3 +const unsigned int VERSION_BBS_3MF = 1; +// Allow loading version 2 file as well. +const unsigned int VERSION_BBS_3MF_COMPATIBLE = 2; +const char* BBS_3MF_VERSION1 = "bamboo_slicer:Version3mf"; // definition of the metadata name saved into .model file +const char* BBS_3MF_VERSION = "BambuStudio:3mfVersion"; //compatible with prusa currently +// Painting gizmos data version numbers +// 0 : initial version of fdm, seam, mm +const unsigned int FDM_SUPPORTS_PAINTING_VERSION = 0; +const unsigned int SEAM_PAINTING_VERSION = 0; +const unsigned int MM_PAINTING_VERSION = 0; + +const std::string BBS_FDM_SUPPORTS_PAINTING_VERSION = "BambuStudio:FdmSupportsPaintingVersion"; +const std::string BBS_SEAM_PAINTING_VERSION = "BambuStudio:SeamPaintingVersion"; +const std::string BBS_MM_PAINTING_VERSION = "BambuStudio:MmPaintingVersion"; +const std::string BBL_MODEL_ID_TAG = "model_id"; +const std::string BBL_MODEL_NAME_TAG = "Title"; +const std::string BBL_ORIGIN_TAG = "Origin"; +const std::string BBL_DESIGNER_TAG = "Designer"; +const std::string BBL_DESIGNER_USER_ID_TAG = "DesignerUserId"; +const std::string BBL_DESIGNER_COVER_FILE_TAG = "DesignerCover"; +const std::string BBL_DESCRIPTION_TAG = "Description"; +const std::string BBL_COPYRIGHT_TAG = "CopyRight"; +const std::string BBL_COPYRIGHT_NORMATIVE_TAG = "Copyright"; +const std::string BBL_LICENSE_TAG = "License"; +const std::string BBL_REGION_TAG = "Region"; +const std::string BBL_MODIFICATION_TAG = "ModificationDate"; +const std::string BBL_CREATION_DATE_TAG = "CreationDate"; +const std::string BBL_APPLICATION_TAG = "Application"; + +const std::string BBL_PROFILE_TITLE_TAG = "ProfileTitle"; +const std::string BBL_PROFILE_COVER_TAG = "ProfileCover"; +const std::string BBL_PROFILE_DESCRIPTION_TAG = "ProfileDescription"; +const std::string BBL_PROFILE_USER_ID_TAG = "ProfileUserId"; +const std::string BBL_PROFILE_USER_NAME_TAG = "ProfileUserName"; + +const std::string MODEL_FOLDER = "3D/"; +const std::string MODEL_EXTENSION = ".model"; +const std::string MODEL_FILE = "3D/3dmodel.model"; // << this is the only format of the string which works with CURA +const std::string MODEL_RELS_FILE = "3D/_rels/3dmodel.model.rels"; +//BBS: add metadata_folder +const std::string METADATA_DIR = "Metadata/"; +const std::string ACCESOR_DIR = "accesories/"; +const std::string GCODE_EXTENSION = ".gcode"; +const std::string THUMBNAIL_EXTENSION = ".png"; +const std::string CALIBRATION_INFO_EXTENSION = ".json"; +const std::string CONTENT_TYPES_FILE = "[Content_Types].xml"; +const std::string RELATIONSHIPS_FILE = "_rels/.rels"; +const std::string THUMBNAIL_FILE = "Metadata/plate_1.png"; +const std::string THUMBNAIL_FOR_PRINTER_FILE = "Metadata/bbl_thumbnail.png"; +const std::string PRINTER_THUMBNAIL_SMALL_FILE = "/Auxiliaries/.thumbnails/thumbnail_small.png"; +const std::string PRINTER_THUMBNAIL_MIDDLE_FILE = "/Auxiliaries/.thumbnails/thumbnail_middle.png"; +const std::string _3MF_COVER_FILE = "/Auxiliaries/.thumbnails/thumbnail_3mf.png"; +//const std::string PRINT_CONFIG_FILE = "Metadata/Slic3r_PE.config"; +//const std::string MODEL_CONFIG_FILE = "Metadata/Slic3r_PE_model.config"; +const std::string BBS_PRINT_CONFIG_FILE = "Metadata/print_profile.config"; +const std::string BBS_PROJECT_CONFIG_FILE = "Metadata/project_settings.config"; +const std::string BBS_MODEL_CONFIG_FILE = "Metadata/model_settings.config"; +const std::string BBS_MODEL_CONFIG_RELS_FILE = "Metadata/_rels/model_settings.config.rels"; +const std::string SLICE_INFO_CONFIG_FILE = "Metadata/slice_info.config"; +const std::string BBS_LAYER_HEIGHTS_PROFILE_FILE = "Metadata/layer_heights_profile.txt"; +const std::string LAYER_CONFIG_RANGES_FILE = "Metadata/layer_config_ranges.xml"; +/*const std::string SLA_SUPPORT_POINTS_FILE = "Metadata/Slic3r_PE_sla_support_points.txt"; +const std::string SLA_DRAIN_HOLES_FILE = "Metadata/Slic3r_PE_sla_drain_holes.txt";*/ +const std::string CUSTOM_GCODE_PER_PRINT_Z_FILE = "Metadata/custom_gcode_per_layer.xml"; +const std::string AUXILIARY_DIR = "Auxiliaries/"; +const std::string PROJECT_EMBEDDED_PRINT_PRESETS_FILE = "Metadata/print_setting_"; +const std::string PROJECT_EMBEDDED_SLICE_PRESETS_FILE = "Metadata/process_settings_"; +const std::string PROJECT_EMBEDDED_FILAMENT_PRESETS_FILE = "Metadata/filament_settings_"; +const std::string PROJECT_EMBEDDED_PRINTER_PRESETS_FILE = "Metadata/machine_settings_"; +const std::string CUT_INFORMATION_FILE = "Metadata/cut_information.xml"; + +const unsigned int AUXILIARY_STR_LEN = 12; +const unsigned int METADATA_STR_LEN = 9; + + +static constexpr const char* MODEL_TAG = "model"; +static constexpr const char* RESOURCES_TAG = "resources"; +static constexpr const char* COLOR_GROUP_TAG = "m:colorgroup"; +static constexpr const char* COLOR_TAG = "m:color"; +static constexpr const char* OBJECT_TAG = "object"; +static constexpr const char* MESH_TAG = "mesh"; +static constexpr const char* MESH_STAT_TAG = "mesh_stat"; +static constexpr const char* VERTICES_TAG = "vertices"; +static constexpr const char* VERTEX_TAG = "vertex"; +static constexpr const char* TRIANGLES_TAG = "triangles"; +static constexpr const char* TRIANGLE_TAG = "triangle"; +static constexpr const char* COMPONENTS_TAG = "components"; +static constexpr const char* COMPONENT_TAG = "component"; +static constexpr const char* BUILD_TAG = "build"; +static constexpr const char* ITEM_TAG = "item"; +static constexpr const char* METADATA_TAG = "metadata"; +static constexpr const char* FILAMENT_TAG = "filament"; +static constexpr const char* SLICE_WARNING_TAG = "warning"; +static constexpr const char* WARNING_MSG_TAG = "msg"; +static constexpr const char *FILAMENT_ID_TAG = "id"; +static constexpr const char* FILAMENT_TYPE_TAG = "type"; +static constexpr const char *FILAMENT_COLOR_TAG = "color"; +static constexpr const char *FILAMENT_USED_M_TAG = "used_m"; +static constexpr const char *FILAMENT_USED_G_TAG = "used_g"; + + +static constexpr const char* CONFIG_TAG = "config"; +static constexpr const char* VOLUME_TAG = "volume"; +static constexpr const char* PART_TAG = "part"; +static constexpr const char* PLATE_TAG = "plate"; +static constexpr const char* INSTANCE_TAG = "model_instance"; +//BBS +static constexpr const char* ASSEMBLE_TAG = "assemble"; +static constexpr const char* ASSEMBLE_ITEM_TAG = "assemble_item"; +static constexpr const char* SLICE_HEADER_TAG = "header"; +static constexpr const char* SLICE_HEADER_ITEM_TAG = "header_item"; + +// Deprecated: text_info +static constexpr const char* TEXT_INFO_TAG = "text_info"; +static constexpr const char* TEXT_ATTR = "text"; +static constexpr const char* FONT_NAME_ATTR = "font_name"; +static constexpr const char* FONT_INDEX_ATTR = "font_index"; +static constexpr const char* FONT_SIZE_ATTR = "font_size"; +static constexpr const char* THICKNESS_ATTR = "thickness"; +static constexpr const char* EMBEDED_DEPTH_ATTR = "embeded_depth"; +static constexpr const char* ROTATE_ANGLE_ATTR = "rotate_angle"; +static constexpr const char* TEXT_GAP_ATTR = "text_gap"; +static constexpr const char* BOLD_ATTR = "bold"; +static constexpr const char* ITALIC_ATTR = "italic"; +static constexpr const char* SURFACE_TEXT_ATTR = "surface_text"; +static constexpr const char* KEEP_HORIZONTAL_ATTR = "keep_horizontal"; +static constexpr const char* HIT_MESH_ATTR = "hit_mesh"; +static constexpr const char* HIT_POSITION_ATTR = "hit_position"; +static constexpr const char* HIT_NORMAL_ATTR = "hit_normal"; + +// BBS: encrypt +static constexpr const char* RELATIONSHIP_TAG = "Relationship"; +static constexpr const char* PID_ATTR = "pid"; +static constexpr const char* PUUID_ATTR = "p:UUID"; +static constexpr const char* PUUID_LOWER_ATTR = "p:uuid"; +static constexpr const char* PPATH_ATTR = "p:path"; +static constexpr const char *OBJECT_UUID_SUFFIX = "-61cb-4c03-9d28-80fed5dfa1dc"; +static constexpr const char *OBJECT_UUID_SUFFIX2 = "-71cb-4c03-9d28-80fed5dfa1dc"; +static constexpr const char *SUB_OBJECT_UUID_SUFFIX = "-81cb-4c03-9d28-80fed5dfa1dc"; +static constexpr const char *COMPONENT_UUID_SUFFIX = "-b206-40ff-9872-83e8017abed1"; +static constexpr const char* BUILD_UUID = "2c7c17d8-22b5-4d84-8835-1976022ea369"; +static constexpr const char* BUILD_UUID_SUFFIX = "-b1ec-4553-aec9-835e5b724bb4"; +static constexpr const char* TARGET_ATTR = "Target"; +static constexpr const char* RELS_TYPE_ATTR = "Type"; + +static constexpr const char* UNIT_ATTR = "unit"; +static constexpr const char* NAME_ATTR = "name"; +static constexpr const char* COLOR_ATTR = "color"; +static constexpr const char* TYPE_ATTR = "type"; +static constexpr const char* ID_ATTR = "id"; +static constexpr const char* X_ATTR = "x"; +static constexpr const char* Y_ATTR = "y"; +static constexpr const char* Z_ATTR = "z"; +static constexpr const char* V1_ATTR = "v1"; +static constexpr const char* V2_ATTR = "v2"; +static constexpr const char* V3_ATTR = "v3"; +static constexpr const char* OBJECTID_ATTR = "objectid"; +static constexpr const char* TRANSFORM_ATTR = "transform"; +// BBS +static constexpr const char* OFFSET_ATTR = "offset"; +static constexpr const char* PRINTABLE_ATTR = "printable"; +static constexpr const char* INSTANCESCOUNT_ATTR = "instances_count"; +static constexpr const char* CUSTOM_SUPPORTS_ATTR = "paint_supports"; +static constexpr const char* CUSTOM_SEAM_ATTR = "paint_seam"; +static constexpr const char* MMU_SEGMENTATION_ATTR = "paint_color"; +// BBS +static constexpr const char* FACE_PROPERTY_ATTR = "face_property"; + +static constexpr const char* KEY_ATTR = "key"; +static constexpr const char* VALUE_ATTR = "value"; +static constexpr const char* FIRST_TRIANGLE_ID_ATTR = "firstid"; +static constexpr const char* LAST_TRIANGLE_ID_ATTR = "lastid"; +static constexpr const char* SUBTYPE_ATTR = "subtype"; +static constexpr const char* LOCK_ATTR = "locked"; +static constexpr const char* BED_TYPE_ATTR = "bed_type"; +static constexpr const char* PRINT_SEQUENCE_ATTR = "print_sequence"; +static constexpr const char* FIRST_LAYER_PRINT_SEQUENCE_ATTR = "first_layer_print_sequence"; +static constexpr const char* SPIRAL_VASE_MODE = "spiral_mode"; +static constexpr const char* GCODE_FILE_ATTR = "gcode_file"; +static constexpr const char* THUMBNAIL_FILE_ATTR = "thumbnail_file"; +static constexpr const char* TOP_FILE_ATTR = "top_file"; +static constexpr const char* PICK_FILE_ATTR = "pick_file"; +static constexpr const char* PATTERN_FILE_ATTR = "pattern_file"; +static constexpr const char* PATTERN_BBOX_FILE_ATTR = "pattern_bbox_file"; +static constexpr const char* OBJECT_ID_ATTR = "object_id"; +static constexpr const char* INSTANCEID_ATTR = "instance_id"; +static constexpr const char* IDENTIFYID_ATTR = "identify_id"; +static constexpr const char* PLATERID_ATTR = "plater_id"; +static constexpr const char* PLATER_NAME_ATTR = "plater_name"; +static constexpr const char* PLATE_IDX_ATTR = "index"; +static constexpr const char* PRINTER_MODEL_ID_ATTR = "printer_model_id"; +static constexpr const char* NOZZLE_DIAMETERS_ATTR = "nozzle_diameters"; +static constexpr const char* SLICE_PREDICTION_ATTR = "prediction"; +static constexpr const char* SLICE_WEIGHT_ATTR = "weight"; +static constexpr const char* TIMELAPSE_TYPE_ATTR = "timelapse_type"; +static constexpr const char* TIMELAPSE_ERROR_CODE_ATTR = "timelapse_error_code"; +static constexpr const char* OUTSIDE_ATTR = "outside"; +static constexpr const char* SUPPORT_USED_ATTR = "support_used"; +static constexpr const char* LABEL_OBJECT_ENABLED_ATTR = "label_object_enabled"; +static constexpr const char* SKIPPED_ATTR = "skipped"; + +static constexpr const char* OBJECT_TYPE = "object"; +static constexpr const char* VOLUME_TYPE = "volume"; +static constexpr const char* PART_TYPE = "part"; + +static constexpr const char* NAME_KEY = "name"; +static constexpr const char* VOLUME_TYPE_KEY = "volume_type"; +static constexpr const char* PART_TYPE_KEY = "part_type"; +static constexpr const char* MATRIX_KEY = "matrix"; +static constexpr const char* SOURCE_FILE_KEY = "source_file"; +static constexpr const char* SOURCE_OBJECT_ID_KEY = "source_object_id"; +static constexpr const char* SOURCE_VOLUME_ID_KEY = "source_volume_id"; +static constexpr const char* SOURCE_OFFSET_X_KEY = "source_offset_x"; +static constexpr const char* SOURCE_OFFSET_Y_KEY = "source_offset_y"; +static constexpr const char* SOURCE_OFFSET_Z_KEY = "source_offset_z"; +static constexpr const char* SOURCE_IN_INCHES = "source_in_inches"; +static constexpr const char* SOURCE_IN_METERS = "source_in_meters"; + +static constexpr const char* MESH_SHARED_KEY = "mesh_shared"; + +static constexpr const char* MESH_STAT_EDGES_FIXED = "edges_fixed"; +static constexpr const char* MESH_STAT_DEGENERATED_FACETS = "degenerate_facets"; +static constexpr const char* MESH_STAT_FACETS_REMOVED = "facets_removed"; +static constexpr const char* MESH_STAT_FACETS_RESERVED = "facets_reversed"; +static constexpr const char* MESH_STAT_BACKWARDS_EDGES = "backwards_edges"; + +// Store / load of TextConfiguration +static constexpr const char *TEXT_TAG = "slic3rpe:text"; +static constexpr const char *TEXT_DATA_ATTR = "text"; +// TextConfiguration::EmbossStyle +static constexpr const char *STYLE_NAME_ATTR = "style_name"; +static constexpr const char *FONT_DESCRIPTOR_ATTR = "font_descriptor"; +static constexpr const char *FONT_DESCRIPTOR_TYPE_ATTR = "font_descriptor_type"; + +// TextConfiguration::FontProperty +static constexpr const char *CHAR_GAP_ATTR = "char_gap"; +static constexpr const char *LINE_GAP_ATTR = "line_gap"; +static constexpr const char *LINE_HEIGHT_ATTR = "line_height"; +static constexpr const char *BOLDNESS_ATTR = "boldness"; +static constexpr const char *SKEW_ATTR = "skew"; +static constexpr const char *PER_GLYPH_ATTR = "per_glyph"; +static constexpr const char *HORIZONTAL_ALIGN_ATTR = "horizontal"; +static constexpr const char *VERTICAL_ALIGN_ATTR = "vertical"; +static constexpr const char *COLLECTION_NUMBER_ATTR = "collection"; + +static constexpr const char *FONT_FAMILY_ATTR = "family"; +static constexpr const char *FONT_FACE_NAME_ATTR = "face_name"; +static constexpr const char *FONT_STYLE_ATTR = "style"; +static constexpr const char *FONT_WEIGHT_ATTR = "weight"; + +// Store / load of EmbossShape +static constexpr const char *SHAPE_TAG = "slic3rpe:shape"; +static constexpr const char *SHAPE_SCALE_ATTR = "scale"; +static constexpr const char *UNHEALED_ATTR = "unhealed"; +static constexpr const char *SVG_FILE_PATH_ATTR = "filepath"; +static constexpr const char *SVG_FILE_PATH_IN_3MF_ATTR = "filepath3mf"; + +// EmbossProjection +static constexpr const char *DEPTH_ATTR = "depth"; +static constexpr const char *USE_SURFACE_ATTR = "use_surface"; +// static constexpr const char *FIX_TRANSFORMATION_ATTR = "transform"; + + +const unsigned int BBS_VALID_OBJECT_TYPES_COUNT = 2; +const char* BBS_VALID_OBJECT_TYPES[] = +{ + "model", + "other" +}; + +const char* BBS_INVALID_OBJECT_TYPES[] = +{ + "solidsupport", + "support", + "surface" +}; + +template +struct hex_wrap +{ + T t; +}; + +namespace std { + template + basic_ostream<_Elem, _Traits>& operator<<(basic_ostream<_Elem, _Traits>& ostr, + const hex_wrap<_Arg>& wrap) { // insert by calling function with output stream and argument + auto of = ostr.fill('0'); + ostr << setw(sizeof(_Arg) * 2) << std::hex << wrap.t; + ostr << std::dec << setw(0); + ostr.fill(of); + return ostr; + } +} + +class version_error : public Slic3r::FileIOError +{ +public: + version_error(const std::string& what_arg) : Slic3r::FileIOError(what_arg) {} + version_error(const char* what_arg) : Slic3r::FileIOError(what_arg) {} +}; + +const char* bbs_get_attribute_value_charptr(const char** attributes, unsigned int attributes_size, const char* attribute_key) +{ + if ((attributes == nullptr) || (attributes_size == 0) || (attributes_size % 2 != 0) || (attribute_key == nullptr)) + return nullptr; + + for (unsigned int a = 0; a < attributes_size; a += 2) { + if (::strcmp(attributes[a], attribute_key) == 0) + return attributes[a + 1]; + } + + return nullptr; +} + +std::string bbs_get_attribute_value_string(const char** attributes, unsigned int attributes_size, const char* attribute_key) +{ + const char* text = bbs_get_attribute_value_charptr(attributes, attributes_size, attribute_key); + return (text != nullptr) ? text : ""; +} + +float bbs_get_attribute_value_float(const char** attributes, unsigned int attributes_size, const char* attribute_key) +{ + float value = 0.0f; + if (const char *text = bbs_get_attribute_value_charptr(attributes, attributes_size, attribute_key); text != nullptr) + fast_float::from_chars(text, text + strlen(text), value); + return value; +} + +int bbs_get_attribute_value_int(const char** attributes, unsigned int attributes_size, const char* attribute_key) +{ + int value = 0; + if (const char *text = bbs_get_attribute_value_charptr(attributes, attributes_size, attribute_key); text != nullptr) + boost::spirit::qi::parse(text, text + strlen(text), boost::spirit::qi::int_, value); + return value; +} + +bool bbs_get_attribute_value_bool(const char** attributes, unsigned int attributes_size, const char* attribute_key) +{ + const char* text = bbs_get_attribute_value_charptr(attributes, attributes_size, attribute_key); + return (text != nullptr) ? (bool)::atoi(text) : true; +} + +void add_vec3(std::stringstream &stream, const Slic3r::Vec3f &tr) +{ + for (unsigned r = 0; r < 3; ++r) { + stream << tr(r); + if (r != 2) + stream << " "; + } +} + +Slic3r::Vec3f get_vec3_from_string(const std::string &pos_str) +{ + Slic3r::Vec3f pos(0, 0, 0); + if (pos_str.empty()) + return pos; + + std::vector values; + boost::split(values, pos_str, boost::is_any_of(" "), boost::token_compress_on); + + if (values.size() != 3) + return pos; + + for (int i = 0; i < 3; ++i) + pos(i) = ::atof(values[i].c_str()); + + return pos; +} + +Slic3r::Transform3d bbs_get_transform_from_3mf_specs_string(const std::string& mat_str) +{ + // check: https://3mf.io/3d-manufacturing-format/ or https://github.com/3MFConsortium/spec_core/blob/master/3MF%20Core%20Specification.md + // to see how matrices are stored inside 3mf according to specifications + Slic3r::Transform3d ret = Slic3r::Transform3d::Identity(); + + if (mat_str.empty()) + // empty string means default identity matrix + return ret; + + std::vector mat_elements_str; + boost::split(mat_elements_str, mat_str, boost::is_any_of(" "), boost::token_compress_on); + + unsigned int size = (unsigned int)mat_elements_str.size(); + if (size != 12) + // invalid data, return identity matrix + return ret; + + unsigned int i = 0; + // matrices are stored into 3mf files as 4x3 + // we need to transpose them + for (unsigned int c = 0; c < 4; ++c) { + for (unsigned int r = 0; r < 3; ++r) { + ret(r, c) = ::atof(mat_elements_str[i++].c_str()); + } + } + return ret; +} + +Slic3r::Vec3d bbs_get_offset_from_3mf_specs_string(const std::string& vec_str) +{ + Slic3r::Vec3d ofs2ass(0, 0, 0); + + if (vec_str.empty()) + // empty string means default zero offset + return ofs2ass; + + std::vector vec_elements_str; + boost::split(vec_elements_str, vec_str, boost::is_any_of(" "), boost::token_compress_on); + + unsigned int size = (unsigned int)vec_elements_str.size(); + if (size != 3) + // invalid data, return zero offset + return ofs2ass; + + for (unsigned int i = 0; i < 3; i++) { + ofs2ass(i) = ::atof(vec_elements_str[i].c_str()); + } + + return ofs2ass; +} + +float bbs_get_unit_factor(const std::string& unit) +{ + const char* text = unit.c_str(); + + if (::strcmp(text, "micron") == 0) + return 0.001f; + else if (::strcmp(text, "centimeter") == 0) + return 10.0f; + else if (::strcmp(text, "inch") == 0) + return 25.4f; + else if (::strcmp(text, "foot") == 0) + return 304.8f; + else if (::strcmp(text, "meter") == 0) + return 1000.0f; + else + // default "millimeters" (see specification) + return 1.0f; +} + +bool bbs_is_valid_object_type(const std::string& type) +{ + // if the type is empty defaults to "model" (see specification) + if (type.empty()) + return true; + + for (unsigned int i = 0; i < BBS_VALID_OBJECT_TYPES_COUNT; ++i) { + if (::strcmp(type.c_str(), BBS_VALID_OBJECT_TYPES[i]) == 0) + return true; + } + + return false; +} + +namespace Slic3r { + +void PlateData::parse_filament_info(GCodeProcessorResult *result) +{ + if (!result) return; + + PrintEstimatedStatistics &ps = result->print_statistics; + std::vector m_filament_diameters = result->filament_diameters; + std::vector m_filament_densities = result->filament_densities; + auto get_used_filament_from_volume = [m_filament_diameters, m_filament_densities](double volume, int extruder_id) { + double koef = 0.001; + std::pair ret = {koef * volume / (PI * sqr(0.5 * m_filament_diameters[extruder_id])), volume * m_filament_densities[extruder_id] * 0.001}; + return ret; + }; + + for (auto it = ps.volumes_per_extruder.begin(); it != ps.volumes_per_extruder.end(); it++) { + double volume = it->second; + auto [used_filament_m, used_filament_g] = get_used_filament_from_volume(volume, it->first); + + FilamentInfo info; + info.id = it->first; + //if (ps.flush_per_filament.find(it->first) != ps.flush_per_filament.end()) { + // volume = ps.flush_per_filament.at(it->first); + // auto [flushed_filament_m, flushed_filament_g] = get_used_filament_from_volume(volume, it->first); + // info.used_m = used_filament_m + flushed_filament_m; + // info.used_g = used_filament_g + flushed_filament_g; + //} else { //Susi_not_impl + info.used_m = used_filament_m; + info.used_g = used_filament_g; + //} + slice_filaments_info.push_back(info); + } + + /* only for test + GCodeProcessorResult::SliceWarning sw; + sw.msg = BED_TEMP_TOO_HIGH_THAN_FILAMENT; + sw.level = 1; + result->warnings.push_back(sw); + */ + //warnings = result->warnings; //Susi_not_impl +} + + +//! macro used to mark string used at localization, +//! return same string +#define L(s) (s) +#define _(s) Slic3r::I18N::translate(s) + + // Base class with error messages management + class _BBS_3MF_Base + { + mutable boost::mutex mutex; + mutable std::vector m_errors; + + protected: + void add_error(const std::string& error) const { boost::unique_lock l(mutex); m_errors.push_back(error); } + void clear_errors() { m_errors.clear(); } + + public: + void log_errors() + { + for (const std::string& error : m_errors) + BOOST_LOG_TRIVIAL(error) << error; + } + }; + + class _BBS_3MF_Importer : public _BBS_3MF_Base + { + typedef std::pair Id; // BBS: encrypt + + struct Component + { + Id object_id; + Transform3d transform; + + explicit Component(Id object_id) + : object_id(object_id) + , transform(Transform3d::Identity()) + { + } + + Component(Id object_id, const Transform3d& transform) + : object_id(object_id) + , transform(transform) + { + } + }; + + typedef std::vector ComponentsList; + + struct Geometry + { + std::vector vertices; + std::vector triangles; + std::vector custom_supports; + std::vector custom_seam; + std::vector mmu_segmentation; + // BBS + std::vector face_properties; + + bool empty() { return vertices.empty() || triangles.empty(); } + + // backup & restore + void swap(Geometry& o) { + std::swap(vertices, o.vertices); + std::swap(triangles, o.triangles); + std::swap(custom_supports, o.custom_supports); + std::swap(custom_seam, o.custom_seam); + } + + void reset() { + vertices.clear(); + triangles.clear(); + custom_supports.clear(); + custom_seam.clear(); + mmu_segmentation.clear(); + } + }; + + struct CurrentObject + { + // ID of the object inside the 3MF file, 1 based. + int id; + // Index of the ModelObject in its respective Model, zero based. + int model_object_idx; + Geometry geometry; + ModelObject* object; + ComponentsList components; + + //BBS: sub object id + //int subobject_id; + std::string name; + std::string uuid; + int pid{-1}; + //bool is_model_object; + + CurrentObject() { reset(); } + + void reset() { + id = -1; + model_object_idx = -1; + geometry.reset(); + object = nullptr; + components.clear(); + //BBS: sub object id + uuid.clear(); + name.clear(); + } + }; + + struct CurrentConfig + { + int object_id {-1}; + int volume_id {-1}; + }; + + struct CurrentInstance + { + int object_id; + int instance_id; + int identify_id; + }; + + struct Instance + { + ModelInstance* instance; + Transform3d transform; + + Instance(ModelInstance* instance, const Transform3d& transform) + : instance(instance) + , transform(transform) + { + } + }; + + struct Metadata + { + std::string key; + std::string value; + + Metadata(const std::string& key, const std::string& value) + : key(key) + , value(value) + { + } + }; + + typedef std::vector MetadataList; + + struct ObjectMetadata + { + struct VolumeMetadata + { + //BBS: refine the part logic + unsigned int first_triangle_id; + unsigned int last_triangle_id; + int subobject_id; + MetadataList metadata; + RepairedMeshErrors mesh_stats; + ModelVolumeType part_type; + //std::optional text_configuration; //Susi_not_impl + //std::optional shape_configuration; //Susi_not_impl + VolumeMetadata(unsigned int first_triangle_id, unsigned int last_triangle_id, ModelVolumeType type = ModelVolumeType::MODEL_PART) + : first_triangle_id(first_triangle_id) + , last_triangle_id(last_triangle_id) + , part_type(type) + , subobject_id(-1) + { + } + + VolumeMetadata(int sub_id, ModelVolumeType type = ModelVolumeType::MODEL_PART) + : subobject_id(sub_id) + , part_type(type) + , first_triangle_id(0) + , last_triangle_id(0) + { + } + }; + + typedef std::vector VolumeMetadataList; + + MetadataList metadata; + VolumeMetadataList volumes; + }; + + struct CutObjectInfo + { + struct Connector + { + int volume_id; + int type; + float r_tolerance; + float h_tolerance; + }; + CutObjectBase id; + std::vector connectors; + }; + + // Map from a 1 based 3MF object ID to a 0 based ModelObject index inside m_model->objects. + //typedef std::pair Id; // BBS: encrypt + typedef std::map IdToCurrentObjectMap; + typedef std::map IndexToPathMap; + typedef std::map IdToModelObjectMap; + //typedef std::map IdToAliasesMap; + typedef std::vector InstancesList; + typedef std::map IdToMetadataMap; + //typedef std::map IdToGeometryMap; + typedef std::map> IdToLayerHeightsProfileMap; + typedef std::map IdToLayerConfigRangesMap; + typedef std::map IdToCutObjectInfoMap; + /*typedef std::map> IdToSlaSupportPointsMap; + typedef std::map> IdToSlaDrainHolesMap;*/ + using PathToEmbossShapeFileMap = std::map>; + + struct ObjectImporter + { + IdToCurrentObjectMap object_list; + CurrentObject *current_object{nullptr}; + std::string object_path; + std::string zip_path; + _BBS_3MF_Importer *top_importer{nullptr}; + XML_Parser object_xml_parser; + bool obj_parse_error { false }; + std::string obj_parse_error_message; + + //local parsed datas + std::string obj_curr_metadata_name; + std::string obj_curr_characters; + float object_unit_factor; + int object_current_color_group{-1}; + std::map object_group_id_to_color; + bool is_bbl_3mf { false }; + + ObjectImporter(_BBS_3MF_Importer *importer, std::string file_path, std::string obj_path) + { + top_importer = importer; + object_path = obj_path; + zip_path = file_path; + } + + ~ObjectImporter() + { + _destroy_object_xml_parser(); + } + + void _destroy_object_xml_parser() + { + if (object_xml_parser != nullptr) { + XML_ParserFree(object_xml_parser); + object_xml_parser = nullptr; + } + } + + void _stop_object_xml_parser(const std::string& msg = std::string()) + { + assert(! obj_parse_error); + assert(obj_parse_error_message.empty()); + assert(object_xml_parser != nullptr); + obj_parse_error = true; + obj_parse_error_message = msg; + XML_StopParser(object_xml_parser, false); + } + + bool object_parse_error() const { return obj_parse_error; } + const char* object_parse_error_message() const { + return obj_parse_error ? + // The error was signalled by the user code, not the expat parser. + (obj_parse_error_message.empty() ? "Invalid 3MF format" : obj_parse_error_message.c_str()) : + // The error was signalled by the expat parser. + XML_ErrorString(XML_GetErrorCode(object_xml_parser)); + } + + bool _extract_object_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat); + + bool extract_object_model() + { + mz_zip_archive archive; + //mz_zip_archive_file_stat stat; + mz_zip_zero_struct(&archive); + + if (!open_zip_reader(&archive, zip_path)) { + top_importer->add_error("Unable to open the zipfile "+ zip_path); + return false; + } + + if (!top_importer->_extract_from_archive(archive, object_path, [this] (mz_zip_archive& archive, const mz_zip_archive_file_stat& stat) { + return _extract_object_from_archive(archive, stat); + }, top_importer->m_load_restore)) { + std::string error_msg = std::string("Archive does not contain a valid model for ") + object_path; + top_importer->add_error(error_msg); + + close_zip_reader(&archive); + return false; + } + + close_zip_reader(&archive); + + if (obj_parse_error) { + //already add_error inside + //top_importer->add_error(object_parse_error_message()); + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Found error while extrace object %1%\n")%object_path; + return false; + } + return true; + } + + bool _handle_object_start_model(const char** attributes, unsigned int num_attributes); + bool _handle_object_end_model(); + + bool _handle_object_start_resources(const char** attributes, unsigned int num_attributes); + bool _handle_object_end_resources(); + + bool _handle_object_start_object(const char** attributes, unsigned int num_attributes); + bool _handle_object_end_object(); + + bool _handle_object_start_color_group(const char **attributes, unsigned int num_attributes); + bool _handle_object_end_color_group(); + + bool _handle_object_start_color(const char **attributes, unsigned int num_attributes); + bool _handle_object_end_color(); + + bool _handle_object_start_mesh(const char** attributes, unsigned int num_attributes); + bool _handle_object_end_mesh(); + + bool _handle_object_start_vertices(const char** attributes, unsigned int num_attributes); + bool _handle_object_end_vertices(); + + bool _handle_object_start_vertex(const char** attributes, unsigned int num_attributes); + bool _handle_object_end_vertex(); + + bool _handle_object_start_triangles(const char** attributes, unsigned int num_attributes); + bool _handle_object_end_triangles(); + + bool _handle_object_start_triangle(const char** attributes, unsigned int num_attributes); + bool _handle_object_end_triangle(); + + bool _handle_object_start_components(const char** attributes, unsigned int num_attributes); + bool _handle_object_end_components(); + + bool _handle_object_start_component(const char** attributes, unsigned int num_attributes); + bool _handle_object_end_component(); + + bool _handle_object_start_metadata(const char** attributes, unsigned int num_attributes); + bool _handle_object_end_metadata(); + + void _handle_object_start_model_xml_element(const char* name, const char** attributes); + void _handle_object_end_model_xml_element(const char* name); + void _handle_object_xml_characters(const XML_Char* s, int len); + + // callbacks to parse the .model file of an object + static void XMLCALL _handle_object_start_model_xml_element(void* userData, const char* name, const char** attributes); + static void XMLCALL _handle_object_end_model_xml_element(void* userData, const char* name); + static void XMLCALL _handle_object_xml_characters(void* userData, const XML_Char* s, int len); + }; + + // Version of the 3mf file + unsigned int m_version; + bool m_check_version = false; + bool m_load_model = false; + bool m_load_aux = false; + bool m_load_config = false; + // backup & restore + bool m_load_restore = false; + std::string m_backup_path; + std::string m_origin_file; + // Semantic version of Orca Slicer, that generated this 3MF. + boost::optional m_bambuslicer_generator_version; + unsigned int m_fdm_supports_painting_version = 0; + unsigned int m_seam_painting_version = 0; + unsigned int m_mm_painting_version = 0; + std::string m_model_id; + std::string m_contry_code; + std::string m_designer; + std::string m_designer_user_id; + std::string m_designer_cover; + //ModelInfo model_info; //Susi_not_impl + //BBLProject project_info; //Susi_not_impl + std::string m_profile_title; + std::string m_profile_cover; + std::string m_Profile_description; + std::string m_profile_user_id; + std::string m_profile_user_name; + + XML_Parser m_xml_parser; + // Error code returned by the application side of the parser. In that case the expat may not reliably deliver the error state + // after returning from XML_Parse() function, thus we keep the error state here. + bool m_parse_error { false }; + std::string m_parse_error_message; + Model* m_model; + float m_unit_factor; + CurrentObject* m_curr_object{nullptr}; + IdToCurrentObjectMap m_current_objects; + IndexToPathMap m_index_paths; + IdToModelObjectMap m_objects; + //IdToAliasesMap m_objects_aliases; + InstancesList m_instances; + //IdToGeometryMap m_geometries; + //IdToGeometryMap m_orig_geometries; // backup & restore + CurrentConfig m_curr_config; + IdToMetadataMap m_objects_metadata; + IdToCutObjectInfoMap m_cut_object_infos; + IdToLayerHeightsProfileMap m_layer_heights_profiles; + IdToLayerConfigRangesMap m_layer_config_ranges; + /*IdToSlaSupportPointsMap m_sla_support_points; + IdToSlaDrainHolesMap m_sla_drain_holes;*/ + PathToEmbossShapeFileMap m_path_to_emboss_shape_files; + std::string m_curr_metadata_name; + std::string m_curr_characters; + std::string m_name; + std::string m_sub_model_path; + + std::string m_start_part_path; + std::string m_thumbnail_path; + std::string m_thumbnail_middle; + std::string m_thumbnail_small; + std::vector m_sub_model_paths; + std::vector m_object_importers; + + std::map m_shared_meshes; + + //BBS: plater related structures + bool m_is_bbl_3mf { false }; + bool m_parsing_slice_info { false }; + PlateDataMaps m_plater_data; + PlateData* m_curr_plater; + CurrentInstance m_curr_instance; + + int m_current_color_group{-1}; + std::map m_group_id_to_color; + + public: + _BBS_3MF_Importer(); + ~_BBS_3MF_Importer(); + + //BBS: add plate data related logic + // add backup & restore logic + bool load_model_from_file(const std::string& filename, Model& model, PlateDataPtrs& plate_data_list, std::vector& project_presets, DynamicPrintConfig& config, + ConfigSubstitutionContext& config_substitutions, LoadStrategy strategy, bool& is_bbl_3mf, Semver& file_version, Import3mfProgressFn proFn = nullptr, /*BBLProject *project = nullptr,*/ int plate_id = 0); + bool get_thumbnail(const std::string &filename, std::string &data); + bool load_gcode_3mf_from_stream(std::istream & data, Model& model, PlateDataPtrs& plate_data_list, DynamicPrintConfig& config, Semver& file_version); + unsigned int version() const { return m_version; } + + private: + void _destroy_xml_parser(); + void _stop_xml_parser(const std::string& msg = std::string()); + + bool parse_error() const { return m_parse_error; } + const char* parse_error_message() const { + return m_parse_error ? + // The error was signalled by the user code, not the expat parser. + (m_parse_error_message.empty() ? "Invalid 3MF format" : m_parse_error_message.c_str()) : + // The error was signalled by the expat parser. + XML_ErrorString(XML_GetErrorCode(m_xml_parser)); + } + + //BBS: add plate data related logic + // add backup & restore logic + bool _load_model_from_file(std::string filename, Model& model, PlateDataPtrs& plate_data_list, std::vector& project_presets, DynamicPrintConfig& config, ConfigSubstitutionContext& config_substitutions, Import3mfProgressFn proFn = nullptr, + /*BBLProject* project = nullptr, */int plate_id = 0); + bool _is_svg_shape_file(const std::string &filename) const; + bool _extract_from_archive(mz_zip_archive& archive, std::string const & path, std::function, bool restore = false); + bool _extract_xml_from_archive(mz_zip_archive& archive, std::string const & path, XML_StartElementHandler start_handler, XML_EndElementHandler end_handler); + bool _extract_xml_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat, XML_StartElementHandler start_handler, XML_EndElementHandler end_handler); + bool _extract_model_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat); + void _extract_cut_information_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat, ConfigSubstitutionContext& config_substitutions); + void _extract_layer_heights_profile_config_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat); + void _extract_layer_config_ranges_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat, ConfigSubstitutionContext& config_substitutions); + void _extract_sla_support_points_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat); + void _extract_sla_drain_holes_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat); + + void _extract_custom_gcode_per_print_z_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat); + + void _extract_print_config_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat, DynamicPrintConfig& config, ConfigSubstitutionContext& subs_context, const std::string& archive_filename); + //BBS: add project config file logic + void _extract_project_config_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat, DynamicPrintConfig& config, ConfigSubstitutionContext& subs_context, Model& model); + //BBS: extract project embedded presets + void _extract_project_embedded_presets_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat, std::vector&project_presets, Model& model, Preset::Type type, bool use_json = true); + + void _extract_auxiliary_file_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat, Model& model); + void _extract_file_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat); + void _extract_embossed_svg_shape_file(const std::string &filename, mz_zip_archive &archive, const mz_zip_archive_file_stat &stat); + + // handlers to parse the .model file + void _handle_start_model_xml_element(const char* name, const char** attributes); + void _handle_end_model_xml_element(const char* name); + void _handle_xml_characters(const XML_Char* s, int len); + + // handlers to parse the MODEL_CONFIG_FILE file + void _handle_start_config_xml_element(const char* name, const char** attributes); + void _handle_end_config_xml_element(const char* name); + + bool _handle_start_model(const char** attributes, unsigned int num_attributes); + bool _handle_end_model(); + + bool _handle_start_resources(const char** attributes, unsigned int num_attributes); + bool _handle_end_resources(); + + bool _handle_start_object(const char** attributes, unsigned int num_attributes); + bool _handle_end_object(); + + bool _handle_start_color_group(const char **attributes, unsigned int num_attributes); + bool _handle_end_color_group(); + + bool _handle_start_color(const char **attributes, unsigned int num_attributes); + bool _handle_end_color(); + + bool _handle_start_mesh(const char** attributes, unsigned int num_attributes); + bool _handle_end_mesh(); + + bool _handle_start_vertices(const char** attributes, unsigned int num_attributes); + bool _handle_end_vertices(); + + bool _handle_start_vertex(const char** attributes, unsigned int num_attributes); + bool _handle_end_vertex(); + + bool _handle_start_triangles(const char** attributes, unsigned int num_attributes); + bool _handle_end_triangles(); + + bool _handle_start_triangle(const char** attributes, unsigned int num_attributes); + bool _handle_end_triangle(); + + bool _handle_start_components(const char** attributes, unsigned int num_attributes); + bool _handle_end_components(); + + bool _handle_start_component(const char** attributes, unsigned int num_attributes); + bool _handle_end_component(); + + bool _handle_start_build(const char** attributes, unsigned int num_attributes); + bool _handle_end_build(); + + bool _handle_start_item(const char** attributes, unsigned int num_attributes); + bool _handle_end_item(); + + bool _handle_start_metadata(const char** attributes, unsigned int num_attributes); + bool _handle_end_metadata(); + + bool _handle_start_text_configuration(const char** attributes, unsigned int num_attributes); + bool _handle_start_shape_configuration(const char **attributes, unsigned int num_attributes); + + bool _create_object_instance(std::string const & path, int object_id, const Transform3d& transform, const bool printable, unsigned int recur_counter); + + void _apply_transform(ModelInstance& instance, const Transform3d& transform); + + bool _handle_start_config(const char** attributes, unsigned int num_attributes); + bool _handle_end_config(); + + bool _handle_start_config_object(const char** attributes, unsigned int num_attributes); + bool _handle_end_config_object(); + + bool _handle_start_config_volume(const char** attributes, unsigned int num_attributes); + bool _handle_start_config_volume_mesh(const char** attributes, unsigned int num_attributes); + bool _handle_end_config_volume(); + bool _handle_end_config_volume_mesh(); + + bool _handle_start_config_metadata(const char** attributes, unsigned int num_attributes); + bool _handle_end_config_metadata(); + + bool _handle_start_config_filament(const char** attributes, unsigned int num_attributes); + bool _handle_end_config_filament(); + + bool _handle_start_config_warning(const char** attributes, unsigned int num_attributes); + bool _handle_end_config_warning(); + + //BBS: add plater config parse functions + bool _handle_start_config_plater(const char** attributes, unsigned int num_attributes); + bool _handle_end_config_plater(); + + bool _handle_start_config_plater_instance(const char** attributes, unsigned int num_attributes); + bool _handle_end_config_plater_instance(); + + bool _handle_start_assemble(const char** attributes, unsigned int num_attributes); + bool _handle_end_assemble(); + + bool _handle_start_assemble_item(const char** attributes, unsigned int num_attributes); + bool _handle_end_assemble_item(); + + bool _handle_start_text_info_item(const char **attributes, unsigned int num_attributes); + bool _handle_end_text_info_item(); + + // BBS: callbacks to parse the .rels file + static void XMLCALL _handle_start_relationships_element(void* userData, const char* name, const char** attributes); + static void XMLCALL _handle_end_relationships_element(void* userData, const char* name); + + void _handle_start_relationships_element(const char* name, const char** attributes); + void _handle_end_relationships_element(const char* name); + + bool _handle_start_relationship(const char** attributes, unsigned int num_attributes); + + void _generate_current_object_list(std::vector &sub_objects, Id object_id, IdToCurrentObjectMap& current_objects); + bool _generate_volumes_new(ModelObject& object, const std::vector &sub_objects, const ObjectMetadata::VolumeMetadataList& volumes, const DynamicPrintConfig &config, ConfigSubstitutionContext& config_substitutions); + //bool _generate_volumes(ModelObject& object, const Geometry& geometry, const ObjectMetadata::VolumeMetadataList& volumes, ConfigSubstitutionContext& config_substitutions); + + // callbacks to parse the .model file + static void XMLCALL _handle_start_model_xml_element(void* userData, const char* name, const char** attributes); + static void XMLCALL _handle_end_model_xml_element(void* userData, const char* name); + static void XMLCALL _handle_xml_characters(void* userData, const XML_Char* s, int len); + + // callbacks to parse the MODEL_CONFIG_FILE file + static void XMLCALL _handle_start_config_xml_element(void* userData, const char* name, const char** attributes); + static void XMLCALL _handle_end_config_xml_element(void* userData, const char* name); + }; + + _BBS_3MF_Importer::_BBS_3MF_Importer() + : m_version(0) + , m_check_version(false) + , m_xml_parser(nullptr) + , m_model(nullptr) + , m_unit_factor(1.0f) + , m_curr_metadata_name("") + , m_curr_characters("") + , m_name("") + , m_curr_plater(nullptr) + { + } + + _BBS_3MF_Importer::~_BBS_3MF_Importer() + { + _destroy_xml_parser(); + clear_errors(); + + if (m_curr_object) { + delete m_curr_object; + m_curr_object = nullptr; + } + m_current_objects.clear(); + m_index_paths.clear(); + m_objects.clear(); + m_instances.clear(); + m_objects_metadata.clear(); + m_curr_metadata_name.clear(); + m_curr_characters.clear(); + + std::map::iterator it = m_plater_data.begin(); + while (it != m_plater_data.end()) + { + delete it->second; + it++; + } + m_plater_data.clear(); + } + + //BBS: add plate data related logic + // add backup & restore logic + bool _BBS_3MF_Importer::load_model_from_file(const std::string& filename, Model& model, PlateDataPtrs& plate_data_list, std::vector& project_presets, DynamicPrintConfig& config, + ConfigSubstitutionContext& config_substitutions, LoadStrategy strategy, bool& is_bbl_3mf, Semver& file_version, Import3mfProgressFn proFn, /*BBLProject *project,*/ int plate_id) + { + m_version = 0; + m_fdm_supports_painting_version = 0; + m_seam_painting_version = 0; + m_mm_painting_version = 0; + m_check_version = strategy & LoadStrategy::CheckVersion; + //BBS: auxiliary data + m_load_model = strategy & LoadStrategy::LoadModel; + m_load_aux = strategy & LoadStrategy::LoadAuxiliary; + m_load_restore = strategy & LoadStrategy::Restore; + m_load_config = strategy & LoadStrategy::LoadConfig; + m_model = &model; + m_unit_factor = 1.0f; + m_curr_object = nullptr; + m_current_objects.clear(); + m_index_paths.clear(); + m_objects.clear(); + //m_objects_aliases.clear(); + m_instances.clear(); + //m_geometries.clear(); + m_curr_config.object_id = -1; + m_curr_config.volume_id = -1; + m_objects_metadata.clear(); + m_layer_heights_profiles.clear(); + m_layer_config_ranges.clear(); + //m_sla_support_points.clear(); + m_curr_metadata_name.clear(); + m_curr_characters.clear(); + //BBS: plater data init + m_plater_data.clear(); + m_curr_instance.object_id = -1; + m_curr_instance.instance_id = -1; + m_curr_instance.identify_id = 0; + clear_errors(); + + // restore + //if (m_load_restore) { + // m_backup_path = filename.substr(0, filename.size() - 5); + // model.set_backup_path(m_backup_path); + // try { + // if (boost::filesystem::exists(model.get_backup_path() + "/origin.txt")) + // load_string_file(model.get_backup_path() + "/origin.txt", m_origin_file); + // } catch (...) {} + // save_string_file( + // model.get_backup_path() + "/lock.txt", + // boost::lexical_cast(get_current_pid())); + //} + //else { + // m_backup_path = model.get_backup_path(); + //} + bool result = _load_model_from_file(filename, model, plate_data_list, project_presets, config, config_substitutions, proFn, /*project,*/ plate_id); + is_bbl_3mf = m_is_bbl_3mf; + if (m_bambuslicer_generator_version) + file_version = *m_bambuslicer_generator_version; + // save for restore + //if (result && m_load_aux && !m_load_restore) { + // save_string_file(model.get_backup_path() + "/origin.txt", filename); + //} + //if (m_load_restore && !result) // not clear failed backup data for later analyze + // model.set_backup_path("detach"); + return result; + } + + bool _BBS_3MF_Importer::get_thumbnail(const std::string &filename, std::string &data) + { + mz_zip_archive archive; + mz_zip_zero_struct(&archive); + + struct close_lock + { + mz_zip_archive *archive; + void close() + { + if (archive) { + close_zip_reader(archive); + archive = nullptr; + } + } + ~close_lock() { close(); } + } lock{&archive}; + + if (!open_zip_reader(&archive, filename)) { + add_error("Unable to open the file "+filename); + return false; + } + + // BBS: load relationships + if (!_extract_xml_from_archive(archive, RELATIONSHIPS_FILE, _handle_start_relationships_element, _handle_end_relationships_element)) + return false; + if (m_thumbnail_middle.empty()) m_thumbnail_middle = m_thumbnail_path; + if (!m_thumbnail_middle.empty()) { + return _extract_from_archive(archive, m_thumbnail_middle, [&data](auto &archive, auto const &stat) -> bool { + data.resize(stat.m_uncomp_size); + return mz_zip_reader_extract_to_mem(&archive, stat.m_file_index, data.data(), data.size(), 0); + }); + } + return _extract_from_archive(archive, THUMBNAIL_FILE, [&data](auto &archive, auto const &stat) -> bool { + data.resize(stat.m_uncomp_size); + return mz_zip_reader_extract_to_mem(&archive, stat.m_file_index, data.data(), data.size(), 0); + }); + } + + static size_t mz_zip_read_istream(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n) + { + auto & is = *reinterpret_cast(pOpaque); + is.seekg(file_ofs, std::istream::beg); + if (!is) + return 0; + is.read((char *)pBuf, n); + return is.gcount(); + } + + bool _BBS_3MF_Importer::load_gcode_3mf_from_stream(std::istream &data, Model &model, PlateDataPtrs &plate_data_list, DynamicPrintConfig &config, Semver &file_version) + { + mz_zip_archive archive; + mz_zip_zero_struct(&archive); + archive.m_pRead = mz_zip_read_istream; + archive.m_pIO_opaque = &data; + + data.seekg(0, std::istream::end); + mz_uint64 size = data.tellg(); + data.seekg(0, std::istream::beg); + if (!mz_zip_reader_init(&archive, size, 0)) + return false; + + struct close_lock + { + mz_zip_archive *archive; + void close() + { + if (archive) { + mz_zip_reader_end(archive); + archive = nullptr; + } + } + ~close_lock() { close(); } + } lock{&archive}; + + // BBS: load relationships + if (!_extract_xml_from_archive(archive, RELATIONSHIPS_FILE, _handle_start_relationships_element, _handle_end_relationships_element)) + return false; + if (m_start_part_path.empty()) + return false; + + //extract model files + m_model = &model; + if (!_extract_from_archive(archive, m_start_part_path, [this] (mz_zip_archive& archive, const mz_zip_archive_file_stat& stat) { + return _extract_model_from_archive(archive, stat); + })) { + add_error("Archive does not contain a valid model"); + return false; + } + + //if (!m_designer.empty()) { + // m_model->design_info = std::make_shared(); + // m_model->design_info->DesignerUserId = m_designer_user_id; + // m_model->design_info->Designer = m_designer; + //} + + //m_model->profile_info = std::make_shared(); + //m_model->profile_info->ProfileTile = m_profile_title; + //m_model->profile_info->ProfileCover = m_profile_cover; + //m_model->profile_info->ProfileDescription = m_Profile_description; + //m_model->profile_info->ProfileUserId = m_profile_user_id; + //m_model->profile_info->ProfileUserName = m_profile_user_name; + + //m_model->model_info = std::make_shared(); + //m_model->model_info->load(model_info); //Susi_not_impl + + if (m_thumbnail_middle.empty()) m_thumbnail_middle = m_thumbnail_path; + if (m_thumbnail_small.empty()) m_thumbnail_small = m_thumbnail_path; + if (!m_thumbnail_small.empty() && m_thumbnail_small.front() == '/') + m_thumbnail_small.erase(m_thumbnail_small.begin()); + if (!m_thumbnail_middle.empty() && m_thumbnail_middle.front() == '/') + m_thumbnail_middle.erase(m_thumbnail_middle.begin()); + //m_model->model_info->metadata_items.emplace("Thumbnail", m_thumbnail_middle); + //m_model->model_info->metadata_items.emplace("Poster", m_thumbnail_middle); //Susi_not_impl + + // we then loop again the entries to read other files stored in the archive + mz_uint num_entries = mz_zip_reader_get_num_files(&archive); + mz_zip_archive_file_stat stat; + for (mz_uint i = 0; i < num_entries; ++i) { + if (mz_zip_reader_file_stat(&archive, i, &stat)) { + std::string name(stat.m_filename); + std::replace(name.begin(), name.end(), '\\', '/'); + + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format("extract %1%th file %2%, total=%3%\n")%(i+1)%name%num_entries; + + if (boost::algorithm::iequals(name, BBS_PROJECT_CONFIG_FILE)) { + // extract slic3r print config file + ConfigSubstitutionContext config_substitutions(ForwardCompatibilitySubstitutionRule::Disable); + _extract_project_config_from_archive(archive, stat, config, config_substitutions, model); + } + else if (boost::algorithm::iequals(name, BBS_MODEL_CONFIG_FILE)) { + // extract slic3r model config file + if (!_extract_xml_from_archive(archive, stat, _handle_start_config_xml_element, _handle_end_config_xml_element)) { + add_error("Archive does not contain a valid model config"); + return false; + } + } + else if (boost::algorithm::iequals(name, SLICE_INFO_CONFIG_FILE)) { + m_parsing_slice_info = true; + //extract slice info from archive + _extract_xml_from_archive(archive, stat, _handle_start_config_xml_element, _handle_end_config_xml_element); + m_parsing_slice_info = false; + } + } + } + + //BBS: load the plate info into plate_data_list + std::map::iterator it = m_plater_data.begin(); + plate_data_list.clear(); + plate_data_list.reserve(m_plater_data.size()); + for (unsigned int i = 0; i < m_plater_data.size(); i++) + { + PlateData* plate = new PlateData(); + plate_data_list.push_back(plate); + } + while (it != m_plater_data.end()) + { + if (it->first > m_plater_data.size()) + { + add_error("invalid plate index"); + return false; + } + PlateData * plate = plate_data_list[it->first-1]; + plate->locked = it->second->locked; + plate->plate_index = it->second->plate_index-1; + plate->obj_inst_map = it->second->obj_inst_map; + plate->gcode_file = it->second->gcode_file; + plate->gcode_prediction = it->second->gcode_prediction; + plate->gcode_weight = it->second->gcode_weight; + plate->toolpath_outside = it->second->toolpath_outside; + plate->is_support_used = it->second->is_support_used; + plate->is_label_object_enabled = it->second->is_label_object_enabled; + plate->skipped_objects = it->second->skipped_objects; + plate->slice_filaments_info = it->second->slice_filaments_info; + plate->warnings = it->second->warnings; + plate->thumbnail_file = it->second->thumbnail_file; + if (plate->thumbnail_file.empty()) { + plate->thumbnail_file = plate->gcode_file; + boost::algorithm::replace_all(plate->thumbnail_file, ".gcode", ".png"); + } + //plate->pattern_file = it->second->pattern_file; + plate->top_file = it->second->top_file; + plate->pick_file = it->second->pick_file.empty(); + plate->pattern_bbox_file = it->second->pattern_bbox_file.empty(); + plate->config = it->second->config; + + if (!plate->thumbnail_file.empty()) + _extract_from_archive(archive, plate->thumbnail_file, [&pixels = plate_data_list[it->first - 1]->plate_thumbnail.pixels](auto &archive, auto const &stat) -> bool { + pixels.resize(stat.m_uncomp_size); + return mz_zip_reader_extract_to_mem(&archive, stat.m_file_index, pixels.data(), pixels.size(), 0); + }); + + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", plate %1%, thumbnail_file=%2%")%it->first %plate->thumbnail_file; + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", top_thumbnail_file=%1%, pick_thumbnail_file=%2%")%plate->top_file %plate->pick_file; + it++; + } + + lock.close(); + + return true; + } + + void _BBS_3MF_Importer::_destroy_xml_parser() + { + if (m_xml_parser != nullptr) { + XML_ParserFree(m_xml_parser); + m_xml_parser = nullptr; + } + } + + void _BBS_3MF_Importer::_stop_xml_parser(const std::string &msg) + { + assert(! m_parse_error); + assert(m_parse_error_message.empty()); + assert(m_xml_parser != nullptr); + m_parse_error = true; + m_parse_error_message = msg; + XML_StopParser(m_xml_parser, false); + } + + //BBS: add plate data related logic + bool _BBS_3MF_Importer::_load_model_from_file( + std::string filename, + Model& model, + PlateDataPtrs& plate_data_list, + std::vector& project_presets, + DynamicPrintConfig& config, + ConfigSubstitutionContext& config_substitutions, + Import3mfProgressFn proFn, + /*BBLProject *project,*/ //Susi_not_impl + int plate_id) + { + bool cb_cancel = false; + //BBS progress point + // prepare restore + if (m_load_restore) { + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format("import 3mf IMPORT_STAGE_RESTORE\n"); + if (proFn) { + proFn(IMPORT_STAGE_RESTORE, 0, 1, cb_cancel); + if (cb_cancel) + return false; + } + } + + //BBS progress point + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format("import 3mf IMPORT_STAGE_OPEN, m_load_restore=%1%\n")%m_load_restore; + if (proFn) { + proFn(IMPORT_STAGE_OPEN, 0, 1, cb_cancel); + if (cb_cancel) + return false; + } + + mz_zip_archive archive; + mz_zip_zero_struct(&archive); + + struct close_lock + { + mz_zip_archive * archive; + void close() { + if (archive) { + close_zip_reader(archive); + archive = nullptr; + } + } + ~close_lock() { + close(); + } + } lock{ &archive }; + + if (!open_zip_reader(&archive, filename)) { + add_error("Unable to open the file"+filename); + return false; + } + + mz_uint num_entries = mz_zip_reader_get_num_files(&archive); + + mz_zip_archive_file_stat stat; + + m_name = boost::filesystem::path(filename).stem().string(); + + //BBS progress point + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format("import 3mf IMPORT_STAGE_READ_FILES\n"); + if (proFn) { + proFn(IMPORT_STAGE_READ_FILES, 0, 3, cb_cancel); + if (cb_cancel) + return false; + } + // BBS: load relationships + if (!_extract_xml_from_archive(archive, RELATIONSHIPS_FILE, _handle_start_relationships_element, _handle_end_relationships_element)) + return false; + if (m_start_part_path.empty()) + return false; + // BBS: load sub models (Production Extension) + std::string sub_rels = m_start_part_path; + sub_rels.insert(boost::find_last(sub_rels, "/").end() - sub_rels.begin(), "_rels/"); + sub_rels.append(".rels"); + if (sub_rels.front() == '/') sub_rels = sub_rels.substr(1); + + //check whether sub relation file is exist or not + int sub_index = mz_zip_reader_locate_file(&archive, sub_rels.c_str(), nullptr, 0); + if (sub_index == -1) { + //no submodule files found, use only one 3dmodel.model + } + else { + _extract_xml_from_archive(archive, sub_rels, _handle_start_relationships_element, _handle_end_relationships_element); + int index = 0; + +#if 0 + for (auto path : m_sub_model_paths) { + if (proFn) { + proFn(IMPORT_STAGE_READ_FILES, ++index, 3 + m_sub_model_paths.size(), cb_cancel); + if (cb_cancel) + return false; + } + else + ++index; + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", read %1%th sub model file %2%\n")%index %path; + m_sub_model_path = path; + if (!_extract_from_archive(archive, path, [this] (mz_zip_archive& archive, const mz_zip_archive_file_stat& stat) { + return _extract_model_from_archive(archive, stat); + }, m_load_restore)) { + add_error("Archive does not contain a valid model"); + return false; + } + m_sub_model_path.clear(); + } +#else + for (auto path : m_sub_model_paths) { + ObjectImporter *object_importer = new ObjectImporter(this, filename, path); + m_object_importers.push_back(object_importer); + } + + bool object_load_result = true; + boost::mutex mutex; + tbb::parallel_for( + tbb::blocked_range(0, m_object_importers.size()), + [this, &mutex, &object_load_result](const tbb::blocked_range& importer_range) { + CNumericLocalesSetter locales_setter; + for (size_t object_index = importer_range.begin(); object_index < importer_range.end(); ++ object_index) { + bool result = m_object_importers[object_index]->extract_object_model(); + { + boost::unique_lock l(mutex); + object_load_result &= result; + } + } + } + ); + + if (!object_load_result) { + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", loading sub-objects error\n"); + return false; + } + + //merge these objects into one + for (auto obj_importer : m_object_importers) { + for (const IdToCurrentObjectMap::value_type& obj : obj_importer->object_list) + m_current_objects.insert({ std::move(obj.first), std::move(obj.second)}); + for (auto group_color : obj_importer->object_group_id_to_color) + m_group_id_to_color.insert(std::move(group_color)); + + delete obj_importer; + } + m_object_importers.clear(); +#endif + // BBS: load root model + if (proFn) { + proFn(IMPORT_STAGE_READ_FILES, 2, 3, cb_cancel); + if (cb_cancel) + return false; + } + } + + //extract model files + if (!_extract_from_archive(archive, m_start_part_path, [this] (mz_zip_archive& archive, const mz_zip_archive_file_stat& stat) { + return _extract_model_from_archive(archive, stat); + })) { + add_error("Archive does not contain a valid model"); + return false; + } + + //if (!m_designer.empty()) { + // m_model->design_info = std::make_shared(); + // m_model->design_info->DesignerUserId = m_designer_user_id; + // m_model->design_info->Designer = m_designer; + //} //Susi_not_impl + + //m_model->profile_info = std::make_shared(); + //m_model->profile_info->ProfileTile = m_profile_title; + //m_model->profile_info->ProfileCover = m_profile_cover; + //m_model->profile_info->ProfileDescription = m_Profile_description; + //m_model->profile_info->ProfileUserId = m_profile_user_id; + //m_model->profile_info->ProfileUserName = m_profile_user_name; //Susi_not_impl + + + //m_model->model_info = std::make_shared(); + //m_model->model_info->load(model_info); + //if (!m_thumbnail_small.empty()) m_model->model_info->metadata_items.emplace("Thumbnail_Small", m_thumbnail_small); + //if (!m_thumbnail_middle.empty()) m_model->model_info->metadata_items.emplace("Thumbnail_Middle", m_thumbnail_middle); //Susi_not_impl + + //got project id + //if (project) { + // project->project_model_id = m_model_id; + // project->project_country_code = m_contry_code; + //} + + // Orca: skip version check + bool dont_load_config = !m_load_config; + // if (m_bambuslicer_generator_version) { + // Semver app_version = *(Semver::parse(SoftFever_VERSION)); + // Semver file_version = *m_bambuslicer_generator_version; + // if (file_version.maj() != app_version.maj()) + // dont_load_config = true; + // } + // else { + // m_bambuslicer_generator_version = Semver::parse("0.0.0.0"); + // dont_load_config = true; + // } + + // we then loop again the entries to read other files stored in the archive + for (mz_uint i = 0; i < num_entries; ++i) { + if (mz_zip_reader_file_stat(&archive, i, &stat)) { + + //BBS progress point + if (proFn) { + proFn(IMPORT_STAGE_EXTRACT, i, num_entries, cb_cancel); + if (cb_cancel) + return false; + } + + std::string name(stat.m_filename); + std::replace(name.begin(), name.end(), '\\', '/'); + + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format("extract %1%th file %2%, total=%3%")%(i+1)%name%num_entries; + + if (name.find("/../") != std::string::npos) { + BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(", find file path including /../, not valid, skip it\n"); + continue; + } + + if (boost::algorithm::iequals(name, BBS_LAYER_HEIGHTS_PROFILE_FILE)) { + // extract slic3r layer heights profile file + _extract_layer_heights_profile_config_from_archive(archive, stat); + } + else + if (boost::algorithm::iequals(name, LAYER_CONFIG_RANGES_FILE)) { + // extract slic3r layer config ranges file + _extract_layer_config_ranges_from_archive(archive, stat, config_substitutions); + } + //BBS: disable SLA related files currently + /*else if (boost::algorithm::iequals(name, SLA_SUPPORT_POINTS_FILE)) { + // extract sla support points file + _extract_sla_support_points_from_archive(archive, stat); + } + else if (boost::algorithm::iequals(name, SLA_DRAIN_HOLES_FILE)) { + // extract sla support points file + _extract_sla_drain_holes_from_archive(archive, stat); + }*/ + //BBS: project setting file + //if (!dont_load_config && boost::algorithm::iequals(name, BBS_PRINT_CONFIG_FILE)) { + // extract slic3r print config file + // _extract_print_config_from_archive(archive, stat, config, config_substitutions, filename); + //} else + if (!dont_load_config && boost::algorithm::iequals(name, BBS_PROJECT_CONFIG_FILE)) { + // extract slic3r print config file + _extract_project_config_from_archive(archive, stat, config, config_substitutions, model); + } + else if (boost::algorithm::iequals(name, CUT_INFORMATION_FILE)) { + // extract object cut info + _extract_cut_information_from_archive(archive, stat, config_substitutions); + } + //BBS: project embedded presets + else if (!dont_load_config && boost::algorithm::istarts_with(name, PROJECT_EMBEDDED_PRINT_PRESETS_FILE)) { + // extract slic3r layer config ranges file + _extract_project_embedded_presets_from_archive(archive, stat, project_presets, model, Preset::TYPE_FFF_PRINT, false); + } + else if (!dont_load_config && boost::algorithm::istarts_with(name, PROJECT_EMBEDDED_SLICE_PRESETS_FILE)) { + // extract slic3r layer config ranges file + _extract_project_embedded_presets_from_archive(archive, stat, project_presets, model, Preset::TYPE_FFF_PRINT); + } + else if (!dont_load_config && boost::algorithm::istarts_with(name, PROJECT_EMBEDDED_FILAMENT_PRESETS_FILE)) { + // extract slic3r layer config ranges file + _extract_project_embedded_presets_from_archive(archive, stat, project_presets, model, Preset::TYPE_FFF_FILAMENT); + } + else if (!dont_load_config && boost::algorithm::istarts_with(name, PROJECT_EMBEDDED_PRINTER_PRESETS_FILE)) { + // extract slic3r layer config ranges file + _extract_project_embedded_presets_from_archive(archive, stat, project_presets, model, Preset::TYPE_PRINTER); + } + else if (!dont_load_config && boost::algorithm::iequals(name, CUSTOM_GCODE_PER_PRINT_Z_FILE)) { + // extract slic3r layer config ranges file + _extract_custom_gcode_per_print_z_from_archive(archive, stat); + } + else if (boost::algorithm::iequals(name, BBS_MODEL_CONFIG_FILE)) { + // extract slic3r model config file + if (!_extract_xml_from_archive(archive, stat, _handle_start_config_xml_element, _handle_end_config_xml_element)) { + add_error("Archive does not contain a valid model config"); + return false; + } + } + else if (_is_svg_shape_file(name)) { + _extract_embossed_svg_shape_file(name, archive, stat); + } + else if (!dont_load_config && boost::algorithm::iequals(name, SLICE_INFO_CONFIG_FILE)) { + m_parsing_slice_info = true; + //extract slice info from archive + _extract_xml_from_archive(archive, stat, _handle_start_config_xml_element, _handle_end_config_xml_element); + m_parsing_slice_info = false; + } + else if (boost::algorithm::istarts_with(name, AUXILIARY_DIR)) { + // extract auxiliary directory to temp directory, do nothing for restore + if (m_load_aux && !m_load_restore) + _extract_auxiliary_file_from_archive(archive, stat, model); + } + else if (!dont_load_config && boost::algorithm::istarts_with(name, METADATA_DIR) && boost::algorithm::iends_with(name, GCODE_EXTENSION)) { + //load gcode files + _extract_file_from_archive(archive, stat); + } + else if (!dont_load_config && boost::algorithm::istarts_with(name, METADATA_DIR) && boost::algorithm::iends_with(name, THUMBNAIL_EXTENSION)) { + //BBS parsing pattern thumbnail and plate thumbnails + _extract_file_from_archive(archive, stat); + } + else if (!dont_load_config && boost::algorithm::istarts_with(name, METADATA_DIR) && boost::algorithm::iends_with(name, CALIBRATION_INFO_EXTENSION)) { + //BBS parsing pattern config files + _extract_file_from_archive(archive, stat); + } + else { + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", %1% skipped, already parsed or a directory or not supported\n")%name; + } + } + } + + lock.close(); + + if (!m_is_bbl_3mf) { + // if the 3mf was not produced by OrcaSlicer and there is more than one instance, + // split the object in as many objects as instances + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", found 3mf from other vendor, split as instance"); + for (const IdToModelObjectMap::value_type& object : m_objects) { + if (object.second >= int(m_model->objects.size())) { + add_error("3rd 3mf, invalid object, id: "+std::to_string(object.first.second)); + return false; + } + ModelObject* model_object = m_model->objects[object.second]; + if (model_object->instances.size() > 1) { + IdToCurrentObjectMap::const_iterator current_object = m_current_objects.find(object.first); + if (current_object == m_current_objects.end()) { + add_error("3rd 3mf, can not find object, id " + std::to_string(object.first.second)); + return false; + } + std::vector object_id_list; + _generate_current_object_list(object_id_list, object.first, m_current_objects); + + ObjectMetadata::VolumeMetadataList volumes; + ObjectMetadata::VolumeMetadataList* volumes_ptr = nullptr; + + for (int k = 0; k < object_id_list.size(); k++) + { + Id object_id = object_id_list[k].object_id; + volumes.emplace_back(object_id.second); + } + + // select as volumes + volumes_ptr = &volumes; + + // for each instance after the 1st, create a new model object containing only that instance + // and copy into it the geometry + while (model_object->instances.size() > 1) { + ModelObject* new_model_object = m_model->add_object(*model_object); + new_model_object->clear_instances(); + new_model_object->add_instance(*model_object->instances.back()); + model_object->delete_last_instance(); + if (!_generate_volumes_new(*new_model_object, object_id_list, *volumes_ptr, config, config_substitutions)) + return false; + } + } + } + } + + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", process group colors, size %1%\n")%m_group_id_to_color.size(); + std::map color_group_id_to_extruder_id_map; + std::map color_to_extruder_id_map; + int extruder_id = 0; + for (auto group_iter = m_group_id_to_color.begin(); group_iter != m_group_id_to_color.end(); ++group_iter) { + auto color_iter = color_to_extruder_id_map.find(group_iter->second); + if (color_iter == color_to_extruder_id_map.end()) { + ++extruder_id; + color_to_extruder_id_map[group_iter->second] = extruder_id; + color_group_id_to_extruder_id_map[group_iter->first] = extruder_id; + } else { + color_group_id_to_extruder_id_map[group_iter->first] = color_iter->second; + } + } + + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", begin to assemble objects, size %1%\n")%m_objects.size(); + //only load objects in plate_id + PlateData* current_plate_data = nullptr; + if ((plate_id > 0) && (plate_id <= m_plater_data.size())) { + std::map::iterator it =m_plater_data.find(plate_id); + if (it != m_plater_data.end()) { + current_plate_data = it->second; + } + } + for (const IdToModelObjectMap::value_type& object : m_objects) { + if (object.second >= int(m_model->objects.size())) { + add_error("invalid object, id: "+std::to_string(object.first.second)); + return false; + } + if (current_plate_data) { + std::map>::iterator it = current_plate_data->obj_inst_map.find(object.first.second); + if (it == current_plate_data->obj_inst_map.end()) { + //not in current plate, skip + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", could not find object %1% in plate %2%, skip it\n")%object.first.second %plate_id; + continue; + } + } + ModelObject* model_object = m_model->objects[object.second]; + /*IdToGeometryMap::const_iterator obj_geometry = m_geometries.find(object.first); + if (obj_geometry == m_geometries.end()) { + add_error("Unable to find object geometry"); + return false; + }*/ + + // m_layer_heights_profiles are indexed by a 1 based model object index. + IdToLayerHeightsProfileMap::iterator obj_layer_heights_profile = m_layer_heights_profiles.find(object.second + 1); + if (obj_layer_heights_profile != m_layer_heights_profiles.end()) + model_object->layer_height_profile.set(std::move(obj_layer_heights_profile->second)); + + // m_layer_config_ranges are indexed by a 1 based model object index. + IdToLayerConfigRangesMap::iterator obj_layer_config_ranges = m_layer_config_ranges.find(object.second + 1); + if (obj_layer_config_ranges != m_layer_config_ranges.end()) + model_object->layer_config_ranges = std::move(obj_layer_config_ranges->second); + + // m_sla_support_points are indexed by a 1 based model object index. + /*IdToSlaSupportPointsMap::iterator obj_sla_support_points = m_sla_support_points.find(object.second + 1); + if (obj_sla_support_points != m_sla_support_points.end() && !obj_sla_support_points->second.empty()) { + model_object->sla_support_points = std::move(obj_sla_support_points->second); + model_object->sla_points_status = sla::PointsStatus::UserModified; + } + + IdToSlaDrainHolesMap::iterator obj_drain_holes = m_sla_drain_holes.find(object.second + 1); + if (obj_drain_holes != m_sla_drain_holes.end() && !obj_drain_holes->second.empty()) { + model_object->sla_drain_holes = std::move(obj_drain_holes->second); + }*/ + + std::vector object_id_list; + _generate_current_object_list(object_id_list, object.first, m_current_objects); + + ObjectMetadata::VolumeMetadataList volumes; + ObjectMetadata::VolumeMetadataList* volumes_ptr = nullptr; + + IdToMetadataMap::iterator obj_metadata = m_objects_metadata.find(object.first.second); + if (obj_metadata != m_objects_metadata.end()) { + // config data has been found, this model was saved using slic3r pe + + std::map key_values_to_deserialize; + // apply object's name and config data + for (const Metadata& metadata : obj_metadata->second.metadata) { + if (metadata.key == "name") + model_object->name = metadata.value; + //BBS: add module name + else if (metadata.key == "module") + ; //model_object->module_name = metadata.value; //Susi_not_impl + else + key_values_to_deserialize[metadata.key] = metadata.value; + //model_object->config.set_deserialize(metadata.key, metadata.value, config_substitutions); + } + convert_settings_from_bambu(key_values_to_deserialize, config, model_object->config, config_substitutions, false); + + // select object's detected volumes + volumes_ptr = &obj_metadata->second.volumes; + } + else { + // config data not found, this model was not saved using slic3r pe + + // add the entire geometry as the single volume to generate + //volumes.emplace_back(0, (int)obj_geometry->second.triangles.size() - 1); + for (int k = 0; k < object_id_list.size(); k++) + { + Id object_id = object_id_list[k].object_id; + volumes.emplace_back(object_id.second); + } + + IdToCurrentObjectMap::const_iterator current_object = m_current_objects.find(object.first); + if (current_object != m_current_objects.end()) { + // get name + if (!current_object->second.name.empty()) + model_object->name = current_object->second.name; + else + model_object->name = "Object_"+std::to_string(object.second+1); + + // get color + auto extruder_itor = color_group_id_to_extruder_id_map.find(current_object->second.pid); + if (extruder_itor != color_group_id_to_extruder_id_map.end()) { + model_object->config.set_key_value("extruder", new ConfigOptionInt(extruder_itor->second)); + } + } + + // select as volumes + volumes_ptr = &volumes; + } + + if (!_generate_volumes_new(*model_object, object_id_list, *volumes_ptr, config, config_substitutions)) + return false; + + // Apply cut information for object if any was loaded + // m_cut_object_ids are indexed by a 1 based model object index. + IdToCutObjectInfoMap::iterator cut_object_info = m_cut_object_infos.find(object.second + 1); + if (cut_object_info != m_cut_object_infos.end()) { + //model_object->cut_id = cut_object_info->second.id; //Susi_not_impl + int vol_cnt = int(model_object->volumes.size()); + for (auto connector : cut_object_info->second.connectors) { + if (connector.volume_id < 0 || connector.volume_id >= vol_cnt) { + add_error("Invalid connector is found"); + continue; + } + //model_object->volumes[connector.volume_id]->cut_info = + // ModelVolume::CutInfo(CutConnectorType(connector.type), connector.r_tolerance, connector.h_tolerance, true); //Susi_not_impl + } + } + } + + // If instances contain a single volume, the volume offset should be 0,0,0 + // This equals to say that instance world position and volume world position should match + // Correct all instances/volumes for which this does not hold + for (int obj_id = 0; obj_id < int(model.objects.size()); ++obj_id) { + ModelObject *o = model.objects[obj_id]; + if (o->volumes.size() == 1) { + ModelVolume * v = o->volumes.front(); + const Slic3r::Geometry::Transformation &first_inst_trafo = o->instances.front()->get_transformation(); + const Vec3d world_vol_offset = (first_inst_trafo * v->get_transformation()).get_offset(); + const Vec3d world_inst_offset = first_inst_trafo.get_offset(); + + if (!world_vol_offset.isApprox(world_inst_offset)) { + const Slic3r::Geometry::Transformation &vol_trafo = v->get_transformation(); + for (int inst_id = 0; inst_id < int(o->instances.size()); ++inst_id) { + ModelInstance * i = o->instances[inst_id]; + const Slic3r::Geometry::Transformation &inst_trafo = i->get_transformation(); + i->set_offset((inst_trafo * vol_trafo).get_offset()); + } + v->set_offset(Vec3d::Zero()); + } + } + } + + int object_idx = 0; + for (ModelObject* o : model.objects) { + int volume_idx = 0; + for (ModelVolume* v : o->volumes) { + if (v->source.input_file.empty() && v->type() == ModelVolumeType::MODEL_PART) { + v->source.input_file = filename; + if (v->source.volume_idx == -1) + v->source.volume_idx = volume_idx; + if (v->source.object_idx == -1) + v->source.object_idx = object_idx; + } + ++volume_idx; + } + ++object_idx; + } + + const ConfigOptionStrings* filament_ids_opt = config.option("filament_settings_id"); + int max_filament_id = filament_ids_opt ? filament_ids_opt->size() : std::numeric_limits::max(); + for (ModelObject* mo : m_model->objects) { + const ConfigOptionInt* extruder_opt = dynamic_cast(mo->config.option("extruder")); + int extruder_id = 0; + if (extruder_opt != nullptr) + extruder_id = extruder_opt->get_int(); + + if (extruder_id == 0 || extruder_id > max_filament_id) + mo->config.set_key_value("extruder", new ConfigOptionInt(1)); + + if (mo->volumes.size() == 1) { + mo->volumes[0]->config.erase("extruder"); + } + else { + for (ModelVolume* mv : mo->volumes) { + const ConfigOptionInt* vol_extruder_opt = dynamic_cast(mv->config.option("extruder")); + if (vol_extruder_opt == nullptr) + continue; + + if (vol_extruder_opt->get_int() == 0) + mv->config.erase("extruder"); + else if (vol_extruder_opt->get_int() > max_filament_id) + mv->config.set_key_value("extruder", new ConfigOptionInt(1)); + } + } + } + +// // fixes the min z of the model if negative +// model.adjust_min_z(); + + //BBS progress point + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format("import 3mf IMPORT_STAGE_LOADING_PLATES, m_plater_data size %1%, m_backup_path %2%\n")%m_plater_data.size() %m_backup_path; + if (proFn) { + proFn(IMPORT_STAGE_LOADING_PLATES, 0, 1, cb_cancel); + if (cb_cancel) + return false; + } + + //BBS: load the plate info into plate_data_list + std::map::iterator it = m_plater_data.begin(); + plate_data_list.clear(); + plate_data_list.reserve(m_plater_data.size()); + for (unsigned int i = 0; i < m_plater_data.size(); i++) + { + PlateData* plate = new PlateData(); + plate_data_list.push_back(plate); + } + while (it != m_plater_data.end()) + { + if (it->first > m_plater_data.size()) + { + add_error("invalid plate index"); + return false; + } + plate_data_list[it->first-1]->locked = it->second->locked; + plate_data_list[it->first-1]->plate_index = it->second->plate_index-1; + plate_data_list[it->first-1]->plate_name = it->second->plate_name; + plate_data_list[it->first-1]->obj_inst_map = it->second->obj_inst_map; + plate_data_list[it->first-1]->gcode_file = (m_load_restore || it->second->gcode_file.empty()) ? it->second->gcode_file : m_backup_path + "/" + it->second->gcode_file; + plate_data_list[it->first-1]->gcode_prediction = it->second->gcode_prediction; + plate_data_list[it->first-1]->gcode_weight = it->second->gcode_weight; + plate_data_list[it->first-1]->toolpath_outside = it->second->toolpath_outside; + plate_data_list[it->first-1]->is_support_used = it->second->is_support_used; + plate_data_list[it->first-1]->is_label_object_enabled = it->second->is_label_object_enabled; + plate_data_list[it->first-1]->slice_filaments_info = it->second->slice_filaments_info; + plate_data_list[it->first-1]->skipped_objects = it->second->skipped_objects; + plate_data_list[it->first-1]->warnings = it->second->warnings; + plate_data_list[it->first-1]->thumbnail_file = (m_load_restore || it->second->thumbnail_file.empty()) ? it->second->thumbnail_file : m_backup_path + "/" + it->second->thumbnail_file; + //plate_data_list[it->first-1]->pattern_file = (m_load_restore || it->second->pattern_file.empty()) ? it->second->pattern_file : m_backup_path + "/" + it->second->pattern_file; + plate_data_list[it->first-1]->top_file = (m_load_restore || it->second->top_file.empty()) ? it->second->top_file : m_backup_path + "/" + it->second->top_file; + plate_data_list[it->first-1]->pick_file = (m_load_restore || it->second->pick_file.empty()) ? it->second->pick_file : m_backup_path + "/" + it->second->pick_file; + plate_data_list[it->first-1]->pattern_bbox_file = (m_load_restore || it->second->pattern_bbox_file.empty()) ? it->second->pattern_bbox_file : m_backup_path + "/" + it->second->pattern_bbox_file; + plate_data_list[it->first-1]->config = it->second->config; + + current_plate_data = plate_data_list[it->first - 1]; + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", plate %1%, thumbnail_file=%2%")%it->first %plate_data_list[it->first-1]->thumbnail_file; + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", top_thumbnail_file=%1%, pick_thumbnail_file=%2%")%plate_data_list[it->first-1]->top_file %plate_data_list[it->first-1]->pick_file; + it++; + + //update the arrange order + std::map>::iterator map_it = current_plate_data->obj_inst_map.begin(); + while (map_it != current_plate_data->obj_inst_map.end()) { + int obj_index, obj_id = map_it->first, inst_index = map_it->second.first; + IndexToPathMap::iterator index_iter = m_index_paths.find(obj_id); + if (index_iter == m_index_paths.end()) { + BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << ":" << __LINE__ + << boost::format(", can not find object from plate's obj_map, id=%1%, skip this object")%obj_id; + map_it++; + continue; + } + Id temp_id = std::make_pair(index_iter->second, index_iter->first); + IdToModelObjectMap::iterator object_item = m_objects.find(temp_id); + if (object_item == m_objects.end()) { + BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << ":" << __LINE__ + << boost::format(", can not find object from plate's obj_map, ID <%1%, %2%>, skip this object")%index_iter->second %index_iter->first; + map_it++; + continue; + } + obj_index = object_item->second; + + if (obj_index >= m_model->objects.size()) { + BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << ":" << __LINE__ << boost::format("invalid object id %1%\n")%obj_index; + map_it++; + continue; + } + ModelObject* obj = m_model->objects[obj_index]; + if (inst_index >= obj->instances.size()) { + BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << ":" << __LINE__ << boost::format("invalid instance id %1%\n")%inst_index; + map_it++; + continue; + } + ModelInstance* inst = obj->instances[inst_index]; + //inst->loaded_id = map_it->second.second; //Susi_not_impl + map_it++; + } + } + + if ((plate_id > 0) && (plate_id <= m_plater_data.size())) { + //remove the no need objects + std::vector delete_ids; + for (int index = 0; index < m_model->objects.size(); index++) { + ModelObject* obj = m_model->objects[index]; + if (obj->volumes.size() == 0) { + //remove this model objects + delete_ids.push_back(index); + } + } + + for (int index = delete_ids.size() - 1; index >= 0; index--) + m_model->delete_object(delete_ids[index]); + } + + //BBS progress point + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format("import 3mf IMPORT_STAGE_FINISH\n"); + if (proFn) { + proFn(IMPORT_STAGE_FINISH, 0, 1, cb_cancel); + if (cb_cancel) + return false; + } + + return true; + } + + bool _BBS_3MF_Importer::_is_svg_shape_file(const std::string &name) const { + return boost::starts_with(name, MODEL_FOLDER) && boost::ends_with(name, ".svg"); + } + + bool _BBS_3MF_Importer::_extract_from_archive(mz_zip_archive& archive, std::string const & path, std::function extract, bool restore) + { + mz_uint num_entries = mz_zip_reader_get_num_files(&archive); + mz_zip_archive_file_stat stat; + std::string path2 = path; + if (path2.front() == '/') path2 = path2.substr(1); + // try utf8 encoding + int index = mz_zip_reader_locate_file(&archive, path2.c_str(), nullptr, 0); + if (index < 0) { + // try native encoding + std::string native_path = encode_path(path2.c_str()); + index = mz_zip_reader_locate_file(&archive, native_path.c_str(), nullptr, 0); + } + if (index < 0) { + // try unicode path extra + std::string extra(1024, 0); + for (mz_uint i = 0; i < archive.m_total_files; ++i) { + size_t n = mz_zip_reader_get_extra(&archive, i, extra.data(), extra.size()); + if (n > 0 && path2 == ZipUnicodePathExtraField::decode(extra.substr(0, n))) { + index = i; + break; + } + } + } + if (index < 0 || !mz_zip_reader_file_stat(&archive, index, &stat)) { + if (restore) { + std::vector paths = {m_backup_path + path}; + if (!m_origin_file.empty()) paths.push_back(m_origin_file); + for (auto & path2 : paths) { + bool result = false; + if (boost::filesystem::exists(path2)) { + mz_zip_archive archive; + mz_zip_zero_struct(&archive); + if (open_zip_reader(&archive, path2)) { + result = _extract_from_archive(archive, path, extract); + close_zip_reader(&archive); + } + } + if (result) return result; + } + } + char error_buf[1024]; + ::snprintf(error_buf, 1024, "File %s not found from archive", path.c_str()); + add_error(error_buf); + return false; + } + try + { + if (!extract(archive, stat)) { + return false; + } + } + catch (const std::exception& e) + { + // ensure the zip archive is closed and rethrow the exception + add_error(e.what()); + return false; + } + return true; + } + + bool _BBS_3MF_Importer::_extract_xml_from_archive(mz_zip_archive& archive, const std::string & path, XML_StartElementHandler start_handler, XML_EndElementHandler end_handler) + { + return _extract_from_archive(archive, path, [this, start_handler, end_handler](mz_zip_archive& archive, const mz_zip_archive_file_stat& stat) { + return _extract_xml_from_archive(archive, stat, start_handler, end_handler); + }); + } + + bool _BBS_3MF_Importer::_extract_xml_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat, XML_StartElementHandler start_handler, XML_EndElementHandler end_handler) + { + if (stat.m_uncomp_size == 0) { + add_error("Found invalid size"); + return false; + } + + _destroy_xml_parser(); + + m_xml_parser = XML_ParserCreate(nullptr); + if (m_xml_parser == nullptr) { + add_error("Unable to create parser"); + return false; + } + + XML_SetUserData(m_xml_parser, (void*)this); + XML_SetElementHandler(m_xml_parser, start_handler, end_handler); + XML_SetCharacterDataHandler(m_xml_parser, _BBS_3MF_Importer::_handle_xml_characters); + + void* parser_buffer = XML_GetBuffer(m_xml_parser, (int)stat.m_uncomp_size); + if (parser_buffer == nullptr) { + add_error("Unable to create buffer"); + return false; + } + + mz_bool res = mz_zip_reader_extract_file_to_mem(&archive, stat.m_filename, parser_buffer, (size_t)stat.m_uncomp_size, 0); + if (res == 0) { + add_error("Error while reading config data to buffer"); + return false; + } + + if (!XML_ParseBuffer(m_xml_parser, (int)stat.m_uncomp_size, 1)) { + char error_buf[1024]; + ::snprintf(error_buf, 1024, "Error (%s) while parsing xml file at line %d", XML_ErrorString(XML_GetErrorCode(m_xml_parser)), (int)XML_GetCurrentLineNumber(m_xml_parser)); + add_error(error_buf); + return false; + } + + return true; + } + + bool _BBS_3MF_Importer::_extract_model_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat) + { + if (stat.m_uncomp_size == 0) { + add_error("Found invalid size"); + return false; + } + + _destroy_xml_parser(); + + m_xml_parser = XML_ParserCreate(nullptr); + if (m_xml_parser == nullptr) { + add_error("Unable to create parser"); + return false; + } + + XML_SetUserData(m_xml_parser, (void*)this); + XML_SetElementHandler(m_xml_parser, _BBS_3MF_Importer::_handle_start_model_xml_element, _BBS_3MF_Importer::_handle_end_model_xml_element); + XML_SetCharacterDataHandler(m_xml_parser, _BBS_3MF_Importer::_handle_xml_characters); + + struct CallbackData + { + XML_Parser& parser; + _BBS_3MF_Importer& importer; + const mz_zip_archive_file_stat& stat; + + CallbackData(XML_Parser& parser, _BBS_3MF_Importer& importer, const mz_zip_archive_file_stat& stat) : parser(parser), importer(importer), stat(stat) {} + }; + + CallbackData data(m_xml_parser, *this, stat); + + mz_bool res = 0; + + try + { + mz_file_write_func callback = [](void* pOpaque, mz_uint64 file_ofs, const void* pBuf, size_t n)->size_t { + CallbackData* data = (CallbackData*)pOpaque; + if (!XML_Parse(data->parser, (const char*)pBuf, (int)n, (file_ofs + n == data->stat.m_uncomp_size) ? 1 : 0) || data->importer.parse_error()) { + char error_buf[1024]; + ::snprintf(error_buf, 1024, "Error (%s) while parsing '%s' at line %d", data->importer.parse_error_message(), data->stat.m_filename, (int)XML_GetCurrentLineNumber(data->parser)); + throw Slic3r::FileIOError(error_buf); + } + return n; + }; + void* opaque = &data; + res = mz_zip_reader_extract_to_callback(&archive, stat.m_file_index, callback, opaque, 0); + } + catch (const version_error& e) + { + // rethrow the exception + throw Slic3r::FileIOError(e.what()); + } + catch (std::exception& e) + { + add_error(e.what()); + return false; + } + + if (res == 0) { + add_error("Error while extracting model data from zip archive"); + return false; + } + + return true; + } + + void _BBS_3MF_Importer::_extract_cut_information_from_archive(mz_zip_archive &archive, const mz_zip_archive_file_stat &stat, ConfigSubstitutionContext &config_substitutions) + { + if (stat.m_uncomp_size > 0) { + std::string buffer((size_t)stat.m_uncomp_size, 0); + mz_bool res = mz_zip_reader_extract_file_to_mem(&archive, stat.m_filename, (void *) buffer.data(), (size_t) stat.m_uncomp_size, 0); + if (res == 0) { + add_error("Error while reading cut information data to buffer"); + return; + } + + std::istringstream iss(buffer); // wrap returned xml to istringstream + pt::ptree objects_tree; + pt::read_xml(iss, objects_tree); + + for (const auto& object : objects_tree.get_child("objects")) { + pt::ptree object_tree = object.second; + int obj_idx = object_tree.get(".id", -1); + if (obj_idx <= 0) { + add_error("Found invalid object id"); + continue; + } + + IdToCutObjectInfoMap::iterator object_item = m_cut_object_infos.find(obj_idx); + if (object_item != m_cut_object_infos.end()) { + add_error("Found duplicated cut_object_id"); + continue; + } + + CutObjectBase cut_id; + std::vector connectors; + + for (const auto& obj_cut_info : object_tree) { + if (obj_cut_info.first == "cut_id") { + pt::ptree cut_id_tree = obj_cut_info.second; + cut_id = CutObjectBase(ObjectID( cut_id_tree.get(".id")), + cut_id_tree.get(".check_sum"), + cut_id_tree.get(".connectors_cnt")); + } + if (obj_cut_info.first == "connectors") { + pt::ptree cut_connectors_tree = obj_cut_info.second; + for (const auto& cut_connector : cut_connectors_tree) { + if (cut_connector.first != "connector") + continue; + pt::ptree connector_tree = cut_connector.second; + CutObjectInfo::Connector connector = {connector_tree.get(".volume_id"), + connector_tree.get(".type"), + connector_tree.get(".r_tolerance"), + connector_tree.get(".h_tolerance")}; + connectors.emplace_back(connector); + } + } + } + + CutObjectInfo cut_info {cut_id, connectors}; + m_cut_object_infos.insert({ obj_idx, cut_info }); + } + } + } + + void _BBS_3MF_Importer::_extract_print_config_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat, DynamicPrintConfig& config, ConfigSubstitutionContext& config_substitutions, const std::string& archive_filename) + { + if (stat.m_uncomp_size > 0) { + std::string buffer((size_t)stat.m_uncomp_size, 0); + mz_bool res = mz_zip_reader_extract_file_to_mem(&archive, stat.m_filename, (void*)buffer.data(), (size_t)stat.m_uncomp_size, 0); + if (res == 0) { + add_error("Error while reading config data to buffer"); + return; + } + ConfigBase::load_from_gcode_string_legacy(config, buffer.data(), config_substitutions); + } + } + + //BBS: extract project config from json files + void _BBS_3MF_Importer::_extract_project_config_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat, DynamicPrintConfig& config, ConfigSubstitutionContext& config_substitutions, Model& model) + { + if (stat.m_uncomp_size > 0) { + + std_path temp_file = extract_file(model, archive, stat); + bool ok = read_json_file_bambu(temp_file, config, config_substitutions, true); + if (!ok) { + add_error("Error load config from bambu/orca json"); + return; + } + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", load project config file successfully from %1%\n") % temp_file.string(); + } + } + + //BBS: extract project embedded presets + void _BBS_3MF_Importer::_extract_project_embedded_presets_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat, std::vector&project_presets, Model& model, Preset::Type type, bool use_json) + { + if (stat.m_uncomp_size > 0) { + + std_path dest_file_path = extract_file(model, archive, stat); + std::string dest_file = dest_file_path.string(); + //load presets + DynamicPrintConfig config; + ConfigSubstitutionContext config_substitution_context(ForwardCompatibilitySubstitutionRule::Enable); + std::map key_values; + bool ok = false; + if (use_json) { + ok = read_json_file_bambu(dest_file_path, config, config_substitution_context, true); + } else { + key_values = read_ini_file_bambu(dest_file_path); + ok = convert_settings_from_bambu(key_values, config, config_substitution_context, true); + } + if (!ok) { + add_error("Error load config from bambu/orca json"); + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(", load project embedded config from %1% failed\n") % dest_file; + //skip this file + return; + } + + + /*std::string src_file = decode_path(stat.m_filename); + std::size_t found = src_file.find(METADATA_DIR); + if (found != std::string::npos) + src_file = src_file.substr(found + METADATA_STR_LEN); + else + return;*/ + //std::string dest_file = m_backup_path + std::string("/") + "_temp_2.config";; + //std::string dest_zip_file = encode_path(dest_file.c_str()); + //mz_bool res = mz_zip_reader_extract_to_file(&archive, stat.m_file_index, dest_zip_file.c_str(), 0); + //BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", extract %1% from 3mf %2%, ret %3%\n") % dest_file % stat.m_filename % res; + //if (res == 0) { + // add_error("Error while extract auxiliary file to file"); + // return; + //} + ////load presets + //DynamicPrintConfig config; + ////ConfigSubstitutions config_substitutions = config.load_from_ini(dest_file, Enable); + //std::map key_values; + //std::string reason; + //ConfigSubstitutions config_substitutions = use_json? config.load_from_json(dest_file, Enable, key_values, reason) : config.load_from_ini(dest_file, Enable); + //if (!reason.empty()) { + // BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(", load project embedded config from %1% failed\n") % dest_file; + // //skip this file + // return; + //} + ConfigOptionString* print_name; + ConfigOptionStrings* filament_names; + std::string preset_name; + if (type == Preset::TYPE_FFF_PRINT) { + print_name = dynamic_cast < ConfigOptionString* > (config.option("print_settings_id")); + if (!print_name) { + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(", can not found print_settings_id from %1%\n") % dest_file; + //skip this file + return; + } + preset_name = print_name->value; + } + else if (type == Preset::TYPE_FFF_FILAMENT) { + filament_names = dynamic_cast < ConfigOptionStrings* > (config.option("filament_settings_id")); + if (!filament_names) { + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(", can not found filament_settings_id from %1%\n") % dest_file; + //skip this file + return; + } + preset_name = filament_names->values[0]; + } + else if (type == Preset::TYPE_PRINTER) { + print_name = dynamic_cast < ConfigOptionString* > (config.option("printer_settings_id")); + if (!print_name) { + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(", can not found printer_settings_id from %1%\n") % dest_file; + //skip this file + return; + } + preset_name = print_name->value; + } + else { + BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(", invalid type %1% from file %2%\n")% Preset::type_name(type) % dest_file; + //skip this file + return; + } + + //Preset(Type type, const std::string &name, bool is_default = false) : type(type), is_default(is_default), name(name) {} + Preset *preset = new Preset(type, preset_name, false); + preset->file = dest_file; + preset->config = std::move(config); + preset->loaded = true; + //preset->is_project_embedded = true; //Susi_not_impl + preset->is_external = true; + preset->is_dirty = false; + + std::string version_str = key_values[BBL_JSON_KEY_VERSION]; + boost::optional version = Semver::parse(version_str); + if (version) { + //preset->version = *version; //Susi_not_impl + } else { + //preset->version = this->m_bambuslicer_generator_version?*this->m_bambuslicer_generator_version: Semver(); //Susi_not_impl + } + /*for (int i = 0; i < config_substitutions.size(); i++) + { + //ConfigSubstitution config_substitution; + //config_substitution.opt_def = optdef; + //config_substitution.old_value = value; + //config_substitution.new_value = ConfigOptionUniquePtr(opt->clone()); + preset->loading_substitutions.emplace_back(std::move(config_substitutions[i])); + }*/ + //if (!config_substitutions.empty()) { + // preset->loading_substitutions = new ConfigSubstitutions(); + // *(preset->loading_substitutions) = std::move(config_substitutions); + //} //Susi_not_impl + + project_presets.push_back(preset); + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", create one project embedded preset: %1% from %2%, type %3%\n") % preset_name % dest_file %Preset::type_name(type); + } + } + + void _BBS_3MF_Importer::_extract_auxiliary_file_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat, Model& model) + { + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", stat.m_uncomp_size is %1%")%stat.m_uncomp_size; + if (stat.m_uncomp_size > 0) { + std::string dest_file; + if (stat.m_is_utf8) { + dest_file = stat.m_filename; + } else { + std::string extra(1024, 0); + size_t n = mz_zip_reader_get_extra(&archive, stat.m_file_index, extra.data(), extra.size()); + dest_file = ZipUnicodePathExtraField::decode(extra.substr(0, n), stat.m_filename); + } + //aux directory from model + std_path dir = get_temp_file(model); + std::size_t found = dest_file.find(AUXILIARY_DIR); + if (found != std::string::npos) + dest_file = dest_file.substr(found + AUXILIARY_STR_LEN); + else + return; + + if (dest_file.find('/') != std::string::npos) { + boost::filesystem::path src_path = boost::filesystem::path(dest_file); + boost::filesystem::path parent_path = src_path.parent_path(); + std::string temp_path = dir.string() + std::string("/") + parent_path.string(); + boost::filesystem::path parent_full_path = boost::filesystem::path(temp_path); + if (!boost::filesystem::exists(parent_full_path)) + boost::filesystem::create_directories(parent_full_path); + } + dest_file = dir.string() + std::string("/") + dest_file; + std::string dest_zip_file = encode_path(dest_file.c_str()); + mz_bool res = mz_zip_reader_extract_to_file(&archive, stat.m_file_index, dest_zip_file.c_str(), 0); + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", extract %1% from 3mf %2%, ret %3%\n") % dest_file % stat.m_filename % res; + if (res == 0) { + add_error("Error while extract auxiliary file to file"); + return; + } + } + } + + void _BBS_3MF_Importer::_extract_file_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat) + { + if (stat.m_uncomp_size > 0) { + std::string src_file = decode_path(stat.m_filename); + // BBS: use backup path + //aux directory from model + boost::filesystem::path dest_path = boost::filesystem::path(m_backup_path + "/" + src_file); + std::string dest_zip_file = encode_path(dest_path.string().c_str()); + mz_bool res = mz_zip_reader_extract_to_file(&archive, stat.m_file_index, dest_zip_file.c_str(), 0); + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(", extract %1% from 3mf %2%, ret %3%\n") % dest_path % stat.m_filename % res; + if (res == 0) { + add_error("Error while extract file to temp directory"); + return; + } + } + return; + } + + void _BBS_3MF_Importer::_extract_layer_heights_profile_config_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat) + { + if (stat.m_uncomp_size > 0) { + std::string buffer((size_t)stat.m_uncomp_size, 0); + mz_bool res = mz_zip_reader_extract_to_mem(&archive, stat.m_file_index, (void*)buffer.data(), (size_t)stat.m_uncomp_size, 0); + if (res == 0) { + add_error("Error while reading layer heights profile data to buffer"); + return; + } + + if (buffer.back() == '\n') + buffer.pop_back(); + + std::vector objects; + boost::split(objects, buffer, boost::is_any_of("\n"), boost::token_compress_off); + + for (const std::string& object : objects) { + std::vector object_data; + boost::split(object_data, object, boost::is_any_of("|"), boost::token_compress_off); + if (object_data.size() != 2) { + add_error("Error while reading object data"); + continue; + } + + std::vector object_data_id; + boost::split(object_data_id, object_data[0], boost::is_any_of("="), boost::token_compress_off); + if (object_data_id.size() != 2) { + add_error("Error while reading object id"); + continue; + } + + int object_id = std::atoi(object_data_id[1].c_str()); + if (object_id == 0) { + add_error("Found invalid object id"); + continue; + } + + IdToLayerHeightsProfileMap::iterator object_item = m_layer_heights_profiles.find(object_id); + if (object_item != m_layer_heights_profiles.end()) { + add_error("Found duplicated layer heights profile"); + continue; + } + + std::vector object_data_profile; + boost::split(object_data_profile, object_data[1], boost::is_any_of(";"), boost::token_compress_off); + if (object_data_profile.size() <= 4 || object_data_profile.size() % 2 != 0) { + add_error("Found invalid layer heights profile"); + continue; + } + + std::vector profile; + profile.reserve(object_data_profile.size()); + + for (const std::string& value : object_data_profile) { + profile.push_back((coordf_t)std::atof(value.c_str())); + } + + m_layer_heights_profiles.insert({ object_id, profile }); + } + } + } + + void _BBS_3MF_Importer::_extract_layer_config_ranges_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat, ConfigSubstitutionContext& config_substitutions) + { + if (stat.m_uncomp_size > 0) { + std::string buffer((size_t)stat.m_uncomp_size, 0); + mz_bool res = mz_zip_reader_extract_file_to_mem(&archive, stat.m_filename, (void*)buffer.data(), (size_t)stat.m_uncomp_size, 0); + if (res == 0) { + add_error("Error while reading layer config ranges data to buffer"); + return; + } + + std::istringstream iss(buffer); // wrap returned xml to istringstream + pt::ptree objects_tree; + pt::read_xml(iss, objects_tree); + + for (const auto& object : objects_tree.get_child("objects")) { + pt::ptree object_tree = object.second; + int obj_idx = object_tree.get(".id", -1); + if (obj_idx <= 0) { + add_error("Found invalid object id"); + continue; + } + + IdToLayerConfigRangesMap::iterator object_item = m_layer_config_ranges.find(obj_idx); + if (object_item != m_layer_config_ranges.end()) { + add_error("Found duplicated layer config range"); + continue; + } + + t_layer_config_ranges config_ranges; + + for (const auto& range : object_tree) { + if (range.first != "range") + continue; + pt::ptree range_tree = range.second; + double min_z = range_tree.get(".min_z"); + double max_z = range_tree.get(".max_z"); + + // get Z range information + DynamicPrintConfig config; + + std::map key_values_to_deserialize; + for (const auto& option : range_tree) { + if (option.first != "option") + continue; + std::string opt_key = option.second.get(".opt_key"); + std::string value = option.second.data(); + + //config.set_deserialize(opt_key, value, config_substitutions); + key_values_to_deserialize[opt_key] = value; + } + assert(key_values_to_deserialize.find("extruder") != key_values_to_deserialize.end()); + assert(key_values_to_deserialize.find("layer_height") != key_values_to_deserialize.end()); + convert_settings_from_bambu(key_values_to_deserialize, config, config_substitutions, false); + config_ranges[{ min_z, max_z }].assign_config(std::move(config)); + } + + if (!config_ranges.empty()) + m_layer_config_ranges.insert({ obj_idx, std::move(config_ranges) }); + } + } + } + /* + void _BBS_3MF_Importer::_extract_sla_support_points_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat) + { + if (stat.m_uncomp_size > 0) { + std::string buffer((size_t)stat.m_uncomp_size, 0); + mz_bool res = mz_zip_reader_extract_file_to_mem(&archive, stat.m_filename, (void*)buffer.data(), (size_t)stat.m_uncomp_size, 0); + if (res == 0) { + add_error("Error while reading sla support points data to buffer"); + return; + } + + if (buffer.back() == '\n') + buffer.pop_back(); + + std::vector objects; + boost::split(objects, buffer, boost::is_any_of("\n"), boost::token_compress_off); + + // Info on format versioning - see 3mf.hpp + int version = 0; + std::string key("support_points_format_version="); + if (!objects.empty() && objects[0].find(key) != std::string::npos) { + objects[0].erase(objects[0].begin(), objects[0].begin() + long(key.size())); // removes the string + version = std::stoi(objects[0]); + objects.erase(objects.begin()); // pop the header + } + + for (const std::string& object : objects) { + std::vector object_data; + boost::split(object_data, object, boost::is_any_of("|"), boost::token_compress_off); + + if (object_data.size() != 2) { + add_error("Error while reading object data"); + continue; + } + + std::vector object_data_id; + boost::split(object_data_id, object_data[0], boost::is_any_of("="), boost::token_compress_off); + if (object_data_id.size() != 2) { + add_error("Error while reading object id"); + continue; + } + + int object_id = std::atoi(object_data_id[1].c_str()); + if (object_id == 0) { + add_error("Found invalid object id"); + continue; + } + + IdToSlaSupportPointsMap::iterator object_item = m_sla_support_points.find(object_id); + if (object_item != m_sla_support_points.end()) { + add_error("Found duplicated SLA support points"); + continue; + } + + std::vector object_data_points; + boost::split(object_data_points, object_data[1], boost::is_any_of(" "), boost::token_compress_off); + + std::vector sla_support_points; + + if (version == 0) { + for (unsigned int i=0; i 0) { + std::string buffer(size_t(stat.m_uncomp_size), 0); + mz_bool res = mz_zip_reader_extract_file_to_mem(&archive, stat.m_filename, (void*)buffer.data(), (size_t)stat.m_uncomp_size, 0); + if (res == 0) { + add_error("Error while reading sla support points data to buffer"); + return; + } + + if (buffer.back() == '\n') + buffer.pop_back(); + + std::vector objects; + boost::split(objects, buffer, boost::is_any_of("\n"), boost::token_compress_off); + + // Info on format versioning - see 3mf.hpp + int version = 0; + std::string key("drain_holes_format_version="); + if (!objects.empty() && objects[0].find(key) != std::string::npos) { + objects[0].erase(objects[0].begin(), objects[0].begin() + long(key.size())); // removes the string + version = std::stoi(objects[0]); + objects.erase(objects.begin()); // pop the header + } + + for (const std::string& object : objects) { + std::vector object_data; + boost::split(object_data, object, boost::is_any_of("|"), boost::token_compress_off); + + if (object_data.size() != 2) { + add_error("Error while reading object data"); + continue; + } + + std::vector object_data_id; + boost::split(object_data_id, object_data[0], boost::is_any_of("="), boost::token_compress_off); + if (object_data_id.size() != 2) { + add_error("Error while reading object id"); + continue; + } + + int object_id = std::atoi(object_data_id[1].c_str()); + if (object_id == 0) { + add_error("Found invalid object id"); + continue; + } + + IdToSlaDrainHolesMap::iterator object_item = m_sla_drain_holes.find(object_id); + if (object_item != m_sla_drain_holes.end()) { + add_error("Found duplicated SLA drain holes"); + continue; + } + + std::vector object_data_points; + boost::split(object_data_points, object_data[1], boost::is_any_of(" "), boost::token_compress_off); + + sla::DrainHoles sla_drain_holes; + + if (version == 1) { + for (unsigned int i=0; i(stat.m_uncomp_size, '\0'); + mz_bool res = mz_zip_reader_extract_to_mem(&archive, stat.m_file_index, (void *) file->data(), stat.m_uncomp_size, 0); + if (res == 0) { + add_error("Error while reading svg shape for emboss"); + return; + } + + // store for case svg is loaded before volume + m_path_to_emboss_shape_files[filename] = std::move(file); + + // find embossed volume, for case svg is loaded after volume + //for (const ModelObject* object : m_model->objects) + //for (ModelVolume *volume : object->volumes) { + // std::optional &es = volume->emboss_shape; + // if (!es.has_value()) + // continue; + // std::optional &svg = es->svg_file; + // if (!svg.has_value()) + // continue; + // if (filename.compare(svg->path_in_3mf) == 0) + // svg->file_data = m_path_to_emboss_shape_files[filename]; + //} //Susi_not_impl + } + + void _BBS_3MF_Importer::_extract_custom_gcode_per_print_z_from_archive(::mz_zip_archive &archive, const mz_zip_archive_file_stat &stat) + { + //BBS: add plate tree related logic + if (stat.m_uncomp_size > 0) { + std::string buffer((size_t)stat.m_uncomp_size, 0); + mz_bool res = mz_zip_reader_extract_file_to_mem(&archive, stat.m_filename, (void*)buffer.data(), (size_t)stat.m_uncomp_size, 0); + if (res == 0) { + add_error("Error while reading custom Gcodes per height data to buffer"); + return; + } + + std::istringstream iss(buffer); // wrap returned xml to istringstream + pt::ptree main_tree; + pt::read_xml(iss, main_tree); + + if (main_tree.front().first != "custom_gcodes_per_layer") + return; + + auto extract_code = [this](int plate_id, pt::ptree code_tree) { + for (const auto& code : code_tree) { + if (code.first == "mode") { + pt::ptree tree = code.second; + std::string mode = tree.get(".value"); + //m_model->plates_custom_gcodes[plate_id - 1].mode = mode == CustomGCode::SingleExtruderMode ? CustomGCode::Mode::SingleExtruder : + // mode == CustomGCode::MultiAsSingleMode ? CustomGCode::Mode::MultiAsSingle : + // CustomGCode::Mode::MultiExtruder; //Susi_not_impl + } + if (code.first == "layer") { + pt::ptree tree = code.second; + double print_z = tree.get(".top_z"); + int extruder = tree.get(".extruder"); + std::string color = tree.get(".color"); + + CustomGCode::Type type; + std::string extra; + pt::ptree attr_tree = tree.find("")->second; + if (attr_tree.find("type") == attr_tree.not_found()) { + // It means that data was saved in old version (2.2.0 and older) of PrusaSlicer + // read old data ... + std::string gcode = tree.get(".gcode"); + // ... and interpret them to the new data + type = gcode == "M600" ? CustomGCode::ColorChange : + gcode == "M601" ? CustomGCode::PausePrint : + gcode == "tool_change" ? CustomGCode::ToolChange : CustomGCode::Custom; + extra = type == CustomGCode::PausePrint ? color : + type == CustomGCode::Custom ? gcode : ""; + } + else { + type = static_cast(tree.get(".type")); + extra = tree.get(".extra"); + } + //m_model->plates_custom_gcodes[plate_id - 1].gcodes.push_back(CustomGCode::Item{ print_z, type, extruder, color, extra }); //Susi_not_impl + } + } + }; + + //m_model->plates_custom_gcodes.clear(); //Susi_not_impl + + bool has_plate_info = false; + for (const auto& element : main_tree.front().second) { + if (element.first == "plate") { + has_plate_info = true; + + int plate_id = -1; + pt::ptree code_tree = element.second; + for (const auto& code : code_tree) { + if (code.first == "plate_info") { + plate_id = code.second.get(".id"); + } + + } + if (plate_id == -1) + continue; + + extract_code(plate_id, code_tree); + } + } + + if (!has_plate_info) { + int plate_id = 1; + pt::ptree code_tree = main_tree.front().second; + extract_code(plate_id, code_tree); + } + } + } + + void _BBS_3MF_Importer::_handle_start_model_xml_element(const char* name, const char** attributes) + { + if (m_xml_parser == nullptr) + return; + + bool res = true; + unsigned int num_attributes = (unsigned int)XML_GetSpecifiedAttributeCount(m_xml_parser); + + if (::strcmp(MODEL_TAG, name) == 0) + res = _handle_start_model(attributes, num_attributes); + else if (::strcmp(RESOURCES_TAG, name) == 0) + res = _handle_start_resources(attributes, num_attributes); + else if (::strcmp(OBJECT_TAG, name) == 0) + res = _handle_start_object(attributes, num_attributes); + else if (::strcmp(COLOR_GROUP_TAG, name) == 0) + res = _handle_start_color_group(attributes, num_attributes); + else if (::strcmp(COLOR_TAG, name) == 0) + res = _handle_start_color(attributes, num_attributes); + else if (::strcmp(MESH_TAG, name) == 0) + res = _handle_start_mesh(attributes, num_attributes); + else if (::strcmp(VERTICES_TAG, name) == 0) + res = _handle_start_vertices(attributes, num_attributes); + else if (::strcmp(VERTEX_TAG, name) == 0) + res = _handle_start_vertex(attributes, num_attributes); + else if (::strcmp(TRIANGLES_TAG, name) == 0) + res = _handle_start_triangles(attributes, num_attributes); + else if (::strcmp(TRIANGLE_TAG, name) == 0) + res = _handle_start_triangle(attributes, num_attributes); + else if (::strcmp(COMPONENTS_TAG, name) == 0) + res = _handle_start_components(attributes, num_attributes); + else if (::strcmp(COMPONENT_TAG, name) == 0) + res = _handle_start_component(attributes, num_attributes); + else if (::strcmp(BUILD_TAG, name) == 0) + res = _handle_start_build(attributes, num_attributes); + else if (::strcmp(ITEM_TAG, name) == 0) + res = _handle_start_item(attributes, num_attributes); + else if (::strcmp(METADATA_TAG, name) == 0) + res = _handle_start_metadata(attributes, num_attributes); + + if (!res) + _stop_xml_parser(); + } + + void _BBS_3MF_Importer::_handle_end_model_xml_element(const char* name) + { + if (m_xml_parser == nullptr) + return; + + bool res = true; + + if (::strcmp(MODEL_TAG, name) == 0) + res = _handle_end_model(); + else if (::strcmp(RESOURCES_TAG, name) == 0) + res = _handle_end_resources(); + else if (::strcmp(OBJECT_TAG, name) == 0) + res = _handle_end_object(); + else if (::strcmp(COLOR_GROUP_TAG, name) == 0) + res = _handle_end_color_group(); + else if (::strcmp(COLOR_TAG, name) == 0) + res = _handle_end_color(); + else if (::strcmp(MESH_TAG, name) == 0) + res = _handle_end_mesh(); + else if (::strcmp(VERTICES_TAG, name) == 0) + res = _handle_end_vertices(); + else if (::strcmp(VERTEX_TAG, name) == 0) + res = _handle_end_vertex(); + else if (::strcmp(TRIANGLES_TAG, name) == 0) + res = _handle_end_triangles(); + else if (::strcmp(TRIANGLE_TAG, name) == 0) + res = _handle_end_triangle(); + else if (::strcmp(COMPONENTS_TAG, name) == 0) + res = _handle_end_components(); + else if (::strcmp(COMPONENT_TAG, name) == 0) + res = _handle_end_component(); + else if (::strcmp(BUILD_TAG, name) == 0) + res = _handle_end_build(); + else if (::strcmp(ITEM_TAG, name) == 0) + res = _handle_end_item(); + else if (::strcmp(METADATA_TAG, name) == 0) + res = _handle_end_metadata(); + + if (!res) + _stop_xml_parser(); + } + + void _BBS_3MF_Importer::_handle_xml_characters(const XML_Char* s, int len) + { + m_curr_characters.append(s, len); + } + + void _BBS_3MF_Importer::_handle_start_config_xml_element(const char* name, const char** attributes) + { + if (m_xml_parser == nullptr) + return; + + bool res = true; + unsigned int num_attributes = (unsigned int)XML_GetSpecifiedAttributeCount(m_xml_parser); + + if (::strcmp(CONFIG_TAG, name) == 0) + res = _handle_start_config(attributes, num_attributes); + else if (::strcmp(OBJECT_TAG, name) == 0) + res = _handle_start_config_object(attributes, num_attributes); + else if (::strcmp(VOLUME_TAG, name) == 0) + res = _handle_start_config_volume(attributes, num_attributes); + else if (::strcmp(PART_TAG, name) == 0) + res = _handle_start_config_volume(attributes, num_attributes); + else if (::strcmp(MESH_STAT_TAG, name) == 0) + res = _handle_start_config_volume_mesh(attributes, num_attributes); + else if (::strcmp(METADATA_TAG, name) == 0) + res = _handle_start_config_metadata(attributes, num_attributes); + else if (::strcmp(SHAPE_TAG, name) == 0) + res = _handle_start_shape_configuration(attributes, num_attributes); + else if (::strcmp(TEXT_TAG, name) == 0) + res = _handle_start_text_configuration(attributes, num_attributes); + else if (::strcmp(PLATE_TAG, name) == 0) + res = _handle_start_config_plater(attributes, num_attributes); + else if (::strcmp(INSTANCE_TAG, name) == 0) + res = _handle_start_config_plater_instance(attributes, num_attributes); + else if (::strcmp(FILAMENT_TAG, name) == 0) + res = _handle_start_config_filament(attributes, num_attributes); + else if (::strcmp(SLICE_WARNING_TAG, name) == 0) + res = _handle_start_config_warning(attributes, num_attributes); + else if (::strcmp(ASSEMBLE_TAG, name) == 0) + res = _handle_start_assemble(attributes, num_attributes); + else if (::strcmp(ASSEMBLE_ITEM_TAG, name) == 0) + res = _handle_start_assemble_item(attributes, num_attributes); + else if (::strcmp(TEXT_INFO_TAG, name) == 0) + res = _handle_start_text_info_item(attributes, num_attributes); + + if (!res) + _stop_xml_parser(); + } + + void _BBS_3MF_Importer::_handle_end_config_xml_element(const char* name) + { + if (m_xml_parser == nullptr) + return; + + bool res = true; + + if (::strcmp(CONFIG_TAG, name) == 0) + res = _handle_end_config(); + else if (::strcmp(OBJECT_TAG, name) == 0) + res = _handle_end_config_object(); + else if (::strcmp(VOLUME_TAG, name) == 0) + res = _handle_end_config_volume(); + else if (::strcmp(PART_TAG, name) == 0) + res = _handle_end_config_volume(); + else if (::strcmp(MESH_STAT_TAG, name) == 0) + res = _handle_end_config_volume_mesh(); + else if (::strcmp(METADATA_TAG, name) == 0) + res = _handle_end_config_metadata(); + else if (::strcmp(PLATE_TAG, name) == 0) + res = _handle_end_config_plater(); + else if (::strcmp(FILAMENT_TAG, name) == 0) + res = _handle_end_config_filament(); + else if (::strcmp(INSTANCE_TAG, name) == 0) + res = _handle_end_config_plater_instance(); + else if (::strcmp(ASSEMBLE_TAG, name) == 0) + res = _handle_end_assemble(); + else if (::strcmp(ASSEMBLE_ITEM_TAG, name) == 0) + res = _handle_end_assemble_item(); + + if (!res) + _stop_xml_parser(); + } + + bool _BBS_3MF_Importer::_handle_start_model(const char** attributes, unsigned int num_attributes) + { + m_unit_factor = bbs_get_unit_factor(bbs_get_attribute_value_string(attributes, num_attributes, UNIT_ATTR)); + + return true; + } + + bool _BBS_3MF_Importer::_handle_end_model() + { + // BBS: Production Extension + if (!m_sub_model_path.empty()) + return true; + + // deletes all non-built or non-instanced objects + for (const IdToModelObjectMap::value_type& object : m_objects) { + if (object.second >= int(m_model->objects.size())) { + add_error("Unable to find object"); + return false; + } + ModelObject *model_object = m_model->objects[object.second]; + if (model_object != nullptr && model_object->instances.size() == 0) + m_model->delete_object(model_object); + } + + //construct the index maps + for (const IdToCurrentObjectMap::value_type& object : m_current_objects) { + m_index_paths.insert({ object.first.second, object.first.first}); + } + + if (!m_is_bbl_3mf) { + // if the 3mf was not produced by OrcaSlicer and there is only one object, + // set the object name to match the filename + if (m_model->objects.size() == 1) + m_model->objects.front()->name = m_name; + } + + // applies instances' matrices + for (Instance& instance : m_instances) { + if (instance.instance != nullptr && instance.instance->get_object() != nullptr) + // apply the transform to the instance + _apply_transform(*instance.instance, instance.transform); + } + + return true; + } + + bool _BBS_3MF_Importer::_handle_start_resources(const char** attributes, unsigned int num_attributes) + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_end_resources() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_start_object(const char** attributes, unsigned int num_attributes) + { + // reset current object data + if (m_curr_object) { + delete m_curr_object; + m_curr_object = nullptr; + } + + std::string object_type = bbs_get_attribute_value_string(attributes, num_attributes, TYPE_ATTR); + + if (bbs_is_valid_object_type(object_type)) { + if (!m_curr_object) { + m_curr_object = new CurrentObject(); + // create new object (it may be removed later if no instances are generated from it) + /*m_curr_object->model_object_idx = (int)m_model->objects.size(); + m_curr_object.object = m_model->add_object(); + if (m_curr_object.object == nullptr) { + add_error("Unable to create object"); + return false; + }*/ + } + + m_curr_object->id = bbs_get_attribute_value_int(attributes, num_attributes, ID_ATTR); + m_curr_object->name = bbs_get_attribute_value_string(attributes, num_attributes, NAME_ATTR); + + m_curr_object->uuid = bbs_get_attribute_value_string(attributes, num_attributes, PUUID_ATTR); + if (m_curr_object->uuid.empty()) { + m_curr_object->uuid = bbs_get_attribute_value_string(attributes, num_attributes, PUUID_LOWER_ATTR); + } + m_curr_object->pid = bbs_get_attribute_value_int(attributes, num_attributes, PID_ATTR); + } + + return true; + } + + bool _BBS_3MF_Importer::_handle_end_object() + { + if (!m_load_model) { + delete m_curr_object; + m_curr_object = nullptr; + return true; + } + if (!m_curr_object || (m_curr_object->id == -1)) { + add_error("Found invalid object"); + return false; + } + else { + if (m_is_bbl_3mf && boost::ends_with(m_curr_object->uuid, OBJECT_UUID_SUFFIX) && m_load_restore) { + // Adjust backup object/volume id + std::istringstream iss(m_curr_object->uuid); + int backup_id; + bool need_replace = false; + if (iss >> std::hex >> backup_id) { + need_replace = (m_curr_object->id != backup_id); + m_curr_object->id = backup_id; + } + if (!m_curr_object->components.empty()) + { + Id first_id = m_curr_object->components.front().object_id; + first_id.second = 0; + IdToCurrentObjectMap::iterator current_object = m_current_objects.lower_bound(first_id); + IdToCurrentObjectMap new_map; + for (int index = 0; index < m_curr_object->components.size(); index++) + { + Component& component = m_curr_object->components[index]; + Id new_id = component.object_id; + new_id.second = (index + 1) << 16 | backup_id; + if (current_object != m_current_objects.end() + && (new_id.first.empty() || new_id.first == current_object->first.first)) { + current_object->second.id = new_id.second; + new_map.insert({new_id, std::move(current_object->second)}); + current_object = m_current_objects.erase(current_object); + } + else { + add_error("can not find object for component, id=" + std::to_string(component.object_id.second)); + delete m_curr_object; + m_curr_object = nullptr; + return false; + } + component.object_id.second = new_id.second; + } + for (auto & obj : new_map) + m_current_objects.insert({obj.first, std::move(obj.second)}); + } + } + + Id id = std::make_pair(m_sub_model_path, m_curr_object->id); + if (m_current_objects.find(id) == m_current_objects.end()) { + m_current_objects.insert({ id, std::move(*m_curr_object) }); + delete m_curr_object; + m_curr_object = nullptr; + } + else { + add_error("Found object with duplicate id"); + delete m_curr_object; + m_curr_object = nullptr; + return false; + } + } + + /*if (m_curr_object.object != nullptr) { + if (m_curr_object.id != -1) { + if (m_curr_object.geometry.empty()) { + // no geometry defined + // remove the object from the model + m_model->delete_object(m_curr_object.object); + + if (m_curr_object.components.empty()) { + // no components defined -> invalid object, delete it + IdToModelObjectMap::iterator object_item = m_objects.find(id); + if (object_item != m_objects.end()) + m_objects.erase(object_item); + + IdToAliasesMap::iterator alias_item = m_objects_aliases.find(id); + if (alias_item != m_objects_aliases.end()) + m_objects_aliases.erase(alias_item); + } + else + // adds components to aliases + m_objects_aliases.insert({ id, m_curr_object.components }); + } + else { + // geometry defined, store it for later use + m_geometries.insert({ id, std::move(m_curr_object.geometry) }); + + // stores the object for later use + if (m_objects.find(id) == m_objects.end()) { + m_objects.insert({ id, m_curr_object.model_object_idx }); + m_objects_aliases.insert({ id, { 1, Component(m_curr_object.id) } }); // aliases itself + } + else { + add_error("Found object with duplicate id"); + return false; + } + } + } + else { + //sub objects + } + }*/ + + return true; + } + + bool _BBS_3MF_Importer::_handle_start_color_group(const char **attributes, unsigned int num_attributes) + { + m_current_color_group = bbs_get_attribute_value_int(attributes, num_attributes, ID_ATTR); + return true; + } + + bool _BBS_3MF_Importer::_handle_end_color_group() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_start_color(const char **attributes, unsigned int num_attributes) + { + std::string color = bbs_get_attribute_value_string(attributes, num_attributes, COLOR_ATTR); + m_group_id_to_color[m_current_color_group] = color; + return true; + } + + bool _BBS_3MF_Importer::_handle_end_color() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_start_mesh(const char** attributes, unsigned int num_attributes) + { + // reset current geometry + if (m_curr_object) + m_curr_object->geometry.reset(); + return true; + } + + bool _BBS_3MF_Importer::_handle_end_mesh() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_start_vertices(const char** attributes, unsigned int num_attributes) + { + // reset current vertices + if (m_curr_object) + m_curr_object->geometry.vertices.clear(); + return true; + } + + bool _BBS_3MF_Importer::_handle_end_vertices() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_start_vertex(const char** attributes, unsigned int num_attributes) + { + // appends the vertex coordinates + // missing values are set equal to ZERO + if (m_curr_object) + m_curr_object->geometry.vertices.emplace_back( + m_unit_factor * bbs_get_attribute_value_float(attributes, num_attributes, X_ATTR), + m_unit_factor * bbs_get_attribute_value_float(attributes, num_attributes, Y_ATTR), + m_unit_factor * bbs_get_attribute_value_float(attributes, num_attributes, Z_ATTR)); + return true; + } + + bool _BBS_3MF_Importer::_handle_end_vertex() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_start_triangles(const char** attributes, unsigned int num_attributes) + { + // reset current triangles + if (m_curr_object) + m_curr_object->geometry.triangles.clear(); + return true; + } + + bool _BBS_3MF_Importer::_handle_end_triangles() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_start_triangle(const char** attributes, unsigned int num_attributes) + { + // we are ignoring the following attributes: + // p1 + // p2 + // p3 + // pid + // see specifications + + // appends the triangle's vertices indices + // missing values are set equal to ZERO + if (m_curr_object) { + m_curr_object->geometry.triangles.emplace_back( + bbs_get_attribute_value_int(attributes, num_attributes, V1_ATTR), + bbs_get_attribute_value_int(attributes, num_attributes, V2_ATTR), + bbs_get_attribute_value_int(attributes, num_attributes, V3_ATTR)); + + m_curr_object->geometry.custom_supports.push_back(bbs_get_attribute_value_string(attributes, num_attributes, CUSTOM_SUPPORTS_ATTR)); + m_curr_object->geometry.custom_seam.push_back(bbs_get_attribute_value_string(attributes, num_attributes, CUSTOM_SEAM_ATTR)); + m_curr_object->geometry.mmu_segmentation.push_back(bbs_get_attribute_value_string(attributes, num_attributes, MMU_SEGMENTATION_ATTR)); + // BBS + m_curr_object->geometry.face_properties.push_back(bbs_get_attribute_value_string(attributes, num_attributes, FACE_PROPERTY_ATTR)); + } + return true; + } + + bool _BBS_3MF_Importer::_handle_end_triangle() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_start_components(const char** attributes, unsigned int num_attributes) + { + // reset current components + if (m_curr_object) + m_curr_object->components.clear(); + return true; + } + + bool _BBS_3MF_Importer::_handle_end_components() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_start_component(const char** attributes, unsigned int num_attributes) + { + std::string path = xml_unescape(bbs_get_attribute_value_string(attributes, num_attributes, PPATH_ATTR)); + int object_id = bbs_get_attribute_value_int(attributes, num_attributes, OBJECTID_ATTR); + Transform3d transform = bbs_get_transform_from_3mf_specs_string(bbs_get_attribute_value_string(attributes, num_attributes, TRANSFORM_ATTR)); + + /*Id id = std::make_pair(m_sub_model_path, object_id); + IdToModelObjectMap::iterator object_item = m_objects.find(id); + if (object_item == m_objects.end()) { + IdToAliasesMap::iterator alias_item = m_objects_aliases.find(id); + if (alias_item == m_objects_aliases.end()) { + add_error("Found component with invalid object id"); + return false; + } + }*/ + + if (m_curr_object) { + Id id = std::make_pair(m_sub_model_path.empty() ? path : m_sub_model_path, object_id); + m_curr_object->components.emplace_back(id, transform); + } + + return true; + } + + bool _BBS_3MF_Importer::_handle_end_component() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_start_build(const char** attributes, unsigned int num_attributes) + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_end_build() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_start_item(const char** attributes, unsigned int num_attributes) + { + // we are ignoring the following attributes + // thumbnail + // partnumber + // pid + // pindex + // see specifications + + int object_id = bbs_get_attribute_value_int(attributes, num_attributes, OBJECTID_ATTR); + std::string path = bbs_get_attribute_value_string(attributes, num_attributes, PPATH_ATTR); + Transform3d transform = bbs_get_transform_from_3mf_specs_string(bbs_get_attribute_value_string(attributes, num_attributes, TRANSFORM_ATTR)); + int printable = bbs_get_attribute_value_bool(attributes, num_attributes, PRINTABLE_ATTR); + + return !m_load_model || _create_object_instance(path, object_id, transform, printable, 1); + } + + bool _BBS_3MF_Importer::_handle_end_item() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_start_metadata(const char** attributes, unsigned int num_attributes) + { + m_curr_characters.clear(); + + std::string name = bbs_get_attribute_value_string(attributes, num_attributes, NAME_ATTR); + if (!name.empty()) { + m_curr_metadata_name = name; + } + + return true; + } + + inline static void check_painting_version(unsigned int loaded_version, unsigned int highest_supported_version, const std::string &error_msg) + { + if (loaded_version > highest_supported_version) + throw version_error(error_msg); + } + + bool _BBS_3MF_Importer::_handle_end_metadata() + { + if ((m_curr_metadata_name == BBS_3MF_VERSION)||(m_curr_metadata_name == BBS_3MF_VERSION1)) { + //m_is_bbl_3mf = true; + m_version = (unsigned int)atoi(m_curr_characters.c_str()); + /*if (m_check_version && (m_version > VERSION_BBS_3MF_COMPATIBLE)) { + // std::string msg = _(L("The selected 3mf file has been saved with a newer version of " + std::string(SLIC3R_APP_NAME) + " and is not compatible.")); + // throw version_error(msg.c_str()); + const std::string msg = (boost::format(_(L("The selected 3mf file has been saved with a newer version of %1% and is not compatible."))) % std::string(SLIC3R_APP_NAME)).str(); + throw version_error(msg); + }*/ + } else if (m_curr_metadata_name == BBL_APPLICATION_TAG) { + // Generator application of the 3MF. + // SLIC3R_APP_KEY - SoftFever_VERSION + if (boost::starts_with(m_curr_characters, "BambuStudio-")) { + m_is_bbl_3mf = true; + m_bambuslicer_generator_version = Semver::parse(m_curr_characters.substr(12)); + } + else if (boost::starts_with(m_curr_characters, "OrcaSlicer-")) { + m_is_bbl_3mf = true; + m_bambuslicer_generator_version = Semver::parse(m_curr_characters.substr(11)); + } + //TODO: currently use version 0, no need to load&&save this string + /*} else if (m_curr_metadata_name == BBS_FDM_SUPPORTS_PAINTING_VERSION) { + m_fdm_supports_painting_version = (unsigned int) atoi(m_curr_characters.c_str()); + check_painting_version(m_fdm_supports_painting_version, FDM_SUPPORTS_PAINTING_VERSION, + _(L("The selected 3MF contains FDM supports painted object using a newer version of OrcaSlicer and is not compatible."))); + } else if (m_curr_metadata_name == BBS_SEAM_PAINTING_VERSION) { + m_seam_painting_version = (unsigned int) atoi(m_curr_characters.c_str()); + check_painting_version(m_seam_painting_version, SEAM_PAINTING_VERSION, + _(L("The selected 3MF contains seam painted object using a newer version of OrcaSlicer and is not compatible."))); + } else if (m_curr_metadata_name == BBS_MM_PAINTING_VERSION) { + m_mm_painting_version = (unsigned int) atoi(m_curr_characters.c_str()); + check_painting_version(m_mm_painting_version, MM_PAINTING_VERSION, + _(L("The selected 3MF contains multi-material painted object using a newer version of OrcaSlicer and is not compatible.")));*/ + } else if (m_curr_metadata_name == BBL_MODEL_ID_TAG) { + m_model_id = xml_unescape(m_curr_characters); + } else if (m_curr_metadata_name == BBL_MODEL_NAME_TAG) { + BOOST_LOG_TRIVIAL(trace) << "design_info, load_3mf found model name = " << m_curr_characters; + //model_info.model_name = xml_unescape(m_curr_characters); //Susi_not_impl + } else if (m_curr_metadata_name == BBL_ORIGIN_TAG) { + BOOST_LOG_TRIVIAL(trace) << "design_info, load_3mf found model name = " << m_curr_characters; + //model_info.origin = xml_unescape(m_curr_characters); //Susi_not_impl + } else if (m_curr_metadata_name == BBL_DESIGNER_TAG) { + BOOST_LOG_TRIVIAL(trace) << "design_info, load_3mf found designer = " << m_curr_characters; + m_designer = xml_unescape(m_curr_characters); + } else if (m_curr_metadata_name == BBL_DESIGNER_USER_ID_TAG) { + BOOST_LOG_TRIVIAL(trace) << "design_info, load_3mf found designer_user_id = " << m_curr_characters; + m_designer_user_id = xml_unescape(m_curr_characters); + } else if (m_curr_metadata_name == BBL_DESIGNER_COVER_FILE_TAG) { + BOOST_LOG_TRIVIAL(trace) << "design_info, load_3mf found designer_cover = " << m_curr_characters; + //model_info.cover_file = xml_unescape(m_curr_characters); //Susi_not_impl + } else if (m_curr_metadata_name == BBL_DESCRIPTION_TAG) { + BOOST_LOG_TRIVIAL(trace) << "design_info, load_3mf found description = " << m_curr_characters; + //model_info.description = xml_unescape(m_curr_characters); //Susi_not_impl + } else if (m_curr_metadata_name == BBL_LICENSE_TAG) { + BOOST_LOG_TRIVIAL(trace) << "design_info, load_3mf found license = " << m_curr_characters; + //model_info.license = xml_unescape(m_curr_characters); //Susi_not_impl + } else if (m_curr_metadata_name == BBL_COPYRIGHT_TAG) { + BOOST_LOG_TRIVIAL(trace) << "design_info, load_3mf found CopyRight = " << m_curr_characters; + //model_info.copyright = xml_unescape(m_curr_characters); //Susi_not_impl + } else if (m_curr_metadata_name == BBL_COPYRIGHT_NORMATIVE_TAG) { + BOOST_LOG_TRIVIAL(trace) << "design_info, load_3mf found Copyright = " << m_curr_characters; + //model_info.copyright = xml_unescape(m_curr_characters); //Susi_not_impl + } else if (m_curr_metadata_name == BBL_REGION_TAG) { + BOOST_LOG_TRIVIAL(trace) << "design_info, load_3mf found region = " << m_curr_characters; + m_contry_code = xml_unescape(m_curr_characters); + } else if (m_curr_metadata_name == BBL_PROFILE_TITLE_TAG) { + BOOST_LOG_TRIVIAL(trace) << "design_info, load_3mf found profile_title = " << m_curr_characters; + m_profile_title = xml_unescape(m_curr_characters); + } else if (m_curr_metadata_name == BBL_PROFILE_COVER_TAG) { + BOOST_LOG_TRIVIAL(trace) << "design_info, load_3mf found profile_cover = " << m_curr_characters; + m_profile_cover = xml_unescape(m_curr_characters); + } else if (m_curr_metadata_name == BBL_PROFILE_DESCRIPTION_TAG) { + BOOST_LOG_TRIVIAL(trace) << "design_info, load_3mf found profile_description = " << m_curr_characters; + m_Profile_description = xml_unescape(m_curr_characters); + } else if (m_curr_metadata_name == BBL_PROFILE_USER_ID_TAG) { + BOOST_LOG_TRIVIAL(trace) << "design_info, load_3mf found profile_user_id = " << m_curr_characters; + m_profile_user_id = xml_unescape(m_curr_characters); + }else if (m_curr_metadata_name == BBL_PROFILE_USER_NAME_TAG) { + BOOST_LOG_TRIVIAL(trace) << "design_info, load_3mf found profile_user_name = " << m_curr_characters; + m_profile_user_name = xml_unescape(m_curr_characters); + } else if (m_curr_metadata_name == BBL_CREATION_DATE_TAG) { + ; + } else if (m_curr_metadata_name == BBL_MODIFICATION_TAG) { + ; + } else { + ; + } + if (!m_curr_metadata_name.empty()) { + BOOST_LOG_TRIVIAL(info) << "load_3mf found metadata key = " << m_curr_metadata_name << ", value = " << xml_unescape(m_curr_characters); + //model_info.metadata_items[m_curr_metadata_name] = xml_unescape(m_curr_characters); //Susi_not_impl + } + + return true; + } + + //struct TextConfigurationSerialization + //{ + //public: + // TextConfigurationSerialization() = delete; + // + // using TypeToName = boost::bimap; + // static const TypeToName type_to_name; + + // using HorizontalAlignToName = boost::bimap; + // static const HorizontalAlignToName horizontal_align_to_name; + + // using VerticalAlignToName = boost::bimap; + // static const VerticalAlignToName vertical_align_to_name; + // + // static EmbossStyle::Type get_type(std::string_view type) { + // const auto& to_type = TextConfigurationSerialization::type_to_name.right; + // auto type_item = to_type.find(type); + // assert(type_item != to_type.end()); + // if (type_item == to_type.end()) return EmbossStyle::Type::undefined; + // return type_item->second; + // } + + // static std::string_view get_name(EmbossStyle::Type type) { + // const auto& to_name = TextConfigurationSerialization::type_to_name.left; + // auto type_name = to_name.find(type); + // assert(type_name != to_name.end()); + // if (type_name == to_name.end()) return "unknown type"; + // return type_name->second; + // } + + // static void to_xml(std::stringstream &stream, const TextConfiguration &tc); + // static std::optional read(const char **attributes, unsigned int num_attributes); + // static EmbossShape read_old(const char **attributes, unsigned int num_attributes); + //}; //Susi_not_impl + + bool _BBS_3MF_Importer::_handle_start_text_configuration(const char **attributes, unsigned int num_attributes) + { + IdToMetadataMap::iterator object = m_objects_metadata.find(m_curr_config.object_id); + if (object == m_objects_metadata.end()) { + add_error("Can not assign volume mesh to a valid object"); + return false; + } + if (object->second.volumes.empty()) { + add_error("Can not assign mesh to a valid volume"); + return false; + } + ObjectMetadata::VolumeMetadata& volume = object->second.volumes.back(); + //volume.text_configuration = TextConfigurationSerialization::read(attributes, num_attributes); //Susi_not_impl + //if (!volume.text_configuration.has_value()) //Susi_not_impl + // return false; + + // Is 3mf version with shapes? + //if (volume.shape_configuration.has_value()) //Susi_not_impl + // return true; + + // Back compatibility for 3mf version without shapes + //volume.shape_configuration = TextConfigurationSerialization::read_old(attributes, num_attributes); //Susi_not_impl + return true; + } + + // Definition of read/write method for EmbossShape + static void to_xml(std::stringstream &stream, /*const EmbossShape &es, */const ModelVolume &volume, mz_zip_archive &archive); + //static std::optional read_emboss_shape(const char **attributes, unsigned int num_attributes); //Susi_not_impl + + bool _BBS_3MF_Importer::_handle_start_shape_configuration(const char **attributes, unsigned int num_attributes) + { + IdToMetadataMap::iterator object = m_objects_metadata.find(m_curr_config.object_id); + if (object == m_objects_metadata.end()) { + add_error("Can not assign volume mesh to a valid object"); + return false; + } + auto &volumes = object->second.volumes; + if (volumes.empty()) { + add_error("Can not assign mesh to a valid volume"); + return false; + } + ObjectMetadata::VolumeMetadata &volume = volumes.back(); + //volume.shape_configuration = read_emboss_shape(attributes, num_attributes); + //if (!volume.shape_configuration.has_value()) + // return false; //Susi_not_impl + + // Fill svg file content into shape_configuration + //std::optional &svg = volume.shape_configuration->svg_file; + //if (!svg.has_value()) + // return true; // do not contain svg file //Susi_not_impl + + //const std::string &path = svg->path_in_3mf; + //if (path.empty()) + // return true; // do not contain svg file //Susi_not_impl + + //auto it = m_path_to_emboss_shape_files.find(path); + //if (it == m_path_to_emboss_shape_files.end()) + // return true; // svg file is not loaded yet //Susi_not_impl + + //svg->file_data = it->second; //Susi_not_impl + return true; + } + + bool _BBS_3MF_Importer::_create_object_instance(std::string const & path, int object_id, const Transform3d& transform, const bool printable, unsigned int recur_counter) + { + static const unsigned int MAX_RECURSIONS = 10; + + // escape from circular aliasing + if (recur_counter > MAX_RECURSIONS) { + add_error("Too many recursions"); + return false; + } + + Id id{path, object_id}; + IdToCurrentObjectMap::iterator it = m_current_objects.find(id); + if (it == m_current_objects.end()) { + add_error("can not find object id " + std::to_string(object_id) + " to builditem"); + return false; + } + + IdToModelObjectMap::iterator object_item = m_objects.find(id); + if (object_item == m_objects.end()) { + //add object + CurrentObject& current_object = it->second; + int object_index = (int)m_model->objects.size(); + ModelObject* model_object = m_model->add_object(); + if (model_object == nullptr) { + add_error("Unable to create object for builditem, id " + std::to_string(object_id)); + return false; + } + m_objects.insert({ id, object_index }); + current_object.model_object_idx = object_index; + current_object.object = model_object; + + ModelInstance* instance = m_model->objects[object_index]->add_instance(); + if (instance == nullptr) { + add_error("error when add object instance for id " + std::to_string(object_id)); + return false; + } + instance->printable = printable; + + m_instances.emplace_back(instance, transform); + + if (m_is_bbl_3mf && boost::ends_with(current_object.uuid, OBJECT_UUID_SUFFIX)) { + std::istringstream iss(current_object.uuid); + int backup_id; + if (iss >> std::hex >> backup_id) { + //m_model->set_object_backup_id(*model_object, backup_id); //Susi_not_impl + } + } + /*if (!current_object.geometry.empty()) { + } + else if (!current_object.components.empty()) { + // recursively process nested components + for (const Component& component : it->second) { + if (!_create_object_instance(path, component.object_id, transform * component.transform, printable, recur_counter + 1)) + return false; + } + } + else { + add_error("can not construct build items with invalid object, id " + std::to_string(object_id)); + return false; + }*/ + } + else { + //add instance + ModelInstance* instance = m_model->objects[object_item->second]->add_instance(); + if (instance == nullptr) { + add_error("error when add object instance for id " + std::to_string(object_id)); + return false; + } + instance->printable = printable; + + m_instances.emplace_back(instance, transform); + } + + /*if (it->second.size() == 1 && it->second[0].object_id == object_id) { + // aliasing to itself + + IdToModelObjectMap::iterator object_item = m_objects.find(id); + if (object_item == m_objects.end() || object_item->second == -1) { + add_error("Found invalid object"); + return false; + } + else { + ModelInstance* instance = m_model->objects[object_item->second]->add_instance(); + if (instance == nullptr) { + add_error("Unable to add object instance"); + return false; + } + instance->printable = printable; + + m_instances.emplace_back(instance, transform); + } + } + else { + // recursively process nested components + for (const Component& component : it->second) { + if (!_create_object_instance(path, component.object_id, transform * component.transform, printable, recur_counter + 1)) + return false; + } + }*/ + + return true; + } + + void _BBS_3MF_Importer::_apply_transform(ModelInstance& instance, const Transform3d& transform) + { + Slic3r::Geometry::Transformation t(transform); + // invalid scale value, return + if (!t.get_scaling_factor().all()) + return; + + instance.set_transformation(t); + } + + bool _BBS_3MF_Importer::_handle_start_config(const char** attributes, unsigned int num_attributes) + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_end_config() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_start_config_object(const char** attributes, unsigned int num_attributes) + { + if (m_parsing_slice_info) + return true; + int object_id = bbs_get_attribute_value_int(attributes, num_attributes, ID_ATTR); + IdToMetadataMap::iterator object_item = m_objects_metadata.find(object_id); + if (object_item != m_objects_metadata.end()) { + add_error("Duplicated object id: " + std::to_string(object_id) + " in model_settings.config"); + return false; + } + + // Added because of github #3435, currently not used by PrusaSlicer + // int instances_count_id = bbs_get_attribute_value_int(attributes, num_attributes, INSTANCESCOUNT_ATTR); + + m_objects_metadata.insert({ object_id, ObjectMetadata() }); + m_curr_config.object_id = object_id; + return true; + } + + bool _BBS_3MF_Importer::_handle_end_config_object() + { + m_curr_config.object_id = -1; + return true; + } + + bool _BBS_3MF_Importer::_handle_start_config_volume(const char** attributes, unsigned int num_attributes) + { + IdToMetadataMap::iterator object = m_objects_metadata.find(m_curr_config.object_id); + if (object == m_objects_metadata.end()) { + add_error("can not find object for part, id " + std::to_string(m_curr_config.object_id) ); + return false; + } + + m_curr_config.volume_id = (int)object->second.volumes.size(); + + unsigned int first_triangle_id = (unsigned int)bbs_get_attribute_value_int(attributes, num_attributes, FIRST_TRIANGLE_ID_ATTR); + unsigned int last_triangle_id = (unsigned int)bbs_get_attribute_value_int(attributes, num_attributes, LAST_TRIANGLE_ID_ATTR); + + //BBS: refine the part type logic + std::string subtype_str = bbs_get_attribute_value_string(attributes, num_attributes, SUBTYPE_ATTR); + if( "normal_part" == subtype_str) + subtype_str = "ModelPart"; + else if("negative_part" == subtype_str) + subtype_str = "NegativeVolume"; + else if("modifier_part" == subtype_str) + subtype_str = "ParameterModifier"; + else if("support_enforcer" == subtype_str) + subtype_str = "SupportEnforcer"; + else if("support_blocker" == subtype_str) + subtype_str = "SupportBlocker"; + ModelVolumeType type = ModelVolume::type_from_string(subtype_str); + + int subbject_id = bbs_get_attribute_value_int(attributes, num_attributes, ID_ATTR); + + if (last_triangle_id > 0) + object->second.volumes.emplace_back(first_triangle_id, last_triangle_id, type); + else + object->second.volumes.emplace_back(subbject_id, type); + return true; + } + + bool _BBS_3MF_Importer::_handle_start_config_volume_mesh(const char** attributes, unsigned int num_attributes) + { + IdToMetadataMap::iterator object = m_objects_metadata.find(m_curr_config.object_id); + if (object == m_objects_metadata.end()) { + add_error("can not find object for mesh_stats, id " + std::to_string(m_curr_config.object_id) ); + return false; + } + if ((m_curr_config.volume_id == -1) || ((object->second.volumes.size() - 1) < m_curr_config.volume_id)) { + add_error("can not find part for mesh_stats"); + return false; + } + + ObjectMetadata::VolumeMetadata& volume = object->second.volumes[m_curr_config.volume_id]; + + int edges_fixed = bbs_get_attribute_value_int(attributes, num_attributes, MESH_STAT_EDGES_FIXED ); + int degenerate_facets = bbs_get_attribute_value_int(attributes, num_attributes, MESH_STAT_DEGENERATED_FACETS); + int facets_removed = bbs_get_attribute_value_int(attributes, num_attributes, MESH_STAT_FACETS_REMOVED ); + int facets_reversed = bbs_get_attribute_value_int(attributes, num_attributes, MESH_STAT_FACETS_RESERVED ); + int backwards_edges = bbs_get_attribute_value_int(attributes, num_attributes, MESH_STAT_BACKWARDS_EDGES ); + + volume.mesh_stats = { edges_fixed, degenerate_facets, facets_removed, facets_reversed, backwards_edges }; + + return true; + } + + bool _BBS_3MF_Importer::_handle_end_config_volume() + { + m_curr_config.volume_id = -1; + return true; + } + + bool _BBS_3MF_Importer::_handle_end_config_volume_mesh() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_start_config_metadata(const char** attributes, unsigned int num_attributes) + { + //std::string type = bbs_get_attribute_value_string(attributes, num_attributes, TYPE_ATTR); + std::string key = bbs_get_attribute_value_string(attributes, num_attributes, KEY_ATTR); + std::string value = bbs_get_attribute_value_string(attributes, num_attributes, VALUE_ATTR); + + if ((m_curr_plater == nullptr)&&!m_parsing_slice_info) + { + IdToMetadataMap::iterator object = m_objects_metadata.find(m_curr_config.object_id); + if (object == m_objects_metadata.end()) { + add_error("Cannot find object for metadata, id " + std::to_string(m_curr_config.object_id)); + return false; + } + if (m_curr_config.volume_id == -1) + object->second.metadata.emplace_back(key, value); + else { + if (size_t(m_curr_config.volume_id) < object->second.volumes.size()) + object->second.volumes[m_curr_config.volume_id].metadata.emplace_back(key, value); + } + } + else + { + //plater + if (key == PLATERID_ATTR) + { + m_curr_plater->plate_index = atoi(value.c_str()); + } + else if (key == PLATER_NAME_ATTR) { + m_curr_plater->plate_name = xml_unescape(value.c_str()); + } + else if (key == LOCK_ATTR) + { + std::istringstream(value) >> std::boolalpha >> m_curr_plater->locked; + } + else if (key == BED_TYPE_ATTR) + { + //BedType bed_type = BedType::btPC; + //ConfigOptionEnum::from_string(value, bed_type); + //m_curr_plater->config.set_key_value("curr_bed_type", new ConfigOptionEnum(bed_type)); //Susi_not_impl + } + else if (key == PRINT_SEQUENCE_ATTR) + { + //PrintSequence print_sequence = PrintSequence::ByLayer; + //ConfigOptionEnum::from_string(value, print_sequence); + //m_curr_plater->config.set_key_value("print_sequence", new ConfigOptionEnum(print_sequence)); + if (value == "by layer") + m_curr_plater->config.set_key_value("complete_objects", new ConfigOptionBool(false)); + else if (value == "by object") + m_curr_plater->config.set_key_value("complete_objects", new ConfigOptionBool(true)); + else + assert(false); + } + else if (key == FIRST_LAYER_PRINT_SEQUENCE_ATTR) { + auto get_vector_from_string = [](const std::string &str) -> std::vector { + std::stringstream stream(str); + int value; + std::vector results; + while (stream >> value) { + results.push_back(value); + } + return results; + }; + //m_curr_plater->config.set_key_value("first_layer_print_sequence", new ConfigOptionInts(get_vector_from_string(value))); //Susi_not_impl + } + else if (key == SPIRAL_VASE_MODE) { + bool spiral_mode = false; + std::istringstream(value) >> std::boolalpha >> spiral_mode; + m_curr_plater->config.set_key_value("spiral_vase"/*"spiral_mode"*/, new ConfigOptionBool(spiral_mode)); + } + else if (key == GCODE_FILE_ATTR) + { + m_curr_plater->gcode_file = value; + } + else if (key == THUMBNAIL_FILE_ATTR) + { + m_curr_plater->thumbnail_file = value; + } + else if (key == TOP_FILE_ATTR) + { + m_curr_plater->top_file = value; + } + else if (key == PICK_FILE_ATTR) + { + m_curr_plater->pick_file = value; + } + //else if (key == PATTERN_FILE_ATTR) + //{ + // m_curr_plater->pattern_file = value; + //} + else if (key == PATTERN_BBOX_FILE_ATTR) + { + m_curr_plater->pattern_bbox_file = value; + } + else if (key == INSTANCEID_ATTR) + { + m_curr_instance.instance_id = atoi(value.c_str()); + } + else if (key == IDENTIFYID_ATTR) + { + m_curr_instance.identify_id = atoi(value.c_str()); + } + else if (key == OBJECT_ID_ATTR) + { + m_curr_instance.object_id = atoi(value.c_str()); + /*int obj_id = atoi(value.c_str()); + m_curr_instance.object_id = -1; + IndexToPathMap::iterator index_iter = m_index_paths.find(obj_id); + if (index_iter == m_index_paths.end()) { + BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << ":" << __LINE__ + << boost::format(", can not find object for plate's item, id=%1%, skip this object")%obj_id; + return true; + } + Id temp_id = std::make_pair(index_iter->second, index_iter->first); + IdToModelObjectMap::iterator object_item = m_objects.find(temp_id); + if (object_item == m_objects.end()) { + BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << ":" << __LINE__ + << boost::format(", can not find object for plate's item, ID <%1%, %2%>, skip this object")%index_iter->second %index_iter->first; + return true; + } + m_curr_instance.object_id = object_item->second;*/ + } + else if (key == PLATE_IDX_ATTR) + { + int plate_index = atoi(value.c_str()); + std::map::iterator it = m_plater_data.find(plate_index); + if (it != m_plater_data.end()) + m_curr_plater = it->second; + } + else if (key == SLICE_PREDICTION_ATTR) + { + if (m_curr_plater) + m_curr_plater->gcode_prediction = value; + } + else if (key == SLICE_WEIGHT_ATTR) + { + if (m_curr_plater) + m_curr_plater->gcode_weight = value; + } + else if (key == OUTSIDE_ATTR) + { + if (m_curr_plater) + std::istringstream(value) >> std::boolalpha >> m_curr_plater->toolpath_outside; + } + else if (key == SUPPORT_USED_ATTR) + { + if (m_curr_plater) + std::istringstream(value) >> std::boolalpha >> m_curr_plater->is_support_used; + } + else if (key == LABEL_OBJECT_ENABLED_ATTR) + { + if (m_curr_plater) + std::istringstream(value) >> std::boolalpha >> m_curr_plater->is_label_object_enabled; + } + } + + return true; + } + + bool _BBS_3MF_Importer::_handle_end_config_metadata() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_start_config_filament(const char** attributes, unsigned int num_attributes) + { + if (m_curr_plater) { + std::string id = bbs_get_attribute_value_string(attributes, num_attributes, FILAMENT_ID_TAG); + std::string type = bbs_get_attribute_value_string(attributes, num_attributes, FILAMENT_TYPE_TAG); + std::string color = bbs_get_attribute_value_string(attributes, num_attributes, FILAMENT_COLOR_TAG); + std::string used_m = bbs_get_attribute_value_string(attributes, num_attributes, FILAMENT_USED_M_TAG); + std::string used_g = bbs_get_attribute_value_string(attributes, num_attributes, FILAMENT_USED_G_TAG); + + FilamentInfo filament_info; + filament_info.id = atoi(id.c_str()) - 1; + filament_info.type = type; + filament_info.color = color; + filament_info.used_m = atof(used_m.c_str()); + filament_info.used_g = atof(used_g.c_str()); + m_curr_plater->slice_filaments_info.push_back(filament_info); + } + return true; + } + + bool _BBS_3MF_Importer::_handle_end_config_filament() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_start_config_warning(const char** attributes, unsigned int num_attributes) + { + if (m_curr_plater) { + std::string msg = bbs_get_attribute_value_string(attributes, num_attributes, WARNING_MSG_TAG); + std::string lvl_str = bbs_get_attribute_value_string(attributes, num_attributes, "level"); + //GCodeProcessorResult::SliceWarning sw; + //sw.msg = msg; + //try { + // sw.level = atoi(lvl_str.c_str()); + //} + //catch(...) { + //}; //Susi_not_impl + + m_curr_plater->warnings.push_back(msg); + } + return true; + } + + bool _BBS_3MF_Importer::_handle_end_config_warning() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_start_config_plater(const char** attributes, unsigned int num_attributes) + { + if (!m_parsing_slice_info) { + m_curr_plater = new PlateData(); + } + + return true; + } + + bool _BBS_3MF_Importer::_handle_end_config_plater() + { + if (!m_curr_plater) + { + add_error("_handle_end_config_plater: don't find plate created before"); + return false; + } + m_plater_data.emplace(m_curr_plater->plate_index, m_curr_plater); + m_curr_plater = nullptr; + return true; + } + + bool _BBS_3MF_Importer::_handle_start_config_plater_instance(const char** attributes, unsigned int num_attributes) + { + if (!m_curr_plater) + { + add_error("_handle_start_config_plater_instance: don't find plate created before"); + return false; + } + + //do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_end_config_plater_instance() + { + if (!m_curr_plater) + { + add_error("_handle_end_config_plater_instance: don't find plate created before"); + return false; + } + if ((m_curr_instance.object_id == -1) || (m_curr_instance.instance_id == -1)) + { + //add_error("invalid object id/instance id"); + //skip this instance + m_curr_instance.object_id = m_curr_instance.instance_id = -1; + m_curr_instance.identify_id = 0; + return true; + } + + m_curr_plater->obj_inst_map.emplace(m_curr_instance.object_id, std::make_pair(m_curr_instance.instance_id, m_curr_instance.identify_id)); + m_curr_instance.object_id = m_curr_instance.instance_id = -1; + m_curr_instance.identify_id = 0; + return true; + } + + bool _BBS_3MF_Importer::_handle_start_assemble(const char** attributes, unsigned int num_attributes) + { + return true; + } + + bool _BBS_3MF_Importer::_handle_end_assemble() + { + //do nothing + return true; + } + + bool _BBS_3MF_Importer::_handle_start_assemble_item(const char** attributes, unsigned int num_attributes) + { + if (!m_load_model) return true; + + int object_id = bbs_get_attribute_value_int(attributes, num_attributes, OBJECT_ID_ATTR); + int instance_id = bbs_get_attribute_value_int(attributes, num_attributes, INSTANCEID_ATTR); + + IndexToPathMap::iterator index_iter = m_index_paths.find(object_id); + if (index_iter == m_index_paths.end()) { + add_error("can not find object for assemble item, id= " + std::to_string(object_id)); + return false; + } + Id temp_id = std::make_pair(index_iter->second, index_iter->first); + IdToModelObjectMap::iterator object_item = m_objects.find(temp_id); + if (object_item == m_objects.end()) { + add_error("can not find object for assemble item, id= " + std::to_string(object_id)); + return false; + } + object_id = object_item->second; + + Transform3d transform = bbs_get_transform_from_3mf_specs_string(bbs_get_attribute_value_string(attributes, num_attributes, TRANSFORM_ATTR)); + Vec3d ofs2ass = bbs_get_offset_from_3mf_specs_string(bbs_get_attribute_value_string(attributes, num_attributes, OFFSET_ATTR)); + if (object_id < m_model->objects.size()) { + if (instance_id < m_model->objects[object_id]->instances.size()) { + //m_model->objects[object_id]->instances[instance_id]->set_assemble_from_transform(transform); //Susi_not_impl + //m_model->objects[object_id]->instances[instance_id]->set_offset_to_assembly(ofs2ass); //Susi_not_impl + } + } + return true; + } + + bool _BBS_3MF_Importer::_handle_end_assemble_item() + { + return true; + } + + bool _BBS_3MF_Importer::_handle_start_text_info_item(const char **attributes, unsigned int num_attributes) + { + IdToMetadataMap::iterator object = m_objects_metadata.find(m_curr_config.object_id); + if (object == m_objects_metadata.end()) { + add_error("can not find object for text_info, id " + std::to_string(m_curr_config.object_id)); + return false; + } + if ((m_curr_config.volume_id == -1) || ((object->second.volumes.size() - 1) < m_curr_config.volume_id)) { + add_error("can not find part for text_info"); + return false; + } + + ObjectMetadata::VolumeMetadata &volume = object->second.volumes[m_curr_config.volume_id]; + + //if (volume.text_configuration.has_value()) { + // add_error("Both text_info and text_configuration found, ignore legacy text_info"); + // return true; + //} //Susi_not_impl + + // TODO: Orca: support legacy text info + /* + TextInfo text_info; + text_info.m_text = xml_unescape(bbs_get_attribute_value_string(attributes, num_attributes, TEXT_ATTR)); + text_info.m_font_name = bbs_get_attribute_value_string(attributes, num_attributes, FONT_NAME_ATTR); + + text_info.m_curr_font_idx = bbs_get_attribute_value_int(attributes, num_attributes, FONT_INDEX_ATTR); + + text_info.m_font_size = bbs_get_attribute_value_float(attributes, num_attributes, FONT_SIZE_ATTR); + text_info.m_thickness = bbs_get_attribute_value_float(attributes, num_attributes, THICKNESS_ATTR); + text_info.m_embeded_depth = bbs_get_attribute_value_float(attributes, num_attributes, EMBEDED_DEPTH_ATTR); + text_info.m_rotate_angle = bbs_get_attribute_value_float(attributes, num_attributes, ROTATE_ANGLE_ATTR); + text_info.m_text_gap = bbs_get_attribute_value_float(attributes, num_attributes, TEXT_GAP_ATTR); + + text_info.m_bold = bbs_get_attribute_value_int(attributes, num_attributes, BOLD_ATTR); + text_info.m_italic = bbs_get_attribute_value_int(attributes, num_attributes, ITALIC_ATTR); + text_info.m_is_surface_text = bbs_get_attribute_value_int(attributes, num_attributes, SURFACE_TEXT_ATTR); + text_info.m_keep_horizontal = bbs_get_attribute_value_int(attributes, num_attributes, KEEP_HORIZONTAL_ATTR); + + text_info.m_rr.mesh_id = bbs_get_attribute_value_int(attributes, num_attributes, HIT_MESH_ATTR); + + std::string hit_pos = bbs_get_attribute_value_string(attributes, num_attributes, HIT_POSITION_ATTR); + if (!hit_pos.empty()) + text_info.m_rr.hit = get_vec3_from_string(hit_pos); + + std::string hit_normal = bbs_get_attribute_value_string(attributes, num_attributes, HIT_NORMAL_ATTR); + if (!hit_normal.empty()) + text_info.m_rr.normal = get_vec3_from_string(hit_normal); + + volume.text_info = text_info;*/ + return true; + } + + bool _BBS_3MF_Importer::_handle_end_text_info_item() + { + return true; + } + + void XMLCALL _BBS_3MF_Importer::_handle_start_relationships_element(void* userData, const char* name, const char** attributes) + { + _BBS_3MF_Importer* importer = (_BBS_3MF_Importer*)userData; + if (importer != nullptr) + importer->_handle_start_relationships_element(name, attributes); + } + + void XMLCALL _BBS_3MF_Importer::_handle_end_relationships_element(void* userData, const char* name) + { + _BBS_3MF_Importer* importer = (_BBS_3MF_Importer*)userData; + if (importer != nullptr) + importer->_handle_end_relationships_element(name); + } + + void _BBS_3MF_Importer::_handle_start_relationships_element(const char* name, const char** attributes) + { + if (m_xml_parser == nullptr) + return; + + bool res = true; + unsigned int num_attributes = (unsigned int)XML_GetSpecifiedAttributeCount(m_xml_parser); + + if (::strcmp(RELATIONSHIP_TAG, name) == 0) + res = _handle_start_relationship(attributes, num_attributes); + + m_curr_characters.clear(); + if (!res) + _stop_xml_parser(); + } + + void _BBS_3MF_Importer::_handle_end_relationships_element(const char* name) + { + if (m_xml_parser == nullptr) + return; + + bool res = true; + + if (!res) + _stop_xml_parser(); + } + + bool _BBS_3MF_Importer::_handle_start_relationship(const char** attributes, unsigned int num_attributes) + { + std::string path = bbs_get_attribute_value_string(attributes, num_attributes, TARGET_ATTR); + std::string type = bbs_get_attribute_value_string(attributes, num_attributes, RELS_TYPE_ATTR); + if (boost::starts_with(type, "http://schemas.microsoft.com/3dmanufacturing/") && boost::ends_with(type, "3dmodel")) { + if (m_start_part_path.empty()) m_start_part_path = path; + else m_sub_model_paths.push_back(path); + } else if (boost::starts_with(type, "http://schemas.openxmlformats.org/") && boost::ends_with(type, "thumbnail")) { + if (boost::algorithm::ends_with(path, ".png")) + m_thumbnail_path = path; + } else if (boost::starts_with(type, "http://schemas.bambulab.com/") && boost::ends_with(type, "cover-thumbnail-middle")) { + m_thumbnail_middle = path; + } else if (boost::starts_with(type, "http://schemas.bambulab.com/") && boost::ends_with(type, "cover-thumbnail-small")) { + m_thumbnail_small = path; + } + return true; + } + + void _BBS_3MF_Importer::_generate_current_object_list(std::vector &sub_objects, Id object_id, IdToCurrentObjectMap ¤t_objects) + { + std::list> id_list; // ???? it's filled then deleted? [merill] + id_list.push_back(std::make_pair(Component(object_id, Transform3d::Identity()), Transform3d::Identity())); + + while (!id_list.empty()) + { + auto current_item = id_list.front(); + Component current_id = current_item.first; + id_list.pop_front(); + IdToCurrentObjectMap::iterator current_object = current_objects.find(current_id.object_id); + if (current_object != current_objects.end()) { + //found one + if (!current_object->second.components.empty()) { + for (const Component &comp : current_object->second.components) { + id_list.push_back(std::pair(comp, current_item.second * comp.transform)); + } + } + else if (!(current_object->second.geometry.empty())) { + //CurrentObject* ptr = &(current_objects[current_id]); + //CurrentObject* ptr2 = &(current_object->second); + sub_objects.push_back({ current_object->first, current_item.second}); + } + } + } + } + + bool _BBS_3MF_Importer::_generate_volumes_new(ModelObject& object, const std::vector &sub_objects, const ObjectMetadata::VolumeMetadataList& volumes, const DynamicPrintConfig &config, ConfigSubstitutionContext& config_substitutions) + { + if (!object.volumes.empty()) { + add_error("object already built with parts"); + return false; + } + + //unsigned int geo_tri_count = (unsigned int)geometry.triangles.size(); + unsigned int renamed_volumes_count = 0; + + for (unsigned int index = 0; index < sub_objects.size(); index++) + { + //find the volume metadata firstly + Component sub_comp = sub_objects[index]; + Id object_id = sub_comp.object_id; + IdToCurrentObjectMap::iterator current_object = m_current_objects.find(object_id); + if (current_object == m_current_objects.end()) { + add_error("sub_objects can not be found, id=" + std::to_string(object_id.second)); + return false; + } + CurrentObject* sub_object = &(current_object->second); + + const ObjectMetadata::VolumeMetadata* volume_data = nullptr; + ObjectMetadata::VolumeMetadata default_volume_data(sub_object->id); + if (index < volumes.size() && volumes[index].subobject_id == sub_object->id) + volume_data = &volumes[index]; + else for (const ObjectMetadata::VolumeMetadata& volume_iter : volumes) { + if (volume_iter.subobject_id == sub_object->id) { + volume_data = &volume_iter; + break; + } + } + + Transform3d volume_matrix_to_object = Transform3d::Identity(); + bool has_transform = false; + int shared_mesh_id = object_id.second; + if (volume_data) + { + int found_count = 0; + // extract the volume transformation from the volume's metadata, if present + for (const Metadata& metadata : volume_data->metadata) { + if (metadata.key == MATRIX_KEY) { + volume_matrix_to_object = Slic3r::Geometry::transform3d_from_string(metadata.value); + has_transform = ! volume_matrix_to_object.isApprox(Transform3d::Identity(), 1e-10); + found_count++; + } + else if (metadata.key == MESH_SHARED_KEY){ + //add the shared mesh logic + shared_mesh_id = ::atoi(metadata.value.c_str()); + found_count++; + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": line %1%, shared_mesh_id %2%")%__LINE__%shared_mesh_id; + } + + if (found_count >= 2) + break; + } + } + else { + //create a volume_data + volume_data = &default_volume_data; + } + + ModelVolume* volume = nullptr; + ModelVolume *shared_volume = nullptr; + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": line %1%, subobject_id %2%, shared_mesh_id %3%")%__LINE__ %sub_object->id %shared_mesh_id; + if (shared_mesh_id != -1) { + std::map::iterator iter = m_shared_meshes.find(shared_mesh_id); + if (iter != m_shared_meshes.end()) { + shared_volume = iter->second; + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": line %1%, found shared mesh, id %2%, mesh %3%")%__LINE__%shared_mesh_id%shared_volume; + } + } + else { + //for some cases, object point to this shared mesh already loaded, treat that one as the root + std::map::iterator iter = m_shared_meshes.find(sub_object->id); + if (iter != m_shared_meshes.end()) { + shared_volume = iter->second; + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": line %1%, already loaded copy-share mesh before, id %2%, mesh %3%")%__LINE__%sub_object->id%shared_volume; + } + } + + const size_t triangles_count = sub_object->geometry.triangles.size(); + if (triangles_count == 0) { + add_error("found no trianges in the object " + std::to_string(sub_object->id)); + return false; + } + if (!shared_volume){ + // splits volume out of imported geometry + indexed_triangle_set its; + its.indices.assign(sub_object->geometry.triangles.begin(), sub_object->geometry.triangles.end()); + //const size_t triangles_count = its.indices.size(); + //if (triangles_count == 0) { + // add_error("found no trianges in the object " + std::to_string(sub_object->id)); + // return false; + //} + for (const Vec3i32& face : its.indices) { + for (const int tri_id : face) { + if (tri_id < 0 || tri_id >= int(sub_object->geometry.vertices.size())) { + add_error("invalid vertex id in object " + std::to_string(sub_object->id)); + return false; + } + } + } + + its.vertices.assign(sub_object->geometry.vertices.begin(), sub_object->geometry.vertices.end()); + + // BBS + //for (const std::string prop_str : sub_object->geometry.face_properties) { + // FaceProperty face_prop; + // face_prop.from_string(prop_str); + // its.properties.push_back(face_prop); + //} //Susi_not_impl + + TriangleMesh triangle_mesh(std::move(its), volume_data->mesh_stats); + + // BBS: no need to multiply the instance matrix into the volume + //if (!m_is_bbl_3mf) { + // // if the 3mf was not produced by BambuStudio and there is only one instance, + // // bake the transformation into the geometry to allow the reload from disk command + // // to work properly + // if (object.instances.size() == 1) { + // triangle_mesh.transform(object.instances.front()->get_transformation().get_matrix(), false); + // object.instances.front()->set_transformation(Slic3r::Geometry::Transformation()); + // //FIXME do the mesh fixing? + // } + //} + if (triangle_mesh.volume() < 0) + triangle_mesh.flip_triangles(); + + volume = object.add_volume(std::move(triangle_mesh)); + + if (shared_mesh_id != -1) + //for some cases the shared mesh is in other plate and not loaded in cli slicing + //we need to use the first one in the same plate instead + m_shared_meshes[shared_mesh_id] = volume; + else + m_shared_meshes[sub_object->id] = volume; + } + else { + // create volume to use shared mesh + //volume = object.add_volume_with_shared_mesh(*shared_volume); //orca -> use susi equivalent + volume = object.add_volume(shared_volume->mesh(), ModelVolumeType::MODEL_PART, false); + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": line %1%, create volume using shared_mesh %2%")%__LINE__%shared_volume; + } + // stores the volume matrix taken from the metadata, if present + if (has_transform) + volume->source.transform = Slic3r::Geometry::Transformation(volume_matrix_to_object); + + volume->calculate_convex_hull(); + + //set transform from 3mf + Slic3r::Geometry::Transformation comp_transformatino(sub_comp.transform); + volume->set_transformation(comp_transformatino * volume->get_transformation()); + if (shared_volume) { + const TriangleMesh& trangle_mesh = volume->mesh(); + Vec3d shift = trangle_mesh.get_init_shift(); + if (!shift.isApprox(Vec3d::Zero())) + volume->translate(shift); + } + + // recreate custom supports, seam and mmu segmentation from previously loaded attribute + { + volume->supported_facets.reserve(triangles_count); + volume->seam_facets.reserve(triangles_count); + volume->mmu_segmentation_facets.reserve(triangles_count); + for (size_t i=0; igeometry.custom_supports.size()); + assert(i < sub_object->geometry.custom_seam.size()); + assert(i < sub_object->geometry.mmu_segmentation.size()); + if (! sub_object->geometry.custom_supports[i].empty()) + volume->supported_facets.set_triangle_from_string(i, sub_object->geometry.custom_supports[i]); + if (! sub_object->geometry.custom_seam[i].empty()) + volume->seam_facets.set_triangle_from_string(i, sub_object->geometry.custom_seam[i]); + if (! sub_object->geometry.mmu_segmentation[i].empty()) + volume->mmu_segmentation_facets.set_triangle_from_string(i, sub_object->geometry.mmu_segmentation[i]); + } + volume->supported_facets.shrink_to_fit(); + volume->seam_facets.shrink_to_fit(); + volume->mmu_segmentation_facets.shrink_to_fit(); + volume->mmu_segmentation_facets.touch(); + } + + volume->set_type(volume_data->part_type); + + //if (auto &es = volume_data->shape_configuration; es.has_value()) + // volume->emboss_shape = std::move(es); + //if (auto &tc = volume_data->text_configuration; tc.has_value()) + // volume->text_configuration = std::move(tc); //Susi_not_impl + + std::map key_values_to_deserialize; + // apply the remaining volume's metadata + for (const Metadata& metadata : volume_data->metadata) { + if (metadata.key == NAME_KEY) + volume->name = metadata.value; + //else if ((metadata.key == MODIFIER_KEY) && (metadata.value == "1")) + // volume->set_type(ModelVolumeType::PARAMETER_MODIFIER); + //for old format + else if ((metadata.key == VOLUME_TYPE_KEY) || (metadata.key == PART_TYPE_KEY)) { + std::string subtype_str = metadata.value; + if( "normal_part" == subtype_str) + subtype_str = "ModelPart"; + else if("negative_part" == subtype_str) + subtype_str = "NegativeVolume"; + else if("modifier_part" == subtype_str) + subtype_str = "ParameterModifier"; + else if("support_enforcer" == subtype_str) + subtype_str = "SupportEnforcer"; + else if("support_blocker" == subtype_str) + subtype_str = "SupportBlocker"; + volume->set_type(ModelVolume::type_from_string(subtype_str)); + } else if (metadata.key == SOURCE_FILE_KEY) + volume->source.input_file = metadata.value; + else if (metadata.key == SOURCE_OBJECT_ID_KEY) + volume->source.object_idx = ::atoi(metadata.value.c_str()); + else if (metadata.key == SOURCE_VOLUME_ID_KEY) + volume->source.volume_idx = ::atoi(metadata.value.c_str()); + else if (metadata.key == SOURCE_OFFSET_X_KEY) + volume->source.mesh_offset(0) = ::atof(metadata.value.c_str()); + else if (metadata.key == SOURCE_OFFSET_Y_KEY) + volume->source.mesh_offset(1) = ::atof(metadata.value.c_str()); + else if (metadata.key == SOURCE_OFFSET_Z_KEY) + volume->source.mesh_offset(2) = ::atof(metadata.value.c_str()); + else if (metadata.key == SOURCE_IN_INCHES) + volume->source.is_converted_from_inches = metadata.value == "1"; + else if (metadata.key == SOURCE_IN_METERS) + volume->source.is_converted_from_meters = metadata.value == "1"; + else if ((metadata.key == MATRIX_KEY) || (metadata.key == MESH_SHARED_KEY)) + continue; + else + //volume->config.set_deserialize(metadata.key, metadata.value, config_substitutions); + key_values_to_deserialize[metadata.key] = metadata.value; + } + convert_settings_from_bambu(key_values_to_deserialize, config, volume->config, config_substitutions, false); + + // this may happen for 3mf saved by 3rd part softwares + if (volume->name.empty()) { + volume->name = object.name; + if (renamed_volumes_count > 0) + volume->name += "_" + std::to_string(renamed_volumes_count + 1); + ++renamed_volumes_count; + } + } + + return true; + } + /* + bool _BBS_3MF_Importer::_generate_volumes(ModelObject& object, const Geometry& geometry, const ObjectMetadata::VolumeMetadataList& volumes, ConfigSubstitutionContext& config_substitutions) + { + if (!object.volumes.empty()) { + add_error("Found invalid volumes count"); + return false; + } + + unsigned int geo_tri_count = (unsigned int)geometry.triangles.size(); + unsigned int renamed_volumes_count = 0; + + for (const ObjectMetadata::VolumeMetadata& volume_data : volumes) { + if (geo_tri_count <= volume_data.first_triangle_id || geo_tri_count <= volume_data.last_triangle_id || volume_data.last_triangle_id < volume_data.first_triangle_id) { + add_error("Found invalid triangle id"); + return false; + } + + Transform3d volume_matrix_to_object = Transform3d::Identity(); + bool has_transform = false; + // extract the volume transformation from the volume's metadata, if present + for (const Metadata& metadata : volume_data.metadata) { + if (metadata.key == MATRIX_KEY) { + volume_matrix_to_object = Slic3r::Geometry::transform3d_from_string(metadata.value); + has_transform = ! volume_matrix_to_object.isApprox(Transform3d::Identity(), 1e-10); + break; + } + } + + // splits volume out of imported geometry + indexed_triangle_set its; + its.indices.assign(geometry.triangles.begin() + volume_data.first_triangle_id, geometry.triangles.begin() + volume_data.last_triangle_id + 1); + const size_t triangles_count = its.indices.size(); + if (triangles_count == 0) { + add_error("An empty triangle mesh found"); + return false; + } + + { + int min_id = its.indices.front()[0]; + int max_id = min_id; + for (const Vec3i& face : its.indices) { + for (const int tri_id : face) { + if (tri_id < 0 || tri_id >= int(geometry.vertices.size())) { + add_error("Found invalid vertex id"); + return false; + } + min_id = std::min(min_id, tri_id); + max_id = std::max(max_id, tri_id); + } + } + its.vertices.assign(geometry.vertices.begin() + min_id, geometry.vertices.begin() + max_id + 1); + + // BBS + for (const std::string prop_str : geometry.face_properties) { + FaceProperty face_prop; + face_prop.from_string(prop_str); + its.properties.push_back(face_prop); + } + + // rebase indices to the current vertices list + for (Vec3i& face : its.indices) + for (int& tri_id : face) + tri_id -= min_id; + } + + TriangleMesh triangle_mesh(std::move(its), volume_data.mesh_stats); + + if (!m_is_bbl_3mf) { + // if the 3mf was not produced by OrcaSlicer and there is only one instance, + // bake the transformation into the geometry to allow the reload from disk command + // to work properly + if (object.instances.size() == 1) { + triangle_mesh.transform(object.instances.front()->get_transformation().get_matrix(), false); + object.instances.front()->set_transformation(Slic3r::Geometry::Transformation()); + //FIXME do the mesh fixing? + } + } + if (triangle_mesh.volume() < 0) + triangle_mesh.flip_triangles(); + + ModelVolume* volume = object.add_volume(std::move(triangle_mesh)); + // stores the volume matrix taken from the metadata, if present + if (has_transform) + volume->source.transform = Slic3r::Geometry::Transformation(volume_matrix_to_object); + volume->calculate_convex_hull(); + + // recreate custom supports, seam and mmu segmentation from previously loaded attribute + volume->supported_facets.reserve(triangles_count); + volume->seam_facets.reserve(triangles_count); + volume->mmu_segmentation_facets.reserve(triangles_count); + for (size_t i=0; isupported_facets.set_triangle_from_string(i, geometry.custom_supports[index]); + if (! geometry.custom_seam[index].empty()) + volume->seam_facets.set_triangle_from_string(i, geometry.custom_seam[index]); + if (! geometry.mmu_segmentation[index].empty()) + volume->mmu_segmentation_facets.set_triangle_from_string(i, geometry.mmu_segmentation[index]); + } + volume->supported_facets.shrink_to_fit(); + volume->seam_facets.shrink_to_fit(); + volume->mmu_segmentation_facets.shrink_to_fit(); + + volume->set_type(volume_data.part_type); + + // apply the remaining volume's metadata + for (const Metadata& metadata : volume_data.metadata) { + if (metadata.key == NAME_KEY) + volume->name = metadata.value; + //else if ((metadata.key == MODIFIER_KEY) && (metadata.value == "1")) + // volume->set_type(ModelVolumeType::PARAMETER_MODIFIER); + //for old format + else if ((metadata.key == VOLUME_TYPE_KEY) || (metadata.key == PART_TYPE_KEY)) + volume->set_type(ModelVolume::type_from_string(metadata.value)); + else if (metadata.key == SOURCE_FILE_KEY) + volume->source.input_file = metadata.value; + else if (metadata.key == SOURCE_OBJECT_ID_KEY) + volume->source.object_idx = ::atoi(metadata.value.c_str()); + else if (metadata.key == SOURCE_VOLUME_ID_KEY) + volume->source.volume_idx = ::atoi(metadata.value.c_str()); + else if (metadata.key == SOURCE_OFFSET_X_KEY) + volume->source.mesh_offset(0) = ::atof(metadata.value.c_str()); + else if (metadata.key == SOURCE_OFFSET_Y_KEY) + volume->source.mesh_offset(1) = ::atof(metadata.value.c_str()); + else if (metadata.key == SOURCE_OFFSET_Z_KEY) + volume->source.mesh_offset(2) = ::atof(metadata.value.c_str()); + else if (metadata.key == SOURCE_IN_INCHES) + volume->source.is_converted_from_inches = metadata.value == "1"; + else if (metadata.key == SOURCE_IN_METERS) + volume->source.is_converted_from_meters = metadata.value == "1"; + else + volume->config.set_deserialize(metadata.key, metadata.value, config_substitutions); + } + + // this may happen for 3mf saved by 3rd part softwares + if (volume->name.empty()) { + volume->name = object.name; + if (renamed_volumes_count > 0) + volume->name += "_" + std::to_string(renamed_volumes_count + 1); + ++renamed_volumes_count; + } + } + + return true; + } + */ + void XMLCALL _BBS_3MF_Importer::_handle_start_model_xml_element(void* userData, const char* name, const char** attributes) + { + _BBS_3MF_Importer* importer = (_BBS_3MF_Importer*)userData; + if (importer != nullptr) + importer->_handle_start_model_xml_element(name, attributes); + } + + void XMLCALL _BBS_3MF_Importer::_handle_end_model_xml_element(void* userData, const char* name) + { + _BBS_3MF_Importer* importer = (_BBS_3MF_Importer*)userData; + if (importer != nullptr) + importer->_handle_end_model_xml_element(name); + } + + void XMLCALL _BBS_3MF_Importer::_handle_xml_characters(void* userData, const XML_Char* s, int len) + { + _BBS_3MF_Importer* importer = (_BBS_3MF_Importer*)userData; + if (importer != nullptr) + importer->_handle_xml_characters(s, len); + } + + void XMLCALL _BBS_3MF_Importer::_handle_start_config_xml_element(void* userData, const char* name, const char** attributes) + { + _BBS_3MF_Importer* importer = (_BBS_3MF_Importer*)userData; + if (importer != nullptr) + importer->_handle_start_config_xml_element(name, attributes); + } + + void XMLCALL _BBS_3MF_Importer::_handle_end_config_xml_element(void* userData, const char* name) + { + _BBS_3MF_Importer* importer = (_BBS_3MF_Importer*)userData; + if (importer != nullptr) + importer->_handle_end_config_xml_element(name); + } + + + /* functions of ObjectImporter */ + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_start_model(const char** attributes, unsigned int num_attributes) + { + object_unit_factor = bbs_get_unit_factor(bbs_get_attribute_value_string(attributes, num_attributes, UNIT_ATTR)); + + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_end_model() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_start_resources(const char** attributes, unsigned int num_attributes) + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_end_resources() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_start_object(const char** attributes, unsigned int num_attributes) + { + // reset current object data + if (current_object) { + delete current_object; + current_object = nullptr; + } + + std::string object_type = bbs_get_attribute_value_string(attributes, num_attributes, TYPE_ATTR); + + if (bbs_is_valid_object_type(object_type)) { + if (!current_object) { + current_object = new CurrentObject(); + } + + current_object->id = bbs_get_attribute_value_int(attributes, num_attributes, ID_ATTR); + current_object->name = bbs_get_attribute_value_string(attributes, num_attributes, NAME_ATTR); + + current_object->uuid = bbs_get_attribute_value_string(attributes, num_attributes, PUUID_ATTR); + if (current_object->uuid.empty()) { + current_object->uuid = bbs_get_attribute_value_string(attributes, num_attributes, PUUID_LOWER_ATTR); + } + current_object->pid = bbs_get_attribute_value_int(attributes, num_attributes, PID_ATTR); + } + + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_end_object() + { + if (!current_object || (current_object->id == -1)) { + top_importer->add_error("Found invalid object for "+ object_path); + return false; + } + else { + if (is_bbl_3mf && boost::ends_with(current_object->uuid, OBJECT_UUID_SUFFIX) && top_importer->m_load_restore) { + std::istringstream iss(current_object->uuid); + int backup_id; + bool need_replace = false; + if (iss >> std::hex >> backup_id) { + need_replace = (current_object->id != backup_id); + current_object->id = backup_id; + } + //if (need_replace) + { + for (int index = 0; index < current_object->components.size(); index++) + { + int temp_id = (index + 1) << 16 | backup_id; + Component& component = current_object->components[index]; + std::string new_path = component.object_id.first; + Id new_id = std::make_pair(new_path, temp_id); + IdToCurrentObjectMap::iterator object_it = object_list.find(component.object_id); + if (object_it != object_list.end()) { + CurrentObject new_object; + new_object.geometry = std::move(object_it->second.geometry); + new_object.id = temp_id; + new_object.model_object_idx = object_it->second.model_object_idx; + new_object.name = object_it->second.name; + new_object.uuid = object_it->second.uuid; + + object_list.erase(object_it); + object_list.insert({ new_id, std::move(new_object) }); + } + else { + top_importer->add_error("can not find object for component, id=" + std::to_string(component.object_id.second)); + delete current_object; + current_object = nullptr; + return false; + } + + component.object_id.second = temp_id; + } + } + } + Id id = std::make_pair(object_path, current_object->id); + if (object_list.find(id) == object_list.end()) { + object_list.insert({ id, std::move(*current_object) }); + delete current_object; + current_object = nullptr; + } + else { + top_importer->add_error("Found object with duplicate id for "+object_path); + delete current_object; + current_object = nullptr; + return false; + } + } + + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_start_color_group(const char **attributes, unsigned int num_attributes) + { + object_current_color_group = bbs_get_attribute_value_int(attributes, num_attributes, ID_ATTR); + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_end_color_group() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_start_color(const char **attributes, unsigned int num_attributes) + { + std::string color = bbs_get_attribute_value_string(attributes, num_attributes, COLOR_ATTR); + object_group_id_to_color[object_current_color_group] = color; + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_end_color() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_start_mesh(const char** attributes, unsigned int num_attributes) + { + // reset current geometry + if (current_object) + current_object->geometry.reset(); + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_end_mesh() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_start_vertices(const char** attributes, unsigned int num_attributes) + { + // reset current vertices + if (current_object) + current_object->geometry.vertices.clear(); + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_end_vertices() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_start_vertex(const char** attributes, unsigned int num_attributes) + { + // appends the vertex coordinates + // missing values are set equal to ZERO + if (current_object) + current_object->geometry.vertices.emplace_back( + object_unit_factor * bbs_get_attribute_value_float(attributes, num_attributes, X_ATTR), + object_unit_factor * bbs_get_attribute_value_float(attributes, num_attributes, Y_ATTR), + object_unit_factor * bbs_get_attribute_value_float(attributes, num_attributes, Z_ATTR)); + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_end_vertex() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_start_triangles(const char** attributes, unsigned int num_attributes) + { + // reset current triangles + if (current_object) + current_object->geometry.triangles.clear(); + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_end_triangles() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_start_triangle(const char** attributes, unsigned int num_attributes) + { + // we are ignoring the following attributes: + // p1 + // p2 + // p3 + // pid + // see specifications + + // appends the triangle's vertices indices + // missing values are set equal to ZERO + if (current_object) { + current_object->geometry.triangles.emplace_back( + bbs_get_attribute_value_int(attributes, num_attributes, V1_ATTR), + bbs_get_attribute_value_int(attributes, num_attributes, V2_ATTR), + bbs_get_attribute_value_int(attributes, num_attributes, V3_ATTR)); + + current_object->geometry.custom_supports.push_back(bbs_get_attribute_value_string(attributes, num_attributes, CUSTOM_SUPPORTS_ATTR)); + current_object->geometry.custom_seam.push_back(bbs_get_attribute_value_string(attributes, num_attributes, CUSTOM_SEAM_ATTR)); + current_object->geometry.mmu_segmentation.push_back(bbs_get_attribute_value_string(attributes, num_attributes, MMU_SEGMENTATION_ATTR)); + // BBS + current_object->geometry.face_properties.push_back(bbs_get_attribute_value_string(attributes, num_attributes, FACE_PROPERTY_ATTR)); + } + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_end_triangle() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_start_components(const char** attributes, unsigned int num_attributes) + { + // reset current components + if (current_object) + current_object->components.clear(); + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_end_components() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_start_component(const char** attributes, unsigned int num_attributes) + { + int object_id = bbs_get_attribute_value_int(attributes, num_attributes, OBJECTID_ATTR); + Transform3d transform = bbs_get_transform_from_3mf_specs_string(bbs_get_attribute_value_string(attributes, num_attributes, TRANSFORM_ATTR)); + + /*Id id = std::make_pair(m_sub_model_path, object_id); + IdToModelObjectMap::iterator object_item = m_objects.find(id); + if (object_item == m_objects.end()) { + IdToAliasesMap::iterator alias_item = m_objects_aliases.find(id); + if (alias_item == m_objects_aliases.end()) { + add_error("Found component with invalid object id"); + return false; + } + }*/ + + if (current_object) { + Id id = std::make_pair(object_path, object_id); + current_object->components.emplace_back(id, transform); + } + + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_end_component() + { + // do nothing + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_start_metadata(const char** attributes, unsigned int num_attributes) + { + obj_curr_metadata_name.clear(); + + std::string name = bbs_get_attribute_value_string(attributes, num_attributes, NAME_ATTR); + if (!name.empty()) { + obj_curr_metadata_name = name; + } + + return true; + } + + bool _BBS_3MF_Importer::ObjectImporter::_handle_object_end_metadata() + { + if ((obj_curr_metadata_name == BBS_3MF_VERSION)||(obj_curr_metadata_name == BBS_3MF_VERSION1)) { + is_bbl_3mf = true; + } + return true; + } + void _BBS_3MF_Importer::ObjectImporter::_handle_object_start_model_xml_element(const char* name, const char** attributes) + { + if (object_xml_parser == nullptr) + return; + + bool res = true; + unsigned int num_attributes = (unsigned int)XML_GetSpecifiedAttributeCount(object_xml_parser); + + if (::strcmp(MODEL_TAG, name) == 0) + res = _handle_object_start_model(attributes, num_attributes); + else if (::strcmp(RESOURCES_TAG, name) == 0) + res = _handle_object_start_resources(attributes, num_attributes); + else if (::strcmp(OBJECT_TAG, name) == 0) + res = _handle_object_start_object(attributes, num_attributes); + else if (::strcmp(COLOR_GROUP_TAG, name) == 0) + res = _handle_object_start_color_group(attributes, num_attributes); + else if (::strcmp(COLOR_TAG, name) == 0) + res = _handle_object_start_color(attributes, num_attributes); + else if (::strcmp(MESH_TAG, name) == 0) + res = _handle_object_start_mesh(attributes, num_attributes); + else if (::strcmp(VERTICES_TAG, name) == 0) + res = _handle_object_start_vertices(attributes, num_attributes); + else if (::strcmp(VERTEX_TAG, name) == 0) + res = _handle_object_start_vertex(attributes, num_attributes); + else if (::strcmp(TRIANGLES_TAG, name) == 0) + res = _handle_object_start_triangles(attributes, num_attributes); + else if (::strcmp(TRIANGLE_TAG, name) == 0) + res = _handle_object_start_triangle(attributes, num_attributes); + else if (::strcmp(COMPONENTS_TAG, name) == 0) + res = _handle_object_start_components(attributes, num_attributes); + else if (::strcmp(COMPONENT_TAG, name) == 0) + res = _handle_object_start_component(attributes, num_attributes); + else if (::strcmp(METADATA_TAG, name) == 0) + res = _handle_object_start_metadata(attributes, num_attributes); + + if (!res) + _stop_object_xml_parser(); + } + + void _BBS_3MF_Importer::ObjectImporter::_handle_object_end_model_xml_element(const char* name) + { + if (object_xml_parser == nullptr) + return; + + bool res = true; + + if (::strcmp(MODEL_TAG, name) == 0) + res = _handle_object_end_model(); + else if (::strcmp(RESOURCES_TAG, name) == 0) + res = _handle_object_end_resources(); + else if (::strcmp(OBJECT_TAG, name) == 0) + res = _handle_object_end_object(); + else if (::strcmp(COLOR_GROUP_TAG, name) == 0) + res = _handle_object_end_color_group(); + else if (::strcmp(COLOR_TAG, name) == 0) + res = _handle_object_end_color(); + else if (::strcmp(MESH_TAG, name) == 0) + res = _handle_object_end_mesh(); + else if (::strcmp(VERTICES_TAG, name) == 0) + res = _handle_object_end_vertices(); + else if (::strcmp(VERTEX_TAG, name) == 0) + res = _handle_object_end_vertex(); + else if (::strcmp(TRIANGLES_TAG, name) == 0) + res = _handle_object_end_triangles(); + else if (::strcmp(TRIANGLE_TAG, name) == 0) + res = _handle_object_end_triangle(); + else if (::strcmp(COMPONENTS_TAG, name) == 0) + res = _handle_object_end_components(); + else if (::strcmp(COMPONENT_TAG, name) == 0) + res = _handle_object_end_component(); + else if (::strcmp(METADATA_TAG, name) == 0) + res = _handle_object_end_metadata(); + + if (!res) + _stop_object_xml_parser(); + } + + void _BBS_3MF_Importer::ObjectImporter::_handle_object_xml_characters(const XML_Char* s, int len) + { + obj_curr_characters.append(s, len); + } + + void XMLCALL _BBS_3MF_Importer::ObjectImporter::_handle_object_start_model_xml_element(void* userData, const char* name, const char** attributes) + { + ObjectImporter* importer = (ObjectImporter*)userData; + if (importer != nullptr) + importer->_handle_object_start_model_xml_element(name, attributes); + } + + void XMLCALL _BBS_3MF_Importer::ObjectImporter::_handle_object_end_model_xml_element(void* userData, const char* name) + { + ObjectImporter* importer = (ObjectImporter*)userData; + if (importer != nullptr) + importer->_handle_object_end_model_xml_element(name); + } + + void XMLCALL _BBS_3MF_Importer::ObjectImporter::_handle_object_xml_characters(void* userData, const XML_Char* s, int len) + { + ObjectImporter* importer = (ObjectImporter*)userData; + if (importer != nullptr) + importer->_handle_object_xml_characters(s, len); + } + + bool _BBS_3MF_Importer::ObjectImporter::_extract_object_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat) + { + if (stat.m_uncomp_size == 0) { + top_importer->add_error("Found invalid size for "+object_path); + return false; + } + + object_xml_parser = XML_ParserCreate(nullptr); + if (object_xml_parser == nullptr) { + top_importer->add_error("Unable to create parser for "+object_path); + return false; + } + + XML_SetUserData(object_xml_parser, (void*)this); + XML_SetElementHandler(object_xml_parser, _BBS_3MF_Importer::ObjectImporter::_handle_object_start_model_xml_element, _BBS_3MF_Importer::ObjectImporter::_handle_object_end_model_xml_element); + XML_SetCharacterDataHandler(object_xml_parser, _BBS_3MF_Importer::ObjectImporter::_handle_object_xml_characters); + + struct CallbackData + { + XML_Parser& parser; + _BBS_3MF_Importer::ObjectImporter& importer; + const mz_zip_archive_file_stat& stat; + + CallbackData(XML_Parser& parser, _BBS_3MF_Importer::ObjectImporter& importer, const mz_zip_archive_file_stat& stat) : parser(parser), importer(importer), stat(stat) {} + }; + + CallbackData data(object_xml_parser, *this, stat); + + mz_bool res = 0; + + try + { + mz_file_write_func callback = [](void* pOpaque, mz_uint64 file_ofs, const void* pBuf, size_t n)->size_t { + CallbackData* data = (CallbackData*)pOpaque; + if (!XML_Parse(data->parser, (const char*)pBuf, (int)n, (file_ofs + n == data->stat.m_uncomp_size) ? 1 : 0) || data->importer.object_parse_error()) { + char error_buf[1024]; + ::snprintf(error_buf, 1024, "Error (%s) while parsing '%s' at line %d", data->importer.object_parse_error_message(), data->stat.m_filename, (int)XML_GetCurrentLineNumber(data->parser)); + throw Slic3r::FileIOError(error_buf); + } + return n; + }; + void* opaque = &data; + res = mz_zip_reader_extract_to_callback(&archive, stat.m_file_index, callback, opaque, 0); + } + catch (const version_error& e) + { + // rethrow the exception + std::string error_message = std::string(e.what()) + " for " + object_path; + throw Slic3r::FileIOError(error_message); + } + catch (std::exception& e) + { + std::string error_message = std::string(e.what()) + " for " + object_path; + top_importer->add_error(error_message); + return false; + } + + if (res == 0) { + top_importer->add_error("Error while extracting model data from zip archive for "+object_path); + return false; + } + + return true; + } + +//////////////////////////////////////////////////// EXPORTER ///////////////////////////////////////////////////// +// +// class _BBS_3MF_Exporter : public _BBS_3MF_Base +// { +// struct BuildItem +// { +// std::string path; +// unsigned int id; +// Transform3d transform; +// bool printable; +// +// BuildItem(std::string const & path, unsigned int id, const Transform3d& transform, const bool printable) +// : path(path) +// , id(id) +// , transform(transform) +// , printable(printable) +// { +// } +// }; +// +// //BBS: change volume to seperate objects +// /*struct Offsets +// { +// unsigned int first_vertex_id; +// unsigned int first_triangle_id; +// unsigned int last_triangle_id; +// +// Offsets(unsigned int first_vertex_id) +// : first_vertex_id(first_vertex_id) +// , first_triangle_id(-1) +// , last_triangle_id(-1) +// { +// } +// };*/ +// +// //typedef std::map VolumeToOffsetsMap; +// typedef std::map VolumeToObjectIDMap; +// +// struct ObjectData +// { +// ModelObject const * object; +// int backup_id; +// int object_id = 0; +// std::string sub_path; +// bool share_mesh = false; +// VolumeToObjectIDMap volumes_objectID; +// }; +// +// typedef std::vector BuildItemsList; +// typedef std::map ObjectToObjectDataMap; +// +// bool m_fullpath_sources{ true }; +// bool m_zip64 { true }; +// bool m_production_ext { false }; // save with Production Extention +// bool m_skip_static{ false }; // not save mesh and other big static contents +// bool m_from_backup_save{ false }; // the object save is from backup store +// bool m_split_model { false }; // save object per file with Production Extention +// bool m_save_gcode { false }; // whether to save gcode for normal save +// bool m_skip_model { false }; // skip model when exporting .gcode.3mf +// bool m_skip_auxiliary { false }; // skip normal axuiliary files +// bool m_use_loaded_id { false }; // whether to use loaded id for identify_id +// bool m_share_mesh { false }; // whether to share mesh between objects +// std::string m_thumbnail_middle = PRINTER_THUMBNAIL_MIDDLE_FILE; +// std::string m_thumbnail_small = PRINTER_THUMBNAIL_SMALL_FILE; +// std::map> m_shared_meshes; +// std::map> m_volume_paths; +// public: +// //BBS: add plate data related logic +// +// // add backup logic +// //bool save_model_to_file(const std::string& filename, Model& model, PlateDataPtrs& plate_data_list, std::vector& project_presets, const DynamicPrintConfig* config, bool fullpath_sources, const std::vector& thumbnail_data, bool zip64, bool skip_static, Export3mfProgressFn proFn = nullptr, bool silence = false); +// +// bool save_model_to_file(StoreParams& store_params); +// // add backup logic +// bool save_object_mesh(const std::string& temp_path, ModelObject const & object, int obj_id); +// static void add_transformation(std::stringstream &stream, const Transform3d &tr); +// +// private: +// //BBS: add plate data related logic +// bool _save_model_to_file(const std::string& filename, +// Model& model, PlateDataPtrs& plate_data_list, +// std::vector& project_presets, +// const DynamicPrintConfig* config, +// const std::vector& thumbnail_data, +// const std::vector& top_thumbnail_data, +// const std::vector& pick_thumbnail_data, +// Export3mfProgressFn proFn, +// const std::vector& calibration_data, +// //const std::vector& id_bboxes, //Susi_not_impl +// //BBLProject* project = nullptr, //Susi_not_impl +// int export_plate_idx = -1); +// +// bool _add_file_to_archive(mz_zip_archive& archive, const std::string & path_in_zip, const std::string & file_path); +// +// bool _add_content_types_file_to_archive(mz_zip_archive& archive); +// +// bool _add_thumbnail_file_to_archive(mz_zip_archive& archive, const ThumbnailData& thumbnail_data, const char* local_path, int index, bool generate_small_thumbnail = false); +// bool _add_calibration_file_to_archive(mz_zip_archive& archive, const ThumbnailData& thumbnail_data, int index); +// bool _add_bbox_file_to_archive(mz_zip_archive& archive, /*const PlateBBoxData& id_bboxes,*/ int index); +// bool _add_relationships_file_to_archive(mz_zip_archive & archive, +// std::string const & from = {}, +// std::vector const &targets = {}, +// std::vector const &types = {}, +// PackingTemporaryData data = PackingTemporaryData(), +// int export_plate_idx = -1) const; +// bool _add_model_file_to_archive(const std::string& filename, mz_zip_archive& archive, const Model& model, ObjectToObjectDataMap& objects_data, Export3mfProgressFn proFn = nullptr, /*BBLProject* project = nullptr*/) const; +// bool _add_object_to_model_stream(mz_zip_writer_staged_context &context, ObjectData const &object_data) const; +// void _add_object_components_to_stream(std::stringstream &stream, ObjectData const &object_data) const; +// //BBS: change volume to seperate objects +// bool _add_mesh_to_object_stream(std::function const &flush, ObjectData const &object_data) const; +// bool _add_build_to_model_stream(std::stringstream& stream, const BuildItemsList& build_items) const; +// bool _add_cut_information_file_to_archive(mz_zip_archive& archive, Model& model); +// bool _add_layer_height_profile_file_to_archive(mz_zip_archive& archive, Model& model); +// bool _add_layer_config_ranges_file_to_archive(mz_zip_archive& archive, Model& model); +// bool _add_sla_support_points_file_to_archive(mz_zip_archive& archive, Model& model); +// bool _add_sla_drain_holes_file_to_archive(mz_zip_archive& archive, Model& model); +// bool _add_print_config_file_to_archive(mz_zip_archive& archive, const DynamicPrintConfig &config); +// //BBS: add project config file logic for json format +// bool _add_project_config_file_to_archive(mz_zip_archive& archive, const DynamicPrintConfig &config, Model& model); +// //BBS: add project embedded preset files +// bool _add_project_embedded_presets_to_archive(mz_zip_archive& archive, Model& model, std::vector project_presets); +// bool _add_model_config_file_to_archive(mz_zip_archive& archive, const Model& model, PlateDataPtrs& plate_data_list, const ObjectToObjectDataMap &objects_data, int export_plate_idx = -1, bool save_gcode = true, bool use_loaded_id = false); +// bool _add_slice_info_config_file_to_archive(mz_zip_archive &archive, const Model &model, PlateDataPtrs &plate_data_list, const ObjectToObjectDataMap &objects_data, const DynamicPrintConfig& config); +// bool _add_gcode_file_to_archive(mz_zip_archive& archive, const Model& model, PlateDataPtrs& plate_data_list, Export3mfProgressFn proFn = nullptr); +// bool _add_custom_gcode_per_print_z_file_to_archive(mz_zip_archive& archive, Model& model, const DynamicPrintConfig* config); +// bool _add_auxiliary_dir_to_archive(mz_zip_archive &archive, const std::string &aux_dir, PackingTemporaryData &data); +// +// static int convert_instance_id_to_resource_id(const Model& model, int obj_id, int instance_id) +// { +// int resource_id = 1; +// +// for (int i = 0; i < obj_id; ++i) +// { +// resource_id += model.objects[i]->volumes.size() + 1; +// } +// +// resource_id += model.objects[obj_id]->volumes.size(); +// +// return resource_id; +// } +// }; +// +// bool _BBS_3MF_Exporter::save_model_to_file(StoreParams& store_params) +// { +// clear_errors(); +// m_fullpath_sources = store_params.strategy & SaveStrategy::FullPathSources; +// m_zip64 = store_params.strategy & SaveStrategy::Zip64; +// m_production_ext = store_params.strategy & SaveStrategy::ProductionExt; +// +// m_skip_static = store_params.strategy & SaveStrategy::SkipStatic; +// m_split_model = store_params.strategy & SaveStrategy::SplitModel; +// m_save_gcode = store_params.strategy & SaveStrategy::WithGcode; +// m_skip_model = store_params.strategy & SaveStrategy::SkipModel; +// m_skip_auxiliary = store_params.strategy & SaveStrategy::SkipAuxiliary; +// m_share_mesh = store_params.strategy & SaveStrategy::ShareMesh; +// m_from_backup_save = store_params.strategy & SaveStrategy::Backup; +// +// m_use_loaded_id = store_params.strategy & SaveStrategy::UseLoadedId; +// +// //if (auto info = store_params.model->model_info) { +// // if (auto iter = info->metadata_items.find("Thumbnail_Small"); iter != info->metadata_items.end()) +// // m_thumbnail_small = iter->second; +// // if (auto iter = info->metadata_items.find("Thumbnail_Middle"); iter != info->metadata_items.end()) +// // m_thumbnail_middle = iter->second; +// //} //Susi_not_impl +// boost::system::error_code ec; +// std::string filename = std::string(store_params.path); +// boost::filesystem::remove(filename + ".tmp", ec); +// +// bool result = _save_model_to_file(filename + ".tmp", *store_params.model, store_params.plate_data_list, store_params.project_presets, store_params.config, +// store_params.thumbnail_data, store_params.top_thumbnail_data, store_params.pick_thumbnail_data, store_params.proFn, +// store_params.calibration_thumbnail_data, /*store_params.id_bboxes, store_params.project, */store_params.export_plate_idx); +// if (result) { +// boost::filesystem::rename(filename + ".tmp", filename, ec); +// if (ec) { +// add_error("Failed to rename file: " + ec.message()); +// boost::filesystem::remove(filename + ".tmp", ec); +// return false; +// } +// if (!(store_params.strategy & SaveStrategy::Silence)) +// //save_string_file(store_params.model->get_backup_path() + "/origin.txt", filename); +// save_string_file(get_temp_file(*store_params.model) / "origin.txt", filename); +// } +// return result; +// } +// +// // backup mesh-only +// bool _BBS_3MF_Exporter::save_object_mesh(const std::string& temp_path, ModelObject const & object, int obj_id) +// { +// m_production_ext = true; +// m_from_backup_save = true; +// Model const & model = *object.get_model(); +// +// mz_zip_archive archive; +// mz_zip_zero_struct(&archive); +// +// auto filename = boost::format("3D/Objects/%s_%d.model") % object.name % obj_id; +// std::string filepath = temp_path + "/" + filename.str(); +// std::string filepath_tmp = filepath + ".tmp"; +// boost::system::error_code ec; +// boost::filesystem::remove(filepath_tmp, ec); +// if (!open_zip_writer(&archive, filepath_tmp)) { +// add_error("Unable to open the file"+filepath_tmp); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Unable to open the file\n"); +// return false; +// } +// +// struct close_lock +// { +// mz_zip_archive & archive; +// std::string const * filename; +// void close() { +// close_zip_writer(&archive); +// filename = nullptr; +// } +// ~close_lock() { +// if (filename) { +// close_zip_writer(&archive); +// boost::system::error_code ec; +// boost::filesystem::remove(*filename, ec); +// } +// } +// } lock{archive, &filepath_tmp}; +// +// ObjectToObjectDataMap objects_data; +// auto & volumes_objectID = objects_data.insert({&object, {&object, obj_id}}).first->second.volumes_objectID; +// unsigned int volume_count = 0; +// for (ModelVolume *volume : object.volumes) { +// if (volume == nullptr) continue; +// volumes_objectID.insert({volume, (++volume_count << 16 | obj_id)}); +// } +// +// _add_model_file_to_archive(filename.str(), archive, model, objects_data); +// +// mz_zip_writer_finalize_archive(&archive); +// lock.close(); +// boost::filesystem::rename(filepath_tmp, filepath, ec); +// return true; +// } +// +// //BBS: add plate data related logic +// bool _BBS_3MF_Exporter::_save_model_to_file(const std::string& filename, +// Model& model, +// PlateDataPtrs& plate_data_list, +// std::vector& project_presets, +// const DynamicPrintConfig* config, +// const std::vector& thumbnail_data, +// const std::vector& top_thumbnail_data, +// const std::vector& pick_thumbnail_data, +// Export3mfProgressFn proFn, +// const std::vector& calibration_data, +// //const std::vector& id_bboxes, //Susi_not_impl +// //BBLProject* project, //Susi_not_impl +// int export_plate_idx) +// { +// PackingTemporaryData temp_data; +// +// mz_zip_archive archive; +// mz_zip_zero_struct(&archive); +// +// bool cb_cancel = false; +// +// //BBS progress point +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << +// boost::format(",before open zip writer, m_skip_static %1%, m_save_gcode %2%, m_use_loaded_id %3%")%m_skip_static %m_save_gcode %m_use_loaded_id; +// if (proFn) { +// proFn(EXPORT_STAGE_OPEN_3MF, 0, 1, cb_cancel); +// if (cb_cancel) +// return false; +// } +// +// if (!open_zip_writer(&archive, filename)) { +// add_error("Unable to open the file"+filename); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Unable to open the file\n"); +// return false; +// } +// +// struct close_lock +// { +// mz_zip_archive & archive; +// std::string const * filename; +// ~close_lock() { +// close_zip_writer(&archive); +// if (filename) { +// boost::system::error_code ec; +// boost::filesystem::remove(*filename, ec); +// } +// } +// } lock{ archive, &filename}; +// +// //BBS progress point +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", before add _add_content_types_file_to_archive\n"); +// if (proFn) { +// proFn(EXPORT_STAGE_CONTENT_TYPES, 0, 1, cb_cancel); +// if (cb_cancel) +// return false; +// } +// +// // Adds content types file ("[Content_Types].xml";). +// // The content of this file is the same for each OrcaSlicer 3mf. +// if (!_add_content_types_file_to_archive(archive)) { +// return false; +// } +// +// //BBS progress point +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(",before add thumbnails, count %1%") % thumbnail_data.size(); +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(",top&&pick thumbnails, count %1%")%top_thumbnail_data.size(); +// +// //BBS: add thumbnail for each plate +// if (!m_skip_static) { +// std::vector thumbnail_status(plate_data_list.size(), false); +// std::vector top_thumbnail_status(plate_data_list.size(), false); +// std::vector pick_thumbnail_status(plate_data_list.size(), false); +// +// if ((thumbnail_data.size() > 0)&&(thumbnail_data.size() > plate_data_list.size())) { +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", thumbnail_data size %1% > plate count %2%") +// % thumbnail_data.size() %plate_data_list.size(); +// return false; +// } +// if ((top_thumbnail_data.size() > 0)&&(top_thumbnail_data.size() > plate_data_list.size())) { +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", top_thumbnail_data size %1% > plate count %2%") +// % top_thumbnail_data.size() %plate_data_list.size(); +// return false; +// } +// if ((pick_thumbnail_data.size() > 0)&&(pick_thumbnail_data.size() > plate_data_list.size())) { +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", pick_thumbnail_data size %1% > plate count %2%") +// % pick_thumbnail_data.size() %plate_data_list.size(); +// return false; +// } +// if (top_thumbnail_data.size() != pick_thumbnail_data.size()) { +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", top_thumbnail_data size %1% != pick_thumbnail_data size %2%") +// % top_thumbnail_data.size() %pick_thumbnail_data.size(); +// return false; +// } +// +// if (proFn) { +// proFn(EXPORT_STAGE_ADD_THUMBNAILS, 0, plate_data_list.size(), cb_cancel); +// if (cb_cancel) +// return false; +// } +// +// for (unsigned int index = 0; index < thumbnail_data.size(); index++) +// { +// if (thumbnail_data[index]->is_valid()) +// { +// if (!_add_thumbnail_file_to_archive(archive, *thumbnail_data[index], "Metadata/plate", index, true)) { +// return false; +// } +// +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(",add thumbnail %1%'s data into 3mf")%(index+1); +// thumbnail_status[index] = true; +// } +// } +// +// // Adds the file Metadata/top_i.png and Metadata/pick_i.png +// for (unsigned int index = 0; index < top_thumbnail_data.size(); index++) +// { +// if (top_thumbnail_data[index]->is_valid()) +// { +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(",add top thumbnail %1%'s data into 3mf")%(index+1); +// if (!_add_thumbnail_file_to_archive(archive, *top_thumbnail_data[index], "Metadata/top", index)) { +// return false; +// } +// top_thumbnail_status[index] = true; +// } +// +// if (pick_thumbnail_data[index]->is_valid()) +// { +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(",add pick thumbnail %1%'s data into 3mf")%(index+1); +// if (!_add_thumbnail_file_to_archive(archive, *pick_thumbnail_data[index], "Metadata/pick", index)) { +// return false; +// } +// pick_thumbnail_status[index] = true; +// } +// } +// +// for (int i = 0; i < plate_data_list.size(); i++) { +// PlateData *plate_data = plate_data_list[i]; +// +// if (!thumbnail_status[i] && !plate_data->thumbnail_file.empty() && (boost::filesystem::exists(plate_data->thumbnail_file))){ +// std::string dst_in_3mf = (boost::format("Metadata/plate_%1%.png") % (i + 1)).str(); +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", add thumbnail %1% from file %2%") % (i+1) %plate_data->thumbnail_file; +// +// if (!_add_file_to_archive(archive, dst_in_3mf, plate_data->thumbnail_file)) { +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", add thumbnail %1% from file %2% failed\n") % (i+1) %plate_data->thumbnail_file; +// return false; +// } +// } +// +// if (!top_thumbnail_status[i] && !plate_data->top_file.empty() && (boost::filesystem::exists(plate_data->top_file))){ +// std::string dst_in_3mf = (boost::format("Metadata/top_%1%.png") % (i + 1)).str(); +// +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", add top thumbnail %1% from file %2%") % (i+1) %plate_data->top_file; +// if (!_add_file_to_archive(archive, dst_in_3mf, plate_data->top_file)) { +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", add top thumbnail %1% failed") % (i+1); +// return false; +// } +// top_thumbnail_status[i] = true; +// } +// +// if (!pick_thumbnail_status[i] && !plate_data->pick_file.empty() && (boost::filesystem::exists(plate_data->pick_file))){ +// std::string dst_in_3mf = (boost::format("Metadata/pick_%1%.png") % (i + 1)).str(); +// +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", add pick thumbnail %1% from file %2%") % (i+1) %plate_data->pick_file; +// if (!_add_file_to_archive(archive, dst_in_3mf, plate_data->pick_file)) { +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", add pick thumbnail %1% failed") % (i+1); +// return false; +// } +// pick_thumbnail_status[i] = true; +// } +// } +// if (proFn) { +// proFn(EXPORT_STAGE_ADD_THUMBNAILS, plate_data_list.size(), plate_data_list.size(), cb_cancel); +// if (cb_cancel) +// return false; +// } +// } +// +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(",before add calibration thumbnails, count %1%\n")%calibration_data.size(); +// //BBS add calibration thumbnail for each plate +// if (!m_skip_static && calibration_data.size() > 0) { +// // Adds the file Metadata/calibration_p[X].png. +// for (unsigned int index = 0; index < calibration_data.size(); index++) +// { +// if (proFn) { +// proFn(EXPORT_STAGE_ADD_THUMBNAILS, index, calibration_data.size(), cb_cancel); +// if (cb_cancel) +// return false; +// } +// +// if (calibration_data[index]->is_valid()) +// { +// if (!_add_calibration_file_to_archive(archive, *calibration_data[index], index)) { +// close_zip_writer(&archive); +// return false; +// } +// } +// } +// } +// +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(",before add calibration boundingbox, count %1%\n")%id_bboxes.size(); +// //if (!m_skip_static && id_bboxes.size() > 0) { +// // // Adds the file Metadata/calibration_p[X].png. +// // for (unsigned int index = 0; index < id_bboxes.size(); index++) +// // { +// // // BBS: save bounding box to json +// // if (id_bboxes[index]->is_valid()) { +// // if (!_add_bbox_file_to_archive(archive, *id_bboxes[index], index)) { +// // close_zip_writer(&archive); +// // return false; +// // } +// // } +// // } +// //} //s +// +// //BBS progress point +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", before add models\n"); +// if (proFn) { +// proFn(EXPORT_STAGE_ADD_MODELS, 0, 1, cb_cancel); +// if (cb_cancel) +// return false; +// } +// +// // Adds model file ("3D/3dmodel.model"). +// // This is the one and only file that contains all the geometry (vertices and triangles) of all ModelVolumes. +// ObjectToObjectDataMap objects_data; +// //if (!m_skip_model) +// { +// if (!_add_model_file_to_archive(filename, archive, model, objects_data, proFn, project)) { return false; } +// +// // Adds layer height profile file ("Metadata/Slic3r_PE_layer_heights_profile.txt"). +// // All layer height profiles of all ModelObjects are stored here, indexed by 1 based index of the ModelObject in Model. +// // The index differes from the index of an object ID of an object instance of a 3MF file! +// if (!_add_layer_height_profile_file_to_archive(archive, model)) { +// close_zip_writer(&archive); +// return false; +// } +// +// // BBS progress point +// /*BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format("export 3mf EXPORT_STAGE_ADD_LAYER_RANGE\n"); +// if (proFn) { +// proFn(EXPORT_STAGE_ADD_LAYER_RANGE, 0, 1, cb_cancel); +// if (cb_cancel) +// return false; +// }*/ +// +// // Adds layer config ranges file ("Metadata/Slic3r_PE_layer_config_ranges.txt"). +// // All layer height profiles of all ModelObjects are stored here, indexed by 1 based index of the ModelObject in Model. +// // The index differes from the index of an object ID of an object instance of a 3MF file! +// if (!_add_layer_config_ranges_file_to_archive(archive, model)) { +// close_zip_writer(&archive); +// return false; +// } +// +// // BBS progress point +// /*BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format("export 3mf EXPORT_STAGE_ADD_SUPPORT\n"); +// if (proFn) { +// proFn(EXPORT_STAGE_ADD_SUPPORT, 0, 1, cb_cancel); +// if (cb_cancel) +// return false; +// } +// +// // Adds sla support points file ("Metadata/Slic3r_PE_sla_support_points.txt"). +// // All sla support points of all ModelObjects are stored here, indexed by 1 based index of the ModelObject in Model. +// // The index differes from the index of an object ID of an object instance of a 3MF file! +// if (!_add_sla_support_points_file_to_archive(archive, model)) { +// return false; +// } +// +// if (!_add_sla_drain_holes_file_to_archive(archive, model)) { +// return false; +// }*/ +// +// // BBS progress point +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", before add custom gcodes\n"); +// if (proFn) { +// proFn(EXPORT_STAGE_ADD_CUSTOM_GCODE, 0, 1, cb_cancel); +// if (cb_cancel) return false; +// } +// +// // Adds custom gcode per height file ("Metadata/Prusa_Slicer_custom_gcode_per_print_z.xml"). +// // All custom gcode per height of whole Model are stored here +// if (!_add_custom_gcode_per_print_z_file_to_archive(archive, model, config)) { return false; } +// +// // BBS progress point +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", before add project_settings\n"); +// if (proFn) { +// proFn(EXPORT_STAGE_ADD_PRINT_CONFIG, 0, 1, cb_cancel); +// if (cb_cancel) return false; +// } +// +// // Adds slic3r print config file ("Metadata/Slic3r_PE.config"). +// // This file contains the content of FullPrintConfing / SLAFullPrintConfig. +// if (config != nullptr) { +// // BBS: change to json format +// // if (!_add_print_config_file_to_archive(archive, *config)) { +// if (!_add_project_config_file_to_archive(archive, *config, model)) { return false; } +// } +// +// // BBS progress point +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", before add project embedded settings\n"); +// if (proFn) { +// proFn(EXPORT_STAGE_ADD_CONFIG_FILE, 0, 1, cb_cancel); +// if (cb_cancel) return false; +// } +// +// // BBS: add project config +// if (project_presets.size() > 0) { +// // BBS: add project embedded preset files +// _add_project_embedded_presets_to_archive(archive, model, project_presets); +// +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", finished add project embedded settings, size %1%\n")%project_presets.size(); +// if (proFn) { +// proFn(EXPORT_STAGE_ADD_PROJECT_CONFIG, 0, 1, cb_cancel); +// if (cb_cancel) return false; +// } +// } +// } +// +// // add plate_N.gcode.md5 to file +// if (!m_skip_static && m_save_gcode) { +// for (int i = 0; i < plate_data_list.size(); i++) { +// PlateData *plate_data = plate_data_list[i]; +// if (!plate_data->gcode_file.empty() && plate_data->is_sliced_valid && boost::filesystem::exists(plate_data->gcode_file)) { +// unsigned char digest[16]; +// MD5_CTX ctx; +// MD5_Init(&ctx); +// auto src_gcode_file = plate_data->gcode_file; +// boost::filesystem::ifstream ifs(src_gcode_file, std::ios::binary); +// std::string buf(64 * 1024, 0); +// const std::size_t & size = boost::filesystem::file_size(src_gcode_file); +// std::size_t left_size = size; +// while (ifs) { +// ifs.read(buf.data(), buf.size()); +// int read_bytes = ifs.gcount(); +// MD5_Update(&ctx, (unsigned char *) buf.data(), read_bytes); +// } +// MD5_Final(digest, &ctx); +// char md5_str[33]; +// for (int j = 0; j < 16; j++) { sprintf(&md5_str[j * 2], "%02X", (unsigned int) digest[j]); } +// plate_data->gcode_file_md5 = std::string(md5_str); +// std::string target_file = (boost::format("Metadata/plate_%1%.gcode.md5") % (plate_data->plate_index + 1)).str(); +// if (!mz_zip_writer_add_mem(&archive, target_file.c_str(), (const void *) plate_data->gcode_file_md5.c_str(), plate_data->gcode_file_md5.length(), +// MZ_DEFAULT_COMPRESSION)) { +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ +// << boost::format(", store gcode md5 to 3mf's %1%, length %2%, failed\n") %target_file %plate_data->gcode_file_md5.length(); +// return false; +// } +// } +// } +// } +// +// // Adds gcode files ("Metadata/plate_1.gcode, plate_2.gcode, ...) +// // Before _add_model_config_file_to_archive, because we modify plate_data +// //if (!m_skip_static && !_add_gcode_file_to_archive(archive, model, plate_data_list, proFn)) { +// if (!m_skip_static && m_save_gcode && !_add_gcode_file_to_archive(archive, model, plate_data_list, proFn)) { +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", _add_gcode_file_to_archive failed\n"); +// return false; +// } +// +// // Adds slic3r model config file ("Metadata/Slic3r_PE_model.config"). +// // This file contains all the attributes of all ModelObjects and their ModelVolumes (names, parameter overrides). +// // As there is just a single Indexed Triangle Set data stored per ModelObject, offsets of volumes into their respective Indexed Triangle Set data +// // is stored here as well. +// if (!_add_model_config_file_to_archive(archive, model, plate_data_list, objects_data, export_plate_idx, m_save_gcode, m_use_loaded_id)) { +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", _add_model_config_file_to_archive failed\n"); +// return false; +// } +// +// if (!_add_cut_information_file_to_archive(archive, model)) { +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", _add_cut_information_file_to_archive failed\n"); +// return false; +// } +// +// //BBS progress point +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", before add sliced info to 3mf\n"); +// if (proFn) { +// proFn(EXPORT_STAGE_ADD_SLICE_INFO, 0, 1, cb_cancel); +// if (cb_cancel) +// return false; +// } +// +// // Adds sliced info of plate file ("Metadata/slice_info.config") +// // This file contains all sliced info of all plates +// if (!_add_slice_info_config_file_to_archive(archive, model, plate_data_list, objects_data, *config)) { +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", _add_slice_info_config_file_to_archive failed\n"); +// return false; +// } +// +// //BBS progress point +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", before add auxiliary dir to 3mf\n"); +// if (proFn) { +// proFn(EXPORT_STAGE_ADD_AUXILIARIES, 0, 1, cb_cancel); +// if (cb_cancel) +// return false; +// } +// +// if (!m_skip_static && !_add_auxiliary_dir_to_archive(archive, model.get_auxiliary_file_temp_path(), temp_data)) { +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", _add_auxiliary_dir_to_archive failed\n"); +// return false; +// } +// +// //BBS progress point +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", before add relation file to 3mf\n"); +// if (proFn) { +// proFn(EXPORT_STAGE_ADD_RELATIONS, 0, 1, cb_cancel); +// if (cb_cancel) +// return false; +// } +// +// // Adds relationships file ("_rels/.rels"). +// // The content of this file is the same for each OrcaSlicer 3mf. +// // The relationshis file contains a reference to the geometry file "3D/3dmodel.model", the name was chosen to be compatible with CURA. +// if (!_add_relationships_file_to_archive(archive, {}, {}, {}, temp_data, export_plate_idx)) { +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", _add_relationships_file_to_archive failed\n"); +// return false; +// } +// +// if (!mz_zip_writer_finalize_archive(&archive)) { +// add_error("Unable to finalize the archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Unable to finalize the archive\n"); +// return false; +// } +// +// //BBS progress point +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", finished exporting 3mf\n"); +// if (proFn) { +// proFn(EXPORT_STAGE_FINISH, 0, 1, cb_cancel); +// if (cb_cancel) +// return false; +// } +// +// lock.filename = nullptr; +// +// return true; +// } +// +// bool _BBS_3MF_Exporter::_add_file_to_archive(mz_zip_archive& archive, const std::string& path_in_zip, const std::string& src_file_path) +// { +// static std::string const nocomp_exts[] = {".png", ".jpg", ".mp4", ".jpeg", ".zip", ".3mf"}; +// auto end = nocomp_exts + sizeof(nocomp_exts) / sizeof(nocomp_exts[0]); +// bool nocomp = std::find_if(nocomp_exts, end, [&path_in_zip](auto & ext) { return boost::algorithm::ends_with(path_in_zip, ext); }) != end; +//#if WRITE_ZIP_LANGUAGE_ENCODING +// bool result = mz_zip_writer_add_file(&archive, path_in_zip.c_str(), encode_path(src_file_path.c_str()).c_str(), NULL, 0, nocomp ? MZ_NO_COMPRESSION : MZ_DEFAULT_LEVEL); +//#else +// std::string native_path = encode_path(path_in_zip.c_str()); +// std::string extra = ZipUnicodePathExtraField::encode(path_in_zip, native_path); +// bool result = mz_zip_writer_add_file_ex(&archive, native_path.c_str(), encode_path(src_file_path.c_str()).c_str(), NULL, 0, nocomp ? MZ_ZIP_FLAG_ASCII_FILENAME : MZ_DEFAULT_COMPRESSION, +// extra.c_str(), extra.length(), extra.c_str(), extra.length()); +//#endif +// if (!result) { +// add_error("Unable to add file " + src_file_path + " to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", Unable to add file %1% to archive %2%\n") % src_file_path % path_in_zip; +// } else { +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", add file %1% to archive %2%\n") % src_file_path % path_in_zip; +// } +// return result; +// } +// +// bool _BBS_3MF_Exporter::_add_content_types_file_to_archive(mz_zip_archive& archive) +// { +// std::stringstream stream; +// stream << "\n"; +// stream << "\n"; +// stream << " \n"; +// stream << " \n"; +// stream << " \n"; +// stream << " \n"; +// stream << ""; +// +// std::string out = stream.str(); +// +// if (!mz_zip_writer_add_mem(&archive, CONTENT_TYPES_FILE.c_str(), (const void*)out.data(), out.length(), MZ_DEFAULT_COMPRESSION)) { +// add_error("Unable to add content types file to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Unable to add content types file to archive\n"); +// return false; +// } +// +// return true; +// } +// +// bool _BBS_3MF_Exporter::_add_thumbnail_file_to_archive(mz_zip_archive& archive, const ThumbnailData& thumbnail_data, const char* local_path, int index, bool generate_small_thumbnail) +// { +// bool res = false; +// +// size_t png_size = 0; +// void* png_data = tdefl_write_image_to_png_file_in_memory_ex((const void*)thumbnail_data.pixels.data(), thumbnail_data.width, thumbnail_data.height, 4, &png_size, MZ_DEFAULT_COMPRESSION, 1); +// if (png_data != nullptr) { +// std::string thumbnail_name = (boost::format("%1%_%2%.png")%local_path % (index + 1)).str(); +// res = mz_zip_writer_add_mem(&archive, thumbnail_name.c_str(), (const void*)png_data, png_size, MZ_NO_COMPRESSION); +// mz_free(png_data); +// } +// +// if (!res) { +// add_error("Unable to add thumbnail file to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Unable to add thumbnail file to archive\n"); +// } +// +// if (generate_small_thumbnail && thumbnail_data.is_valid()) { +// //generate small size of thumbnail +// std::vector small_pixels; +// small_pixels.resize(PLATE_THUMBNAIL_SMALL_WIDTH * PLATE_THUMBNAIL_SMALL_HEIGHT * 4); +// /* step width and step height */ +// int sw = thumbnail_data.width / PLATE_THUMBNAIL_SMALL_WIDTH; +// int sh = thumbnail_data.height / PLATE_THUMBNAIL_SMALL_HEIGHT; +// int clampped_width = sw * PLATE_THUMBNAIL_SMALL_WIDTH; +// int clampped_height = sh * PLATE_THUMBNAIL_SMALL_HEIGHT; +// +// for (int i = 0; i < clampped_height; i += sh) { +// for (int j = 0; j < clampped_width; j += sw) { +// int r = 0, g = 0, b = 0, a = 0; +// for (int m = 0; m < sh; m++) { +// for (int n = 0; n < sw; n++) { +// r += (int)thumbnail_data.pixels[4 * ((i + m) * thumbnail_data.width + j + n) + 0]; +// g += (int)thumbnail_data.pixels[4 * ((i + m) * thumbnail_data.width + j + n) + 1]; +// b += (int)thumbnail_data.pixels[4 * ((i + m) * thumbnail_data.width + j + n) + 2]; +// a += (int)thumbnail_data.pixels[4 * ((i + m) * thumbnail_data.width + j + n) + 3]; +// } +// } +// r = std::clamp(0, r / sw / sh, 255); +// g = std::clamp(0, g / sw / sh, 255); +// b = std::clamp(0, b / sw / sh, 255); +// a = std::clamp(0, a / sw / sh, 255); +// small_pixels[4 * (i / sw * PLATE_THUMBNAIL_SMALL_WIDTH + j / sh) + 0] = (unsigned char)r; +// small_pixels[4 * (i / sw * PLATE_THUMBNAIL_SMALL_WIDTH + j / sh) + 1] = (unsigned char)g; +// small_pixels[4 * (i / sw * PLATE_THUMBNAIL_SMALL_WIDTH + j / sh) + 2] = (unsigned char)b; +// small_pixels[4 * (i / sw * PLATE_THUMBNAIL_SMALL_WIDTH + j / sh) + 3] = (unsigned char)a; +// //memcpy((void*)&small_pixels[4*(i / sw * PLATE_THUMBNAIL_SMALL_WIDTH + j / sh)], thumbnail_data.pixels.data() + 4*(i * thumbnail_data.width + j), 4); +// } +// } +// size_t small_png_size = 0; +// void* small_png_data = tdefl_write_image_to_png_file_in_memory_ex((const void*)small_pixels.data(), PLATE_THUMBNAIL_SMALL_WIDTH, PLATE_THUMBNAIL_SMALL_HEIGHT, 4, &small_png_size, MZ_DEFAULT_COMPRESSION, 1); +// if (png_data != nullptr) { +// std::string thumbnail_name = (boost::format("%1%_%2%_small.png") % local_path % (index + 1)).str(); +// res = mz_zip_writer_add_mem(&archive, thumbnail_name.c_str(), (const void*)small_png_data, small_png_size, MZ_NO_COMPRESSION); +// mz_free(small_png_data); +// } +// +// if (!res) { +// add_error("Unable to add small thumbnail file to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Unable to add small thumbnail file to archive\n"); +// } +// } +// +// return res; +// } +// +// bool _BBS_3MF_Exporter::_add_calibration_file_to_archive(mz_zip_archive& archive, const ThumbnailData& thumbnail_data, int index) +// { +// bool res = false; +// +// /*size_t png_size = 0; +// void* png_data = tdefl_write_image_to_png_file_in_memory_ex((const void*)thumbnail_data.pixels.data(), thumbnail_data.width, thumbnail_data.height, 4, &png_size, MZ_DEFAULT_COMPRESSION, 1); +// if (png_data != nullptr) { +// std::string thumbnail_name = (boost::format(PATTERN_FILE_FORMAT) % (index + 1)).str(); +// res = mz_zip_writer_add_mem(&archive, thumbnail_name.c_str(), (const void*)png_data, png_size, MZ_NO_COMPRESSION); +// mz_free(png_data); +// } +// +// if (!res) { +// add_error("Unable to add thumbnail file to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Unable to add thumbnail file to archive\n"); +// }*/ +// +// return res; +// } +// +// bool _BBS_3MF_Exporter::_add_bbox_file_to_archive(mz_zip_archive& archive, /*const PlateBBoxData& id_bboxes, */int index) +// { +// bool res = false; +// nlohmann::json j; +// //id_bboxes.to_json(j); +// std::string out = j.dump(); +// +// std::string json_file_name = (boost::format(PATTERN_CONFIG_FILE_FORMAT) % (index + 1)).str(); +// if (!mz_zip_writer_add_mem(&archive, json_file_name.c_str(), (const void*)out.data(), out.length(), MZ_DEFAULT_COMPRESSION)) { +// add_error("Unable to add json file to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Unable to add json file to archive\n"); +// return false; +// } +// +// return true; +// } +// +// bool _BBS_3MF_Exporter::_add_relationships_file_to_archive( +// mz_zip_archive &archive, std::string const &from, std::vector const &targets, std::vector const &types, PackingTemporaryData data, int export_plate_idx) const +// { +// std::stringstream stream; +// stream << "\n"; +// stream << "\n"; +// if (from.empty()) { +// stream << " \n"; +// +// if (export_plate_idx < 0) { +// //use cover image if have +// if (data._3mf_thumbnail.empty()) { +// stream << " \n"; +// } else { +// stream << " \n"; +// } +// +// if (data._3mf_printer_thumbnail_middle.empty()) { +// stream << " \n"; +// } else { +// stream << " \n"; +// } +// +// if (data._3mf_printer_thumbnail_small.empty()) { +// stream << "\n"; +// } else { +// stream << " \n"; +// } +// } +// else { +// //always use plate thumbnails +// std::string thumbnail_file_str = (boost::format("Metadata/plate_%1%.png") % (export_plate_idx + 1)).str(); +// stream << " \n"; +// +// thumbnail_file_str = (boost::format("Metadata/plate_%1%.png") % (export_plate_idx + 1)).str(); +// stream << " \n"; +// +// thumbnail_file_str = (boost::format("Metadata/plate_%1%_small.png") % (export_plate_idx + 1)).str(); +// stream << " \n"; +// } +// } +// else if (targets.empty()) { +// return false; +// } +// else { +// int i = 0; +// for (auto & path : targets) { +// for (auto & type : types) +// stream << " \n"; +// } +// } +// stream << ""; +// +// std::string out = stream.str(); +// +// if (!mz_zip_writer_add_mem(&archive, from.empty() ? RELATIONSHIPS_FILE.c_str() : from.c_str(), (const void*)out.data(), out.length(), MZ_DEFAULT_COMPRESSION)) { +// add_error("Unable to add relationships file to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Unable to add relationships file to archive\n"); +// return false; +// } +// +// return true; +// } +// +// +// static void reset_stream(std::stringstream &stream) +// { +// stream.str(""); +// stream.clear(); +// // https://en.cppreference.com/w/cpp/types/numeric_limits/max_digits10 +// // Conversion of a floating-point value to text and back is exact as long as at least max_digits10 were used (9 for float, 17 for double). +// // It is guaranteed to produce the same floating-point value, even though the intermediate text representation is not exact. +// // The default value of std::stream precision is 6 digits only! +// stream << std::setprecision(std::numeric_limits::max_digits10); +// } +// +// /* +// * BBS: Production Extension (SplitModel) +// * save sub model if objects_data is not empty +// * not collect build items in sub model +// */ +// bool _BBS_3MF_Exporter::_add_model_file_to_archive(const std::string& filename, mz_zip_archive& archive, const Model& model, ObjectToObjectDataMap& objects_data, Export3mfProgressFn proFn, /*BBLProject* project*/) const +// { +// bool sub_model = !objects_data.empty(); +// bool write_object = sub_model || !m_split_model; +// +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", filename %1%, m_split_model %2%, sub_model %3%")%filename % m_split_model % sub_model; +// +//#if WRITE_ZIP_LANGUAGE_ENCODING +// auto & zip_filename = filename; +//#else +// std::string zip_filename = encode_path(filename.c_str()); +// std::string extra = sub_model ? ZipUnicodePathExtraField::encode(filename, zip_filename) : ""; +//#endif +// mz_zip_writer_staged_context context; +// if (!mz_zip_writer_add_staged_open(&archive, &context, sub_model ? zip_filename.c_str() : MODEL_FILE.c_str(), +// m_zip64 ? +// // Maximum expected and allowed 3MF file size is 16GiB. +// // This switches the ZIP file to a 64bit mode, which adds a tiny bit of overhead to file records. +// (uint64_t(1) << 30) * 16 : +// // Maximum expected 3MF file size is 4GB-1. This is a workaround for interoperability with Windows 10 3D model fixing API, see +// // GH issue #6193. +// (uint64_t(1) << 32) - 1, +//#if WRITE_ZIP_LANGUAGE_ENCODING +// nullptr, nullptr, 0, MZ_DEFAULT_LEVEL, nullptr, 0, nullptr, 0)) { +//#else +// nullptr, nullptr, 0, MZ_DEFAULT_COMPRESSION, extra.c_str(), extra.length(), extra.c_str(), extra.length())) { +//#endif +// add_error("Unable to add model file to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Unable to add model file to archive\n"); +// return false; +// } +// +// +// { +// std::stringstream stream; +// reset_stream(stream); +// stream << "\n"; +// stream << "<" << MODEL_TAG << " unit=\"millimeter\" xml:lang=\"en-US\" xmlns=\"http://schemas.microsoft.com/3dmanufacturing/core/2015/02\" xmlns:slic3rpe=\"http://schemas.slic3r.org/3mf/2017/06\""; +// if (m_production_ext) +// stream << " xmlns:p=\"http://schemas.microsoft.com/3dmanufacturing/production/2015/06\" requiredextensions=\"p\""; +// stream << ">\n"; +// +// std::string origin; +// std::string name; +// std::string user_name; +// std::string user_id; +// std::string design_cover; +// std::string license; +// std::string description; +// std::string copyright; +// std::string rating; +// std::string model_id; +// std::string region_code; +// //if (model.design_info) { +// // user_name = model.design_info->Designer; +// // user_id = model.design_info->DesignerUserId; +// // BOOST_LOG_TRIVIAL(trace) << "design_info, save_3mf found designer = " << user_name; +// // BOOST_LOG_TRIVIAL(trace) << "design_info, save_3mf found designer_user_id = " << user_id; +// //} //Susi_not_impl +// +// //if (project) { +// // model_id = project->project_model_id; +// // region_code = project->project_country_code; +// //} //Susi_not_impl +// +// //if (model.model_info) { +// // design_cover = model.model_info->cover_file; +// // license = model.model_info->license; +// // description = model.model_info->description; +// // copyright = model.model_info->copyright; +// // name = model.model_info->model_name; +// // origin = model.model_info->origin; +// // BOOST_LOG_TRIVIAL(trace) << "design_info, save_3mf found designer_cover = " << design_cover; +// //} //Susi_not_impl +// // remember to use metadata_item_map to store metadata info +// std::map metadata_item_map; +// if (!sub_model) { +// // update metadat_items +// //if (model.model_info && model.model_info.get()) { +// // metadata_item_map = model.model_info.get()->metadata_items; +// //} //Susi_not_impl +// +// metadata_item_map[BBL_MODEL_NAME_TAG] = xml_escape(name); +// metadata_item_map[BBL_ORIGIN_TAG] = xml_escape(origin); +// metadata_item_map[BBL_DESIGNER_TAG] = xml_escape(user_name); +// metadata_item_map[BBL_DESIGNER_USER_ID_TAG] = user_id; +// metadata_item_map[BBL_DESIGNER_COVER_FILE_TAG] = xml_escape(design_cover); +// metadata_item_map[BBL_DESCRIPTION_TAG] = xml_escape(description); +// metadata_item_map[BBL_COPYRIGHT_NORMATIVE_TAG] = xml_escape(copyright); +// metadata_item_map[BBL_LICENSE_TAG] = xml_escape(license); +// +// /* save model info */ +// if (!model_id.empty()) { +// metadata_item_map[BBL_MODEL_ID_TAG] = model_id; +// metadata_item_map[BBL_REGION_TAG] = region_code; +// } +// +// std::string date = Slic3r::Utils::utc_timestamp(Slic3r::Utils::get_current_time_utc()); +// // keep only the date part of the string +// date = date.substr(0, 10); +// metadata_item_map[BBL_CREATION_DATE_TAG] = date; +// metadata_item_map[BBL_MODIFICATION_TAG] = date; +// //SoftFever: write BambuStudio tag to keep it compatible +// metadata_item_map[BBL_APPLICATION_TAG] = (boost::format("%1%-%2%") % "BambuStudio" % SoftFever_VERSION).str(); +// } +// metadata_item_map[BBS_3MF_VERSION] = std::to_string(VERSION_BBS_3MF); +// +// // store metadata info +// for (auto item : metadata_item_map) { +// BOOST_LOG_TRIVIAL(info) << "bbs_3mf: save key= " << item.first << ", value = " << item.second; +// stream << " <" << METADATA_TAG << " name=\"" << item.first << "\">" +// << xml_escape(item.second) << "\n"; +// } +// +// stream << " <" << RESOURCES_TAG << ">\n"; +// std::string buf = stream.str(); +// if (! buf.empty() && ! mz_zip_writer_add_staged_data(&context, buf.data(), buf.size())) { +// add_error("Unable to add model file to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Unable to add model file to archive\n"); +// return false; +// } +// } +// +// // Instance transformations, indexed by the 3MF object ID (which is a linear serialization of all instances of all ModelObjects). +// BuildItemsList build_items; +// +// // The object_id here is a one based identifier of the first instance of a ModelObject in the 3MF file, where +// // all the object instances of all ModelObjects are stored and indexed in a 1 based linear fashion. +// // Therefore the list of object_ids here may not be continuous. +// unsigned int object_id = 1; +// unsigned int object_index = 0; +// +// bool cb_cancel = false; +// std::vector object_paths; +// // if (!m_skip_model) { +// for (ModelObject* obj : model.objects) { +// if (sub_model && obj != objects_data.begin()->second.object) continue; +// +// if (proFn) { +// proFn(EXPORT_STAGE_ADD_MODELS, object_index++, model.objects.size(), cb_cancel); +// if (cb_cancel) +// return false; +// } +// +// if (obj == nullptr) +// continue; +// +// // Index of an object in the 3MF file corresponding to the 1st instance of a ModelObject. +// ObjectToObjectDataMap::iterator object_it = objects_data.begin(); +// +// if (!sub_model) { +// // For backup, use backup id as object id +// int backup_id = const_cast(model).get_object_backup_id(*obj); +// if (m_from_backup_save) object_id = backup_id; +// object_it = objects_data.insert({obj, {obj, backup_id} }).first; +// auto & object_data = object_it->second; +// +// if (m_split_model) { +// auto filename = boost::format("3D/Objects/%s_%d.model") % obj->name % backup_id; +// object_data.sub_path = "/" + filename.str(); +// object_paths.push_back(filename.str()); +// } +// +// auto &volumes_objectID = object_data.volumes_objectID; +// unsigned int volume_id = object_id, volume_count = 0; +// for (ModelVolume *volume : obj->volumes) { +// if (volume == nullptr) +// continue; +// volume_count++; +// if (m_share_mesh) { +// auto iter = m_shared_meshes.find(volume->mesh_ptr().get()); +// if (iter != m_shared_meshes.end()) +// { +// const ModelVolume* shared_volume = iter->second.second; +// if ((shared_volume->supported_facets.equals(volume->supported_facets)) +// && (shared_volume->seam_facets.equals(volume->seam_facets)) +// && (shared_volume->mmu_segmentation_facets.equals(volume->mmu_segmentation_facets))) +// { +// auto data = iter->second.first; +// const_cast<_BBS_3MF_Exporter *>(this)->m_volume_paths.insert({volume, {data->sub_path, data->volumes_objectID.find(iter->second.second)->second}}); +// volumes_objectID.insert({volume, 0}); +// object_data.share_mesh = true; +// continue; +// } +// } +// const_cast<_BBS_3MF_Exporter *>(this)->m_shared_meshes.insert({volume->mesh_ptr().get(), {&object_data, volume}}); +// } +// if (m_from_backup_save) +// volume_id = (volume_count << 16 | backup_id); +// volumes_objectID.insert({volume, volume_id}); +// volume_id++; +// } +// +// if (!m_from_backup_save) object_id = volume_id; +// object_data.object_id = object_id; +// } +// +// if (m_skip_model) continue; +// +// if (write_object) { +// // Store geometry of all ModelVolumes contained in a single ModelObject into a single 3MF indexed triangle set object. +// // object_it->second.volumes_objectID will contain the offsets of the ModelVolumes in that single indexed triangle set. +// // object_id will be increased to point to the 1st instance of the next ModelObject. +// if (!_add_object_to_model_stream(context, object_it->second)) { +// add_error("Unable to add object to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Unable to add object to archive\n"); +// return false; +// } +// } +// +// if (sub_model) break; +// +// unsigned int count = 0; +// for (const ModelInstance* instance : obj->instances) { +// Transform3d t = instance->get_matrix(); +// // instance_id is just a 1 indexed index in build_items. +// //assert(m_skip_static || curr_id == build_items.size() + 1); +// build_items.emplace_back("", object_it->second.object_id, t, instance->printable); +// count++; +// } +// +// if (!m_from_backup_save) object_id++; +// } +// // } +// +// { +// std::stringstream stream; +// reset_stream(stream); +// +// if (!m_skip_model && !sub_model) { +// for (auto object : model.objects) { +// auto &data = objects_data[object]; +// _add_object_components_to_stream(stream, data); +// } +// } +// +// stream << " \n"; +// +// // Store the transformations of all the ModelInstances of all ModelObjects, indexed in a linear fashion. +// if (!_add_build_to_model_stream(stream, build_items)) { +// add_error("Unable to add build to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Unable to add build to archive\n"); +// return false; +// } +// +// stream << "\n"; +// +// std::string buf = stream.str(); +// +// if ((! buf.empty() && ! mz_zip_writer_add_staged_data(&context, buf.data(), buf.size())) || +// ! mz_zip_writer_add_staged_finish(&context)) { +// add_error("Unable to add model file to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Unable to add model file to archive\n"); +// return false; +// } +// } +// +// if (m_skip_model || write_object) return true; +// +// // write model rels +// _add_relationships_file_to_archive(archive, MODEL_RELS_FILE, object_paths, {"http://schemas.microsoft.com/3dmanufacturing/2013/01/3dmodel"}); +// +// if (!m_from_backup_save) { +// boost::mutex mutex; +// tbb::parallel_for(tbb::blocked_range(0, objects_data.size(), 1), [this, &mutex, &model, objects = model.objects, &objects_data, &object_paths, main = &archive, project](const tbb::blocked_range& range) { +// for (size_t i = range.begin(); i < range.end(); ++i) { +// auto iter = objects_data.find(objects[i]); +// ObjectToObjectDataMap objects_data2; +// objects_data2.insert(*iter); +// auto & object = *iter->second.object; +// mz_zip_archive archive; +// mz_zip_zero_struct(&archive); +// mz_zip_writer_init_heap(&archive, 0, 1024 * 1024); +// CNumericLocalesSetter locales_setter; +// _add_model_file_to_archive(object_paths[i], archive, model, objects_data2, nullptr, project); +// iter->second = objects_data2.begin()->second; +// void *ppBuf; size_t pSize; +// mz_zip_writer_finalize_heap_archive(&archive, &ppBuf, &pSize); +// mz_zip_writer_end(&archive); +// mz_zip_zero_struct(&archive); +// mz_zip_reader_init_mem(&archive, ppBuf, pSize, 0); +// { +// boost::unique_lock l(mutex); +// mz_zip_writer_add_from_zip_reader(main, &archive, 0); +// } +// mz_zip_reader_end(&archive); +// } +// }); +// } +// +// return true; +// } +// +// bool _BBS_3MF_Exporter::_add_object_to_model_stream(mz_zip_writer_staged_context &context, ObjectData const &object_data) const +// { +// // backup: make _add_mesh_to_object_stream() reusable +// auto flush = [this, &context](std::string & buf, bool force = false) { +// if ((force && !buf.empty()) || buf.size() >= 65536 * 16) { +// if (!mz_zip_writer_add_staged_data(&context, buf.data(), buf.size())) { +// add_error("Error during writing or compression"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Error during writing or compression\n"); +// return false; +// } +// buf.clear(); +// } +// return true; +// }; +// if (!_add_mesh_to_object_stream(flush, object_data)) { +// add_error("Unable to add mesh to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Unable to add mesh to archive\n"); +// return false; +// } +// +// // Move all components to main model +// //_add_object_components_to_stream(stream, object_data); +// +// return true; +// } +// +// void _BBS_3MF_Exporter::_add_object_components_to_stream(std::stringstream &stream, ObjectData const &object_data) const +// { +// auto & object = *object_data.object; +// +// stream << " <" << OBJECT_TAG << " id=\"" << object_data.object_id; +// if (m_production_ext) +// stream << "\" " << PUUID_ATTR << "=\"" << hex_wrap{(boost::uint32_t)object_data.backup_id} +// << (object_data.share_mesh ? OBJECT_UUID_SUFFIX2 : OBJECT_UUID_SUFFIX); +// stream << "\" type=\"model\">\n"; +// +// stream << " <" << COMPONENTS_TAG << ">\n"; +// +// for (unsigned int index = 0; index < object.volumes.size(); index ++) { +// ModelVolume *volume = object.volumes[index]; +// unsigned int volume_id = object_data.volumes_objectID.find(volume)->second; +// auto * ppath = &object_data.sub_path; +// auto iter = m_volume_paths.find(volume); +// if (iter != m_volume_paths.end()) { +// ppath = &iter->second.first; +// volume_id = iter->second.second; +// } +// //add the transform of the volume +// if (ppath->empty()) +// stream << " <" << COMPONENT_TAG << " objectid=\"" << volume_id; +// else +// stream << " <" << COMPONENT_TAG << " p:path=\"" << xml_escape(*ppath) << "\" objectid=\"" << volume_id; // << "\"/>\n"; +// if (m_production_ext) +// stream << "\" " << PUUID_ATTR << "=\"" << hex_wrap{(boost::uint32_t) (index + (object_data.backup_id << 16))} << COMPONENT_UUID_SUFFIX; +// const Transform3d &transf = volume->get_matrix(); +// stream << "\" " << TRANSFORM_ATTR << "=\""; +// for (unsigned c = 0; c < 4; ++c) { +// for (unsigned r = 0; r < 3; ++r) { +// stream << transf(r, c); +// if (r != 2 || c != 3) +// stream << " "; +// } +// } +// stream << "\"/>\n"; +// } +// +// stream << " \n"; +// +// stream << " \n"; +// } +// +//#if EXPORT_3MF_USE_SPIRIT_KARMA_FP +// template +// struct coordinate_policy_fixed : boost::spirit::karma::real_policies +// { +// static int floatfield(Num n) { return fmtflags::fixed; } +// // Number of decimal digits to maintain float accuracy when storing into a text file and parsing back. +// static unsigned precision(Num /* n */) { return std::numeric_limits::max_digits10 + 1; } +// // No trailing zeros, thus for fmtflags::fixed usually much less than max_digits10 decimal numbers will be produced. +// static bool trailing_zeros(Num /* n */) { return false; } +// }; +// template +// struct coordinate_policy_scientific : coordinate_policy_fixed +// { +// static int floatfield(Num n) { return fmtflags::scientific; } +// }; +// // Define a new generator type based on the new coordinate policy. +// using coordinate_type_fixed = boost::spirit::karma::real_generator>; +// using coordinate_type_scientific = boost::spirit::karma::real_generator>; +//#endif // EXPORT_3MF_USE_SPIRIT_KARMA_FP +// +// //BBS: change volume to seperate objects +// bool _BBS_3MF_Exporter::_add_mesh_to_object_stream(std::function const &flush, ObjectData const &object_data) const +// { +// std::string output_buffer; +// +//#if 0 +// auto flush = [this, &output_buffer, &context](bool force = false) { +// if ((force && ! output_buffer.empty()) || output_buffer.size() >= 65536 * 16) { +// if (! mz_zip_writer_add_staged_data(&context, output_buffer.data(), output_buffer.size())) { +// add_error("Error during writing or compression"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Error during writing or compression\n"); +// return false; +// } +// output_buffer.clear(); +// } +// return true; +// }; +//#endif +// +// /*output_buffer += " <"; +// output_buffer += MESH_TAG; +// output_buffer += ">\n <"; +// output_buffer += VERTICES_TAG; +// output_buffer += ">\n";*/ +// +// auto format_coordinate = [](float f, char *buf) -> char* { +// assert(is_decimal_separator_point()); +//#if EXPORT_3MF_USE_SPIRIT_KARMA_FP +// // Slightly faster than sprintf("%.9g"), but there is an issue with the karma floating point formatter, +// // https://github.com/boostorg/spirit/pull/586 +// // where the exported string is one digit shorter than it should be to guarantee lossless round trip. +// // The code is left here for the ocasion boost guys improve. +// coordinate_type_fixed const coordinate_fixed = coordinate_type_fixed(); +// coordinate_type_scientific const coordinate_scientific = coordinate_type_scientific(); +// // Format "f" in a fixed format. +// char *ptr = buf; +// boost::spirit::karma::generate(ptr, coordinate_fixed, f); +// // Format "f" in a scientific format. +// char *ptr2 = ptr; +// boost::spirit::karma::generate(ptr2, coordinate_scientific, f); +// // Return end of the shorter string. +// auto len2 = ptr2 - ptr; +// if (ptr - buf > len2) { +// // Move the shorter scientific form to the front. +// memcpy(buf, ptr, len2); +// ptr = buf + len2; +// } +// // Return pointer to the end. +// return ptr; +//#else +// // Round-trippable float, shortest possible. +// return buf + sprintf(buf, "%.9g", f); +//#endif +// }; +// +// auto const & object = *object_data.object; +// +// char buf[256]; +// unsigned int vertices_count = 0; +// //unsigned int triangles_count = 0; +// for (unsigned int index = 0; index < object.volumes.size(); index++) { +// ModelVolume *volume = object.volumes[index]; +// if (volume == nullptr) +// continue; +// +// int volume_id = object_data.volumes_objectID.find(volume)->second; +// if (m_share_mesh && volume_id == 0) +// continue; +// +// //if (!volume->mesh().stats().repaired()) +// // throw Slic3r::FileIOError("store_3mf() requires repair()"); +// +// const indexed_triangle_set &its = volume->mesh().its; +// if (its.vertices.empty()) { +// add_error("Found invalid mesh"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Found invalid mesh\n"); +// return false; +// } +// +// std::string type = (volume->type() == ModelVolumeType::MODEL_PART)?"model":"other"; +// +// output_buffer += " <"; +// output_buffer += OBJECT_TAG; +// output_buffer += " id=\""; +// output_buffer += std::to_string(volume_id); +// if (m_production_ext) { +// std::stringstream stream; +// reset_stream(stream); +// stream << "\" " << PUUID_ATTR << "=\"" << hex_wrap{(boost::uint32_t) (index + (object_data.backup_id << 16))} << SUB_OBJECT_UUID_SUFFIX; +// //output_buffer += "\" "; +// //output_buffer += PUUID_ATTR; +// //output_buffer += "=\""; +// //output_buffer += std::to_string(hex_wrap{(boost::uint32_t)backup_id}); +// //output_buffer += OBJECT_UUID_SUFFIX; +// output_buffer += stream.str(); +// } +// output_buffer += "\" type=\""; +// output_buffer += type; +// output_buffer += "\">\n"; +// output_buffer += " <"; +// output_buffer += MESH_TAG; +// output_buffer += ">\n <"; +// output_buffer += VERTICES_TAG; +// output_buffer += ">\n"; +// +// vertices_count += (int)its.vertices.size(); +// +// for (size_t i = 0; i < its.vertices.size(); ++i) { +// //don't save the volume's matrix into vertex data +// //add the shared mesh logic +// //Vec3f v = (matrix * its.vertices[i].cast()).cast(); +// Vec3f v = its.vertices[i]; +// char* ptr = buf; +// boost::spirit::karma::generate(ptr, boost::spirit::lit(" <") << VERTEX_TAG << " x=\""); +// ptr = format_coordinate(v.x(), ptr); +// boost::spirit::karma::generate(ptr, "\" y=\""); +// ptr = format_coordinate(v.y(), ptr); +// boost::spirit::karma::generate(ptr, "\" z=\""); +// ptr = format_coordinate(v.z(), ptr); +// boost::spirit::karma::generate(ptr, "\"/>\n"); +// *ptr = '\0'; +// output_buffer += buf; +// if (!flush(output_buffer, false)) +// return false; +// } +// //} +// +// output_buffer += " \n <"; +// output_buffer += TRIANGLES_TAG; +// output_buffer += ">\n"; +// +// //for (ModelVolume* volume : object.volumes) { +// // if (volume == nullptr) +// // continue; +// +// //BBS: as we stored matrix seperately, not multiplied into vertex +// //we don't need to consider this left hand case specially +// //bool is_left_handed = volume->is_left_handed(); +// bool is_left_handed = false; +// //VolumeToOffsetsMap::iterator volume_it = volumes_objectID.find(volume); +// //assert(volume_it != volumes_objectID.end()); +// +// //const indexed_triangle_set &its = volume->mesh().its; +// +// // updates triangle offsets +// //unsigned int first_triangle_id = triangles_count; +// //triangles_count += (int)its.indices.size(); +// //unsigned int last_triangle_id = triangles_count - 1; +// +// for (int i = 0; i < int(its.indices.size()); ++ i) { +// { +// const Vec3i &idx = its.indices[i]; +// char *ptr = buf; +// boost::spirit::karma::generate(ptr, boost::spirit::lit(" <") << TRIANGLE_TAG << +// " v1=\"" << boost::spirit::int_ << +// "\" v2=\"" << boost::spirit::int_ << +// "\" v3=\"" << boost::spirit::int_ << "\"", +// idx[is_left_handed ? 2 : 0], +// idx[1], +// idx[is_left_handed ? 0 : 2]); +// *ptr = '\0'; +// output_buffer += buf; +// } +// +// std::string custom_supports_data_string = volume->supported_facets.get_triangle_as_string(i); +// if (! custom_supports_data_string.empty()) { +// output_buffer += " "; +// output_buffer += CUSTOM_SUPPORTS_ATTR; +// output_buffer += "=\""; +// output_buffer += custom_supports_data_string; +// output_buffer += "\""; +// } +// +// std::string custom_seam_data_string = volume->seam_facets.get_triangle_as_string(i); +// if (! custom_seam_data_string.empty()) { +// output_buffer += " "; +// output_buffer += CUSTOM_SEAM_ATTR; +// output_buffer += "=\""; +// output_buffer += custom_seam_data_string; +// output_buffer += "\""; +// } +// +// std::string mmu_painting_data_string = volume->mmu_segmentation_facets.get_triangle_as_string(i); +// if (! mmu_painting_data_string.empty()) { +// output_buffer += " "; +// output_buffer += MMU_SEGMENTATION_ATTR; +// output_buffer += "=\""; +// output_buffer += mmu_painting_data_string; +// output_buffer += "\""; +// } +// +// // BBS +// if (i < its.properties.size()) { +// std::string prop_str = its.properties[i].to_string(); +// if (!prop_str.empty()) { +// output_buffer += " "; +// output_buffer += FACE_PROPERTY_ATTR; +// output_buffer += "=\""; +// output_buffer += prop_str; +// output_buffer += "\""; +// } +// } +// +// output_buffer += "/>\n"; +// +// if (! flush(output_buffer, false)) +// return false; +// } +// output_buffer += " \n \n"; +// output_buffer += " \n"; +// } +// +// // Force flush. +// return flush(output_buffer, true); +// } +// +// void _BBS_3MF_Exporter::add_transformation(std::stringstream &stream, const Transform3d &tr) +// { +// for (unsigned c = 0; c < 4; ++c) { +// for (unsigned r = 0; r < 3; ++r) { +// stream << tr(r, c); +// if (r != 2 || c != 3) stream << " "; +// } +// } +// } +// +// bool _BBS_3MF_Exporter::_add_build_to_model_stream(std::stringstream& stream, const BuildItemsList& build_items) const +// { +// // This happens for empty projects +// if (build_items.size() == 0) { +// stream << " <" << BUILD_TAG << "/>\n"; +// return true; +// } +// +// stream << " <" << BUILD_TAG; +// if (m_production_ext) +// stream << " " << PUUID_ATTR << "=\"" << BUILD_UUID << "\""; +// stream << ">\n"; +// +// for (const BuildItem& item : build_items) { +// stream << " <" << ITEM_TAG << " " << OBJECTID_ATTR << "=\"" << item.id; +// if (m_production_ext) +// stream << "\" " << PUUID_ATTR << "=\"" << hex_wrap{item.id} << BUILD_UUID_SUFFIX; +// if (!item.path.empty()) +// stream << "\" " << PPATH_ATTR << "=\"" << xml_escape(item.path); +// stream << "\" " << TRANSFORM_ATTR << "=\""; +// add_transformation(stream, item.transform); +// stream << "\" " << PRINTABLE_ATTR << "=\"" << item.printable << "\"/>\n"; +// } +// +// stream << " \n"; +// +// return true; +// } +// +// bool _BBS_3MF_Exporter::_add_cut_information_file_to_archive(mz_zip_archive &archive, Model &model) +// { +// std::string out = ""; +// pt::ptree tree; +// +// unsigned int object_cnt = 0; +// for (const ModelObject* object : model.objects) { +// object_cnt++; +// if (!object->is_cut()) +// continue; +// pt::ptree& obj_tree = tree.add("objects.object", ""); +// +// obj_tree.put(".id", object_cnt); +// +// // Store info for cut_id +// pt::ptree& cut_id_tree = obj_tree.add("cut_id", ""); +// +// // store cut_id atributes +// cut_id_tree.put(".id", object->cut_id.id().id); +// cut_id_tree.put(".check_sum", object->cut_id.check_sum()); +// cut_id_tree.put(".connectors_cnt", object->cut_id.connectors_cnt()); +// +// int volume_idx = -1; +// for (const ModelVolume* volume : object->volumes) { +// ++volume_idx; +// if (volume->is_cut_connector()) { +// pt::ptree& connectors_tree = obj_tree.add("connectors.connector", ""); +// connectors_tree.put(".volume_id", volume_idx); +// connectors_tree.put(".type", int(volume->cut_info.connector_type)); +// connectors_tree.put(".r_tolerance", volume->cut_info.radius_tolerance); +// connectors_tree.put(".h_tolerance", volume->cut_info.height_tolerance); +// } +// } +// } +// +// if (!tree.empty()) { +// std::ostringstream oss; +// pt::write_xml(oss, tree); +// out = oss.str(); +// +// // Post processing("beautification") of the output string for a better preview +// boost::replace_all(out, ">\n \n ", ">\n "); +// boost::replace_all(out, ">\n ", ">\n "); +// boost::replace_all(out, ">\n ", ">\n "); +// boost::replace_all(out, ">", ">\n "); +// // OR just +// boost::replace_all(out, "><", ">\n<"); +// } +// +// if (!out.empty()) { +// if (!mz_zip_writer_add_mem(&archive, CUT_INFORMATION_FILE.c_str(), (const void*)out.data(), out.length(), MZ_DEFAULT_COMPRESSION)) { +// add_error("Unable to add cut information file to archive"); +// return false; +// } +// } +// +// return true; +// } +// +// bool _BBS_3MF_Exporter::_add_layer_height_profile_file_to_archive(mz_zip_archive& archive, Model& model) +// { +// assert(is_decimal_separator_point()); +// std::string out = ""; +// char buffer[1024]; +// +// unsigned int count = 0; +// for (const ModelObject* object : model.objects) { +// ++count; +// const std::vector& layer_height_profile = object->layer_height_profile.get(); +// if (layer_height_profile.size() >= 4 && layer_height_profile.size() % 2 == 0) { +// snprintf(buffer, 1024, "object_id=%d|", count); +// out += buffer; +// +// // Store the layer height profile as a single semicolon separated list. +// for (size_t i = 0; i < layer_height_profile.size(); ++i) { +// snprintf(buffer, 1024, (i == 0) ? "%f" : ";%f", layer_height_profile[i]); +// out += buffer; +// } +// +// out += "\n"; +// } +// } +// +// if (!out.empty()) { +// if (!mz_zip_writer_add_mem(&archive, BBS_LAYER_HEIGHTS_PROFILE_FILE.c_str(), (const void*)out.data(), out.length(), MZ_DEFAULT_COMPRESSION)) { +// add_error("Unable to add layer heights profile file to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format("Unable to add layer heights profile file to archive\n"); +// return false; +// } +// } +// +// return true; +// } +// +// bool _BBS_3MF_Exporter::_add_layer_config_ranges_file_to_archive(mz_zip_archive& archive, Model& model) +// { +// std::string out = ""; +// pt::ptree tree; +// +// unsigned int object_cnt = 0; +// for (const ModelObject* object : model.objects) { +// object_cnt++; +// const t_layer_config_ranges& ranges = object->layer_config_ranges; +// if (!ranges.empty()) +// { +// pt::ptree& obj_tree = tree.add("objects.object",""); +// +// obj_tree.put(".id", object_cnt); +// +// // Store the layer config ranges. +// for (const auto& range : ranges) { +// pt::ptree& range_tree = obj_tree.add("range", ""); +// +// // store minX and maxZ +// range_tree.put(".min_z", range.first.first); +// range_tree.put(".max_z", range.first.second); +// +// // store range configuration +// const ModelConfig& config = range.second; +// for (const std::string& opt_key : config.keys()) { +// pt::ptree& opt_tree = range_tree.add("option", config.opt_serialize(opt_key)); +// opt_tree.put(".opt_key", opt_key); +// } +// } +// } +// } +// +// if (!tree.empty()) { +// std::ostringstream oss; +// pt::write_xml(oss, tree); +// out = oss.str(); +// +// // Post processing("beautification") of the output string for a better preview +// boost::replace_all(out, ">\n \n \n ", ">\n "); +// boost::replace_all(out, ">", ">\n "); +// // OR just +// boost::replace_all(out, "><", ">\n<"); +// } +// +// if (!out.empty()) { +// if (!mz_zip_writer_add_mem(&archive, LAYER_CONFIG_RANGES_FILE.c_str(), (const void*)out.data(), out.length(), MZ_DEFAULT_COMPRESSION)) { +// add_error("Unable to add layer heights profile file to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format("Unable to add layer heights profile file to archive\n"); +// return false; +// } +// } +// +// return true; +// } +// +// /* +// bool _BBS_3MF_Exporter::_add_sla_support_points_file_to_archive(mz_zip_archive& archive, Model& model) +// { +// assert(is_decimal_separator_point()); +// std::string out = ""; +// char buffer[1024]; +// +// unsigned int count = 0; +// for (const ModelObject* object : model.objects) { +// ++count; +// const std::vector& sla_support_points = object->sla_support_points; +// if (!sla_support_points.empty()) { +// sprintf(buffer, "object_id=%d|", count); +// out += buffer; +// +// // Store the layer height profile as a single space separated list. +// for (size_t i = 0; i < sla_support_points.size(); ++i) { +// sprintf(buffer, (i==0 ? "%f %f %f %f %f" : " %f %f %f %f %f"), sla_support_points[i].pos(0), sla_support_points[i].pos(1), sla_support_points[i].pos(2), sla_support_points[i].head_front_radius, (float)sla_support_points[i].is_new_island); +// out += buffer; +// } +// out += "\n"; +// } +// } +// +// if (!out.empty()) { +// // Adds version header at the beginning: +// //out = std::string("support_points_format_version=") + std::to_string(support_points_format_version) + std::string("\n") + out; +// +// if (!mz_zip_writer_add_mem(&archive, SLA_SUPPORT_POINTS_FILE.c_str(), (const void*)out.data(), out.length(), MZ_DEFAULT_COMPRESSION)) { +// add_error("Unable to add sla support points file to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format("Unable to add sla support points file to archive\n"); +// return false; +// } +// } +// return true; +// } +// +// bool _BBS_3MF_Exporter::_add_sla_drain_holes_file_to_archive(mz_zip_archive& archive, Model& model) +// { +// assert(is_decimal_separator_point()); +// const char *const fmt = "object_id=%d|"; +// std::string out; +// +// unsigned int count = 0; +// for (const ModelObject* object : model.objects) { +// ++count; +// sla::DrainHoles drain_holes = object->sla_drain_holes; +// +// // The holes were placed 1mm above the mesh in the first implementation. +// // This was a bad idea and the reference point was changed in 2.3 so +// // to be on the mesh exactly. The elevated position is still saved +// // in 3MFs for compatibility reasons. +// for (sla::DrainHole& hole : drain_holes) { +// hole.pos -= hole.normal.normalized(); +// hole.height += 1.f; +// } +// +// if (!drain_holes.empty()) { +// out += string_printf(fmt, count); +// +// // Store the layer height profile as a single space separated list. +// for (size_t i = 0; i < drain_holes.size(); ++i) +// out += string_printf((i == 0 ? "%f %f %f %f %f %f %f %f" : " %f %f %f %f %f %f %f %f"), +// drain_holes[i].pos(0), +// drain_holes[i].pos(1), +// drain_holes[i].pos(2), +// drain_holes[i].normal(0), +// drain_holes[i].normal(1), +// drain_holes[i].normal(2), +// drain_holes[i].radius, +// drain_holes[i].height); +// +// out += "\n"; +// } +// } +// +// if (!out.empty()) { +// // Adds version header at the beginning: +// //out = std::string("drain_holes_format_version=") + std::to_string(drain_holes_format_version) + std::string("\n") + out; +// +// if (!mz_zip_writer_add_mem(&archive, SLA_DRAIN_HOLES_FILE.c_str(), static_cast(out.data()), out.length(), mz_uint(MZ_DEFAULT_COMPRESSION))) { +// add_error("Unable to add sla support points file to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format("Unable to add sla support points file to archive\n"); +// return false; +// } +// } +// return true; +// }*/ +// +// bool _BBS_3MF_Exporter::_add_print_config_file_to_archive(mz_zip_archive& archive, const DynamicPrintConfig &config) +// { +// assert(is_decimal_separator_point()); +// char buffer[1024]; +// snprintf(buffer, 1024, "; %s\n\n", header_slic3r_generated().c_str()); +// std::string out = buffer; +// +// for (const std::string &key : config.keys()) +// if (key != "compatible_printers") +// out += "; " + key + " = " + config.opt_serialize(key) + "\n"; +// +// if (!out.empty()) { +// if (!mz_zip_writer_add_mem(&archive, BBS_PRINT_CONFIG_FILE.c_str(), (const void*)out.data(), out.length(), MZ_DEFAULT_COMPRESSION)) { +// add_error("Unable to add print config file to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format("Unable to add print config file to archive\n"); +// return false; +// } +// } +// +// return true; +// } +// +// //BBS: add project config file logic for new json format +// bool _BBS_3MF_Exporter::_add_project_config_file_to_archive(mz_zip_archive& archive, const DynamicPrintConfig &config, Model& model) +// { +// const std::string& temp_path = model.get_backup_path(); +// std::string temp_file = temp_path + std::string("/") + "_temp_1.config"; +// config.save_to_json(temp_file, std::string("project_settings"), std::string("project"), std::string(SoftFever_VERSION)); +// return _add_file_to_archive(archive, BBS_PROJECT_CONFIG_FILE, temp_file); +// } +// +// //BBS: add project embedded preset files +// bool _BBS_3MF_Exporter::_add_project_embedded_presets_to_archive(mz_zip_archive& archive, Model& model, std::vector project_presets) +// { +// char buffer[1024]; +// snprintf(buffer, 1024, "; %s\n\n", header_slic3r_generated().c_str()); +// std::string out = buffer; +// int print_count = 0, filament_count = 0, printer_count = 0; +// const std::string& temp_path = model.get_backup_path(); +// +// for (int i = 0; i < project_presets.size(); i++) +// { +// Preset* preset = project_presets[i]; +// +// if (preset) { +// preset->file = temp_path + std::string("/") + "_temp_1.config"; +// DynamicPrintConfig& config = preset->config; +// //config.save(preset->file); +// config.save_to_json(preset->file, preset->name, std::string("project"), preset->version.to_string()); +// +// std::string dest_file; +// if (preset->type == Preset::TYPE_PRINT) { +// dest_file = (boost::format(EMBEDDED_PRINT_FILE_FORMAT) % (print_count + 1)).str(); +// print_count++; +// } +// else if (preset->type == Preset::TYPE_FILAMENT) { +// dest_file = (boost::format(EMBEDDED_FILAMENT_FILE_FORMAT) % (filament_count + 1)).str(); +// filament_count++; +// } +// else if (preset->type == Preset::TYPE_PRINTER) { +// dest_file = (boost::format(EMBEDDED_PRINTER_FILE_FORMAT) % (printer_count + 1)).str(); +// printer_count++; +// } +// else +// continue; +// +// _add_file_to_archive(archive, dest_file, preset->file); +// } +// } +// +// return true; +// } +// +// bool _BBS_3MF_Exporter::_add_model_config_file_to_archive(mz_zip_archive& archive, const Model& model, PlateDataPtrs& plate_data_list, const ObjectToObjectDataMap &objects_data, int export_plate_idx, bool save_gcode, bool use_loaded_id) +// { +// std::stringstream stream; +// // Store mesh transformation in full precision, as the volumes are stored transformed and they need to be transformed back +// // when loaded as accurately as possible. +// stream << std::setprecision(std::numeric_limits::max_digits10); +// stream << "\n"; +// stream << "<" << CONFIG_TAG << ">\n"; +// +// if (!m_skip_model) +// for (const ObjectToObjectDataMap::value_type& obj_metadata : objects_data) { +// auto object_data = obj_metadata.second; +// const ModelObject *obj = object_data.object; +// if (obj != nullptr) { +// // Output of instances count added because of github #3435, currently not used by PrusaSlicer +// //stream << " <" << OBJECT_TAG << " " << ID_ATTR << "=\"" << obj_metadata.first << "\" " << INSTANCESCOUNT_ATTR << "=\"" << obj->instances.size() << "\">\n"; +// stream << " <" << OBJECT_TAG << " " << ID_ATTR << "=\"" << object_data.object_id << "\">\n"; +// +// // stores object's name +// if (!obj->name.empty()) +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"name\" " << VALUE_ATTR << "=\"" << xml_escape(obj->name) << "\"/>\n"; +// +// //BBS: store object's module name +// if (!obj->module_name.empty()) +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"module\" " << VALUE_ATTR << "=\"" << xml_escape(obj->module_name) << "\"/>\n"; +// +// // stores object's config data +// for (const std::string& key : obj->config.keys()) { +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << key << "\" " << VALUE_ATTR << "=\"" << obj->config.opt_serialize(key) << "\"/>\n"; +// } +// +// for (const ModelVolume* volume : obj_metadata.second.object->volumes) { +// if (volume != nullptr) { +// const VolumeToObjectIDMap& objectIDs = obj_metadata.second.volumes_objectID; +// VolumeToObjectIDMap::const_iterator it = objectIDs.find(volume); +// if (it != objectIDs.end()) { +// // stores volume's offsets +// stream << " <" << PART_TAG << " "; +// //stream << FIRST_TRIANGLE_ID_ATTR << "=\"" << it->second.first_triangle_id << "\" "; +// //stream << LAST_TRIANGLE_ID_ATTR << "=\"" << it->second.last_triangle_id << "\" "; +// int volume_id = it->second; +// if (m_share_mesh && volume_id == 0) +// volume_id = m_volume_paths.find(volume)->second.second; +// stream << ID_ATTR << "=\"" << volume_id << "\" "; +// +// stream << SUBTYPE_ATTR << "=\"" << ModelVolume::type_to_string(volume->type()) << "\">\n"; +// //stream << " <" << PART_TAG << " " << ID_ATTR << "=\"" << it->second << "\" " << SUBTYPE_ATTR << "=\"" << ModelVolume::type_to_string(volume->type()) << "\">\n"; +// +// // stores volume's name +// if (!volume->name.empty()) +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << NAME_KEY << "\" " << VALUE_ATTR << "=\"" << xml_escape(volume->name) << "\"/>\n"; +// //stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << NAME_KEY << "\" " << VALUE_ATTR << "=\"" << xml_escape(volume->name) << "\"/>\n"; +// +// // stores volume's modifier field (legacy, to support old slicers) +// /*if (volume->is_modifier()) +// stream << " <" << METADATA_TAG << " " << TYPE_ATTR << "=\"" << PART_TYPE << "\" " << KEY_ATTR << "=\"" << MODIFIER_KEY << "\" " << VALUE_ATTR << "=\"1\"/>\n"; +// // stores volume's type (overrides the modifier field above) +// stream << " <" << METADATA_TAG << " " << TYPE_ATTR << "=\"" << PART_TYPE << "\" " << KEY_ATTR << "=\"" << PART_TYPE_KEY << "\" " << +// VALUE_ATTR << "=\"" << ModelVolume::type_to_string(volume->type()) << "\"/>\n";*/ +// +// // stores volume's local matrix +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << MATRIX_KEY << "\" " << VALUE_ATTR << "=\""; +// Transform3d matrix = volume->get_matrix() * volume->source.transform.get_matrix(); +// for (int r = 0; r < 4; ++r) { +// for (int c = 0; c < 4; ++c) { +// stream << matrix(r, c); +// if (r != 3 || c != 3) +// stream << " "; +// } +// } +// stream << "\"/>\n"; +// +// // stores volume's source data +// { +// std::string input_file = xml_escape(m_fullpath_sources ? volume->source.input_file : boost::filesystem::path(volume->source.input_file).filename().string()); +// //std::string prefix = std::string(" <") + METADATA_TAG + " " + KEY_ATTR + "=\""; +// std::string prefix = std::string(" <") + METADATA_TAG + " " + KEY_ATTR + "=\""; +// if (! volume->source.input_file.empty()) { +// stream << prefix << SOURCE_FILE_KEY << "\" " << VALUE_ATTR << "=\"" << input_file << "\"/>\n"; +// stream << prefix << SOURCE_OBJECT_ID_KEY << "\" " << VALUE_ATTR << "=\"" << volume->source.object_idx << "\"/>\n"; +// stream << prefix << SOURCE_VOLUME_ID_KEY << "\" " << VALUE_ATTR << "=\"" << volume->source.volume_idx << "\"/>\n"; +// stream << prefix << SOURCE_OFFSET_X_KEY << "\" " << VALUE_ATTR << "=\"" << volume->source.mesh_offset(0) << "\"/>\n"; +// stream << prefix << SOURCE_OFFSET_Y_KEY << "\" " << VALUE_ATTR << "=\"" << volume->source.mesh_offset(1) << "\"/>\n"; +// stream << prefix << SOURCE_OFFSET_Z_KEY << "\" " << VALUE_ATTR << "=\"" << volume->source.mesh_offset(2) << "\"/>\n"; +// } +// assert(! volume->source.is_converted_from_inches || ! volume->source.is_converted_from_meters); +// if (volume->source.is_converted_from_inches) +// stream << prefix << SOURCE_IN_INCHES << "\" " << VALUE_ATTR << "=\"1\"/>\n"; +// else if (volume->source.is_converted_from_meters) +// stream << prefix << SOURCE_IN_METERS << "\" " << VALUE_ATTR << "=\"1\"/>\n"; +// } +// +// // stores volume's config data +// for (const std::string& key : volume->config.keys()) { +// stream << " <" << METADATA_TAG << " "<< KEY_ATTR << "=\"" << key << "\" " << VALUE_ATTR << "=\"" << volume->config.opt_serialize(key) << "\"/>\n"; +// } +// +// if (const std::optional &es = volume->emboss_shape; +// es.has_value()) +// to_xml(stream, *es, *volume, archive); +// +// if (const std::optional &tc = volume->text_configuration; +// tc.has_value()) +// TextConfigurationSerialization::to_xml(stream, *tc); +// +// // stores mesh's statistics +// const RepairedMeshErrors& stats = volume->mesh().stats().repaired_errors; +// stream << " <" << MESH_STAT_TAG << " "; +// stream << MESH_STAT_EDGES_FIXED << "=\"" << stats.edges_fixed << "\" "; +// stream << MESH_STAT_DEGENERATED_FACETS << "=\"" << stats.degenerate_facets << "\" "; +// stream << MESH_STAT_FACETS_REMOVED << "=\"" << stats.facets_removed << "\" "; +// stream << MESH_STAT_FACETS_RESERVED << "=\"" << stats.facets_reversed << "\" "; +// stream << MESH_STAT_BACKWARDS_EDGES << "=\"" << stats.backwards_edges << "\"/>\n"; +// +// stream << " \n"; +// } +// } +// } +// +// stream << " \n"; +// } +// } +// +// //BBS: store plate related logic +// std::vector gcode_paths; +// for (unsigned int i = 0; i < (unsigned int)plate_data_list.size(); ++i) +// { +// PlateData* plate_data = plate_data_list[i]; +// int instance_size = plate_data->objects_and_instances.size(); +// +// if (plate_data != nullptr) { +// stream << " <" << PLATE_TAG << ">\n"; +// //plate index +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << PLATERID_ATTR << "\" " << VALUE_ATTR << "=\"" << plate_data->plate_index + 1 << "\"/>\n"; +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << PLATER_NAME_ATTR << "\" " << VALUE_ATTR << "=\"" << xml_escape(plate_data->plate_name.c_str()) << "\"/>\n"; +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << LOCK_ATTR << "\" " << VALUE_ATTR << "=\"" << std::boolalpha<< plate_data->locked<< "\"/>\n"; +// ConfigOption* bed_type_opt = plate_data->config.option("curr_bed_type"); +// t_config_enum_names bed_type_names = ConfigOptionEnum::get_enum_names(); +// if (bed_type_opt != nullptr && bed_type_names.size() > bed_type_opt->getInt()) +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << BED_TYPE_ATTR << "\" " << VALUE_ATTR << "=\"" << bed_type_names[bed_type_opt->getInt()] << "\"/>\n"; +// +// ConfigOption* print_sequence_opt = plate_data->config.option("print_sequence"); +// t_config_enum_names print_sequence_names = ConfigOptionEnum::get_enum_names(); +// if (print_sequence_opt != nullptr && print_sequence_names.size() > print_sequence_opt->getInt()) +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << PRINT_SEQUENCE_ATTR << "\" " << VALUE_ATTR << "=\"" << print_sequence_names[print_sequence_opt->getInt()] << "\"/>\n"; +// +// ConfigOptionInts *first_layer_print_sequence_opt = plate_data->config.option("first_layer_print_sequence"); +// if (first_layer_print_sequence_opt != nullptr) { +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << FIRST_LAYER_PRINT_SEQUENCE_ATTR << "\" " << VALUE_ATTR << "=\""; +// const std::vector& values = first_layer_print_sequence_opt->values; +// for (int i = 0; i < values.size(); ++i) { +// stream << values[i]; +// if (i != (values.size() - 1)) +// stream << " "; +// } +// stream << "\"/>\n"; +// } +// +// ConfigOption* spiral_mode_opt = plate_data->config.option("spiral_mode"); +// if (spiral_mode_opt) +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << SPIRAL_VASE_MODE << "\" " << VALUE_ATTR << "=\"" << spiral_mode_opt->getBool() << "\"/>\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()) { +// gcode_paths.push_back(plate_data->gcode_file); +// } +// if (plate_data->plate_thumbnail.is_valid()) { +// std::string thumbnail_file_in_3mf = (boost::format(THUMBNAIL_FILE_FORMAT) % (plate_data->plate_index + 1)).str(); +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << THUMBNAIL_FILE_ATTR << "\" " << VALUE_ATTR << "=\"" << std::boolalpha << thumbnail_file_in_3mf << "\"/>\n"; +// } +// else if (!plate_data->thumbnail_file.empty() && (boost::filesystem::exists(plate_data->thumbnail_file))){ +// std::string thumbnail_file_in_3mf = (boost::format(THUMBNAIL_FILE_FORMAT) % (plate_data->plate_index + 1)).str(); +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << THUMBNAIL_FILE_ATTR << "\" " << VALUE_ATTR << "=\"" << std::boolalpha << thumbnail_file_in_3mf << "\"/>\n"; +// } +// +// if (!plate_data->top_file.empty()) { +// std::string top_file_in_3mf = (boost::format(TOP_FILE_FORMAT) % (plate_data->plate_index + 1)).str(); +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << TOP_FILE_ATTR << "\" " << VALUE_ATTR << "=\"" << std::boolalpha << top_file_in_3mf << "\"/>\n"; +// } +// +// if (!plate_data->pick_file.empty()) { +// std::string pick_file_in_3mf = (boost::format(PICK_FILE_FORMAT) % (plate_data->plate_index + 1)).str(); +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << PICK_FILE_ATTR << "\" " << VALUE_ATTR << "=\"" << std::boolalpha << pick_file_in_3mf << "\"/>\n"; +// } +// +// /*if (!plate_data->pattern_file.empty()) { +// std::string pattern_file_in_3mf = (boost::format(PATTERN_FILE_FORMAT) % (plate_data->plate_index + 1)).str(); +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << PATTERN_FILE_ATTR << "\" " << VALUE_ATTR << "=\"" << std::boolalpha << pattern_file_in_3mf << "\"/>\n"; +// }*/ +// if (!plate_data->pattern_bbox_file.empty()) { +// std::string pattern_bbox_file_in_3mf = (boost::format(PATTERN_CONFIG_FILE_FORMAT) % (plate_data->plate_index + 1)).str(); +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << PATTERN_BBOX_FILE_ATTR << "\" " << VALUE_ATTR << "=\"" << std::boolalpha << pattern_bbox_file_in_3mf << "\"/>\n"; +// } +// +// if (!m_skip_model && instance_size > 0) +// { +// for (unsigned int j = 0; j < instance_size; ++j) +// { +// stream << " <" << INSTANCE_TAG << ">\n"; +// int obj_id = plate_data->objects_and_instances[j].first; +// int inst_id = plate_data->objects_and_instances[j].second; +// int identify_id = 0; +// ModelObject* obj = NULL; +// ModelInstance* inst = NULL; +// if (obj_id >= model.objects.size()) { +// BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << ":" << __LINE__ << boost::format("invalid object id %1%\n")%obj_id; +// } +// else +// obj = model.objects[obj_id]; +// +// if (obj && (inst_id >= obj->instances.size())) { +// BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << ":" << __LINE__ << boost::format("invalid instance id %1%\n")%inst_id; +// } +// else if (obj){ +// inst = obj->instances[inst_id]; +// if (use_loaded_id && (inst->loaded_id > 0)) +// identify_id = inst->loaded_id; +// else +// identify_id = inst->id().id; +// } +// obj_id = objects_data.find(obj)->second.object_id; +// +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << OBJECT_ID_ATTR << "\" " << VALUE_ATTR << "=\"" << obj_id << "\"/>\n"; +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << INSTANCEID_ATTR << "\" " << VALUE_ATTR << "=\"" << inst_id << "\"/>\n"; +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << IDENTIFYID_ATTR << "\" " << VALUE_ATTR << "=\"" << identify_id << "\"/>\n"; +// stream << " \n"; +// } +// } +// stream << " \n"; +// } +// } +// +// // write model rels +// if (save_gcode) +// _add_relationships_file_to_archive(archive, BBS_MODEL_CONFIG_RELS_FILE, gcode_paths, {"http://schemas.bambulab.com/package/2021/gcode"}, Slic3r::PackingTemporaryData(), export_plate_idx); +// +// if (!m_skip_model) { +// //BBS: store assemble related info +// stream << " <" << ASSEMBLE_TAG << ">\n"; +// for (const ObjectToObjectDataMap::value_type& obj_metadata : objects_data) { +// auto object_data = obj_metadata.second; +// const ModelObject* obj = object_data.object; +// if (obj != nullptr) { +// for (int instance_idx = 0; instance_idx < obj->instances.size(); ++instance_idx) { +// if (obj->instances[instance_idx]->is_assemble_initialized()) { +// stream << " <" << ASSEMBLE_ITEM_TAG << " " << OBJECT_ID_ATTR << "=\"" << object_data.object_id << "\" "; +// stream << INSTANCEID_ATTR << "=\"" << instance_idx << "\" " << TRANSFORM_ATTR << "=\""; +// for (unsigned c = 0; c < 4; ++c) { +// for (unsigned r = 0; r < 3; ++r) { +// const Transform3d assemble_trans = obj->instances[instance_idx]->get_assemble_transformation().get_matrix(); +// stream << assemble_trans(r, c); +// if (r != 2 || c != 3) +// stream << " "; +// } +// } +// +// stream << "\" "; +// +// stream << OFFSET_ATTR << "=\""; +// const Vec3d ofs2ass = obj->instances[instance_idx]->get_offset_to_assembly(); +// stream << ofs2ass(0) << " " << ofs2ass(1) << " " << ofs2ass(2); +// stream << "\" />\n"; +// } +// } +// } +// } +// stream << " \n"; +// } +// +// stream << "\n"; +// +// std::string out = stream.str(); +// if (!mz_zip_writer_add_mem(&archive, BBS_MODEL_CONFIG_FILE.c_str(), (const void*)out.data(), out.length(), MZ_DEFAULT_COMPRESSION)) { +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format("Unable to add model config file to archive\n"); +// add_error("Unable to add model config file to archive"); +// return false; +// } +// +// return true; +// } +// +// bool _BBS_3MF_Exporter::_add_slice_info_config_file_to_archive(mz_zip_archive& archive, const Model& model, PlateDataPtrs& plate_data_list, const ObjectToObjectDataMap &objects_data, const DynamicPrintConfig& config) +// { +// std::stringstream stream; +// // Store mesh transformation in full precision, as the volumes are stored transformed and they need to be transformed back +// // when loaded as accurately as possible. +// stream << std::setprecision(std::numeric_limits::max_digits10); +// stream << std::setiosflags(std::ios::fixed) << std::setprecision(2); +// stream << "\n"; +// stream << "<" << CONFIG_TAG << ">\n"; +// +// // save slice header for debug +// stream << " <" << SLICE_HEADER_TAG << ">\n"; +// stream << " <" << SLICE_HEADER_ITEM_TAG << " " << KEY_ATTR << "=\"" << "X-BBL-Client-Type" << "\" " << VALUE_ATTR << "=\"" << "slicer" << "\"/>\n"; +// stream << " <" << SLICE_HEADER_ITEM_TAG << " " << KEY_ATTR << "=\"" << "X-BBL-Client-Version" << "\" " << VALUE_ATTR << "=\"" << convert_to_full_version(SoftFever_VERSION) << "\"/>\n"; +// stream << " \n"; +// +// for (unsigned int i = 0; i < (unsigned int)plate_data_list.size(); ++i) +// { +// PlateData* plate_data = plate_data_list[i]; +// //int instance_size = plate_data->objects_and_instances.size(); +// +// if (plate_data != nullptr && plate_data->is_sliced_valid) { +// stream << " <" << PLATE_TAG << ">\n"; +// //plate index +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << PLATE_IDX_ATTR << "\" " << VALUE_ATTR << "=\"" << plate_data->plate_index + 1 << "\"/>\n"; +// +// int timelapse_type = int(config.opt_enum("timelapse_type")); +// for (auto it = plate_data->warnings.begin(); it != plate_data->warnings.end(); it++) { +// if (it->msg == NOT_GENERATE_TIMELAPSE) { +// timelapse_type = -1; +// break; +// } +// } +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << PRINTER_MODEL_ID_ATTR << "\" " << VALUE_ATTR << "=\"" << plate_data->printer_model_id << "\"/>\n"; +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << NOZZLE_DIAMETERS_ATTR << "\" " << VALUE_ATTR << "=\"" << plate_data->nozzle_diameters << "\"/>\n"; +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << TIMELAPSE_TYPE_ATTR << "\" " << VALUE_ATTR << "=\"" << timelapse_type << "\"/>\n"; +// //stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << TIMELAPSE_ERROR_CODE_ATTR << "\" " << VALUE_ATTR << "=\"" << plate_data->timelapse_warning_code << "\"/>\n"; +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << SLICE_PREDICTION_ATTR << "\" " << VALUE_ATTR << "=\"" << plate_data->get_gcode_prediction_str() << "\"/>\n"; +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << SLICE_WEIGHT_ATTR << "\" " << VALUE_ATTR << "=\"" << plate_data->get_gcode_weight_str() << "\"/>\n"; +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << OUTSIDE_ATTR << "\" " << VALUE_ATTR << "=\"" << std::boolalpha<< plate_data->toolpath_outside << "\"/>\n"; +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << SUPPORT_USED_ATTR << "\" " << VALUE_ATTR << "=\"" << std::boolalpha<< plate_data->is_support_used << "\"/>\n"; +// stream << " <" << METADATA_TAG << " " << KEY_ATTR << "=\"" << LABEL_OBJECT_ENABLED_ATTR << "\" " << VALUE_ATTR << "=\"" << std::boolalpha<< plate_data->is_label_object_enabled << "\"/>\n"; +// +// for (auto it = plate_data->objects_and_instances.begin(); it != plate_data->objects_and_instances.end(); it++) +// { +// int obj_id = it->first; +// int inst_id = it->second; +// int identify_id = 0; +// ModelObject* obj = NULL; +// ModelInstance* inst = NULL; +// if (obj_id >= model.objects.size()) { +// BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << ":" << __LINE__ << boost::format("invalid object id %1%\n")%obj_id; +// continue; +// } +// obj = model.objects[obj_id]; +// +// if (obj && (inst_id >= obj->instances.size())) { +// BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << ":" << __LINE__ << boost::format("invalid instance id %1%\n")%inst_id; +// continue; +// } +// inst = obj->instances[inst_id]; +// if (m_use_loaded_id && (inst->loaded_id > 0)) +// identify_id = inst->loaded_id; +// else +// identify_id = inst->id().id; +// bool skipped = std::find(plate_data->skipped_objects.begin(), plate_data->skipped_objects.end(), identify_id) != +// plate_data->skipped_objects.end(); +// stream << " <" << OBJECT_TAG << " " << IDENTIFYID_ATTR << "=\"" << std::to_string(identify_id) << "\" " << NAME_ATTR << "=\"" << xml_escape(obj->name) +// << "\" " << SKIPPED_ATTR << "=\"" << (skipped ? "true" : "false") +// << "\" />\n"; +// } +// +// for (auto it = plate_data->slice_filaments_info.begin(); it != plate_data->slice_filaments_info.end(); it++) +// { +// stream << " <" << FILAMENT_TAG << " " << FILAMENT_ID_TAG << "=\"" << std::to_string(it->id + 1) << "\" " +// << FILAMENT_TYPE_TAG << "=\"" << it->type << "\" " +// << FILAMENT_COLOR_TAG << "=\"" << it->color << "\" " +// << FILAMENT_USED_M_TAG << "=\"" << it->used_m << "\" " +// << FILAMENT_USED_G_TAG << "=\"" << it->used_g << "\" />\n"; +// } +// +// for (auto it = plate_data->warnings.begin(); it != plate_data->warnings.end(); it++) { +// stream << " <" << SLICE_WARNING_TAG << " msg=\"" << it->msg << "\" level=\"" << std::to_string(it->level) << "\" error_code =\"" << it->error_code << "\" />\n"; +// } +// stream << " \n"; +// } +// } +// stream << "\n"; +// +// std::string out = stream.str(); +// +// if (!mz_zip_writer_add_mem(&archive, SLICE_INFO_CONFIG_FILE.c_str(), (const void*)out.data(), out.length(), MZ_DEFAULT_COMPRESSION)) { +// add_error("Unable to add model config file to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", store slice-info to 3mf, length %1%, failed\n") % out.length(); +// return false; +// } +// +// return true; +// } +//bool _BBS_3MF_Exporter::_add_gcode_file_to_archive(mz_zip_archive& archive, const Model& model, PlateDataPtrs& plate_data_list, Export3mfProgressFn proFn) +//{ +// bool result = true; +// bool cb_cancel = false; +// +// PlateDataPtrs plate_data_list2; +// for (unsigned int i = 0; i < (unsigned int)plate_data_list.size(); ++i) +// { +// if (proFn) { +// proFn(EXPORT_STAGE_ADD_GCODE, i, plate_data_list.size(), cb_cancel); +// if (cb_cancel) +// return false; +// } +// +// PlateData* plate_data = plate_data_list[i]; +// if (!plate_data->gcode_file.empty() && plate_data->is_sliced_valid && boost::filesystem::exists(plate_data->gcode_file)) { +// plate_data_list2.push_back(plate_data); +// } +// } +// +// boost::mutex mutex; +// tbb::parallel_for(tbb::blocked_range(0, plate_data_list2.size(), 1), [this, &plate_data_list2, &root_archive = archive, &mutex, &result](const tbb::blocked_range& range) { +// for (int i = range.begin(); i < range.end(); ++i) { +// PlateData* plate_data = plate_data_list2[i]; +// auto src_gcode_file = plate_data->gcode_file; +// std::string gcode_in_3mf = (boost::format(GCODE_FILE_FORMAT) % (plate_data->plate_index + 1)).str(); +// +// plate_data->gcode_file = gcode_in_3mf; +// mz_zip_archive archive; +// mz_zip_writer_staged_context context; +// mz_zip_zero_struct(&archive); +// mz_zip_writer_init_heap(&archive, 0, 1024 * 1024); +// { +// mz_zip_writer_add_staged_open(&archive, &context, gcode_in_3mf.c_str(), m_zip64 ? (uint64_t(1) << 30) * 16 : (uint64_t(1) << 32) - 1, nullptr, nullptr, 0, +// MZ_DEFAULT_COMPRESSION, nullptr, 0, nullptr, 0); +// boost::filesystem::path src_gcode_path(src_gcode_file); +// if (!boost::filesystem::exists(src_gcode_path)) { +// BOOST_LOG_TRIVIAL(error) << "Gcode is missing, filename = " << src_gcode_file; +// result = false; +// } +// boost::filesystem::ifstream ifs(src_gcode_file, std::ios::binary); +// std::string buf(64 * 1024, 0); +// while (ifs) { +// ifs.read(buf.data(), buf.size()); +// mz_zip_writer_add_staged_data(&context, buf.data(), ifs.gcount()); +// } +// mz_zip_writer_add_staged_finish(&context); +// } +// void *ppBuf; size_t pSize; +// mz_zip_writer_finalize_heap_archive(&archive, &ppBuf, &pSize); +// mz_zip_writer_end(&archive); +// mz_zip_zero_struct(&archive); +// mz_zip_reader_init_mem(&archive, ppBuf, pSize, 0); +// { +// boost::unique_lock l(mutex); +// mz_zip_writer_add_from_zip_reader(&root_archive, &archive, 0); +// } +// mz_zip_reader_end(&archive); +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" <<__LINE__ << boost::format(", store %1% to 3mf %2%\n") % src_gcode_file % gcode_in_3mf; +// } +// }); +// return result; +//} +// +//bool _BBS_3MF_Exporter::_add_custom_gcode_per_print_z_file_to_archive(mz_zip_archive& archive, Model& model, const DynamicPrintConfig* config) +//{ +// //BBS: add plate tree related logic +// std::string out = ""; +// bool has_custom_gcode = false; +// pt::ptree tree; +// pt::ptree& main_tree = tree.add("custom_gcodes_per_layer", ""); +// for (auto custom_gcodes : model.plates_custom_gcodes) { +// has_custom_gcode = true; +// pt::ptree& plate_tree = main_tree.add("plate", ""); +// pt::ptree& plate_idx_tree = plate_tree.add("plate_info", ""); +// plate_idx_tree.put(".id", custom_gcodes.first + 1); +// +// // store data of custom_gcode_per_print_z +// for (const CustomGCode::Item& code : custom_gcodes.second.gcodes) { +// pt::ptree& code_tree = plate_tree.add("layer", ""); +// code_tree.put(".top_z", code.print_z); +// code_tree.put(".type", static_cast(code.type)); +// code_tree.put(".extruder", code.extruder); +// code_tree.put(".color", code.color); +// code_tree.put(".extra", code.extra); +// +// //BBS +// std::string gcode = //code.type == CustomGCode::ColorChange ? config->opt_string("color_change_gcode") : +// code.type == CustomGCode::PausePrint ? config->opt_string("machine_pause_gcode") : +// code.type == CustomGCode::Template ? config->opt_string("template_custom_gcode") : +// code.type == CustomGCode::ToolChange ? "tool_change" : code.extra; +// code_tree.put(".gcode", gcode); +// } +// +// pt::ptree& mode_tree = plate_tree.add("mode", ""); +// // store mode of a custom_gcode_per_print_z +// mode_tree.put(".value", custom_gcodes.second.mode == CustomGCode::Mode::SingleExtruder ? CustomGCode::SingleExtruderMode : +// custom_gcodes.second.mode == CustomGCode::Mode::MultiAsSingle ? CustomGCode::MultiAsSingleMode : +// CustomGCode::MultiExtruderMode); +// +// } +// if (has_custom_gcode) { +// std::ostringstream oss; +// boost::property_tree::write_xml(oss, tree); +// out = oss.str(); +// +// // Post processing("beautification") of the output string +// boost::replace_all(out, "><", ">\n<"); +// } +// +// if (!out.empty()) { +// if (!mz_zip_writer_add_mem(&archive, CUSTOM_GCODE_PER_PRINT_Z_FILE.c_str(), (const void*)out.data(), out.length(), MZ_DEFAULT_COMPRESSION)) { +// add_error("Unable to add custom Gcodes per print_z file to archive"); +// BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":" << __LINE__ << boost::format(", Unable to add custom Gcodes per print_z file to archive\n"); +// return false; +// } +// } +// +// return true; +//} +// +//bool _BBS_3MF_Exporter::_add_auxiliary_dir_to_archive(mz_zip_archive &archive, const std::string &aux_dir, PackingTemporaryData &data) +//{ +// bool result = true; +// +// if (aux_dir.empty()) { +// //no accessory directories +// return result; +// } +// +// boost::filesystem::path dir = boost::filesystem::path(aux_dir); +// if (!boost::filesystem::exists(dir)) +// { +// //no accessory directories +// return result; +// } +// +// static std::string const nocomp_exts[] = {".png", ".jpg", ".mp4", ".jpeg"}; +// std::deque directories({dir}); +// int root_dir_len = dir.string().length() + 1; +// //boost file access +// while (!directories.empty()) { +// boost::filesystem::directory_iterator iterator(directories.front()); +// directories.pop_front(); +// for (auto &dir_entry : iterator) +// { +// std::string src_file; +// std::string dst_in_3mf; +// if (boost::filesystem::is_directory(dir_entry.path())) +// { +// directories.push_back(dir_entry.path()); +// continue; +// } +// if (boost::filesystem::is_regular_file(dir_entry.path()) && !m_skip_auxiliary) +// { +// src_file = dir_entry.path().string(); +// dst_in_3mf = dir_entry.path().string(); +// dst_in_3mf.replace(0, root_dir_len, AUXILIARY_DIR); +// std::replace(dst_in_3mf.begin(), dst_in_3mf.end(), '\\', '/'); +// if (_3MF_COVER_FILE.compare(1, _3MF_COVER_FILE.length() - 1, dst_in_3mf) == 0) { +// data._3mf_thumbnail = dst_in_3mf; +// } else if (m_thumbnail_small.compare(1, m_thumbnail_small.length() - 1, dst_in_3mf) == 0) { +// data._3mf_printer_thumbnail_small = dst_in_3mf; +// if (m_thumbnail_middle == m_thumbnail_small) data._3mf_printer_thumbnail_middle = dst_in_3mf; +// } else if (m_thumbnail_middle.compare(1, m_thumbnail_middle.length() - 1, dst_in_3mf) == 0) { +// data._3mf_printer_thumbnail_middle = dst_in_3mf; +// } +// result &= _add_file_to_archive(archive, dst_in_3mf, src_file); +// } +// } +// } +// +// return result; +//} +// +//// Perform conversions based on the config values available. +////FIXME provide a version of PrusaSlicer that stored the project file (3MF). +//static void handle_legacy_project_loaded(unsigned int version_project_file, DynamicPrintConfig& config) +//{ +// if (! config.has("brim_object_gap")) { +// if (auto *opt_elephant_foot = config.option("elefant_foot_compensation", false); opt_elephant_foot) { +// // Conversion from older PrusaSlicer which applied brim separation equal to elephant foot compensation. +// auto *opt_brim_separation = config.option("brim_object_gap", true); +// opt_brim_separation->value = opt_elephant_foot->value; +// } +// } +//} +// +//// backup backgroud thread to dispatch tasks and coperate with ui thread +//class _BBS_Backup_Manager +//{ +//public: +// static _BBS_Backup_Manager& get() { +// static _BBS_Backup_Manager m; +// return m; +// } +// +// void set_post_callback(std::function c) { +// boost::lock_guard lock(m_mutex); +// m_post_callback = c; +// } +// +// void run_ui_tasks() { +// std::deque tasks; +// { +// boost::lock_guard lock(m_mutex); +// std::swap(tasks, m_ui_tasks); +// } +// for (auto& t : tasks) +// { +// process_ui_task(t); +// } +// } +// +// void push_object_gaurd(ModelObject& object) { +// m_gaurd_objects.push_back(std::make_pair(&object, 0)); +// } +// +// void pop_object_gaurd() { +// auto object = m_gaurd_objects.back(); +// m_gaurd_objects.pop_back(); +// if (object.second) +// add_object_mesh(*object.first); +// } +// +// void add_object_mesh(ModelObject& object) { +// for (auto& g : m_gaurd_objects) { +// if (g.first == &object) { +// ++g.second; +// return; +// } +// } +// // clone object +// auto model = object.get_model(); +// auto o = m_temp_model.add_object(object); +// int backup_id = model->get_object_backup_id(object); +// push_task({ AddObject, (size_t) backup_id, object.get_model()->get_backup_path(), o, 1 }); +// } +// +// void remove_object_mesh(ModelObject& object) { +// push_task({ RemoveObject, object.id().id, object.get_model()->get_backup_path() }); +// } +// +// void backup_soon() { +// boost::lock_guard lock(m_mutex); +// m_other_changes_backup = true; +// m_tasks.push_back({ Backup, 0, std::string(), nullptr, ++m_task_seq }); +// m_cond.notify_all(); +// } +// +// void remove_backup(Model& model, bool removeAll) { +// BOOST_LOG_TRIVIAL(info) +// << "remove_backup " << model.get_backup_path() << ", " << removeAll; +// std::deque canceled_tasks; +// boost::unique_lock lock(m_mutex); +// if (removeAll && model.is_need_backup()) { +// // running task may not be canceled +// for (auto & t : m_ui_tasks) +// canceled_tasks.push_back(t); +// for (auto & t : m_tasks) +// canceled_tasks.push_back(t); +// m_ui_tasks.clear(); +// m_tasks.clear(); +// } +// m_tasks.push_back({ RemoveBackup, model.id().id, model.get_backup_path(), nullptr, removeAll }); +// ++m_task_seq; +// if (model.is_need_backup()) { +// m_other_changes = false; +// m_other_changes_backup = false; +// } +// m_cond.notify_all(); +// lock.unlock(); +// for (auto& t : canceled_tasks) { +// process_ui_task(t, true); +// } +// } +// +// void set_interval(long n) { +// boost::lock_guard lock(m_mutex); +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " entry, and last interval is: " << m_interval; +// m_next_backup -= boost::posix_time::seconds(m_interval); +// m_interval = n; +// m_next_backup += boost::posix_time::seconds(m_interval); +// m_cond.notify_all(); +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " exit, and new interval is: " << m_interval; +// } +// +// void put_other_changes() +// { +// BOOST_LOG_TRIVIAL(info) << "put_other_changes"; +// m_other_changes = true; +// m_other_changes_backup = true; +// } +// +// void clear_other_changes(bool backup) +// { +// if (backup) +// m_other_changes_backup = false; +// else +// m_other_changes = false; +// } +// +// bool has_other_changes(bool backup) +// { +// return backup ? m_other_changes_backup : m_other_changes; +// } +// +//private: +// enum TaskType { +// None, +// Backup, // this task is working as response in ui thread +// AddObject, +// RemoveObject, +// RemoveBackup, +// Exit +// }; +// struct Task { +// TaskType type; +// size_t id = 0; +// std::string path; +// ModelObject* object = nullptr; +// union { +// size_t delay = 0; // delay sequence, only last task is delayed +// size_t sequence; +// bool removeAll; +// }; +// friend bool operator==(Task const& l, Task const& r) { +// return l.type == r.type && l.id == r.id; +// } +// std::string to_string() const { +// constexpr char const *type_names[] = {"None", +// "Backup", +// "AddObject", +// "RemoveObject", +// "RemoveBackup", +// "Exit"}; +// std::ostringstream os; +// os << "{ type:" << type_names[type] << ", id:" << id +// << ", path:" << path +// << ", object:" << (object ? object->id().id : 0) << ", extra:" << delay << "}"; +// return os.str(); +// } +// }; +// +// struct timer { +// timer(char const * msg) : msg(msg), start(boost::posix_time::microsec_clock::universal_time()) { } +// ~timer() { +//#ifdef __WIN32__ +// auto end = boost::posix_time::microsec_clock::universal_time(); +// int duration = (int)(end - start).total_milliseconds(); +// char buf[20]; +// OutputDebugStringA(msg); +// OutputDebugStringA(": "); +// OutputDebugStringA(itoa(duration, buf, 10)); +// OutputDebugStringA("\n"); +//#endif +// } +// char const* msg; +// boost::posix_time::ptime start; +// }; +//private: +// _BBS_Backup_Manager() { +// BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " inital and interval = " << m_interval; +// m_next_backup = boost::get_system_time() + boost::posix_time::seconds(m_interval); +// boost::unique_lock lock(m_mutex); +// m_thread = std::move(boost::thread(boost::ref(*this))); +// } +// +// ~_BBS_Backup_Manager() { +// push_task({Exit}); +// m_thread.join(); +// } +// +// void push_task(Task const & t) { +// boost::unique_lock lock(m_mutex); +// if (t.delay && !m_tasks.empty() && m_tasks.back() == t) { +// auto t2 = m_tasks.back(); +// m_tasks.back() = t; +// m_tasks.back().delay = t2.delay + 1; +// m_cond.notify_all(); +// lock.unlock(); +// process_ui_task(t2); +// } +// else { +// m_tasks.push_back(t); +// ++m_task_seq; +// m_cond.notify_all(); +// } +// } +// +// void process_ui_task(Task& t, bool canceled = false) { +// BOOST_LOG_TRIVIAL(info) << "process_ui_task" << t.to_string() << " and interval = " << m_interval; +// switch (t.type) { +// case Backup: { +// if (canceled) +// break; +// std::function callback; +// boost::unique_lock lock(m_mutex); +// if (m_task_seq != t.sequence) { +// if (find(m_tasks.begin(), m_tasks.end(), Task{ Backup }) == m_tasks.end()) { +// t.sequence = ++m_task_seq; // may has pending tasks, retry later +// m_tasks.push_back(t); +// m_cond.notify_all(); +// } +// break; +// } +// callback = m_post_callback; +// lock.unlock(); +// { +// timer t("backup cost"); +// try { +// if (callback) callback(1); +// } catch (...) {} +// } +// m_other_changes_backup = false; +// break; +// } +// case AddObject: +// m_temp_model.delete_object(t.object); +// break; +// case RemoveBackup: +// if (t.removeAll) { +// try { +// boost::filesystem::remove(t.path + "/lock.txt"); +// boost::filesystem::remove_all(t.path); +// BOOST_LOG_TRIVIAL(info) << "process_ui_task: remove all of backup path " << t.path; +// } catch (std::exception &ex) { +// BOOST_LOG_TRIVIAL(error) << "process_ui_task: failed to remove backup path" << t.path << ": " << ex.what(); +// } +// } +// break; +// } +// } +// +// void process_task(Task& t) { +// BOOST_LOG_TRIVIAL(info) << "process_task" << t.to_string() << " and interval = " << m_interval; +// switch (t.type) { +// case Backup: +// // do it in response +// break; +// case AddObject: { +// { +// CNumericLocalesSetter locales_setter; +// _BBS_3MF_Exporter e; +// e.save_object_mesh(t.path, *t.object, (int) t.id); +// // response to delete cloned object +// } +// break; +// } +// case RemoveObject: { +// boost::system::error_code ec; +// boost::filesystem::remove(t.path + "/mesh_" + boost::lexical_cast(t.id) + ".xml", ec); +// t.type = None; +// break; +// } +// case RemoveBackup: { +// try { +// boost::system::error_code ec; +// boost::filesystem::remove(t.path + "/.3mf", ec); +// // We Saved with SplitModel now, so we can safe delete these sub models. +// boost::filesystem::remove_all(t.path + "/3D/Objects"); +// boost::filesystem::create_directory(t.path + "/3D/Objects"); +// } +// catch (...) {} +// } +// } +// } +// +//public: +// void operator()() { +// boost::unique_lock lock(m_mutex); +// while (true) +// { +// while (m_tasks.empty()) { +// if (m_interval > 0) +// m_cond.timed_wait(lock, m_next_backup); +// else +// m_cond.wait(lock); +// if (m_interval > 0 && boost::get_system_time() > m_next_backup) { +// m_tasks.push_back({ Backup, 0, std::string(), nullptr, ++m_task_seq }); +// m_next_backup += boost::posix_time::seconds(m_interval); +// // Maybe wakeup from power sleep +// if (m_next_backup < boost::get_system_time()) +// m_next_backup = boost::get_system_time() + boost::posix_time::seconds(m_interval); +// } +// } +// Task t = m_tasks.front(); +// if (t.type == Exit) break; +// if (t.object && t.delay) { +// if (!delay_task(t, lock)) +// continue; +// } +// m_tasks.pop_front(); +// auto callback = m_post_callback; +// lock.unlock(); +// process_task(t); +// lock.lock(); +// if (t.type > None) { +// m_ui_tasks.push_back(t); +// if (m_ui_tasks.size() == 1 && callback) +// callback(0); +// } +// } +// } +// +// bool delay_task(Task& t, boost::unique_lock & lock) { +// // delay last task for 3 seconds after last modify +// auto now = boost::get_system_time(); +// auto delay_expire = now + boost::posix_time::seconds(10); // must not delay over this time +// auto wait = now + boost::posix_time::seconds(3); +// while (true) { +// m_cond.timed_wait(lock, wait); +// // Only delay when it's the only-one task +// if (m_tasks.size() != 1 || m_tasks.front().delay == t.delay) +// break; +// t.delay = m_tasks.front().delay; +// now = boost::get_system_time(); +// if (now >= delay_expire) +// break; +// wait = now + boost::posix_time::seconds(3); +// if (wait > delay_expire) +// wait = delay_expire; +// }; +// // task maybe canceled +// if (m_tasks.empty()) +// return false; +// t = m_tasks.front(); +// return true; +// } +// +//private: +// boost::mutex m_mutex; +// boost::condition_variable m_cond; +// std::deque m_tasks; +// std::deque m_ui_tasks; +// size_t m_task_seq = 0; +// // param 0: should call run_ui_tasks +// // param 1: should backup current project +// std::function m_post_callback; +// long m_interval = 1 * 60; +// boost::system_time m_next_backup; +// Model m_temp_model; // visit only in main thread +// bool m_other_changes = false; // visit only in main thread +// bool m_other_changes_backup = false; // visit only in main thread +// std::vector> m_gaurd_objects; +// boost::thread m_thread; +//}; +// +// +////BBS: add plate data list related logic +bool load_bbs_3mf(const char* path, DynamicPrintConfig* config, ConfigSubstitutionContext* config_substitutions, Model* model, PlateDataPtrs* plate_data_list, std::vector* project_presets, + bool* is_bbl_3mf, Semver* file_version, Import3mfProgressFn proFn, LoadStrategy strategy, /*BBLProject *project,*/ int plate_id) +{ + if (path == nullptr || config == nullptr || model == nullptr) + return false; + + // All import should use "C" locales for number formatting. + CNumericLocalesSetter locales_setter; + _BBS_3MF_Importer importer; + bool res = importer.load_model_from_file(path, *model, *plate_data_list, *project_presets, *config, *config_substitutions, strategy, *is_bbl_3mf, *file_version, proFn, /*project,*/ plate_id); + importer.log_errors(); + //BBS: remove legacy project logic currently + //handle_legacy_project_loaded(importer.version(), *config); + return res; +} +// +//std::string bbs_3mf_get_thumbnail(const char *path) +//{ +// _BBS_3MF_Importer importer; +// std::string data; +// bool res = importer.get_thumbnail(path, data); +// if (!res) importer.log_errors(); +// return data; +//} +// +//bool load_gcode_3mf_from_stream(std::istream &data, DynamicPrintConfig *config, Model *model, PlateDataPtrs *plate_data_list, Semver *file_version) +//{ +// CNumericLocalesSetter locales_setter; +// _BBS_3MF_Importer importer; +// bool res = importer.load_gcode_3mf_from_stream(data, *model, *plate_data_list, *config, *file_version); +// importer.log_errors(); +// return res; +//} +// +//bool store_bbs_3mf(StoreParams& store_params) +//{ +// // All export should use "C" locales for number formatting. +// CNumericLocalesSetter locales_setter; +// +// if (store_params.path == nullptr || store_params.model == nullptr) +// return false; +// +// _BBS_3MF_Exporter exporter; +// bool res = exporter.save_model_to_file(store_params); +// if (!res) +// exporter.log_errors(); +// +// return res; +//} +// +////BBS: release plate data list +//void release_PlateData_list(PlateDataPtrs& plate_data_list) +//{ +// //clear +// for (unsigned int i = 0; i < plate_data_list.size(); i++) +// { +// delete plate_data_list[i]; +// } +// plate_data_list.clear(); +// +// return; +//} +// +//// backup interface +// +//void save_object_mesh(ModelObject& object) +//{ +// if (!object.get_model() || !object.get_model()->is_need_backup()) +// return; +// if (object.volumes.empty() || object.instances.empty()) +// return; +// _BBS_Backup_Manager::get().add_object_mesh(object); +//} +// +//void delete_object_mesh(ModelObject& object) +//{ +// // not really remove +// // _BBS_Backup_Manager::get().remove_object_mesh(object); +//} +// +//void backup_soon() +//{ +// _BBS_Backup_Manager::get().backup_soon(); +//} +// +//void remove_backup(Model& model, bool removeAll) +//{ +// _BBS_Backup_Manager::get().remove_backup(model, removeAll); +//} +// +//void set_backup_interval(long interval) +//{ +// _BBS_Backup_Manager::get().set_interval(interval); +//} +// +//void set_backup_callback(std::function callback) +//{ +// _BBS_Backup_Manager::get().set_post_callback(callback); +//} +// +//void run_backup_ui_tasks() +//{ +// _BBS_Backup_Manager::get().run_ui_tasks(); +//} +// +//bool has_restore_data(std::string & path, std::string& origin) +//{ +// if (path.empty()) { +// origin = ""; +// return false; +// } +// if (boost::filesystem::exists(path + "/lock.txt")) { +// std::string pid; +// load_string_file(path + "/lock.txt", pid); +// try { +// if (get_process_name(boost::lexical_cast(pid)) == +// get_process_name(0)) { +// origin = ""; +// return false; +// } +// } +// catch (...) { +// return false; +// } +// } +// std::string file3mf = path + "/.3mf"; +// if (!boost::filesystem::exists(file3mf)) +// return false; +// try { +// if (boost::filesystem::exists(path + "/origin.txt")) +// load_string_file(path + "/origin.txt", origin); +// } +// catch (...) { +// } +// path = file3mf; +// return true; +//} +// +//void put_other_changes() +//{ +// _BBS_Backup_Manager::get().put_other_changes(); +//} +// +//void clear_other_changes(bool backup) +//{ +// _BBS_Backup_Manager::get().clear_other_changes(backup); +//} +// +//bool has_other_changes(bool backup) +//{ +// return _BBS_Backup_Manager::get().has_other_changes(backup); +//} +// +//SaveObjectGaurd::SaveObjectGaurd(ModelObject& object) +//{ +// _BBS_Backup_Manager::get().push_object_gaurd(object); +//} +// +//SaveObjectGaurd::~SaveObjectGaurd() +//{ +// _BBS_Backup_Manager::get().pop_object_gaurd(); +//} +// +//namespace{ +// +//// Conversion with bidirectional map +//// F .. first, S .. second +//template +//F bimap_cvt(const boost::bimap &bmap, S s, const F & def_value) { +// const auto &map = bmap.right; +// auto found_item = map.find(s); +// +// // only for back and forward compatibility +// assert(found_item != map.end()); +// if (found_item == map.end()) +// return def_value; +// +// return found_item->second; +//} +// +//template +//S bimap_cvt(const boost::bimap &bmap, F f, const S &def_value) +//{ +// const auto &map = bmap.left; +// auto found_item = map.find(f); +// +// // only for back and forward compatibility +// assert(found_item != map.end()); +// if (found_item == map.end()) +// return def_value; +// +// return found_item->second; +//} +// +//} // namespace + +/// +/// TextConfiguration serialization //Susi_not_impl +/// +//const TextConfigurationSerialization::TypeToName TextConfigurationSerialization::type_to_name = +// boost::assign::list_of +// (EmbossStyle::Type::file_path, "file_name") +// (EmbossStyle::Type::wx_win_font_descr, "wxFontDescriptor_Windows") +// (EmbossStyle::Type::wx_lin_font_descr, "wxFontDescriptor_Linux") +// (EmbossStyle::Type::wx_mac_font_descr, "wxFontDescriptor_MacOsX"); +// +//const TextConfigurationSerialization::HorizontalAlignToName TextConfigurationSerialization::horizontal_align_to_name = +// boost::assign::list_of +// (FontProp::HorizontalAlign::left, "left") +// (FontProp::HorizontalAlign::center, "center") +// (FontProp::HorizontalAlign::right, "right"); +// +//const TextConfigurationSerialization::VerticalAlignToName TextConfigurationSerialization::vertical_align_to_name = +// boost::assign::list_of +// (FontProp::VerticalAlign::top, "top") +// (FontProp::VerticalAlign::center, "middle") +// (FontProp::VerticalAlign::bottom, "bottom"); + +// +//void TextConfigurationSerialization::to_xml(std::stringstream &stream, const TextConfiguration &tc) +//{ +// stream << " <" << TEXT_TAG << " "; +// +// stream << TEXT_DATA_ATTR << "=\"" << xml_escape_double_quotes_attribute_value(tc.text) << "\" "; +// // font item +// const EmbossStyle &style = tc.style; +// stream << STYLE_NAME_ATTR << "=\"" << xml_escape_double_quotes_attribute_value(style.name) << "\" "; +// stream << FONT_DESCRIPTOR_ATTR << "=\"" << xml_escape_double_quotes_attribute_value(style.path) << "\" "; +// constexpr std::string_view dafault_type{"undefined"}; +// std::string_view style_type = bimap_cvt(type_to_name, style.type, dafault_type); +// stream << FONT_DESCRIPTOR_TYPE_ATTR << "=\"" << style_type << "\" "; +// +// // font property +// const FontProp &fp = tc.style.prop; +// if (fp.char_gap.has_value()) +// stream << CHAR_GAP_ATTR << "=\"" << *fp.char_gap << "\" "; +// if (fp.line_gap.has_value()) +// stream << LINE_GAP_ATTR << "=\"" << *fp.line_gap << "\" "; +// +// stream << LINE_HEIGHT_ATTR << "=\"" << fp.size_in_mm << "\" "; +// if (fp.boldness.has_value()) +// stream << BOLDNESS_ATTR << "=\"" << *fp.boldness << "\" "; +// if (fp.skew.has_value()) +// stream << SKEW_ATTR << "=\"" << *fp.skew << "\" "; +// if (fp.per_glyph) +// stream << PER_GLYPH_ATTR << "=\"" << 1 << "\" "; +// stream << HORIZONTAL_ALIGN_ATTR << "=\"" << bimap_cvt(horizontal_align_to_name, fp.align.first, dafault_type) << "\" "; +// stream << VERTICAL_ALIGN_ATTR << "=\"" << bimap_cvt(vertical_align_to_name, fp.align.second, dafault_type) << "\" "; +// if (fp.collection_number.has_value()) +// stream << COLLECTION_NUMBER_ATTR << "=\"" << *fp.collection_number << "\" "; +// // font descriptor +// if (fp.family.has_value()) +// stream << FONT_FAMILY_ATTR << "=\"" << *fp.family << "\" "; +// if (fp.face_name.has_value()) +// stream << FONT_FACE_NAME_ATTR << "=\"" << *fp.face_name << "\" "; +// if (fp.style.has_value()) +// stream << FONT_STYLE_ATTR << "=\"" << *fp.style << "\" "; +// if (fp.weight.has_value()) +// stream << FONT_WEIGHT_ATTR << "=\"" << *fp.weight << "\" "; +// +// stream << "/>\n"; // end TEXT_TAG +//} +//namespace { +// +//FontProp::HorizontalAlign read_horizontal_align(const char **attributes, unsigned int num_attributes, const TextConfigurationSerialization::HorizontalAlignToName& horizontal_align_to_name){ +// std::string horizontal_align_str = bbs_get_attribute_value_string(attributes, num_attributes, HORIZONTAL_ALIGN_ATTR); +// +// // Back compatibility +// // PS 2.6.0 do not have align +// if (horizontal_align_str.empty()) +// return FontProp::HorizontalAlign::center; +// +// // Back compatibility +// // PS 2.6.1 store indices(0|1|2) instead of text for align +// if (horizontal_align_str.length() == 1) { +// int horizontal_align_int = 0; +// if(boost::spirit::qi::parse(horizontal_align_str.c_str(), horizontal_align_str.c_str() + 1, boost::spirit::qi::int_, horizontal_align_int)) +// return static_cast(horizontal_align_int); +// } +// +// return bimap_cvt(horizontal_align_to_name, std::string_view(horizontal_align_str), FontProp::HorizontalAlign::center); +//} +// +// +//FontProp::VerticalAlign read_vertical_align(const char **attributes, unsigned int num_attributes, const TextConfigurationSerialization::VerticalAlignToName& vertical_align_to_name){ +// std::string vertical_align_str = bbs_get_attribute_value_string(attributes, num_attributes, VERTICAL_ALIGN_ATTR); +// +// // Back compatibility +// // PS 2.6.0 do not have align +// if (vertical_align_str.empty()) +// return FontProp::VerticalAlign::center; +// +// // Back compatibility +// // PS 2.6.1 store indices(0|1|2) instead of text for align +// if (vertical_align_str.length() == 1) { +// int vertical_align_int = 0; +// if(boost::spirit::qi::parse(vertical_align_str.c_str(), vertical_align_str.c_str() + 1, boost::spirit::qi::int_, vertical_align_int)) +// return static_cast(vertical_align_int); +// } +// +// return bimap_cvt(vertical_align_to_name, std::string_view(vertical_align_str), FontProp::VerticalAlign::center); +//} +// +//} // namespace +// +//std::optional TextConfigurationSerialization::read(const char **attributes, unsigned int num_attributes) +//{ +// FontProp fp; +// int char_gap = bbs_get_attribute_value_int(attributes, num_attributes, CHAR_GAP_ATTR); +// if (char_gap != 0) fp.char_gap = char_gap; +// int line_gap = bbs_get_attribute_value_int(attributes, num_attributes, LINE_GAP_ATTR); +// if (line_gap != 0) fp.line_gap = line_gap; +// float boldness = bbs_get_attribute_value_float(attributes, num_attributes, BOLDNESS_ATTR); +// if (std::fabs(boldness) > std::numeric_limits::epsilon()) +// fp.boldness = boldness; +// float skew = bbs_get_attribute_value_float(attributes, num_attributes, SKEW_ATTR); +// if (std::fabs(skew) > std::numeric_limits::epsilon()) +// fp.skew = skew; +// int per_glyph = bbs_get_attribute_value_int(attributes, num_attributes, PER_GLYPH_ATTR); +// if (per_glyph == 1) fp.per_glyph = true; +// +// fp.align = FontProp::Align( +// read_horizontal_align(attributes, num_attributes, horizontal_align_to_name), +// read_vertical_align(attributes, num_attributes, vertical_align_to_name)); +// +// int collection_number = bbs_get_attribute_value_int(attributes, num_attributes, COLLECTION_NUMBER_ATTR); +// if (collection_number > 0) fp.collection_number = static_cast(collection_number); +// +// fp.size_in_mm = bbs_get_attribute_value_float(attributes, num_attributes, LINE_HEIGHT_ATTR); +// +// std::string family = bbs_get_attribute_value_string(attributes, num_attributes, FONT_FAMILY_ATTR); +// if (!family.empty()) fp.family = family; +// std::string face_name = bbs_get_attribute_value_string(attributes, num_attributes, FONT_FACE_NAME_ATTR); +// if (!face_name.empty()) fp.face_name = face_name; +// std::string style = bbs_get_attribute_value_string(attributes, num_attributes, FONT_STYLE_ATTR); +// if (!style.empty()) fp.style = style; +// std::string weight = bbs_get_attribute_value_string(attributes, num_attributes, FONT_WEIGHT_ATTR); +// if (!weight.empty()) fp.weight = weight; +// +// std::string style_name = bbs_get_attribute_value_string(attributes, num_attributes, STYLE_NAME_ATTR); +// std::string font_descriptor = bbs_get_attribute_value_string(attributes, num_attributes, FONT_DESCRIPTOR_ATTR); +// std::string type_str = bbs_get_attribute_value_string(attributes, num_attributes, FONT_DESCRIPTOR_TYPE_ATTR); +// EmbossStyle::Type type = bimap_cvt(type_to_name, std::string_view{type_str}, EmbossStyle::Type::undefined); +// +// std::string text = bbs_get_attribute_value_string(attributes, num_attributes, TEXT_DATA_ATTR); +// EmbossStyle es{style_name, std::move(font_descriptor), type, std::move(fp)}; +// return TextConfiguration{std::move(es), std::move(text)}; +//} +// +//EmbossShape TextConfigurationSerialization::read_old(const char **attributes, unsigned int num_attributes) +//{ +// EmbossShape es; +// std::string fix_tr_mat_str = bbs_get_attribute_value_string(attributes, num_attributes, TRANSFORM_ATTR); +// if (!fix_tr_mat_str.empty()) +// es.fix_3mf_tr = bbs_get_transform_from_3mf_specs_string(fix_tr_mat_str); +// +// +// if (bbs_get_attribute_value_int(attributes, num_attributes, USE_SURFACE_ATTR) == 1) +// es.projection.use_surface = true; +// +// es.projection.depth = bbs_get_attribute_value_float(attributes, num_attributes, DEPTH_ATTR); +// +// int use_surface = bbs_get_attribute_value_int(attributes, num_attributes, USE_SURFACE_ATTR); +// if (use_surface == 1) +// es.projection.use_surface = true; +// +// return es; +//} +// +//namespace { +//Transform3d create_fix(const std::optional &prev, const ModelVolume &volume) +//{ +// // IMPROVE: check if volume was modified (translated, rotated OR scaled) +// // when no change do not calculate transformation only store original fix matrix +// +// // Create transformation used after load actual stored volume +// // Orca: do not bake volume transformation into meshes +// // const Transform3d &actual_trmat = volume.get_matrix(); +// const Transform3d& actual_trmat = Transform3d::Identity(); +// +// const auto &vertices = volume.mesh().its.vertices; +// Vec3d min = actual_trmat * vertices.front().cast(); +// Vec3d max = min; +// for (const Vec3f &v : vertices) { +// Vec3d vd = actual_trmat * v.cast(); +// for (size_t i = 0; i < 3; ++i) { +// if (min[i] > vd[i]) +// min[i] = vd[i]; +// if (max[i] < vd[i]) +// max[i] = vd[i]; +// } +// } +// Vec3d center = (max + min) / 2; +// Transform3d post_trmat = Transform3d::Identity(); +// post_trmat.translate(center); +// +// Transform3d fix_trmat = actual_trmat.inverse() * post_trmat; +// if (!prev.has_value()) +// return fix_trmat; +// +// // check whether fix somehow differ previous +// if (fix_trmat.isApprox(Transform3d::Identity(), 1e-5)) +// return *prev; +// +// return *prev * fix_trmat; +//} +// +//bool to_xml(std::stringstream &stream, /*const EmbossShape::SvgFile &svg, */const ModelVolume &volume, mz_zip_archive &archive){ +// if (svg.path_in_3mf.empty()) +// return true; // EmbossedText OR unwanted store .svg file into .3mf (protection of copyRight) +// +// if (!svg.path.empty()) +// stream << SVG_FILE_PATH_ATTR << "=\"" << xml_escape_double_quotes_attribute_value(svg.path) << "\" "; +// stream << SVG_FILE_PATH_IN_3MF_ATTR << "=\"" << xml_escape_double_quotes_attribute_value(svg.path_in_3mf) << "\" "; +// +// std::shared_ptr file_data = svg.file_data; +// assert(file_data != nullptr); +// if (file_data == nullptr && !svg.path.empty()) +// file_data = read_from_disk(svg.path); +// if (file_data == nullptr) { +// BOOST_LOG_TRIVIAL(warning) << "Can't write svg file no filedata"; +// return false; +// } +// const std::string &file_data_str = *file_data; +// +// return mz_zip_writer_add_mem(&archive, svg.path_in_3mf.c_str(), +// (const void *) file_data_str.c_str(), file_data_str.size(), MZ_DEFAULT_COMPRESSION); +//} +// +//} // namespace +// +//void to_xml(std::stringstream &stream, const EmbossShape &es, const ModelVolume &volume, mz_zip_archive &archive) +//{ +// stream << " <" << SHAPE_TAG << " "; +// if (es.svg_file.has_value()) +// if(!to_xml(stream, *es.svg_file, volume, archive)) +// BOOST_LOG_TRIVIAL(warning) << "Can't write svg file defiden embossed shape into 3mf"; +// +// stream << SHAPE_SCALE_ATTR << "=\"" << es.scale << "\" "; +// +// if (!es.final_shape.is_healed) +// stream << UNHEALED_ATTR << "=\"" << 1 << "\" "; +// +// // projection +// const EmbossProjection &p = es.projection; +// stream << DEPTH_ATTR << "=\"" << p.depth << "\" "; +// if (p.use_surface) +// stream << USE_SURFACE_ATTR << "=\"" << 1 << "\" "; +// +// // FIX of baked transformation +// Transform3d fix = create_fix(es.fix_3mf_tr, volume); +// stream << TRANSFORM_ATTR << "=\""; +// _BBS_3MF_Exporter::add_transformation(stream, fix); +// stream << "\" "; +// +// stream << "/>\n"; // end SHAPE_TAG +//} +// +//std::optional read_emboss_shape(const char **attributes, unsigned int num_attributes) { +// double scale = bbs_get_attribute_value_float(attributes, num_attributes, SHAPE_SCALE_ATTR); +// int unhealed = bbs_get_attribute_value_int(attributes, num_attributes, UNHEALED_ATTR); +// bool is_healed = unhealed != 1; +// +// EmbossProjection projection; +// projection.depth = bbs_get_attribute_value_float(attributes, num_attributes, DEPTH_ATTR); +// if (is_approx(projection.depth, 0.)) +// projection.depth = 10.; +// +// int use_surface = bbs_get_attribute_value_int(attributes, num_attributes, USE_SURFACE_ATTR); +// if (use_surface == 1) +// projection.use_surface = true; +// +// std::optional fix_tr_mat; +// std::string fix_tr_mat_str = bbs_get_attribute_value_string(attributes, num_attributes, TRANSFORM_ATTR); +// if (!fix_tr_mat_str.empty()) { +// fix_tr_mat = bbs_get_transform_from_3mf_specs_string(fix_tr_mat_str); +// } +// +// std::string file_path = bbs_get_attribute_value_string(attributes, num_attributes, SVG_FILE_PATH_ATTR); +// std::string file_path_3mf = bbs_get_attribute_value_string(attributes, num_attributes, SVG_FILE_PATH_IN_3MF_ATTR); +// +// // MayBe: store also shapes to not store svg +// // But be carefull curve will be lost -> scale will not change sampling +// // shapes could be loaded from SVG +// ExPolygonsWithIds shapes; +// // final shape could be calculated from shapes +// HealedExPolygons final_shape; +// final_shape.is_healed = is_healed; +// +// EmbossShape::SvgFile svg{file_path, file_path_3mf}; +// return EmbossShape{std::move(shapes), std::move(final_shape), scale, std::move(projection), std::move(fix_tr_mat), std::move(svg)}; +//} + + +} // namespace Slic3r diff --git a/src/libslic3r/Format/bbs_3mf.hpp b/src/libslic3r/Format/bbs_3mf.hpp new file mode 100644 index 00000000000..4850c5dcad7 --- /dev/null +++ b/src/libslic3r/Format/bbs_3mf.hpp @@ -0,0 +1,315 @@ +#ifndef BBS_3MF_hpp_ +#define BBS_3MF_hpp_ + +#include "../PrintConfig.hpp" +#include "../GCode/ThumbnailData.hpp" +//#include "libslic3r/ProjectTask.hpp" +//#include "libslic3r/GCode/GCodeProcessor.hpp" +#include + +namespace Slic3r { +class Model; +struct ConfigSubstitutionContext; +class DynamicPrintConfig; +class Preset; +struct GCodeProcessorResult; +class ModelObject; +//struct ThumbnailData; + +struct FilamentInfo +{ + int id; // filament id = extruder id, start with 0. + std::string type; + std::string color; + std::string filament_id; + std::string brand; + float used_m; + float used_g; + int tray_id; // start with 0 + float distance; + int mapping_result = 0; +}; +struct ThumbnailData; + + +#define PLATE_THUMBNAIL_SMALL_WIDTH 128 +#define PLATE_THUMBNAIL_SMALL_HEIGHT 128 + +#define GCODE_FILE_FORMAT "Metadata/plate_%1%.gcode" +#define THUMBNAIL_FILE_FORMAT "Metadata/plate_%1%.png" +#define TOP_FILE_FORMAT "Metadata/top_%1%.png" +#define PICK_FILE_FORMAT "Metadata/pick_%1%.png" +//#define PATTERN_FILE_FORMAT "Metadata/plate_%1%_pattern_layer_0.png" +#define PATTERN_CONFIG_FILE_FORMAT "Metadata/plate_%1%.json" +#define EMBEDDED_PRINT_FILE_FORMAT "Metadata/process_settings_%1%.config" +#define EMBEDDED_FILAMENT_FILE_FORMAT "Metadata/filament_settings_%1%.config" +#define EMBEDDED_PRINTER_FILE_FORMAT "Metadata/machine_settings_%1%.config" + +#define BBL_DESIGNER_MODEL_TITLE_TAG "Title" +#define BBL_DESIGNER_PROFILE_ID_TAG "DesignProfileId" +#define BBL_DESIGNER_PROFILE_TITLE_TAG "ProfileTitle" +#define BBL_DESIGNER_MODEL_ID_TAG "DesignModelId" + + +//BBS: define assistant struct to store temporary variable during exporting 3mf +class PackingTemporaryData +{ +public: + std::string _3mf_thumbnail; + std::string _3mf_printer_thumbnail_middle; + std::string _3mf_printer_thumbnail_small; + + PackingTemporaryData() {} +}; + + +//BBS: define plate data list related structures +struct PlateData +{ + PlateData(int plate_id, std::set> &obj_to_inst_list, bool lock_state) : plate_index(plate_id), locked(lock_state) + { + objects_and_instances.clear(); + for (std::set>::iterator it = obj_to_inst_list.begin(); it != obj_to_inst_list.end(); ++it) + objects_and_instances.emplace_back(it->first, it->second); + } + PlateData() : plate_index(-1), locked(false) + { + objects_and_instances.clear(); + } + ~PlateData() + { + objects_and_instances.clear(); + } + + void parse_filament_info(GCodeProcessorResult *result); + + int plate_index; + std::vector> objects_and_instances; + std::map> obj_inst_map; + std::string printer_model_id; + std::string nozzle_diameters; + std::string gcode_file; + std::string gcode_file_md5; + std::string thumbnail_file; + ThumbnailData plate_thumbnail; + std::string top_file; + std::string pick_file; + //ThumbnailData pattern_thumbnail; + //std::string pattern_file; + std::string pattern_bbox_file; + std::string gcode_prediction; + std::string gcode_weight; + std::string plate_name; + std::vector slice_filaments_info; + std::vector skipped_objects; + DynamicPrintConfig config; + bool is_support_used {false}; + bool is_sliced_valid = false; + bool toolpath_outside {false}; + bool is_label_object_enabled {false}; + int timelapse_warning_code = 0; // 1<<0 sprial vase, 1<<1 by object + + //std::vector warnings; + std::vector warnings; + + std::string get_gcode_prediction_str() { + return gcode_prediction; + } + + std::string get_gcode_weight_str() { + return gcode_weight; + } + bool locked; +}; + +// BBS: encrypt +enum class SaveStrategy +{ + Default = 0, + FullPathSources = 1, + Zip64 = 1 << 1, + ProductionExt = 1 << 2, + SecureContentExt = 1 << 3, + WithGcode = 1 << 4, + Silence = 1 << 5, + SkipStatic = 1 << 6, + SkipModel = 1 << 7, + WithSliceInfo = 1 << 8, + SkipAuxiliary = 1 << 9, + UseLoadedId = 1 << 10, + ShareMesh = 1 << 11, + + SplitModel = 0x1000 | ProductionExt, + Encrypted = SecureContentExt | SplitModel, + Backup = 0x10000 | WithGcode | Silence | SkipStatic | SplitModel, +}; + +inline SaveStrategy operator | (SaveStrategy lhs, SaveStrategy rhs) +{ + using T = std::underlying_type_t ; + return static_cast(static_cast(lhs) | static_cast(rhs)); +} + +inline bool operator & (SaveStrategy & lhs, SaveStrategy rhs) +{ + using T = std::underlying_type_t ; + return ((static_cast(lhs) & static_cast(rhs))) == static_cast(rhs); +} + +enum class LoadStrategy +{ + Default = 0, + AddDefaultInstances = 1, + CheckVersion = 2, + LoadModel = 4, + LoadConfig = 8, + LoadAuxiliary = 16, + Silence = 32, + ImperialUnits = 64, + + Restore = 0x10000 | LoadModel | LoadConfig | LoadAuxiliary | Silence, +}; + +inline LoadStrategy operator | (LoadStrategy lhs, LoadStrategy rhs) +{ + using T = std::underlying_type_t ; + return static_cast(static_cast(lhs) | static_cast(rhs)); +} + +inline bool operator & (LoadStrategy & lhs, LoadStrategy rhs) +{ + using T = std::underlying_type_t ; + return (static_cast(lhs) & static_cast(rhs)) == static_cast(rhs); +} + +const int EXPORT_STAGE_OPEN_3MF = 0; +const int EXPORT_STAGE_CONTENT_TYPES = 1; +const int EXPORT_STAGE_ADD_THUMBNAILS = 2; +const int EXPORT_STAGE_ADD_RELATIONS = 3; +const int EXPORT_STAGE_ADD_MODELS = 4; +const int EXPORT_STAGE_ADD_LAYER_RANGE = 5; +const int EXPORT_STAGE_ADD_SUPPORT = 6; +const int EXPORT_STAGE_ADD_CUSTOM_GCODE = 7; +const int EXPORT_STAGE_ADD_PRINT_CONFIG = 8; +const int EXPORT_STAGE_ADD_PROJECT_CONFIG = 9; +const int EXPORT_STAGE_ADD_CONFIG_FILE = 10; +const int EXPORT_STAGE_ADD_SLICE_INFO = 11; +const int EXPORT_STAGE_ADD_GCODE = 12; +const int EXPORT_STAGE_ADD_AUXILIARIES = 13; +const int EXPORT_STAGE_FINISH = 14; + +const int IMPORT_STAGE_RESTORE = 0; +const int IMPORT_STAGE_OPEN = 1; +const int IMPORT_STAGE_READ_FILES = 2; +const int IMPORT_STAGE_EXTRACT = 3; +const int IMPORT_STAGE_LOADING_OBJECTS = 4; +const int IMPORT_STAGE_LOADING_PLATES = 5; +const int IMPORT_STAGE_FINISH = 6; +const int IMPORT_STAGE_ADD_INSTANCE = 7; +const int IMPORT_STAGE_UPDATE_GCODE = 8; +const int IMPORT_STAGE_CHECK_MODE_GCODE = 9; +const int UPDATE_GCODE_RESULT = 10; +const int IMPORT_LOAD_CONFIG = 11; +const int IMPORT_LOAD_MODEL_OBJECTS = 12; +const int IMPORT_STAGE_MAX = 13; + +//BBS export 3mf progress +typedef std::function Export3mfProgressFn; +typedef std::function Import3mfProgressFn; + +typedef std::vector PlateDataPtrs; + +typedef std::map PlateDataMaps; + +struct StoreParams +{ + const char* path; + Model* model = nullptr; + PlateDataPtrs plate_data_list; + int export_plate_idx = -1; + std::vector project_presets; + DynamicPrintConfig* config; + std::vector thumbnail_data; + std::vector top_thumbnail_data; + std::vector pick_thumbnail_data; + std::vector calibration_thumbnail_data; + SaveStrategy strategy = SaveStrategy::Zip64; + Export3mfProgressFn proFn = nullptr; + //std::vector id_bboxes; + //BBLProject* project = nullptr; + //BBLProfile* profile = nullptr; + + StoreParams() {} +}; + + +//BBS: add plate data list related logic +// add restore logic +// Load the content of a 3mf file into the given model and preset bundle. +extern bool load_bbs_3mf(const char* path, DynamicPrintConfig* config, ConfigSubstitutionContext* config_substitutions, Model* model, PlateDataPtrs* plate_data_list, std::vector* project_presets, + bool* is_bbl_3mf, Semver* file_version, Import3mfProgressFn proFn = nullptr, LoadStrategy strategy = LoadStrategy::Default, /*BBLProject *project = nullptr,*/ int plate_id = 0); + +extern std::string bbs_3mf_get_thumbnail(const char * path); + +extern bool load_gcode_3mf_from_stream(std::istream & data, DynamicPrintConfig* config, Model* model, PlateDataPtrs* plate_data_list, + Semver* file_version); + + +//BBS: add plate data list related logic +// add backup logic +// Save the given model and the config data contained in the given Print into a 3mf file. +// The model could be modified during the export process if meshes are not repaired or have no shared vertices +/* +extern bool store_bbs_3mf(const char* path, + Model* model, + PlateDataPtrs& plate_data_list, + std::vector& project_presets, + const DynamicPrintConfig* config, + bool fullpath_sources, + const std::vector& thumbnail_data, + bool zip64 = true, + bool skip_static = false, + Export3mfProgressFn proFn = nullptr, + bool silence = true); +*/ + + +/////////////////////// EXPORT ///////////////////////////// +// +//extern bool store_bbs_3mf(StoreParams& store_params); +// +//extern void release_PlateData_list(PlateDataPtrs& plate_data_list); +// +//// backup & restore project +// +//extern void save_object_mesh(ModelObject& object); +// +//extern void delete_object_mesh(ModelObject& object); +// +//extern void backup_soon(); +// +//extern void remove_backup(Model& model, bool removeAll); +// +//extern void set_backup_interval(long interval); +// +//extern void set_backup_callback(std::function callback); +// +//extern void run_backup_ui_tasks(); +// +//extern bool has_restore_data(std::string & path, std::string & origin); +// +//extern void put_other_changes(); +// +//extern void clear_other_changes(bool backup); +// +//extern bool has_other_changes(bool backup); +// +//class SaveObjectGaurd { +//public: +// SaveObjectGaurd(ModelObject& object); +// ~SaveObjectGaurd(); +//}; + +} // namespace Slic3r + +#endif /* BBS_3MF_hpp_ */ diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp index cce5b3c8c93..c304a9797d1 100644 --- a/src/libslic3r/GCode/GCodeProcessor.cpp +++ b/src/libslic3r/GCode/GCodeProcessor.cpp @@ -1414,7 +1414,7 @@ void GCodeProcessor::process_file(const std::string& filename, std::functionvolumes.push_back(v); @@ -1773,8 +1773,10 @@ void ModelVolume::center_geometry_after_creation(bool update_source_offset) Vec3d shift = this->mesh().bounding_box().center(); if (!shift.isApprox(Vec3d::Zero())) { - if (m_mesh) + if (m_mesh) { const_cast(m_mesh.get())->translate(-(float)shift(0), -(float)shift(1), -(float)shift(2)); + const_cast(m_mesh.get())->set_init_shift(shift); + } if (m_convex_hull) const_cast(m_convex_hull.get())->translate(-(float)shift(0), -(float)shift(1), -(float)shift(2)); translate(shift); diff --git a/src/libslic3r/Model.hpp b/src/libslic3r/Model.hpp index 335366d2301..144272b8e36 100644 --- a/src/libslic3r/Model.hpp +++ b/src/libslic3r/Model.hpp @@ -286,7 +286,7 @@ class ModelObject final : public ObjectBase Model* get_model() { return m_model; } const Model* get_model() const { return m_model; } - ModelVolume* add_volume(const TriangleMesh &mesh, bool centered = true); + ModelVolume* add_volume(const TriangleMesh &mesh, ModelVolumeType type = ModelVolumeType::MODEL_PART, bool centered = true); ModelVolume* add_volume(TriangleMesh &&mesh, ModelVolumeType type = ModelVolumeType::MODEL_PART, bool centered = true); ModelVolume* add_volume(const ModelVolume &volume, ModelVolumeType type = ModelVolumeType::INVALID, bool centered = true); ModelVolume* add_volume(const ModelVolume &volume, TriangleMesh &&mesh, bool centered = true); diff --git a/src/libslic3r/ObjectID.hpp b/src/libslic3r/ObjectID.hpp index 1030171e7fe..782c587417e 100644 --- a/src/libslic3r/ObjectID.hpp +++ b/src/libslic3r/ObjectID.hpp @@ -77,7 +77,7 @@ class ObjectBase // Override this method if a ObjectBase derived class owns other ObjectBase derived instances. virtual void assign_new_unique_ids_recursive() { this->set_new_unique_id(); } -private: +//private: ObjectID m_id; static inline ObjectID generate_new_id() { return ObjectID(++ s_last_id); } @@ -128,6 +128,66 @@ class ObjectWithTimestamp : public ObjectBase template void serialize(Archive &ar) { ar(m_timestamp); } }; + + +class CutObjectBase : public ObjectBase +{ + // check sum of CutParts in initial Object + size_t m_check_sum{ 1 }; + // connectors count + size_t m_connectors_cnt{ 0 }; + +public: + // Default Constructor to assign an invalid ID + CutObjectBase() : ObjectBase(-1) {} + // Constructor with ignored int parameter to assign an invalid ID, to be replaced + // by an existing ID copied from elsewhere. + CutObjectBase(int) : ObjectBase(-1) {} + // Constructor to initialize full information from 3mf + CutObjectBase(ObjectID id, size_t check_sum, size_t connectors_cnt) : ObjectBase(id), m_check_sum(check_sum), m_connectors_cnt(connectors_cnt) {} + // The class tree will have virtual tables and type information. + virtual ~CutObjectBase() = default; + + bool operator<(const CutObjectBase& other) const { return other.id() > this->id(); } + bool operator==(const CutObjectBase& other) const { return other.id() == this->id(); } + + void copy(const CutObjectBase& rhs) { + this->copy_id(rhs); + this->m_check_sum = rhs.check_sum(); + this->m_connectors_cnt = rhs.connectors_cnt() ; + } + CutObjectBase& operator=(const CutObjectBase& other) { + this->copy(other); + return *this; + } + + void invalidate() { + set_invalid_id(); + m_check_sum = 1; + m_connectors_cnt = 0; + } + + void init() { this->set_new_unique_id(); } + bool has_same_id(const CutObjectBase& rhs) { return this->id() == rhs.id(); } + bool is_equal(const CutObjectBase& rhs) { return this->id() == rhs.id() && + this->check_sum() == rhs.check_sum() && + this->connectors_cnt() == rhs.connectors_cnt() ; } + + size_t check_sum() const { return m_check_sum; } + void set_check_sum(size_t cs) { m_check_sum = cs; } + void increase_check_sum(size_t cnt) { m_check_sum += cnt; } + + size_t connectors_cnt() const { return m_connectors_cnt; } + void increase_connectors_cnt(size_t connectors_cnt) { m_connectors_cnt += connectors_cnt; } + +private: + friend class cereal::access; + template void serialize(Archive& ar) { + ar(cereal::base_class(this)); + ar(m_check_sum, m_connectors_cnt); + } +}; + // Unique object / instance ID for the wipe tower. extern ObjectID wipe_tower_object_id(); extern ObjectID wipe_tower_instance_id(); diff --git a/src/libslic3r/Preset.hpp b/src/libslic3r/Preset.hpp index f4a07870889..046ee22eb4f 100644 --- a/src/libslic3r/Preset.hpp +++ b/src/libslic3r/Preset.hpp @@ -107,7 +107,7 @@ struct PresetWithVendorProfile { // because Preset and the ConfigWizard hold pointers to VendorProfiles. // XXX: maybe set is enough (cf. changes in Wizard) typedef std::map VendorMap; - +class _BBS_3MF_Importer; class Preset { public: @@ -269,6 +269,7 @@ class Preset friend class PresetCollection; friend class PresetBundle; + friend class _BBS_3MF_Importer; }; bool is_compatible_with_print (const PresetWithVendorProfile &preset, const PresetWithVendorProfile &active_print, const PresetWithVendorProfile &active_printer); diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index 51c66b96938..50d5573fdd1 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -802,7 +802,7 @@ ConfigSubstitutions PresetBundle::load_config_file(const std::string &path, Forw ConfigSubstitutions config_substitutions = config.load_from_gcode_file(path, compatibility_rule); Preset::normalize(config); if(from_prusa) - config.convert_from_prusa(); + config.convert_from_prusa(true); load_config_file_config(path, true, std::move(config)); return config_substitutions; } @@ -838,7 +838,7 @@ ConfigSubstitutions PresetBundle::load_config_file(const std::string &path, Forw config_substitutions = config.load(tree, compatibility_rule); Preset::normalize(config); if (from_prusa) { - config.convert_from_prusa(); + config.convert_from_prusa(true); } load_config_file_config(path, true, std::move(config)); return config_substitutions; @@ -1335,7 +1335,7 @@ std::pair PresetBundle::load_configbundle( config.set_deserialize(kvp.first, kvp.second.data(), substitution_context); } if (flags.has(LoadConfigBundleAttribute::ConvertFromPrusa)) - config.convert_from_prusa(); + config.convert_from_prusa(true); }; if (presets == &this->printers) { // Select the default config based on the printer_technology field extracted from kvp. diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 36d166a7a2b..4d471ea0cd7 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -7793,7 +7793,7 @@ std::map PrintConfigDef::from_prusa(t_config_option_key template -void _convert_from_prusa(CONFIG_CLASS& conf, const DynamicPrintConfig& global_config) { +void _convert_from_prusa(CONFIG_CLASS& conf, const DynamicPrintConfig& global_config, bool with_phony) { //void convert_from_prusa(DynamicPrintConfig& conf, const DynamicPrintConfig & global_config) { //void convert_from_prusa(ModelConfigObject& conf, const DynamicPrintConfig& global_config) { std::map results; @@ -7820,23 +7820,33 @@ void _convert_from_prusa(CONFIG_CLASS& conf, const DynamicPrintConfig& global_co conf.set_key_value(entry.first, opt_new); } } + // set phony entries - for (const t_config_option_key &opt_key : - {"extrusion_spacing", "perimeter_extrusion_spacing", "external_perimeter_extrusion_spacing", - "first_layer_extrusion_spacing", "infill_extrusion_spacing", "solid_infill_extrusion_spacing", - "top_infill_extrusion_spacing"}) { - ConfigOption* opt_new = print_config_def.get(opt_key)->default_value.get()->clone(); - opt_new->deserialize(""); // note: deserialize don't set phony, only the ConfigBase::set_deserialize* - opt_new->set_phony(true); - conf.set_key_value(opt_key, opt_new); + if (with_phony) { + for (auto &[opt_key_width, opt_key_spacing] : + {std::pair{"extrusion_width", "extrusion_spacing"}, + std::pair{"perimeter_extrusion_width", "perimeter_extrusion_spacing"}, + std::pair{"external_perimeter_extrusion_width", "external_perimeter_extrusion_spacing"}, + std::pair{"first_layer_extrusion_width", "first_layer_extrusion_spacing"}, + std::pair{"infill_extrusion_width", "infill_extrusion_spacing"}, + std::pair{"solid_infill_extrusion_width", "solid_infill_extrusion_spacing"}, + std::pair{"top_infill_extrusion_width", "top_infill_extrusion_spacing"}}) { + // if prusa has defined a width, or if the conf has a default spacing that need to be overwritten + if (conf.option(opt_key_width) != nullptr || conf.option(opt_key_spacing) != nullptr) { + ConfigOption *opt_new = print_config_def.get(opt_key_spacing)->default_value.get()->clone(); + opt_new->deserialize(""); // note: deserialize don't set phony, only the ConfigBase::set_deserialize* + opt_new->set_phony(true); + conf.set_key_value(opt_key_spacing, opt_new); + } + } } } -void DynamicPrintConfig::convert_from_prusa() { - _convert_from_prusa(*this, *this); +void DynamicPrintConfig::convert_from_prusa(bool with_phony) { + _convert_from_prusa(*this, *this, with_phony); } -void ModelConfig::convert_from_prusa(const DynamicPrintConfig& global_config) { - _convert_from_prusa(*this, global_config); +void ModelConfig::convert_from_prusa(const DynamicPrintConfig& global_config, bool with_phony) { + _convert_from_prusa(*this, global_config, with_phony); } std::unordered_set prusa_export_to_remove_keys = { diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 647c63e501c..54694ab48d3 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -391,7 +391,8 @@ class DynamicPrintConfig : public DynamicConfig void to_prusa(t_config_option_key& opt_key, std::string& value) const override { PrintConfigDef::to_prusa(opt_key, value, *this); } // utilities to help convert from prusa config. - void convert_from_prusa(); + // if with_phony, then the phony settigns will be set to phony if needed. + void convert_from_prusa(bool with_phony); /// /// callback to changed other settings that are linked (like width & spacing) @@ -1669,7 +1670,8 @@ class ModelConfig // utilities to help convert from prusa config. - void convert_from_prusa(const DynamicPrintConfig& global_config); + // if with_phony, then the phony settigns will be set to phony if needed. + void convert_from_prusa(const DynamicPrintConfig& global_config, bool with_phony); private: friend class cereal::access; diff --git a/src/libslic3r/SupportMaterial.cpp b/src/libslic3r/SupportMaterial.cpp index 96b1924d420..8993cd9bcde 100644 --- a/src/libslic3r/SupportMaterial.cpp +++ b/src/libslic3r/SupportMaterial.cpp @@ -4122,10 +4122,6 @@ void PrintObjectSupportMaterial::generate_toolpaths( LoopInterfaceProcessor loop_interface_processor(1.5 * m_support_params.support_material_interface_flow.scaled_width()); loop_interface_processor.n_contact_loops = this->has_contact_loops() ? 1 : 0; - //std::vector angles { m_support_params.base_angle }; - //if (m_object_config->support_material_pattern.value == smpRectilinearGrid) - // angles.push_back(m_support_params.interface_angle); - BoundingBox bbox_object(Point(-scale_(1.), -scale_(1.0)), Point(scale_(1.), scale_(1.))); // const coordf_t link_max_length_factor = 3.; @@ -4277,7 +4273,7 @@ void PrintObjectSupportMaterial::generate_toolpaths( filler_first_layer_ptr->ratio_fill_inside = 0.2f; tbb::parallel_for(tbb::blocked_range(n_raft_layers, support_layers.size()), [this, &support_layers, &bottom_contacts, &top_contacts, &intermediate_layers, &interface_layers, &base_interface_layers, &layer_caches, &loop_interface_processor, - &bbox_object, /*&angles,*/ link_max_length_factor, &filler_first_layer_ptr, &raft_top_interface_idx, &raft_angle_interface] + &bbox_object, link_max_length_factor, &filler_first_layer_ptr, &raft_top_interface_idx, &raft_angle_interface] (const tbb::blocked_range& range) { // Indices of the 1st layer in their respective container at the support layer height. size_t idx_layer_bottom_contact = size_t(-1); @@ -4318,7 +4314,9 @@ void PrintObjectSupportMaterial::generate_toolpaths( //compute if the support has to switch its angle float suppport_angle = m_support_params.base_angle; - if (m_support_params.base_angle_height > 0 && (int(support_layer.print_z / m_support_params.base_angle_height)) % 2 == 1) { + if (m_object_config->support_material_pattern.value == smpRectilinearGrid && support_layer_id % 2 == 1) { + suppport_angle = m_support_params.interface_angle; + } else if (m_support_params.base_angle_height > 0 && (int(support_layer.print_z / m_support_params.base_angle_height)) % 2 == 1) { suppport_angle += float(M_PI) / 2; } @@ -4419,7 +4417,7 @@ void PrintObjectSupportMaterial::generate_toolpaths( } else { filler->angle = interface_as_base ? // If zero interface layers are configured, use the same angle as for the base layers. - suppport_angle : //angles[support_layer_id % angles.size()] : + suppport_angle : // Use interface angle for the interface layers. m_support_params.interface_angle + interface_angle_delta; supp_density = interface_as_base ? m_support_params.support_density : m_support_params.interface_density; @@ -4484,7 +4482,6 @@ void PrintObjectSupportMaterial::generate_toolpaths( // its pattern to the other layers filler_spacing = flow.spacing(); } else{ - //filler->angle = angles[support_layer_id % angles.size()]; filler->angle = suppport_angle; filler->link_max_length = coord_t(scale_(filler_spacing * link_max_length_factor / m_support_params.support_density)); } diff --git a/src/libslic3r/TriangleMesh.hpp b/src/libslic3r/TriangleMesh.hpp index 4b8563f7eb0..733a4f4ea61 100644 --- a/src/libslic3r/TriangleMesh.hpp +++ b/src/libslic3r/TriangleMesh.hpp @@ -150,11 +150,15 @@ class TriangleMesh void restore_optional() {} const TriangleMeshStats& stats() const { return m_stats; } + + void set_init_shift(const Vec3d &offset) { m_init_shift = offset; } + Vec3d get_init_shift() const { return m_init_shift; } indexed_triangle_set its; private: TriangleMeshStats m_stats; + Vec3d m_init_shift {0.0, 0.0, 0.0}; // BBS, for import bbs 3mf... }; // Index of face indices incident with a vertex index. diff --git a/src/miniz/ChangeLog.md b/src/miniz/ChangeLog.md index 3ee292d7996..632177a8036 100644 --- a/src/miniz/ChangeLog.md +++ b/src/miniz/ChangeLog.md @@ -1,5 +1,11 @@ ## Changelog +## Babumslicer: + - search for BBS + - m_is_utf8 for mz_zip_archive_file_stat (filled by mz_zip_file_stat_internal) + - mz_zip_writer_add_file_ex, like mz_zip_writer_add_file but with extra params for mz_zip_writer_add_cfile + - mz_zip_reader_get_extra + ### 2.1.0 - More instances of memcpy instead of cast and use memcpy per default diff --git a/src/miniz/miniz.c b/src/miniz/miniz.c index 0d6fc7d9bc8..e75a797ee35 100644 --- a/src/miniz/miniz.c +++ b/src/miniz/miniz.c @@ -4156,6 +4156,8 @@ static mz_bool mz_zip_file_stat_internal(mz_zip_archive *pZip, mz_uint file_inde pStat->m_is_directory = mz_zip_reader_is_file_a_directory(pZip, file_index); pStat->m_is_encrypted = mz_zip_reader_is_file_encrypted(pZip, file_index); pStat->m_is_supported = mz_zip_reader_is_file_supported(pZip, file_index); + // BBS + pStat->m_is_utf8 = pStat->m_bit_flag & MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8; /* See if we need to read any zip64 extended information fields. */ /* Confusingly, these zip64 fields can be present even on non-zip64 archives (Debian zip on a huge files from stdin piped to stdout creates them). */ @@ -6985,7 +6987,14 @@ mz_bool mz_zip_writer_add_cfile(mz_zip_archive *pZip, const char *pArchive_name, user_extra_data, user_extra_data_len, user_extra_data_central, user_extra_data_central_len); } +// BBS: support storage path with unicode path extra mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags) +{ + return mz_zip_writer_add_file_ex(pZip, pArchive_name, pSrc_filename, pComment, comment_size, level_and_flags, NULL, 0, NULL, 0); +} + +mz_bool mz_zip_writer_add_file_ex(mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, + const char *user_extra_data, mz_uint user_extra_data_len, const char *user_extra_data_central, mz_uint user_extra_data_central_len) { MZ_FILE *pSrc_file = NULL; mz_uint64 uncomp_size = 0; @@ -7009,7 +7018,8 @@ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, uncomp_size = MZ_FTELL64(pSrc_file); MZ_FSEEK64(pSrc_file, 0, SEEK_SET); - status = mz_zip_writer_add_cfile(pZip, pArchive_name, pSrc_file, uncomp_size, pFile_time, pComment, comment_size, level_and_flags, NULL, 0, NULL, 0); + // BBS + status = mz_zip_writer_add_cfile(pZip, pArchive_name, pSrc_file, uncomp_size, pFile_time, pComment, comment_size, level_and_flags, user_extra_data, user_extra_data_len, user_extra_data_central, user_extra_data_central_len); MZ_FCLOSE(pSrc_file); @@ -7922,6 +7932,30 @@ mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, mz_uint file_index, cha return n + 1; } +// BBS +mz_uint mz_zip_reader_get_extra(mz_zip_archive* pZip, mz_uint file_index, char* pExtra, mz_uint extra_buf_size) +{ + mz_uint nf; + mz_uint ne; + const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index); + if (!p) + { + if (extra_buf_size) + pExtra[0] = '\0'; + mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER); + return 0; + } + nf = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS); + ne = MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS); + if (extra_buf_size) + { + ne = MZ_MIN(ne, extra_buf_size - 1); + memcpy(pExtra, p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + nf, ne); + pExtra[ne] = '\0'; + } + return ne + 1; +} + mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index, mz_zip_archive_file_stat *pStat) { return mz_zip_file_stat_internal(pZip, file_index, mz_zip_get_cdh(pZip, file_index), pStat, NULL); diff --git a/src/miniz/miniz.h b/src/miniz/miniz.h index 8fe0461adba..fdf54092dc4 100644 --- a/src/miniz/miniz.h +++ b/src/miniz/miniz.h @@ -966,6 +966,9 @@ typedef struct /* MZ_TRUE if the file is not encrypted, a patch file, and if it uses a compression method we support. */ mz_bool m_is_supported; + // BBS + mz_bool m_is_utf8; + /* Filename. If string ends in '/' it's a subdirectory entry. */ /* Guaranteed to be zero terminated, may be truncated to fit. */ char m_filename[MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE]; @@ -1159,6 +1162,8 @@ mz_bool mz_zip_reader_is_file_supported(mz_zip_archive *pZip, mz_uint file_index /* Retrieves the filename of an archive file entry. */ /* Returns the number of bytes written to pFilename, or if filename_buf_size is 0 this function returns the number of bytes needed to fully store the filename. */ mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, mz_uint file_index, char *pFilename, mz_uint filename_buf_size); +// BBS +mz_uint mz_zip_reader_get_extra(mz_zip_archive *pZip, mz_uint file_index, char *pExtra, mz_uint extra_buf_size); /* Attempts to locates a file in the archive's central directory. */ /* Valid flags: MZ_ZIP_FLAG_CASE_SENSITIVE, MZ_ZIP_FLAG_IGNORE_PATH */ @@ -1290,6 +1295,9 @@ mz_bool mz_zip_writer_add_read_buf_callback(mz_zip_archive *pZip, const char *pA /* Adds the contents of a disk file to an archive. This function also records the disk file's modified time into the archive. */ /* level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION. */ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags); +// BBS: support storage path with unicode path extra +mz_bool mz_zip_writer_add_file_ex(mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, + const char *user_extra_data, mz_uint user_extra_data_len, const char *user_extra_data_central, mz_uint user_extra_data_central_len); /* Like mz_zip_writer_add_file(), except the file data is read from the specified FILE stream. */ mz_bool mz_zip_writer_add_cfile(mz_zip_archive *pZip, const char *pArchive_name, MZ_FILE *pSrc_file, mz_uint64 size_to_add, diff --git a/src/nlohmann/adl_serializer.hpp b/src/nlohmann/adl_serializer.hpp new file mode 100644 index 00000000000..f967612db20 --- /dev/null +++ b/src/nlohmann/adl_serializer.hpp @@ -0,0 +1,73 @@ +#pragma once + +#include +#include + +#include +#include +#include +#include + +namespace nlohmann +{ + +template +struct adl_serializer +{ + /*! + @brief convert a JSON value to any value type + + This function is usually called by the `get()` function of the + @ref basic_json class (either explicit or via conversion operators). + + @note This function is chosen for default-constructible value types. + + @param[in] j JSON value to read from + @param[in,out] val value to write to + */ + template + static auto from_json(BasicJsonType && j, TargetType& val) noexcept( + noexcept(::nlohmann::from_json(std::forward(j), val))) + -> decltype(::nlohmann::from_json(std::forward(j), val), void()) + { + ::nlohmann::from_json(std::forward(j), val); + } + + /*! + @brief convert a JSON value to any value type + + This function is usually called by the `get()` function of the + @ref basic_json class (either explicit or via conversion operators). + + @note This function is chosen for value types which are not default-constructible. + + @param[in] j JSON value to read from + + @return copy of the JSON value, converted to @a ValueType + */ + template + static auto from_json(BasicJsonType && j) noexcept( + noexcept(::nlohmann::from_json(std::forward(j), detail::identity_tag {}))) + -> decltype(::nlohmann::from_json(std::forward(j), detail::identity_tag {})) + { + return ::nlohmann::from_json(std::forward(j), detail::identity_tag {}); + } + + /*! + @brief convert any value type to a JSON value + + This function is usually called by the constructors of the @ref basic_json + class. + + @param[in,out] j JSON value to write to + @param[in] val value to read from + */ + template + static auto to_json(BasicJsonType& j, TargetType && val) noexcept( + noexcept(::nlohmann::to_json(j, std::forward(val)))) + -> decltype(::nlohmann::to_json(j, std::forward(val)), void()) + { + ::nlohmann::to_json(j, std::forward(val)); + } +}; +} // namespace nlohmann diff --git a/src/nlohmann/byte_container_with_subtype.hpp b/src/nlohmann/byte_container_with_subtype.hpp new file mode 100644 index 00000000000..4086e0834d2 --- /dev/null +++ b/src/nlohmann/byte_container_with_subtype.hpp @@ -0,0 +1,169 @@ +#pragma once + +#include // uint8_t, uint64_t +#include // tie +#include // move + +namespace nlohmann +{ + +/*! +@brief an internal type for a backed binary type + +This type extends the template parameter @a BinaryType provided to `basic_json` +with a subtype used by BSON and MessagePack. This type exists so that the user +does not have to specify a type themselves with a specific naming scheme in +order to override the binary type. + +@tparam BinaryType container to store bytes (`std::vector` by + default) + +@since version 3.8.0; changed type of subtypes to std::uint64_t in 3.10.0. +*/ +template +class byte_container_with_subtype : public BinaryType +{ + public: + /// the type of the underlying container + using container_type = BinaryType; + /// the type of the subtype + using subtype_type = std::uint64_t; + + byte_container_with_subtype() noexcept(noexcept(container_type())) + : container_type() + {} + + byte_container_with_subtype(const container_type& b) noexcept(noexcept(container_type(b))) + : container_type(b) + {} + + byte_container_with_subtype(container_type&& b) noexcept(noexcept(container_type(std::move(b)))) + : container_type(std::move(b)) + {} + + byte_container_with_subtype(const container_type& b, subtype_type subtype_) noexcept(noexcept(container_type(b))) + : container_type(b) + , m_subtype(subtype_) + , m_has_subtype(true) + {} + + byte_container_with_subtype(container_type&& b, subtype_type subtype_) noexcept(noexcept(container_type(std::move(b)))) + : container_type(std::move(b)) + , m_subtype(subtype_) + , m_has_subtype(true) + {} + + bool operator==(const byte_container_with_subtype& rhs) const + { + return std::tie(static_cast(*this), m_subtype, m_has_subtype) == + std::tie(static_cast(rhs), rhs.m_subtype, rhs.m_has_subtype); + } + + bool operator!=(const byte_container_with_subtype& rhs) const + { + return !(rhs == *this); + } + + /*! + @brief sets the binary subtype + + Sets the binary subtype of the value, also flags a binary JSON value as + having a subtype, which has implications for serialization. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @sa see @ref subtype() -- return the binary subtype + @sa see @ref clear_subtype() -- clears the binary subtype + @sa see @ref has_subtype() -- returns whether or not the binary value has a + subtype + + @since version 3.8.0 + */ + void set_subtype(subtype_type subtype_) noexcept + { + m_subtype = subtype_; + m_has_subtype = true; + } + + /*! + @brief return the binary subtype + + Returns the numerical subtype of the value if it has a subtype. If it does + not have a subtype, this function will return subtype_type(-1) as a sentinel + value. + + @return the numerical subtype of the binary value + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @sa see @ref set_subtype() -- sets the binary subtype + @sa see @ref clear_subtype() -- clears the binary subtype + @sa see @ref has_subtype() -- returns whether or not the binary value has a + subtype + + @since version 3.8.0; fixed return value to properly return + subtype_type(-1) as documented in version 3.10.0 + */ + constexpr subtype_type subtype() const noexcept + { + return m_has_subtype ? m_subtype : subtype_type(-1); + } + + /*! + @brief return whether the value has a subtype + + @return whether the value has a subtype + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @sa see @ref subtype() -- return the binary subtype + @sa see @ref set_subtype() -- sets the binary subtype + @sa see @ref clear_subtype() -- clears the binary subtype + + @since version 3.8.0 + */ + constexpr bool has_subtype() const noexcept + { + return m_has_subtype; + } + + /*! + @brief clears the binary subtype + + Clears the binary subtype and flags the value as not having a subtype, which + has implications for serialization; for instance MessagePack will prefer the + bin family over the ext family. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @sa see @ref subtype() -- return the binary subtype + @sa see @ref set_subtype() -- sets the binary subtype + @sa see @ref has_subtype() -- returns whether or not the binary value has a + subtype + + @since version 3.8.0 + */ + void clear_subtype() noexcept + { + m_subtype = 0; + m_has_subtype = false; + } + + private: + subtype_type m_subtype = 0; + bool m_has_subtype = false; +}; + +} // namespace nlohmann diff --git a/src/nlohmann/detail/conversions/from_json.hpp b/src/nlohmann/detail/conversions/from_json.hpp new file mode 100644 index 00000000000..acf5aee096e --- /dev/null +++ b/src/nlohmann/detail/conversions/from_json.hpp @@ -0,0 +1,482 @@ +#pragma once + +#include // transform +#include // array +#include // forward_list +#include // inserter, front_inserter, end +#include // map +#include // string +#include // tuple, make_tuple +#include // is_arithmetic, is_same, is_enum, underlying_type, is_convertible +#include // unordered_map +#include // pair, declval +#include // valarray + +#include +#include +#include +#include +#include +#include + +// #ifdef JSON_HAS_CPP_17 + // #include +// #endif + +namespace nlohmann +{ +namespace detail +{ +template +void from_json(const BasicJsonType& j, typename std::nullptr_t& n) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_null())) + { + JSON_THROW(type_error::create(302, "type must be null, but is " + std::string(j.type_name()), j)); + } + n = nullptr; +} + +// overloads for basic_json template parameters +template < typename BasicJsonType, typename ArithmeticType, + enable_if_t < std::is_arithmetic::value&& + !std::is_same::value, + int > = 0 > +void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val) +{ + switch (static_cast(j)) + { + case value_t::number_unsigned: + { + val = static_cast(*j.template get_ptr()); + break; + } + case value_t::number_integer: + { + val = static_cast(*j.template get_ptr()); + break; + } + case value_t::number_float: + { + val = static_cast(*j.template get_ptr()); + break; + } + + case value_t::null: + case value_t::object: + case value_t::array: + case value_t::string: + case value_t::boolean: + case value_t::binary: + case value_t::discarded: + default: + JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name()), j)); + } +} + +template +void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_boolean())) + { + JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(j.type_name()), j)); + } + b = *j.template get_ptr(); +} + +template +void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_string())) + { + JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()), j)); + } + s = *j.template get_ptr(); +} + +template < + typename BasicJsonType, typename ConstructibleStringType, + enable_if_t < + is_constructible_string_type::value&& + !std::is_same::value, + int > = 0 > +void from_json(const BasicJsonType& j, ConstructibleStringType& s) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_string())) + { + JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()), j)); + } + + s = *j.template get_ptr(); +} + +template +void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val) +{ + get_arithmetic_value(j, val); +} + +template +void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val) +{ + get_arithmetic_value(j, val); +} + +template +void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val) +{ + get_arithmetic_value(j, val); +} + +template::value, int> = 0> +void from_json(const BasicJsonType& j, EnumType& e) +{ + typename std::underlying_type::type val; + get_arithmetic_value(j, val); + e = static_cast(val); +} + +// forward_list doesn't have an insert method +template::value, int> = 0> +void from_json(const BasicJsonType& j, std::forward_list& l) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_array())) + { + JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j)); + } + l.clear(); + std::transform(j.rbegin(), j.rend(), + std::front_inserter(l), [](const BasicJsonType & i) + { + return i.template get(); + }); +} + +// valarray doesn't have an insert method +template::value, int> = 0> +void from_json(const BasicJsonType& j, std::valarray& l) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_array())) + { + JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j)); + } + l.resize(j.size()); + std::transform(j.begin(), j.end(), std::begin(l), + [](const BasicJsonType & elem) + { + return elem.template get(); + }); +} + +template +auto from_json(const BasicJsonType& j, T (&arr)[N]) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) +-> decltype(j.template get(), void()) +{ + for (std::size_t i = 0; i < N; ++i) + { + arr[i] = j.at(i).template get(); + } +} + +template +void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/) +{ + arr = *j.template get_ptr(); +} + +template +auto from_json_array_impl(const BasicJsonType& j, std::array& arr, + priority_tag<2> /*unused*/) +-> decltype(j.template get(), void()) +{ + for (std::size_t i = 0; i < N; ++i) + { + arr[i] = j.at(i).template get(); + } +} + +template::value, + int> = 0> +auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/) +-> decltype( + arr.reserve(std::declval()), + j.template get(), + void()) +{ + using std::end; + + ConstructibleArrayType ret; + ret.reserve(j.size()); + std::transform(j.begin(), j.end(), + std::inserter(ret, end(ret)), [](const BasicJsonType & i) + { + // get() returns *this, this won't call a from_json + // method when value_type is BasicJsonType + return i.template get(); + }); + arr = std::move(ret); +} + +template::value, + int> = 0> +void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, + priority_tag<0> /*unused*/) +{ + using std::end; + + ConstructibleArrayType ret; + std::transform( + j.begin(), j.end(), std::inserter(ret, end(ret)), + [](const BasicJsonType & i) + { + // get() returns *this, this won't call a from_json + // method when value_type is BasicJsonType + return i.template get(); + }); + arr = std::move(ret); +} + +template < typename BasicJsonType, typename ConstructibleArrayType, + enable_if_t < + is_constructible_array_type::value&& + !is_constructible_object_type::value&& + !is_constructible_string_type::value&& + !std::is_same::value&& + !is_basic_json::value, + int > = 0 > +auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr) +-> decltype(from_json_array_impl(j, arr, priority_tag<3> {}), +j.template get(), +void()) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_array())) + { + JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j)); + } + + from_json_array_impl(j, arr, priority_tag<3> {}); +} + +template < typename BasicJsonType, typename T, std::size_t... Idx > +std::array from_json_inplace_array_impl(BasicJsonType&& j, + identity_tag> /*unused*/, index_sequence /*unused*/) +{ + return { { std::forward(j).at(Idx).template get()... } }; +} + +template < typename BasicJsonType, typename T, std::size_t N > +auto from_json(BasicJsonType&& j, identity_tag> tag) +-> decltype(from_json_inplace_array_impl(std::forward(j), tag, make_index_sequence {})) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_array())) + { + JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j)); + } + + return from_json_inplace_array_impl(std::forward(j), tag, make_index_sequence {}); +} + +template +void from_json(const BasicJsonType& j, typename BasicJsonType::binary_t& bin) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_binary())) + { + JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(j.type_name()), j)); + } + + bin = *j.template get_ptr(); +} + +template::value, int> = 0> +void from_json(const BasicJsonType& j, ConstructibleObjectType& obj) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_object())) + { + JSON_THROW(type_error::create(302, "type must be object, but is " + std::string(j.type_name()), j)); + } + + ConstructibleObjectType ret; + const auto* inner_object = j.template get_ptr(); + using value_type = typename ConstructibleObjectType::value_type; + std::transform( + inner_object->begin(), inner_object->end(), + std::inserter(ret, ret.begin()), + [](typename BasicJsonType::object_t::value_type const & p) + { + return value_type(p.first, p.second.template get()); + }); + obj = std::move(ret); +} + +// overload for arithmetic types, not chosen for basic_json template arguments +// (BooleanType, etc..); note: Is it really necessary to provide explicit +// overloads for boolean_t etc. in case of a custom BooleanType which is not +// an arithmetic type? +template < typename BasicJsonType, typename ArithmeticType, + enable_if_t < + std::is_arithmetic::value&& + !std::is_same::value&& + !std::is_same::value&& + !std::is_same::value&& + !std::is_same::value, + int > = 0 > +void from_json(const BasicJsonType& j, ArithmeticType& val) +{ + switch (static_cast(j)) + { + case value_t::number_unsigned: + { + val = static_cast(*j.template get_ptr()); + break; + } + case value_t::number_integer: + { + val = static_cast(*j.template get_ptr()); + break; + } + case value_t::number_float: + { + val = static_cast(*j.template get_ptr()); + break; + } + case value_t::boolean: + { + val = static_cast(*j.template get_ptr()); + break; + } + + case value_t::null: + case value_t::object: + case value_t::array: + case value_t::string: + case value_t::binary: + case value_t::discarded: + default: + JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name()), j)); + } +} + +template +std::tuple from_json_tuple_impl_base(BasicJsonType&& j, index_sequence /*unused*/) +{ + return std::make_tuple(std::forward(j).at(Idx).template get()...); +} + +template < typename BasicJsonType, class A1, class A2 > +std::pair from_json_tuple_impl(BasicJsonType&& j, identity_tag> /*unused*/, priority_tag<0> /*unused*/) +{ + return {std::forward(j).at(0).template get(), + std::forward(j).at(1).template get()}; +} + +template +void from_json_tuple_impl(BasicJsonType&& j, std::pair& p, priority_tag<1> /*unused*/) +{ + p = from_json_tuple_impl(std::forward(j), identity_tag> {}, priority_tag<0> {}); +} + +template +std::tuple from_json_tuple_impl(BasicJsonType&& j, identity_tag> /*unused*/, priority_tag<2> /*unused*/) +{ + return from_json_tuple_impl_base(std::forward(j), index_sequence_for {}); +} + +template +void from_json_tuple_impl(BasicJsonType&& j, std::tuple& t, priority_tag<3> /*unused*/) +{ + t = from_json_tuple_impl_base(std::forward(j), index_sequence_for {}); +} + +template +auto from_json(BasicJsonType&& j, TupleRelated&& t) +-> decltype(from_json_tuple_impl(std::forward(j), std::forward(t), priority_tag<3> {})) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_array())) + { + JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j)); + } + + return from_json_tuple_impl(std::forward(j), std::forward(t), priority_tag<3> {}); +} + +template < typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator, + typename = enable_if_t < !std::is_constructible < + typename BasicJsonType::string_t, Key >::value >> +void from_json(const BasicJsonType& j, std::map& m) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_array())) + { + JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j)); + } + m.clear(); + for (const auto& p : j) + { + if (JSON_HEDLEY_UNLIKELY(!p.is_array())) + { + JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name()), j)); + } + m.emplace(p.at(0).template get(), p.at(1).template get()); + } +} + +template < typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator, + typename = enable_if_t < !std::is_constructible < + typename BasicJsonType::string_t, Key >::value >> +void from_json(const BasicJsonType& j, std::unordered_map& m) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_array())) + { + JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j)); + } + m.clear(); + for (const auto& p : j) + { + if (JSON_HEDLEY_UNLIKELY(!p.is_array())) + { + JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name()), j)); + } + m.emplace(p.at(0).template get(), p.at(1).template get()); + } +} + +#ifdef JSON_HAS_CPP_17 +template +void from_json(const BasicJsonType& j, std_path& p) +{ + if (JSON_HEDLEY_UNLIKELY(!j.is_string())) + { + JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()), j)); + } + p = *j.template get_ptr(); +} +#endif + +struct from_json_fn +{ + template + auto operator()(const BasicJsonType& j, T&& val) const + noexcept(noexcept(from_json(j, std::forward(val)))) + -> decltype(from_json(j, std::forward(val))) + { + return from_json(j, std::forward(val)); + } +}; +} // namespace detail + +/// namespace to hold default `from_json` function +/// to see why this is required: +/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html +namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces) +{ +constexpr const auto& from_json = detail::static_const::value; // NOLINT(misc-definitions-in-headers) +} // namespace +} // namespace nlohmann diff --git a/src/nlohmann/detail/conversions/to_chars.hpp b/src/nlohmann/detail/conversions/to_chars.hpp new file mode 100644 index 00000000000..17289481df5 --- /dev/null +++ b/src/nlohmann/detail/conversions/to_chars.hpp @@ -0,0 +1,1110 @@ +#pragma once + +#include // array +#include // signbit, isfinite +#include // intN_t, uintN_t +#include // memcpy, memmove +#include // numeric_limits +#include // conditional + +#include + +namespace nlohmann +{ +namespace detail +{ + +/*! +@brief implements the Grisu2 algorithm for binary to decimal floating-point +conversion. + +This implementation is a slightly modified version of the reference +implementation which may be obtained from +http://florian.loitsch.com/publications (bench.tar.gz). + +The code is distributed under the MIT license, Copyright (c) 2009 Florian Loitsch. + +For a detailed description of the algorithm see: + +[1] Loitsch, "Printing Floating-Point Numbers Quickly and Accurately with + Integers", Proceedings of the ACM SIGPLAN 2010 Conference on Programming + Language Design and Implementation, PLDI 2010 +[2] Burger, Dybvig, "Printing Floating-Point Numbers Quickly and Accurately", + Proceedings of the ACM SIGPLAN 1996 Conference on Programming Language + Design and Implementation, PLDI 1996 +*/ +namespace dtoa_impl +{ + +template +Target reinterpret_bits(const Source source) +{ + static_assert(sizeof(Target) == sizeof(Source), "size mismatch"); + + Target target; + std::memcpy(&target, &source, sizeof(Source)); + return target; +} + +struct diyfp // f * 2^e +{ + static constexpr int kPrecision = 64; // = q + + std::uint64_t f = 0; + int e = 0; + + constexpr diyfp(std::uint64_t f_, int e_) noexcept : f(f_), e(e_) {} + + /*! + @brief returns x - y + @pre x.e == y.e and x.f >= y.f + */ + static diyfp sub(const diyfp& x, const diyfp& y) noexcept + { + JSON_ASSERT(x.e == y.e); + JSON_ASSERT(x.f >= y.f); + + return {x.f - y.f, x.e}; + } + + /*! + @brief returns x * y + @note The result is rounded. (Only the upper q bits are returned.) + */ + static diyfp mul(const diyfp& x, const diyfp& y) noexcept + { + static_assert(kPrecision == 64, "internal error"); + + // Computes: + // f = round((x.f * y.f) / 2^q) + // e = x.e + y.e + q + + // Emulate the 64-bit * 64-bit multiplication: + // + // p = u * v + // = (u_lo + 2^32 u_hi) (v_lo + 2^32 v_hi) + // = (u_lo v_lo ) + 2^32 ((u_lo v_hi ) + (u_hi v_lo )) + 2^64 (u_hi v_hi ) + // = (p0 ) + 2^32 ((p1 ) + (p2 )) + 2^64 (p3 ) + // = (p0_lo + 2^32 p0_hi) + 2^32 ((p1_lo + 2^32 p1_hi) + (p2_lo + 2^32 p2_hi)) + 2^64 (p3 ) + // = (p0_lo ) + 2^32 (p0_hi + p1_lo + p2_lo ) + 2^64 (p1_hi + p2_hi + p3) + // = (p0_lo ) + 2^32 (Q ) + 2^64 (H ) + // = (p0_lo ) + 2^32 (Q_lo + 2^32 Q_hi ) + 2^64 (H ) + // + // (Since Q might be larger than 2^32 - 1) + // + // = (p0_lo + 2^32 Q_lo) + 2^64 (Q_hi + H) + // + // (Q_hi + H does not overflow a 64-bit int) + // + // = p_lo + 2^64 p_hi + + const std::uint64_t u_lo = x.f & 0xFFFFFFFFu; + const std::uint64_t u_hi = x.f >> 32u; + const std::uint64_t v_lo = y.f & 0xFFFFFFFFu; + const std::uint64_t v_hi = y.f >> 32u; + + const std::uint64_t p0 = u_lo * v_lo; + const std::uint64_t p1 = u_lo * v_hi; + const std::uint64_t p2 = u_hi * v_lo; + const std::uint64_t p3 = u_hi * v_hi; + + const std::uint64_t p0_hi = p0 >> 32u; + const std::uint64_t p1_lo = p1 & 0xFFFFFFFFu; + const std::uint64_t p1_hi = p1 >> 32u; + const std::uint64_t p2_lo = p2 & 0xFFFFFFFFu; + const std::uint64_t p2_hi = p2 >> 32u; + + std::uint64_t Q = p0_hi + p1_lo + p2_lo; + + // The full product might now be computed as + // + // p_hi = p3 + p2_hi + p1_hi + (Q >> 32) + // p_lo = p0_lo + (Q << 32) + // + // But in this particular case here, the full p_lo is not required. + // Effectively we only need to add the highest bit in p_lo to p_hi (and + // Q_hi + 1 does not overflow). + + Q += std::uint64_t{1} << (64u - 32u - 1u); // round, ties up + + const std::uint64_t h = p3 + p2_hi + p1_hi + (Q >> 32u); + + return {h, x.e + y.e + 64}; + } + + /*! + @brief normalize x such that the significand is >= 2^(q-1) + @pre x.f != 0 + */ + static diyfp normalize(diyfp x) noexcept + { + JSON_ASSERT(x.f != 0); + + while ((x.f >> 63u) == 0) + { + x.f <<= 1u; + x.e--; + } + + return x; + } + + /*! + @brief normalize x such that the result has the exponent E + @pre e >= x.e and the upper e - x.e bits of x.f must be zero. + */ + static diyfp normalize_to(const diyfp& x, const int target_exponent) noexcept + { + const int delta = x.e - target_exponent; + + JSON_ASSERT(delta >= 0); + JSON_ASSERT(((x.f << delta) >> delta) == x.f); + + return {x.f << delta, target_exponent}; + } +}; + +struct boundaries +{ + diyfp w; + diyfp minus; + diyfp plus; +}; + +/*! +Compute the (normalized) diyfp representing the input number 'value' and its +boundaries. + +@pre value must be finite and positive +*/ +template +boundaries compute_boundaries(FloatType value) +{ + JSON_ASSERT(std::isfinite(value)); + JSON_ASSERT(value > 0); + + // Convert the IEEE representation into a diyfp. + // + // If v is denormal: + // value = 0.F * 2^(1 - bias) = ( F) * 2^(1 - bias - (p-1)) + // If v is normalized: + // value = 1.F * 2^(E - bias) = (2^(p-1) + F) * 2^(E - bias - (p-1)) + + static_assert(std::numeric_limits::is_iec559, + "internal error: dtoa_short requires an IEEE-754 floating-point implementation"); + + constexpr int kPrecision = std::numeric_limits::digits; // = p (includes the hidden bit) + constexpr int kBias = std::numeric_limits::max_exponent - 1 + (kPrecision - 1); + constexpr int kMinExp = 1 - kBias; + constexpr std::uint64_t kHiddenBit = std::uint64_t{1} << (kPrecision - 1); // = 2^(p-1) + + using bits_type = typename std::conditional::type; + + const auto bits = static_cast(reinterpret_bits(value)); + const std::uint64_t E = bits >> (kPrecision - 1); + const std::uint64_t F = bits & (kHiddenBit - 1); + + const bool is_denormal = E == 0; + const diyfp v = is_denormal + ? diyfp(F, kMinExp) + : diyfp(F + kHiddenBit, static_cast(E) - kBias); + + // Compute the boundaries m- and m+ of the floating-point value + // v = f * 2^e. + // + // Determine v- and v+, the floating-point predecessor and successor if v, + // respectively. + // + // v- = v - 2^e if f != 2^(p-1) or e == e_min (A) + // = v - 2^(e-1) if f == 2^(p-1) and e > e_min (B) + // + // v+ = v + 2^e + // + // Let m- = (v- + v) / 2 and m+ = (v + v+) / 2. All real numbers _strictly_ + // between m- and m+ round to v, regardless of how the input rounding + // algorithm breaks ties. + // + // ---+-------------+-------------+-------------+-------------+--- (A) + // v- m- v m+ v+ + // + // -----------------+------+------+-------------+-------------+--- (B) + // v- m- v m+ v+ + + const bool lower_boundary_is_closer = F == 0 && E > 1; + const diyfp m_plus = diyfp(2 * v.f + 1, v.e - 1); + const diyfp m_minus = lower_boundary_is_closer + ? diyfp(4 * v.f - 1, v.e - 2) // (B) + : diyfp(2 * v.f - 1, v.e - 1); // (A) + + // Determine the normalized w+ = m+. + const diyfp w_plus = diyfp::normalize(m_plus); + + // Determine w- = m- such that e_(w-) = e_(w+). + const diyfp w_minus = diyfp::normalize_to(m_minus, w_plus.e); + + return {diyfp::normalize(v), w_minus, w_plus}; +} + +// Given normalized diyfp w, Grisu needs to find a (normalized) cached +// power-of-ten c, such that the exponent of the product c * w = f * 2^e lies +// within a certain range [alpha, gamma] (Definition 3.2 from [1]) +// +// alpha <= e = e_c + e_w + q <= gamma +// +// or +// +// f_c * f_w * 2^alpha <= f_c 2^(e_c) * f_w 2^(e_w) * 2^q +// <= f_c * f_w * 2^gamma +// +// Since c and w are normalized, i.e. 2^(q-1) <= f < 2^q, this implies +// +// 2^(q-1) * 2^(q-1) * 2^alpha <= c * w * 2^q < 2^q * 2^q * 2^gamma +// +// or +// +// 2^(q - 2 + alpha) <= c * w < 2^(q + gamma) +// +// The choice of (alpha,gamma) determines the size of the table and the form of +// the digit generation procedure. Using (alpha,gamma)=(-60,-32) works out well +// in practice: +// +// The idea is to cut the number c * w = f * 2^e into two parts, which can be +// processed independently: An integral part p1, and a fractional part p2: +// +// f * 2^e = ( (f div 2^-e) * 2^-e + (f mod 2^-e) ) * 2^e +// = (f div 2^-e) + (f mod 2^-e) * 2^e +// = p1 + p2 * 2^e +// +// The conversion of p1 into decimal form requires a series of divisions and +// modulos by (a power of) 10. These operations are faster for 32-bit than for +// 64-bit integers, so p1 should ideally fit into a 32-bit integer. This can be +// achieved by choosing +// +// -e >= 32 or e <= -32 := gamma +// +// In order to convert the fractional part +// +// p2 * 2^e = p2 / 2^-e = d[-1] / 10^1 + d[-2] / 10^2 + ... +// +// into decimal form, the fraction is repeatedly multiplied by 10 and the digits +// d[-i] are extracted in order: +// +// (10 * p2) div 2^-e = d[-1] +// (10 * p2) mod 2^-e = d[-2] / 10^1 + ... +// +// The multiplication by 10 must not overflow. It is sufficient to choose +// +// 10 * p2 < 16 * p2 = 2^4 * p2 <= 2^64. +// +// Since p2 = f mod 2^-e < 2^-e, +// +// -e <= 60 or e >= -60 := alpha + +constexpr int kAlpha = -60; +constexpr int kGamma = -32; + +struct cached_power // c = f * 2^e ~= 10^k +{ + std::uint64_t f; + int e; + int k; +}; + +/*! +For a normalized diyfp w = f * 2^e, this function returns a (normalized) cached +power-of-ten c = f_c * 2^e_c, such that the exponent of the product w * c +satisfies (Definition 3.2 from [1]) + + alpha <= e_c + e + q <= gamma. +*/ +inline cached_power get_cached_power_for_binary_exponent(int e) +{ + // Now + // + // alpha <= e_c + e + q <= gamma (1) + // ==> f_c * 2^alpha <= c * 2^e * 2^q + // + // and since the c's are normalized, 2^(q-1) <= f_c, + // + // ==> 2^(q - 1 + alpha) <= c * 2^(e + q) + // ==> 2^(alpha - e - 1) <= c + // + // If c were an exact power of ten, i.e. c = 10^k, one may determine k as + // + // k = ceil( log_10( 2^(alpha - e - 1) ) ) + // = ceil( (alpha - e - 1) * log_10(2) ) + // + // From the paper: + // "In theory the result of the procedure could be wrong since c is rounded, + // and the computation itself is approximated [...]. In practice, however, + // this simple function is sufficient." + // + // For IEEE double precision floating-point numbers converted into + // normalized diyfp's w = f * 2^e, with q = 64, + // + // e >= -1022 (min IEEE exponent) + // -52 (p - 1) + // -52 (p - 1, possibly normalize denormal IEEE numbers) + // -11 (normalize the diyfp) + // = -1137 + // + // and + // + // e <= +1023 (max IEEE exponent) + // -52 (p - 1) + // -11 (normalize the diyfp) + // = 960 + // + // This binary exponent range [-1137,960] results in a decimal exponent + // range [-307,324]. One does not need to store a cached power for each + // k in this range. For each such k it suffices to find a cached power + // such that the exponent of the product lies in [alpha,gamma]. + // This implies that the difference of the decimal exponents of adjacent + // table entries must be less than or equal to + // + // floor( (gamma - alpha) * log_10(2) ) = 8. + // + // (A smaller distance gamma-alpha would require a larger table.) + + // NB: + // Actually this function returns c, such that -60 <= e_c + e + 64 <= -34. + + constexpr int kCachedPowersMinDecExp = -300; + constexpr int kCachedPowersDecStep = 8; + + static constexpr std::array kCachedPowers = + { + { + { 0xAB70FE17C79AC6CA, -1060, -300 }, + { 0xFF77B1FCBEBCDC4F, -1034, -292 }, + { 0xBE5691EF416BD60C, -1007, -284 }, + { 0x8DD01FAD907FFC3C, -980, -276 }, + { 0xD3515C2831559A83, -954, -268 }, + { 0x9D71AC8FADA6C9B5, -927, -260 }, + { 0xEA9C227723EE8BCB, -901, -252 }, + { 0xAECC49914078536D, -874, -244 }, + { 0x823C12795DB6CE57, -847, -236 }, + { 0xC21094364DFB5637, -821, -228 }, + { 0x9096EA6F3848984F, -794, -220 }, + { 0xD77485CB25823AC7, -768, -212 }, + { 0xA086CFCD97BF97F4, -741, -204 }, + { 0xEF340A98172AACE5, -715, -196 }, + { 0xB23867FB2A35B28E, -688, -188 }, + { 0x84C8D4DFD2C63F3B, -661, -180 }, + { 0xC5DD44271AD3CDBA, -635, -172 }, + { 0x936B9FCEBB25C996, -608, -164 }, + { 0xDBAC6C247D62A584, -582, -156 }, + { 0xA3AB66580D5FDAF6, -555, -148 }, + { 0xF3E2F893DEC3F126, -529, -140 }, + { 0xB5B5ADA8AAFF80B8, -502, -132 }, + { 0x87625F056C7C4A8B, -475, -124 }, + { 0xC9BCFF6034C13053, -449, -116 }, + { 0x964E858C91BA2655, -422, -108 }, + { 0xDFF9772470297EBD, -396, -100 }, + { 0xA6DFBD9FB8E5B88F, -369, -92 }, + { 0xF8A95FCF88747D94, -343, -84 }, + { 0xB94470938FA89BCF, -316, -76 }, + { 0x8A08F0F8BF0F156B, -289, -68 }, + { 0xCDB02555653131B6, -263, -60 }, + { 0x993FE2C6D07B7FAC, -236, -52 }, + { 0xE45C10C42A2B3B06, -210, -44 }, + { 0xAA242499697392D3, -183, -36 }, + { 0xFD87B5F28300CA0E, -157, -28 }, + { 0xBCE5086492111AEB, -130, -20 }, + { 0x8CBCCC096F5088CC, -103, -12 }, + { 0xD1B71758E219652C, -77, -4 }, + { 0x9C40000000000000, -50, 4 }, + { 0xE8D4A51000000000, -24, 12 }, + { 0xAD78EBC5AC620000, 3, 20 }, + { 0x813F3978F8940984, 30, 28 }, + { 0xC097CE7BC90715B3, 56, 36 }, + { 0x8F7E32CE7BEA5C70, 83, 44 }, + { 0xD5D238A4ABE98068, 109, 52 }, + { 0x9F4F2726179A2245, 136, 60 }, + { 0xED63A231D4C4FB27, 162, 68 }, + { 0xB0DE65388CC8ADA8, 189, 76 }, + { 0x83C7088E1AAB65DB, 216, 84 }, + { 0xC45D1DF942711D9A, 242, 92 }, + { 0x924D692CA61BE758, 269, 100 }, + { 0xDA01EE641A708DEA, 295, 108 }, + { 0xA26DA3999AEF774A, 322, 116 }, + { 0xF209787BB47D6B85, 348, 124 }, + { 0xB454E4A179DD1877, 375, 132 }, + { 0x865B86925B9BC5C2, 402, 140 }, + { 0xC83553C5C8965D3D, 428, 148 }, + { 0x952AB45CFA97A0B3, 455, 156 }, + { 0xDE469FBD99A05FE3, 481, 164 }, + { 0xA59BC234DB398C25, 508, 172 }, + { 0xF6C69A72A3989F5C, 534, 180 }, + { 0xB7DCBF5354E9BECE, 561, 188 }, + { 0x88FCF317F22241E2, 588, 196 }, + { 0xCC20CE9BD35C78A5, 614, 204 }, + { 0x98165AF37B2153DF, 641, 212 }, + { 0xE2A0B5DC971F303A, 667, 220 }, + { 0xA8D9D1535CE3B396, 694, 228 }, + { 0xFB9B7CD9A4A7443C, 720, 236 }, + { 0xBB764C4CA7A44410, 747, 244 }, + { 0x8BAB8EEFB6409C1A, 774, 252 }, + { 0xD01FEF10A657842C, 800, 260 }, + { 0x9B10A4E5E9913129, 827, 268 }, + { 0xE7109BFBA19C0C9D, 853, 276 }, + { 0xAC2820D9623BF429, 880, 284 }, + { 0x80444B5E7AA7CF85, 907, 292 }, + { 0xBF21E44003ACDD2D, 933, 300 }, + { 0x8E679C2F5E44FF8F, 960, 308 }, + { 0xD433179D9C8CB841, 986, 316 }, + { 0x9E19DB92B4E31BA9, 1013, 324 }, + } + }; + + // This computation gives exactly the same results for k as + // k = ceil((kAlpha - e - 1) * 0.30102999566398114) + // for |e| <= 1500, but doesn't require floating-point operations. + // NB: log_10(2) ~= 78913 / 2^18 + JSON_ASSERT(e >= -1500); + JSON_ASSERT(e <= 1500); + const int f = kAlpha - e - 1; + const int k = (f * 78913) / (1 << 18) + static_cast(f > 0); + + const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep; + JSON_ASSERT(index >= 0); + JSON_ASSERT(static_cast(index) < kCachedPowers.size()); + + const cached_power cached = kCachedPowers[static_cast(index)]; + JSON_ASSERT(kAlpha <= cached.e + e + 64); + JSON_ASSERT(kGamma >= cached.e + e + 64); + + return cached; +} + +/*! +For n != 0, returns k, such that pow10 := 10^(k-1) <= n < 10^k. +For n == 0, returns 1 and sets pow10 := 1. +*/ +inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10) +{ + // LCOV_EXCL_START + if (n >= 1000000000) + { + pow10 = 1000000000; + return 10; + } + // LCOV_EXCL_STOP + if (n >= 100000000) + { + pow10 = 100000000; + return 9; + } + if (n >= 10000000) + { + pow10 = 10000000; + return 8; + } + if (n >= 1000000) + { + pow10 = 1000000; + return 7; + } + if (n >= 100000) + { + pow10 = 100000; + return 6; + } + if (n >= 10000) + { + pow10 = 10000; + return 5; + } + if (n >= 1000) + { + pow10 = 1000; + return 4; + } + if (n >= 100) + { + pow10 = 100; + return 3; + } + if (n >= 10) + { + pow10 = 10; + return 2; + } + + pow10 = 1; + return 1; +} + +inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t delta, + std::uint64_t rest, std::uint64_t ten_k) +{ + JSON_ASSERT(len >= 1); + JSON_ASSERT(dist <= delta); + JSON_ASSERT(rest <= delta); + JSON_ASSERT(ten_k > 0); + + // <--------------------------- delta ----> + // <---- dist ---------> + // --------------[------------------+-------------------]-------------- + // M- w M+ + // + // ten_k + // <------> + // <---- rest ----> + // --------------[------------------+----+--------------]-------------- + // w V + // = buf * 10^k + // + // ten_k represents a unit-in-the-last-place in the decimal representation + // stored in buf. + // Decrement buf by ten_k while this takes buf closer to w. + + // The tests are written in this order to avoid overflow in unsigned + // integer arithmetic. + + while (rest < dist + && delta - rest >= ten_k + && (rest + ten_k < dist || dist - rest > rest + ten_k - dist)) + { + JSON_ASSERT(buf[len - 1] != '0'); + buf[len - 1]--; + rest += ten_k; + } +} + +/*! +Generates V = buffer * 10^decimal_exponent, such that M- <= V <= M+. +M- and M+ must be normalized and share the same exponent -60 <= e <= -32. +*/ +inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent, + diyfp M_minus, diyfp w, diyfp M_plus) +{ + static_assert(kAlpha >= -60, "internal error"); + static_assert(kGamma <= -32, "internal error"); + + // Generates the digits (and the exponent) of a decimal floating-point + // number V = buffer * 10^decimal_exponent in the range [M-, M+]. The diyfp's + // w, M- and M+ share the same exponent e, which satisfies alpha <= e <= gamma. + // + // <--------------------------- delta ----> + // <---- dist ---------> + // --------------[------------------+-------------------]-------------- + // M- w M+ + // + // Grisu2 generates the digits of M+ from left to right and stops as soon as + // V is in [M-,M+]. + + JSON_ASSERT(M_plus.e >= kAlpha); + JSON_ASSERT(M_plus.e <= kGamma); + + std::uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e) + std::uint64_t dist = diyfp::sub(M_plus, w ).f; // (significand of (M+ - w ), implicit exponent is e) + + // Split M+ = f * 2^e into two parts p1 and p2 (note: e < 0): + // + // M+ = f * 2^e + // = ((f div 2^-e) * 2^-e + (f mod 2^-e)) * 2^e + // = ((p1 ) * 2^-e + (p2 )) * 2^e + // = p1 + p2 * 2^e + + const diyfp one(std::uint64_t{1} << -M_plus.e, M_plus.e); + + auto p1 = static_cast(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.) + std::uint64_t p2 = M_plus.f & (one.f - 1); // p2 = f mod 2^-e + + // 1) + // + // Generate the digits of the integral part p1 = d[n-1]...d[1]d[0] + + JSON_ASSERT(p1 > 0); + + std::uint32_t pow10{}; + const int k = find_largest_pow10(p1, pow10); + + // 10^(k-1) <= p1 < 10^k, pow10 = 10^(k-1) + // + // p1 = (p1 div 10^(k-1)) * 10^(k-1) + (p1 mod 10^(k-1)) + // = (d[k-1] ) * 10^(k-1) + (p1 mod 10^(k-1)) + // + // M+ = p1 + p2 * 2^e + // = d[k-1] * 10^(k-1) + (p1 mod 10^(k-1)) + p2 * 2^e + // = d[k-1] * 10^(k-1) + ((p1 mod 10^(k-1)) * 2^-e + p2) * 2^e + // = d[k-1] * 10^(k-1) + ( rest) * 2^e + // + // Now generate the digits d[n] of p1 from left to right (n = k-1,...,0) + // + // p1 = d[k-1]...d[n] * 10^n + d[n-1]...d[0] + // + // but stop as soon as + // + // rest * 2^e = (d[n-1]...d[0] * 2^-e + p2) * 2^e <= delta * 2^e + + int n = k; + while (n > 0) + { + // Invariants: + // M+ = buffer * 10^n + (p1 + p2 * 2^e) (buffer = 0 for n = k) + // pow10 = 10^(n-1) <= p1 < 10^n + // + const std::uint32_t d = p1 / pow10; // d = p1 div 10^(n-1) + const std::uint32_t r = p1 % pow10; // r = p1 mod 10^(n-1) + // + // M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e + // = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e) + // + JSON_ASSERT(d <= 9); + buffer[length++] = static_cast('0' + d); // buffer := buffer * 10 + d + // + // M+ = buffer * 10^(n-1) + (r + p2 * 2^e) + // + p1 = r; + n--; + // + // M+ = buffer * 10^n + (p1 + p2 * 2^e) + // pow10 = 10^n + // + + // Now check if enough digits have been generated. + // Compute + // + // p1 + p2 * 2^e = (p1 * 2^-e + p2) * 2^e = rest * 2^e + // + // Note: + // Since rest and delta share the same exponent e, it suffices to + // compare the significands. + const std::uint64_t rest = (std::uint64_t{p1} << -one.e) + p2; + if (rest <= delta) + { + // V = buffer * 10^n, with M- <= V <= M+. + + decimal_exponent += n; + + // We may now just stop. But instead look if the buffer could be + // decremented to bring V closer to w. + // + // pow10 = 10^n is now 1 ulp in the decimal representation V. + // The rounding procedure works with diyfp's with an implicit + // exponent of e. + // + // 10^n = (10^n * 2^-e) * 2^e = ulp * 2^e + // + const std::uint64_t ten_n = std::uint64_t{pow10} << -one.e; + grisu2_round(buffer, length, dist, delta, rest, ten_n); + + return; + } + + pow10 /= 10; + // + // pow10 = 10^(n-1) <= p1 < 10^n + // Invariants restored. + } + + // 2) + // + // The digits of the integral part have been generated: + // + // M+ = d[k-1]...d[1]d[0] + p2 * 2^e + // = buffer + p2 * 2^e + // + // Now generate the digits of the fractional part p2 * 2^e. + // + // Note: + // No decimal point is generated: the exponent is adjusted instead. + // + // p2 actually represents the fraction + // + // p2 * 2^e + // = p2 / 2^-e + // = d[-1] / 10^1 + d[-2] / 10^2 + ... + // + // Now generate the digits d[-m] of p1 from left to right (m = 1,2,...) + // + // p2 * 2^e = d[-1]d[-2]...d[-m] * 10^-m + // + 10^-m * (d[-m-1] / 10^1 + d[-m-2] / 10^2 + ...) + // + // using + // + // 10^m * p2 = ((10^m * p2) div 2^-e) * 2^-e + ((10^m * p2) mod 2^-e) + // = ( d) * 2^-e + ( r) + // + // or + // 10^m * p2 * 2^e = d + r * 2^e + // + // i.e. + // + // M+ = buffer + p2 * 2^e + // = buffer + 10^-m * (d + r * 2^e) + // = (buffer * 10^m + d) * 10^-m + 10^-m * r * 2^e + // + // and stop as soon as 10^-m * r * 2^e <= delta * 2^e + + JSON_ASSERT(p2 > delta); + + int m = 0; + for (;;) + { + // Invariant: + // M+ = buffer * 10^-m + 10^-m * (d[-m-1] / 10 + d[-m-2] / 10^2 + ...) * 2^e + // = buffer * 10^-m + 10^-m * (p2 ) * 2^e + // = buffer * 10^-m + 10^-m * (1/10 * (10 * p2) ) * 2^e + // = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e + // + JSON_ASSERT(p2 <= (std::numeric_limits::max)() / 10); + p2 *= 10; + const std::uint64_t d = p2 >> -one.e; // d = (10 * p2) div 2^-e + const std::uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e + // + // M+ = buffer * 10^-m + 10^-m * (1/10 * (d * 2^-e + r) * 2^e + // = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e)) + // = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e + // + JSON_ASSERT(d <= 9); + buffer[length++] = static_cast('0' + d); // buffer := buffer * 10 + d + // + // M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e + // + p2 = r; + m++; + // + // M+ = buffer * 10^-m + 10^-m * p2 * 2^e + // Invariant restored. + + // Check if enough digits have been generated. + // + // 10^-m * p2 * 2^e <= delta * 2^e + // p2 * 2^e <= 10^m * delta * 2^e + // p2 <= 10^m * delta + delta *= 10; + dist *= 10; + if (p2 <= delta) + { + break; + } + } + + // V = buffer * 10^-m, with M- <= V <= M+. + + decimal_exponent -= m; + + // 1 ulp in the decimal representation is now 10^-m. + // Since delta and dist are now scaled by 10^m, we need to do the + // same with ulp in order to keep the units in sync. + // + // 10^m * 10^-m = 1 = 2^-e * 2^e = ten_m * 2^e + // + const std::uint64_t ten_m = one.f; + grisu2_round(buffer, length, dist, delta, p2, ten_m); + + // By construction this algorithm generates the shortest possible decimal + // number (Loitsch, Theorem 6.2) which rounds back to w. + // For an input number of precision p, at least + // + // N = 1 + ceil(p * log_10(2)) + // + // decimal digits are sufficient to identify all binary floating-point + // numbers (Matula, "In-and-Out conversions"). + // This implies that the algorithm does not produce more than N decimal + // digits. + // + // N = 17 for p = 53 (IEEE double precision) + // N = 9 for p = 24 (IEEE single precision) +} + +/*! +v = buf * 10^decimal_exponent +len is the length of the buffer (number of decimal digits) +The buffer must be large enough, i.e. >= max_digits10. +*/ +JSON_HEDLEY_NON_NULL(1) +inline void grisu2(char* buf, int& len, int& decimal_exponent, + diyfp m_minus, diyfp v, diyfp m_plus) +{ + JSON_ASSERT(m_plus.e == m_minus.e); + JSON_ASSERT(m_plus.e == v.e); + + // --------(-----------------------+-----------------------)-------- (A) + // m- v m+ + // + // --------------------(-----------+-----------------------)-------- (B) + // m- v m+ + // + // First scale v (and m- and m+) such that the exponent is in the range + // [alpha, gamma]. + + const cached_power cached = get_cached_power_for_binary_exponent(m_plus.e); + + const diyfp c_minus_k(cached.f, cached.e); // = c ~= 10^-k + + // The exponent of the products is = v.e + c_minus_k.e + q and is in the range [alpha,gamma] + const diyfp w = diyfp::mul(v, c_minus_k); + const diyfp w_minus = diyfp::mul(m_minus, c_minus_k); + const diyfp w_plus = diyfp::mul(m_plus, c_minus_k); + + // ----(---+---)---------------(---+---)---------------(---+---)---- + // w- w w+ + // = c*m- = c*v = c*m+ + // + // diyfp::mul rounds its result and c_minus_k is approximated too. w, w- and + // w+ are now off by a small amount. + // In fact: + // + // w - v * 10^k < 1 ulp + // + // To account for this inaccuracy, add resp. subtract 1 ulp. + // + // --------+---[---------------(---+---)---------------]---+-------- + // w- M- w M+ w+ + // + // Now any number in [M-, M+] (bounds included) will round to w when input, + // regardless of how the input rounding algorithm breaks ties. + // + // And digit_gen generates the shortest possible such number in [M-, M+]. + // Note that this does not mean that Grisu2 always generates the shortest + // possible number in the interval (m-, m+). + const diyfp M_minus(w_minus.f + 1, w_minus.e); + const diyfp M_plus (w_plus.f - 1, w_plus.e ); + + decimal_exponent = -cached.k; // = -(-k) = k + + grisu2_digit_gen(buf, len, decimal_exponent, M_minus, w, M_plus); +} + +/*! +v = buf * 10^decimal_exponent +len is the length of the buffer (number of decimal digits) +The buffer must be large enough, i.e. >= max_digits10. +*/ +template +JSON_HEDLEY_NON_NULL(1) +void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value) +{ + static_assert(diyfp::kPrecision >= std::numeric_limits::digits + 3, + "internal error: not enough precision"); + + JSON_ASSERT(std::isfinite(value)); + JSON_ASSERT(value > 0); + + // If the neighbors (and boundaries) of 'value' are always computed for double-precision + // numbers, all float's can be recovered using strtod (and strtof). However, the resulting + // decimal representations are not exactly "short". + // + // The documentation for 'std::to_chars' (https://en.cppreference.com/w/cpp/utility/to_chars) + // says "value is converted to a string as if by std::sprintf in the default ("C") locale" + // and since sprintf promotes float's to double's, I think this is exactly what 'std::to_chars' + // does. + // On the other hand, the documentation for 'std::to_chars' requires that "parsing the + // representation using the corresponding std::from_chars function recovers value exactly". That + // indicates that single precision floating-point numbers should be recovered using + // 'std::strtof'. + // + // NB: If the neighbors are computed for single-precision numbers, there is a single float + // (7.0385307e-26f) which can't be recovered using strtod. The resulting double precision + // value is off by 1 ulp. +#if 0 + const boundaries w = compute_boundaries(static_cast(value)); +#else + const boundaries w = compute_boundaries(value); +#endif + + grisu2(buf, len, decimal_exponent, w.minus, w.w, w.plus); +} + +/*! +@brief appends a decimal representation of e to buf +@return a pointer to the element following the exponent. +@pre -1000 < e < 1000 +*/ +JSON_HEDLEY_NON_NULL(1) +JSON_HEDLEY_RETURNS_NON_NULL +inline char* append_exponent(char* buf, int e) +{ + JSON_ASSERT(e > -1000); + JSON_ASSERT(e < 1000); + + if (e < 0) + { + e = -e; + *buf++ = '-'; + } + else + { + *buf++ = '+'; + } + + auto k = static_cast(e); + if (k < 10) + { + // Always print at least two digits in the exponent. + // This is for compatibility with printf("%g"). + *buf++ = '0'; + *buf++ = static_cast('0' + k); + } + else if (k < 100) + { + *buf++ = static_cast('0' + k / 10); + k %= 10; + *buf++ = static_cast('0' + k); + } + else + { + *buf++ = static_cast('0' + k / 100); + k %= 100; + *buf++ = static_cast('0' + k / 10); + k %= 10; + *buf++ = static_cast('0' + k); + } + + return buf; +} + +/*! +@brief prettify v = buf * 10^decimal_exponent + +If v is in the range [10^min_exp, 10^max_exp) it will be printed in fixed-point +notation. Otherwise it will be printed in exponential notation. + +@pre min_exp < 0 +@pre max_exp > 0 +*/ +JSON_HEDLEY_NON_NULL(1) +JSON_HEDLEY_RETURNS_NON_NULL +inline char* format_buffer(char* buf, int len, int decimal_exponent, + int min_exp, int max_exp) +{ + JSON_ASSERT(min_exp < 0); + JSON_ASSERT(max_exp > 0); + + const int k = len; + const int n = len + decimal_exponent; + + // v = buf * 10^(n-k) + // k is the length of the buffer (number of decimal digits) + // n is the position of the decimal point relative to the start of the buffer. + + if (k <= n && n <= max_exp) + { + // digits[000] + // len <= max_exp + 2 + + std::memset(buf + k, '0', static_cast(n) - static_cast(k)); + // Make it look like a floating-point number (#362, #378) + buf[n + 0] = '.'; + buf[n + 1] = '0'; + return buf + (static_cast(n) + 2); + } + + if (0 < n && n <= max_exp) + { + // dig.its + // len <= max_digits10 + 1 + + JSON_ASSERT(k > n); + + std::memmove(buf + (static_cast(n) + 1), buf + n, static_cast(k) - static_cast(n)); + buf[n] = '.'; + return buf + (static_cast(k) + 1U); + } + + if (min_exp < n && n <= 0) + { + // 0.[000]digits + // len <= 2 + (-min_exp - 1) + max_digits10 + + std::memmove(buf + (2 + static_cast(-n)), buf, static_cast(k)); + buf[0] = '0'; + buf[1] = '.'; + std::memset(buf + 2, '0', static_cast(-n)); + return buf + (2U + static_cast(-n) + static_cast(k)); + } + + if (k == 1) + { + // dE+123 + // len <= 1 + 5 + + buf += 1; + } + else + { + // d.igitsE+123 + // len <= max_digits10 + 1 + 5 + + std::memmove(buf + 2, buf + 1, static_cast(k) - 1); + buf[1] = '.'; + buf += 1 + static_cast(k); + } + + *buf++ = 'e'; + return append_exponent(buf, n - 1); +} + +} // namespace dtoa_impl + +/*! +@brief generates a decimal representation of the floating-point number value in [first, last). + +The format of the resulting decimal representation is similar to printf's %g +format. Returns an iterator pointing past-the-end of the decimal representation. + +@note The input number must be finite, i.e. NaN's and Inf's are not supported. +@note The buffer must be large enough. +@note The result is NOT null-terminated. +*/ +template +JSON_HEDLEY_NON_NULL(1, 2) +JSON_HEDLEY_RETURNS_NON_NULL +char* to_chars(char* first, const char* last, FloatType value) +{ + static_cast(last); // maybe unused - fix warning + JSON_ASSERT(std::isfinite(value)); + + // Use signbit(value) instead of (value < 0) since signbit works for -0. + if (std::signbit(value)) + { + value = -value; + *first++ = '-'; + } + +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wfloat-equal" +#endif + if (value == 0) // +-0 + { + *first++ = '0'; + // Make it look like a floating-point number (#362, #378) + *first++ = '.'; + *first++ = '0'; + return first; + } +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif + + JSON_ASSERT(last - first >= std::numeric_limits::max_digits10); + + // Compute v = buffer * 10^decimal_exponent. + // The decimal digits are stored in the buffer, which needs to be interpreted + // as an unsigned decimal integer. + // len is the length of the buffer, i.e. the number of decimal digits. + int len = 0; + int decimal_exponent = 0; + dtoa_impl::grisu2(first, len, decimal_exponent, value); + + JSON_ASSERT(len <= std::numeric_limits::max_digits10); + + // Format the buffer like printf("%.*g", prec, value) + constexpr int kMinExp = -4; + // Use digits10 here to increase compatibility with version 2. + constexpr int kMaxExp = std::numeric_limits::digits10; + + JSON_ASSERT(last - first >= kMaxExp + 2); + JSON_ASSERT(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits::max_digits10); + JSON_ASSERT(last - first >= std::numeric_limits::max_digits10 + 6); + + return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp); +} + +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/conversions/to_json.hpp b/src/nlohmann/detail/conversions/to_json.hpp new file mode 100644 index 00000000000..71e93e90fd7 --- /dev/null +++ b/src/nlohmann/detail/conversions/to_json.hpp @@ -0,0 +1,420 @@ +#pragma once + +#include // copy +#include // begin, end +#include // string +#include // tuple, get +#include // is_same, is_constructible, is_floating_point, is_enum, underlying_type +#include // move, forward, declval, pair +#include // valarray +#include // vector + +#include +#include +#include +#include +#include + +// #ifdef JSON_HAS_CPP_17 + // #include +// #endif + +namespace nlohmann +{ +namespace detail +{ +////////////////// +// constructors // +////////////////// + +/* + * Note all external_constructor<>::construct functions need to call + * j.m_value.destroy(j.m_type) to avoid a memory leak in case j contains an + * allocated value (e.g., a string). See bug issue + * https://github.com/nlohmann/json/issues/2865 for more information. + */ + +template struct external_constructor; + +template<> +struct external_constructor +{ + template + static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept + { + j.m_value.destroy(j.m_type); + j.m_type = value_t::boolean; + j.m_value = b; + j.assert_invariant(); + } +}; + +template<> +struct external_constructor +{ + template + static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s) + { + j.m_value.destroy(j.m_type); + j.m_type = value_t::string; + j.m_value = s; + j.assert_invariant(); + } + + template + static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s) + { + j.m_value.destroy(j.m_type); + j.m_type = value_t::string; + j.m_value = std::move(s); + j.assert_invariant(); + } + + template < typename BasicJsonType, typename CompatibleStringType, + enable_if_t < !std::is_same::value, + int > = 0 > + static void construct(BasicJsonType& j, const CompatibleStringType& str) + { + j.m_value.destroy(j.m_type); + j.m_type = value_t::string; + j.m_value.string = j.template create(str); + j.assert_invariant(); + } +}; + +template<> +struct external_constructor +{ + template + static void construct(BasicJsonType& j, const typename BasicJsonType::binary_t& b) + { + j.m_value.destroy(j.m_type); + j.m_type = value_t::binary; + j.m_value = typename BasicJsonType::binary_t(b); + j.assert_invariant(); + } + + template + static void construct(BasicJsonType& j, typename BasicJsonType::binary_t&& b) + { + j.m_value.destroy(j.m_type); + j.m_type = value_t::binary; + j.m_value = typename BasicJsonType::binary_t(std::move(b)); + j.assert_invariant(); + } +}; + +template<> +struct external_constructor +{ + template + static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept + { + j.m_value.destroy(j.m_type); + j.m_type = value_t::number_float; + j.m_value = val; + j.assert_invariant(); + } +}; + +template<> +struct external_constructor +{ + template + static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept + { + j.m_value.destroy(j.m_type); + j.m_type = value_t::number_unsigned; + j.m_value = val; + j.assert_invariant(); + } +}; + +template<> +struct external_constructor +{ + template + static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept + { + j.m_value.destroy(j.m_type); + j.m_type = value_t::number_integer; + j.m_value = val; + j.assert_invariant(); + } +}; + +template<> +struct external_constructor +{ + template + static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr) + { + j.m_value.destroy(j.m_type); + j.m_type = value_t::array; + j.m_value = arr; + j.set_parents(); + j.assert_invariant(); + } + + template + static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr) + { + j.m_value.destroy(j.m_type); + j.m_type = value_t::array; + j.m_value = std::move(arr); + j.set_parents(); + j.assert_invariant(); + } + + template < typename BasicJsonType, typename CompatibleArrayType, + enable_if_t < !std::is_same::value, + int > = 0 > + static void construct(BasicJsonType& j, const CompatibleArrayType& arr) + { + using std::begin; + using std::end; + + j.m_value.destroy(j.m_type); + j.m_type = value_t::array; + j.m_value.array = j.template create(begin(arr), end(arr)); + j.set_parents(); + j.assert_invariant(); + } + + template + static void construct(BasicJsonType& j, const std::vector& arr) + { + j.m_value.destroy(j.m_type); + j.m_type = value_t::array; + j.m_value = value_t::array; + j.m_value.array->reserve(arr.size()); + for (const bool x : arr) + { + j.m_value.array->push_back(x); + j.set_parent(j.m_value.array->back()); + } + j.assert_invariant(); + } + + template::value, int> = 0> + static void construct(BasicJsonType& j, const std::valarray& arr) + { + j.m_value.destroy(j.m_type); + j.m_type = value_t::array; + j.m_value = value_t::array; + j.m_value.array->resize(arr.size()); + if (arr.size() > 0) + { + std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin()); + } + j.set_parents(); + j.assert_invariant(); + } +}; + +template<> +struct external_constructor +{ + template + static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj) + { + j.m_value.destroy(j.m_type); + j.m_type = value_t::object; + j.m_value = obj; + j.set_parents(); + j.assert_invariant(); + } + + template + static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj) + { + j.m_value.destroy(j.m_type); + j.m_type = value_t::object; + j.m_value = std::move(obj); + j.set_parents(); + j.assert_invariant(); + } + + template < typename BasicJsonType, typename CompatibleObjectType, + enable_if_t < !std::is_same::value, int > = 0 > + static void construct(BasicJsonType& j, const CompatibleObjectType& obj) + { + using std::begin; + using std::end; + + j.m_value.destroy(j.m_type); + j.m_type = value_t::object; + j.m_value.object = j.template create(begin(obj), end(obj)); + j.set_parents(); + j.assert_invariant(); + } +}; + +///////////// +// to_json // +///////////// + +template::value, int> = 0> +void to_json(BasicJsonType& j, T b) noexcept +{ + external_constructor::construct(j, b); +} + +template::value, int> = 0> +void to_json(BasicJsonType& j, const CompatibleString& s) +{ + external_constructor::construct(j, s); +} + +template +void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s) +{ + external_constructor::construct(j, std::move(s)); +} + +template::value, int> = 0> +void to_json(BasicJsonType& j, FloatType val) noexcept +{ + external_constructor::construct(j, static_cast(val)); +} + +template::value, int> = 0> +void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept +{ + external_constructor::construct(j, static_cast(val)); +} + +template::value, int> = 0> +void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept +{ + external_constructor::construct(j, static_cast(val)); +} + +template::value, int> = 0> +void to_json(BasicJsonType& j, EnumType e) noexcept +{ + using underlying_type = typename std::underlying_type::type; + external_constructor::construct(j, static_cast(e)); +} + +template +void to_json(BasicJsonType& j, const std::vector& e) +{ + external_constructor::construct(j, e); +} + +template < typename BasicJsonType, typename CompatibleArrayType, + enable_if_t < is_compatible_array_type::value&& + !is_compatible_object_type::value&& + !is_compatible_string_type::value&& + !std::is_same::value&& + !is_basic_json::value, + int > = 0 > +void to_json(BasicJsonType& j, const CompatibleArrayType& arr) +{ + external_constructor::construct(j, arr); +} + +template +void to_json(BasicJsonType& j, const typename BasicJsonType::binary_t& bin) +{ + external_constructor::construct(j, bin); +} + +template::value, int> = 0> +void to_json(BasicJsonType& j, const std::valarray& arr) +{ + external_constructor::construct(j, std::move(arr)); +} + +template +void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr) +{ + external_constructor::construct(j, std::move(arr)); +} + +template < typename BasicJsonType, typename CompatibleObjectType, + enable_if_t < is_compatible_object_type::value&& !is_basic_json::value, int > = 0 > +void to_json(BasicJsonType& j, const CompatibleObjectType& obj) +{ + external_constructor::construct(j, obj); +} + +template +void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj) +{ + external_constructor::construct(j, std::move(obj)); +} + +template < + typename BasicJsonType, typename T, std::size_t N, + enable_if_t < !std::is_constructible::value, // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) + int > = 0 > +void to_json(BasicJsonType& j, const T(&arr)[N]) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) +{ + external_constructor::construct(j, arr); +} + +template < typename BasicJsonType, typename T1, typename T2, enable_if_t < std::is_constructible::value&& std::is_constructible::value, int > = 0 > +void to_json(BasicJsonType& j, const std::pair& p) +{ + j = { p.first, p.second }; +} + +// for https://github.com/nlohmann/json/pull/1134 +template>::value, int> = 0> +void to_json(BasicJsonType& j, const T& b) +{ + j = { {b.key(), b.value()} }; +} + +template +void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence /*unused*/) +{ + j = { std::get(t)... }; +} + +template::value, int > = 0> +void to_json(BasicJsonType& j, const T& t) +{ + to_json_tuple_impl(j, t, make_index_sequence::value> {}); +} + +#ifdef JSON_HAS_CPP_17 +template +void to_json(BasicJsonType& j, const std_path& p) +{ + j = p.string(); +} +#endif + +struct to_json_fn +{ + template + auto operator()(BasicJsonType& j, T&& val) const noexcept(noexcept(to_json(j, std::forward(val)))) + -> decltype(to_json(j, std::forward(val)), void()) + { + return to_json(j, std::forward(val)); + } +}; +} // namespace detail + +/// namespace to hold default `to_json` function +/// to see why this is required: +/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html +namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces) +{ +constexpr const auto& to_json = detail::static_const::value; // NOLINT(misc-definitions-in-headers) +} // namespace +} // namespace nlohmann diff --git a/src/nlohmann/detail/exceptions.hpp b/src/nlohmann/detail/exceptions.hpp new file mode 100644 index 00000000000..02f1b40bbed --- /dev/null +++ b/src/nlohmann/detail/exceptions.hpp @@ -0,0 +1,429 @@ +#pragma once + +#include // exception +#include // runtime_error +#include // to_string +#include // vector + +#include +#include +#include +#include + +namespace nlohmann +{ +namespace detail +{ +//////////////// +// exceptions // +//////////////// + +/*! +@brief general exception of the @ref basic_json class + +This class is an extension of `std::exception` objects with a member @a id for +exception ids. It is used as the base class for all exceptions thrown by the +@ref basic_json class. This class can hence be used as "wildcard" to catch +exceptions. + +Subclasses: +- @ref parse_error for exceptions indicating a parse error +- @ref invalid_iterator for exceptions indicating errors with iterators +- @ref type_error for exceptions indicating executing a member function with + a wrong type +- @ref out_of_range for exceptions indicating access out of the defined range +- @ref other_error for exceptions indicating other library errors + +@internal +@note To have nothrow-copy-constructible exceptions, we internally use + `std::runtime_error` which can cope with arbitrary-length error messages. + Intermediate strings are built with static functions and then passed to + the actual constructor. +@endinternal + +@liveexample{The following code shows how arbitrary library exceptions can be +caught.,exception} + +@since version 3.0.0 +*/ +class exception : public std::exception +{ + public: + /// returns the explanatory string + const char* what() const noexcept override + { + return m.what(); + } + + /// the id of the exception + const int id; // NOLINT(cppcoreguidelines-non-private-member-variables-in-classes) + + protected: + JSON_HEDLEY_NON_NULL(3) + exception(int id_, const char* what_arg) : id(id_), m(what_arg) {} + + static std::string name(const std::string& ename, int id_) + { + return "[json.exception." + ename + "." + std::to_string(id_) + "] "; + } + + template + static std::string diagnostics(const BasicJsonType& leaf_element) + { +#if JSON_DIAGNOSTICS + std::vector tokens; + for (const auto* current = &leaf_element; current->m_parent != nullptr; current = current->m_parent) + { + switch (current->m_parent->type()) + { + case value_t::array: + { + for (std::size_t i = 0; i < current->m_parent->m_value.array->size(); ++i) + { + if (¤t->m_parent->m_value.array->operator[](i) == current) + { + tokens.emplace_back(std::to_string(i)); + break; + } + } + break; + } + + case value_t::object: + { + for (const auto& element : *current->m_parent->m_value.object) + { + if (&element.second == current) + { + tokens.emplace_back(element.first.c_str()); + break; + } + } + break; + } + + case value_t::null: // LCOV_EXCL_LINE + case value_t::string: // LCOV_EXCL_LINE + case value_t::boolean: // LCOV_EXCL_LINE + case value_t::number_integer: // LCOV_EXCL_LINE + case value_t::number_unsigned: // LCOV_EXCL_LINE + case value_t::number_float: // LCOV_EXCL_LINE + case value_t::binary: // LCOV_EXCL_LINE + case value_t::discarded: // LCOV_EXCL_LINE + default: // LCOV_EXCL_LINE + break; // LCOV_EXCL_LINE + } + } + + if (tokens.empty()) + { + return ""; + } + + return "(" + std::accumulate(tokens.rbegin(), tokens.rend(), std::string{}, + [](const std::string & a, const std::string & b) + { + return a + "/" + detail::escape(b); + }) + ") "; +#else + static_cast(leaf_element); + return ""; +#endif + } + + private: + /// an exception object as storage for error messages + std::runtime_error m; +}; + +/*! +@brief exception indicating a parse error + +This exception is thrown by the library when a parse error occurs. Parse errors +can occur during the deserialization of JSON text, CBOR, MessagePack, as well +as when using JSON Patch. + +Member @a byte holds the byte index of the last read character in the input +file. + +Exceptions have ids 1xx. + +name / id | example message | description +------------------------------ | --------------- | ------------------------- +json.exception.parse_error.101 | parse error at 2: unexpected end of input; expected string literal | This error indicates a syntax error while deserializing a JSON text. The error message describes that an unexpected token (character) was encountered, and the member @a byte indicates the error position. +json.exception.parse_error.102 | parse error at 14: missing or wrong low surrogate | JSON uses the `\uxxxx` format to describe Unicode characters. Code points above above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point. +json.exception.parse_error.103 | parse error: code points above 0x10FFFF are invalid | Unicode supports code points up to 0x10FFFF. Code points above 0x10FFFF are invalid. +json.exception.parse_error.104 | parse error: JSON patch must be an array of objects | [RFC 6902](https://tools.ietf.org/html/rfc6902) requires a JSON Patch document to be a JSON document that represents an array of objects. +json.exception.parse_error.105 | parse error: operation must have string member 'op' | An operation of a JSON Patch document must contain exactly one "op" member, whose value indicates the operation to perform. Its value must be one of "add", "remove", "replace", "move", "copy", or "test"; other values are errors. +json.exception.parse_error.106 | parse error: array index '01' must not begin with '0' | An array index in a JSON Pointer ([RFC 6901](https://tools.ietf.org/html/rfc6901)) may be `0` or any number without a leading `0`. +json.exception.parse_error.107 | parse error: JSON pointer must be empty or begin with '/' - was: 'foo' | A JSON Pointer must be a Unicode string containing a sequence of zero or more reference tokens, each prefixed by a `/` character. +json.exception.parse_error.108 | parse error: escape character '~' must be followed with '0' or '1' | In a JSON Pointer, only `~0` and `~1` are valid escape sequences. +json.exception.parse_error.109 | parse error: array index 'one' is not a number | A JSON Pointer array index must be a number. +json.exception.parse_error.110 | parse error at 1: cannot read 2 bytes from vector | When parsing CBOR or MessagePack, the byte vector ends before the complete value has been read. +json.exception.parse_error.112 | parse error at 1: error reading CBOR; last byte: 0xF8 | Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read. +json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last byte: 0x98 | While parsing a map key, a value that is not a string has been read. +json.exception.parse_error.114 | parse error: Unsupported BSON record type 0x0F | The parsing of the corresponding BSON record type is not implemented (yet). +json.exception.parse_error.115 | parse error at byte 5: syntax error while parsing UBJSON high-precision number: invalid number text: 1A | A UBJSON high-precision number could not be parsed. + +@note For an input with n bytes, 1 is the index of the first character and n+1 + is the index of the terminating null byte or the end of file. This also + holds true when reading a byte vector (CBOR or MessagePack). + +@liveexample{The following code shows how a `parse_error` exception can be +caught.,parse_error} + +@sa - @ref exception for the base class of the library exceptions +@sa - @ref invalid_iterator for exceptions indicating errors with iterators +@sa - @ref type_error for exceptions indicating executing a member function with + a wrong type +@sa - @ref out_of_range for exceptions indicating access out of the defined range +@sa - @ref other_error for exceptions indicating other library errors + +@since version 3.0.0 +*/ +class parse_error : public exception +{ + public: + /*! + @brief create a parse error exception + @param[in] id_ the id of the exception + @param[in] pos the position where the error occurred (or with + chars_read_total=0 if the position cannot be + determined) + @param[in] what_arg the explanatory string + @return parse_error object + */ + template + static parse_error create(int id_, const position_t& pos, const std::string& what_arg, const BasicJsonType& context) + { + std::string w = exception::name("parse_error", id_) + "parse error" + + position_string(pos) + ": " + exception::diagnostics(context) + what_arg; + return parse_error(id_, pos.chars_read_total, w.c_str()); + } + + template + static parse_error create(int id_, std::size_t byte_, const std::string& what_arg, const BasicJsonType& context) + { + std::string w = exception::name("parse_error", id_) + "parse error" + + (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") + + ": " + exception::diagnostics(context) + what_arg; + return parse_error(id_, byte_, w.c_str()); + } + + /*! + @brief byte index of the parse error + + The byte index of the last read character in the input file. + + @note For an input with n bytes, 1 is the index of the first character and + n+1 is the index of the terminating null byte or the end of file. + This also holds true when reading a byte vector (CBOR or MessagePack). + */ + const std::size_t byte; + + private: + parse_error(int id_, std::size_t byte_, const char* what_arg) + : exception(id_, what_arg), byte(byte_) {} + + static std::string position_string(const position_t& pos) + { + return " at line " + std::to_string(pos.lines_read + 1) + + ", column " + std::to_string(pos.chars_read_current_line); + } +}; + +/*! +@brief exception indicating errors with iterators + +This exception is thrown if iterators passed to a library function do not match +the expected semantics. + +Exceptions have ids 2xx. + +name / id | example message | description +----------------------------------- | --------------- | ------------------------- +json.exception.invalid_iterator.201 | iterators are not compatible | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid. +json.exception.invalid_iterator.202 | iterator does not fit current value | In an erase or insert function, the passed iterator @a pos does not belong to the JSON value for which the function was called. It hence does not define a valid position for the deletion/insertion. +json.exception.invalid_iterator.203 | iterators do not fit current value | Either iterator passed to function @ref erase(IteratorType first, IteratorType last) does not belong to the JSON value from which values shall be erased. It hence does not define a valid range to delete values from. +json.exception.invalid_iterator.204 | iterators out of range | When an iterator range for a primitive type (number, boolean, or string) is passed to a constructor or an erase function, this range has to be exactly (@ref begin(), @ref end()), because this is the only way the single stored value is expressed. All other ranges are invalid. +json.exception.invalid_iterator.205 | iterator out of range | When an iterator for a primitive type (number, boolean, or string) is passed to an erase function, the iterator has to be the @ref begin() iterator, because it is the only way to address the stored value. All other iterators are invalid. +json.exception.invalid_iterator.206 | cannot construct with iterators from null | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) belong to a JSON null value and hence to not define a valid range. +json.exception.invalid_iterator.207 | cannot use key() for non-object iterators | The key() member function can only be used on iterators belonging to a JSON object, because other types do not have a concept of a key. +json.exception.invalid_iterator.208 | cannot use operator[] for object iterators | The operator[] to specify a concrete offset cannot be used on iterators belonging to a JSON object, because JSON objects are unordered. +json.exception.invalid_iterator.209 | cannot use offsets with object iterators | The offset operators (+, -, +=, -=) cannot be used on iterators belonging to a JSON object, because JSON objects are unordered. +json.exception.invalid_iterator.210 | iterators do not fit | The iterator range passed to the insert function are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid. +json.exception.invalid_iterator.211 | passed iterators may not belong to container | The iterator range passed to the insert function must not be a subrange of the container to insert to. +json.exception.invalid_iterator.212 | cannot compare iterators of different containers | When two iterators are compared, they must belong to the same container. +json.exception.invalid_iterator.213 | cannot compare order of object iterators | The order of object iterators cannot be compared, because JSON objects are unordered. +json.exception.invalid_iterator.214 | cannot get value | Cannot get value for iterator: Either the iterator belongs to a null value or it is an iterator to a primitive type (number, boolean, or string), but the iterator is different to @ref begin(). + +@liveexample{The following code shows how an `invalid_iterator` exception can be +caught.,invalid_iterator} + +@sa - @ref exception for the base class of the library exceptions +@sa - @ref parse_error for exceptions indicating a parse error +@sa - @ref type_error for exceptions indicating executing a member function with + a wrong type +@sa - @ref out_of_range for exceptions indicating access out of the defined range +@sa - @ref other_error for exceptions indicating other library errors + +@since version 3.0.0 +*/ +class invalid_iterator : public exception +{ + public: + template + static invalid_iterator create(int id_, const std::string& what_arg, const BasicJsonType& context) + { + std::string w = exception::name("invalid_iterator", id_) + exception::diagnostics(context) + what_arg; + return invalid_iterator(id_, w.c_str()); + } + + private: + JSON_HEDLEY_NON_NULL(3) + invalid_iterator(int id_, const char* what_arg) + : exception(id_, what_arg) {} +}; + +/*! +@brief exception indicating executing a member function with a wrong type + +This exception is thrown in case of a type error; that is, a library function is +executed on a JSON value whose type does not match the expected semantics. + +Exceptions have ids 3xx. + +name / id | example message | description +----------------------------- | --------------- | ------------------------- +json.exception.type_error.301 | cannot create object from initializer list | To create an object from an initializer list, the initializer list must consist only of a list of pairs whose first element is a string. When this constraint is violated, an array is created instead. +json.exception.type_error.302 | type must be object, but is array | During implicit or explicit value conversion, the JSON type must be compatible to the target type. For instance, a JSON string can only be converted into string types, but not into numbers or boolean types. +json.exception.type_error.303 | incompatible ReferenceType for get_ref, actual type is object | To retrieve a reference to a value stored in a @ref basic_json object with @ref get_ref, the type of the reference must match the value type. For instance, for a JSON array, the @a ReferenceType must be @ref array_t &. +json.exception.type_error.304 | cannot use at() with string | The @ref at() member functions can only be executed for certain JSON types. +json.exception.type_error.305 | cannot use operator[] with string | The @ref operator[] member functions can only be executed for certain JSON types. +json.exception.type_error.306 | cannot use value() with string | The @ref value() member functions can only be executed for certain JSON types. +json.exception.type_error.307 | cannot use erase() with string | The @ref erase() member functions can only be executed for certain JSON types. +json.exception.type_error.308 | cannot use push_back() with string | The @ref push_back() and @ref operator+= member functions can only be executed for certain JSON types. +json.exception.type_error.309 | cannot use insert() with | The @ref insert() member functions can only be executed for certain JSON types. +json.exception.type_error.310 | cannot use swap() with number | The @ref swap() member functions can only be executed for certain JSON types. +json.exception.type_error.311 | cannot use emplace_back() with string | The @ref emplace_back() member function can only be executed for certain JSON types. +json.exception.type_error.312 | cannot use update() with string | The @ref update() member functions can only be executed for certain JSON types. +json.exception.type_error.313 | invalid value to unflatten | The @ref unflatten function converts an object whose keys are JSON Pointers back into an arbitrary nested JSON value. The JSON Pointers must not overlap, because then the resulting value would not be well defined. +json.exception.type_error.314 | only objects can be unflattened | The @ref unflatten function only works for an object whose keys are JSON Pointers. +json.exception.type_error.315 | values in object must be primitive | The @ref unflatten function only works for an object whose keys are JSON Pointers and whose values are primitive. +json.exception.type_error.316 | invalid UTF-8 byte at index 10: 0x7E | The @ref dump function only works with UTF-8 encoded strings; that is, if you assign a `std::string` to a JSON value, make sure it is UTF-8 encoded. | +json.exception.type_error.317 | JSON value cannot be serialized to requested format | The dynamic type of the object cannot be represented in the requested serialization format (e.g. a raw `true` or `null` JSON object cannot be serialized to BSON) | + +@liveexample{The following code shows how a `type_error` exception can be +caught.,type_error} + +@sa - @ref exception for the base class of the library exceptions +@sa - @ref parse_error for exceptions indicating a parse error +@sa - @ref invalid_iterator for exceptions indicating errors with iterators +@sa - @ref out_of_range for exceptions indicating access out of the defined range +@sa - @ref other_error for exceptions indicating other library errors + +@since version 3.0.0 +*/ +class type_error : public exception +{ + public: + template + static type_error create(int id_, const std::string& what_arg, const BasicJsonType& context) + { + std::string w = exception::name("type_error", id_) + exception::diagnostics(context) + what_arg; + return type_error(id_, w.c_str()); + } + + private: + JSON_HEDLEY_NON_NULL(3) + type_error(int id_, const char* what_arg) : exception(id_, what_arg) {} +}; + +/*! +@brief exception indicating access out of the defined range + +This exception is thrown in case a library function is called on an input +parameter that exceeds the expected range, for instance in case of array +indices or nonexisting object keys. + +Exceptions have ids 4xx. + +name / id | example message | description +------------------------------- | --------------- | ------------------------- +json.exception.out_of_range.401 | array index 3 is out of range | The provided array index @a i is larger than @a size-1. +json.exception.out_of_range.402 | array index '-' (3) is out of range | The special array index `-` in a JSON Pointer never describes a valid element of the array, but the index past the end. That is, it can only be used to add elements at this position, but not to read it. +json.exception.out_of_range.403 | key 'foo' not found | The provided key was not found in the JSON object. +json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved. +json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value. +json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF. +json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. (until version 3.8.0) | +json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. | +json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 (at byte 2) | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string | + +@liveexample{The following code shows how an `out_of_range` exception can be +caught.,out_of_range} + +@sa - @ref exception for the base class of the library exceptions +@sa - @ref parse_error for exceptions indicating a parse error +@sa - @ref invalid_iterator for exceptions indicating errors with iterators +@sa - @ref type_error for exceptions indicating executing a member function with + a wrong type +@sa - @ref other_error for exceptions indicating other library errors + +@since version 3.0.0 +*/ +class out_of_range : public exception +{ + public: + template + static out_of_range create(int id_, const std::string& what_arg, const BasicJsonType& context) + { + std::string w = exception::name("out_of_range", id_) + exception::diagnostics(context) + what_arg; + return out_of_range(id_, w.c_str()); + } + + private: + JSON_HEDLEY_NON_NULL(3) + out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {} +}; + +/*! +@brief exception indicating other library errors + +This exception is thrown in case of errors that cannot be classified with the +other exception types. + +Exceptions have ids 5xx. + +name / id | example message | description +------------------------------ | --------------- | ------------------------- +json.exception.other_error.501 | unsuccessful: {"op":"test","path":"/baz", "value":"bar"} | A JSON Patch operation 'test' failed. The unsuccessful operation is also printed. + +@sa - @ref exception for the base class of the library exceptions +@sa - @ref parse_error for exceptions indicating a parse error +@sa - @ref invalid_iterator for exceptions indicating errors with iterators +@sa - @ref type_error for exceptions indicating executing a member function with + a wrong type +@sa - @ref out_of_range for exceptions indicating access out of the defined range + +@liveexample{The following code shows how an `other_error` exception can be +caught.,other_error} + +@since version 3.0.0 +*/ +class other_error : public exception +{ + public: + template + static other_error create(int id_, const std::string& what_arg, const BasicJsonType& context) + { + std::string w = exception::name("other_error", id_) + exception::diagnostics(context) + what_arg; + return other_error(id_, w.c_str()); + } + + private: + JSON_HEDLEY_NON_NULL(3) + other_error(int id_, const char* what_arg) : exception(id_, what_arg) {} +}; +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/hash.hpp b/src/nlohmann/detail/hash.hpp new file mode 100644 index 00000000000..776b9ca61c5 --- /dev/null +++ b/src/nlohmann/detail/hash.hpp @@ -0,0 +1,122 @@ +#pragma once + +#include // uint8_t +#include // size_t +#include // hash + +#include +#include + +namespace nlohmann +{ +namespace detail +{ + +// boost::hash_combine +inline std::size_t combine(std::size_t seed, std::size_t h) noexcept +{ + seed ^= h + 0x9e3779b9 + (seed << 6U) + (seed >> 2U); + return seed; +} + +/*! +@brief hash a JSON value + +The hash function tries to rely on std::hash where possible. Furthermore, the +type of the JSON value is taken into account to have different hash values for +null, 0, 0U, and false, etc. + +@tparam BasicJsonType basic_json specialization +@param j JSON value to hash +@return hash value of j +*/ +template +std::size_t hash(const BasicJsonType& j) +{ + using string_t = typename BasicJsonType::string_t; + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + + const auto type = static_cast(j.type()); + switch (j.type()) + { + case BasicJsonType::value_t::null: + case BasicJsonType::value_t::discarded: + { + return combine(type, 0); + } + + case BasicJsonType::value_t::object: + { + auto seed = combine(type, j.size()); + for (const auto& element : j.items()) + { + const auto h = std::hash {}(element.key()); + seed = combine(seed, h); + seed = combine(seed, hash(element.value())); + } + return seed; + } + + case BasicJsonType::value_t::array: + { + auto seed = combine(type, j.size()); + for (const auto& element : j) + { + seed = combine(seed, hash(element)); + } + return seed; + } + + case BasicJsonType::value_t::string: + { + const auto h = std::hash {}(j.template get_ref()); + return combine(type, h); + } + + case BasicJsonType::value_t::boolean: + { + const auto h = std::hash {}(j.template get()); + return combine(type, h); + } + + case BasicJsonType::value_t::number_integer: + { + const auto h = std::hash {}(j.template get()); + return combine(type, h); + } + + case BasicJsonType::value_t::number_unsigned: + { + const auto h = std::hash {}(j.template get()); + return combine(type, h); + } + + case BasicJsonType::value_t::number_float: + { + const auto h = std::hash {}(j.template get()); + return combine(type, h); + } + + case BasicJsonType::value_t::binary: + { + auto seed = combine(type, j.get_binary().size()); + const auto h = std::hash {}(j.get_binary().has_subtype()); + seed = combine(seed, h); + seed = combine(seed, static_cast(j.get_binary().subtype())); + for (const auto byte : j.get_binary()) + { + seed = combine(seed, std::hash {}(byte)); + } + return seed; + } + + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE + return 0; // LCOV_EXCL_LINE + } +} + +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/input/binary_reader.hpp b/src/nlohmann/detail/input/binary_reader.hpp new file mode 100644 index 00000000000..f1b65ba5475 --- /dev/null +++ b/src/nlohmann/detail/input/binary_reader.hpp @@ -0,0 +1,2524 @@ +#pragma once + +#include // generate_n +#include // array +#include // ldexp +#include // size_t +#include // uint8_t, uint16_t, uint32_t, uint64_t +#include // snprintf +#include // memcpy +#include // back_inserter +#include // numeric_limits +#include // char_traits, string +#include // make_pair, move +#include // vector + +#include +#include +#include +#include +#include +#include +#include +#include + +namespace nlohmann +{ +namespace detail +{ + +/// how to treat CBOR tags +enum class cbor_tag_handler_t +{ + error, ///< throw a parse_error exception in case of a tag + ignore, ///< ignore tags + store ///< store tags as binary type +}; + +/*! +@brief determine system byte order + +@return true if and only if system's byte order is little endian + +@note from https://stackoverflow.com/a/1001328/266378 +*/ +static inline bool little_endianess(int num = 1) noexcept +{ + return *reinterpret_cast(&num) == 1; +} + + +/////////////////// +// binary reader // +/////////////////// + +/*! +@brief deserialization of CBOR, MessagePack, and UBJSON values +*/ +template> +class binary_reader +{ + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + using string_t = typename BasicJsonType::string_t; + using binary_t = typename BasicJsonType::binary_t; + using json_sax_t = SAX; + using char_type = typename InputAdapterType::char_type; + using char_int_type = typename std::char_traits::int_type; + + public: + /*! + @brief create a binary reader + + @param[in] adapter input adapter to read from + */ + explicit binary_reader(InputAdapterType&& adapter) noexcept : ia(std::move(adapter)) + { + (void)detail::is_sax_static_asserts {}; + } + + // make class move-only + binary_reader(const binary_reader&) = delete; + binary_reader(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor) + binary_reader& operator=(const binary_reader&) = delete; + binary_reader& operator=(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor) + ~binary_reader() = default; + + /*! + @param[in] format the binary format to parse + @param[in] sax_ a SAX event processor + @param[in] strict whether to expect the input to be consumed completed + @param[in] tag_handler how to treat CBOR tags + + @return whether parsing was successful + */ + JSON_HEDLEY_NON_NULL(3) + bool sax_parse(const input_format_t format, + json_sax_t* sax_, + const bool strict = true, + const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error) + { + sax = sax_; + bool result = false; + + switch (format) + { + case input_format_t::bson: + result = parse_bson_internal(); + break; + + case input_format_t::cbor: + result = parse_cbor_internal(true, tag_handler); + break; + + case input_format_t::msgpack: + result = parse_msgpack_internal(); + break; + + case input_format_t::ubjson: + result = parse_ubjson_internal(); + break; + + case input_format_t::json: // LCOV_EXCL_LINE + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE + } + + // strict mode: next byte must be EOF + if (result && strict) + { + if (format == input_format_t::ubjson) + { + get_ignore_noop(); + } + else + { + get(); + } + + if (JSON_HEDLEY_UNLIKELY(current != std::char_traits::eof())) + { + return sax->parse_error(chars_read, get_token_string(), + parse_error::create(110, chars_read, exception_message(format, "expected end of input; last byte: 0x" + get_token_string(), "value"), BasicJsonType())); + } + } + + return result; + } + + private: + ////////// + // BSON // + ////////// + + /*! + @brief Reads in a BSON-object and passes it to the SAX-parser. + @return whether a valid BSON-value was passed to the SAX parser + */ + bool parse_bson_internal() + { + std::int32_t document_size{}; + get_number(input_format_t::bson, document_size); + + if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1)))) + { + return false; + } + + if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/false))) + { + return false; + } + + return sax->end_object(); + } + + /*! + @brief Parses a C-style string from the BSON input. + @param[in,out] result A reference to the string variable where the read + string is to be stored. + @return `true` if the \x00-byte indicating the end of the string was + encountered before the EOF; false` indicates an unexpected EOF. + */ + bool get_bson_cstr(string_t& result) + { + auto out = std::back_inserter(result); + while (true) + { + get(); + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "cstring"))) + { + return false; + } + if (current == 0x00) + { + return true; + } + *out++ = static_cast(current); + } + } + + /*! + @brief Parses a zero-terminated string of length @a len from the BSON + input. + @param[in] len The length (including the zero-byte at the end) of the + string to be read. + @param[in,out] result A reference to the string variable where the read + string is to be stored. + @tparam NumberType The type of the length @a len + @pre len >= 1 + @return `true` if the string was successfully parsed + */ + template + bool get_bson_string(const NumberType len, string_t& result) + { + if (JSON_HEDLEY_UNLIKELY(len < 1)) + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "string length must be at least 1, is " + std::to_string(len), "string"), BasicJsonType())); + } + + return get_string(input_format_t::bson, len - static_cast(1), result) && get() != std::char_traits::eof(); + } + + /*! + @brief Parses a byte array input of length @a len from the BSON input. + @param[in] len The length of the byte array to be read. + @param[in,out] result A reference to the binary variable where the read + array is to be stored. + @tparam NumberType The type of the length @a len + @pre len >= 0 + @return `true` if the byte array was successfully parsed + */ + template + bool get_bson_binary(const NumberType len, binary_t& result) + { + if (JSON_HEDLEY_UNLIKELY(len < 0)) + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "byte array length cannot be negative, is " + std::to_string(len), "binary"), BasicJsonType())); + } + + // All BSON binary values have a subtype + std::uint8_t subtype{}; + get_number(input_format_t::bson, subtype); + result.set_subtype(subtype); + + return get_binary(input_format_t::bson, len, result); + } + + /*! + @brief Read a BSON document element of the given @a element_type. + @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html + @param[in] element_type_parse_position The position in the input stream, + where the `element_type` was read. + @warning Not all BSON element types are supported yet. An unsupported + @a element_type will give rise to a parse_error.114: + Unsupported BSON record type 0x... + @return whether a valid BSON-object/array was passed to the SAX parser + */ + bool parse_bson_element_internal(const char_int_type element_type, + const std::size_t element_type_parse_position) + { + switch (element_type) + { + case 0x01: // double + { + double number{}; + return get_number(input_format_t::bson, number) && sax->number_float(static_cast(number), ""); + } + + case 0x02: // string + { + std::int32_t len{}; + string_t value; + return get_number(input_format_t::bson, len) && get_bson_string(len, value) && sax->string(value); + } + + case 0x03: // object + { + return parse_bson_internal(); + } + + case 0x04: // array + { + return parse_bson_array(); + } + + case 0x05: // binary + { + std::int32_t len{}; + binary_t value; + return get_number(input_format_t::bson, len) && get_bson_binary(len, value) && sax->binary(value); + } + + case 0x08: // boolean + { + return sax->boolean(get() != 0); + } + + case 0x0A: // null + { + return sax->null(); + } + + case 0x10: // int32 + { + std::int32_t value{}; + return get_number(input_format_t::bson, value) && sax->number_integer(value); + } + + case 0x12: // int64 + { + std::int64_t value{}; + return get_number(input_format_t::bson, value) && sax->number_integer(value); + } + + default: // anything else not supported (yet) + { + std::array cr{{}}; + (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast(element_type)); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg) + return sax->parse_error(element_type_parse_position, std::string(cr.data()), parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + std::string(cr.data()), BasicJsonType())); + } + } + } + + /*! + @brief Read a BSON element list (as specified in the BSON-spec) + + The same binary layout is used for objects and arrays, hence it must be + indicated with the argument @a is_array which one is expected + (true --> array, false --> object). + + @param[in] is_array Determines if the element list being read is to be + treated as an object (@a is_array == false), or as an + array (@a is_array == true). + @return whether a valid BSON-object/array was passed to the SAX parser + */ + bool parse_bson_element_list(const bool is_array) + { + string_t key; + + while (auto element_type = get()) + { + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "element list"))) + { + return false; + } + + const std::size_t element_type_parse_position = chars_read; + if (JSON_HEDLEY_UNLIKELY(!get_bson_cstr(key))) + { + return false; + } + + if (!is_array && !sax->key(key)) + { + return false; + } + + if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_internal(element_type, element_type_parse_position))) + { + return false; + } + + // get_bson_cstr only appends + key.clear(); + } + + return true; + } + + /*! + @brief Reads an array from the BSON input and passes it to the SAX-parser. + @return whether a valid BSON-array was passed to the SAX parser + */ + bool parse_bson_array() + { + std::int32_t document_size{}; + get_number(input_format_t::bson, document_size); + + if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1)))) + { + return false; + } + + if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/true))) + { + return false; + } + + return sax->end_array(); + } + + ////////// + // CBOR // + ////////// + + /*! + @param[in] get_char whether a new character should be retrieved from the + input (true) or whether the last read character should + be considered instead (false) + @param[in] tag_handler how CBOR tags should be treated + + @return whether a valid CBOR value was passed to the SAX parser + */ + bool parse_cbor_internal(const bool get_char, + const cbor_tag_handler_t tag_handler) + { + switch (get_char ? get() : current) + { + // EOF + case std::char_traits::eof(): + return unexpect_eof(input_format_t::cbor, "value"); + + // Integer 0x00..0x17 (0..23) + case 0x00: + case 0x01: + case 0x02: + case 0x03: + case 0x04: + case 0x05: + case 0x06: + case 0x07: + case 0x08: + case 0x09: + case 0x0A: + case 0x0B: + case 0x0C: + case 0x0D: + case 0x0E: + case 0x0F: + case 0x10: + case 0x11: + case 0x12: + case 0x13: + case 0x14: + case 0x15: + case 0x16: + case 0x17: + return sax->number_unsigned(static_cast(current)); + + case 0x18: // Unsigned integer (one-byte uint8_t follows) + { + std::uint8_t number{}; + return get_number(input_format_t::cbor, number) && sax->number_unsigned(number); + } + + case 0x19: // Unsigned integer (two-byte uint16_t follows) + { + std::uint16_t number{}; + return get_number(input_format_t::cbor, number) && sax->number_unsigned(number); + } + + case 0x1A: // Unsigned integer (four-byte uint32_t follows) + { + std::uint32_t number{}; + return get_number(input_format_t::cbor, number) && sax->number_unsigned(number); + } + + case 0x1B: // Unsigned integer (eight-byte uint64_t follows) + { + std::uint64_t number{}; + return get_number(input_format_t::cbor, number) && sax->number_unsigned(number); + } + + // Negative integer -1-0x00..-1-0x17 (-1..-24) + case 0x20: + case 0x21: + case 0x22: + case 0x23: + case 0x24: + case 0x25: + case 0x26: + case 0x27: + case 0x28: + case 0x29: + case 0x2A: + case 0x2B: + case 0x2C: + case 0x2D: + case 0x2E: + case 0x2F: + case 0x30: + case 0x31: + case 0x32: + case 0x33: + case 0x34: + case 0x35: + case 0x36: + case 0x37: + return sax->number_integer(static_cast(0x20 - 1 - current)); + + case 0x38: // Negative integer (one-byte uint8_t follows) + { + std::uint8_t number{}; + return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast(-1) - number); + } + + case 0x39: // Negative integer -1-n (two-byte uint16_t follows) + { + std::uint16_t number{}; + return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast(-1) - number); + } + + case 0x3A: // Negative integer -1-n (four-byte uint32_t follows) + { + std::uint32_t number{}; + return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast(-1) - number); + } + + case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows) + { + std::uint64_t number{}; + return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast(-1) + - static_cast(number)); + } + + // Binary data (0x00..0x17 bytes follow) + case 0x40: + case 0x41: + case 0x42: + case 0x43: + case 0x44: + case 0x45: + case 0x46: + case 0x47: + case 0x48: + case 0x49: + case 0x4A: + case 0x4B: + case 0x4C: + case 0x4D: + case 0x4E: + case 0x4F: + case 0x50: + case 0x51: + case 0x52: + case 0x53: + case 0x54: + case 0x55: + case 0x56: + case 0x57: + case 0x58: // Binary data (one-byte uint8_t for n follows) + case 0x59: // Binary data (two-byte uint16_t for n follow) + case 0x5A: // Binary data (four-byte uint32_t for n follow) + case 0x5B: // Binary data (eight-byte uint64_t for n follow) + case 0x5F: // Binary data (indefinite length) + { + binary_t b; + return get_cbor_binary(b) && sax->binary(b); + } + + // UTF-8 string (0x00..0x17 bytes follow) + case 0x60: + case 0x61: + case 0x62: + case 0x63: + case 0x64: + case 0x65: + case 0x66: + case 0x67: + case 0x68: + case 0x69: + case 0x6A: + case 0x6B: + case 0x6C: + case 0x6D: + case 0x6E: + case 0x6F: + case 0x70: + case 0x71: + case 0x72: + case 0x73: + case 0x74: + case 0x75: + case 0x76: + case 0x77: + case 0x78: // UTF-8 string (one-byte uint8_t for n follows) + case 0x79: // UTF-8 string (two-byte uint16_t for n follow) + case 0x7A: // UTF-8 string (four-byte uint32_t for n follow) + case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow) + case 0x7F: // UTF-8 string (indefinite length) + { + string_t s; + return get_cbor_string(s) && sax->string(s); + } + + // array (0x00..0x17 data items follow) + case 0x80: + case 0x81: + case 0x82: + case 0x83: + case 0x84: + case 0x85: + case 0x86: + case 0x87: + case 0x88: + case 0x89: + case 0x8A: + case 0x8B: + case 0x8C: + case 0x8D: + case 0x8E: + case 0x8F: + case 0x90: + case 0x91: + case 0x92: + case 0x93: + case 0x94: + case 0x95: + case 0x96: + case 0x97: + return get_cbor_array(static_cast(static_cast(current) & 0x1Fu), tag_handler); + + case 0x98: // array (one-byte uint8_t for n follows) + { + std::uint8_t len{}; + return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast(len), tag_handler); + } + + case 0x99: // array (two-byte uint16_t for n follow) + { + std::uint16_t len{}; + return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast(len), tag_handler); + } + + case 0x9A: // array (four-byte uint32_t for n follow) + { + std::uint32_t len{}; + return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast(len), tag_handler); + } + + case 0x9B: // array (eight-byte uint64_t for n follow) + { + std::uint64_t len{}; + return get_number(input_format_t::cbor, len) && get_cbor_array(detail::conditional_static_cast(len), tag_handler); + } + + case 0x9F: // array (indefinite length) + return get_cbor_array(std::size_t(-1), tag_handler); + + // map (0x00..0x17 pairs of data items follow) + case 0xA0: + case 0xA1: + case 0xA2: + case 0xA3: + case 0xA4: + case 0xA5: + case 0xA6: + case 0xA7: + case 0xA8: + case 0xA9: + case 0xAA: + case 0xAB: + case 0xAC: + case 0xAD: + case 0xAE: + case 0xAF: + case 0xB0: + case 0xB1: + case 0xB2: + case 0xB3: + case 0xB4: + case 0xB5: + case 0xB6: + case 0xB7: + return get_cbor_object(static_cast(static_cast(current) & 0x1Fu), tag_handler); + + case 0xB8: // map (one-byte uint8_t for n follows) + { + std::uint8_t len{}; + return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast(len), tag_handler); + } + + case 0xB9: // map (two-byte uint16_t for n follow) + { + std::uint16_t len{}; + return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast(len), tag_handler); + } + + case 0xBA: // map (four-byte uint32_t for n follow) + { + std::uint32_t len{}; + return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast(len), tag_handler); + } + + case 0xBB: // map (eight-byte uint64_t for n follow) + { + std::uint64_t len{}; + return get_number(input_format_t::cbor, len) && get_cbor_object(detail::conditional_static_cast(len), tag_handler); + } + + case 0xBF: // map (indefinite length) + return get_cbor_object(std::size_t(-1), tag_handler); + + case 0xC6: // tagged item + case 0xC7: + case 0xC8: + case 0xC9: + case 0xCA: + case 0xCB: + case 0xCC: + case 0xCD: + case 0xCE: + case 0xCF: + case 0xD0: + case 0xD1: + case 0xD2: + case 0xD3: + case 0xD4: + case 0xD8: // tagged item (1 bytes follow) + case 0xD9: // tagged item (2 bytes follow) + case 0xDA: // tagged item (4 bytes follow) + case 0xDB: // tagged item (8 bytes follow) + { + switch (tag_handler) + { + case cbor_tag_handler_t::error: + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value"), BasicJsonType())); + } + + case cbor_tag_handler_t::ignore: + { + // ignore binary subtype + switch (current) + { + case 0xD8: + { + std::uint8_t subtype_to_ignore{}; + get_number(input_format_t::cbor, subtype_to_ignore); + break; + } + case 0xD9: + { + std::uint16_t subtype_to_ignore{}; + get_number(input_format_t::cbor, subtype_to_ignore); + break; + } + case 0xDA: + { + std::uint32_t subtype_to_ignore{}; + get_number(input_format_t::cbor, subtype_to_ignore); + break; + } + case 0xDB: + { + std::uint64_t subtype_to_ignore{}; + get_number(input_format_t::cbor, subtype_to_ignore); + break; + } + default: + break; + } + return parse_cbor_internal(true, tag_handler); + } + + case cbor_tag_handler_t::store: + { + binary_t b; + // use binary subtype and store in binary container + switch (current) + { + case 0xD8: + { + std::uint8_t subtype{}; + get_number(input_format_t::cbor, subtype); + b.set_subtype(detail::conditional_static_cast(subtype)); + break; + } + case 0xD9: + { + std::uint16_t subtype{}; + get_number(input_format_t::cbor, subtype); + b.set_subtype(detail::conditional_static_cast(subtype)); + break; + } + case 0xDA: + { + std::uint32_t subtype{}; + get_number(input_format_t::cbor, subtype); + b.set_subtype(detail::conditional_static_cast(subtype)); + break; + } + case 0xDB: + { + std::uint64_t subtype{}; + get_number(input_format_t::cbor, subtype); + b.set_subtype(detail::conditional_static_cast(subtype)); + break; + } + default: + return parse_cbor_internal(true, tag_handler); + } + get(); + return get_cbor_binary(b) && sax->binary(b); + } + + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE + return false; // LCOV_EXCL_LINE + } + } + + case 0xF4: // false + return sax->boolean(false); + + case 0xF5: // true + return sax->boolean(true); + + case 0xF6: // null + return sax->null(); + + case 0xF9: // Half-Precision Float (two-byte IEEE 754) + { + const auto byte1_raw = get(); + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number"))) + { + return false; + } + const auto byte2_raw = get(); + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number"))) + { + return false; + } + + const auto byte1 = static_cast(byte1_raw); + const auto byte2 = static_cast(byte2_raw); + + // code from RFC 7049, Appendix D, Figure 3: + // As half-precision floating-point numbers were only added + // to IEEE 754 in 2008, today's programming platforms often + // still only have limited support for them. It is very + // easy to include at least decoding support for them even + // without such support. An example of a small decoder for + // half-precision floating-point numbers in the C language + // is shown in Fig. 3. + const auto half = static_cast((byte1 << 8u) + byte2); + const double val = [&half] + { + const int exp = (half >> 10u) & 0x1Fu; + const unsigned int mant = half & 0x3FFu; + JSON_ASSERT(0 <= exp&& exp <= 32); + JSON_ASSERT(mant <= 1024); + switch (exp) + { + case 0: + return std::ldexp(mant, -24); + case 31: + return (mant == 0) + ? std::numeric_limits::infinity() + : std::numeric_limits::quiet_NaN(); + default: + return std::ldexp(mant + 1024, exp - 25); + } + }(); + return sax->number_float((half & 0x8000u) != 0 + ? static_cast(-val) + : static_cast(val), ""); + } + + case 0xFA: // Single-Precision Float (four-byte IEEE 754) + { + float number{}; + return get_number(input_format_t::cbor, number) && sax->number_float(static_cast(number), ""); + } + + case 0xFB: // Double-Precision Float (eight-byte IEEE 754) + { + double number{}; + return get_number(input_format_t::cbor, number) && sax->number_float(static_cast(number), ""); + } + + default: // anything else (0xFF is handled inside the other types) + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value"), BasicJsonType())); + } + } + } + + /*! + @brief reads a CBOR string + + This function first reads starting bytes to determine the expected + string length and then copies this number of bytes into a string. + Additionally, CBOR's strings with indefinite lengths are supported. + + @param[out] result created string + + @return whether string creation completed + */ + bool get_cbor_string(string_t& result) + { + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "string"))) + { + return false; + } + + switch (current) + { + // UTF-8 string (0x00..0x17 bytes follow) + case 0x60: + case 0x61: + case 0x62: + case 0x63: + case 0x64: + case 0x65: + case 0x66: + case 0x67: + case 0x68: + case 0x69: + case 0x6A: + case 0x6B: + case 0x6C: + case 0x6D: + case 0x6E: + case 0x6F: + case 0x70: + case 0x71: + case 0x72: + case 0x73: + case 0x74: + case 0x75: + case 0x76: + case 0x77: + { + return get_string(input_format_t::cbor, static_cast(current) & 0x1Fu, result); + } + + case 0x78: // UTF-8 string (one-byte uint8_t for n follows) + { + std::uint8_t len{}; + return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result); + } + + case 0x79: // UTF-8 string (two-byte uint16_t for n follow) + { + std::uint16_t len{}; + return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result); + } + + case 0x7A: // UTF-8 string (four-byte uint32_t for n follow) + { + std::uint32_t len{}; + return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result); + } + + case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow) + { + std::uint64_t len{}; + return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result); + } + + case 0x7F: // UTF-8 string (indefinite length) + { + while (get() != 0xFF) + { + string_t chunk; + if (!get_cbor_string(chunk)) + { + return false; + } + result.append(chunk); + } + return true; + } + + default: + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string"), BasicJsonType())); + } + } + } + + /*! + @brief reads a CBOR byte array + + This function first reads starting bytes to determine the expected + byte array length and then copies this number of bytes into the byte array. + Additionally, CBOR's byte arrays with indefinite lengths are supported. + + @param[out] result created byte array + + @return whether byte array creation completed + */ + bool get_cbor_binary(binary_t& result) + { + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "binary"))) + { + return false; + } + + switch (current) + { + // Binary data (0x00..0x17 bytes follow) + case 0x40: + case 0x41: + case 0x42: + case 0x43: + case 0x44: + case 0x45: + case 0x46: + case 0x47: + case 0x48: + case 0x49: + case 0x4A: + case 0x4B: + case 0x4C: + case 0x4D: + case 0x4E: + case 0x4F: + case 0x50: + case 0x51: + case 0x52: + case 0x53: + case 0x54: + case 0x55: + case 0x56: + case 0x57: + { + return get_binary(input_format_t::cbor, static_cast(current) & 0x1Fu, result); + } + + case 0x58: // Binary data (one-byte uint8_t for n follows) + { + std::uint8_t len{}; + return get_number(input_format_t::cbor, len) && + get_binary(input_format_t::cbor, len, result); + } + + case 0x59: // Binary data (two-byte uint16_t for n follow) + { + std::uint16_t len{}; + return get_number(input_format_t::cbor, len) && + get_binary(input_format_t::cbor, len, result); + } + + case 0x5A: // Binary data (four-byte uint32_t for n follow) + { + std::uint32_t len{}; + return get_number(input_format_t::cbor, len) && + get_binary(input_format_t::cbor, len, result); + } + + case 0x5B: // Binary data (eight-byte uint64_t for n follow) + { + std::uint64_t len{}; + return get_number(input_format_t::cbor, len) && + get_binary(input_format_t::cbor, len, result); + } + + case 0x5F: // Binary data (indefinite length) + { + while (get() != 0xFF) + { + binary_t chunk; + if (!get_cbor_binary(chunk)) + { + return false; + } + result.insert(result.end(), chunk.begin(), chunk.end()); + } + return true; + } + + default: + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x40-0x5B) or indefinite binary array type (0x5F); last byte: 0x" + last_token, "binary"), BasicJsonType())); + } + } + } + + /*! + @param[in] len the length of the array or std::size_t(-1) for an + array of indefinite size + @param[in] tag_handler how CBOR tags should be treated + @return whether array creation completed + */ + bool get_cbor_array(const std::size_t len, + const cbor_tag_handler_t tag_handler) + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len))) + { + return false; + } + + if (len != std::size_t(-1)) + { + for (std::size_t i = 0; i < len; ++i) + { + if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler))) + { + return false; + } + } + } + else + { + while (get() != 0xFF) + { + if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(false, tag_handler))) + { + return false; + } + } + } + + return sax->end_array(); + } + + /*! + @param[in] len the length of the object or std::size_t(-1) for an + object of indefinite size + @param[in] tag_handler how CBOR tags should be treated + @return whether object creation completed + */ + bool get_cbor_object(const std::size_t len, + const cbor_tag_handler_t tag_handler) + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len))) + { + return false; + } + + if (len != 0) + { + string_t key; + if (len != std::size_t(-1)) + { + for (std::size_t i = 0; i < len; ++i) + { + get(); + if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key))) + { + return false; + } + + if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler))) + { + return false; + } + key.clear(); + } + } + else + { + while (get() != 0xFF) + { + if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key))) + { + return false; + } + + if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler))) + { + return false; + } + key.clear(); + } + } + } + + return sax->end_object(); + } + + ///////////// + // MsgPack // + ///////////// + + /*! + @return whether a valid MessagePack value was passed to the SAX parser + */ + bool parse_msgpack_internal() + { + switch (get()) + { + // EOF + case std::char_traits::eof(): + return unexpect_eof(input_format_t::msgpack, "value"); + + // positive fixint + case 0x00: + case 0x01: + case 0x02: + case 0x03: + case 0x04: + case 0x05: + case 0x06: + case 0x07: + case 0x08: + case 0x09: + case 0x0A: + case 0x0B: + case 0x0C: + case 0x0D: + case 0x0E: + case 0x0F: + case 0x10: + case 0x11: + case 0x12: + case 0x13: + case 0x14: + case 0x15: + case 0x16: + case 0x17: + case 0x18: + case 0x19: + case 0x1A: + case 0x1B: + case 0x1C: + case 0x1D: + case 0x1E: + case 0x1F: + case 0x20: + case 0x21: + case 0x22: + case 0x23: + case 0x24: + case 0x25: + case 0x26: + case 0x27: + case 0x28: + case 0x29: + case 0x2A: + case 0x2B: + case 0x2C: + case 0x2D: + case 0x2E: + case 0x2F: + case 0x30: + case 0x31: + case 0x32: + case 0x33: + case 0x34: + case 0x35: + case 0x36: + case 0x37: + case 0x38: + case 0x39: + case 0x3A: + case 0x3B: + case 0x3C: + case 0x3D: + case 0x3E: + case 0x3F: + case 0x40: + case 0x41: + case 0x42: + case 0x43: + case 0x44: + case 0x45: + case 0x46: + case 0x47: + case 0x48: + case 0x49: + case 0x4A: + case 0x4B: + case 0x4C: + case 0x4D: + case 0x4E: + case 0x4F: + case 0x50: + case 0x51: + case 0x52: + case 0x53: + case 0x54: + case 0x55: + case 0x56: + case 0x57: + case 0x58: + case 0x59: + case 0x5A: + case 0x5B: + case 0x5C: + case 0x5D: + case 0x5E: + case 0x5F: + case 0x60: + case 0x61: + case 0x62: + case 0x63: + case 0x64: + case 0x65: + case 0x66: + case 0x67: + case 0x68: + case 0x69: + case 0x6A: + case 0x6B: + case 0x6C: + case 0x6D: + case 0x6E: + case 0x6F: + case 0x70: + case 0x71: + case 0x72: + case 0x73: + case 0x74: + case 0x75: + case 0x76: + case 0x77: + case 0x78: + case 0x79: + case 0x7A: + case 0x7B: + case 0x7C: + case 0x7D: + case 0x7E: + case 0x7F: + return sax->number_unsigned(static_cast(current)); + + // fixmap + case 0x80: + case 0x81: + case 0x82: + case 0x83: + case 0x84: + case 0x85: + case 0x86: + case 0x87: + case 0x88: + case 0x89: + case 0x8A: + case 0x8B: + case 0x8C: + case 0x8D: + case 0x8E: + case 0x8F: + return get_msgpack_object(static_cast(static_cast(current) & 0x0Fu)); + + // fixarray + case 0x90: + case 0x91: + case 0x92: + case 0x93: + case 0x94: + case 0x95: + case 0x96: + case 0x97: + case 0x98: + case 0x99: + case 0x9A: + case 0x9B: + case 0x9C: + case 0x9D: + case 0x9E: + case 0x9F: + return get_msgpack_array(static_cast(static_cast(current) & 0x0Fu)); + + // fixstr + case 0xA0: + case 0xA1: + case 0xA2: + case 0xA3: + case 0xA4: + case 0xA5: + case 0xA6: + case 0xA7: + case 0xA8: + case 0xA9: + case 0xAA: + case 0xAB: + case 0xAC: + case 0xAD: + case 0xAE: + case 0xAF: + case 0xB0: + case 0xB1: + case 0xB2: + case 0xB3: + case 0xB4: + case 0xB5: + case 0xB6: + case 0xB7: + case 0xB8: + case 0xB9: + case 0xBA: + case 0xBB: + case 0xBC: + case 0xBD: + case 0xBE: + case 0xBF: + case 0xD9: // str 8 + case 0xDA: // str 16 + case 0xDB: // str 32 + { + string_t s; + return get_msgpack_string(s) && sax->string(s); + } + + case 0xC0: // nil + return sax->null(); + + case 0xC2: // false + return sax->boolean(false); + + case 0xC3: // true + return sax->boolean(true); + + case 0xC4: // bin 8 + case 0xC5: // bin 16 + case 0xC6: // bin 32 + case 0xC7: // ext 8 + case 0xC8: // ext 16 + case 0xC9: // ext 32 + case 0xD4: // fixext 1 + case 0xD5: // fixext 2 + case 0xD6: // fixext 4 + case 0xD7: // fixext 8 + case 0xD8: // fixext 16 + { + binary_t b; + return get_msgpack_binary(b) && sax->binary(b); + } + + case 0xCA: // float 32 + { + float number{}; + return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast(number), ""); + } + + case 0xCB: // float 64 + { + double number{}; + return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast(number), ""); + } + + case 0xCC: // uint 8 + { + std::uint8_t number{}; + return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number); + } + + case 0xCD: // uint 16 + { + std::uint16_t number{}; + return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number); + } + + case 0xCE: // uint 32 + { + std::uint32_t number{}; + return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number); + } + + case 0xCF: // uint 64 + { + std::uint64_t number{}; + return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number); + } + + case 0xD0: // int 8 + { + std::int8_t number{}; + return get_number(input_format_t::msgpack, number) && sax->number_integer(number); + } + + case 0xD1: // int 16 + { + std::int16_t number{}; + return get_number(input_format_t::msgpack, number) && sax->number_integer(number); + } + + case 0xD2: // int 32 + { + std::int32_t number{}; + return get_number(input_format_t::msgpack, number) && sax->number_integer(number); + } + + case 0xD3: // int 64 + { + std::int64_t number{}; + return get_number(input_format_t::msgpack, number) && sax->number_integer(number); + } + + case 0xDC: // array 16 + { + std::uint16_t len{}; + return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast(len)); + } + + case 0xDD: // array 32 + { + std::uint32_t len{}; + return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast(len)); + } + + case 0xDE: // map 16 + { + std::uint16_t len{}; + return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast(len)); + } + + case 0xDF: // map 32 + { + std::uint32_t len{}; + return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast(len)); + } + + // negative fixint + case 0xE0: + case 0xE1: + case 0xE2: + case 0xE3: + case 0xE4: + case 0xE5: + case 0xE6: + case 0xE7: + case 0xE8: + case 0xE9: + case 0xEA: + case 0xEB: + case 0xEC: + case 0xED: + case 0xEE: + case 0xEF: + case 0xF0: + case 0xF1: + case 0xF2: + case 0xF3: + case 0xF4: + case 0xF5: + case 0xF6: + case 0xF7: + case 0xF8: + case 0xF9: + case 0xFA: + case 0xFB: + case 0xFC: + case 0xFD: + case 0xFE: + case 0xFF: + return sax->number_integer(static_cast(current)); + + default: // anything else + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::msgpack, "invalid byte: 0x" + last_token, "value"), BasicJsonType())); + } + } + } + + /*! + @brief reads a MessagePack string + + This function first reads starting bytes to determine the expected + string length and then copies this number of bytes into a string. + + @param[out] result created string + + @return whether string creation completed + */ + bool get_msgpack_string(string_t& result) + { + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::msgpack, "string"))) + { + return false; + } + + switch (current) + { + // fixstr + case 0xA0: + case 0xA1: + case 0xA2: + case 0xA3: + case 0xA4: + case 0xA5: + case 0xA6: + case 0xA7: + case 0xA8: + case 0xA9: + case 0xAA: + case 0xAB: + case 0xAC: + case 0xAD: + case 0xAE: + case 0xAF: + case 0xB0: + case 0xB1: + case 0xB2: + case 0xB3: + case 0xB4: + case 0xB5: + case 0xB6: + case 0xB7: + case 0xB8: + case 0xB9: + case 0xBA: + case 0xBB: + case 0xBC: + case 0xBD: + case 0xBE: + case 0xBF: + { + return get_string(input_format_t::msgpack, static_cast(current) & 0x1Fu, result); + } + + case 0xD9: // str 8 + { + std::uint8_t len{}; + return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result); + } + + case 0xDA: // str 16 + { + std::uint16_t len{}; + return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result); + } + + case 0xDB: // str 32 + { + std::uint32_t len{}; + return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result); + } + + default: + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::msgpack, "expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x" + last_token, "string"), BasicJsonType())); + } + } + } + + /*! + @brief reads a MessagePack byte array + + This function first reads starting bytes to determine the expected + byte array length and then copies this number of bytes into a byte array. + + @param[out] result created byte array + + @return whether byte array creation completed + */ + bool get_msgpack_binary(binary_t& result) + { + // helper function to set the subtype + auto assign_and_return_true = [&result](std::int8_t subtype) + { + result.set_subtype(static_cast(subtype)); + return true; + }; + + switch (current) + { + case 0xC4: // bin 8 + { + std::uint8_t len{}; + return get_number(input_format_t::msgpack, len) && + get_binary(input_format_t::msgpack, len, result); + } + + case 0xC5: // bin 16 + { + std::uint16_t len{}; + return get_number(input_format_t::msgpack, len) && + get_binary(input_format_t::msgpack, len, result); + } + + case 0xC6: // bin 32 + { + std::uint32_t len{}; + return get_number(input_format_t::msgpack, len) && + get_binary(input_format_t::msgpack, len, result); + } + + case 0xC7: // ext 8 + { + std::uint8_t len{}; + std::int8_t subtype{}; + return get_number(input_format_t::msgpack, len) && + get_number(input_format_t::msgpack, subtype) && + get_binary(input_format_t::msgpack, len, result) && + assign_and_return_true(subtype); + } + + case 0xC8: // ext 16 + { + std::uint16_t len{}; + std::int8_t subtype{}; + return get_number(input_format_t::msgpack, len) && + get_number(input_format_t::msgpack, subtype) && + get_binary(input_format_t::msgpack, len, result) && + assign_and_return_true(subtype); + } + + case 0xC9: // ext 32 + { + std::uint32_t len{}; + std::int8_t subtype{}; + return get_number(input_format_t::msgpack, len) && + get_number(input_format_t::msgpack, subtype) && + get_binary(input_format_t::msgpack, len, result) && + assign_and_return_true(subtype); + } + + case 0xD4: // fixext 1 + { + std::int8_t subtype{}; + return get_number(input_format_t::msgpack, subtype) && + get_binary(input_format_t::msgpack, 1, result) && + assign_and_return_true(subtype); + } + + case 0xD5: // fixext 2 + { + std::int8_t subtype{}; + return get_number(input_format_t::msgpack, subtype) && + get_binary(input_format_t::msgpack, 2, result) && + assign_and_return_true(subtype); + } + + case 0xD6: // fixext 4 + { + std::int8_t subtype{}; + return get_number(input_format_t::msgpack, subtype) && + get_binary(input_format_t::msgpack, 4, result) && + assign_and_return_true(subtype); + } + + case 0xD7: // fixext 8 + { + std::int8_t subtype{}; + return get_number(input_format_t::msgpack, subtype) && + get_binary(input_format_t::msgpack, 8, result) && + assign_and_return_true(subtype); + } + + case 0xD8: // fixext 16 + { + std::int8_t subtype{}; + return get_number(input_format_t::msgpack, subtype) && + get_binary(input_format_t::msgpack, 16, result) && + assign_and_return_true(subtype); + } + + default: // LCOV_EXCL_LINE + return false; // LCOV_EXCL_LINE + } + } + + /*! + @param[in] len the length of the array + @return whether array creation completed + */ + bool get_msgpack_array(const std::size_t len) + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len))) + { + return false; + } + + for (std::size_t i = 0; i < len; ++i) + { + if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal())) + { + return false; + } + } + + return sax->end_array(); + } + + /*! + @param[in] len the length of the object + @return whether object creation completed + */ + bool get_msgpack_object(const std::size_t len) + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len))) + { + return false; + } + + string_t key; + for (std::size_t i = 0; i < len; ++i) + { + get(); + if (JSON_HEDLEY_UNLIKELY(!get_msgpack_string(key) || !sax->key(key))) + { + return false; + } + + if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal())) + { + return false; + } + key.clear(); + } + + return sax->end_object(); + } + + //////////// + // UBJSON // + //////////// + + /*! + @param[in] get_char whether a new character should be retrieved from the + input (true, default) or whether the last read + character should be considered instead + + @return whether a valid UBJSON value was passed to the SAX parser + */ + bool parse_ubjson_internal(const bool get_char = true) + { + return get_ubjson_value(get_char ? get_ignore_noop() : current); + } + + /*! + @brief reads a UBJSON string + + This function is either called after reading the 'S' byte explicitly + indicating a string, or in case of an object key where the 'S' byte can be + left out. + + @param[out] result created string + @param[in] get_char whether a new character should be retrieved from the + input (true, default) or whether the last read + character should be considered instead + + @return whether string creation completed + */ + bool get_ubjson_string(string_t& result, const bool get_char = true) + { + if (get_char) + { + get(); // TODO(niels): may we ignore N here? + } + + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "value"))) + { + return false; + } + + switch (current) + { + case 'U': + { + std::uint8_t len{}; + return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result); + } + + case 'i': + { + std::int8_t len{}; + return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result); + } + + case 'I': + { + std::int16_t len{}; + return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result); + } + + case 'l': + { + std::int32_t len{}; + return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result); + } + + case 'L': + { + std::int64_t len{}; + return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result); + } + + default: + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token, "string"), BasicJsonType())); + } + } + + /*! + @param[out] result determined size + @return whether size determination completed + */ + bool get_ubjson_size_value(std::size_t& result) + { + switch (get_ignore_noop()) + { + case 'U': + { + std::uint8_t number{}; + if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number))) + { + return false; + } + result = static_cast(number); + return true; + } + + case 'i': + { + std::int8_t number{}; + if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number))) + { + return false; + } + result = static_cast(number); // NOLINT(bugprone-signed-char-misuse,cert-str34-c): number is not a char + return true; + } + + case 'I': + { + std::int16_t number{}; + if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number))) + { + return false; + } + result = static_cast(number); + return true; + } + + case 'l': + { + std::int32_t number{}; + if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number))) + { + return false; + } + result = static_cast(number); + return true; + } + + case 'L': + { + std::int64_t number{}; + if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number))) + { + return false; + } + result = static_cast(number); + return true; + } + + default: + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token, "size"), BasicJsonType())); + } + } + } + + /*! + @brief determine the type and size for a container + + In the optimized UBJSON format, a type and a size can be provided to allow + for a more compact representation. + + @param[out] result pair of the size and the type + + @return whether pair creation completed + */ + bool get_ubjson_size_type(std::pair& result) + { + result.first = string_t::npos; // size + result.second = 0; // type + + get_ignore_noop(); + + if (current == '$') + { + result.second = get(); // must not ignore 'N', because 'N' maybe the type + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "type"))) + { + return false; + } + + get_ignore_noop(); + if (JSON_HEDLEY_UNLIKELY(current != '#')) + { + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "value"))) + { + return false; + } + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "expected '#' after type information; last byte: 0x" + last_token, "size"), BasicJsonType())); + } + + return get_ubjson_size_value(result.first); + } + + if (current == '#') + { + return get_ubjson_size_value(result.first); + } + + return true; + } + + /*! + @param prefix the previously read or set type prefix + @return whether value creation completed + */ + bool get_ubjson_value(const char_int_type prefix) + { + switch (prefix) + { + case std::char_traits::eof(): // EOF + return unexpect_eof(input_format_t::ubjson, "value"); + + case 'T': // true + return sax->boolean(true); + case 'F': // false + return sax->boolean(false); + + case 'Z': // null + return sax->null(); + + case 'U': + { + std::uint8_t number{}; + return get_number(input_format_t::ubjson, number) && sax->number_unsigned(number); + } + + case 'i': + { + std::int8_t number{}; + return get_number(input_format_t::ubjson, number) && sax->number_integer(number); + } + + case 'I': + { + std::int16_t number{}; + return get_number(input_format_t::ubjson, number) && sax->number_integer(number); + } + + case 'l': + { + std::int32_t number{}; + return get_number(input_format_t::ubjson, number) && sax->number_integer(number); + } + + case 'L': + { + std::int64_t number{}; + return get_number(input_format_t::ubjson, number) && sax->number_integer(number); + } + + case 'd': + { + float number{}; + return get_number(input_format_t::ubjson, number) && sax->number_float(static_cast(number), ""); + } + + case 'D': + { + double number{}; + return get_number(input_format_t::ubjson, number) && sax->number_float(static_cast(number), ""); + } + + case 'H': + { + return get_ubjson_high_precision_number(); + } + + case 'C': // char + { + get(); + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "char"))) + { + return false; + } + if (JSON_HEDLEY_UNLIKELY(current > 127)) + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token, "char"), BasicJsonType())); + } + string_t s(1, static_cast(current)); + return sax->string(s); + } + + case 'S': // string + { + string_t s; + return get_ubjson_string(s) && sax->string(s); + } + + case '[': // array + return get_ubjson_array(); + + case '{': // object + return get_ubjson_object(); + + default: // anything else + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "invalid byte: 0x" + last_token, "value"), BasicJsonType())); + } + } + } + + /*! + @return whether array creation completed + */ + bool get_ubjson_array() + { + std::pair size_and_type; + if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type))) + { + return false; + } + + if (size_and_type.first != string_t::npos) + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_array(size_and_type.first))) + { + return false; + } + + if (size_and_type.second != 0) + { + if (size_and_type.second != 'N') + { + for (std::size_t i = 0; i < size_and_type.first; ++i) + { + if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second))) + { + return false; + } + } + } + } + else + { + for (std::size_t i = 0; i < size_and_type.first; ++i) + { + if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal())) + { + return false; + } + } + } + } + else + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1)))) + { + return false; + } + + while (current != ']') + { + if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal(false))) + { + return false; + } + get_ignore_noop(); + } + } + + return sax->end_array(); + } + + /*! + @return whether object creation completed + */ + bool get_ubjson_object() + { + std::pair size_and_type; + if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type))) + { + return false; + } + + string_t key; + if (size_and_type.first != string_t::npos) + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_object(size_and_type.first))) + { + return false; + } + + if (size_and_type.second != 0) + { + for (std::size_t i = 0; i < size_and_type.first; ++i) + { + if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key))) + { + return false; + } + if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second))) + { + return false; + } + key.clear(); + } + } + else + { + for (std::size_t i = 0; i < size_and_type.first; ++i) + { + if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key))) + { + return false; + } + if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal())) + { + return false; + } + key.clear(); + } + } + } + else + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1)))) + { + return false; + } + + while (current != '}') + { + if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key, false) || !sax->key(key))) + { + return false; + } + if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal())) + { + return false; + } + get_ignore_noop(); + key.clear(); + } + } + + return sax->end_object(); + } + + // Note, no reader for UBJSON binary types is implemented because they do + // not exist + + bool get_ubjson_high_precision_number() + { + // get size of following number string + std::size_t size{}; + auto res = get_ubjson_size_value(size); + if (JSON_HEDLEY_UNLIKELY(!res)) + { + return res; + } + + // get number string + std::vector number_vector; + for (std::size_t i = 0; i < size; ++i) + { + get(); + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "number"))) + { + return false; + } + number_vector.push_back(static_cast(current)); + } + + // parse number string + using ia_type = decltype(detail::input_adapter(number_vector)); + auto number_lexer = detail::lexer(detail::input_adapter(number_vector), false); + const auto result_number = number_lexer.scan(); + const auto number_string = number_lexer.get_token_string(); + const auto result_remainder = number_lexer.scan(); + + using token_type = typename detail::lexer_base::token_type; + + if (JSON_HEDLEY_UNLIKELY(result_remainder != token_type::end_of_input)) + { + return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read, exception_message(input_format_t::ubjson, "invalid number text: " + number_lexer.get_token_string(), "high-precision number"), BasicJsonType())); + } + + switch (result_number) + { + case token_type::value_integer: + return sax->number_integer(number_lexer.get_number_integer()); + case token_type::value_unsigned: + return sax->number_unsigned(number_lexer.get_number_unsigned()); + case token_type::value_float: + return sax->number_float(number_lexer.get_number_float(), std::move(number_string)); + case token_type::uninitialized: + case token_type::literal_true: + case token_type::literal_false: + case token_type::literal_null: + case token_type::value_string: + case token_type::begin_array: + case token_type::begin_object: + case token_type::end_array: + case token_type::end_object: + case token_type::name_separator: + case token_type::value_separator: + case token_type::parse_error: + case token_type::end_of_input: + case token_type::literal_or_value: + default: + return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read, exception_message(input_format_t::ubjson, "invalid number text: " + number_lexer.get_token_string(), "high-precision number"), BasicJsonType())); + } + } + + /////////////////////// + // Utility functions // + /////////////////////// + + /*! + @brief get next character from the input + + This function provides the interface to the used input adapter. It does + not throw in case the input reached EOF, but returns a -'ve valued + `std::char_traits::eof()` in that case. + + @return character read from the input + */ + char_int_type get() + { + ++chars_read; + return current = ia.get_character(); + } + + /*! + @return character read from the input after ignoring all 'N' entries + */ + char_int_type get_ignore_noop() + { + do + { + get(); + } + while (current == 'N'); + + return current; + } + + /* + @brief read a number from the input + + @tparam NumberType the type of the number + @param[in] format the current format (for diagnostics) + @param[out] result number of type @a NumberType + + @return whether conversion completed + + @note This function needs to respect the system's endianess, because + bytes in CBOR, MessagePack, and UBJSON are stored in network order + (big endian) and therefore need reordering on little endian systems. + */ + template + bool get_number(const input_format_t format, NumberType& result) + { + // step 1: read input into array with system's byte order + std::array vec{}; + for (std::size_t i = 0; i < sizeof(NumberType); ++i) + { + get(); + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "number"))) + { + return false; + } + + // reverse byte order prior to conversion if necessary + if (is_little_endian != InputIsLittleEndian) + { + vec[sizeof(NumberType) - i - 1] = static_cast(current); + } + else + { + vec[i] = static_cast(current); // LCOV_EXCL_LINE + } + } + + // step 2: convert array into number of type T and return + std::memcpy(&result, vec.data(), sizeof(NumberType)); + return true; + } + + /*! + @brief create a string by reading characters from the input + + @tparam NumberType the type of the number + @param[in] format the current format (for diagnostics) + @param[in] len number of characters to read + @param[out] result string created by reading @a len bytes + + @return whether string creation completed + + @note We can not reserve @a len bytes for the result, because @a len + may be too large. Usually, @ref unexpect_eof() detects the end of + the input before we run out of string memory. + */ + template + bool get_string(const input_format_t format, + const NumberType len, + string_t& result) + { + bool success = true; + for (NumberType i = 0; i < len; i++) + { + get(); + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "string"))) + { + success = false; + break; + } + result.push_back(static_cast(current)); + } + return success; + } + + /*! + @brief create a byte array by reading bytes from the input + + @tparam NumberType the type of the number + @param[in] format the current format (for diagnostics) + @param[in] len number of bytes to read + @param[out] result byte array created by reading @a len bytes + + @return whether byte array creation completed + + @note We can not reserve @a len bytes for the result, because @a len + may be too large. Usually, @ref unexpect_eof() detects the end of + the input before we run out of memory. + */ + template + bool get_binary(const input_format_t format, + const NumberType len, + binary_t& result) + { + bool success = true; + for (NumberType i = 0; i < len; i++) + { + get(); + if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "binary"))) + { + success = false; + break; + } + result.push_back(static_cast(current)); + } + return success; + } + + /*! + @param[in] format the current format (for diagnostics) + @param[in] context further context information (for diagnostics) + @return whether the last read character is not EOF + */ + JSON_HEDLEY_NON_NULL(3) + bool unexpect_eof(const input_format_t format, const char* context) const + { + if (JSON_HEDLEY_UNLIKELY(current == std::char_traits::eof())) + { + return sax->parse_error(chars_read, "", + parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context), BasicJsonType())); + } + return true; + } + + /*! + @return a string representation of the last read byte + */ + std::string get_token_string() const + { + std::array cr{{}}; + (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast(current)); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg) + return std::string{cr.data()}; + } + + /*! + @param[in] format the current format + @param[in] detail a detailed error message + @param[in] context further context information + @return a message string to use in the parse_error exceptions + */ + std::string exception_message(const input_format_t format, + const std::string& detail, + const std::string& context) const + { + std::string error_msg = "syntax error while parsing "; + + switch (format) + { + case input_format_t::cbor: + error_msg += "CBOR"; + break; + + case input_format_t::msgpack: + error_msg += "MessagePack"; + break; + + case input_format_t::ubjson: + error_msg += "UBJSON"; + break; + + case input_format_t::bson: + error_msg += "BSON"; + break; + + case input_format_t::json: // LCOV_EXCL_LINE + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE + } + + return error_msg + " " + context + ": " + detail; + } + + private: + /// input adapter + InputAdapterType ia; + + /// the current character + char_int_type current = std::char_traits::eof(); + + /// the number of characters read + std::size_t chars_read = 0; + + /// whether we can assume little endianess + const bool is_little_endian = little_endianess(); + + /// the SAX parser + json_sax_t* sax = nullptr; +}; +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/input/input_adapters.hpp b/src/nlohmann/detail/input/input_adapters.hpp new file mode 100644 index 00000000000..6df58a1cd57 --- /dev/null +++ b/src/nlohmann/detail/input/input_adapters.hpp @@ -0,0 +1,483 @@ +#pragma once + +#include // array +#include // size_t +#include // strlen +#include // begin, end, iterator_traits, random_access_iterator_tag, distance, next +#include // shared_ptr, make_shared, addressof +#include // accumulate +#include // string, char_traits +#include // enable_if, is_base_of, is_pointer, is_integral, remove_pointer +#include // pair, declval + +#ifndef JSON_NO_IO + #include // FILE * + #include // istream +#endif // JSON_NO_IO + +#include +#include + +namespace nlohmann +{ +namespace detail +{ +/// the supported input formats +enum class input_format_t { json, cbor, msgpack, ubjson, bson }; + +//////////////////// +// input adapters // +//////////////////// + +#ifndef JSON_NO_IO +/*! +Input adapter for stdio file access. This adapter read only 1 byte and do not use any + buffer. This adapter is a very low level adapter. +*/ +class file_input_adapter +{ + public: + using char_type = char; + + JSON_HEDLEY_NON_NULL(2) + explicit file_input_adapter(std::FILE* f) noexcept + : m_file(f) + {} + + // make class move-only + file_input_adapter(const file_input_adapter&) = delete; + file_input_adapter(file_input_adapter&&) noexcept = default; + file_input_adapter& operator=(const file_input_adapter&) = delete; + file_input_adapter& operator=(file_input_adapter&&) = delete; + ~file_input_adapter() = default; + + std::char_traits::int_type get_character() noexcept + { + return std::fgetc(m_file); + } + + private: + /// the file pointer to read from + std::FILE* m_file; +}; + + +/*! +Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at +beginning of input. Does not support changing the underlying std::streambuf +in mid-input. Maintains underlying std::istream and std::streambuf to support +subsequent use of standard std::istream operations to process any input +characters following those used in parsing the JSON input. Clears the +std::istream flags; any input errors (e.g., EOF) will be detected by the first +subsequent call for input from the std::istream. +*/ +class input_stream_adapter +{ + public: + using char_type = char; + + ~input_stream_adapter() + { + // clear stream flags; we use underlying streambuf I/O, do not + // maintain ifstream flags, except eof + if (is != nullptr) + { + is->clear(is->rdstate() & std::ios::eofbit); + } + } + + explicit input_stream_adapter(std::istream& i) + : is(&i), sb(i.rdbuf()) + {} + + // delete because of pointer members + input_stream_adapter(const input_stream_adapter&) = delete; + input_stream_adapter& operator=(input_stream_adapter&) = delete; + input_stream_adapter& operator=(input_stream_adapter&&) = delete; + + input_stream_adapter(input_stream_adapter&& rhs) noexcept + : is(rhs.is), sb(rhs.sb) + { + rhs.is = nullptr; + rhs.sb = nullptr; + } + + // std::istream/std::streambuf use std::char_traits::to_int_type, to + // ensure that std::char_traits::eof() and the character 0xFF do not + // end up as the same value, eg. 0xFFFFFFFF. + std::char_traits::int_type get_character() + { + auto res = sb->sbumpc(); + // set eof manually, as we don't use the istream interface. + if (JSON_HEDLEY_UNLIKELY(res == std::char_traits::eof())) + { + is->clear(is->rdstate() | std::ios::eofbit); + } + return res; + } + + private: + /// the associated input stream + std::istream* is = nullptr; + std::streambuf* sb = nullptr; +}; +#endif // JSON_NO_IO + +// General-purpose iterator-based adapter. It might not be as fast as +// theoretically possible for some containers, but it is extremely versatile. +template +class iterator_input_adapter +{ + public: + using char_type = typename std::iterator_traits::value_type; + + iterator_input_adapter(IteratorType first, IteratorType last) + : current(std::move(first)), end(std::move(last)) + {} + + typename std::char_traits::int_type get_character() + { + if (JSON_HEDLEY_LIKELY(current != end)) + { + auto result = std::char_traits::to_int_type(*current); + std::advance(current, 1); + return result; + } + + return std::char_traits::eof(); + } + + private: + IteratorType current; + IteratorType end; + + template + friend struct wide_string_input_helper; + + bool empty() const + { + return current == end; + } +}; + + +template +struct wide_string_input_helper; + +template +struct wide_string_input_helper +{ + // UTF-32 + static void fill_buffer(BaseInputAdapter& input, + std::array::int_type, 4>& utf8_bytes, + size_t& utf8_bytes_index, + size_t& utf8_bytes_filled) + { + utf8_bytes_index = 0; + + if (JSON_HEDLEY_UNLIKELY(input.empty())) + { + utf8_bytes[0] = std::char_traits::eof(); + utf8_bytes_filled = 1; + } + else + { + // get the current character + const auto wc = input.get_character(); + + // UTF-32 to UTF-8 encoding + if (wc < 0x80) + { + utf8_bytes[0] = static_cast::int_type>(wc); + utf8_bytes_filled = 1; + } + else if (wc <= 0x7FF) + { + utf8_bytes[0] = static_cast::int_type>(0xC0u | ((static_cast(wc) >> 6u) & 0x1Fu)); + utf8_bytes[1] = static_cast::int_type>(0x80u | (static_cast(wc) & 0x3Fu)); + utf8_bytes_filled = 2; + } + else if (wc <= 0xFFFF) + { + utf8_bytes[0] = static_cast::int_type>(0xE0u | ((static_cast(wc) >> 12u) & 0x0Fu)); + utf8_bytes[1] = static_cast::int_type>(0x80u | ((static_cast(wc) >> 6u) & 0x3Fu)); + utf8_bytes[2] = static_cast::int_type>(0x80u | (static_cast(wc) & 0x3Fu)); + utf8_bytes_filled = 3; + } + else if (wc <= 0x10FFFF) + { + utf8_bytes[0] = static_cast::int_type>(0xF0u | ((static_cast(wc) >> 18u) & 0x07u)); + utf8_bytes[1] = static_cast::int_type>(0x80u | ((static_cast(wc) >> 12u) & 0x3Fu)); + utf8_bytes[2] = static_cast::int_type>(0x80u | ((static_cast(wc) >> 6u) & 0x3Fu)); + utf8_bytes[3] = static_cast::int_type>(0x80u | (static_cast(wc) & 0x3Fu)); + utf8_bytes_filled = 4; + } + else + { + // unknown character + utf8_bytes[0] = static_cast::int_type>(wc); + utf8_bytes_filled = 1; + } + } + } +}; + +template +struct wide_string_input_helper +{ + // UTF-16 + static void fill_buffer(BaseInputAdapter& input, + std::array::int_type, 4>& utf8_bytes, + size_t& utf8_bytes_index, + size_t& utf8_bytes_filled) + { + utf8_bytes_index = 0; + + if (JSON_HEDLEY_UNLIKELY(input.empty())) + { + utf8_bytes[0] = std::char_traits::eof(); + utf8_bytes_filled = 1; + } + else + { + // get the current character + const auto wc = input.get_character(); + + // UTF-16 to UTF-8 encoding + if (wc < 0x80) + { + utf8_bytes[0] = static_cast::int_type>(wc); + utf8_bytes_filled = 1; + } + else if (wc <= 0x7FF) + { + utf8_bytes[0] = static_cast::int_type>(0xC0u | ((static_cast(wc) >> 6u))); + utf8_bytes[1] = static_cast::int_type>(0x80u | (static_cast(wc) & 0x3Fu)); + utf8_bytes_filled = 2; + } + else if (0xD800 > wc || wc >= 0xE000) + { + utf8_bytes[0] = static_cast::int_type>(0xE0u | ((static_cast(wc) >> 12u))); + utf8_bytes[1] = static_cast::int_type>(0x80u | ((static_cast(wc) >> 6u) & 0x3Fu)); + utf8_bytes[2] = static_cast::int_type>(0x80u | (static_cast(wc) & 0x3Fu)); + utf8_bytes_filled = 3; + } + else + { + if (JSON_HEDLEY_UNLIKELY(!input.empty())) + { + const auto wc2 = static_cast(input.get_character()); + const auto charcode = 0x10000u + (((static_cast(wc) & 0x3FFu) << 10u) | (wc2 & 0x3FFu)); + utf8_bytes[0] = static_cast::int_type>(0xF0u | (charcode >> 18u)); + utf8_bytes[1] = static_cast::int_type>(0x80u | ((charcode >> 12u) & 0x3Fu)); + utf8_bytes[2] = static_cast::int_type>(0x80u | ((charcode >> 6u) & 0x3Fu)); + utf8_bytes[3] = static_cast::int_type>(0x80u | (charcode & 0x3Fu)); + utf8_bytes_filled = 4; + } + else + { + utf8_bytes[0] = static_cast::int_type>(wc); + utf8_bytes_filled = 1; + } + } + } + } +}; + +// Wraps another input apdater to convert wide character types into individual bytes. +template +class wide_string_input_adapter +{ + public: + using char_type = char; + + wide_string_input_adapter(BaseInputAdapter base) + : base_adapter(base) {} + + typename std::char_traits::int_type get_character() noexcept + { + // check if buffer needs to be filled + if (utf8_bytes_index == utf8_bytes_filled) + { + fill_buffer(); + + JSON_ASSERT(utf8_bytes_filled > 0); + JSON_ASSERT(utf8_bytes_index == 0); + } + + // use buffer + JSON_ASSERT(utf8_bytes_filled > 0); + JSON_ASSERT(utf8_bytes_index < utf8_bytes_filled); + return utf8_bytes[utf8_bytes_index++]; + } + + private: + BaseInputAdapter base_adapter; + + template + void fill_buffer() + { + wide_string_input_helper::fill_buffer(base_adapter, utf8_bytes, utf8_bytes_index, utf8_bytes_filled); + } + + /// a buffer for UTF-8 bytes + std::array::int_type, 4> utf8_bytes = {{0, 0, 0, 0}}; + + /// index to the utf8_codes array for the next valid byte + std::size_t utf8_bytes_index = 0; + /// number of valid bytes in the utf8_codes array + std::size_t utf8_bytes_filled = 0; +}; + + +template +struct iterator_input_adapter_factory +{ + using iterator_type = IteratorType; + using char_type = typename std::iterator_traits::value_type; + using adapter_type = iterator_input_adapter; + + static adapter_type create(IteratorType first, IteratorType last) + { + return adapter_type(std::move(first), std::move(last)); + } +}; + +template +struct is_iterator_of_multibyte +{ + using value_type = typename std::iterator_traits::value_type; + enum + { + value = sizeof(value_type) > 1 + }; +}; + +template +struct iterator_input_adapter_factory::value>> +{ + using iterator_type = IteratorType; + using char_type = typename std::iterator_traits::value_type; + using base_adapter_type = iterator_input_adapter; + using adapter_type = wide_string_input_adapter; + + static adapter_type create(IteratorType first, IteratorType last) + { + return adapter_type(base_adapter_type(std::move(first), std::move(last))); + } +}; + +// General purpose iterator-based input +template +typename iterator_input_adapter_factory::adapter_type input_adapter(IteratorType first, IteratorType last) +{ + using factory_type = iterator_input_adapter_factory; + return factory_type::create(first, last); +} + +// Convenience shorthand from container to iterator +// Enables ADL on begin(container) and end(container) +// Encloses the using declarations in namespace for not to leak them to outside scope + +namespace container_input_adapter_factory_impl +{ + +using std::begin; +using std::end; + +template +struct container_input_adapter_factory {}; + +template +struct container_input_adapter_factory< ContainerType, + void_t()), end(std::declval()))>> + { + using adapter_type = decltype(input_adapter(begin(std::declval()), end(std::declval()))); + + static adapter_type create(const ContainerType& container) +{ + return input_adapter(begin(container), end(container)); +} + }; + +} // namespace container_input_adapter_factory_impl + +template +typename container_input_adapter_factory_impl::container_input_adapter_factory::adapter_type input_adapter(const ContainerType& container) +{ + return container_input_adapter_factory_impl::container_input_adapter_factory::create(container); +} + +#ifndef JSON_NO_IO +// Special cases with fast paths +inline file_input_adapter input_adapter(std::FILE* file) +{ + return file_input_adapter(file); +} + +inline input_stream_adapter input_adapter(std::istream& stream) +{ + return input_stream_adapter(stream); +} + +inline input_stream_adapter input_adapter(std::istream&& stream) +{ + return input_stream_adapter(stream); +} +#endif // JSON_NO_IO + +using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval(), std::declval())); + +// Null-delimited strings, and the like. +template < typename CharT, + typename std::enable_if < + std::is_pointer::value&& + !std::is_array::value&& + std::is_integral::type>::value&& + sizeof(typename std::remove_pointer::type) == 1, + int >::type = 0 > +contiguous_bytes_input_adapter input_adapter(CharT b) +{ + auto length = std::strlen(reinterpret_cast(b)); + const auto* ptr = reinterpret_cast(b); + return input_adapter(ptr, ptr + length); +} + +template +auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N)) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) +{ + return input_adapter(array, array + N); +} + +// This class only handles inputs of input_buffer_adapter type. +// It's required so that expressions like {ptr, len} can be implicitely casted +// to the correct adapter. +class span_input_adapter +{ + public: + template < typename CharT, + typename std::enable_if < + std::is_pointer::value&& + std::is_integral::type>::value&& + sizeof(typename std::remove_pointer::type) == 1, + int >::type = 0 > + span_input_adapter(CharT b, std::size_t l) + : ia(reinterpret_cast(b), reinterpret_cast(b) + l) {} + + template::iterator_category, std::random_access_iterator_tag>::value, + int>::type = 0> + span_input_adapter(IteratorType first, IteratorType last) + : ia(input_adapter(first, last)) {} + + contiguous_bytes_input_adapter&& get() + { + return std::move(ia); // NOLINT(hicpp-move-const-arg,performance-move-const-arg) + } + + private: + contiguous_bytes_input_adapter ia; +}; +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/input/json_sax.hpp b/src/nlohmann/detail/input/json_sax.hpp new file mode 100644 index 00000000000..67278f85664 --- /dev/null +++ b/src/nlohmann/detail/input/json_sax.hpp @@ -0,0 +1,711 @@ +#pragma once + +#include +#include // string +#include // move +#include // vector + +#include +#include + +namespace nlohmann +{ + +/*! +@brief SAX interface + +This class describes the SAX interface used by @ref nlohmann::json::sax_parse. +Each function is called in different situations while the input is parsed. The +boolean return value informs the parser whether to continue processing the +input. +*/ +template +struct json_sax +{ + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + using string_t = typename BasicJsonType::string_t; + using binary_t = typename BasicJsonType::binary_t; + + /*! + @brief a null value was read + @return whether parsing should proceed + */ + virtual bool null() = 0; + + /*! + @brief a boolean value was read + @param[in] val boolean value + @return whether parsing should proceed + */ + virtual bool boolean(bool val) = 0; + + /*! + @brief an integer number was read + @param[in] val integer value + @return whether parsing should proceed + */ + virtual bool number_integer(number_integer_t val) = 0; + + /*! + @brief an unsigned integer number was read + @param[in] val unsigned integer value + @return whether parsing should proceed + */ + virtual bool number_unsigned(number_unsigned_t val) = 0; + + /*! + @brief an floating-point number was read + @param[in] val floating-point value + @param[in] s raw token value + @return whether parsing should proceed + */ + virtual bool number_float(number_float_t val, const string_t& s) = 0; + + /*! + @brief a string was read + @param[in] val string value + @return whether parsing should proceed + @note It is safe to move the passed string. + */ + virtual bool string(string_t& val) = 0; + + /*! + @brief a binary string was read + @param[in] val binary value + @return whether parsing should proceed + @note It is safe to move the passed binary. + */ + virtual bool binary(binary_t& val) = 0; + + /*! + @brief the beginning of an object was read + @param[in] elements number of object elements or -1 if unknown + @return whether parsing should proceed + @note binary formats may report the number of elements + */ + virtual bool start_object(std::size_t elements) = 0; + + /*! + @brief an object key was read + @param[in] val object key + @return whether parsing should proceed + @note It is safe to move the passed string. + */ + virtual bool key(string_t& val) = 0; + + /*! + @brief the end of an object was read + @return whether parsing should proceed + */ + virtual bool end_object() = 0; + + /*! + @brief the beginning of an array was read + @param[in] elements number of array elements or -1 if unknown + @return whether parsing should proceed + @note binary formats may report the number of elements + */ + virtual bool start_array(std::size_t elements) = 0; + + /*! + @brief the end of an array was read + @return whether parsing should proceed + */ + virtual bool end_array() = 0; + + /*! + @brief a parse error occurred + @param[in] position the position in the input where the error occurs + @param[in] last_token the last read token + @param[in] ex an exception object describing the error + @return whether parsing should proceed (must return false) + */ + virtual bool parse_error(std::size_t position, + const std::string& last_token, + const detail::exception& ex) = 0; + + json_sax() = default; + json_sax(const json_sax&) = default; + json_sax(json_sax&&) noexcept = default; + json_sax& operator=(const json_sax&) = default; + json_sax& operator=(json_sax&&) noexcept = default; + virtual ~json_sax() = default; +}; + + +namespace detail +{ +/*! +@brief SAX implementation to create a JSON value from SAX events + +This class implements the @ref json_sax interface and processes the SAX events +to create a JSON value which makes it basically a DOM parser. The structure or +hierarchy of the JSON value is managed by the stack `ref_stack` which contains +a pointer to the respective array or object for each recursion depth. + +After successful parsing, the value that is passed by reference to the +constructor contains the parsed value. + +@tparam BasicJsonType the JSON type +*/ +template +class json_sax_dom_parser +{ + public: + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + using string_t = typename BasicJsonType::string_t; + using binary_t = typename BasicJsonType::binary_t; + + /*! + @param[in,out] r reference to a JSON value that is manipulated while + parsing + @param[in] allow_exceptions_ whether parse errors yield exceptions + */ + explicit json_sax_dom_parser(BasicJsonType& r, const bool allow_exceptions_ = true) + : root(r), allow_exceptions(allow_exceptions_) + {} + + // make class move-only + json_sax_dom_parser(const json_sax_dom_parser&) = delete; + json_sax_dom_parser(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor) + json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete; + json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor) + ~json_sax_dom_parser() = default; + + bool null() + { + handle_value(nullptr); + return true; + } + + bool boolean(bool val) + { + handle_value(val); + return true; + } + + bool number_integer(number_integer_t val) + { + handle_value(val); + return true; + } + + bool number_unsigned(number_unsigned_t val) + { + handle_value(val); + return true; + } + + bool number_float(number_float_t val, const string_t& /*unused*/) + { + handle_value(val); + return true; + } + + bool string(string_t& val) + { + handle_value(val); + return true; + } + + bool binary(binary_t& val) + { + handle_value(std::move(val)); + return true; + } + + bool start_object(std::size_t len) + { + ref_stack.push_back(handle_value(BasicJsonType::value_t::object)); + + if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size())) + { + JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len), *ref_stack.back())); + } + + return true; + } + + bool key(string_t& val) + { + // add null at given key and store the reference for later + object_element = &(ref_stack.back()->m_value.object->operator[](val)); + return true; + } + + bool end_object() + { + ref_stack.back()->set_parents(); + ref_stack.pop_back(); + return true; + } + + bool start_array(std::size_t len) + { + ref_stack.push_back(handle_value(BasicJsonType::value_t::array)); + + if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size())) + { + JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len), *ref_stack.back())); + } + + return true; + } + + bool end_array() + { + ref_stack.back()->set_parents(); + ref_stack.pop_back(); + return true; + } + + template + bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, + const Exception& ex) + { + errored = true; + static_cast(ex); + if (allow_exceptions) + { + JSON_THROW(ex); + } + return false; + } + + constexpr bool is_errored() const + { + return errored; + } + + private: + /*! + @invariant If the ref stack is empty, then the passed value will be the new + root. + @invariant If the ref stack contains a value, then it is an array or an + object to which we can add elements + */ + template + JSON_HEDLEY_RETURNS_NON_NULL + BasicJsonType* handle_value(Value&& v) + { + if (ref_stack.empty()) + { + root = BasicJsonType(std::forward(v)); + return &root; + } + + JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object()); + + if (ref_stack.back()->is_array()) + { + ref_stack.back()->m_value.array->emplace_back(std::forward(v)); + return &(ref_stack.back()->m_value.array->back()); + } + + JSON_ASSERT(ref_stack.back()->is_object()); + JSON_ASSERT(object_element); + *object_element = BasicJsonType(std::forward(v)); + return object_element; + } + + /// the parsed JSON value + BasicJsonType& root; + /// stack to model hierarchy of values + std::vector ref_stack {}; + /// helper to hold the reference for the next object element + BasicJsonType* object_element = nullptr; + /// whether a syntax error occurred + bool errored = false; + /// whether to throw exceptions in case of errors + const bool allow_exceptions = true; +}; + +template +class json_sax_dom_callback_parser +{ + public: + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + using string_t = typename BasicJsonType::string_t; + using binary_t = typename BasicJsonType::binary_t; + using parser_callback_t = typename BasicJsonType::parser_callback_t; + using parse_event_t = typename BasicJsonType::parse_event_t; + + json_sax_dom_callback_parser(BasicJsonType& r, + const parser_callback_t cb, + const bool allow_exceptions_ = true) + : root(r), callback(cb), allow_exceptions(allow_exceptions_) + { + keep_stack.push_back(true); + } + + // make class move-only + json_sax_dom_callback_parser(const json_sax_dom_callback_parser&) = delete; + json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor) + json_sax_dom_callback_parser& operator=(const json_sax_dom_callback_parser&) = delete; + json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor) + ~json_sax_dom_callback_parser() = default; + + bool null() + { + handle_value(nullptr); + return true; + } + + bool boolean(bool val) + { + handle_value(val); + return true; + } + + bool number_integer(number_integer_t val) + { + handle_value(val); + return true; + } + + bool number_unsigned(number_unsigned_t val) + { + handle_value(val); + return true; + } + + bool number_float(number_float_t val, const string_t& /*unused*/) + { + handle_value(val); + return true; + } + + bool string(string_t& val) + { + handle_value(val); + return true; + } + + bool binary(binary_t& val) + { + handle_value(std::move(val)); + return true; + } + + bool start_object(std::size_t len) + { + // check callback for object start + const bool keep = callback(static_cast(ref_stack.size()), parse_event_t::object_start, discarded); + keep_stack.push_back(keep); + + auto val = handle_value(BasicJsonType::value_t::object, true); + ref_stack.push_back(val.second); + + // check object limit + if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size())) + { + JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len), *ref_stack.back())); + } + + return true; + } + + bool key(string_t& val) + { + BasicJsonType k = BasicJsonType(val); + + // check callback for key + const bool keep = callback(static_cast(ref_stack.size()), parse_event_t::key, k); + key_keep_stack.push_back(keep); + + // add discarded value at given key and store the reference for later + if (keep && ref_stack.back()) + { + object_element = &(ref_stack.back()->m_value.object->operator[](val) = discarded); + } + + return true; + } + + bool end_object() + { + if (ref_stack.back()) + { + if (!callback(static_cast(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back())) + { + // discard object + *ref_stack.back() = discarded; + } + else + { + ref_stack.back()->set_parents(); + } + } + + JSON_ASSERT(!ref_stack.empty()); + JSON_ASSERT(!keep_stack.empty()); + ref_stack.pop_back(); + keep_stack.pop_back(); + + if (!ref_stack.empty() && ref_stack.back() && ref_stack.back()->is_structured()) + { + // remove discarded value + for (auto it = ref_stack.back()->begin(); it != ref_stack.back()->end(); ++it) + { + if (it->is_discarded()) + { + ref_stack.back()->erase(it); + break; + } + } + } + + return true; + } + + bool start_array(std::size_t len) + { + const bool keep = callback(static_cast(ref_stack.size()), parse_event_t::array_start, discarded); + keep_stack.push_back(keep); + + auto val = handle_value(BasicJsonType::value_t::array, true); + ref_stack.push_back(val.second); + + // check array limit + if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size())) + { + JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len), *ref_stack.back())); + } + + return true; + } + + bool end_array() + { + bool keep = true; + + if (ref_stack.back()) + { + keep = callback(static_cast(ref_stack.size()) - 1, parse_event_t::array_end, *ref_stack.back()); + if (keep) + { + ref_stack.back()->set_parents(); + } + else + { + // discard array + *ref_stack.back() = discarded; + } + } + + JSON_ASSERT(!ref_stack.empty()); + JSON_ASSERT(!keep_stack.empty()); + ref_stack.pop_back(); + keep_stack.pop_back(); + + // remove discarded value + if (!keep && !ref_stack.empty() && ref_stack.back()->is_array()) + { + ref_stack.back()->m_value.array->pop_back(); + } + + return true; + } + + template + bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, + const Exception& ex) + { + errored = true; + static_cast(ex); + if (allow_exceptions) + { + JSON_THROW(ex); + } + return false; + } + + constexpr bool is_errored() const + { + return errored; + } + + private: + /*! + @param[in] v value to add to the JSON value we build during parsing + @param[in] skip_callback whether we should skip calling the callback + function; this is required after start_array() and + start_object() SAX events, because otherwise we would call the + callback function with an empty array or object, respectively. + + @invariant If the ref stack is empty, then the passed value will be the new + root. + @invariant If the ref stack contains a value, then it is an array or an + object to which we can add elements + + @return pair of boolean (whether value should be kept) and pointer (to the + passed value in the ref_stack hierarchy; nullptr if not kept) + */ + template + std::pair handle_value(Value&& v, const bool skip_callback = false) + { + JSON_ASSERT(!keep_stack.empty()); + + // do not handle this value if we know it would be added to a discarded + // container + if (!keep_stack.back()) + { + return {false, nullptr}; + } + + // create value + auto value = BasicJsonType(std::forward(v)); + + // check callback + const bool keep = skip_callback || callback(static_cast(ref_stack.size()), parse_event_t::value, value); + + // do not handle this value if we just learnt it shall be discarded + if (!keep) + { + return {false, nullptr}; + } + + if (ref_stack.empty()) + { + root = std::move(value); + return {true, &root}; + } + + // skip this value if we already decided to skip the parent + // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360) + if (!ref_stack.back()) + { + return {false, nullptr}; + } + + // we now only expect arrays and objects + JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object()); + + // array + if (ref_stack.back()->is_array()) + { + ref_stack.back()->m_value.array->emplace_back(std::move(value)); + return {true, &(ref_stack.back()->m_value.array->back())}; + } + + // object + JSON_ASSERT(ref_stack.back()->is_object()); + // check if we should store an element for the current key + JSON_ASSERT(!key_keep_stack.empty()); + const bool store_element = key_keep_stack.back(); + key_keep_stack.pop_back(); + + if (!store_element) + { + return {false, nullptr}; + } + + JSON_ASSERT(object_element); + *object_element = std::move(value); + return {true, object_element}; + } + + /// the parsed JSON value + BasicJsonType& root; + /// stack to model hierarchy of values + std::vector ref_stack {}; + /// stack to manage which values to keep + std::vector keep_stack {}; + /// stack to manage which object keys to keep + std::vector key_keep_stack {}; + /// helper to hold the reference for the next object element + BasicJsonType* object_element = nullptr; + /// whether a syntax error occurred + bool errored = false; + /// callback function + const parser_callback_t callback = nullptr; + /// whether to throw exceptions in case of errors + const bool allow_exceptions = true; + /// a discarded value for the callback + BasicJsonType discarded = BasicJsonType::value_t::discarded; +}; + +template +class json_sax_acceptor +{ + public: + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + using string_t = typename BasicJsonType::string_t; + using binary_t = typename BasicJsonType::binary_t; + + bool null() + { + return true; + } + + bool boolean(bool /*unused*/) + { + return true; + } + + bool number_integer(number_integer_t /*unused*/) + { + return true; + } + + bool number_unsigned(number_unsigned_t /*unused*/) + { + return true; + } + + bool number_float(number_float_t /*unused*/, const string_t& /*unused*/) + { + return true; + } + + bool string(string_t& /*unused*/) + { + return true; + } + + bool binary(binary_t& /*unused*/) + { + return true; + } + + bool start_object(std::size_t /*unused*/ = std::size_t(-1)) + { + return true; + } + + bool key(string_t& /*unused*/) + { + return true; + } + + bool end_object() + { + return true; + } + + bool start_array(std::size_t /*unused*/ = std::size_t(-1)) + { + return true; + } + + bool end_array() + { + return true; + } + + bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& /*unused*/) + { + return false; + } +}; +} // namespace detail + +} // namespace nlohmann diff --git a/src/nlohmann/detail/input/lexer.hpp b/src/nlohmann/detail/input/lexer.hpp new file mode 100644 index 00000000000..3a47167e9c1 --- /dev/null +++ b/src/nlohmann/detail/input/lexer.hpp @@ -0,0 +1,1623 @@ +#pragma once + +#include // array +#include // localeconv +#include // size_t +#include // snprintf +#include // strtof, strtod, strtold, strtoll, strtoull +#include // initializer_list +#include // char_traits, string +#include // move +#include // vector + +#include +#include +#include + +namespace nlohmann +{ +namespace detail +{ +/////////// +// lexer // +/////////// + +template +class lexer_base +{ + public: + /// token types for the parser + enum class token_type + { + uninitialized, ///< indicating the scanner is uninitialized + literal_true, ///< the `true` literal + literal_false, ///< the `false` literal + literal_null, ///< the `null` literal + value_string, ///< a string -- use get_string() for actual value + value_unsigned, ///< an unsigned integer -- use get_number_unsigned() for actual value + value_integer, ///< a signed integer -- use get_number_integer() for actual value + value_float, ///< an floating point number -- use get_number_float() for actual value + begin_array, ///< the character for array begin `[` + begin_object, ///< the character for object begin `{` + end_array, ///< the character for array end `]` + end_object, ///< the character for object end `}` + name_separator, ///< the name separator `:` + value_separator, ///< the value separator `,` + parse_error, ///< indicating a parse error + end_of_input, ///< indicating the end of the input buffer + literal_or_value ///< a literal or the begin of a value (only for diagnostics) + }; + + /// return name of values of type token_type (only used for errors) + JSON_HEDLEY_RETURNS_NON_NULL + JSON_HEDLEY_CONST + static const char* token_type_name(const token_type t) noexcept + { + switch (t) + { + case token_type::uninitialized: + return ""; + case token_type::literal_true: + return "true literal"; + case token_type::literal_false: + return "false literal"; + case token_type::literal_null: + return "null literal"; + case token_type::value_string: + return "string literal"; + case token_type::value_unsigned: + case token_type::value_integer: + case token_type::value_float: + return "number literal"; + case token_type::begin_array: + return "'['"; + case token_type::begin_object: + return "'{'"; + case token_type::end_array: + return "']'"; + case token_type::end_object: + return "'}'"; + case token_type::name_separator: + return "':'"; + case token_type::value_separator: + return "','"; + case token_type::parse_error: + return ""; + case token_type::end_of_input: + return "end of input"; + case token_type::literal_or_value: + return "'[', '{', or a literal"; + // LCOV_EXCL_START + default: // catch non-enum values + return "unknown token"; + // LCOV_EXCL_STOP + } + } +}; +/*! +@brief lexical analysis + +This class organizes the lexical analysis during JSON deserialization. +*/ +template +class lexer : public lexer_base +{ + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + using string_t = typename BasicJsonType::string_t; + using char_type = typename InputAdapterType::char_type; + using char_int_type = typename std::char_traits::int_type; + + public: + using token_type = typename lexer_base::token_type; + + explicit lexer(InputAdapterType&& adapter, bool ignore_comments_ = false) noexcept + : ia(std::move(adapter)) + , ignore_comments(ignore_comments_) + , decimal_point_char(static_cast(get_decimal_point())) + {} + + // delete because of pointer members + lexer(const lexer&) = delete; + lexer(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor) + lexer& operator=(lexer&) = delete; + lexer& operator=(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor) + ~lexer() = default; + + private: + ///////////////////// + // locales + ///////////////////// + + /// return the locale-dependent decimal point + JSON_HEDLEY_PURE + static char get_decimal_point() noexcept + { + const auto* loc = localeconv(); + JSON_ASSERT(loc != nullptr); + return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point); + } + + ///////////////////// + // scan functions + ///////////////////// + + /*! + @brief get codepoint from 4 hex characters following `\u` + + For input "\u c1 c2 c3 c4" the codepoint is: + (c1 * 0x1000) + (c2 * 0x0100) + (c3 * 0x0010) + c4 + = (c1 << 12) + (c2 << 8) + (c3 << 4) + (c4 << 0) + + Furthermore, the possible characters '0'..'9', 'A'..'F', and 'a'..'f' + must be converted to the integers 0x0..0x9, 0xA..0xF, 0xA..0xF, resp. The + conversion is done by subtracting the offset (0x30, 0x37, and 0x57) + between the ASCII value of the character and the desired integer value. + + @return codepoint (0x0000..0xFFFF) or -1 in case of an error (e.g. EOF or + non-hex character) + */ + int get_codepoint() + { + // this function only makes sense after reading `\u` + JSON_ASSERT(current == 'u'); + int codepoint = 0; + + const auto factors = { 12u, 8u, 4u, 0u }; + for (const auto factor : factors) + { + get(); + + if (current >= '0' && current <= '9') + { + codepoint += static_cast((static_cast(current) - 0x30u) << factor); + } + else if (current >= 'A' && current <= 'F') + { + codepoint += static_cast((static_cast(current) - 0x37u) << factor); + } + else if (current >= 'a' && current <= 'f') + { + codepoint += static_cast((static_cast(current) - 0x57u) << factor); + } + else + { + return -1; + } + } + + JSON_ASSERT(0x0000 <= codepoint && codepoint <= 0xFFFF); + return codepoint; + } + + /*! + @brief check if the next byte(s) are inside a given range + + Adds the current byte and, for each passed range, reads a new byte and + checks if it is inside the range. If a violation was detected, set up an + error message and return false. Otherwise, return true. + + @param[in] ranges list of integers; interpreted as list of pairs of + inclusive lower and upper bound, respectively + + @pre The passed list @a ranges must have 2, 4, or 6 elements; that is, + 1, 2, or 3 pairs. This precondition is enforced by an assertion. + + @return true if and only if no range violation was detected + */ + bool next_byte_in_range(std::initializer_list ranges) + { + JSON_ASSERT(ranges.size() == 2 || ranges.size() == 4 || ranges.size() == 6); + add(current); + + for (auto range = ranges.begin(); range != ranges.end(); ++range) + { + get(); + if (JSON_HEDLEY_LIKELY(*range <= current && current <= *(++range))) + { + add(current); + } + else + { + error_message = "invalid string: ill-formed UTF-8 byte"; + return false; + } + } + + return true; + } + + /*! + @brief scan a string literal + + This function scans a string according to Sect. 7 of RFC 8259. While + scanning, bytes are escaped and copied into buffer token_buffer. Then the + function returns successfully, token_buffer is *not* null-terminated (as it + may contain \0 bytes), and token_buffer.size() is the number of bytes in the + string. + + @return token_type::value_string if string could be successfully scanned, + token_type::parse_error otherwise + + @note In case of errors, variable error_message contains a textual + description. + */ + token_type scan_string() + { + // reset token_buffer (ignore opening quote) + reset(); + + // we entered the function by reading an open quote + JSON_ASSERT(current == '\"'); + + while (true) + { + // get next character + switch (get()) + { + // end of file while parsing string + case std::char_traits::eof(): + { + error_message = "invalid string: missing closing quote"; + return token_type::parse_error; + } + + // closing quote + case '\"': + { + return token_type::value_string; + } + + // escapes + case '\\': + { + switch (get()) + { + // quotation mark + case '\"': + add('\"'); + break; + // reverse solidus + case '\\': + add('\\'); + break; + // solidus + case '/': + add('/'); + break; + // backspace + case 'b': + add('\b'); + break; + // form feed + case 'f': + add('\f'); + break; + // line feed + case 'n': + add('\n'); + break; + // carriage return + case 'r': + add('\r'); + break; + // tab + case 't': + add('\t'); + break; + + // unicode escapes + case 'u': + { + const int codepoint1 = get_codepoint(); + int codepoint = codepoint1; // start with codepoint1 + + if (JSON_HEDLEY_UNLIKELY(codepoint1 == -1)) + { + error_message = "invalid string: '\\u' must be followed by 4 hex digits"; + return token_type::parse_error; + } + + // check if code point is a high surrogate + if (0xD800 <= codepoint1 && codepoint1 <= 0xDBFF) + { + // expect next \uxxxx entry + if (JSON_HEDLEY_LIKELY(get() == '\\' && get() == 'u')) + { + const int codepoint2 = get_codepoint(); + + if (JSON_HEDLEY_UNLIKELY(codepoint2 == -1)) + { + error_message = "invalid string: '\\u' must be followed by 4 hex digits"; + return token_type::parse_error; + } + + // check if codepoint2 is a low surrogate + if (JSON_HEDLEY_LIKELY(0xDC00 <= codepoint2 && codepoint2 <= 0xDFFF)) + { + // overwrite codepoint + codepoint = static_cast( + // high surrogate occupies the most significant 22 bits + (static_cast(codepoint1) << 10u) + // low surrogate occupies the least significant 15 bits + + static_cast(codepoint2) + // there is still the 0xD800, 0xDC00 and 0x10000 noise + // in the result so we have to subtract with: + // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00 + - 0x35FDC00u); + } + else + { + error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF"; + return token_type::parse_error; + } + } + else + { + error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF"; + return token_type::parse_error; + } + } + else + { + if (JSON_HEDLEY_UNLIKELY(0xDC00 <= codepoint1 && codepoint1 <= 0xDFFF)) + { + error_message = "invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF"; + return token_type::parse_error; + } + } + + // result of the above calculation yields a proper codepoint + JSON_ASSERT(0x00 <= codepoint && codepoint <= 0x10FFFF); + + // translate codepoint into bytes + if (codepoint < 0x80) + { + // 1-byte characters: 0xxxxxxx (ASCII) + add(static_cast(codepoint)); + } + else if (codepoint <= 0x7FF) + { + // 2-byte characters: 110xxxxx 10xxxxxx + add(static_cast(0xC0u | (static_cast(codepoint) >> 6u))); + add(static_cast(0x80u | (static_cast(codepoint) & 0x3Fu))); + } + else if (codepoint <= 0xFFFF) + { + // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx + add(static_cast(0xE0u | (static_cast(codepoint) >> 12u))); + add(static_cast(0x80u | ((static_cast(codepoint) >> 6u) & 0x3Fu))); + add(static_cast(0x80u | (static_cast(codepoint) & 0x3Fu))); + } + else + { + // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx + add(static_cast(0xF0u | (static_cast(codepoint) >> 18u))); + add(static_cast(0x80u | ((static_cast(codepoint) >> 12u) & 0x3Fu))); + add(static_cast(0x80u | ((static_cast(codepoint) >> 6u) & 0x3Fu))); + add(static_cast(0x80u | (static_cast(codepoint) & 0x3Fu))); + } + + break; + } + + // other characters after escape + default: + error_message = "invalid string: forbidden character after backslash"; + return token_type::parse_error; + } + + break; + } + + // invalid control characters + case 0x00: + { + error_message = "invalid string: control character U+0000 (NUL) must be escaped to \\u0000"; + return token_type::parse_error; + } + + case 0x01: + { + error_message = "invalid string: control character U+0001 (SOH) must be escaped to \\u0001"; + return token_type::parse_error; + } + + case 0x02: + { + error_message = "invalid string: control character U+0002 (STX) must be escaped to \\u0002"; + return token_type::parse_error; + } + + case 0x03: + { + error_message = "invalid string: control character U+0003 (ETX) must be escaped to \\u0003"; + return token_type::parse_error; + } + + case 0x04: + { + error_message = "invalid string: control character U+0004 (EOT) must be escaped to \\u0004"; + return token_type::parse_error; + } + + case 0x05: + { + error_message = "invalid string: control character U+0005 (ENQ) must be escaped to \\u0005"; + return token_type::parse_error; + } + + case 0x06: + { + error_message = "invalid string: control character U+0006 (ACK) must be escaped to \\u0006"; + return token_type::parse_error; + } + + case 0x07: + { + error_message = "invalid string: control character U+0007 (BEL) must be escaped to \\u0007"; + return token_type::parse_error; + } + + case 0x08: + { + error_message = "invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b"; + return token_type::parse_error; + } + + case 0x09: + { + error_message = "invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t"; + return token_type::parse_error; + } + + case 0x0A: + { + error_message = "invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n"; + return token_type::parse_error; + } + + case 0x0B: + { + error_message = "invalid string: control character U+000B (VT) must be escaped to \\u000B"; + return token_type::parse_error; + } + + case 0x0C: + { + error_message = "invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f"; + return token_type::parse_error; + } + + case 0x0D: + { + error_message = "invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r"; + return token_type::parse_error; + } + + case 0x0E: + { + error_message = "invalid string: control character U+000E (SO) must be escaped to \\u000E"; + return token_type::parse_error; + } + + case 0x0F: + { + error_message = "invalid string: control character U+000F (SI) must be escaped to \\u000F"; + return token_type::parse_error; + } + + case 0x10: + { + error_message = "invalid string: control character U+0010 (DLE) must be escaped to \\u0010"; + return token_type::parse_error; + } + + case 0x11: + { + error_message = "invalid string: control character U+0011 (DC1) must be escaped to \\u0011"; + return token_type::parse_error; + } + + case 0x12: + { + error_message = "invalid string: control character U+0012 (DC2) must be escaped to \\u0012"; + return token_type::parse_error; + } + + case 0x13: + { + error_message = "invalid string: control character U+0013 (DC3) must be escaped to \\u0013"; + return token_type::parse_error; + } + + case 0x14: + { + error_message = "invalid string: control character U+0014 (DC4) must be escaped to \\u0014"; + return token_type::parse_error; + } + + case 0x15: + { + error_message = "invalid string: control character U+0015 (NAK) must be escaped to \\u0015"; + return token_type::parse_error; + } + + case 0x16: + { + error_message = "invalid string: control character U+0016 (SYN) must be escaped to \\u0016"; + return token_type::parse_error; + } + + case 0x17: + { + error_message = "invalid string: control character U+0017 (ETB) must be escaped to \\u0017"; + return token_type::parse_error; + } + + case 0x18: + { + error_message = "invalid string: control character U+0018 (CAN) must be escaped to \\u0018"; + return token_type::parse_error; + } + + case 0x19: + { + error_message = "invalid string: control character U+0019 (EM) must be escaped to \\u0019"; + return token_type::parse_error; + } + + case 0x1A: + { + error_message = "invalid string: control character U+001A (SUB) must be escaped to \\u001A"; + return token_type::parse_error; + } + + case 0x1B: + { + error_message = "invalid string: control character U+001B (ESC) must be escaped to \\u001B"; + return token_type::parse_error; + } + + case 0x1C: + { + error_message = "invalid string: control character U+001C (FS) must be escaped to \\u001C"; + return token_type::parse_error; + } + + case 0x1D: + { + error_message = "invalid string: control character U+001D (GS) must be escaped to \\u001D"; + return token_type::parse_error; + } + + case 0x1E: + { + error_message = "invalid string: control character U+001E (RS) must be escaped to \\u001E"; + return token_type::parse_error; + } + + case 0x1F: + { + error_message = "invalid string: control character U+001F (US) must be escaped to \\u001F"; + return token_type::parse_error; + } + + // U+0020..U+007F (except U+0022 (quote) and U+005C (backspace)) + case 0x20: + case 0x21: + case 0x23: + case 0x24: + case 0x25: + case 0x26: + case 0x27: + case 0x28: + case 0x29: + case 0x2A: + case 0x2B: + case 0x2C: + case 0x2D: + case 0x2E: + case 0x2F: + case 0x30: + case 0x31: + case 0x32: + case 0x33: + case 0x34: + case 0x35: + case 0x36: + case 0x37: + case 0x38: + case 0x39: + case 0x3A: + case 0x3B: + case 0x3C: + case 0x3D: + case 0x3E: + case 0x3F: + case 0x40: + case 0x41: + case 0x42: + case 0x43: + case 0x44: + case 0x45: + case 0x46: + case 0x47: + case 0x48: + case 0x49: + case 0x4A: + case 0x4B: + case 0x4C: + case 0x4D: + case 0x4E: + case 0x4F: + case 0x50: + case 0x51: + case 0x52: + case 0x53: + case 0x54: + case 0x55: + case 0x56: + case 0x57: + case 0x58: + case 0x59: + case 0x5A: + case 0x5B: + case 0x5D: + case 0x5E: + case 0x5F: + case 0x60: + case 0x61: + case 0x62: + case 0x63: + case 0x64: + case 0x65: + case 0x66: + case 0x67: + case 0x68: + case 0x69: + case 0x6A: + case 0x6B: + case 0x6C: + case 0x6D: + case 0x6E: + case 0x6F: + case 0x70: + case 0x71: + case 0x72: + case 0x73: + case 0x74: + case 0x75: + case 0x76: + case 0x77: + case 0x78: + case 0x79: + case 0x7A: + case 0x7B: + case 0x7C: + case 0x7D: + case 0x7E: + case 0x7F: + { + add(current); + break; + } + + // U+0080..U+07FF: bytes C2..DF 80..BF + case 0xC2: + case 0xC3: + case 0xC4: + case 0xC5: + case 0xC6: + case 0xC7: + case 0xC8: + case 0xC9: + case 0xCA: + case 0xCB: + case 0xCC: + case 0xCD: + case 0xCE: + case 0xCF: + case 0xD0: + case 0xD1: + case 0xD2: + case 0xD3: + case 0xD4: + case 0xD5: + case 0xD6: + case 0xD7: + case 0xD8: + case 0xD9: + case 0xDA: + case 0xDB: + case 0xDC: + case 0xDD: + case 0xDE: + case 0xDF: + { + if (JSON_HEDLEY_UNLIKELY(!next_byte_in_range({0x80, 0xBF}))) + { + return token_type::parse_error; + } + break; + } + + // U+0800..U+0FFF: bytes E0 A0..BF 80..BF + case 0xE0: + { + if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF})))) + { + return token_type::parse_error; + } + break; + } + + // U+1000..U+CFFF: bytes E1..EC 80..BF 80..BF + // U+E000..U+FFFF: bytes EE..EF 80..BF 80..BF + case 0xE1: + case 0xE2: + case 0xE3: + case 0xE4: + case 0xE5: + case 0xE6: + case 0xE7: + case 0xE8: + case 0xE9: + case 0xEA: + case 0xEB: + case 0xEC: + case 0xEE: + case 0xEF: + { + if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF})))) + { + return token_type::parse_error; + } + break; + } + + // U+D000..U+D7FF: bytes ED 80..9F 80..BF + case 0xED: + { + if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x9F, 0x80, 0xBF})))) + { + return token_type::parse_error; + } + break; + } + + // U+10000..U+3FFFF F0 90..BF 80..BF 80..BF + case 0xF0: + { + if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF})))) + { + return token_type::parse_error; + } + break; + } + + // U+40000..U+FFFFF F1..F3 80..BF 80..BF 80..BF + case 0xF1: + case 0xF2: + case 0xF3: + { + if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF})))) + { + return token_type::parse_error; + } + break; + } + + // U+100000..U+10FFFF F4 80..8F 80..BF 80..BF + case 0xF4: + { + if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF})))) + { + return token_type::parse_error; + } + break; + } + + // remaining bytes (80..C1 and F5..FF) are ill-formed + default: + { + error_message = "invalid string: ill-formed UTF-8 byte"; + return token_type::parse_error; + } + } + } + } + + /*! + * @brief scan a comment + * @return whether comment could be scanned successfully + */ + bool scan_comment() + { + switch (get()) + { + // single-line comments skip input until a newline or EOF is read + case '/': + { + while (true) + { + switch (get()) + { + case '\n': + case '\r': + case std::char_traits::eof(): + case '\0': + return true; + + default: + break; + } + } + } + + // multi-line comments skip input until */ is read + case '*': + { + while (true) + { + switch (get()) + { + case std::char_traits::eof(): + case '\0': + { + error_message = "invalid comment; missing closing '*/'"; + return false; + } + + case '*': + { + switch (get()) + { + case '/': + return true; + + default: + { + unget(); + continue; + } + } + } + + default: + continue; + } + } + } + + // unexpected character after reading '/' + default: + { + error_message = "invalid comment; expecting '/' or '*' after '/'"; + return false; + } + } + } + + JSON_HEDLEY_NON_NULL(2) + static void strtof(float& f, const char* str, char** endptr) noexcept + { + f = std::strtof(str, endptr); + } + + JSON_HEDLEY_NON_NULL(2) + static void strtof(double& f, const char* str, char** endptr) noexcept + { + f = std::strtod(str, endptr); + } + + JSON_HEDLEY_NON_NULL(2) + static void strtof(long double& f, const char* str, char** endptr) noexcept + { + f = std::strtold(str, endptr); + } + + /*! + @brief scan a number literal + + This function scans a string according to Sect. 6 of RFC 8259. + + The function is realized with a deterministic finite state machine derived + from the grammar described in RFC 8259. Starting in state "init", the + input is read and used to determined the next state. Only state "done" + accepts the number. State "error" is a trap state to model errors. In the + table below, "anything" means any character but the ones listed before. + + state | 0 | 1-9 | e E | + | - | . | anything + ---------|----------|----------|----------|---------|---------|----------|----------- + init | zero | any1 | [error] | [error] | minus | [error] | [error] + minus | zero | any1 | [error] | [error] | [error] | [error] | [error] + zero | done | done | exponent | done | done | decimal1 | done + any1 | any1 | any1 | exponent | done | done | decimal1 | done + decimal1 | decimal2 | decimal2 | [error] | [error] | [error] | [error] | [error] + decimal2 | decimal2 | decimal2 | exponent | done | done | done | done + exponent | any2 | any2 | [error] | sign | sign | [error] | [error] + sign | any2 | any2 | [error] | [error] | [error] | [error] | [error] + any2 | any2 | any2 | done | done | done | done | done + + The state machine is realized with one label per state (prefixed with + "scan_number_") and `goto` statements between them. The state machine + contains cycles, but any cycle can be left when EOF is read. Therefore, + the function is guaranteed to terminate. + + During scanning, the read bytes are stored in token_buffer. This string is + then converted to a signed integer, an unsigned integer, or a + floating-point number. + + @return token_type::value_unsigned, token_type::value_integer, or + token_type::value_float if number could be successfully scanned, + token_type::parse_error otherwise + + @note The scanner is independent of the current locale. Internally, the + locale's decimal point is used instead of `.` to work with the + locale-dependent converters. + */ + token_type scan_number() // lgtm [cpp/use-of-goto] + { + // reset token_buffer to store the number's bytes + reset(); + + // the type of the parsed number; initially set to unsigned; will be + // changed if minus sign, decimal point or exponent is read + token_type number_type = token_type::value_unsigned; + + // state (init): we just found out we need to scan a number + switch (current) + { + case '-': + { + add(current); + goto scan_number_minus; + } + + case '0': + { + add(current); + goto scan_number_zero; + } + + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { + add(current); + goto scan_number_any1; + } + + // all other characters are rejected outside scan_number() + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE + } + +scan_number_minus: + // state: we just parsed a leading minus sign + number_type = token_type::value_integer; + switch (get()) + { + case '0': + { + add(current); + goto scan_number_zero; + } + + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { + add(current); + goto scan_number_any1; + } + + default: + { + error_message = "invalid number; expected digit after '-'"; + return token_type::parse_error; + } + } + +scan_number_zero: + // state: we just parse a zero (maybe with a leading minus sign) + switch (get()) + { + case '.': + { + add(decimal_point_char); + goto scan_number_decimal1; + } + + case 'e': + case 'E': + { + add(current); + goto scan_number_exponent; + } + + default: + goto scan_number_done; + } + +scan_number_any1: + // state: we just parsed a number 0-9 (maybe with a leading minus sign) + switch (get()) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { + add(current); + goto scan_number_any1; + } + + case '.': + { + add(decimal_point_char); + goto scan_number_decimal1; + } + + case 'e': + case 'E': + { + add(current); + goto scan_number_exponent; + } + + default: + goto scan_number_done; + } + +scan_number_decimal1: + // state: we just parsed a decimal point + number_type = token_type::value_float; + switch (get()) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { + add(current); + goto scan_number_decimal2; + } + + default: + { + error_message = "invalid number; expected digit after '.'"; + return token_type::parse_error; + } + } + +scan_number_decimal2: + // we just parsed at least one number after a decimal point + switch (get()) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { + add(current); + goto scan_number_decimal2; + } + + case 'e': + case 'E': + { + add(current); + goto scan_number_exponent; + } + + default: + goto scan_number_done; + } + +scan_number_exponent: + // we just parsed an exponent + number_type = token_type::value_float; + switch (get()) + { + case '+': + case '-': + { + add(current); + goto scan_number_sign; + } + + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { + add(current); + goto scan_number_any2; + } + + default: + { + error_message = + "invalid number; expected '+', '-', or digit after exponent"; + return token_type::parse_error; + } + } + +scan_number_sign: + // we just parsed an exponent sign + switch (get()) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { + add(current); + goto scan_number_any2; + } + + default: + { + error_message = "invalid number; expected digit after exponent sign"; + return token_type::parse_error; + } + } + +scan_number_any2: + // we just parsed a number after the exponent or exponent sign + switch (get()) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { + add(current); + goto scan_number_any2; + } + + default: + goto scan_number_done; + } + +scan_number_done: + // unget the character after the number (we only read it to know that + // we are done scanning a number) + unget(); + + char* endptr = nullptr; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg) + errno = 0; + + // try to parse integers first and fall back to floats + if (number_type == token_type::value_unsigned) + { + const auto x = std::strtoull(token_buffer.data(), &endptr, 10); + + // we checked the number format before + JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size()); + + if (errno == 0) + { + value_unsigned = static_cast(x); + if (value_unsigned == x) + { + return token_type::value_unsigned; + } + } + } + else if (number_type == token_type::value_integer) + { + const auto x = std::strtoll(token_buffer.data(), &endptr, 10); + + // we checked the number format before + JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size()); + + if (errno == 0) + { + value_integer = static_cast(x); + if (value_integer == x) + { + return token_type::value_integer; + } + } + } + + // this code is reached if we parse a floating-point number or if an + // integer conversion above failed + strtof(value_float, token_buffer.data(), &endptr); + + // we checked the number format before + JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size()); + + return token_type::value_float; + } + + /*! + @param[in] literal_text the literal text to expect + @param[in] length the length of the passed literal text + @param[in] return_type the token type to return on success + */ + JSON_HEDLEY_NON_NULL(2) + token_type scan_literal(const char_type* literal_text, const std::size_t length, + token_type return_type) + { + JSON_ASSERT(std::char_traits::to_char_type(current) == literal_text[0]); + for (std::size_t i = 1; i < length; ++i) + { + if (JSON_HEDLEY_UNLIKELY(std::char_traits::to_char_type(get()) != literal_text[i])) + { + error_message = "invalid literal"; + return token_type::parse_error; + } + } + return return_type; + } + + ///////////////////// + // input management + ///////////////////// + + /// reset token_buffer; current character is beginning of token + void reset() noexcept + { + token_buffer.clear(); + token_string.clear(); + token_string.push_back(std::char_traits::to_char_type(current)); + } + + /* + @brief get next character from the input + + This function provides the interface to the used input adapter. It does + not throw in case the input reached EOF, but returns a + `std::char_traits::eof()` in that case. Stores the scanned characters + for use in error messages. + + @return character read from the input + */ + char_int_type get() + { + ++position.chars_read_total; + ++position.chars_read_current_line; + + if (next_unget) + { + // just reset the next_unget variable and work with current + next_unget = false; + } + else + { + current = ia.get_character(); + } + + if (JSON_HEDLEY_LIKELY(current != std::char_traits::eof())) + { + token_string.push_back(std::char_traits::to_char_type(current)); + } + + if (current == '\n') + { + ++position.lines_read; + position.chars_read_current_line = 0; + } + + return current; + } + + /*! + @brief unget current character (read it again on next get) + + We implement unget by setting variable next_unget to true. The input is not + changed - we just simulate ungetting by modifying chars_read_total, + chars_read_current_line, and token_string. The next call to get() will + behave as if the unget character is read again. + */ + void unget() + { + next_unget = true; + + --position.chars_read_total; + + // in case we "unget" a newline, we have to also decrement the lines_read + if (position.chars_read_current_line == 0) + { + if (position.lines_read > 0) + { + --position.lines_read; + } + } + else + { + --position.chars_read_current_line; + } + + if (JSON_HEDLEY_LIKELY(current != std::char_traits::eof())) + { + JSON_ASSERT(!token_string.empty()); + token_string.pop_back(); + } + } + + /// add a character to token_buffer + void add(char_int_type c) + { + token_buffer.push_back(static_cast(c)); + } + + public: + ///////////////////// + // value getters + ///////////////////// + + /// return integer value + constexpr number_integer_t get_number_integer() const noexcept + { + return value_integer; + } + + /// return unsigned integer value + constexpr number_unsigned_t get_number_unsigned() const noexcept + { + return value_unsigned; + } + + /// return floating-point value + constexpr number_float_t get_number_float() const noexcept + { + return value_float; + } + + /// return current string value (implicitly resets the token; useful only once) + string_t& get_string() + { + return token_buffer; + } + + ///////////////////// + // diagnostics + ///////////////////// + + /// return position of last read token + constexpr position_t get_position() const noexcept + { + return position; + } + + /// return the last read token (for errors only). Will never contain EOF + /// (an arbitrary value that is not a valid char value, often -1), because + /// 255 may legitimately occur. May contain NUL, which should be escaped. + std::string get_token_string() const + { + // escape control characters + std::string result; + for (const auto c : token_string) + { + if (static_cast(c) <= '\x1F') + { + // escape control characters + std::array cs{{}}; + (std::snprintf)(cs.data(), cs.size(), "", static_cast(c)); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg) + result += cs.data(); + } + else + { + // add character as is + result.push_back(static_cast(c)); + } + } + + return result; + } + + /// return syntax error message + JSON_HEDLEY_RETURNS_NON_NULL + constexpr const char* get_error_message() const noexcept + { + return error_message; + } + + ///////////////////// + // actual scanner + ///////////////////// + + /*! + @brief skip the UTF-8 byte order mark + @return true iff there is no BOM or the correct BOM has been skipped + */ + bool skip_bom() + { + if (get() == 0xEF) + { + // check if we completely parse the BOM + return get() == 0xBB && get() == 0xBF; + } + + // the first character is not the beginning of the BOM; unget it to + // process is later + unget(); + return true; + } + + void skip_whitespace() + { + do + { + get(); + } + while (current == ' ' || current == '\t' || current == '\n' || current == '\r'); + } + + token_type scan() + { + // initially, skip the BOM + if (position.chars_read_total == 0 && !skip_bom()) + { + error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given"; + return token_type::parse_error; + } + + // read next character and ignore whitespace + skip_whitespace(); + + // ignore comments + while (ignore_comments && current == '/') + { + if (!scan_comment()) + { + return token_type::parse_error; + } + + // skip following whitespace + skip_whitespace(); + } + + switch (current) + { + // structural characters + case '[': + return token_type::begin_array; + case ']': + return token_type::end_array; + case '{': + return token_type::begin_object; + case '}': + return token_type::end_object; + case ':': + return token_type::name_separator; + case ',': + return token_type::value_separator; + + // literals + case 't': + { + std::array true_literal = {{char_type('t'), char_type('r'), char_type('u'), char_type('e')}}; + return scan_literal(true_literal.data(), true_literal.size(), token_type::literal_true); + } + case 'f': + { + std::array false_literal = {{char_type('f'), char_type('a'), char_type('l'), char_type('s'), char_type('e')}}; + return scan_literal(false_literal.data(), false_literal.size(), token_type::literal_false); + } + case 'n': + { + std::array null_literal = {{char_type('n'), char_type('u'), char_type('l'), char_type('l')}}; + return scan_literal(null_literal.data(), null_literal.size(), token_type::literal_null); + } + + // string + case '\"': + return scan_string(); + + // number + case '-': + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + return scan_number(); + + // end of input (the null byte is needed when parsing from + // string literals) + case '\0': + case std::char_traits::eof(): + return token_type::end_of_input; + + // error + default: + error_message = "invalid literal"; + return token_type::parse_error; + } + } + + private: + /// input adapter + InputAdapterType ia; + + /// whether comments should be ignored (true) or signaled as errors (false) + const bool ignore_comments = false; + + /// the current character + char_int_type current = std::char_traits::eof(); + + /// whether the next get() call should just return current + bool next_unget = false; + + /// the start position of the current token + position_t position {}; + + /// raw input token string (for error messages) + std::vector token_string {}; + + /// buffer for variable-length tokens (numbers, strings) + string_t token_buffer {}; + + /// a description of occurred lexer errors + const char* error_message = ""; + + // number values + number_integer_t value_integer = 0; + number_unsigned_t value_unsigned = 0; + number_float_t value_float = 0; + + /// the decimal point + const char_int_type decimal_point_char = '.'; +}; +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/input/parser.hpp b/src/nlohmann/detail/input/parser.hpp new file mode 100644 index 00000000000..99cdd05ecb4 --- /dev/null +++ b/src/nlohmann/detail/input/parser.hpp @@ -0,0 +1,499 @@ +#pragma once + +#include // isfinite +#include // uint8_t +#include // function +#include // string +#include // move +#include // vector + +#include +#include +#include +#include +#include +#include +#include + +namespace nlohmann +{ +namespace detail +{ +//////////// +// parser // +//////////// + +enum class parse_event_t : std::uint8_t +{ + /// the parser read `{` and started to process a JSON object + object_start, + /// the parser read `}` and finished processing a JSON object + object_end, + /// the parser read `[` and started to process a JSON array + array_start, + /// the parser read `]` and finished processing a JSON array + array_end, + /// the parser read a key of a value in an object + key, + /// the parser finished reading a JSON value + value +}; + +template +using parser_callback_t = + std::function; + +/*! +@brief syntax analysis + +This class implements a recursive descent parser. +*/ +template +class parser +{ + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + using string_t = typename BasicJsonType::string_t; + using lexer_t = lexer; + using token_type = typename lexer_t::token_type; + + public: + /// a parser reading from an input adapter + explicit parser(InputAdapterType&& adapter, + const parser_callback_t cb = nullptr, + const bool allow_exceptions_ = true, + const bool skip_comments = false) + : callback(cb) + , m_lexer(std::move(adapter), skip_comments) + , allow_exceptions(allow_exceptions_) + { + // read first token + get_token(); + } + + /*! + @brief public parser interface + + @param[in] strict whether to expect the last token to be EOF + @param[in,out] result parsed JSON value + + @throw parse_error.101 in case of an unexpected token + @throw parse_error.102 if to_unicode fails or surrogate error + @throw parse_error.103 if to_unicode fails + */ + void parse(const bool strict, BasicJsonType& result) + { + if (callback) + { + json_sax_dom_callback_parser sdp(result, callback, allow_exceptions); + sax_parse_internal(&sdp); + + // in strict mode, input must be completely read + if (strict && (get_token() != token_type::end_of_input)) + { + sdp.parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::end_of_input, "value"), BasicJsonType())); + } + + // in case of an error, return discarded value + if (sdp.is_errored()) + { + result = value_t::discarded; + return; + } + + // set top-level value to null if it was discarded by the callback + // function + if (result.is_discarded()) + { + result = nullptr; + } + } + else + { + json_sax_dom_parser sdp(result, allow_exceptions); + sax_parse_internal(&sdp); + + // in strict mode, input must be completely read + if (strict && (get_token() != token_type::end_of_input)) + { + sdp.parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), BasicJsonType())); + } + + // in case of an error, return discarded value + if (sdp.is_errored()) + { + result = value_t::discarded; + return; + } + } + + result.assert_invariant(); + } + + /*! + @brief public accept interface + + @param[in] strict whether to expect the last token to be EOF + @return whether the input is a proper JSON text + */ + bool accept(const bool strict = true) + { + json_sax_acceptor sax_acceptor; + return sax_parse(&sax_acceptor, strict); + } + + template + JSON_HEDLEY_NON_NULL(2) + bool sax_parse(SAX* sax, const bool strict = true) + { + (void)detail::is_sax_static_asserts {}; + const bool result = sax_parse_internal(sax); + + // strict mode: next byte must be EOF + if (result && strict && (get_token() != token_type::end_of_input)) + { + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), BasicJsonType())); + } + + return result; + } + + private: + template + JSON_HEDLEY_NON_NULL(2) + bool sax_parse_internal(SAX* sax) + { + // stack to remember the hierarchy of structured values we are parsing + // true = array; false = object + std::vector states; + // value to avoid a goto (see comment where set to true) + bool skip_to_state_evaluation = false; + + while (true) + { + if (!skip_to_state_evaluation) + { + // invariant: get_token() was called before each iteration + switch (last_token) + { + case token_type::begin_object: + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1)))) + { + return false; + } + + // closing } -> we are done + if (get_token() == token_type::end_object) + { + if (JSON_HEDLEY_UNLIKELY(!sax->end_object())) + { + return false; + } + break; + } + + // parse key + if (JSON_HEDLEY_UNLIKELY(last_token != token_type::value_string)) + { + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), BasicJsonType())); + } + if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string()))) + { + return false; + } + + // parse separator (:) + if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator)) + { + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), BasicJsonType())); + } + + // remember we are now inside an object + states.push_back(false); + + // parse values + get_token(); + continue; + } + + case token_type::begin_array: + { + if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1)))) + { + return false; + } + + // closing ] -> we are done + if (get_token() == token_type::end_array) + { + if (JSON_HEDLEY_UNLIKELY(!sax->end_array())) + { + return false; + } + break; + } + + // remember we are now inside an array + states.push_back(true); + + // parse values (no need to call get_token) + continue; + } + + case token_type::value_float: + { + const auto res = m_lexer.get_number_float(); + + if (JSON_HEDLEY_UNLIKELY(!std::isfinite(res))) + { + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + out_of_range::create(406, "number overflow parsing '" + m_lexer.get_token_string() + "'", BasicJsonType())); + } + + if (JSON_HEDLEY_UNLIKELY(!sax->number_float(res, m_lexer.get_string()))) + { + return false; + } + + break; + } + + case token_type::literal_false: + { + if (JSON_HEDLEY_UNLIKELY(!sax->boolean(false))) + { + return false; + } + break; + } + + case token_type::literal_null: + { + if (JSON_HEDLEY_UNLIKELY(!sax->null())) + { + return false; + } + break; + } + + case token_type::literal_true: + { + if (JSON_HEDLEY_UNLIKELY(!sax->boolean(true))) + { + return false; + } + break; + } + + case token_type::value_integer: + { + if (JSON_HEDLEY_UNLIKELY(!sax->number_integer(m_lexer.get_number_integer()))) + { + return false; + } + break; + } + + case token_type::value_string: + { + if (JSON_HEDLEY_UNLIKELY(!sax->string(m_lexer.get_string()))) + { + return false; + } + break; + } + + case token_type::value_unsigned: + { + if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(m_lexer.get_number_unsigned()))) + { + return false; + } + break; + } + + case token_type::parse_error: + { + // using "uninitialized" to avoid "expected" message + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), exception_message(token_type::uninitialized, "value"), BasicJsonType())); + } + + case token_type::uninitialized: + case token_type::end_array: + case token_type::end_object: + case token_type::name_separator: + case token_type::value_separator: + case token_type::end_of_input: + case token_type::literal_or_value: + default: // the last token was unexpected + { + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value, "value"), BasicJsonType())); + } + } + } + else + { + skip_to_state_evaluation = false; + } + + // we reached this line after we successfully parsed a value + if (states.empty()) + { + // empty stack: we reached the end of the hierarchy: done + return true; + } + + if (states.back()) // array + { + // comma -> next value + if (get_token() == token_type::value_separator) + { + // parse a new value + get_token(); + continue; + } + + // closing ] + if (JSON_HEDLEY_LIKELY(last_token == token_type::end_array)) + { + if (JSON_HEDLEY_UNLIKELY(!sax->end_array())) + { + return false; + } + + // We are done with this array. Before we can parse a + // new value, we need to evaluate the new state first. + // By setting skip_to_state_evaluation to false, we + // are effectively jumping to the beginning of this if. + JSON_ASSERT(!states.empty()); + states.pop_back(); + skip_to_state_evaluation = true; + continue; + } + + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_array, "array"), BasicJsonType())); + } + + // states.back() is false -> object + + // comma -> next value + if (get_token() == token_type::value_separator) + { + // parse key + if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::value_string)) + { + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), BasicJsonType())); + } + + if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string()))) + { + return false; + } + + // parse separator (:) + if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator)) + { + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), BasicJsonType())); + } + + // parse values + get_token(); + continue; + } + + // closing } + if (JSON_HEDLEY_LIKELY(last_token == token_type::end_object)) + { + if (JSON_HEDLEY_UNLIKELY(!sax->end_object())) + { + return false; + } + + // We are done with this object. Before we can parse a + // new value, we need to evaluate the new state first. + // By setting skip_to_state_evaluation to false, we + // are effectively jumping to the beginning of this if. + JSON_ASSERT(!states.empty()); + states.pop_back(); + skip_to_state_evaluation = true; + continue; + } + + return sax->parse_error(m_lexer.get_position(), + m_lexer.get_token_string(), + parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object, "object"), BasicJsonType())); + } + } + + /// get next token from lexer + token_type get_token() + { + return last_token = m_lexer.scan(); + } + + std::string exception_message(const token_type expected, const std::string& context) + { + std::string error_msg = "syntax error "; + + if (!context.empty()) + { + error_msg += "while parsing " + context + " "; + } + + error_msg += "- "; + + if (last_token == token_type::parse_error) + { + error_msg += std::string(m_lexer.get_error_message()) + "; last read: '" + + m_lexer.get_token_string() + "'"; + } + else + { + error_msg += "unexpected " + std::string(lexer_t::token_type_name(last_token)); + } + + if (expected != token_type::uninitialized) + { + error_msg += "; expected " + std::string(lexer_t::token_type_name(expected)); + } + + return error_msg; + } + + private: + /// callback function + const parser_callback_t callback = nullptr; + /// the type of the last read token + token_type last_token = token_type::uninitialized; + /// the lexer + lexer_t m_lexer; + /// whether to throw exceptions in case of errors + const bool allow_exceptions = true; +}; + +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/input/position_t.hpp b/src/nlohmann/detail/input/position_t.hpp new file mode 100644 index 00000000000..14e9649fb29 --- /dev/null +++ b/src/nlohmann/detail/input/position_t.hpp @@ -0,0 +1,27 @@ +#pragma once + +#include // size_t + +namespace nlohmann +{ +namespace detail +{ +/// struct to capture the start position of the current token +struct position_t +{ + /// the total number of characters read + std::size_t chars_read_total = 0; + /// the number of characters read in the current line + std::size_t chars_read_current_line = 0; + /// the number of lines read + std::size_t lines_read = 0; + + /// conversion to size_t to preserve SAX interface + constexpr operator size_t() const + { + return chars_read_total; + } +}; + +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/iterators/internal_iterator.hpp b/src/nlohmann/detail/iterators/internal_iterator.hpp new file mode 100644 index 00000000000..2c81f723fd2 --- /dev/null +++ b/src/nlohmann/detail/iterators/internal_iterator.hpp @@ -0,0 +1,25 @@ +#pragma once + +#include + +namespace nlohmann +{ +namespace detail +{ +/*! +@brief an iterator value + +@note This structure could easily be a union, but MSVC currently does not allow +unions members with complex constructors, see https://github.com/nlohmann/json/pull/105. +*/ +template struct internal_iterator +{ + /// iterator for JSON objects + typename BasicJsonType::object_t::iterator object_iterator {}; + /// iterator for JSON arrays + typename BasicJsonType::array_t::iterator array_iterator {}; + /// generic iterator for all other types + primitive_iterator_t primitive_iterator {}; +}; +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/iterators/iter_impl.hpp b/src/nlohmann/detail/iterators/iter_impl.hpp new file mode 100644 index 00000000000..aaff2b64cc3 --- /dev/null +++ b/src/nlohmann/detail/iterators/iter_impl.hpp @@ -0,0 +1,739 @@ +#pragma once + +#include // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next +#include // conditional, is_const, remove_const + +#include +#include +#include +#include +#include +#include +#include + +namespace nlohmann +{ +namespace detail +{ +// forward declare, to be able to friend it later on +template class iteration_proxy; +template class iteration_proxy_value; + +/*! +@brief a template for a bidirectional iterator for the @ref basic_json class +This class implements a both iterators (iterator and const_iterator) for the +@ref basic_json class. +@note An iterator is called *initialized* when a pointer to a JSON value has + been set (e.g., by a constructor or a copy assignment). If the iterator is + default-constructed, it is *uninitialized* and most methods are undefined. + **The library uses assertions to detect calls on uninitialized iterators.** +@requirement The class satisfies the following concept requirements: +- +[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator): + The iterator that can be moved can be moved in both directions (i.e. + incremented and decremented). +@since version 1.0.0, simplified in version 2.0.9, change to bidirectional + iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593) +*/ +template +class iter_impl +{ + /// the iterator with BasicJsonType of different const-ness + using other_iter_impl = iter_impl::value, typename std::remove_const::type, const BasicJsonType>::type>; + /// allow basic_json to access private members + friend other_iter_impl; + friend BasicJsonType; + friend iteration_proxy; + friend iteration_proxy_value; + + using object_t = typename BasicJsonType::object_t; + using array_t = typename BasicJsonType::array_t; + // make sure BasicJsonType is basic_json or const basic_json + static_assert(is_basic_json::type>::value, + "iter_impl only accepts (const) basic_json"); + + public: + + /// The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17. + /// The C++ Standard has never required user-defined iterators to derive from std::iterator. + /// A user-defined iterator should provide publicly accessible typedefs named + /// iterator_category, value_type, difference_type, pointer, and reference. + /// Note that value_type is required to be non-const, even for constant iterators. + using iterator_category = std::bidirectional_iterator_tag; + + /// the type of the values when the iterator is dereferenced + using value_type = typename BasicJsonType::value_type; + /// a type to represent differences between iterators + using difference_type = typename BasicJsonType::difference_type; + /// defines a pointer to the type iterated over (value_type) + using pointer = typename std::conditional::value, + typename BasicJsonType::const_pointer, + typename BasicJsonType::pointer>::type; + /// defines a reference to the type iterated over (value_type) + using reference = + typename std::conditional::value, + typename BasicJsonType::const_reference, + typename BasicJsonType::reference>::type; + + iter_impl() = default; + ~iter_impl() = default; + iter_impl(iter_impl&&) noexcept = default; + iter_impl& operator=(iter_impl&&) noexcept = default; + + /*! + @brief constructor for a given JSON instance + @param[in] object pointer to a JSON object for this iterator + @pre object != nullptr + @post The iterator is initialized; i.e. `m_object != nullptr`. + */ + explicit iter_impl(pointer object) noexcept : m_object(object) + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + { + m_it.object_iterator = typename object_t::iterator(); + break; + } + + case value_t::array: + { + m_it.array_iterator = typename array_t::iterator(); + break; + } + + case value_t::null: + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + { + m_it.primitive_iterator = primitive_iterator_t(); + break; + } + } + } + + /*! + @note The conventional copy constructor and copy assignment are implicitly + defined. Combined with the following converting constructor and + assignment, they support: (1) copy from iterator to iterator, (2) + copy from const iterator to const iterator, and (3) conversion from + iterator to const iterator. However conversion from const iterator + to iterator is not defined. + */ + + /*! + @brief const copy constructor + @param[in] other const iterator to copy from + @note This copy constructor had to be defined explicitly to circumvent a bug + occurring on msvc v19.0 compiler (VS 2015) debug build. For more + information refer to: https://github.com/nlohmann/json/issues/1608 + */ + iter_impl(const iter_impl& other) noexcept + : m_object(other.m_object), m_it(other.m_it) + {} + + /*! + @brief converting assignment + @param[in] other const iterator to copy from + @return const/non-const iterator + @note It is not checked whether @a other is initialized. + */ + iter_impl& operator=(const iter_impl& other) noexcept + { + if (&other != this) + { + m_object = other.m_object; + m_it = other.m_it; + } + return *this; + } + + /*! + @brief converting constructor + @param[in] other non-const iterator to copy from + @note It is not checked whether @a other is initialized. + */ + iter_impl(const iter_impl::type>& other) noexcept + : m_object(other.m_object), m_it(other.m_it) + {} + + /*! + @brief converting assignment + @param[in] other non-const iterator to copy from + @return const/non-const iterator + @note It is not checked whether @a other is initialized. + */ + iter_impl& operator=(const iter_impl::type>& other) noexcept // NOLINT(cert-oop54-cpp) + { + m_object = other.m_object; + m_it = other.m_it; + return *this; + } + + JSON_PRIVATE_UNLESS_TESTED: + /*! + @brief set the iterator to the first value + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + void set_begin() noexcept + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + { + m_it.object_iterator = m_object->m_value.object->begin(); + break; + } + + case value_t::array: + { + m_it.array_iterator = m_object->m_value.array->begin(); + break; + } + + case value_t::null: + { + // set to end so begin()==end() is true: null is empty + m_it.primitive_iterator.set_end(); + break; + } + + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + { + m_it.primitive_iterator.set_begin(); + break; + } + } + } + + /*! + @brief set the iterator past the last value + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + void set_end() noexcept + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + { + m_it.object_iterator = m_object->m_value.object->end(); + break; + } + + case value_t::array: + { + m_it.array_iterator = m_object->m_value.array->end(); + break; + } + + case value_t::null: + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + { + m_it.primitive_iterator.set_end(); + break; + } + } + } + + public: + /*! + @brief return a reference to the value pointed to by the iterator + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + reference operator*() const + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + { + JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end()); + return m_it.object_iterator->second; + } + + case value_t::array: + { + JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end()); + return *m_it.array_iterator; + } + + case value_t::null: + JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object)); + + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + { + if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin())) + { + return *m_object; + } + + JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object)); + } + } + } + + /*! + @brief dereference the iterator + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + pointer operator->() const + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + { + JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end()); + return &(m_it.object_iterator->second); + } + + case value_t::array: + { + JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end()); + return &*m_it.array_iterator; + } + + case value_t::null: + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + { + if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin())) + { + return m_object; + } + + JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object)); + } + } + } + + /*! + @brief post-increment (it++) + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + iter_impl const operator++(int) // NOLINT(readability-const-return-type) + { + auto result = *this; + ++(*this); + return result; + } + + /*! + @brief pre-increment (++it) + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + iter_impl& operator++() + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + { + std::advance(m_it.object_iterator, 1); + break; + } + + case value_t::array: + { + std::advance(m_it.array_iterator, 1); + break; + } + + case value_t::null: + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + { + ++m_it.primitive_iterator; + break; + } + } + + return *this; + } + + /*! + @brief post-decrement (it--) + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + iter_impl const operator--(int) // NOLINT(readability-const-return-type) + { + auto result = *this; + --(*this); + return result; + } + + /*! + @brief pre-decrement (--it) + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + iter_impl& operator--() + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + { + std::advance(m_it.object_iterator, -1); + break; + } + + case value_t::array: + { + std::advance(m_it.array_iterator, -1); + break; + } + + case value_t::null: + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + { + --m_it.primitive_iterator; + break; + } + } + + return *this; + } + + /*! + @brief comparison: equal + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + template < typename IterImpl, detail::enable_if_t < (std::is_same::value || std::is_same::value), std::nullptr_t > = nullptr > + bool operator==(const IterImpl& other) const + { + // if objects are not the same, the comparison is undefined + if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object)) + { + JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", *m_object)); + } + + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + return (m_it.object_iterator == other.m_it.object_iterator); + + case value_t::array: + return (m_it.array_iterator == other.m_it.array_iterator); + + case value_t::null: + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + return (m_it.primitive_iterator == other.m_it.primitive_iterator); + } + } + + /*! + @brief comparison: not equal + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + template < typename IterImpl, detail::enable_if_t < (std::is_same::value || std::is_same::value), std::nullptr_t > = nullptr > + bool operator!=(const IterImpl& other) const + { + return !operator==(other); + } + + /*! + @brief comparison: smaller + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + bool operator<(const iter_impl& other) const + { + // if objects are not the same, the comparison is undefined + if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object)) + { + JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", *m_object)); + } + + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators", *m_object)); + + case value_t::array: + return (m_it.array_iterator < other.m_it.array_iterator); + + case value_t::null: + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + return (m_it.primitive_iterator < other.m_it.primitive_iterator); + } + } + + /*! + @brief comparison: less than or equal + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + bool operator<=(const iter_impl& other) const + { + return !other.operator < (*this); + } + + /*! + @brief comparison: greater than + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + bool operator>(const iter_impl& other) const + { + return !operator<=(other); + } + + /*! + @brief comparison: greater than or equal + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + bool operator>=(const iter_impl& other) const + { + return !operator<(other); + } + + /*! + @brief add to iterator + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + iter_impl& operator+=(difference_type i) + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", *m_object)); + + case value_t::array: + { + std::advance(m_it.array_iterator, i); + break; + } + + case value_t::null: + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + { + m_it.primitive_iterator += i; + break; + } + } + + return *this; + } + + /*! + @brief subtract from iterator + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + iter_impl& operator-=(difference_type i) + { + return operator+=(-i); + } + + /*! + @brief add to iterator + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + iter_impl operator+(difference_type i) const + { + auto result = *this; + result += i; + return result; + } + + /*! + @brief addition of distance and iterator + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + friend iter_impl operator+(difference_type i, const iter_impl& it) + { + auto result = it; + result += i; + return result; + } + + /*! + @brief subtract from iterator + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + iter_impl operator-(difference_type i) const + { + auto result = *this; + result -= i; + return result; + } + + /*! + @brief return difference + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + difference_type operator-(const iter_impl& other) const + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", *m_object)); + + case value_t::array: + return m_it.array_iterator - other.m_it.array_iterator; + + case value_t::null: + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + return m_it.primitive_iterator - other.m_it.primitive_iterator; + } + } + + /*! + @brief access to successor + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + reference operator[](difference_type n) const + { + JSON_ASSERT(m_object != nullptr); + + switch (m_object->m_type) + { + case value_t::object: + JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators", *m_object)); + + case value_t::array: + return *std::next(m_it.array_iterator, n); + + case value_t::null: + JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object)); + + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + { + if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.get_value() == -n)) + { + return *m_object; + } + + JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object)); + } + } + } + + /*! + @brief return the key of an object iterator + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + const typename object_t::key_type& key() const + { + JSON_ASSERT(m_object != nullptr); + + if (JSON_HEDLEY_LIKELY(m_object->is_object())) + { + return m_it.object_iterator->first; + } + + JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators", *m_object)); + } + + /*! + @brief return the value of an iterator + @pre The iterator is initialized; i.e. `m_object != nullptr`. + */ + reference value() const + { + return operator*(); + } + + JSON_PRIVATE_UNLESS_TESTED: + /// associated JSON instance + pointer m_object = nullptr; + /// the actual iterator of the associated instance + internal_iterator::type> m_it {}; +}; +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/iterators/iteration_proxy.hpp b/src/nlohmann/detail/iterators/iteration_proxy.hpp new file mode 100644 index 00000000000..9994b364c47 --- /dev/null +++ b/src/nlohmann/detail/iterators/iteration_proxy.hpp @@ -0,0 +1,189 @@ +#pragma once + +#include // size_t +#include // input_iterator_tag +#include // string, to_string +#include // tuple_size, get, tuple_element +#include // move + +#include +#include + +namespace nlohmann +{ +namespace detail +{ +template +void int_to_string( string_type& target, std::size_t value ) +{ + // For ADL + using std::to_string; + target = to_string(value); +} +template class iteration_proxy_value +{ + public: + using difference_type = std::ptrdiff_t; + using value_type = iteration_proxy_value; + using pointer = value_type * ; + using reference = value_type & ; + using iterator_category = std::input_iterator_tag; + using string_type = typename std::remove_cv< typename std::remove_reference().key() ) >::type >::type; + + private: + /// the iterator + IteratorType anchor; + /// an index for arrays (used to create key names) + std::size_t array_index = 0; + /// last stringified array index + mutable std::size_t array_index_last = 0; + /// a string representation of the array index + mutable string_type array_index_str = "0"; + /// an empty string (to return a reference for primitive values) + const string_type empty_str{}; + + public: + explicit iteration_proxy_value(IteratorType it) noexcept + : anchor(std::move(it)) + {} + + /// dereference operator (needed for range-based for) + iteration_proxy_value& operator*() + { + return *this; + } + + /// increment operator (needed for range-based for) + iteration_proxy_value& operator++() + { + ++anchor; + ++array_index; + + return *this; + } + + /// equality operator (needed for InputIterator) + bool operator==(const iteration_proxy_value& o) const + { + return anchor == o.anchor; + } + + /// inequality operator (needed for range-based for) + bool operator!=(const iteration_proxy_value& o) const + { + return anchor != o.anchor; + } + + /// return key of the iterator + const string_type& key() const + { + JSON_ASSERT(anchor.m_object != nullptr); + + switch (anchor.m_object->type()) + { + // use integer array index as key + case value_t::array: + { + if (array_index != array_index_last) + { + int_to_string( array_index_str, array_index ); + array_index_last = array_index; + } + return array_index_str; + } + + // use key from the object + case value_t::object: + return anchor.key(); + + // use an empty key for all primitive types + case value_t::null: + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + return empty_str; + } + } + + /// return value of the iterator + typename IteratorType::reference value() const + { + return anchor.value(); + } +}; + +/// proxy class for the items() function +template class iteration_proxy +{ + private: + /// the container to iterate + typename IteratorType::reference container; + + public: + /// construct iteration proxy from a container + explicit iteration_proxy(typename IteratorType::reference cont) noexcept + : container(cont) {} + + /// return iterator begin (needed for range-based for) + iteration_proxy_value begin() noexcept + { + return iteration_proxy_value(container.begin()); + } + + /// return iterator end (needed for range-based for) + iteration_proxy_value end() noexcept + { + return iteration_proxy_value(container.end()); + } +}; +// Structured Bindings Support +// For further reference see https://blog.tartanllama.xyz/structured-bindings/ +// And see https://github.com/nlohmann/json/pull/1391 +template = 0> +auto get(const nlohmann::detail::iteration_proxy_value& i) -> decltype(i.key()) +{ + return i.key(); +} +// Structured Bindings Support +// For further reference see https://blog.tartanllama.xyz/structured-bindings/ +// And see https://github.com/nlohmann/json/pull/1391 +template = 0> +auto get(const nlohmann::detail::iteration_proxy_value& i) -> decltype(i.value()) +{ + return i.value(); +} +} // namespace detail +} // namespace nlohmann + +// The Addition to the STD Namespace is required to add +// Structured Bindings Support to the iteration_proxy_value class +// For further reference see https://blog.tartanllama.xyz/structured-bindings/ +// And see https://github.com/nlohmann/json/pull/1391 +namespace std +{ +#if defined(__clang__) + // Fix: https://github.com/nlohmann/json/issues/1401 + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wmismatched-tags" +#endif +template +class tuple_size<::nlohmann::detail::iteration_proxy_value> + : public std::integral_constant {}; + +template +class tuple_element> +{ + public: + using type = decltype( + get(std::declval < + ::nlohmann::detail::iteration_proxy_value> ())); +}; +#if defined(__clang__) + #pragma clang diagnostic pop +#endif +} // namespace std diff --git a/src/nlohmann/detail/iterators/iterator_traits.hpp b/src/nlohmann/detail/iterators/iterator_traits.hpp new file mode 100644 index 00000000000..da5636188f5 --- /dev/null +++ b/src/nlohmann/detail/iterators/iterator_traits.hpp @@ -0,0 +1,51 @@ +#pragma once + +#include // random_access_iterator_tag + +#include +#include + +namespace nlohmann +{ +namespace detail +{ +template +struct iterator_types {}; + +template +struct iterator_types < + It, + void_t> +{ + using difference_type = typename It::difference_type; + using value_type = typename It::value_type; + using pointer = typename It::pointer; + using reference = typename It::reference; + using iterator_category = typename It::iterator_category; +}; + +// This is required as some compilers implement std::iterator_traits in a way that +// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341. +template +struct iterator_traits +{ +}; + +template +struct iterator_traits < T, enable_if_t < !std::is_pointer::value >> + : iterator_types +{ +}; + +template +struct iterator_traits::value>> +{ + using iterator_category = std::random_access_iterator_tag; + using value_type = T; + using difference_type = ptrdiff_t; + using pointer = T*; + using reference = T&; +}; +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/iterators/json_reverse_iterator.hpp b/src/nlohmann/detail/iterators/json_reverse_iterator.hpp new file mode 100644 index 00000000000..e787fdbcd7b --- /dev/null +++ b/src/nlohmann/detail/iterators/json_reverse_iterator.hpp @@ -0,0 +1,119 @@ +#pragma once + +#include // ptrdiff_t +#include // reverse_iterator +#include // declval + +namespace nlohmann +{ +namespace detail +{ +////////////////////// +// reverse_iterator // +////////////////////// + +/*! +@brief a template for a reverse iterator class + +@tparam Base the base iterator type to reverse. Valid types are @ref +iterator (to create @ref reverse_iterator) and @ref const_iterator (to +create @ref const_reverse_iterator). + +@requirement The class satisfies the following concept requirements: +- +[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator): + The iterator that can be moved can be moved in both directions (i.e. + incremented and decremented). +- [OutputIterator](https://en.cppreference.com/w/cpp/named_req/OutputIterator): + It is possible to write to the pointed-to element (only if @a Base is + @ref iterator). + +@since version 1.0.0 +*/ +template +class json_reverse_iterator : public std::reverse_iterator +{ + public: + using difference_type = std::ptrdiff_t; + /// shortcut to the reverse iterator adapter + using base_iterator = std::reverse_iterator; + /// the reference type for the pointed-to element + using reference = typename Base::reference; + + /// create reverse iterator from iterator + explicit json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept + : base_iterator(it) {} + + /// create reverse iterator from base class + explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {} + + /// post-increment (it++) + json_reverse_iterator const operator++(int) // NOLINT(readability-const-return-type) + { + return static_cast(base_iterator::operator++(1)); + } + + /// pre-increment (++it) + json_reverse_iterator& operator++() + { + return static_cast(base_iterator::operator++()); + } + + /// post-decrement (it--) + json_reverse_iterator const operator--(int) // NOLINT(readability-const-return-type) + { + return static_cast(base_iterator::operator--(1)); + } + + /// pre-decrement (--it) + json_reverse_iterator& operator--() + { + return static_cast(base_iterator::operator--()); + } + + /// add to iterator + json_reverse_iterator& operator+=(difference_type i) + { + return static_cast(base_iterator::operator+=(i)); + } + + /// add to iterator + json_reverse_iterator operator+(difference_type i) const + { + return static_cast(base_iterator::operator+(i)); + } + + /// subtract from iterator + json_reverse_iterator operator-(difference_type i) const + { + return static_cast(base_iterator::operator-(i)); + } + + /// return difference + difference_type operator-(const json_reverse_iterator& other) const + { + return base_iterator(*this) - base_iterator(other); + } + + /// access to successor + reference operator[](difference_type n) const + { + return *(this->operator+(n)); + } + + /// return the key of an object iterator + auto key() const -> decltype(std::declval().key()) + { + auto it = --this->base(); + return it.key(); + } + + /// return the value of an iterator + reference value() const + { + auto it = --this->base(); + return it.operator * (); + } +}; +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/iterators/primitive_iterator.hpp b/src/nlohmann/detail/iterators/primitive_iterator.hpp new file mode 100644 index 00000000000..15aa2f08aa4 --- /dev/null +++ b/src/nlohmann/detail/iterators/primitive_iterator.hpp @@ -0,0 +1,123 @@ +#pragma once + +#include // ptrdiff_t +#include // numeric_limits + +#include + +namespace nlohmann +{ +namespace detail +{ +/* +@brief an iterator for primitive JSON types + +This class models an iterator for primitive JSON types (boolean, number, +string). It's only purpose is to allow the iterator/const_iterator classes +to "iterate" over primitive values. Internally, the iterator is modeled by +a `difference_type` variable. Value begin_value (`0`) models the begin, +end_value (`1`) models past the end. +*/ +class primitive_iterator_t +{ + private: + using difference_type = std::ptrdiff_t; + static constexpr difference_type begin_value = 0; + static constexpr difference_type end_value = begin_value + 1; + + JSON_PRIVATE_UNLESS_TESTED: + /// iterator as signed integer type + difference_type m_it = (std::numeric_limits::min)(); + + public: + constexpr difference_type get_value() const noexcept + { + return m_it; + } + + /// set iterator to a defined beginning + void set_begin() noexcept + { + m_it = begin_value; + } + + /// set iterator to a defined past the end + void set_end() noexcept + { + m_it = end_value; + } + + /// return whether the iterator can be dereferenced + constexpr bool is_begin() const noexcept + { + return m_it == begin_value; + } + + /// return whether the iterator is at end + constexpr bool is_end() const noexcept + { + return m_it == end_value; + } + + friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept + { + return lhs.m_it == rhs.m_it; + } + + friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept + { + return lhs.m_it < rhs.m_it; + } + + primitive_iterator_t operator+(difference_type n) noexcept + { + auto result = *this; + result += n; + return result; + } + + friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept + { + return lhs.m_it - rhs.m_it; + } + + primitive_iterator_t& operator++() noexcept + { + ++m_it; + return *this; + } + + primitive_iterator_t const operator++(int) noexcept // NOLINT(readability-const-return-type) + { + auto result = *this; + ++m_it; + return result; + } + + primitive_iterator_t& operator--() noexcept + { + --m_it; + return *this; + } + + primitive_iterator_t const operator--(int) noexcept // NOLINT(readability-const-return-type) + { + auto result = *this; + --m_it; + return result; + } + + primitive_iterator_t& operator+=(difference_type n) noexcept + { + m_it += n; + return *this; + } + + primitive_iterator_t& operator-=(difference_type n) noexcept + { + m_it -= n; + return *this; + } +}; +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/json_pointer.hpp b/src/nlohmann/detail/json_pointer.hpp new file mode 100644 index 00000000000..d727ecc50bd --- /dev/null +++ b/src/nlohmann/detail/json_pointer.hpp @@ -0,0 +1,989 @@ +#pragma once + +#include // all_of +#include // isdigit +#include // max +#include // accumulate +#include // string +#include // move +#include // vector + +#include +#include +#include +#include + +namespace nlohmann +{ +template +class json_pointer +{ + // allow basic_json to access private members + NLOHMANN_BASIC_JSON_TPL_DECLARATION + friend class basic_json; + + public: + /*! + @brief create JSON pointer + + Create a JSON pointer according to the syntax described in + [Section 3 of RFC6901](https://tools.ietf.org/html/rfc6901#section-3). + + @param[in] s string representing the JSON pointer; if omitted, the empty + string is assumed which references the whole JSON value + + @throw parse_error.107 if the given JSON pointer @a s is nonempty and does + not begin with a slash (`/`); see example below + + @throw parse_error.108 if a tilde (`~`) in the given JSON pointer @a s is + not followed by `0` (representing `~`) or `1` (representing `/`); see + example below + + @liveexample{The example shows the construction several valid JSON pointers + as well as the exceptional behavior.,json_pointer} + + @since version 2.0.0 + */ + explicit json_pointer(const std::string& s = "") + : reference_tokens(split(s)) + {} + + /*! + @brief return a string representation of the JSON pointer + + @invariant For each JSON pointer `ptr`, it holds: + @code {.cpp} + ptr == json_pointer(ptr.to_string()); + @endcode + + @return a string representation of the JSON pointer + + @liveexample{The example shows the result of `to_string`.,json_pointer__to_string} + + @since version 2.0.0 + */ + std::string to_string() const + { + return std::accumulate(reference_tokens.begin(), reference_tokens.end(), + std::string{}, + [](const std::string & a, const std::string & b) + { + return a + "/" + detail::escape(b); + }); + } + + /// @copydoc to_string() + operator std::string() const + { + return to_string(); + } + + /*! + @brief append another JSON pointer at the end of this JSON pointer + + @param[in] ptr JSON pointer to append + @return JSON pointer with @a ptr appended + + @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add} + + @complexity Linear in the length of @a ptr. + + @sa see @ref operator/=(std::string) to append a reference token + @sa see @ref operator/=(std::size_t) to append an array index + @sa see @ref operator/(const json_pointer&, const json_pointer&) for a binary operator + + @since version 3.6.0 + */ + json_pointer& operator/=(const json_pointer& ptr) + { + reference_tokens.insert(reference_tokens.end(), + ptr.reference_tokens.begin(), + ptr.reference_tokens.end()); + return *this; + } + + /*! + @brief append an unescaped reference token at the end of this JSON pointer + + @param[in] token reference token to append + @return JSON pointer with @a token appended without escaping @a token + + @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add} + + @complexity Amortized constant. + + @sa see @ref operator/=(const json_pointer&) to append a JSON pointer + @sa see @ref operator/=(std::size_t) to append an array index + @sa see @ref operator/(const json_pointer&, std::size_t) for a binary operator + + @since version 3.6.0 + */ + json_pointer& operator/=(std::string token) + { + push_back(std::move(token)); + return *this; + } + + /*! + @brief append an array index at the end of this JSON pointer + + @param[in] array_idx array index to append + @return JSON pointer with @a array_idx appended + + @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add} + + @complexity Amortized constant. + + @sa see @ref operator/=(const json_pointer&) to append a JSON pointer + @sa see @ref operator/=(std::string) to append a reference token + @sa see @ref operator/(const json_pointer&, std::string) for a binary operator + + @since version 3.6.0 + */ + json_pointer& operator/=(std::size_t array_idx) + { + return *this /= std::to_string(array_idx); + } + + /*! + @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer + + @param[in] lhs JSON pointer + @param[in] rhs JSON pointer + @return a new JSON pointer with @a rhs appended to @a lhs + + @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary} + + @complexity Linear in the length of @a lhs and @a rhs. + + @sa see @ref operator/=(const json_pointer&) to append a JSON pointer + + @since version 3.6.0 + */ + friend json_pointer operator/(const json_pointer& lhs, + const json_pointer& rhs) + { + return json_pointer(lhs) /= rhs; + } + + /*! + @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer + + @param[in] ptr JSON pointer + @param[in] token reference token + @return a new JSON pointer with unescaped @a token appended to @a ptr + + @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary} + + @complexity Linear in the length of @a ptr. + + @sa see @ref operator/=(std::string) to append a reference token + + @since version 3.6.0 + */ + friend json_pointer operator/(const json_pointer& ptr, std::string token) // NOLINT(performance-unnecessary-value-param) + { + return json_pointer(ptr) /= std::move(token); + } + + /*! + @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer + + @param[in] ptr JSON pointer + @param[in] array_idx array index + @return a new JSON pointer with @a array_idx appended to @a ptr + + @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary} + + @complexity Linear in the length of @a ptr. + + @sa see @ref operator/=(std::size_t) to append an array index + + @since version 3.6.0 + */ + friend json_pointer operator/(const json_pointer& ptr, std::size_t array_idx) + { + return json_pointer(ptr) /= array_idx; + } + + /*! + @brief returns the parent of this JSON pointer + + @return parent of this JSON pointer; in case this JSON pointer is the root, + the root itself is returned + + @complexity Linear in the length of the JSON pointer. + + @liveexample{The example shows the result of `parent_pointer` for different + JSON Pointers.,json_pointer__parent_pointer} + + @since version 3.6.0 + */ + json_pointer parent_pointer() const + { + if (empty()) + { + return *this; + } + + json_pointer res = *this; + res.pop_back(); + return res; + } + + /*! + @brief remove last reference token + + @pre not `empty()` + + @liveexample{The example shows the usage of `pop_back`.,json_pointer__pop_back} + + @complexity Constant. + + @throw out_of_range.405 if JSON pointer has no parent + + @since version 3.6.0 + */ + void pop_back() + { + if (JSON_HEDLEY_UNLIKELY(empty())) + { + JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", BasicJsonType())); + } + + reference_tokens.pop_back(); + } + + /*! + @brief return last reference token + + @pre not `empty()` + @return last reference token + + @liveexample{The example shows the usage of `back`.,json_pointer__back} + + @complexity Constant. + + @throw out_of_range.405 if JSON pointer has no parent + + @since version 3.6.0 + */ + const std::string& back() const + { + if (JSON_HEDLEY_UNLIKELY(empty())) + { + JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", BasicJsonType())); + } + + return reference_tokens.back(); + } + + /*! + @brief append an unescaped token at the end of the reference pointer + + @param[in] token token to add + + @complexity Amortized constant. + + @liveexample{The example shows the result of `push_back` for different + JSON Pointers.,json_pointer__push_back} + + @since version 3.6.0 + */ + void push_back(const std::string& token) + { + reference_tokens.push_back(token); + } + + /// @copydoc push_back(const std::string&) + void push_back(std::string&& token) + { + reference_tokens.push_back(std::move(token)); + } + + /*! + @brief return whether pointer points to the root document + + @return true iff the JSON pointer points to the root document + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @liveexample{The example shows the result of `empty` for different JSON + Pointers.,json_pointer__empty} + + @since version 3.6.0 + */ + bool empty() const noexcept + { + return reference_tokens.empty(); + } + + private: + /*! + @param[in] s reference token to be converted into an array index + + @return integer representation of @a s + + @throw parse_error.106 if an array index begins with '0' + @throw parse_error.109 if an array index begins not with a digit + @throw out_of_range.404 if string @a s could not be converted to an integer + @throw out_of_range.410 if an array index exceeds size_type + */ + static typename BasicJsonType::size_type array_index(const std::string& s) + { + using size_type = typename BasicJsonType::size_type; + + // error condition (cf. RFC 6901, Sect. 4) + if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && s[0] == '0')) + { + JSON_THROW(detail::parse_error::create(106, 0, "array index '" + s + "' must not begin with '0'", BasicJsonType())); + } + + // error condition (cf. RFC 6901, Sect. 4) + if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && !(s[0] >= '1' && s[0] <= '9'))) + { + JSON_THROW(detail::parse_error::create(109, 0, "array index '" + s + "' is not a number", BasicJsonType())); + } + + std::size_t processed_chars = 0; + unsigned long long res = 0; // NOLINT(runtime/int) + JSON_TRY + { + res = std::stoull(s, &processed_chars); + } + JSON_CATCH(std::out_of_range&) + { + JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'", BasicJsonType())); + } + + // check if the string was completely read + if (JSON_HEDLEY_UNLIKELY(processed_chars != s.size())) + { + JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'", BasicJsonType())); + } + + // only triggered on special platforms (like 32bit), see also + // https://github.com/nlohmann/json/pull/2203 + if (res >= static_cast((std::numeric_limits::max)())) // NOLINT(runtime/int) + { + JSON_THROW(detail::out_of_range::create(410, "array index " + s + " exceeds size_type", BasicJsonType())); // LCOV_EXCL_LINE + } + + return static_cast(res); + } + + JSON_PRIVATE_UNLESS_TESTED: + json_pointer top() const + { + if (JSON_HEDLEY_UNLIKELY(empty())) + { + JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", BasicJsonType())); + } + + json_pointer result = *this; + result.reference_tokens = {reference_tokens[0]}; + return result; + } + + private: + /*! + @brief create and return a reference to the pointed to value + + @complexity Linear in the number of reference tokens. + + @throw parse_error.109 if array index is not a number + @throw type_error.313 if value cannot be unflattened + */ + BasicJsonType& get_and_create(BasicJsonType& j) const + { + auto* result = &j; + + // in case no reference tokens exist, return a reference to the JSON value + // j which will be overwritten by a primitive value + for (const auto& reference_token : reference_tokens) + { + switch (result->type()) + { + case detail::value_t::null: + { + if (reference_token == "0") + { + // start a new array if reference token is 0 + result = &result->operator[](0); + } + else + { + // start a new object otherwise + result = &result->operator[](reference_token); + } + break; + } + + case detail::value_t::object: + { + // create an entry in the object + result = &result->operator[](reference_token); + break; + } + + case detail::value_t::array: + { + // create an entry in the array + result = &result->operator[](array_index(reference_token)); + break; + } + + /* + The following code is only reached if there exists a reference + token _and_ the current value is primitive. In this case, we have + an error situation, because primitive values may only occur as + single value; that is, with an empty list of reference tokens. + */ + case detail::value_t::string: + case detail::value_t::boolean: + case detail::value_t::number_integer: + case detail::value_t::number_unsigned: + case detail::value_t::number_float: + case detail::value_t::binary: + case detail::value_t::discarded: + default: + JSON_THROW(detail::type_error::create(313, "invalid value to unflatten", j)); + } + } + + return *result; + } + + /*! + @brief return a reference to the pointed to value + + @note This version does not throw if a value is not present, but tries to + create nested values instead. For instance, calling this function + with pointer `"/this/that"` on a null value is equivalent to calling + `operator[]("this").operator[]("that")` on that value, effectively + changing the null value to an object. + + @param[in] ptr a JSON value + + @return reference to the JSON value pointed to by the JSON pointer + + @complexity Linear in the length of the JSON pointer. + + @throw parse_error.106 if an array index begins with '0' + @throw parse_error.109 if an array index was not a number + @throw out_of_range.404 if the JSON pointer can not be resolved + */ + BasicJsonType& get_unchecked(BasicJsonType* ptr) const + { + for (const auto& reference_token : reference_tokens) + { + // convert null values to arrays or objects before continuing + if (ptr->is_null()) + { + // check if reference token is a number + const bool nums = + std::all_of(reference_token.begin(), reference_token.end(), + [](const unsigned char x) + { + return std::isdigit(x); + }); + + // change value to array for numbers or "-" or to object otherwise + *ptr = (nums || reference_token == "-") + ? detail::value_t::array + : detail::value_t::object; + } + + switch (ptr->type()) + { + case detail::value_t::object: + { + // use unchecked object access + ptr = &ptr->operator[](reference_token); + break; + } + + case detail::value_t::array: + { + if (reference_token == "-") + { + // explicitly treat "-" as index beyond the end + ptr = &ptr->operator[](ptr->m_value.array->size()); + } + else + { + // convert array index to number; unchecked access + ptr = &ptr->operator[](array_index(reference_token)); + } + break; + } + + case detail::value_t::null: + case detail::value_t::string: + case detail::value_t::boolean: + case detail::value_t::number_integer: + case detail::value_t::number_unsigned: + case detail::value_t::number_float: + case detail::value_t::binary: + case detail::value_t::discarded: + default: + JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr)); + } + } + + return *ptr; + } + + /*! + @throw parse_error.106 if an array index begins with '0' + @throw parse_error.109 if an array index was not a number + @throw out_of_range.402 if the array index '-' is used + @throw out_of_range.404 if the JSON pointer can not be resolved + */ + BasicJsonType& get_checked(BasicJsonType* ptr) const + { + for (const auto& reference_token : reference_tokens) + { + switch (ptr->type()) + { + case detail::value_t::object: + { + // note: at performs range check + ptr = &ptr->at(reference_token); + break; + } + + case detail::value_t::array: + { + if (JSON_HEDLEY_UNLIKELY(reference_token == "-")) + { + // "-" always fails the range check + JSON_THROW(detail::out_of_range::create(402, + "array index '-' (" + std::to_string(ptr->m_value.array->size()) + + ") is out of range", *ptr)); + } + + // note: at performs range check + ptr = &ptr->at(array_index(reference_token)); + break; + } + + case detail::value_t::null: + case detail::value_t::string: + case detail::value_t::boolean: + case detail::value_t::number_integer: + case detail::value_t::number_unsigned: + case detail::value_t::number_float: + case detail::value_t::binary: + case detail::value_t::discarded: + default: + JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr)); + } + } + + return *ptr; + } + + /*! + @brief return a const reference to the pointed to value + + @param[in] ptr a JSON value + + @return const reference to the JSON value pointed to by the JSON + pointer + + @throw parse_error.106 if an array index begins with '0' + @throw parse_error.109 if an array index was not a number + @throw out_of_range.402 if the array index '-' is used + @throw out_of_range.404 if the JSON pointer can not be resolved + */ + const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const + { + for (const auto& reference_token : reference_tokens) + { + switch (ptr->type()) + { + case detail::value_t::object: + { + // use unchecked object access + ptr = &ptr->operator[](reference_token); + break; + } + + case detail::value_t::array: + { + if (JSON_HEDLEY_UNLIKELY(reference_token == "-")) + { + // "-" cannot be used for const access + JSON_THROW(detail::out_of_range::create(402, "array index '-' (" + std::to_string(ptr->m_value.array->size()) + ") is out of range", *ptr)); + } + + // use unchecked array access + ptr = &ptr->operator[](array_index(reference_token)); + break; + } + + case detail::value_t::null: + case detail::value_t::string: + case detail::value_t::boolean: + case detail::value_t::number_integer: + case detail::value_t::number_unsigned: + case detail::value_t::number_float: + case detail::value_t::binary: + case detail::value_t::discarded: + default: + JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr)); + } + } + + return *ptr; + } + + /*! + @throw parse_error.106 if an array index begins with '0' + @throw parse_error.109 if an array index was not a number + @throw out_of_range.402 if the array index '-' is used + @throw out_of_range.404 if the JSON pointer can not be resolved + */ + const BasicJsonType& get_checked(const BasicJsonType* ptr) const + { + for (const auto& reference_token : reference_tokens) + { + switch (ptr->type()) + { + case detail::value_t::object: + { + // note: at performs range check + ptr = &ptr->at(reference_token); + break; + } + + case detail::value_t::array: + { + if (JSON_HEDLEY_UNLIKELY(reference_token == "-")) + { + // "-" always fails the range check + JSON_THROW(detail::out_of_range::create(402, + "array index '-' (" + std::to_string(ptr->m_value.array->size()) + + ") is out of range", *ptr)); + } + + // note: at performs range check + ptr = &ptr->at(array_index(reference_token)); + break; + } + + case detail::value_t::null: + case detail::value_t::string: + case detail::value_t::boolean: + case detail::value_t::number_integer: + case detail::value_t::number_unsigned: + case detail::value_t::number_float: + case detail::value_t::binary: + case detail::value_t::discarded: + default: + JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr)); + } + } + + return *ptr; + } + + /*! + @throw parse_error.106 if an array index begins with '0' + @throw parse_error.109 if an array index was not a number + */ + bool contains(const BasicJsonType* ptr) const + { + for (const auto& reference_token : reference_tokens) + { + switch (ptr->type()) + { + case detail::value_t::object: + { + if (!ptr->contains(reference_token)) + { + // we did not find the key in the object + return false; + } + + ptr = &ptr->operator[](reference_token); + break; + } + + case detail::value_t::array: + { + if (JSON_HEDLEY_UNLIKELY(reference_token == "-")) + { + // "-" always fails the range check + return false; + } + if (JSON_HEDLEY_UNLIKELY(reference_token.size() == 1 && !("0" <= reference_token && reference_token <= "9"))) + { + // invalid char + return false; + } + if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1)) + { + if (JSON_HEDLEY_UNLIKELY(!('1' <= reference_token[0] && reference_token[0] <= '9'))) + { + // first char should be between '1' and '9' + return false; + } + for (std::size_t i = 1; i < reference_token.size(); i++) + { + if (JSON_HEDLEY_UNLIKELY(!('0' <= reference_token[i] && reference_token[i] <= '9'))) + { + // other char should be between '0' and '9' + return false; + } + } + } + + const auto idx = array_index(reference_token); + if (idx >= ptr->size()) + { + // index out of range + return false; + } + + ptr = &ptr->operator[](idx); + break; + } + + case detail::value_t::null: + case detail::value_t::string: + case detail::value_t::boolean: + case detail::value_t::number_integer: + case detail::value_t::number_unsigned: + case detail::value_t::number_float: + case detail::value_t::binary: + case detail::value_t::discarded: + default: + { + // we do not expect primitive values if there is still a + // reference token to process + return false; + } + } + } + + // no reference token left means we found a primitive value + return true; + } + + /*! + @brief split the string input to reference tokens + + @note This function is only called by the json_pointer constructor. + All exceptions below are documented there. + + @throw parse_error.107 if the pointer is not empty or begins with '/' + @throw parse_error.108 if character '~' is not followed by '0' or '1' + */ + static std::vector split(const std::string& reference_string) + { + std::vector result; + + // special case: empty reference string -> no reference tokens + if (reference_string.empty()) + { + return result; + } + + // check if nonempty reference string begins with slash + if (JSON_HEDLEY_UNLIKELY(reference_string[0] != '/')) + { + JSON_THROW(detail::parse_error::create(107, 1, "JSON pointer must be empty or begin with '/' - was: '" + reference_string + "'", BasicJsonType())); + } + + // extract the reference tokens: + // - slash: position of the last read slash (or end of string) + // - start: position after the previous slash + for ( + // search for the first slash after the first character + std::size_t slash = reference_string.find_first_of('/', 1), + // set the beginning of the first reference token + start = 1; + // we can stop if start == 0 (if slash == std::string::npos) + start != 0; + // set the beginning of the next reference token + // (will eventually be 0 if slash == std::string::npos) + start = (slash == std::string::npos) ? 0 : slash + 1, + // find next slash + slash = reference_string.find_first_of('/', start)) + { + // use the text between the beginning of the reference token + // (start) and the last slash (slash). + auto reference_token = reference_string.substr(start, slash - start); + + // check reference tokens are properly escaped + for (std::size_t pos = reference_token.find_first_of('~'); + pos != std::string::npos; + pos = reference_token.find_first_of('~', pos + 1)) + { + JSON_ASSERT(reference_token[pos] == '~'); + + // ~ must be followed by 0 or 1 + if (JSON_HEDLEY_UNLIKELY(pos == reference_token.size() - 1 || + (reference_token[pos + 1] != '0' && + reference_token[pos + 1] != '1'))) + { + JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'", BasicJsonType())); + } + } + + // finally, store the reference token + detail::unescape(reference_token); + result.push_back(reference_token); + } + + return result; + } + + private: + /*! + @param[in] reference_string the reference string to the current value + @param[in] value the value to consider + @param[in,out] result the result object to insert values to + + @note Empty objects or arrays are flattened to `null`. + */ + static void flatten(const std::string& reference_string, + const BasicJsonType& value, + BasicJsonType& result) + { + switch (value.type()) + { + case detail::value_t::array: + { + if (value.m_value.array->empty()) + { + // flatten empty array as null + result[reference_string] = nullptr; + } + else + { + // iterate array and use index as reference string + for (std::size_t i = 0; i < value.m_value.array->size(); ++i) + { + flatten(reference_string + "/" + std::to_string(i), + value.m_value.array->operator[](i), result); + } + } + break; + } + + case detail::value_t::object: + { + if (value.m_value.object->empty()) + { + // flatten empty object as null + result[reference_string] = nullptr; + } + else + { + // iterate object and use keys as reference string + for (const auto& element : *value.m_value.object) + { + flatten(reference_string + "/" + detail::escape(element.first), element.second, result); + } + } + break; + } + + case detail::value_t::null: + case detail::value_t::string: + case detail::value_t::boolean: + case detail::value_t::number_integer: + case detail::value_t::number_unsigned: + case detail::value_t::number_float: + case detail::value_t::binary: + case detail::value_t::discarded: + default: + { + // add primitive value with its reference string + result[reference_string] = value; + break; + } + } + } + + /*! + @param[in] value flattened JSON + + @return unflattened JSON + + @throw parse_error.109 if array index is not a number + @throw type_error.314 if value is not an object + @throw type_error.315 if object values are not primitive + @throw type_error.313 if value cannot be unflattened + */ + static BasicJsonType + unflatten(const BasicJsonType& value) + { + if (JSON_HEDLEY_UNLIKELY(!value.is_object())) + { + JSON_THROW(detail::type_error::create(314, "only objects can be unflattened", value)); + } + + BasicJsonType result; + + // iterate the JSON object values + for (const auto& element : *value.m_value.object) + { + if (JSON_HEDLEY_UNLIKELY(!element.second.is_primitive())) + { + JSON_THROW(detail::type_error::create(315, "values in object must be primitive", element.second)); + } + + // assign value to reference pointed to by JSON pointer; Note that if + // the JSON pointer is "" (i.e., points to the whole value), function + // get_and_create returns a reference to result itself. An assignment + // will then create a primitive value. + json_pointer(element.first).get_and_create(result) = element.second; + } + + return result; + } + + /*! + @brief compares two JSON pointers for equality + + @param[in] lhs JSON pointer to compare + @param[in] rhs JSON pointer to compare + @return whether @a lhs is equal to @a rhs + + @complexity Linear in the length of the JSON pointer + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + */ + friend bool operator==(json_pointer const& lhs, + json_pointer const& rhs) noexcept + { + return lhs.reference_tokens == rhs.reference_tokens; + } + + /*! + @brief compares two JSON pointers for inequality + + @param[in] lhs JSON pointer to compare + @param[in] rhs JSON pointer to compare + @return whether @a lhs is not equal @a rhs + + @complexity Linear in the length of the JSON pointer + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + */ + friend bool operator!=(json_pointer const& lhs, + json_pointer const& rhs) noexcept + { + return !(lhs == rhs); + } + + /// the reference tokens + std::vector reference_tokens; +}; +} // namespace nlohmann diff --git a/src/nlohmann/detail/json_ref.hpp b/src/nlohmann/detail/json_ref.hpp new file mode 100644 index 00000000000..b4e5dabaf79 --- /dev/null +++ b/src/nlohmann/detail/json_ref.hpp @@ -0,0 +1,68 @@ +#pragma once + +#include +#include + +#include + +namespace nlohmann +{ +namespace detail +{ +template +class json_ref +{ + public: + using value_type = BasicJsonType; + + json_ref(value_type&& value) + : owned_value(std::move(value)) + {} + + json_ref(const value_type& value) + : value_ref(&value) + {} + + json_ref(std::initializer_list init) + : owned_value(init) + {} + + template < + class... Args, + enable_if_t::value, int> = 0 > + json_ref(Args && ... args) + : owned_value(std::forward(args)...) + {} + + // class should be movable only + json_ref(json_ref&&) noexcept = default; + json_ref(const json_ref&) = delete; + json_ref& operator=(const json_ref&) = delete; + json_ref& operator=(json_ref&&) = delete; + ~json_ref() = default; + + value_type moved_or_copied() const + { + if (value_ref == nullptr) + { + return std::move(owned_value); + } + return *value_ref; + } + + value_type const& operator*() const + { + return value_ref ? *value_ref : owned_value; + } + + value_type const* operator->() const + { + return &** this; + } + + private: + mutable value_type owned_value = nullptr; + value_type const* value_ref = nullptr; +}; +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/macro_scope.hpp b/src/nlohmann/detail/macro_scope.hpp new file mode 100644 index 00000000000..c2a65bdda66 --- /dev/null +++ b/src/nlohmann/detail/macro_scope.hpp @@ -0,0 +1,347 @@ +#pragma once + +#include // declval, pair +#include +#include + +// This file contains all internal macro definitions +// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them + +// exclude unsupported compilers +#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK) + #if defined(__clang__) + #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400 + #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers" + #endif + #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER)) + #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800 + #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers" + #endif + #endif +#endif + +// C++ language standard detection +// if the user manually specified the used c++ version this is skipped +#if !defined(JSON_HAS_CPP_20) && !defined(JSON_HAS_CPP_17) && !defined(JSON_HAS_CPP_14) && !defined(JSON_HAS_CPP_11) + #if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L) + #define JSON_HAS_CPP_20 + #define JSON_HAS_CPP_17 + #define JSON_HAS_CPP_14 + #elif (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464 + #define JSON_HAS_CPP_17 + #define JSON_HAS_CPP_14 + #elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1) + #define JSON_HAS_CPP_14 + #endif + // the cpp 11 flag is always specified because it is the minimal required version + #define JSON_HAS_CPP_11 +#endif + +// disable documentation warnings on clang +#if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wdocumentation" + #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" +#endif + +// allow to disable exceptions +#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION) + #define JSON_THROW(exception) throw exception + #define JSON_TRY try + #define JSON_CATCH(exception) catch(exception) + #define JSON_INTERNAL_CATCH(exception) catch(exception) +#else + #include + #define JSON_THROW(exception) std::abort() + #define JSON_TRY if(true) + #define JSON_CATCH(exception) if(false) + #define JSON_INTERNAL_CATCH(exception) if(false) +#endif + +// override exception macros +#if defined(JSON_THROW_USER) + #undef JSON_THROW + #define JSON_THROW JSON_THROW_USER +#endif +#if defined(JSON_TRY_USER) + #undef JSON_TRY + #define JSON_TRY JSON_TRY_USER +#endif +#if defined(JSON_CATCH_USER) + #undef JSON_CATCH + #define JSON_CATCH JSON_CATCH_USER + #undef JSON_INTERNAL_CATCH + #define JSON_INTERNAL_CATCH JSON_CATCH_USER +#endif +#if defined(JSON_INTERNAL_CATCH_USER) + #undef JSON_INTERNAL_CATCH + #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER +#endif + +// allow to override assert +#if !defined(JSON_ASSERT) + #include // assert + #define JSON_ASSERT(x) assert(x) +#endif + +// allow to access some private functions (needed by the test suite) +#if defined(JSON_TESTS_PRIVATE) + #define JSON_PRIVATE_UNLESS_TESTED public +#else + #define JSON_PRIVATE_UNLESS_TESTED private +#endif + +/*! +@brief macro to briefly define a mapping between an enum and JSON +@def NLOHMANN_JSON_SERIALIZE_ENUM +@since version 3.4.0 +*/ +#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...) \ + template \ + inline void to_json(BasicJsonType& j, const ENUM_TYPE& e) \ + { \ + static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ + static const std::pair m[] = __VA_ARGS__; \ + auto it = std::find_if(std::begin(m), std::end(m), \ + [e](const std::pair& ej_pair) -> bool \ + { \ + return ej_pair.first == e; \ + }); \ + j = ((it != std::end(m)) ? it : std::begin(m))->second; \ + } \ + template \ + inline void from_json(const BasicJsonType& j, ENUM_TYPE& e) \ + { \ + static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ + static const std::pair m[] = __VA_ARGS__; \ + auto it = std::find_if(std::begin(m), std::end(m), \ + [&j](const std::pair& ej_pair) -> bool \ + { \ + return ej_pair.second == j; \ + }); \ + e = ((it != std::end(m)) ? it : std::begin(m))->first; \ + } + +// Ugly macros to avoid uglier copy-paste when specializing basic_json. They +// may be removed in the future once the class is split. + +#define NLOHMANN_BASIC_JSON_TPL_DECLARATION \ + template class ObjectType, \ + template class ArrayType, \ + class StringType, class BooleanType, class NumberIntegerType, \ + class NumberUnsignedType, class NumberFloatType, \ + template class AllocatorType, \ + template class JSONSerializer, \ + class BinaryType> + +#define NLOHMANN_BASIC_JSON_TPL \ + basic_json + +// Macros to simplify conversion from/to types + +#define NLOHMANN_JSON_EXPAND( x ) x +#define NLOHMANN_JSON_GET_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, NAME,...) NAME +#define NLOHMANN_JSON_PASTE(...) NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_GET_MACRO(__VA_ARGS__, \ + NLOHMANN_JSON_PASTE64, \ + NLOHMANN_JSON_PASTE63, \ + NLOHMANN_JSON_PASTE62, \ + NLOHMANN_JSON_PASTE61, \ + NLOHMANN_JSON_PASTE60, \ + NLOHMANN_JSON_PASTE59, \ + NLOHMANN_JSON_PASTE58, \ + NLOHMANN_JSON_PASTE57, \ + NLOHMANN_JSON_PASTE56, \ + NLOHMANN_JSON_PASTE55, \ + NLOHMANN_JSON_PASTE54, \ + NLOHMANN_JSON_PASTE53, \ + NLOHMANN_JSON_PASTE52, \ + NLOHMANN_JSON_PASTE51, \ + NLOHMANN_JSON_PASTE50, \ + NLOHMANN_JSON_PASTE49, \ + NLOHMANN_JSON_PASTE48, \ + NLOHMANN_JSON_PASTE47, \ + NLOHMANN_JSON_PASTE46, \ + NLOHMANN_JSON_PASTE45, \ + NLOHMANN_JSON_PASTE44, \ + NLOHMANN_JSON_PASTE43, \ + NLOHMANN_JSON_PASTE42, \ + NLOHMANN_JSON_PASTE41, \ + NLOHMANN_JSON_PASTE40, \ + NLOHMANN_JSON_PASTE39, \ + NLOHMANN_JSON_PASTE38, \ + NLOHMANN_JSON_PASTE37, \ + NLOHMANN_JSON_PASTE36, \ + NLOHMANN_JSON_PASTE35, \ + NLOHMANN_JSON_PASTE34, \ + NLOHMANN_JSON_PASTE33, \ + NLOHMANN_JSON_PASTE32, \ + NLOHMANN_JSON_PASTE31, \ + NLOHMANN_JSON_PASTE30, \ + NLOHMANN_JSON_PASTE29, \ + NLOHMANN_JSON_PASTE28, \ + NLOHMANN_JSON_PASTE27, \ + NLOHMANN_JSON_PASTE26, \ + NLOHMANN_JSON_PASTE25, \ + NLOHMANN_JSON_PASTE24, \ + NLOHMANN_JSON_PASTE23, \ + NLOHMANN_JSON_PASTE22, \ + NLOHMANN_JSON_PASTE21, \ + NLOHMANN_JSON_PASTE20, \ + NLOHMANN_JSON_PASTE19, \ + NLOHMANN_JSON_PASTE18, \ + NLOHMANN_JSON_PASTE17, \ + NLOHMANN_JSON_PASTE16, \ + NLOHMANN_JSON_PASTE15, \ + NLOHMANN_JSON_PASTE14, \ + NLOHMANN_JSON_PASTE13, \ + NLOHMANN_JSON_PASTE12, \ + NLOHMANN_JSON_PASTE11, \ + NLOHMANN_JSON_PASTE10, \ + NLOHMANN_JSON_PASTE9, \ + NLOHMANN_JSON_PASTE8, \ + NLOHMANN_JSON_PASTE7, \ + NLOHMANN_JSON_PASTE6, \ + NLOHMANN_JSON_PASTE5, \ + NLOHMANN_JSON_PASTE4, \ + NLOHMANN_JSON_PASTE3, \ + NLOHMANN_JSON_PASTE2, \ + NLOHMANN_JSON_PASTE1)(__VA_ARGS__)) +#define NLOHMANN_JSON_PASTE2(func, v1) func(v1) +#define NLOHMANN_JSON_PASTE3(func, v1, v2) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE2(func, v2) +#define NLOHMANN_JSON_PASTE4(func, v1, v2, v3) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE3(func, v2, v3) +#define NLOHMANN_JSON_PASTE5(func, v1, v2, v3, v4) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE4(func, v2, v3, v4) +#define NLOHMANN_JSON_PASTE6(func, v1, v2, v3, v4, v5) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE5(func, v2, v3, v4, v5) +#define NLOHMANN_JSON_PASTE7(func, v1, v2, v3, v4, v5, v6) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE6(func, v2, v3, v4, v5, v6) +#define NLOHMANN_JSON_PASTE8(func, v1, v2, v3, v4, v5, v6, v7) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE7(func, v2, v3, v4, v5, v6, v7) +#define NLOHMANN_JSON_PASTE9(func, v1, v2, v3, v4, v5, v6, v7, v8) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE8(func, v2, v3, v4, v5, v6, v7, v8) +#define NLOHMANN_JSON_PASTE10(func, v1, v2, v3, v4, v5, v6, v7, v8, v9) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE9(func, v2, v3, v4, v5, v6, v7, v8, v9) +#define NLOHMANN_JSON_PASTE11(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE10(func, v2, v3, v4, v5, v6, v7, v8, v9, v10) +#define NLOHMANN_JSON_PASTE12(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE11(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) +#define NLOHMANN_JSON_PASTE13(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE12(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) +#define NLOHMANN_JSON_PASTE14(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE13(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) +#define NLOHMANN_JSON_PASTE15(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE14(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) +#define NLOHMANN_JSON_PASTE16(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE15(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) +#define NLOHMANN_JSON_PASTE17(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE16(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) +#define NLOHMANN_JSON_PASTE18(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE17(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) +#define NLOHMANN_JSON_PASTE19(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE18(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) +#define NLOHMANN_JSON_PASTE20(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE19(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) +#define NLOHMANN_JSON_PASTE21(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE20(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) +#define NLOHMANN_JSON_PASTE22(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE21(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) +#define NLOHMANN_JSON_PASTE23(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE22(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) +#define NLOHMANN_JSON_PASTE24(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE23(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) +#define NLOHMANN_JSON_PASTE25(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE24(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) +#define NLOHMANN_JSON_PASTE26(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE25(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) +#define NLOHMANN_JSON_PASTE27(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE26(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) +#define NLOHMANN_JSON_PASTE28(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE27(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) +#define NLOHMANN_JSON_PASTE29(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE28(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) +#define NLOHMANN_JSON_PASTE30(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE29(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) +#define NLOHMANN_JSON_PASTE31(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE30(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) +#define NLOHMANN_JSON_PASTE32(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE31(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) +#define NLOHMANN_JSON_PASTE33(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE32(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) +#define NLOHMANN_JSON_PASTE34(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE33(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) +#define NLOHMANN_JSON_PASTE35(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE34(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) +#define NLOHMANN_JSON_PASTE36(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE35(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) +#define NLOHMANN_JSON_PASTE37(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE36(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) +#define NLOHMANN_JSON_PASTE38(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE37(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) +#define NLOHMANN_JSON_PASTE39(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE38(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) +#define NLOHMANN_JSON_PASTE40(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE39(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) +#define NLOHMANN_JSON_PASTE41(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE40(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) +#define NLOHMANN_JSON_PASTE42(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE41(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) +#define NLOHMANN_JSON_PASTE43(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE42(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) +#define NLOHMANN_JSON_PASTE44(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE43(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) +#define NLOHMANN_JSON_PASTE45(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE44(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) +#define NLOHMANN_JSON_PASTE46(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE45(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) +#define NLOHMANN_JSON_PASTE47(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE46(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) +#define NLOHMANN_JSON_PASTE48(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE47(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) +#define NLOHMANN_JSON_PASTE49(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE48(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) +#define NLOHMANN_JSON_PASTE50(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE49(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) +#define NLOHMANN_JSON_PASTE51(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE50(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) +#define NLOHMANN_JSON_PASTE52(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE51(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) +#define NLOHMANN_JSON_PASTE53(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE52(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) +#define NLOHMANN_JSON_PASTE54(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE53(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) +#define NLOHMANN_JSON_PASTE55(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE54(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) +#define NLOHMANN_JSON_PASTE56(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE55(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) +#define NLOHMANN_JSON_PASTE57(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE56(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) +#define NLOHMANN_JSON_PASTE58(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE57(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) +#define NLOHMANN_JSON_PASTE59(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE58(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) +#define NLOHMANN_JSON_PASTE60(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE59(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) +#define NLOHMANN_JSON_PASTE61(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE60(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) +#define NLOHMANN_JSON_PASTE62(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE61(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) +#define NLOHMANN_JSON_PASTE63(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE62(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) +#define NLOHMANN_JSON_PASTE64(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE63(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) + +#define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1; +#define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1); + +/*! +@brief macro +@def NLOHMANN_DEFINE_TYPE_INTRUSIVE +@since version 3.9.0 +*/ +#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...) \ + friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ + friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } + +/*! +@brief macro +@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE +@since version 3.9.0 +*/ +#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...) \ + inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ + inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } + + +// inspired from https://stackoverflow.com/a/26745591 +// allows to call any std function as if (e.g. with begin): +// using std::begin; begin(x); +// +// it allows using the detected idiom to retrieve the return type +// of such an expression +#define NLOHMANN_CAN_CALL_STD_FUNC_IMPL(std_name) \ + namespace detail { \ + using std::std_name; \ + \ + template \ + using result_of_##std_name = decltype(std_name(std::declval()...)); \ + } \ + \ + namespace detail2 { \ + struct std_name##_tag \ + { \ + }; \ + \ + template \ + std_name##_tag std_name(T&&...); \ + \ + template \ + using result_of_##std_name = decltype(std_name(std::declval()...)); \ + \ + template \ + struct would_call_std_##std_name \ + { \ + static constexpr auto const value = ::nlohmann::detail:: \ + is_detected_exact::value; \ + }; \ + } /* namespace detail2 */ \ + \ + template \ + struct would_call_std_##std_name : detail2::would_call_std_##std_name \ + { \ + } + +#ifndef JSON_USE_IMPLICIT_CONVERSIONS + #define JSON_USE_IMPLICIT_CONVERSIONS 1 +#endif + +#if JSON_USE_IMPLICIT_CONVERSIONS + #define JSON_EXPLICIT +#else + #define JSON_EXPLICIT explicit +#endif + +#ifndef JSON_DIAGNOSTICS + #define JSON_DIAGNOSTICS 0 +#endif diff --git a/src/nlohmann/detail/macro_unscope.hpp b/src/nlohmann/detail/macro_unscope.hpp new file mode 100644 index 00000000000..67bf1466bc5 --- /dev/null +++ b/src/nlohmann/detail/macro_unscope.hpp @@ -0,0 +1,24 @@ +#pragma once + +// restore clang diagnostic settings +#if defined(__clang__) + #pragma clang diagnostic pop +#endif + +// clean up +#undef JSON_ASSERT +#undef JSON_INTERNAL_CATCH +#undef JSON_CATCH +#undef JSON_THROW +#undef JSON_TRY +#undef JSON_PRIVATE_UNLESS_TESTED +#undef JSON_HAS_CPP_11 +#undef JSON_HAS_CPP_14 +#undef JSON_HAS_CPP_17 +#undef JSON_HAS_CPP_20 +#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION +#undef NLOHMANN_BASIC_JSON_TPL +#undef JSON_EXPLICIT +#undef NLOHMANN_CAN_CALL_STD_FUNC_IMPL + +#include diff --git a/src/nlohmann/detail/meta/call_std/begin.hpp b/src/nlohmann/detail/meta/call_std/begin.hpp new file mode 100644 index 00000000000..da937144c85 --- /dev/null +++ b/src/nlohmann/detail/meta/call_std/begin.hpp @@ -0,0 +1,8 @@ +#pragma once + +#include + +namespace nlohmann +{ +NLOHMANN_CAN_CALL_STD_FUNC_IMPL(begin); +} // namespace nlohmann diff --git a/src/nlohmann/detail/meta/call_std/end.hpp b/src/nlohmann/detail/meta/call_std/end.hpp new file mode 100644 index 00000000000..19090073980 --- /dev/null +++ b/src/nlohmann/detail/meta/call_std/end.hpp @@ -0,0 +1,8 @@ +#pragma once + +#include + +namespace nlohmann +{ +NLOHMANN_CAN_CALL_STD_FUNC_IMPL(end); +} // namespace nlohmann diff --git a/src/nlohmann/detail/meta/cpp_future.hpp b/src/nlohmann/detail/meta/cpp_future.hpp new file mode 100644 index 00000000000..e24518fafe5 --- /dev/null +++ b/src/nlohmann/detail/meta/cpp_future.hpp @@ -0,0 +1,154 @@ +#pragma once + +#include // size_t +#include // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type +#include // index_sequence, make_index_sequence, index_sequence_for + +#include + +namespace nlohmann +{ +namespace detail +{ + +template +using uncvref_t = typename std::remove_cv::type>::type; + +#ifdef JSON_HAS_CPP_14 + +// the following utilities are natively available in C++14 +using std::enable_if_t; +using std::index_sequence; +using std::make_index_sequence; +using std::index_sequence_for; + +#else + +// alias templates to reduce boilerplate +template +using enable_if_t = typename std::enable_if::type; + +// The following code is taken from https://github.com/abseil/abseil-cpp/blob/10cb35e459f5ecca5b2ff107635da0bfa41011b4/absl/utility/utility.h +// which is part of Google Abseil (https://github.com/abseil/abseil-cpp), licensed under the Apache License 2.0. + +//// START OF CODE FROM GOOGLE ABSEIL + +// integer_sequence +// +// Class template representing a compile-time integer sequence. An instantiation +// of `integer_sequence` has a sequence of integers encoded in its +// type through its template arguments (which is a common need when +// working with C++11 variadic templates). `absl::integer_sequence` is designed +// to be a drop-in replacement for C++14's `std::integer_sequence`. +// +// Example: +// +// template< class T, T... Ints > +// void user_function(integer_sequence); +// +// int main() +// { +// // user_function's `T` will be deduced to `int` and `Ints...` +// // will be deduced to `0, 1, 2, 3, 4`. +// user_function(make_integer_sequence()); +// } +template +struct integer_sequence +{ + using value_type = T; + static constexpr std::size_t size() noexcept + { + return sizeof...(Ints); + } +}; + +// index_sequence +// +// A helper template for an `integer_sequence` of `size_t`, +// `absl::index_sequence` is designed to be a drop-in replacement for C++14's +// `std::index_sequence`. +template +using index_sequence = integer_sequence; + +namespace utility_internal +{ + +template +struct Extend; + +// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency. +template +struct Extend, SeqSize, 0> +{ + using type = integer_sequence < T, Ints..., (Ints + SeqSize)... >; +}; + +template +struct Extend, SeqSize, 1> +{ + using type = integer_sequence < T, Ints..., (Ints + SeqSize)..., 2 * SeqSize >; +}; + +// Recursion helper for 'make_integer_sequence'. +// 'Gen::type' is an alias for 'integer_sequence'. +template +struct Gen +{ + using type = + typename Extend < typename Gen < T, N / 2 >::type, N / 2, N % 2 >::type; +}; + +template +struct Gen +{ + using type = integer_sequence; +}; + +} // namespace utility_internal + +// Compile-time sequences of integers + +// make_integer_sequence +// +// This template alias is equivalent to +// `integer_sequence`, and is designed to be a drop-in +// replacement for C++14's `std::make_integer_sequence`. +template +using make_integer_sequence = typename utility_internal::Gen::type; + +// make_index_sequence +// +// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`, +// and is designed to be a drop-in replacement for C++14's +// `std::make_index_sequence`. +template +using make_index_sequence = make_integer_sequence; + +// index_sequence_for +// +// Converts a typename pack into an index sequence of the same length, and +// is designed to be a drop-in replacement for C++14's +// `std::index_sequence_for()` +template +using index_sequence_for = make_index_sequence; + +//// END OF CODE FROM GOOGLE ABSEIL + +#endif + +// dispatch utility (taken from ranges-v3) +template struct priority_tag : priority_tag < N - 1 > {}; +template<> struct priority_tag<0> {}; + +// taken from ranges-v3 +template +struct static_const +{ + static constexpr T value{}; +}; + +template +constexpr T static_const::value; + +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/meta/detected.hpp b/src/nlohmann/detail/meta/detected.hpp new file mode 100644 index 00000000000..8480e1c055d --- /dev/null +++ b/src/nlohmann/detail/meta/detected.hpp @@ -0,0 +1,61 @@ +#pragma once + +#include + +#include + +// https://en.cppreference.com/w/cpp/experimental/is_detected +namespace nlohmann +{ +namespace detail +{ +struct nonesuch +{ + nonesuch() = delete; + ~nonesuch() = delete; + nonesuch(nonesuch const&) = delete; + nonesuch(nonesuch const&&) = delete; + void operator=(nonesuch const&) = delete; + void operator=(nonesuch&&) = delete; +}; + +template class Op, + class... Args> +struct detector +{ + using value_t = std::false_type; + using type = Default; +}; + +template class Op, class... Args> +struct detector>, Op, Args...> +{ + using value_t = std::true_type; + using type = Op; +}; + +template class Op, class... Args> +using is_detected = typename detector::value_t; + +template class Op, class... Args> +struct is_detected_lazy : is_detected { }; + +template class Op, class... Args> +using detected_t = typename detector::type; + +template class Op, class... Args> +using detected_or = detector; + +template class Op, class... Args> +using detected_or_t = typename detected_or::type; + +template class Op, class... Args> +using is_detected_exact = std::is_same>; + +template class Op, class... Args> +using is_detected_convertible = + std::is_convertible, To>; +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/meta/identity_tag.hpp b/src/nlohmann/detail/meta/identity_tag.hpp new file mode 100644 index 00000000000..73a3e91700d --- /dev/null +++ b/src/nlohmann/detail/meta/identity_tag.hpp @@ -0,0 +1,10 @@ +#pragma once + +namespace nlohmann +{ +namespace detail +{ +// dispatching helper struct +template struct identity_tag {}; +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/meta/is_sax.hpp b/src/nlohmann/detail/meta/is_sax.hpp new file mode 100644 index 00000000000..e1e48a0bae1 --- /dev/null +++ b/src/nlohmann/detail/meta/is_sax.hpp @@ -0,0 +1,149 @@ +#pragma once + +#include // size_t +#include // declval +#include // string + +#include +#include + +namespace nlohmann +{ +namespace detail +{ +template +using null_function_t = decltype(std::declval().null()); + +template +using boolean_function_t = + decltype(std::declval().boolean(std::declval())); + +template +using number_integer_function_t = + decltype(std::declval().number_integer(std::declval())); + +template +using number_unsigned_function_t = + decltype(std::declval().number_unsigned(std::declval())); + +template +using number_float_function_t = decltype(std::declval().number_float( + std::declval(), std::declval())); + +template +using string_function_t = + decltype(std::declval().string(std::declval())); + +template +using binary_function_t = + decltype(std::declval().binary(std::declval())); + +template +using start_object_function_t = + decltype(std::declval().start_object(std::declval())); + +template +using key_function_t = + decltype(std::declval().key(std::declval())); + +template +using end_object_function_t = decltype(std::declval().end_object()); + +template +using start_array_function_t = + decltype(std::declval().start_array(std::declval())); + +template +using end_array_function_t = decltype(std::declval().end_array()); + +template +using parse_error_function_t = decltype(std::declval().parse_error( + std::declval(), std::declval(), + std::declval())); + +template +struct is_sax +{ + private: + static_assert(is_basic_json::value, + "BasicJsonType must be of type basic_json<...>"); + + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + using string_t = typename BasicJsonType::string_t; + using binary_t = typename BasicJsonType::binary_t; + using exception_t = typename BasicJsonType::exception; + + public: + static constexpr bool value = + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value && + is_detected_exact::value; +}; + +template +struct is_sax_static_asserts +{ + private: + static_assert(is_basic_json::value, + "BasicJsonType must be of type basic_json<...>"); + + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using number_float_t = typename BasicJsonType::number_float_t; + using string_t = typename BasicJsonType::string_t; + using binary_t = typename BasicJsonType::binary_t; + using exception_t = typename BasicJsonType::exception; + + public: + static_assert(is_detected_exact::value, + "Missing/invalid function: bool null()"); + static_assert(is_detected_exact::value, + "Missing/invalid function: bool boolean(bool)"); + static_assert(is_detected_exact::value, + "Missing/invalid function: bool boolean(bool)"); + static_assert( + is_detected_exact::value, + "Missing/invalid function: bool number_integer(number_integer_t)"); + static_assert( + is_detected_exact::value, + "Missing/invalid function: bool number_unsigned(number_unsigned_t)"); + static_assert(is_detected_exact::value, + "Missing/invalid function: bool number_float(number_float_t, const string_t&)"); + static_assert( + is_detected_exact::value, + "Missing/invalid function: bool string(string_t&)"); + static_assert( + is_detected_exact::value, + "Missing/invalid function: bool binary(binary_t&)"); + static_assert(is_detected_exact::value, + "Missing/invalid function: bool start_object(std::size_t)"); + static_assert(is_detected_exact::value, + "Missing/invalid function: bool key(string_t&)"); + static_assert(is_detected_exact::value, + "Missing/invalid function: bool end_object()"); + static_assert(is_detected_exact::value, + "Missing/invalid function: bool start_array(std::size_t)"); + static_assert(is_detected_exact::value, + "Missing/invalid function: bool end_array()"); + static_assert( + is_detected_exact::value, + "Missing/invalid function: bool parse_error(std::size_t, const " + "std::string&, const exception&)"); +}; +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/meta/type_traits.hpp b/src/nlohmann/detail/meta/type_traits.hpp new file mode 100644 index 00000000000..984ca19319b --- /dev/null +++ b/src/nlohmann/detail/meta/type_traits.hpp @@ -0,0 +1,474 @@ +#pragma once + +#include // numeric_limits +#include // false_type, is_constructible, is_integral, is_same, true_type +#include // declval +#include // tuple + +#include + +#include +#include +#include +#include +#include +#include + +namespace nlohmann +{ +/*! +@brief detail namespace with internal helper functions + +This namespace collects functions that should not be exposed, +implementations of some @ref basic_json methods, and meta-programming helpers. + +@since version 2.1.0 +*/ +namespace detail +{ +///////////// +// helpers // +///////////// + +// Note to maintainers: +// +// Every trait in this file expects a non CV-qualified type. +// The only exceptions are in the 'aliases for detected' section +// (i.e. those of the form: decltype(T::member_function(std::declval()))) +// +// In this case, T has to be properly CV-qualified to constraint the function arguments +// (e.g. to_json(BasicJsonType&, const T&)) + +template struct is_basic_json : std::false_type {}; + +NLOHMANN_BASIC_JSON_TPL_DECLARATION +struct is_basic_json : std::true_type {}; + +////////////////////// +// json_ref helpers // +////////////////////// + +template +class json_ref; + +template +struct is_json_ref : std::false_type {}; + +template +struct is_json_ref> : std::true_type {}; + +////////////////////////// +// aliases for detected // +////////////////////////// + +template +using mapped_type_t = typename T::mapped_type; + +template +using key_type_t = typename T::key_type; + +template +using value_type_t = typename T::value_type; + +template +using difference_type_t = typename T::difference_type; + +template +using pointer_t = typename T::pointer; + +template +using reference_t = typename T::reference; + +template +using iterator_category_t = typename T::iterator_category; + +template +using to_json_function = decltype(T::to_json(std::declval()...)); + +template +using from_json_function = decltype(T::from_json(std::declval()...)); + +template +using get_template_function = decltype(std::declval().template get()); + +// trait checking if JSONSerializer::from_json(json const&, udt&) exists +template +struct has_from_json : std::false_type {}; + +// trait checking if j.get is valid +// use this trait instead of std::is_constructible or std::is_convertible, +// both rely on, or make use of implicit conversions, and thus fail when T +// has several constructors/operator= (see https://github.com/nlohmann/json/issues/958) +template +struct is_getable +{ + static constexpr bool value = is_detected::value; +}; + +template +struct has_from_json < BasicJsonType, T, enable_if_t < !is_basic_json::value >> +{ + using serializer = typename BasicJsonType::template json_serializer; + + static constexpr bool value = + is_detected_exact::value; +}; + +// This trait checks if JSONSerializer::from_json(json const&) exists +// this overload is used for non-default-constructible user-defined-types +template +struct has_non_default_from_json : std::false_type {}; + +template +struct has_non_default_from_json < BasicJsonType, T, enable_if_t < !is_basic_json::value >> +{ + using serializer = typename BasicJsonType::template json_serializer; + + static constexpr bool value = + is_detected_exact::value; +}; + +// This trait checks if BasicJsonType::json_serializer::to_json exists +// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion. +template +struct has_to_json : std::false_type {}; + +template +struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json::value >> +{ + using serializer = typename BasicJsonType::template json_serializer; + + static constexpr bool value = + is_detected_exact::value; +}; + + +/////////////////// +// is_ functions // +/////////////////// + +// https://en.cppreference.com/w/cpp/types/conjunction +template struct conjunction : std::true_type { }; +template struct conjunction : B1 { }; +template +struct conjunction +: std::conditional, B1>::type {}; + +// https://en.cppreference.com/w/cpp/types/negation +template struct negation : std::integral_constant < bool, !B::value > { }; + +// Reimplementation of is_constructible and is_default_constructible, due to them being broken for +// std::pair and std::tuple until LWG 2367 fix (see https://cplusplus.github.io/LWG/lwg-defects.html#2367). +// This causes compile errors in e.g. clang 3.5 or gcc 4.9. +template +struct is_default_constructible : std::is_default_constructible {}; + +template +struct is_default_constructible> + : conjunction, is_default_constructible> {}; + +template +struct is_default_constructible> + : conjunction, is_default_constructible> {}; + +template +struct is_default_constructible> + : conjunction...> {}; + +template +struct is_default_constructible> + : conjunction...> {}; + + +template +struct is_constructible : std::is_constructible {}; + +template +struct is_constructible> : is_default_constructible> {}; + +template +struct is_constructible> : is_default_constructible> {}; + +template +struct is_constructible> : is_default_constructible> {}; + +template +struct is_constructible> : is_default_constructible> {}; + + +template +struct is_iterator_traits : std::false_type {}; + +template +struct is_iterator_traits> +{ + private: + using traits = iterator_traits; + + public: + static constexpr auto value = + is_detected::value && + is_detected::value && + is_detected::value && + is_detected::value && + is_detected::value; +}; + +template +struct is_range +{ + private: + using t_ref = typename std::add_lvalue_reference::type; + + using iterator = detected_t; + using sentinel = detected_t; + + // to be 100% correct, it should use https://en.cppreference.com/w/cpp/iterator/input_or_output_iterator + // and https://en.cppreference.com/w/cpp/iterator/sentinel_for + // but reimplementing these would be too much work, as a lot of other concepts are used underneath + static constexpr auto is_iterator_begin = + is_iterator_traits>::value; + + public: + static constexpr bool value = !std::is_same::value && !std::is_same::value && is_iterator_begin; +}; + +template +using iterator_t = enable_if_t::value, result_of_begin())>>; + +template +using range_value_t = value_type_t>>; + +// The following implementation of is_complete_type is taken from +// https://blogs.msdn.microsoft.com/vcblog/2015/12/02/partial-support-for-expression-sfinae-in-vs-2015-update-1/ +// and is written by Xiang Fan who agreed to using it in this library. + +template +struct is_complete_type : std::false_type {}; + +template +struct is_complete_type : std::true_type {}; + +template +struct is_compatible_object_type_impl : std::false_type {}; + +template +struct is_compatible_object_type_impl < + BasicJsonType, CompatibleObjectType, + enable_if_t < is_detected::value&& + is_detected::value >> +{ + using object_t = typename BasicJsonType::object_t; + + // macOS's is_constructible does not play well with nonesuch... + static constexpr bool value = + is_constructible::value && + is_constructible::value; +}; + +template +struct is_compatible_object_type + : is_compatible_object_type_impl {}; + +template +struct is_constructible_object_type_impl : std::false_type {}; + +template +struct is_constructible_object_type_impl < + BasicJsonType, ConstructibleObjectType, + enable_if_t < is_detected::value&& + is_detected::value >> +{ + using object_t = typename BasicJsonType::object_t; + + static constexpr bool value = + (is_default_constructible::value && + (std::is_move_assignable::value || + std::is_copy_assignable::value) && + (is_constructible::value && + std::is_same < + typename object_t::mapped_type, + typename ConstructibleObjectType::mapped_type >::value)) || + (has_from_json::value || + has_non_default_from_json < + BasicJsonType, + typename ConstructibleObjectType::mapped_type >::value); +}; + +template +struct is_constructible_object_type + : is_constructible_object_type_impl {}; + +template +struct is_compatible_string_type +{ + static constexpr auto value = + is_constructible::value; +}; + +template +struct is_constructible_string_type +{ + static constexpr auto value = + is_constructible::value; +}; + +template +struct is_compatible_array_type_impl : std::false_type {}; + +template +struct is_compatible_array_type_impl < + BasicJsonType, CompatibleArrayType, + enable_if_t < + is_detected::value&& + is_iterator_traits>>::value&& +// special case for types like std::filesystem::path whose iterator's value_type are themselves +// c.f. https://github.com/nlohmann/json/pull/3073 + !std::is_same>::value >> +{ + static constexpr bool value = + is_constructible>::value; +}; + +template +struct is_compatible_array_type + : is_compatible_array_type_impl {}; + +template +struct is_constructible_array_type_impl : std::false_type {}; + +template +struct is_constructible_array_type_impl < + BasicJsonType, ConstructibleArrayType, + enable_if_t::value >> + : std::true_type {}; + +template +struct is_constructible_array_type_impl < + BasicJsonType, ConstructibleArrayType, + enable_if_t < !std::is_same::value&& + !is_compatible_string_type::value&& + is_default_constructible::value&& +(std::is_move_assignable::value || + std::is_copy_assignable::value)&& +is_detected::value&& +is_iterator_traits>>::value&& +is_detected::value&& +// special case for types like std::filesystem::path whose iterator's value_type are themselves +// c.f. https://github.com/nlohmann/json/pull/3073 +!std::is_same>::value&& + is_complete_type < + detected_t>::value >> +{ + using value_type = range_value_t; + + static constexpr bool value = + std::is_same::value || + has_from_json::value || + has_non_default_from_json < + BasicJsonType, + value_type >::value; +}; + +template +struct is_constructible_array_type + : is_constructible_array_type_impl {}; + +template +struct is_compatible_integer_type_impl : std::false_type {}; + +template +struct is_compatible_integer_type_impl < + RealIntegerType, CompatibleNumberIntegerType, + enable_if_t < std::is_integral::value&& + std::is_integral::value&& + !std::is_same::value >> +{ + // is there an assert somewhere on overflows? + using RealLimits = std::numeric_limits; + using CompatibleLimits = std::numeric_limits; + + static constexpr auto value = + is_constructible::value && + CompatibleLimits::is_integer && + RealLimits::is_signed == CompatibleLimits::is_signed; +}; + +template +struct is_compatible_integer_type + : is_compatible_integer_type_impl {}; + +template +struct is_compatible_type_impl: std::false_type {}; + +template +struct is_compatible_type_impl < + BasicJsonType, CompatibleType, + enable_if_t::value >> +{ + static constexpr bool value = + has_to_json::value; +}; + +template +struct is_compatible_type + : is_compatible_type_impl {}; + +template +struct is_constructible_tuple : std::false_type {}; + +template +struct is_constructible_tuple> : conjunction...> {}; + +// a naive helper to check if a type is an ordered_map (exploits the fact that +// ordered_map inherits capacity() from std::vector) +template +struct is_ordered_map +{ + using one = char; + + struct two + { + char x[2]; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) + }; + + template static one test( decltype(&C::capacity) ) ; + template static two test(...); + + enum { value = sizeof(test(nullptr)) == sizeof(char) }; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg) +}; + +// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324) +template < typename T, typename U, enable_if_t < !std::is_same::value, int > = 0 > +T conditional_static_cast(U value) +{ + return static_cast(value); +} + +template::value, int> = 0> +T conditional_static_cast(U value) +{ + return value; +} + +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/meta/void_t.hpp b/src/nlohmann/detail/meta/void_t.hpp new file mode 100644 index 00000000000..4ee2c86f0d0 --- /dev/null +++ b/src/nlohmann/detail/meta/void_t.hpp @@ -0,0 +1,13 @@ +#pragma once + +namespace nlohmann +{ +namespace detail +{ +template struct make_void +{ + using type = void; +}; +template using void_t = typename make_void::type; +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/output/binary_writer.hpp b/src/nlohmann/detail/output/binary_writer.hpp new file mode 100644 index 00000000000..42fd50e3213 --- /dev/null +++ b/src/nlohmann/detail/output/binary_writer.hpp @@ -0,0 +1,1635 @@ +#pragma once + +#include // reverse +#include // array +#include // isnan, isinf +#include // uint8_t, uint16_t, uint32_t, uint64_t +#include // memcpy +#include // numeric_limits +#include // string +#include // move + +#include +#include +#include + +namespace nlohmann +{ +namespace detail +{ +/////////////////// +// binary writer // +/////////////////// + +/*! +@brief serialization to CBOR and MessagePack values +*/ +template +class binary_writer +{ + using string_t = typename BasicJsonType::string_t; + using binary_t = typename BasicJsonType::binary_t; + using number_float_t = typename BasicJsonType::number_float_t; + + public: + /*! + @brief create a binary writer + + @param[in] adapter output adapter to write to + */ + explicit binary_writer(output_adapter_t adapter) : oa(std::move(adapter)) + { + JSON_ASSERT(oa); + } + + /*! + @param[in] j JSON value to serialize + @pre j.type() == value_t::object + */ + void write_bson(const BasicJsonType& j) + { + switch (j.type()) + { + case value_t::object: + { + write_bson_object(*j.m_value.object); + break; + } + + case value_t::null: + case value_t::array: + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + { + JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name()), j)); + } + } + } + + /*! + @param[in] j JSON value to serialize + */ + void write_cbor(const BasicJsonType& j) + { + switch (j.type()) + { + case value_t::null: + { + oa->write_character(to_char_type(0xF6)); + break; + } + + case value_t::boolean: + { + oa->write_character(j.m_value.boolean + ? to_char_type(0xF5) + : to_char_type(0xF4)); + break; + } + + case value_t::number_integer: + { + if (j.m_value.number_integer >= 0) + { + // CBOR does not differentiate between positive signed + // integers and unsigned integers. Therefore, we used the + // code from the value_t::number_unsigned case here. + if (j.m_value.number_integer <= 0x17) + { + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_integer <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x18)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_integer <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x19)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_integer <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x1A)); + write_number(static_cast(j.m_value.number_integer)); + } + else + { + oa->write_character(to_char_type(0x1B)); + write_number(static_cast(j.m_value.number_integer)); + } + } + else + { + // The conversions below encode the sign in the first + // byte, and the value is converted to a positive number. + const auto positive_number = -1 - j.m_value.number_integer; + if (j.m_value.number_integer >= -24) + { + write_number(static_cast(0x20 + positive_number)); + } + else if (positive_number <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x38)); + write_number(static_cast(positive_number)); + } + else if (positive_number <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x39)); + write_number(static_cast(positive_number)); + } + else if (positive_number <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x3A)); + write_number(static_cast(positive_number)); + } + else + { + oa->write_character(to_char_type(0x3B)); + write_number(static_cast(positive_number)); + } + } + break; + } + + case value_t::number_unsigned: + { + if (j.m_value.number_unsigned <= 0x17) + { + write_number(static_cast(j.m_value.number_unsigned)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x18)); + write_number(static_cast(j.m_value.number_unsigned)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x19)); + write_number(static_cast(j.m_value.number_unsigned)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x1A)); + write_number(static_cast(j.m_value.number_unsigned)); + } + else + { + oa->write_character(to_char_type(0x1B)); + write_number(static_cast(j.m_value.number_unsigned)); + } + break; + } + + case value_t::number_float: + { + if (std::isnan(j.m_value.number_float)) + { + // NaN is 0xf97e00 in CBOR + oa->write_character(to_char_type(0xF9)); + oa->write_character(to_char_type(0x7E)); + oa->write_character(to_char_type(0x00)); + } + else if (std::isinf(j.m_value.number_float)) + { + // Infinity is 0xf97c00, -Infinity is 0xf9fc00 + oa->write_character(to_char_type(0xf9)); + oa->write_character(j.m_value.number_float > 0 ? to_char_type(0x7C) : to_char_type(0xFC)); + oa->write_character(to_char_type(0x00)); + } + else + { + write_compact_float(j.m_value.number_float, detail::input_format_t::cbor); + } + break; + } + + case value_t::string: + { + // step 1: write control byte and the string length + const auto N = j.m_value.string->size(); + if (N <= 0x17) + { + write_number(static_cast(0x60 + N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x78)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x79)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x7A)); + write_number(static_cast(N)); + } + // LCOV_EXCL_START + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x7B)); + write_number(static_cast(N)); + } + // LCOV_EXCL_STOP + + // step 2: write the string + oa->write_characters( + reinterpret_cast(j.m_value.string->c_str()), + j.m_value.string->size()); + break; + } + + case value_t::array: + { + // step 1: write control byte and the array size + const auto N = j.m_value.array->size(); + if (N <= 0x17) + { + write_number(static_cast(0x80 + N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x98)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x99)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x9A)); + write_number(static_cast(N)); + } + // LCOV_EXCL_START + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x9B)); + write_number(static_cast(N)); + } + // LCOV_EXCL_STOP + + // step 2: write each element + for (const auto& el : *j.m_value.array) + { + write_cbor(el); + } + break; + } + + case value_t::binary: + { + if (j.m_value.binary->has_subtype()) + { + if (j.m_value.binary->subtype() <= (std::numeric_limits::max)()) + { + write_number(static_cast(0xd8)); + write_number(static_cast(j.m_value.binary->subtype())); + } + else if (j.m_value.binary->subtype() <= (std::numeric_limits::max)()) + { + write_number(static_cast(0xd9)); + write_number(static_cast(j.m_value.binary->subtype())); + } + else if (j.m_value.binary->subtype() <= (std::numeric_limits::max)()) + { + write_number(static_cast(0xda)); + write_number(static_cast(j.m_value.binary->subtype())); + } + else if (j.m_value.binary->subtype() <= (std::numeric_limits::max)()) + { + write_number(static_cast(0xdb)); + write_number(static_cast(j.m_value.binary->subtype())); + } + } + + // step 1: write control byte and the binary array size + const auto N = j.m_value.binary->size(); + if (N <= 0x17) + { + write_number(static_cast(0x40 + N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x58)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x59)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x5A)); + write_number(static_cast(N)); + } + // LCOV_EXCL_START + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0x5B)); + write_number(static_cast(N)); + } + // LCOV_EXCL_STOP + + // step 2: write each element + oa->write_characters( + reinterpret_cast(j.m_value.binary->data()), + N); + + break; + } + + case value_t::object: + { + // step 1: write control byte and the object size + const auto N = j.m_value.object->size(); + if (N <= 0x17) + { + write_number(static_cast(0xA0 + N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0xB8)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0xB9)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0xBA)); + write_number(static_cast(N)); + } + // LCOV_EXCL_START + else if (N <= (std::numeric_limits::max)()) + { + oa->write_character(to_char_type(0xBB)); + write_number(static_cast(N)); + } + // LCOV_EXCL_STOP + + // step 2: write each element + for (const auto& el : *j.m_value.object) + { + write_cbor(el.first); + write_cbor(el.second); + } + break; + } + + case value_t::discarded: + default: + break; + } + } + + /*! + @param[in] j JSON value to serialize + */ + void write_msgpack(const BasicJsonType& j) + { + switch (j.type()) + { + case value_t::null: // nil + { + oa->write_character(to_char_type(0xC0)); + break; + } + + case value_t::boolean: // true and false + { + oa->write_character(j.m_value.boolean + ? to_char_type(0xC3) + : to_char_type(0xC2)); + break; + } + + case value_t::number_integer: + { + if (j.m_value.number_integer >= 0) + { + // MessagePack does not differentiate between positive + // signed integers and unsigned integers. Therefore, we used + // the code from the value_t::number_unsigned case here. + if (j.m_value.number_unsigned < 128) + { + // positive fixnum + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + // uint 8 + oa->write_character(to_char_type(0xCC)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + // uint 16 + oa->write_character(to_char_type(0xCD)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + // uint 32 + oa->write_character(to_char_type(0xCE)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + // uint 64 + oa->write_character(to_char_type(0xCF)); + write_number(static_cast(j.m_value.number_integer)); + } + } + else + { + if (j.m_value.number_integer >= -32) + { + // negative fixnum + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_integer >= (std::numeric_limits::min)() && + j.m_value.number_integer <= (std::numeric_limits::max)()) + { + // int 8 + oa->write_character(to_char_type(0xD0)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_integer >= (std::numeric_limits::min)() && + j.m_value.number_integer <= (std::numeric_limits::max)()) + { + // int 16 + oa->write_character(to_char_type(0xD1)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_integer >= (std::numeric_limits::min)() && + j.m_value.number_integer <= (std::numeric_limits::max)()) + { + // int 32 + oa->write_character(to_char_type(0xD2)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_integer >= (std::numeric_limits::min)() && + j.m_value.number_integer <= (std::numeric_limits::max)()) + { + // int 64 + oa->write_character(to_char_type(0xD3)); + write_number(static_cast(j.m_value.number_integer)); + } + } + break; + } + + case value_t::number_unsigned: + { + if (j.m_value.number_unsigned < 128) + { + // positive fixnum + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + // uint 8 + oa->write_character(to_char_type(0xCC)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + // uint 16 + oa->write_character(to_char_type(0xCD)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + // uint 32 + oa->write_character(to_char_type(0xCE)); + write_number(static_cast(j.m_value.number_integer)); + } + else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + { + // uint 64 + oa->write_character(to_char_type(0xCF)); + write_number(static_cast(j.m_value.number_integer)); + } + break; + } + + case value_t::number_float: + { + write_compact_float(j.m_value.number_float, detail::input_format_t::msgpack); + break; + } + + case value_t::string: + { + // step 1: write control byte and the string length + const auto N = j.m_value.string->size(); + if (N <= 31) + { + // fixstr + write_number(static_cast(0xA0 | N)); + } + else if (N <= (std::numeric_limits::max)()) + { + // str 8 + oa->write_character(to_char_type(0xD9)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + // str 16 + oa->write_character(to_char_type(0xDA)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + // str 32 + oa->write_character(to_char_type(0xDB)); + write_number(static_cast(N)); + } + + // step 2: write the string + oa->write_characters( + reinterpret_cast(j.m_value.string->c_str()), + j.m_value.string->size()); + break; + } + + case value_t::array: + { + // step 1: write control byte and the array size + const auto N = j.m_value.array->size(); + if (N <= 15) + { + // fixarray + write_number(static_cast(0x90 | N)); + } + else if (N <= (std::numeric_limits::max)()) + { + // array 16 + oa->write_character(to_char_type(0xDC)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + // array 32 + oa->write_character(to_char_type(0xDD)); + write_number(static_cast(N)); + } + + // step 2: write each element + for (const auto& el : *j.m_value.array) + { + write_msgpack(el); + } + break; + } + + case value_t::binary: + { + // step 0: determine if the binary type has a set subtype to + // determine whether or not to use the ext or fixext types + const bool use_ext = j.m_value.binary->has_subtype(); + + // step 1: write control byte and the byte string length + const auto N = j.m_value.binary->size(); + if (N <= (std::numeric_limits::max)()) + { + std::uint8_t output_type{}; + bool fixed = true; + if (use_ext) + { + switch (N) + { + case 1: + output_type = 0xD4; // fixext 1 + break; + case 2: + output_type = 0xD5; // fixext 2 + break; + case 4: + output_type = 0xD6; // fixext 4 + break; + case 8: + output_type = 0xD7; // fixext 8 + break; + case 16: + output_type = 0xD8; // fixext 16 + break; + default: + output_type = 0xC7; // ext 8 + fixed = false; + break; + } + + } + else + { + output_type = 0xC4; // bin 8 + fixed = false; + } + + oa->write_character(to_char_type(output_type)); + if (!fixed) + { + write_number(static_cast(N)); + } + } + else if (N <= (std::numeric_limits::max)()) + { + std::uint8_t output_type = use_ext + ? 0xC8 // ext 16 + : 0xC5; // bin 16 + + oa->write_character(to_char_type(output_type)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + std::uint8_t output_type = use_ext + ? 0xC9 // ext 32 + : 0xC6; // bin 32 + + oa->write_character(to_char_type(output_type)); + write_number(static_cast(N)); + } + + // step 1.5: if this is an ext type, write the subtype + if (use_ext) + { + write_number(static_cast(j.m_value.binary->subtype())); + } + + // step 2: write the byte string + oa->write_characters( + reinterpret_cast(j.m_value.binary->data()), + N); + + break; + } + + case value_t::object: + { + // step 1: write control byte and the object size + const auto N = j.m_value.object->size(); + if (N <= 15) + { + // fixmap + write_number(static_cast(0x80 | (N & 0xF))); + } + else if (N <= (std::numeric_limits::max)()) + { + // map 16 + oa->write_character(to_char_type(0xDE)); + write_number(static_cast(N)); + } + else if (N <= (std::numeric_limits::max)()) + { + // map 32 + oa->write_character(to_char_type(0xDF)); + write_number(static_cast(N)); + } + + // step 2: write each element + for (const auto& el : *j.m_value.object) + { + write_msgpack(el.first); + write_msgpack(el.second); + } + break; + } + + case value_t::discarded: + default: + break; + } + } + + /*! + @param[in] j JSON value to serialize + @param[in] use_count whether to use '#' prefixes (optimized format) + @param[in] use_type whether to use '$' prefixes (optimized format) + @param[in] add_prefix whether prefixes need to be used for this value + */ + void write_ubjson(const BasicJsonType& j, const bool use_count, + const bool use_type, const bool add_prefix = true) + { + switch (j.type()) + { + case value_t::null: + { + if (add_prefix) + { + oa->write_character(to_char_type('Z')); + } + break; + } + + case value_t::boolean: + { + if (add_prefix) + { + oa->write_character(j.m_value.boolean + ? to_char_type('T') + : to_char_type('F')); + } + break; + } + + case value_t::number_integer: + { + write_number_with_ubjson_prefix(j.m_value.number_integer, add_prefix); + break; + } + + case value_t::number_unsigned: + { + write_number_with_ubjson_prefix(j.m_value.number_unsigned, add_prefix); + break; + } + + case value_t::number_float: + { + write_number_with_ubjson_prefix(j.m_value.number_float, add_prefix); + break; + } + + case value_t::string: + { + if (add_prefix) + { + oa->write_character(to_char_type('S')); + } + write_number_with_ubjson_prefix(j.m_value.string->size(), true); + oa->write_characters( + reinterpret_cast(j.m_value.string->c_str()), + j.m_value.string->size()); + break; + } + + case value_t::array: + { + if (add_prefix) + { + oa->write_character(to_char_type('[')); + } + + bool prefix_required = true; + if (use_type && !j.m_value.array->empty()) + { + JSON_ASSERT(use_count); + const CharType first_prefix = ubjson_prefix(j.front()); + const bool same_prefix = std::all_of(j.begin() + 1, j.end(), + [this, first_prefix](const BasicJsonType & v) + { + return ubjson_prefix(v) == first_prefix; + }); + + if (same_prefix) + { + prefix_required = false; + oa->write_character(to_char_type('$')); + oa->write_character(first_prefix); + } + } + + if (use_count) + { + oa->write_character(to_char_type('#')); + write_number_with_ubjson_prefix(j.m_value.array->size(), true); + } + + for (const auto& el : *j.m_value.array) + { + write_ubjson(el, use_count, use_type, prefix_required); + } + + if (!use_count) + { + oa->write_character(to_char_type(']')); + } + + break; + } + + case value_t::binary: + { + if (add_prefix) + { + oa->write_character(to_char_type('[')); + } + + if (use_type && !j.m_value.binary->empty()) + { + JSON_ASSERT(use_count); + oa->write_character(to_char_type('$')); + oa->write_character('U'); + } + + if (use_count) + { + oa->write_character(to_char_type('#')); + write_number_with_ubjson_prefix(j.m_value.binary->size(), true); + } + + if (use_type) + { + oa->write_characters( + reinterpret_cast(j.m_value.binary->data()), + j.m_value.binary->size()); + } + else + { + for (size_t i = 0; i < j.m_value.binary->size(); ++i) + { + oa->write_character(to_char_type('U')); + oa->write_character(j.m_value.binary->data()[i]); + } + } + + if (!use_count) + { + oa->write_character(to_char_type(']')); + } + + break; + } + + case value_t::object: + { + if (add_prefix) + { + oa->write_character(to_char_type('{')); + } + + bool prefix_required = true; + if (use_type && !j.m_value.object->empty()) + { + JSON_ASSERT(use_count); + const CharType first_prefix = ubjson_prefix(j.front()); + const bool same_prefix = std::all_of(j.begin(), j.end(), + [this, first_prefix](const BasicJsonType & v) + { + return ubjson_prefix(v) == first_prefix; + }); + + if (same_prefix) + { + prefix_required = false; + oa->write_character(to_char_type('$')); + oa->write_character(first_prefix); + } + } + + if (use_count) + { + oa->write_character(to_char_type('#')); + write_number_with_ubjson_prefix(j.m_value.object->size(), true); + } + + for (const auto& el : *j.m_value.object) + { + write_number_with_ubjson_prefix(el.first.size(), true); + oa->write_characters( + reinterpret_cast(el.first.c_str()), + el.first.size()); + write_ubjson(el.second, use_count, use_type, prefix_required); + } + + if (!use_count) + { + oa->write_character(to_char_type('}')); + } + + break; + } + + case value_t::discarded: + default: + break; + } + } + + private: + ////////// + // BSON // + ////////// + + /*! + @return The size of a BSON document entry header, including the id marker + and the entry name size (and its null-terminator). + */ + static std::size_t calc_bson_entry_header_size(const string_t& name, const BasicJsonType& j) + { + const auto it = name.find(static_cast(0)); + if (JSON_HEDLEY_UNLIKELY(it != BasicJsonType::string_t::npos)) + { + JSON_THROW(out_of_range::create(409, "BSON key cannot contain code point U+0000 (at byte " + std::to_string(it) + ")", j)); + static_cast(j); + } + + return /*id*/ 1ul + name.size() + /*zero-terminator*/1u; + } + + /*! + @brief Writes the given @a element_type and @a name to the output adapter + */ + void write_bson_entry_header(const string_t& name, + const std::uint8_t element_type) + { + oa->write_character(to_char_type(element_type)); // boolean + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + } + + /*! + @brief Writes a BSON element with key @a name and boolean value @a value + */ + void write_bson_boolean(const string_t& name, + const bool value) + { + write_bson_entry_header(name, 0x08); + oa->write_character(value ? to_char_type(0x01) : to_char_type(0x00)); + } + + /*! + @brief Writes a BSON element with key @a name and double value @a value + */ + void write_bson_double(const string_t& name, + const double value) + { + write_bson_entry_header(name, 0x01); + write_number(value); + } + + /*! + @return The size of the BSON-encoded string in @a value + */ + static std::size_t calc_bson_string_size(const string_t& value) + { + return sizeof(std::int32_t) + value.size() + 1ul; + } + + /*! + @brief Writes a BSON element with key @a name and string value @a value + */ + void write_bson_string(const string_t& name, + const string_t& value) + { + write_bson_entry_header(name, 0x02); + + write_number(static_cast(value.size() + 1ul)); + oa->write_characters( + reinterpret_cast(value.c_str()), + value.size() + 1); + } + + /*! + @brief Writes a BSON element with key @a name and null value + */ + void write_bson_null(const string_t& name) + { + write_bson_entry_header(name, 0x0A); + } + + /*! + @return The size of the BSON-encoded integer @a value + */ + static std::size_t calc_bson_integer_size(const std::int64_t value) + { + return (std::numeric_limits::min)() <= value && value <= (std::numeric_limits::max)() + ? sizeof(std::int32_t) + : sizeof(std::int64_t); + } + + /*! + @brief Writes a BSON element with key @a name and integer @a value + */ + void write_bson_integer(const string_t& name, + const std::int64_t value) + { + if ((std::numeric_limits::min)() <= value && value <= (std::numeric_limits::max)()) + { + write_bson_entry_header(name, 0x10); // int32 + write_number(static_cast(value)); + } + else + { + write_bson_entry_header(name, 0x12); // int64 + write_number(static_cast(value)); + } + } + + /*! + @return The size of the BSON-encoded unsigned integer in @a j + */ + static constexpr std::size_t calc_bson_unsigned_size(const std::uint64_t value) noexcept + { + return (value <= static_cast((std::numeric_limits::max)())) + ? sizeof(std::int32_t) + : sizeof(std::int64_t); + } + + /*! + @brief Writes a BSON element with key @a name and unsigned @a value + */ + void write_bson_unsigned(const string_t& name, + const BasicJsonType& j) + { + if (j.m_value.number_unsigned <= static_cast((std::numeric_limits::max)())) + { + write_bson_entry_header(name, 0x10 /* int32 */); + write_number(static_cast(j.m_value.number_unsigned)); + } + else if (j.m_value.number_unsigned <= static_cast((std::numeric_limits::max)())) + { + write_bson_entry_header(name, 0x12 /* int64 */); + write_number(static_cast(j.m_value.number_unsigned)); + } + else + { + JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(j.m_value.number_unsigned) + " cannot be represented by BSON as it does not fit int64", j)); + } + } + + /*! + @brief Writes a BSON element with key @a name and object @a value + */ + void write_bson_object_entry(const string_t& name, + const typename BasicJsonType::object_t& value) + { + write_bson_entry_header(name, 0x03); // object + write_bson_object(value); + } + + /*! + @return The size of the BSON-encoded array @a value + */ + static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value) + { + std::size_t array_index = 0ul; + + const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), std::size_t(0), [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el) + { + return result + calc_bson_element_size(std::to_string(array_index++), el); + }); + + return sizeof(std::int32_t) + embedded_document_size + 1ul; + } + + /*! + @return The size of the BSON-encoded binary array @a value + */ + static std::size_t calc_bson_binary_size(const typename BasicJsonType::binary_t& value) + { + return sizeof(std::int32_t) + value.size() + 1ul; + } + + /*! + @brief Writes a BSON element with key @a name and array @a value + */ + void write_bson_array(const string_t& name, + const typename BasicJsonType::array_t& value) + { + write_bson_entry_header(name, 0x04); // array + write_number(static_cast(calc_bson_array_size(value))); + + std::size_t array_index = 0ul; + + for (const auto& el : value) + { + write_bson_element(std::to_string(array_index++), el); + } + + oa->write_character(to_char_type(0x00)); + } + + /*! + @brief Writes a BSON element with key @a name and binary value @a value + */ + void write_bson_binary(const string_t& name, + const binary_t& value) + { + write_bson_entry_header(name, 0x05); + + write_number(static_cast(value.size())); + write_number(value.has_subtype() ? static_cast(value.subtype()) : std::uint8_t(0x00)); + + oa->write_characters(reinterpret_cast(value.data()), value.size()); + } + + /*! + @brief Calculates the size necessary to serialize the JSON value @a j with its @a name + @return The calculated size for the BSON document entry for @a j with the given @a name. + */ + static std::size_t calc_bson_element_size(const string_t& name, + const BasicJsonType& j) + { + const auto header_size = calc_bson_entry_header_size(name, j); + switch (j.type()) + { + case value_t::object: + return header_size + calc_bson_object_size(*j.m_value.object); + + case value_t::array: + return header_size + calc_bson_array_size(*j.m_value.array); + + case value_t::binary: + return header_size + calc_bson_binary_size(*j.m_value.binary); + + case value_t::boolean: + return header_size + 1ul; + + case value_t::number_float: + return header_size + 8ul; + + case value_t::number_integer: + return header_size + calc_bson_integer_size(j.m_value.number_integer); + + case value_t::number_unsigned: + return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned); + + case value_t::string: + return header_size + calc_bson_string_size(*j.m_value.string); + + case value_t::null: + return header_size + 0ul; + + // LCOV_EXCL_START + case value_t::discarded: + default: + JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) + return 0ul; + // LCOV_EXCL_STOP + } + } + + /*! + @brief Serializes the JSON value @a j to BSON and associates it with the + key @a name. + @param name The name to associate with the JSON entity @a j within the + current BSON document + */ + void write_bson_element(const string_t& name, + const BasicJsonType& j) + { + switch (j.type()) + { + case value_t::object: + return write_bson_object_entry(name, *j.m_value.object); + + case value_t::array: + return write_bson_array(name, *j.m_value.array); + + case value_t::binary: + return write_bson_binary(name, *j.m_value.binary); + + case value_t::boolean: + return write_bson_boolean(name, j.m_value.boolean); + + case value_t::number_float: + return write_bson_double(name, j.m_value.number_float); + + case value_t::number_integer: + return write_bson_integer(name, j.m_value.number_integer); + + case value_t::number_unsigned: + return write_bson_unsigned(name, j); + + case value_t::string: + return write_bson_string(name, *j.m_value.string); + + case value_t::null: + return write_bson_null(name); + + // LCOV_EXCL_START + case value_t::discarded: + default: + JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) + return; + // LCOV_EXCL_STOP + } + } + + /*! + @brief Calculates the size of the BSON serialization of the given + JSON-object @a j. + @param[in] value JSON value to serialize + @pre value.type() == value_t::object + */ + static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value) + { + std::size_t document_size = std::accumulate(value.begin(), value.end(), std::size_t(0), + [](size_t result, const typename BasicJsonType::object_t::value_type & el) + { + return result += calc_bson_element_size(el.first, el.second); + }); + + return sizeof(std::int32_t) + document_size + 1ul; + } + + /*! + @param[in] value JSON value to serialize + @pre value.type() == value_t::object + */ + void write_bson_object(const typename BasicJsonType::object_t& value) + { + write_number(static_cast(calc_bson_object_size(value))); + + for (const auto& el : value) + { + write_bson_element(el.first, el.second); + } + + oa->write_character(to_char_type(0x00)); + } + + ////////// + // CBOR // + ////////// + + static constexpr CharType get_cbor_float_prefix(float /*unused*/) + { + return to_char_type(0xFA); // Single-Precision Float + } + + static constexpr CharType get_cbor_float_prefix(double /*unused*/) + { + return to_char_type(0xFB); // Double-Precision Float + } + + ///////////// + // MsgPack // + ///////////// + + static constexpr CharType get_msgpack_float_prefix(float /*unused*/) + { + return to_char_type(0xCA); // float 32 + } + + static constexpr CharType get_msgpack_float_prefix(double /*unused*/) + { + return to_char_type(0xCB); // float 64 + } + + //////////// + // UBJSON // + //////////// + + // UBJSON: write number (floating point) + template::value, int>::type = 0> + void write_number_with_ubjson_prefix(const NumberType n, + const bool add_prefix) + { + if (add_prefix) + { + oa->write_character(get_ubjson_float_prefix(n)); + } + write_number(n); + } + + // UBJSON: write number (unsigned integer) + template::value, int>::type = 0> + void write_number_with_ubjson_prefix(const NumberType n, + const bool add_prefix) + { + if (n <= static_cast((std::numeric_limits::max)())) + { + if (add_prefix) + { + oa->write_character(to_char_type('i')); // int8 + } + write_number(static_cast(n)); + } + else if (n <= (std::numeric_limits::max)()) + { + if (add_prefix) + { + oa->write_character(to_char_type('U')); // uint8 + } + write_number(static_cast(n)); + } + else if (n <= static_cast((std::numeric_limits::max)())) + { + if (add_prefix) + { + oa->write_character(to_char_type('I')); // int16 + } + write_number(static_cast(n)); + } + else if (n <= static_cast((std::numeric_limits::max)())) + { + if (add_prefix) + { + oa->write_character(to_char_type('l')); // int32 + } + write_number(static_cast(n)); + } + else if (n <= static_cast((std::numeric_limits::max)())) + { + if (add_prefix) + { + oa->write_character(to_char_type('L')); // int64 + } + write_number(static_cast(n)); + } + else + { + if (add_prefix) + { + oa->write_character(to_char_type('H')); // high-precision number + } + + const auto number = BasicJsonType(n).dump(); + write_number_with_ubjson_prefix(number.size(), true); + for (std::size_t i = 0; i < number.size(); ++i) + { + oa->write_character(to_char_type(static_cast(number[i]))); + } + } + } + + // UBJSON: write number (signed integer) + template < typename NumberType, typename std::enable_if < + std::is_signed::value&& + !std::is_floating_point::value, int >::type = 0 > + void write_number_with_ubjson_prefix(const NumberType n, + const bool add_prefix) + { + if ((std::numeric_limits::min)() <= n && n <= (std::numeric_limits::max)()) + { + if (add_prefix) + { + oa->write_character(to_char_type('i')); // int8 + } + write_number(static_cast(n)); + } + else if (static_cast((std::numeric_limits::min)()) <= n && n <= static_cast((std::numeric_limits::max)())) + { + if (add_prefix) + { + oa->write_character(to_char_type('U')); // uint8 + } + write_number(static_cast(n)); + } + else if ((std::numeric_limits::min)() <= n && n <= (std::numeric_limits::max)()) + { + if (add_prefix) + { + oa->write_character(to_char_type('I')); // int16 + } + write_number(static_cast(n)); + } + else if ((std::numeric_limits::min)() <= n && n <= (std::numeric_limits::max)()) + { + if (add_prefix) + { + oa->write_character(to_char_type('l')); // int32 + } + write_number(static_cast(n)); + } + else if ((std::numeric_limits::min)() <= n && n <= (std::numeric_limits::max)()) + { + if (add_prefix) + { + oa->write_character(to_char_type('L')); // int64 + } + write_number(static_cast(n)); + } + // LCOV_EXCL_START + else + { + if (add_prefix) + { + oa->write_character(to_char_type('H')); // high-precision number + } + + const auto number = BasicJsonType(n).dump(); + write_number_with_ubjson_prefix(number.size(), true); + for (std::size_t i = 0; i < number.size(); ++i) + { + oa->write_character(to_char_type(static_cast(number[i]))); + } + } + // LCOV_EXCL_STOP + } + + /*! + @brief determine the type prefix of container values + */ + CharType ubjson_prefix(const BasicJsonType& j) const noexcept + { + switch (j.type()) + { + case value_t::null: + return 'Z'; + + case value_t::boolean: + return j.m_value.boolean ? 'T' : 'F'; + + case value_t::number_integer: + { + if ((std::numeric_limits::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits::max)()) + { + return 'i'; + } + if ((std::numeric_limits::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits::max)()) + { + return 'U'; + } + if ((std::numeric_limits::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits::max)()) + { + return 'I'; + } + if ((std::numeric_limits::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits::max)()) + { + return 'l'; + } + if ((std::numeric_limits::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits::max)()) + { + return 'L'; + } + // anything else is treated as high-precision number + return 'H'; // LCOV_EXCL_LINE + } + + case value_t::number_unsigned: + { + if (j.m_value.number_unsigned <= static_cast((std::numeric_limits::max)())) + { + return 'i'; + } + if (j.m_value.number_unsigned <= static_cast((std::numeric_limits::max)())) + { + return 'U'; + } + if (j.m_value.number_unsigned <= static_cast((std::numeric_limits::max)())) + { + return 'I'; + } + if (j.m_value.number_unsigned <= static_cast((std::numeric_limits::max)())) + { + return 'l'; + } + if (j.m_value.number_unsigned <= static_cast((std::numeric_limits::max)())) + { + return 'L'; + } + // anything else is treated as high-precision number + return 'H'; // LCOV_EXCL_LINE + } + + case value_t::number_float: + return get_ubjson_float_prefix(j.m_value.number_float); + + case value_t::string: + return 'S'; + + case value_t::array: // fallthrough + case value_t::binary: + return '['; + + case value_t::object: + return '{'; + + case value_t::discarded: + default: // discarded values + return 'N'; + } + } + + static constexpr CharType get_ubjson_float_prefix(float /*unused*/) + { + return 'd'; // float 32 + } + + static constexpr CharType get_ubjson_float_prefix(double /*unused*/) + { + return 'D'; // float 64 + } + + /////////////////////// + // Utility functions // + /////////////////////// + + /* + @brief write a number to output input + @param[in] n number of type @a NumberType + @tparam NumberType the type of the number + @tparam OutputIsLittleEndian Set to true if output data is + required to be little endian + + @note This function needs to respect the system's endianess, because bytes + in CBOR, MessagePack, and UBJSON are stored in network order (big + endian) and therefore need reordering on little endian systems. + */ + template + void write_number(const NumberType n) + { + // step 1: write number to array of length NumberType + std::array vec{}; + std::memcpy(vec.data(), &n, sizeof(NumberType)); + + // step 2: write array to output (with possible reordering) + if (is_little_endian != OutputIsLittleEndian) + { + // reverse byte order prior to conversion if necessary + std::reverse(vec.begin(), vec.end()); + } + + oa->write_characters(vec.data(), sizeof(NumberType)); + } + + void write_compact_float(const number_float_t n, detail::input_format_t format) + { +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wfloat-equal" +#endif + if (static_cast(n) >= static_cast(std::numeric_limits::lowest()) && + static_cast(n) <= static_cast((std::numeric_limits::max)()) && + static_cast(static_cast(n)) == static_cast(n)) + { + oa->write_character(format == detail::input_format_t::cbor + ? get_cbor_float_prefix(static_cast(n)) + : get_msgpack_float_prefix(static_cast(n))); + write_number(static_cast(n)); + } + else + { + oa->write_character(format == detail::input_format_t::cbor + ? get_cbor_float_prefix(n) + : get_msgpack_float_prefix(n)); + write_number(n); + } +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif + } + + public: + // The following to_char_type functions are implement the conversion + // between uint8_t and CharType. In case CharType is not unsigned, + // such a conversion is required to allow values greater than 128. + // See for a discussion. + template < typename C = CharType, + enable_if_t < std::is_signed::value && std::is_signed::value > * = nullptr > + static constexpr CharType to_char_type(std::uint8_t x) noexcept + { + return *reinterpret_cast(&x); + } + + template < typename C = CharType, + enable_if_t < std::is_signed::value && std::is_unsigned::value > * = nullptr > + static CharType to_char_type(std::uint8_t x) noexcept + { + static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t"); + static_assert(std::is_trivial::value, "CharType must be trivial"); + CharType result; + std::memcpy(&result, &x, sizeof(x)); + return result; + } + + template::value>* = nullptr> + static constexpr CharType to_char_type(std::uint8_t x) noexcept + { + return x; + } + + template < typename InputCharType, typename C = CharType, + enable_if_t < + std::is_signed::value && + std::is_signed::value && + std::is_same::type>::value + > * = nullptr > + static constexpr CharType to_char_type(InputCharType x) noexcept + { + return x; + } + + private: + /// whether we can assume little endianess + const bool is_little_endian = little_endianess(); + + /// the output + output_adapter_t oa = nullptr; +}; +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/output/output_adapters.hpp b/src/nlohmann/detail/output/output_adapters.hpp new file mode 100644 index 00000000000..1cad57b19a5 --- /dev/null +++ b/src/nlohmann/detail/output/output_adapters.hpp @@ -0,0 +1,138 @@ +#pragma once + +#include // copy +#include // size_t +#include // back_inserter +#include // shared_ptr, make_shared +#include // basic_string +#include // vector + +#ifndef JSON_NO_IO + #include // streamsize + #include // basic_ostream +#endif // JSON_NO_IO + +#include + +namespace nlohmann +{ +namespace detail +{ +/// abstract output adapter interface +template struct output_adapter_protocol +{ + virtual void write_character(CharType c) = 0; + virtual void write_characters(const CharType* s, std::size_t length) = 0; + virtual ~output_adapter_protocol() = default; + + output_adapter_protocol() = default; + output_adapter_protocol(const output_adapter_protocol&) = default; + output_adapter_protocol(output_adapter_protocol&&) noexcept = default; + output_adapter_protocol& operator=(const output_adapter_protocol&) = default; + output_adapter_protocol& operator=(output_adapter_protocol&&) noexcept = default; +}; + +/// a type to simplify interfaces +template +using output_adapter_t = std::shared_ptr>; + +/// output adapter for byte vectors +template> +class output_vector_adapter : public output_adapter_protocol +{ + public: + explicit output_vector_adapter(std::vector& vec) noexcept + : v(vec) + {} + + void write_character(CharType c) override + { + v.push_back(c); + } + + JSON_HEDLEY_NON_NULL(2) + void write_characters(const CharType* s, std::size_t length) override + { + std::copy(s, s + length, std::back_inserter(v)); + } + + private: + std::vector& v; +}; + +#ifndef JSON_NO_IO +/// output adapter for output streams +template +class output_stream_adapter : public output_adapter_protocol +{ + public: + explicit output_stream_adapter(std::basic_ostream& s) noexcept + : stream(s) + {} + + void write_character(CharType c) override + { + stream.put(c); + } + + JSON_HEDLEY_NON_NULL(2) + void write_characters(const CharType* s, std::size_t length) override + { + stream.write(s, static_cast(length)); + } + + private: + std::basic_ostream& stream; +}; +#endif // JSON_NO_IO + +/// output adapter for basic_string +template> +class output_string_adapter : public output_adapter_protocol +{ + public: + explicit output_string_adapter(StringType& s) noexcept + : str(s) + {} + + void write_character(CharType c) override + { + str.push_back(c); + } + + JSON_HEDLEY_NON_NULL(2) + void write_characters(const CharType* s, std::size_t length) override + { + str.append(s, length); + } + + private: + StringType& str; +}; + +template> +class output_adapter +{ + public: + template> + output_adapter(std::vector& vec) + : oa(std::make_shared>(vec)) {} + +#ifndef JSON_NO_IO + output_adapter(std::basic_ostream& s) + : oa(std::make_shared>(s)) {} +#endif // JSON_NO_IO + + output_adapter(StringType& s) + : oa(std::make_shared>(s)) {} + + operator output_adapter_t() + { + return oa; + } + + private: + output_adapter_t oa = nullptr; +}; +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/output/serializer.hpp b/src/nlohmann/detail/output/serializer.hpp new file mode 100644 index 00000000000..fabb3d3b568 --- /dev/null +++ b/src/nlohmann/detail/output/serializer.hpp @@ -0,0 +1,956 @@ +#pragma once + +#include // reverse, remove, fill, find, none_of +#include // array +#include // localeconv, lconv +#include // labs, isfinite, isnan, signbit +#include // size_t, ptrdiff_t +#include // uint8_t +#include // snprintf +#include // numeric_limits +#include // string, char_traits +#include // is_same +#include // move + +#include +#include +#include +#include +#include +#include +#include + +namespace nlohmann +{ +namespace detail +{ +/////////////////// +// serialization // +/////////////////// + +/// how to treat decoding errors +enum class error_handler_t +{ + strict, ///< throw a type_error exception in case of invalid UTF-8 + replace, ///< replace invalid UTF-8 sequences with U+FFFD + ignore ///< ignore invalid UTF-8 sequences +}; + +template +class serializer +{ + using string_t = typename BasicJsonType::string_t; + using number_float_t = typename BasicJsonType::number_float_t; + using number_integer_t = typename BasicJsonType::number_integer_t; + using number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using binary_char_t = typename BasicJsonType::binary_t::value_type; + static constexpr std::uint8_t UTF8_ACCEPT = 0; + static constexpr std::uint8_t UTF8_REJECT = 1; + + public: + /*! + @param[in] s output stream to serialize to + @param[in] ichar indentation character to use + @param[in] error_handler_ how to react on decoding errors + */ + serializer(output_adapter_t s, const char ichar, + error_handler_t error_handler_ = error_handler_t::strict) + : o(std::move(s)) + , loc(std::localeconv()) + , thousands_sep(loc->thousands_sep == nullptr ? '\0' : std::char_traits::to_char_type(* (loc->thousands_sep))) + , decimal_point(loc->decimal_point == nullptr ? '\0' : std::char_traits::to_char_type(* (loc->decimal_point))) + , indent_char(ichar) + , indent_string(512, indent_char) + , error_handler(error_handler_) + {} + + // delete because of pointer members + serializer(const serializer&) = delete; + serializer& operator=(const serializer&) = delete; + serializer(serializer&&) = delete; + serializer& operator=(serializer&&) = delete; + ~serializer() = default; + + /*! + @brief internal implementation of the serialization function + + This function is called by the public member function dump and organizes + the serialization internally. The indentation level is propagated as + additional parameter. In case of arrays and objects, the function is + called recursively. + + - strings and object keys are escaped using `escape_string()` + - integer numbers are converted implicitly via `operator<<` + - floating-point numbers are converted to a string using `"%g"` format + - binary values are serialized as objects containing the subtype and the + byte array + + @param[in] val value to serialize + @param[in] pretty_print whether the output shall be pretty-printed + @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters + in the output are escaped with `\uXXXX` sequences, and the result consists + of ASCII characters only. + @param[in] indent_step the indent level + @param[in] current_indent the current indent level (only used internally) + */ + void dump(const BasicJsonType& val, + const bool pretty_print, + const bool ensure_ascii, + const unsigned int indent_step, + const unsigned int current_indent = 0) + { + switch (val.m_type) + { + case value_t::object: + { + if (val.m_value.object->empty()) + { + o->write_characters("{}", 2); + return; + } + + if (pretty_print) + { + o->write_characters("{\n", 2); + + // variable to hold indentation for recursive calls + const auto new_indent = current_indent + indent_step; + if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent)) + { + indent_string.resize(indent_string.size() * 2, ' '); + } + + // first n-1 elements + auto i = val.m_value.object->cbegin(); + for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i) + { + o->write_characters(indent_string.c_str(), new_indent); + o->write_character('\"'); + dump_escaped(i->first, ensure_ascii); + o->write_characters("\": ", 3); + dump(i->second, true, ensure_ascii, indent_step, new_indent); + o->write_characters(",\n", 2); + } + + // last element + JSON_ASSERT(i != val.m_value.object->cend()); + JSON_ASSERT(std::next(i) == val.m_value.object->cend()); + o->write_characters(indent_string.c_str(), new_indent); + o->write_character('\"'); + dump_escaped(i->first, ensure_ascii); + o->write_characters("\": ", 3); + dump(i->second, true, ensure_ascii, indent_step, new_indent); + + o->write_character('\n'); + o->write_characters(indent_string.c_str(), current_indent); + o->write_character('}'); + } + else + { + o->write_character('{'); + + // first n-1 elements + auto i = val.m_value.object->cbegin(); + for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i) + { + o->write_character('\"'); + dump_escaped(i->first, ensure_ascii); + o->write_characters("\":", 2); + dump(i->second, false, ensure_ascii, indent_step, current_indent); + o->write_character(','); + } + + // last element + JSON_ASSERT(i != val.m_value.object->cend()); + JSON_ASSERT(std::next(i) == val.m_value.object->cend()); + o->write_character('\"'); + dump_escaped(i->first, ensure_ascii); + o->write_characters("\":", 2); + dump(i->second, false, ensure_ascii, indent_step, current_indent); + + o->write_character('}'); + } + + return; + } + + case value_t::array: + { + if (val.m_value.array->empty()) + { + o->write_characters("[]", 2); + return; + } + + if (pretty_print) + { + o->write_characters("[\n", 2); + + // variable to hold indentation for recursive calls + const auto new_indent = current_indent + indent_step; + if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent)) + { + indent_string.resize(indent_string.size() * 2, ' '); + } + + // first n-1 elements + for (auto i = val.m_value.array->cbegin(); + i != val.m_value.array->cend() - 1; ++i) + { + o->write_characters(indent_string.c_str(), new_indent); + dump(*i, true, ensure_ascii, indent_step, new_indent); + o->write_characters(",\n", 2); + } + + // last element + JSON_ASSERT(!val.m_value.array->empty()); + o->write_characters(indent_string.c_str(), new_indent); + dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent); + + o->write_character('\n'); + o->write_characters(indent_string.c_str(), current_indent); + o->write_character(']'); + } + else + { + o->write_character('['); + + // first n-1 elements + for (auto i = val.m_value.array->cbegin(); + i != val.m_value.array->cend() - 1; ++i) + { + dump(*i, false, ensure_ascii, indent_step, current_indent); + o->write_character(','); + } + + // last element + JSON_ASSERT(!val.m_value.array->empty()); + dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent); + + o->write_character(']'); + } + + return; + } + + case value_t::string: + { + o->write_character('\"'); + dump_escaped(*val.m_value.string, ensure_ascii); + o->write_character('\"'); + return; + } + + case value_t::binary: + { + if (pretty_print) + { + o->write_characters("{\n", 2); + + // variable to hold indentation for recursive calls + const auto new_indent = current_indent + indent_step; + if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent)) + { + indent_string.resize(indent_string.size() * 2, ' '); + } + + o->write_characters(indent_string.c_str(), new_indent); + + o->write_characters("\"bytes\": [", 10); + + if (!val.m_value.binary->empty()) + { + for (auto i = val.m_value.binary->cbegin(); + i != val.m_value.binary->cend() - 1; ++i) + { + dump_integer(*i); + o->write_characters(", ", 2); + } + dump_integer(val.m_value.binary->back()); + } + + o->write_characters("],\n", 3); + o->write_characters(indent_string.c_str(), new_indent); + + o->write_characters("\"subtype\": ", 11); + if (val.m_value.binary->has_subtype()) + { + dump_integer(val.m_value.binary->subtype()); + } + else + { + o->write_characters("null", 4); + } + o->write_character('\n'); + o->write_characters(indent_string.c_str(), current_indent); + o->write_character('}'); + } + else + { + o->write_characters("{\"bytes\":[", 10); + + if (!val.m_value.binary->empty()) + { + for (auto i = val.m_value.binary->cbegin(); + i != val.m_value.binary->cend() - 1; ++i) + { + dump_integer(*i); + o->write_character(','); + } + dump_integer(val.m_value.binary->back()); + } + + o->write_characters("],\"subtype\":", 12); + if (val.m_value.binary->has_subtype()) + { + dump_integer(val.m_value.binary->subtype()); + o->write_character('}'); + } + else + { + o->write_characters("null}", 5); + } + } + return; + } + + case value_t::boolean: + { + if (val.m_value.boolean) + { + o->write_characters("true", 4); + } + else + { + o->write_characters("false", 5); + } + return; + } + + case value_t::number_integer: + { + dump_integer(val.m_value.number_integer); + return; + } + + case value_t::number_unsigned: + { + dump_integer(val.m_value.number_unsigned); + return; + } + + case value_t::number_float: + { + dump_float(val.m_value.number_float); + return; + } + + case value_t::discarded: + { + o->write_characters("", 11); + return; + } + + case value_t::null: + { + o->write_characters("null", 4); + return; + } + + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE + } + } + + JSON_PRIVATE_UNLESS_TESTED: + /*! + @brief dump escaped string + + Escape a string by replacing certain special characters by a sequence of an + escape character (backslash) and another character and other control + characters by a sequence of "\u" followed by a four-digit hex + representation. The escaped string is written to output stream @a o. + + @param[in] s the string to escape + @param[in] ensure_ascii whether to escape non-ASCII characters with + \uXXXX sequences + + @complexity Linear in the length of string @a s. + */ + void dump_escaped(const string_t& s, const bool ensure_ascii) + { + std::uint32_t codepoint{}; + std::uint8_t state = UTF8_ACCEPT; + std::size_t bytes = 0; // number of bytes written to string_buffer + + // number of bytes written at the point of the last valid byte + std::size_t bytes_after_last_accept = 0; + std::size_t undumped_chars = 0; + + for (std::size_t i = 0; i < s.size(); ++i) + { + const auto byte = static_cast(s[i]); + + switch (decode(state, codepoint, byte)) + { + case UTF8_ACCEPT: // decode found a new code point + { + switch (codepoint) + { + case 0x08: // backspace + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = 'b'; + break; + } + + case 0x09: // horizontal tab + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = 't'; + break; + } + + case 0x0A: // newline + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = 'n'; + break; + } + + case 0x0C: // formfeed + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = 'f'; + break; + } + + case 0x0D: // carriage return + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = 'r'; + break; + } + + case 0x22: // quotation mark + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = '\"'; + break; + } + + case 0x5C: // reverse solidus + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = '\\'; + break; + } + + default: + { + // escape control characters (0x00..0x1F) or, if + // ensure_ascii parameter is used, non-ASCII characters + if ((codepoint <= 0x1F) || (ensure_ascii && (codepoint >= 0x7F))) + { + if (codepoint <= 0xFFFF) + { + // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg) + (std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x", + static_cast(codepoint)); + bytes += 6; + } + else + { + // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg) + (std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x", + static_cast(0xD7C0u + (codepoint >> 10u)), + static_cast(0xDC00u + (codepoint & 0x3FFu))); + bytes += 12; + } + } + else + { + // copy byte to buffer (all previous bytes + // been copied have in default case above) + string_buffer[bytes++] = s[i]; + } + break; + } + } + + // write buffer and reset index; there must be 13 bytes + // left, as this is the maximal number of bytes to be + // written ("\uxxxx\uxxxx\0") for one code point + if (string_buffer.size() - bytes < 13) + { + o->write_characters(string_buffer.data(), bytes); + bytes = 0; + } + + // remember the byte position of this accept + bytes_after_last_accept = bytes; + undumped_chars = 0; + break; + } + + case UTF8_REJECT: // decode found invalid UTF-8 byte + { + switch (error_handler) + { + case error_handler_t::strict: + { + std::string sn(9, '\0'); + // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg) + (std::snprintf)(&sn[0], sn.size(), "%.2X", byte); + JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn, BasicJsonType())); + } + + case error_handler_t::ignore: + case error_handler_t::replace: + { + // in case we saw this character the first time, we + // would like to read it again, because the byte + // may be OK for itself, but just not OK for the + // previous sequence + if (undumped_chars > 0) + { + --i; + } + + // reset length buffer to the last accepted index; + // thus removing/ignoring the invalid characters + bytes = bytes_after_last_accept; + + if (error_handler == error_handler_t::replace) + { + // add a replacement character + if (ensure_ascii) + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = 'u'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'd'; + } + else + { + string_buffer[bytes++] = detail::binary_writer::to_char_type('\xEF'); + string_buffer[bytes++] = detail::binary_writer::to_char_type('\xBF'); + string_buffer[bytes++] = detail::binary_writer::to_char_type('\xBD'); + } + + // write buffer and reset index; there must be 13 bytes + // left, as this is the maximal number of bytes to be + // written ("\uxxxx\uxxxx\0") for one code point + if (string_buffer.size() - bytes < 13) + { + o->write_characters(string_buffer.data(), bytes); + bytes = 0; + } + + bytes_after_last_accept = bytes; + } + + undumped_chars = 0; + + // continue processing the string + state = UTF8_ACCEPT; + break; + } + + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE + } + break; + } + + default: // decode found yet incomplete multi-byte code point + { + if (!ensure_ascii) + { + // code point will not be escaped - copy byte to buffer + string_buffer[bytes++] = s[i]; + } + ++undumped_chars; + break; + } + } + } + + // we finished processing the string + if (JSON_HEDLEY_LIKELY(state == UTF8_ACCEPT)) + { + // write buffer + if (bytes > 0) + { + o->write_characters(string_buffer.data(), bytes); + } + } + else + { + // we finish reading, but do not accept: string was incomplete + switch (error_handler) + { + case error_handler_t::strict: + { + std::string sn(9, '\0'); + // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg) + (std::snprintf)(&sn[0], sn.size(), "%.2X", static_cast(s.back())); + JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn, BasicJsonType())); + } + + case error_handler_t::ignore: + { + // write all accepted bytes + o->write_characters(string_buffer.data(), bytes_after_last_accept); + break; + } + + case error_handler_t::replace: + { + // write all accepted bytes + o->write_characters(string_buffer.data(), bytes_after_last_accept); + // add a replacement character + if (ensure_ascii) + { + o->write_characters("\\ufffd", 6); + } + else + { + o->write_characters("\xEF\xBF\xBD", 3); + } + break; + } + + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE + } + } + } + + private: + /*! + @brief count digits + + Count the number of decimal (base 10) digits for an input unsigned integer. + + @param[in] x unsigned integer number to count its digits + @return number of decimal digits + */ + inline unsigned int count_digits(number_unsigned_t x) noexcept + { + unsigned int n_digits = 1; + for (;;) + { + if (x < 10) + { + return n_digits; + } + if (x < 100) + { + return n_digits + 1; + } + if (x < 1000) + { + return n_digits + 2; + } + if (x < 10000) + { + return n_digits + 3; + } + x = x / 10000u; + n_digits += 4; + } + } + + /*! + @brief dump an integer + + Dump a given integer to output stream @a o. Works internally with + @a number_buffer. + + @param[in] x integer number (signed or unsigned) to dump + @tparam NumberType either @a number_integer_t or @a number_unsigned_t + */ + template < typename NumberType, detail::enable_if_t < + std::is_integral::value || + std::is_same::value || + std::is_same::value || + std::is_same::value, + int > = 0 > + void dump_integer(NumberType x) + { + static constexpr std::array, 100> digits_to_99 + { + { + {{'0', '0'}}, {{'0', '1'}}, {{'0', '2'}}, {{'0', '3'}}, {{'0', '4'}}, {{'0', '5'}}, {{'0', '6'}}, {{'0', '7'}}, {{'0', '8'}}, {{'0', '9'}}, + {{'1', '0'}}, {{'1', '1'}}, {{'1', '2'}}, {{'1', '3'}}, {{'1', '4'}}, {{'1', '5'}}, {{'1', '6'}}, {{'1', '7'}}, {{'1', '8'}}, {{'1', '9'}}, + {{'2', '0'}}, {{'2', '1'}}, {{'2', '2'}}, {{'2', '3'}}, {{'2', '4'}}, {{'2', '5'}}, {{'2', '6'}}, {{'2', '7'}}, {{'2', '8'}}, {{'2', '9'}}, + {{'3', '0'}}, {{'3', '1'}}, {{'3', '2'}}, {{'3', '3'}}, {{'3', '4'}}, {{'3', '5'}}, {{'3', '6'}}, {{'3', '7'}}, {{'3', '8'}}, {{'3', '9'}}, + {{'4', '0'}}, {{'4', '1'}}, {{'4', '2'}}, {{'4', '3'}}, {{'4', '4'}}, {{'4', '5'}}, {{'4', '6'}}, {{'4', '7'}}, {{'4', '8'}}, {{'4', '9'}}, + {{'5', '0'}}, {{'5', '1'}}, {{'5', '2'}}, {{'5', '3'}}, {{'5', '4'}}, {{'5', '5'}}, {{'5', '6'}}, {{'5', '7'}}, {{'5', '8'}}, {{'5', '9'}}, + {{'6', '0'}}, {{'6', '1'}}, {{'6', '2'}}, {{'6', '3'}}, {{'6', '4'}}, {{'6', '5'}}, {{'6', '6'}}, {{'6', '7'}}, {{'6', '8'}}, {{'6', '9'}}, + {{'7', '0'}}, {{'7', '1'}}, {{'7', '2'}}, {{'7', '3'}}, {{'7', '4'}}, {{'7', '5'}}, {{'7', '6'}}, {{'7', '7'}}, {{'7', '8'}}, {{'7', '9'}}, + {{'8', '0'}}, {{'8', '1'}}, {{'8', '2'}}, {{'8', '3'}}, {{'8', '4'}}, {{'8', '5'}}, {{'8', '6'}}, {{'8', '7'}}, {{'8', '8'}}, {{'8', '9'}}, + {{'9', '0'}}, {{'9', '1'}}, {{'9', '2'}}, {{'9', '3'}}, {{'9', '4'}}, {{'9', '5'}}, {{'9', '6'}}, {{'9', '7'}}, {{'9', '8'}}, {{'9', '9'}}, + } + }; + + // special case for "0" + if (x == 0) + { + o->write_character('0'); + return; + } + + // use a pointer to fill the buffer + auto buffer_ptr = number_buffer.begin(); // NOLINT(llvm-qualified-auto,readability-qualified-auto,cppcoreguidelines-pro-type-vararg,hicpp-vararg) + + const bool is_negative = std::is_signed::value && !(x >= 0); // see issue #755 + number_unsigned_t abs_value; + + unsigned int n_chars{}; + + if (is_negative) + { + *buffer_ptr = '-'; + abs_value = remove_sign(static_cast(x)); + + // account one more byte for the minus sign + n_chars = 1 + count_digits(abs_value); + } + else + { + abs_value = static_cast(x); + n_chars = count_digits(abs_value); + } + + // spare 1 byte for '\0' + JSON_ASSERT(n_chars < number_buffer.size() - 1); + + // jump to the end to generate the string from backward + // so we later avoid reversing the result + buffer_ptr += n_chars; + + // Fast int2ascii implementation inspired by "Fastware" talk by Andrei Alexandrescu + // See: https://www.youtube.com/watch?v=o4-CwDo2zpg + while (abs_value >= 100) + { + const auto digits_index = static_cast((abs_value % 100)); + abs_value /= 100; + *(--buffer_ptr) = digits_to_99[digits_index][1]; + *(--buffer_ptr) = digits_to_99[digits_index][0]; + } + + if (abs_value >= 10) + { + const auto digits_index = static_cast(abs_value); + *(--buffer_ptr) = digits_to_99[digits_index][1]; + *(--buffer_ptr) = digits_to_99[digits_index][0]; + } + else + { + *(--buffer_ptr) = static_cast('0' + abs_value); + } + + o->write_characters(number_buffer.data(), n_chars); + } + + /*! + @brief dump a floating-point number + + Dump a given floating-point number to output stream @a o. Works internally + with @a number_buffer. + + @param[in] x floating-point number to dump + */ + void dump_float(number_float_t x) + { + // NaN / inf + if (!std::isfinite(x)) + { + o->write_characters("null", 4); + return; + } + + // If number_float_t is an IEEE-754 single or double precision number, + // use the Grisu2 algorithm to produce short numbers which are + // guaranteed to round-trip, using strtof and strtod, resp. + // + // NB: The test below works if == . + static constexpr bool is_ieee_single_or_double + = (std::numeric_limits::is_iec559 && std::numeric_limits::digits == 24 && std::numeric_limits::max_exponent == 128) || + (std::numeric_limits::is_iec559 && std::numeric_limits::digits == 53 && std::numeric_limits::max_exponent == 1024); + + dump_float(x, std::integral_constant()); + } + + void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/) + { + auto* begin = number_buffer.data(); + auto* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x); + + o->write_characters(begin, static_cast(end - begin)); + } + + void dump_float(number_float_t x, std::false_type /*is_ieee_single_or_double*/) + { + // get number of digits for a float -> text -> float round-trip + static constexpr auto d = std::numeric_limits::max_digits10; + + // the actual conversion + // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg) + std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x); + + // negative value indicates an error + JSON_ASSERT(len > 0); + // check if buffer was large enough + JSON_ASSERT(static_cast(len) < number_buffer.size()); + + // erase thousands separator + if (thousands_sep != '\0') + { + // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::remove returns an iterator, see https://github.com/nlohmann/json/issues/3081 + const auto end = std::remove(number_buffer.begin(), number_buffer.begin() + len, thousands_sep); + std::fill(end, number_buffer.end(), '\0'); + JSON_ASSERT((end - number_buffer.begin()) <= len); + len = (end - number_buffer.begin()); + } + + // convert decimal point to '.' + if (decimal_point != '\0' && decimal_point != '.') + { + // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::find returns an iterator, see https://github.com/nlohmann/json/issues/3081 + const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point); + if (dec_pos != number_buffer.end()) + { + *dec_pos = '.'; + } + } + + o->write_characters(number_buffer.data(), static_cast(len)); + + // determine if need to append ".0" + const bool value_is_int_like = + std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1, + [](char c) + { + return c == '.' || c == 'e'; + }); + + if (value_is_int_like) + { + o->write_characters(".0", 2); + } + } + + /*! + @brief check whether a string is UTF-8 encoded + + The function checks each byte of a string whether it is UTF-8 encoded. The + result of the check is stored in the @a state parameter. The function must + be called initially with state 0 (accept). State 1 means the string must + be rejected, because the current byte is not allowed. If the string is + completely processed, but the state is non-zero, the string ended + prematurely; that is, the last byte indicated more bytes should have + followed. + + @param[in,out] state the state of the decoding + @param[in,out] codep codepoint (valid only if resulting state is UTF8_ACCEPT) + @param[in] byte next byte to decode + @return new state + + @note The function has been edited: a std::array is used. + + @copyright Copyright (c) 2008-2009 Bjoern Hoehrmann + @sa http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ + */ + static std::uint8_t decode(std::uint8_t& state, std::uint32_t& codep, const std::uint8_t byte) noexcept + { + static const std::array utf8d = + { + { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00..1F + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 20..3F + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 40..5F + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 60..7F + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, // 80..9F + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // A0..BF + 8, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C0..DF + 0xA, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // E0..EF + 0xB, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // F0..FF + 0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, // s1..s2 + 1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, // s3..s4 + 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, // s5..s6 + 1, 3, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 // s7..s8 + } + }; + + JSON_ASSERT(byte < utf8d.size()); + const std::uint8_t type = utf8d[byte]; + + codep = (state != UTF8_ACCEPT) + ? (byte & 0x3fu) | (codep << 6u) + : (0xFFu >> type) & (byte); + + std::size_t index = 256u + static_cast(state) * 16u + static_cast(type); + JSON_ASSERT(index < 400); + state = utf8d[index]; + return state; + } + + /* + * Overload to make the compiler happy while it is instantiating + * dump_integer for number_unsigned_t. + * Must never be called. + */ + number_unsigned_t remove_sign(number_unsigned_t x) + { + JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE + return x; // LCOV_EXCL_LINE + } + + /* + * Helper function for dump_integer + * + * This function takes a negative signed integer and returns its absolute + * value as unsigned integer. The plus/minus shuffling is necessary as we can + * not directly remove the sign of an arbitrary signed integer as the + * absolute values of INT_MIN and INT_MAX are usually not the same. See + * #1708 for details. + */ + inline number_unsigned_t remove_sign(number_integer_t x) noexcept + { + JSON_ASSERT(x < 0 && x < (std::numeric_limits::max)()); // NOLINT(misc-redundant-expression) + return static_cast(-(x + 1)) + 1; + } + + private: + /// the output of the serializer + output_adapter_t o = nullptr; + + /// a (hopefully) large enough character buffer + std::array number_buffer{{}}; + + /// the locale + const std::lconv* loc = nullptr; + /// the locale's thousand separator character + const char thousands_sep = '\0'; + /// the locale's decimal point character + const char decimal_point = '\0'; + + /// string buffer + std::array string_buffer{{}}; + + /// the indentation character + const char indent_char; + /// the indentation string + string_t indent_string; + + /// error_handler how to react on decoding errors + const error_handler_t error_handler; +}; +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/string_escape.hpp b/src/nlohmann/detail/string_escape.hpp new file mode 100644 index 00000000000..84f7da52e09 --- /dev/null +++ b/src/nlohmann/detail/string_escape.hpp @@ -0,0 +1,63 @@ +#pragma once + +#include +#include + +namespace nlohmann +{ +namespace detail +{ + +/*! +@brief replace all occurrences of a substring by another string + +@param[in,out] s the string to manipulate; changed so that all + occurrences of @a f are replaced with @a t +@param[in] f the substring to replace with @a t +@param[in] t the string to replace @a f + +@pre The search string @a f must not be empty. **This precondition is +enforced with an assertion.** + +@since version 2.0.0 +*/ +inline void replace_substring(std::string& s, const std::string& f, + const std::string& t) +{ + JSON_ASSERT(!f.empty()); + for (auto pos = s.find(f); // find first occurrence of f + pos != std::string::npos; // make sure f was found + s.replace(pos, f.size(), t), // replace with t, and + pos = s.find(f, pos + t.size())) // find next occurrence of f + {} +} + +/*! + * @brief string escaping as described in RFC 6901 (Sect. 4) + * @param[in] s string to escape + * @return escaped string + * + * Note the order of escaping "~" to "~0" and "/" to "~1" is important. + */ +inline std::string escape(std::string s) +{ + replace_substring(s, "~", "~0"); + replace_substring(s, "/", "~1"); + return s; +} + +/*! + * @brief string unescaping as described in RFC 6901 (Sect. 4) + * @param[in] s string to unescape + * @return unescaped string + * + * Note the order of escaping "~1" to "/" and "~0" to "~" is important. + */ +static void unescape(std::string& s) +{ + replace_substring(s, "~1", "/"); + replace_substring(s, "~0", "~"); +} + +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/detail/value_t.hpp b/src/nlohmann/detail/value_t.hpp new file mode 100644 index 00000000000..a98c4355a0b --- /dev/null +++ b/src/nlohmann/detail/value_t.hpp @@ -0,0 +1,81 @@ +#pragma once + +#include // array +#include // size_t +#include // uint8_t +#include // string + +namespace nlohmann +{ +namespace detail +{ +/////////////////////////// +// JSON type enumeration // +/////////////////////////// + +/*! +@brief the JSON type enumeration + +This enumeration collects the different JSON types. It is internally used to +distinguish the stored values, and the functions @ref basic_json::is_null(), +@ref basic_json::is_object(), @ref basic_json::is_array(), +@ref basic_json::is_string(), @ref basic_json::is_boolean(), +@ref basic_json::is_number() (with @ref basic_json::is_number_integer(), +@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()), +@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and +@ref basic_json::is_structured() rely on it. + +@note There are three enumeration entries (number_integer, number_unsigned, and +number_float), because the library distinguishes these three types for numbers: +@ref basic_json::number_unsigned_t is used for unsigned integers, +@ref basic_json::number_integer_t is used for signed integers, and +@ref basic_json::number_float_t is used for floating-point numbers or to +approximate integers which do not fit in the limits of their respective type. + +@sa see @ref basic_json::basic_json(const value_t value_type) -- create a JSON +value with the default value for a given type + +@since version 1.0.0 +*/ +enum class value_t : std::uint8_t +{ + null, ///< null value + object, ///< object (unordered set of name/value pairs) + array, ///< array (ordered collection of values) + string, ///< string value + boolean, ///< boolean value + number_integer, ///< number value (signed integer) + number_unsigned, ///< number value (unsigned integer) + number_float, ///< number value (floating-point) + binary, ///< binary array (ordered collection of bytes) + discarded ///< discarded by the parser callback function +}; + +/*! +@brief comparison operator for JSON types + +Returns an ordering that is similar to Python: +- order: null < boolean < number < object < array < string < binary +- furthermore, each type is not smaller than itself +- discarded values are not comparable +- binary is represented as a b"" string in python and directly comparable to a + string; however, making a binary array directly comparable with a string would + be surprising behavior in a JSON file. + +@since version 1.0.0 +*/ +inline bool operator<(const value_t lhs, const value_t rhs) noexcept +{ + static constexpr std::array order = {{ + 0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */, + 1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */, + 6 /* binary */ + } + }; + + const auto l_index = static_cast(lhs); + const auto r_index = static_cast(rhs); + return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index]; +} +} // namespace detail +} // namespace nlohmann diff --git a/src/nlohmann/json.hpp b/src/nlohmann/json.hpp new file mode 100644 index 00000000000..bc6797dc9da --- /dev/null +++ b/src/nlohmann/json.hpp @@ -0,0 +1,9076 @@ +/* + __ _____ _____ _____ + __| | __| | | | JSON for Modern C++ +| | |__ | | | | | | version 3.10.4 +|_____|_____|_____|_|___| https://github.com/nlohmann/json + +Licensed under the MIT License . +SPDX-License-Identifier: MIT +Copyright (c) 2013-2019 Niels Lohmann . + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +#ifndef INCLUDE_NLOHMANN_JSON_HPP_ +#define INCLUDE_NLOHMANN_JSON_HPP_ + +#define NLOHMANN_JSON_VERSION_MAJOR 3 +#define NLOHMANN_JSON_VERSION_MINOR 10 +#define NLOHMANN_JSON_VERSION_PATCH 4 + +#include // all_of, find, for_each +#include // nullptr_t, ptrdiff_t, size_t +#include // hash, less +#include // initializer_list +#ifndef JSON_NO_IO + #include // istream, ostream +#endif // JSON_NO_IO +#include // random_access_iterator_tag +#include // unique_ptr +#include // accumulate +#include // string, stoi, to_string +#include // declval, forward, move, pair, swap +#include // vector + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if defined(JSON_HAS_CPP_17) + #include +#endif + +/*! +@brief namespace for Niels Lohmann +@see https://github.com/nlohmann +@since version 1.0.0 +*/ +namespace nlohmann +{ + +/*! +@brief a class to store JSON values + +@tparam ObjectType type for JSON objects (`std::map` by default; will be used +in @ref object_t) +@tparam ArrayType type for JSON arrays (`std::vector` by default; will be used +in @ref array_t) +@tparam StringType type for JSON strings and object keys (`std::string` by +default; will be used in @ref string_t) +@tparam BooleanType type for JSON booleans (`bool` by default; will be used +in @ref boolean_t) +@tparam NumberIntegerType type for JSON integer numbers (`int64_t` by +default; will be used in @ref number_integer_t) +@tparam NumberUnsignedType type for JSON unsigned integer numbers (@c +`uint64_t` by default; will be used in @ref number_unsigned_t) +@tparam NumberFloatType type for JSON floating-point numbers (`double` by +default; will be used in @ref number_float_t) +@tparam BinaryType type for packed binary data for compatibility with binary +serialization formats (`std::vector` by default; will be used in +@ref binary_t) +@tparam AllocatorType type of the allocator to use (`std::allocator` by +default) +@tparam JSONSerializer the serializer to resolve internal calls to `to_json()` +and `from_json()` (@ref adl_serializer by default) + +@requirement The class satisfies the following concept requirements: +- Basic + - [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible): + JSON values can be default constructed. The result will be a JSON null + value. + - [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible): + A JSON value can be constructed from an rvalue argument. + - [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible): + A JSON value can be copy-constructed from an lvalue expression. + - [MoveAssignable](https://en.cppreference.com/w/cpp/named_req/MoveAssignable): + A JSON value van be assigned from an rvalue argument. + - [CopyAssignable](https://en.cppreference.com/w/cpp/named_req/CopyAssignable): + A JSON value can be copy-assigned from an lvalue expression. + - [Destructible](https://en.cppreference.com/w/cpp/named_req/Destructible): + JSON values can be destructed. +- Layout + - [StandardLayoutType](https://en.cppreference.com/w/cpp/named_req/StandardLayoutType): + JSON values have + [standard layout](https://en.cppreference.com/w/cpp/language/data_members#Standard_layout): + All non-static data members are private and standard layout types, the + class has no virtual functions or (virtual) base classes. +- Library-wide + - [EqualityComparable](https://en.cppreference.com/w/cpp/named_req/EqualityComparable): + JSON values can be compared with `==`, see @ref + operator==(const_reference,const_reference). + - [LessThanComparable](https://en.cppreference.com/w/cpp/named_req/LessThanComparable): + JSON values can be compared with `<`, see @ref + operator<(const_reference,const_reference). + - [Swappable](https://en.cppreference.com/w/cpp/named_req/Swappable): + Any JSON lvalue or rvalue of can be swapped with any lvalue or rvalue of + other compatible types, using unqualified function call @ref swap(). + - [NullablePointer](https://en.cppreference.com/w/cpp/named_req/NullablePointer): + JSON values can be compared against `std::nullptr_t` objects which are used + to model the `null` value. +- Container + - [Container](https://en.cppreference.com/w/cpp/named_req/Container): + JSON values can be used like STL containers and provide iterator access. + - [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer); + JSON values can be used like STL containers and provide reverse iterator + access. + +@invariant The member variables @a m_value and @a m_type have the following +relationship: +- If `m_type == value_t::object`, then `m_value.object != nullptr`. +- If `m_type == value_t::array`, then `m_value.array != nullptr`. +- If `m_type == value_t::string`, then `m_value.string != nullptr`. +The invariants are checked by member function assert_invariant(). + +@internal +@note ObjectType trick from https://stackoverflow.com/a/9860911 +@endinternal + +@see [RFC 8259: The JavaScript Object Notation (JSON) Data Interchange +Format](https://tools.ietf.org/html/rfc8259) + +@since version 1.0.0 + +@nosubgrouping +*/ +NLOHMANN_BASIC_JSON_TPL_DECLARATION +class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions) +{ + private: + template friend struct detail::external_constructor; + friend ::nlohmann::json_pointer; + + template + friend class ::nlohmann::detail::parser; + friend ::nlohmann::detail::serializer; + template + friend class ::nlohmann::detail::iter_impl; + template + friend class ::nlohmann::detail::binary_writer; + template + friend class ::nlohmann::detail::binary_reader; + template + friend class ::nlohmann::detail::json_sax_dom_parser; + template + friend class ::nlohmann::detail::json_sax_dom_callback_parser; + friend class ::nlohmann::detail::exception; + + /// workaround type for MSVC + using basic_json_t = NLOHMANN_BASIC_JSON_TPL; + + JSON_PRIVATE_UNLESS_TESTED: + // convenience aliases for types residing in namespace detail; + using lexer = ::nlohmann::detail::lexer_base; + + template + static ::nlohmann::detail::parser parser( + InputAdapterType adapter, + detail::parser_callback_tcb = nullptr, + const bool allow_exceptions = true, + const bool ignore_comments = false + ) + { + return ::nlohmann::detail::parser(std::move(adapter), + std::move(cb), allow_exceptions, ignore_comments); + } + + private: + using primitive_iterator_t = ::nlohmann::detail::primitive_iterator_t; + template + using internal_iterator = ::nlohmann::detail::internal_iterator; + template + using iter_impl = ::nlohmann::detail::iter_impl; + template + using iteration_proxy = ::nlohmann::detail::iteration_proxy; + template using json_reverse_iterator = ::nlohmann::detail::json_reverse_iterator; + + template + using output_adapter_t = ::nlohmann::detail::output_adapter_t; + + template + using binary_reader = ::nlohmann::detail::binary_reader; + template using binary_writer = ::nlohmann::detail::binary_writer; + + JSON_PRIVATE_UNLESS_TESTED: + using serializer = ::nlohmann::detail::serializer; + + public: + using value_t = detail::value_t; + /// JSON Pointer, see @ref nlohmann::json_pointer + using json_pointer = ::nlohmann::json_pointer; + template + using json_serializer = JSONSerializer; + /// how to treat decoding errors + using error_handler_t = detail::error_handler_t; + /// how to treat CBOR tags + using cbor_tag_handler_t = detail::cbor_tag_handler_t; + /// helper type for initializer lists of basic_json values + using initializer_list_t = std::initializer_list>; + + using input_format_t = detail::input_format_t; + /// SAX interface type, see @ref nlohmann::json_sax + using json_sax_t = json_sax; + + //////////////// + // exceptions // + //////////////// + + /// @name exceptions + /// Classes to implement user-defined exceptions. + /// @{ + + /// @copydoc detail::exception + using exception = detail::exception; + /// @copydoc detail::parse_error + using parse_error = detail::parse_error; + /// @copydoc detail::invalid_iterator + using invalid_iterator = detail::invalid_iterator; + /// @copydoc detail::type_error + using type_error = detail::type_error; + /// @copydoc detail::out_of_range + using out_of_range = detail::out_of_range; + /// @copydoc detail::other_error + using other_error = detail::other_error; + + /// @} + + + ///////////////////// + // container types // + ///////////////////// + + /// @name container types + /// The canonic container types to use @ref basic_json like any other STL + /// container. + /// @{ + + /// the type of elements in a basic_json container + using value_type = basic_json; + + /// the type of an element reference + using reference = value_type&; + /// the type of an element const reference + using const_reference = const value_type&; + + /// a type to represent differences between iterators + using difference_type = std::ptrdiff_t; + /// a type to represent container sizes + using size_type = std::size_t; + + /// the allocator type + using allocator_type = AllocatorType; + + /// the type of an element pointer + using pointer = typename std::allocator_traits::pointer; + /// the type of an element const pointer + using const_pointer = typename std::allocator_traits::const_pointer; + + /// an iterator for a basic_json container + using iterator = iter_impl; + /// a const iterator for a basic_json container + using const_iterator = iter_impl; + /// a reverse iterator for a basic_json container + using reverse_iterator = json_reverse_iterator; + /// a const reverse iterator for a basic_json container + using const_reverse_iterator = json_reverse_iterator; + + /// @} + + + /*! + @brief returns the allocator associated with the container + */ + static allocator_type get_allocator() + { + return allocator_type(); + } + + /*! + @brief returns version information on the library + + This function returns a JSON object with information about the library, + including the version number and information on the platform and compiler. + + @return JSON object holding version information + key | description + ----------- | --------------- + `compiler` | Information on the used compiler. It is an object with the following keys: `c++` (the used C++ standard), `family` (the compiler family; possible values are `clang`, `icc`, `gcc`, `ilecpp`, `msvc`, `pgcpp`, `sunpro`, and `unknown`), and `version` (the compiler version). + `copyright` | The copyright line for the library as string. + `name` | The name of the library as string. + `platform` | The used platform as string. Possible values are `win32`, `linux`, `apple`, `unix`, and `unknown`. + `url` | The URL of the project as string. + `version` | The version of the library. It is an object with the following keys: `major`, `minor`, and `patch` as defined by [Semantic Versioning](http://semver.org), and `string` (the version string). + + @liveexample{The following code shows an example output of the `meta()` + function.,meta} + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @complexity Constant. + + @since 2.1.0 + */ + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json meta() + { + basic_json result; + + result["copyright"] = "(C) 2013-2021 Niels Lohmann"; + result["name"] = "JSON for Modern C++"; + result["url"] = "https://github.com/nlohmann/json"; + result["version"]["string"] = + std::to_string(NLOHMANN_JSON_VERSION_MAJOR) + "." + + std::to_string(NLOHMANN_JSON_VERSION_MINOR) + "." + + std::to_string(NLOHMANN_JSON_VERSION_PATCH); + result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR; + result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR; + result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH; + +#ifdef _WIN32 + result["platform"] = "win32"; +#elif defined __linux__ + result["platform"] = "linux"; +#elif defined __APPLE__ + result["platform"] = "apple"; +#elif defined __unix__ + result["platform"] = "unix"; +#else + result["platform"] = "unknown"; +#endif + +#if defined(__ICC) || defined(__INTEL_COMPILER) + result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}}; +#elif defined(__clang__) + result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}}; +#elif defined(__GNUC__) || defined(__GNUG__) + result["compiler"] = {{"family", "gcc"}, {"version", std::to_string(__GNUC__) + "." + std::to_string(__GNUC_MINOR__) + "." + std::to_string(__GNUC_PATCHLEVEL__)}}; +#elif defined(__HP_cc) || defined(__HP_aCC) + result["compiler"] = "hp" +#elif defined(__IBMCPP__) + result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}}; +#elif defined(_MSC_VER) + result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}}; +#elif defined(__PGI) + result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}}; +#elif defined(__SUNPRO_CC) + result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}}; +#else + result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}}; +#endif + +#ifdef __cplusplus + result["compiler"]["c++"] = std::to_string(__cplusplus); +#else + result["compiler"]["c++"] = "unknown"; +#endif + return result; + } + + + /////////////////////////// + // JSON value data types // + /////////////////////////// + + /// @name JSON value data types + /// The data types to store a JSON value. These types are derived from + /// the template arguments passed to class @ref basic_json. + /// @{ + +#if defined(JSON_HAS_CPP_14) + // Use transparent comparator if possible, combined with perfect forwarding + // on find() and count() calls prevents unnecessary string construction. + using object_comparator_t = std::less<>; +#else + using object_comparator_t = std::less; +#endif + + /*! + @brief a type for an object + + [RFC 8259](https://tools.ietf.org/html/rfc8259) describes JSON objects as follows: + > An object is an unordered collection of zero or more name/value pairs, + > where a name is a string and a value is a string, number, boolean, null, + > object, or array. + + To store objects in C++, a type is defined by the template parameters + described below. + + @tparam ObjectType the container to store objects (e.g., `std::map` or + `std::unordered_map`) + @tparam StringType the type of the keys or names (e.g., `std::string`). + The comparison function `std::less` is used to order elements + inside the container. + @tparam AllocatorType the allocator to use for objects (e.g., + `std::allocator`) + + #### Default type + + With the default values for @a ObjectType (`std::map`), @a StringType + (`std::string`), and @a AllocatorType (`std::allocator`), the default + value for @a object_t is: + + @code {.cpp} + std::map< + std::string, // key_type + basic_json, // value_type + std::less, // key_compare + std::allocator> // allocator_type + > + @endcode + + #### Behavior + + The choice of @a object_t influences the behavior of the JSON class. With + the default type, objects have the following behavior: + + - When all names are unique, objects will be interoperable in the sense + that all software implementations receiving that object will agree on + the name-value mappings. + - When the names within an object are not unique, it is unspecified which + one of the values for a given key will be chosen. For instance, + `{"key": 2, "key": 1}` could be equal to either `{"key": 1}` or + `{"key": 2}`. + - Internally, name/value pairs are stored in lexicographical order of the + names. Objects will also be serialized (see @ref dump) in this order. + For instance, `{"b": 1, "a": 2}` and `{"a": 2, "b": 1}` will be stored + and serialized as `{"a": 2, "b": 1}`. + - When comparing objects, the order of the name/value pairs is irrelevant. + This makes objects interoperable in the sense that they will not be + affected by these differences. For instance, `{"b": 1, "a": 2}` and + `{"a": 2, "b": 1}` will be treated as equal. + + #### Limits + + [RFC 8259](https://tools.ietf.org/html/rfc8259) specifies: + > An implementation may set limits on the maximum depth of nesting. + + In this class, the object's limit of nesting is not explicitly constrained. + However, a maximum depth of nesting may be introduced by the compiler or + runtime environment. A theoretical limit can be queried by calling the + @ref max_size function of a JSON object. + + #### Storage + + Objects are stored as pointers in a @ref basic_json type. That is, for any + access to object values, a pointer of type `object_t*` must be + dereferenced. + + @sa see @ref array_t -- type for an array value + + @since version 1.0.0 + + @note The order name/value pairs are added to the object is *not* + preserved by the library. Therefore, iterating an object may return + name/value pairs in a different order than they were originally stored. In + fact, keys will be traversed in alphabetical order as `std::map` with + `std::less` is used by default. Please note this behavior conforms to [RFC + 8259](https://tools.ietf.org/html/rfc8259), because any order implements the + specified "unordered" nature of JSON objects. + */ + using object_t = ObjectType>>; + + /*! + @brief a type for an array + + [RFC 8259](https://tools.ietf.org/html/rfc8259) describes JSON arrays as follows: + > An array is an ordered sequence of zero or more values. + + To store objects in C++, a type is defined by the template parameters + explained below. + + @tparam ArrayType container type to store arrays (e.g., `std::vector` or + `std::list`) + @tparam AllocatorType allocator to use for arrays (e.g., `std::allocator`) + + #### Default type + + With the default values for @a ArrayType (`std::vector`) and @a + AllocatorType (`std::allocator`), the default value for @a array_t is: + + @code {.cpp} + std::vector< + basic_json, // value_type + std::allocator // allocator_type + > + @endcode + + #### Limits + + [RFC 8259](https://tools.ietf.org/html/rfc8259) specifies: + > An implementation may set limits on the maximum depth of nesting. + + In this class, the array's limit of nesting is not explicitly constrained. + However, a maximum depth of nesting may be introduced by the compiler or + runtime environment. A theoretical limit can be queried by calling the + @ref max_size function of a JSON array. + + #### Storage + + Arrays are stored as pointers in a @ref basic_json type. That is, for any + access to array values, a pointer of type `array_t*` must be dereferenced. + + @sa see @ref object_t -- type for an object value + + @since version 1.0.0 + */ + using array_t = ArrayType>; + + /*! + @brief a type for a string + + [RFC 8259](https://tools.ietf.org/html/rfc8259) describes JSON strings as follows: + > A string is a sequence of zero or more Unicode characters. + + To store objects in C++, a type is defined by the template parameter + described below. Unicode values are split by the JSON class into + byte-sized characters during deserialization. + + @tparam StringType the container to store strings (e.g., `std::string`). + Note this container is used for keys/names in objects, see @ref object_t. + + #### Default type + + With the default values for @a StringType (`std::string`), the default + value for @a string_t is: + + @code {.cpp} + std::string + @endcode + + #### Encoding + + Strings are stored in UTF-8 encoding. Therefore, functions like + `std::string::size()` or `std::string::length()` return the number of + bytes in the string rather than the number of characters or glyphs. + + #### String comparison + + [RFC 8259](https://tools.ietf.org/html/rfc8259) states: + > Software implementations are typically required to test names of object + > members for equality. Implementations that transform the textual + > representation into sequences of Unicode code units and then perform the + > comparison numerically, code unit by code unit, are interoperable in the + > sense that implementations will agree in all cases on equality or + > inequality of two strings. For example, implementations that compare + > strings with escaped characters unconverted may incorrectly find that + > `"a\\b"` and `"a\u005Cb"` are not equal. + + This implementation is interoperable as it does compare strings code unit + by code unit. + + #### Storage + + String values are stored as pointers in a @ref basic_json type. That is, + for any access to string values, a pointer of type `string_t*` must be + dereferenced. + + @since version 1.0.0 + */ + using string_t = StringType; + + /*! + @brief a type for a boolean + + [RFC 8259](https://tools.ietf.org/html/rfc8259) implicitly describes a boolean as a + type which differentiates the two literals `true` and `false`. + + To store objects in C++, a type is defined by the template parameter @a + BooleanType which chooses the type to use. + + #### Default type + + With the default values for @a BooleanType (`bool`), the default value for + @a boolean_t is: + + @code {.cpp} + bool + @endcode + + #### Storage + + Boolean values are stored directly inside a @ref basic_json type. + + @since version 1.0.0 + */ + using boolean_t = BooleanType; + + /*! + @brief a type for a number (integer) + + [RFC 8259](https://tools.ietf.org/html/rfc8259) describes numbers as follows: + > The representation of numbers is similar to that used in most + > programming languages. A number is represented in base 10 using decimal + > digits. It contains an integer component that may be prefixed with an + > optional minus sign, which may be followed by a fraction part and/or an + > exponent part. Leading zeros are not allowed. (...) Numeric values that + > cannot be represented in the grammar below (such as Infinity and NaN) + > are not permitted. + + This description includes both integer and floating-point numbers. + However, C++ allows more precise storage if it is known whether the number + is a signed integer, an unsigned integer or a floating-point number. + Therefore, three different types, @ref number_integer_t, @ref + number_unsigned_t and @ref number_float_t are used. + + To store integer numbers in C++, a type is defined by the template + parameter @a NumberIntegerType which chooses the type to use. + + #### Default type + + With the default values for @a NumberIntegerType (`int64_t`), the default + value for @a number_integer_t is: + + @code {.cpp} + int64_t + @endcode + + #### Default behavior + + - The restrictions about leading zeros is not enforced in C++. Instead, + leading zeros in integer literals lead to an interpretation as octal + number. Internally, the value will be stored as decimal number. For + instance, the C++ integer literal `010` will be serialized to `8`. + During deserialization, leading zeros yield an error. + - Not-a-number (NaN) values will be serialized to `null`. + + #### Limits + + [RFC 8259](https://tools.ietf.org/html/rfc8259) specifies: + > An implementation may set limits on the range and precision of numbers. + + When the default type is used, the maximal integer number that can be + stored is `9223372036854775807` (INT64_MAX) and the minimal integer number + that can be stored is `-9223372036854775808` (INT64_MIN). Integer numbers + that are out of range will yield over/underflow when used in a + constructor. During deserialization, too large or small integer numbers + will be automatically be stored as @ref number_unsigned_t or @ref + number_float_t. + + [RFC 8259](https://tools.ietf.org/html/rfc8259) further states: + > Note that when such software is used, numbers that are integers and are + > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense + > that implementations will agree exactly on their numeric values. + + As this range is a subrange of the exactly supported range [INT64_MIN, + INT64_MAX], this class's integer type is interoperable. + + #### Storage + + Integer number values are stored directly inside a @ref basic_json type. + + @sa see @ref number_float_t -- type for number values (floating-point) + + @sa see @ref number_unsigned_t -- type for number values (unsigned integer) + + @since version 1.0.0 + */ + using number_integer_t = NumberIntegerType; + + /*! + @brief a type for a number (unsigned) + + [RFC 8259](https://tools.ietf.org/html/rfc8259) describes numbers as follows: + > The representation of numbers is similar to that used in most + > programming languages. A number is represented in base 10 using decimal + > digits. It contains an integer component that may be prefixed with an + > optional minus sign, which may be followed by a fraction part and/or an + > exponent part. Leading zeros are not allowed. (...) Numeric values that + > cannot be represented in the grammar below (such as Infinity and NaN) + > are not permitted. + + This description includes both integer and floating-point numbers. + However, C++ allows more precise storage if it is known whether the number + is a signed integer, an unsigned integer or a floating-point number. + Therefore, three different types, @ref number_integer_t, @ref + number_unsigned_t and @ref number_float_t are used. + + To store unsigned integer numbers in C++, a type is defined by the + template parameter @a NumberUnsignedType which chooses the type to use. + + #### Default type + + With the default values for @a NumberUnsignedType (`uint64_t`), the + default value for @a number_unsigned_t is: + + @code {.cpp} + uint64_t + @endcode + + #### Default behavior + + - The restrictions about leading zeros is not enforced in C++. Instead, + leading zeros in integer literals lead to an interpretation as octal + number. Internally, the value will be stored as decimal number. For + instance, the C++ integer literal `010` will be serialized to `8`. + During deserialization, leading zeros yield an error. + - Not-a-number (NaN) values will be serialized to `null`. + + #### Limits + + [RFC 8259](https://tools.ietf.org/html/rfc8259) specifies: + > An implementation may set limits on the range and precision of numbers. + + When the default type is used, the maximal integer number that can be + stored is `18446744073709551615` (UINT64_MAX) and the minimal integer + number that can be stored is `0`. Integer numbers that are out of range + will yield over/underflow when used in a constructor. During + deserialization, too large or small integer numbers will be automatically + be stored as @ref number_integer_t or @ref number_float_t. + + [RFC 8259](https://tools.ietf.org/html/rfc8259) further states: + > Note that when such software is used, numbers that are integers and are + > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense + > that implementations will agree exactly on their numeric values. + + As this range is a subrange (when considered in conjunction with the + number_integer_t type) of the exactly supported range [0, UINT64_MAX], + this class's integer type is interoperable. + + #### Storage + + Integer number values are stored directly inside a @ref basic_json type. + + @sa see @ref number_float_t -- type for number values (floating-point) + @sa see @ref number_integer_t -- type for number values (integer) + + @since version 2.0.0 + */ + using number_unsigned_t = NumberUnsignedType; + + /*! + @brief a type for a number (floating-point) + + [RFC 8259](https://tools.ietf.org/html/rfc8259) describes numbers as follows: + > The representation of numbers is similar to that used in most + > programming languages. A number is represented in base 10 using decimal + > digits. It contains an integer component that may be prefixed with an + > optional minus sign, which may be followed by a fraction part and/or an + > exponent part. Leading zeros are not allowed. (...) Numeric values that + > cannot be represented in the grammar below (such as Infinity and NaN) + > are not permitted. + + This description includes both integer and floating-point numbers. + However, C++ allows more precise storage if it is known whether the number + is a signed integer, an unsigned integer or a floating-point number. + Therefore, three different types, @ref number_integer_t, @ref + number_unsigned_t and @ref number_float_t are used. + + To store floating-point numbers in C++, a type is defined by the template + parameter @a NumberFloatType which chooses the type to use. + + #### Default type + + With the default values for @a NumberFloatType (`double`), the default + value for @a number_float_t is: + + @code {.cpp} + double + @endcode + + #### Default behavior + + - The restrictions about leading zeros is not enforced in C++. Instead, + leading zeros in floating-point literals will be ignored. Internally, + the value will be stored as decimal number. For instance, the C++ + floating-point literal `01.2` will be serialized to `1.2`. During + deserialization, leading zeros yield an error. + - Not-a-number (NaN) values will be serialized to `null`. + + #### Limits + + [RFC 8259](https://tools.ietf.org/html/rfc8259) states: + > This specification allows implementations to set limits on the range and + > precision of numbers accepted. Since software that implements IEEE + > 754-2008 binary64 (double precision) numbers is generally available and + > widely used, good interoperability can be achieved by implementations + > that expect no more precision or range than these provide, in the sense + > that implementations will approximate JSON numbers within the expected + > precision. + + This implementation does exactly follow this approach, as it uses double + precision floating-point numbers. Note values smaller than + `-1.79769313486232e+308` and values greater than `1.79769313486232e+308` + will be stored as NaN internally and be serialized to `null`. + + #### Storage + + Floating-point number values are stored directly inside a @ref basic_json + type. + + @sa see @ref number_integer_t -- type for number values (integer) + + @sa see @ref number_unsigned_t -- type for number values (unsigned integer) + + @since version 1.0.0 + */ + using number_float_t = NumberFloatType; + + /*! + @brief a type for a packed binary type + + This type is a type designed to carry binary data that appears in various + serialized formats, such as CBOR's Major Type 2, MessagePack's bin, and + BSON's generic binary subtype. This type is NOT a part of standard JSON and + exists solely for compatibility with these binary types. As such, it is + simply defined as an ordered sequence of zero or more byte values. + + Additionally, as an implementation detail, the subtype of the binary data is + carried around as a `std::uint8_t`, which is compatible with both of the + binary data formats that use binary subtyping, (though the specific + numbering is incompatible with each other, and it is up to the user to + translate between them). + + [CBOR's RFC 7049](https://tools.ietf.org/html/rfc7049) describes this type + as: + > Major type 2: a byte string. The string's length in bytes is represented + > following the rules for positive integers (major type 0). + + [MessagePack's documentation on the bin type + family](https://github.com/msgpack/msgpack/blob/master/spec.md#bin-format-family) + describes this type as: + > Bin format family stores an byte array in 2, 3, or 5 bytes of extra bytes + > in addition to the size of the byte array. + + [BSON's specifications](http://bsonspec.org/spec.html) describe several + binary types; however, this type is intended to represent the generic binary + type which has the description: + > Generic binary subtype - This is the most commonly used binary subtype and + > should be the 'default' for drivers and tools. + + None of these impose any limitations on the internal representation other + than the basic unit of storage be some type of array whose parts are + decomposable into bytes. + + The default representation of this binary format is a + `std::vector`, which is a very common way to represent a byte + array in modern C++. + + #### Default type + + The default values for @a BinaryType is `std::vector` + + #### Storage + + Binary Arrays are stored as pointers in a @ref basic_json type. That is, + for any access to array values, a pointer of the type `binary_t*` must be + dereferenced. + + #### Notes on subtypes + + - CBOR + - Binary values are represented as byte strings. Subtypes are serialized + as tagged values. + - MessagePack + - If a subtype is given and the binary array contains exactly 1, 2, 4, 8, + or 16 elements, the fixext family (fixext1, fixext2, fixext4, fixext8) + is used. For other sizes, the ext family (ext8, ext16, ext32) is used. + The subtype is then added as singed 8-bit integer. + - If no subtype is given, the bin family (bin8, bin16, bin32) is used. + - BSON + - If a subtype is given, it is used and added as unsigned 8-bit integer. + - If no subtype is given, the generic binary subtype 0x00 is used. + + @sa see @ref binary -- create a binary array + + @since version 3.8.0 + */ + using binary_t = nlohmann::byte_container_with_subtype; + /// @} + + private: + + /// helper for exception-safe object creation + template + JSON_HEDLEY_RETURNS_NON_NULL + static T* create(Args&& ... args) + { + AllocatorType alloc; + using AllocatorTraits = std::allocator_traits>; + + auto deleter = [&](T * obj) + { + AllocatorTraits::deallocate(alloc, obj, 1); + }; + std::unique_ptr obj(AllocatorTraits::allocate(alloc, 1), deleter); + AllocatorTraits::construct(alloc, obj.get(), std::forward(args)...); + JSON_ASSERT(obj != nullptr); + return obj.release(); + } + + //////////////////////// + // JSON value storage // + //////////////////////// + + JSON_PRIVATE_UNLESS_TESTED: + /*! + @brief a JSON value + + The actual storage for a JSON value of the @ref basic_json class. This + union combines the different storage types for the JSON value types + defined in @ref value_t. + + JSON type | value_t type | used type + --------- | --------------- | ------------------------ + object | object | pointer to @ref object_t + array | array | pointer to @ref array_t + string | string | pointer to @ref string_t + boolean | boolean | @ref boolean_t + number | number_integer | @ref number_integer_t + number | number_unsigned | @ref number_unsigned_t + number | number_float | @ref number_float_t + binary | binary | pointer to @ref binary_t + null | null | *no value is stored* + + @note Variable-length types (objects, arrays, and strings) are stored as + pointers. The size of the union should not exceed 64 bits if the default + value types are used. + + @since version 1.0.0 + */ + union json_value + { + /// object (stored with pointer to save storage) + object_t* object; + /// array (stored with pointer to save storage) + array_t* array; + /// string (stored with pointer to save storage) + string_t* string; + /// binary (stored with pointer to save storage) + binary_t* binary; + /// boolean + boolean_t boolean; + /// number (integer) + number_integer_t number_integer; + /// number (unsigned integer) + number_unsigned_t number_unsigned; + /// number (floating-point) + number_float_t number_float; + + /// default constructor (for null values) + json_value() = default; + /// constructor for booleans + json_value(boolean_t v) noexcept : boolean(v) {} + /// constructor for numbers (integer) + json_value(number_integer_t v) noexcept : number_integer(v) {} + /// constructor for numbers (unsigned) + json_value(number_unsigned_t v) noexcept : number_unsigned(v) {} + /// constructor for numbers (floating-point) + json_value(number_float_t v) noexcept : number_float(v) {} + /// constructor for empty values of a given type + json_value(value_t t) + { + switch (t) + { + case value_t::object: + { + object = create(); + break; + } + + case value_t::array: + { + array = create(); + break; + } + + case value_t::string: + { + string = create(""); + break; + } + + case value_t::binary: + { + binary = create(); + break; + } + + case value_t::boolean: + { + boolean = boolean_t(false); + break; + } + + case value_t::number_integer: + { + number_integer = number_integer_t(0); + break; + } + + case value_t::number_unsigned: + { + number_unsigned = number_unsigned_t(0); + break; + } + + case value_t::number_float: + { + number_float = number_float_t(0.0); + break; + } + + case value_t::null: + { + object = nullptr; // silence warning, see #821 + break; + } + + case value_t::discarded: + default: + { + object = nullptr; // silence warning, see #821 + if (JSON_HEDLEY_UNLIKELY(t == value_t::null)) + { + JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.10.4", basic_json())); // LCOV_EXCL_LINE + } + break; + } + } + } + + /// constructor for strings + json_value(const string_t& value) + { + string = create(value); + } + + /// constructor for rvalue strings + json_value(string_t&& value) + { + string = create(std::move(value)); + } + + /// constructor for objects + json_value(const object_t& value) + { + object = create(value); + } + + /// constructor for rvalue objects + json_value(object_t&& value) + { + object = create(std::move(value)); + } + + /// constructor for arrays + json_value(const array_t& value) + { + array = create(value); + } + + /// constructor for rvalue arrays + json_value(array_t&& value) + { + array = create(std::move(value)); + } + + /// constructor for binary arrays + json_value(const typename binary_t::container_type& value) + { + binary = create(value); + } + + /// constructor for rvalue binary arrays + json_value(typename binary_t::container_type&& value) + { + binary = create(std::move(value)); + } + + /// constructor for binary arrays (internal type) + json_value(const binary_t& value) + { + binary = create(value); + } + + /// constructor for rvalue binary arrays (internal type) + json_value(binary_t&& value) + { + binary = create(std::move(value)); + } + + void destroy(value_t t) + { + if (t == value_t::array || t == value_t::object) + { + // flatten the current json_value to a heap-allocated stack + std::vector stack; + + // move the top-level items to stack + if (t == value_t::array) + { + stack.reserve(array->size()); + std::move(array->begin(), array->end(), std::back_inserter(stack)); + } + else + { + stack.reserve(object->size()); + for (auto&& it : *object) + { + stack.push_back(std::move(it.second)); + } + } + + while (!stack.empty()) + { + // move the last item to local variable to be processed + basic_json current_item(std::move(stack.back())); + stack.pop_back(); + + // if current_item is array/object, move + // its children to the stack to be processed later + if (current_item.is_array()) + { + std::move(current_item.m_value.array->begin(), current_item.m_value.array->end(), std::back_inserter(stack)); + + current_item.m_value.array->clear(); + } + else if (current_item.is_object()) + { + for (auto&& it : *current_item.m_value.object) + { + stack.push_back(std::move(it.second)); + } + + current_item.m_value.object->clear(); + } + + // it's now safe that current_item get destructed + // since it doesn't have any children + } + } + + switch (t) + { + case value_t::object: + { + AllocatorType alloc; + std::allocator_traits::destroy(alloc, object); + std::allocator_traits::deallocate(alloc, object, 1); + break; + } + + case value_t::array: + { + AllocatorType alloc; + std::allocator_traits::destroy(alloc, array); + std::allocator_traits::deallocate(alloc, array, 1); + break; + } + + case value_t::string: + { + AllocatorType alloc; + std::allocator_traits::destroy(alloc, string); + std::allocator_traits::deallocate(alloc, string, 1); + break; + } + + case value_t::binary: + { + AllocatorType alloc; + std::allocator_traits::destroy(alloc, binary); + std::allocator_traits::deallocate(alloc, binary, 1); + break; + } + + case value_t::null: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::discarded: + default: + { + break; + } + } + } + }; + + private: + /*! + @brief checks the class invariants + + This function asserts the class invariants. It needs to be called at the + end of every constructor to make sure that created objects respect the + invariant. Furthermore, it has to be called each time the type of a JSON + value is changed, because the invariant expresses a relationship between + @a m_type and @a m_value. + + Furthermore, the parent relation is checked for arrays and objects: If + @a check_parents true and the value is an array or object, then the + container's elements must have the current value as parent. + + @param[in] check_parents whether the parent relation should be checked. + The value is true by default and should only be set to false + during destruction of objects when the invariant does not + need to hold. + */ + void assert_invariant(bool check_parents = true) const noexcept + { + JSON_ASSERT(m_type != value_t::object || m_value.object != nullptr); + JSON_ASSERT(m_type != value_t::array || m_value.array != nullptr); + JSON_ASSERT(m_type != value_t::string || m_value.string != nullptr); + JSON_ASSERT(m_type != value_t::binary || m_value.binary != nullptr); + +#if JSON_DIAGNOSTICS + JSON_TRY + { + // cppcheck-suppress assertWithSideEffect + JSON_ASSERT(!check_parents || !is_structured() || std::all_of(begin(), end(), [this](const basic_json & j) + { + return j.m_parent == this; + })); + } + JSON_CATCH(...) {} // LCOV_EXCL_LINE +#endif + static_cast(check_parents); + } + + void set_parents() + { +#if JSON_DIAGNOSTICS + switch (m_type) + { + case value_t::array: + { + for (auto& element : *m_value.array) + { + element.m_parent = this; + } + break; + } + + case value_t::object: + { + for (auto& element : *m_value.object) + { + element.second.m_parent = this; + } + break; + } + + case value_t::null: + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + break; + } +#endif + } + + iterator set_parents(iterator it, typename iterator::difference_type count) + { +#if JSON_DIAGNOSTICS + for (typename iterator::difference_type i = 0; i < count; ++i) + { + (it + i)->m_parent = this; + } +#else + static_cast(count); +#endif + return it; + } + + reference set_parent(reference j, std::size_t old_capacity = std::size_t(-1)) + { +#if JSON_DIAGNOSTICS + if (old_capacity != std::size_t(-1)) + { + // see https://github.com/nlohmann/json/issues/2838 + JSON_ASSERT(type() == value_t::array); + if (JSON_HEDLEY_UNLIKELY(m_value.array->capacity() != old_capacity)) + { + // capacity has changed: update all parents + set_parents(); + return j; + } + } + + // ordered_json uses a vector internally, so pointers could have + // been invalidated; see https://github.com/nlohmann/json/issues/2962 +#ifdef JSON_HEDLEY_MSVC_VERSION +#pragma warning(push ) +#pragma warning(disable : 4127) // ignore warning to replace if with if constexpr +#endif + if (detail::is_ordered_map::value) + { + set_parents(); + return j; + } +#ifdef JSON_HEDLEY_MSVC_VERSION +#pragma warning( pop ) +#endif + + j.m_parent = this; +#else + static_cast(j); + static_cast(old_capacity); +#endif + return j; + } + + public: + ////////////////////////// + // JSON parser callback // + ////////////////////////// + + /*! + @brief parser event types + + The parser callback distinguishes the following events: + - `object_start`: the parser read `{` and started to process a JSON object + - `key`: the parser read a key of a value in an object + - `object_end`: the parser read `}` and finished processing a JSON object + - `array_start`: the parser read `[` and started to process a JSON array + - `array_end`: the parser read `]` and finished processing a JSON array + - `value`: the parser finished reading a JSON value + + @image html callback_events.png "Example when certain parse events are triggered" + + @sa see @ref parser_callback_t for more information and examples + */ + using parse_event_t = detail::parse_event_t; + + /*! + @brief per-element parser callback type + + With a parser callback function, the result of parsing a JSON text can be + influenced. When passed to @ref parse, it is called on certain events + (passed as @ref parse_event_t via parameter @a event) with a set recursion + depth @a depth and context JSON value @a parsed. The return value of the + callback function is a boolean indicating whether the element that emitted + the callback shall be kept or not. + + We distinguish six scenarios (determined by the event type) in which the + callback function can be called. The following table describes the values + of the parameters @a depth, @a event, and @a parsed. + + parameter @a event | description | parameter @a depth | parameter @a parsed + ------------------ | ----------- | ------------------ | ------------------- + parse_event_t::object_start | the parser read `{` and started to process a JSON object | depth of the parent of the JSON object | a JSON value with type discarded + parse_event_t::key | the parser read a key of a value in an object | depth of the currently parsed JSON object | a JSON string containing the key + parse_event_t::object_end | the parser read `}` and finished processing a JSON object | depth of the parent of the JSON object | the parsed JSON object + parse_event_t::array_start | the parser read `[` and started to process a JSON array | depth of the parent of the JSON array | a JSON value with type discarded + parse_event_t::array_end | the parser read `]` and finished processing a JSON array | depth of the parent of the JSON array | the parsed JSON array + parse_event_t::value | the parser finished reading a JSON value | depth of the value | the parsed JSON value + + @image html callback_events.png "Example when certain parse events are triggered" + + Discarding a value (i.e., returning `false`) has different effects + depending on the context in which function was called: + + - Discarded values in structured types are skipped. That is, the parser + will behave as if the discarded value was never read. + - In case a value outside a structured type is skipped, it is replaced + with `null`. This case happens if the top-level element is skipped. + + @param[in] depth the depth of the recursion during parsing + + @param[in] event an event of type parse_event_t indicating the context in + the callback function has been called + + @param[in,out] parsed the current intermediate parse result; note that + writing to this value has no effect for parse_event_t::key events + + @return Whether the JSON value which called the function during parsing + should be kept (`true`) or not (`false`). In the latter case, it is either + skipped completely or replaced by an empty discarded object. + + @sa see @ref parse for examples + + @since version 1.0.0 + */ + using parser_callback_t = detail::parser_callback_t; + + ////////////////// + // constructors // + ////////////////// + + /// @name constructors and destructors + /// Constructors of class @ref basic_json, copy/move constructor, copy + /// assignment, static functions creating objects, and the destructor. + /// @{ + + /*! + @brief create an empty value with a given type + + Create an empty JSON value with a given type. The value will be default + initialized with an empty value which depends on the type: + + Value type | initial value + ----------- | ------------- + null | `null` + boolean | `false` + string | `""` + number | `0` + object | `{}` + array | `[]` + binary | empty array + + @param[in] v the type of the value to create + + @complexity Constant. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @liveexample{The following code shows the constructor for different @ref + value_t values,basic_json__value_t} + + @sa see @ref clear() -- restores the postcondition of this constructor + + @since version 1.0.0 + */ + basic_json(const value_t v) + : m_type(v), m_value(v) + { + assert_invariant(); + } + + /*! + @brief create a null object + + Create a `null` JSON value. It either takes a null pointer as parameter + (explicitly creating `null`) or no parameter (implicitly creating `null`). + The passed null pointer itself is not read -- it is only used to choose + the right constructor. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this constructor never throws + exceptions. + + @liveexample{The following code shows the constructor with and without a + null pointer parameter.,basic_json__nullptr_t} + + @since version 1.0.0 + */ + basic_json(std::nullptr_t = nullptr) noexcept + : basic_json(value_t::null) + { + assert_invariant(); + } + + /*! + @brief create a JSON value + + This is a "catch all" constructor for all compatible JSON types; that is, + types for which a `to_json()` method exists. The constructor forwards the + parameter @a val to that method (to `json_serializer::to_json` method + with `U = uncvref_t`, to be exact). + + Template type @a CompatibleType includes, but is not limited to, the + following types: + - **arrays**: @ref array_t and all kinds of compatible containers such as + `std::vector`, `std::deque`, `std::list`, `std::forward_list`, + `std::array`, `std::valarray`, `std::set`, `std::unordered_set`, + `std::multiset`, and `std::unordered_multiset` with a `value_type` from + which a @ref basic_json value can be constructed. + - **objects**: @ref object_t and all kinds of compatible associative + containers such as `std::map`, `std::unordered_map`, `std::multimap`, + and `std::unordered_multimap` with a `key_type` compatible to + @ref string_t and a `value_type` from which a @ref basic_json value can + be constructed. + - **strings**: @ref string_t, string literals, and all compatible string + containers can be used. + - **numbers**: @ref number_integer_t, @ref number_unsigned_t, + @ref number_float_t, and all convertible number types such as `int`, + `size_t`, `int64_t`, `float` or `double` can be used. + - **boolean**: @ref boolean_t / `bool` can be used. + - **binary**: @ref binary_t / `std::vector` may be used, + unfortunately because string literals cannot be distinguished from binary + character arrays by the C++ type system, all types compatible with `const + char*` will be directed to the string constructor instead. This is both + for backwards compatibility, and due to the fact that a binary type is not + a standard JSON type. + + See the examples below. + + @tparam CompatibleType a type such that: + - @a CompatibleType is not derived from `std::istream`, + - @a CompatibleType is not @ref basic_json (to avoid hijacking copy/move + constructors), + - @a CompatibleType is not a different @ref basic_json type (i.e. with different template arguments) + - @a CompatibleType is not a @ref basic_json nested type (e.g., + @ref json_pointer, @ref iterator, etc ...) + - `json_serializer` has a `to_json(basic_json_t&, CompatibleType&&)` method + + @tparam U = `uncvref_t` + + @param[in] val the value to be forwarded to the respective constructor + + @complexity Usually linear in the size of the passed @a val, also + depending on the implementation of the called `to_json()` + method. + + @exceptionsafety Depends on the called constructor. For types directly + supported by the library (i.e., all types for which no `to_json()` function + was provided), strong guarantee holds: if an exception is thrown, there are + no changes to any JSON value. + + @liveexample{The following code shows the constructor with several + compatible types.,basic_json__CompatibleType} + + @since version 2.1.0 + */ + template < typename CompatibleType, + typename U = detail::uncvref_t, + detail::enable_if_t < + !detail::is_basic_json::value && detail::is_compatible_type::value, int > = 0 > + basic_json(CompatibleType && val) noexcept(noexcept( // NOLINT(bugprone-forwarding-reference-overload,bugprone-exception-escape) + JSONSerializer::to_json(std::declval(), + std::forward(val)))) + { + JSONSerializer::to_json(*this, std::forward(val)); + set_parents(); + assert_invariant(); + } + + /*! + @brief create a JSON value from an existing one + + This is a constructor for existing @ref basic_json types. + It does not hijack copy/move constructors, since the parameter has different + template arguments than the current ones. + + The constructor tries to convert the internal @ref m_value of the parameter. + + @tparam BasicJsonType a type such that: + - @a BasicJsonType is a @ref basic_json type. + - @a BasicJsonType has different template arguments than @ref basic_json_t. + + @param[in] val the @ref basic_json value to be converted. + + @complexity Usually linear in the size of the passed @a val, also + depending on the implementation of the called `to_json()` + method. + + @exceptionsafety Depends on the called constructor. For types directly + supported by the library (i.e., all types for which no `to_json()` function + was provided), strong guarantee holds: if an exception is thrown, there are + no changes to any JSON value. + + @since version 3.2.0 + */ + template < typename BasicJsonType, + detail::enable_if_t < + detail::is_basic_json::value&& !std::is_same::value, int > = 0 > + basic_json(const BasicJsonType& val) + { + using other_boolean_t = typename BasicJsonType::boolean_t; + using other_number_float_t = typename BasicJsonType::number_float_t; + using other_number_integer_t = typename BasicJsonType::number_integer_t; + using other_number_unsigned_t = typename BasicJsonType::number_unsigned_t; + using other_string_t = typename BasicJsonType::string_t; + using other_object_t = typename BasicJsonType::object_t; + using other_array_t = typename BasicJsonType::array_t; + using other_binary_t = typename BasicJsonType::binary_t; + + switch (val.type()) + { + case value_t::boolean: + JSONSerializer::to_json(*this, val.template get()); + break; + case value_t::number_float: + JSONSerializer::to_json(*this, val.template get()); + break; + case value_t::number_integer: + JSONSerializer::to_json(*this, val.template get()); + break; + case value_t::number_unsigned: + JSONSerializer::to_json(*this, val.template get()); + break; + case value_t::string: + JSONSerializer::to_json(*this, val.template get_ref()); + break; + case value_t::object: + JSONSerializer::to_json(*this, val.template get_ref()); + break; + case value_t::array: + JSONSerializer::to_json(*this, val.template get_ref()); + break; + case value_t::binary: + JSONSerializer::to_json(*this, val.template get_ref()); + break; + case value_t::null: + *this = nullptr; + break; + case value_t::discarded: + m_type = value_t::discarded; + break; + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE + } + set_parents(); + assert_invariant(); + } + + /*! + @brief create a container (array or object) from an initializer list + + Creates a JSON value of type array or object from the passed initializer + list @a init. In case @a type_deduction is `true` (default), the type of + the JSON value to be created is deducted from the initializer list @a init + according to the following rules: + + 1. If the list is empty, an empty JSON object value `{}` is created. + 2. If the list consists of pairs whose first element is a string, a JSON + object value is created where the first elements of the pairs are + treated as keys and the second elements are as values. + 3. In all other cases, an array is created. + + The rules aim to create the best fit between a C++ initializer list and + JSON values. The rationale is as follows: + + 1. The empty initializer list is written as `{}` which is exactly an empty + JSON object. + 2. C++ has no way of describing mapped types other than to list a list of + pairs. As JSON requires that keys must be of type string, rule 2 is the + weakest constraint one can pose on initializer lists to interpret them + as an object. + 3. In all other cases, the initializer list could not be interpreted as + JSON object type, so interpreting it as JSON array type is safe. + + With the rules described above, the following JSON values cannot be + expressed by an initializer list: + + - the empty array (`[]`): use @ref array(initializer_list_t) + with an empty initializer list in this case + - arrays whose elements satisfy rule 2: use @ref + array(initializer_list_t) with the same initializer list + in this case + + @note When used without parentheses around an empty initializer list, @ref + basic_json() is called instead of this function, yielding the JSON null + value. + + @param[in] init initializer list with JSON values + + @param[in] type_deduction internal parameter; when set to `true`, the type + of the JSON value is deducted from the initializer list @a init; when set + to `false`, the type provided via @a manual_type is forced. This mode is + used by the functions @ref array(initializer_list_t) and + @ref object(initializer_list_t). + + @param[in] manual_type internal parameter; when @a type_deduction is set + to `false`, the created JSON value will use the provided type (only @ref + value_t::array and @ref value_t::object are valid); when @a type_deduction + is set to `true`, this parameter has no effect + + @throw type_error.301 if @a type_deduction is `false`, @a manual_type is + `value_t::object`, but @a init contains an element which is not a pair + whose first element is a string. In this case, the constructor could not + create an object. If @a type_deduction would have be `true`, an array + would have been created. See @ref object(initializer_list_t) + for an example. + + @complexity Linear in the size of the initializer list @a init. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @liveexample{The example below shows how JSON values are created from + initializer lists.,basic_json__list_init_t} + + @sa see @ref array(initializer_list_t) -- create a JSON array + value from an initializer list + @sa see @ref object(initializer_list_t) -- create a JSON object + value from an initializer list + + @since version 1.0.0 + */ + basic_json(initializer_list_t init, + bool type_deduction = true, + value_t manual_type = value_t::array) + { + // check if each element is an array with two elements whose first + // element is a string + bool is_an_object = std::all_of(init.begin(), init.end(), + [](const detail::json_ref& element_ref) + { + return element_ref->is_array() && element_ref->size() == 2 && (*element_ref)[0].is_string(); + }); + + // adjust type if type deduction is not wanted + if (!type_deduction) + { + // if array is wanted, do not create an object though possible + if (manual_type == value_t::array) + { + is_an_object = false; + } + + // if object is wanted but impossible, throw an exception + if (JSON_HEDLEY_UNLIKELY(manual_type == value_t::object && !is_an_object)) + { + JSON_THROW(type_error::create(301, "cannot create object from initializer list", basic_json())); + } + } + + if (is_an_object) + { + // the initializer list is a list of pairs -> create object + m_type = value_t::object; + m_value = value_t::object; + + for (auto& element_ref : init) + { + auto element = element_ref.moved_or_copied(); + m_value.object->emplace( + std::move(*((*element.m_value.array)[0].m_value.string)), + std::move((*element.m_value.array)[1])); + } + } + else + { + // the initializer list describes an array -> create array + m_type = value_t::array; + m_value.array = create(init.begin(), init.end()); + } + + set_parents(); + assert_invariant(); + } + + /*! + @brief explicitly create a binary array (without subtype) + + Creates a JSON binary array value from a given binary container. Binary + values are part of various binary formats, such as CBOR, MessagePack, and + BSON. This constructor is used to create a value for serialization to those + formats. + + @note Note, this function exists because of the difficulty in correctly + specifying the correct template overload in the standard value ctor, as both + JSON arrays and JSON binary arrays are backed with some form of a + `std::vector`. Because JSON binary arrays are a non-standard extension it + was decided that it would be best to prevent automatic initialization of a + binary array type, for backwards compatibility and so it does not happen on + accident. + + @param[in] init container containing bytes to use as binary type + + @return JSON binary array value + + @complexity Linear in the size of @a init. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @since version 3.8.0 + */ + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json binary(const typename binary_t::container_type& init) + { + auto res = basic_json(); + res.m_type = value_t::binary; + res.m_value = init; + return res; + } + + /*! + @brief explicitly create a binary array (with subtype) + + Creates a JSON binary array value from a given binary container. Binary + values are part of various binary formats, such as CBOR, MessagePack, and + BSON. This constructor is used to create a value for serialization to those + formats. + + @note Note, this function exists because of the difficulty in correctly + specifying the correct template overload in the standard value ctor, as both + JSON arrays and JSON binary arrays are backed with some form of a + `std::vector`. Because JSON binary arrays are a non-standard extension it + was decided that it would be best to prevent automatic initialization of a + binary array type, for backwards compatibility and so it does not happen on + accident. + + @param[in] init container containing bytes to use as binary type + @param[in] subtype subtype to use in MessagePack and BSON + + @return JSON binary array value + + @complexity Linear in the size of @a init. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @since version 3.8.0 + */ + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json binary(const typename binary_t::container_type& init, typename binary_t::subtype_type subtype) + { + auto res = basic_json(); + res.m_type = value_t::binary; + res.m_value = binary_t(init, subtype); + return res; + } + + /// @copydoc binary(const typename binary_t::container_type&) + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json binary(typename binary_t::container_type&& init) + { + auto res = basic_json(); + res.m_type = value_t::binary; + res.m_value = std::move(init); + return res; + } + + /// @copydoc binary(const typename binary_t::container_type&, typename binary_t::subtype_type) + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json binary(typename binary_t::container_type&& init, typename binary_t::subtype_type subtype) + { + auto res = basic_json(); + res.m_type = value_t::binary; + res.m_value = binary_t(std::move(init), subtype); + return res; + } + + /*! + @brief explicitly create an array from an initializer list + + Creates a JSON array value from a given initializer list. That is, given a + list of values `a, b, c`, creates the JSON value `[a, b, c]`. If the + initializer list is empty, the empty array `[]` is created. + + @note This function is only needed to express two edge cases that cannot + be realized with the initializer list constructor (@ref + basic_json(initializer_list_t, bool, value_t)). These cases + are: + 1. creating an array whose elements are all pairs whose first element is a + string -- in this case, the initializer list constructor would create an + object, taking the first elements as keys + 2. creating an empty array -- passing the empty initializer list to the + initializer list constructor yields an empty object + + @param[in] init initializer list with JSON values to create an array from + (optional) + + @return JSON array value + + @complexity Linear in the size of @a init. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @liveexample{The following code shows an example for the `array` + function.,array} + + @sa see @ref basic_json(initializer_list_t, bool, value_t) -- + create a JSON value from an initializer list + @sa see @ref object(initializer_list_t) -- create a JSON object + value from an initializer list + + @since version 1.0.0 + */ + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json array(initializer_list_t init = {}) + { + return basic_json(init, false, value_t::array); + } + + /*! + @brief explicitly create an object from an initializer list + + Creates a JSON object value from a given initializer list. The initializer + lists elements must be pairs, and their first elements must be strings. If + the initializer list is empty, the empty object `{}` is created. + + @note This function is only added for symmetry reasons. In contrast to the + related function @ref array(initializer_list_t), there are + no cases which can only be expressed by this function. That is, any + initializer list @a init can also be passed to the initializer list + constructor @ref basic_json(initializer_list_t, bool, value_t). + + @param[in] init initializer list to create an object from (optional) + + @return JSON object value + + @throw type_error.301 if @a init is not a list of pairs whose first + elements are strings. In this case, no object can be created. When such a + value is passed to @ref basic_json(initializer_list_t, bool, value_t), + an array would have been created from the passed initializer list @a init. + See example below. + + @complexity Linear in the size of @a init. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @liveexample{The following code shows an example for the `object` + function.,object} + + @sa see @ref basic_json(initializer_list_t, bool, value_t) -- + create a JSON value from an initializer list + @sa see @ref array(initializer_list_t) -- create a JSON array + value from an initializer list + + @since version 1.0.0 + */ + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json object(initializer_list_t init = {}) + { + return basic_json(init, false, value_t::object); + } + + /*! + @brief construct an array with count copies of given value + + Constructs a JSON array value by creating @a cnt copies of a passed value. + In case @a cnt is `0`, an empty array is created. + + @param[in] cnt the number of JSON copies of @a val to create + @param[in] val the JSON value to copy + + @post `std::distance(begin(),end()) == cnt` holds. + + @complexity Linear in @a cnt. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @liveexample{The following code shows examples for the @ref + basic_json(size_type\, const basic_json&) + constructor.,basic_json__size_type_basic_json} + + @since version 1.0.0 + */ + basic_json(size_type cnt, const basic_json& val) + : m_type(value_t::array) + { + m_value.array = create(cnt, val); + set_parents(); + assert_invariant(); + } + + /*! + @brief construct a JSON container given an iterator range + + Constructs the JSON value with the contents of the range `[first, last)`. + The semantics depends on the different types a JSON value can have: + - In case of a null type, invalid_iterator.206 is thrown. + - In case of other primitive types (number, boolean, or string), @a first + must be `begin()` and @a last must be `end()`. In this case, the value is + copied. Otherwise, invalid_iterator.204 is thrown. + - In case of structured types (array, object), the constructor behaves as + similar versions for `std::vector` or `std::map`; that is, a JSON array + or object is constructed from the values in the range. + + @tparam InputIT an input iterator type (@ref iterator or @ref + const_iterator) + + @param[in] first begin of the range to copy from (included) + @param[in] last end of the range to copy from (excluded) + + @pre Iterators @a first and @a last must be initialized. **This + precondition is enforced with an assertion (see warning).** If + assertions are switched off, a violation of this precondition yields + undefined behavior. + + @pre Range `[first, last)` is valid. Usually, this precondition cannot be + checked efficiently. Only certain edge cases are detected; see the + description of the exceptions below. A violation of this precondition + yields undefined behavior. + + @warning A precondition is enforced with a runtime assertion that will + result in calling `std::abort` if this precondition is not met. + Assertions can be disabled by defining `NDEBUG` at compile time. + See https://en.cppreference.com/w/cpp/error/assert for more + information. + + @throw invalid_iterator.201 if iterators @a first and @a last are not + compatible (i.e., do not belong to the same JSON value). In this case, + the range `[first, last)` is undefined. + @throw invalid_iterator.204 if iterators @a first and @a last belong to a + primitive type (number, boolean, or string), but @a first does not point + to the first element any more. In this case, the range `[first, last)` is + undefined. See example code below. + @throw invalid_iterator.206 if iterators @a first and @a last belong to a + null value. In this case, the range `[first, last)` is undefined. + + @complexity Linear in distance between @a first and @a last. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @liveexample{The example below shows several ways to create JSON values by + specifying a subrange with iterators.,basic_json__InputIt_InputIt} + + @since version 1.0.0 + */ + template < class InputIT, typename std::enable_if < + std::is_same::value || + std::is_same::value, int >::type = 0 > + basic_json(InputIT first, InputIT last) + { + JSON_ASSERT(first.m_object != nullptr); + JSON_ASSERT(last.m_object != nullptr); + + // make sure iterator fits the current value + if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object)) + { + JSON_THROW(invalid_iterator::create(201, "iterators are not compatible", basic_json())); + } + + // copy type from first iterator + m_type = first.m_object->m_type; + + // check if iterator range is complete for primitive values + switch (m_type) + { + case value_t::boolean: + case value_t::number_float: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::string: + { + if (JSON_HEDLEY_UNLIKELY(!first.m_it.primitive_iterator.is_begin() + || !last.m_it.primitive_iterator.is_end())) + { + JSON_THROW(invalid_iterator::create(204, "iterators out of range", *first.m_object)); + } + break; + } + + case value_t::null: + case value_t::object: + case value_t::array: + case value_t::binary: + case value_t::discarded: + default: + break; + } + + switch (m_type) + { + case value_t::number_integer: + { + m_value.number_integer = first.m_object->m_value.number_integer; + break; + } + + case value_t::number_unsigned: + { + m_value.number_unsigned = first.m_object->m_value.number_unsigned; + break; + } + + case value_t::number_float: + { + m_value.number_float = first.m_object->m_value.number_float; + break; + } + + case value_t::boolean: + { + m_value.boolean = first.m_object->m_value.boolean; + break; + } + + case value_t::string: + { + m_value = *first.m_object->m_value.string; + break; + } + + case value_t::object: + { + m_value.object = create(first.m_it.object_iterator, + last.m_it.object_iterator); + break; + } + + case value_t::array: + { + m_value.array = create(first.m_it.array_iterator, + last.m_it.array_iterator); + break; + } + + case value_t::binary: + { + m_value = *first.m_object->m_value.binary; + break; + } + + case value_t::null: + case value_t::discarded: + default: + JSON_THROW(invalid_iterator::create(206, "cannot construct with iterators from " + std::string(first.m_object->type_name()), *first.m_object)); + } + + set_parents(); + assert_invariant(); + } + + + /////////////////////////////////////// + // other constructors and destructor // + /////////////////////////////////////// + + template, + std::is_same>::value, int> = 0 > + basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {} + + /*! + @brief copy constructor + + Creates a copy of a given JSON value. + + @param[in] other the JSON value to copy + + @post `*this == other` + + @complexity Linear in the size of @a other. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes to any JSON value. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is linear. + - As postcondition, it holds: `other == basic_json(other)`. + + @liveexample{The following code shows an example for the copy + constructor.,basic_json__basic_json} + + @since version 1.0.0 + */ + basic_json(const basic_json& other) + : m_type(other.m_type) + { + // check of passed value is valid + other.assert_invariant(); + + switch (m_type) + { + case value_t::object: + { + m_value = *other.m_value.object; + break; + } + + case value_t::array: + { + m_value = *other.m_value.array; + break; + } + + case value_t::string: + { + m_value = *other.m_value.string; + break; + } + + case value_t::boolean: + { + m_value = other.m_value.boolean; + break; + } + + case value_t::number_integer: + { + m_value = other.m_value.number_integer; + break; + } + + case value_t::number_unsigned: + { + m_value = other.m_value.number_unsigned; + break; + } + + case value_t::number_float: + { + m_value = other.m_value.number_float; + break; + } + + case value_t::binary: + { + m_value = *other.m_value.binary; + break; + } + + case value_t::null: + case value_t::discarded: + default: + break; + } + + set_parents(); + assert_invariant(); + } + + /*! + @brief move constructor + + Move constructor. Constructs a JSON value with the contents of the given + value @a other using move semantics. It "steals" the resources from @a + other and leaves it as JSON null value. + + @param[in,out] other value to move to this object + + @post `*this` has the same value as @a other before the call. + @post @a other is a JSON null value. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this constructor never throws + exceptions. + + @requirement This function helps `basic_json` satisfying the + [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible) + requirements. + + @liveexample{The code below shows the move constructor explicitly called + via std::move.,basic_json__moveconstructor} + + @since version 1.0.0 + */ + basic_json(basic_json&& other) noexcept + : m_type(std::move(other.m_type)), + m_value(std::move(other.m_value)) + { + // check that passed value is valid + other.assert_invariant(false); + + // invalidate payload + other.m_type = value_t::null; + other.m_value = {}; + + set_parents(); + assert_invariant(); + } + + /*! + @brief copy assignment + + Copy assignment operator. Copies a JSON value via the "copy and swap" + strategy: It is expressed in terms of the copy constructor, destructor, + and the `swap()` member function. + + @param[in] other value to copy from + + @complexity Linear. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is linear. + + @liveexample{The code below shows and example for the copy assignment. It + creates a copy of value `a` which is then swapped with `b`. Finally\, the + copy of `a` (which is the null value after the swap) is + destroyed.,basic_json__copyassignment} + + @since version 1.0.0 + */ + basic_json& operator=(basic_json other) noexcept ( + std::is_nothrow_move_constructible::value&& + std::is_nothrow_move_assignable::value&& + std::is_nothrow_move_constructible::value&& + std::is_nothrow_move_assignable::value + ) + { + // check that passed value is valid + other.assert_invariant(); + + using std::swap; + swap(m_type, other.m_type); + swap(m_value, other.m_value); + + set_parents(); + assert_invariant(); + return *this; + } + + /*! + @brief destructor + + Destroys the JSON value and frees all allocated memory. + + @complexity Linear. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is linear. + - All stored elements are destroyed and all memory is freed. + + @since version 1.0.0 + */ + ~basic_json() noexcept + { + assert_invariant(false); + m_value.destroy(m_type); + } + + /// @} + + public: + /////////////////////// + // object inspection // + /////////////////////// + + /// @name object inspection + /// Functions to inspect the type of a JSON value. + /// @{ + + /*! + @brief serialization + + Serialization function for JSON values. The function tries to mimic + Python's `json.dumps()` function, and currently supports its @a indent + and @a ensure_ascii parameters. + + @param[in] indent If indent is nonnegative, then array elements and object + members will be pretty-printed with that indent level. An indent level of + `0` will only insert newlines. `-1` (the default) selects the most compact + representation. + @param[in] indent_char The character to use for indentation if @a indent is + greater than `0`. The default is ` ` (space). + @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters + in the output are escaped with `\uXXXX` sequences, and the result consists + of ASCII characters only. + @param[in] error_handler how to react on decoding errors; there are three + possible values: `strict` (throws and exception in case a decoding error + occurs; default), `replace` (replace invalid UTF-8 sequences with U+FFFD), + and `ignore` (ignore invalid UTF-8 sequences during serialization; all + bytes are copied to the output unchanged). + + @return string containing the serialization of the JSON value + + @throw type_error.316 if a string stored inside the JSON value is not + UTF-8 encoded and @a error_handler is set to strict + + @note Binary values are serialized as object containing two keys: + - "bytes": an array of bytes as integers + - "subtype": the subtype as integer or "null" if the binary has no subtype + + @complexity Linear. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes in the JSON value. + + @liveexample{The following example shows the effect of different @a indent\, + @a indent_char\, and @a ensure_ascii parameters to the result of the + serialization.,dump} + + @see https://docs.python.org/2/library/json.html#json.dump + + @since version 1.0.0; indentation character @a indent_char, option + @a ensure_ascii and exceptions added in version 3.0.0; error + handlers added in version 3.4.0; serialization of binary values added + in version 3.8.0. + */ + string_t dump(const int indent = -1, + const char indent_char = ' ', + const bool ensure_ascii = false, + const error_handler_t error_handler = error_handler_t::strict) const + { + string_t result; + serializer s(detail::output_adapter(result), indent_char, error_handler); + + if (indent >= 0) + { + s.dump(*this, true, ensure_ascii, static_cast(indent)); + } + else + { + s.dump(*this, false, ensure_ascii, 0); + } + + return result; + } + + /*! + @brief return the type of the JSON value (explicit) + + Return the type of the JSON value as a value from the @ref value_t + enumeration. + + @return the type of the JSON value + Value type | return value + ------------------------- | ------------------------- + null | value_t::null + boolean | value_t::boolean + string | value_t::string + number (integer) | value_t::number_integer + number (unsigned integer) | value_t::number_unsigned + number (floating-point) | value_t::number_float + object | value_t::object + array | value_t::array + binary | value_t::binary + discarded | value_t::discarded + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `type()` for all JSON + types.,type} + + @sa see @ref operator value_t() -- return the type of the JSON value (implicit) + @sa see @ref type_name() -- return the type as string + + @since version 1.0.0 + */ + constexpr value_t type() const noexcept + { + return m_type; + } + + /*! + @brief return whether type is primitive + + This function returns true if and only if the JSON type is primitive + (string, number, boolean, or null). + + @return `true` if type is primitive (string, number, boolean, or null), + `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_primitive()` for all JSON + types.,is_primitive} + + @sa see @ref is_structured() -- returns whether JSON value is structured + @sa see @ref is_null() -- returns whether JSON value is `null` + @sa see @ref is_string() -- returns whether JSON value is a string + @sa see @ref is_boolean() -- returns whether JSON value is a boolean + @sa see @ref is_number() -- returns whether JSON value is a number + @sa see @ref is_binary() -- returns whether JSON value is a binary array + + @since version 1.0.0 + */ + constexpr bool is_primitive() const noexcept + { + return is_null() || is_string() || is_boolean() || is_number() || is_binary(); + } + + /*! + @brief return whether type is structured + + This function returns true if and only if the JSON type is structured + (array or object). + + @return `true` if type is structured (array or object), `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_structured()` for all JSON + types.,is_structured} + + @sa see @ref is_primitive() -- returns whether value is primitive + @sa see @ref is_array() -- returns whether value is an array + @sa see @ref is_object() -- returns whether value is an object + + @since version 1.0.0 + */ + constexpr bool is_structured() const noexcept + { + return is_array() || is_object(); + } + + /*! + @brief return whether value is null + + This function returns true if and only if the JSON value is null. + + @return `true` if type is null, `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_null()` for all JSON + types.,is_null} + + @since version 1.0.0 + */ + constexpr bool is_null() const noexcept + { + return m_type == value_t::null; + } + + /*! + @brief return whether value is a boolean + + This function returns true if and only if the JSON value is a boolean. + + @return `true` if type is boolean, `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_boolean()` for all JSON + types.,is_boolean} + + @since version 1.0.0 + */ + constexpr bool is_boolean() const noexcept + { + return m_type == value_t::boolean; + } + + /*! + @brief return whether value is a number + + This function returns true if and only if the JSON value is a number. This + includes both integer (signed and unsigned) and floating-point values. + + @return `true` if type is number (regardless whether integer, unsigned + integer or floating-type), `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_number()` for all JSON + types.,is_number} + + @sa see @ref is_number_integer() -- check if value is an integer or unsigned + integer number + @sa see @ref is_number_unsigned() -- check if value is an unsigned integer + number + @sa see @ref is_number_float() -- check if value is a floating-point number + + @since version 1.0.0 + */ + constexpr bool is_number() const noexcept + { + return is_number_integer() || is_number_float(); + } + + /*! + @brief return whether value is an integer number + + This function returns true if and only if the JSON value is a signed or + unsigned integer number. This excludes floating-point values. + + @return `true` if type is an integer or unsigned integer number, `false` + otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_number_integer()` for all + JSON types.,is_number_integer} + + @sa see @ref is_number() -- check if value is a number + @sa see @ref is_number_unsigned() -- check if value is an unsigned integer + number + @sa see @ref is_number_float() -- check if value is a floating-point number + + @since version 1.0.0 + */ + constexpr bool is_number_integer() const noexcept + { + return m_type == value_t::number_integer || m_type == value_t::number_unsigned; + } + + /*! + @brief return whether value is an unsigned integer number + + This function returns true if and only if the JSON value is an unsigned + integer number. This excludes floating-point and signed integer values. + + @return `true` if type is an unsigned integer number, `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_number_unsigned()` for all + JSON types.,is_number_unsigned} + + @sa see @ref is_number() -- check if value is a number + @sa see @ref is_number_integer() -- check if value is an integer or unsigned + integer number + @sa see @ref is_number_float() -- check if value is a floating-point number + + @since version 2.0.0 + */ + constexpr bool is_number_unsigned() const noexcept + { + return m_type == value_t::number_unsigned; + } + + /*! + @brief return whether value is a floating-point number + + This function returns true if and only if the JSON value is a + floating-point number. This excludes signed and unsigned integer values. + + @return `true` if type is a floating-point number, `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_number_float()` for all + JSON types.,is_number_float} + + @sa see @ref is_number() -- check if value is number + @sa see @ref is_number_integer() -- check if value is an integer number + @sa see @ref is_number_unsigned() -- check if value is an unsigned integer + number + + @since version 1.0.0 + */ + constexpr bool is_number_float() const noexcept + { + return m_type == value_t::number_float; + } + + /*! + @brief return whether value is an object + + This function returns true if and only if the JSON value is an object. + + @return `true` if type is object, `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_object()` for all JSON + types.,is_object} + + @since version 1.0.0 + */ + constexpr bool is_object() const noexcept + { + return m_type == value_t::object; + } + + /*! + @brief return whether value is an array + + This function returns true if and only if the JSON value is an array. + + @return `true` if type is array, `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_array()` for all JSON + types.,is_array} + + @since version 1.0.0 + */ + constexpr bool is_array() const noexcept + { + return m_type == value_t::array; + } + + /*! + @brief return whether value is a string + + This function returns true if and only if the JSON value is a string. + + @return `true` if type is string, `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_string()` for all JSON + types.,is_string} + + @since version 1.0.0 + */ + constexpr bool is_string() const noexcept + { + return m_type == value_t::string; + } + + /*! + @brief return whether value is a binary array + + This function returns true if and only if the JSON value is a binary array. + + @return `true` if type is binary array, `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_binary()` for all JSON + types.,is_binary} + + @since version 3.8.0 + */ + constexpr bool is_binary() const noexcept + { + return m_type == value_t::binary; + } + + /*! + @brief return whether value is discarded + + This function returns true if and only if the JSON value was discarded + during parsing with a callback function (see @ref parser_callback_t). + + @note This function will always be `false` for JSON values after parsing. + That is, discarded values can only occur during parsing, but will be + removed when inside a structured value or replaced by null in other cases. + + @return `true` if type is discarded, `false` otherwise. + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies `is_discarded()` for all JSON + types.,is_discarded} + + @since version 1.0.0 + */ + constexpr bool is_discarded() const noexcept + { + return m_type == value_t::discarded; + } + + /*! + @brief return the type of the JSON value (implicit) + + Implicitly return the type of the JSON value as a value from the @ref + value_t enumeration. + + @return the type of the JSON value + + @complexity Constant. + + @exceptionsafety No-throw guarantee: this member function never throws + exceptions. + + @liveexample{The following code exemplifies the @ref value_t operator for + all JSON types.,operator__value_t} + + @sa see @ref type() -- return the type of the JSON value (explicit) + @sa see @ref type_name() -- return the type as string + + @since version 1.0.0 + */ + constexpr operator value_t() const noexcept + { + return m_type; + } + + /// @} + + private: + ////////////////// + // value access // + ////////////////// + + /// get a boolean (explicit) + boolean_t get_impl(boolean_t* /*unused*/) const + { + if (JSON_HEDLEY_LIKELY(is_boolean())) + { + return m_value.boolean; + } + + JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(type_name()), *this)); + } + + /// get a pointer to the value (object) + object_t* get_impl_ptr(object_t* /*unused*/) noexcept + { + return is_object() ? m_value.object : nullptr; + } + + /// get a pointer to the value (object) + constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept + { + return is_object() ? m_value.object : nullptr; + } + + /// get a pointer to the value (array) + array_t* get_impl_ptr(array_t* /*unused*/) noexcept + { + return is_array() ? m_value.array : nullptr; + } + + /// get a pointer to the value (array) + constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept + { + return is_array() ? m_value.array : nullptr; + } + + /// get a pointer to the value (string) + string_t* get_impl_ptr(string_t* /*unused*/) noexcept + { + return is_string() ? m_value.string : nullptr; + } + + /// get a pointer to the value (string) + constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept + { + return is_string() ? m_value.string : nullptr; + } + + /// get a pointer to the value (boolean) + boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept + { + return is_boolean() ? &m_value.boolean : nullptr; + } + + /// get a pointer to the value (boolean) + constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept + { + return is_boolean() ? &m_value.boolean : nullptr; + } + + /// get a pointer to the value (integer number) + number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept + { + return is_number_integer() ? &m_value.number_integer : nullptr; + } + + /// get a pointer to the value (integer number) + constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept + { + return is_number_integer() ? &m_value.number_integer : nullptr; + } + + /// get a pointer to the value (unsigned number) + number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept + { + return is_number_unsigned() ? &m_value.number_unsigned : nullptr; + } + + /// get a pointer to the value (unsigned number) + constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept + { + return is_number_unsigned() ? &m_value.number_unsigned : nullptr; + } + + /// get a pointer to the value (floating-point number) + number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept + { + return is_number_float() ? &m_value.number_float : nullptr; + } + + /// get a pointer to the value (floating-point number) + constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept + { + return is_number_float() ? &m_value.number_float : nullptr; + } + + /// get a pointer to the value (binary) + binary_t* get_impl_ptr(binary_t* /*unused*/) noexcept + { + return is_binary() ? m_value.binary : nullptr; + } + + /// get a pointer to the value (binary) + constexpr const binary_t* get_impl_ptr(const binary_t* /*unused*/) const noexcept + { + return is_binary() ? m_value.binary : nullptr; + } + + /*! + @brief helper function to implement get_ref() + + This function helps to implement get_ref() without code duplication for + const and non-const overloads + + @tparam ThisType will be deduced as `basic_json` or `const basic_json` + + @throw type_error.303 if ReferenceType does not match underlying value + type of the current JSON + */ + template + static ReferenceType get_ref_impl(ThisType& obj) + { + // delegate the call to get_ptr<>() + auto* ptr = obj.template get_ptr::type>(); + + if (JSON_HEDLEY_LIKELY(ptr != nullptr)) + { + return *ptr; + } + + JSON_THROW(type_error::create(303, "incompatible ReferenceType for get_ref, actual type is " + std::string(obj.type_name()), obj)); + } + + public: + /// @name value access + /// Direct access to the stored value of a JSON value. + /// @{ + + /*! + @brief get a pointer value (implicit) + + Implicit pointer access to the internally stored JSON value. No copies are + made. + + @warning Writing data to the pointee of the result yields an undefined + state. + + @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref + object_t, @ref string_t, @ref boolean_t, @ref number_integer_t, + @ref number_unsigned_t, or @ref number_float_t. Enforced by a static + assertion. + + @return pointer to the internally stored JSON value if the requested + pointer type @a PointerType fits to the JSON value; `nullptr` otherwise + + @complexity Constant. + + @liveexample{The example below shows how pointers to internal values of a + JSON value can be requested. Note that no type conversions are made and a + `nullptr` is returned if the value and the requested pointer type does not + match.,get_ptr} + + @since version 1.0.0 + */ + template::value, int>::type = 0> + auto get_ptr() noexcept -> decltype(std::declval().get_impl_ptr(std::declval())) + { + // delegate the call to get_impl_ptr<>() + return get_impl_ptr(static_cast(nullptr)); + } + + /*! + @brief get a pointer value (implicit) + @copydoc get_ptr() + */ + template < typename PointerType, typename std::enable_if < + std::is_pointer::value&& + std::is_const::type>::value, int >::type = 0 > + constexpr auto get_ptr() const noexcept -> decltype(std::declval().get_impl_ptr(std::declval())) + { + // delegate the call to get_impl_ptr<>() const + return get_impl_ptr(static_cast(nullptr)); + } + + private: + /*! + @brief get a value (explicit) + + Explicit type conversion between the JSON value and a compatible value + which is [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible) + and [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible). + The value is converted by calling the @ref json_serializer + `from_json()` method. + + The function is equivalent to executing + @code {.cpp} + ValueType ret; + JSONSerializer::from_json(*this, ret); + return ret; + @endcode + + This overloads is chosen if: + - @a ValueType is not @ref basic_json, + - @ref json_serializer has a `from_json()` method of the form + `void from_json(const basic_json&, ValueType&)`, and + - @ref json_serializer does not have a `from_json()` method of + the form `ValueType from_json(const basic_json&)` + + @tparam ValueType the returned value type + + @return copy of the JSON value, converted to @a ValueType + + @throw what @ref json_serializer `from_json()` method throws + + @liveexample{The example below shows several conversions from JSON values + to other types. There a few things to note: (1) Floating-point numbers can + be converted to integers\, (2) A JSON array can be converted to a standard + `std::vector`\, (3) A JSON object can be converted to C++ + associative containers such as `std::unordered_map`.,get__ValueType_const} + + @since version 2.1.0 + */ + template < typename ValueType, + detail::enable_if_t < + detail::is_default_constructible::value&& + detail::has_from_json::value, + int > = 0 > + ValueType get_impl(detail::priority_tag<0> /*unused*/) const noexcept(noexcept( + JSONSerializer::from_json(std::declval(), std::declval()))) + { + auto ret = ValueType(); + JSONSerializer::from_json(*this, ret); + return ret; + } + + /*! + @brief get a value (explicit); special case + + Explicit type conversion between the JSON value and a compatible value + which is **not** [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible) + and **not** [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible). + The value is converted by calling the @ref json_serializer + `from_json()` method. + + The function is equivalent to executing + @code {.cpp} + return JSONSerializer::from_json(*this); + @endcode + + This overloads is chosen if: + - @a ValueType is not @ref basic_json and + - @ref json_serializer has a `from_json()` method of the form + `ValueType from_json(const basic_json&)` + + @note If @ref json_serializer has both overloads of + `from_json()`, this one is chosen. + + @tparam ValueType the returned value type + + @return copy of the JSON value, converted to @a ValueType + + @throw what @ref json_serializer `from_json()` method throws + + @since version 2.1.0 + */ + template < typename ValueType, + detail::enable_if_t < + detail::has_non_default_from_json::value, + int > = 0 > + ValueType get_impl(detail::priority_tag<1> /*unused*/) const noexcept(noexcept( + JSONSerializer::from_json(std::declval()))) + { + return JSONSerializer::from_json(*this); + } + + /*! + @brief get special-case overload + + This overloads converts the current @ref basic_json in a different + @ref basic_json type + + @tparam BasicJsonType == @ref basic_json + + @return a copy of *this, converted into @a BasicJsonType + + @complexity Depending on the implementation of the called `from_json()` + method. + + @since version 3.2.0 + */ + template < typename BasicJsonType, + detail::enable_if_t < + detail::is_basic_json::value, + int > = 0 > + BasicJsonType get_impl(detail::priority_tag<2> /*unused*/) const + { + return *this; + } + + /*! + @brief get special-case overload + + This overloads avoids a lot of template boilerplate, it can be seen as the + identity method + + @tparam BasicJsonType == @ref basic_json + + @return a copy of *this + + @complexity Constant. + + @since version 2.1.0 + */ + template::value, + int> = 0> + basic_json get_impl(detail::priority_tag<3> /*unused*/) const + { + return *this; + } + + /*! + @brief get a pointer value (explicit) + @copydoc get() + */ + template::value, + int> = 0> + constexpr auto get_impl(detail::priority_tag<4> /*unused*/) const noexcept + -> decltype(std::declval().template get_ptr()) + { + // delegate the call to get_ptr + return get_ptr(); + } + + public: + /*! + @brief get a (pointer) value (explicit) + + Performs explicit type conversion between the JSON value and a compatible value if required. + + - If the requested type is a pointer to the internally stored JSON value that pointer is returned. + No copies are made. + + - If the requested type is the current @ref basic_json, or a different @ref basic_json convertible + from the current @ref basic_json. + + - Otherwise the value is converted by calling the @ref json_serializer `from_json()` + method. + + @tparam ValueTypeCV the provided value type + @tparam ValueType the returned value type + + @return copy of the JSON value, converted to @tparam ValueType if necessary + + @throw what @ref json_serializer `from_json()` method throws if conversion is required + + @since version 2.1.0 + */ + template < typename ValueTypeCV, typename ValueType = detail::uncvref_t> +#if defined(JSON_HAS_CPP_14) + constexpr +#endif + auto get() const noexcept( + noexcept(std::declval().template get_impl(detail::priority_tag<4> {}))) + -> decltype(std::declval().template get_impl(detail::priority_tag<4> {})) + { + // we cannot static_assert on ValueTypeCV being non-const, because + // there is support for get(), which is why we + // still need the uncvref + static_assert(!std::is_reference::value, + "get() cannot be used with reference types, you might want to use get_ref()"); + return get_impl(detail::priority_tag<4> {}); + } + + /*! + @brief get a pointer value (explicit) + + Explicit pointer access to the internally stored JSON value. No copies are + made. + + @warning The pointer becomes invalid if the underlying JSON object + changes. + + @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref + object_t, @ref string_t, @ref boolean_t, @ref number_integer_t, + @ref number_unsigned_t, or @ref number_float_t. + + @return pointer to the internally stored JSON value if the requested + pointer type @a PointerType fits to the JSON value; `nullptr` otherwise + + @complexity Constant. + + @liveexample{The example below shows how pointers to internal values of a + JSON value can be requested. Note that no type conversions are made and a + `nullptr` is returned if the value and the requested pointer type does not + match.,get__PointerType} + + @sa see @ref get_ptr() for explicit pointer-member access + + @since version 1.0.0 + */ + template::value, int>::type = 0> + auto get() noexcept -> decltype(std::declval().template get_ptr()) + { + // delegate the call to get_ptr + return get_ptr(); + } + + /*! + @brief get a value (explicit) + + Explicit type conversion between the JSON value and a compatible value. + The value is filled into the input parameter by calling the @ref json_serializer + `from_json()` method. + + The function is equivalent to executing + @code {.cpp} + ValueType v; + JSONSerializer::from_json(*this, v); + @endcode + + This overloads is chosen if: + - @a ValueType is not @ref basic_json, + - @ref json_serializer has a `from_json()` method of the form + `void from_json(const basic_json&, ValueType&)`, and + + @tparam ValueType the input parameter type. + + @return the input parameter, allowing chaining calls. + + @throw what @ref json_serializer `from_json()` method throws + + @liveexample{The example below shows several conversions from JSON values + to other types. There a few things to note: (1) Floating-point numbers can + be converted to integers\, (2) A JSON array can be converted to a standard + `std::vector`\, (3) A JSON object can be converted to C++ + associative containers such as `std::unordered_map`.,get_to} + + @since version 3.3.0 + */ + template < typename ValueType, + detail::enable_if_t < + !detail::is_basic_json::value&& + detail::has_from_json::value, + int > = 0 > + ValueType & get_to(ValueType& v) const noexcept(noexcept( + JSONSerializer::from_json(std::declval(), v))) + { + JSONSerializer::from_json(*this, v); + return v; + } + + // specialization to allow to call get_to with a basic_json value + // see https://github.com/nlohmann/json/issues/2175 + template::value, + int> = 0> + ValueType & get_to(ValueType& v) const + { + v = *this; + return v; + } + + template < + typename T, std::size_t N, + typename Array = T (&)[N], // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) + detail::enable_if_t < + detail::has_from_json::value, int > = 0 > + Array get_to(T (&v)[N]) const // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays) + noexcept(noexcept(JSONSerializer::from_json( + std::declval(), v))) + { + JSONSerializer::from_json(*this, v); + return v; + } + + /*! + @brief get a reference value (implicit) + + Implicit reference access to the internally stored JSON value. No copies + are made. + + @warning Writing data to the referee of the result yields an undefined + state. + + @tparam ReferenceType reference type; must be a reference to @ref array_t, + @ref object_t, @ref string_t, @ref boolean_t, @ref number_integer_t, or + @ref number_float_t. Enforced by static assertion. + + @return reference to the internally stored JSON value if the requested + reference type @a ReferenceType fits to the JSON value; throws + type_error.303 otherwise + + @throw type_error.303 in case passed type @a ReferenceType is incompatible + with the stored JSON value; see example below + + @complexity Constant. + + @liveexample{The example shows several calls to `get_ref()`.,get_ref} + + @since version 1.1.0 + */ + template::value, int>::type = 0> + ReferenceType get_ref() + { + // delegate call to get_ref_impl + return get_ref_impl(*this); + } + + /*! + @brief get a reference value (implicit) + @copydoc get_ref() + */ + template < typename ReferenceType, typename std::enable_if < + std::is_reference::value&& + std::is_const::type>::value, int >::type = 0 > + ReferenceType get_ref() const + { + // delegate call to get_ref_impl + return get_ref_impl(*this); + } + + /*! + @brief get a value (implicit) + + Implicit type conversion between the JSON value and a compatible value. + The call is realized by calling @ref get() const. + + @tparam ValueType non-pointer type compatible to the JSON value, for + instance `int` for JSON integer numbers, `bool` for JSON booleans, or + `std::vector` types for JSON arrays. The character type of @ref string_t + as well as an initializer list of this type is excluded to avoid + ambiguities as these types implicitly convert to `std::string`. + + @return copy of the JSON value, converted to type @a ValueType + + @throw type_error.302 in case passed type @a ValueType is incompatible + to the JSON value type (e.g., the JSON value is of type boolean, but a + string is requested); see example below + + @complexity Linear in the size of the JSON value. + + @liveexample{The example below shows several conversions from JSON values + to other types. There a few things to note: (1) Floating-point numbers can + be converted to integers\, (2) A JSON array can be converted to a standard + `std::vector`\, (3) A JSON object can be converted to C++ + associative containers such as `std::unordered_map`.,operator__ValueType} + + @since version 1.0.0 + */ + template < typename ValueType, typename std::enable_if < + detail::conjunction < + detail::negation>, + detail::negation>>, + detail::negation>, + detail::negation>, + detail::negation>>, + +#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1910 && _MSC_VER <= 1914)) + detail::negation>, +#endif + detail::is_detected_lazy + >::value, int >::type = 0 > + JSON_EXPLICIT operator ValueType() const + { + // delegate the call to get<>() const + return get(); + } + + /*! + @return reference to the binary value + + @throw type_error.302 if the value is not binary + + @sa see @ref is_binary() to check if the value is binary + + @since version 3.8.0 + */ + binary_t& get_binary() + { + if (!is_binary()) + { + JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(type_name()), *this)); + } + + return *get_ptr(); + } + + /// @copydoc get_binary() + const binary_t& get_binary() const + { + if (!is_binary()) + { + JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(type_name()), *this)); + } + + return *get_ptr(); + } + + /// @} + + + //////////////////// + // element access // + //////////////////// + + /// @name element access + /// Access to the JSON value. + /// @{ + + /*! + @brief access specified array element with bounds checking + + Returns a reference to the element at specified location @a idx, with + bounds checking. + + @param[in] idx index of the element to access + + @return reference to the element at index @a idx + + @throw type_error.304 if the JSON value is not an array; in this case, + calling `at` with an index makes no sense. See example below. + @throw out_of_range.401 if the index @a idx is out of range of the array; + that is, `idx >= size()`. See example below. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes in the JSON value. + + @complexity Constant. + + @since version 1.0.0 + + @liveexample{The example below shows how array elements can be read and + written using `at()`. It also demonstrates the different exceptions that + can be thrown.,at__size_type} + */ + reference at(size_type idx) + { + // at only works for arrays + if (JSON_HEDLEY_LIKELY(is_array())) + { + JSON_TRY + { + return set_parent(m_value.array->at(idx)); + } + JSON_CATCH (std::out_of_range&) + { + // create better exception explanation + JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", *this)); + } + } + else + { + JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this)); + } + } + + /*! + @brief access specified array element with bounds checking + + Returns a const reference to the element at specified location @a idx, + with bounds checking. + + @param[in] idx index of the element to access + + @return const reference to the element at index @a idx + + @throw type_error.304 if the JSON value is not an array; in this case, + calling `at` with an index makes no sense. See example below. + @throw out_of_range.401 if the index @a idx is out of range of the array; + that is, `idx >= size()`. See example below. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes in the JSON value. + + @complexity Constant. + + @since version 1.0.0 + + @liveexample{The example below shows how array elements can be read using + `at()`. It also demonstrates the different exceptions that can be thrown., + at__size_type_const} + */ + const_reference at(size_type idx) const + { + // at only works for arrays + if (JSON_HEDLEY_LIKELY(is_array())) + { + JSON_TRY + { + return m_value.array->at(idx); + } + JSON_CATCH (std::out_of_range&) + { + // create better exception explanation + JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", *this)); + } + } + else + { + JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this)); + } + } + + /*! + @brief access specified object element with bounds checking + + Returns a reference to the element at with specified key @a key, with + bounds checking. + + @param[in] key key of the element to access + + @return reference to the element at key @a key + + @throw type_error.304 if the JSON value is not an object; in this case, + calling `at` with a key makes no sense. See example below. + @throw out_of_range.403 if the key @a key is is not stored in the object; + that is, `find(key) == end()`. See example below. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes in the JSON value. + + @complexity Logarithmic in the size of the container. + + @sa see @ref operator[](const typename object_t::key_type&) for unchecked + access by reference + @sa see @ref value() for access by value with a default value + + @since version 1.0.0 + + @liveexample{The example below shows how object elements can be read and + written using `at()`. It also demonstrates the different exceptions that + can be thrown.,at__object_t_key_type} + */ + reference at(const typename object_t::key_type& key) + { + // at only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + JSON_TRY + { + return set_parent(m_value.object->at(key)); + } + JSON_CATCH (std::out_of_range&) + { + // create better exception explanation + JSON_THROW(out_of_range::create(403, "key '" + key + "' not found", *this)); + } + } + else + { + JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this)); + } + } + + /*! + @brief access specified object element with bounds checking + + Returns a const reference to the element at with specified key @a key, + with bounds checking. + + @param[in] key key of the element to access + + @return const reference to the element at key @a key + + @throw type_error.304 if the JSON value is not an object; in this case, + calling `at` with a key makes no sense. See example below. + @throw out_of_range.403 if the key @a key is is not stored in the object; + that is, `find(key) == end()`. See example below. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes in the JSON value. + + @complexity Logarithmic in the size of the container. + + @sa see @ref operator[](const typename object_t::key_type&) for unchecked + access by reference + @sa see @ref value() for access by value with a default value + + @since version 1.0.0 + + @liveexample{The example below shows how object elements can be read using + `at()`. It also demonstrates the different exceptions that can be thrown., + at__object_t_key_type_const} + */ + const_reference at(const typename object_t::key_type& key) const + { + // at only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + JSON_TRY + { + return m_value.object->at(key); + } + JSON_CATCH (std::out_of_range&) + { + // create better exception explanation + JSON_THROW(out_of_range::create(403, "key '" + key + "' not found", *this)); + } + } + else + { + JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this)); + } + } + + /*! + @brief access specified array element + + Returns a reference to the element at specified location @a idx. + + @note If @a idx is beyond the range of the array (i.e., `idx >= size()`), + then the array is silently filled up with `null` values to make `idx` a + valid reference to the last stored element. + + @param[in] idx index of the element to access + + @return reference to the element at index @a idx + + @throw type_error.305 if the JSON value is not an array or null; in that + cases, using the [] operator with an index makes no sense. + + @complexity Constant if @a idx is in the range of the array. Otherwise + linear in `idx - size()`. + + @liveexample{The example below shows how array elements can be read and + written using `[]` operator. Note the addition of `null` + values.,operatorarray__size_type} + + @since version 1.0.0 + */ + reference operator[](size_type idx) + { + // implicitly convert null value to an empty array + if (is_null()) + { + m_type = value_t::array; + m_value.array = create(); + assert_invariant(); + } + + // operator[] only works for arrays + if (JSON_HEDLEY_LIKELY(is_array())) + { + // fill up array with null values if given idx is outside range + if (idx >= m_value.array->size()) + { +#if JSON_DIAGNOSTICS + // remember array size & capacity before resizing + const auto old_size = m_value.array->size(); + const auto old_capacity = m_value.array->capacity(); +#endif + m_value.array->resize(idx + 1); + +#if JSON_DIAGNOSTICS + if (JSON_HEDLEY_UNLIKELY(m_value.array->capacity() != old_capacity)) + { + // capacity has changed: update all parents + set_parents(); + } + else + { + // set parent for values added above + set_parents(begin() + static_cast(old_size), static_cast(idx + 1 - old_size)); + } +#endif + assert_invariant(); + } + + return m_value.array->operator[](idx); + } + + JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name()), *this)); + } + + /*! + @brief access specified array element + + Returns a const reference to the element at specified location @a idx. + + @param[in] idx index of the element to access + + @return const reference to the element at index @a idx + + @throw type_error.305 if the JSON value is not an array; in that case, + using the [] operator with an index makes no sense. + + @complexity Constant. + + @liveexample{The example below shows how array elements can be read using + the `[]` operator.,operatorarray__size_type_const} + + @since version 1.0.0 + */ + const_reference operator[](size_type idx) const + { + // const operator[] only works for arrays + if (JSON_HEDLEY_LIKELY(is_array())) + { + return m_value.array->operator[](idx); + } + + JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name()), *this)); + } + + /*! + @brief access specified object element + + Returns a reference to the element at with specified key @a key. + + @note If @a key is not found in the object, then it is silently added to + the object and filled with a `null` value to make `key` a valid reference. + In case the value was `null` before, it is converted to an object. + + @param[in] key key of the element to access + + @return reference to the element at key @a key + + @throw type_error.305 if the JSON value is not an object or null; in that + cases, using the [] operator with a key makes no sense. + + @complexity Logarithmic in the size of the container. + + @liveexample{The example below shows how object elements can be read and + written using the `[]` operator.,operatorarray__key_type} + + @sa see @ref at(const typename object_t::key_type&) for access by reference + with range checking + @sa see @ref value() for access by value with a default value + + @since version 1.0.0 + */ + reference operator[](const typename object_t::key_type& key) + { + // implicitly convert null value to an empty object + if (is_null()) + { + m_type = value_t::object; + m_value.object = create(); + assert_invariant(); + } + + // operator[] only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + return set_parent(m_value.object->operator[](key)); + } + + JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this)); + } + + /*! + @brief read-only access specified object element + + Returns a const reference to the element at with specified key @a key. No + bounds checking is performed. + + @warning If the element with key @a key does not exist, the behavior is + undefined. + + @param[in] key key of the element to access + + @return const reference to the element at key @a key + + @pre The element with key @a key must exist. **This precondition is + enforced with an assertion.** + + @throw type_error.305 if the JSON value is not an object; in that case, + using the [] operator with a key makes no sense. + + @complexity Logarithmic in the size of the container. + + @liveexample{The example below shows how object elements can be read using + the `[]` operator.,operatorarray__key_type_const} + + @sa see @ref at(const typename object_t::key_type&) for access by reference + with range checking + @sa see @ref value() for access by value with a default value + + @since version 1.0.0 + */ + const_reference operator[](const typename object_t::key_type& key) const + { + // const operator[] only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + JSON_ASSERT(m_value.object->find(key) != m_value.object->end()); + return m_value.object->find(key)->second; + } + + JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this)); + } + + /*! + @brief access specified object element + + Returns a reference to the element at with specified key @a key. + + @note If @a key is not found in the object, then it is silently added to + the object and filled with a `null` value to make `key` a valid reference. + In case the value was `null` before, it is converted to an object. + + @param[in] key key of the element to access + + @return reference to the element at key @a key + + @throw type_error.305 if the JSON value is not an object or null; in that + cases, using the [] operator with a key makes no sense. + + @complexity Logarithmic in the size of the container. + + @liveexample{The example below shows how object elements can be read and + written using the `[]` operator.,operatorarray__key_type} + + @sa see @ref at(const typename object_t::key_type&) for access by reference + with range checking + @sa see @ref value() for access by value with a default value + + @since version 1.1.0 + */ + template + JSON_HEDLEY_NON_NULL(2) + reference operator[](T* key) + { + // implicitly convert null to object + if (is_null()) + { + m_type = value_t::object; + m_value = value_t::object; + assert_invariant(); + } + + // at only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + return set_parent(m_value.object->operator[](key)); + } + + JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this)); + } + + /*! + @brief read-only access specified object element + + Returns a const reference to the element at with specified key @a key. No + bounds checking is performed. + + @warning If the element with key @a key does not exist, the behavior is + undefined. + + @param[in] key key of the element to access + + @return const reference to the element at key @a key + + @pre The element with key @a key must exist. **This precondition is + enforced with an assertion.** + + @throw type_error.305 if the JSON value is not an object; in that case, + using the [] operator with a key makes no sense. + + @complexity Logarithmic in the size of the container. + + @liveexample{The example below shows how object elements can be read using + the `[]` operator.,operatorarray__key_type_const} + + @sa see @ref at(const typename object_t::key_type&) for access by reference + with range checking + @sa see @ref value() for access by value with a default value + + @since version 1.1.0 + */ + template + JSON_HEDLEY_NON_NULL(2) + const_reference operator[](T* key) const + { + // at only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + JSON_ASSERT(m_value.object->find(key) != m_value.object->end()); + return m_value.object->find(key)->second; + } + + JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this)); + } + + /*! + @brief access specified object element with default value + + Returns either a copy of an object's element at the specified key @a key + or a given default value if no element with key @a key exists. + + The function is basically equivalent to executing + @code {.cpp} + try { + return at(key); + } catch(out_of_range) { + return default_value; + } + @endcode + + @note Unlike @ref at(const typename object_t::key_type&), this function + does not throw if the given key @a key was not found. + + @note Unlike @ref operator[](const typename object_t::key_type& key), this + function does not implicitly add an element to the position defined by @a + key. This function is furthermore also applicable to const objects. + + @param[in] key key of the element to access + @param[in] default_value the value to return if @a key is not found + + @tparam ValueType type compatible to JSON values, for instance `int` for + JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for + JSON arrays. Note the type of the expected value at @a key and the default + value @a default_value must be compatible. + + @return copy of the element at key @a key or @a default_value if @a key + is not found + + @throw type_error.302 if @a default_value does not match the type of the + value at @a key + @throw type_error.306 if the JSON value is not an object; in that case, + using `value()` with a key makes no sense. + + @complexity Logarithmic in the size of the container. + + @liveexample{The example below shows how object elements can be queried + with a default value.,basic_json__value} + + @sa see @ref at(const typename object_t::key_type&) for access by reference + with range checking + @sa see @ref operator[](const typename object_t::key_type&) for unchecked + access by reference + + @since version 1.0.0 + */ + // using std::is_convertible in a std::enable_if will fail when using explicit conversions + template < class ValueType, typename std::enable_if < + detail::is_getable::value + && !std::is_same::value, int >::type = 0 > + ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const + { + // at only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + // if key is found, return value and given default value otherwise + const auto it = find(key); + if (it != end()) + { + return it->template get(); + } + + return default_value; + } + + JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name()), *this)); + } + + /*! + @brief overload for a default value of type const char* + @copydoc basic_json::value(const typename object_t::key_type&, const ValueType&) const + */ + string_t value(const typename object_t::key_type& key, const char* default_value) const + { + return value(key, string_t(default_value)); + } + + /*! + @brief access specified object element via JSON Pointer with default value + + Returns either a copy of an object's element at the specified key @a key + or a given default value if no element with key @a key exists. + + The function is basically equivalent to executing + @code {.cpp} + try { + return at(ptr); + } catch(out_of_range) { + return default_value; + } + @endcode + + @note Unlike @ref at(const json_pointer&), this function does not throw + if the given key @a key was not found. + + @param[in] ptr a JSON pointer to the element to access + @param[in] default_value the value to return if @a ptr found no value + + @tparam ValueType type compatible to JSON values, for instance `int` for + JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for + JSON arrays. Note the type of the expected value at @a key and the default + value @a default_value must be compatible. + + @return copy of the element at key @a key or @a default_value if @a key + is not found + + @throw type_error.302 if @a default_value does not match the type of the + value at @a ptr + @throw type_error.306 if the JSON value is not an object; in that case, + using `value()` with a key makes no sense. + + @complexity Logarithmic in the size of the container. + + @liveexample{The example below shows how object elements can be queried + with a default value.,basic_json__value_ptr} + + @sa see @ref operator[](const json_pointer&) for unchecked access by reference + + @since version 2.0.2 + */ + template::value, int>::type = 0> + ValueType value(const json_pointer& ptr, const ValueType& default_value) const + { + // at only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + // if pointer resolves a value, return it or use default value + JSON_TRY + { + return ptr.get_checked(this).template get(); + } + JSON_INTERNAL_CATCH (out_of_range&) + { + return default_value; + } + } + + JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name()), *this)); + } + + /*! + @brief overload for a default value of type const char* + @copydoc basic_json::value(const json_pointer&, ValueType) const + */ + JSON_HEDLEY_NON_NULL(3) + string_t value(const json_pointer& ptr, const char* default_value) const + { + return value(ptr, string_t(default_value)); + } + + /*! + @brief access the first element + + Returns a reference to the first element in the container. For a JSON + container `c`, the expression `c.front()` is equivalent to `*c.begin()`. + + @return In case of a structured type (array or object), a reference to the + first element is returned. In case of number, string, boolean, or binary + values, a reference to the value is returned. + + @complexity Constant. + + @pre The JSON value must not be `null` (would throw `std::out_of_range`) + or an empty array or object (undefined behavior, **guarded by + assertions**). + @post The JSON value remains unchanged. + + @throw invalid_iterator.214 when called on `null` value + + @liveexample{The following code shows an example for `front()`.,front} + + @sa see @ref back() -- access the last element + + @since version 1.0.0 + */ + reference front() + { + return *begin(); + } + + /*! + @copydoc basic_json::front() + */ + const_reference front() const + { + return *cbegin(); + } + + /*! + @brief access the last element + + Returns a reference to the last element in the container. For a JSON + container `c`, the expression `c.back()` is equivalent to + @code {.cpp} + auto tmp = c.end(); + --tmp; + return *tmp; + @endcode + + @return In case of a structured type (array or object), a reference to the + last element is returned. In case of number, string, boolean, or binary + values, a reference to the value is returned. + + @complexity Constant. + + @pre The JSON value must not be `null` (would throw `std::out_of_range`) + or an empty array or object (undefined behavior, **guarded by + assertions**). + @post The JSON value remains unchanged. + + @throw invalid_iterator.214 when called on a `null` value. See example + below. + + @liveexample{The following code shows an example for `back()`.,back} + + @sa see @ref front() -- access the first element + + @since version 1.0.0 + */ + reference back() + { + auto tmp = end(); + --tmp; + return *tmp; + } + + /*! + @copydoc basic_json::back() + */ + const_reference back() const + { + auto tmp = cend(); + --tmp; + return *tmp; + } + + /*! + @brief remove element given an iterator + + Removes the element specified by iterator @a pos. The iterator @a pos must + be valid and dereferenceable. Thus the `end()` iterator (which is valid, + but is not dereferenceable) cannot be used as a value for @a pos. + + If called on a primitive type other than `null`, the resulting JSON value + will be `null`. + + @param[in] pos iterator to the element to remove + @return Iterator following the last removed element. If the iterator @a + pos refers to the last element, the `end()` iterator is returned. + + @tparam IteratorType an @ref iterator or @ref const_iterator + + @post Invalidates iterators and references at or after the point of the + erase, including the `end()` iterator. + + @throw type_error.307 if called on a `null` value; example: `"cannot use + erase() with null"` + @throw invalid_iterator.202 if called on an iterator which does not belong + to the current JSON value; example: `"iterator does not fit current + value"` + @throw invalid_iterator.205 if called on a primitive type with invalid + iterator (i.e., any iterator which is not `begin()`); example: `"iterator + out of range"` + + @complexity The complexity depends on the type: + - objects: amortized constant + - arrays: linear in distance between @a pos and the end of the container + - strings and binary: linear in the length of the member + - other types: constant + + @liveexample{The example shows the result of `erase()` for different JSON + types.,erase__IteratorType} + + @sa see @ref erase(IteratorType, IteratorType) -- removes the elements in + the given range + @sa see @ref erase(const typename object_t::key_type&) -- removes the element + from an object at the given key + @sa see @ref erase(const size_type) -- removes the element from an array at + the given index + + @since version 1.0.0 + */ + template < class IteratorType, typename std::enable_if < + std::is_same::value || + std::is_same::value, int >::type + = 0 > + IteratorType erase(IteratorType pos) + { + // make sure iterator fits the current value + if (JSON_HEDLEY_UNLIKELY(this != pos.m_object)) + { + JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this)); + } + + IteratorType result = end(); + + switch (m_type) + { + case value_t::boolean: + case value_t::number_float: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::string: + case value_t::binary: + { + if (JSON_HEDLEY_UNLIKELY(!pos.m_it.primitive_iterator.is_begin())) + { + JSON_THROW(invalid_iterator::create(205, "iterator out of range", *this)); + } + + if (is_string()) + { + AllocatorType alloc; + std::allocator_traits::destroy(alloc, m_value.string); + std::allocator_traits::deallocate(alloc, m_value.string, 1); + m_value.string = nullptr; + } + else if (is_binary()) + { + AllocatorType alloc; + std::allocator_traits::destroy(alloc, m_value.binary); + std::allocator_traits::deallocate(alloc, m_value.binary, 1); + m_value.binary = nullptr; + } + + m_type = value_t::null; + assert_invariant(); + break; + } + + case value_t::object: + { + result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator); + break; + } + + case value_t::array: + { + result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator); + break; + } + + case value_t::null: + case value_t::discarded: + default: + JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this)); + } + + return result; + } + + /*! + @brief remove elements given an iterator range + + Removes the element specified by the range `[first; last)`. The iterator + @a first does not need to be dereferenceable if `first == last`: erasing + an empty range is a no-op. + + If called on a primitive type other than `null`, the resulting JSON value + will be `null`. + + @param[in] first iterator to the beginning of the range to remove + @param[in] last iterator past the end of the range to remove + @return Iterator following the last removed element. If the iterator @a + second refers to the last element, the `end()` iterator is returned. + + @tparam IteratorType an @ref iterator or @ref const_iterator + + @post Invalidates iterators and references at or after the point of the + erase, including the `end()` iterator. + + @throw type_error.307 if called on a `null` value; example: `"cannot use + erase() with null"` + @throw invalid_iterator.203 if called on iterators which does not belong + to the current JSON value; example: `"iterators do not fit current value"` + @throw invalid_iterator.204 if called on a primitive type with invalid + iterators (i.e., if `first != begin()` and `last != end()`); example: + `"iterators out of range"` + + @complexity The complexity depends on the type: + - objects: `log(size()) + std::distance(first, last)` + - arrays: linear in the distance between @a first and @a last, plus linear + in the distance between @a last and end of the container + - strings and binary: linear in the length of the member + - other types: constant + + @liveexample{The example shows the result of `erase()` for different JSON + types.,erase__IteratorType_IteratorType} + + @sa see @ref erase(IteratorType) -- removes the element at a given position + @sa see @ref erase(const typename object_t::key_type&) -- removes the element + from an object at the given key + @sa see @ref erase(const size_type) -- removes the element from an array at + the given index + + @since version 1.0.0 + */ + template < class IteratorType, typename std::enable_if < + std::is_same::value || + std::is_same::value, int >::type + = 0 > + IteratorType erase(IteratorType first, IteratorType last) + { + // make sure iterator fits the current value + if (JSON_HEDLEY_UNLIKELY(this != first.m_object || this != last.m_object)) + { + JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value", *this)); + } + + IteratorType result = end(); + + switch (m_type) + { + case value_t::boolean: + case value_t::number_float: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::string: + case value_t::binary: + { + if (JSON_HEDLEY_LIKELY(!first.m_it.primitive_iterator.is_begin() + || !last.m_it.primitive_iterator.is_end())) + { + JSON_THROW(invalid_iterator::create(204, "iterators out of range", *this)); + } + + if (is_string()) + { + AllocatorType alloc; + std::allocator_traits::destroy(alloc, m_value.string); + std::allocator_traits::deallocate(alloc, m_value.string, 1); + m_value.string = nullptr; + } + else if (is_binary()) + { + AllocatorType alloc; + std::allocator_traits::destroy(alloc, m_value.binary); + std::allocator_traits::deallocate(alloc, m_value.binary, 1); + m_value.binary = nullptr; + } + + m_type = value_t::null; + assert_invariant(); + break; + } + + case value_t::object: + { + result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator, + last.m_it.object_iterator); + break; + } + + case value_t::array: + { + result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator, + last.m_it.array_iterator); + break; + } + + case value_t::null: + case value_t::discarded: + default: + JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this)); + } + + return result; + } + + /*! + @brief remove element from a JSON object given a key + + Removes elements from a JSON object with the key value @a key. + + @param[in] key value of the elements to remove + + @return Number of elements removed. If @a ObjectType is the default + `std::map` type, the return value will always be `0` (@a key was not + found) or `1` (@a key was found). + + @post References and iterators to the erased elements are invalidated. + Other references and iterators are not affected. + + @throw type_error.307 when called on a type other than JSON object; + example: `"cannot use erase() with null"` + + @complexity `log(size()) + count(key)` + + @liveexample{The example shows the effect of `erase()`.,erase__key_type} + + @sa see @ref erase(IteratorType) -- removes the element at a given position + @sa see @ref erase(IteratorType, IteratorType) -- removes the elements in + the given range + @sa see @ref erase(const size_type) -- removes the element from an array at + the given index + + @since version 1.0.0 + */ + size_type erase(const typename object_t::key_type& key) + { + // this erase only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + return m_value.object->erase(key); + } + + JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this)); + } + + /*! + @brief remove element from a JSON array given an index + + Removes element from a JSON array at the index @a idx. + + @param[in] idx index of the element to remove + + @throw type_error.307 when called on a type other than JSON object; + example: `"cannot use erase() with null"` + @throw out_of_range.401 when `idx >= size()`; example: `"array index 17 + is out of range"` + + @complexity Linear in distance between @a idx and the end of the container. + + @liveexample{The example shows the effect of `erase()`.,erase__size_type} + + @sa see @ref erase(IteratorType) -- removes the element at a given position + @sa see @ref erase(IteratorType, IteratorType) -- removes the elements in + the given range + @sa see @ref erase(const typename object_t::key_type&) -- removes the element + from an object at the given key + + @since version 1.0.0 + */ + void erase(const size_type idx) + { + // this erase only works for arrays + if (JSON_HEDLEY_LIKELY(is_array())) + { + if (JSON_HEDLEY_UNLIKELY(idx >= size())) + { + JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", *this)); + } + + m_value.array->erase(m_value.array->begin() + static_cast(idx)); + } + else + { + JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this)); + } + } + + /// @} + + + //////////// + // lookup // + //////////// + + /// @name lookup + /// @{ + + /*! + @brief find an element in a JSON object + + Finds an element in a JSON object with key equivalent to @a key. If the + element is not found or the JSON value is not an object, end() is + returned. + + @note This method always returns @ref end() when executed on a JSON type + that is not an object. + + @param[in] key key value of the element to search for. + + @return Iterator to an element with key equivalent to @a key. If no such + element is found or the JSON value is not an object, past-the-end (see + @ref end()) iterator is returned. + + @complexity Logarithmic in the size of the JSON object. + + @liveexample{The example shows how `find()` is used.,find__key_type} + + @sa see @ref contains(KeyT&&) const -- checks whether a key exists + + @since version 1.0.0 + */ + template + iterator find(KeyT&& key) + { + auto result = end(); + + if (is_object()) + { + result.m_it.object_iterator = m_value.object->find(std::forward(key)); + } + + return result; + } + + /*! + @brief find an element in a JSON object + @copydoc find(KeyT&&) + */ + template + const_iterator find(KeyT&& key) const + { + auto result = cend(); + + if (is_object()) + { + result.m_it.object_iterator = m_value.object->find(std::forward(key)); + } + + return result; + } + + /*! + @brief returns the number of occurrences of a key in a JSON object + + Returns the number of elements with key @a key. If ObjectType is the + default `std::map` type, the return value will always be `0` (@a key was + not found) or `1` (@a key was found). + + @note This method always returns `0` when executed on a JSON type that is + not an object. + + @param[in] key key value of the element to count + + @return Number of elements with key @a key. If the JSON value is not an + object, the return value will be `0`. + + @complexity Logarithmic in the size of the JSON object. + + @liveexample{The example shows how `count()` is used.,count} + + @since version 1.0.0 + */ + template + size_type count(KeyT&& key) const + { + // return 0 for all nonobject types + return is_object() ? m_value.object->count(std::forward(key)) : 0; + } + + /*! + @brief check the existence of an element in a JSON object + + Check whether an element exists in a JSON object with key equivalent to + @a key. If the element is not found or the JSON value is not an object, + false is returned. + + @note This method always returns false when executed on a JSON type + that is not an object. + + @param[in] key key value to check its existence. + + @return true if an element with specified @a key exists. If no such + element with such key is found or the JSON value is not an object, + false is returned. + + @complexity Logarithmic in the size of the JSON object. + + @liveexample{The following code shows an example for `contains()`.,contains} + + @sa see @ref find(KeyT&&) -- returns an iterator to an object element + @sa see @ref contains(const json_pointer&) const -- checks the existence for a JSON pointer + + @since version 3.6.0 + */ + template < typename KeyT, typename std::enable_if < + !std::is_same::type, json_pointer>::value, int >::type = 0 > + bool contains(KeyT && key) const + { + return is_object() && m_value.object->find(std::forward(key)) != m_value.object->end(); + } + + /*! + @brief check the existence of an element in a JSON object given a JSON pointer + + Check whether the given JSON pointer @a ptr can be resolved in the current + JSON value. + + @note This method can be executed on any JSON value type. + + @param[in] ptr JSON pointer to check its existence. + + @return true if the JSON pointer can be resolved to a stored value, false + otherwise. + + @post If `j.contains(ptr)` returns true, it is safe to call `j[ptr]`. + + @throw parse_error.106 if an array index begins with '0' + @throw parse_error.109 if an array index was not a number + + @complexity Logarithmic in the size of the JSON object. + + @liveexample{The following code shows an example for `contains()`.,contains_json_pointer} + + @sa see @ref contains(KeyT &&) const -- checks the existence of a key + + @since version 3.7.0 + */ + bool contains(const json_pointer& ptr) const + { + return ptr.contains(this); + } + + /// @} + + + /////////////// + // iterators // + /////////////// + + /// @name iterators + /// @{ + + /*! + @brief returns an iterator to the first element + + Returns an iterator to the first element. + + @image html range-begin-end.svg "Illustration from cppreference.com" + + @return iterator to the first element + + @complexity Constant. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is constant. + + @liveexample{The following code shows an example for `begin()`.,begin} + + @sa see @ref cbegin() -- returns a const iterator to the beginning + @sa see @ref end() -- returns an iterator to the end + @sa see @ref cend() -- returns a const iterator to the end + + @since version 1.0.0 + */ + iterator begin() noexcept + { + iterator result(this); + result.set_begin(); + return result; + } + + /*! + @copydoc basic_json::cbegin() + */ + const_iterator begin() const noexcept + { + return cbegin(); + } + + /*! + @brief returns a const iterator to the first element + + Returns a const iterator to the first element. + + @image html range-begin-end.svg "Illustration from cppreference.com" + + @return const iterator to the first element + + @complexity Constant. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is constant. + - Has the semantics of `const_cast(*this).begin()`. + + @liveexample{The following code shows an example for `cbegin()`.,cbegin} + + @sa see @ref begin() -- returns an iterator to the beginning + @sa see @ref end() -- returns an iterator to the end + @sa see @ref cend() -- returns a const iterator to the end + + @since version 1.0.0 + */ + const_iterator cbegin() const noexcept + { + const_iterator result(this); + result.set_begin(); + return result; + } + + /*! + @brief returns an iterator to one past the last element + + Returns an iterator to one past the last element. + + @image html range-begin-end.svg "Illustration from cppreference.com" + + @return iterator one past the last element + + @complexity Constant. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is constant. + + @liveexample{The following code shows an example for `end()`.,end} + + @sa see @ref cend() -- returns a const iterator to the end + @sa see @ref begin() -- returns an iterator to the beginning + @sa see @ref cbegin() -- returns a const iterator to the beginning + + @since version 1.0.0 + */ + iterator end() noexcept + { + iterator result(this); + result.set_end(); + return result; + } + + /*! + @copydoc basic_json::cend() + */ + const_iterator end() const noexcept + { + return cend(); + } + + /*! + @brief returns a const iterator to one past the last element + + Returns a const iterator to one past the last element. + + @image html range-begin-end.svg "Illustration from cppreference.com" + + @return const iterator one past the last element + + @complexity Constant. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is constant. + - Has the semantics of `const_cast(*this).end()`. + + @liveexample{The following code shows an example for `cend()`.,cend} + + @sa see @ref end() -- returns an iterator to the end + @sa see @ref begin() -- returns an iterator to the beginning + @sa see @ref cbegin() -- returns a const iterator to the beginning + + @since version 1.0.0 + */ + const_iterator cend() const noexcept + { + const_iterator result(this); + result.set_end(); + return result; + } + + /*! + @brief returns an iterator to the reverse-beginning + + Returns an iterator to the reverse-beginning; that is, the last element. + + @image html range-rbegin-rend.svg "Illustration from cppreference.com" + + @complexity Constant. + + @requirement This function helps `basic_json` satisfying the + [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer) + requirements: + - The complexity is constant. + - Has the semantics of `reverse_iterator(end())`. + + @liveexample{The following code shows an example for `rbegin()`.,rbegin} + + @sa see @ref crbegin() -- returns a const reverse iterator to the beginning + @sa see @ref rend() -- returns a reverse iterator to the end + @sa see @ref crend() -- returns a const reverse iterator to the end + + @since version 1.0.0 + */ + reverse_iterator rbegin() noexcept + { + return reverse_iterator(end()); + } + + /*! + @copydoc basic_json::crbegin() + */ + const_reverse_iterator rbegin() const noexcept + { + return crbegin(); + } + + /*! + @brief returns an iterator to the reverse-end + + Returns an iterator to the reverse-end; that is, one before the first + element. + + @image html range-rbegin-rend.svg "Illustration from cppreference.com" + + @complexity Constant. + + @requirement This function helps `basic_json` satisfying the + [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer) + requirements: + - The complexity is constant. + - Has the semantics of `reverse_iterator(begin())`. + + @liveexample{The following code shows an example for `rend()`.,rend} + + @sa see @ref crend() -- returns a const reverse iterator to the end + @sa see @ref rbegin() -- returns a reverse iterator to the beginning + @sa see @ref crbegin() -- returns a const reverse iterator to the beginning + + @since version 1.0.0 + */ + reverse_iterator rend() noexcept + { + return reverse_iterator(begin()); + } + + /*! + @copydoc basic_json::crend() + */ + const_reverse_iterator rend() const noexcept + { + return crend(); + } + + /*! + @brief returns a const reverse iterator to the last element + + Returns a const iterator to the reverse-beginning; that is, the last + element. + + @image html range-rbegin-rend.svg "Illustration from cppreference.com" + + @complexity Constant. + + @requirement This function helps `basic_json` satisfying the + [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer) + requirements: + - The complexity is constant. + - Has the semantics of `const_cast(*this).rbegin()`. + + @liveexample{The following code shows an example for `crbegin()`.,crbegin} + + @sa see @ref rbegin() -- returns a reverse iterator to the beginning + @sa see @ref rend() -- returns a reverse iterator to the end + @sa see @ref crend() -- returns a const reverse iterator to the end + + @since version 1.0.0 + */ + const_reverse_iterator crbegin() const noexcept + { + return const_reverse_iterator(cend()); + } + + /*! + @brief returns a const reverse iterator to one before the first + + Returns a const reverse iterator to the reverse-end; that is, one before + the first element. + + @image html range-rbegin-rend.svg "Illustration from cppreference.com" + + @complexity Constant. + + @requirement This function helps `basic_json` satisfying the + [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer) + requirements: + - The complexity is constant. + - Has the semantics of `const_cast(*this).rend()`. + + @liveexample{The following code shows an example for `crend()`.,crend} + + @sa see @ref rend() -- returns a reverse iterator to the end + @sa see @ref rbegin() -- returns a reverse iterator to the beginning + @sa see @ref crbegin() -- returns a const reverse iterator to the beginning + + @since version 1.0.0 + */ + const_reverse_iterator crend() const noexcept + { + return const_reverse_iterator(cbegin()); + } + + public: + /*! + @brief wrapper to access iterator member functions in range-based for + + This function allows to access @ref iterator::key() and @ref + iterator::value() during range-based for loops. In these loops, a + reference to the JSON values is returned, so there is no access to the + underlying iterator. + + For loop without iterator_wrapper: + + @code{cpp} + for (auto it = j_object.begin(); it != j_object.end(); ++it) + { + std::cout << "key: " << it.key() << ", value:" << it.value() << '\n'; + } + @endcode + + Range-based for loop without iterator proxy: + + @code{cpp} + for (auto it : j_object) + { + // "it" is of type json::reference and has no key() member + std::cout << "value: " << it << '\n'; + } + @endcode + + Range-based for loop with iterator proxy: + + @code{cpp} + for (auto it : json::iterator_wrapper(j_object)) + { + std::cout << "key: " << it.key() << ", value:" << it.value() << '\n'; + } + @endcode + + @note When iterating over an array, `key()` will return the index of the + element as string (see example). + + @param[in] ref reference to a JSON value + @return iteration proxy object wrapping @a ref with an interface to use in + range-based for loops + + @liveexample{The following code shows how the wrapper is used,iterator_wrapper} + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes in the JSON value. + + @complexity Constant. + + @note The name of this function is not yet final and may change in the + future. + + @deprecated This stream operator is deprecated and will be removed in + future 4.0.0 of the library. Please use @ref items() instead; + that is, replace `json::iterator_wrapper(j)` with `j.items()`. + */ + JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items()) + static iteration_proxy iterator_wrapper(reference ref) noexcept + { + return ref.items(); + } + + /*! + @copydoc iterator_wrapper(reference) + */ + JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items()) + static iteration_proxy iterator_wrapper(const_reference ref) noexcept + { + return ref.items(); + } + + /*! + @brief helper to access iterator member functions in range-based for + + This function allows to access @ref iterator::key() and @ref + iterator::value() during range-based for loops. In these loops, a + reference to the JSON values is returned, so there is no access to the + underlying iterator. + + For loop without `items()` function: + + @code{cpp} + for (auto it = j_object.begin(); it != j_object.end(); ++it) + { + std::cout << "key: " << it.key() << ", value:" << it.value() << '\n'; + } + @endcode + + Range-based for loop without `items()` function: + + @code{cpp} + for (auto it : j_object) + { + // "it" is of type json::reference and has no key() member + std::cout << "value: " << it << '\n'; + } + @endcode + + Range-based for loop with `items()` function: + + @code{cpp} + for (auto& el : j_object.items()) + { + std::cout << "key: " << el.key() << ", value:" << el.value() << '\n'; + } + @endcode + + The `items()` function also allows to use + [structured bindings](https://en.cppreference.com/w/cpp/language/structured_binding) + (C++17): + + @code{cpp} + for (auto& [key, val] : j_object.items()) + { + std::cout << "key: " << key << ", value:" << val << '\n'; + } + @endcode + + @note When iterating over an array, `key()` will return the index of the + element as string (see example). For primitive types (e.g., numbers), + `key()` returns an empty string. + + @warning Using `items()` on temporary objects is dangerous. Make sure the + object's lifetime exeeds the iteration. See + for more + information. + + @return iteration proxy object wrapping @a ref with an interface to use in + range-based for loops + + @liveexample{The following code shows how the function is used.,items} + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes in the JSON value. + + @complexity Constant. + + @since version 3.1.0, structured bindings support since 3.5.0. + */ + iteration_proxy items() noexcept + { + return iteration_proxy(*this); + } + + /*! + @copydoc items() + */ + iteration_proxy items() const noexcept + { + return iteration_proxy(*this); + } + + /// @} + + + ////////////// + // capacity // + ////////////// + + /// @name capacity + /// @{ + + /*! + @brief checks whether the container is empty. + + Checks if a JSON value has no elements (i.e. whether its @ref size is `0`). + + @return The return value depends on the different types and is + defined as follows: + Value type | return value + ----------- | ------------- + null | `true` + boolean | `false` + string | `false` + number | `false` + binary | `false` + object | result of function `object_t::empty()` + array | result of function `array_t::empty()` + + @liveexample{The following code uses `empty()` to check if a JSON + object contains any elements.,empty} + + @complexity Constant, as long as @ref array_t and @ref object_t satisfy + the Container concept; that is, their `empty()` functions have constant + complexity. + + @iterators No changes. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @note This function does not return whether a string stored as JSON value + is empty - it returns whether the JSON container itself is empty which is + false in the case of a string. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is constant. + - Has the semantics of `begin() == end()`. + + @sa see @ref size() -- returns the number of elements + + @since version 1.0.0 + */ + bool empty() const noexcept + { + switch (m_type) + { + case value_t::null: + { + // null values are empty + return true; + } + + case value_t::array: + { + // delegate call to array_t::empty() + return m_value.array->empty(); + } + + case value_t::object: + { + // delegate call to object_t::empty() + return m_value.object->empty(); + } + + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + { + // all other types are nonempty + return false; + } + } + } + + /*! + @brief returns the number of elements + + Returns the number of elements in a JSON value. + + @return The return value depends on the different types and is + defined as follows: + Value type | return value + ----------- | ------------- + null | `0` + boolean | `1` + string | `1` + number | `1` + binary | `1` + object | result of function object_t::size() + array | result of function array_t::size() + + @liveexample{The following code calls `size()` on the different value + types.,size} + + @complexity Constant, as long as @ref array_t and @ref object_t satisfy + the Container concept; that is, their size() functions have constant + complexity. + + @iterators No changes. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @note This function does not return the length of a string stored as JSON + value - it returns the number of elements in the JSON value which is 1 in + the case of a string. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is constant. + - Has the semantics of `std::distance(begin(), end())`. + + @sa see @ref empty() -- checks whether the container is empty + @sa see @ref max_size() -- returns the maximal number of elements + + @since version 1.0.0 + */ + size_type size() const noexcept + { + switch (m_type) + { + case value_t::null: + { + // null values are empty + return 0; + } + + case value_t::array: + { + // delegate call to array_t::size() + return m_value.array->size(); + } + + case value_t::object: + { + // delegate call to object_t::size() + return m_value.object->size(); + } + + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + { + // all other types have size 1 + return 1; + } + } + } + + /*! + @brief returns the maximum possible number of elements + + Returns the maximum number of elements a JSON value is able to hold due to + system or library implementation limitations, i.e. `std::distance(begin(), + end())` for the JSON value. + + @return The return value depends on the different types and is + defined as follows: + Value type | return value + ----------- | ------------- + null | `0` (same as `size()`) + boolean | `1` (same as `size()`) + string | `1` (same as `size()`) + number | `1` (same as `size()`) + binary | `1` (same as `size()`) + object | result of function `object_t::max_size()` + array | result of function `array_t::max_size()` + + @liveexample{The following code calls `max_size()` on the different value + types. Note the output is implementation specific.,max_size} + + @complexity Constant, as long as @ref array_t and @ref object_t satisfy + the Container concept; that is, their `max_size()` functions have constant + complexity. + + @iterators No changes. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @requirement This function helps `basic_json` satisfying the + [Container](https://en.cppreference.com/w/cpp/named_req/Container) + requirements: + - The complexity is constant. + - Has the semantics of returning `b.size()` where `b` is the largest + possible JSON value. + + @sa see @ref size() -- returns the number of elements + + @since version 1.0.0 + */ + size_type max_size() const noexcept + { + switch (m_type) + { + case value_t::array: + { + // delegate call to array_t::max_size() + return m_value.array->max_size(); + } + + case value_t::object: + { + // delegate call to object_t::max_size() + return m_value.object->max_size(); + } + + case value_t::null: + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + { + // all other types have max_size() == size() + return size(); + } + } + } + + /// @} + + + /////////////// + // modifiers // + /////////////// + + /// @name modifiers + /// @{ + + /*! + @brief clears the contents + + Clears the content of a JSON value and resets it to the default value as + if @ref basic_json(value_t) would have been called with the current value + type from @ref type(): + + Value type | initial value + ----------- | ------------- + null | `null` + boolean | `false` + string | `""` + number | `0` + binary | An empty byte vector + object | `{}` + array | `[]` + + @post Has the same effect as calling + @code {.cpp} + *this = basic_json(type()); + @endcode + + @liveexample{The example below shows the effect of `clear()` to different + JSON types.,clear} + + @complexity Linear in the size of the JSON value. + + @iterators All iterators, pointers and references related to this container + are invalidated. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @sa see @ref basic_json(value_t) -- constructor that creates an object with the + same value than calling `clear()` + + @since version 1.0.0 + */ + void clear() noexcept + { + switch (m_type) + { + case value_t::number_integer: + { + m_value.number_integer = 0; + break; + } + + case value_t::number_unsigned: + { + m_value.number_unsigned = 0; + break; + } + + case value_t::number_float: + { + m_value.number_float = 0.0; + break; + } + + case value_t::boolean: + { + m_value.boolean = false; + break; + } + + case value_t::string: + { + m_value.string->clear(); + break; + } + + case value_t::binary: + { + m_value.binary->clear(); + break; + } + + case value_t::array: + { + m_value.array->clear(); + break; + } + + case value_t::object: + { + m_value.object->clear(); + break; + } + + case value_t::null: + case value_t::discarded: + default: + break; + } + } + + /*! + @brief add an object to an array + + Appends the given element @a val to the end of the JSON value. If the + function is called on a JSON null value, an empty array is created before + appending @a val. + + @param[in] val the value to add to the JSON array + + @throw type_error.308 when called on a type other than JSON array or + null; example: `"cannot use push_back() with number"` + + @complexity Amortized constant. + + @liveexample{The example shows how `push_back()` and `+=` can be used to + add elements to a JSON array. Note how the `null` value was silently + converted to a JSON array.,push_back} + + @since version 1.0.0 + */ + void push_back(basic_json&& val) + { + // push_back only works for null objects or arrays + if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array()))) + { + JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()), *this)); + } + + // transform null object into an array + if (is_null()) + { + m_type = value_t::array; + m_value = value_t::array; + assert_invariant(); + } + + // add element to array (move semantics) + const auto old_capacity = m_value.array->capacity(); + m_value.array->push_back(std::move(val)); + set_parent(m_value.array->back(), old_capacity); + // if val is moved from, basic_json move constructor marks it null so we do not call the destructor + } + + /*! + @brief add an object to an array + @copydoc push_back(basic_json&&) + */ + reference operator+=(basic_json&& val) + { + push_back(std::move(val)); + return *this; + } + + /*! + @brief add an object to an array + @copydoc push_back(basic_json&&) + */ + void push_back(const basic_json& val) + { + // push_back only works for null objects or arrays + if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array()))) + { + JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()), *this)); + } + + // transform null object into an array + if (is_null()) + { + m_type = value_t::array; + m_value = value_t::array; + assert_invariant(); + } + + // add element to array + const auto old_capacity = m_value.array->capacity(); + m_value.array->push_back(val); + set_parent(m_value.array->back(), old_capacity); + } + + /*! + @brief add an object to an array + @copydoc push_back(basic_json&&) + */ + reference operator+=(const basic_json& val) + { + push_back(val); + return *this; + } + + /*! + @brief add an object to an object + + Inserts the given element @a val to the JSON object. If the function is + called on a JSON null value, an empty object is created before inserting + @a val. + + @param[in] val the value to add to the JSON object + + @throw type_error.308 when called on a type other than JSON object or + null; example: `"cannot use push_back() with number"` + + @complexity Logarithmic in the size of the container, O(log(`size()`)). + + @liveexample{The example shows how `push_back()` and `+=` can be used to + add elements to a JSON object. Note how the `null` value was silently + converted to a JSON object.,push_back__object_t__value} + + @since version 1.0.0 + */ + void push_back(const typename object_t::value_type& val) + { + // push_back only works for null objects or objects + if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object()))) + { + JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()), *this)); + } + + // transform null object into an object + if (is_null()) + { + m_type = value_t::object; + m_value = value_t::object; + assert_invariant(); + } + + // add element to object + auto res = m_value.object->insert(val); + set_parent(res.first->second); + } + + /*! + @brief add an object to an object + @copydoc push_back(const typename object_t::value_type&) + */ + reference operator+=(const typename object_t::value_type& val) + { + push_back(val); + return *this; + } + + /*! + @brief add an object to an object + + This function allows to use `push_back` with an initializer list. In case + + 1. the current value is an object, + 2. the initializer list @a init contains only two elements, and + 3. the first element of @a init is a string, + + @a init is converted into an object element and added using + @ref push_back(const typename object_t::value_type&). Otherwise, @a init + is converted to a JSON value and added using @ref push_back(basic_json&&). + + @param[in] init an initializer list + + @complexity Linear in the size of the initializer list @a init. + + @note This function is required to resolve an ambiguous overload error, + because pairs like `{"key", "value"}` can be both interpreted as + `object_t::value_type` or `std::initializer_list`, see + https://github.com/nlohmann/json/issues/235 for more information. + + @liveexample{The example shows how initializer lists are treated as + objects when possible.,push_back__initializer_list} + */ + void push_back(initializer_list_t init) + { + if (is_object() && init.size() == 2 && (*init.begin())->is_string()) + { + basic_json&& key = init.begin()->moved_or_copied(); + push_back(typename object_t::value_type( + std::move(key.get_ref()), (init.begin() + 1)->moved_or_copied())); + } + else + { + push_back(basic_json(init)); + } + } + + /*! + @brief add an object to an object + @copydoc push_back(initializer_list_t) + */ + reference operator+=(initializer_list_t init) + { + push_back(init); + return *this; + } + + /*! + @brief add an object to an array + + Creates a JSON value from the passed parameters @a args to the end of the + JSON value. If the function is called on a JSON null value, an empty array + is created before appending the value created from @a args. + + @param[in] args arguments to forward to a constructor of @ref basic_json + @tparam Args compatible types to create a @ref basic_json object + + @return reference to the inserted element + + @throw type_error.311 when called on a type other than JSON array or + null; example: `"cannot use emplace_back() with number"` + + @complexity Amortized constant. + + @liveexample{The example shows how `push_back()` can be used to add + elements to a JSON array. Note how the `null` value was silently converted + to a JSON array.,emplace_back} + + @since version 2.0.8, returns reference since 3.7.0 + */ + template + reference emplace_back(Args&& ... args) + { + // emplace_back only works for null objects or arrays + if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array()))) + { + JSON_THROW(type_error::create(311, "cannot use emplace_back() with " + std::string(type_name()), *this)); + } + + // transform null object into an array + if (is_null()) + { + m_type = value_t::array; + m_value = value_t::array; + assert_invariant(); + } + + // add element to array (perfect forwarding) + const auto old_capacity = m_value.array->capacity(); + m_value.array->emplace_back(std::forward(args)...); + return set_parent(m_value.array->back(), old_capacity); + } + + /*! + @brief add an object to an object if key does not exist + + Inserts a new element into a JSON object constructed in-place with the + given @a args if there is no element with the key in the container. If the + function is called on a JSON null value, an empty object is created before + appending the value created from @a args. + + @param[in] args arguments to forward to a constructor of @ref basic_json + @tparam Args compatible types to create a @ref basic_json object + + @return a pair consisting of an iterator to the inserted element, or the + already-existing element if no insertion happened, and a bool + denoting whether the insertion took place. + + @throw type_error.311 when called on a type other than JSON object or + null; example: `"cannot use emplace() with number"` + + @complexity Logarithmic in the size of the container, O(log(`size()`)). + + @liveexample{The example shows how `emplace()` can be used to add elements + to a JSON object. Note how the `null` value was silently converted to a + JSON object. Further note how no value is added if there was already one + value stored with the same key.,emplace} + + @since version 2.0.8 + */ + template + std::pair emplace(Args&& ... args) + { + // emplace only works for null objects or arrays + if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object()))) + { + JSON_THROW(type_error::create(311, "cannot use emplace() with " + std::string(type_name()), *this)); + } + + // transform null object into an object + if (is_null()) + { + m_type = value_t::object; + m_value = value_t::object; + assert_invariant(); + } + + // add element to array (perfect forwarding) + auto res = m_value.object->emplace(std::forward(args)...); + set_parent(res.first->second); + + // create result iterator and set iterator to the result of emplace + auto it = begin(); + it.m_it.object_iterator = res.first; + + // return pair of iterator and boolean + return {it, res.second}; + } + + /// Helper for insertion of an iterator + /// @note: This uses std::distance to support GCC 4.8, + /// see https://github.com/nlohmann/json/pull/1257 + template + iterator insert_iterator(const_iterator pos, Args&& ... args) + { + iterator result(this); + JSON_ASSERT(m_value.array != nullptr); + + auto insert_pos = std::distance(m_value.array->begin(), pos.m_it.array_iterator); + m_value.array->insert(pos.m_it.array_iterator, std::forward(args)...); + result.m_it.array_iterator = m_value.array->begin() + insert_pos; + + // This could have been written as: + // result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val); + // but the return value of insert is missing in GCC 4.8, so it is written this way instead. + + set_parents(); + return result; + } + + /*! + @brief inserts element + + Inserts element @a val before iterator @a pos. + + @param[in] pos iterator before which the content will be inserted; may be + the end() iterator + @param[in] val element to insert + @return iterator pointing to the inserted @a val. + + @throw type_error.309 if called on JSON values other than arrays; + example: `"cannot use insert() with string"` + @throw invalid_iterator.202 if @a pos is not an iterator of *this; + example: `"iterator does not fit current value"` + + @complexity Constant plus linear in the distance between @a pos and end of + the container. + + @liveexample{The example shows how `insert()` is used.,insert} + + @since version 1.0.0 + */ + iterator insert(const_iterator pos, const basic_json& val) + { + // insert only works for arrays + if (JSON_HEDLEY_LIKELY(is_array())) + { + // check if iterator pos fits to this JSON value + if (JSON_HEDLEY_UNLIKELY(pos.m_object != this)) + { + JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this)); + } + + // insert to array and return iterator + return insert_iterator(pos, val); + } + + JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this)); + } + + /*! + @brief inserts element + @copydoc insert(const_iterator, const basic_json&) + */ + iterator insert(const_iterator pos, basic_json&& val) + { + return insert(pos, val); + } + + /*! + @brief inserts elements + + Inserts @a cnt copies of @a val before iterator @a pos. + + @param[in] pos iterator before which the content will be inserted; may be + the end() iterator + @param[in] cnt number of copies of @a val to insert + @param[in] val element to insert + @return iterator pointing to the first element inserted, or @a pos if + `cnt==0` + + @throw type_error.309 if called on JSON values other than arrays; example: + `"cannot use insert() with string"` + @throw invalid_iterator.202 if @a pos is not an iterator of *this; + example: `"iterator does not fit current value"` + + @complexity Linear in @a cnt plus linear in the distance between @a pos + and end of the container. + + @liveexample{The example shows how `insert()` is used.,insert__count} + + @since version 1.0.0 + */ + iterator insert(const_iterator pos, size_type cnt, const basic_json& val) + { + // insert only works for arrays + if (JSON_HEDLEY_LIKELY(is_array())) + { + // check if iterator pos fits to this JSON value + if (JSON_HEDLEY_UNLIKELY(pos.m_object != this)) + { + JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this)); + } + + // insert to array and return iterator + return insert_iterator(pos, cnt, val); + } + + JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this)); + } + + /*! + @brief inserts elements + + Inserts elements from range `[first, last)` before iterator @a pos. + + @param[in] pos iterator before which the content will be inserted; may be + the end() iterator + @param[in] first begin of the range of elements to insert + @param[in] last end of the range of elements to insert + + @throw type_error.309 if called on JSON values other than arrays; example: + `"cannot use insert() with string"` + @throw invalid_iterator.202 if @a pos is not an iterator of *this; + example: `"iterator does not fit current value"` + @throw invalid_iterator.210 if @a first and @a last do not belong to the + same JSON value; example: `"iterators do not fit"` + @throw invalid_iterator.211 if @a first or @a last are iterators into + container for which insert is called; example: `"passed iterators may not + belong to container"` + + @return iterator pointing to the first element inserted, or @a pos if + `first==last` + + @complexity Linear in `std::distance(first, last)` plus linear in the + distance between @a pos and end of the container. + + @liveexample{The example shows how `insert()` is used.,insert__range} + + @since version 1.0.0 + */ + iterator insert(const_iterator pos, const_iterator first, const_iterator last) + { + // insert only works for arrays + if (JSON_HEDLEY_UNLIKELY(!is_array())) + { + JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this)); + } + + // check if iterator pos fits to this JSON value + if (JSON_HEDLEY_UNLIKELY(pos.m_object != this)) + { + JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this)); + } + + // check if range iterators belong to the same JSON object + if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object)) + { + JSON_THROW(invalid_iterator::create(210, "iterators do not fit", *this)); + } + + if (JSON_HEDLEY_UNLIKELY(first.m_object == this)) + { + JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container", *this)); + } + + // insert to array and return iterator + return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator); + } + + /*! + @brief inserts elements + + Inserts elements from initializer list @a ilist before iterator @a pos. + + @param[in] pos iterator before which the content will be inserted; may be + the end() iterator + @param[in] ilist initializer list to insert the values from + + @throw type_error.309 if called on JSON values other than arrays; example: + `"cannot use insert() with string"` + @throw invalid_iterator.202 if @a pos is not an iterator of *this; + example: `"iterator does not fit current value"` + + @return iterator pointing to the first element inserted, or @a pos if + `ilist` is empty + + @complexity Linear in `ilist.size()` plus linear in the distance between + @a pos and end of the container. + + @liveexample{The example shows how `insert()` is used.,insert__ilist} + + @since version 1.0.0 + */ + iterator insert(const_iterator pos, initializer_list_t ilist) + { + // insert only works for arrays + if (JSON_HEDLEY_UNLIKELY(!is_array())) + { + JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this)); + } + + // check if iterator pos fits to this JSON value + if (JSON_HEDLEY_UNLIKELY(pos.m_object != this)) + { + JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this)); + } + + // insert to array and return iterator + return insert_iterator(pos, ilist.begin(), ilist.end()); + } + + /*! + @brief inserts elements + + Inserts elements from range `[first, last)`. + + @param[in] first begin of the range of elements to insert + @param[in] last end of the range of elements to insert + + @throw type_error.309 if called on JSON values other than objects; example: + `"cannot use insert() with string"` + @throw invalid_iterator.202 if iterator @a first or @a last does does not + point to an object; example: `"iterators first and last must point to + objects"` + @throw invalid_iterator.210 if @a first and @a last do not belong to the + same JSON value; example: `"iterators do not fit"` + + @complexity Logarithmic: `O(N*log(size() + N))`, where `N` is the number + of elements to insert. + + @liveexample{The example shows how `insert()` is used.,insert__range_object} + + @since version 3.0.0 + */ + void insert(const_iterator first, const_iterator last) + { + // insert only works for objects + if (JSON_HEDLEY_UNLIKELY(!is_object())) + { + JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this)); + } + + // check if range iterators belong to the same JSON object + if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object)) + { + JSON_THROW(invalid_iterator::create(210, "iterators do not fit", *this)); + } + + // passed iterators must belong to objects + if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object())) + { + JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects", *this)); + } + + m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator); + } + + /*! + @brief updates a JSON object from another object, overwriting existing keys + + Inserts all values from JSON object @a j and overwrites existing keys. + + @param[in] j JSON object to read values from + + @throw type_error.312 if called on JSON values other than objects; example: + `"cannot use update() with string"` + + @complexity O(N*log(size() + N)), where N is the number of elements to + insert. + + @liveexample{The example shows how `update()` is used.,update} + + @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update + + @since version 3.0.0 + */ + void update(const_reference j) + { + // implicitly convert null value to an empty object + if (is_null()) + { + m_type = value_t::object; + m_value.object = create(); + assert_invariant(); + } + + if (JSON_HEDLEY_UNLIKELY(!is_object())) + { + JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name()), *this)); + } + if (JSON_HEDLEY_UNLIKELY(!j.is_object())) + { + JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(j.type_name()), *this)); + } + + for (auto it = j.cbegin(); it != j.cend(); ++it) + { + m_value.object->operator[](it.key()) = it.value(); +#if JSON_DIAGNOSTICS + m_value.object->operator[](it.key()).m_parent = this; +#endif + } + } + + /*! + @brief updates a JSON object from another object, overwriting existing keys + + Inserts all values from from range `[first, last)` and overwrites existing + keys. + + @param[in] first begin of the range of elements to insert + @param[in] last end of the range of elements to insert + + @throw type_error.312 if called on JSON values other than objects; example: + `"cannot use update() with string"` + @throw invalid_iterator.202 if iterator @a first or @a last does does not + point to an object; example: `"iterators first and last must point to + objects"` + @throw invalid_iterator.210 if @a first and @a last do not belong to the + same JSON value; example: `"iterators do not fit"` + + @complexity O(N*log(size() + N)), where N is the number of elements to + insert. + + @liveexample{The example shows how `update()` is used__range.,update} + + @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update + + @since version 3.0.0 + */ + void update(const_iterator first, const_iterator last) + { + // implicitly convert null value to an empty object + if (is_null()) + { + m_type = value_t::object; + m_value.object = create(); + assert_invariant(); + } + + if (JSON_HEDLEY_UNLIKELY(!is_object())) + { + JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name()), *this)); + } + + // check if range iterators belong to the same JSON object + if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object)) + { + JSON_THROW(invalid_iterator::create(210, "iterators do not fit", *this)); + } + + // passed iterators must belong to objects + if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object() + || !last.m_object->is_object())) + { + JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects", *this)); + } + + for (auto it = first; it != last; ++it) + { + m_value.object->operator[](it.key()) = it.value(); +#if JSON_DIAGNOSTICS + m_value.object->operator[](it.key()).m_parent = this; +#endif + } + } + + /*! + @brief exchanges the values + + Exchanges the contents of the JSON value with those of @a other. Does not + invoke any move, copy, or swap operations on individual elements. All + iterators and references remain valid. The past-the-end iterator is + invalidated. + + @param[in,out] other JSON value to exchange the contents with + + @complexity Constant. + + @liveexample{The example below shows how JSON values can be swapped with + `swap()`.,swap__reference} + + @since version 1.0.0 + */ + void swap(reference other) noexcept ( + std::is_nothrow_move_constructible::value&& + std::is_nothrow_move_assignable::value&& + std::is_nothrow_move_constructible::value&& + std::is_nothrow_move_assignable::value + ) + { + std::swap(m_type, other.m_type); + std::swap(m_value, other.m_value); + + set_parents(); + other.set_parents(); + assert_invariant(); + } + + /*! + @brief exchanges the values + + Exchanges the contents of the JSON value from @a left with those of @a right. Does not + invoke any move, copy, or swap operations on individual elements. All + iterators and references remain valid. The past-the-end iterator is + invalidated. implemented as a friend function callable via ADL. + + @param[in,out] left JSON value to exchange the contents with + @param[in,out] right JSON value to exchange the contents with + + @complexity Constant. + + @liveexample{The example below shows how JSON values can be swapped with + `swap()`.,swap__reference} + + @since version 1.0.0 + */ + friend void swap(reference left, reference right) noexcept ( + std::is_nothrow_move_constructible::value&& + std::is_nothrow_move_assignable::value&& + std::is_nothrow_move_constructible::value&& + std::is_nothrow_move_assignable::value + ) + { + left.swap(right); + } + + /*! + @brief exchanges the values + + Exchanges the contents of a JSON array with those of @a other. Does not + invoke any move, copy, or swap operations on individual elements. All + iterators and references remain valid. The past-the-end iterator is + invalidated. + + @param[in,out] other array to exchange the contents with + + @throw type_error.310 when JSON value is not an array; example: `"cannot + use swap() with string"` + + @complexity Constant. + + @liveexample{The example below shows how arrays can be swapped with + `swap()`.,swap__array_t} + + @since version 1.0.0 + */ + void swap(array_t& other) // NOLINT(bugprone-exception-escape) + { + // swap only works for arrays + if (JSON_HEDLEY_LIKELY(is_array())) + { + std::swap(*(m_value.array), other); + } + else + { + JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this)); + } + } + + /*! + @brief exchanges the values + + Exchanges the contents of a JSON object with those of @a other. Does not + invoke any move, copy, or swap operations on individual elements. All + iterators and references remain valid. The past-the-end iterator is + invalidated. + + @param[in,out] other object to exchange the contents with + + @throw type_error.310 when JSON value is not an object; example: + `"cannot use swap() with string"` + + @complexity Constant. + + @liveexample{The example below shows how objects can be swapped with + `swap()`.,swap__object_t} + + @since version 1.0.0 + */ + void swap(object_t& other) // NOLINT(bugprone-exception-escape) + { + // swap only works for objects + if (JSON_HEDLEY_LIKELY(is_object())) + { + std::swap(*(m_value.object), other); + } + else + { + JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this)); + } + } + + /*! + @brief exchanges the values + + Exchanges the contents of a JSON string with those of @a other. Does not + invoke any move, copy, or swap operations on individual elements. All + iterators and references remain valid. The past-the-end iterator is + invalidated. + + @param[in,out] other string to exchange the contents with + + @throw type_error.310 when JSON value is not a string; example: `"cannot + use swap() with boolean"` + + @complexity Constant. + + @liveexample{The example below shows how strings can be swapped with + `swap()`.,swap__string_t} + + @since version 1.0.0 + */ + void swap(string_t& other) // NOLINT(bugprone-exception-escape) + { + // swap only works for strings + if (JSON_HEDLEY_LIKELY(is_string())) + { + std::swap(*(m_value.string), other); + } + else + { + JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this)); + } + } + + /*! + @brief exchanges the values + + Exchanges the contents of a JSON string with those of @a other. Does not + invoke any move, copy, or swap operations on individual elements. All + iterators and references remain valid. The past-the-end iterator is + invalidated. + + @param[in,out] other binary to exchange the contents with + + @throw type_error.310 when JSON value is not a string; example: `"cannot + use swap() with boolean"` + + @complexity Constant. + + @liveexample{The example below shows how strings can be swapped with + `swap()`.,swap__binary_t} + + @since version 3.8.0 + */ + void swap(binary_t& other) // NOLINT(bugprone-exception-escape) + { + // swap only works for strings + if (JSON_HEDLEY_LIKELY(is_binary())) + { + std::swap(*(m_value.binary), other); + } + else + { + JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this)); + } + } + + /// @copydoc swap(binary_t&) + void swap(typename binary_t::container_type& other) // NOLINT(bugprone-exception-escape) + { + // swap only works for strings + if (JSON_HEDLEY_LIKELY(is_binary())) + { + std::swap(*(m_value.binary), other); + } + else + { + JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this)); + } + } + + /// @} + + public: + ////////////////////////////////////////// + // lexicographical comparison operators // + ////////////////////////////////////////// + + /// @name lexicographical comparison operators + /// @{ + + /*! + @brief comparison: equal + + Compares two JSON values for equality according to the following rules: + - Two JSON values are equal if (1) they are from the same type and (2) + their stored values are the same according to their respective + `operator==`. + - Integer and floating-point numbers are automatically converted before + comparison. Note that two NaN values are always treated as unequal. + - Two JSON null values are equal. + + @note Floating-point inside JSON values numbers are compared with + `json::number_float_t::operator==` which is `double::operator==` by + default. To compare floating-point while respecting an epsilon, an alternative + [comparison function](https://github.com/mariokonrad/marnav/blob/master/include/marnav/math/floatingpoint.hpp#L34-#L39) + could be used, for instance + @code {.cpp} + template::value, T>::type> + inline bool is_same(T a, T b, T epsilon = std::numeric_limits::epsilon()) noexcept + { + return std::abs(a - b) <= epsilon; + } + @endcode + Or you can self-defined operator equal function like this: + @code {.cpp} + bool my_equal(const_reference lhs, const_reference rhs) { + const auto lhs_type lhs.type(); + const auto rhs_type rhs.type(); + if (lhs_type == rhs_type) { + switch(lhs_type) + // self_defined case + case value_t::number_float: + return std::abs(lhs - rhs) <= std::numeric_limits::epsilon(); + // other cases remain the same with the original + ... + } + ... + } + @endcode + + @note NaN values never compare equal to themselves or to other NaN values. + + @param[in] lhs first JSON value to consider + @param[in] rhs second JSON value to consider + @return whether the values @a lhs and @a rhs are equal + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @complexity Linear. + + @liveexample{The example demonstrates comparing several JSON + types.,operator__equal} + + @since version 1.0.0 + */ + friend bool operator==(const_reference lhs, const_reference rhs) noexcept + { +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wfloat-equal" +#endif + const auto lhs_type = lhs.type(); + const auto rhs_type = rhs.type(); + + if (lhs_type == rhs_type) + { + switch (lhs_type) + { + case value_t::array: + return *lhs.m_value.array == *rhs.m_value.array; + + case value_t::object: + return *lhs.m_value.object == *rhs.m_value.object; + + case value_t::null: + return true; + + case value_t::string: + return *lhs.m_value.string == *rhs.m_value.string; + + case value_t::boolean: + return lhs.m_value.boolean == rhs.m_value.boolean; + + case value_t::number_integer: + return lhs.m_value.number_integer == rhs.m_value.number_integer; + + case value_t::number_unsigned: + return lhs.m_value.number_unsigned == rhs.m_value.number_unsigned; + + case value_t::number_float: + return lhs.m_value.number_float == rhs.m_value.number_float; + + case value_t::binary: + return *lhs.m_value.binary == *rhs.m_value.binary; + + case value_t::discarded: + default: + return false; + } + } + else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float) + { + return static_cast(lhs.m_value.number_integer) == rhs.m_value.number_float; + } + else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer) + { + return lhs.m_value.number_float == static_cast(rhs.m_value.number_integer); + } + else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float) + { + return static_cast(lhs.m_value.number_unsigned) == rhs.m_value.number_float; + } + else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned) + { + return lhs.m_value.number_float == static_cast(rhs.m_value.number_unsigned); + } + else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer) + { + return static_cast(lhs.m_value.number_unsigned) == rhs.m_value.number_integer; + } + else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned) + { + return lhs.m_value.number_integer == static_cast(rhs.m_value.number_unsigned); + } + + return false; +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif + } + + /*! + @brief comparison: equal + @copydoc operator==(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator==(const_reference lhs, ScalarType rhs) noexcept + { + return lhs == basic_json(rhs); + } + + /*! + @brief comparison: equal + @copydoc operator==(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator==(ScalarType lhs, const_reference rhs) noexcept + { + return basic_json(lhs) == rhs; + } + + /*! + @brief comparison: not equal + + Compares two JSON values for inequality by calculating `not (lhs == rhs)`. + + @param[in] lhs first JSON value to consider + @param[in] rhs second JSON value to consider + @return whether the values @a lhs and @a rhs are not equal + + @complexity Linear. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @liveexample{The example demonstrates comparing several JSON + types.,operator__notequal} + + @since version 1.0.0 + */ + friend bool operator!=(const_reference lhs, const_reference rhs) noexcept + { + return !(lhs == rhs); + } + + /*! + @brief comparison: not equal + @copydoc operator!=(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator!=(const_reference lhs, ScalarType rhs) noexcept + { + return lhs != basic_json(rhs); + } + + /*! + @brief comparison: not equal + @copydoc operator!=(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator!=(ScalarType lhs, const_reference rhs) noexcept + { + return basic_json(lhs) != rhs; + } + + /*! + @brief comparison: less than + + Compares whether one JSON value @a lhs is less than another JSON value @a + rhs according to the following rules: + - If @a lhs and @a rhs have the same type, the values are compared using + the default `<` operator. + - Integer and floating-point numbers are automatically converted before + comparison + - In case @a lhs and @a rhs have different types, the values are ignored + and the order of the types is considered, see + @ref operator<(const value_t, const value_t). + + @param[in] lhs first JSON value to consider + @param[in] rhs second JSON value to consider + @return whether @a lhs is less than @a rhs + + @complexity Linear. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @liveexample{The example demonstrates comparing several JSON + types.,operator__less} + + @since version 1.0.0 + */ + friend bool operator<(const_reference lhs, const_reference rhs) noexcept + { + const auto lhs_type = lhs.type(); + const auto rhs_type = rhs.type(); + + if (lhs_type == rhs_type) + { + switch (lhs_type) + { + case value_t::array: + // note parentheses are necessary, see + // https://github.com/nlohmann/json/issues/1530 + return (*lhs.m_value.array) < (*rhs.m_value.array); + + case value_t::object: + return (*lhs.m_value.object) < (*rhs.m_value.object); + + case value_t::null: + return false; + + case value_t::string: + return (*lhs.m_value.string) < (*rhs.m_value.string); + + case value_t::boolean: + return (lhs.m_value.boolean) < (rhs.m_value.boolean); + + case value_t::number_integer: + return (lhs.m_value.number_integer) < (rhs.m_value.number_integer); + + case value_t::number_unsigned: + return (lhs.m_value.number_unsigned) < (rhs.m_value.number_unsigned); + + case value_t::number_float: + return (lhs.m_value.number_float) < (rhs.m_value.number_float); + + case value_t::binary: + return (*lhs.m_value.binary) < (*rhs.m_value.binary); + + case value_t::discarded: + default: + return false; + } + } + else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float) + { + return static_cast(lhs.m_value.number_integer) < rhs.m_value.number_float; + } + else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer) + { + return lhs.m_value.number_float < static_cast(rhs.m_value.number_integer); + } + else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float) + { + return static_cast(lhs.m_value.number_unsigned) < rhs.m_value.number_float; + } + else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned) + { + return lhs.m_value.number_float < static_cast(rhs.m_value.number_unsigned); + } + else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned) + { + return lhs.m_value.number_integer < static_cast(rhs.m_value.number_unsigned); + } + else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer) + { + return static_cast(lhs.m_value.number_unsigned) < rhs.m_value.number_integer; + } + + // We only reach this line if we cannot compare values. In that case, + // we compare types. Note we have to call the operator explicitly, + // because MSVC has problems otherwise. + return operator<(lhs_type, rhs_type); + } + + /*! + @brief comparison: less than + @copydoc operator<(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator<(const_reference lhs, ScalarType rhs) noexcept + { + return lhs < basic_json(rhs); + } + + /*! + @brief comparison: less than + @copydoc operator<(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator<(ScalarType lhs, const_reference rhs) noexcept + { + return basic_json(lhs) < rhs; + } + + /*! + @brief comparison: less than or equal + + Compares whether one JSON value @a lhs is less than or equal to another + JSON value by calculating `not (rhs < lhs)`. + + @param[in] lhs first JSON value to consider + @param[in] rhs second JSON value to consider + @return whether @a lhs is less than or equal to @a rhs + + @complexity Linear. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @liveexample{The example demonstrates comparing several JSON + types.,operator__greater} + + @since version 1.0.0 + */ + friend bool operator<=(const_reference lhs, const_reference rhs) noexcept + { + return !(rhs < lhs); + } + + /*! + @brief comparison: less than or equal + @copydoc operator<=(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator<=(const_reference lhs, ScalarType rhs) noexcept + { + return lhs <= basic_json(rhs); + } + + /*! + @brief comparison: less than or equal + @copydoc operator<=(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator<=(ScalarType lhs, const_reference rhs) noexcept + { + return basic_json(lhs) <= rhs; + } + + /*! + @brief comparison: greater than + + Compares whether one JSON value @a lhs is greater than another + JSON value by calculating `not (lhs <= rhs)`. + + @param[in] lhs first JSON value to consider + @param[in] rhs second JSON value to consider + @return whether @a lhs is greater than to @a rhs + + @complexity Linear. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @liveexample{The example demonstrates comparing several JSON + types.,operator__lessequal} + + @since version 1.0.0 + */ + friend bool operator>(const_reference lhs, const_reference rhs) noexcept + { + return !(lhs <= rhs); + } + + /*! + @brief comparison: greater than + @copydoc operator>(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator>(const_reference lhs, ScalarType rhs) noexcept + { + return lhs > basic_json(rhs); + } + + /*! + @brief comparison: greater than + @copydoc operator>(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator>(ScalarType lhs, const_reference rhs) noexcept + { + return basic_json(lhs) > rhs; + } + + /*! + @brief comparison: greater than or equal + + Compares whether one JSON value @a lhs is greater than or equal to another + JSON value by calculating `not (lhs < rhs)`. + + @param[in] lhs first JSON value to consider + @param[in] rhs second JSON value to consider + @return whether @a lhs is greater than or equal to @a rhs + + @complexity Linear. + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @liveexample{The example demonstrates comparing several JSON + types.,operator__greaterequal} + + @since version 1.0.0 + */ + friend bool operator>=(const_reference lhs, const_reference rhs) noexcept + { + return !(lhs < rhs); + } + + /*! + @brief comparison: greater than or equal + @copydoc operator>=(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator>=(const_reference lhs, ScalarType rhs) noexcept + { + return lhs >= basic_json(rhs); + } + + /*! + @brief comparison: greater than or equal + @copydoc operator>=(const_reference, const_reference) + */ + template::value, int>::type = 0> + friend bool operator>=(ScalarType lhs, const_reference rhs) noexcept + { + return basic_json(lhs) >= rhs; + } + + /// @} + + /////////////////// + // serialization // + /////////////////// + + /// @name serialization + /// @{ +#ifndef JSON_NO_IO + /*! + @brief serialize to stream + + Serialize the given JSON value @a j to the output stream @a o. The JSON + value will be serialized using the @ref dump member function. + + - The indentation of the output can be controlled with the member variable + `width` of the output stream @a o. For instance, using the manipulator + `std::setw(4)` on @a o sets the indentation level to `4` and the + serialization result is the same as calling `dump(4)`. + + - The indentation character can be controlled with the member variable + `fill` of the output stream @a o. For instance, the manipulator + `std::setfill('\\t')` sets indentation to use a tab character rather than + the default space character. + + @param[in,out] o stream to serialize to + @param[in] j JSON value to serialize + + @return the stream @a o + + @throw type_error.316 if a string stored inside the JSON value is not + UTF-8 encoded + + @complexity Linear. + + @liveexample{The example below shows the serialization with different + parameters to `width` to adjust the indentation level.,operator_serialize} + + @since version 1.0.0; indentation character added in version 3.0.0 + */ + friend std::ostream& operator<<(std::ostream& o, const basic_json& j) + { + // read width member and use it as indentation parameter if nonzero + const bool pretty_print = o.width() > 0; + const auto indentation = pretty_print ? o.width() : 0; + + // reset width to 0 for subsequent calls to this stream + o.width(0); + + // do the actual serialization + serializer s(detail::output_adapter(o), o.fill()); + s.dump(j, pretty_print, false, static_cast(indentation)); + return o; + } + + /*! + @brief serialize to stream + @deprecated This stream operator is deprecated and will be removed in + future 4.0.0 of the library. Please use + @ref operator<<(std::ostream&, const basic_json&) + instead; that is, replace calls like `j >> o;` with `o << j;`. + @since version 1.0.0; deprecated since version 3.0.0 + */ + JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator<<(std::ostream&, const basic_json&)) + friend std::ostream& operator>>(const basic_json& j, std::ostream& o) + { + return o << j; + } +#endif // JSON_NO_IO + /// @} + + + ///////////////////// + // deserialization // + ///////////////////// + + /// @name deserialization + /// @{ + + /*! + @brief deserialize from a compatible input + + @tparam InputType A compatible input, for instance + - an std::istream object + - a FILE pointer + - a C-style array of characters + - a pointer to a null-terminated string of single byte characters + - an object obj for which begin(obj) and end(obj) produces a valid pair of + iterators. + + @param[in] i input to read from + @param[in] cb a parser callback function of type @ref parser_callback_t + which is used to control the deserialization by filtering unwanted values + (optional) + @param[in] allow_exceptions whether to throw exceptions in case of a + parse error (optional, true by default) + @param[in] ignore_comments whether comments should be ignored and treated + like whitespace (true) or yield a parse error (true); (optional, false by + default) + + @return deserialized JSON value; in case of a parse error and + @a allow_exceptions set to `false`, the return value will be + value_t::discarded. + + @throw parse_error.101 if a parse error occurs; example: `""unexpected end + of input; expected string literal""` + @throw parse_error.102 if to_unicode fails or surrogate error + @throw parse_error.103 if to_unicode fails + + @complexity Linear in the length of the input. The parser is a predictive + LL(1) parser. The complexity can be higher if the parser callback function + @a cb or reading from the input @a i has a super-linear complexity. + + @note A UTF-8 byte order mark is silently ignored. + + @liveexample{The example below demonstrates the `parse()` function reading + from an array.,parse__array__parser_callback_t} + + @liveexample{The example below demonstrates the `parse()` function with + and without callback function.,parse__string__parser_callback_t} + + @liveexample{The example below demonstrates the `parse()` function with + and without callback function.,parse__istream__parser_callback_t} + + @liveexample{The example below demonstrates the `parse()` function reading + from a contiguous container.,parse__contiguouscontainer__parser_callback_t} + + @since version 2.0.3 (contiguous containers); version 3.9.0 allowed to + ignore comments. + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json parse(InputType&& i, + const parser_callback_t cb = nullptr, + const bool allow_exceptions = true, + const bool ignore_comments = false) + { + basic_json result; + parser(detail::input_adapter(std::forward(i)), cb, allow_exceptions, ignore_comments).parse(true, result); + return result; + } + + /*! + @brief deserialize from a pair of character iterators + + The value_type of the iterator must be a integral type with size of 1, 2 or + 4 bytes, which will be interpreted respectively as UTF-8, UTF-16 and UTF-32. + + @param[in] first iterator to start of character range + @param[in] last iterator to end of character range + @param[in] cb a parser callback function of type @ref parser_callback_t + which is used to control the deserialization by filtering unwanted values + (optional) + @param[in] allow_exceptions whether to throw exceptions in case of a + parse error (optional, true by default) + @param[in] ignore_comments whether comments should be ignored and treated + like whitespace (true) or yield a parse error (true); (optional, false by + default) + + @return deserialized JSON value; in case of a parse error and + @a allow_exceptions set to `false`, the return value will be + value_t::discarded. + + @throw parse_error.101 if a parse error occurs; example: `""unexpected end + of input; expected string literal""` + @throw parse_error.102 if to_unicode fails or surrogate error + @throw parse_error.103 if to_unicode fails + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json parse(IteratorType first, + IteratorType last, + const parser_callback_t cb = nullptr, + const bool allow_exceptions = true, + const bool ignore_comments = false) + { + basic_json result; + parser(detail::input_adapter(std::move(first), std::move(last)), cb, allow_exceptions, ignore_comments).parse(true, result); + return result; + } + + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, parse(ptr, ptr + len)) + static basic_json parse(detail::span_input_adapter&& i, + const parser_callback_t cb = nullptr, + const bool allow_exceptions = true, + const bool ignore_comments = false) + { + basic_json result; + parser(i.get(), cb, allow_exceptions, ignore_comments).parse(true, result); + return result; + } + + /*! + @brief check if the input is valid JSON + + Unlike the @ref parse(InputType&&, const parser_callback_t,const bool) + function, this function neither throws an exception in case of invalid JSON + input (i.e., a parse error) nor creates diagnostic information. + + @tparam InputType A compatible input, for instance + - an std::istream object + - a FILE pointer + - a C-style array of characters + - a pointer to a null-terminated string of single byte characters + - an object obj for which begin(obj) and end(obj) produces a valid pair of + iterators. + + @param[in] i input to read from + @param[in] ignore_comments whether comments should be ignored and treated + like whitespace (true) or yield a parse error (true); (optional, false by + default) + + @return Whether the input read from @a i is valid JSON. + + @complexity Linear in the length of the input. The parser is a predictive + LL(1) parser. + + @note A UTF-8 byte order mark is silently ignored. + + @liveexample{The example below demonstrates the `accept()` function reading + from a string.,accept__string} + */ + template + static bool accept(InputType&& i, + const bool ignore_comments = false) + { + return parser(detail::input_adapter(std::forward(i)), nullptr, false, ignore_comments).accept(true); + } + + template + static bool accept(IteratorType first, IteratorType last, + const bool ignore_comments = false) + { + return parser(detail::input_adapter(std::move(first), std::move(last)), nullptr, false, ignore_comments).accept(true); + } + + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, accept(ptr, ptr + len)) + static bool accept(detail::span_input_adapter&& i, + const bool ignore_comments = false) + { + return parser(i.get(), nullptr, false, ignore_comments).accept(true); + } + + /*! + @brief generate SAX events + + The SAX event lister must follow the interface of @ref json_sax. + + This function reads from a compatible input. Examples are: + - an std::istream object + - a FILE pointer + - a C-style array of characters + - a pointer to a null-terminated string of single byte characters + - an object obj for which begin(obj) and end(obj) produces a valid pair of + iterators. + + @param[in] i input to read from + @param[in,out] sax SAX event listener + @param[in] format the format to parse (JSON, CBOR, MessagePack, or UBJSON) + @param[in] strict whether the input has to be consumed completely + @param[in] ignore_comments whether comments should be ignored and treated + like whitespace (true) or yield a parse error (true); (optional, false by + default); only applies to the JSON file format. + + @return return value of the last processed SAX event + + @throw parse_error.101 if a parse error occurs; example: `""unexpected end + of input; expected string literal""` + @throw parse_error.102 if to_unicode fails or surrogate error + @throw parse_error.103 if to_unicode fails + + @complexity Linear in the length of the input. The parser is a predictive + LL(1) parser. The complexity can be higher if the SAX consumer @a sax has + a super-linear complexity. + + @note A UTF-8 byte order mark is silently ignored. + + @liveexample{The example below demonstrates the `sax_parse()` function + reading from string and processing the events with a user-defined SAX + event consumer.,sax_parse} + + @since version 3.2.0 + */ + template + JSON_HEDLEY_NON_NULL(2) + static bool sax_parse(InputType&& i, SAX* sax, + input_format_t format = input_format_t::json, + const bool strict = true, + const bool ignore_comments = false) + { + auto ia = detail::input_adapter(std::forward(i)); + return format == input_format_t::json + ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict) + : detail::binary_reader(std::move(ia)).sax_parse(format, sax, strict); + } + + template + JSON_HEDLEY_NON_NULL(3) + static bool sax_parse(IteratorType first, IteratorType last, SAX* sax, + input_format_t format = input_format_t::json, + const bool strict = true, + const bool ignore_comments = false) + { + auto ia = detail::input_adapter(std::move(first), std::move(last)); + return format == input_format_t::json + ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict) + : detail::binary_reader(std::move(ia)).sax_parse(format, sax, strict); + } + + template + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, sax_parse(ptr, ptr + len, ...)) + JSON_HEDLEY_NON_NULL(2) + static bool sax_parse(detail::span_input_adapter&& i, SAX* sax, + input_format_t format = input_format_t::json, + const bool strict = true, + const bool ignore_comments = false) + { + auto ia = i.get(); + return format == input_format_t::json + // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg) + ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict) + // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg) + : detail::binary_reader(std::move(ia)).sax_parse(format, sax, strict); + } +#ifndef JSON_NO_IO + /*! + @brief deserialize from stream + @deprecated This stream operator is deprecated and will be removed in + version 4.0.0 of the library. Please use + @ref operator>>(std::istream&, basic_json&) + instead; that is, replace calls like `j << i;` with `i >> j;`. + @since version 1.0.0; deprecated since version 3.0.0 + */ + JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator>>(std::istream&, basic_json&)) + friend std::istream& operator<<(basic_json& j, std::istream& i) + { + return operator>>(i, j); + } + + /*! + @brief deserialize from stream + + Deserializes an input stream to a JSON value. + + @param[in,out] i input stream to read a serialized JSON value from + @param[in,out] j JSON value to write the deserialized input to + + @throw parse_error.101 in case of an unexpected token + @throw parse_error.102 if to_unicode fails or surrogate error + @throw parse_error.103 if to_unicode fails + + @complexity Linear in the length of the input. The parser is a predictive + LL(1) parser. + + @note A UTF-8 byte order mark is silently ignored. + + @liveexample{The example below shows how a JSON value is constructed by + reading a serialization from a stream.,operator_deserialize} + + @sa parse(std::istream&, const parser_callback_t) for a variant with a + parser callback function to filter values while parsing + + @since version 1.0.0 + */ + friend std::istream& operator>>(std::istream& i, basic_json& j) + { + parser(detail::input_adapter(i)).parse(false, j); + return i; + } +#endif // JSON_NO_IO + /// @} + + /////////////////////////// + // convenience functions // + /////////////////////////// + + /*! + @brief return the type as string + + Returns the type name as string to be used in error messages - usually to + indicate that a function was called on a wrong JSON type. + + @return a string representation of a the @a m_type member: + Value type | return value + ----------- | ------------- + null | `"null"` + boolean | `"boolean"` + string | `"string"` + number | `"number"` (for all number types) + object | `"object"` + array | `"array"` + binary | `"binary"` + discarded | `"discarded"` + + @exceptionsafety No-throw guarantee: this function never throws exceptions. + + @complexity Constant. + + @liveexample{The following code exemplifies `type_name()` for all JSON + types.,type_name} + + @sa see @ref type() -- return the type of the JSON value + @sa see @ref operator value_t() -- return the type of the JSON value (implicit) + + @since version 1.0.0, public since 2.1.0, `const char*` and `noexcept` + since 3.0.0 + */ + JSON_HEDLEY_RETURNS_NON_NULL + const char* type_name() const noexcept + { + { + switch (m_type) + { + case value_t::null: + return "null"; + case value_t::object: + return "object"; + case value_t::array: + return "array"; + case value_t::string: + return "string"; + case value_t::boolean: + return "boolean"; + case value_t::binary: + return "binary"; + case value_t::discarded: + return "discarded"; + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + default: + return "number"; + } + } + } + + + JSON_PRIVATE_UNLESS_TESTED: + ////////////////////// + // member variables // + ////////////////////// + + /// the type of the current element + value_t m_type = value_t::null; + + /// the value of the current element + json_value m_value = {}; + +#if JSON_DIAGNOSTICS + /// a pointer to a parent value (for debugging purposes) + basic_json* m_parent = nullptr; +#endif + + ////////////////////////////////////////// + // binary serialization/deserialization // + ////////////////////////////////////////// + + /// @name binary serialization/deserialization support + /// @{ + + public: + /*! + @brief create a CBOR serialization of a given JSON value + + Serializes a given JSON value @a j to a byte vector using the CBOR (Concise + Binary Object Representation) serialization format. CBOR is a binary + serialization format which aims to be more compact than JSON itself, yet + more efficient to parse. + + The library uses the following mapping from JSON values types to + CBOR types according to the CBOR specification (RFC 7049): + + JSON value type | value/range | CBOR type | first byte + --------------- | ------------------------------------------ | ---------------------------------- | --------------- + null | `null` | Null | 0xF6 + boolean | `true` | True | 0xF5 + boolean | `false` | False | 0xF4 + number_integer | -9223372036854775808..-2147483649 | Negative integer (8 bytes follow) | 0x3B + number_integer | -2147483648..-32769 | Negative integer (4 bytes follow) | 0x3A + number_integer | -32768..-129 | Negative integer (2 bytes follow) | 0x39 + number_integer | -128..-25 | Negative integer (1 byte follow) | 0x38 + number_integer | -24..-1 | Negative integer | 0x20..0x37 + number_integer | 0..23 | Integer | 0x00..0x17 + number_integer | 24..255 | Unsigned integer (1 byte follow) | 0x18 + number_integer | 256..65535 | Unsigned integer (2 bytes follow) | 0x19 + number_integer | 65536..4294967295 | Unsigned integer (4 bytes follow) | 0x1A + number_integer | 4294967296..18446744073709551615 | Unsigned integer (8 bytes follow) | 0x1B + number_unsigned | 0..23 | Integer | 0x00..0x17 + number_unsigned | 24..255 | Unsigned integer (1 byte follow) | 0x18 + number_unsigned | 256..65535 | Unsigned integer (2 bytes follow) | 0x19 + number_unsigned | 65536..4294967295 | Unsigned integer (4 bytes follow) | 0x1A + number_unsigned | 4294967296..18446744073709551615 | Unsigned integer (8 bytes follow) | 0x1B + number_float | *any value representable by a float* | Single-Precision Float | 0xFA + number_float | *any value NOT representable by a float* | Double-Precision Float | 0xFB + string | *length*: 0..23 | UTF-8 string | 0x60..0x77 + string | *length*: 23..255 | UTF-8 string (1 byte follow) | 0x78 + string | *length*: 256..65535 | UTF-8 string (2 bytes follow) | 0x79 + string | *length*: 65536..4294967295 | UTF-8 string (4 bytes follow) | 0x7A + string | *length*: 4294967296..18446744073709551615 | UTF-8 string (8 bytes follow) | 0x7B + array | *size*: 0..23 | array | 0x80..0x97 + array | *size*: 23..255 | array (1 byte follow) | 0x98 + array | *size*: 256..65535 | array (2 bytes follow) | 0x99 + array | *size*: 65536..4294967295 | array (4 bytes follow) | 0x9A + array | *size*: 4294967296..18446744073709551615 | array (8 bytes follow) | 0x9B + object | *size*: 0..23 | map | 0xA0..0xB7 + object | *size*: 23..255 | map (1 byte follow) | 0xB8 + object | *size*: 256..65535 | map (2 bytes follow) | 0xB9 + object | *size*: 65536..4294967295 | map (4 bytes follow) | 0xBA + object | *size*: 4294967296..18446744073709551615 | map (8 bytes follow) | 0xBB + binary | *size*: 0..23 | byte string | 0x40..0x57 + binary | *size*: 23..255 | byte string (1 byte follow) | 0x58 + binary | *size*: 256..65535 | byte string (2 bytes follow) | 0x59 + binary | *size*: 65536..4294967295 | byte string (4 bytes follow) | 0x5A + binary | *size*: 4294967296..18446744073709551615 | byte string (8 bytes follow) | 0x5B + + Binary values with subtype are mapped to tagged values (0xD8..0xDB) + depending on the subtype, followed by a byte string, see "binary" cells + in the table above. + + @note The mapping is **complete** in the sense that any JSON value type + can be converted to a CBOR value. + + @note If NaN or Infinity are stored inside a JSON number, they are + serialized properly. This behavior differs from the @ref dump() + function which serializes NaN or Infinity to `null`. + + @note The following CBOR types are not used in the conversion: + - UTF-8 strings terminated by "break" (0x7F) + - arrays terminated by "break" (0x9F) + - maps terminated by "break" (0xBF) + - byte strings terminated by "break" (0x5F) + - date/time (0xC0..0xC1) + - bignum (0xC2..0xC3) + - decimal fraction (0xC4) + - bigfloat (0xC5) + - expected conversions (0xD5..0xD7) + - simple values (0xE0..0xF3, 0xF8) + - undefined (0xF7) + - half-precision floats (0xF9) + - break (0xFF) + + @param[in] j JSON value to serialize + @return CBOR serialization as byte vector + + @complexity Linear in the size of the JSON value @a j. + + @liveexample{The example shows the serialization of a JSON value to a byte + vector in CBOR format.,to_cbor} + + @sa http://cbor.io + @sa see @ref from_cbor(InputType&&, const bool, const bool, const cbor_tag_handler_t) for the + analogous deserialization + @sa see @ref to_msgpack(const basic_json&) for the related MessagePack format + @sa see @ref to_ubjson(const basic_json&, const bool, const bool) for the + related UBJSON format + + @since version 2.0.9; compact representation of floating-point numbers + since version 3.8.0 + */ + static std::vector to_cbor(const basic_json& j) + { + std::vector result; + to_cbor(j, result); + return result; + } + + static void to_cbor(const basic_json& j, detail::output_adapter o) + { + binary_writer(o).write_cbor(j); + } + + static void to_cbor(const basic_json& j, detail::output_adapter o) + { + binary_writer(o).write_cbor(j); + } + + /*! + @brief create a MessagePack serialization of a given JSON value + + Serializes a given JSON value @a j to a byte vector using the MessagePack + serialization format. MessagePack is a binary serialization format which + aims to be more compact than JSON itself, yet more efficient to parse. + + The library uses the following mapping from JSON values types to + MessagePack types according to the MessagePack specification: + + JSON value type | value/range | MessagePack type | first byte + --------------- | --------------------------------- | ---------------- | ---------- + null | `null` | nil | 0xC0 + boolean | `true` | true | 0xC3 + boolean | `false` | false | 0xC2 + number_integer | -9223372036854775808..-2147483649 | int64 | 0xD3 + number_integer | -2147483648..-32769 | int32 | 0xD2 + number_integer | -32768..-129 | int16 | 0xD1 + number_integer | -128..-33 | int8 | 0xD0 + number_integer | -32..-1 | negative fixint | 0xE0..0xFF + number_integer | 0..127 | positive fixint | 0x00..0x7F + number_integer | 128..255 | uint 8 | 0xCC + number_integer | 256..65535 | uint 16 | 0xCD + number_integer | 65536..4294967295 | uint 32 | 0xCE + number_integer | 4294967296..18446744073709551615 | uint 64 | 0xCF + number_unsigned | 0..127 | positive fixint | 0x00..0x7F + number_unsigned | 128..255 | uint 8 | 0xCC + number_unsigned | 256..65535 | uint 16 | 0xCD + number_unsigned | 65536..4294967295 | uint 32 | 0xCE + number_unsigned | 4294967296..18446744073709551615 | uint 64 | 0xCF + number_float | *any value representable by a float* | float 32 | 0xCA + number_float | *any value NOT representable by a float* | float 64 | 0xCB + string | *length*: 0..31 | fixstr | 0xA0..0xBF + string | *length*: 32..255 | str 8 | 0xD9 + string | *length*: 256..65535 | str 16 | 0xDA + string | *length*: 65536..4294967295 | str 32 | 0xDB + array | *size*: 0..15 | fixarray | 0x90..0x9F + array | *size*: 16..65535 | array 16 | 0xDC + array | *size*: 65536..4294967295 | array 32 | 0xDD + object | *size*: 0..15 | fix map | 0x80..0x8F + object | *size*: 16..65535 | map 16 | 0xDE + object | *size*: 65536..4294967295 | map 32 | 0xDF + binary | *size*: 0..255 | bin 8 | 0xC4 + binary | *size*: 256..65535 | bin 16 | 0xC5 + binary | *size*: 65536..4294967295 | bin 32 | 0xC6 + + @note The mapping is **complete** in the sense that any JSON value type + can be converted to a MessagePack value. + + @note The following values can **not** be converted to a MessagePack value: + - strings with more than 4294967295 bytes + - byte strings with more than 4294967295 bytes + - arrays with more than 4294967295 elements + - objects with more than 4294967295 elements + + @note Any MessagePack output created @ref to_msgpack can be successfully + parsed by @ref from_msgpack. + + @note If NaN or Infinity are stored inside a JSON number, they are + serialized properly. This behavior differs from the @ref dump() + function which serializes NaN or Infinity to `null`. + + @param[in] j JSON value to serialize + @return MessagePack serialization as byte vector + + @complexity Linear in the size of the JSON value @a j. + + @liveexample{The example shows the serialization of a JSON value to a byte + vector in MessagePack format.,to_msgpack} + + @sa http://msgpack.org + @sa see @ref from_msgpack for the analogous deserialization + @sa see @ref to_cbor(const basic_json& for the related CBOR format + @sa see @ref to_ubjson(const basic_json&, const bool, const bool) for the + related UBJSON format + + @since version 2.0.9 + */ + static std::vector to_msgpack(const basic_json& j) + { + std::vector result; + to_msgpack(j, result); + return result; + } + + static void to_msgpack(const basic_json& j, detail::output_adapter o) + { + binary_writer(o).write_msgpack(j); + } + + static void to_msgpack(const basic_json& j, detail::output_adapter o) + { + binary_writer(o).write_msgpack(j); + } + + /*! + @brief create a UBJSON serialization of a given JSON value + + Serializes a given JSON value @a j to a byte vector using the UBJSON + (Universal Binary JSON) serialization format. UBJSON aims to be more compact + than JSON itself, yet more efficient to parse. + + The library uses the following mapping from JSON values types to + UBJSON types according to the UBJSON specification: + + JSON value type | value/range | UBJSON type | marker + --------------- | --------------------------------- | ----------- | ------ + null | `null` | null | `Z` + boolean | `true` | true | `T` + boolean | `false` | false | `F` + number_integer | -9223372036854775808..-2147483649 | int64 | `L` + number_integer | -2147483648..-32769 | int32 | `l` + number_integer | -32768..-129 | int16 | `I` + number_integer | -128..127 | int8 | `i` + number_integer | 128..255 | uint8 | `U` + number_integer | 256..32767 | int16 | `I` + number_integer | 32768..2147483647 | int32 | `l` + number_integer | 2147483648..9223372036854775807 | int64 | `L` + number_unsigned | 0..127 | int8 | `i` + number_unsigned | 128..255 | uint8 | `U` + number_unsigned | 256..32767 | int16 | `I` + number_unsigned | 32768..2147483647 | int32 | `l` + number_unsigned | 2147483648..9223372036854775807 | int64 | `L` + number_unsigned | 2147483649..18446744073709551615 | high-precision | `H` + number_float | *any value* | float64 | `D` + string | *with shortest length indicator* | string | `S` + array | *see notes on optimized format* | array | `[` + object | *see notes on optimized format* | map | `{` + + @note The mapping is **complete** in the sense that any JSON value type + can be converted to a UBJSON value. + + @note The following values can **not** be converted to a UBJSON value: + - strings with more than 9223372036854775807 bytes (theoretical) + + @note The following markers are not used in the conversion: + - `Z`: no-op values are not created. + - `C`: single-byte strings are serialized with `S` markers. + + @note Any UBJSON output created @ref to_ubjson can be successfully parsed + by @ref from_ubjson. + + @note If NaN or Infinity are stored inside a JSON number, they are + serialized properly. This behavior differs from the @ref dump() + function which serializes NaN or Infinity to `null`. + + @note The optimized formats for containers are supported: Parameter + @a use_size adds size information to the beginning of a container and + removes the closing marker. Parameter @a use_type further checks + whether all elements of a container have the same type and adds the + type marker to the beginning of the container. The @a use_type + parameter must only be used together with @a use_size = true. Note + that @a use_size = true alone may result in larger representations - + the benefit of this parameter is that the receiving side is + immediately informed on the number of elements of the container. + + @note If the JSON data contains the binary type, the value stored is a list + of integers, as suggested by the UBJSON documentation. In particular, + this means that serialization and the deserialization of a JSON + containing binary values into UBJSON and back will result in a + different JSON object. + + @param[in] j JSON value to serialize + @param[in] use_size whether to add size annotations to container types + @param[in] use_type whether to add type annotations to container types + (must be combined with @a use_size = true) + @return UBJSON serialization as byte vector + + @complexity Linear in the size of the JSON value @a j. + + @liveexample{The example shows the serialization of a JSON value to a byte + vector in UBJSON format.,to_ubjson} + + @sa http://ubjson.org + @sa see @ref from_ubjson(InputType&&, const bool, const bool) for the + analogous deserialization + @sa see @ref to_cbor(const basic_json& for the related CBOR format + @sa see @ref to_msgpack(const basic_json&) for the related MessagePack format + + @since version 3.1.0 + */ + static std::vector to_ubjson(const basic_json& j, + const bool use_size = false, + const bool use_type = false) + { + std::vector result; + to_ubjson(j, result, use_size, use_type); + return result; + } + + static void to_ubjson(const basic_json& j, detail::output_adapter o, + const bool use_size = false, const bool use_type = false) + { + binary_writer(o).write_ubjson(j, use_size, use_type); + } + + static void to_ubjson(const basic_json& j, detail::output_adapter o, + const bool use_size = false, const bool use_type = false) + { + binary_writer(o).write_ubjson(j, use_size, use_type); + } + + + /*! + @brief Serializes the given JSON object `j` to BSON and returns a vector + containing the corresponding BSON-representation. + + BSON (Binary JSON) is a binary format in which zero or more ordered key/value pairs are + stored as a single entity (a so-called document). + + The library uses the following mapping from JSON values types to BSON types: + + JSON value type | value/range | BSON type | marker + --------------- | --------------------------------- | ----------- | ------ + null | `null` | null | 0x0A + boolean | `true`, `false` | boolean | 0x08 + number_integer | -9223372036854775808..-2147483649 | int64 | 0x12 + number_integer | -2147483648..2147483647 | int32 | 0x10 + number_integer | 2147483648..9223372036854775807 | int64 | 0x12 + number_unsigned | 0..2147483647 | int32 | 0x10 + number_unsigned | 2147483648..9223372036854775807 | int64 | 0x12 + number_unsigned | 9223372036854775808..18446744073709551615| -- | -- + number_float | *any value* | double | 0x01 + string | *any value* | string | 0x02 + array | *any value* | document | 0x04 + object | *any value* | document | 0x03 + binary | *any value* | binary | 0x05 + + @warning The mapping is **incomplete**, since only JSON-objects (and things + contained therein) can be serialized to BSON. + Also, integers larger than 9223372036854775807 cannot be serialized to BSON, + and the keys may not contain U+0000, since they are serialized a + zero-terminated c-strings. + + @throw out_of_range.407 if `j.is_number_unsigned() && j.get() > 9223372036854775807` + @throw out_of_range.409 if a key in `j` contains a NULL (U+0000) + @throw type_error.317 if `!j.is_object()` + + @pre The input `j` is required to be an object: `j.is_object() == true`. + + @note Any BSON output created via @ref to_bson can be successfully parsed + by @ref from_bson. + + @param[in] j JSON value to serialize + @return BSON serialization as byte vector + + @complexity Linear in the size of the JSON value @a j. + + @liveexample{The example shows the serialization of a JSON value to a byte + vector in BSON format.,to_bson} + + @sa http://bsonspec.org/spec.html + @sa see @ref from_bson(detail::input_adapter&&, const bool strict) for the + analogous deserialization + @sa see @ref to_ubjson(const basic_json&, const bool, const bool) for the + related UBJSON format + @sa see @ref to_cbor(const basic_json&) for the related CBOR format + @sa see @ref to_msgpack(const basic_json&) for the related MessagePack format + */ + static std::vector to_bson(const basic_json& j) + { + std::vector result; + to_bson(j, result); + return result; + } + + /*! + @brief Serializes the given JSON object `j` to BSON and forwards the + corresponding BSON-representation to the given output_adapter `o`. + @param j The JSON object to convert to BSON. + @param o The output adapter that receives the binary BSON representation. + @pre The input `j` shall be an object: `j.is_object() == true` + @sa see @ref to_bson(const basic_json&) + */ + static void to_bson(const basic_json& j, detail::output_adapter o) + { + binary_writer(o).write_bson(j); + } + + /*! + @copydoc to_bson(const basic_json&, detail::output_adapter) + */ + static void to_bson(const basic_json& j, detail::output_adapter o) + { + binary_writer(o).write_bson(j); + } + + + /*! + @brief create a JSON value from an input in CBOR format + + Deserializes a given input @a i to a JSON value using the CBOR (Concise + Binary Object Representation) serialization format. + + The library maps CBOR types to JSON value types as follows: + + CBOR type | JSON value type | first byte + ---------------------- | --------------- | ---------- + Integer | number_unsigned | 0x00..0x17 + Unsigned integer | number_unsigned | 0x18 + Unsigned integer | number_unsigned | 0x19 + Unsigned integer | number_unsigned | 0x1A + Unsigned integer | number_unsigned | 0x1B + Negative integer | number_integer | 0x20..0x37 + Negative integer | number_integer | 0x38 + Negative integer | number_integer | 0x39 + Negative integer | number_integer | 0x3A + Negative integer | number_integer | 0x3B + Byte string | binary | 0x40..0x57 + Byte string | binary | 0x58 + Byte string | binary | 0x59 + Byte string | binary | 0x5A + Byte string | binary | 0x5B + UTF-8 string | string | 0x60..0x77 + UTF-8 string | string | 0x78 + UTF-8 string | string | 0x79 + UTF-8 string | string | 0x7A + UTF-8 string | string | 0x7B + UTF-8 string | string | 0x7F + array | array | 0x80..0x97 + array | array | 0x98 + array | array | 0x99 + array | array | 0x9A + array | array | 0x9B + array | array | 0x9F + map | object | 0xA0..0xB7 + map | object | 0xB8 + map | object | 0xB9 + map | object | 0xBA + map | object | 0xBB + map | object | 0xBF + False | `false` | 0xF4 + True | `true` | 0xF5 + Null | `null` | 0xF6 + Half-Precision Float | number_float | 0xF9 + Single-Precision Float | number_float | 0xFA + Double-Precision Float | number_float | 0xFB + + @warning The mapping is **incomplete** in the sense that not all CBOR + types can be converted to a JSON value. The following CBOR types + are not supported and will yield parse errors (parse_error.112): + - date/time (0xC0..0xC1) + - bignum (0xC2..0xC3) + - decimal fraction (0xC4) + - bigfloat (0xC5) + - expected conversions (0xD5..0xD7) + - simple values (0xE0..0xF3, 0xF8) + - undefined (0xF7) + + @warning CBOR allows map keys of any type, whereas JSON only allows + strings as keys in object values. Therefore, CBOR maps with keys + other than UTF-8 strings are rejected (parse_error.113). + + @note Any CBOR output created @ref to_cbor can be successfully parsed by + @ref from_cbor. + + @param[in] i an input in CBOR format convertible to an input adapter + @param[in] strict whether to expect the input to be consumed until EOF + (true by default) + @param[in] allow_exceptions whether to throw exceptions in case of a + parse error (optional, true by default) + @param[in] tag_handler how to treat CBOR tags (optional, error by default) + + @return deserialized JSON value; in case of a parse error and + @a allow_exceptions set to `false`, the return value will be + value_t::discarded. + + @throw parse_error.110 if the given input ends prematurely or the end of + file was not reached when @a strict was set to true + @throw parse_error.112 if unsupported features from CBOR were + used in the given input @a v or if the input is not valid CBOR + @throw parse_error.113 if a string was expected as map key, but not found + + @complexity Linear in the size of the input @a i. + + @liveexample{The example shows the deserialization of a byte vector in CBOR + format to a JSON value.,from_cbor} + + @sa http://cbor.io + @sa see @ref to_cbor(const basic_json&) for the analogous serialization + @sa see @ref from_msgpack(InputType&&, const bool, const bool) for the + related MessagePack format + @sa see @ref from_ubjson(InputType&&, const bool, const bool) for the + related UBJSON format + + @since version 2.0.9; parameter @a start_index since 2.1.1; changed to + consume input adapters, removed start_index parameter, and added + @a strict parameter since 3.0.0; added @a allow_exceptions parameter + since 3.2.0; added @a tag_handler parameter since 3.9.0. + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json from_cbor(InputType&& i, + const bool strict = true, + const bool allow_exceptions = true, + const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = detail::input_adapter(std::forward(i)); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler); + return res ? result : basic_json(value_t::discarded); + } + + /*! + @copydoc from_cbor(InputType&&, const bool, const bool, const cbor_tag_handler_t) + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json from_cbor(IteratorType first, IteratorType last, + const bool strict = true, + const bool allow_exceptions = true, + const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = detail::input_adapter(std::move(first), std::move(last)); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler); + return res ? result : basic_json(value_t::discarded); + } + + template + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len)) + static basic_json from_cbor(const T* ptr, std::size_t len, + const bool strict = true, + const bool allow_exceptions = true, + const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error) + { + return from_cbor(ptr, ptr + len, strict, allow_exceptions, tag_handler); + } + + + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len)) + static basic_json from_cbor(detail::span_input_adapter&& i, + const bool strict = true, + const bool allow_exceptions = true, + const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = i.get(); + // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg) + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler); + return res ? result : basic_json(value_t::discarded); + } + + /*! + @brief create a JSON value from an input in MessagePack format + + Deserializes a given input @a i to a JSON value using the MessagePack + serialization format. + + The library maps MessagePack types to JSON value types as follows: + + MessagePack type | JSON value type | first byte + ---------------- | --------------- | ---------- + positive fixint | number_unsigned | 0x00..0x7F + fixmap | object | 0x80..0x8F + fixarray | array | 0x90..0x9F + fixstr | string | 0xA0..0xBF + nil | `null` | 0xC0 + false | `false` | 0xC2 + true | `true` | 0xC3 + float 32 | number_float | 0xCA + float 64 | number_float | 0xCB + uint 8 | number_unsigned | 0xCC + uint 16 | number_unsigned | 0xCD + uint 32 | number_unsigned | 0xCE + uint 64 | number_unsigned | 0xCF + int 8 | number_integer | 0xD0 + int 16 | number_integer | 0xD1 + int 32 | number_integer | 0xD2 + int 64 | number_integer | 0xD3 + str 8 | string | 0xD9 + str 16 | string | 0xDA + str 32 | string | 0xDB + array 16 | array | 0xDC + array 32 | array | 0xDD + map 16 | object | 0xDE + map 32 | object | 0xDF + bin 8 | binary | 0xC4 + bin 16 | binary | 0xC5 + bin 32 | binary | 0xC6 + ext 8 | binary | 0xC7 + ext 16 | binary | 0xC8 + ext 32 | binary | 0xC9 + fixext 1 | binary | 0xD4 + fixext 2 | binary | 0xD5 + fixext 4 | binary | 0xD6 + fixext 8 | binary | 0xD7 + fixext 16 | binary | 0xD8 + negative fixint | number_integer | 0xE0-0xFF + + @note Any MessagePack output created @ref to_msgpack can be successfully + parsed by @ref from_msgpack. + + @param[in] i an input in MessagePack format convertible to an input + adapter + @param[in] strict whether to expect the input to be consumed until EOF + (true by default) + @param[in] allow_exceptions whether to throw exceptions in case of a + parse error (optional, true by default) + + @return deserialized JSON value; in case of a parse error and + @a allow_exceptions set to `false`, the return value will be + value_t::discarded. + + @throw parse_error.110 if the given input ends prematurely or the end of + file was not reached when @a strict was set to true + @throw parse_error.112 if unsupported features from MessagePack were + used in the given input @a i or if the input is not valid MessagePack + @throw parse_error.113 if a string was expected as map key, but not found + + @complexity Linear in the size of the input @a i. + + @liveexample{The example shows the deserialization of a byte vector in + MessagePack format to a JSON value.,from_msgpack} + + @sa http://msgpack.org + @sa see @ref to_msgpack(const basic_json&) for the analogous serialization + @sa see @ref from_cbor(InputType&&, const bool, const bool, const cbor_tag_handler_t) for the + related CBOR format + @sa see @ref from_ubjson(InputType&&, const bool, const bool) for + the related UBJSON format + @sa see @ref from_bson(InputType&&, const bool, const bool) for + the related BSON format + + @since version 2.0.9; parameter @a start_index since 2.1.1; changed to + consume input adapters, removed start_index parameter, and added + @a strict parameter since 3.0.0; added @a allow_exceptions parameter + since 3.2.0 + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json from_msgpack(InputType&& i, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = detail::input_adapter(std::forward(i)); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + /*! + @copydoc from_msgpack(InputType&&, const bool, const bool) + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json from_msgpack(IteratorType first, IteratorType last, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = detail::input_adapter(std::move(first), std::move(last)); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + + template + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len)) + static basic_json from_msgpack(const T* ptr, std::size_t len, + const bool strict = true, + const bool allow_exceptions = true) + { + return from_msgpack(ptr, ptr + len, strict, allow_exceptions); + } + + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len)) + static basic_json from_msgpack(detail::span_input_adapter&& i, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = i.get(); + // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg) + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + + /*! + @brief create a JSON value from an input in UBJSON format + + Deserializes a given input @a i to a JSON value using the UBJSON (Universal + Binary JSON) serialization format. + + The library maps UBJSON types to JSON value types as follows: + + UBJSON type | JSON value type | marker + ----------- | --------------------------------------- | ------ + no-op | *no value, next value is read* | `N` + null | `null` | `Z` + false | `false` | `F` + true | `true` | `T` + float32 | number_float | `d` + float64 | number_float | `D` + uint8 | number_unsigned | `U` + int8 | number_integer | `i` + int16 | number_integer | `I` + int32 | number_integer | `l` + int64 | number_integer | `L` + high-precision number | number_integer, number_unsigned, or number_float - depends on number string | 'H' + string | string | `S` + char | string | `C` + array | array (optimized values are supported) | `[` + object | object (optimized values are supported) | `{` + + @note The mapping is **complete** in the sense that any UBJSON value can + be converted to a JSON value. + + @param[in] i an input in UBJSON format convertible to an input adapter + @param[in] strict whether to expect the input to be consumed until EOF + (true by default) + @param[in] allow_exceptions whether to throw exceptions in case of a + parse error (optional, true by default) + + @return deserialized JSON value; in case of a parse error and + @a allow_exceptions set to `false`, the return value will be + value_t::discarded. + + @throw parse_error.110 if the given input ends prematurely or the end of + file was not reached when @a strict was set to true + @throw parse_error.112 if a parse error occurs + @throw parse_error.113 if a string could not be parsed successfully + + @complexity Linear in the size of the input @a i. + + @liveexample{The example shows the deserialization of a byte vector in + UBJSON format to a JSON value.,from_ubjson} + + @sa http://ubjson.org + @sa see @ref to_ubjson(const basic_json&, const bool, const bool) for the + analogous serialization + @sa see @ref from_cbor(InputType&&, const bool, const bool, const cbor_tag_handler_t) for the + related CBOR format + @sa see @ref from_msgpack(InputType&&, const bool, const bool) for + the related MessagePack format + @sa see @ref from_bson(InputType&&, const bool, const bool) for + the related BSON format + + @since version 3.1.0; added @a allow_exceptions parameter since 3.2.0 + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json from_ubjson(InputType&& i, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = detail::input_adapter(std::forward(i)); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + /*! + @copydoc from_ubjson(InputType&&, const bool, const bool) + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json from_ubjson(IteratorType first, IteratorType last, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = detail::input_adapter(std::move(first), std::move(last)); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + template + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len)) + static basic_json from_ubjson(const T* ptr, std::size_t len, + const bool strict = true, + const bool allow_exceptions = true) + { + return from_ubjson(ptr, ptr + len, strict, allow_exceptions); + } + + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len)) + static basic_json from_ubjson(detail::span_input_adapter&& i, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = i.get(); + // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg) + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + + /*! + @brief Create a JSON value from an input in BSON format + + Deserializes a given input @a i to a JSON value using the BSON (Binary JSON) + serialization format. + + The library maps BSON record types to JSON value types as follows: + + BSON type | BSON marker byte | JSON value type + --------------- | ---------------- | --------------------------- + double | 0x01 | number_float + string | 0x02 | string + document | 0x03 | object + array | 0x04 | array + binary | 0x05 | binary + undefined | 0x06 | still unsupported + ObjectId | 0x07 | still unsupported + boolean | 0x08 | boolean + UTC Date-Time | 0x09 | still unsupported + null | 0x0A | null + Regular Expr. | 0x0B | still unsupported + DB Pointer | 0x0C | still unsupported + JavaScript Code | 0x0D | still unsupported + Symbol | 0x0E | still unsupported + JavaScript Code | 0x0F | still unsupported + int32 | 0x10 | number_integer + Timestamp | 0x11 | still unsupported + 128-bit decimal float | 0x13 | still unsupported + Max Key | 0x7F | still unsupported + Min Key | 0xFF | still unsupported + + @warning The mapping is **incomplete**. The unsupported mappings + are indicated in the table above. + + @param[in] i an input in BSON format convertible to an input adapter + @param[in] strict whether to expect the input to be consumed until EOF + (true by default) + @param[in] allow_exceptions whether to throw exceptions in case of a + parse error (optional, true by default) + + @return deserialized JSON value; in case of a parse error and + @a allow_exceptions set to `false`, the return value will be + value_t::discarded. + + @throw parse_error.114 if an unsupported BSON record type is encountered + + @complexity Linear in the size of the input @a i. + + @liveexample{The example shows the deserialization of a byte vector in + BSON format to a JSON value.,from_bson} + + @sa http://bsonspec.org/spec.html + @sa see @ref to_bson(const basic_json&) for the analogous serialization + @sa see @ref from_cbor(InputType&&, const bool, const bool, const cbor_tag_handler_t) for the + related CBOR format + @sa see @ref from_msgpack(InputType&&, const bool, const bool) for + the related MessagePack format + @sa see @ref from_ubjson(InputType&&, const bool, const bool) for the + related UBJSON format + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json from_bson(InputType&& i, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = detail::input_adapter(std::forward(i)); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + /*! + @copydoc from_bson(InputType&&, const bool, const bool) + */ + template + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json from_bson(IteratorType first, IteratorType last, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = detail::input_adapter(std::move(first), std::move(last)); + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + template + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len)) + static basic_json from_bson(const T* ptr, std::size_t len, + const bool strict = true, + const bool allow_exceptions = true) + { + return from_bson(ptr, ptr + len, strict, allow_exceptions); + } + + JSON_HEDLEY_WARN_UNUSED_RESULT + JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len)) + static basic_json from_bson(detail::span_input_adapter&& i, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + auto ia = i.get(); + // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg) + const bool res = binary_reader(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + /// @} + + ////////////////////////// + // JSON Pointer support // + ////////////////////////// + + /// @name JSON Pointer functions + /// @{ + + /*! + @brief access specified element via JSON Pointer + + Uses a JSON pointer to retrieve a reference to the respective JSON value. + No bound checking is performed. Similar to @ref operator[](const typename + object_t::key_type&), `null` values are created in arrays and objects if + necessary. + + In particular: + - If the JSON pointer points to an object key that does not exist, it + is created an filled with a `null` value before a reference to it + is returned. + - If the JSON pointer points to an array index that does not exist, it + is created an filled with a `null` value before a reference to it + is returned. All indices between the current maximum and the given + index are also filled with `null`. + - The special value `-` is treated as a synonym for the index past the + end. + + @param[in] ptr a JSON pointer + + @return reference to the element pointed to by @a ptr + + @complexity Constant. + + @throw parse_error.106 if an array index begins with '0' + @throw parse_error.109 if an array index was not a number + @throw out_of_range.404 if the JSON pointer can not be resolved + + @liveexample{The behavior is shown in the example.,operatorjson_pointer} + + @since version 2.0.0 + */ + reference operator[](const json_pointer& ptr) + { + return ptr.get_unchecked(this); + } + + /*! + @brief access specified element via JSON Pointer + + Uses a JSON pointer to retrieve a reference to the respective JSON value. + No bound checking is performed. The function does not change the JSON + value; no `null` values are created. In particular, the special value + `-` yields an exception. + + @param[in] ptr JSON pointer to the desired element + + @return const reference to the element pointed to by @a ptr + + @complexity Constant. + + @throw parse_error.106 if an array index begins with '0' + @throw parse_error.109 if an array index was not a number + @throw out_of_range.402 if the array index '-' is used + @throw out_of_range.404 if the JSON pointer can not be resolved + + @liveexample{The behavior is shown in the example.,operatorjson_pointer_const} + + @since version 2.0.0 + */ + const_reference operator[](const json_pointer& ptr) const + { + return ptr.get_unchecked(this); + } + + /*! + @brief access specified element via JSON Pointer + + Returns a reference to the element at with specified JSON pointer @a ptr, + with bounds checking. + + @param[in] ptr JSON pointer to the desired element + + @return reference to the element pointed to by @a ptr + + @throw parse_error.106 if an array index in the passed JSON pointer @a ptr + begins with '0'. See example below. + + @throw parse_error.109 if an array index in the passed JSON pointer @a ptr + is not a number. See example below. + + @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr + is out of range. See example below. + + @throw out_of_range.402 if the array index '-' is used in the passed JSON + pointer @a ptr. As `at` provides checked access (and no elements are + implicitly inserted), the index '-' is always invalid. See example below. + + @throw out_of_range.403 if the JSON pointer describes a key of an object + which cannot be found. See example below. + + @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved. + See example below. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes in the JSON value. + + @complexity Constant. + + @since version 2.0.0 + + @liveexample{The behavior is shown in the example.,at_json_pointer} + */ + reference at(const json_pointer& ptr) + { + return ptr.get_checked(this); + } + + /*! + @brief access specified element via JSON Pointer + + Returns a const reference to the element at with specified JSON pointer @a + ptr, with bounds checking. + + @param[in] ptr JSON pointer to the desired element + + @return reference to the element pointed to by @a ptr + + @throw parse_error.106 if an array index in the passed JSON pointer @a ptr + begins with '0'. See example below. + + @throw parse_error.109 if an array index in the passed JSON pointer @a ptr + is not a number. See example below. + + @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr + is out of range. See example below. + + @throw out_of_range.402 if the array index '-' is used in the passed JSON + pointer @a ptr. As `at` provides checked access (and no elements are + implicitly inserted), the index '-' is always invalid. See example below. + + @throw out_of_range.403 if the JSON pointer describes a key of an object + which cannot be found. See example below. + + @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved. + See example below. + + @exceptionsafety Strong guarantee: if an exception is thrown, there are no + changes in the JSON value. + + @complexity Constant. + + @since version 2.0.0 + + @liveexample{The behavior is shown in the example.,at_json_pointer_const} + */ + const_reference at(const json_pointer& ptr) const + { + return ptr.get_checked(this); + } + + /*! + @brief return flattened JSON value + + The function creates a JSON object whose keys are JSON pointers (see [RFC + 6901](https://tools.ietf.org/html/rfc6901)) and whose values are all + primitive. The original JSON value can be restored using the @ref + unflatten() function. + + @return an object that maps JSON pointers to primitive values + + @note Empty objects and arrays are flattened to `null` and will not be + reconstructed correctly by the @ref unflatten() function. + + @complexity Linear in the size the JSON value. + + @liveexample{The following code shows how a JSON object is flattened to an + object whose keys consist of JSON pointers.,flatten} + + @sa see @ref unflatten() for the reverse function + + @since version 2.0.0 + */ + basic_json flatten() const + { + basic_json result(value_t::object); + json_pointer::flatten("", *this, result); + return result; + } + + /*! + @brief unflatten a previously flattened JSON value + + The function restores the arbitrary nesting of a JSON value that has been + flattened before using the @ref flatten() function. The JSON value must + meet certain constraints: + 1. The value must be an object. + 2. The keys must be JSON pointers (see + [RFC 6901](https://tools.ietf.org/html/rfc6901)) + 3. The mapped values must be primitive JSON types. + + @return the original JSON from a flattened version + + @note Empty objects and arrays are flattened by @ref flatten() to `null` + values and can not unflattened to their original type. Apart from + this example, for a JSON value `j`, the following is always true: + `j == j.flatten().unflatten()`. + + @complexity Linear in the size the JSON value. + + @throw type_error.314 if value is not an object + @throw type_error.315 if object values are not primitive + + @liveexample{The following code shows how a flattened JSON object is + unflattened into the original nested JSON object.,unflatten} + + @sa see @ref flatten() for the reverse function + + @since version 2.0.0 + */ + basic_json unflatten() const + { + return json_pointer::unflatten(*this); + } + + /// @} + + ////////////////////////// + // JSON Patch functions // + ////////////////////////// + + /// @name JSON Patch functions + /// @{ + + /*! + @brief applies a JSON patch + + [JSON Patch](http://jsonpatch.com) defines a JSON document structure for + expressing a sequence of operations to apply to a JSON) document. With + this function, a JSON Patch is applied to the current JSON value by + executing all operations from the patch. + + @param[in] json_patch JSON patch document + @return patched document + + @note The application of a patch is atomic: Either all operations succeed + and the patched document is returned or an exception is thrown. In + any case, the original value is not changed: the patch is applied + to a copy of the value. + + @throw parse_error.104 if the JSON patch does not consist of an array of + objects + + @throw parse_error.105 if the JSON patch is malformed (e.g., mandatory + attributes are missing); example: `"operation add must have member path"` + + @throw out_of_range.401 if an array index is out of range. + + @throw out_of_range.403 if a JSON pointer inside the patch could not be + resolved successfully in the current JSON value; example: `"key baz not + found"` + + @throw out_of_range.405 if JSON pointer has no parent ("add", "remove", + "move") + + @throw other_error.501 if "test" operation was unsuccessful + + @complexity Linear in the size of the JSON value and the length of the + JSON patch. As usually only a fraction of the JSON value is affected by + the patch, the complexity can usually be neglected. + + @liveexample{The following code shows how a JSON patch is applied to a + value.,patch} + + @sa see @ref diff -- create a JSON patch by comparing two JSON values + + @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902) + @sa [RFC 6901 (JSON Pointer)](https://tools.ietf.org/html/rfc6901) + + @since version 2.0.0 + */ + basic_json patch(const basic_json& json_patch) const + { + // make a working copy to apply the patch to + basic_json result = *this; + + // the valid JSON Patch operations + enum class patch_operations {add, remove, replace, move, copy, test, invalid}; + + const auto get_op = [](const std::string & op) + { + if (op == "add") + { + return patch_operations::add; + } + if (op == "remove") + { + return patch_operations::remove; + } + if (op == "replace") + { + return patch_operations::replace; + } + if (op == "move") + { + return patch_operations::move; + } + if (op == "copy") + { + return patch_operations::copy; + } + if (op == "test") + { + return patch_operations::test; + } + + return patch_operations::invalid; + }; + + // wrapper for "add" operation; add value at ptr + const auto operation_add = [&result](json_pointer & ptr, basic_json val) + { + // adding to the root of the target document means replacing it + if (ptr.empty()) + { + result = val; + return; + } + + // make sure the top element of the pointer exists + json_pointer top_pointer = ptr.top(); + if (top_pointer != ptr) + { + result.at(top_pointer); + } + + // get reference to parent of JSON pointer ptr + const auto last_path = ptr.back(); + ptr.pop_back(); + basic_json& parent = result[ptr]; + + switch (parent.m_type) + { + case value_t::null: + case value_t::object: + { + // use operator[] to add value + parent[last_path] = val; + break; + } + + case value_t::array: + { + if (last_path == "-") + { + // special case: append to back + parent.push_back(val); + } + else + { + const auto idx = json_pointer::array_index(last_path); + if (JSON_HEDLEY_UNLIKELY(idx > parent.size())) + { + // avoid undefined behavior + JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", parent)); + } + + // default case: insert add offset + parent.insert(parent.begin() + static_cast(idx), val); + } + break; + } + + // if there exists a parent it cannot be primitive + case value_t::string: // LCOV_EXCL_LINE + case value_t::boolean: // LCOV_EXCL_LINE + case value_t::number_integer: // LCOV_EXCL_LINE + case value_t::number_unsigned: // LCOV_EXCL_LINE + case value_t::number_float: // LCOV_EXCL_LINE + case value_t::binary: // LCOV_EXCL_LINE + case value_t::discarded: // LCOV_EXCL_LINE + default: // LCOV_EXCL_LINE + JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE + } + }; + + // wrapper for "remove" operation; remove value at ptr + const auto operation_remove = [this, &result](json_pointer & ptr) + { + // get reference to parent of JSON pointer ptr + const auto last_path = ptr.back(); + ptr.pop_back(); + basic_json& parent = result.at(ptr); + + // remove child + if (parent.is_object()) + { + // perform range check + auto it = parent.find(last_path); + if (JSON_HEDLEY_LIKELY(it != parent.end())) + { + parent.erase(it); + } + else + { + JSON_THROW(out_of_range::create(403, "key '" + last_path + "' not found", *this)); + } + } + else if (parent.is_array()) + { + // note erase performs range check + parent.erase(json_pointer::array_index(last_path)); + } + }; + + // type check: top level value must be an array + if (JSON_HEDLEY_UNLIKELY(!json_patch.is_array())) + { + JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", json_patch)); + } + + // iterate and apply the operations + for (const auto& val : json_patch) + { + // wrapper to get a value for an operation + const auto get_value = [&val](const std::string & op, + const std::string & member, + bool string_type) -> basic_json & + { + // find value + auto it = val.m_value.object->find(member); + + // context-sensitive error message + const auto error_msg = (op == "op") ? "operation" : "operation '" + op + "'"; + + // check if desired value is present + if (JSON_HEDLEY_UNLIKELY(it == val.m_value.object->end())) + { + // NOLINTNEXTLINE(performance-inefficient-string-concatenation) + JSON_THROW(parse_error::create(105, 0, error_msg + " must have member '" + member + "'", val)); + } + + // check if result is of type string + if (JSON_HEDLEY_UNLIKELY(string_type && !it->second.is_string())) + { + // NOLINTNEXTLINE(performance-inefficient-string-concatenation) + JSON_THROW(parse_error::create(105, 0, error_msg + " must have string member '" + member + "'", val)); + } + + // no error: return value + return it->second; + }; + + // type check: every element of the array must be an object + if (JSON_HEDLEY_UNLIKELY(!val.is_object())) + { + JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", val)); + } + + // collect mandatory members + const auto op = get_value("op", "op", true).template get(); + const auto path = get_value(op, "path", true).template get(); + json_pointer ptr(path); + + switch (get_op(op)) + { + case patch_operations::add: + { + operation_add(ptr, get_value("add", "value", false)); + break; + } + + case patch_operations::remove: + { + operation_remove(ptr); + break; + } + + case patch_operations::replace: + { + // the "path" location must exist - use at() + result.at(ptr) = get_value("replace", "value", false); + break; + } + + case patch_operations::move: + { + const auto from_path = get_value("move", "from", true).template get(); + json_pointer from_ptr(from_path); + + // the "from" location must exist - use at() + basic_json v = result.at(from_ptr); + + // The move operation is functionally identical to a + // "remove" operation on the "from" location, followed + // immediately by an "add" operation at the target + // location with the value that was just removed. + operation_remove(from_ptr); + operation_add(ptr, v); + break; + } + + case patch_operations::copy: + { + const auto from_path = get_value("copy", "from", true).template get(); + const json_pointer from_ptr(from_path); + + // the "from" location must exist - use at() + basic_json v = result.at(from_ptr); + + // The copy is functionally identical to an "add" + // operation at the target location using the value + // specified in the "from" member. + operation_add(ptr, v); + break; + } + + case patch_operations::test: + { + bool success = false; + JSON_TRY + { + // check if "value" matches the one at "path" + // the "path" location must exist - use at() + success = (result.at(ptr) == get_value("test", "value", false)); + } + JSON_INTERNAL_CATCH (out_of_range&) + { + // ignore out of range errors: success remains false + } + + // throw an exception if test fails + if (JSON_HEDLEY_UNLIKELY(!success)) + { + JSON_THROW(other_error::create(501, "unsuccessful: " + val.dump(), val)); + } + + break; + } + + case patch_operations::invalid: + default: + { + // op must be "add", "remove", "replace", "move", "copy", or + // "test" + JSON_THROW(parse_error::create(105, 0, "operation value '" + op + "' is invalid", val)); + } + } + } + + return result; + } + + /*! + @brief creates a diff as a JSON patch + + Creates a [JSON Patch](http://jsonpatch.com) so that value @a source can + be changed into the value @a target by calling @ref patch function. + + @invariant For two JSON values @a source and @a target, the following code + yields always `true`: + @code {.cpp} + source.patch(diff(source, target)) == target; + @endcode + + @note Currently, only `remove`, `add`, and `replace` operations are + generated. + + @param[in] source JSON value to compare from + @param[in] target JSON value to compare against + @param[in] path helper value to create JSON pointers + + @return a JSON patch to convert the @a source to @a target + + @complexity Linear in the lengths of @a source and @a target. + + @liveexample{The following code shows how a JSON patch is created as a + diff for two JSON values.,diff} + + @sa see @ref patch -- apply a JSON patch + @sa see @ref merge_patch -- apply a JSON Merge Patch + + @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902) + + @since version 2.0.0 + */ + JSON_HEDLEY_WARN_UNUSED_RESULT + static basic_json diff(const basic_json& source, const basic_json& target, + const std::string& path = "") + { + // the patch + basic_json result(value_t::array); + + // if the values are the same, return empty patch + if (source == target) + { + return result; + } + + if (source.type() != target.type()) + { + // different types: replace value + result.push_back( + { + {"op", "replace"}, {"path", path}, {"value", target} + }); + return result; + } + + switch (source.type()) + { + case value_t::array: + { + // first pass: traverse common elements + std::size_t i = 0; + while (i < source.size() && i < target.size()) + { + // recursive call to compare array values at index i + auto temp_diff = diff(source[i], target[i], path + "/" + std::to_string(i)); + result.insert(result.end(), temp_diff.begin(), temp_diff.end()); + ++i; + } + + // i now reached the end of at least one array + // in a second pass, traverse the remaining elements + + // remove my remaining elements + const auto end_index = static_cast(result.size()); + while (i < source.size()) + { + // add operations in reverse order to avoid invalid + // indices + result.insert(result.begin() + end_index, object( + { + {"op", "remove"}, + {"path", path + "/" + std::to_string(i)} + })); + ++i; + } + + // add other remaining elements + while (i < target.size()) + { + result.push_back( + { + {"op", "add"}, + {"path", path + "/-"}, + {"value", target[i]} + }); + ++i; + } + + break; + } + + case value_t::object: + { + // first pass: traverse this object's elements + for (auto it = source.cbegin(); it != source.cend(); ++it) + { + // escape the key name to be used in a JSON patch + const auto path_key = path + "/" + detail::escape(it.key()); + + if (target.find(it.key()) != target.end()) + { + // recursive call to compare object values at key it + auto temp_diff = diff(it.value(), target[it.key()], path_key); + result.insert(result.end(), temp_diff.begin(), temp_diff.end()); + } + else + { + // found a key that is not in o -> remove it + result.push_back(object( + { + {"op", "remove"}, {"path", path_key} + })); + } + } + + // second pass: traverse other object's elements + for (auto it = target.cbegin(); it != target.cend(); ++it) + { + if (source.find(it.key()) == source.end()) + { + // found a key that is not in this -> add it + const auto path_key = path + "/" + detail::escape(it.key()); + result.push_back( + { + {"op", "add"}, {"path", path_key}, + {"value", it.value()} + }); + } + } + + break; + } + + case value_t::null: + case value_t::string: + case value_t::boolean: + case value_t::number_integer: + case value_t::number_unsigned: + case value_t::number_float: + case value_t::binary: + case value_t::discarded: + default: + { + // both primitive type: replace value + result.push_back( + { + {"op", "replace"}, {"path", path}, {"value", target} + }); + break; + } + } + + return result; + } + + /// @} + + //////////////////////////////// + // JSON Merge Patch functions // + //////////////////////////////// + + /// @name JSON Merge Patch functions + /// @{ + + /*! + @brief applies a JSON Merge Patch + + The merge patch format is primarily intended for use with the HTTP PATCH + method as a means of describing a set of modifications to a target + resource's content. This function applies a merge patch to the current + JSON value. + + The function implements the following algorithm from Section 2 of + [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396): + + ``` + define MergePatch(Target, Patch): + if Patch is an Object: + if Target is not an Object: + Target = {} // Ignore the contents and set it to an empty Object + for each Name/Value pair in Patch: + if Value is null: + if Name exists in Target: + remove the Name/Value pair from Target + else: + Target[Name] = MergePatch(Target[Name], Value) + return Target + else: + return Patch + ``` + + Thereby, `Target` is the current object; that is, the patch is applied to + the current value. + + @param[in] apply_patch the patch to apply + + @complexity Linear in the lengths of @a patch. + + @liveexample{The following code shows how a JSON Merge Patch is applied to + a JSON document.,merge_patch} + + @sa see @ref patch -- apply a JSON patch + @sa [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396) + + @since version 3.0.0 + */ + void merge_patch(const basic_json& apply_patch) + { + if (apply_patch.is_object()) + { + if (!is_object()) + { + *this = object(); + } + for (auto it = apply_patch.begin(); it != apply_patch.end(); ++it) + { + if (it.value().is_null()) + { + erase(it.key()); + } + else + { + operator[](it.key()).merge_patch(it.value()); + } + } + } + else + { + *this = apply_patch; + } + } + + /// @} +}; + +/*! +@brief user-defined to_string function for JSON values + +This function implements a user-defined to_string for JSON objects. + +@param[in] j a JSON object +@return a std::string object +*/ + +NLOHMANN_BASIC_JSON_TPL_DECLARATION +std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j) +{ + return j.dump(); +} +} // namespace nlohmann + +/////////////////////// +// nonmember support // +/////////////////////// + +// specialization of std::swap, and std::hash +namespace std +{ + +/// hash value for JSON objects +template<> +struct hash +{ + /*! + @brief return a hash value for a JSON object + + @since version 1.0.0 + */ + std::size_t operator()(const nlohmann::json& j) const + { + return nlohmann::detail::hash(j); + } +}; + +/// specialization for std::less +/// @note: do not remove the space after '<', +/// see https://github.com/nlohmann/json/pull/679 +template<> +struct less<::nlohmann::detail::value_t> +{ + /*! + @brief compare two value_t enum values + @since version 3.0.0 + */ + bool operator()(nlohmann::detail::value_t lhs, + nlohmann::detail::value_t rhs) const noexcept + { + return nlohmann::detail::operator<(lhs, rhs); + } +}; + +// C++20 prohibit function specialization in the std namespace. +#ifndef JSON_HAS_CPP_20 + +/*! +@brief exchanges the values of two JSON objects + +@since version 1.0.0 +*/ +template<> +inline void swap(nlohmann::json& j1, nlohmann::json& j2) noexcept( // NOLINT(readability-inconsistent-declaration-parameter-name) + is_nothrow_move_constructible::value&& // NOLINT(misc-redundant-expression) + is_nothrow_move_assignable::value + ) +{ + j1.swap(j2); +} + +#endif + +} // namespace std + +/*! +@brief user-defined string literal for JSON values + +This operator implements a user-defined string literal for JSON objects. It +can be used by adding `"_json"` to a string literal and returns a JSON object +if no parse error occurred. + +@param[in] s a string representation of a JSON object +@param[in] n the length of string @a s +@return a JSON object + +@since version 1.0.0 +*/ +JSON_HEDLEY_NON_NULL(1) +inline nlohmann::json operator "" _json(const char* s, std::size_t n) +{ + return nlohmann::json::parse(s, s + n); +} + +/*! +@brief user-defined string literal for JSON pointer + +This operator implements a user-defined string literal for JSON Pointers. It +can be used by adding `"_json_pointer"` to a string literal and returns a JSON pointer +object if no parse error occurred. + +@param[in] s a string representation of a JSON Pointer +@param[in] n the length of string @a s +@return a JSON pointer object + +@since version 2.0.0 +*/ +JSON_HEDLEY_NON_NULL(1) +inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n) +{ + return nlohmann::json::json_pointer(std::string(s, n)); +} + +#include + +#endif // INCLUDE_NLOHMANN_JSON_HPP_ diff --git a/src/nlohmann/json_fwd.hpp b/src/nlohmann/json_fwd.hpp new file mode 100644 index 00000000000..332227c1ba2 --- /dev/null +++ b/src/nlohmann/json_fwd.hpp @@ -0,0 +1,78 @@ +#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_ +#define INCLUDE_NLOHMANN_JSON_FWD_HPP_ + +#include // int64_t, uint64_t +#include // map +#include // allocator +#include // string +#include // vector + +/*! +@brief namespace for Niels Lohmann +@see https://github.com/nlohmann +@since version 1.0.0 +*/ +namespace nlohmann +{ +/*! +@brief default JSONSerializer template argument + +This serializer ignores the template arguments and uses ADL +([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl)) +for serialization. +*/ +template +struct adl_serializer; + +template class ObjectType = + std::map, + template class ArrayType = std::vector, + class StringType = std::string, class BooleanType = bool, + class NumberIntegerType = std::int64_t, + class NumberUnsignedType = std::uint64_t, + class NumberFloatType = double, + template class AllocatorType = std::allocator, + template class JSONSerializer = + adl_serializer, + class BinaryType = std::vector> +class basic_json; + +/*! +@brief JSON Pointer + +A JSON pointer defines a string syntax for identifying a specific value +within a JSON document. It can be used with functions `at` and +`operator[]`. Furthermore, JSON pointers are the base for JSON patches. + +@sa [RFC 6901](https://tools.ietf.org/html/rfc6901) + +@since version 2.0.0 +*/ +template +class json_pointer; + +/*! +@brief default JSON class + +This type is the default specialization of the @ref basic_json class which +uses the standard template types. + +@since version 1.0.0 +*/ +using json = basic_json<>; + +template +struct ordered_map; + +/*! +@brief ordered JSON class + +This type preserves the insertion order of object keys. + +@since version 3.9.0 +*/ +using ordered_json = basic_json; + +} // namespace nlohmann + +#endif // INCLUDE_NLOHMANN_JSON_FWD_HPP_ diff --git a/src/nlohmann/ordered_map.hpp b/src/nlohmann/ordered_map.hpp new file mode 100644 index 00000000000..cf5f133e708 --- /dev/null +++ b/src/nlohmann/ordered_map.hpp @@ -0,0 +1,190 @@ +#pragma once + +#include // less +#include // initializer_list +#include // input_iterator_tag, iterator_traits +#include // allocator +#include // for out_of_range +#include // enable_if, is_convertible +#include // pair +#include // vector + +#include + +namespace nlohmann +{ + +/// ordered_map: a minimal map-like container that preserves insertion order +/// for use within nlohmann::basic_json +template , + class Allocator = std::allocator>> + struct ordered_map : std::vector, Allocator> +{ + using key_type = Key; + using mapped_type = T; + using Container = std::vector, Allocator>; + using typename Container::iterator; + using typename Container::const_iterator; + using typename Container::size_type; + using typename Container::value_type; + + // Explicit constructors instead of `using Container::Container` + // otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4) + ordered_map(const Allocator& alloc = Allocator()) : Container{alloc} {} + template + ordered_map(It first, It last, const Allocator& alloc = Allocator()) + : Container{first, last, alloc} {} + ordered_map(std::initializer_list init, const Allocator& alloc = Allocator() ) + : Container{init, alloc} {} + + std::pair emplace(const key_type& key, T&& t) + { + for (auto it = this->begin(); it != this->end(); ++it) + { + if (it->first == key) + { + return {it, false}; + } + } + Container::emplace_back(key, t); + return {--this->end(), true}; + } + + T& operator[](const Key& key) + { + return emplace(key, T{}).first->second; + } + + const T& operator[](const Key& key) const + { + return at(key); + } + + T& at(const Key& key) + { + for (auto it = this->begin(); it != this->end(); ++it) + { + if (it->first == key) + { + return it->second; + } + } + + JSON_THROW(std::out_of_range("key not found")); + } + + const T& at(const Key& key) const + { + for (auto it = this->begin(); it != this->end(); ++it) + { + if (it->first == key) + { + return it->second; + } + } + + JSON_THROW(std::out_of_range("key not found")); + } + + size_type erase(const Key& key) + { + for (auto it = this->begin(); it != this->end(); ++it) + { + if (it->first == key) + { + // Since we cannot move const Keys, re-construct them in place + for (auto next = it; ++next != this->end(); ++it) + { + it->~value_type(); // Destroy but keep allocation + new (&*it) value_type{std::move(*next)}; + } + Container::pop_back(); + return 1; + } + } + return 0; + } + + iterator erase(iterator pos) + { + auto it = pos; + + // Since we cannot move const Keys, re-construct them in place + for (auto next = it; ++next != this->end(); ++it) + { + it->~value_type(); // Destroy but keep allocation + new (&*it) value_type{std::move(*next)}; + } + Container::pop_back(); + return pos; + } + + size_type count(const Key& key) const + { + for (auto it = this->begin(); it != this->end(); ++it) + { + if (it->first == key) + { + return 1; + } + } + return 0; + } + + iterator find(const Key& key) + { + for (auto it = this->begin(); it != this->end(); ++it) + { + if (it->first == key) + { + return it; + } + } + return Container::end(); + } + + const_iterator find(const Key& key) const + { + for (auto it = this->begin(); it != this->end(); ++it) + { + if (it->first == key) + { + return it; + } + } + return Container::end(); + } + + std::pair insert( value_type&& value ) + { + return emplace(value.first, std::move(value.second)); + } + + std::pair insert( const value_type& value ) + { + for (auto it = this->begin(); it != this->end(); ++it) + { + if (it->first == value.first) + { + return {it, false}; + } + } + Container::push_back(value); + return {--this->end(), true}; + } + + template + using require_input_iter = typename std::enable_if::iterator_category, + std::input_iterator_tag>::value>::type; + + template> + void insert(InputIt first, InputIt last) + { + for (auto it = first; it != last; ++it) + { + insert(*it); + } + } +}; + +} // namespace nlohmann diff --git a/src/nlohmann/thirdparty/hedley/hedley.hpp b/src/nlohmann/thirdparty/hedley/hedley.hpp new file mode 100644 index 00000000000..b309e989fc7 --- /dev/null +++ b/src/nlohmann/thirdparty/hedley/hedley.hpp @@ -0,0 +1,2044 @@ +#pragma once + +/* Hedley - https://nemequ.github.io/hedley + * Created by Evan Nemerson + * + * To the extent possible under law, the author(s) have dedicated all + * copyright and related and neighboring rights to this software to + * the public domain worldwide. This software is distributed without + * any warranty. + * + * For details, see . + * SPDX-License-Identifier: CC0-1.0 + */ + +#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 15) +#if defined(JSON_HEDLEY_VERSION) + #undef JSON_HEDLEY_VERSION +#endif +#define JSON_HEDLEY_VERSION 15 + +#if defined(JSON_HEDLEY_STRINGIFY_EX) + #undef JSON_HEDLEY_STRINGIFY_EX +#endif +#define JSON_HEDLEY_STRINGIFY_EX(x) #x + +#if defined(JSON_HEDLEY_STRINGIFY) + #undef JSON_HEDLEY_STRINGIFY +#endif +#define JSON_HEDLEY_STRINGIFY(x) JSON_HEDLEY_STRINGIFY_EX(x) + +#if defined(JSON_HEDLEY_CONCAT_EX) + #undef JSON_HEDLEY_CONCAT_EX +#endif +#define JSON_HEDLEY_CONCAT_EX(a,b) a##b + +#if defined(JSON_HEDLEY_CONCAT) + #undef JSON_HEDLEY_CONCAT +#endif +#define JSON_HEDLEY_CONCAT(a,b) JSON_HEDLEY_CONCAT_EX(a,b) + +#if defined(JSON_HEDLEY_CONCAT3_EX) + #undef JSON_HEDLEY_CONCAT3_EX +#endif +#define JSON_HEDLEY_CONCAT3_EX(a,b,c) a##b##c + +#if defined(JSON_HEDLEY_CONCAT3) + #undef JSON_HEDLEY_CONCAT3 +#endif +#define JSON_HEDLEY_CONCAT3(a,b,c) JSON_HEDLEY_CONCAT3_EX(a,b,c) + +#if defined(JSON_HEDLEY_VERSION_ENCODE) + #undef JSON_HEDLEY_VERSION_ENCODE +#endif +#define JSON_HEDLEY_VERSION_ENCODE(major,minor,revision) (((major) * 1000000) + ((minor) * 1000) + (revision)) + +#if defined(JSON_HEDLEY_VERSION_DECODE_MAJOR) + #undef JSON_HEDLEY_VERSION_DECODE_MAJOR +#endif +#define JSON_HEDLEY_VERSION_DECODE_MAJOR(version) ((version) / 1000000) + +#if defined(JSON_HEDLEY_VERSION_DECODE_MINOR) + #undef JSON_HEDLEY_VERSION_DECODE_MINOR +#endif +#define JSON_HEDLEY_VERSION_DECODE_MINOR(version) (((version) % 1000000) / 1000) + +#if defined(JSON_HEDLEY_VERSION_DECODE_REVISION) + #undef JSON_HEDLEY_VERSION_DECODE_REVISION +#endif +#define JSON_HEDLEY_VERSION_DECODE_REVISION(version) ((version) % 1000) + +#if defined(JSON_HEDLEY_GNUC_VERSION) + #undef JSON_HEDLEY_GNUC_VERSION +#endif +#if defined(__GNUC__) && defined(__GNUC_PATCHLEVEL__) + #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) +#elif defined(__GNUC__) + #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, 0) +#endif + +#if defined(JSON_HEDLEY_GNUC_VERSION_CHECK) + #undef JSON_HEDLEY_GNUC_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_GNUC_VERSION) + #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GNUC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_MSVC_VERSION) + #undef JSON_HEDLEY_MSVC_VERSION +#endif +#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000) && !defined(__ICL) + #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100) +#elif defined(_MSC_FULL_VER) && !defined(__ICL) + #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10) +#elif defined(_MSC_VER) && !defined(__ICL) + #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0) +#endif + +#if defined(JSON_HEDLEY_MSVC_VERSION_CHECK) + #undef JSON_HEDLEY_MSVC_VERSION_CHECK +#endif +#if !defined(JSON_HEDLEY_MSVC_VERSION) + #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0) +#elif defined(_MSC_VER) && (_MSC_VER >= 1400) + #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch))) +#elif defined(_MSC_VER) && (_MSC_VER >= 1200) + #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 1000000) + (minor * 10000) + (patch))) +#else + #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_VER >= ((major * 100) + (minor))) +#endif + +#if defined(JSON_HEDLEY_INTEL_VERSION) + #undef JSON_HEDLEY_INTEL_VERSION +#endif +#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && !defined(__ICL) + #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE) +#elif defined(__INTEL_COMPILER) && !defined(__ICL) + #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0) +#endif + +#if defined(JSON_HEDLEY_INTEL_VERSION_CHECK) + #undef JSON_HEDLEY_INTEL_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_INTEL_VERSION) + #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_INTEL_CL_VERSION) + #undef JSON_HEDLEY_INTEL_CL_VERSION +#endif +#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && defined(__ICL) + #define JSON_HEDLEY_INTEL_CL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER, __INTEL_COMPILER_UPDATE, 0) +#endif + +#if defined(JSON_HEDLEY_INTEL_CL_VERSION_CHECK) + #undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_INTEL_CL_VERSION) + #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_CL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_PGI_VERSION) + #undef JSON_HEDLEY_PGI_VERSION +#endif +#if defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__) + #define JSON_HEDLEY_PGI_VERSION JSON_HEDLEY_VERSION_ENCODE(__PGIC__, __PGIC_MINOR__, __PGIC_PATCHLEVEL__) +#endif + +#if defined(JSON_HEDLEY_PGI_VERSION_CHECK) + #undef JSON_HEDLEY_PGI_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_PGI_VERSION) + #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PGI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_SUNPRO_VERSION) + #undef JSON_HEDLEY_SUNPRO_VERSION +#endif +#if defined(__SUNPRO_C) && (__SUNPRO_C > 0x1000) + #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_C >> 16) & 0xf) * 10) + ((__SUNPRO_C >> 12) & 0xf), (((__SUNPRO_C >> 8) & 0xf) * 10) + ((__SUNPRO_C >> 4) & 0xf), (__SUNPRO_C & 0xf) * 10) +#elif defined(__SUNPRO_C) + #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf) +#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000) + #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_CC >> 16) & 0xf) * 10) + ((__SUNPRO_CC >> 12) & 0xf), (((__SUNPRO_CC >> 8) & 0xf) * 10) + ((__SUNPRO_CC >> 4) & 0xf), (__SUNPRO_CC & 0xf) * 10) +#elif defined(__SUNPRO_CC) + #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf) +#endif + +#if defined(JSON_HEDLEY_SUNPRO_VERSION_CHECK) + #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_SUNPRO_VERSION) + #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_SUNPRO_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION) + #undef JSON_HEDLEY_EMSCRIPTEN_VERSION +#endif +#if defined(__EMSCRIPTEN__) + #define JSON_HEDLEY_EMSCRIPTEN_VERSION JSON_HEDLEY_VERSION_ENCODE(__EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__) +#endif + +#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK) + #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION) + #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_EMSCRIPTEN_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_ARM_VERSION) + #undef JSON_HEDLEY_ARM_VERSION +#endif +#if defined(__CC_ARM) && defined(__ARMCOMPILER_VERSION) + #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCOMPILER_VERSION / 1000000, (__ARMCOMPILER_VERSION % 1000000) / 10000, (__ARMCOMPILER_VERSION % 10000) / 100) +#elif defined(__CC_ARM) && defined(__ARMCC_VERSION) + #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCC_VERSION / 1000000, (__ARMCC_VERSION % 1000000) / 10000, (__ARMCC_VERSION % 10000) / 100) +#endif + +#if defined(JSON_HEDLEY_ARM_VERSION_CHECK) + #undef JSON_HEDLEY_ARM_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_ARM_VERSION) + #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_ARM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_IBM_VERSION) + #undef JSON_HEDLEY_IBM_VERSION +#endif +#if defined(__ibmxl__) + #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ibmxl_version__, __ibmxl_release__, __ibmxl_modification__) +#elif defined(__xlC__) && defined(__xlC_ver__) + #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, (__xlC_ver__ >> 8) & 0xff) +#elif defined(__xlC__) + #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, 0) +#endif + +#if defined(JSON_HEDLEY_IBM_VERSION_CHECK) + #undef JSON_HEDLEY_IBM_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_IBM_VERSION) + #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IBM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_VERSION) + #undef JSON_HEDLEY_TI_VERSION +#endif +#if \ + defined(__TI_COMPILER_VERSION__) && \ + ( \ + defined(__TMS470__) || defined(__TI_ARM__) || \ + defined(__MSP430__) || \ + defined(__TMS320C2000__) \ + ) +#if (__TI_COMPILER_VERSION__ >= 16000000) + #define JSON_HEDLEY_TI_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif +#endif + +#if defined(JSON_HEDLEY_TI_VERSION_CHECK) + #undef JSON_HEDLEY_TI_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_VERSION) + #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_CL2000_VERSION) + #undef JSON_HEDLEY_TI_CL2000_VERSION +#endif +#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C2000__) + #define JSON_HEDLEY_TI_CL2000_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif + +#if defined(JSON_HEDLEY_TI_CL2000_VERSION_CHECK) + #undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_CL2000_VERSION) + #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL2000_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_CL430_VERSION) + #undef JSON_HEDLEY_TI_CL430_VERSION +#endif +#if defined(__TI_COMPILER_VERSION__) && defined(__MSP430__) + #define JSON_HEDLEY_TI_CL430_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif + +#if defined(JSON_HEDLEY_TI_CL430_VERSION_CHECK) + #undef JSON_HEDLEY_TI_CL430_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_CL430_VERSION) + #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL430_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_ARMCL_VERSION) + #undef JSON_HEDLEY_TI_ARMCL_VERSION +#endif +#if defined(__TI_COMPILER_VERSION__) && (defined(__TMS470__) || defined(__TI_ARM__)) + #define JSON_HEDLEY_TI_ARMCL_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif + +#if defined(JSON_HEDLEY_TI_ARMCL_VERSION_CHECK) + #undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_ARMCL_VERSION) + #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_ARMCL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_CL6X_VERSION) + #undef JSON_HEDLEY_TI_CL6X_VERSION +#endif +#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C6X__) + #define JSON_HEDLEY_TI_CL6X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif + +#if defined(JSON_HEDLEY_TI_CL6X_VERSION_CHECK) + #undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_CL6X_VERSION) + #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL6X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_CL7X_VERSION) + #undef JSON_HEDLEY_TI_CL7X_VERSION +#endif +#if defined(__TI_COMPILER_VERSION__) && defined(__C7000__) + #define JSON_HEDLEY_TI_CL7X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif + +#if defined(JSON_HEDLEY_TI_CL7X_VERSION_CHECK) + #undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_CL7X_VERSION) + #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL7X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_CLPRU_VERSION) + #undef JSON_HEDLEY_TI_CLPRU_VERSION +#endif +#if defined(__TI_COMPILER_VERSION__) && defined(__PRU__) + #define JSON_HEDLEY_TI_CLPRU_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif + +#if defined(JSON_HEDLEY_TI_CLPRU_VERSION_CHECK) + #undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_CLPRU_VERSION) + #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CLPRU_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_CRAY_VERSION) + #undef JSON_HEDLEY_CRAY_VERSION +#endif +#if defined(_CRAYC) + #if defined(_RELEASE_PATCHLEVEL) + #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, _RELEASE_PATCHLEVEL) + #else + #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, 0) + #endif +#endif + +#if defined(JSON_HEDLEY_CRAY_VERSION_CHECK) + #undef JSON_HEDLEY_CRAY_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_CRAY_VERSION) + #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_CRAY_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_IAR_VERSION) + #undef JSON_HEDLEY_IAR_VERSION +#endif +#if defined(__IAR_SYSTEMS_ICC__) + #if __VER__ > 1000 + #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000)) + #else + #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(__VER__ / 100, __VER__ % 100, 0) + #endif +#endif + +#if defined(JSON_HEDLEY_IAR_VERSION_CHECK) + #undef JSON_HEDLEY_IAR_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_IAR_VERSION) + #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IAR_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TINYC_VERSION) + #undef JSON_HEDLEY_TINYC_VERSION +#endif +#if defined(__TINYC__) + #define JSON_HEDLEY_TINYC_VERSION JSON_HEDLEY_VERSION_ENCODE(__TINYC__ / 1000, (__TINYC__ / 100) % 10, __TINYC__ % 100) +#endif + +#if defined(JSON_HEDLEY_TINYC_VERSION_CHECK) + #undef JSON_HEDLEY_TINYC_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TINYC_VERSION) + #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TINYC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_DMC_VERSION) + #undef JSON_HEDLEY_DMC_VERSION +#endif +#if defined(__DMC__) + #define JSON_HEDLEY_DMC_VERSION JSON_HEDLEY_VERSION_ENCODE(__DMC__ >> 8, (__DMC__ >> 4) & 0xf, __DMC__ & 0xf) +#endif + +#if defined(JSON_HEDLEY_DMC_VERSION_CHECK) + #undef JSON_HEDLEY_DMC_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_DMC_VERSION) + #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_DMC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_COMPCERT_VERSION) + #undef JSON_HEDLEY_COMPCERT_VERSION +#endif +#if defined(__COMPCERT_VERSION__) + #define JSON_HEDLEY_COMPCERT_VERSION JSON_HEDLEY_VERSION_ENCODE(__COMPCERT_VERSION__ / 10000, (__COMPCERT_VERSION__ / 100) % 100, __COMPCERT_VERSION__ % 100) +#endif + +#if defined(JSON_HEDLEY_COMPCERT_VERSION_CHECK) + #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_COMPCERT_VERSION) + #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_COMPCERT_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_PELLES_VERSION) + #undef JSON_HEDLEY_PELLES_VERSION +#endif +#if defined(__POCC__) + #define JSON_HEDLEY_PELLES_VERSION JSON_HEDLEY_VERSION_ENCODE(__POCC__ / 100, __POCC__ % 100, 0) +#endif + +#if defined(JSON_HEDLEY_PELLES_VERSION_CHECK) + #undef JSON_HEDLEY_PELLES_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_PELLES_VERSION) + #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PELLES_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_MCST_LCC_VERSION) + #undef JSON_HEDLEY_MCST_LCC_VERSION +#endif +#if defined(__LCC__) && defined(__LCC_MINOR__) + #define JSON_HEDLEY_MCST_LCC_VERSION JSON_HEDLEY_VERSION_ENCODE(__LCC__ / 100, __LCC__ % 100, __LCC_MINOR__) +#endif + +#if defined(JSON_HEDLEY_MCST_LCC_VERSION_CHECK) + #undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_MCST_LCC_VERSION) + #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_MCST_LCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_GCC_VERSION) + #undef JSON_HEDLEY_GCC_VERSION +#endif +#if \ + defined(JSON_HEDLEY_GNUC_VERSION) && \ + !defined(__clang__) && \ + !defined(JSON_HEDLEY_INTEL_VERSION) && \ + !defined(JSON_HEDLEY_PGI_VERSION) && \ + !defined(JSON_HEDLEY_ARM_VERSION) && \ + !defined(JSON_HEDLEY_CRAY_VERSION) && \ + !defined(JSON_HEDLEY_TI_VERSION) && \ + !defined(JSON_HEDLEY_TI_ARMCL_VERSION) && \ + !defined(JSON_HEDLEY_TI_CL430_VERSION) && \ + !defined(JSON_HEDLEY_TI_CL2000_VERSION) && \ + !defined(JSON_HEDLEY_TI_CL6X_VERSION) && \ + !defined(JSON_HEDLEY_TI_CL7X_VERSION) && \ + !defined(JSON_HEDLEY_TI_CLPRU_VERSION) && \ + !defined(__COMPCERT__) && \ + !defined(JSON_HEDLEY_MCST_LCC_VERSION) + #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION +#endif + +#if defined(JSON_HEDLEY_GCC_VERSION_CHECK) + #undef JSON_HEDLEY_GCC_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_GCC_VERSION) + #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_HAS_ATTRIBUTE) + #undef JSON_HEDLEY_HAS_ATTRIBUTE +#endif +#if \ + defined(__has_attribute) && \ + ( \ + (!defined(JSON_HEDLEY_IAR_VERSION) || JSON_HEDLEY_IAR_VERSION_CHECK(8,5,9)) \ + ) +# define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute) +#else +# define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE) + #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE +#endif +#if defined(__has_attribute) + #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute) +#else + #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_ATTRIBUTE) + #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE +#endif +#if defined(__has_attribute) + #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute) +#else + #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE) + #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE +#endif +#if \ + defined(__has_cpp_attribute) && \ + defined(__cplusplus) && \ + (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) + #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute) +#else + #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0) +#endif + +#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS) + #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS +#endif +#if !defined(__cplusplus) || !defined(__has_cpp_attribute) + #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0) +#elif \ + !defined(JSON_HEDLEY_PGI_VERSION) && \ + !defined(JSON_HEDLEY_IAR_VERSION) && \ + (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) && \ + (!defined(JSON_HEDLEY_MSVC_VERSION) || JSON_HEDLEY_MSVC_VERSION_CHECK(19,20,0)) + #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute) +#else + #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE) + #undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE +#endif +#if defined(__has_cpp_attribute) && defined(__cplusplus) + #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute) +#else + #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE) + #undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE +#endif +#if defined(__has_cpp_attribute) && defined(__cplusplus) + #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute) +#else + #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_HAS_BUILTIN) + #undef JSON_HEDLEY_HAS_BUILTIN +#endif +#if defined(__has_builtin) + #define JSON_HEDLEY_HAS_BUILTIN(builtin) __has_builtin(builtin) +#else + #define JSON_HEDLEY_HAS_BUILTIN(builtin) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_BUILTIN) + #undef JSON_HEDLEY_GNUC_HAS_BUILTIN +#endif +#if defined(__has_builtin) + #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin) +#else + #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_BUILTIN) + #undef JSON_HEDLEY_GCC_HAS_BUILTIN +#endif +#if defined(__has_builtin) + #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin) +#else + #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_HAS_FEATURE) + #undef JSON_HEDLEY_HAS_FEATURE +#endif +#if defined(__has_feature) + #define JSON_HEDLEY_HAS_FEATURE(feature) __has_feature(feature) +#else + #define JSON_HEDLEY_HAS_FEATURE(feature) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_FEATURE) + #undef JSON_HEDLEY_GNUC_HAS_FEATURE +#endif +#if defined(__has_feature) + #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature) +#else + #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_FEATURE) + #undef JSON_HEDLEY_GCC_HAS_FEATURE +#endif +#if defined(__has_feature) + #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature) +#else + #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_HAS_EXTENSION) + #undef JSON_HEDLEY_HAS_EXTENSION +#endif +#if defined(__has_extension) + #define JSON_HEDLEY_HAS_EXTENSION(extension) __has_extension(extension) +#else + #define JSON_HEDLEY_HAS_EXTENSION(extension) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_EXTENSION) + #undef JSON_HEDLEY_GNUC_HAS_EXTENSION +#endif +#if defined(__has_extension) + #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension) +#else + #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_EXTENSION) + #undef JSON_HEDLEY_GCC_HAS_EXTENSION +#endif +#if defined(__has_extension) + #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension) +#else + #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE) + #undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE +#endif +#if defined(__has_declspec_attribute) + #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) __has_declspec_attribute(attribute) +#else + #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE) + #undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE +#endif +#if defined(__has_declspec_attribute) + #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute) +#else + #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE) + #undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE +#endif +#if defined(__has_declspec_attribute) + #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute) +#else + #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_HAS_WARNING) + #undef JSON_HEDLEY_HAS_WARNING +#endif +#if defined(__has_warning) + #define JSON_HEDLEY_HAS_WARNING(warning) __has_warning(warning) +#else + #define JSON_HEDLEY_HAS_WARNING(warning) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_WARNING) + #undef JSON_HEDLEY_GNUC_HAS_WARNING +#endif +#if defined(__has_warning) + #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning) +#else + #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_WARNING) + #undef JSON_HEDLEY_GCC_HAS_WARNING +#endif +#if defined(__has_warning) + #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning) +#else + #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if \ + (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \ + defined(__clang__) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \ + JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \ + (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR)) + #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value) +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) + #define JSON_HEDLEY_PRAGMA(value) __pragma(value) +#else + #define JSON_HEDLEY_PRAGMA(value) +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH) + #undef JSON_HEDLEY_DIAGNOSTIC_PUSH +#endif +#if defined(JSON_HEDLEY_DIAGNOSTIC_POP) + #undef JSON_HEDLEY_DIAGNOSTIC_POP +#endif +#if defined(__clang__) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop") +#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop") +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push)) + #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop)) +#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop") +#elif \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop") +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)") +#else + #define JSON_HEDLEY_DIAGNOSTIC_PUSH + #define JSON_HEDLEY_DIAGNOSTIC_POP +#endif + +/* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for + HEDLEY INTERNAL USE ONLY. API subject to change without notice. */ +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ +#endif +#if defined(__cplusplus) +# if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat") +# if JSON_HEDLEY_HAS_WARNING("-Wc++17-extensions") +# if JSON_HEDLEY_HAS_WARNING("-Wc++1z-extensions") +# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \ + _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \ + _Pragma("clang diagnostic ignored \"-Wc++1z-extensions\"") \ + xpr \ + JSON_HEDLEY_DIAGNOSTIC_POP +# else +# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \ + _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \ + xpr \ + JSON_HEDLEY_DIAGNOSTIC_POP +# endif +# else +# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \ + xpr \ + JSON_HEDLEY_DIAGNOSTIC_POP +# endif +# endif +#endif +#if !defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x +#endif + +#if defined(JSON_HEDLEY_CONST_CAST) + #undef JSON_HEDLEY_CONST_CAST +#endif +#if defined(__cplusplus) +# define JSON_HEDLEY_CONST_CAST(T, expr) (const_cast(expr)) +#elif \ + JSON_HEDLEY_HAS_WARNING("-Wcast-qual") || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) +# define JSON_HEDLEY_CONST_CAST(T, expr) (__extension__ ({ \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL \ + ((T) (expr)); \ + JSON_HEDLEY_DIAGNOSTIC_POP \ + })) +#else +# define JSON_HEDLEY_CONST_CAST(T, expr) ((T) (expr)) +#endif + +#if defined(JSON_HEDLEY_REINTERPRET_CAST) + #undef JSON_HEDLEY_REINTERPRET_CAST +#endif +#if defined(__cplusplus) + #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast(expr)) +#else + #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) ((T) (expr)) +#endif + +#if defined(JSON_HEDLEY_STATIC_CAST) + #undef JSON_HEDLEY_STATIC_CAST +#endif +#if defined(__cplusplus) + #define JSON_HEDLEY_STATIC_CAST(T, expr) (static_cast(expr)) +#else + #define JSON_HEDLEY_STATIC_CAST(T, expr) ((T) (expr)) +#endif + +#if defined(JSON_HEDLEY_CPP_CAST) + #undef JSON_HEDLEY_CPP_CAST +#endif +#if defined(__cplusplus) +# if JSON_HEDLEY_HAS_WARNING("-Wold-style-cast") +# define JSON_HEDLEY_CPP_CAST(T, expr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wold-style-cast\"") \ + ((T) (expr)) \ + JSON_HEDLEY_DIAGNOSTIC_POP +# elif JSON_HEDLEY_IAR_VERSION_CHECK(8,3,0) +# define JSON_HEDLEY_CPP_CAST(T, expr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("diag_suppress=Pe137") \ + JSON_HEDLEY_DIAGNOSTIC_POP +# else +# define JSON_HEDLEY_CPP_CAST(T, expr) ((T) (expr)) +# endif +#else +# define JSON_HEDLEY_CPP_CAST(T, expr) (expr) +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wdeprecated-declarations") + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") +#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)") +#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:1478 1786)) +#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1216,1444,1445") +#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996)) +#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444") +#elif \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718") +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && !defined(__cplusplus) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,E_DEPRECATED_ATT,E_DEPRECATED_ATT_MESS)") +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && defined(__cplusplus) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,symdeprecated,symdeprecated2)") +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress=Pe1444,Pe1215") +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warn(disable:2241)") +#else + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas") + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"") +#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)") +#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:161)) +#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"") +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:4068)) +#elif \ + JSON_HEDLEY_TI_VERSION_CHECK(16,9,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163") +#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163") +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161") +#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 161") +#else + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wunknown-attributes") + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("clang diagnostic ignored \"-Wunknown-attributes\"") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") +#elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)") +#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:1292)) +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030)) +#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097,1098") +#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097") +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("error_messages(off,attrskipunsup)") +#elif \ + JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173") +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress=Pe1097") +#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097") +#else + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wcast-qual") + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("clang diagnostic ignored \"-Wcast-qual\"") +#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("warning(disable:2203 2331)") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("GCC diagnostic ignored \"-Wcast-qual\"") +#else + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wunused-function") + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("clang diagnostic ignored \"-Wunused-function\"") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("GCC diagnostic ignored \"-Wunused-function\"") +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(1,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION __pragma(warning(disable:4505)) +#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("diag_suppress 3142") +#else + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION +#endif + +#if defined(JSON_HEDLEY_DEPRECATED) + #undef JSON_HEDLEY_DEPRECATED +#endif +#if defined(JSON_HEDLEY_DEPRECATED_FOR) + #undef JSON_HEDLEY_DEPRECATED_FOR +#endif +#if \ + JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since)) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement)) +#elif \ + (JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) && !defined(JSON_HEDLEY_IAR_VERSION)) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(18,1,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since))) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement))) +#elif defined(__cplusplus) && (__cplusplus >= 201402L) + #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]]) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]]) +#elif \ + JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) + #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__)) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__)) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ + JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated) +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_DEPRECATED(since) _Pragma("deprecated") + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) _Pragma("deprecated") +#else + #define JSON_HEDLEY_DEPRECATED(since) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) +#endif + +#if defined(JSON_HEDLEY_UNAVAILABLE) + #undef JSON_HEDLEY_UNAVAILABLE +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since))) +#else + #define JSON_HEDLEY_UNAVAILABLE(available_since) +#endif + +#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT) + #undef JSON_HEDLEY_WARN_UNUSED_RESULT +#endif +#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT_MSG) + #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__)) + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) __attribute__((__warn_unused_result__)) +#elif (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L) + #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]]) +#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) + #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) +#elif defined(_Check_return_) /* SAL */ + #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_ + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) _Check_return_ +#else + #define JSON_HEDLEY_WARN_UNUSED_RESULT + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) +#endif + +#if defined(JSON_HEDLEY_SENTINEL) + #undef JSON_HEDLEY_SENTINEL +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position))) +#else + #define JSON_HEDLEY_SENTINEL(position) +#endif + +#if defined(JSON_HEDLEY_NO_RETURN) + #undef JSON_HEDLEY_NO_RETURN +#endif +#if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_NO_RETURN __noreturn +#elif \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__)) +#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L + #define JSON_HEDLEY_NO_RETURN _Noreturn +#elif defined(__cplusplus) && (__cplusplus >= 201103L) + #define JSON_HEDLEY_NO_RETURN JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]]) +#elif \ + JSON_HEDLEY_HAS_ATTRIBUTE(noreturn) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,2,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) + #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__)) +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) + #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return") +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_NO_RETURN __declspec(noreturn) +#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus) + #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;") +#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0) + #define JSON_HEDLEY_NO_RETURN __attribute((noreturn)) +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0) + #define JSON_HEDLEY_NO_RETURN __declspec(noreturn) +#else + #define JSON_HEDLEY_NO_RETURN +#endif + +#if defined(JSON_HEDLEY_NO_ESCAPE) + #undef JSON_HEDLEY_NO_ESCAPE +#endif +#if JSON_HEDLEY_HAS_ATTRIBUTE(noescape) + #define JSON_HEDLEY_NO_ESCAPE __attribute__((__noescape__)) +#else + #define JSON_HEDLEY_NO_ESCAPE +#endif + +#if defined(JSON_HEDLEY_UNREACHABLE) + #undef JSON_HEDLEY_UNREACHABLE +#endif +#if defined(JSON_HEDLEY_UNREACHABLE_RETURN) + #undef JSON_HEDLEY_UNREACHABLE_RETURN +#endif +#if defined(JSON_HEDLEY_ASSUME) + #undef JSON_HEDLEY_ASSUME +#endif +#if \ + JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_ASSUME(expr) __assume(expr) +#elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume) + #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr) +#elif \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) + #if defined(__cplusplus) + #define JSON_HEDLEY_ASSUME(expr) std::_nassert(expr) + #else + #define JSON_HEDLEY_ASSUME(expr) _nassert(expr) + #endif +#endif +#if \ + (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && (!defined(JSON_HEDLEY_ARM_VERSION))) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(18,10,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5) || \ + JSON_HEDLEY_CRAY_VERSION_CHECK(10,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable() +#elif defined(JSON_HEDLEY_ASSUME) + #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0) +#endif +#if !defined(JSON_HEDLEY_ASSUME) + #if defined(JSON_HEDLEY_UNREACHABLE) + #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, ((expr) ? 1 : (JSON_HEDLEY_UNREACHABLE(), 1))) + #else + #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, expr) + #endif +#endif +#if defined(JSON_HEDLEY_UNREACHABLE) + #if \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) + #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (JSON_HEDLEY_STATIC_CAST(void, JSON_HEDLEY_ASSUME(0)), (value)) + #else + #define JSON_HEDLEY_UNREACHABLE_RETURN(value) JSON_HEDLEY_UNREACHABLE() + #endif +#else + #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (value) +#endif +#if !defined(JSON_HEDLEY_UNREACHABLE) + #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0) +#endif + +JSON_HEDLEY_DIAGNOSTIC_PUSH +#if JSON_HEDLEY_HAS_WARNING("-Wpedantic") + #pragma clang diagnostic ignored "-Wpedantic" +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus) + #pragma clang diagnostic ignored "-Wc++98-compat-pedantic" +#endif +#if JSON_HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros",4,0,0) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wvariadic-macros" + #elif defined(JSON_HEDLEY_GCC_VERSION) + #pragma GCC diagnostic ignored "-Wvariadic-macros" + #endif +#endif +#if defined(JSON_HEDLEY_NON_NULL) + #undef JSON_HEDLEY_NON_NULL +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(nonnull) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) + #define JSON_HEDLEY_NON_NULL(...) __attribute__((__nonnull__(__VA_ARGS__))) +#else + #define JSON_HEDLEY_NON_NULL(...) +#endif +JSON_HEDLEY_DIAGNOSTIC_POP + +#if defined(JSON_HEDLEY_PRINTF_FORMAT) + #undef JSON_HEDLEY_PRINTF_FORMAT +#endif +#if defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && !defined(__USE_MINGW_ANSI_STDIO) + #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(ms_printf, string_idx, first_to_check))) +#elif defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && defined(__USE_MINGW_ANSI_STDIO) + #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(gnu_printf, string_idx, first_to_check))) +#elif \ + JSON_HEDLEY_HAS_ATTRIBUTE(format) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check))) +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0) + #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check)) +#else + #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) +#endif + +#if defined(JSON_HEDLEY_CONSTEXPR) + #undef JSON_HEDLEY_CONSTEXPR +#endif +#if defined(__cplusplus) + #if __cplusplus >= 201103L + #define JSON_HEDLEY_CONSTEXPR JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr) + #endif +#endif +#if !defined(JSON_HEDLEY_CONSTEXPR) + #define JSON_HEDLEY_CONSTEXPR +#endif + +#if defined(JSON_HEDLEY_PREDICT) + #undef JSON_HEDLEY_PREDICT +#endif +#if defined(JSON_HEDLEY_LIKELY) + #undef JSON_HEDLEY_LIKELY +#endif +#if defined(JSON_HEDLEY_UNLIKELY) + #undef JSON_HEDLEY_UNLIKELY +#endif +#if defined(JSON_HEDLEY_UNPREDICTABLE) + #undef JSON_HEDLEY_UNPREDICTABLE +#endif +#if JSON_HEDLEY_HAS_BUILTIN(__builtin_unpredictable) + #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable((expr)) +#endif +#if \ + (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) && !defined(JSON_HEDLEY_PGI_VERSION)) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) +# define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability( (expr), (value), (probability)) +# define JSON_HEDLEY_PREDICT_TRUE(expr, probability) __builtin_expect_with_probability(!!(expr), 1 , (probability)) +# define JSON_HEDLEY_PREDICT_FALSE(expr, probability) __builtin_expect_with_probability(!!(expr), 0 , (probability)) +# define JSON_HEDLEY_LIKELY(expr) __builtin_expect (!!(expr), 1 ) +# define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect (!!(expr), 0 ) +#elif \ + (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27) || \ + JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) +# define JSON_HEDLEY_PREDICT(expr, expected, probability) \ + (((probability) >= 0.9) ? __builtin_expect((expr), (expected)) : (JSON_HEDLEY_STATIC_CAST(void, expected), (expr))) +# define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \ + (__extension__ ({ \ + double hedley_probability_ = (probability); \ + ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 1) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 0) : !!(expr))); \ + })) +# define JSON_HEDLEY_PREDICT_FALSE(expr, probability) \ + (__extension__ ({ \ + double hedley_probability_ = (probability); \ + ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 0) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 1) : !!(expr))); \ + })) +# define JSON_HEDLEY_LIKELY(expr) __builtin_expect(!!(expr), 1) +# define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0) +#else +# define JSON_HEDLEY_PREDICT(expr, expected, probability) (JSON_HEDLEY_STATIC_CAST(void, expected), (expr)) +# define JSON_HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr)) +# define JSON_HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr)) +# define JSON_HEDLEY_LIKELY(expr) (!!(expr)) +# define JSON_HEDLEY_UNLIKELY(expr) (!!(expr)) +#endif +#if !defined(JSON_HEDLEY_UNPREDICTABLE) + #define JSON_HEDLEY_UNPREDICTABLE(expr) JSON_HEDLEY_PREDICT(expr, 1, 0.5) +#endif + +#if defined(JSON_HEDLEY_MALLOC) + #undef JSON_HEDLEY_MALLOC +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(malloc) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_MALLOC __attribute__((__malloc__)) +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) + #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory") +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_MALLOC __declspec(restrict) +#else + #define JSON_HEDLEY_MALLOC +#endif + +#if defined(JSON_HEDLEY_PURE) + #undef JSON_HEDLEY_PURE +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(pure) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(2,96,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) +# define JSON_HEDLEY_PURE __attribute__((__pure__)) +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) +# define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data") +#elif defined(__cplusplus) && \ + ( \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) \ + ) +# define JSON_HEDLEY_PURE _Pragma("FUNC_IS_PURE;") +#else +# define JSON_HEDLEY_PURE +#endif + +#if defined(JSON_HEDLEY_CONST) + #undef JSON_HEDLEY_CONST +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(const) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(2,5,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_CONST __attribute__((__const__)) +#elif \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) + #define JSON_HEDLEY_CONST _Pragma("no_side_effect") +#else + #define JSON_HEDLEY_CONST JSON_HEDLEY_PURE +#endif + +#if defined(JSON_HEDLEY_RESTRICT) + #undef JSON_HEDLEY_RESTRICT +#endif +#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus) + #define JSON_HEDLEY_RESTRICT restrict +#elif \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ + JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,4) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \ + defined(__clang__) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_RESTRICT __restrict +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus) + #define JSON_HEDLEY_RESTRICT _Restrict +#else + #define JSON_HEDLEY_RESTRICT +#endif + +#if defined(JSON_HEDLEY_INLINE) + #undef JSON_HEDLEY_INLINE +#endif +#if \ + (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \ + (defined(__cplusplus) && (__cplusplus >= 199711L)) + #define JSON_HEDLEY_INLINE inline +#elif \ + defined(JSON_HEDLEY_GCC_VERSION) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(6,2,0) + #define JSON_HEDLEY_INLINE __inline__ +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,1,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_INLINE __inline +#else + #define JSON_HEDLEY_INLINE +#endif + +#if defined(JSON_HEDLEY_ALWAYS_INLINE) + #undef JSON_HEDLEY_ALWAYS_INLINE +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(always_inline) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) +# define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) +# define JSON_HEDLEY_ALWAYS_INLINE __forceinline +#elif defined(__cplusplus) && \ + ( \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) \ + ) +# define JSON_HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;") +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) +# define JSON_HEDLEY_ALWAYS_INLINE _Pragma("inline=forced") +#else +# define JSON_HEDLEY_ALWAYS_INLINE JSON_HEDLEY_INLINE +#endif + +#if defined(JSON_HEDLEY_NEVER_INLINE) + #undef JSON_HEDLEY_NEVER_INLINE +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(noinline) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) + #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__)) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline) +#elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0) + #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline") +#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus) + #define JSON_HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;") +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_NEVER_INLINE _Pragma("inline=never") +#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0) + #define JSON_HEDLEY_NEVER_INLINE __attribute((noinline)) +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0) + #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline) +#else + #define JSON_HEDLEY_NEVER_INLINE +#endif + +#if defined(JSON_HEDLEY_PRIVATE) + #undef JSON_HEDLEY_PRIVATE +#endif +#if defined(JSON_HEDLEY_PUBLIC) + #undef JSON_HEDLEY_PUBLIC +#endif +#if defined(JSON_HEDLEY_IMPORT) + #undef JSON_HEDLEY_IMPORT +#endif +#if defined(_WIN32) || defined(__CYGWIN__) +# define JSON_HEDLEY_PRIVATE +# define JSON_HEDLEY_PUBLIC __declspec(dllexport) +# define JSON_HEDLEY_IMPORT __declspec(dllimport) +#else +# if \ + JSON_HEDLEY_HAS_ATTRIBUTE(visibility) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \ + ( \ + defined(__TI_EABI__) && \ + ( \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) \ + ) \ + ) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) +# define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden"))) +# define JSON_HEDLEY_PUBLIC __attribute__((__visibility__("default"))) +# else +# define JSON_HEDLEY_PRIVATE +# define JSON_HEDLEY_PUBLIC +# endif +# define JSON_HEDLEY_IMPORT extern +#endif + +#if defined(JSON_HEDLEY_NO_THROW) + #undef JSON_HEDLEY_NO_THROW +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__)) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) + #define JSON_HEDLEY_NO_THROW __declspec(nothrow) +#else + #define JSON_HEDLEY_NO_THROW +#endif + +#if defined(JSON_HEDLEY_FALL_THROUGH) + #undef JSON_HEDLEY_FALL_THROUGH +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(fallthrough) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__)) +#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough) + #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]]) +#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough) + #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]]) +#elif defined(__fallthrough) /* SAL */ + #define JSON_HEDLEY_FALL_THROUGH __fallthrough +#else + #define JSON_HEDLEY_FALL_THROUGH +#endif + +#if defined(JSON_HEDLEY_RETURNS_NON_NULL) + #undef JSON_HEDLEY_RETURNS_NON_NULL +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__)) +#elif defined(_Ret_notnull_) /* SAL */ + #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_ +#else + #define JSON_HEDLEY_RETURNS_NON_NULL +#endif + +#if defined(JSON_HEDLEY_ARRAY_PARAM) + #undef JSON_HEDLEY_ARRAY_PARAM +#endif +#if \ + defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \ + !defined(__STDC_NO_VLA__) && \ + !defined(__cplusplus) && \ + !defined(JSON_HEDLEY_PGI_VERSION) && \ + !defined(JSON_HEDLEY_TINYC_VERSION) + #define JSON_HEDLEY_ARRAY_PARAM(name) (name) +#else + #define JSON_HEDLEY_ARRAY_PARAM(name) +#endif + +#if defined(JSON_HEDLEY_IS_CONSTANT) + #undef JSON_HEDLEY_IS_CONSTANT +#endif +#if defined(JSON_HEDLEY_REQUIRE_CONSTEXPR) + #undef JSON_HEDLEY_REQUIRE_CONSTEXPR +#endif +/* JSON_HEDLEY_IS_CONSTEXPR_ is for + HEDLEY INTERNAL USE ONLY. API subject to change without notice. */ +#if defined(JSON_HEDLEY_IS_CONSTEXPR_) + #undef JSON_HEDLEY_IS_CONSTEXPR_ +#endif +#if \ + JSON_HEDLEY_HAS_BUILTIN(__builtin_constant_p) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,19) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \ + (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \ + JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr) +#endif +#if !defined(__cplusplus) +# if \ + JSON_HEDLEY_HAS_BUILTIN(__builtin_types_compatible_p) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \ + JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \ + JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,24) +#if defined(__INTPTR_TYPE__) + #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0)), int*) +#else + #include + #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((intptr_t) ((expr) * 0)) : (int*) 0)), int*) +#endif +# elif \ + ( \ + defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && \ + !defined(JSON_HEDLEY_SUNPRO_VERSION) && \ + !defined(JSON_HEDLEY_PGI_VERSION) && \ + !defined(JSON_HEDLEY_IAR_VERSION)) || \ + (JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) && !defined(JSON_HEDLEY_IAR_VERSION)) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(5,3,0) +#if defined(__INTPTR_TYPE__) + #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0), int*: 1, void*: 0) +#else + #include + #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((intptr_t) * 0) : (int*) 0), int*: 1, void*: 0) +#endif +# elif \ + defined(JSON_HEDLEY_GCC_VERSION) || \ + defined(JSON_HEDLEY_INTEL_VERSION) || \ + defined(JSON_HEDLEY_TINYC_VERSION) || \ + defined(JSON_HEDLEY_TI_ARMCL_VERSION) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(18,12,0) || \ + defined(JSON_HEDLEY_TI_CL2000_VERSION) || \ + defined(JSON_HEDLEY_TI_CL6X_VERSION) || \ + defined(JSON_HEDLEY_TI_CL7X_VERSION) || \ + defined(JSON_HEDLEY_TI_CLPRU_VERSION) || \ + defined(__clang__) +# define JSON_HEDLEY_IS_CONSTEXPR_(expr) ( \ + sizeof(void) != \ + sizeof(*( \ + 1 ? \ + ((void*) ((expr) * 0L) ) : \ +((struct { char v[sizeof(void) * 2]; } *) 1) \ + ) \ + ) \ + ) +# endif +#endif +#if defined(JSON_HEDLEY_IS_CONSTEXPR_) + #if !defined(JSON_HEDLEY_IS_CONSTANT) + #define JSON_HEDLEY_IS_CONSTANT(expr) JSON_HEDLEY_IS_CONSTEXPR_(expr) + #endif + #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (JSON_HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1)) +#else + #if !defined(JSON_HEDLEY_IS_CONSTANT) + #define JSON_HEDLEY_IS_CONSTANT(expr) (0) + #endif + #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (expr) +#endif + +#if defined(JSON_HEDLEY_BEGIN_C_DECLS) + #undef JSON_HEDLEY_BEGIN_C_DECLS +#endif +#if defined(JSON_HEDLEY_END_C_DECLS) + #undef JSON_HEDLEY_END_C_DECLS +#endif +#if defined(JSON_HEDLEY_C_DECL) + #undef JSON_HEDLEY_C_DECL +#endif +#if defined(__cplusplus) + #define JSON_HEDLEY_BEGIN_C_DECLS extern "C" { + #define JSON_HEDLEY_END_C_DECLS } + #define JSON_HEDLEY_C_DECL extern "C" +#else + #define JSON_HEDLEY_BEGIN_C_DECLS + #define JSON_HEDLEY_END_C_DECLS + #define JSON_HEDLEY_C_DECL +#endif + +#if defined(JSON_HEDLEY_STATIC_ASSERT) + #undef JSON_HEDLEY_STATIC_ASSERT +#endif +#if \ + !defined(__cplusplus) && ( \ + (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \ + (JSON_HEDLEY_HAS_FEATURE(c_static_assert) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + defined(_Static_assert) \ + ) +# define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message) +#elif \ + (defined(__cplusplus) && (__cplusplus >= 201103L)) || \ + JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) +# define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message)) +#else +# define JSON_HEDLEY_STATIC_ASSERT(expr, message) +#endif + +#if defined(JSON_HEDLEY_NULL) + #undef JSON_HEDLEY_NULL +#endif +#if defined(__cplusplus) + #if __cplusplus >= 201103L + #define JSON_HEDLEY_NULL JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr) + #elif defined(NULL) + #define JSON_HEDLEY_NULL NULL + #else + #define JSON_HEDLEY_NULL JSON_HEDLEY_STATIC_CAST(void*, 0) + #endif +#elif defined(NULL) + #define JSON_HEDLEY_NULL NULL +#else + #define JSON_HEDLEY_NULL ((void*) 0) +#endif + +#if defined(JSON_HEDLEY_MESSAGE) + #undef JSON_HEDLEY_MESSAGE +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas") +# define JSON_HEDLEY_MESSAGE(msg) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \ + JSON_HEDLEY_PRAGMA(message msg) \ + JSON_HEDLEY_DIAGNOSTIC_POP +#elif \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,4,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) +# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message msg) +#elif JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) +# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(_CRI message msg) +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) +# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg)) +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,0,0) +# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg)) +#else +# define JSON_HEDLEY_MESSAGE(msg) +#endif + +#if defined(JSON_HEDLEY_WARNING) + #undef JSON_HEDLEY_WARNING +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas") +# define JSON_HEDLEY_WARNING(msg) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \ + JSON_HEDLEY_PRAGMA(clang warning msg) \ + JSON_HEDLEY_DIAGNOSTIC_POP +#elif \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,8,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) +# define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) +# define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg)) +#else +# define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg) +#endif + +#if defined(JSON_HEDLEY_REQUIRE) + #undef JSON_HEDLEY_REQUIRE +#endif +#if defined(JSON_HEDLEY_REQUIRE_MSG) + #undef JSON_HEDLEY_REQUIRE_MSG +#endif +#if JSON_HEDLEY_HAS_ATTRIBUTE(diagnose_if) +# if JSON_HEDLEY_HAS_WARNING("-Wgcc-compat") +# define JSON_HEDLEY_REQUIRE(expr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \ + __attribute__((diagnose_if(!(expr), #expr, "error"))) \ + JSON_HEDLEY_DIAGNOSTIC_POP +# define JSON_HEDLEY_REQUIRE_MSG(expr,msg) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \ + __attribute__((diagnose_if(!(expr), msg, "error"))) \ + JSON_HEDLEY_DIAGNOSTIC_POP +# else +# define JSON_HEDLEY_REQUIRE(expr) __attribute__((diagnose_if(!(expr), #expr, "error"))) +# define JSON_HEDLEY_REQUIRE_MSG(expr,msg) __attribute__((diagnose_if(!(expr), msg, "error"))) +# endif +#else +# define JSON_HEDLEY_REQUIRE(expr) +# define JSON_HEDLEY_REQUIRE_MSG(expr,msg) +#endif + +#if defined(JSON_HEDLEY_FLAGS) + #undef JSON_HEDLEY_FLAGS +#endif +#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum) && (!defined(__cplusplus) || JSON_HEDLEY_HAS_WARNING("-Wbitfield-enum-conversion")) + #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__)) +#else + #define JSON_HEDLEY_FLAGS +#endif + +#if defined(JSON_HEDLEY_FLAGS_CAST) + #undef JSON_HEDLEY_FLAGS_CAST +#endif +#if JSON_HEDLEY_INTEL_VERSION_CHECK(19,0,0) +# define JSON_HEDLEY_FLAGS_CAST(T, expr) (__extension__ ({ \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("warning(disable:188)") \ + ((T) (expr)); \ + JSON_HEDLEY_DIAGNOSTIC_POP \ + })) +#else +# define JSON_HEDLEY_FLAGS_CAST(T, expr) JSON_HEDLEY_STATIC_CAST(T, expr) +#endif + +#if defined(JSON_HEDLEY_EMPTY_BASES) + #undef JSON_HEDLEY_EMPTY_BASES +#endif +#if \ + (JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases) +#else + #define JSON_HEDLEY_EMPTY_BASES +#endif + +/* Remaining macros are deprecated. */ + +#if defined(JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK) + #undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK +#endif +#if defined(__clang__) + #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) (0) +#else + #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_CLANG_HAS_ATTRIBUTE) + #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE +#endif +#define JSON_HEDLEY_CLANG_HAS_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_ATTRIBUTE(attribute) + +#if defined(JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE) + #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE +#endif +#define JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) + +#if defined(JSON_HEDLEY_CLANG_HAS_BUILTIN) + #undef JSON_HEDLEY_CLANG_HAS_BUILTIN +#endif +#define JSON_HEDLEY_CLANG_HAS_BUILTIN(builtin) JSON_HEDLEY_HAS_BUILTIN(builtin) + +#if defined(JSON_HEDLEY_CLANG_HAS_FEATURE) + #undef JSON_HEDLEY_CLANG_HAS_FEATURE +#endif +#define JSON_HEDLEY_CLANG_HAS_FEATURE(feature) JSON_HEDLEY_HAS_FEATURE(feature) + +#if defined(JSON_HEDLEY_CLANG_HAS_EXTENSION) + #undef JSON_HEDLEY_CLANG_HAS_EXTENSION +#endif +#define JSON_HEDLEY_CLANG_HAS_EXTENSION(extension) JSON_HEDLEY_HAS_EXTENSION(extension) + +#if defined(JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE) + #undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE +#endif +#define JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) + +#if defined(JSON_HEDLEY_CLANG_HAS_WARNING) + #undef JSON_HEDLEY_CLANG_HAS_WARNING +#endif +#define JSON_HEDLEY_CLANG_HAS_WARNING(warning) JSON_HEDLEY_HAS_WARNING(warning) + +#endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */ diff --git a/src/nlohmann/thirdparty/hedley/hedley_undef.hpp b/src/nlohmann/thirdparty/hedley/hedley_undef.hpp new file mode 100644 index 00000000000..d2b37a16d67 --- /dev/null +++ b/src/nlohmann/thirdparty/hedley/hedley_undef.hpp @@ -0,0 +1,150 @@ +#pragma once + +#undef JSON_HEDLEY_ALWAYS_INLINE +#undef JSON_HEDLEY_ARM_VERSION +#undef JSON_HEDLEY_ARM_VERSION_CHECK +#undef JSON_HEDLEY_ARRAY_PARAM +#undef JSON_HEDLEY_ASSUME +#undef JSON_HEDLEY_BEGIN_C_DECLS +#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE +#undef JSON_HEDLEY_CLANG_HAS_BUILTIN +#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE +#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE +#undef JSON_HEDLEY_CLANG_HAS_EXTENSION +#undef JSON_HEDLEY_CLANG_HAS_FEATURE +#undef JSON_HEDLEY_CLANG_HAS_WARNING +#undef JSON_HEDLEY_COMPCERT_VERSION +#undef JSON_HEDLEY_COMPCERT_VERSION_CHECK +#undef JSON_HEDLEY_CONCAT +#undef JSON_HEDLEY_CONCAT3 +#undef JSON_HEDLEY_CONCAT3_EX +#undef JSON_HEDLEY_CONCAT_EX +#undef JSON_HEDLEY_CONST +#undef JSON_HEDLEY_CONSTEXPR +#undef JSON_HEDLEY_CONST_CAST +#undef JSON_HEDLEY_CPP_CAST +#undef JSON_HEDLEY_CRAY_VERSION +#undef JSON_HEDLEY_CRAY_VERSION_CHECK +#undef JSON_HEDLEY_C_DECL +#undef JSON_HEDLEY_DEPRECATED +#undef JSON_HEDLEY_DEPRECATED_FOR +#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL +#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ +#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED +#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES +#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS +#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION +#undef JSON_HEDLEY_DIAGNOSTIC_POP +#undef JSON_HEDLEY_DIAGNOSTIC_PUSH +#undef JSON_HEDLEY_DMC_VERSION +#undef JSON_HEDLEY_DMC_VERSION_CHECK +#undef JSON_HEDLEY_EMPTY_BASES +#undef JSON_HEDLEY_EMSCRIPTEN_VERSION +#undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK +#undef JSON_HEDLEY_END_C_DECLS +#undef JSON_HEDLEY_FLAGS +#undef JSON_HEDLEY_FLAGS_CAST +#undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE +#undef JSON_HEDLEY_GCC_HAS_BUILTIN +#undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE +#undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE +#undef JSON_HEDLEY_GCC_HAS_EXTENSION +#undef JSON_HEDLEY_GCC_HAS_FEATURE +#undef JSON_HEDLEY_GCC_HAS_WARNING +#undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK +#undef JSON_HEDLEY_GCC_VERSION +#undef JSON_HEDLEY_GCC_VERSION_CHECK +#undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE +#undef JSON_HEDLEY_GNUC_HAS_BUILTIN +#undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE +#undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE +#undef JSON_HEDLEY_GNUC_HAS_EXTENSION +#undef JSON_HEDLEY_GNUC_HAS_FEATURE +#undef JSON_HEDLEY_GNUC_HAS_WARNING +#undef JSON_HEDLEY_GNUC_VERSION +#undef JSON_HEDLEY_GNUC_VERSION_CHECK +#undef JSON_HEDLEY_HAS_ATTRIBUTE +#undef JSON_HEDLEY_HAS_BUILTIN +#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE +#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS +#undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE +#undef JSON_HEDLEY_HAS_EXTENSION +#undef JSON_HEDLEY_HAS_FEATURE +#undef JSON_HEDLEY_HAS_WARNING +#undef JSON_HEDLEY_IAR_VERSION +#undef JSON_HEDLEY_IAR_VERSION_CHECK +#undef JSON_HEDLEY_IBM_VERSION +#undef JSON_HEDLEY_IBM_VERSION_CHECK +#undef JSON_HEDLEY_IMPORT +#undef JSON_HEDLEY_INLINE +#undef JSON_HEDLEY_INTEL_CL_VERSION +#undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK +#undef JSON_HEDLEY_INTEL_VERSION +#undef JSON_HEDLEY_INTEL_VERSION_CHECK +#undef JSON_HEDLEY_IS_CONSTANT +#undef JSON_HEDLEY_IS_CONSTEXPR_ +#undef JSON_HEDLEY_LIKELY +#undef JSON_HEDLEY_MALLOC +#undef JSON_HEDLEY_MCST_LCC_VERSION +#undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK +#undef JSON_HEDLEY_MESSAGE +#undef JSON_HEDLEY_MSVC_VERSION +#undef JSON_HEDLEY_MSVC_VERSION_CHECK +#undef JSON_HEDLEY_NEVER_INLINE +#undef JSON_HEDLEY_NON_NULL +#undef JSON_HEDLEY_NO_ESCAPE +#undef JSON_HEDLEY_NO_RETURN +#undef JSON_HEDLEY_NO_THROW +#undef JSON_HEDLEY_NULL +#undef JSON_HEDLEY_PELLES_VERSION +#undef JSON_HEDLEY_PELLES_VERSION_CHECK +#undef JSON_HEDLEY_PGI_VERSION +#undef JSON_HEDLEY_PGI_VERSION_CHECK +#undef JSON_HEDLEY_PREDICT +#undef JSON_HEDLEY_PRINTF_FORMAT +#undef JSON_HEDLEY_PRIVATE +#undef JSON_HEDLEY_PUBLIC +#undef JSON_HEDLEY_PURE +#undef JSON_HEDLEY_REINTERPRET_CAST +#undef JSON_HEDLEY_REQUIRE +#undef JSON_HEDLEY_REQUIRE_CONSTEXPR +#undef JSON_HEDLEY_REQUIRE_MSG +#undef JSON_HEDLEY_RESTRICT +#undef JSON_HEDLEY_RETURNS_NON_NULL +#undef JSON_HEDLEY_SENTINEL +#undef JSON_HEDLEY_STATIC_ASSERT +#undef JSON_HEDLEY_STATIC_CAST +#undef JSON_HEDLEY_STRINGIFY +#undef JSON_HEDLEY_STRINGIFY_EX +#undef JSON_HEDLEY_SUNPRO_VERSION +#undef JSON_HEDLEY_SUNPRO_VERSION_CHECK +#undef JSON_HEDLEY_TINYC_VERSION +#undef JSON_HEDLEY_TINYC_VERSION_CHECK +#undef JSON_HEDLEY_TI_ARMCL_VERSION +#undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK +#undef JSON_HEDLEY_TI_CL2000_VERSION +#undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK +#undef JSON_HEDLEY_TI_CL430_VERSION +#undef JSON_HEDLEY_TI_CL430_VERSION_CHECK +#undef JSON_HEDLEY_TI_CL6X_VERSION +#undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK +#undef JSON_HEDLEY_TI_CL7X_VERSION +#undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK +#undef JSON_HEDLEY_TI_CLPRU_VERSION +#undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK +#undef JSON_HEDLEY_TI_VERSION +#undef JSON_HEDLEY_TI_VERSION_CHECK +#undef JSON_HEDLEY_UNAVAILABLE +#undef JSON_HEDLEY_UNLIKELY +#undef JSON_HEDLEY_UNPREDICTABLE +#undef JSON_HEDLEY_UNREACHABLE +#undef JSON_HEDLEY_UNREACHABLE_RETURN +#undef JSON_HEDLEY_VERSION +#undef JSON_HEDLEY_VERSION_DECODE_MAJOR +#undef JSON_HEDLEY_VERSION_DECODE_MINOR +#undef JSON_HEDLEY_VERSION_DECODE_REVISION +#undef JSON_HEDLEY_VERSION_ENCODE +#undef JSON_HEDLEY_WARNING +#undef JSON_HEDLEY_WARN_UNUSED_RESULT +#undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG +#undef JSON_HEDLEY_FALL_THROUGH From d24762f7f1c9edea3f4feed17e53b811ea99db66 Mon Sep 17 00:00:00 2001 From: supermerill Date: Sat, 27 Jan 2024 19:37:52 +0100 Subject: [PATCH 12/28] Fixes for localization --- src/libslic3r/Config.cpp | 12 ++++---- src/slic3r/GUI/PresetHints.cpp | 50 ++++++++++++++++++---------------- src/slic3r/GUI/Tab.cpp | 8 +++--- 3 files changed, 37 insertions(+), 33 deletions(-) diff --git a/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp index 234b44324bd..b1a619f354c 100644 --- a/src/libslic3r/Config.cpp +++ b/src/libslic3r/Config.cpp @@ -54,15 +54,15 @@ std::string toString(OptionCategory opt) { case OptionCategory::filoverride: return L("Filament overrides"); case OptionCategory::customgcode: return L("Custom G-code"); case OptionCategory::general: return L("General"); - case OptionCategory::limits: return "Machine limits"; // if not used, no need ot ask for translation - case OptionCategory::mmsetup: return "Single Extruder MM Setup"; - case OptionCategory::firmware: return "Firmware"; - case OptionCategory::pad: return "Pad"; - case OptionCategory::padSupp: return "Pad and Support"; + case OptionCategory::limits: return L("Machine limits"); // if not used, no need ot ask for translation + case OptionCategory::mmsetup: return L("Single Extruder MM Setup"); + case OptionCategory::firmware: return L("Firmware"); + case OptionCategory::pad: return L("Pad"); + case OptionCategory::padSupp: return L("Pad and Support"); case OptionCategory::wipe: return L("Wipe Options"); case OptionCategory::milling: return L("Milling"); case OptionCategory::hollowing: return "Hollowing"; - case OptionCategory::milling_extruders: return "Milling tools"; + case OptionCategory::milling_extruders: return L("Milling tools"); case OptionCategory::fuzzy_skin : return L("Fuzzy skin"); } return "error"; diff --git a/src/slic3r/GUI/PresetHints.cpp b/src/slic3r/GUI/PresetHints.cpp index 4ae6d925924..4197c3cc612 100644 --- a/src/slic3r/GUI/PresetHints.cpp +++ b/src/slic3r/GUI/PresetHints.cpp @@ -194,32 +194,36 @@ std::string PresetHints::cooling_description(const Preset &preset_fil, const Pre } if (slowdown_below_layer_time > 0) { - out += (boost::format(_utf8(L("\n\nIf estimated layer time is below ~%1%s"))) - % slowdown_below_layer_time).str(); + out += std::string("\n\n"); + out += format_wxstr(_L("If estimated layer time is below ~%1%s"), slowdown_below_layer_time); if (max_fan_speed > 0 && max_fan_speed > min_fan_speed) { - out += " " + (boost::format(_utf8(L("fan will run by default to %1%%%"))) - % max_fan_speed).str(); - - if (disable_fan_first_layers > 1) - out += " (" + (boost::format(_utf8(L("except for the first %1% layers where the fan is disabled"))) % disable_fan_first_layers).str(); - else if (disable_fan_first_layers == 1) - out += " (" + _utf8(L("except for the first layer where the fan is disabled")); + out += " "; + out += format_wxstr(_L("fan will run by default to %1%%%"), max_fan_speed); + + if (disable_fan_first_layers > 1) { + out += " ("; + out += format_wxstr(_L("except for the first %1% layers where the fan is disabled"), disable_fan_first_layers); + } else if (disable_fan_first_layers == 1) { + out += " ("; + out += _L("except for the first layer where the fan is disabled"); + } if (full_fan_speed_layer > disable_fan_first_layers + 1 && disable_fan_first_layers > 0) - out += (boost::format(_utf8(L(" and will gradually speed-up to the above speeds over %1% layers"))) % (full_fan_speed_layer - disable_fan_first_layers)).str(); + out += format_wxstr(_L(" and will gradually speed-up to the above speeds over %1% layers"), full_fan_speed_layer); if(disable_fan_first_layers > 0) out += ")"; out += " and"; } - out += " " + (boost::format(_utf8(L("print speed will be reduced " - "so that no less than %1%s are spent on that layer"))) % slowdown_below_layer_time).str(); + out += " "; + out += format_wxstr(_L("print speed will be reduced so that no less than %1%s are spent on that layer"), slowdown_below_layer_time); if(min_print_speed > 0) - if(max_speed_reduc > 0) - out += " " + (boost::format(_utf8(L("(however, speed will never be reduced below %1%mm/s or up to %2%%% reduction)"))) - % min_print_speed % max_speed_reduc).str(); - else - out += " " + (boost::format(_utf8(L("(however, speed will never be reduced below %1%mm/s)"))) - % min_print_speed).str(); + if (max_speed_reduc > 0) { + out += " "; + out += format_wxstr(_L("(however, speed will never be reduced below %1%mm/s or up to %2%%% reduction)"), min_print_speed, max_speed_reduc); + } else { + out += " "; + out += format_wxstr(_L("(however, speed will never be reduced below %1%mm/s)"), min_print_speed); + } } if (fan_below_layer_time > 0 || slowdown_below_layer_time > 0) { @@ -229,15 +233,15 @@ std::string PresetHints::cooling_description(const Preset &preset_fil, const Pre //tooltip for Depractaed values if (preset_fil.config.opt_int("top_fan_speed", 0) == 1) - out += "\n\n! 1 for the Top fan speed is Deprecated, please set it to 0 to stop the fan!"; + out += "\n\n" + _L("! 1 for the Top fan speed is Deprecated, please set it to 0 to stop the fan!"); if (preset_fil.config.opt_int("top_fan_speed", 0) == 1) - out += "\n\n! 1 for the Top fan speed is Deprecated, please set it to 0 to stop the fan!"; + out += "\n\n" + _L("! 1 for the Top fan speed is Deprecated, please set it to 0 to stop the fan!"); if (preset_fil.config.opt_int("external_perimeter_fan_speed", 0) == 1) - out += "\n\n! 1 for the External perimeters fan speed is Deprecated, please set it to 0 to stop the fan!"; + out += "\n\n" + _L("! 1 for the External perimeters fan speed is Deprecated, please set it to 0 to stop the fan!"); if (preset_fil.config.opt_int("bridge_fan_speed", 0) == 1) - out += "\n\n! 1 for the Bridge fan speed is Deprecated, please set it to 0 to stop the fan!"; + out += "\n\n" + _L("! 1 for the Bridge fan speed is Deprecated, please set it to 0 to stop the fan!"); if (preset_fil.config.opt_int("bridge_internal_fan_speed", 0) == 1) - out += "\n\n! 1 for the Infill bridge fan speed is Deprecated, please set it to 0 to stop the fan!"; + out += "\n\n" + _L("! 1 for the Infill bridge fan speed is Deprecated, please set it to 0 to stop the fan!"); return out.ToStdString(); } diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index d8d3a461ff5..ebe79ddeca3 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -1773,7 +1773,7 @@ std::vector Tab::create_pages(std::string setting_type_nam if (params.size() < 2) continue; if (params.size() == 2) params.push_back("wrench"); - std::string label = L(params[params.size()-2]); + wxString label = _(params[params.size()-2]); for (int i = 1; i < params.size() - 1; i++) { if (params[i] == "idx") @@ -1783,7 +1783,7 @@ std::vector Tab::create_pages(std::string setting_type_nam } if(logs) Slic3r::slic3r_log->info("settings gui") << "create page " << label.c_str() <<" : "<< params[params.size() - 1] << "\n"; - pages.push_back(create_options_page(L(label), params[params.size() - 1])); + pages.push_back(create_options_page(label, params[params.size() - 1])); current_page = pages.back(); } else if (boost::starts_with(full_line, "end_page")) @@ -4459,8 +4459,8 @@ void Tab::update_show_hide_incompatible_button() m_btn_hide_incompatible_presets->SetBitmap_(m_show_incompatible_presets ? m_bmp_show_incompatible_presets : m_bmp_hide_incompatible_presets); m_btn_hide_incompatible_presets->SetToolTip(m_show_incompatible_presets ? - "Both compatible an incompatible presets are shown. Click to hide presets not compatible with the current printer." : - "Only compatible presets are shown. Click to show both the presets compatible and not compatible with the current printer."); + _L("Both compatible and incompatible presets are shown. Click to hide presets not compatible with the current printer.") : + _L("Only compatible presets are shown. Click to show both the presets compatible and not compatible with the current printer.")); } void Tab::update_ui_from_settings() From 075ded38ef2fe705fbd67dbf4e29e5a3b13cfa01 Mon Sep 17 00:00:00 2001 From: supermerill Date: Sat, 27 Jan 2024 19:40:58 +0100 Subject: [PATCH 13/28] updates to italian translation --- resources/localization/it/Slic3r.po | 657 ++++++++++++-- resources/localization/it/TODO.po | 580 +------------ resources/localization/it/it_database.po | 1008 +++++++++++++++++++--- 3 files changed, 1477 insertions(+), 768 deletions(-) diff --git a/resources/localization/it/Slic3r.po b/resources/localization/it/Slic3r.po index f29f9c709c3..9cb641e4d54 100644 --- a/resources/localization/it/Slic3r.po +++ b/resources/localization/it/Slic3r.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: Slic3r\n" -"POT-Creation-Date: 2023-12-31 00:00\n" -"PO-Revision-Date: 2023-12-31 00:00\n" +"POT-Creation-Date: 2024-01-29 00:00\n" +"PO-Revision-Date: 2024-01-29 00:00\n" "Last-Translator:\n" "Language-Team:\n" "MIME-Version: 1.0\n" @@ -14,6 +14,33 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language:it\n" +msgid "" +"! 1 for the Bridge fan speed is Deprecated, please set it to 0 to stop the " +"fan!" +msgstr "" +"! 1 per la velocità della ventola del Ponte è sconsigliato, imposta 0 per " +"fermare la ventola!" + +msgid "" +"! 1 for the External perimeters fan speed is Deprecated, please set it to 0 " +"to stop the fan!" +msgstr "" +"! 1 per la velocità della ventola dei perimetri esterni è sconsigliato, " +"imposta 0 per fermare la ventola!" + +msgid "" +"! 1 for the Infill bridge fan speed is Deprecated, please set it to 0 to " +"stop the fan!" +msgstr "" +"! 1 per la velocità della ventola dei Ponti interni è sconsigliato, imposta 0 " +"per fermare la ventola!" + +msgid "" +"! 1 for the Top fan speed is Deprecated, please set it to 0 to stop the fan!" +msgstr "" +"! 1 per la velocità massima della ventola è sconsigliato, imposta 0 per " +"fermare la ventola!" + msgid "!! Can be unstable in some os distribution !!" msgstr "" "!! Può essere instabile in alcune distribuzioni di sistemi operativi !!" @@ -555,15 +582,6 @@ msgstr "" "\"G92 E0\" trovato in layer_gcode, che è incompatibile con l'indirizzamento " "assoluto dell'estrusore." -msgid "" -"\n" -"\n" -"If estimated layer time is below ~%1%s" -msgstr "" -"\n" -"\n" -"Se il tempo stimato dello strato è inferiore a ~%1%s" - msgid "" "\n" "\n" @@ -867,13 +885,14 @@ msgstr "" "messaggio. Personalmente, penso che sia inutile." msgid "" -"Add one perimeter every odd layer. With this, infill is taken into the " -"sandwich and you may be able to reduce drastically the infill/perimeter " -"overlap setting. " +"Add one perimeter every even layer (and not on odd layers like the first " +"one). With this, infill is taken into the sandwich and you may be able to " +"reduce drastically the infill/perimeter overlap setting. " msgstr "" -"Aggiungi un perimetro ogni strato dispari. Con questo, l'infill viene preso " -"in sandwitch e si può essere in grado di ridurre drasticamente " -"l'impostazione di sovrapposizione infill/perimetro. " +"Aggiungi un perimetro su ogni strato pari (e non sugli strati dispari come " +"il primo). In questo modo, il riempimento viene inserito nel sandwich e " +"potresti essere in grado di ridurre drasticamente l'impostazione di " +"sovrapposizione riempimento/perimetro. " msgid "Add pause print" msgstr "Aggiungi la stampa in pausa" @@ -1204,9 +1223,17 @@ msgstr "Emetti anche limiti al G-code" msgid "Also for all perimeters" msgstr "Anche per tutti i perimetri" +msgid "Also, the fan speed over %1% won't be touched by this feature." +msgstr "" +"Inoltre, la velocità della ventola sopra a %1% non verrà modificata da " +"questa funzione." + msgid "Alt + Mouse wheel" msgstr "Alt + Ruota del mouse" +msgid "Alternate Fill Angle" +msgstr "Angolo riempimento alternativo" + msgid "Alternate nozzles:" msgstr "Ugelli alternativi:" @@ -1565,6 +1592,9 @@ msgstr "Evita di attraversare i perimetri" msgid "Avoid crossing perimeters - Max detour length" msgstr "Evita di incrociare i perimetri - Massima distanza di deviazione" +msgid "Avoid top surface for travels" +msgstr "Evita superfici superiori per spostamenti" + msgid "BACK ARROW" msgstr "FRECCIA INDIETRO" @@ -1700,6 +1730,13 @@ msgstr "Supporti a blocchi" msgid "Block supports by angle" msgstr "Supporti di blocco per angolo" +msgid "" +"Both compatible and incompatible presets are shown. Click to hide presets " +"not compatible with the current printer." +msgstr "" +"Vengono mostrati sia i presets compatibili che quelli incompatibili. Fare clic " +"per nascondere i presets non compatibili con la stampante corrente." + msgid "Bottle volume" msgstr "Volume della bottiglia" @@ -1854,6 +1891,9 @@ msgstr "buffer troppo piccolo" msgid "build volume" msgstr "Volume stampa" +msgid "but for %1% where the speed-up phase is skipped." +msgstr "ma per %1% dove la fase di accelerazione viene saltata." + msgid "But on first layer" msgstr "Però sul primo strato" @@ -1880,6 +1920,9 @@ msgstr "" "Nota: Questo nome può essere cambiato in seguito dalle impostazioni delle " "stampanti fisiche" +msgid "By default, there won't be any fan speed command." +msgstr "Per default, non ci sarà alcun comando di velocità ventola." + msgid "" "By how much the 'wipe inside' can dive inside the object (if possible)?\n" "In % of the perimeter width.\n" @@ -1989,8 +2032,8 @@ msgstr "" msgid "Cannot overwrite a system profile." msgstr "Impossibile sovrascrivere un profilo di sistema." -msgid "Cannot overwrite an external profile." -msgstr "Impossibile sovrascrivere un profilo esterno." +msgid "Cannot overwrite an external profile. Please choose another name." +msgstr "Impossibile sovrascrivere un profilo esterno. Scegliere un altro nome." msgid "" "Cannot proceed without support points! Add support points or disable support " @@ -2002,6 +2045,9 @@ msgstr "" msgid "Cap with" msgstr "Capacità con" +msgid "Cap with perimeter flow" +msgstr "Limite flusso perimetrale" + msgid "Capabilities" msgstr "Capacità" @@ -2095,31 +2141,35 @@ msgstr "" "Se il valore è impostato su 0, mostrerà 0." msgid "" -"Change width on every odd layer for better overlap with adjacent layers and " -"getting stringer shells. Try values about +/- 0.1 with different sign for " -"external and internal perimeters.\n" -"This could be combined with extra permeters on odd layers.\n" +"Change width on every even layer (and not on odd layers like the first one) " +"for better overlap with adjacent layers and getting stringer shells. Try " +"values about +/- 0.1 with different sign for external and internal " +"perimeters.\n" +"This could be combined with extra permeters on even layers.\n" "Works as absolute spacing or a % of the spacing.\n" "set 0 to disable" msgstr "" -"Modifica la larghezza su ogni strato dispari per una migliore sovrapposizione " -"con gli strati adiacenti e per ottenere gusci più stretti. Prova valori di " -"circa +/- 0,1 con segno diverso per i perimetri esterni e interni.\n" -"Questo potrebbe essere combinato con perimetri extra su strati dispari.\n" +"Modifica la larghezza su ogni strato pari (e non su strati dispari come il " +"primo) per una migliore sovrapposizione con gli strati adiacenti e per " +"ottenere gusci più stretti. Prova valori di circa +/- 0,1 con segno diverso " +"per i perimetri esterni ed interni.\n" +"Questo potrebbe essere combinato con perimetri extra su strati pari.\n" "Funziona come spaziatura assoluta o una % della spaziatura.\n" "Imposta 0 per disabilitare" msgid "" -"Change width on every odd layer for better overlap with adjacent layers and " -"getting stringer shells. Try values about +/- 0.1 with different sign.\n" -"This could be combined with extra permeters on odd layers.\n" +"Change width on every even layer (and not on odd layers like the first one) " +"for better overlap with adjacent layers and getting stringer shells. Try " +"values about +/- 0.1 with different sign.\n" +"This could be combined with extra permeters on even layers.\n" "Works as absolute spacing or a % of the spacing.\n" "set 0 to disable" msgstr "" -"Modifica la larghezza su ogni strato dispari per una migliore sovrapposizione " -"con gli strati adiacenti e per ottenere gusci più stretti. Prova valori di " -"circa +/- 0,1 con segno diverso.\n" -"Questo potrebbe essere combinato con perimetri extra su strati dispari.\n" +"Modifica la larghezza su ogni strato pari (e non su strati dispari come il " +"primo) per una migliore sovrapposizione con gli strati adiacenti e per " +"ottenere gusci più stretti. Prova valori di circa +/- 0,1 con segno " +"diverso.\n" +"Questo potrebbe essere combinato con perimetri extra su strati pari.\n" "Funziona come spaziatura assoluta o una % della spaziatura.\n" "Imposta 0 per disabilitare" @@ -2418,6 +2468,9 @@ msgstr "COMPLETATO" msgid "Completed" msgstr "Completato" +msgid "Compress png textures" +msgstr "Comprimi texture png" + msgid "compression failed" msgstr "compressione fallita" @@ -2876,6 +2929,9 @@ msgstr "Creare un nuovo progetto mentre alcuni preset vengono modificati." msgid "Creating a new project while the current project is modified." msgstr "Creare un nuovo progetto mentre il progetto corrente viene modificato." +msgid "Creating arcs" +msgstr "Creazione archi" + msgid "Critical angle" msgstr "Angolo critico" @@ -3107,6 +3163,22 @@ msgstr "profilo di stampa SLA predefinito" msgid "Default speed" msgstr "Velocità predefinita" +msgid "" +"Default speed for the fan, to set the speed for features where there is no " +"fan control. Useful for PLA and other low-temp filament.\n" +"Set 0 to disable the fan by default. Useful for ABS and other high-temp " +"filaments.\n" +"Set -1 to disable. if disabled, the beahavior isn't defined yet. The goal is " +"to avoid adding fan speed commands." +msgstr "" +"Velocità predefinita per la ventola, per impostare la velocità per le " +"funzioni in cui non è disponibile il controllo della ventola. Utile per PLA " +"e altri filamenti a bassa temperatura.\n" +"Imposta 0 per disabilitare la ventola per impostazione predefinita. Utile " +"per ABS e altri filamenti ad alta temperatura.\n" +"Imposta -1 per disabilitare. Se disabilitato, il comportamento non è ancora " +"definito. L'obiettivo è evitare di aggiungere comandi di velocità ventola." + msgid "default value" msgstr "valore predefinito" @@ -3228,8 +3300,18 @@ msgstr "Strato riempimento denso" msgid "Density" msgstr "Densità" -msgid "Density of internal infill, expressed in the range 0% - 100%." -msgstr "Densità del riempimento interno, espressa nell'intervallo 0% - 100%." +msgid "" +"Density of internal infill, expressed in the range 0% - 100%.\n" +"Set 0 to remove any sparse infill.\n" +"Note that using a value of 100% won't change the type of infill from sparse " +"to solid. If you want only solid infill, you can set the 'Solid infill every " +"X layers' (solid_infill_every_layers) to 1 instead." +msgstr "" +"Densità del riempimento interno, espressa nel range 0% - 100%.\n" +"Imposta 0 per rimuovere qualsiasi riempimento sparso.\n" +"Nota che usare un valore del 100% non cambierà tipo di riempimento da scarso a " +"solido. Se desideri solo il riempimento solido, puoi invece impostare " +"'Riempimento solido ogni X livelli' (solid_infill_every_layers) su 1." msgid "Density of the first raft or support layer." msgstr "Densità del primo layer del raft o del supporto." @@ -3514,6 +3596,9 @@ msgstr "Non organizzare" msgid "Don't avoid crossing on 1st layer" msgstr "Non evitare l'attraversamento sul 1° strato" +msgid "Don't check crossings for retraction on first layer" +msgstr "Non controllare la retrazione degli incroci sul primo strato" + msgid "Don't import" msgstr "Non importare" @@ -3595,6 +3680,9 @@ msgstr "Ogni millimetro aggiunge questo valore al valore di retrazione." msgid "Ear pattern" msgstr "Modello di orecchio" +msgid "EBridge" +msgstr "EBridge" + msgid "Edit" msgstr "Modifica" @@ -3973,6 +4061,9 @@ msgstr "" "Corpo del messaggio: \"%1%\"\n" "Errore: \"% 2%\"" +msgid "EPeri" +msgstr "EPeri" + msgid "Erase all objects" msgstr "Cancella tutti gli oggetti" @@ -4019,6 +4110,31 @@ msgstr "Errore nel caricamento sull'host di stampa:" msgid "Error while loading .gcode file" msgstr "Errore durante il caricamento del file .G-code" +msgid "" +"Error while writing gcode: two points are at the same position. Please send " +"the .3mf project to the dev team for debugging. Extrude loop: seam notch." +msgstr "" +"Errore durante la scrittura del gcode: due punti sono nella stessa posizione. " +"Invia il progetto .3mf al team di sviluppo per il debug. Ciclo estrusione: " +"tacca cucitura." + +msgid "" +"Error while writing gcode: two points are at the same position. Please send " +"the .3mf project to the dev team for debugging. Extrude loop: wipe." +msgstr "" +"Errore durante la scrittura del gcode: due punti sono nella stessa posizione. " +"Invia il progetto .3mf al team di sviluppo per il debug. Ciclo estrusione: " +"pulizia." + +msgid "" +"Error while writing gcode: two points are at the same position. Please send " +"the .3mf project to the dev team for debugging. Extrude loop: " +"wipe_inside_start." +msgstr "" +"Errore durante la scrittura del gcode: due punti sono nella stessa posizione. " +"Invia il progetto .3mf al team di sviluppo per il debug. Ciclo estrusione: " +"wipe_inside_start." + msgid "Error with zip archive" msgstr "Errore con l'archivio zip" @@ -4049,6 +4165,9 @@ msgstr "Tempo di stampa stimato" msgid "Estimated printing times" msgstr "Tempi di stampa stimati" +msgid "even layers" +msgstr "strati pari" + msgid "Even-odd" msgstr "Pari-dispari" @@ -4218,6 +4337,9 @@ msgstr "" "Esporta la configurazione corrente su file, con solo le impostazioni " "compatibili con Slic3r" +msgid "Export current plate (options available in the dialog)" +msgstr "Esporta piastra corrente (opzioni disponibili nella finestra di dialogo)" + msgid "Export current plate as G-code" msgstr "Esportazione della piastra corrente come G-code" @@ -4367,8 +4489,8 @@ msgstr "Perimetri esterni in modalità vaso" msgid "External perimeters spacing" msgstr "Spazio tra perimetri esterni" -msgid "External perimeters spacing change on odd layers" -msgstr "Modifica spaziatura perimetri esterni su strati dispari" +msgid "External perimeters spacing change on even layers" +msgstr "Modifica spaziatura perimetri esterni su strati pari" msgid "External perimeters speed" msgstr "Velocità dei perimetri esterni" @@ -4385,8 +4507,8 @@ msgstr "Lunghezza extra sulla ripartenza" msgid "Extra loading distance" msgstr "Distanza di carico extra" -msgid "Extra perimeter on odd layers" -msgstr "Perimetro extra su strati dispari" +msgid "Extra perimeter on even layers" +msgstr "Perimetro extra su strati pari" msgid "Extra perimeters" msgstr "Perimetri aggiuntivi" @@ -4411,16 +4533,16 @@ msgstr "Lunghezza dell'estratto sul riavvio del cambio utensile" msgid "" "Extrude perimeters that have a part over an overhang in the reverse " -"direction on odd layers. This alternating pattern can drastically improve " -"steep overhang.\n" +"direction on even layers (and not on odd layers like the first one). This " +"alternating pattern can drastically improve steep overhang.\n" "!! this is a very slow algorithm (it uses the same results as " "extra_perimeters_overhangs) !!" msgstr "" -"Estrudi i perimetri che hanno una parte sopra una sporgenza nella direzione " -"inversa in strati dispari. Quel modello alternato può migliorare " -"drasticamente lo sbalzo ripido.\n" +"Estrudi perimetri che hanno una parte sopra una sporgenza nella direzione " +"opposta su strati pari (e non su strati dispari come il primo). Questa trama " +"alternata può migliorare drasticamente la sporgenza ripida.\n" "!! questo è un algoritmo molto lento (usa gli stessi risultati di " -"extra_perimeters_overhangs) !!!" +"extra_perimeters_overhangs) !!" msgid "Extruder" msgstr "Estrusore" @@ -4537,6 +4659,9 @@ msgstr "Mancata esecuzione di alcuni fori nel modello" msgid "Fan" msgstr "Ventola" +msgid "Fan delay only for overhangs" +msgstr "Ritardo ventola solo sporgenze" + msgid "Fan KickStart time" msgstr "Tempo di KickStart della ventola" @@ -4737,6 +4862,9 @@ msgstr "Angolo di riempimento" msgid "Fill angle increment" msgstr "Incremento dell'angolo di riempimento" +msgid "Fill angle template" +msgstr "Modello angolo riempimento" + msgid "Fill bed" msgstr "Riempi letto" @@ -5088,6 +5216,9 @@ msgstr "" "Formato delle miniature del G-code: PNG per la migliore qualità, JPG per la " "dimensione più piccola, QOI per il firmware con poca memoria" +msgid "Formatting" +msgstr "Formattazione" + msgid "" "Forward-compatibility rule when loading configurations from config files and " "project files (3MF, AMF)." @@ -5366,6 +5497,9 @@ msgstr "Generazione di percorsi utensile" msgid "Generating vertex buffer" msgstr "Generazione del buffer dei vertici" +msgid "GFill" +msgstr "GFill" + msgid "" "Give to the bridge infill algorithm if the infill needs to be connected, and " "on which perimeters. Can be useful to disconnect to reduce a little bit the " @@ -5789,6 +5923,9 @@ msgstr "" msgid "Hyperbola" msgstr "Iperbole" +msgid "IBridge" +msgstr "IBridge" + msgid "Icon" msgstr "Icona" @@ -6082,6 +6219,9 @@ msgstr "" "Se abilitato, puoi cambiare la dimensione delle icone della barra degli " "strumenti manualmente." +msgid "If estimated layer time is below ~%1%s" +msgstr "Se il tempo di strato stimato è inferiore a ~%1%s" + msgid "" "If expressed as absolute value in mm/s, this speed will be applied as a " "maximum for all infill print moves of the first layer.\n" @@ -6175,6 +6315,18 @@ msgstr "" "impostata alcuna tacca. Se l'angolo è troppo alto, non c'è abbastanza spazio " "per la tacca." +msgid "If the fan speed is set and is higher than %1%%%, it won't be changed." +msgstr "" +"Se la velocità della ventola è impostata ed è superiore a %1%%%, non verrà " +"modificata." + +msgid "" +"If the fan speed is set, it will proportionally increasing speed between " +"this value and %1%%%." +msgstr "" +"Se la velocità della ventola è impostata, la velocità aumenterà " +"proporzionalmente tra questo valore e %1%%%." + msgid "" "If the perimeter overlap is set at 100%, the yellow areas should be filled " "by the overlap.\n" @@ -6286,6 +6438,35 @@ msgstr "" "Se utilizzi un colore con una saturazione e/o un valore superiore all'80%, " "questi verranno aumentati. Se inferiori, verranno diminuiti." +msgid "" +"If you want to process the output G-code through custom scripts, just list " +"their absolute paths here.\n" +"Separate multiple scripts with a semicolon or a line return.\n" +"!! please use '\\;' here if you want a not-line-separation ';'!!\n" +"Scripts will be passed the absolute path to the G-code file as the first " +"argument, and they can access the Slic3r config settings by reading " +"environment variables.\n" +"The script, if passed as a relative path, will also be searched from the " +"slic3r directory, the slic3r configuration directory and the user directory." +msgstr "" +"Se vuoi elaborare il G-code di uscita con script personalizzati, elenca qui i " +"loro percorsi assoluti.\n" +"Separa più script con un punto e virgola o un ritorno a capo.\n" +"!! per favore usa '\\' se vuoi una separazione non di linea ';'!!\n" +"Agli script viene passato il percorso assoluto del file G-code come primo " +"argomento, e possono accedere alle impostazioni di configurazione di Slic3r " +"leggendo le variabili d'ambiente.\n" +"Lo script, se passato come percorso relativo, verrà cercato anche dalla " +"directory slic3r, dalla directory di configurazione di slic3r e dalla " +"directory dell'utente." + +msgid "" +"If your custom texture (in png format) is displayed black, then disable this " +"option to remove the problematic optimisation." +msgstr "" +"Se la tua texture personalizzata (in formato png) viene visualizzata in " +"nero, disabilita questa opzione per rimuovere l'ottimizzazione problematica." + msgid "" "If your firmware doesn't handle the extruder displacement you need the G-" "code to take it into account. This option lets you specify the displacement " @@ -6324,6 +6505,9 @@ msgstr "" "aumenterà la qualità.\n" "Imposta zero per disabilitare." +msgid "IFill" +msgstr "IFill" + msgid "Ignore HTTPS certificate revocation checks" msgstr "Ignora i controlli di revoca dei certificati HTTPS" @@ -6599,8 +6783,8 @@ msgstr "Massima velocità riempimento primo strato" msgid "Infill spacing" msgstr "Spaziatura riempimento" -msgid "Infill spacing change on odd layers" -msgstr "Modifica spaziatura riempimento su strati dispari" +msgid "Infill spacing change on even layers" +msgstr "Modifica spaziatura riempimento su strati pari" msgid "Infill speed" msgstr "Velocità riempimento" @@ -6677,6 +6861,17 @@ msgstr "Istanze" msgid "Instances to Separated Objects" msgstr "Istanze a oggetti separati" +msgid "" +"instead of writing 'thumbnails' as tag in the gcode, it will write " +"'thumbnails_PNG', thumbnails_JPG', 'thumbnail_QOI', etc..\n" +" Some firmware need it to know how to decode the thumbnail, some others " +"don't support it." +msgstr "" +"invece di scrivere 'thumbnails' come tag nel gcode, scriverà 'thumbnails_PNG', " +"'thumbnails_JPG', 'thumbnail_QOI', ecc..\n" +" Alcuni firmware lo richiedono per sapere come decodificare la miniatura, " +"altri non lo supportano." + msgid "Interface" msgstr "Interfaccia" @@ -6734,6 +6929,9 @@ msgstr "Perimetro interno" msgid "Internal Perimeter acceleration" msgstr "Accelerazione perimetro interno" +msgid "Internal Perimeter fan speed" +msgstr "Velocità ventola perimetro interno" + msgid "Internal perimeters" msgstr "Perimetri interno" @@ -6789,6 +6987,30 @@ msgstr "parametro non valido" msgid "Invalid pinhead diameter" msgstr "Diametro della testa di spillo non valido" +msgid "Invert Pitch axis" +msgstr "Inverti asse Angolo" + +msgid "Invert Roll axis" +msgstr "Inverti asse Rotazione" + +msgid "Invert X axis" +msgstr "Inverti asse X" + +msgid "Invert Y axis" +msgstr "Inverti asse Y" + +msgid "Invert Yaw axis" +msgstr "Inverti asse Imbardata" + +msgid "Invert Z axis" +msgstr "Inverti asse Z" + +msgid "IPeri" +msgstr "IPeri" + +msgid "Iron" +msgstr "Stiro" + msgid "Ironing" msgstr "Stiratura" @@ -6879,6 +7101,13 @@ msgstr "" msgid "It's a last preset for this physical printer." msgstr "È un ultimo preset per questa stampante fisica." +msgid "" +"It's better for some infill like rectilinear to rotate 90° each layer. If " +"this setting is deactivated, they won't do that anymore." +msgstr "" +"È meglio che alcuni riempimenti, come quello rettilineo, ruotino di 90° ogni " +"strato. Se questa impostazione è disattivata, non lo faranno più." + msgid "It's impossible to print multi-part object(s) with SLA technology." msgstr "È impossibile stampare oggetti in più parti con la tecnologia SLA." @@ -7229,6 +7458,26 @@ msgstr "Carico" msgid "Load a model" msgstr "Carica un modello" +msgid "" +"Load a png/svg file to be used as a texture. \n" +"If it can be found via the executable, configuration or user directory then " +"a relative path will be kept instead of the full one." +msgstr "" +"Carica un file png/svg da utilizzare come texture. \n" +"Se è possibile trovarlo tramite l'eseguibile, la configurazione o la " +"directory dell'utente, verrà mantenuto un percorso relativo invece di quello " +"completo." + +msgid "" +"Load a stl file to be used as a model. \n" +"If it can be found via the executable, configuration or user directory then " +"a relative path will be kept instead of the full one." +msgstr "" +"Carica un file stl da utilizzare come modello. \n" +"Se è possibile trovarlo tramite l'eseguibile, la configurazione o la " +"directory dell'utente, verrà mantenuto un percorso relativo invece di quello " +"completo." + msgid "Load an model saved with imperial units" msgstr "Carica un modello salvato con unità imperiali" @@ -7820,6 +8069,9 @@ msgstr "" "tengono le teste di spillo dei punti di supporto e si collegano ai pilastri " "come piccoli rami." +msgid "Maximum Print Volumetric speed" +msgstr "Velocità volumetrica di stampa massima" + msgid "maximum speed" msgstr "velocità massima" @@ -8056,6 +8308,9 @@ msgstr "Tempo di esposizione minimo" msgid "Minimum extrusion length" msgstr "Lunghezza minima di estrusione" +msgid "Minimum fan speed" +msgstr "Velocità minima ventola" + msgid "Minimum feature size" msgstr "Dimensione minima della caratteristica" @@ -8660,6 +8915,13 @@ msgstr "Nota: È richiesta una versione di Repetier almeno 0.90.0 ." msgid "Note: some shortcuts work in (non)editing mode only." msgstr "Nota: alcune scorciatoie funzionano solo in modalità (non) editing." +msgid "" +"Note: The layer time for the cooling is currently computed with infinite " +"acceleration, and so is very optimistic." +msgstr "" +"Nota: il tempo di raffreddamento è attualmente calcolato con accelerazione " +"infinita, quindi è molto ottimistico." + msgid "Note: This preset will be replaced after saving" msgstr "Nota: Questo preset sarà sostituito dopo il salvataggio" @@ -8829,9 +9091,6 @@ msgstr "Spirale di ottagramma" msgid "OctoPrint version" msgstr "Versione OctoPrint" -msgid "odd layers" -msgstr "strati dispari" - msgid "of a current Object" msgstr "di un oggetto corrente" @@ -8865,12 +9124,12 @@ msgstr "Vecchio valore" msgid "On" msgstr "On" +msgid "On even layers" +msgstr "Su strati pari" + msgid "On first layer" msgstr "Primo strato" -msgid "On odd layers" -msgstr "Su strati dispari" - msgid "" "On OSX there is always only one instance of app running by default. However " "it is allowed to run multiple instances of same app from the command line. " @@ -8948,6 +9207,16 @@ msgstr "" "Rimuovi tutto tranne l'ultimo oggetto, o abilita la modalità sequenziale con " "\"complete_objects\"." +msgid "Only ascii characters in gcode" +msgstr "Solo caratteri ascii nel gcode" + +msgid "" +"Only compatible presets are shown. Click to show both the presets compatible " +"and not compatible with the current printer." +msgstr "" +"Vengono mostrati solo i presets compatibili. Fare clic per mostrare sia i " +"presets compatibili che quelli non compatibili con la stampante corrente." + msgid "" "Only create support if it lies on a build plate. Don't create support on a " "print." @@ -9131,6 +9400,9 @@ msgstr "" "Apre la notifica del consiglio del giorno nell'angolo in basso a destra o " "mostra un altro consiglio se già aperto." +msgid "OPeri" +msgstr "OPeri" + msgid "Optimize object rotation for best surface quality." msgstr "Ottimizza rotazione oggetto per la migliore qualità superficiale" @@ -9162,9 +9434,21 @@ msgstr "" "di trasudamento. Questa caratteristica rallenta sia la stampa che la " "generazione del codice G." +msgid "Optimizing layer %s / %s" +msgstr "Ottimizzazione strato %s / %s" + +msgid "Optimizing skirt & brim %s%%" +msgstr "Ottimizzazione skirt e brim %s%%" + +msgid "Optimizing support layer %s / %s" +msgstr "Ottimizzazione strato supporto %s/%s" + msgid "Option tags:" msgstr "Opzioni tag:" +msgid "Option use another tags than the current mode." +msgstr "L'opzione utilizza tag diversi dalla modalità corrente." + msgid "Options" msgstr "Opzioni" @@ -9243,6 +9527,42 @@ msgstr "Opzioni di uscita" msgid "Outside walls" msgstr "Pareti esterne" +msgid "Over %1% and %2% it will be at least %3%%%." +msgstr "Sopra il %1% e %2% sarà almeno il %3%%%." + +msgid "Over %1% and %2% it will be fixed to %3%%%." +msgstr "Sopra il %1% e %2% sarà fissa al %3%%%." + +msgid "Over %1% and %2% it will be off." +msgstr "Sopra il %1% e %2% sarà spenta." + +msgid "Over %1% it will be at %2%%%." +msgstr "Sopra il %1% sarà al %2%%%." + +msgid "Over %1% it will be at least %2%%%, and off over %3%." +msgstr "Sopra il %1% sarà almeno %2%%%, e spento sopra il %3%." + +msgid "Over %1% it will be at least %2%%%, and over %3% at least %4%%%." +msgstr "Sopra il %1% sarà almeno %2%%% e sopra il %3% almeno del %4%%%." + +msgid "Over %1% it will be at least %2%%%." +msgstr "Sopra il %1% sarà almeno il %2%%%." + +msgid "Over %1% it will be fixed to %2%%%, and off over %3%." +msgstr "Sopra il %1% sarà fissa al %2%%% e ridotta al %3%." + +msgid "Over %1% it will be fixed to %2%%%, and over %3% to %4%%%." +msgstr "Sopra il %1% sarà fissa al %2%%% e sopra il %3% al %4%%%." + +msgid "Over %1% it will be off, and over %2% at least %3%%%." +msgstr "Sopra il %1% sarà spenta, e sopra il %2% almeno il %3%%%." + +msgid "Over %1% it will be off, and over %2% fixed to %3%%%." +msgstr "Sopra il %1% verrà spenta e sopra il %2% fissa al %3%%%." + +msgid "Over %1% it will be off." +msgstr "Sopra il %1% verrà spenta." + msgid "Over raft" msgstr "Sopra Raft" @@ -9550,6 +9870,9 @@ msgstr "Generatore di perimetri" msgid "Perimeter loop seam" msgstr "Cucitura perimetrale ad anello" +msgid "Perimeter overhangs" +msgstr "Sporgenze perimetrali" + msgid "perimeter overlap" msgstr "sovrapposizione del perimetro" @@ -9589,8 +9912,8 @@ msgstr "Numero del perimetro" msgid "Perimeters loop" msgstr "Anello dei perimetri" -msgid "Perimeters spacing change on odd layers" -msgstr "Modifica spaziatura perimetri su strati dispari" +msgid "Perimeters spacing change on even layers" +msgstr "Modifica spaziatura perimetri su strati pari" msgid "" "Perimeters will be split into multiple segments by inserting Fuzzy skin " @@ -10027,6 +10350,15 @@ msgstr "Stampante con nome \"%1%\" esiste già." msgid "Printer:" msgstr "Stampante:" +msgid "" +"Printing speed of the wipe tower. Capped by filament_max_volumetric_speed " +"(if set).\n" +"If set to zero, a value of 80mm/s is used." +msgstr "" +"Velocità di stampa della torre di pulizia. Limitata da " +"filament_max_volumetric_speed (se impostato).\n" +"Se impostato a zero, viene utilizzato un valore di 80 mm/s." + msgid "" "Printing with multiple extruders of differing nozzle diameters. If support " "is to be printed with the current extruder (support_material_extruder == 0 " @@ -10520,6 +10852,9 @@ msgstr "Ripristino alla base" msgid "Reset to Filament Color" msgstr "Ripristina il colore del filamento" +msgid " resin '%1%'" +msgstr " resina '%1%'" + msgid "Restart application" msgstr "Riavvia l'applicazione" @@ -10573,8 +10908,8 @@ msgstr "Retrazioni" msgid "Reverse direction of zoom with mouse wheel" msgstr "Inverti la direzione dello zoom con la rotella del mouse" -msgid "Reverse on odd" -msgstr "Inverti su dispari" +msgid "Reverse on even" +msgstr "Inverti su pari" msgid "Reverse threshold" msgstr "Soglia inversa" @@ -11192,6 +11527,23 @@ msgstr "" msgid "Set the shape of your printer's bed." msgstr "Imposta la forma del letto della tua stampante." +msgid "" +"Set the speed of the full perimeters to the overhang speed, and also the " +"next one(s) if any.\n" +"Set to 0 to disable.\n" +"Set to 1 to set the overhang speed to the full perimeter if there is any " +"overhang detected inside it.\n" +"Set to more than 1 to also set the overhang speed to the next perimeter(s) " +"(only in classic mode)." +msgstr "" +"Imposta la velocità di tutti i perimetri alla velocità sporgenze e anche " +"quelli successivi, se presenti.\n" +"Imposta 0 per disabilitare.\n" +"Imposta 1 per impostare la velocità sporgenze sull'intero perimetro se viene " +"rilevata una sporgenza nel perimetro.\n" +"Imposta maggiore di 1 per impostare anche la velocità sporgenze sul/sui " +"perimetro/i successivo/i (solo in modalità classica)." + msgid "" "Set this if your printer uses control values from 0-100 instead of 0-255." msgstr "" @@ -11415,6 +11767,9 @@ msgstr "" "propria finestra. Devi fare clic sugli ingranaggi delle impostazioni per " "visualizzare la finestra delle impostazioni." +msgid "SFill" +msgstr "SFill" + msgid "Shall I adjust those settings for supports?" msgstr "Devo regolare queste impostazioni per i supporti?" @@ -11615,6 +11970,9 @@ msgstr "" "(utilizzando 55% e 75% per le due soglie)\n" "Usa la modalità esperto per ottenere widget più dettagliati" +msgid "Simplifying paths" +msgstr "Semplificare percorsi" + msgid "Simulate Prusa 'no thick bridge'" msgstr "Simula Prusa 'no ponte spesso'" @@ -11962,8 +12320,8 @@ msgstr "Velocità ventola riempimento solido" msgid "Solid infill spacing" msgstr "Spaziatura di riempimento solido" -msgid "Solid infill spacing change on odd layers" -msgstr "Modifica spaziatura riempimento solido su strati dispari" +msgid "Solid infill spacing change on even layers" +msgstr "Modifica spaziatura riempimento solido su strati pari" msgid "Solid infill speed" msgstr "Velocità di riempimento solido" @@ -11980,6 +12338,9 @@ msgstr "Strati solidi" msgid "Solid spacing" msgstr "Spaziatura solida" +msgid "Solid surfaces" +msgstr "Superfici solide" + msgid "Soluble material" msgstr "Materiale solubile" @@ -12091,6 +12452,9 @@ msgstr "Sparsi" msgid "Sparse fill pattern" msgstr "Trama riempimento sparso" +msgid "Sparse infill" +msgstr "Riempimento sparso" + msgid "Sparse infill pattern" msgstr "Trama riempimento sparso" @@ -12372,6 +12736,15 @@ msgstr "Iniziare il codice G" msgid "Start new slicing process" msgstr "Inizia un nuovo processo di affettamento" +msgid "" +"Start of the wiping speed ramp up (for wipe tower).\n" +"Can be a % of the 'Wipe tower speed'.\n" +"Set to 0 to disable." +msgstr "" +"Inizio dell'incremento della velocità di pulizia (per la torre di pulizia).\n" +"Può essere una % della 'Velocità della torre di pulizia'.\n" +"Imposta 0 per disabilitare." + msgid "Start temp:" msgstr "Temp. inizio:" @@ -12467,6 +12840,12 @@ msgstr "" "Smontato con successo. Il dispositivo %s(%s) può ora essere rimosso in modo " "sicuro dal computer." +msgid "Supp" +msgstr "Supp" + +msgid "SuppI" +msgstr "SuppI" + msgid "support" msgstr "supporto" @@ -12734,6 +13113,12 @@ msgstr "" " Layout schede: tutte le finestre sono nell'applicazione, tutte " "selezionabili tramite una scheda." +msgid "Tags" +msgstr "Tags" + +msgid "tags" +msgstr "tags" + msgid "Take Configuration &Snapshot" msgstr "Prendi la configurazione e l'istantanea" @@ -12794,6 +13179,9 @@ msgstr "Colori del testo" msgid "Texture" msgstr "Texture" +msgid "TFill" +msgstr "TFill" + msgid "The %1% infill pattern is not supposed to work at 100%% density." msgstr "" "Il modello di riempimento %1% non dovrebbe funzionare al 100%% di densità." @@ -13241,6 +13629,13 @@ msgstr "" "L'oggetto sarà sollevato da questo numero di strati, e il materiale di " "supporto sarà generato sotto di esso." +msgid "" +"The option you selected in the search dialog isn't available in the current " +"mode/tags. Do you want to switch to the option tag?" +msgstr "" +"L'opzione selezionata nella finestra di dialogo di ricerca non è disponibile " +"nella modalità/tag corrente. Vuoi passare al tag opzione?" + msgid "" "The percentage of smaller pillars compared to the normal pillar diameter " "which are used in problematic areas where a normal pilla cannot fit." @@ -13452,6 +13847,33 @@ msgid "The speed for retractions (this only applies to the extruder motor)." msgstr "" "La velocità per le retrazioni (si applica solo al motore dell'estrusore)." +msgid "" +"The Spiral Vase mode requires:\n" +"- no top solid layers\n" +"- 0% fill density\n" +"- classic perimeter slicing\n" +"- no support material\n" +"- Ensure vertical shell thickness enabled\n" +"- disabled 'no solid infill over perimeters'\n" +"- unchecked 'exact last layer height'\n" +"- unchecked 'dense infill'\n" +"- unchecked 'extra perimeters'- unchecked 'gap fill after last perimeter'- " +"disabled 'no solid fill over X perimeters'- disabled 'seam notch'" +msgstr "" +"La modalità Vaso a spirale richiede:\n" +"- nessun strato solido superiore\n" +"- 0% densità di riempimento\n" +"- generatore perimetro classico\n" +"- nessun materiale di supporto\n" +"- Assicurati che lo spessore del guscio verticale sia abilitato\n" +"- disabilitato 'nessun riempimento solido sui perimetri'\n" +"- deselezionata 'altezza esatta dell'ultimo strato'\n" +"- deselezionato 'riempimento denso'\n" +"- deselezionato 'perimetri extra'\n" +"- deselezionato 'riempimento spazio dopo l'ultimo perimetro'\n" +"- disabilitato 'nessun riempimento solido su X perimetri'\n" +"- disabilitato 'tacca di cucitura'" + msgid "" "The Spiral Vase option can only be used when printing single material " "objects." @@ -13702,6 +14124,9 @@ msgstr "Pareti sottili larghezza minima" msgid "Thin walls speed" msgstr "Velocità delle pareti sottili" +msgid "ThinW" +msgstr "ThinW" + msgid "This %s version: %s" msgstr "Questa versione %s: %s" @@ -13793,6 +14218,22 @@ msgstr "" "proprio prima dello spostamento Z. Nota che puoi usare variabili segnaposto " "per tutte le impostazioni di Slic3r così come {layer_num} e {layer_z}." +msgid "" +"This define the succetion of infill angle. When defined, it replaces the " +"fill_angle, and there won't be any extra 90° for each layer added, but the " +"fill_angle_increment will still be used. The first layer start with the " +"first angle. If a new pattern is used in a modifier, it will choose the " +"layer angle from the pattern as if it has started from the first layer.Empty " +"this settings to disable and recover the old behavior." +msgstr "" +"Questo definisce la successione dell'angolo di riempimento. Quando definito, " +"sostituisce fill_angle e non ci saranno 90° aggiuntivi per ogni strato " +"aggiunto, ma fill_angle_increment verrà comunque utilizzato. Il primo strato " +"inizia con il primo angolo. Se un nuovo modello viene utilizzato in un " +"modificatore, sceglierà l'angolo dello strato dal modello come se fosse " +"iniziato dal primo strato. Svuotare queste impostazioni per disabilitare e " +"ripristinare il vecchio comportamento." + msgid "" "This end procedure is inserted at the end of the output file, before the " "printer end gcode (and before any toolchange from this filament in case of " @@ -13917,6 +14358,21 @@ msgstr "" "Può essere disabilitato da disable_fan_first_layers, rallentato da " "full_fan_speed_layer e aumentato dal tempo di strato basso." +msgid "" +"This fan speed is enforced during all infill bridges. It won't slow down the " +"fan if it's currently running at a higher speed.\n" +"Set to -1 to disable this override (Internal bridges will use Bridges fan " +"speed).\n" +"Can be disabled by disable_fan_first_layers and increased by low layer time." +msgstr "" +"Questa velocità della ventola viene applicata durante tutti i ponti di " +"riempimento. Non rallenterà la ventola se è attualmente in funzione a una " +"velocità maggiore.\n" +"Imposta -1 per disabilitare questa sostituzione (i ponti interni " +"utilizzeranno la velocità della ventola dei ponti).\n" +"Può essere disabilitato da disable_fan_first_layers e aumentato dal tempo di " +"strato basso." + msgid "" "This fan speed is enforced during all Internal Infill moves\n" "Set to 1 to disable fan.\n" @@ -14957,6 +15413,13 @@ msgstr "" "Può essere una % della larghezza del perimetro\n" "0 per auto" +msgid "" +"This setting represents the minimum fan speed (like minimum PWM) your fan " +"needs to work." +msgstr "" +"Questa impostazione rappresenta la velocità minima della ventola (come il " +"PWM minimo) necessaria per il suo funzionamento." + msgid "" "This setting represents the minimum mm for a gapfill extrusion to be " "extruded.\n" @@ -15264,6 +15727,13 @@ msgstr "" "la variabile d'ambiente %1% sul bundle CA corretto e riavviate " "l'applicazione." +msgid "" +"To use a client cert on MacOS, you might need to add your certificate to " +"your keychain and make sure it's trusted." +msgstr "" +"Per utilizzare un certificato client su MacOS, potresti dover aggiungere il " +"certificato al portachiavi e assicurarti che sia affidabile." + msgid "" "To use a custom CA file, please import your CA file into Certificate Store / " "Keychain." @@ -15377,6 +15847,9 @@ msgstr "Superiore solido" msgid "Top solid acceleration" msgstr "Accelerazione solido superiore" +msgid "Top Solid fan speed" +msgstr "Velocità ventola solido superiore" + msgid "Top solid infill" msgstr "Riempimento solido superiore" @@ -15392,6 +15865,9 @@ msgstr "Riempimento solido superiore" msgid "Top solid speed" msgstr "Velocità massima solida" +msgid "Top surfaces" +msgstr "Superfici superiori" + msgid "Top View" msgstr "Vista dall'alto" @@ -15819,6 +16295,24 @@ msgstr "Utente" msgid "User presets" msgstr "Preset dell'utente" +msgid "" +"Using a color change gcode, but there isn't one for this printer.\n" +"The printer won't stop for the filament change, unless you set it manually " +"in the custom gcode section." +msgstr "" +"Usa un gcode per il cambio colore, ma non ce n'è uno per questa stampante.\n" +"La stampante non si fermerà per il cambio del filamento, a meno che non lo " +"imposti manualmente nella sezione gcode personalizzata." + +msgid "" +"Using a pause gcode, but there isn't one for this printer.\n" +"The printer won't pause, unless you set it manually in the custom gcode " +"section." +msgstr "" +"Usa un gcode di pausa, ma non ce n'è uno per questa stampante.\n" +"La stampante non andrà in pausa, a meno che non la imposti manualmente nella " +"sezione gcode personalizzata." + msgid "usually not necessary to change this" msgstr "di solito non è necessario cambiare questo" @@ -16110,6 +16604,14 @@ msgstr "" "rovinate. Slic3r dovrebbe avvisare e prevenire le collisioni tra estrusori, " "ma attenzione." +msgid "" +"When printing the gcode file, replace any non-ascii character by a '_'. Can " +"be useful if the firmware or a software in a workflow doesn't support uft-8." +msgstr "" +"Quando si stampa il file gcode, sostituire qualsiasi carattere non-ascii con " +"un '_'. Può essere utile se il firmware o un software in un flusso di lavoro " +"non supporta uft-8." + msgid "" "When printing with very low layer heights, you might still want to print a " "thicker bottom layer to improve adhesion and tolerance for non perfect build " @@ -16245,6 +16747,13 @@ msgstr "" "dividere o unire i segmenti del perimetro. Se espresso in percentuale (ad " "esempio 100%), verrà calcolato in base al diametro dell'ugello." +msgid "" +"When using 'Avoid crossing perimeters', consider the top surfaces as a void, " +"to avoid travelling over them if possible." +msgstr "" +"Quando si utilizza 'Evita attraversamento perimetri', considera le superfici " +"superiori come un vuoto, per evitare di attraversarle, se possibile." + msgid "" "When using 'Complete individual objects', the default behavior is to draw " "the skirt around each object. if you prefer to have only one skirt for the " @@ -16415,6 +16924,12 @@ msgstr "Angolo di rotazione della torre di pulizia" msgid "Wipe tower rotation angle with respect to x-axis." msgstr "Angolo di rotazione della torre di pulizia rispetto all'asse x." +msgid "Wipe Tower Speed" +msgstr "Velocità torre pulizia" + +msgid "Wipe tower starting speed" +msgstr "Velocità iniziale torre pulizia" + msgid "Wipe tower Width" msgstr "Larghezza della torre di spurgo" @@ -16477,9 +16992,15 @@ msgstr "scrittura richiamata fallita" msgid "Write information about the model to the console." msgstr "Scrivi informazioni sul modello nella console." +msgid "Write the thumbnail type in gcode." +msgstr "Scrivi tipo di miniatura nel gcode." + msgid "Wrong password" msgstr "Password sbagliata" +msgid "WTower" +msgstr "WTower" + msgid "X coordinate of the left front corner of a wipe tower" msgstr "Coordinata X dell'angolo anteriore sinistro di una torre di pulizia" @@ -16620,6 +17141,13 @@ msgstr "" "modificarla tu stesso nel pannello di destra se preferisci. È solo più " "veloce selezionarlo qui." +msgid "" +"You can either use a path to your certificate or the name of your " +"certificate as you can find it in your Keychain" +msgstr "" +"Puoi usare un percorso per il tuo certificato o il nome del tuo certificato " +"come puoi trovarlo nel tuo portachiavi" + msgid "" "You can increase this to over-extrude on the first layer if there is not " "enough plastic because your bed isn't levelled.\n" @@ -16794,9 +17322,18 @@ msgstr "" "Le tue modifiche attuali cancelleranno tutte le modifiche dell'estrusore " "(utensile) salvate." +msgid "Your current tags:" +msgstr "I tuoi tag correnti:" + msgid "Your file was repaired." msgstr "Il tuo file è stato riparato." +msgid "Your firmware doesn't allow to print the remaining times with M117." +msgstr "Il tuo firmware non consente di stampare i tempi rimanenti con M117." + +msgid "Your firmware doesn't allow to print the remaining times with M73." +msgstr "Il tuo firmware non consente di stampare i tempi rimanenti con M73." + msgid "" "Your object appears to be too large, so it was automatically scaled down to " "fit your print bed." diff --git a/resources/localization/it/TODO.po b/resources/localization/it/TODO.po index be1af4926db..d77d00e136d 100644 --- a/resources/localization/it/TODO.po +++ b/resources/localization/it/TODO.po @@ -1,577 +1,17 @@ - -#: src/slic3r/GUI/Plater.cpp:5877 -#, possible-boost-format -msgid " resin '%1%'" -msgstr "" - #: ../../ui_layout/default/print.ui msgid "_" msgstr "" - -#: src/slic3r/GUI/PresetHints.cpp:192 -#, possible-boost-format -msgid "Also, the fan speed over %1% won't be touched by this feature." -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:2287 -msgid "Alternate Fill Angle" -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:174 -#, possible-boost-format -msgid "but for %1% where the speed-up phase is skipped." -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:123 -msgid "By default, there won't be any fan speed command." -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:2738 -#Similar to me: Cap with perimeter flow -# 7 changes: % of perimeter flow -# translation: % di flusso perimetrale -msgid "Cap with perimeter flow" -msgstr "" - - -#: src/libslic3r/Print.cpp:1238 -msgid "Creating arcs" -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:1224 -msgid "" -"Default speed for the fan, to set the speed for features where there is no " -"fan control. Useful for PLA and other low-temp filament.\n" -"Set 0 to disable the fan by default. Useful for ABS and other high-temp " -"filaments.\n" -"Set -1 to disable. if disabled, the beahavior isn't defined yet. The goal is " -"to avoid adding fan speed commands." -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:1452 -msgid "Don't check crossings for retraction on first layer" -msgstr "" - - -#: src/libslic3r/GCode.cpp:4085 -msgid "" -"Error while writing gcode: two points are at the same position. Please send " -"the .3mf project to the dev team for debugging. Extrude loop: seam notch." -msgstr "" - - -#: src/libslic3r/GCode.cpp:4565 -msgid "" -"Error while writing gcode: two points are at the same position. Please send " -"the .3mf project to the dev team for debugging. Extrude loop: wipe." -msgstr "" - - -#: src/libslic3r/GCode.cpp:4473 -msgid "" -"Error while writing gcode: two points are at the same position. Please send " -"the .3mf project to the dev team for debugging. Extrude loop: " -"wipe_inside_start." -msgstr "" - - -#: src/slic3r/GUI/MainFrame.cpp:1735 -msgid "Export current plate (options available in the dialog)" -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:3420 -#Similar to me: Fan delay only for overhangs -# 11 changes: Only for overhangs -# translation: Solo per sporgenze -msgid "Fan delay only for overhangs" -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:2307 src/libslic3r/PrintConfig.cpp:2308 -msgid "Fill angle template" -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:190 -#, possible-boost-format -msgid "If the fan speed is set and is higher than %1%%%, it won't be changed." -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:188 -#, possible-boost-format -msgid "" -"If the fan speed is set, it will proportionally increasing speed between " -"this value and %1%%%." -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:4240 -#Similar to me: If you want to process the output G-code through custom scripts, just list their absolute paths here.\nSeparate multiple scripts with a semicolon or a line return.\n!! please use '\\;' here if you want a not-line-separation ';'!!\nScripts will be passed the absolute path to the G-code file as the first argument, and they can access the Slic3r config settings by reading environment variables.\nThe script, if passed as a relative path, will also be searched from the slic3r directory, the slic3r configuration directory and the user directory. -# 86 changes: If you want to process the output G-code through custom scripts, just list their absolute paths here. Separate multiple scripts with a semicolon. Scripts will be passed the absolute path to the G-code file as the first argument, and they can access the Slic3r config settings by reading environment variables.\nThe script, if passed as a relative path, will also be searched from the slic3r directory, the slic3r configuration directory and the user directory. -# translation: Se vuoi elaborare il G-code di uscita con script personalizzati, elenca qui i loro percorsi assoluti. Separa gli script multipli con un punto e virgola. Agli script viene passato il percorso assoluto del file G-code come primo argomento, e possono accedere alle impostazioni di configurazione di Slic3r leggendo le variabili d'ambiente.\nLo script, se passato come percorso relativo, verrà cercato anche dalla directory slic3r, dalla directory di configurazione di slic3r e dalla directory dell'utente. -msgid "" -"If you want to process the output G-code through custom scripts, just list " -"their absolute paths here.\n" -"Separate multiple scripts with a semicolon or a line return.\n" -"!! please use '\\;' here if you want a not-line-separation ';'!!\n" -"Scripts will be passed the absolute path to the G-code file as the first " -"argument, and they can access the Slic3r config settings by reading " -"environment variables.\n" -"The script, if passed as a relative path, will also be searched from the " -"slic3r directory, the slic3r configuration directory and the user directory." -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:427 -msgid "" -"instead of writing 'thumbnails' as tag in the gcode, it will write " -"'thumbnails_PNG', thumbnails_JPG', 'thumbnail_QOI', etc..\n" -" Some firmware needs it to know how to decode the thumbnail, some others " -"don't support it." -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:4150 -#Similar to me: Internal Perimeter fan speed -# 3 changes: External perimeter fan speed -# translation: Velocità della ventola sul perimetro esterno -# 5 changes: Internal perimeters speed -# translation: Velocità perimetri interni -# 7 changes: External perimeters speed -# translation: Velocità dei perimetri esterni -msgid "Internal Perimeter fan speed" -msgstr "" - - -#: src/slic3r/GUI/Mouse3DController.cpp:562 -msgid "Invert Pitch axis" -msgstr "" - - -#: src/slic3r/GUI/Mouse3DController.cpp:567 -msgid "Invert Roll axis" -msgstr "" - - -#: src/slic3r/GUI/Mouse3DController.cpp:542 -msgid "Invert X axis" -msgstr "" - - -#: src/slic3r/GUI/Mouse3DController.cpp:547 -msgid "Invert Y axis" -msgstr "" - - -#: src/slic3r/GUI/Mouse3DController.cpp:557 -msgid "Invert Yaw axis" -msgstr "" - - -#: src/slic3r/GUI/Mouse3DController.cpp:552 -msgid "Invert Z axis" -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:2289 -msgid "" -"It's better for some infill like rectilinear to rotate 90° each layer. If " -"this settign is deactivated, they won't do that anymore." -msgstr "" - - -#: src/slic3r/GUI/BedShapeDialog.cpp:305 -msgid "" -"Load a png/svg file to be used as a texture. \n" -"If it can be found via the executable, configuration or user directory then " -"a relative path will be kept instead of the full one." -msgstr "" - - -#: src/slic3r/GUI/BedShapeDialog.cpp:383 -msgid "" -"Load a stl file to be used as a model. \n" -"If it can be found via the executable, configuration or user directory then " -"a relative path will be kept instead of the full one." -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:3664 -#Similar to me: Maximum Print Volumetric speed -# 11 changes: Max volumetric speed -# translation: Velocità volumetrica massima -msgid "Maximum Print Volumetric speed" -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:4273 src/libslic3r/PrintConfig.cpp:4274 -#Similar to me: Minimum fan speed -# 6 changes: Max fan speed -# translation: Velocità massima ventola -msgid "Minimum fan speed" -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:3152 -#Similar to me: mm of % -# 1 changes: mm or % -# translation: mm o % -# 2 changes: mm² or % -# translation: mm² o % -msgid "mm of %" -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:226 -msgid "" -"Note: The layer time for the cooling is currently computed with infinite " -"acceleration, and so is very optimistic." -msgstr "" - - -#: src/libslic3r/PrintObject.cpp:641 src/libslic3r/PrintObject.cpp:652 -#: src/libslic3r/PrintObject.cpp:692 -#, possible-c-format, possible-boost-format -#Similar to me: Optimizing layer %s / %s -# 6 changes: Infilling layer %s / %s -# translation: Riempimento strato %s / %s -msgid "Optimizing layer %s / %s" -msgstr "" - - -#: src/libslic3r/Print.cpp:1251 src/libslic3r/Print.cpp:1263 -#: src/libslic3r/Print.cpp:1268 -#, possible-c-format, possible-boost-format -msgid "Optimizing skirt & brim %s%%" -msgstr "" - - -#: src/libslic3r/PrintObject.cpp:683 -#, possible-c-format, possible-boost-format -msgid "Optimizing support layer %s / %s" -msgstr "" - - -#: src/slic3r/GUI/Plater.cpp:1128 -msgid "Option use another tags than the current mode." -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:76 -#, possible-boost-format -msgid "Over %1% and %2% it will be at least %3%%%." -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:40 -#, possible-boost-format -msgid "Over %1% and %2% it will be fixed to %3%%%." -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:38 src/slic3r/GUI/PresetHints.cpp:74 -#, possible-boost-format -msgid "Over %1% and %2% it will be off." -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:26 -#, possible-boost-format -msgid "Over %1% it will be at %2%%%." -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:85 -#, possible-boost-format -msgid "Over %1% it will be at least %2%%%, and off over %3%." -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:87 -#, possible-boost-format -msgid "Over %1% it will be at least %2%%%, and over %3% at least %4%%%." -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:63 -#, possible-boost-format -msgid "Over %1% it will be at least %2%%%." -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:47 -#, possible-boost-format -msgid "Over %1% it will be fixed to %2%%%, and off over %3%." -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:49 -#, possible-boost-format -msgid "Over %1% it will be fixed to %2%%%, and over %3% to %4%%%." -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:83 -#, possible-boost-format -msgid "Over %1% it will be off, and over %2% at least %3%%%." -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:45 -#, possible-boost-format -msgid "Over %1% it will be off, and over %2% fixed to %3%%%." -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:24 src/slic3r/GUI/PresetHints.cpp:61 -#, possible-boost-format -msgid "Over %1% it will be off." -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:135 src/slic3r/GUI/PresetHints.cpp:171 -#Similar to me: Perimeter overhangs -# 4 changes: Perimeter overlap -# translation: Sovrapposizione del perimetro -# 5 changes: perimeter overlap -# translation: sovrapposizione del perimetro -# 7 changes: Perimeter bonding -# translation: Incollaggio perimetrale -msgid "Perimeter overhangs" -msgstr "" - -#: ../../ui_layout/default/print.ui : l79 +#: ../../ui_layout/default/print.ui : l83 #Similar to me: Position of perimeters' starting points. May use the angle & travel cost (with the fixed visilibity & ovehangs cost) to find the best place.\nCorners\. at least 100% angle cost and no more than 80% travel cost (default to 120-40).\nNearest\. no more than 100% angle cost and at least 100% travel cost (default to 80-100).\nScattered\. seam is placed at a random position on external perimeters.\nRandom\. seam is placed at a random position for all perimeters.\nAligned\. seams are grouped in the best place possible (minimum 6 layers per group).\nContiguous\. seam is placed over a seam from the previous layer (useful with enforcers as seeds).\nRear\. seam is placed at the far side (highest Y coordinates).\nCustom\. Other conbination of angle & travel cost than 'Corners' and 'Nearest', (default to 60-100).\nCustom & weight can be defined in Advanced or Expert mode. +# 8 changes: Position of perimeters' starting points. May use the angle & travel cost (with the fixed visilibity & ovehangs cost) to find the best place.\nCorners\\. at least 100% angle cost and no more than 80% travel cost (default to 120-40).\nNearest\\. no more than 100% angle cost and at least 100% travel cost (default to 80-100).\nScattered\\. seam is placed at a random position on external perimeters.\nRandom\\. seam is placed at a random position for all perimeters.\nAligned\\. seams are grouped in the best place possible (minimum 6 layers per group).\nContiguous\\. seam is placed over a seam from the previous layer (useful with enforcers as seeds).\nRear\\. seam is placed at the far side (highest Y coordinates).\nCustom\\. Other conbination of angle & travel cost than 'Corners' and 'Nearest', (default to 60-100).\nCustom & weight can be defined in Advanced or Expert mode. +# translation: Posizione dei punti di partenza dei perimetri. Può usare il costo angolo e viaggio (con il costo fisso di visibilità e sporgenze) per trovare il posto migliore.\nAngoli\\. almeno il 100% del costo dell'angolo e non più dell'80% del costo del viaggio (predefinito 120-40).\nPiù vicino\\. non più del 100% del costo dell'angolo e almeno il 100% del costo del viaggio (predefinito 80-100).\nSparpagliato: la cucitura è posizionata in una posizione casuale sui perimetri esterni\nCasuale: la cucitura è posizionata in una posizione casuale per tutti i perimetri\nAllineato: le cuciture sono raggruppate nel miglior posto possibile (minimo 6 strati per gruppo).\nContiguo: la cucitura è posizionata sopra una cucitura dello strato precedente (utile con gli esecutori)\nPosteriore: la cucitura è posizionata sul lato opposto (coordinate Y più alte).\nPersonalizzato: altra combinazione di angolo e costo del viaggio rispetto a 'Angoli' e 'Più vicino' (predefinito 60-100).\nPersonalizzato può essere definito in modalità Avanzato o Esperto. # 16 changes: Position of perimeters' starting points. May use the angle & travel cost (with the fixed visilibity & ovehangs cost) to find the best place.\nCorners: at least 100% angle cost and no more than 80% travel cost (default to 120-40).\nNearest: no more than 100% angle cost and at least 100% travel cost (default to 80-100).\nScattered: seam is placed at a random position on external perimeters.\nRandom: seam is placed at a random position for all perimeters.\nAligned: seams are grouped in the best place possible (minimum 6 layers per group).\nContiguous: seam is placed over a seam from the previous layer (useful with enforcers as seeds).\nRear: seam is placed at the far side (highest Y coordinates).\nCustom: Other conbination of angle & travel cost than 'Corners' and 'Nearest', (default to 60-100).\nCustom & weight can be defined in Advanced or Expert mode. # translation: Posizione dei punti di partenza dei perimetri. Può utilizzare l'angolo e il costo del viaggio (con la visibilità fissa e il costo delle sporgenze) per trovare il posto migliore.\nAngoli: almeno il 100% del costo dell'angolo e non più dell'80% del costo del viaggio (predefinito 120-40).\nPiù vicino: non più del 100% del costo dell'angolo e almeno il 100% del costo del viaggio (predefinito 80-100).\nSparpagliato: la cucitura è posizionata in una posizione casuale sui perimetri esterni\nCasuale: la cucitura è posizionata in una posizione casuale per tutti i perimetri\nAllineato: le cuciture sono raggruppate nel miglior posto possibile (minimo 6 strati per gruppo).\nContiguo: la cucitura è posizionata sopra una cucitura dello strato precedente (utile con gli esecutori)\nPosteriore: la cucitura è posizionata sul lato opposto (coordinate Y più alte).\nPersonalizzato: altra combinazione di angolo e costo del viaggio rispetto a 'Angoli' e 'Più vicino' (predefinito 60-100).\nPersonalizzato può essere definito in modalità Avanzato o Esperto. msgid "Position of perimeters' starting points. May use the angle & travel cost (with the fixed visilibity & ovehangs cost) to find the best place.\nCorners\. at least 100% angle cost and no more than 80% travel cost (default to 120-40).\nNearest\. no more than 100% angle cost and at least 100% travel cost (default to 80-100).\nScattered\. seam is placed at a random position on external perimeters.\nRandom\. seam is placed at a random position for all perimeters.\nAligned\. seams are grouped in the best place possible (minimum 6 layers per group).\nContiguous\. seam is placed over a seam from the previous layer (useful with enforcers as seeds).\nRear\. seam is placed at the far side (highest Y coordinates).\nCustom\. Other conbination of angle & travel cost than 'Corners' and 'Nearest', (default to 60-100).\nCustom & weight can be defined in Advanced or Expert mode." msgstr "" - -#: src/libslic3r/PrintConfig.cpp:6077 -msgid "" -"Printing speed of the wipe tower. Capped by filament_max_volumetric_speed " -"(if set).\n" -"If set to zero, a value of 80mm/s is used." -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:3961 -#Similar to me: Set the speed of the full perimeters to the overhang speed, and also the next one(s) if any.\nSet to 0 to disable.\nSet to 1 to set the overhang speed to the full perimeter if there is any overhang detected inside it.\nSet to more than 1 to also set the overhang speed to the next perimeter(s) (only in classic mode). -# 35 changes: Set the speed of the full perimeters to the overhang speed, and also the next one(s) if any.\nSet to 0 to disable.\nSet to 1 to set the overhang speed to the full periemter if there is any overhang detected in the periemter.\nSet to more than 1 to also set the overhang speed to the next perimeter(s). -# translation: Imposta la velocità di tutti i perimetri alla velocità sporgenze e anche quelli successivi, se presenti.\nImposta 0 per disabilitare.Imposta 1 per impostare la velocità sporgenze sull'intero perimetro se viene rilevata una sporgenza nel perimetro.\nImposta maggiore di 1 per impostare anche la velocità sporgenze sul/sui perimetro/i successivo/i. -msgid "" -"Set the speed of the full perimeters to the overhang speed, and also the " -"next one(s) if any.\n" -"Set to 0 to disable.\n" -"Set to 1 to set the overhang speed to the full perimeter if there is any " -"overhang detected inside it.\n" -"Set to more than 1 to also set the overhang speed to the next perimeter(s) " -"(only in classic mode)." -msgstr "" - - -#: src/libslic3r/Print.cpp:1240 -msgid "Simplifying paths" -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:131 -#Similar to me: Solid surfaces -# 4 changes: All surfaces -# translation: Tutte le superfici -# 5 changes: All solid surfaces -# translation: Tutte le superfici solide -# 5 changes: Min surface -# translation: Superficie minima -msgid "Solid surfaces" -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:130 -#Similar to me: Sparse infill -# 5 changes: Bridge infill -# translation: Riempimento del ponte -# 5 changes: Max infill -# translation: Riempimento -# 5 changes: Smart fill -# translation: Riempimento intelligente -msgid "Sparse infill" -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:6086 -#, possible-c-format, possible-boost-format -msgid "" -"Start of the wiping speed ramp up (for wipe tower).\n" -"Can be a % of the 'Wipe tower speed'.\n" -"Set to 0 to disable." -msgstr "" - - -#: src/slic3r/GUI/GUI_App.cpp:2505 -#Similar to me: Tags -# 1 changes: Tabs -# translation: Tabulazioni -msgid "Tags" -msgstr "" - - -#: src/slic3r/GUI/Search.cpp:394 src/slic3r/GUI/Search.cpp:463 -msgid "tags" -msgstr "" - - -#: src/slic3r/GUI/Plater.cpp:1127 -msgid "" -"The option you selected in the search dialog isn't available in the current " -"mode/tags. Do you want to switch to the option tag?" -msgstr "" - - -#: src/slic3r/GUI/ConfigManipulation.cpp:93 -#, possible-c-format, possible-boost-format -#Similar to me: The Spiral Vase mode requires:\n- no top solid layers\n- 0% fill density\n- classic perimeter slicing\n- no support material\n- Ensure vertical shell thickness enabled\n- disabled 'no solid infill over perimeters'\n- unchecked 'exact last layer height'\n- unchecked 'dense infill'\n- unchecked 'extra perimeters'- unchecked 'gap fill after last perimeter'- disabled 'no solid fill over X perimeters'- disabled 'seam notch' -# 23 changes: The Spiral Vase mode requires:\n- no top solid layers\n- 0% fill density\n- classic perimeter slicing\n- no support material\n- Ensure vertical shell thickness enabled\n- disabled 'no solid infill over perimeters'\n- unchecked 'exact last layer height'\n- unchecked 'dense infill'\n- unchecked 'extra perimeters'- unchecked 'gap fill after last perimeter'- disabled 'no solid fill over X perimeters' -# translation: La modalità Vaso a spirale richiede:\n- nessuno strato solido superiore\n- 0% densità di riempimento\n- generatore perimetro classico\n- nessun materiale di supporto\n- Assicurati che lo spessore del guscio verticale sia abilitato\n- disabilitato 'nessun riempimento solido sui perimetri'\n- deselezionata 'altezza esatta dell'ultimo strato'\n- deselezionato 'riempimento denso'\n- deselezionato 'perimetri extra'\n- deselezionato 'riempimento spazio dopo l'ultimo perimetro'\n- disabilitato 'nessun riempimento solido su X perimetri' -# 69 changes: The Spiral Vase mode requires:\n- one perimeter\n- no top solid layers\n- 0% fill density\n- no support material\n- Ensure vertical shell thickness enabled\n- disabled 'no solid infill over perimeters'\n- unchecked 'exact last layer height'\n- unchecked 'dense infill'\n- unchecked 'extra perimeters'- unchecked 'gap fill after last perimeter'- disabled 'no solid fill over X perimeters' -# translation: La modalità Vaso a spirale richiede:\n- un perimetro\n- nessuno strato solido superiore\n- 0% densità di riempimento\n- nessun materiale di supporto\n- Assicurati che lo spessore del guscio verticale sia abilitato\n- disabilitato 'nessun riempimento solido sui perimetri'\n- deselezionata 'altezza esatta dell'ultimo strato'\n- deselezionato 'riempimento denso'\n- deselezionato 'perimetri extra'\n- deselezionato 'riempimento spazio dopo l'ultimo perimetro'\n- disabilitato 'nessun riempimento solido su X perimetri' -# 157 changes: The Spiral Vase mode requires:\n- one perimeter\n- no top solid layers\n- 0% fill density\n- no support material\n- Ensure vertical shell thickness enabled\n- disabled 'no solid infill over perimeters'\n- unchecked 'exact last layer height'\n- unchecked 'dense infill'\n- unchecked 'extra perimeters' -# translation: La modalità Vaso a spirale richiede:\n- un perimetro\n- nessuno strato solido superiore\n- 0% densità di riempimento\n- nessun materiale di supporto\n- Assicurati che lo spessore del guscio verticale sia abilitato\n- disabilitato 'nessun riempimento solido sui perimetri'\n- deselezionata 'altezza esatta dell'ultimo strato'\n- deselezionato 'riempimento denso'\n- deselezionato 'perimetri extra' -msgid "" -"The Spiral Vase mode requires:\n" -"- no top solid layers\n" -"- 0% fill density\n" -"- classic perimeter slicing\n" -"- no support material\n" -"- Ensure vertical shell thickness enabled\n" -"- disabled 'no solid infill over perimeters'\n" -"- unchecked 'exact last layer height'\n" -"- unchecked 'dense infill'\n" -"- unchecked 'extra perimeters'- unchecked 'gap fill after last perimeter'- " -"disabled 'no solid fill over X perimeters'- disabled 'seam notch'" -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:2310 -msgid "" -"This define the succetion of infill angle. When defined, it replaces the " -"fill_angle, and there won't be any extra 90° for each layer added, but the " -"fill_angle_increment will still be used. The first layer start with the " -"first angle. If a new pattern is used in a modifier, it will choose the " -"layer angle from the pattern as if it has started from the first layer.Empty " -"this settings to disable and recover the old behavior." -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:750 -#Similar to me: This fan speed is enforced during all infill bridges. It won't slow down the fan if it's currently running at a higher speed.\nSet to -1 to disable this override (Internal bridges will use Bridges fan speed).\nCan be disabled by disable_fan_first_layers and increased by low layer time. -# 35 changes: This fan speed is enforced during bridges and overhangs. It won't slow down the fan if it's currently running at a higher speed.\nSet to -1 to disable this override (Bridges will use default fan speed).\nCan be disabled by disable_fan_first_layers and increased by low layer time. -# translation: Questa velocità della ventola viene applicata durante ponti e sporgenze. Non rallenterà la ventola se è attualmente in funzione a una velocità superiore.\nImposta -1 per disabilitare questa sostituzione (i ponti e le sporgenze utilizzeranno la velocità predefinita della ventola).\nPuò essere disabilitato da disable_fan_first_layers e aumentato dal tempo di strato basso. -# 36 changes: This fan speed is enforced during all infill bridges. It won't slow down the fan if it's currently running at a higher speed.\nSet to 1 to follow default speed.\nSet to -1 to disable this override (internal bridges will use Bridges fan speed).\nCan be disabled by disable_fan_first_layers and increased by low layer time. -# translation: Questa velocità della ventola viene applicata durante tutti i ponti del riempimento. Non rallenterà la ventola se è attualmente in funzione a una velocità maggiore.\nImposta 1 per seguire la velocità predefinita.\nImposta -1 per disabilitare questa sostituzione (i ponti interni utilizzeranno la velocità della ventola dei ponti).\nPuò essere sovrascritto solo da disable_fan_first_layers. -# 36 changes: This fan speed is enforced during bridges and overhangs. It won't slow down the fan if it's currently running at a higher speed.\nSet to -1 to disable this override (Bridge will use default fan speed).\nCan be disabled by disable_fan_first_layers and increased by low layer time. -# translation: Questa velocità della ventola viene applicata durante ponti e sporgenze. Non rallenterà la ventola se è attualmente in funzione a una velocità superiore.\nImposta -1 per disabilitare questa sostituzione (i ponti e le sporgenze utilizzeranno la velocità predefinita della ventola).\nPuò essere disabilitato da disable_fan_first_layers e aumentato dal tempo di strato basso. -msgid "" -"This fan speed is enforced during all infill bridges. It won't slow down the " -"fan if it's currently running at a higher speed.\n" -"Set to -1 to disable this override (Internal bridges will use Bridges fan " -"speed).\n" -"Can be disabled by disable_fan_first_layers and increased by low layer time." -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:4276 -#Similar to me: This setting represents the minimum fan speed (like minimum PWM) your fan needs to work. -# 25 changes: This setting represents the minimum PWM your fan needs to work. -# translation: Questa impostazione rappresenta la PWM minima (modulazione di larghezza di impulso) che la ventola necessita per lavorare. -msgid "" -"This setting represents the minimum fan speed (like minimum PWM) your fan " -"needs to work." -msgstr "" - - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:455 -msgid "" -"To use a client cert on MacOS, you might need to add your certificate to " -"your keychain and make sure it's trusted." -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:5829 -#Similar to me: Top Solid fan speed -# 5 changes: Top solid speed -# translation: Velocità massima solida -# 6 changes: Gap fill fan speed -# translation: Velocità ventola riempimento spazio -# 6 changes: Top fan speed -# translation: Velocità massima della ventola -msgid "Top Solid fan speed" -msgstr "" - - -#: src/slic3r/GUI/PresetHints.cpp:132 src/slic3r/GUI/PresetHints.cpp:192 -#Similar to me: Top surfaces -# 3 changes: All surfaces -# translation: Tutte le superfici -# 3 changes: On surfaces -# translation: Sulle superfici -# 4 changes: Min surface -# translation: Superficie minima -msgid "Top surfaces" -msgstr "" - - -#: src/libslic3r/GCode.cpp:2719 -msgid "" -"Using a color change gcode, but there isn't one for this printer.\n" -"The printer won't stop for the filament change, unless you set it manually " -"in the custom gcode section." -msgstr "" - - -#: src/libslic3r/GCode.cpp:2738 -msgid "" -"Using a pause gcode, but there isn't one for this printer.\n" -"The printer won't pause, unless you set it manually in the custom gcode " -"section." -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:6075 -#Similar to me: Wipe Tower Speed -# 6 changes: Wipe Tower -# translation: Torre del tergicristallo -# 6 changes: Wipe tower Width -# translation: Larghezza della torre di spurgo -# 6 changes: Wipe tower X -# translation: Torre di pulizia X -msgid "Wipe Tower Speed" -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:6084 -#Similar to me: Wipe tower starting speed -# 10 changes: Wipe tower rotation angle -# translation: Angolo di rotazione della torre di pulizia -msgid "Wipe tower starting speed" -msgstr "" - - -#: src/libslic3r/PrintConfig.cpp:426 -msgid "Write the thumbnail type in gcode." -msgstr "" - #: ../../ui_layout/default/printer_sla.ui : l9 msgid "X" msgstr "" @@ -580,19 +20,7 @@ msgstr "" msgid "Y" msgstr "" - -#: src/slic3r/GUI/PhysicalPrinterDialog.cpp:456 -msgid "" -"You can either use a path to your certificate or the name of your " -"certificate as you can find it in your Keychain" -msgstr "" - - -#: src/slic3r/GUI/Plater.cpp:1115 -msgid "Your current tags:" -msgstr "" - -#: ../../ui_layout/default/print.ui : l343 +#: ../../ui_layout/default/print.ui : l347 msgid "z" msgstr "" diff --git a/resources/localization/it/it_database.po b/resources/localization/it/it_database.po index acb834c6c09..ac73379e4c3 100644 --- a/resources/localization/it/it_database.po +++ b/resources/localization/it/it_database.po @@ -540,15 +540,6 @@ msgstr "" "\"G92 E0\" trovato in layer_gcode, che è incompatibile con l'indirizzamento " "assoluto dell'estrusore." -msgid "" -"\n" -"\n" -"If estimated layer time is below ~%1%s" -msgstr "" -"\n" -"\n" -"Se il tempo stimato dello strato è inferiore a ~%1%s" - msgid "" "\n" "\n" @@ -852,13 +843,14 @@ msgstr "" "messaggio. Personalmente, penso che sia inutile." msgid "" -"Add one perimeter every odd layer. With this, infill is taken into the " -"sandwich and you may be able to reduce drastically the infill/perimeter " -"overlap setting. " +"Add one perimeter every even layer (and not on odd layers like the first " +"one). With this, infill is taken into the sandwich and you may be able to " +"reduce drastically the infill/perimeter overlap setting. " msgstr "" -"Aggiungi un perimetro ogni strato dispari. Con questo, l'infill viene preso " -"in sandwitch e si può essere in grado di ridurre drasticamente " -"l'impostazione di sovrapposizione infill/perimetro. " +"Aggiungi un perimetro su ogni strato pari (e non sugli strati dispari come " +"il primo). In questo modo, il riempimento viene inserito nel sandwich e " +"potresti essere in grado di ridurre drasticamente l'impostazione di " +"sovrapposizione riempimento/perimetro. " msgid "Add pause print" msgstr "Aggiungi la stampa in pausa" @@ -1189,9 +1181,17 @@ msgstr "Emetti anche limiti al G-code" msgid "Also for all perimeters" msgstr "Anche per tutti i perimetri" +msgid "Also, the fan speed over %1% won't be touched by this feature." +msgstr "" +"Inoltre, la velocità della ventola sopra a %1% non verrà modificata da " +"questa funzione." + msgid "Alt + Mouse wheel" msgstr "Alt + Ruota del mouse" +msgid "Alternate Fill Angle" +msgstr "Angolo riempimento alternativo" + msgid "Alternate nozzles:" msgstr "Ugelli alternativi:" @@ -1550,6 +1550,9 @@ msgstr "Evita di attraversare i perimetri" msgid "Avoid crossing perimeters - Max detour length" msgstr "Evita di incrociare i perimetri - Massima distanza di deviazione" +msgid "Avoid top surface for travels" +msgstr "Evita superfici superiori per spostamenti" + msgid "BACK ARROW" msgstr "FRECCIA INDIETRO" @@ -1839,6 +1842,9 @@ msgstr "buffer troppo piccolo" msgid "build volume" msgstr "Volume stampa" +msgid "but for %1% where the speed-up phase is skipped." +msgstr "ma per %1% dove la fase di accelerazione viene saltata." + msgid "But on first layer" msgstr "Però sul primo strato" @@ -1865,6 +1871,9 @@ msgstr "" "Nota: Questo nome può essere cambiato in seguito dalle impostazioni delle " "stampanti fisiche" +msgid "By default, there won't be any fan speed command." +msgstr "Per default, non ci sarà alcun comando di velocità ventola." + msgid "" "By how much the 'wipe inside' can dive inside the object (if possible)?\n" "In % of the perimeter width.\n" @@ -1903,6 +1912,11 @@ msgstr "" "Può essere utile per evitare che gli ingranaggi bondtech deformino le punte " "calde, ma non è normalmente necessario" +msgid "" +"Can't open directory '%1%'. Config bundles from here can't be loaded.\n" +"Error: %2%" +msgstr "Impossibile aprire la directory '%1%'. I bundle di configurazione da qui non possono essere caricati.\nErrore: %2%" + msgid "Can't process the repetier return message: missing field '%s'" msgstr "" "Impossibile elaborare il messaggio di ritorno di repetier: campo '%s' " @@ -1969,9 +1983,6 @@ msgstr "" msgid "Cannot overwrite a system profile." msgstr "Impossibile sovrascrivere un profilo di sistema." -msgid "Cannot overwrite an external profile." -msgstr "Impossibile sovrascrivere un profilo esterno." - msgid "" "Cannot proceed without support points! Add support points or disable support " "generation." @@ -2075,31 +2086,35 @@ msgstr "" "Se il valore è impostato su 0, mostrerà 0." msgid "" -"Change width on every odd layer for better overlap with adjacent layers and " -"getting stringer shells. Try values about +/- 0.1 with different sign for " -"external and internal perimeters.\n" -"This could be combined with extra permeters on odd layers.\n" +"Change width on every even layer (and not on odd layers like the first one) " +"for better overlap with adjacent layers and getting stringer shells. Try " +"values about +/- 0.1 with different sign for external and internal " +"perimeters.\n" +"This could be combined with extra permeters on even layers.\n" "Works as absolute spacing or a % of the spacing.\n" "set 0 to disable" msgstr "" -"Modifica la larghezza su ogni strato dispari per una migliore sovrapposizione " -"con gli strati adiacenti e per ottenere gusci più stretti. Prova valori di " -"circa +/- 0,1 con segno diverso per i perimetri esterni e interni.\n" -"Questo potrebbe essere combinato con perimetri extra su strati dispari.\n" +"Modifica la larghezza su ogni strato pari (e non su strati dispari come il " +"primo) per una migliore sovrapposizione con gli strati adiacenti e per " +"ottenere gusci più stretti. Prova valori di circa +/- 0,1 con segno diverso " +"per i perimetri esterni ed interni.\n" +"Questo potrebbe essere combinato con perimetri extra su strati pari.\n" "Funziona come spaziatura assoluta o una % della spaziatura.\n" "Imposta 0 per disabilitare" msgid "" -"Change width on every odd layer for better overlap with adjacent layers and " -"getting stringer shells. Try values about +/- 0.1 with different sign.\n" -"This could be combined with extra permeters on odd layers.\n" +"Change width on every even layer (and not on odd layers like the first one) " +"for better overlap with adjacent layers and getting stringer shells. Try " +"values about +/- 0.1 with different sign.\n" +"This could be combined with extra permeters on even layers.\n" "Works as absolute spacing or a % of the spacing.\n" "set 0 to disable" msgstr "" -"Modifica la larghezza su ogni strato dispari per una migliore sovrapposizione " -"con gli strati adiacenti e per ottenere gusci più stretti. Prova valori di " -"circa +/- 0,1 con segno diverso.\n" -"Questo potrebbe essere combinato con perimetri extra su strati dispari.\n" +"Modifica la larghezza su ogni strato pari (e non su strati dispari come il " +"primo) per una migliore sovrapposizione con gli strati adiacenti e per " +"ottenere gusci più stretti. Prova valori di circa +/- 0,1 con segno " +"diverso.\n" +"Questo potrebbe essere combinato con perimetri extra su strati pari.\n" "Funziona come spaziatura assoluta o una % della spaziatura.\n" "Imposta 0 per disabilitare" @@ -2398,6 +2413,9 @@ msgstr "COMPLETATO" msgid "Completed" msgstr "Completato" +msgid "Compress png textures" +msgstr "Comprimi texture png" + msgid "compression failed" msgstr "compressione fallita" @@ -2856,6 +2874,9 @@ msgstr "Creare un nuovo progetto mentre alcuni preset vengono modificati." msgid "Creating a new project while the current project is modified." msgstr "Creare un nuovo progetto mentre il progetto corrente viene modificato." +msgid "Creating arcs" +msgstr "Creazione archi" + msgid "Critical angle" msgstr "Angolo critico" @@ -3087,6 +3108,22 @@ msgstr "profilo di stampa SLA predefinito" msgid "Default speed" msgstr "Velocità predefinita" +msgid "" +"Default speed for the fan, to set the speed for features where there is no " +"fan control. Useful for PLA and other low-temp filament.\n" +"Set 0 to disable the fan by default. Useful for ABS and other high-temp " +"filaments.\n" +"Set -1 to disable. if disabled, the beahavior isn't defined yet. The goal is " +"to avoid adding fan speed commands." +msgstr "" +"Velocità predefinita per la ventola, per impostare la velocità per le " +"funzioni in cui non è disponibile il controllo della ventola. Utile per PLA " +"e altri filamenti a bassa temperatura.\n" +"Imposta 0 per disabilitare la ventola per impostazione predefinita. Utile " +"per ABS e altri filamenti ad alta temperatura.\n" +"Imposta -1 per disabilitare. Se disabilitato, il comportamento non è ancora " +"definito. L'obiettivo è evitare di aggiungere comandi di velocità ventola." + msgid "default value" msgstr "valore predefinito" @@ -3208,9 +3245,6 @@ msgstr "Strato riempimento denso" msgid "Density" msgstr "Densità" -msgid "Density of internal infill, expressed in the range 0% - 100%." -msgstr "Densità del riempimento interno, espressa nell'intervallo 0% - 100%." - msgid "Density of the first raft or support layer." msgstr "Densità del primo layer del raft o del supporto." @@ -3494,6 +3528,9 @@ msgstr "Non organizzare" msgid "Don't avoid crossing on 1st layer" msgstr "Non evitare l'attraversamento sul 1° strato" +msgid "Don't check crossings for retraction on first layer" +msgstr "Non controllare la retrazione degli incroci sul primo strato" + msgid "Don't import" msgstr "Non importare" @@ -4029,6 +4066,9 @@ msgstr "Tempo di stampa stimato" msgid "Estimated printing times" msgstr "Tempi di stampa stimati" +msgid "even layers" +msgstr "strati pari" + msgid "Even-odd" msgstr "Pari-dispari" @@ -4041,9 +4081,15 @@ msgstr "Esatta altezza dell'ultimo strato" msgid "Exact pattern" msgstr "Modello esatta" +msgid "Except for the first %1% layers where the fan is disabled" +msgstr "Tranne i primi %1% strati in cui la ventola è disabilitata" + msgid "except for the first %1% layers where the fan is disabled" msgstr "tranne i primi %1% strati in cui la ventola è disabilitata" +msgid "Except for the first layer where the fan is disabled" +msgstr "Tranne il primo strato dove la ventola è disabilitato" + msgid "except for the first layer where the fan is disabled" msgstr "tranne il primo strato dove la ventola è disabilitato" @@ -4341,8 +4387,8 @@ msgstr "Perimetri esterni in modalità vaso" msgid "External perimeters spacing" msgstr "Spazio tra perimetri esterni" -msgid "External perimeters spacing change on odd layers" -msgstr "Modifica spaziatura perimetri esterni su strati dispari" +msgid "External perimeters spacing change on even layers" +msgstr "Modifica spaziatura perimetri esterni su strati pari" msgid "External perimeters speed" msgstr "Velocità dei perimetri esterni" @@ -4359,8 +4405,8 @@ msgstr "Lunghezza extra sulla ripartenza" msgid "Extra loading distance" msgstr "Distanza di carico extra" -msgid "Extra perimeter on odd layers" -msgstr "Perimetro extra su strati dispari" +msgid "Extra perimeter on even layers" +msgstr "Perimetro extra su strati pari" msgid "Extra perimeters" msgstr "Perimetri aggiuntivi" @@ -4385,16 +4431,16 @@ msgstr "Lunghezza dell'estratto sul riavvio del cambio utensile" msgid "" "Extrude perimeters that have a part over an overhang in the reverse " -"direction on odd layers. This alternating pattern can drastically improve " -"steep overhang.\n" +"direction on even layers (and not on odd layers like the first one). This " +"alternating pattern can drastically improve steep overhang.\n" "!! this is a very slow algorithm (it uses the same results as " "extra_perimeters_overhangs) !!" msgstr "" -"Estrudi i perimetri che hanno una parte sopra una sporgenza nella direzione " -"inversa in strati dispari. Quel modello alternato può migliorare " -"drasticamente lo sbalzo ripido.\n" +"Estrudi perimetri che hanno una parte sopra una sporgenza nella direzione " +"opposta su strati pari (e non su strati dispari come il primo). Questa trama " +"alternata può migliorare drasticamente la sporgenza ripida.\n" "!! questo è un algoritmo molto lento (usa gli stessi risultati di " -"extra_perimeters_overhangs) !!!" +"extra_perimeters_overhangs) !!" msgid "Extruder" msgstr "Estrusore" @@ -4511,6 +4557,9 @@ msgstr "Mancata esecuzione di alcuni fori nel modello" msgid "Fan" msgstr "Ventola" +msgid "Fan delay only for overhangs" +msgstr "Ritardo ventola solo sporgenze" + msgid "Fan KickStart time" msgstr "Tempo di KickStart della ventola" @@ -4545,6 +4594,12 @@ msgstr "" msgid "Fan startup delay" msgstr "Ritardo di avvio della ventola" +msgid "Fan will be turned off by default." +msgstr "Ventola sarà disattivato per impostazione predefinita." + +msgid "Fan will run at %1%%% by default." +msgstr "Ventola verrà eseguito a %1%%% per impostazione predefinita" + msgid "fan will run by default to %1%%%" msgstr "la ventola funzionerà di default a %1%%%" @@ -4705,6 +4760,9 @@ msgstr "Angolo di riempimento" msgid "Fill angle increment" msgstr "Incremento dell'angolo di riempimento" +msgid "Fill angle template" +msgstr "Modello angolo riempimento" + msgid "Fill bed" msgstr "Riempi letto" @@ -5208,6 +5266,12 @@ msgstr "Velocità di riempimento del gap" msgid "Gap Fill threshold" msgstr "Soglia riempimento spazio" +msgid "Gap fill: extra extension" +msgstr "Gap fill: Estensione extra" + +msgid "Gap fills" +msgstr "Riempimenti del vuoto" + msgid "Gapfill: after last perimeter" msgstr "Gapfill: Dopo l'ultimo perimetro" @@ -6137,6 +6201,18 @@ msgstr "" "impostata alcuna tacca. Se l'angolo è troppo alto, non c'è abbastanza spazio " "per la tacca." +msgid "If the fan speed is set and is higher than %1%%%, it won't be changed." +msgstr "" +"Se la velocità della ventola è impostata ed è superiore a %1%%%, non verrà " +"modificata." + +msgid "" +"If the fan speed is set, it will proportionally increasing speed between " +"this value and %1%%%." +msgstr "" +"Se la velocità della ventola è impostata, la velocità aumenterà " +"proporzionalmente tra questo valore e %1%%%." + msgid "" "If the perimeter overlap is set at 100%, the yellow areas should be filled " "by the overlap.\n" @@ -6248,6 +6324,13 @@ msgstr "" "Se utilizzi un colore con una saturazione e/o un valore superiore all'80%, " "questi verranno aumentati. Se inferiori, verranno diminuiti." +msgid "" +"If your custom texture (in png format) is displayed black, then disable this " +"option to remove the problematic optimisation." +msgstr "" +"Se la tua texture personalizzata (in formato png) viene visualizzata in " +"nero, disabilita questa opzione per rimuovere l'ottimizzazione problematica." + msgid "" "If your firmware doesn't handle the extruder displacement you need the G-" "code to take it into account. This option lets you specify the displacement " @@ -6373,6 +6456,9 @@ msgstr "Importa STL (unità imperiali)" msgid "Import STL/3MF/STEP/OBJ/AM&F" msgstr "Importa STL/3MF/STEP/OBJ/AM&F" +msgid "Import STL/3MF/STEP/OBJ/AMF without config, keep platter" +msgstr "Importa STL/3MF/STEP/OBJ/AMF senza configurazione, mantieni piano" + msgid "Importing canceled." msgstr "Importazione annullata." @@ -6540,6 +6626,9 @@ msgstr "riempimento" msgid "Infill acceleration" msgstr "Accelerazione del riempimento" +msgid "Infill angle" +msgstr "Angolo di riempimento" + msgid "Infill before perimeters" msgstr "Riempimento prima dei perimetri" @@ -6555,8 +6644,8 @@ msgstr "Massima velocità riempimento primo strato" msgid "Infill spacing" msgstr "Spaziatura riempimento" -msgid "Infill spacing change on odd layers" -msgstr "Modifica spaziatura riempimento su strati dispari" +msgid "Infill spacing change on even layers" +msgstr "Modifica spaziatura riempimento su strati pari" msgid "Infill speed" msgstr "Velocità riempimento" @@ -6690,6 +6779,9 @@ msgstr "Perimetro interno" msgid "Internal Perimeter acceleration" msgstr "Accelerazione perimetro interno" +msgid "Internal perimeters" +msgstr "Perimetri interno" + msgid "Internal perimeters speed" msgstr "Velocità perimetri interni" @@ -6790,6 +6882,9 @@ msgstr "Tipo di ironing" msgid "Ironing width" msgstr "Larghezza dell'ironing" +msgid "Ironings" +msgstr "Stiraturi" + msgid "is licensed under the" msgstr "è concesso in licenza sotto la" @@ -6829,6 +6924,13 @@ msgstr "" msgid "It's a last preset for this physical printer." msgstr "È un ultimo preset per questa stampante fisica." +msgid "" +"It's better for some infill like rectilinear to rotate 90° each layer. If " +"this setting is deactivated, they won't do that anymore." +msgstr "" +"È meglio che alcuni riempimenti, come quello rettilineo, ruotino di 90° ogni " +"strato. Se questa impostazione è disattivata, non lo faranno più." + msgid "It's impossible to print multi-part object(s) with SLA technology." msgstr "È impossibile stampare oggetti in più parti con la tecnologia SLA." @@ -7056,6 +7158,11 @@ msgstr "" msgid "Length of the infill anchor" msgstr "Lunghezza dell'ancoraggio di riempimento" +msgid "" +"let the retraction happens on the first layer even if the travel path does " +"not exceed the upper layer's perimeters." +msgstr "Lascia che la retrazione avvenga sul primo strato anche se il percorso di viaggio non supera i perimetri dello strato superiore." + msgid "" "License agreements of all following programs (libraries) are part of " "application license agreement" @@ -7174,6 +7281,26 @@ msgstr "Carico" msgid "Load a model" msgstr "Carica un modello" +msgid "" +"Load a png/svg file to be used as a texture. \n" +"If it can be found via the executable, configuration or user directory then " +"a relative path will be kept instead of the full one." +msgstr "" +"Carica un file png/svg da utilizzare come texture. \n" +"Se è possibile trovarlo tramite l'eseguibile, la configurazione o la " +"directory dell'utente, verrà mantenuto un percorso relativo invece di quello " +"completo." + +msgid "" +"Load a stl file to be used as a model. \n" +"If it can be found via the executable, configuration or user directory then " +"a relative path will be kept instead of the full one." +msgstr "" +"Carica un file stl da utilizzare come modello. \n" +"Se è possibile trovarlo tramite l'eseguibile, la configurazione o la " +"directory dell'utente, verrà mantenuto un percorso relativo invece di quello " +"completo." + msgid "Load an model saved with imperial units" msgstr "Carica un modello salvato con unità imperiali" @@ -7606,6 +7733,14 @@ msgstr "" "quest'area. Impostare a 0 per lasciare che hole_size_compensation si " "applichi completamente a tutti i fori rilevati" +msgid "" +"Maximum deflection of a point to the estimated radius of the circle.\n" +"As cylinders are often exported as triangles of varying size, points may not " +"be on the circle circumference. This setting allows you some leeway to " +"broaden the detection.\n" +"In mm or in % of the radius." +msgstr "Defezione massima di un punto rispetto al raggio stimato del cerchio.\nPoiché i cilindri vengono spesso esportati come triangoli di dimensioni variabili, il punto potrebbe non trovarsi sulla circonferenza del cerchio. Questa impostazione ti consente di limitare il rilevamento.\nIn mm o in % del raggio." + msgid "" "Maximum density for bridge lines. If you want more space between line (or " "less), you can modify it. A value of 50% will create two times less lines, " @@ -7757,6 +7892,9 @@ msgstr "" "tengono le teste di spillo dei punti di supporto e si collegano ai pilastri " "come piccoli rami." +msgid "Maximum Print Volumetric speed" +msgstr "Velocità volumetrica di stampa massima" + msgid "maximum speed" msgstr "velocità massima" @@ -7993,6 +8131,9 @@ msgstr "Tempo di esposizione minimo" msgid "Minimum extrusion length" msgstr "Lunghezza minima di estrusione" +msgid "Minimum fan speed" +msgstr "Velocità minima ventola" + msgid "Minimum feature size" msgstr "Dimensione minima della caratteristica" @@ -8597,6 +8738,13 @@ msgstr "Nota: È richiesta una versione di Repetier almeno 0.90.0 ." msgid "Note: some shortcuts work in (non)editing mode only." msgstr "Nota: alcune scorciatoie funzionano solo in modalità (non) editing." +msgid "" +"Note: The layer time for the cooling is currently computed with infinite " +"acceleration, and so is very optimistic." +msgstr "" +"Nota: il tempo di raffreddamento è attualmente calcolato con accelerazione " +"infinita, quindi è molto ottimistico." + msgid "Note: This preset will be replaced after saving" msgstr "Nota: Questo preset sarà sostituito dopo il salvataggio" @@ -8766,9 +8914,6 @@ msgstr "Spirale di ottagramma" msgid "OctoPrint version" msgstr "Versione OctoPrint" -msgid "odd layers" -msgstr "strati dispari" - msgid "of a current Object" msgstr "di un oggetto corrente" @@ -8791,18 +8936,23 @@ msgstr "" msgid "Offsets (for multi-extruder printers)" msgstr "Compensazione (per stampanti multi-estrusore)" +msgid "" +"Old layout: all windows are in the application, settings are on the top tab " +"bar and the platter choice in on the bottom of the platter view." +msgstr "Vecchio layout: tutte le finestre sono nell'applicazione, le impostazioni si trovano nella barra delle schede in alto e la scelta della piastra nella parte inferiore della vista della piastra." + msgid "Old Value" msgstr "Vecchio valore" msgid "On" msgstr "On" +msgid "On even layers" +msgstr "Su strati pari" + msgid "On first layer" msgstr "Primo strato" -msgid "On odd layers" -msgstr "Su strati dispari" - msgid "" "On OSX there is always only one instance of app running by default. However " "it is allowed to run multiple instances of same app from the command line. " @@ -8880,6 +9030,13 @@ msgstr "" "Rimuovi tutto tranne l'ultimo oggetto, o abilita la modalità sequenziale con " "\"complete_objects\"." +msgid "" +"Only compatible presets are shown. Click to show both the presets compatible " +"and not compatible with the current printer." +msgstr "" +"Vengono mostrati solo i presets compatibili. Fare clic per mostrare sia i " +"presets compatibili che quelli non compatibili con la stampante corrente." + msgid "" "Only create support if it lies on a build plate. Don't create support on a " "print." @@ -9032,6 +9189,9 @@ msgstr "Apri una nuova istanza" msgid "Open New Instance" msgstr "Apri una nuova istanza" +msgid "Open project AMF/3MF with config, clear platter" +msgstr "Apri progetto AMF/3MF con configurazione, pulisci piano" + msgid "Open the %s releases page in your browser" msgstr "Apri la pagine di rilascio di %s nel tuo browser" @@ -9091,6 +9251,18 @@ msgstr "" "di trasudamento. Questa caratteristica rallenta sia la stampa che la " "generazione del codice G." +msgid "Optimizing layer %s / %s" +msgstr "Ottimizzazione strato %s / %s" + +msgid "Optimizing skirt & brim %s%%" +msgstr "Ottimizzazione skirt e brim %s%%" + +msgid "Optimizing support layer %s / %s" +msgstr "Ottimizzazione strato supporto %s/%s" + +msgid "Option tags:" +msgstr "Opzioni tag:" + msgid "Options" msgstr "Opzioni" @@ -9169,6 +9341,42 @@ msgstr "Opzioni di uscita" msgid "Outside walls" msgstr "Pareti esterne" +msgid "Over %1% and %2% it will be at least %3%%%." +msgstr "Sopra il %1% e %2% sarà almeno il %3%%%." + +msgid "Over %1% and %2% it will be fixed to %3%%%." +msgstr "Sopra il %1% e %2% sarà fissa al %3%%%." + +msgid "Over %1% and %2% it will be off." +msgstr "Sopra il %1% e %2% sarà spenta." + +msgid "Over %1% it will be at %2%%%." +msgstr "Sopra il %1% sarà al %2%%%." + +msgid "Over %1% it will be at least %2%%%, and off over %3%." +msgstr "Sopra il %1% sarà almeno %2%%%, e spento sopra il %3%." + +msgid "Over %1% it will be at least %2%%%, and over %3% at least %4%%%." +msgstr "Sopra il %1% sarà almeno %2%%% e sopra il %3% almeno del %4%%%." + +msgid "Over %1% it will be at least %2%%%." +msgstr "Sopra il %1% sarà almeno il %2%%%." + +msgid "Over %1% it will be fixed to %2%%%, and off over %3%." +msgstr "Sopra il %1% sarà fissa al %2%%% e ridotta al %3%." + +msgid "Over %1% it will be fixed to %2%%%, and over %3% to %4%%%." +msgstr "Sopra il %1% sarà fissa al %2%%% e sopra il %3% al %4%%%." + +msgid "Over %1% it will be off, and over %2% at least %3%%%." +msgstr "Sopra il %1% sarà spenta, e sopra il %2% almeno il %3%%%." + +msgid "Over %1% it will be off, and over %2% fixed to %3%%%." +msgstr "Sopra il %1% verrà spenta e sopra il %2% fissa al %3%%%." + +msgid "Over %1% it will be off." +msgstr "Sopra il %1% verrà spenta." + msgid "Over raft" msgstr "Sopra Raft" @@ -9476,6 +9684,9 @@ msgstr "Generatore di perimetri" msgid "Perimeter loop seam" msgstr "Cucitura perimetrale ad anello" +msgid "Perimeter overhangs" +msgstr "Sporgenze perimetrali" + msgid "perimeter overlap" msgstr "sovrapposizione del perimetro" @@ -9515,8 +9726,8 @@ msgstr "Numero del perimetro" msgid "Perimeters loop" msgstr "Anello dei perimetri" -msgid "Perimeters spacing change on odd layers" -msgstr "Modifica spaziatura perimetri su strati dispari" +msgid "Perimeters spacing change on even layers" +msgstr "Modifica spaziatura perimetri su strati pari" msgid "" "Perimeters will be split into multiple segments by inserting Fuzzy skin " @@ -9953,6 +10164,15 @@ msgstr "Stampante con nome \"%1%\" esiste già." msgid "Printer:" msgstr "Stampante:" +msgid "" +"Printing speed of the wipe tower. Capped by filament_max_volumetric_speed " +"(if set).\n" +"If set to zero, a value of 80mm/s is used." +msgstr "" +"Velocità di stampa della torre di pulizia. Limitata da " +"filament_max_volumetric_speed (se impostato).\n" +"Se impostato a zero, viene utilizzato un valore di 80 mm/s." + msgid "" "Printing with multiple extruders of differing nozzle diameters. If support " "is to be printed with the current extruder (support_material_extruder == 0 " @@ -10242,6 +10462,9 @@ msgstr "Ricarica piatto da disco" msgid "Reload the plater from disk" msgstr "Ricarica la piastra dal disco" +msgid "Reload the platter from disk" +msgstr "Ricarica la piastra dal disco" + msgid "Remaining errors" msgstr "Errori rimanenti" @@ -10443,6 +10666,9 @@ msgstr "Ripristino alla base" msgid "Reset to Filament Color" msgstr "Ripristina il colore del filamento" +msgid " resin '%1%'" +msgstr " resina '%1%'" + msgid "Restart application" msgstr "Riavvia l'applicazione" @@ -10496,8 +10722,8 @@ msgstr "Retrazioni" msgid "Reverse direction of zoom with mouse wheel" msgstr "Inverti la direzione dello zoom con la rotella del mouse" -msgid "Reverse on odd" -msgstr "Inverti su dispari" +msgid "Reverse on even" +msgstr "Inverti su pari" msgid "Reverse threshold" msgstr "Soglia inversa" @@ -11115,6 +11341,23 @@ msgstr "" msgid "Set the shape of your printer's bed." msgstr "Imposta la forma del letto della tua stampante." +msgid "" +"Set the speed of the full perimeters to the overhang speed, and also the " +"next one(s) if any.\n" +"Set to 0 to disable.\n" +"Set to 1 to set the overhang speed to the full perimeter if there is any " +"overhang detected inside it.\n" +"Set to more than 1 to also set the overhang speed to the next perimeter(s) " +"(only in classic mode)." +msgstr "" +"Imposta la velocità di tutti i perimetri alla velocità sporgenze e anche " +"quelli successivi, se presenti.\n" +"Imposta 0 per disabilitare.\n" +"Imposta 1 per impostare la velocità sporgenze sull'intero perimetro se viene " +"rilevata una sporgenza nel perimetro.\n" +"Imposta maggiore di 1 per impostare anche la velocità sporgenze sul/sui " +"perimetro/i successivo/i (solo in modalità classica)." + msgid "" "Set this if your printer uses control values from 0-100 instead of 0-255." msgstr "" @@ -11538,6 +11781,9 @@ msgstr "" "(utilizzando 55% e 75% per le due soglie)\n" "Usa la modalità esperto per ottenere widget più dettagliati" +msgid "Simplifying paths" +msgstr "Semplificare percorsi" + msgid "Simulate Prusa 'no thick bridge'" msgstr "Simula Prusa 'no ponte spesso'" @@ -11885,8 +12131,8 @@ msgstr "Velocità ventola riempimento solido" msgid "Solid infill spacing" msgstr "Spaziatura di riempimento solido" -msgid "Solid infill spacing change on odd layers" -msgstr "Modifica spaziatura riempimento solido su strati dispari" +msgid "Solid infill spacing change on even layers" +msgstr "Modifica spaziatura riempimento solido su strati pari" msgid "Solid infill speed" msgstr "Velocità di riempimento solido" @@ -11903,6 +12149,9 @@ msgstr "Strati solidi" msgid "Solid spacing" msgstr "Spaziatura solida" +msgid "Solid surfaces" +msgstr "Superfici solide" + msgid "Soluble material" msgstr "Materiale solubile" @@ -12014,6 +12263,9 @@ msgstr "Sparsi" msgid "Sparse fill pattern" msgstr "Trama riempimento sparso" +msgid "Sparse infill" +msgstr "Riempimento sparso" + msgid "Sparse infill pattern" msgstr "Trama riempimento sparso" @@ -12295,6 +12547,15 @@ msgstr "Iniziare il codice G" msgid "Start new slicing process" msgstr "Inizia un nuovo processo di affettamento" +msgid "" +"Start of the wiping speed ramp up (for wipe tower).\n" +"Can be a % of the 'Wipe tower speed'.\n" +"Set to 0 to disable." +msgstr "" +"Inizio dell'incremento della velocità di pulizia (per la torre di pulizia).\n" +"Può essere una % della 'Velocità della torre di pulizia'.\n" +"Imposta 0 per disabilitare." + msgid "Start temp:" msgstr "Temp. inizio:" @@ -12450,6 +12711,9 @@ msgstr "Angolo trama interfaccia supporto" msgid "Support interface speed" msgstr "Velocità dell'interfaccia di sostegno" +msgid "Support interfaces" +msgstr "Interfacce di supporto" + msgid "Support layer height" msgstr "Altezza strato supporto" @@ -13372,6 +13636,33 @@ msgid "The speed for retractions (this only applies to the extruder motor)." msgstr "" "La velocità per le retrazioni (si applica solo al motore dell'estrusore)." +msgid "" +"The Spiral Vase mode requires:\n" +"- no top solid layers\n" +"- 0% fill density\n" +"- classic perimeter slicing\n" +"- no support material\n" +"- Ensure vertical shell thickness enabled\n" +"- disabled 'no solid infill over perimeters'\n" +"- unchecked 'exact last layer height'\n" +"- unchecked 'dense infill'\n" +"- unchecked 'extra perimeters'- unchecked 'gap fill after last perimeter'- " +"disabled 'no solid fill over X perimeters'- disabled 'seam notch'" +msgstr "" +"La modalità Vaso a spirale richiede:\n" +"- nessun strato solido superiore\n" +"- 0% densità di riempimento\n" +"- generatore perimetro classico\n" +"- nessun materiale di supporto\n" +"- Assicurati che lo spessore del guscio verticale sia abilitato\n" +"- disabilitato 'nessun riempimento solido sui perimetri'\n" +"- deselezionata 'altezza esatta dell'ultimo strato'\n" +"- deselezionato 'riempimento denso'\n" +"- deselezionato 'perimetri extra'\n" +"- deselezionato 'riempimento spazio dopo l'ultimo perimetro'\n" +"- disabilitato 'nessun riempimento solido su X perimetri'\n" +"- disabilitato 'tacca di cucitura'" + msgid "" "The Spiral Vase option can only be used when printing single material " "objects." @@ -13713,6 +14004,22 @@ msgstr "" "proprio prima dello spostamento Z. Nota che puoi usare variabili segnaposto " "per tutte le impostazioni di Slic3r così come {layer_num} e {layer_z}." +msgid "" +"This define the succetion of infill angle. When defined, it replaces the " +"fill_angle, and there won't be any extra 90° for each layer added, but the " +"fill_angle_increment will still be used. The first layer start with the " +"first angle. If a new pattern is used in a modifier, it will choose the " +"layer angle from the pattern as if it has started from the first layer.Empty " +"this settings to disable and recover the old behavior." +msgstr "" +"Questo definisce la successione dell'angolo di riempimento. Quando definito, " +"sostituisce fill_angle e non ci saranno 90° aggiuntivi per ogni strato " +"aggiunto, ma fill_angle_increment verrà comunque utilizzato. Il primo strato " +"inizia con il primo angolo. Se un nuovo modello viene utilizzato in un " +"modificatore, sceglierà l'angolo dello strato dal modello come se fosse " +"iniziato dal primo strato. Svuotare queste impostazioni per disabilitare e " +"ripristinare il vecchio comportamento." + msgid "" "This end procedure is inserted at the end of the output file, before the " "printer end gcode (and before any toolchange from this filament in case of " @@ -13747,6 +14054,14 @@ msgstr "" "altezza di estrusione 0,2 mm, velocità di avanzamento 20 mm/s) a 1,8 mm³/s " "(velocità di avanzamento 60 mm/s) richieda almeno 2 secondi." +msgid "" +"This experimental setting is used to limit the speed of change in extrusion " +"rate for a transition from lower speed to higher speed. A value of 1.8 mm³/" +"s² ensures, that a change from the extrusion rate of 1.8 mm³/s (0.45mm " +"extrusion width, 0.2mm extrusion height, feedrate 20 mm/s) to 5.4 mm³/s " +"(feedrate 60 mm/s) will take at least 2 seconds." +msgstr "Questa impostazione sperimentale viene utilizzata per limitare la variazione della velocità di estrusione nel passaggio da una velocità inferiore a una superiore. Un valore di 1,8 mm³/s² garantisce che il passaggio dalla velocità di estrusione di 1,8 mm³/s (larghezza di estrusione 0,45 mm, altezza di estrusione 0,2 mm, velocità di avanzamento 20 mm/s) a 5,4 mm³/s (velocità di avanzamento 60 mm/s) richieda almeno 2 secondi." + msgid "" "This experimental setting uses G10 and G11 commands to have the firmware " "handle the retraction. This is only supported in recent Marlin." @@ -13829,6 +14144,21 @@ msgstr "" "Può essere disabilitato da disable_fan_first_layers, rallentato da " "full_fan_speed_layer e aumentato dal tempo di strato basso." +msgid "" +"This fan speed is enforced during all infill bridges. It won't slow down the " +"fan if it's currently running at a higher speed.\n" +"Set to -1 to disable this override (Internal bridges will use Bridges fan " +"speed).\n" +"Can be disabled by disable_fan_first_layers and increased by low layer time." +msgstr "" +"Questa velocità della ventola viene applicata durante tutti i ponti di " +"riempimento. Non rallenterà la ventola se è attualmente in funzione a una " +"velocità maggiore.\n" +"Imposta -1 per disabilitare questa sostituzione (i ponti interni " +"utilizzeranno la velocità della ventola dei ponti).\n" +"Può essere disabilitato da disable_fan_first_layers e aumentato dal tempo di " +"strato basso." + msgid "" "This fan speed is enforced during all Internal Infill moves\n" "Set to 1 to disable fan.\n" @@ -13938,6 +14268,13 @@ msgstr "" "Può essere disabilitato da disable_fan_first_layers, rallentato da " "full_fan_speed_layer." +msgid "" +"This fan speed is enforced during bridges and overhangs. It won't slow down " +"the fan if it's currently running at a higher speed.\n" +"Set to -1 to disable this override (Bridges will use default fan speed).\n" +"Can be disabled by disable_fan_first_layers and increased by low layer time." +msgstr "Questa velocità della ventola viene applicata durante ponti e sporgenze. Non rallenterà la ventola se è attualmente in funzione a una velocità superiore.\nImposta -1 per disabilitare questa sostituzione (i ponti e le sporgenze utilizzeranno la velocità predefinita della ventola).\nPuò essere disabilitato da disable_fan_first_layers e aumentato dal tempo di strato basso." + msgid "" "This feature allows you to combine infill and speed up your print by " "extruding thicker infill layers while preserving thin perimeters, thus " @@ -14862,6 +15199,13 @@ msgstr "" "Può essere una % della larghezza del perimetro\n" "0 per auto" +msgid "" +"This setting represents the minimum fan speed (like minimum PWM) your fan " +"needs to work." +msgstr "" +"Questa impostazione rappresenta la velocità minima della ventola (come il " +"PWM minimo) necessaria per il suo funzionamento." + msgid "" "This setting represents the minimum mm for a gapfill extrusion to be " "extruded.\n" @@ -15297,6 +15641,9 @@ msgstr "Riempimento solido superiore" msgid "Top solid speed" msgstr "Velocità massima solida" +msgid "Top surfaces" +msgstr "Superfici superiori" + msgid "Top View" msgstr "Vista dall'alto" @@ -15897,6 +16244,11 @@ msgstr "Benvenuto nell'assistente di configurazione %s" msgid "Welcome to the %s Configuration Wizard" msgstr "Benvenuti alla procedura guidata di configurazione %s" +msgid "" +"What to do with the result? insert it into the existing platter or replacing " +"the current platter by a new one?" +msgstr "Cosa fare con il risultato? Inserirlo nel piatto esistente o sostituire il piatto attuale con uno nuovo?" + msgid "What would you like to do with \"%1%\" preset after saving?" msgstr "Cosa vorresti fare con \"%1%\" preimpostato dopo il salvataggio?" @@ -16145,6 +16497,13 @@ msgstr "" "dividere o unire i segmenti del perimetro. Se espresso in percentuale (ad " "esempio 100%), verrà calcolato in base al diametro dell'ugello." +msgid "" +"When using 'Avoid crossing perimeters', consider the top surfaces as a void, " +"to avoid travelling over them if possible." +msgstr "" +"Quando si utilizza 'Evita attraversamento perimetri', considera le superfici " +"superiori come un vuoto, per evitare di attraversarle, se possibile." + msgid "" "When using 'Complete individual objects', the default behavior is to draw " "the skirt around each object. if you prefer to have only one skirt for the " @@ -16315,6 +16674,12 @@ msgstr "Angolo di rotazione della torre di pulizia" msgid "Wipe tower rotation angle with respect to x-axis." msgstr "Angolo di rotazione della torre di pulizia rispetto all'asse x." +msgid "Wipe Tower Speed" +msgstr "Velocità torre pulizia" + +msgid "Wipe tower starting speed" +msgstr "Velocità iniziale torre pulizia" + msgid "Wipe tower Width" msgstr "Larghezza della torre di spurgo" @@ -16377,6 +16742,9 @@ msgstr "scrittura richiamata fallita" msgid "Write information about the model to the console." msgstr "Scrivi informazioni sul modello nella console." +msgid "Write the thumbnail type in gcode." +msgstr "Scrivi tipo di miniatura nel gcode." + msgid "Wrong password" msgstr "Password sbagliata" @@ -16763,89 +17131,94 @@ msgid "°C" msgstr "°C" msgid "" -"Can't open directory '%1%'. Config bundles from here can't be loaded.\n" -"Error: %2%" -msgstr "Impossibile aprire la directory '%1%'. I bundle di configurazione da qui non possono essere caricati.\nErrore: %2%" - -msgid "Except for the first %1% layers where the fan is disabled" -msgstr "Tranne i primi %1% strati in cui la ventola è disabilitata" - -msgid "Except for the first layer where the fan is disabled" -msgstr "Tranne il primo strato dove la ventola è disabilitato" - -msgid "Fan will be turned off by default." -msgstr "Ventola sarà disattivato per impostazione predefinita." - -msgid "Fan will run at %1%%% by default." -msgstr "Ventola verrà eseguito a %1%%% per impostazione predefinita" - -msgid "Gap fill: extra extension" -msgstr "Gap fill: Estensione extra" +"\n" +"\n" +"If estimated layer time is below ~%1%s" +msgstr "" +"\n" +"\n" +"Se il tempo stimato dello strato è inferiore a ~%1%s" -msgid "Gap fills" -msgstr "Riempimenti del vuoto" +msgid "" +"Add one perimeter every odd layer. With this, infill is taken into the " +"sandwich and you may be able to reduce drastically the infill/perimeter " +"overlap setting. " +msgstr "" +"Aggiungi un perimetro ogni strato dispari. Con questo, l'infill viene preso " +"in sandwitch e si può essere in grado di ridurre drasticamente " +"l'impostazione di sovrapposizione infill/perimetro. " -msgid "Import STL/3MF/STEP/OBJ/AMF without config, keep platter" -msgstr "Importa STL/3MF/STEP/OBJ/AMF senza configurazione, mantieni piano" +msgid "Cannot overwrite an external profile." +msgstr "Impossibile sovrascrivere un profilo esterno." -msgid "Infill angle" -msgstr "Angolo di riempimento" +msgid "" +"Change width on every odd layer for better overlap with adjacent layers and " +"getting stringer shells. Try values about +/- 0.1 with different sign for " +"external and internal perimeters.\n" +"This could be combined with extra permeters on odd layers.\n" +"Works as absolute spacing or a % of the spacing.\n" +"set 0 to disable" +msgstr "" +"Modifica la larghezza su ogni strato dispari per una migliore sovrapposizione " +"con gli strati adiacenti e per ottenere gusci più stretti. Prova valori di " +"circa +/- 0,1 con segno diverso per i perimetri esterni e interni.\n" +"Questo potrebbe essere combinato con perimetri extra su strati dispari.\n" +"Funziona come spaziatura assoluta o una % della spaziatura.\n" +"Imposta 0 per disabilitare" -msgid "Internal perimeters" -msgstr "Perimetri interno" +msgid "" +"Change width on every odd layer for better overlap with adjacent layers and " +"getting stringer shells. Try values about +/- 0.1 with different sign.\n" +"This could be combined with extra permeters on odd layers.\n" +"Works as absolute spacing or a % of the spacing.\n" +"set 0 to disable" +msgstr "" +"Modifica la larghezza su ogni strato dispari per una migliore sovrapposizione " +"con gli strati adiacenti e per ottenere gusci più stretti. Prova valori di " +"circa +/- 0,1 con segno diverso.\n" +"Questo potrebbe essere combinato con perimetri extra su strati dispari.\n" +"Funziona come spaziatura assoluta o una % della spaziatura.\n" +"Imposta 0 per disabilitare" -msgid "Ironings" -msgstr "Stiraturi" +msgid "Density of internal infill, expressed in the range 0% - 100%." +msgstr "Densità del riempimento interno, espressa nell'intervallo 0% - 100%." -msgid "" -"let the retraction happens on the first layer even if the travel path does " -"not exceed the upper layer's perimeters." -msgstr "Lascia che la retrazione avvenga sul primo strato anche se il percorso di viaggio non supera i perimetri dello strato superiore." +msgid "External perimeters spacing change on odd layers" +msgstr "Modifica spaziatura perimetri esterni su strati dispari" -msgid "" -"Maximum deflection of a point to the estimated radius of the circle.\n" -"As cylinders are often exported as triangles of varying size, points may not " -"be on the circle circumference. This setting allows you some leeway to " -"broaden the detection.\n" -"In mm or in % of the radius." -msgstr "Defezione massima di un punto rispetto al raggio stimato del cerchio.\nPoiché i cilindri vengono spesso esportati come triangoli di dimensioni variabili, il punto potrebbe non trovarsi sulla circonferenza del cerchio. Questa impostazione ti consente di limitare il rilevamento.\nIn mm o in % del raggio." +msgid "Extra perimeter on odd layers" +msgstr "Perimetro extra su strati dispari" msgid "" -"Old layout: all windows are in the application, settings are on the top tab " -"bar and the platter choice in on the bottom of the platter view." -msgstr "Vecchio layout: tutte le finestre sono nell'applicazione, le impostazioni si trovano nella barra delle schede in alto e la scelta della piastra nella parte inferiore della vista della piastra." - -msgid "Open project AMF/3MF with config, clear platter" -msgstr "Apri progetto AMF/3MF con configurazione, pulisci piano" +"Extrude perimeters that have a part over an overhang in the reverse " +"direction on odd layers. This alternating pattern can drastically improve " +"steep overhang.\n" +"!! this is a very slow algorithm (it uses the same results as " +"extra_perimeters_overhangs) !!" +msgstr "" +"Estrudi i perimetri che hanno una parte sopra una sporgenza nella direzione " +"inversa in strati dispari. Quel modello alternato può migliorare " +"drasticamente lo sbalzo ripido.\n" +"!! questo è un algoritmo molto lento (usa gli stessi risultati di " +"extra_perimeters_overhangs) !!!" -msgid "Option tags:" -msgstr "Opzioni tag:" +msgid "Infill spacing change on odd layers" +msgstr "Modifica spaziatura riempimento su strati dispari" -msgid "Reload the platter from disk" -msgstr "Ricarica la piastra dal disco" +msgid "odd layers" +msgstr "strati dispari" -msgid "Support interfaces" -msgstr "Interfacce di supporto" +msgid "On odd layers" +msgstr "Su strati dispari" -msgid "" -"This experimental setting is used to limit the speed of change in extrusion " -"rate for a transition from lower speed to higher speed. A value of 1.8 mm³/" -"s² ensures, that a change from the extrusion rate of 1.8 mm³/s (0.45mm " -"extrusion width, 0.2mm extrusion height, feedrate 20 mm/s) to 5.4 mm³/s " -"(feedrate 60 mm/s) will take at least 2 seconds." -msgstr "Questa impostazione sperimentale viene utilizzata per limitare la variazione della velocità di estrusione nel passaggio da una velocità inferiore a una superiore. Un valore di 1,8 mm³/s² garantisce che il passaggio dalla velocità di estrusione di 1,8 mm³/s (larghezza di estrusione 0,45 mm, altezza di estrusione 0,2 mm, velocità di avanzamento 20 mm/s) a 5,4 mm³/s (velocità di avanzamento 60 mm/s) richieda almeno 2 secondi." +msgid "Perimeters spacing change on odd layers" +msgstr "Modifica spaziatura perimetri su strati dispari" -msgid "" -"This fan speed is enforced during bridges and overhangs. It won't slow down " -"the fan if it's currently running at a higher speed.\n" -"Set to -1 to disable this override (Bridges will use default fan speed).\n" -"Can be disabled by disable_fan_first_layers and increased by low layer time." -msgstr "Questa velocità della ventola viene applicata durante ponti e sporgenze. Non rallenterà la ventola se è attualmente in funzione a una velocità superiore.\nImposta -1 per disabilitare questa sostituzione (i ponti e le sporgenze utilizzeranno la velocità predefinita della ventola).\nPuò essere disabilitato da disable_fan_first_layers e aumentato dal tempo di strato basso." +msgid "Reverse on odd" +msgstr "Inverti su dispari" -msgid "" -"What to do with the result? insert it into the existing platter or replacing " -"the current platter by a new one?" -msgstr "Cosa fare con il risultato? Inserirlo nel piatto esistente o sostituire il piatto attuale con uno nuovo?" +msgid "Solid infill spacing change on odd layers" +msgstr "Modifica spaziatura riempimento solido su strati dispari" msgid "" "%s has encountered an error. It was likely caused by running out of memory. " @@ -30395,8 +30768,379 @@ msgstr "" "clic per nascondere i presets non compatibili con la stampante corrente." msgid "" -"Only compatible presets are shown. Click to show both the presets compatible " -"and not compatible with the current printer." +"If you want to process the output G-code through custom scripts, just list " +"their absolute paths here.\n" +"Separate multiple scripts with a semicolon or a line return.\n" +"!! please use ';' here if you want a not-line-separation ';'!!\n" +"Scripts will be passed the absolute path to the G-code file as the first " +"argument, and they can access the Slic3r config settings by reading " +"environment variables.\n" +"The script, if passed as a relative path, will also be searched from the " +"slic3r directory, the slic3r configuration directory and the user directory." msgstr "" -"Vengono mostrati solo i presets compatibili. Fare clic per mostrare sia i " -"presets compatibili che quelli non compatibili con la stampante corrente." +"Se vuoi elaborare il G-code di uscita con script personalizzati, elenca qui " +"i loro percorsi assoluti.\n" +"Separa più script con un punto e virgola o un ritorno a capo.\n" +"!! per favore usa ';' se vuoi una separazione non di linea ';'!!\n" +"Agli script viene passato il percorso assoluto del file G-code come primo " +"argomento, e possono accedere alle impostazioni di configurazione di Slic3r " +"leggendo le variabili d'ambiente.\n" +"Lo script, se passato come percorso relativo, verrà cercato anche dalla " +"directory slic3r, dalla directory di configurazione di slic3r e dalla " +"directory dell'utente." + +msgid "" +"It's better for some infill like rectilinear to rotate 90° each layer. If " +"this settign is deactivated, they won't do that anymore." +msgstr "" +"È meglio che alcuni riempimenti, come quello rettilineo, ruotino di 90° ogni " +"strato. Se questa impostazione è disattivata, non lo faranno più." + +msgid "Fill angle pattern" +msgstr "Trama angolo riempimento" + +msgid "" +"instead of writing 'thumbnails' as tag in the gcode, it will write " +"'thumbnails_PNG', thumbnails_JPG', 'thumbnail_QOI', etc..\n" +" Some firmware needs it to know how to decode the thumbnail, some others " +"don't support it." +msgstr "" +"invece di scrivere 'thumbnails' come tag nel gcode, scriverà " +"'thumbnails_PNG', thumbnails_JPG', 'thumbnail_QOI', ecc..\n" +" Alcuni firmware ne hanno bisogno per sapere come decodificare la miniatura, " +"altri non lo supportano." + +msgid "" +"\n" +"\n" +"! 1 for the Top fan speed is Deprecated, please set it to 0 to stop the fan!" +msgstr "" +"\n" +"\n" +"! 1 per la velocità massima della ventola è sconsigliato, imposta 0 per " +"fermare la ventola!" + +msgid "" +"\n" +"\n" +"! 1 for the External perimeters fan speed is Deprecated, please set it to 0 " +"to stop the fan!" +msgstr "" +"\n" +"\n" +"! 1 per la velocità della ventola dei perimetri esterni è sconsigliato, " +"imposta 0 per fermare la ventola!" + +msgid "" +"\n" +"\n" +"! 1 for the Bridge fan speed is Deprecated, please set it to 0 to stop the " +"fan!" +msgstr "" +"\n" +"\n" +"! 1 per la velocità della ventola del Ponte è sconsigliato, imposta 0 per " +"fermare la ventola!" + +msgid "" +"\n" +"\n" +"! 1 for the Infill bridge fan speed is Deprecated, please set it to 0 to " +"stop the fan!" +msgstr "" +"\n" +"\n" +"! 1 per la velocità della ventola dei Ponti interni è sconsigliato, imposta " +"0 per fermare la ventola!" + +msgid "Cannot overwrite an external profile. Please choose another name." +msgstr "Impossibile sovrascrivere un profilo esterno. Scegliere un altro nome." + +msgid "Cap with perimeter flow" +msgstr "Limite flusso perimetrale" + +msgid "If estimated layer time is below ~%1%s" +msgstr "Se il tempo di strato stimato è inferiore a ~%1%s" + +msgid "" +"! 1 for the Top fan speed is Deprecated, please set it to 0 to stop the fan!" +msgstr "" +"! 1 per la velocità massima della ventola è sconsigliato, imposta 0 per " +"fermare la ventola!" + +msgid "" +"! 1 for the External perimeters fan speed is Deprecated, please set it to 0 to " +"stop the fan!" +msgstr "" +"! 1 per la velocità della ventola dei perimetri esterni è sconsigliato, " +"imposta 0 per fermare la ventola!" + +msgid "" +"! 1 for the Bridge fan speed is Deprecated, please set it to 0 to stop the fan!" +msgstr "" +"! 1 per la velocità della ventola del Ponte è sconsigliato, imposta 0 per " +"fermare la ventola!" + +msgid "" +"! 1 for the Infill bridge fan speed is Deprecated, please set it to 0 to stop " +"the fan!" +msgstr "" +"! 1 per la velocità della ventola dei Ponti interni è sconsigliato, imposta 0 " +"per fermare la ventola!" + +msgid "" +"Both compatible and incompatible presets are shown. Click to hide presets not " +"compatible with the current printer." +msgstr "" +"Vengono mostrati sia i presets compatibili che quelli incompatibili. Fare clic " +"per nascondere i presets non compatibili con la stampante corrente." + +msgid "EPeri" +msgstr "EPeri" + +msgid "IPeri" +msgstr "IPeri" + +msgid "OPeri" +msgstr "OPeri" + +msgid "GFill" +msgstr "GFill" + +msgid "IFill" +msgstr "IFill" + +msgid "SFill" +msgstr "SFill" + +msgid "TFill" +msgstr "TFill" + +msgid "EBridge" +msgstr "EBridge" + +msgid "IBridge" +msgstr "IBridge" + +msgid "" +"Density of internal infill, expressed in the range 0% - 100%.\n" +"Set 0 to remove any sparse infill.\n" +"Note that using a value of 100% won't change the type of infill from sparse to " +"solid. If you want only solid infill, you can set the 'Solid infill every X " +"layers' (solid_infill_every_layers) to 1 instead." +msgstr "" +"Densità del riempimento interno, espressa nel range 0% - 100%.\n" +"Imposta 0 per rimuovere qualsiasi riempimento sparso.\n" +"Nota che usare un valore del 100% non cambierà tipo di riempimento da scarso a " +"solido. Se desideri solo il riempimento solido, puoi invece impostare " +"'Riempimento solido ogni X livelli' (solid_infill_every_layers) su 1." + +msgid "" +"Error while writing gcode: two points are at the same position. Please send " +"the .3mf project to the dev team for debugging. Extrude loop: seam notch." +msgstr "" +"Errore durante la scrittura del gcode: due punti sono nella stessa posizione. " +"Invia il progetto .3mf al team di sviluppo per il debug. Ciclo estrusione: " +"tacca cucitura." + +msgid "" +"Error while writing gcode: two points are at the same position. Please send " +"the .3mf project to the dev team for debugging. Extrude loop: wipe." +msgstr "" +"Errore durante la scrittura del gcode: due punti sono nella stessa posizione. " +"Invia il progetto .3mf al team di sviluppo per il debug. Ciclo estrusione: " +"pulizia." + +msgid "" +"Error while writing gcode: two points are at the same position. Please send " +"the .3mf project to the dev team for debugging. Extrude loop: " +"wipe_inside_start." +msgstr "" +"Errore durante la scrittura del gcode: due punti sono nella stessa posizione. " +"Invia il progetto .3mf al team di sviluppo per il debug. Ciclo estrusione: " +"wipe_inside_start." + +msgid "Export current plate (options available in the dialog)" +msgstr "Esporta piastra corrente (opzioni disponibili nella finestra di dialogo)" + +msgid "Formatting" +msgstr "Formattazione" + +msgid "" +"If you want to process the output G-code through custom scripts, just list " +"their absolute paths here.\n" +"Separate multiple scripts with a semicolon or a line return.\n" +"!! please use '\\;' here if you want a not-line-separation ';'!!\n" +"Scripts will be passed the absolute path to the G-code file as the first " +"argument, and they can access the Slic3r config settings by reading " +"environment variables.\n" +"The script, if passed as a relative path, will also be searched from the " +"slic3r directory, the slic3r configuration directory and the user directory." +msgstr "" +"Se vuoi elaborare il G-code di uscita con script personalizzati, elenca qui i " +"loro percorsi assoluti.\n" +"Separa più script con un punto e virgola o un ritorno a capo.\n" +"!! per favore usa '\\' se vuoi una separazione non di linea ';'!!\n" +"Agli script viene passato il percorso assoluto del file G-code come primo " +"argomento, e possono accedere alle impostazioni di configurazione di Slic3r " +"leggendo le variabili d'ambiente.\n" +"Lo script, se passato come percorso relativo, verrà cercato anche dalla " +"directory slic3r, dalla directory di configurazione di slic3r e dalla " +"directory dell'utente." + +msgid "" +"instead of writing 'thumbnails' as tag in the gcode, it will write " +"'thumbnails_PNG', thumbnails_JPG', 'thumbnail_QOI', etc..\n" +" Some firmware need it to know how to decode the thumbnail, some others don't " +"support it." +msgstr "" +"invece di scrivere 'thumbnails' come tag nel gcode, scriverà 'thumbnails_PNG', " +"'thumbnails_JPG', 'thumbnail_QOI', ecc..\n" +" Alcuni firmware lo richiedono per sapere come decodificare la miniatura, " +"altri non lo supportano." + +msgid "Internal Perimeter fan speed" +msgstr "Velocità ventola perimetro interno" + +msgid "Top Solid fan speed" +msgstr "Velocità ventola solido superiore" + +msgid "Invert Pitch axis" +msgstr "Inverti asse Angolo" + +msgid "Invert Roll axis" +msgstr "Inverti asse Rotazione" + +msgid "Invert X axis" +msgstr "Inverti asse X" + +msgid "Invert Y axis" +msgstr "Inverti asse Y" + +msgid "Invert Yaw axis" +msgstr "Inverti asse Imbardata" + +msgid "Invert Z axis" +msgstr "Inverti asse Z" + +msgid "Iron" +msgstr "Stiro" + +msgid "Only ascii characters in gcode" +msgstr "Solo caratteri ascii nel gcode" + +msgid "Option use another tags than the current mode." +msgstr "L'opzione utilizza tag diversi dalla modalità corrente." + +msgid "" +"Position of perimeters' starting points. May use the angle & travel cost (with " +"the fixed visilibity & ovehangs cost) to find the best place.\n" +"Corners\\. at least 100% angle cost and no more than 80% travel cost (default " +"to 120-40).\n" +"Nearest\\. no more than 100% angle cost and at least 100% travel cost (default " +"to 80-100).\n" +"Scattered\\. seam is placed at a random position on external perimeters.\n" +"Random\\. seam is placed at a random position for all perimeters.\n" +"Aligned\\. seams are grouped in the best place possible (minimum 6 layers per " +"group).\n" +"Contiguous\\. seam is placed over a seam from the previous layer (useful with " +"enforcers as seeds).\n" +"Rear\\. seam is placed at the far side (highest Y coordinates).\n" +"Custom\\. Other conbination of angle & travel cost than 'Corners' and " +"'Nearest', (default to 60-100).\n" +"Custom & weight can be defined in Advanced or Expert mode." +msgstr "" +"Posizione dei punti di partenza dei perimetri. Può usare il costo angolo e " +"viaggio (con il costo fisso di visibilità e sporgenze) per trovare il posto " +"migliore.\n" +"Angoli\\. almeno il 100% del costo dell'angolo e non più dell'80% del costo " +"del viaggio (predefinito 120-40).\n" +"Più vicino\\. non più del 100% del costo dell'angolo e almeno il 100% del " +"costo del viaggio (predefinito 80-100).\n" +"Sparpagliato: la cucitura è posizionata in una posizione casuale sui perimetri " +"esterni\n" +"Casuale: la cucitura è posizionata in una posizione casuale per tutti i " +"perimetri\n" +"Allineato: le cuciture sono raggruppate nel miglior posto possibile (minimo 6 " +"strati per gruppo).\n" +"Contiguo: la cucitura è posizionata sopra una cucitura dello strato precedente " +"(utile con gli esecutori)\n" +"Posteriore: la cucitura è posizionata sul lato opposto (coordinate Y più " +"alte).\n" +"Personalizzato: altra combinazione di angolo e costo del viaggio rispetto a " +"'Angoli' e 'Più vicino' (predefinito 60-100).\n" +"Personalizzato può essere definito in modalità Avanzato o Esperto." + +msgid "Supp" +msgstr "Supp" + +msgid "SuppI" +msgstr "SuppI" + +msgid "Tags" +msgstr "Tags" + +msgid "tags" +msgstr "tags" + +msgid "Your current tags:" +msgstr "I tuoi tag correnti:" + +msgid "" +"The option you selected in the search dialog isn't available in the current " +"mode/tags. Do you want to switch to the option tag?" +msgstr "" +"L'opzione selezionata nella finestra di dialogo di ricerca non è disponibile " +"nella modalità/tag corrente. Vuoi passare al tag opzione?" + +msgid "ThinW" +msgstr "ThinW" + +msgid "" +"To use a client cert on MacOS, you might need to add your certificate to your " +"keychain and make sure it's trusted." +msgstr "" +"Per utilizzare un certificato client su MacOS, potresti dover aggiungere il " +"certificato al portachiavi e assicurarti che sia affidabile." + +msgid "" +"You can either use a path to your certificate or the name of your certificate " +"as you can find it in your Keychain" +msgstr "" +"Puoi usare un percorso per il tuo certificato o il nome del tuo certificato " +"come puoi trovarlo nel tuo portachiavi" + +msgid "" +"Using a color change gcode, but there isn't one for this printer.\n" +"The printer won't stop for the filament change, unless you set it manually in " +"the custom gcode section." +msgstr "" +"Usa un gcode per il cambio colore, ma non ce n'è uno per questa stampante.\n" +"La stampante non si fermerà per il cambio del filamento, a meno che non lo " +"imposti manualmente nella sezione gcode personalizzata." + +msgid "" +"Using a pause gcode, but there isn't one for this printer.\n" +"The printer won't pause, unless you set it manually in the custom gcode " +"section." +msgstr "" +"Usa un gcode di pausa, ma non ce n'è uno per questa stampante.\n" +"La stampante non andrà in pausa, a meno che non la imposti manualmente nella " +"sezione gcode personalizzata." + +msgid "" +"When printing the gcode file, replace any non-ascii character by a '_'. Can be " +"useful if the firmware or a software in a workflow doesn't support uft-8." +msgstr "" +"Quando si stampa il file gcode, sostituire qualsiasi carattere non-ascii con " +"un '_'. Può essere utile se il firmware o un software in un flusso di lavoro " +"non supporta uft-8." + +msgid "WTower" +msgstr "WTower" + +msgid "Your firmware doesn't allow to print the remaining times with M117." +msgstr "Il tuo firmware non consente di stampare i tempi rimanenti con M117." + +msgid "Your firmware doesn't allow to print the remaining times with M73." +msgstr "Il tuo firmware non consente di stampare i tempi rimanenti con M73." From b7849a4e0317a06098306139eeb5868eebed5d49 Mon Sep 17 00:00:00 2001 From: supermerill Date: Sat, 27 Jan 2024 20:01:08 +0100 Subject: [PATCH 14/28] update CopyrightsDialog --- src/slic3r/GUI/AboutDialog.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp index 16b58927325..fcd610a1e6f 100644 --- a/src/slic3r/GUI/AboutDialog.cpp +++ b/src/slic3r/GUI/AboutDialog.cpp @@ -132,6 +132,14 @@ void CopyrightsDialog::fill_entries() , "Ultimaker" , "https://github.com/Ultimaker/CuraEngine" }, { "Arc Welder" , "Brad Hochgesang" , "https://github.com/FormerLurker/ArcWelderLib/" }, + { "AngelScript" + , "Andreas Jönsson" , "https://www.angelcode.com/angelscript/" }, + { "JSON for Modern C++" + , "Niels Lohmann" , "https://github.com/nlohmann/json" }, + { "Bambu Studio" + , "bambulab" , "https://bambulab.com/en/download/studio" }, + { "Orca Slicer" + , "SoftFever" , "https://github.com/SoftFever/OrcaSlicer" }, }; } From 8f29395d05e6e27de77b29e5142a6d12dc40b2d1 Mon Sep 17 00:00:00 2001 From: supermerill Date: Mon, 29 Jan 2024 17:02:08 +0100 Subject: [PATCH 15/28] fix XY size compensation direction for inner & holes --- src/libslic3r/PrintObjectSlice.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/PrintObjectSlice.cpp b/src/libslic3r/PrintObjectSlice.cpp index 06d029802fb..a20fdce557e 100644 --- a/src/libslic3r/PrintObjectSlice.cpp +++ b/src/libslic3r/PrintObjectSlice.cpp @@ -729,7 +729,7 @@ ExPolygons PrintObject::_shrink_contour_holes(double contour_delta, double not_c if (convex_delta_adapted != 0) { Polygon hole_as_contour = hole; hole_as_contour.make_counter_clockwise(); - for (ExPolygon& newHole : offset_ex(ExPolygon{ hole_as_contour }, convex_delta_adapted)) { + for (ExPolygon& newHole : offset_ex(ExPolygon{ hole_as_contour }, -convex_delta_adapted)) { holes.push_back(std::move(newHole)); } } else { @@ -744,7 +744,7 @@ ExPolygons PrintObject::_shrink_contour_holes(double contour_delta, double not_c if (not_convex_delta != 0) { Polygon hole_as_contour = hole; hole_as_contour.make_counter_clockwise(); - for (ExPolygon& newHole : offset_ex(ExPolygon{ hole_as_contour }, not_convex_delta)) { + for (ExPolygon& newHole : offset_ex(ExPolygon{ hole_as_contour }, -not_convex_delta)) { holes.push_back(std::move(newHole)); } } else { From 4c3718a5fd6ab466291fa2052ba325d174d46d53 Mon Sep 17 00:00:00 2001 From: supermerill Date: Mon, 29 Jan 2024 17:23:19 +0100 Subject: [PATCH 16/28] fix full fill assert, again --- src/libslic3r/Fill/Fill.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp index 267121f0aed..a65eca98d3e 100644 --- a/src/libslic3r/Fill/Fill.cpp +++ b/src/libslic3r/Fill/Fill.cpp @@ -700,7 +700,8 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive: assert(compute_volume.volume < unscaled(unscaled(surface_fill.surface.area())) * surface_fill.params.layer_height + EPSILON); double area = unscaled(unscaled(real_surface)); assert(compute_volume.volume <= area * surface_fill.params.layer_height * 1.001 || f->debug_verify_flow_mult <= 0.8); - assert(compute_volume.volume >= area * surface_fill.params.layer_height * 0.999 || f->debug_verify_flow_mult >= 1.3 || area < std::max(1.,surface_fill.params.config->solid_infill_below_area.value)); + if(compute_volume.volume > 0) //can fail for thin regions + assert(compute_volume.volume >= area * surface_fill.params.layer_height * 0.999 || f->debug_verify_flow_mult >= 1.3 || area < std::max(1.,surface_fill.params.config->solid_infill_below_area.value)); } #endif } From ff8d29fa5d51a6c85d84b4cab5d349bbfacb14f3 Mon Sep 17 00:00:00 2001 From: supermerill Date: Mon, 29 Jan 2024 19:54:49 +0100 Subject: [PATCH 17/28] Fix fan_mover/gcodeprocessor with G2/G3 via new test case supermerill/SuperSlicer#4061 --- src/libslic3r/GCode/FanMover.cpp | 64 ++-- src/libslic3r/GCode/FanMover.hpp | 5 + src/libslic3r/GCodeReader.cpp | 2 +- tests/superslicerlibslic3r/test_fan_mover.cpp | 316 ++++++++++++++++++ 4 files changed, 365 insertions(+), 22 deletions(-) diff --git a/src/libslic3r/GCode/FanMover.cpp b/src/libslic3r/GCode/FanMover.cpp index b108bbc459a..989e08bdb8a 100644 --- a/src/libslic3r/GCode/FanMover.cpp +++ b/src/libslic3r/GCode/FanMover.cpp @@ -34,8 +34,7 @@ const std::string& FanMover::process_gcode(const std::string& gcode, bool flush) if (flush) { while (!m_buffer.empty()) { - m_process_output += m_buffer.front().raw + "\n"; - remove_from_buffer(m_buffer.begin()); + write_buffer_data(); } } @@ -282,6 +281,15 @@ void FanMover::_process_gcode_line(GCodeReader& reader, const GCodeReader::GCode dist = std::sqrt(dist); time = dist / m_current_speed; } + } else if (::atoi(&cmd[1]) == 2 || ::atoi(&cmd[1]) == 3) { + // TODO: compute real dist + double distx = line.dist_X(reader); + double disty = line.dist_Y(reader); + double dist = distx * distx + disty * disty; + if (dist > 0) { + dist = std::sqrt(dist); + time = dist / m_current_speed; + } } break; } @@ -433,11 +441,18 @@ void FanMover::_process_gcode_line(GCodeReader& reader, const GCodeReader::GCode } if (line.has(Axis::E)) { new_data.e = reader.e(); - if (relative_e) + if (relative_e) { + assert(new_data.e == 0); new_data.de = line.e(); - else + } else new_data.de = line.dist_E(reader); } + assert(new_data.dx == 0 || reader.x() == new_data.x); + assert(new_data.dx == 0 || reader.x() + new_data.dx == line.x()); + assert(new_data.dy == 0 ||reader.y() == new_data.y); + assert(new_data.dy == 0 || reader.y() + new_data.dy == line.y()); + assert(new_data.de == 0 || reader.e() == new_data.e); + assert(new_data.de == 0 || reader.e() + new_data.de == line.e()); if (m_current_kickstart.time > 0 && time > 0) { m_current_kickstart.time -= time; @@ -472,23 +487,7 @@ void FanMover::_process_gcode_line(GCodeReader& reader, const GCodeReader::GCode //if buffer too big, flush it. if (time >= 0) { while (!m_buffer.empty() && (need_flush || m_buffer_time_size - m_buffer.front().time > nb_seconds_delay - EPSILON) ){ - BufferData& frontdata = m_buffer.front(); - if (frontdata.fan_speed < 0 || frontdata.fan_speed != m_front_buffer_fan_speed || frontdata.is_kickstart) { - if (frontdata.is_kickstart && frontdata.fan_speed < m_front_buffer_fan_speed) { - //you have to slow down! not kickstart! rewrite the fan speed. - m_process_output += _set_fan(frontdata.fan_speed);//m_writer.set_fan(frontdata.fan_speed,true); //FIXME extruder id (or use the gcode writer, but then you have to disable the multi-thread thing - - m_front_buffer_fan_speed = frontdata.fan_speed; - } else { - m_process_output += frontdata.raw + "\n"; - if (frontdata.fan_speed >= 0) { - //note that this is the only place where the fan_speed is set and we print from the buffer, as if the fan_speed >= 0 => time == 0 - //and as this flush all time == 0 lines from the back of the queue... - m_front_buffer_fan_speed = frontdata.fan_speed; - } - } - } - remove_from_buffer(m_buffer.begin()); + write_buffer_data(); } } #if _DEBUG @@ -498,5 +497,28 @@ void FanMover::_process_gcode_line(GCodeReader& reader, const GCodeReader::GCode #endif } +void FanMover::write_buffer_data() +{ + BufferData &frontdata = m_buffer.front(); + if (frontdata.fan_speed < 0 || frontdata.fan_speed != m_front_buffer_fan_speed || frontdata.is_kickstart) { + if (frontdata.is_kickstart && frontdata.fan_speed < m_front_buffer_fan_speed) { + // you have to slow down! not kickstart! rewrite the fan speed. + m_process_output += _set_fan( + frontdata.fan_speed); // m_writer.set_fan(frontdata.fan_speed,true); //FIXME extruder id (or use the + // gcode writer, but then you have to disable the multi-thread thing + + m_front_buffer_fan_speed = frontdata.fan_speed; + } else { + m_process_output += frontdata.raw + "\n"; + if (frontdata.fan_speed >= 0) { + // note that this is the only place where the fan_speed is set and we print from the buffer, as if the + // fan_speed >= 0 => time == 0 and as this flush all time == 0 lines from the back of the queue... + m_front_buffer_fan_speed = frontdata.fan_speed; + } + } + } + remove_from_buffer(m_buffer.begin()); +} + } // namespace Slic3r diff --git a/src/libslic3r/GCode/FanMover.hpp b/src/libslic3r/GCode/FanMover.hpp index 2d0c3ad6306..a5598df4bfe 100644 --- a/src/libslic3r/GCode/FanMover.hpp +++ b/src/libslic3r/GCode/FanMover.hpp @@ -15,11 +15,15 @@ namespace Slic3r { class BufferData { public: + //raw string, contains end position std::string raw; + // time to go from start to end float time; int16_t fan_speed; bool is_kickstart; + // start position float x = 0, y = 0, z = 0, e = 0; + // delta to go to end position float dx = 0, dy = 0, dz = 0, de = 0; BufferData(std::string line, float time = 0, int16_t fan_speed = 0, float is_kickstart = false) : raw(line), time(time), fan_speed(fan_speed), is_kickstart(is_kickstart){ //avoid double \n @@ -86,6 +90,7 @@ class FanMover void _put_in_middle_G1(std::list::iterator item_to_split, float nb_sec, BufferData&& line_to_write); void _print_in_middle_G1(BufferData& line_to_split, float nb_sec, const std::string& line_to_write); void _remove_slow_fan(int16_t min_speed, float past_sec); + void write_buffer_data(); std::string _set_fan(int16_t speed); }; diff --git a/src/libslic3r/GCodeReader.cpp b/src/libslic3r/GCodeReader.cpp index c8a9b790fcf..ef0c4bfa085 100644 --- a/src/libslic3r/GCodeReader.cpp +++ b/src/libslic3r/GCodeReader.cpp @@ -120,7 +120,7 @@ void GCodeReader::update_coordinates(GCodeLine &gline, std::pair std::string { + std::string s = ";LAYER_CHANGE\n"; + s += ";Z:18.4\n"; + s += ";HEIGHT:0.199999\n"; + s += "G92 E0\n"; + s += "G10 ; retract\n"; + s += "; stop printing object Star_face.stl id:0 copy 0\n"; + s += "EXCLUDE_OBJECT_END NAME=Star_face_stl_id_0_copy_0\n"; + s += "M204 S10000\n"; + s += "G1 Z18.4 F1800\n"; + s += "G92 E0\n"; + s += "; printing object Star_face.stl id:0 copy 0\n"; + s += "EXCLUDE_OBJECT_START NAME=Star_face_stl_id_0_copy_0\n"; + s += "; acceleration to travel\n"; + s += "G1 X163.229 Y127.604 F18000\n"; + s += "G1 X146.967 Y135.013\n"; + s += "G1 X146.61 Y135.175\n"; + s += "G1 X123.351 Y145.771\n"; + s += "G1 X122.18 Y146.428\n"; + s += "; decel to extrusion\n"; + s += "M204 S5000\n"; + s += "G1 X118.537 Y148.471\n"; + s += "G1 X117.236 Y148.733\n"; + s += "G1 X116.744 Y148.781\n"; + s += "G1 X116.452 Y148.95\n"; + s += "; end travel\n"; + s += "G11 ; unretract\n"; + s += "G92 E0\n"; + s += ";TYPE:External perimeter\n"; + s += ";WIDTH:0.698815\n"; + s += "M106 S25.5\n"; + s += "G1 F4650\n"; + s += "G1 X115.957 Y148.975 E0.02567\n"; + s += "G3 X105.872 Y142.185 I-.066 J-10.787 E.69483\n"; + s += "G1 X105.745 Y141.815 E0.71508\n"; + s += "G3 X106.128 Y133.713 I10.705 J-3.555 E1.14496\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.728025\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G3 X108.063 Y130.539 I11.385 J4.764 E1.34692\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.75984\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G3 X112.6 Y127.602 I6.872 J5.643 E1.65789\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.789218\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G3 X125.102 Y132.013 I3.494 J10.021 E2.50206\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.755247\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G3 X126.771 Y137.462 I-9.904 J6.012 E2.82604\n"; + if(!remove_useless) s += "M106 S25.5\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G1 X126.775 Y137.806 E2.84539\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.727549\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G3 X123.57 Y145.764 I-11.051 J.175 E3.32189\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.698815\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G3 X116.606 Y148.952 I-7.679 J-7.576 E3.72755\n"; + s += "G1 X116.527 Y148.951 E3.73167\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIPE_START\n"; + s += "M204 S10000\n"; + s += "G1 X116.189 Y148.524 F18000\n"; + s += ";WIPE_END\n"; + s += "; acceleration to travel\n"; + s += "G1 X115.678 Y148.359\n"; + s += "; decel to extrusion\n"; + s += "M204 S5000\n"; + s += "G1 X115.422 Y148.276\n"; + s += "; end travel\n"; + s += ";WIDTH:0.720254\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G1 F4650\n"; + s += "G1 X116.001 Y148.314 E3.76269\n"; + s += "G2 X122.624 Y145.725 I-.12 J-10.072 E4.15158\n"; + s += "G2 X123.751 Y144.568 I-8.904 J-9.799 E4.23803\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.748162\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G2 X126.066 Y137.801 I-7.967 J-6.506 E4.64496\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.77744\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G2 X124.935 Y133.225 I-11.113 J.321 E4.92054\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.805275\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G2 X119.271 Y128.291 I-8.81 J4.395 E5.38463\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.773006\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G2 X113.961 Y127.995 I-3.206 J9.712 E5.69495\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.76111\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G1 X113.76 Y128.037 E5.70656\n"; + s += "G2 X110.376 Y129.391 I2.27 J10.575 E5.91434\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.728025\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G2 X108.025 Y131.708 I5.15 J7.579 E6.09394\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.692664\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G2 X105.869 Y139.349 I8.98 J6.658 E6.51053\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.720254\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G2 X115.208 Y148.292 I10.012 J-1.107 E7.26171\n"; + s += "G1 X115.348 Y148.282 E7.26918\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIPE_START\n"; + s += "M204 S10000\n"; + s += "G1 X115.664 Y148.713 F18000\n"; + s += ";WIPE_END\n"; + s += "G92 E0\n"; + s += "G10 ; retract\n"; + s += "; acceleration to travel\n"; + s += "G1 X115.662 Y148.808\n"; + s += "G1 X120.932 Y147.524\n"; + s += "G1 X121.226 Y147.362\n"; + s += "G1 X150.16 Y140.336\n"; + s += "; decel to extrusion\n"; + s += "M204 S5000\n"; + s += "G1 X156.209 Y138.866\n"; + s += "G1 X156.22 Y138.976\n"; + s += "; end travel\n"; + s += "G11 ; unretract\n"; + s += ";WIDTH:0.649924\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G1 F4650\n"; + s += "G1 X155.801 Y139.034 E0.02026\n"; + s += "G3 X153.702 Y138.948 I-.587 J-11.382 E.12117\n"; + s += "G3 X152.849 Y138.822 I.823 J-8.513 E.16252\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.683858\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G3 X145.878 Y134.51 I2.171 J-11.301 E.58686\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.711771\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G3 X143.804 Y130.663 I9.809 J-7.768 E.81894\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.74297\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G3 X148.219 Y117.616 I10.583 J-3.69 E1.63918\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.711031\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G3 X152.826 Y115.811 I6.908 J10.85 E1.90195\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.680045\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G3 X154.402 Y115.729 I1.097 J5.903 E1.9816\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.643995\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G3 X157.534 Y116.615 I-.943 J9.313 E2.13698\n"; + s += "G3 X165.073 Y124.528 I-4.996 J12.307 E2.67179\n"; + s += "G1 X165.155 Y124.808 E2.68563\n"; + s += "G3 X165.6 Y127.286 I-12.334 J3.496 E2.80535\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.649924\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G1 X165.609 Y127.779 E2.82901\n"; + s += "G3 X163.67 Y134.419 I-11.681 J.192 E3.1657\n"; + s += "G3 X161.835 Y136.929 I-6.919 J-3.132 E3.31587\n"; + s += "G3 X156.616 Y138.963 I-6.621 J-9.277 E3.58724\n"; + s += "G1 X156.295 Y138.974 E3.60263\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIPE_START\n"; + s += "M204 S10000\n"; + s += "G1 X155.927 Y138.571 F18000\n"; + s += ";WIPE_END\n"; + s += "M204 S5000\n"; + s += "G1 X155.863 Y138.403\n"; + s += ";WIDTH:0.638248\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G1 F4650\n"; + s += "G1 X155.909 Y138.419 E3.60495\n"; + s += "G2 X161.549 Y136.388 I-.727 J-10.866 E3.89052\n"; + s += "G2 X163.15 Y134.126 I-4.753 J-5.062 E4.02169\n"; + s += "G2 X164.82 Y125.892 I-9.372 J-6.188 E4.42665\n"; + s += "G1 X164.74 Y125.556 E4.4429\n"; + s += "G2 X159.719 Y118.49 I-11.601 J2.927 E4.86006\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.667068\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G2 X154.678 Y116.365 I-7.59 J10.96 E5.13167\n"; + if (move_useful) { + s += "G1 X154.511 Y116.36 E5.13992\n"; + s += "M106 S140.25\n"; + } + s += "G1 X154.256 Y116.352 E5.15251\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.707201\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G2 X152.007 Y116.669 I.061 J8.587 E5.27203\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.741124\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G2 X143.911 Y126.283 I2.509 J10.329 E6.01375\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.713385\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G2 X144.261 Y129.843 I10.983 J.716 E6.20405\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.681374\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G2 X146.03 Y133.648 I11.334 J-2.956 E6.41684\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.649924\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G2 X153.408 Y138.302 I9.116 J-6.276 E6.84676\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIDTH:0.638248\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G1 X153.561 Y138.322 E6.85401\n"; + s += "G2 X155.003 Y138.441 I1.621 J-10.769 E6.9221\n"; + s += "G1 X155.788 Y138.406 E6.95905\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += ";WIPE_START\n"; + s += "M204 S10000\n"; + s += "G1 X156.022 Y138.877 F18000\n"; + s += ";WIPE_END\n"; + s += "G92 E0\n"; + s += "G10 ; retract\n"; + s += "; acceleration to travel\n"; + s += "G1 X155.991 Y138.508\n"; + s += "G1 X163.054 Y127.686\n"; + s += "G1 X163.042 Y127.702\n"; + s += "; decel to extrusion\n"; + s += "M204 S500\n"; + s += "G1 X162.795 Y128.055\n"; + s += "; end travel\n"; + s += "G11 ; unretract\n"; + s += ";TYPE:Overhang perimeter\n"; + s += ";WIDTH:0.542919\n"; + s += ";HEIGHT:0.5\n"; + if(!move_useful) s += "M106 S140.25\n"; + s += "G1 F1800\n"; + s += "G3 X163.624 Y127.86 I.327 J-.467 E.10369\n"; + s += "G3 X163.258 Y128.142 I-.531 J-.312 E.1224\n"; + s += "G3 X162.86 Y128.094 I-.135 J-.555 E.13857\n"; + s += "M106 S25.5\n"; + s += "; acceleration to travel\n"; + s += "M204 S10000\n"; + s += "G1 X163.052 Y127.812 F18000\n"; + s += "; decel to extrusion\n"; + s += "M204 S5000\n"; + s += "G1 X163.2 Y127.595\n"; + s += "; end travel\n"; + s += ";TYPE:Internal perimeter\n"; + s += ";WIDTH:0.702708\n"; + s += ";HEIGHT:0.2\n"; + if(!remove_useless) s += "M106 S25.5\n"; + s += "G1 F4650\n"; + s += "G3 X163.159 Y127.523 I-.077 J-.003 E.15938\n"; + if(!remove_useless) s += "M106 S25.5\n"; + return s; + }; + + const std::string gcode = create_gcode(false, false); + //"M106 S25.5\n"; + GCodeWriter writer; + // what's used from the writer: + writer.config.gcode_flavor.value = gcfMarlinFirmware; + writer.config.gcode_comments.value = false; + writer.config.fan_percentage.value = false; // 0 -> 255 + // writer.tool[0] = nullptr; + assert(writer.tool() == nullptr); + assert(writer.get_tool(0) == nullptr); + + SECTION("disable evrything") + { + Slic3r::FanMover fan_mover(writer, + 0, // fan_speedup_time.value, + false, // with_D_option + false, // use_relative_e_distances.value, + false, // fan_speedup_overhangs.value, + 0 // fan_kickstart.value)); + ); + std::string processed_gcode = fan_mover.process_gcode(gcode, true); + std::string good_gcode = create_gcode(true, false); + //remove + REQUIRE(good_gcode == processed_gcode); + } + + SECTION("4061 bug") + { + Slic3r::FanMover fan_mover(writer, + .486, // fan_speedup_time.value, + false, // with_D_option + false, // use_relative_e_distances.value, + true, // fan_speedup_overhangs.value, + 0 // fan_kickstart.value)); + ); + std::string processed_gcode = fan_mover.process_gcode(gcode, true); + std::string good_gcode = create_gcode(true, true); + + REQUIRE(good_gcode == processed_gcode); + } +} + From 56a1977a6a98ea4e523d991197ba9a085317fa6d Mon Sep 17 00:00:00 2001 From: supermerill Date: Tue, 30 Jan 2024 11:45:10 +0100 Subject: [PATCH 18/28] little change to splashscreen setting choice. --- src/libslic3r/AppConfig.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index 10dbaa57e9a..5b118433591 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -504,9 +504,6 @@ void AppConfig::set_defaults() if (get("show_splash_screen").empty()) set("show_splash_screen", "1"); - if (get("show_splash_screen").empty()) - set("show_splash_screen", "1"); - if (get("restore_win_position").empty()) set("restore_win_position", "1"); // allowed values - "1", "0", "crashed_at_..." @@ -519,7 +516,7 @@ void AppConfig::set_defaults() { //try to load splashscreen from ui file - std::map key2splashscreen = {{"splash_screen_editor", "benchy-splashscreen.jpg"}, {"splash_screen_gcodeviewer", "prusa-gcodepreview.jpg"} }; + std::map key2splashscreen = {{"splash_screen_editor", ""}, {"splash_screen_gcodeviewer", ""} }; boost::property_tree::ptree tree_splashscreen; boost::filesystem::path path_colors = boost::filesystem::path(layout_config_path()) / "colors.ini"; try { @@ -547,10 +544,13 @@ void AppConfig::set_defaults() if (get("splash_screen_gcodeviewer").empty()) set("splash_screen_gcodeviewer", "default"); - if (!get("show_splash_screen_random").empty() && get("show_splash_screen_random") == "1") { + bool switch_to_random = get("show_splash_screen_random") == "1"; + if (switch_to_random || key2splashscreen["splash_screen_editor"].empty()) set("splash_screen_editor", "random"); + if (switch_to_random || key2splashscreen["splash_screen_gcodeviewer"].empty()) + set("splash_screen_gcodeviewer", "random"); + if (switch_to_random) set("show_splash_screen_random", "0"); - } } #ifdef _WIN32 From 46bb95a4ec6edf8731c8e80fb0f4e44641609d2b Mon Sep 17 00:00:00 2001 From: supermerill Date: Tue, 30 Jan 2024 13:49:07 +0100 Subject: [PATCH 19/28] improved conversion to/from prusa/orca: now can tell you what options are ignored. --- src/PrusaSlicer.cpp | 14 +- src/libslic3r/AppConfig.cpp | 3 + src/libslic3r/Config.cpp | 123 ++++++++++---- src/libslic3r/Config.hpp | 19 ++- src/libslic3r/Format/3mf.cpp | 95 ++++++----- src/libslic3r/Format/AMF.cpp | 46 +++--- src/libslic3r/Format/BBConfig.cpp | 213 +++++++++++++++++++++++-- src/libslic3r/Format/bbs_3mf.cpp | 19 +++ src/libslic3r/GCode/GCodeProcessor.cpp | 2 +- src/libslic3r/Model.cpp | 2 +- src/libslic3r/PresetBundle.cpp | 37 +++-- src/libslic3r/PrintConfig.cpp | 196 +++++++++++++++++++++-- src/libslic3r/PrintConfig.hpp | 19 ++- src/slic3r/GUI/GUI.cpp | 72 ++++++++- src/slic3r/GUI/Plater.cpp | 2 +- src/slic3r/GUI/Preferences.cpp | 7 + 16 files changed, 719 insertions(+), 150 deletions(-) diff --git a/src/PrusaSlicer.cpp b/src/PrusaSlicer.cpp index 129baabd8fb..a342f208878 100644 --- a/src/PrusaSlicer.cpp +++ b/src/PrusaSlicer.cpp @@ -142,7 +142,10 @@ int CLI::run(int argc, char **argv) if (! config_substitutions.empty()) { boost::nowide::cout << "The following configuration values were substituted when loading \" << file << \":\n"; for (const ConfigSubstitution &subst : config_substitutions) - boost::nowide::cout << "\tkey = \"" << subst.opt_def->opt_key << "\"\t loaded = \"" << subst.old_value << "\tsubstituted = \"" << subst.new_value->serialize() << "\"\n"; + if(subst.opt_def) + boost::nowide::cout << "\tkey = \"" << subst.opt_def->opt_key << "\"\t loaded = \"" << subst.old_value << "\tsubstituted = \"" << subst.new_value->serialize() << "\"\n"; + else + boost::nowide::cout << "\tkey = \"" << subst.old_name << "\"\t can't be loaded (value = \"" << subst.old_value <<"\")\n"; } config.normalize_fdm(); PrinterTechnology other_printer_technology = get_printer_technology(config); @@ -192,10 +195,13 @@ int CLI::run(int argc, char **argv) boost::nowide::cerr << "Mixing configurations for FFF and SLA technologies" << std::endl; return 1; } - if (! config_substitutions.substitutions.empty()) { + if (! config_substitutions.empty()) { boost::nowide::cout << "The following configuration values were substituted when loading \" << file << \":\n"; - for (const ConfigSubstitution& subst : config_substitutions.substitutions) - boost::nowide::cout << "\tkey = \"" << subst.opt_def->opt_key << "\"\t loaded = \"" << subst.old_value << "\tsubstituted = \"" << subst.new_value->serialize() << "\"\n"; + for (const ConfigSubstitution& subst : config_substitutions.get()) + if(subst.opt_def) + boost::nowide::cout << "\tkey = \"" << subst.opt_def->opt_key << "\"\t loaded = \"" << subst.old_value << "\tsubstituted = \"" << subst.new_value->serialize() << "\"\n"; + else + boost::nowide::cout << "\tkey = \"" << subst.old_name << "\"\t can't be loaded (value = \"" << subst.old_value <<"\")\n"; } // config is applied to m_print_config before the current m_config values. config += std::move(m_print_config); diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index 5b118433591..089b92d5f7b 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -395,6 +395,9 @@ void AppConfig::set_defaults() if (get("check_material_export").empty()) set("check_material_export", "0"); + if (get("show_unknown_setting").empty()) + set("show_unknown_setting", "1"); + if (get("use_custom_toolbar_size").empty()) set("use_custom_toolbar_size", "0"); diff --git a/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp index b1a619f354c..3e5ffe18195 100644 --- a/src/libslic3r/Config.cpp +++ b/src/libslic3r/Config.cpp @@ -565,12 +565,17 @@ bool ConfigBase::set_deserialize_nothrow(const t_config_option_key &opt_key_src, { t_config_option_key opt_key = opt_key_src; std::string value = value_src; + //note: should be done BEFORE calling set_deserialize // Both opt_key and value may be modified by handle_legacy(). // If the opt_key is no more valid in this version of Slic3r, opt_key is cleared by handle_legacy(). this->handle_legacy(opt_key, value); - if (opt_key.empty()) + if (opt_key.empty()) { + assert(false); // Ignore the option. return true; + } + assert(opt_key == opt_key_src); + assert(value == value_src); return this->set_deserialize_raw(opt_key, value, substitutions_ctxt, append); } @@ -601,7 +606,7 @@ void ConfigBase::set_deserialize(const t_config_option_key &opt_key_src, const s if (optdef == nullptr) throw UnknownOptionException(opt_key_src); } - substitutions_ctxt.substitutions.push_back(ConfigSubstitution{ optdef, value_src, ConfigOptionUniquePtr(optdef->default_value->clone()) }); + substitutions_ctxt.add(ConfigSubstitution{ optdef, value_src, ConfigOptionUniquePtr(optdef->default_value->clone()) }); } } } @@ -694,12 +699,7 @@ bool ConfigBase::set_deserialize_raw(const t_config_option_key &opt_key_src, con if (substituted && (substitutions_ctxt.rule == ForwardCompatibilitySubstitutionRule::Enable || substitutions_ctxt.rule == ForwardCompatibilitySubstitutionRule::EnableSystemSilent)) { - // Log the substitution. - ConfigSubstitution config_substitution; - config_substitution.opt_def = optdef; - config_substitution.old_value = value; - config_substitution.new_value = ConfigOptionUniquePtr(opt->clone()); - substitutions_ctxt.substitutions.emplace_back(std::move(config_substitution)); + substitutions_ctxt.emplace(optdef, std::string(value), ConfigOptionUniquePtr(opt->clone())); } } //set phony status @@ -937,9 +937,20 @@ ConfigSubstitutions ConfigBase::load(const boost::property_tree::ptree &tree, Fo for (const boost::property_tree::ptree::value_type &v : tree) { t_config_option_key opt_key = v.first; try { - this->set_deserialize(opt_key, v.second.get_value(), substitutions_ctxt); + std::string value = v.second.get_value(); + PrintConfigDef::handle_legacy(opt_key, value, false); + if (!opt_key.empty()) { + if (!PrintConfigDef::is_defined(opt_key)) { + if (substitutions_ctxt.rule != ForwardCompatibilitySubstitutionRule::Disable) { + substitutions_ctxt.add(ConfigSubstitution(v.first, value)); + } + } else { + this->set_deserialize(opt_key, value, substitutions_ctxt); + } + } } catch (UnknownOptionException & /* e */) { // ignore + assert(false); } catch (BadOptionValueException & e) { if (compatibility_rule == ForwardCompatibilitySubstitutionRule::Disable) throw e; @@ -947,41 +958,44 @@ ConfigSubstitutions ConfigBase::load(const boost::property_tree::ptree &tree, Fo const ConfigDef* def = this->def(); if (def == nullptr) throw e; const ConfigOptionDef* optdef = def->get(opt_key); - substitutions_ctxt.substitutions.emplace_back(optdef, v.second.get_value(), ConfigOptionUniquePtr(optdef->default_value->clone())); + substitutions_ctxt.emplace(optdef, v.second.get_value(), ConfigOptionUniquePtr(optdef->default_value->clone())); } } - return std::move(substitutions_ctxt.substitutions); + return std::move(substitutions_ctxt).data(); } // Load the config keys from the given string. -size_t ConfigBase::load_from_gcode_string_legacy(ConfigBase& config, const char* str, ConfigSubstitutionContext& substitutions) +std::map ConfigBase::load_gcode_string_legacy(const char* str) { + std::map opt_key_values; if (str == nullptr) - return 0; + return opt_key_values; // Walk line by line in reverse until a non-configuration key appears. const char *data_start = str; // boost::nowide::ifstream seems to cook the text data somehow, so less then the 64k of characters may be retrieved. - const char *end = data_start + strlen(str); - size_t num_key_value_pairs = 0; + const char *end = data_start + strlen(str); for (;;) { // Extract next line. - for (--end; end > data_start && (*end == '\r' || *end == '\n'); --end); + for (--end; end > data_start && (*end == '\r' || *end == '\n'); --end) + ; if (end == data_start) break; - const char *start = end ++; - for (; start > data_start && *start != '\r' && *start != '\n'; --start); + const char *start = end++; + for (; start > data_start && *start != '\r' && *start != '\n'; --start) + ; if (start == data_start) break; // Extracted a line from start to end. Extract the key = value pair. - if (end - (++ start) < 10 || start[0] != ';' || start[1] != ' ') + if (end - (++start) < 10 || start[0] != ';' || start[1] != ' ') break; const char *key = start + 2; if (!((*key >= 'a' && *key <= 'z') || (*key >= 'A' && *key <= 'Z'))) // A key must start with a letter. break; const char *sep = key; - for (; sep != end && *sep != '='; ++ sep) ; + for (; sep != end && *sep != '='; ++sep) + ; if (sep == end || sep[-1] != ' ' || sep[1] != ' ') break; const char *value = sep + 2; @@ -991,29 +1005,58 @@ size_t ConfigBase::load_from_gcode_string_legacy(ConfigBase& config, const char* if (key_end - key < 3) break; // The key may contain letters, digits and underscores. - for (const char *c = key; c != key_end; ++ c) + for (const char *c = key; c != key_end; ++c) if (!((*c >= 'a' && *c <= 'z') || (*c >= 'A' && *c <= 'Z') || (*c >= '0' && *c <= '9') || *c == '_')) { key = nullptr; break; } if (key == nullptr) break; + opt_key_values.emplace(std::string(key, key_end), std::string(value, end)); + end = start; + } + return opt_key_values; +} + + +size_t ConfigBase::load_from_gcode_string_legacy(ConfigBase& config, const char* str, ConfigSubstitutionContext& substitutions) +{ + if (str == nullptr) + return 0; + + // Walk line by line in reverse until a non-configuration key appears. + const char *data_start = str; + // boost::nowide::ifstream seems to cook the text data somehow, so less then the 64k of characters may be retrieved. + const char *end = data_start + strlen(str); + size_t num_key_value_pairs = 0; + for (auto [key, value] : load_gcode_string_legacy(str)) { try { - config.set_deserialize(std::string(key, key_end), std::string(value, end), substitutions); - ++num_key_value_pairs; + std::string opt_key = key; + PrintConfigDef::handle_legacy(opt_key, value, false); + if (!opt_key.empty()) { + if (!PrintConfigDef::is_defined(opt_key)) { + if (substitutions.rule != ForwardCompatibilitySubstitutionRule::Disable) { + substitutions.add(ConfigSubstitution(key, value)); + } + } else { + config.set_deserialize(opt_key, value, substitutions); + ++num_key_value_pairs; + } + } } catch (UnknownOptionException & /* e */) { - // ignore + // log & ignore + if (substitutions.rule != ForwardCompatibilitySubstitutionRule::Disable) + substitutions.add(ConfigSubstitution(key, value)); } catch (BadOptionValueException & e) { if (substitutions.rule == ForwardCompatibilitySubstitutionRule::Disable) throw e; // log the error const ConfigDef* def = config.def(); if (def == nullptr) throw e; - const ConfigOptionDef* optdef = def->get(std::string(key, key_end)); - substitutions.substitutions.emplace_back(optdef, std::string(value, end), ConfigOptionUniquePtr(optdef->default_value->clone())); + const ConfigOptionDef* optdef = def->get(key); + substitutions.emplace(optdef, std::move(value), ConfigOptionUniquePtr(optdef->default_value->clone())); } - end = start; } return num_key_value_pairs; @@ -1166,10 +1209,21 @@ ConfigSubstitutions ConfigBase::load_from_gcode_file(const std::string &file, Fo boost::trim(key); boost::trim(value); try { - this->set_deserialize(key, value, substitutions_ctxt); - ++ key_value_pairs; + std::string opt_key = key; + PrintConfigDef::handle_legacy(opt_key, value, false); + if (!opt_key.empty()) { + if (!PrintConfigDef::is_defined(opt_key)) { + if (substitutions_ctxt.rule != ForwardCompatibilitySubstitutionRule::Disable) { + substitutions_ctxt.add(ConfigSubstitution(key, value)); + } + } else { + this->set_deserialize(opt_key, value, substitutions_ctxt); + ++key_value_pairs; + } + } } catch (UnknownOptionException & /* e */) { // ignore + assert(false); } } } @@ -1192,7 +1246,7 @@ ConfigSubstitutions ConfigBase::load_from_gcode_file(const std::string &file, Fo if (key_value_pairs < 80) throw Slic3r::RuntimeError(format("Suspiciously low number of configuration values extracted from %1%: %2%", file, key_value_pairs)); - return std::move(substitutions_ctxt.substitutions); + return std::move(substitutions_ctxt).data(); } void ConfigBase::save(const std::string &file, bool to_prusa) const @@ -1404,10 +1458,11 @@ bool DynamicConfig::read_cli(int argc, const char* const argv[], t_config_option // Just bail out if the configuration value is not understood. ConfigSubstitutionContext context(ForwardCompatibilitySubstitutionRule::Disable); // Any scalar value of a type different from Bool and String. - if (! this->set_deserialize_nothrow(opt_key, value, context, false)) { - boost::nowide::cerr << "Invalid value supplied for --" << token.c_str() << std::endl; - return false; - } + // here goes int options, like loglevel. + if (!this->set_deserialize_nothrow(opt_key, value, context, false)) { + boost::nowide::cerr << "Invalid value supplied for --" << token.c_str() << std::endl; + return false; + } } } return true; diff --git a/src/libslic3r/Config.hpp b/src/libslic3r/Config.hpp index c9e4e7536d6..37012226541 100644 --- a/src/libslic3r/Config.hpp +++ b/src/libslic3r/Config.hpp @@ -354,10 +354,12 @@ using ConfigOptionUniquePtr = std::unique_ptr; @@ -367,10 +369,20 @@ using ConfigSubstitutions = std::vector; struct ConfigSubstitutionContext { ConfigSubstitutionContext(ForwardCompatibilitySubstitutionRule rl) : rule(rl) {} - bool empty() const throw() { return substitutions.empty(); } ForwardCompatibilitySubstitutionRule rule; - ConfigSubstitutions substitutions; + + bool empty() const throw() { return m_substitutions.empty(); } + const ConfigSubstitutions &get() const { return m_substitutions; } + ConfigSubstitutions data() && { return std::move(m_substitutions); } + void add(ConfigSubstitution&& substitution) { m_substitutions.push_back(std::move(substitution)); } + void emplace(std::string &&key, std::string &&value) { m_substitutions.emplace_back(std::move(key), std::move(value)); } + void emplace(const ConfigOptionDef* def, std::string &&old_value, ConfigOptionUniquePtr&& new_v) { m_substitutions.emplace_back(def, std::move(old_value), std::move(new_v)); } + void clear() { m_substitutions.clear(); } + void sort_and_remove_duplicates() { sort_remove_duplicates(m_substitutions); } + +private: + ConfigSubstitutions m_substitutions; }; // A generic value of a configuration option. @@ -2364,6 +2376,7 @@ class ConfigBase : public ConfigOptionResolver // Set all the nullable values to nils. void null_nullables(); + static std::map load_gcode_string_legacy(const char* str); static size_t load_from_gcode_string_legacy(ConfigBase& config, const char* str, ConfigSubstitutionContext& substitutions); private: diff --git a/src/libslic3r/Format/3mf.cpp b/src/libslic3r/Format/3mf.cpp index 4bc4335d393..b85b9c818fd 100644 --- a/src/libslic3r/Format/3mf.cpp +++ b/src/libslic3r/Format/3mf.cpp @@ -443,6 +443,7 @@ namespace Slic3r { // Version of the 3mf file unsigned int m_version; bool m_check_version; + bool m_trying_read_prusa = false; // Semantic version of PrusaSlicer, that generated this 3MF. boost::optional m_prusaslicer_generator_version; @@ -504,7 +505,7 @@ namespace Slic3r { void _extract_print_config_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat, DynamicPrintConfig& config, ConfigSubstitutionContext& subs_context, const std::string& archive_filename); bool _extract_model_config_from_archive(mz_zip_archive& archive, const mz_zip_archive_file_stat& stat, Model& model); - + // handlers to parse the .model file void _handle_start_model_xml_element(const char* name, const char** attributes); void _handle_end_model_xml_element(const char* name); @@ -571,7 +572,7 @@ namespace Slic3r { bool _handle_start_config_metadata(const char** attributes, unsigned int num_attributes); bool _handle_end_config_metadata(); - bool _generate_volumes(ModelObject& object, const Geometry& geometry, const ObjectMetadata::VolumeMetadataList& volumes, ConfigSubstitutionContext& config_substitutions, DynamicPrintConfig& config_not_used_remove_plz); + bool _generate_volumes(ModelObject& object, const Geometry& geometry, const ObjectMetadata::VolumeMetadataList& volumes, ConfigSubstitutionContext& config_substitutions, DynamicPrintConfig& global_config); // callbacks to parse the .model file static void XMLCALL _handle_start_model_xml_element(void* userData, const char* name, const char** attributes); @@ -600,6 +601,7 @@ namespace Slic3r { _destroy_xml_parser(); } + bool _3MF_Importer::load_model_from_file(const std::string& filename, Model& model, DynamicPrintConfig& config, ConfigSubstitutionContext& config_substitutions, bool check_version) { m_version = 0; @@ -769,7 +771,9 @@ namespace Slic3r { if (boost::algorithm::iequals(name, PRUSA_LAYER_CONFIG_RANGES_FILE)) { // extract slic3r layer config ranges file from a bad named file - _extract_layer_config_ranges_from_archive(archive, stat, config_substitutions); + m_trying_read_prusa = true; + _extract_layer_config_ranges_from_archive(archive, stat, config_substitutions); + m_trying_read_prusa = false; break; } } @@ -779,30 +783,24 @@ namespace Slic3r { //parsed superslicer/prusa files if slic3r not found //note that is we successfully read one of the config file, then the other ones should also have the same name auto read_from_other_storage = [this, &print_config_parsed, num_entries, &archive, &stat, &config, &model, &filename, &config_substitutions] - (const std::string &print_config_name, const std::string& model_config_name, const std::string& layer_config_name, bool from_prusa) -> bool { - for (mz_uint i = 0; i < num_entries; ++i) - { - if (mz_zip_reader_file_stat(&archive, i, &stat)) - { + (const std::string &print_config_name, const std::string& model_config_name, const std::string& layer_config_name) -> bool { + for (mz_uint i = 0; i < num_entries; ++i) { + if (mz_zip_reader_file_stat(&archive, i, &stat)) { std::string name(stat.m_filename); std::replace(name.begin(), name.end(), '\\', '/'); - //TODO use special methods to convert them better? + // TODO use special methods to convert them better? - if (boost::algorithm::iequals(name, layer_config_name)) - { + if (boost::algorithm::iequals(name, layer_config_name)) { // extract slic3r layer config ranges file _extract_layer_config_ranges_from_archive(archive, stat, config_substitutions); - } else if (boost::algorithm::iequals(name, print_config_name)) - { + } else if (boost::algorithm::iequals(name, print_config_name)) { // extract slic3r print config file _extract_print_config_from_archive(archive, stat, config, config_substitutions, filename); print_config_parsed = true; - } else if (boost::algorithm::iequals(name, model_config_name)) - { + } else if (boost::algorithm::iequals(name, model_config_name)) { // extract slic3r model config file - if (!_extract_model_config_from_archive(archive, stat, model)) - { + if (!_extract_model_config_from_archive(archive, stat, model)) { close_zip_reader(&archive); add_error("Archive does not contain a valid model config"); return false; @@ -815,17 +813,19 @@ namespace Slic3r { }; bool use_prusa_config = false; if (!print_config_parsed) { - if (!read_from_other_storage(SUPER_PRINT_CONFIG_FILE, SUPER_MODEL_CONFIG_FILE, SUPER_LAYER_CONFIG_RANGES_FILE, false)) + if (!read_from_other_storage(SUPER_PRINT_CONFIG_FILE, SUPER_MODEL_CONFIG_FILE, SUPER_LAYER_CONFIG_RANGES_FILE)) return false; } if (!print_config_parsed) { - if (!read_from_other_storage(PRUSA_PRINT_CONFIG_FILE, PRUSA_MODEL_CONFIG_FILE, PRUSA_LAYER_CONFIG_RANGES_FILE, true)) + m_trying_read_prusa = true; + if (!read_from_other_storage(PRUSA_PRINT_CONFIG_FILE, PRUSA_MODEL_CONFIG_FILE, PRUSA_LAYER_CONFIG_RANGES_FILE)) return false; if (print_config_parsed) { //succeed to read prusa use_prusa_config = true; config.convert_from_prusa(true); } + m_trying_read_prusa = false; } close_zip_reader(&archive); @@ -917,12 +917,15 @@ namespace Slic3r { // config data has been found, this model was saved using slic3r pe // apply object's name and config data - for (const Metadata& metadata : obj_metadata->second.metadata) { - if (metadata.key == "name") - model_object->name = metadata.value; - else - model_object->config.set_deserialize(metadata.key, metadata.value, config_substitutions); + std::map opt_key_to_value; + for (const Metadata &metadata : obj_metadata->second.metadata) { + if (metadata.key == "name") { + model_object->name = metadata.value; + } else { + opt_key_to_value.emplace(metadata.key, metadata.value); } + } + deserialize_maybe_from_prusa(opt_key_to_value, model_object->config, config, config_substitutions, true, m_trying_read_prusa); // select object's detected volumes volumes_ptr = &obj_metadata->second.volumes; @@ -1062,7 +1065,8 @@ namespace Slic3r { // parsing 3MFs from before PrusaSlicer 2.0.0 (which can have duplicated entries in the INI. // See https://github.com/prusa3d/PrusaSlicer/issues/7155. We'll revert it for now. //config_substitutions.substitutions = config.load_from_ini_string_commented(std::move(buffer), config_substitutions.rule); - ConfigBase::load_from_gcode_string_legacy(config, buffer.data(), config_substitutions); + //ConfigBase::load_from_gcode_string_legacy(config, buffer.data(), config_substitutions); + deserialize_maybe_from_prusa(ConfigBase::load_gcode_string_legacy(buffer.data()), config, config_substitutions, true, m_trying_read_prusa); } } @@ -1167,7 +1171,7 @@ namespace Slic3r { // get Z range information DynamicPrintConfig config; - + std::map opt_key_to_value; for (const auto& option : range_tree) { if (option.first != "option") continue; @@ -1175,14 +1179,16 @@ namespace Slic3r { std::string value = option.second.data(); if (value.empty() && opt_key.find("pattern") != std::string::npos) { add_error("Error while reading '"+ opt_key +"': no value. If you are the one who created this project file, please open an issue and put the ERROR_FILE_TO_SEND_TO_MERILL_PLZZZZ.txt file created next to the executable for debugging."); - ConfigSubstitution config_substitution; - config_substitution.opt_def = config.get_option_def(opt_key); - config_substitution.old_value = "Error while reading '" + opt_key + "': no value. If you are the one who created this project file, please open an issue and put the ERROR_FILE_TO_SEND_TO_MERILL_PLZZZZ.txt file created next to the executable for debugging."; - config_substitution.new_value = ConfigOptionUniquePtr(config_substitution.opt_def->default_value->clone()); - config_substitutions.substitutions.emplace_back(std::move(config_substitution)); - }else - config.set_deserialize(opt_key, value, config_substitutions); + std::string old_value = "Error while reading '" + opt_key + "': no value. If you are the one who created this project file, please open an issue and put the ERROR_FILE_TO_SEND_TO_MERILL_PLZZZZ.txt file created next to the executable for debugging."; + const ConfigOptionDef *opt_def = config.get_option_def(opt_key); + config_substitutions.emplace(opt_def, + std::move(old_value), + ConfigOptionUniquePtr(opt_def->default_value->clone())); + } else { + opt_key_to_value.emplace(opt_key, value); + } } + deserialize_maybe_from_prusa(opt_key_to_value, config, config_substitutions, true, m_trying_read_prusa); config_ranges[{ min_z, max_z }].assign_config(std::move(config)); } @@ -2084,7 +2090,7 @@ namespace Slic3r { return true; } - bool _3MF_Importer::_generate_volumes(ModelObject& object, const Geometry& geometry, const ObjectMetadata::VolumeMetadataList& volumes, ConfigSubstitutionContext& config_substitutions, DynamicPrintConfig& config_not_used_remove_plz) + bool _3MF_Importer::_generate_volumes(ModelObject& object, const Geometry& geometry, const ObjectMetadata::VolumeMetadataList& volumes, ConfigSubstitutionContext& config_substitutions, DynamicPrintConfig& global_config) { if (!object.volumes.empty()) { add_error("Found invalid volumes count"); @@ -2189,6 +2195,7 @@ namespace Slic3r { volume->mmu_segmentation_facets.shrink_to_fit(); // apply the remaining volume's metadata + std::map opt_key_to_value; for (const Metadata& metadata : volume_data.metadata) { if (metadata.key == NAME_KEY) volume->name = metadata.value; @@ -2212,17 +2219,21 @@ namespace Slic3r { volume->source.is_converted_from_inches = metadata.value == "1"; else if (metadata.key == SOURCE_IN_METERS) volume->source.is_converted_from_meters = metadata.value == "1"; + else if (metadata.key == MATRIX_KEY) + ;//already parsed else if (metadata.value.empty() && metadata.key.find("pattern") != std::string::npos) { - add_error("Error while reading '" + metadata.key + "': no value. If you are the one who created this project file, please open an issue and put the ERROR_FILE_TO_SEND_TO_MERILL_PLZZZZ.txt file created next to the executable for debugging."); - ConfigSubstitution config_substitution; - config_substitution.opt_def = config_not_used_remove_plz.get_option_def(metadata.key); - config_substitution.old_value = "Error while reading '" + metadata.key + "': no value. If you are the one who created this project file, please open an issue and put the ERROR_FILE_TO_SEND_TO_MERILL_PLZZZZ.txt file created next to the executable for debugging."; - config_substitution.new_value = ConfigOptionUniquePtr(config_substitution.opt_def->default_value->clone()); - config_substitutions.substitutions.emplace_back(std::move(config_substitution)); - } else - volume->config.set_deserialize(metadata.key, metadata.value, config_substitutions); + add_error("Error while reading '"+ metadata.key +"': no value. If you are the one who created this project file, please open an issue and put the ERROR_FILE_TO_SEND_TO_MERILL_PLZZZZ.txt file created next to the executable for debugging."); + std::string old_value = "Error while reading '" + metadata.key + "': no value. If you are the one who created this project file, please open an issue and put the ERROR_FILE_TO_SEND_TO_MERILL_PLZZZZ.txt file created next to the executable for debugging."; + const ConfigOptionDef *opt_def = global_config.get_option_def(metadata.key); + config_substitutions.emplace(opt_def, + std::move(old_value), + ConfigOptionUniquePtr(opt_def->default_value->clone())); + } else { + opt_key_to_value.emplace(metadata.key, metadata.value); + } } + deserialize_maybe_from_prusa(opt_key_to_value, volume->config, global_config, config_substitutions, true, m_trying_read_prusa); // this may happen for 3mf saved by 3rd part softwares if (volume->name.empty()) { diff --git a/src/libslic3r/Format/AMF.cpp b/src/libslic3r/Format/AMF.cpp index 35d1ff478b9..910cba4bbe4 100644 --- a/src/libslic3r/Format/AMF.cpp +++ b/src/libslic3r/Format/AMF.cpp @@ -734,8 +734,8 @@ void AMFParserContext::endElement(const char * /* name */) ConfigBase::load_from_gcode_string_legacy(*m_config, std::move(m_value[1].c_str()), *m_config_substitutions); } else if (strncmp(m_value[0].c_str(), "slic3r.", 7) == 0) { - const char *opt_key = m_value[0].c_str() + 7; - if (print_config_def.options.find(opt_key) != print_config_def.options.end()) { + const char *key = m_value[0].c_str() + 7; + if (print_config_def.options.find(key) != print_config_def.options.end()) { ModelConfig *config = nullptr; if (m_path.size() == 3) { if (m_path[1] == NODE_TYPE_MATERIAL && m_material) @@ -749,9 +749,19 @@ void AMFParserContext::endElement(const char * /* name */) auto it = --m_object->layer_config_ranges.end(); config = &it->second; } - if (config) - config->set_deserialize(opt_key, m_value[1], *m_config_substitutions); - } else if (m_path.size() == 3 && m_path[1] == NODE_TYPE_OBJECT && m_object && strcmp(opt_key, "layer_height_profile") == 0) { + if (config) { + std::string opt_key = key; + std::string value = m_value[1]; + PrintConfigDef::handle_legacy(opt_key, value, true); + if (opt_key.empty()) { + if (m_config_substitutions->rule != ForwardCompatibilitySubstitutionRule::Disable) { + m_config_substitutions->emplace(std::string(key), std::move(value)); + } + } else { + config->set_deserialize(opt_key, value, *m_config_substitutions); + } + } + } else if (m_path.size() == 3 && m_path[1] == NODE_TYPE_OBJECT && m_object && strcmp(key, "layer_height_profile") == 0) { // Parse object's layer height profile, a semicolon separated list of floats. char *p = m_value[1].data(); std::vector data; @@ -766,7 +776,7 @@ void AMFParserContext::endElement(const char * /* name */) } m_object->layer_height_profile.set(std::move(data)); } - else if (m_path.size() == 3 && m_path[1] == NODE_TYPE_OBJECT && m_object && strcmp(opt_key, "sla_support_points") == 0) { + else if (m_path.size() == 3 && m_path[1] == NODE_TYPE_OBJECT && m_object && strcmp(key, "sla_support_points") == 0) { // Parse object's layer height profile, a semicolon separated list of floats. unsigned char coord_idx = 0; Eigen::Matrix point(Eigen::Matrix::Zero()); @@ -788,7 +798,7 @@ void AMFParserContext::endElement(const char * /* name */) m_object->sla_points_status = sla::PointsStatus::UserModified; } else if (m_path.size() == 5 && m_path[1] == NODE_TYPE_OBJECT && m_path[3] == NODE_TYPE_RANGE && - m_object && strcmp(opt_key, "layer_height_range") == 0) { + m_object && strcmp(key, "layer_height_range") == 0) { // Parse object's layer_height_range, a semicolon separated doubles. char* p = m_value[1].data(); char* end = strchr(p, ';'); @@ -798,38 +808,38 @@ void AMFParserContext::endElement(const char * /* name */) m_object->layer_config_ranges[range]; } else if (m_path.size() == 5 && m_path[3] == NODE_TYPE_VOLUME && m_volume) { - if (strcmp(opt_key, "modifier") == 0) { + if (strcmp(key, "modifier") == 0) { // Is this volume a modifier volume? // "modifier" flag comes first in the XML file, so it may be later overwritten by the "type" flag. m_volume->set_type((atoi(m_value[1].c_str()) == 1) ? ModelVolumeType::PARAMETER_MODIFIER : ModelVolumeType::MODEL_PART); - } else if (strcmp(opt_key, "volume_type") == 0) { + } else if (strcmp(key, "volume_type") == 0) { m_volume->set_type(ModelVolume::type_from_string(m_value[1])); } - else if (strcmp(opt_key, "matrix") == 0) { + else if (strcmp(key, "matrix") == 0) { m_volume_transform = Slic3r::Geometry::transform3d_from_string(m_value[1]); } - else if (strcmp(opt_key, "source_file") == 0) { + else if (strcmp(key, "source_file") == 0) { m_volume->source.input_file = m_value[1]; } - else if (strcmp(opt_key, "source_object_id") == 0) { + else if (strcmp(key, "source_object_id") == 0) { m_volume->source.object_idx = ::atoi(m_value[1].c_str()); } - else if (strcmp(opt_key, "source_volume_id") == 0) { + else if (strcmp(key, "source_volume_id") == 0) { m_volume->source.volume_idx = ::atoi(m_value[1].c_str()); } - else if (strcmp(opt_key, "source_offset_x") == 0) { + else if (strcmp(key, "source_offset_x") == 0) { m_volume->source.mesh_offset(0) = ::atof(m_value[1].c_str()); } - else if (strcmp(opt_key, "source_offset_y") == 0) { + else if (strcmp(key, "source_offset_y") == 0) { m_volume->source.mesh_offset(1) = ::atof(m_value[1].c_str()); } - else if (strcmp(opt_key, "source_offset_z") == 0) { + else if (strcmp(key, "source_offset_z") == 0) { m_volume->source.mesh_offset(2) = ::atof(m_value[1].c_str()); } - else if (strcmp(opt_key, "source_in_inches") == 0) { + else if (strcmp(key, "source_in_inches") == 0) { m_volume->source.is_converted_from_inches = m_value[1] == "1"; } - else if (strcmp(opt_key, "source_in_meters") == 0) { + else if (strcmp(key, "source_in_meters") == 0) { m_volume->source.is_converted_from_meters = m_value[1] == "1"; } } diff --git a/src/libslic3r/Format/BBConfig.cpp b/src/libslic3r/Format/BBConfig.cpp index 9944b185f3a..f635ee6c0ff 100644 --- a/src/libslic3r/Format/BBConfig.cpp +++ b/src/libslic3r/Format/BBConfig.cpp @@ -44,6 +44,17 @@ namespace BBConfiguration { std::map key_translation_map; std::map> value_translation_map; +std::vector> custom_gcode_replace; // vector, as i want to keep the ordering +enum BBSettingType: uint8_t{ + bbstFFF_PRINT = 0<<0, + bbstFFF_FILAMENT = 0<<1, + bbstFFF_PRINTER = 0<<2, + bbstSLA_PRINT = 0<<3, + bbstSLA_MATERIAL = 0<<4, + bbstSLA_PRINTER = 0<<5, + +}; +std::map key_custom_settings_translation_map; // std::map&, std::map>&, const std::string&, const std::string&)>> transform_complicated; std::map&, std::map>&, const @@ -52,11 +63,30 @@ bool is_init = false; void init() { - //list from https://github.com/theophile/SuperSlicer_to_Orca_scripts/blob/main/superslicer_to_orca.pl + key_translation_map["version"] = ""; + key_translation_map["from"] = ""; + key_translation_map["name"] = ""; + + //list (partially) from https://github.com/theophile/SuperSlicer_to_Orca_scripts/blob/main/superslicer_to_orca.pl + key_translation_map["extra_perimeters_on_overhangs"] = "extra_perimeters_overhangs"; + key_translation_map["internal_solid_infill_pattern"] = "solid_fill_pattern"; + key_translation_map["overhang_speed_classic"] = "overhangs_speed"; + key_translation_map["preferred_orientation"] = "init_z_rotate"; + key_translation_map["solid_infill_filament"] = "solid_infill_extruder"; + key_translation_map["support_filament"] = "support_material_extruder"; + key_translation_map["support_interface_filament"] = "support_material_interface_extruder"; + key_translation_map["sparse_infill_filament"] = "infill_extruder"; + key_translation_map["wall_filament"] = "perimeter_extruder"; + key_translation_map["first_layer_filament"] = "first_layer_extruder"; + key_translation_map["spiral_mode"] = "spiral_vase"; + // print + key_translation_map["alternate_extra_wall"] = "extra_perimeters_odd_layers"; + key_translation_map["is_infill_first"] = "infill_first"; key_translation_map["enable_arc_fitting"] = "arc_fitting"; key_translation_map["bottom_shell_layers"] = "bottom_solid_layers"; key_translation_map["bottom_shell_thickness"] = "bottom_solid_min_thickness"; + key_translation_map["bottom_solid_infill_flow_ratio"] = "first_layer_flow_ratio "; //key_translation_map["bridge_acceleration"] = "bridge_acceleration"; //key_translation_map["bridge_angle"] = "bridge_angle"; key_translation_map["bridge_density"] = "bridge_overlap_min"; @@ -74,7 +104,8 @@ void init() key_translation_map["detect_overhang_wall"] = "overhangs"; // will go to handle_legacy key_translation_map["detect_thin_wall"] = "thin_walls"; //key_translation_map["draft_shield"] = "draft_shield"; - //key_translation_map["elefant_foot_compensation"] // will go to handle_legacy = "first_layer_size_compensation"; + key_translation_map["elefant_foot_compensation"] = "elefant_foot_compensation"; // will go to handle_legacy + key_translation_map["elefant_foot_compensation_layers"] = "first_layer_size_compensation_layers"; key_translation_map["enable_overhang_speed"] = "enable_dynamic_overhang_speeds"; //2.7 //key_translation_map["extra_perimeters_on_overhangs"] = "extra_perimeters_on_overhangs"; key_translation_map["enable_prime_tower"] = "wipe_tower"; @@ -153,7 +184,7 @@ void init() key_translation_map["support_line_width"] = "support_material_extrusion_width"; key_translation_map["support_on_build_plate_only"] = "support_material_buildplate_only"; key_translation_map["support_threshold_angle"] = "support_material_threshold"; - //key_translation_map["thick_bridges"] = "thick_bridges"; //handled by from_prusa + key_translation_map["thick_bridges"] = "thick_bridges"; //handled by from_prusa key_translation_map["top_shell_layers"] = "top_solid_layers"; key_translation_map["top_shell_thickness"] = "top_solid_min_thickness"; key_translation_map["top_surface_acceleration"] = "top_solid_infill_acceleration"; @@ -195,9 +226,9 @@ void init() key_translation_map["bottom_solid_infill_flow_ratio"] = "initial_layer_flow_ratio"; key_translation_map["infill_combination"] = "infill_every_layers"; key_translation_map["print_sequence"] = "complete_objects"; - //key_translation_map["brim_type"] = "brim_type"; //handled by from_prusa + key_translation_map["brim_type"] = "brim_type"; //handled by from_prusa //key_translation_map["notes"] = "notes"; - //key_translation_map["support_material_style"] = "support_material_style"; + key_translation_map["support_style"] = "support_material_style"; //key_translation_map["ironing"] = "ironing"; //key_translation_map["ironing_type"] = "ironing_type"; //key_translation_map["ironing_angle"] = "ironing_angle"; @@ -283,6 +314,7 @@ void init() //key_translation_map["default_filament_profile"] = "default_filament_profile"; //key_translation_map["default_print_profile"] = "default_print_profile"; key_translation_map["deretraction_speed"] = "deretract_speed"; + key_translation_map["emit_machine_limits_to_gcode"] = "machine_limits_usage"; //key_translation_map["gcode_flavor"] = "gcode_flavor"; //key_translation_map["inherits"] = "inherits"; key_translation_map["layer_change_gcode"] = "layer_gcode"; @@ -418,12 +450,36 @@ void init() value_translation_map["support_material_style"]["normal"] = "grid"; value_translation_map["support_material_style"]["default"] = "grid"; value_translation_map["support_material_style"]["tree"] = "snug"; // organic in 2.7 + value_translation_map["support_material_style"]["tree_slim"] = "snug"; // organic in 2.7 + value_translation_map["support_material_style"]["tree_strong"] = "snug"; // organic in 2.7 + value_translation_map["support_material_style"]["tree_hybrid"] = "snug"; // organic in 2.7 value_translation_map["support_material_style"]["organic"] = "snug"; // organic in 2.7 value_translation_map["retract_lift_top"]["Bottom Only"] = "Not on top"; value_translation_map["retract_lift_top"]["Top Only"] = "Only on top"; value_translation_map["thumbnails_format"]["BTT_TFT"] = "BIQU"; value_translation_map["complete_objects"]["by layer"] = "0"; value_translation_map["complete_objects"]["by object"] = "1"; + value_translation_map["machine_limits_usage"]["0"] = "time_estimate_only"; + value_translation_map["machine_limits_usage"]["1"] = "emit_to_gcode"; + + + +/// GCODE + custom_gcode_replace.emplace_back("[bed_temperature_initial_layer_single]", "{first_layer_bed_temperature[initial_extruder]}"); + custom_gcode_replace.emplace_back("bed_temperature_initial_layer_single", "first_layer_bed_temperature[initial_extruder]"); + custom_gcode_replace.emplace_back("initial_extruder_id", "initial_extruder"); + custom_gcode_replace.emplace_back("bbl_bed_temperature_gcode", "false"); + custom_gcode_replace.emplace_back("bed_temperature_initial_layer", "first_layer_bed_temperature"); + custom_gcode_replace.emplace_back("bed_temperature_initial_layer_vector", "\"\""); + custom_gcode_replace.emplace_back("[temperature_initial_layer]", "{first_layer_temperature[initial_extruder]}"); + custom_gcode_replace.emplace_back("temperature_initial_layer", "first_layer_temperature[initial_extruder]"); + //custom_gcode_replace.emplace_back("overall_chamber_temperature", "chamber_temperature"); //fixme: it's a max. + + //if plate_name, then add plate_name as custom setting + key_custom_settings_translation_map["print_custom_variables"] = BBSettingType(bbstFFF_PRINT | bbstSLA_PRINT); + key_custom_settings_translation_map["filament_custom_variables"] = BBSettingType(bbstFFF_FILAMENT | bbstSLA_MATERIAL); + key_custom_settings_translation_map["printer_custom_variables"] = BBSettingType(bbstFFF_PRINTER | bbstSLA_PRINTER); + key_custom_settings_translation_map["plate_name"] = BBSettingType(bbstFFF_PRINT | bbstSLA_PRINT); } void complicated_convert(t_config_option_key &opt_key, std::string &value, const std::map &input, std::map &output) @@ -434,11 +490,109 @@ void complicated_convert(t_config_option_key &opt_key, std::string &value, const output["ironing"] = "0"; assert(input.find("ironing") == input.end() || input.find("ironing")->second == "0"); } + if ("brim_type" == opt_key && "brim_ears" == value) { + opt_key = "brim_ears"; + value = "1"; + } + if ("disable_m73" == opt_key) { + output["remaining_times_type"] = "m73"; + opt_key = "remaining_times"; + if ("1" == value) { + value = "0"; + } else { + value = "1"; + } + } + if ("enable_overhang_speed") { + + } } //settings from orca that I can't convert // ironing_pattern +bool push_into_custom_variable(DynamicPrintConfig &print_config, + const std::string & opt_key, + const std::string & opt_value) +{ + if (auto it = key_custom_settings_translation_map.find(opt_key); it != key_custom_settings_translation_map.end()) { + if ((it->second & bbstFFF_PRINT) != 0 || (it->second & bbstSLA_PRINT) != 0) { + if (print_config.opt("print_custom_variables") == nullptr) + print_config.set_deserialize("print_custom_variables", ""); + std::string &value = print_config.opt("print_custom_variables")->value; + if (value.find(opt_key) == std::string::npos) + value += opt_key + std::string("=") + opt_value + std::string("\n"); + } + if ((it->second & bbstFFF_FILAMENT) != 0 || (it->second & bbstSLA_MATERIAL) != 0) { + if (print_config.opt("filament_custom_variables") == nullptr) + print_config.set_deserialize("filament_custom_variables", ""); + const std::string &val = print_config.opt("filament_custom_variables")->get_at(0); + if (val.find(opt_key) == std::string::npos) + print_config.opt("filament_custom_variables") + ->set_at(val + opt_key + std::string("=") + opt_value + std::string("\n"), 0); + } + if ((it->second & bbstFFF_PRINTER) != 0 || (it->second & bbstSLA_PRINTER) != 0) { + if (print_config.opt("printer_custom_variables") == nullptr) + print_config.set_deserialize("printer_custom_variables", ""); + std::string &value = print_config.opt("printer_custom_variables")->value; + if (value.find(opt_key) == std::string::npos) + value += opt_key + std::string("=") + opt_value + std::string("\n"); + } + return true; + } + return false; +} + +bool push_into_custom_variables(DynamicPrintConfig & print_config, + const std::string & opt_key, + const std::vector &opt_value) +{ + if (auto it = key_custom_settings_translation_map.find(opt_key); it != key_custom_settings_translation_map.end()) { + if ((it->second & bbstFFF_FILAMENT) != 0 || (it->second & bbstSLA_MATERIAL) != 0) { + for (int i = 0; i < opt_value.size(); ++i) { + if (print_config.opt("filament_custom_variables") == nullptr) + print_config.set_deserialize("filament_custom_variables", ""); + const std::string &val = print_config.opt("filament_custom_variables")->get_at(i); + if (val.find(opt_key) == std::string::npos) + print_config.opt("filament_custom_variables") + ->set_at(val + opt_key + std::string("=") + opt_value[i] + std::string("\n"), i); + } + return true; + } + } + return false; +} + +//TODO: ensure it's inside '{' '[' script section, reliably +void custom_gcode_transform(DynamicPrintConfig &print_config) +{ + for (std::string opt_key : {"template_custom_gcode", "toolchange_gcode", "before_layer_gcode", + "between_objects_gcode", "end_gcode", "layer_gcode", "feature_gcode", "start_gcode", + "color_change_gcode", "pause_print_gcode", "toolchange_gcode"}) { + auto opt = print_config.opt(opt_key); + if (opt != nullptr) { + std::string &custom_gcode = opt->value; + // check & replace setting name + for (auto &entry : key_translation_map) { boost::replace_all(custom_gcode, entry.first, entry.second); } + // check & replace special things + for (auto &entry : custom_gcode_replace) { boost::replace_all(custom_gcode, entry.first, entry.second); } + } + } + for (std::string opt_key : {"end_filament_gcode", "start_filament_gcode"}) { + auto opt = print_config.opt(opt_key); + if (opt != nullptr) + for (std::string &custom_gcode : opt->values) { + // check & replace setting name + for (auto &entry : key_translation_map) { + boost::replace_all(custom_gcode, entry.first, entry.second); + } + // check & replace special things + for (auto &entry : custom_gcode_replace) { + boost::replace_all(custom_gcode, entry.first, entry.second); + } + } + } +} } // BBconfiguration @@ -536,9 +690,13 @@ bool read_json_file_bambu(const std_path &temp_file, for (auto &entry : key_values) { t_config_option_key opt_key = entry.first; std::string value = entry.second; + + if (push_into_custom_variable(config, opt_key, value)) + continue; + if (auto it = key_translation_map.find(opt_key); it != key_translation_map.end()) opt_key = it->second; - PrintConfigDef::handle_legacy(opt_key, value); + PrintConfigDef::handle_legacy(opt_key, value, false); complicated_convert(opt_key, value, key_values, good_key_values); @@ -548,18 +706,24 @@ bool read_json_file_bambu(const std_path &temp_file, if (!opt_key.empty()) good_key_values[opt_key] = value; + //else + // config_substitutions.substitutions.push_back(ConfigSubstitution{ nullptr, entry.first+std::string(" : ")+value, nullptr}); } for (auto &entry : key_vector_values) { t_config_option_key key = entry.first; std::vector values = entry.second; + if (push_into_custom_variables(config, key, values)) + continue; if (auto it = key_translation_map.find(key); it != key_translation_map.end()) key = it->second; std::string check_val = values[0]; - PrintConfigDef::handle_legacy(key, values[0]); + PrintConfigDef::handle_legacy(key, values[0], false); assert(check_val == values[0]); // can't change a vec value, sadly. if (!key.empty()) good_key_vector_values[key] = values; + //else + // config_substitutions.substitutions.push_back(ConfigSubstitution{ nullptr, entry.first+std::string(" : ")+(values.empty()?"":values.front()), nullptr}); } // check how to serialize the array (string use ';', others ',') @@ -608,16 +772,27 @@ bool read_json_file_bambu(const std_path &temp_file, } if (valid) good_key_values[opt_key] = value_str; + else if(optdef) + config_substitutions.add(ConfigSubstitution( optdef, value_str, ConfigOptionUniquePtr(optdef->default_value->clone()) )); + else + config_substitutions.add(ConfigSubstitution(entry.first, value_str)); + } // push these into config + for (auto &entry : good_key_values) { - config.set_deserialize(entry.first, entry.second, config_substitutions); + if(config_def->has(entry.first)) + config.set_deserialize(entry.first, entry.second, config_substitutions); + else + config_substitutions.add(ConfigSubstitution(entry.first, entry.second)); } // final transform config.convert_from_prusa(with_phony); + custom_gcode_transform(config); + return true; } @@ -650,9 +825,13 @@ bool convert_settings_from_bambu(std::map bambu_settin for (auto &entry : bambu_settings_serialized) { t_config_option_key opt_key = entry.first; std::string value = entry.second; + + if (push_into_custom_variable(print_config, opt_key, value)) + continue; + if (auto it = key_translation_map.find(opt_key); it != key_translation_map.end()) opt_key = it->second; - PrintConfigDef::handle_legacy(opt_key, value); + PrintConfigDef::handle_legacy(opt_key, value, false); complicated_convert(opt_key, value, bambu_settings_serialized, good_key_values); @@ -666,12 +845,18 @@ bool convert_settings_from_bambu(std::map bambu_settin // push these into config + const ConfigDef *config_def = print_config.def(); for (auto &entry : good_key_values) { - print_config.set_deserialize(entry.first, entry.second, config_substitutions); + if(config_def->has(entry.first)) + print_config.set_deserialize(entry.first, entry.second, config_substitutions); + else + config_substitutions.add(ConfigSubstitution(entry.first, entry.second)); } // final transform print_config.convert_from_prusa(with_phony); + custom_gcode_transform(print_config); + return true; } @@ -692,7 +877,7 @@ bool convert_settings_from_bambu(std::map bambu_settin std::string value = entry.second; if (auto it = key_translation_map.find(opt_key); it != key_translation_map.end()) opt_key = it->second; - PrintConfigDef::handle_legacy(opt_key, value); + PrintConfigDef::handle_legacy(opt_key, value, false); complicated_convert(opt_key, value, bambu_settings_serialized, good_key_values); @@ -706,8 +891,12 @@ bool convert_settings_from_bambu(std::map bambu_settin // push these into config + const ConfigDef *config_def = object_config.get().def(); for (auto &entry : good_key_values) { - object_config.set_deserialize(entry.first, entry.second, config_substitutions); + if(config_def->has(entry.first)) + object_config.set_deserialize(entry.first, entry.second, config_substitutions); + else + config_substitutions.add(ConfigSubstitution(entry.first, entry.second)); } // final transform diff --git a/src/libslic3r/Format/bbs_3mf.cpp b/src/libslic3r/Format/bbs_3mf.cpp index d12342bfa0a..f1570b7a40e 100644 --- a/src/libslic3r/Format/bbs_3mf.cpp +++ b/src/libslic3r/Format/bbs_3mf.cpp @@ -1409,6 +1409,25 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result) is_bbl_3mf = m_is_bbl_3mf; if (m_bambuslicer_generator_version) file_version = *m_bambuslicer_generator_version; + if (result && plate_data_list.size() > 0) { + if(config.opt("gcode_label_objects") == nullptr) + config.set_key_value("gcode_label_objects", config.get_option_def("gcode_label_objects")->default_value->clone()); + bool has_label_objests = config.opt("gcode_label_objects")->value; + for (PlateData *plate : plate_data_list) + has_label_objests = has_label_objests || plate->is_label_object_enabled; + config.opt("gcode_label_objects")->value = has_label_objests; + std::string print_vars = config.opt("print_custom_variables") == nullptr ? "" : config.opt("print_custom_variables")->value; + if (print_vars.find("plate_name") == std::string::npos && plate_data_list.front()) { + std::string plate_name = ""; + for (PlateData *plate : plate_data_list) + plate_name += plate_name.empty() ? plate->plate_name : std::string(" ; ") + plate->plate_name; + boost::replace_all(plate_name, "\"", "'"); + if (!print_vars.empty() && print_vars.back() != '\n') + print_vars += std::string("\n"); + print_vars += std::string("plate_name=\"") + plate_name + std::string("\"\n"); + config.set_key_value("print_custom_variables", new ConfigOptionString(print_vars)); + } + } // save for restore //if (result && m_load_aux && !m_load_restore) { // save_string_file(model.get_backup_path() + "/origin.txt", filename); diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp index c304a9797d1..521e687e704 100644 --- a/src/libslic3r/GCode/GCodeProcessor.cpp +++ b/src/libslic3r/GCode/GCodeProcessor.cpp @@ -1592,7 +1592,7 @@ ConfigSubstitutions load_from_superslicer_gcode_file(const std::string& filename if (key_value_pairs < 80) throw Slic3r::RuntimeError(format("Suspiciously low number of configuration values extracted from %1%: %2%", filename, key_value_pairs)); - return std::move(substitutions_ctxt.substitutions); + return std::move(substitutions_ctxt).data(); } void GCodeProcessor::apply_config_superslicer(const std::string& filename) diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp index a98b48beb8d..721bbe60ab5 100644 --- a/src/libslic3r/Model.cpp +++ b/src/libslic3r/Model.cpp @@ -167,7 +167,7 @@ Model Model::read_from_file(const std::string& input_file, DynamicPrintConfig* c CustomGCode::update_custom_gcode_per_print_z_from_config(model.custom_gcode_per_print_z, config); CustomGCode::check_mode_for_custom_gcode_per_print_z(model.custom_gcode_per_print_z); - sort_remove_duplicates(config_substitutions->substitutions); + config_substitutions->sort_and_remove_duplicates(); return model; } diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index 50d5573fdd1..98adfb2e1d8 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -1321,7 +1321,7 @@ std::pair PresetBundle::load_configbundle( std::vector renamed_from; try { auto parse_config_section = [§ion, &alias_name, &renamed_from, &substitution_context, &path, &flags](DynamicPrintConfig &config) { - substitution_context.substitutions.clear(); + substitution_context.clear(); for (auto &kvp : section.second) { if (kvp.first == "alias") alias_name = kvp.second.data(); @@ -1332,7 +1332,13 @@ std::pair PresetBundle::load_configbundle( } } // Throws on parsing error. For system presets, no substituion is being done, but an exception is thrown. - config.set_deserialize(kvp.first, kvp.second.data(), substitution_context); + std::string opt_key = kvp.first; + std::string value = kvp.second.data(); + PrintConfigDef::handle_legacy(opt_key, value, true); + // don't throw for an unknown key, just ignore it + if (!opt_key.empty()) { + config.set_deserialize(opt_key, value, substitution_context); + } } if (flags.has(LoadConfigBundleAttribute::ConvertFromPrusa)) config.convert_from_prusa(true); @@ -1446,9 +1452,8 @@ std::pair PresetBundle::load_configbundle( loaded.alias = std::move(alias_name); loaded.renamed_from = std::move(renamed_from); if (! substitution_context.empty()) - substitutions.push_back({ - preset_name, presets->type(), PresetConfigSubstitutions::Source::ConfigBundle, - std::string(), std::move(substitution_context.substitutions) }); + substitutions.push_back({preset_name, presets->type(), PresetConfigSubstitutions::Source::ConfigBundle, + std::string(), std::move(substitution_context).data()}); ++ presets_loaded; } @@ -1457,10 +1462,20 @@ std::pair PresetBundle::load_configbundle( const DynamicPrintConfig& default_config = ph_printers->default_config(); DynamicPrintConfig config = default_config; - substitution_context.substitutions.clear(); + substitution_context.clear(); try { - for (auto& kvp : section.second) - config.set_deserialize(kvp.first, kvp.second.data(), substitution_context); + for (auto& kvp : section.second) { + std::string opt_key = kvp.first; + std::string value = kvp.second.data(); + PrintConfigDef::handle_legacy(opt_key, value, true); + if (opt_key.empty()) { + if (substitution_context.rule != ForwardCompatibilitySubstitutionRule::Disable) { + substitution_context.add(ConfigSubstitution(kvp.first, value)); + } + } else { + config.set_deserialize(opt_key, value, substitution_context); + } + } } catch (const ConfigurationError &e) { throw ConfigurationError(format("Invalid configuration bundle \"%1%\", section [%2%]: ", path, section.first) + e.what()); } @@ -1491,9 +1506,9 @@ std::pair PresetBundle::load_configbundle( // Load the preset into the list of presets, save it to disk. ph_printers->load_printer(file_path.string(), ph_printer_name, std::move(config), false, flags.has(LoadConfigBundleAttribute::SaveImported)); if (! substitution_context.empty()) - substitutions.push_back({ - ph_printer_name, Preset::TYPE_PHYSICAL_PRINTER, PresetConfigSubstitutions::Source::ConfigBundle, - std::string(), std::move(substitution_context.substitutions) }); + substitutions.push_back({ph_printer_name, Preset::TYPE_PHYSICAL_PRINTER, + PresetConfigSubstitutions::Source::ConfigBundle, std::string(), + std::move(substitution_context).data()}); ++ ph_printers_loaded; } } diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 4d471ea0cd7..178ff642e37 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -5772,6 +5772,7 @@ void PrintConfigDef::init_fff_params() def->min = 0; def->mode = comExpert | comSuSi; def->set_default_value(new ConfigOptionFloatOrPercent(100, true)); + def = this->add("threads", coInt); def->label = L("Threads"); def->tooltip = L("Threads are used to parallelize long-running tasks. Optimal threads number " @@ -7461,7 +7462,7 @@ void PrintConfigDef::init_sla_params() def->set_default_value(new ConfigOptionFloat(0.001)); } -void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &value) +void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &value, bool remove_unkown_keys) { // handle legacy options (other than aliases) if (opt_key == "extrusion_width_ratio" || opt_key == "bottom_layer_speed_ratio" @@ -7672,21 +7673,6 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va opt_key = ""; return; } - - if (! print_config_def.has(opt_key)) { - //check the aliases - for(const auto& entry : print_config_def.options) { - for (const std::string& alias : entry.second.aliases) { - if (alias == opt_key) { - // translate - opt_key = entry.first; - return; - } - } - } - opt_key = ""; - return; - } //in ps 2.4, the raft_first_layer_density is now more powerful than the support_material_solid_first_layer, also it always does the perimeter. if ("support_material_solid_first_layer" == opt_key) { opt_key = "raft_first_layer_density"; @@ -7703,6 +7689,7 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va } else { opt_key = ""; } + return; } //prusa @@ -7710,8 +7697,26 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va if ("reprap" == value) value = "sprinter"; } + + if (!print_config_def.has(opt_key)) { + //check the aliases + for(const auto& entry : print_config_def.options) { + for (const std::string& alias : entry.second.aliases) { + if (alias == opt_key) { + // translate + opt_key = entry.first; + return; + } + } + } + if (remove_unkown_keys) + opt_key = ""; + return; + } } +bool PrintConfigDef::is_defined(t_config_option_key &opt_key) { return print_config_def.has(opt_key); } + // this is for extra things to add / modify from prusa that can't be handled otherwise. // after handle_legacy std::map PrintConfigDef::from_prusa(t_config_option_key& opt_key, std::string& value, const DynamicConfig& all_conf) { @@ -7733,6 +7738,7 @@ std::map PrintConfigDef::from_prusa(t_config_option_key output["first_layer_infill_speed"] = value; } if ("brim_type" == opt_key) { + opt_key = ""; if ("no_brim" == value) { output["brim_width"] = "0"; output["brim_width_interior"] = "0"; @@ -7788,6 +7794,29 @@ std::map PrintConfigDef::from_prusa(t_config_option_key output["thumbnails_tag_format"] = "0"; } + + // ---- custom gcode: ---- + static const std::vector> custom_gcode_replace = + {{"[temperature]", "{temperature+extruder_temperature_offset}"}, + {"{temperature}", "{temperature+extruder_temperature_offset}"}, + {"{temperature[initial_extruder]}", "{temperature[initial_extruder]+extruder_temperature_offset[initial_extruder]}"}, + {"[first_layer_temperature]", "{first_layer_temperature+extruder_temperature_offset}"}, + {"{first_layer_temperature}", "{first_layer_temperature+extruder_temperature_offset}"}, + {"{first_layer_temperature[initial_extruder]}", "{first_layer_temperature[initial_extruder]+extruder_temperature_offset[initial_extruder]}"}}; + + static const std::set custom_gcode_keys = + {"template_custom_gcode", "toolchange_gcode", "before_layer_gcode", + "between_objects_gcode", "end_gcode", "layer_gcode", + "feature_gcode", "start_gcode", "color_change_gcode", + "pause_print_gcode", "toolchange_gcode", "end_filament_gcode", + "start_filament_gcode"}; + if (custom_gcode_keys.find(opt_key) != custom_gcode_keys.end()) { + // check & replace + for (auto &entry : custom_gcode_replace) { + boost::replace_all(value, entry.first, entry.second); + } + } + return output; } @@ -7849,6 +7878,123 @@ void ModelConfig::convert_from_prusa(const DynamicPrintConfig& global_config, bo _convert_from_prusa(*this, global_config, with_phony); } + +template +void _deserialize_maybe_from_prusa(std::map settings, + CONFIG_CLASS & config, + const DynamicPrintConfig & global_config, + ConfigSubstitutionContext & config_substitutions, + bool with_phony, + bool check_prusa) +{ + std::map unknown_keys; + const ConfigDef *def = config.def(); + for (auto [key, value] : settings) { + try { + t_config_option_key opt_key = key; + PrintConfigDef::handle_legacy(opt_key, value, false); + if (!opt_key.empty()) + if (!def->has(opt_key)) { + unknown_keys.emplace(key, value); + } else { + config.set_deserialize(opt_key, value, config_substitutions); + } + } catch (UnknownOptionException & /* e */) { + // log & ignore + if (config_substitutions.rule != ForwardCompatibilitySubstitutionRule::Disable) + config_substitutions.add(ConfigSubstitution(key, value)); + assert(false); + } catch (BadOptionValueException &e) { + if (config_substitutions.rule == ForwardCompatibilitySubstitutionRule::Disable) + throw e; + // log the error + const ConfigDef *def = config.def(); + if (def == nullptr) + throw e; + const ConfigOptionDef *optdef = def->get(key); + config_substitutions.emplace(optdef,std::string(value), ConfigOptionUniquePtr(optdef->default_value->clone())); + } + } + // from prusa: try again with from_prusa before handle_legacy + if (check_prusa) { + std::map settings_to_change; + for (auto [key, value] : unknown_keys) { + t_config_option_key opt_key = key; + std::map result = PrintConfigDef::from_prusa(opt_key, value, global_config); + settings_to_change.insert(result.begin(), result.end()); + if (!opt_key.empty()) + //check if good this time + PrintConfigDef::handle_legacy(opt_key, value, false); + if (!opt_key.empty()) { + if (!def->has(opt_key)) { + if (config_substitutions.rule != ForwardCompatibilitySubstitutionRule::Disable) { + config_substitutions.add(ConfigSubstitution(key, value)); + } + } else { + try { + config.set_deserialize(opt_key, value, config_substitutions); + } catch (BadOptionValueException &e) { + if (config_substitutions.rule == ForwardCompatibilitySubstitutionRule::Disable) + throw e; + // log the error + if (def == nullptr) + throw e; + const ConfigOptionDef *optdef = def->get(key); + config_substitutions.emplace(optdef, std::string(value), ConfigOptionUniquePtr(optdef->default_value->clone())); + } + } + } + } + for (auto entry : settings_to_change) + config.set_deserialize(entry.first, entry.second, config_substitutions); + } else { + for (auto [key, value] : unknown_keys) { + if (config_substitutions.rule != ForwardCompatibilitySubstitutionRule::Disable) { + config_substitutions.add(ConfigSubstitution(key, value)); + } + } + } + + // set phony entries + if (with_phony) { + const ConfigDef *def = config.def(); + for (auto &[opt_key_width, opt_key_spacing] : + {std::pair{"extrusion_width", "extrusion_spacing"}, + std::pair{"perimeter_extrusion_width", "perimeter_extrusion_spacing"}, + std::pair{"external_perimeter_extrusion_width", "external_perimeter_extrusion_spacing"}, + std::pair{"first_layer_extrusion_width", "first_layer_extrusion_spacing"}, + std::pair{"infill_extrusion_width", "infill_extrusion_spacing"}, + std::pair{"solid_infill_extrusion_width", "solid_infill_extrusion_spacing"}, + std::pair{"top_infill_extrusion_width", "top_infill_extrusion_spacing"}}) { + // if prusa has defined a width, or if the config has a default spacing that need to be overwritten + if (config.option(opt_key_width) != nullptr || config.option(opt_key_spacing) != nullptr) { + ConfigOption *opt_new = def->get(opt_key_spacing)->default_value.get()->clone(); + opt_new->deserialize(""); // note: deserialize don't set phony, only the ConfigBase::set_deserialize* + opt_new->set_phony(true); + config.set_key_value(opt_key_spacing, opt_new); + } + } + } +} +void deserialize_maybe_from_prusa(std::map settings, + ModelConfig & config, + const DynamicPrintConfig & global_config, + ConfigSubstitutionContext & config_substitutions, + bool with_phony, + bool check_prusa) +{ + _deserialize_maybe_from_prusa(settings, config, global_config, config_substitutions, with_phony, check_prusa); +} +void deserialize_maybe_from_prusa(std::map settings, + DynamicPrintConfig & config, + ConfigSubstitutionContext & config_substitutions, + bool with_phony, + bool check_prusa) +{ + _deserialize_maybe_from_prusa(settings, config, config, config_substitutions, with_phony, check_prusa); +} + + std::unordered_set prusa_export_to_remove_keys = { "allow_empty_layers", "arc_fitting", @@ -8231,6 +8377,24 @@ std::map PrintConfigDef::to_prusa(t_config_option_key& new_entries["fan_always_on"] = "1"; } } + + // ---- custom gcode: ---- + static const std::vector> custom_gcode_replace = + {{"extruder_temperature_offset[initial_extruder]", "0"}, {"extruder_temperature_offset", "0"}}; + static const std::set custom_gcode_keys = + {"template_custom_gcode", "toolchange_gcode", "before_layer_gcode", + "between_objects_gcode", "end_gcode", "layer_gcode", + "feature_gcode", "start_gcode", "color_change_gcode", + "pause_print_gcode", "toolchange_gcode", "end_filament_gcode", + "start_filament_gcode"}; + if (custom_gcode_keys.find(opt_key) != custom_gcode_keys.end()) { + // check & replace + for (auto &entry : custom_gcode_replace) { + boost::replace_all(value, entry.first, entry.second); + } + } + // --end-- custom gcode: --end-- + return new_entries; } diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 54694ab48d3..5fe902cc900 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -309,8 +309,9 @@ class PrintConfigDef : public ConfigDef { public: PrintConfigDef(); - - static void handle_legacy(t_config_option_key& opt_key, std::string& value); + + static void handle_legacy(t_config_option_key& opt_key, std::string& value, bool remove_unkown_keys = true); + static bool is_defined(t_config_option_key& opt_key); static std::map to_prusa(t_config_option_key& opt_key, std::string& value, const DynamicConfig& all_conf); static std::map from_prusa(t_config_option_key& opt_key, std::string& value, const DynamicConfig& all_conf); @@ -1650,6 +1651,7 @@ class ModelConfig auto cend() const { return m_data.cend(); } t_config_option_keys keys() const { return m_data.keys(); } bool has(const t_config_option_key& opt_key) const { return m_data.has(opt_key); } + const ConfigDef* def() const { return m_data.def(); } bool operator==(const ModelConfig& other) const { return m_data.equals(other.m_data); } bool operator!=(const ModelConfig& other) const { return !this->operator==(other); } const ConfigOption* option(const t_config_option_key &opt_key) const { return m_data.option(opt_key); } @@ -1685,6 +1687,19 @@ class ModelConfig +void deserialize_maybe_from_prusa(std::map settings, + ModelConfig & config, + const DynamicPrintConfig & global_config, + ConfigSubstitutionContext & config_substitutions, + bool with_phony, + bool check_prusa); +void deserialize_maybe_from_prusa(std::map settings, + DynamicPrintConfig & config, + ConfigSubstitutionContext & config_substitutions, + bool with_phony, + bool check_prusa); + + } // namespace Slic3r // Serialization through the Cereal library diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp index 54bf516ad05..7988625f1e7 100644 --- a/src/slic3r/GUI/GUI.cpp +++ b/src/slic3r/GUI/GUI.cpp @@ -3,6 +3,7 @@ #include "format.hpp" #include "I18N.hpp" +#include "libslic3r/AppConfig.hpp" #include "libslic3r/LocalesUtils.hpp" #include @@ -150,11 +151,16 @@ static wxString bold_string(const wxString& str) static void add_config_substitutions(const ConfigSubstitutions& conf_substitutions, wxString& changes) { changes += ""; + size_t nb_entries_changes = 0; + size_t nb_entries_unknown = 0; for (const ConfigSubstitution& conf_substitution : conf_substitutions) { wxString new_val; const ConfigOptionDef* def = conf_substitution.opt_def; - if (!def) - continue; + if (!def) { + nb_entries_unknown++; + continue; + } + nb_entries_changes++; switch (def->type) { case coEnum: { @@ -208,7 +214,25 @@ static void add_config_substitutions(const ConfigSubstitutions& conf_substitutio format_wxstr(_L("%1% was substituted with %2%"), bold_string(conf_substitution.old_value), bold(new_val)) + ""; } - changes += "
"; + assert(nb_entries_changes + nb_entries_unknown > 0); + if(nb_entries_changes > 0) + changes += ""; + if (get_app_config()->get("show_unknown_setting") == "1") { + if (nb_entries_unknown > 0) { + changes += format_wxstr(_L("The following key-values are ignored, as the key doesn't have any substitution in this " + "version of %1%:"), SLIC3R_APP_NAME); + changes += ""; + } + for (const ConfigSubstitution &conf_substitution : conf_substitutions) { + if (!conf_substitution.opt_def) { + changes += format_wxstr("", + format_wxstr(_L("Unknow setting: %1%"), conf_substitution.old_name), + format_wxstr(_L("value: %1%"), bold_string(conf_substitution.old_value))); + } + } + if (nb_entries_unknown > 0) + changes += "
%1%(%2%)
"; + } } static wxString substitution_message(const wxString& changes) @@ -219,9 +243,43 @@ static wxString substitution_message(const wxString& changes) _L("Review the substitutions and adjust them if needed."); } -void show_substitutions_info(const PresetsConfigSubstitutions& presets_config_substitutions) +size_t check_count(const PresetsConfigSubstitutions &presets_config_substitutions) { + size_t nb_entries_changes = 0; + size_t nb_entries_unknown = 0; + for (const PresetConfigSubstitutions &substitution : presets_config_substitutions) { + for (const ConfigSubstitution &conf_substitution : substitution.substitutions) { + if (conf_substitution.opt_def) + nb_entries_changes++; + else + nb_entries_unknown++; + } + } + if (get_app_config()->get("show_unknown_setting") != "1") + nb_entries_unknown = 0; + return nb_entries_changes + nb_entries_unknown; +} + +size_t check_count(const ConfigSubstitutions &substitutions) { + size_t nb_entries_changes = 0; + size_t nb_entries_unknown = 0; + for (const ConfigSubstitution &conf_substitution : substitutions) { + if (conf_substitution.opt_def) + nb_entries_changes++; + else + nb_entries_unknown++; + } + if (get_app_config()->get("show_unknown_setting") != "1") + nb_entries_unknown = 0; + return nb_entries_changes + nb_entries_unknown; +} + +void show_substitutions_info(const PresetsConfigSubstitutions &presets_config_substitutions) { - wxString changes; + wxString changes; + + // check count + if (check_count(presets_config_substitutions) == 0) + return; auto preset_type_name = [](Preset::Type type) { switch (type) { @@ -249,6 +307,10 @@ void show_substitutions_info(const PresetsConfigSubstitutions& presets_config_su void show_substitutions_info(const ConfigSubstitutions& config_substitutions, const std::string& filename) { + // check count + if (check_count(config_substitutions) == 0) + return; + wxString changes = "\n"; add_config_substitutions(config_substitutions, changes); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 5c460abfd71..12a0ca2fa0a 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -2518,7 +2518,7 @@ std::vector Plater::priv::load_files(const std::vector& input_ config += std::move(config_loaded); } if (! config_substitutions.empty()) - show_substitutions_info(config_substitutions.substitutions, filename.string()); + show_substitutions_info(config_substitutions.get(), filename.string()); this->model.custom_gcode_per_print_z = model.custom_gcode_per_print_z; } diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index 6da31dc9110..f0bc224a466 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -317,6 +317,13 @@ void PreferencesDialog::build(size_t selected_tab) option = Option(def, "check_material_export"); m_optgroups_general.back()->append_single_option_line(option); + def.label = L("Show ignored settings when loading a project or configuration"); + def.type = coBool; + def.tooltip = L("When loading a configuration, if it's coming from an earlier, a future or from another software, show the ignored settings that deosn't suit this version. Uncheck to remove this anoying pop-up."); + def.set_default_value(new ConfigOptionBool{ app_config->has("show_unknown_setting") ? app_config->get("show_unknown_setting") == "1" : false }); + option = Option(def, "show_unknown_setting"); + m_optgroups_general.back()->append_single_option_line(option); + activate_options_tab(m_optgroups_general.back(), 3); m_optgroups_general.emplace_back(create_options_group(_L("Dialogs"), tabs, 0)); From 981b77e41788003f343fc5a684474046eaea8e85 Mon Sep 17 00:00:00 2001 From: supermerill Date: Tue, 30 Jan 2024 16:36:15 +0100 Subject: [PATCH 20/28] Maybe fix BIQU / BTT_TFT thumbnail --- src/libslic3r/GCode.cpp | 20 ++++++++++++++++---- src/libslic3r/GCode/Thumbnails.hpp | 7 ++++--- src/slic3r/GUI/Tab.cpp | 5 +++++ 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index c6c32102793..648a9791b71 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -1391,6 +1391,20 @@ void GCode::_do_export(Print& print_mod, GCodeOutputStream &file, ThumbnailsGene std::string preamble_to_put_start_layer = ""; + + // if thumbnail type of BTT_TFT, insert above header + // if not, it is inserted under the header in its normal spot + const ConfigOptionEnum* thumbnails_format = print.full_print_config().option>("thumbnails_format"); + const ConfigOptionBool* thumbnails_with_bed = print.full_print_config().option("thumbnails_with_bed"); + if (thumbnails_format != nullptr && thumbnails_format->value == GCodeThumbnailsFormat::BIQU) + GCodeThumbnails::export_thumbnails_to_file(thumbnail_cb, + print.full_print_config().option("thumbnails")->values, + thumbnails_with_bed ? thumbnails_with_bed->value : false, + thumbnails_format->value, + true, + [&file](const char *sz) { file.write(sz); }, + [&print]() { print.throw_if_canceled(); }); + // Write information on the generator. file.write_format("; %s\n\n", Slic3r::header_slic3r_generated().c_str()); @@ -1398,9 +1412,7 @@ void GCode::_do_export(Print& print_mod, GCodeOutputStream &file, ThumbnailsGene //print thumbnails at the start unless requested at the end. const ConfigOptionBool* thumbnails_end_file = print.full_print_config().option("thumbnails_end_file"); if(!thumbnails_end_file || !thumbnails_end_file->value) { - const ConfigOptionBool* thumbnails_with_bed = print.full_print_config().option("thumbnails_with_bed"); const ConfigOptionBool* thumbnails_tag_with_format = print.full_print_config().option("thumbnails_tag_format"); - const ConfigOptionEnum* thumbnails_format = print.full_print_config().option>("thumbnails_format"); // Unit tests or command line slicing may not define "thumbnails" or "thumbnails_format". // If "thumbnails_format" is not defined, export to PNG. GCodeThumbnails::export_thumbnails_to_file(thumbnail_cb, @@ -2092,8 +2104,8 @@ void GCode::_do_export(Print& print_mod, GCodeOutputStream &file, ThumbnailsGene } print.throw_if_canceled(); - //print thumbnails at the end instead of the start if requested - if (thumbnails_end_file && thumbnails_end_file->value) { + //print thumbnails at the end instead of the start if requested (unless BTT / biqu thumbnail) + if (thumbnails_end_file && thumbnails_end_file->value && (thumbnails_format == nullptr || thumbnails_format->value != GCodeThumbnailsFormat::BIQU)) { const ConfigOptionBool* thumbnails_with_bed = print.full_print_config().option("thumbnails_with_bed"); const ConfigOptionBool* thumbnails_tag_with_format = print.full_print_config().option("thumbnails_tag_format"); const ConfigOptionEnum* thumbnails_format = print.full_print_config().option>("thumbnails_format"); diff --git a/src/libslic3r/GCode/Thumbnails.hpp b/src/libslic3r/GCode/Thumbnails.hpp index 2b04415c9eb..da539ed8ac9 100644 --- a/src/libslic3r/GCode/Thumbnails.hpp +++ b/src/libslic3r/GCode/Thumbnails.hpp @@ -51,9 +51,10 @@ inline void export_thumbnails_to_file(ThumbnailsGeneratorCallback &thumbnail_cb, auto compressed = compress_thumbnail(data, format); if (compressed->data && compressed->size) { if (format == GCodeThumbnailsFormat::BIQU) { - output((boost::format("\n;\n; %s begin %dx%d %d\n") - % (with_tag_format ? compressed->tag() : EMPTY_TAG) - % data.width % data.height % (compressed->size - 1)).str().c_str()); + // BIQU firmware need to have nothing before the thumbnail + //output((boost::format("\n;\n; %s begin %dx%d %d\n") + // % (with_tag_format ? compressed->tag() : EMPTY_TAG) + // % data.width % data.height % (compressed->size - 1)).str().c_str()); //print size in hex std::stringstream ss; ss << std::setfill('0') << std::hex; diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index ebe79ddeca3..8ad4bf3b307 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -3500,6 +3500,11 @@ void TabPrinter::toggle_options() bool custom_color = m_config->opt_bool("thumbnails_custom_color"); field = get_field("thumbnails_color"); if (field) field->toggle(custom_color); + const ConfigOptionEnum* thumbnails_format = m_config->option>("thumbnails_format"); + field = get_field("thumbnails_end_file"); + if (thumbnails_format && field) field->toggle(thumbnails_format->value != (GCodeThumbnailsFormat::BIQU)); + field = get_field("thumbnails_tag_format"); + if (thumbnails_format && field) field->toggle(thumbnails_format->value != (GCodeThumbnailsFormat::BIQU)); //firmware bool have_remaining_times = m_config->opt_bool("remaining_times"); From 96cad10df73f87be337f2c45f79aecb31c598730 Mon Sep 17 00:00:00 2001 From: supermerill Date: Wed, 31 Jan 2024 15:44:15 +0100 Subject: [PATCH 21/28] Fix retraction calibration solid fill areas supermerill/SuperSlicer#4097 --- src/libslic3r/Extruder.cpp | 2 +- src/slic3r/GUI/CalibrationRetractionDialog.cpp | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/libslic3r/Extruder.cpp b/src/libslic3r/Extruder.cpp index ca156d5b8f5..e12a5cd0b36 100644 --- a/src/libslic3r/Extruder.cpp +++ b/src/libslic3r/Extruder.cpp @@ -53,7 +53,7 @@ double Tool::extrude(double dE) double Tool::retract(double length, std::optional restart_extra, std::optional restart_extra_toolchange) { assert(length < std::numeric_limits::max()); - assert(length > 0); + //assert(length > 0); // it's possible, as you may want to "reset the extruder but do not use restart_extra yet. assert(!restart_extra || *restart_extra < std::numeric_limits::max()); assert(!restart_extra || *restart_extra > -std::numeric_limits::max()); assert(!restart_extra_toolchange || *restart_extra_toolchange < std::numeric_limits::max()); diff --git a/src/slic3r/GUI/CalibrationRetractionDialog.cpp b/src/slic3r/GUI/CalibrationRetractionDialog.cpp index 3f9dd45eae4..edd3b598b37 100644 --- a/src/slic3r/GUI/CalibrationRetractionDialog.cpp +++ b/src/slic3r/GUI/CalibrationRetractionDialog.cpp @@ -177,11 +177,13 @@ void CalibrationRetractionDialog::create_geometry(wxCommandEvent& event_args) { //add sub-part after scale float zscale_number = (first_layer_height + layer_height) / 0.4; std::vector < std::vector> part_tower; + std::vector filament_temp_item_name; for (size_t id_item = 0; id_item < nb_items; id_item++) { part_tower.emplace_back(); int mytemp = temp - temp_decr * id_item; if (mytemp <= 285 && mytemp >= 180 && mytemp % 5 == 0) { - add_part(model.objects[objs_idx[id_item]], (boost::filesystem::path(Slic3r::resources_dir()) / "calibration" / "filament_temp" / ("t" + std::to_string(mytemp) + ".amf")).string(), + filament_temp_item_name.push_back("t" + std::to_string(mytemp) + ".amf"); + add_part(model.objects[objs_idx[id_item]], (boost::filesystem::path(Slic3r::resources_dir()) / "calibration" / "filament_temp" / filament_temp_item_name.back()).string(), Vec3d{ 0,0, scale * 0.0 - 4.8 }, Vec3d{ scale,scale,scale }); model.objects[objs_idx[id_item]]->volumes[1]->rotate(PI / 2, Vec3d(0, 0, 1)); model.objects[objs_idx[id_item]]->volumes[1]->rotate(-PI / 2, Vec3d(1, 0, 0)); @@ -209,6 +211,8 @@ void CalibrationRetractionDialog::create_geometry(wxCommandEvent& event_args) { /// --- custom config --- + assert(filament_temp_item_name.size() == nb_items); + assert(model.objects.size() == nb_items); for (size_t i = 0; i < nb_items; i++) { //speed double perimeter_speed = full_print_config.get_computed_value("perimeter_speed"); @@ -218,8 +222,9 @@ void CalibrationRetractionDialog::create_geometry(wxCommandEvent& event_args) { model.objects[objs_idx[i]]->config.set_key_value("perimeters", new ConfigOptionInt(2)); model.objects[objs_idx[i]]->config.set_key_value("external_perimeters_first", new ConfigOptionBool(false)); model.objects[objs_idx[i]]->config.set_key_value("bottom_solid_layers", new ConfigOptionInt(0)); - model.objects[objs_idx[i]]->volumes[0]->config.set_key_value("bottom_solid_layers", new ConfigOptionInt(2)); - //model.objects[objs_idx[i]]->volumes[1]->config.set_key_value("bottom_solid_layers", new ConfigOptionInt(2)); + for(auto& volume : model.objects[objs_idx[i]]->volumes) + if( volume->name == filament_temp_item_name[i] || volume->name.empty()) // if temperature patch or the main retraction patch (empty name because it's the initial volume) + volume->config.set_key_value("bottom_solid_layers", new ConfigOptionInt(2)); model.objects[objs_idx[i]]->config.set_key_value("top_solid_layers", new ConfigOptionInt(0)); model.objects[objs_idx[i]]->config.set_key_value("fill_density", new ConfigOptionPercent(0)); //model.objects[objs_idx[i]]->config.set_key_value("fill_pattern", new ConfigOptionEnum(ipRectilinear)); From a9355385701a6e8c7a58f79f64b62ffb3460e6b6 Mon Sep 17 00:00:00 2001 From: supermerill Date: Wed, 31 Jan 2024 20:04:43 +0100 Subject: [PATCH 22/28] Calibrations : now accept preferred orientation (init_z_rotate) supermerill/SuperSlicer#4099 --- src/libslic3r/Model.hpp | 1 + src/slic3r/GUI/CalibrationAbstractDialog.cpp | 6 +- src/slic3r/GUI/CalibrationAbstractDialog.hpp | 2 +- src/slic3r/GUI/CalibrationBridgeDialog.cpp | 15 ++++- src/slic3r/GUI/CalibrationFlowDialog.cpp | 15 ++++- .../GUI/CalibrationOverBridgeDialog.cpp | 15 ++++- .../GUI/CalibrationRetractionDialog.cpp | 62 ++++++++++--------- src/slic3r/GUI/CalibrationTempDialog.cpp | 14 ++--- 8 files changed, 84 insertions(+), 46 deletions(-) diff --git a/src/libslic3r/Model.hpp b/src/libslic3r/Model.hpp index 144272b8e36..493ae950a7c 100644 --- a/src/libslic3r/Model.hpp +++ b/src/libslic3r/Model.hpp @@ -353,6 +353,7 @@ class ModelObject final : public ObjectBase /// It operates on the total size by duplicating the object according to all the instances. /// \param size Sizef3 the size vector void scale_to_fit(const Vec3d &size); + /// Rotate the model along its internal position (does not take its position into account) void rotate(double angle, Axis axis); void rotate(double angle, const Vec3d& axis); void mirror(Axis axis); diff --git a/src/slic3r/GUI/CalibrationAbstractDialog.cpp b/src/slic3r/GUI/CalibrationAbstractDialog.cpp index 385d5e0cfbb..f3eaebbb664 100644 --- a/src/slic3r/GUI/CalibrationAbstractDialog.cpp +++ b/src/slic3r/GUI/CalibrationAbstractDialog.cpp @@ -5,6 +5,7 @@ #include "GUI.hpp" #include "GUI_ObjectList.hpp" #include "Tab.hpp" +#include "Plater.hpp" #include #include @@ -101,7 +102,7 @@ void CalibrationAbstractDialog::close_me(wxCommandEvent& event_args) { this->Destroy(); } -ModelObject* CalibrationAbstractDialog::add_part(ModelObject* model_object, std::string input_file, Vec3d move, Vec3d scale) { +void CalibrationAbstractDialog::add_part(ModelObject* model_object, std::string input_file, Vec3d move, Vec3d scale, bool rotate) { Model model; try { model = Model::read_from_file(input_file); @@ -124,6 +125,8 @@ ModelObject* CalibrationAbstractDialog::add_part(ModelObject* model_object, std: if (scale != Vec3d{ 1,1,1 }) { volume->scale(scale); } + if(rotate) + volume->rotate(Geometry::deg2rad(this->main_frame->plater()->config()->opt_float("init_z_rotate")), Axis::Z); ModelVolume* new_volume = model_object->add_volume(*volume); new_volume->set_type(ModelVolumeType::MODEL_PART); new_volume->name = boost::filesystem::path(input_file).filename().string(); @@ -145,7 +148,6 @@ ModelObject* CalibrationAbstractDialog::add_part(ModelObject* model_object, std: } } assert(model.objects.size() == 1); - return model.objects.empty()?nullptr: model.objects[0]; } void CalibrationAbstractDialog::on_dpi_changed(const wxRect& suggested_rect) diff --git a/src/slic3r/GUI/CalibrationAbstractDialog.hpp b/src/slic3r/GUI/CalibrationAbstractDialog.hpp index 1cb50c4257b..a54fa6d72b3 100644 --- a/src/slic3r/GUI/CalibrationAbstractDialog.hpp +++ b/src/slic3r/GUI/CalibrationAbstractDialog.hpp @@ -29,7 +29,7 @@ class CalibrationAbstractDialog : public DPIDialog virtual void create_buttons(wxStdDialogButtonSizer*) = 0; void on_dpi_changed(const wxRect& suggested_rect) override; void close_me(wxCommandEvent& event_args); - ModelObject* add_part(ModelObject* model_object, std::string input_file, Vec3d move, Vec3d scale = Vec3d{ 1,1,1 }); + void add_part(ModelObject* model_object, std::string input_file, Vec3d move, Vec3d scale = Vec3d{ 1,1,1 }, bool rotate = true); wxHtmlWindow* html_viewer; MainFrame* main_frame; diff --git a/src/slic3r/GUI/CalibrationBridgeDialog.cpp b/src/slic3r/GUI/CalibrationBridgeDialog.cpp index 0d703d42915..30a98d55a08 100644 --- a/src/slic3r/GUI/CalibrationBridgeDialog.cpp +++ b/src/slic3r/GUI/CalibrationBridgeDialog.cpp @@ -101,6 +101,16 @@ void CalibrationBridgeDialog::create_geometry(std::string setting_to_test, bool } else { z_scale = 1; } + + // it's rotated but not around the good origin: correct that + double init_z_rotate_angle = Geometry::deg2rad(plat->config()->opt_float("init_z_rotate")); + Matrix3d rot_matrix = Eigen::Quaterniond(Eigen::AngleAxisd(init_z_rotate_angle, Vec3d{0,0,1})).toRotationMatrix(); + auto translate_from_rotation = [&rot_matrix, &model, &objs_idx](int idx, Vec3d &&translation) { + ModelVolume *vol = model.objects[objs_idx[idx]]->volumes[model.objects[objs_idx[idx]]->volumes.size()-1]; + Geometry::Transformation trsf = vol->get_transformation(); + trsf.set_offset(rot_matrix * translation - translation + trsf.get_offset()); + vol->set_transformation(trsf); + }; //add sub-part after scale const ConfigOptionPercent* bridge_flow_ratio = print_config->option(setting_to_test); @@ -109,11 +119,12 @@ void CalibrationBridgeDialog::create_geometry(std::string setting_to_test, bool for (size_t i = 0; i < nb_items; i++) { int step_num = (start + (add ? 1 : -1) * i * step); if (step_num < 180 && step_num > 20 && step_num%5 == 0) { - add_part(model.objects[objs_idx[i]], (boost::filesystem::path(Slic3r::resources_dir()) / "calibration" / "bridge_flow" / ("f" + std::to_string(step_num) + ".amf")).string(), Vec3d{ -10,0, zshift + 4.6 * z_scale }, Vec3d{ 1,1,z_scale }); + add_part(model.objects[objs_idx[i]], (boost::filesystem::path(Slic3r::resources_dir()) / "calibration" / "bridge_flow" / ("f" + std::to_string(step_num) + ".amf")).string(), Vec3d{ -10, 0, zshift + 4.6 * z_scale }, Vec3d{ 1,1,z_scale }); + translate_from_rotation(i, Vec3d{ -10, 0, zshift + 4.6 * z_scale }); } } /// --- translate ---; - bool has_to_arrange = false; + bool has_to_arrange = init_z_rotate_angle != 0; const float brim_width = std::max(print_config->option("brim_width")->value, nozzle_diameter * 5.); const ConfigOptionFloat* extruder_clearance_radius = print_config->option("extruder_clearance_radius"); const ConfigOptionPoints* bed_shape = printer_config->option("bed_shape"); diff --git a/src/slic3r/GUI/CalibrationFlowDialog.cpp b/src/slic3r/GUI/CalibrationFlowDialog.cpp index d697aad6f20..f128b9923d4 100644 --- a/src/slic3r/GUI/CalibrationFlowDialog.cpp +++ b/src/slic3r/GUI/CalibrationFlowDialog.cpp @@ -92,6 +92,17 @@ void CalibrationFlowDialog::create_geometry(float start, float delta) { The 0.3 constant is the same as the delta calculated in add_part below, this should probably be calculated per the model object */ float zshift = -(zscale / 2) + ((first_layer_height + layer_height) / 2) + 0.3; + + // it's rotated but not around the good origin: correct that + double init_z_rotate_angle = Geometry::deg2rad(plat->config()->opt_float("init_z_rotate")); + Matrix3d rot_matrix = Eigen::Quaterniond(Eigen::AngleAxisd(init_z_rotate_angle, Vec3d{0,0,1})).toRotationMatrix(); + auto translate_from_rotation = [&rot_matrix, &model, &objs_idx](int idx, Vec3d &&translation) { + ModelVolume *vol = model.objects[objs_idx[idx]]->volumes[model.objects[objs_idx[idx]]->volumes.size()-1]; + Geometry::Transformation trsf = vol->get_transformation(); + trsf.set_offset(rot_matrix * translation - translation + trsf.get_offset()); + vol->set_transformation(trsf); + }; + if (delta == 10.f && start == 80.f) { add_part(model.objects[objs_idx[0]], (boost::filesystem::path(Slic3r::resources_dir()) / "calibration" / "filament_flow" / "m20.amf").string(), Vec3d{ 10 * xyScale,0,zshift }, Vec3d{ xyScale , xyScale, zscale_number}); add_part(model.objects[objs_idx[1]], (boost::filesystem::path(Slic3r::resources_dir()) / "calibration" / "filament_flow" / "m10.amf").string(), Vec3d{ 10 * xyScale,0,zshift }, Vec3d{ xyScale , xyScale, zscale_number }); @@ -106,11 +117,13 @@ void CalibrationFlowDialog::create_geometry(float start, float delta) { add_part(model.objects[objs_idx[4]], (boost::filesystem::path(Slic3r::resources_dir()) / "calibration" / "filament_flow" / "_0.amf").string(), Vec3d{ 10 * xyScale,0,zshift }, Vec3d{ xyScale , xyScale, zscale_number}); } for (size_t i = 0; i < 5; i++) { + translate_from_rotation(i, Vec3d{ 10 * xyScale,0,zshift }); add_part(model.objects[objs_idx[i]], (boost::filesystem::path(Slic3r::resources_dir()) / "calibration" / "filament_flow" / "O.amf").string(), Vec3d{ 0,0,zscale/2.f + 0.5 }, Vec3d{xyScale , xyScale, layer_height / 0.2}); // base: 0.2mm height } + /// --- translate ---; - bool has_to_arrange = false; + bool has_to_arrange = init_z_rotate_angle != 0; const ConfigOptionFloat* extruder_clearance_radius = print_config->option("extruder_clearance_radius"); const ConfigOptionPoints* bed_shape = printerConfig->option("bed_shape"); const double brim_width = nozzle_diameter * 3.5; diff --git a/src/slic3r/GUI/CalibrationOverBridgeDialog.cpp b/src/slic3r/GUI/CalibrationOverBridgeDialog.cpp index 847edbf5e55..4ad8cf4818a 100644 --- a/src/slic3r/GUI/CalibrationOverBridgeDialog.cpp +++ b/src/slic3r/GUI/CalibrationOverBridgeDialog.cpp @@ -79,6 +79,16 @@ void CalibrationOverBridgeDialog::create_geometry(bool over_bridge) { } for (size_t i = 0; i < 6; i++) model.objects[objs_idx[i]]->scale(xyz_scale * 1.5f, xyz_scale * 1.5f, xyz_scale); + + // it's rotated but not around the good origin: correct that + double init_z_rotate_angle = Geometry::deg2rad(plat->config()->opt_float("init_z_rotate")); + Matrix3d rot_matrix = Eigen::Quaterniond(Eigen::AngleAxisd(init_z_rotate_angle, Vec3d{0,0,1})).toRotationMatrix(); + auto translate_from_rotation = [&rot_matrix, &model, &objs_idx](int idx, Vec3d &&translation) { + ModelVolume *vol = model.objects[objs_idx[idx]]->volumes[model.objects[objs_idx[idx]]->volumes.size()-1]; + Geometry::Transformation trsf = vol->get_transformation(); + trsf.set_offset(rot_matrix * translation - translation + trsf.get_offset()); + vol->set_transformation(trsf); + }; //add sub-part after scale const ConfigOptionFloatOrPercent* first_layer_height = print_config->option("first_layer_height"); @@ -86,11 +96,12 @@ void CalibrationOverBridgeDialog::create_geometry(bool over_bridge) { float zshift = 0.8 * (1 - xyz_scale); for (size_t i = 0; i < 6; i++) { model.objects[objs_idx[i]]->rotate(PI / 2, { 0,0,1 }); - ModelObject* obj = add_part(model.objects[objs_idx[i]], (boost::filesystem::path(Slic3r::resources_dir()) /"calibration" / "bridge_flow" / ("f"+std::to_string(100 + i * 5)+".amf")).string(), Vec3d{ 0, 10 * xyz_scale ,zshift }, Vec3d{ 1, 1, patch_zscale }); + add_part(model.objects[objs_idx[i]], (boost::filesystem::path(Slic3r::resources_dir()) /"calibration" / "bridge_flow" / ("f"+std::to_string(100 + i * 5)+".amf")).string(), Vec3d{ 0, 10 * xyz_scale ,zshift }, Vec3d{ 1, 1, patch_zscale }); + translate_from_rotation(i, Vec3d{ 0, 10 * xyz_scale ,zshift }); } /// --- translate ---; - bool has_to_arrange = false; + bool has_to_arrange = init_z_rotate_angle != 0; const ConfigOptionFloat* extruder_clearance_radius = print_config->option("extruder_clearance_radius"); const ConfigOptionPoints* bed_shape = printer_config->option("bed_shape"); const float brim_width = print_config->option("brim_width")->get_float(); diff --git a/src/slic3r/GUI/CalibrationRetractionDialog.cpp b/src/slic3r/GUI/CalibrationRetractionDialog.cpp index edd3b598b37..44ea22a2d20 100644 --- a/src/slic3r/GUI/CalibrationRetractionDialog.cpp +++ b/src/slic3r/GUI/CalibrationRetractionDialog.cpp @@ -176,27 +176,28 @@ void CalibrationRetractionDialog::create_geometry(wxCommandEvent& event_args) { //add sub-part after scale float zscale_number = (first_layer_height + layer_height) / 0.4; - std::vector < std::vector> part_tower; std::vector filament_temp_item_name; for (size_t id_item = 0; id_item < nb_items; id_item++) { - part_tower.emplace_back(); int mytemp = temp - temp_decr * id_item; if (mytemp <= 285 && mytemp >= 180 && mytemp % 5 == 0) { filament_temp_item_name.push_back("t" + std::to_string(mytemp) + ".amf"); + assert(model.objects[objs_idx[id_item]]->volumes.size() == 1); add_part(model.objects[objs_idx[id_item]], (boost::filesystem::path(Slic3r::resources_dir()) / "calibration" / "filament_temp" / filament_temp_item_name.back()).string(), Vec3d{ 0,0, scale * 0.0 - 4.8 }, Vec3d{ scale,scale,scale }); + assert(model.objects[objs_idx[id_item]]->volumes.size() == 2); model.objects[objs_idx[id_item]]->volumes[1]->rotate(PI / 2, Vec3d(0, 0, 1)); model.objects[objs_idx[id_item]]->volumes[1]->rotate(-PI / 2, Vec3d(1, 0, 0)); + //model.objects[objs_idx[id_item]]->volumes[1]->rotate(Geometry::deg2rad(plat->config()->opt_float("init_z_rotate")), Axis::Z); } for (int num_retract = 0; num_retract < nb_retract; num_retract++) { - part_tower.back().push_back(add_part(model.objects[objs_idx[id_item]], + add_part(model.objects[objs_idx[id_item]], (boost::filesystem::path(Slic3r::resources_dir()) / "calibration" / "retraction" / "retraction_calibration_pillar.amf").string(), - Vec3d{ 0,0,scale * 0.7 - 0.3 + scale * num_retract }, Vec3d{ scale,scale,scale })); + Vec3d{ 0,0,scale * 0.7 - 0.3 + scale * num_retract }, Vec3d{ scale,scale,scale }); } } /// --- translate ---; - bool has_to_arrange = false; + bool has_to_arrange = plat->config()->opt_float("init_z_rotate") != 0; const ConfigOptionFloat* extruder_clearance_radius = print_config->option("extruder_clearance_radius"); const ConfigOptionPoints* bed_shape = printer_config->option("bed_shape"); const float brim_width = std::max(print_config->option("brim_width")->value, nozzle_diameter * 5.); @@ -214,41 +215,42 @@ void CalibrationRetractionDialog::create_geometry(wxCommandEvent& event_args) { assert(filament_temp_item_name.size() == nb_items); assert(model.objects.size() == nb_items); for (size_t i = 0; i < nb_items; i++) { + ModelObject *current_obj = model.objects[objs_idx[i]]; //speed double perimeter_speed = full_print_config.get_computed_value("perimeter_speed"); double external_perimeter_speed = full_print_config.get_computed_value("external_perimeter_speed"); //brim to have some time to build up pressure in the nozzle - model.objects[objs_idx[i]]->config.set_key_value("brim_width", new ConfigOptionFloat(0)); - model.objects[objs_idx[i]]->config.set_key_value("perimeters", new ConfigOptionInt(2)); - model.objects[objs_idx[i]]->config.set_key_value("external_perimeters_first", new ConfigOptionBool(false)); - model.objects[objs_idx[i]]->config.set_key_value("bottom_solid_layers", new ConfigOptionInt(0)); - for(auto& volume : model.objects[objs_idx[i]]->volumes) + current_obj->config.set_key_value("brim_width", new ConfigOptionFloat(0)); + current_obj->config.set_key_value("perimeters", new ConfigOptionInt(2)); + current_obj->config.set_key_value("external_perimeters_first", new ConfigOptionBool(false)); + current_obj->config.set_key_value("bottom_solid_layers", new ConfigOptionInt(0)); + for(auto& volume : current_obj->volumes) if( volume->name == filament_temp_item_name[i] || volume->name.empty()) // if temperature patch or the main retraction patch (empty name because it's the initial volume) volume->config.set_key_value("bottom_solid_layers", new ConfigOptionInt(2)); - model.objects[objs_idx[i]]->config.set_key_value("top_solid_layers", new ConfigOptionInt(0)); - model.objects[objs_idx[i]]->config.set_key_value("fill_density", new ConfigOptionPercent(0)); - //model.objects[objs_idx[i]]->config.set_key_value("fill_pattern", new ConfigOptionEnum(ipRectilinear)); - model.objects[objs_idx[i]]->config.set_key_value("only_one_perimeter_top", new ConfigOptionBool(false)); - model.objects[objs_idx[i]]->config.set_key_value("overhangs_width_speed", new ConfigOptionFloatOrPercent(0,false)); - model.objects[objs_idx[i]]->config.set_key_value("thin_walls", new ConfigOptionBool(true)); - model.objects[objs_idx[i]]->config.set_key_value("thin_walls_min_width", new ConfigOptionFloatOrPercent(2,true)); - model.objects[objs_idx[i]]->config.set_key_value("gap_fill_enabled", new ConfigOptionBool(false)); - model.objects[objs_idx[i]]->config.set_key_value("first_layer_height", new ConfigOptionFloatOrPercent(nozzle_diameter / 2., false)); - model.objects[objs_idx[i]]->config.set_key_value("layer_height", new ConfigOptionFloat(nozzle_diameter / 2.)); + current_obj->config.set_key_value("top_solid_layers", new ConfigOptionInt(0)); + current_obj->config.set_key_value("fill_density", new ConfigOptionPercent(0)); + //current_obj->config.set_key_value("fill_pattern", new ConfigOptionEnum(ipRectilinear)); + current_obj->config.set_key_value("only_one_perimeter_top", new ConfigOptionBool(false)); + current_obj->config.set_key_value("overhangs_width_speed", new ConfigOptionFloatOrPercent(0,false)); + current_obj->config.set_key_value("thin_walls", new ConfigOptionBool(true)); + current_obj->config.set_key_value("thin_walls_min_width", new ConfigOptionFloatOrPercent(2,true)); + current_obj->config.set_key_value("gap_fill_enabled", new ConfigOptionBool(false)); + current_obj->config.set_key_value("first_layer_height", new ConfigOptionFloatOrPercent(nozzle_diameter / 2., false)); + current_obj->config.set_key_value("layer_height", new ConfigOptionFloat(nozzle_diameter / 2.)); //temp - model.objects[objs_idx[i]]->config.set_key_value("print_temperature", new ConfigOptionInt(int(temp - temp_decr * i))); + current_obj->config.set_key_value("print_temperature", new ConfigOptionInt(int(temp - temp_decr * i))); //set retraction override - size_t num_part = 0; + const int mytemp = temp - temp_decr * i; const int extra_vol = (mytemp <= 285 && mytemp >= 180 && mytemp % 5 == 0) ? 2 : 1; - for (ModelObject* part : part_tower[i]) { - model.objects[objs_idx[i]]->volumes[num_part + extra_vol]->config.set_key_value("print_retract_length", new ConfigOptionFloat(retraction_start + num_part * retraction_steps)); - model.objects[objs_idx[i]]->volumes[num_part + extra_vol]->config.set_key_value("small_perimeter_speed", new ConfigOptionFloatOrPercent(external_perimeter_speed, false)); - model.objects[objs_idx[i]]->volumes[num_part + extra_vol]->config.set_key_value("perimeter_speed", new ConfigOptionFloatOrPercent(std::min(external_perimeter_speed, perimeter_speed), false)); - model.objects[objs_idx[i]]->volumes[num_part + extra_vol]->config.set_key_value("external_perimeter_speed", new ConfigOptionFloatOrPercent(external_perimeter_speed, false)); - //model.objects[objs_idx[i]]->volumes[num_part + extra_vol]->config.set_key_value("small_perimeter_speed", new ConfigOptionFloatOrPercent(external_perimeter_speed, false)); - //model.objects[objs_idx[i]]->volumes[num_part + extra_vol]->config.set_key_value("infill_speed", new ConfigOptionFloatOrPercent(std::min(print_config->option("infill_speed")->value, 10.*scale)), false); - num_part++; + for (size_t num_part = extra_vol; num_part < current_obj->volumes.size(); num_part++) { + current_obj->volumes[num_part]->config.set_key_value("print_retract_length", new ConfigOptionFloat(retraction_start + num_part * retraction_steps)); + current_obj->volumes[num_part]->config.set_key_value("small_perimeter_speed", new ConfigOptionFloatOrPercent(external_perimeter_speed, false)); + current_obj->volumes[num_part]->config.set_key_value("perimeter_speed", new ConfigOptionFloatOrPercent(std::min(external_perimeter_speed, perimeter_speed), false)); + current_obj->volumes[num_part]->config.set_key_value("external_perimeter_speed", new ConfigOptionFloatOrPercent(external_perimeter_speed, false)); + //current_obj->volumes[num_part + extra_vol]->config.set_key_value("small_perimeter_speed", new ConfigOptionFloatOrPercent(external_perimeter_speed, false)); + //current_obj->volumes[num_part + extra_vol]->config.set_key_value("infill_speed", new ConfigOptionFloatOrPercent(std::min(print_config->option("infill_speed")->value, 10.*scale)), false); + } } diff --git a/src/slic3r/GUI/CalibrationTempDialog.cpp b/src/slic3r/GUI/CalibrationTempDialog.cpp index 4ccb00a5116..7ca7edfaf74 100644 --- a/src/slic3r/GUI/CalibrationTempDialog.cpp +++ b/src/slic3r/GUI/CalibrationTempDialog.cpp @@ -104,21 +104,19 @@ void CalibrationTempDialog::create_geometry(wxCommandEvent& event_args) { } //add 8 others - std::vectortower; - tower.push_back(model.objects[objs_idx[0]]); float zshift = (1 - xyzScale) / 2; if (temperature > 175 && temperature < 290 && temperature%5==0) { - tower.push_back(add_part(model.objects[objs_idx[0]], (boost::filesystem::path(Slic3r::resources_dir()) / "calibration" / "filament_temp" / ("t"+std::to_string(temperature)+".amf")).string(), + add_part(model.objects[objs_idx[0]], (boost::filesystem::path(Slic3r::resources_dir()) / "calibration" / "filament_temp" / ("t"+std::to_string(temperature)+".amf")).string(), //Vec3d{ xyzScale * 5, - xyzScale * 2.5, zshift - xyzScale * 2.5}, Vec3d{ xyzScale, xyzScale, xyzScale * 0.43 })); - Vec3d{ 8 - xyzScale * 5, -xyzScale * 2.3, xyzScale * (0 * 10 - 2.45) }, Vec3d{ xyzScale, xyzScale, xyzScale * 0.43 })); + Vec3d{ 8 - xyzScale * 5, -xyzScale * 2.3, xyzScale * (0 * 10 - 2.45) }, Vec3d{ xyzScale, xyzScale, xyzScale * 0.43 }); } for (int16_t i = 1; i < nb_items; i++) { - tower.push_back(add_part(model.objects[objs_idx[0]], (boost::filesystem::path(Slic3r::resources_dir()) / "calibration" / "filament_temp" / ("Smart_compact_temperature_calibration_item.amf")).string(), - Vec3d{ 0,0, i * 10 * xyzScale }, Vec3d{ xyzScale, xyzScale * 0.5, xyzScale })); + add_part(model.objects[objs_idx[0]], (boost::filesystem::path(Slic3r::resources_dir()) / "calibration" / "filament_temp" / ("Smart_compact_temperature_calibration_item.amf")).string(), + Vec3d{ 0,0, i * 10 * xyzScale }, Vec3d{ xyzScale, xyzScale * 0.5, xyzScale }); int sub_temp = temperature - i * step_temp; if (sub_temp > 175 && sub_temp < 290 && sub_temp % 5 == 0) { - tower.push_back(add_part(model.objects[objs_idx[0]], (boost::filesystem::path(Slic3r::resources_dir()) / "calibration" / "filament_temp" / ("t" + std::to_string(sub_temp) + ".amf")).string(), - Vec3d{ 8 - xyzScale * 5, -xyzScale * 2.3, xyzScale * (i * 10 - 2.5) }, Vec3d{ xyzScale, xyzScale, xyzScale * 0.43 })); + add_part(model.objects[objs_idx[0]], (boost::filesystem::path(Slic3r::resources_dir()) / "calibration" / "filament_temp" / ("t" + std::to_string(sub_temp) + ".amf")).string(), + Vec3d{ 8 - xyzScale * 5, -xyzScale * 2.3, xyzScale * (i * 10 - 2.5) }, Vec3d{ xyzScale, xyzScale, xyzScale * 0.43 }); } } From 845c7da4ed67dbf52026d0fcd9f483cd2dbf70e8 Mon Sep 17 00:00:00 2001 From: supermerill Date: Wed, 31 Jan 2024 17:00:08 +0100 Subject: [PATCH 23/28] Double slider anti-miss-clicks adjustments: . Push the (+) color change button as far away as possible . Add a little dead zone between the bottom and the lock icon. . Also fix a crash that can happen when a color change is done and the computer is a bit slow. supermerill/SuperSlicer#4075 --- src/slic3r/GUI/DoubleSlider.cpp | 89 ++++++++++++++++++++++++--------- src/slic3r/GUI/DoubleSlider.hpp | 1 + src/slic3r/GUI/GCodeViewer.cpp | 9 ++-- 3 files changed, 71 insertions(+), 28 deletions(-) diff --git a/src/slic3r/GUI/DoubleSlider.cpp b/src/slic3r/GUI/DoubleSlider.cpp index 87d29b3c201..b45070e5cd7 100644 --- a/src/slic3r/GUI/DoubleSlider.cpp +++ b/src/slic3r/GUI/DoubleSlider.cpp @@ -108,6 +108,8 @@ Control::Control( wxWindow *parent, m_bmp_cog = ScalableBitmap(this, "cog"); m_cog_icon_dim = m_bmp_cog.GetBmpWidth(); + m_dead_zone_height = m_lock_icon_dim / 2; + m_selection = ssUndef; m_ticks.set_pause_print_msg(_utf8(L("Place bearings in slots and resume printing"))); m_ticks.set_extruder_colors(&m_extruder_colors); @@ -176,6 +178,8 @@ void Control::msw_rescale() m_bmp_one_layer_unlock_off.msw_rescale(); m_lock_icon_dim = m_bmp_one_layer_lock_on.bmp().GetSize().x; + m_dead_zone_height = m_lock_icon_dim / 2; + m_bmp_revert.msw_rescale(); m_revert_icon_dim = m_bmp_revert.bmp().GetSize().x; m_bmp_cog.msw_rescale(); @@ -203,6 +207,8 @@ void Control::sys_color_changed() m_bmp_one_layer_unlock_off.msw_rescale(); m_lock_icon_dim = m_bmp_one_layer_lock_on.GetBmpWidth(); + m_dead_zone_height = m_lock_icon_dim / 2; + m_bmp_revert.msw_rescale(); m_revert_icon_dim = m_bmp_revert.GetBmpWidth(); m_bmp_cog.msw_rescale(); @@ -339,7 +345,7 @@ void Control::get_size(int* w, int* h) const GetSize(w, h); if (m_draw_mode == dmSequentialGCodeView) return; // we have no more icons for drawing - is_horizontal() ? *w -= m_lock_icon_dim : *h -= m_lock_icon_dim; + is_horizontal() ? *w -= m_lock_icon_dim + m_dead_zone_height : *h -= m_lock_icon_dim + m_dead_zone_height; } double Control::get_double_value(const SelectedSlider& selection) @@ -621,8 +627,11 @@ void Control::draw_info_line_with_icon(wxDC& dc, const wxPoint& pos, const Selec if (m_selection == selection) { //draw info line dc.SetPen(DARK_COLOR_PEN); - const wxPoint pt_beg = is_horizontal() ? wxPoint(pos.x, pos.y - m_thumb_size.y) : wxPoint(pos.x - m_thumb_size.x, pos.y/* - 1*/); - const wxPoint pt_end = is_horizontal() ? wxPoint(pos.x, pos.y + m_thumb_size.y) : wxPoint(pos.x + m_thumb_size.x, pos.y/* - 1*/); + auto panel_size = this->get_size(); + const wxPoint pt_beg = is_horizontal() ? wxPoint(pos.x, (m_selection == ssLower) ? m_tick_icon_dim * 1.3f : pos.y - m_thumb_size.y) + : wxPoint((m_selection == ssLower) ? m_tick_icon_dim * 1.3f : pos.x - m_thumb_size.x, pos.y/* - 1*/); + const wxPoint pt_end = is_horizontal() ? wxPoint(pos.x, (m_selection == ssLower) ? pos.y + m_thumb_size.y : panel_size.y - m_tick_icon_dim * 1.3f) + : wxPoint((m_selection == ssLower) ? pos.x + m_thumb_size.x : panel_size.x - m_tick_icon_dim * 1.3f, pos.y/* - 1*/); dc.DrawLine(pt_beg, pt_end); //draw action icon @@ -788,7 +797,7 @@ wxString Control::get_label(int tick, LabelType label_type/* = ltHeightWithLayer bool show_lheight = GUI::wxGetApp().app_config->get("show_layer_height_doubleslider") == "1"; bool show_ltime = GUI::wxGetApp().app_config->get("show_layer_time_doubleslider") == "1"; int nb_lines = 2; // to move things down if the slider is on top - wxString comma = "\n("; + wxString comma = "\n"; if (show_lheight) { nb_lines++; double layer_height = 0; @@ -801,7 +810,7 @@ wxString Control::get_label(int tick, LabelType label_type/* = ltHeightWithLayer layer_height = m_values.empty() ? m_label_koef : m_values[layer_number] - (layer_number > 1 ? m_values[layer_number - 1] : 0); } str = str + comma + wxString::Format("%.*f", 2, layer_height); - comma = ",\n"; + comma = "\n"; } if (show_ltime && !m_layers_times.empty()) { if (m_layers_times.size() +1 >= m_values.size()) { @@ -814,7 +823,7 @@ wxString Control::get_label(int tick, LabelType label_type/* = ltHeightWithLayer double previous_time = (layer_idx_time > 0 ? m_layers_times[layer_idx_time - 1] : 0); wxString layer_time_wstr = short_and_splitted_time(get_time_dhms(m_layers_times[layer_idx_time] - previous_time)); str = str + comma + layer_time_wstr; - comma = ",\n"; + comma = "\n"; } } } @@ -823,7 +832,7 @@ wxString Control::get_label(int tick, LabelType label_type/* = ltHeightWithLayer str = "\n" + str; nb_step_down--; } - return format_wxstr("%1%%2%%3%)", str, comma, layer_number); + return format_wxstr("%1%%2%%3%", str, comma, layer_number); } } @@ -912,20 +921,38 @@ void Control::draw_thumbs(wxDC& dc, const wxCoord& lower_pos, const wxCoord& hig const wxPoint pos_l = is_horizontal() ? wxPoint(lower_pos, height*0.5) : wxPoint(0.5*width, lower_pos); const wxPoint pos_h = is_horizontal() ? wxPoint(higher_pos, height*0.5) : wxPoint(0.5*width, higher_pos); - // Draw lower thumb - draw_thumb_item(dc, pos_l, ssLower); - // Draw lower info_line - draw_info_line_with_icon(dc, pos_l, ssLower); - - // Draw higher thumb - draw_thumb_item(dc, pos_h, ssHigher); - // Draw higher info_line - draw_info_line_with_icon(dc, pos_h, ssHigher); - // Draw higher thumb text - draw_thumb_text(dc, pos_h, ssHigher); + if(m_selection != ssLower) { + // Draw lower thumb + draw_thumb_item(dc, pos_l, ssLower); + // Draw lower info_line + draw_info_line_with_icon(dc, pos_l, ssLower); + // Draw lower thumb text + draw_thumb_text(dc, pos_l, ssLower); + } else { + // Draw higher thumb + draw_thumb_item(dc, pos_h, ssHigher); + // Draw higher info_line + draw_info_line_with_icon(dc, pos_h, ssHigher); + // Draw higher thumb text + draw_thumb_text(dc, pos_h, ssHigher); + } + + if(m_selection == ssLower) { + // Draw lower thumb + draw_thumb_item(dc, pos_l, ssLower); + // Draw lower info_line + draw_info_line_with_icon(dc, pos_l, ssLower); + // Draw lower thumb text + draw_thumb_text(dc, pos_l, ssLower); + } else { + // Draw higher thumb + draw_thumb_item(dc, pos_h, ssHigher); + // Draw higher info_line + draw_info_line_with_icon(dc, pos_h, ssHigher); + // Draw higher thumb text + draw_thumb_text(dc, pos_h, ssHigher); + } - // Draw lower thumb text - draw_thumb_text(dc, pos_l, ssLower); } void Control::draw_ticks_pair(wxDC& dc, wxCoord pos, wxCoord mid, int tick_len) @@ -1253,6 +1280,9 @@ void Control::draw_one_layer_icon(wxDC& dc) is_horizontal() ? x_draw = width-2 : x_draw = 0.5*width - 0.5*m_lock_icon_dim; is_horizontal() ? y_draw = 0.5*height - 0.5*m_lock_icon_dim : y_draw = height-2; + //add a little dead zone to ease mouse click + y_draw += m_dead_zone_height; + dc.DrawBitmap(icon, x_draw, y_draw); //update rect of the lock/unlock icon @@ -1271,6 +1301,9 @@ void Control::draw_revert_icon(wxDC& dc) is_horizontal() ? x_draw = width-2 : x_draw = 0.25*SLIDER_MARGIN; is_horizontal() ? y_draw = 0.25*SLIDER_MARGIN: y_draw = height-2; + //add a little dead zone to ease mouse click + y_draw += m_dead_zone_height; + dc.DrawBitmap(m_bmp_revert.bmp(), x_draw, y_draw); //update rect of the lock/unlock icon @@ -1295,6 +1328,9 @@ void Control::draw_cog_icon(wxDC& dc) is_horizontal() ? y_draw = height - m_cog_icon_dim - 2 : y_draw = height - 2; } + //add a little dead zone to ease mouse click + y_draw += m_dead_zone_height; + dc.DrawBitmap(m_bmp_cog.bmp(), x_draw, y_draw); //update rect of the lock/unlock icon @@ -1385,7 +1421,6 @@ void Control::OnLeftDown(wxMouseEvent& event) return; this->CaptureMouse(); - m_is_left_down = true; m_mouse = maNone; wxPoint pos = event.GetLogicalPosition(wxClientDC(this)); @@ -1403,8 +1438,12 @@ void Control::OnLeftDown(wxMouseEvent& event) m_mouse = maRevertIconClick; } + // move only if not in not in motion and not in dead zone (in vertical slicer) + if(is_horizontal() || (m_mouse == maNone && pos.y < m_rect_one_layer_icon.y - m_rect_one_layer_icon.height/2)) + m_is_left_down = true; + if (m_mouse == maNone) - detect_selected_slider(pos); + detect_selected_slider(pos); event.Skip(); } @@ -1711,11 +1750,11 @@ void Control::OnLeftUp(wxMouseEvent& event) if (!HasCapture()) return; this->ReleaseMouse(); - m_is_left_down = false; switch (m_mouse) { case maNone : - move_current_thumb_to_pos(event.GetLogicalPosition(wxClientDC(this))); + if(m_is_left_down) + move_current_thumb_to_pos(event.GetLogicalPosition(wxClientDC(this))); break; case maDeleteTick : delete_current_tick(); @@ -1736,6 +1775,8 @@ void Control::OnLeftUp(wxMouseEvent& event) break; } + m_is_left_down = false; + Refresh(); Update(); event.Skip(); diff --git a/src/slic3r/GUI/DoubleSlider.hpp b/src/slic3r/GUI/DoubleSlider.hpp index acb649e9cdf..016903b26cf 100644 --- a/src/slic3r/GUI/DoubleSlider.hpp +++ b/src/slic3r/GUI/DoubleSlider.hpp @@ -405,6 +405,7 @@ class Control : public wxControl FocusedItem m_focus = fiNone; wxPoint m_moving_pos = wxDefaultPosition; + int m_dead_zone_height; wxRect m_rect_lower_thumb; wxRect m_rect_higher_thumb; wxRect m_rect_tick_action; diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index a1ac5a18580..41e086aea10 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -3642,15 +3642,16 @@ void GCodeViewer::render_legend(float& legend_height) case CustomGCode::ColorChange: { auto it = std::find_if(custom_gcode_per_print_z.begin(), custom_gcode_per_print_z.end(), [time_rec](const CustomGCode::Item& item) { return item.type == time_rec.first; }); if (it != custom_gcode_per_print_z.end()) { - items.push_back({ PartialTime::EType::Print, it->extruder, last_color[it->extruder - 1], Color(), time_rec.second, get_used_filament_from_volume(used_filaments[color_change_idx++], it->extruder-1) }); + double current_used_filament = used_filaments.size() > color_change_idx ? used_filaments[color_change_idx++] : 0; // can happen if the refresh is too fast or too slow + items.push_back({ PartialTime::EType::Print, it->extruder, last_color[it->extruder - 1], Color(), time_rec.second, get_used_filament_from_volume(current_used_filament, it->extruder-1) }); items.push_back({ PartialTime::EType::ColorChange, it->extruder, last_color[it->extruder - 1], decode_color(it->color), time_rec.second }); last_color[it->extruder - 1] = decode_color(it->color); last_extruder_id = it->extruder; custom_gcode_per_print_z.erase(it); + } else { + double current_used_filament = used_filaments.size() > color_change_idx ? used_filaments[color_change_idx++] : 0; // can happen if the refresh is too fast or too slow + items.push_back({ PartialTime::EType::Print, last_extruder_id, last_color[last_extruder_id - 1], Color(), time_rec.second, get_used_filament_from_volume(current_used_filament, last_extruder_id -1) }); } - else - items.push_back({ PartialTime::EType::Print, last_extruder_id, last_color[last_extruder_id - 1], Color(), time_rec.second, get_used_filament_from_volume(used_filaments[color_change_idx++], last_extruder_id -1) }); - break; } default: { break; } From 0bef1605f6e112fe02becc4aba0539cdc9228472 Mon Sep 17 00:00:00 2001 From: supermerill Date: Wed, 31 Jan 2024 18:00:42 +0100 Subject: [PATCH 24/28] Allow enum values as output string in placeholders. supermerill/superslicer#4098 --- src/libslic3r/PlaceholderParser.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libslic3r/PlaceholderParser.cpp b/src/libslic3r/PlaceholderParser.cpp index 75e6a2471a4..a07a74390ab 100644 --- a/src/libslic3r/PlaceholderParser.cpp +++ b/src/libslic3r/PlaceholderParser.cpp @@ -941,6 +941,7 @@ namespace client case coString: output.set_s(static_cast(opt.opt)->value); break; case coPercent: output.set_d(opt.opt->get_float()); break; case coPoint: output.set_s(opt.opt->serialize()); break; + case coEnum: output.set_s(opt.opt->serialize()); break; case coBool: output.set_b(opt.opt->get_bool()); break; case coFloatOrPercent: { From c4b915ed9f847db2caf053414eedfb58cf2f47fc Mon Sep 17 00:00:00 2001 From: supermerill Date: Tue, 30 Jan 2024 09:18:13 +0100 Subject: [PATCH 25/28] Fix macos start error (bad icon path) supermerill/SuperSlicer#4095 --- src/platform/osx/Info.plist.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/platform/osx/Info.plist.in b/src/platform/osx/Info.plist.in index 58220d34a22..e8e2f3fc853 100644 --- a/src/platform/osx/Info.plist.in +++ b/src/platform/osx/Info.plist.in @@ -48,7 +48,7 @@ OBJ CFBundleTypeIconFile - @SLIC3R_BUILD_ID@.icns + @SLIC3R_APP_KEY@.icns CFBundleTypeName STL CFBundleTypeRole @@ -65,7 +65,7 @@ AMF CFBundleTypeIconFile - @SLIC3R_BUILD_ID@.icns + @SLIC3R_APP_KEY@.icns CFBundleTypeName AMF CFBundleTypeRole @@ -82,7 +82,7 @@ 3MF CFBundleTypeIconFile - @SLIC3R_BUILD_ID@.icns + @SLIC3R_APP_KEY@.icns CFBundleTypeName 3MF CFBundleTypeRole From 039fb8a6ba40ab3025294e6a58021b271e301381 Mon Sep 17 00:00:00 2001 From: supermerill Date: Thu, 1 Feb 2024 15:17:45 +0100 Subject: [PATCH 26/28] Fix artifact from mmu paint supermerill/SuperSlicer#4101 (fix commit 9d2ccf13) --- src/libslic3r/MultiMaterialSegmentation.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/MultiMaterialSegmentation.cpp b/src/libslic3r/MultiMaterialSegmentation.cpp index dc1448cb808..d596ebe9ebc 100644 --- a/src/libslic3r/MultiMaterialSegmentation.cpp +++ b/src/libslic3r/MultiMaterialSegmentation.cpp @@ -145,7 +145,7 @@ struct PaintedLineVisitor Line line_to_test; std::unordered_set, boost::hash>> painted_lines_set; int color = -1; - double resolution = 50 * SCALED_EPSILON; + coordf_t resolution = 50 * SCALED_EPSILON; static inline const double cos_threshold2 = Slic3r::sqr(cos(M_PI * 30. / 180.)); static inline const double append_threshold = 50 * SCALED_EPSILON; @@ -1691,7 +1691,7 @@ std::vector> multi_material_segmentation_by_painting(con std::vector edge_grids(num_layers); const ConstLayerPtrsAdaptor layers = print_object.layers(); std::vector input_expolygons(num_layers); - coord_t resolution = scale_t(print_object.config().option("resolution")->get_float()); + coordf_t resolution = scale_d(print_object.print()->config().resolution); throw_on_cancel_callback(); @@ -1824,6 +1824,7 @@ std::vector> multi_material_segmentation_by_painting(con assert(mutex_idx < painted_lines_mutex.size()); PaintedLineVisitor visitor(edge_grids[layer_idx], painted_lines[layer_idx], painted_lines_mutex[mutex_idx], 16); + visitor.resolution = resolution; // note: multiply that if there is still problem with artifact on mmu paint with low resolution (high resolution value). visitor.line_to_test = line_to_test; visitor.color = int(extruder_idx); edge_grids[layer_idx].visit_cells_intersecting_line(line_to_test.a, line_to_test.b, visitor); From 8b4860dc7b08cef4c9fe12366e324c9de81ce5b4 Mon Sep 17 00:00:00 2001 From: Lepes Date: Thu, 1 Feb 2024 14:50:28 +0100 Subject: [PATCH 27/28] Add spanish html translation for calibration Add files via upload supermerill/SuperSlicer#4102 --- .../bed_leveling/es_bed_leveling.html | 68 +++++++++++++ .../bridge_flow/es_bridge_flow.html | 48 ++++++++++ resources/calibration/cube/es_cube.html | 41 ++++++++ resources/calibration/es_introduction.html | 36 +++++++ .../filament_flow/es_filament_flow.html | 96 +++++++++++++++++++ .../filament_temp/es_filament_temp.html | 70 ++++++++++++++ .../es_over-bridge_tuning.html | 58 +++++++++++ .../calibration/retraction/es_retraction.html | 59 ++++++++++++ 8 files changed, 476 insertions(+) create mode 100644 resources/calibration/bed_leveling/es_bed_leveling.html create mode 100644 resources/calibration/bridge_flow/es_bridge_flow.html create mode 100644 resources/calibration/cube/es_cube.html create mode 100644 resources/calibration/es_introduction.html create mode 100644 resources/calibration/filament_flow/es_filament_flow.html create mode 100644 resources/calibration/filament_temp/es_filament_temp.html create mode 100644 resources/calibration/over-bridge_tuning/es_over-bridge_tuning.html create mode 100644 resources/calibration/retraction/es_retraction.html diff --git a/resources/calibration/bed_leveling/es_bed_leveling.html b/resources/calibration/bed_leveling/es_bed_leveling.html new file mode 100644 index 00000000000..94ad5d72279 --- /dev/null +++ b/resources/calibration/bed_leveling/es_bed_leveling.html @@ -0,0 +1,68 @@ + + + + + Nivelación de la cama + + + + + + + + + + +
+

Nivelación de la cama

+
+ + +
Necesita:Nada
+
+

Esta calibración es la primera a realizar porque se necesita una buena adhesión del filamento a la cama caliente.

+

Esta calibración se realiza para obtener un ajuste fino. Por favor realice una nivelación de la cama antes de empezar y mueva la boquilla a 0.2mm por encima de la cama. Debe ser capaz de mover un folio de papel entre la boquilla y la cama, pero debe sentir como la boquilla roza el folio. Después de eso, debería ser capaz de nivelar la cama con una precisión de ~0.1mm aproximadamente.

+

Cómo funciona

+

Primero, seleccione su impresora y su perfil de impresión por defecto con el perfil de filamento adecuado para dicho filamento (PLA, ABS). Tenga en cuenta que esta calibración solo funciona para el primer extrusor si dispone de varios.

+

Cuando presione el botón Generate, el programa creará y laminará el test de impresión. Tienes que enviarlo a la impresora e imprimirlo. Finalizada la impresión compare las 5 pequeñas piezas impresas con las fotos de abajo. Tendrá que afinar su impresora / firmware para corregir la altura si es necesario.

+

Lea las notas y consejos más abajo para más información.

+

Resultados

+ + + + + + + + + + + + + + + + + + + + +
Demasiado lejosMuy lejosAún lejos:
puede ver un
pequeño hueco		Perfectotodavía cerca¡Atención!
Muy cerca:
comprueba el grosor
¡con sus dedos!		Demasiado cerca
Peligro para
la cama
+

Cómo afinar la impresora

+

Si tu impresora tiene tornillos de nivelación de cama, úsalos para subir o bajar la cama donde la pieza en cuestión haya quedado muy lejos o muy cerca de la cama. No olvide repetir la impresión después de efectuar los ajustes de la cama para verificar la compensación realizada. Tenga cuidado, la mayoría de las veces, media vuelta de giro a esos tornillos, corresponden con 0.2mm de altura, que típicamente es la altura de la primera capa. Si eleva la cama, nunca gire más de media vuelta, normalmente debería girar un cuarto de vuelta el tornillo e imprimir de nuevo.

+

Si no dispone de tornillos de ajuste de la cama, tiene que usar el programa suministrado por el fabricante o el firmware. Revise el manual de su impresora.

+

Consejos

+

Si el filamento no se adhiere a la cama caliente puede intentar:

+
    +
  • Aumentar el ancho de extrusión, aumentará la presión sin sobre-extruir. Puede aumentarlo hasta el 200% del diámetro de su boquilla, pero 150% debería ser suficiente. (Opciones Avanzadas, Configuración de Impresión -> Width (ancho)
    • +
  • Reducir la velocidad de impresión para dar tiempo a que se adhiera a la cama. (Opciones avanzadas, Configuración de Impresión -> Velocidad)
    • +
  • Puede des/habilitar "z-hop" para la primera capa "Solo Levantar Z"-> "Encima de Z" para un valor mayor a la altura de su primera capa. Si lo activa, puede levantar el filamento de la cama y si lo desactiva, puede que la boquilla roce en la cama y empuje el filamento depositado, así que debe hacer pruebas para encontrar el valor óptimo. (Opciones Avanzadas, Configuración de la Impresora -> Extrusor)
    • +
+

Notas

+

Este test usa su configuración actual de altura de primera capa, pero quizás desee incrementar el valor hasta el 80 % del diámetro de su boquilla (antes de usar el boton 'generate'), sobre todo si es la primera vez que realiza este test y desea evitar el riesgo de que la boquilla colisione con la cama. Para una boquilla de 0.4 mm de diámetro, el máximo alto de capa sugerido sería 0.4 * 80% = 0.32 mm, dejando más espacio entre cama y boquilla para evitar colisiones.

+

Si después de la calibración del flujo de filamento parece que el valor del flujo es totalmente erróneo, puede realizar este test una vez más deshaciendo este cambio sugerido en el párrafo anterior.

+

La mayoría de las calibraciones deben ser realizadas en el orden correcto. Éste es el primero a realizar. Si desea obtener buenos resultados necesita calibrar su extrusor, por ejemplo: Si solicita extruir 100mm de filamento, esa es la cantidad justa de filamento que debe consumir a la entrada del extrusor.

+

Este test establece la opción "Completar objetos individuales", quizás desee resetear la Configuración de Impresión después de imprimir el test.

+

Licencia de los modelos usados en este test de calibración: CC BY-SA 3.0

+ + diff --git a/resources/calibration/bridge_flow/es_bridge_flow.html b/resources/calibration/bridge_flow/es_bridge_flow.html new file mode 100644 index 00000000000..6d505073762 --- /dev/null +++ b/resources/calibration/bridge_flow/es_bridge_flow.html @@ -0,0 +1,48 @@ + + + + + Calibración del ratio de Flujo en Puentes + + + + + + + + + + + +
+

Calibración del ratio de Flujo en Puentes

+
+ + + +
Necesita:FlujoTemperatura
+ +
+ +

Necesita realizar la calibración de la cama y la calibración de Flujo de Filamento antes de este test. Mejor aún si ha realizado la calibración de temperatura del filamento previamente.

+

Este test imprimirá varios ejemplos de puentes modificando el ratio de flujo en puentes. Usa su configuración actual, así que quizás desee establecerlo en 100% antes de pulsar el botón.

+ + + + + + + + + + + + + + + +

Notes

+

Este test establece la opción "Completar objetos individuales", quizás desee resetear la Configuración de Impresión después de imprimir el test, o deshabilitar esta opción si su cama es muy pequeña.

+

Licencia de los modelos usados en este test de calibración: CC BY-SA 3.0

+ + diff --git a/resources/calibration/cube/es_cube.html b/resources/calibration/cube/es_cube.html new file mode 100644 index 00000000000..3716960054b --- /dev/null +++ b/resources/calibration/cube/es_cube.html @@ -0,0 +1,41 @@ + + + + + Cubo de Calibración + + + + + + + + + + + +
+

Cubo de Calibración

+
+ + + + +
Necesita:Calibración camaFlujoTemperatura
+ +
+ +

Esta página le permite imprimir el amado cubo de calibración. Es útil ver si su impresora es exacta y calibrar algunos ajustes. Lo primero es establecer sus objetivos.

+

Objetivo: exactitud dimensional

+

Tiene que imprimir dos cubos, de diferente tamaño. Si sus dimensiones impresas han escalado proporcionalmente del tamaño de los cubos originales, entonces necesita ajustar los pasos/mm de sus motores (nota: si es el caso, también debe ajustar el flujo, y puede que deba rehacer otras calibraciones si el cambio es grande). Si las dimensiones no han escalado proporcionalmente, puede corregir el desfase ajustando la compensación en XY (Ajustes Avanzados, Configuración de Impresión, Laminando -> XY First Layer Compensation). Con el botón Voron cube, puede testear la calibración de agujeros, ya que normalmente son más pequeños de lo que deberían. El agujero de arriba debería ser suficientemente grande (en la versión de 30mm) para encajar un rodamiento en él.

+

Objetivo: Superposición relleno/perímetros

+

Este test sirve para ver si el relleno atraviesa el perímetro. Intente reducirlo al mínimo posible pero debe comprobar la capa sólida superior, ya que puede crear artefactos si es demasiado bajo. Es mejor imprimir el cubo estandard, ya que tiene una superficie superior mayor para apreciar el posible problema.

+ + +

Notas

+

Este test debe ser el último test a realizar.

+

El tamaño del cubo standard es de 20mm y el tamaño del cubo Voron es de 30mm.

+

Licencia del cubo standard de calibración: CC BY-SA 3.0, realizado por iDig3Dprinting

+

Licencia del cubo Voron de calibración: GPL V3, realizado por VORONDesign

+ + diff --git a/resources/calibration/es_introduction.html b/resources/calibration/es_introduction.html new file mode 100644 index 00000000000..336d4914ec9 --- /dev/null +++ b/resources/calibration/es_introduction.html @@ -0,0 +1,36 @@ + + + + + Calibraciones + + +

Introducción

+

Bienvenido al menú de calibración. Éste menú le ayudará a imprimir calibraciones rápida y eficientemente

+

¿Por qué?

+

La mayoría de impresoras deberían imprimir bastante bien con la configuración de fábrica, pero si encuentra algun problema, o si desea ir un paso más allá en calidad, tendría que asegurarse que todo está bien calibrado. Las calibraciones se pueden dividir en tres grupos: impresora, filamento y laminador.

+

La impresora debe calibrarse primero, después el filamento y por último el laminador.

+

Calibración de impresora

+

Ésto es lo primero a calibrar. Cada impresora es diferente en este aspecto, y debería leer el manual de su impresora para más información.

+

Calibración del extrusor

+

No tiene una entrada de menú, porque no puede calibrarse con una impresión. No es obligatorio pero puede ayudar a evitar algunos problemas. La mayoría está explicado en el menú calibración de flujo.

+

Nivelación de cama

+

La mayoría de impresoras no tienen sistema de nivelación de cama, e incluso aquellas que lo tienen, deben ser calibrados al menos una vez. Estos menúes explicarán muchas cosas, pero asegúrese de leer la documentación de su impresora en el caso de existir pasos específicos para su impresora en concreto. Ésta calibración es particularmente útil si desea verificar / afinar el resultado final, o si desea comprobar que no ha cambiado desde la última vez.

+

Creará 5 pequeñas piezas. Visualmente debería comprobar las piezas y verá donde la cama está nivelada y donde necesita realizar algunos ajustes.

+

Calibración de filamento

+

Cada filamento tiene propiedades diferentes y puede necesitar ajustes. Aunque el perfil por defecto debería funcionar la mayoría de las veces, puede crear defectos evitables. Algunos filamentos especiales (como aquellos que incluyen partículas de madera) necesitarán ajustes especiales.

+

Calibración del flujo de filamento

+

El extrusor muerde el filamento para empujarlo, y la fuerza con que los muelles comprimen el filamento, pueden cambiar el flujo necesitado. Además, si su extrusor no está bien calibrado, estos pasos le ayudarán a contrarrestar este problema.

+

Tenga en cuenta que si su filamento tiene un diámetro variable o no es totalmente redondo, encontrará problemas de flujo, pero éstas situaciones no pueden arreglarse. Debe cambiar de proveedor / calidad del filamento o invertir en un sensor de grosor de filamento.

+

Calibración de temperatura del filamento

+

Algunos filamentos necesitan más temperatura para pegarse, otros sin embargo, necesitan menos temperatura para evitar goteos o caídas de voladizos (salientes). Esta calibración le ayudará a encontrar un buen valor para la temperatura. Puede realizar varias pruebas modificando la velocidad del ventilador de capa hasta encontrar la mejor combinación.

+

Calibración del laminador

+

Estas calibraciones le ayudarán a encontrar la mejor configuración de SuperSlicer para su impresora y filamento.

+

Calibración de flujo en puentes

+

Los puentes son normalmente difíciles de imprimir con un buen resultado visual. Esta calibración le ayudará a elegir la mejor configuración para el flujo de filamento en el puente. También puede intentar diferentes velocidades del ventilador de capa para un mismo flujo de filamento en puentes.

+

Calibración del patrón de Alisado

+

Es difícil imprimir una superficie plana y lisa, ya que puede disminuir su altura en el centro de una gran superficie plana. Esta calibración le ayudará a encontrar la mejor configuración para compensar ese desnivel.

+

Cubo de calibración

+

Esta entrada le permite tener siempre a mano un cubo de calibración listo para imprimir. Es muy útil ver si la impresión tiene una buena exactitud dimensional. Esto puede alterarse con varias opciones de compensación en X-Y.

+ + diff --git a/resources/calibration/filament_flow/es_filament_flow.html b/resources/calibration/filament_flow/es_filament_flow.html new file mode 100644 index 00000000000..a842b4f76b8 --- /dev/null +++ b/resources/calibration/filament_flow/es_filament_flow.html @@ -0,0 +1,96 @@ + + + + + Calibración del Flujo de Filamento + + + + + + + + + + + +
+

Calibración del Flujo de Filamento

+
+ + +
Necesita:Nivelación de cama
+ +
+ +

Necesita realizar la Nivelación de la cama antes de este test.

+

Este test imprimirá cinco piezas con diferentes niveles de flujo. Puede elegir la diferencia de flujo entre cada pieza. Debería empezar con el 10%. +Después de verificar el resultado con la ayuda de la tabla siguiente, debe modificar el multiplicador de extrusión del filamento en su perfil de filamento (si el -20 es el mejor, cambie el multiplicador de 1 a 0.8, vea la fórmula más abajo). ¡No olvide guardar los cambios en el perfil de filamento! Puede continuar con el botón de 2% si quiere una mayor precisión.

+

Resultados

+

Ejemplo:

+ + + + + + + + + + + + + + + + +
No planoNo planoNo planoPlano
pero el círculo
no es tan bueno		Plano
y círculo bueno
+

El flujo que desea elegir es el menor posible que no cree agujeros en la superficie superior. En este ejemplo parece que el mejor flujo es +20. Así que debe cambiar el multiplicador de extrusion a 1.2 e imprimir el segudo set de pruebas (o puede establecerlo en 1.15 y no continúes el test).

+

No mire la calidad de las letras, debería ser buena solo en 0, por eso calibramos la altura de la cama para este test de flujo. Aquí, usando el flujo +20, debería bajar la cama un poquito (rehaciendo la +calibración de la cama).

+

Segundo paso, empezando en +20%:

+ + + + + + + + + + + + + + + + +
No buenoNo buenoCasi buenoBueno pero el
círculo tiene
irregularidades		Bueno
+

Aquí podemos ver que el círculo no es muy bueno en el -8 y -6. El -4 es casi redondo pero no perfecto, eso indica que la boquilla perdió presión. -2 es casi bueno pero el 0 es el único que puede ser considerado como "bueno", incluso si el círculo no es perfecto.

+

Cómo afinar la impresora

+

Tiene que cambiar el multiplicador de extrusión para el filamento que ha calibrado (y guardar el perfil). La fórmula para el multiplicador de extrusión es: nuevo_multiplicador = ( (100 + numero_elegido) / 100 ) * viejo_multiplicador
+Ejemplo: primer paso, elijo -10, así tengo ((100-10)/100) * 1 = (0.9) * 1 = 0.9
+segundo paso elijo +5, así tengo ((100+5)/100) * 0.9 = (1.05) * 0.9 = 0.945 +

+

Si desea hacer este cambio permanente y mantener su multiplicador de extrusión a 1 en SuperSlicer, puede cambiar la configuración de su firmware multiplicando (o dividiendo, depende del firmware/configuración) el 'extruder speed setting' (e-step, step_distance) por su multiplicador de extrusión.

+

Consejos

+

Antes de realizar este test, es preferible calibrar su extrusor (es más fácil en sistemas bowden):

+
    +
  • Quite el tubo bowden del extrusor desde la salida del extrusor (o separe el extrusor del fusor si tiene un extrusor en directa)
    • +
  • Introduzca el filamento a través del extrusor (a mano o usando el programa que lo controla)
    • +
  • Corte el filamento a ras de la salida del extrusor. Mide con una regla de acero que efectivamente hay 0mm. Si no lo hay, anote el valor y no olvide restar este valor de todas las demás medidas que realice.
    • +
  • Ordene extruir 200mm de filamento (gcode: G1 E200).
    • +
  • Mida la longitud extruida de filamento. Repita el proceso dos veces si desea mayor precisión.
    • +
  • Tiene que cambiar su multiplicador de extrusión (e-step, step_distance) multiplicando (o dividiendo, dependiendo de su firmware) el valor actual por (200 / media_de_valores_medidos).
    • +

    Tenga en cuenta que este valor puede cambiar si cambia la presión ejercida por el extrusor al filamento.

    +
+

Notas

+

Es muy difícil afinar el flujo por debajo del 2%, y de todas formas, no hay filamento tan suficientemente consistente para garantizarlo. Filamentos con precisión de +-0.03mm tiene una variación del ~7% entre el mínimo y máximo de su sección.

+

La mayoría de las calibraciones deben ser realizadas en el orden correcto. Ésta debería ser la segunda.

+

Quizás desee realizar de nuevo la calibración de la cama si el resultado es inferior a 0.9 o es más alto de 1.1.

+

Tenga en cuenta que el multiplicador de extrusión puede variar con un filamento de diferente material, uno más blando puede ser marcado/mordido con más fuerza por el extrusor y debido a ello tendrá un menor diámetro en las ruedas dentadas del extrusor.

+

Si el extrusor "se come" el filamento y no puede completar la capa superior, deberá incrementar la distribución del Alisado, planchado, Ironing (en incrementos de 5%).(Modo Experto, Configuración de Impresión -> Relleno)

+

Este test establece la opción "Completar objetos individuales", quizás desee resetear la Configuración de Impresión después de imprimir el test.

+

Licencia de los modelos usados en este test de calibración: CC BY-SA 3.0

+ + diff --git a/resources/calibration/filament_temp/es_filament_temp.html b/resources/calibration/filament_temp/es_filament_temp.html new file mode 100644 index 00000000000..c1771137f31 --- /dev/null +++ b/resources/calibration/filament_temp/es_filament_temp.html @@ -0,0 +1,70 @@ + + + + + Calibración de la Temperatura del Filamento + + + + + + + + + + + +
+

Calibración de la Temperatura del Filamento

+
+ + + +
Necesita:Nivelación camaFlujo
+ +
+ +

Necesita haber realizado la calibración de la cama antes que este test, y preferiblemente también la calibración del Flujo.. +Esta calibración le ayudará a elegir la correcta temperatura correcta respecto a unión del filamento, voladizos y goteo del fusor. +Tenga presente que este test depende de la ventilación de capa elegida. Puede realizar este test varias veces con más o menos porcentaje de ventilación de capa hasta encontrar el punto exacto.

+

Este test imprimirá una torre, impresa a diferentes temperaturas para cada planta. La planta en la mitad de altura será impresa con la temperatura actual elegida en la configuración de su filamento. La planta en la base, tocando la cama caliente, será impresa con la máxima temperatura y la planta superior con la menor temperatura posible. Puede elegir la diferencia de temperatura entre plantas y el número de plantas (cuantos test por debajo de la actual temperatura desea y cuantos test con temperaturas superiores) pero puede dejarlo tal cual está para empezar.

+

Resultados / observaciones

+

El Objetivo es elegir la temperatura más alta posible que no genere artifactos.

+

Primero, debe analizar la torre. Cada planta tiene la temperatura grabada en ella.

+ + + + + + + + + + + + + + + + + + + + + + + +
Demasiado frío, No puede ser extruido +
Bien
Bien
Demasiado caliente, se ve que la boquilla gotea
Muy caliente, se ve que la boquilla gotea
+

Aquí puede ver que la planta impresa a 210 grados celsius es la más caliente que podemos imprimir sin problemas de desintegración (aparte del calor; la baja calidad de impresión es debido a altas velocidades). También, tuve éxito al romper (con cierta dificultad) la planta a 195 grados debido a una mala adhesión entre capas; así que fue impresa a una baja temperatura para este filamento. Aconsejo hacer el mismo test.

+

Resultados: destrucción

+

Finalmente, Debe romper cada planta por la mitad, para comprobar si las bajas temperaturas de impresión tienen efectos adversos en la unión de las capas. No debería ser posible romper solo con sus manos una planta. Si puede romper una planta, entonces la temperatura de esa planta es definitivamente demasiado baja (o el ventilador de capa ha enfriado demasiado rápido esa planta debido al alto caudal de aire), por tanto debe elegir la temperatura más alta posible o repetir el test con menos ventilación de capa. Cuando intente romper una planta con la mano, no ponga los dedos en la unión de esa planta con la anterior o la siguiente, al cambiar la temperatura en esa zona, es la más débil, sujete el inicio de esa planta y el final de esa misma planta firmemente.

+

Cómo afinar su impresora

+

Cambie la temperatura en el perfil de filamento (extrusor -> otras capas), después guarde el perfil. La temperatura de la primera capa casi siempre es 5 grados más para ayudar en la adhesión a la cama, por tanto debería cambiarla también, especialmente si es menor a la nueva temperatura.

+ +

Notas

+

La mayoría de las calibraciones debe ser hechas en el orden correcto. Ésta debe ser la tercera.

+

Los números de las temperaturas solo se verán entre 180 y 285. Valores más altos o bajos no se mostraran pero el test se hará correctamente, solo tiene que recordarlas.

+

Esta torre se realizó con el modelo 3D creado por gaaZolee con la licencia: CC BY-SA 3.0.

+ + diff --git a/resources/calibration/over-bridge_tuning/es_over-bridge_tuning.html b/resources/calibration/over-bridge_tuning/es_over-bridge_tuning.html new file mode 100644 index 00000000000..1b443b8376f --- /dev/null +++ b/resources/calibration/over-bridge_tuning/es_over-bridge_tuning.html @@ -0,0 +1,58 @@ + + + + + Calibración del Patrón de Alisado + + + + + + + + + + + +
+

Calibración del Patrón de Alisado

+
+ + + +
Necesita:FlujoTemperatura
+ +
+ +

Necesita realizar la calibración de flujo del filamento y el ratio de flujo en puentes antes que este test. Mejor aún si ha realizado la calibración de Temperatura del Filamento.

+

Éste método de calibración imprimirá varias piezas modificando el ratio de flujo sobre puentes, entre 100 y 125. Elija el menor valor en el que la superficie superior es plana sin "agujeros". Empiece con el botón over-bridge calibration.

+

Si la calibración sobre puentes (Ajustes avanzados, Configuración de Impresión, Width & Flow, Flow ratio -> Above the bridges) no es concluyente (mismos agujeros en todas las piezas), entonces puede establecer el flujo sobre puentes en 110% y use la opción top fill (Ajustes avanzados, Configuración de Impresión, Width & Flow, Flow ratio -> Top fill). Este ajuste es un poco impredecible, así que lo mejor es no establecerlo lejos del 100%.

+

Resultados

+ + +

Ejemplo:

+ + + + + + + + + + + + + + +
No planoNo planoNo planoPlanoPlano
+Aquí, podemos ver atifactos hasta que el flujo sobre puentes fue establecido a 115. Si era plano en la calibración del flujo, y ahora no lo es, es porque los puentes debajo de la capas superiores se están cayendo un poco por gravedad, por eso deja más volumen para rellenar. Aquí 115 debería ser suficiente, pero 120 es un valor más seguro. + +

Consejos

+

TODO

+ +

Notas

+

Este test establece la opción "Completar objetos individuales", quizás desee resetear la Configuración de Impresión después de imprimir el test.

+

Licencia de los modelos usados en este test de calibración: CC BY-SA 3.0

+ + diff --git a/resources/calibration/retraction/es_retraction.html b/resources/calibration/retraction/es_retraction.html new file mode 100644 index 00000000000..e5bd1fa6660 --- /dev/null +++ b/resources/calibration/retraction/es_retraction.html @@ -0,0 +1,59 @@ + + + + + Calibración de Retracción + + + + + + + + + + + +
+

Calibración de Retracción

+
+ + + +
Necesitas:FlujoTemperatura
+ +
+ +

Cómo realizarlo

+

Es preferible haber realizado las calibraciones de flujo y temperatura. +Esta calibración le ayudará a elegir los valores correctos de distancia de retracción para su extrusor y el filamento actual

+

Este test imprimirá una pieza varianado la distancia de retracción para cada milímetro impreso en el eje Z.

+

Incrementos y Altura

+

Si tiene extrusión directa, es mejor probar con incrementos de 0.1 mm (Steps) y ~15 mm de Altura, ya que no es común necesitar más de 1 mm de retracción. +

Si tiene extrusión Bowden, es mejor probar con incrementos de 0.5 mm Steps) y ~15 mm de Altura, ya que no es común necesitar más de 6 mm de retracción. También puede usar incrementos de 0.2 y una altura mayor. Tenga cuidado, ya que una alta distancia de retracción, incrementará el riesgo de atasco en la boquilla si suele tenerlos. +

Temperatura de Inicio e Incrementos

+

Por defecto, usa la temperatura actual para un solo test. Así que no debería modificarla, a menos que también desee optimizar la temperatura para prevenir hilos (de una torre a otra, stringing).

+

En la calibración de temperatura, obtuvo un intervalo de temperatura donde su impresión fue "suficientemente buena".

+

Aquí, usted debería empezar en la más alta temperatura aceptable. Si ya estableció la temperatura de su filamento, se tomará ese valor como "actual" para la temperatura inicial (Start temp). Si no la ha establecido aún, seleccione la mayor temperatura en el desplegable "Start temp".

+

Después, elija una opción en el campo "Temp decr" que no reduzca la temperatura demasiado bajo. "3x10" significa que imprimirá tres tests, el primer test a la max. temp. y el resto decrementando 10C en cada uno.

+

Modificando capas pequeñas

+Este botón cambiará las configuraciones de Filamento/refrigeración para deshabilitar todas las características que se activan cuando una capa es muy pequeña y necesita enfriarse a tiempo. Con este algoritmo deshabilitado, añadimos un reto extra a su impresora en términos de retracción, así que es un buen test de estrés. Para habilitar de nuevo esas opciones tras esta impresión, elimine las modificaciones hechas por este test en la pestaña de Filamento (la pequeña "flecha hacia atrás" en color naranja). +

Resultados

+

Terminada esta impresión, puede contar los milímetros con los pequeños salientes que tiene a los lados las torres. Yo los cuento con mi uña. Cuando esté en la altura donde ya no haya hilos (stringing) de una torre a otra, tome ese número. Multiplique ese número por los Incrementos elegidos (Steps 0.1, 0.2, 0.5, ó 1) y ya tiene la distancia de retracción para modificar (Ajustes Avanzados, Configuración de Impresora, Extrusor, Retracción -> Largo). Puede añadir un 20% más de distancia para tener un pequeño margen.

+

Si tiene varias impresiones con diferentes tempearaturas, necesita elegir la mejor impresión, aquella con menos hilos, a menos que el decremento de hilos no sea tan grande como para justificar el decremento de temperatura. +

Ejemplo

+ + + + + + + +
En esta impresión, el último hilo ocurre a la altura de ~10. Como usé un salto de 0.5, significa que necesito al menos 5mm de retracción, pero lo estableceré en 6 para asegurarme de eliminar la mayoría de hilos. +
+

+

Notas

+

La velocidad de retracción debe ser tan alta como su extrusor/controladores/drivers puedan soportar de forma segura, con cierto margen. 50mm/s para retracción y 20mm/s para de-retracción son buenos valores de partida para PLA.

+

Licencia de los modelos usados en este test de calibración: CC BY-SA 3.0

+ + From d1d7b25b576543d07dd4f95ba654e582adcfbd6a Mon Sep 17 00:00:00 2001 From: supermerill Date: Thu, 1 Feb 2024 22:00:35 +0100 Subject: [PATCH 28/28] update profiles: Add thumbnails format to profile that define one. --- resources/profiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/profiles b/resources/profiles index 9e3f0c53e5f..8f3bb94a9c6 160000 --- a/resources/profiles +++ b/resources/profiles @@ -1 +1 @@ -Subproject commit 9e3f0c53e5f9a3a9ed7abc25548ab65cba611c0b +Subproject commit 8f3bb94a9c60be9a3b40d88a36ff05ba5cf2d6a8