OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0031159: Visualization - Font_FontMgr skips sub-faces within .ttc font collections

Browse Source 
Font_SystemFont now defines Face Id in addition to file path.
Font_FontMgr::CheckFont() has been extended to return the list of Faces from font collections.
This commit is contained in:
kgv
2019-11-13 14:31:48 +03:00
committed by bugmaster
parent 31a5a359bb
commit 9a90a4524e
9 changed files with 151 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Font/Font_SystemFont.cxx
View File

@@ -29,6 +29,7 @@ Font_SystemFont::Font_SystemFont (const TCollection_AsciiString& theFontName)
myFontName (theFontName),
myIsSingleLine (Standard_False)
{
memset (myFaceIds, 0, sizeof(myFaceIds));
if (theFontName.IsEmpty()) { throw Standard_ProgramError ("Font_SystemFont constructor called with empty font name"); }
myFontKey.LowerCase();
}
@@ -38,10 +39,12 @@ Font_SystemFont::Font_SystemFont (const TCollection_AsciiString& theFontName)
// purpose :
// =======================================================================
void Font_SystemFont::SetFontPath (Font_FontAspect theAspect,
const TCollection_AsciiString& thePath)
const TCollection_AsciiString& thePath,
const Standard_Integer theFaceId)
{
if (theAspect == Font_FontAspect_UNDEFINED) { throw Standard_ProgramError ("Font_SystemFont::SetFontPath() called with UNDEFINED aspect"); }
myFilePaths[theAspect] = thePath;
myFaceIds [theAspect] = theFaceId;
}
// =======================================================================
@@ -102,6 +105,10 @@ TCollection_AsciiString Font_SystemFont::ToString() const
isFirstAspect = false;
}
aDesc += FontPath ((Font_FontAspect )anAspectIter);
if (FontFaceId ((Font_FontAspect )anAspectIter) != 0)
{
aDesc = aDesc + "," + FontFaceId ((Font_FontAspect )anAspectIter);
}
}
aDesc += "]";
return aDesc;