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

Be diligent in our search for color information 

Just because we find a label reference does not mean that is where the
color is stored.  We do an exhaustive search through the hierarchy for
the correct color data

Fixes https://gitlab.com/kicad/code/kicad/issues/6107

(cherry picked from commit 75c2d1a0bf)
This commit is contained in:
Seth Hillbrand 2020-10-21 15:38:48 -07:00
parent 831c51c875
commit 386f827d38
1 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
plugins/3d/oce/loadmodel.cpp
View File

@ -560,22 +560,61 @@ bool processSolid( const TopoDS_Shape& shape, DATA& data, SGNODE* parent,
Quantity_Color col; Quantity_Color col;
Quantity_Color* lcolor = NULL; Quantity_Color* lcolor = NULL;
if( !data.m_assy->Search( shape, label, Standard_False ) ) // Search the whole model first to make sure something exists (may or may not have color)
if( !data.m_assy->Search( shape, label ) )
{ {
static int i = 0; static int i = 0;
std::ostringstream ostr; std::ostringstream ostr;
ostr << "KMISC_" << i++; ostr << "KMISC_" << i++;
partID = ostr.str(); partID = ostr.str();
printf("Missing lable\n");
} }
else else
{ {
getTag( label, partID ); bool found_color = false;
if( getColor( data, label, col ) ) if( getColor( data, label, col ) )
{
found_color = true;
lcolor = &col; lcolor = &col;
} }
// If the top-level label doesn't have the color information, search components
if( !found_color )
{
if( data.m_assy->Search( shape, label, Standard_False, Standard_True, Standard_True ) &&
getColor( data, label, col ) )
{
found_color = true;
lcolor = &col;
}
}
// If the components do not have color information, search all components without location
if( !found_color )
{
if( data.m_assy->Search( shape, label, Standard_False, Standard_False, Standard_True ) &&
getColor( data, label, col ) )
{
found_color = true;
lcolor = &col;
}
}
// Our last chance to find the color looks for color as a subshape of top-level simple shapes
if( !found_color )
{
if( data.m_assy->Search( shape, label, Standard_False, Standard_False, Standard_False ) &&
getColor( data, label, col ) )
{
found_color = true;
lcolor = &col;
}
}
getTag( label, partID );
}
TopoDS_Iterator it; TopoDS_Iterator it;
IFSG_TRANSFORM childNode( parent ); IFSG_TRANSFORM childNode( parent );
SGNODE* pptr = childNode.GetRawPtr(); SGNODE* pptr = childNode.GetRawPtr();