|
| AUTO_RESOLUTION_PARSE_RESULT | KICAD_DIFF::ParseAutoResolutionJson (const std::string &aJsonContent) |
| | Parse a KICAD_MERGETOOL_AUTO-format JSON object mapping item IDs (KIID_PATH strings) to ITEM_RES spellings (the canonical snake_case names emitted by ItemResToString).
|
| |
| APPLY_AUTO_RESOLUTIONS_RESULT | KICAD_DIFF::ApplyAutoResolutions (MERGE_PLAN &aPlan, const std::vector< std::size_t > &aConflictActionIndices, const std::map< wxString, ITEM_RES > &aResolutions) |
| | Apply a parsed auto-resolution map to a MERGE_PLAN's conflicts.
|
| |
| std::vector< CONFLICT_LIST_ENTRY > | KICAD_DIFF::BuildConflictList (const MERGE_PLAN &aPlan) |
| |
| std::vector< KIID_PATH > | KICAD_DIFF::CollectUnresolvedConflicts (const MERGE_PLAN &aPlan, const std::vector< std::size_t > &aConflictActionIndices) |
| | Return the conflict actions that still have no decision.
|
| |
| void | KICAD_DIFF::SettleLibraryMerges (MERGE_PLAN &aPlan, const std::function< bool(const KIID_PATH &)> &aCanCombine, const std::function< std::set< wxString >(const KIID_PATH &)> &aEditedNames={}) |
| | Settle the MERGE_PROPS of a library merge, where an item is combined whole or not at all.
|
| |
| std::set< wxString > | KICAD_DIFF::EditedNames (const ITEM_CHANGE &aChange) |
| | The properties and elements aChange edits, by the names a user would know them by.
|
| |
| std::function< std::set< wxString >(const KIID_PATH &)> | KICAD_DIFF::EditedNamesIn (const DOCUMENT_DIFF &aOurs, const DOCUMENT_DIFF &aTheirs) |
| | What either side edits in an item, for SettleLibraryMerges. Both diffs must outlive the result.
|
| |
| std::optional< BOX2I > | KICAD_DIFF::ResolveConflictBBox (const KIID_PATH &aId, const std::map< KIID_PATH, BOX2I > &aPrimary, const std::map< KIID_PATH, BOX2I > &aOurs, const std::map< KIID_PATH, BOX2I > &aTheirs, const std::map< KIID_PATH, BOX2I > &aAncestor) |
| | Resolve the best bounding box for a conflicted item across the three sides of a 3-way merge.
|
| |
| wxString | KICAD_DIFF::BuildConflictDetailText (const ITEM_RESOLUTION &aResolution) |
| | Build the human-readable detail text shown in the merge dialog's resolution panel for a given ITEM_RESOLUTION.
|
| |