haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

common: RC_ITEM can now keep an arbitrary number of violating UUIDs

This commit is contained in:
Tomasz Wlostowski 2020-09-25 20:27:56 +02:00
parent f38147c201
commit 3e0635bd22
2 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/rc_item.cpp
View File

@ -70,12 +70,12 @@ wxString RC_ITEM::ShowReport( EDA_UNITS aUnits, SEVERITY aSeverity,
EDA_ITEM* mainItem = nullptr; EDA_ITEM* mainItem = nullptr;
EDA_ITEM* auxItem = nullptr; EDA_ITEM* auxItem = nullptr;
auto ii = aItemMap.find( m_mainItemUuid ); auto ii = aItemMap.find( GetMainItemID() );
if( ii != aItemMap.end() ) if( ii != aItemMap.end() )
mainItem = ii->second; mainItem = ii->second;
ii = aItemMap.find( m_auxItemUuid ); ii = aItemMap.find( GetAuxItemID() );
if( ii != aItemMap.end() ) if( ii != aItemMap.end() )
auxItem = ii->second; auxItem = ii->second;

57
common/rc_item.h
View File

@ -73,26 +73,22 @@ public:
*/ */
class RC_ITEM class RC_ITEM
{ {
public:
typedef std::vector<KIID> KIIDS;
protected: protected:
int m_errorCode; // the error code's numeric value int m_errorCode; // the error code's numeric value
wxString m_errorMessage; ///< A message describing the details of this specific error wxString m_errorMessage; ///< A message describing the details of this specific error
wxString m_errorTitle; ///< The string describing the type of error wxString m_errorTitle; ///< The string describing the type of error
wxString m_settingsKey; ///< The key used to describe this type of error in settings wxString m_settingsKey; ///< The key used to describe this type of error in settings
MARKER_BASE* m_parent; // The marker this item belongs to, if any MARKER_BASE* m_parent; // The marker this item belongs to, if any
KIID m_mainItemUuid;
KIID m_auxItemUuid; KIIDS m_ids;
KIID m_auxItem2Uuid;
KIID m_auxItem3Uuid;
public: public:
RC_ITEM() : RC_ITEM() :
m_errorCode( 0 ), m_errorCode( 0 ),
m_parent( nullptr ), m_parent( nullptr )
m_mainItemUuid( NilUuid() ),
m_auxItemUuid( NilUuid() ),
m_auxItem2Uuid( NilUuid() ),
m_auxItem3Uuid( NilUuid() )
{ {
} }
@ -103,44 +99,55 @@ public:
m_errorTitle = aItem->m_errorTitle; m_errorTitle = aItem->m_errorTitle;
m_settingsKey = aItem->m_settingsKey; m_settingsKey = aItem->m_settingsKey;
m_parent = aItem->m_parent; m_parent = aItem->m_parent;
m_mainItemUuid = aItem->m_mainItemUuid; m_ids = aItem->m_ids;
m_auxItemUuid = aItem->m_auxItemUuid;
m_auxItem2Uuid = aItem->m_auxItem2Uuid;
m_auxItem3Uuid = aItem->m_auxItem3Uuid;
} }
virtual ~RC_ITEM() { } virtual ~RC_ITEM() { }
void SetErrorMessage( const wxString& aMessage ) { m_errorMessage = aMessage; } void SetErrorMessage( const wxString& aMessage ) { m_errorMessage = aMessage; }
void SetItems( const KIIDS& aIds )
{
m_ids = aIds;
}
void AddItem( EDA_ITEM* aItem )
{
m_ids.push_back( aItem->m_Uuid );
}
void SetItems( EDA_ITEM* aItem, EDA_ITEM* bItem = nullptr, EDA_ITEM* cItem = nullptr, void SetItems( EDA_ITEM* aItem, EDA_ITEM* bItem = nullptr, EDA_ITEM* cItem = nullptr,
EDA_ITEM* dItem = nullptr ) EDA_ITEM* dItem = nullptr )
{ {
m_mainItemUuid = aItem->m_Uuid; m_ids.clear();
m_ids.push_back( aItem->m_Uuid );
if( bItem ) if( bItem )
m_auxItemUuid = bItem->m_Uuid; m_ids.push_back( bItem->m_Uuid );
if( cItem ) if( cItem )
m_auxItem2Uuid = cItem->m_Uuid; m_ids.push_back( cItem->m_Uuid );
if( dItem ) if( dItem )
m_auxItem3Uuid = dItem->m_Uuid; m_ids.push_back( dItem->m_Uuid );
} }
void SetItems( const KIID& aItem, const KIID& bItem = niluuid, const KIID& cItem = niluuid, void SetItems( const KIID& aItem, const KIID& bItem = niluuid, const KIID& cItem = niluuid,
const KIID& dItem = niluuid ) const KIID& dItem = niluuid )
{ {
m_mainItemUuid = aItem; m_ids.clear();
m_auxItemUuid = bItem;
m_auxItem2Uuid = cItem; m_ids.push_back( aItem );
m_auxItem3Uuid = dItem; m_ids.push_back( bItem );
m_ids.push_back( cItem );
m_ids.push_back( dItem );
} }
KIID GetMainItemID() const { return m_mainItemUuid; } KIID GetMainItemID() const { return m_ids.size() > 0 ? m_ids[0] : niluuid; }
KIID GetAuxItemID() const { return m_auxItemUuid; } KIID GetAuxItemID() const { return m_ids.size() > 1 ? m_ids[1] : niluuid;; }
KIID GetAuxItem2ID() const { return m_auxItem2Uuid; } KIID GetAuxItem2ID() const { return m_ids.size() > 2 ? m_ids[2] : niluuid;; }
KIID GetAuxItem3ID() const { return m_auxItem3Uuid; } KIID GetAuxItem3ID() const { return m_ids.size() > 3 ? m_ids[3] : niluuid;; }
void SetParent( MARKER_BASE* aMarker ) { m_parent = aMarker; } void SetParent( MARKER_BASE* aMarker ) { m_parent = aMarker; }
MARKER_BASE* GetParent() const { return m_parent; } MARKER_BASE* GetParent() const { return m_parent; }