KIGIT_PCB_MERGE Class Reference

#include <kigit_pcb_merge.h>

Public Member Functions
	KIGIT_PCB_MERGE (git_merge_driver_source *aSource, git_buf *aBuf)
virtual	~KIGIT_PCB_MERGE ()
int	Merge ()
std::set< BOARD_ITEM * > &	GetWeModifiedTheyDeleted ()
std::set< BOARD_ITEM * > &	GetTheyModifiedWeDeleted ()
std::set< BOARD_ITEM * > &	GetBothModified ()

Protected Member Functions
std::unique_ptr< BOARD >	readBoard (wxString &aFilename)
KIGIT_PCB_MERGE_DIFFERENCES	compareBoards (BOARD *aAncestor, BOARD *aOther)
void	findSetDifferences (const BOARD_ITEM_SET &aAncestorSet, const BOARD_ITEM_SET &aOtherSet, std::vector< BOARD_ITEM * > &aAdded, std::vector< BOARD_ITEM * > &aRemoved, std::vector< BOARD_ITEM * > &aChanged)

Private Attributes
git_merge_driver_source *	m_mergeDriver
git_buf *	m_result
std::set< BOARD_ITEM * >	we_modified_they_deleted
std::set< BOARD_ITEM * >	they_modified_we_deleted
std::set< BOARD_ITEM * >	both_modified

Detailed Description

Definition at line 41 of file kigit_pcb_merge.h.

Constructor & Destructor Documentation

KIGIT_PCB_MERGE()

KIGIT_PCB_MERGE::KIGIT_PCB_MERGE ( git_merge_driver_source *  aSource, git_buf *  aBuf  )

inline

Definition at line 44 of file kigit_pcb_merge.h.

~KIGIT_PCB_MERGE()

virtual KIGIT_PCB_MERGE::~KIGIT_PCB_MERGE ( )

virtual

Member Function Documentation

compareBoards()

KIGIT_PCB_MERGE_DIFFERENCES KIGIT_PCB_MERGE::compareBoards ( BOARD *  aAncestor, BOARD *  aOther  )

protected

Definition at line 71 of file kigit_pcb_merge.cpp.

References findSetDifferences(), BOARD::GetItemSet(), KIGIT_PCB_MERGE_DIFFERENCES::m_added, KIGIT_PCB_MERGE_DIFFERENCES::m_changed, and KIGIT_PCB_MERGE_DIFFERENCES::m_removed.

Referenced by Merge().

findSetDifferences()

void KIGIT_PCB_MERGE::findSetDifferences ( const BOARD_ITEM_SET &  aAncestorSet, const BOARD_ITEM_SET &  aOtherSet, std::vector< BOARD_ITEM * > &  aAdded, std::vector< BOARD_ITEM * > &  aRemoved, std::vector< BOARD_ITEM * > &  aChanged  )

protected

Definition at line 37 of file kigit_pcb_merge.cpp.

References EDA_ITEM::m_Uuid.

Referenced by compareBoards().

GetBothModified()

std::set< BOARD_ITEM * > & KIGIT_PCB_MERGE::GetBothModified ( )

inline

Definition at line 61 of file kigit_pcb_merge.h.

References both_modified.

GetTheyModifiedWeDeleted()

std::set< BOARD_ITEM * > & KIGIT_PCB_MERGE::GetTheyModifiedWeDeleted ( )

inline

Definition at line 56 of file kigit_pcb_merge.h.

References they_modified_we_deleted.

GetWeModifiedTheyDeleted()

std::set< BOARD_ITEM * > & KIGIT_PCB_MERGE::GetWeModifiedTheyDeleted ( )

inline

Definition at line 51 of file kigit_pcb_merge.h.

References we_modified_they_deleted.

Merge()

int KIGIT_PCB_MERGE::Merge

(

)

Definition at line 84 of file kigit_pcb_merge.cpp.

References both_modified, compareBoards(), KIGIT_COMMON::GetLastGitError(), KIGIT_PCB_MERGE_DIFFERENCES::m_changed, m_mergeDriver, KIGIT_PCB_MERGE_DIFFERENCES::m_removed, PCB_IO_KICAD_SEXPR_PARSER::Parse(), they_modified_we_deleted, traceGit, we_modified_they_deleted, and IO_ERROR::What().

readBoard()

std::unique_ptr< BOARD > KIGIT_PCB_MERGE::readBoard ( wxString &  aFilename )

protected

Member Data Documentation

both_modified

std::set<BOARD_ITEM*> KIGIT_PCB_MERGE::both_modified

private

Definition at line 80 of file kigit_pcb_merge.h.

Referenced by GetBothModified(), and Merge().

m_mergeDriver

git_merge_driver_source* KIGIT_PCB_MERGE::m_mergeDriver

private

Definition at line 75 of file kigit_pcb_merge.h.

Referenced by Merge().

m_result

git_buf* KIGIT_PCB_MERGE::m_result

private

Definition at line 76 of file kigit_pcb_merge.h.

they_modified_we_deleted

std::set<BOARD_ITEM*> KIGIT_PCB_MERGE::they_modified_we_deleted

private

Definition at line 79 of file kigit_pcb_merge.h.

Referenced by GetTheyModifiedWeDeleted(), and Merge().

we_modified_they_deleted

std::set<BOARD_ITEM*> KIGIT_PCB_MERGE::we_modified_they_deleted

private

Definition at line 78 of file kigit_pcb_merge.h.

Referenced by GetWeModifiedTheyDeleted(), and Merge().

---

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

• kigit_pcb_merge.h
• kigit_pcb_merge.cpp