KiCad PCB EDA Suite
Loading...
Searching...
No Matches
Public Member Functions | Static Public Member Functions | Public Attributes | List of all members
KICAD_DIFF::ITEM_RESOLUTION Struct Reference

#include <kicad_merge_engine.h>

Public Member Functions

bool operator== (const ITEM_RESOLUTION &aOther) const
 
nlohmann::json ToJson () const
 

Static Public Member Functions

static ITEM_RESOLUTION FromJson (const nlohmann::json &aJson)
 

Public Attributes

KIID_PATH id
 
ITEM_RES kind = ITEM_RES::KEEP
 
std::vector< PROPERTY_RESOLUTION > props
 

Detailed Description

Definition at line 102 of file kicad_merge_engine.h.

Member Function Documentation

◆ FromJson()

ITEM_RESOLUTION KICAD_DIFF::ITEM_RESOLUTION::FromJson ( const nlohmann::json & aJson)
static

Definition at line 249 of file kicad_merge_engine.cpp.

References KICAD_DIFF::PROPERTY_RESOLUTION::FromJson(), id, KICAD_DIFF::ItemResFromString(), kind, and props.

Referenced by BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), and KICAD_DIFF::MERGE_PLAN::FromJson().

◆ operator==()

bool KICAD_DIFF::ITEM_RESOLUTION::operator== ( const ITEM_RESOLUTION & aOther) const

Definition at line 227 of file kicad_merge_engine.cpp.

References id, kind, and props.

◆ ToJson()

nlohmann::json KICAD_DIFF::ITEM_RESOLUTION::ToJson ( ) const

Definition at line 233 of file kicad_merge_engine.cpp.

References KICAD_DIFF::ItemResToString(), kind, and props.

Referenced by BOOST_AUTO_TEST_CASE(), and BOOST_AUTO_TEST_CASE().

Member Data Documentation

◆ id

KIID_PATH KICAD_DIFF::ITEM_RESOLUTION::id

Definition at line 104 of file kicad_merge_engine.h.

Referenced by KICAD_DIFF::PCB_MERGE_APPLIER::Apply(), KICAD_DIFF::ApplyAutoResolutions(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), KICAD_DIFF::BuildConflictDetailText(), KICAD_DIFF::BuildConflictList(), KICAD_DIFF::CollectUnresolvedConflicts(), FromJson(), operator==(), KICAD_DIFF::KICAD_MERGE_ENGINE::Plan(), DIALOG_KICAD_MERGE_3WAY::rebuildCanvas(), and DIALOG_KICAD_MERGE_3WAY::showConflict().

◆ kind

ITEM_RES KICAD_DIFF::ITEM_RESOLUTION::kind = ITEM_RES::KEEP

Definition at line 105 of file kicad_merge_engine.h.

Referenced by KICAD_DIFF::PCB_MERGE_APPLIER::Apply(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), KICAD_DIFF::BuildConflictDetailText(), KICAD_DIFF::CollectUnresolvedConflicts(), FromJson(), DIALOG_KICAD_MERGE_3WAY::OnResolutionChanged(), operator==(), KICAD_DIFF::KICAD_MERGE_ENGINE::Plan(), DIALOG_KICAD_MERGE_3WAY::showConflict(), and ToJson().

◆ props

std::vector<PROPERTY_RESOLUTION> KICAD_DIFF::ITEM_RESOLUTION::props

Definition at line 106 of file kicad_merge_engine.h.

Referenced by KICAD_DIFF::PCB_MERGE_APPLIER::Apply(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), KICAD_DIFF::BuildConflictDetailText(), FromJson(), operator==(), KICAD_DIFF::KICAD_MERGE_ENGINE::Plan(), and ToJson().

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