electron-rare/kicad-source-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement dynamic assignment of component classes

Browse Source
This commit is contained in:
JamesJCode
2025-03-15 14:33:47 +00:00
parent bb62444fe9
commit ede5faee72
56 changed files with 14041 additions and 1605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcbnew/pcbexpr_evaluator.cpp
+6 -9
View File
@@ -31,6 +31,7 @@
#include <board_connected_item.h>
#include <pcbexpr_evaluator.h>
#include <drc/drc_engine.h>
#include <component_classes/component_class.h>
/* --------------------------------------------------------------------------------------------
* Specialized Expression References
@@ -216,7 +217,7 @@ public:
return LIBEVAL::VALUE::AsString();
if( const COMPONENT_CLASS* compClass = m_item->GetComponentClass() )
const_cast<PCBEXPR_COMPONENT_CLASS_VALUE*>( this )->Set( compClass->GetFullName() );
const_cast<PCBEXPR_COMPONENT_CLASS_VALUE*>( this )->Set( compClass->GetName() );
return LIBEVAL::VALUE::AsString();
}
@@ -232,9 +233,7 @@ public:
const COMPONENT_CLASS* aClass = m_item->GetComponentClass();
const COMPONENT_CLASS* bClass = bValue->m_item->GetComponentClass();
// Note this depends on COMPONENT_CLASS_MANAGER maintaining ownership
// of all unique component class objects
return aClass == bClass;
return *aClass == *bClass;
}
if( b->GetType() == LIBEVAL::VT_STRING )
@@ -242,7 +241,7 @@ public:
if( m_item->GetComponentClass()->ContainsClassName( b->AsString() ) )
return true;
return m_item->GetComponentClass()->GetFullName() == b->AsString();
return m_item->GetComponentClass()->GetName() == b->AsString();
}
return LIBEVAL::VALUE::EqualTo( aCtx, b );
@@ -259,16 +258,14 @@ public:
const COMPONENT_CLASS* aClass = m_item->GetComponentClass();
const COMPONENT_CLASS* bClass = bValue->m_item->GetComponentClass();
// Note this depends on COMPONENT_CLASS_MANAGER maintaining ownership
// of all unique component class objects
return aClass != bClass;
return *aClass != *bClass;
}
if( b->GetType() == LIBEVAL::VT_STRING )
{
const bool isInConstituents =
m_item->GetComponentClass()->ContainsClassName( b->AsString() );
const bool isFullName = m_item->GetComponentClass()->GetFullName() == b->AsString();
const bool isFullName = m_item->GetComponentClass()->GetName() == b->AsString();
return !isInConstituents && !isFullName;
}