DIALOG_KICAD_MERGE_3WAY::CONFLICT_CONTEXT Struct Reference

Phase 8 context for the conflict canvas. More...

#include <dialog_kicad_merge_3way.h>

Public Attributes
KICAD_DIFF::DOCUMENT_GEOMETRY	ancestorGeometry
KICAD_DIFF::DOCUMENT_GEOMETRY	oursGeometry
KICAD_DIFF::DOCUMENT_GEOMETRY	theirsGeometry
std::map< KIID_PATH, BOX2I >	ancestorBBoxes
	Per-side bbox of each conflicting item.
std::map< KIID_PATH, BOX2I >	oursBBoxes
std::map< KIID_PATH, BOX2I >	theirsBBoxes

Detailed Description

Phase 8 context for the conflict canvas.

Each side carries the document geometry extracted from that side's loaded BOARD or SCHEMATIC plus a per-item bbox map; the dialog picks the side to display based on the radio selection and outlines the focused conflict at its on-that-side coordinates so a moved-on-theirs item highlights at the moved location when previewing Theirs.

Definition at line 62 of file dialog_kicad_merge_3way.h.

Member Data Documentation

ancestorBBoxes

std::map<KIID_PATH, BOX2I> DIALOG_KICAD_MERGE_3WAY::CONFLICT_CONTEXT::ancestorBBoxes

Per-side bbox of each conflicting item.

Empty entries fall back through ancestor → ours → theirs at lookup time.

Definition at line 70 of file dialog_kicad_merge_3way.h.

ancestorGeometry

KICAD_DIFF::DOCUMENT_GEOMETRY DIALOG_KICAD_MERGE_3WAY::CONFLICT_CONTEXT::ancestorGeometry

Definition at line 64 of file dialog_kicad_merge_3way.h.

Referenced by PCBNEW_JOBS_HANDLER::runPcbMerge(), and EESCHEMA_JOBS_HANDLER::runSchMerge().

oursBBoxes

std::map<KIID_PATH, BOX2I> DIALOG_KICAD_MERGE_3WAY::CONFLICT_CONTEXT::oursBBoxes

Definition at line 71 of file dialog_kicad_merge_3way.h.

Referenced by PCBNEW_JOBS_HANDLER::runPcbMerge(), and EESCHEMA_JOBS_HANDLER::runSchMerge().

oursGeometry

KICAD_DIFF::DOCUMENT_GEOMETRY DIALOG_KICAD_MERGE_3WAY::CONFLICT_CONTEXT::oursGeometry

Definition at line 65 of file dialog_kicad_merge_3way.h.

Referenced by PCBNEW_JOBS_HANDLER::runPcbMerge(), and EESCHEMA_JOBS_HANDLER::runSchMerge().

theirsBBoxes

std::map<KIID_PATH, BOX2I> DIALOG_KICAD_MERGE_3WAY::CONFLICT_CONTEXT::theirsBBoxes

Definition at line 72 of file dialog_kicad_merge_3way.h.

Referenced by PCBNEW_JOBS_HANDLER::runPcbMerge(), and EESCHEMA_JOBS_HANDLER::runSchMerge().

theirsGeometry

KICAD_DIFF::DOCUMENT_GEOMETRY DIALOG_KICAD_MERGE_3WAY::CONFLICT_CONTEXT::theirsGeometry

Definition at line 66 of file dialog_kicad_merge_3way.h.

Referenced by PCBNEW_JOBS_HANDLER::runPcbMerge(), and EESCHEMA_JOBS_HANDLER::runSchMerge().

---

The documentation for this struct was generated from the following file:

• dialog_kicad_merge_3way.h