OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0023466: Move OSD_FontMgr class outside TKernel

Browse Source 
Created new package Font in TKService.
Classes FontMgr and SystemFont have been moved from OSD package to Font package.
This commit is contained in:
dbv 2012-10-11 17:45:15 +04:00
parent f1e162f2ad
commit eeaaaefb6f
39 changed files with 247 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
adm/UDLIST
View File

@ -501,3 +501,4 @@ r QAResources
t TKQADraw t TKQADraw
p QADNaming p QADNaming
p QABugs p QABugs
p Font

1
src/Font/FILES Normal file
View File

@ -0,0 +1 @@
Font_NListOfSystemFont.hxx

36
src/Font/Font.cdl Normal file
View File

@ -0,0 +1,36 @@
-- Copyright (c) 1992-1999 Matra Datavision
-- Copyright (c) 1999-2012 OPEN CASCADE SAS
--
-- The content of this file is subject to the Open CASCADE Technology Public
-- License Version 6.5 (the "License"). You may not use the content of this file
-- except in compliance with the License. Please obtain a copy of the License
-- at http://www.opencascade.org and read it completely before using this file.
--
-- The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
-- main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
--
-- The Original Code and all software distributed under the License is
-- distributed on an "AS IS" basis, without warranty of any kind, and the
-- Initial Developer hereby disclaims all such warranties, including without
-- limitation, any warranties of merchantability, fitness for a particular
-- purpose or non-infringement. Please see the License for the specific terms
-- and conditions governing the rights and limitations under the License.
package Font
uses Standard ,
Quantity ,
TCollection,
OSD
is
enumeration FontAspect is FA_Undefined, FA_Regular, FA_Bold, FA_Italic, FA_BoldItalic;
---Purpose: Specifies aspect of system font.
class SystemFont;
imported NListOfSystemFont;
class FontMgr;
end Font;

32
src/OSD/OSD_FontMgr.cdl → src/Font/Font_FontMgr.cdl Executable file → Normal file
View File

@ -17,36 +17,28 @@
-- purpose or non-infringement. Please see the License for the specific terms -- purpose or non-infringement. Please see the License for the specific terms
-- and conditions governing the rights and limitations under the License. -- and conditions governing the rights and limitations under the License.
class FontMgr from Font inherits TShared from MMgt
---Purpose: Structure for store of Font System Information
-- Updated: uses SystemFont,
class FontMgr from OSD inherits TShared from MMgt
---Purpose: Structure for store of Font System Information
uses Path,
SystemFont,
NListOfSystemFont, NListOfSystemFont,
Path from OSD,
AsciiString from TCollection AsciiString from TCollection
is is
GetInstance(myclass) GetInstance(myclass) returns FontMgr;
returns FontMgr; ---Level: Public
---Level: Public
GetAvalableFonts(me) GetAvalableFonts(me) returns NListOfSystemFont;
returns NListOfSystemFont;
--- Private methods --- Private methods
Create returns FontMgr is private; Create returns FontMgr is private;
---Purpose: Creates empty font object ---Purpose: Creates empty font object
---Level: Private ---Level: Private
InitFontDataBase(me:mutable) is private; InitFontDataBase(me:mutable) is private;
fields fields
MyListOfFonts: NListOfSystemFont;
MyListOfFonts: NListOfSystemFont; end FontMgr;
end FontMgr;

47
src/OSD/OSD_FontMgr.cxx → src/Font/Font_FontMgr.cxx Executable file → Normal file
View File

@ -17,10 +17,7 @@
// purpose or non-infringement. Please see the License for the specific terms // purpose or non-infringement. Please see the License for the specific terms
// and conditions governing the rights and limitations under the License. // and conditions governing the rights and limitations under the License.
#include <Font_FontMgr.ixx>
// Updated:
#include <OSD_FontMgr.ixx>
#ifdef WNT #ifdef WNT
# include <windows.h> # include <windows.h>
# include <stdlib.h> # include <stdlib.h>
@ -48,7 +45,7 @@
#include <OSD_FileNode.hxx> #include <OSD_FileNode.hxx>
#include <OSD_OpenMode.hxx> #include <OSD_OpenMode.hxx>
#include <OSD_Protection.hxx> #include <OSD_Protection.hxx>
#include <OSD_NListOfSystemFont.hxx> #include <Font_NListOfSystemFont.hxx>
const Standard_Integer font_service_conf_size = 3; const Standard_Integer font_service_conf_size = 3;
static Standard_Character font_service_conf[font_service_conf_size][64] = { {"/etc/X11/fs/config"}, static Standard_Character font_service_conf[font_service_conf_size][64] = { {"/etc/X11/fs/config"},
@ -106,23 +103,23 @@ void find_path_with_font_dir( const TCollection_AsciiString& dir,StringList& dir
#endif //WNT #endif //WNT
Handle(OSD_FontMgr) OSD_FontMgr::GetInstance() { Handle(Font_FontMgr) Font_FontMgr::GetInstance() {
static Handle(OSD_FontMgr) _mgr; static Handle(Font_FontMgr) _mgr;
if ( _mgr.IsNull() ) if ( _mgr.IsNull() )
_mgr = new OSD_FontMgr(); _mgr = new Font_FontMgr();
return _mgr; return _mgr;
} }
OSD_FontMgr::OSD_FontMgr() { Font_FontMgr::Font_FontMgr() {
InitFontDataBase(); InitFontDataBase();
} }
void OSD_FontMgr::InitFontDataBase() { void Font_FontMgr::InitFontDataBase() {
MyListOfFonts.Clear(); MyListOfFonts.Clear();
@ -164,7 +161,7 @@ void OSD_FontMgr::InitFontDataBase() {
DWORD type; DWORD type;
size_name = 100, size_name = 100,
size_data = 100; size_data = 100;
OSD_FontAspect aspect; Font_FontAspect aspect;
if( RegEnumValue( fonts_hkey, if( RegEnumValue( fonts_hkey,
id, id,
buf_name, buf_name,
@ -188,15 +185,15 @@ void OSD_FontMgr::InitFontDataBase() {
fname->RightAdjust(); fname->RightAdjust();
if ( ( anIndex = fname->SearchFromEnd( new TCollection_HAsciiString("Bold Italic") ) ) > 0 ) { if ( ( anIndex = fname->SearchFromEnd( new TCollection_HAsciiString("Bold Italic") ) ) > 0 ) {
aTruncate = ( anIndex > 1 ) && ( fname->Value(anIndex - 1 ) == ' ' ); aTruncate = ( anIndex > 1 ) && ( fname->Value(anIndex - 1 ) == ' ' );
aspect = OSD_FA_BoldItalic; aspect = Font_FA_BoldItalic;
} else if ( ( anIndex = fname->SearchFromEnd( new TCollection_HAsciiString("Bold") ) ) > 0 ) { } else if ( ( anIndex = fname->SearchFromEnd( new TCollection_HAsciiString("Bold") ) ) > 0 ) {
aTruncate = ( anIndex > 1 ) && ( fname->Value(anIndex - 1 ) == ' ' ); aTruncate = ( anIndex > 1 ) && ( fname->Value(anIndex - 1 ) == ' ' );
aspect = OSD_FA_Bold; aspect = Font_FA_Bold;
} else if ( ( anIndex = fname->SearchFromEnd( new TCollection_HAsciiString("Italic") ) ) > 0 ) { } else if ( ( anIndex = fname->SearchFromEnd( new TCollection_HAsciiString("Italic") ) ) > 0 ) {
aTruncate = ( anIndex > 1 ) && ( fname->Value(anIndex - 1 ) == ' ' ); aTruncate = ( anIndex > 1 ) && ( fname->Value(anIndex - 1 ) == ' ' );
aspect = OSD_FA_Italic; aspect = Font_FA_Italic;
} else { } else {
aspect = OSD_FA_Regular; aspect = Font_FA_Regular;
} }
if( aTruncate ) if( aTruncate )
fname->Trunc( anIndex - 1 ); fname->Trunc( anIndex - 1 );
@ -210,24 +207,24 @@ void OSD_FontMgr::InitFontDataBase() {
if( ( ( file_path->Search(".ttf") > 0 ) || ( file_path->Search(".TTF") > 0 ) || if( ( ( file_path->Search(".ttf") > 0 ) || ( file_path->Search(".TTF") > 0 ) ||
( file_path->Search(".otf") > 0 ) || ( file_path->Search(".OTF") > 0 ) || ( file_path->Search(".otf") > 0 ) || ( file_path->Search(".OTF") > 0 ) ||
( file_path->Search(".ttc") > 0 ) || ( file_path->Search(".TTC") > 0 ) ) ){ ( file_path->Search(".ttc") > 0 ) || ( file_path->Search(".TTC") > 0 ) ) ){
MyListOfFonts.Append( new OSD_SystemFont( fname, aspect, file_path ) ); MyListOfFonts.Append( new Font_SystemFont( fname, aspect, file_path ) );
#ifdef TRACE #ifdef TRACE
cout << "Adding font...\n" cout << "Adding font...\n"
<< " font name: " << fname->ToCString() << "\n" << " font name: " << fname->ToCString() << "\n"
<< " font file: " << file_path->ToCString() << "\n" << " font file: " << file_path->ToCString() << "\n"
<< " font aspect: "; << " font aspect: ";
switch( aspect ) { switch( aspect ) {
case OSD_FA_Bold: case Font_FA_Bold:
cout << "OSD_FA_Bold\n"; cout << "Font_FA_Bold\n";
break; break;
case OSD_FA_BoldItalic: case Font_FA_BoldItalic:
cout << "OSD_FA_BoldItalic\n"; cout << "Font_FA_BoldItalic\n";
break; break;
case OSD_FA_Italic: case Font_FA_Italic:
cout << "OSD_FA_Italic\n"; cout << "Font_FA_Italic\n";
break; break;
default: default:
cout << "OSD_FA_Regular\n"; cout << "Font_FA_Regular\n";
break; break;
} }
#endif #endif
@ -412,7 +409,7 @@ void OSD_FontMgr::InitFontDataBase() {
aPath.AssignCat( "/" ); aPath.AssignCat( "/" );
aPath.AssignCat( aLine.Token( " ", 1 ) ); aPath.AssignCat( aLine.Token( " ", 1 ) );
} }
MyListOfFonts.Append( new OSD_SystemFont( new TCollection_HAsciiString( aXLFD ), MyListOfFonts.Append( new Font_SystemFont( new TCollection_HAsciiString( aXLFD ),
new TCollection_HAsciiString( aPath ) ) ); new TCollection_HAsciiString( aPath ) ) );
} }
@ -429,7 +426,7 @@ void OSD_FontMgr::InitFontDataBase() {
#endif #endif
} }
OSD_NListOfSystemFont OSD_FontMgr::GetAvalableFonts() const Font_NListOfSystemFont Font_FontMgr::GetAvalableFonts() const
{ {
return MyListOfFonts; return MyListOfFonts;
} }

15
src/OSD/OSD_NListOfSystemFont.hxx → src/Font/Font_NListOfSystemFont.hxx Executable file → Normal file
View File

@ -16,16 +16,11 @@
// limitation, any warranties of merchantability, fitness for a particular // limitation, any warranties of merchantability, fitness for a particular
// purpose or non-infringement. Please see the License for the specific terms // purpose or non-infringement. Please see the License for the specific terms
// and conditions governing the rights and limitations under the License. // and conditions governing the rights and limitations under the License.
#ifndef _Font_NListOfSystemFont_HeaderFile
#define _Font_NListOfSystemFont_HeaderFile
#ifndef _OSD_NListOfSystemFont_HeaderFile
#define _OSD_NListOfSystemFont_HeaderFile
#include <NCollection_DefineList.hxx> #include <NCollection_DefineList.hxx>
#include <OSD_SystemFont.hxx> #include <Font_SystemFont.hxx>
DEFINE_LIST (Font_NListOfSystemFont,
DEFINE_LIST (OSD_NListOfSystemFont,
NCollection_List, NCollection_List,
Handle(OSD_SystemFont)) Handle(Font_SystemFont))
#endif #endif

73
src/OSD/OSD_SystemFont.cdl → src/Font/Font_SystemFont.cdl Executable file → Normal file
View File

@ -17,62 +17,49 @@
-- purpose or non-infringement. Please see the License for the specific terms -- purpose or non-infringement. Please see the License for the specific terms
-- and conditions governing the rights and limitations under the License. -- and conditions governing the rights and limitations under the License.
class SystemFont from Font inherits TShared from MMgt
-- Updated: ---Purpose: Structure for store of Font System Information
class SystemFont from OSD inherits TShared from MMgt
---Purpose: Structure for store of Font System Information
uses FontAspect, uses FontAspect,
HAsciiString from TCollection HAsciiString from TCollection
is is
Create returns SystemFont; Create returns SystemFont;
---Purpose: Creates empty font object ---Purpose: Creates empty font object
---Level: Public ---Level: Public
Create ( Create (FontName : HAsciiString;
FontName : HAsciiString; Aspect : FontAspect;
Aspect : FontAspect; FilePath : HAsciiString ) returns SystemFont;
FilePath : HAsciiString ) returns SystemFont; ---Purpose: Creates Font object initialized with <FontName> as name
---Purpose: Creates Font object initialized with <FontName> as name --- <FontAspect>.... TODO
--- <FontAspect>.... TODO ---Level: Public
---Level: Public
Create ( Create (XLFD : HAsciiString;
XLFD : HAsciiString; FilePath : HAsciiString ) returns SystemFont;
FilePath : HAsciiString ) returns SystemFont; ---Purpose: TODO
---Purpose: TODO ---Level: Public
---Level: Public
FontName (me) FontName (me) returns HAsciiString;
returns HAsciiString; --- Purpose: Returns font family name
--- Purpose: Returns font family name ---Level: Public
---Level: Public
FontPath (me) FontPath (me) returns HAsciiString;
returns HAsciiString; --- Purpose: Returns font file path
--- Purpose: Returns font file path --- Level: Public
--- Level: Public
FontAspect (me) FontAspect (me) returns FontAspect;
returns FontAspect from OSD; --- Purpose: Returns font aspect
--- Purpose: Returns font aspect --- Level: Public
--- Level: Public
FontHeight (me) FontHeight (me) returns Integer from Standard;
returns Integer from Standard; --- Purpose: Returns font height
--- Purpose: Returns font height --- If returned value is equal -1 it means that font is resizable
--- If returned value is equal -1 it means that font is resizable --- Level: Public
--- Level: Public
IsValid( me ) IsValid (me) returns Boolean;
returns Boolean;
fields fields
MyFontName: HAsciiString; --Font family name MyFontName: HAsciiString; --Font family name
MyFontAspect: FontAspect; MyFontAspect: FontAspect;
MyFaceSize: Integer; --height of font MyFaceSize: Integer; --height of font

38
src/OSD/OSD_SystemFont.cxx → src/Font/Font_SystemFont.cxx Executable file → Normal file
View File

@ -20,21 +20,21 @@
// Updated: // Updated:
#include <OSD_SystemFont.ixx> #include <Font_SystemFont.ixx>
#include <OSD_Path.hxx> #include <OSD_Path.hxx>
#include <TCollection_HAsciiString.hxx> #include <TCollection_HAsciiString.hxx>
OSD_SystemFont::OSD_SystemFont(): Font_SystemFont::Font_SystemFont():
MyFontName(), MyFontName(),
MyFontAspect(OSD_FA_Undefined), MyFontAspect(Font_FA_Undefined),
MyFaceSize(-1), MyFaceSize(-1),
MyVerification(Standard_False) MyVerification(Standard_False)
{ {
} }
OSD_SystemFont::OSD_SystemFont( const Handle(TCollection_HAsciiString)& FontName, Font_SystemFont::Font_SystemFont( const Handle(TCollection_HAsciiString)& FontName,
const OSD_FontAspect FontAspect, const Font_FontAspect FontAspect,
const Handle(TCollection_HAsciiString)& FilePath ): const Handle(TCollection_HAsciiString)& FilePath ):
MyFontName(FontName), MyFontName(FontName),
MyFontAspect(FontAspect), MyFontAspect(FontAspect),
@ -45,10 +45,10 @@ MyVerification(Standard_True)
} }
OSD_SystemFont::OSD_SystemFont( const Handle(TCollection_HAsciiString)& XLFD, Font_SystemFont::Font_SystemFont( const Handle(TCollection_HAsciiString)& XLFD,
const Handle(TCollection_HAsciiString)& FilePath) : const Handle(TCollection_HAsciiString)& FilePath) :
MyFilePath(FilePath), MyFilePath(FilePath),
MyFontAspect(OSD_FA_Undefined) MyFontAspect(Font_FA_Undefined)
{ {
MyVerification = Standard_True; MyVerification = Standard_True;
if ( XLFD.IsNull() ) if ( XLFD.IsNull() )
@ -75,27 +75,27 @@ MyFontAspect(OSD_FA_Undefined)
//detect aspect //detect aspect
if ( str.Token("-", 3).IsEqual( "bold" ) ) if ( str.Token("-", 3).IsEqual( "bold" ) )
MyFontAspect = OSD_FA_Bold; MyFontAspect = Font_FA_Bold;
else if ( str.Token("-", 3).IsEqual( "medium" ) || else if ( str.Token("-", 3).IsEqual( "medium" ) ||
str.Token("-", 3).IsEqual( "normal" ) ) str.Token("-", 3).IsEqual( "normal" ) )
MyFontAspect = OSD_FA_Regular; MyFontAspect = Font_FA_Regular;
if ( MyFontAspect != OSD_FA_Undefined && if ( MyFontAspect != Font_FA_Undefined &&
( str.Token("-",4 ).IsEqual( "i" ) || str.Token("-",4 ).IsEqual( "o" ) ) ) ( str.Token("-",4 ).IsEqual( "i" ) || str.Token("-",4 ).IsEqual( "o" ) ) )
{ {
if ( MyFontAspect == OSD_FA_Bold ) if ( MyFontAspect == Font_FA_Bold )
MyFontAspect = OSD_FA_BoldItalic; MyFontAspect = Font_FA_BoldItalic;
else else
MyFontAspect = OSD_FA_Italic; MyFontAspect = Font_FA_Italic;
} }
} }
} }
Standard_Boolean OSD_SystemFont::IsValid() const{ Standard_Boolean Font_SystemFont::IsValid() const{
if ( !MyVerification) if ( !MyVerification)
return Standard_False; return Standard_False;
if ( MyFontAspect == OSD_FA_Undefined ) if ( MyFontAspect == Font_FA_Undefined )
return Standard_False; return Standard_False;
if ( MyFontName->IsEmpty() || !MyFontName->IsAscii() ) if ( MyFontName->IsEmpty() || !MyFontName->IsAscii() )
@ -105,18 +105,18 @@ Standard_Boolean OSD_SystemFont::IsValid() const{
return path.IsValid( MyFilePath->String() ); return path.IsValid( MyFilePath->String() );
} }
Handle(TCollection_HAsciiString) OSD_SystemFont::FontPath() const{ Handle(TCollection_HAsciiString) Font_SystemFont::FontPath() const{
return MyFilePath; return MyFilePath;
} }
Handle(TCollection_HAsciiString) OSD_SystemFont::FontName() const{ Handle(TCollection_HAsciiString) Font_SystemFont::FontName() const{
return MyFontName; return MyFontName;
} }
OSD_FontAspect OSD_SystemFont::FontAspect() const{ Font_FontAspect Font_SystemFont::FontAspect() const{
return MyFontAspect; return MyFontAspect;
} }
Standard_Integer OSD_SystemFont::FontHeight() const { Standard_Integer Font_SystemFont::FontHeight() const {
return MyFaceSize; return MyFaceSize;
} }

3
src/Graphic3d/Graphic3d.cdl
View File

@ -77,7 +77,8 @@ uses
WNT, WNT,
Image, Image,
AlienImage, AlienImage,
gp gp,
Font
is is
----------------------- -----------------------

10
src/Graphic3d/Graphic3d_AspectText3d.cdl
View File

@ -40,7 +40,7 @@ uses
TypeOfStyleText from Aspect, TypeOfStyleText from Aspect,
TypeOfDisplayText from Aspect, TypeOfDisplayText from Aspect,
AsciiString from TCollection, AsciiString from TCollection,
FontAspect from OSD FontAspect from Font
raises raises
@ -169,12 +169,12 @@ is
---Purpose: Returns Angle of degree ---Purpose: Returns Angle of degree
SetTextFontAspect ( me : mutable; SetTextFontAspect ( me : mutable;
AFontAspect : FontAspect from OSD ); AFontAspect : FontAspect from Font );
---Level: Public ---Level: Public
---Purpose: Turns usage of Aspect text ---Purpose: Turns usage of Aspect text
---Category: Methods to modify the class definition ---Category: Methods to modify the class definition
GetTextFontAspect( me ) returns FontAspect from OSD; GetTextFontAspect( me ) returns FontAspect from Font;
---Level: Public ---Level: Public
---Purpose: Returns text FontAspect ---Purpose: Returns text FontAspect
@ -239,7 +239,7 @@ is
AColorSubTitle : out Color from Quantity; AColorSubTitle : out Color from Quantity;
ATextZoomable : out Boolean from Standard; ATextZoomable : out Boolean from Standard;
ATextAngle : out Real from Standard; ATextAngle : out Real from Standard;
ATextFontAspect : out FontAspect from OSD) ATextFontAspect : out FontAspect from Font)
is static; is static;
---Level: Public ---Level: Public
---Purpose: Returns the current values of the group <me>. ---Purpose: Returns the current values of the group <me>.
@ -290,6 +290,6 @@ fields
MyTextAngle : Real from Standard; MyTextAngle : Real from Standard;
-- the variable turning FontAspect of the text -- the variable turning FontAspect of the text
MyTextFontAspect : FontAspect from OSD; MyTextFontAspect : FontAspect from Font;
end AspectText3d; end AspectText3d;

10
src/Graphic3d/Graphic3d_AspectText3d.cxx
View File

@ -83,7 +83,7 @@ Graphic3d_AspectText3d::Graphic3d_AspectText3d ():
MyFont (Graphic3d_NOF_ASCII_MONO), MyColor (Quantity_NOC_YELLOW), MyFactor (1.0), MySpace (0.0), MyStyle (Aspect_TOST_NORMAL), MyDisplayType (Aspect_TODT_NORMAL), MyColorSubTitle (Quantity_NOC_WHITE) { MyFont (Graphic3d_NOF_ASCII_MONO), MyColor (Quantity_NOC_YELLOW), MyFactor (1.0), MySpace (0.0), MyStyle (Aspect_TOST_NORMAL), MyDisplayType (Aspect_TODT_NORMAL), MyColorSubTitle (Quantity_NOC_WHITE) {
MyTextZoomable = Standard_False; MyTextZoomable = Standard_False;
MyTextAngle = 0.0; MyTextAngle = 0.0;
MyTextFontAspect = OSD_FA_Regular; MyTextFontAspect = Font_FA_Regular;
} }
Graphic3d_AspectText3d::Graphic3d_AspectText3d ( Graphic3d_AspectText3d::Graphic3d_AspectText3d (
@ -96,7 +96,7 @@ Graphic3d_AspectText3d::Graphic3d_AspectText3d (
MyFont(AFont), MyColor (AColor), MyFactor (AFactor), MySpace (ASpace), MyStyle (AStyle), MyDisplayType(ADisplayType), MyColorSubTitle (Quantity_NOC_WHITE) { MyFont(AFont), MyColor (AColor), MyFactor (AFactor), MySpace (ASpace), MyStyle (AStyle), MyDisplayType(ADisplayType), MyColorSubTitle (Quantity_NOC_WHITE) {
MyTextZoomable = Standard_False; MyTextZoomable = Standard_False;
MyTextAngle = 0.0; MyTextAngle = 0.0;
MyTextFontAspect = OSD_FA_Regular; MyTextFontAspect = Font_FA_Regular;
if(MyFont.Length() == 0) if(MyFont.Length() == 0)
MyFont.AssignCat(Graphic3d_NOF_ASCII_MONO); MyFont.AssignCat(Graphic3d_NOF_ASCII_MONO);
@ -181,12 +181,12 @@ Standard_Real Graphic3d_AspectText3d::GetTextAngle() const
return MyTextAngle; return MyTextAngle;
} }
void Graphic3d_AspectText3d::SetTextFontAspect(const OSD_FontAspect AFontAspect) void Graphic3d_AspectText3d::SetTextFontAspect(const Font_FontAspect AFontAspect)
{ {
MyTextFontAspect = AFontAspect; MyTextFontAspect = AFontAspect;
} }
OSD_FontAspect Graphic3d_AspectText3d::GetTextFontAspect() const Font_FontAspect Graphic3d_AspectText3d::GetTextFontAspect() const
{ {
return MyTextFontAspect; return MyTextFontAspect;
} }
@ -236,7 +236,7 @@ void Graphic3d_AspectText3d::Values ( Quantity_Color& AColor,
Quantity_Color& AColorSubTitle, Quantity_Color& AColorSubTitle,
Standard_Boolean& ATextZoomable, Standard_Boolean& ATextZoomable,
Standard_Real& ATextAngle, Standard_Real& ATextAngle,
OSD_FontAspect& ATextFontAspect ) const Font_FontAspect& ATextFontAspect ) const
{ {
AColor = MyColor; AColor = MyColor;

6
src/Graphic3d/Graphic3d_CGraduatedTrihedron.hxx
View File

@ -27,7 +27,7 @@
#include <Quantity_Color.hxx> #include <Quantity_Color.hxx>
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>
#include <TCollection_ExtendedString.hxx> #include <TCollection_ExtendedString.hxx>
#include <OSD_FontAspect.hxx> #include <Font_FontAspect.hxx>
typedef void (*minMaxValuesCallback)(void*); typedef void (*minMaxValuesCallback)(void*);
class Graphic3d_CGraduatedTrihedron class Graphic3d_CGraduatedTrihedron
@ -65,13 +65,13 @@ class Graphic3d_CGraduatedTrihedron
/* Font name of names of axes: Courier, Arial, ... */ /* Font name of names of axes: Courier, Arial, ... */
TCollection_AsciiString fontOfNames; TCollection_AsciiString fontOfNames;
/* Style of names of axes: OSD_FA_Regular, OSD_FA_Bold, ... */ /* Style of names of axes: OSD_FA_Regular, OSD_FA_Bold, ... */
OSD_FontAspect styleOfNames; Font_FontAspect styleOfNames;
/* Size of names of axes: 8, 10, 12, 14, ... */ /* Size of names of axes: 8, 10, 12, 14, ... */
Standard_Integer sizeOfNames; Standard_Integer sizeOfNames;
/* Font name of values: Courier, Arial, ... */ /* Font name of values: Courier, Arial, ... */
TCollection_AsciiString fontOfValues; TCollection_AsciiString fontOfValues;
/* Style of values: OSD_FA_Regular, OSD_FA_Bold, ... */ /* Style of values: OSD_FA_Regular, OSD_FA_Bold, ... */
OSD_FontAspect styleOfValues; Font_FontAspect styleOfValues;
/* Size of values: 8, 10, 12, 14, ... */ /* Size of values: 8, 10, 12, 14, ... */
Standard_Integer sizeOfValues; Standard_Integer sizeOfValues;

2
src/Graphic3d/Graphic3d_GraphicDriver.cdl
View File

@ -129,7 +129,7 @@ uses
HArray1OfReal from TColStd, HArray1OfReal from TColStd,
CUserDraw from Graphic3d, CUserDraw from Graphic3d,
NListOfHAsciiString from Graphic3d, NListOfHAsciiString from Graphic3d,
FontAspect from OSD, FontAspect from Font,
CGraduatedTrihedron from Graphic3d CGraduatedTrihedron from Graphic3d
raises raises

4
src/Graphic3d/Graphic3d_Group_8.cxx
View File

@ -344,7 +344,7 @@ void Graphic3d_Group::SetGroupPrimitivesAspect (const Handle(Graphic3d_AspectTex
Quantity_Color AColorSubTitle; Quantity_Color AColorSubTitle;
Standard_Boolean ATextZoomable; Standard_Boolean ATextZoomable;
Standard_Real ATextAngle; Standard_Real ATextAngle;
OSD_FontAspect ATextFontAspect; Font_FontAspect ATextFontAspect;
CTX->Values (AColor, AFont, AnExpansion, ASpace, AStyle, ADisplayType,AColorSubTitle,ATextZoomable,ATextAngle,ATextFontAspect); CTX->Values (AColor, AFont, AnExpansion, ASpace, AStyle, ADisplayType,AColorSubTitle,ATextZoomable,ATextAngle,ATextFontAspect);
AColor.Values (R, G, B, Quantity_TOC_RGB); AColor.Values (R, G, B, Quantity_TOC_RGB);
@ -664,7 +664,7 @@ void Graphic3d_Group::SetPrimitivesAspect (const Handle(Graphic3d_AspectText3d)&
Quantity_Color AColorSubTitle; Quantity_Color AColorSubTitle;
Standard_Boolean ATextZoomable; Standard_Boolean ATextZoomable;
Standard_Real ATextAngle; Standard_Real ATextAngle;
OSD_FontAspect ATextFontAspect; Font_FontAspect ATextFontAspect;
CTX->Values (AColor, AFont, AnExpansion, ASpace, AStyle, ADisplayType,AColorSubTitle,ATextZoomable,ATextAngle,ATextFontAspect); CTX->Values (AColor, AFont, AnExpansion, ASpace, AStyle, ADisplayType,AColorSubTitle,ATextZoomable,ATextAngle,ATextFontAspect);
AColor.Values (R, G, B, Quantity_TOC_RGB); AColor.Values (R, G, B, Quantity_TOC_RGB);

4
src/Graphic3d/Graphic3d_Structure.cxx
View File

@ -1294,7 +1294,7 @@ void Graphic3d_Structure::SetPrimitivesAspect (const Handle(Graphic3d_AspectText
Quantity_Color AColorSubTitle; Quantity_Color AColorSubTitle;
Standard_Boolean ATextZoomable; Standard_Boolean ATextZoomable;
Standard_Real ATextAngle; Standard_Real ATextAngle;
OSD_FontAspect ATextFontAspect; Font_FontAspect ATextFontAspect;
CTX->Values (AColor, AFont, AnExpansion, ASpace, AStyle, ADisplayType,AColorSubTitle,ATextZoomable,ATextAngle,ATextFontAspect); CTX->Values (AColor, AFont, AnExpansion, ASpace, AStyle, ADisplayType,AColorSubTitle,ATextZoomable,ATextAngle,ATextFontAspect);
AColor.Values (R, G, B, Quantity_TOC_RGB); AColor.Values (R, G, B, Quantity_TOC_RGB);
@ -2113,7 +2113,7 @@ void Graphic3d_Structure::UpdateStructure (const Handle(Graphic3d_AspectLine3d)&
Quantity_Color AColorSubTitle; Quantity_Color AColorSubTitle;
Standard_Boolean ATextZoomable; Standard_Boolean ATextZoomable;
Standard_Real ATextAngle; Standard_Real ATextAngle;
OSD_FontAspect ATextFontAspect; Font_FontAspect ATextFontAspect;
CTXL->Values (AColor, ALType, AWidth); CTXL->Values (AColor, ALType, AWidth);

4
src/MeshVS/MeshVS_TextPrsBuilder.cxx
View File

@ -178,7 +178,7 @@ void MeshVS_TextPrsBuilder::Build ( const Handle(Prs3d_Presentation)& Prs,
TCollection_AsciiString AFontString; TCollection_AsciiString AFontString;
Standard_Integer ADispInt; Standard_Integer ADispInt;
// Bold font is used by default for better text readability // Bold font is used by default for better text readability
OSD_FontAspect AFontAspectType = OSD_FA_Bold; Font_FontAspect AFontAspectType = Font_FA_Bold;
Standard_Integer AAspect; Standard_Integer AAspect;
@ -193,7 +193,7 @@ void MeshVS_TextPrsBuilder::Build ( const Handle(Prs3d_Presentation)& Prs,
if ( aDrawer->GetInteger ( MeshVS_DA_TextDisplayType, ADispInt ) ) if ( aDrawer->GetInteger ( MeshVS_DA_TextDisplayType, ADispInt ) )
ADisplayType = (Aspect_TypeOfDisplayText) ADispInt; ADisplayType = (Aspect_TypeOfDisplayText) ADispInt;
if ( aDrawer->GetInteger ( MeshVS_DA_TextFontAspect, AAspect ) ) if ( aDrawer->GetInteger ( MeshVS_DA_TextFontAspect, AAspect ) )
AFontAspectType = (OSD_FontAspect)AAspect; AFontAspectType = (Font_FontAspect)AAspect;
Handle (Graphic3d_AspectText3d) aTextAspect = new Graphic3d_AspectText3d ( AColor, AFont, AExpansionFactor, ASpace, Handle (Graphic3d_AspectText3d) aTextAspect = new Graphic3d_AspectText3d ( AColor, AFont, AExpansionFactor, ASpace,
ATextStyle, ADisplayType ); ATextStyle, ADisplayType );

6
src/MeshVS/MeshVS_Tool.cxx
View File

@ -200,11 +200,11 @@ Handle( Graphic3d_AspectText3d ) MeshVS_Tool::CreateAspectText3d
Aspect_TypeOfStyleText aStyle = Aspect_TOST_NORMAL; Aspect_TypeOfStyleText aStyle = Aspect_TOST_NORMAL;
Aspect_TypeOfDisplayText aDispText = Aspect_TODT_NORMAL; Aspect_TypeOfDisplayText aDispText = Aspect_TODT_NORMAL;
TCollection_AsciiString aFontString = Graphic3d_NOF_ASCII_MONO; TCollection_AsciiString aFontString = Graphic3d_NOF_ASCII_MONO;
OSD_FontAspect aFontAspect = OSD_FA_Regular; Font_FontAspect aFontAspect = Font_FA_Regular;
Standard_Integer aStyleI = (Standard_Integer)Aspect_TOST_NORMAL; Standard_Integer aStyleI = (Standard_Integer)Aspect_TOST_NORMAL;
Standard_Integer aDispTextI = (Standard_Integer)Aspect_TODT_NORMAL; Standard_Integer aDispTextI = (Standard_Integer)Aspect_TODT_NORMAL;
// Bold font is used by default for better text readability // Bold font is used by default for better text readability
Standard_Integer aFontAspectI = (Standard_Integer)OSD_FA_Bold; Standard_Integer aFontAspectI = (Standard_Integer)Font_FA_Bold;
if ( !theDr->GetColor ( MeshVS_DA_TextColor, aTColor ) && !UseDefaults ) if ( !theDr->GetColor ( MeshVS_DA_TextColor, aTColor ) && !UseDefaults )
return anAsp; return anAsp;
@ -233,7 +233,7 @@ Handle( Graphic3d_AspectText3d ) MeshVS_Tool::CreateAspectText3d
if ( !theDr->GetInteger ( MeshVS_DA_TextFontAspect, aFontAspectI ) && !UseDefaults ) if ( !theDr->GetInteger ( MeshVS_DA_TextFontAspect, aFontAspectI ) && !UseDefaults )
return anAsp; return anAsp;
else else
aFontAspect = (OSD_FontAspect) aFontAspectI; aFontAspect = (Font_FontAspect) aFontAspectI;
anAsp = new Graphic3d_AspectText3d ( aTColor, aFont, anExpFactor, aSpace, aStyle, aDispText ); anAsp = new Graphic3d_AspectText3d ( aTColor, aFont, anExpFactor, aSpace, aStyle, aDispText );
anAsp->SetTextFontAspect( aFontAspect ); anAsp->SetTextFontAspect( aFontAspect );

1
src/OSD/FILES
View File

@ -16,7 +16,6 @@ OSD_signal.cxx
OSD_signal_WNT.cxx OSD_signal_WNT.cxx
OSD_ThreadFunction.hxx OSD_ThreadFunction.hxx
OSD_PThread.hxx OSD_PThread.hxx
OSD_NListOfSystemFont.hxx
OSD_Localizer.cxx OSD_Localizer.cxx
OSD_PerfMeter.c OSD_PerfMeter.c
OSD_PerfMeter.h OSD_PerfMeter.h

10
src/OSD/OSD.cdl
View File

@ -93,10 +93,6 @@ is
enumeration KindFile is FILE, DIRECTORY, LINK, SOCKET, UNKNOWN; enumeration KindFile is FILE, DIRECTORY, LINK, SOCKET, UNKNOWN;
---Purpose: Specifies the type of files. ---Purpose: Specifies the type of files.
--ABD Integration support of system fonts (using FTGL and FreeType)
enumeration FontAspect is FA_Undefined, FA_Regular, FA_Bold, FA_Italic, FA_BoldItalic;
---Purpose: Specifies aspect of system font.
private enumeration WhoAmI is WDirectory, WDirectoryIterator, private enumeration WhoAmI is WDirectory, WDirectoryIterator,
WEnvironment, WFile, WFileNode, WFileIterator, WMailBox, WEnvironment, WFile, WFileNode, WFileIterator, WMailBox,
@ -179,13 +175,7 @@ is
imported ThreadFunction; imported ThreadFunction;
class Thread; class Thread;
---Purpose: A tool to manage threads ---Purpose: A tool to manage threads
--ABD Integration support of system fonts (using FTGL and FreeType)
imported NListOfSystemFont;
class SystemFont;
class FontMgr;
class Real2String; class Real2String;
---Purpose: Convertion of CString to Real and reciprocally ---Purpose: Convertion of CString to Real and reciprocally

4
src/OpenGl/OpenGl_AspectText.cxx
View File

@ -27,7 +27,7 @@ static const TEL_COLOUR myDefaultColor = {{ 1.0F, 1.0F, 1.0F, 1.0F }};
OpenGl_AspectText::OpenGl_AspectText () OpenGl_AspectText::OpenGl_AspectText ()
: myZoomable(0), : myZoomable(0),
myAngle(0.0F), myAngle(0.0F),
myFontAspect(OSD_FA_Regular), myFontAspect(Font_FA_Regular),
myFont(NULL), myFont(NULL),
//mySpace(0.3F), //mySpace(0.3F),
//myExpan(1.0F), //myExpan(1.0F),
@ -53,7 +53,7 @@ void OpenGl_AspectText::SetContext (const CALL_DEF_CONTEXTTEXT &AContext)
{ {
myZoomable = (int) AContext.TextZoomable; myZoomable = (int) AContext.TextZoomable;
myAngle = (float) AContext.TextAngle; myAngle = (float) AContext.TextAngle;
myFontAspect = (OSD_FontAspect) AContext.TextFontAspect; myFontAspect = (Font_FontAspect) AContext.TextFontAspect;
//mySpace = (float) AContext.Space; //mySpace = (float) AContext.Space;
//myExpan = (float) AContext.Expan; //myExpan = (float) AContext.Expan;
myColor.rgb[0] = (float) AContext.Color.r; myColor.rgb[0] = (float) AContext.Color.r;

6
src/OpenGl/OpenGl_AspectText.hxx
View File

@ -22,7 +22,7 @@
#define OpenGl_AspectText_Header #define OpenGl_AspectText_Header
#include <InterfaceGraphic_telem.hxx> #include <InterfaceGraphic_telem.hxx>
#include <OSD_FontAspect.hxx> #include <Font_FontAspect.hxx>
#include <Aspect_TypeOfStyleText.hxx> #include <Aspect_TypeOfStyleText.hxx>
#include <Aspect_TypeOfDisplayText.hxx> #include <Aspect_TypeOfDisplayText.hxx>
@ -40,7 +40,7 @@ public:
int IsZoomable() const { return myZoomable; } int IsZoomable() const { return myZoomable; }
float Angle() const { return myAngle; } float Angle() const { return myAngle; }
OSD_FontAspect FontAspect() const { return myFontAspect; } Font_FontAspect FontAspect() const { return myFontAspect; }
const char * Font() const { return myFont; } const char * Font() const { return myFont; }
const TEL_COLOUR & Color() const { return myColor; } const TEL_COLOUR & Color() const { return myColor; }
Aspect_TypeOfStyleText StyleType() const { return myStyleType; } Aspect_TypeOfStyleText StyleType() const { return myStyleType; }
@ -58,7 +58,7 @@ protected:
int myZoomable; int myZoomable;
float myAngle; float myAngle;
OSD_FontAspect myFontAspect; Font_FontAspect myFontAspect;
const char *myFont; const char *myFont;
//float mySpace; //float mySpace;
//float myExpan; //float myExpan;

4
src/OpenGl/OpenGl_Display.hxx
View File

@ -33,7 +33,7 @@
#include <Aspect_TypeOfLine.hxx> #include <Aspect_TypeOfLine.hxx>
#include <Aspect_TypeOfMarker.hxx> #include <Aspect_TypeOfMarker.hxx>
#include <OSD_FontAspect.hxx> #include <Font_FontAspect.hxx>
#include <InterfaceGraphic_telem.hxx> #include <InterfaceGraphic_telem.hxx>
@ -115,7 +115,7 @@ class OpenGl_Display : public MMgt_TShared
// Fonts // Fonts
int FindFont (const char* AFontName, const OSD_FontAspect AFontAspect, const int ABestSize = -1, const float AXScale = 1.F, const float AYScale = 1.F); int FindFont (const char* AFontName, const Font_FontAspect AFontAspect, const int ABestSize = -1, const float AXScale = 1.F, const float AYScale = 1.F);
void StringSize (const wchar_t *text, int &width, int &ascent, int &descent); void StringSize (const wchar_t *text, int &width, int &ascent, int &descent);

48
src/OpenGl/OpenGl_Display_1.cxx
View File

@ -45,7 +45,7 @@ struct FontMapNode
{ {
const char * EnumName; const char * EnumName;
const char * FontName; const char * FontName;
OSD_FontAspect FontAspect; Font_FontAspect FontAspect;
}; };
static const FontMapNode myFontMap[] = static const FontMapNode myFontMap[] =
@ -53,30 +53,30 @@ static const FontMapNode myFontMap[] =
#ifdef WNT #ifdef WNT
{ "Courier" , "Courier New" , OSD_FA_Regular }, { "Courier" , "Courier New" , Font_FA_Regular },
{ "Times-Roman" , "Times New Roman", OSD_FA_Regular }, { "Times-Roman" , "Times New Roman", Font_FA_Regular },
{ "Times-Bold" , "Times New Roman", OSD_FA_Bold }, { "Times-Bold" , "Times New Roman", Font_FA_Bold },
{ "Times-Italic" , "Times New Roman", OSD_FA_Italic }, { "Times-Italic" , "Times New Roman", Font_FA_Italic },
{ "Times-BoldItalic" , "Times New Roman", OSD_FA_BoldItalic }, { "Times-BoldItalic" , "Times New Roman", Font_FA_BoldItalic },
{ "ZapfChancery-MediumItalic", "Script" , OSD_FA_Regular }, { "ZapfChancery-MediumItalic", "Script" , Font_FA_Regular },
{ "Symbol" , "Symbol" , OSD_FA_Regular }, { "Symbol" , "Symbol" , Font_FA_Regular },
{ "ZapfDingbats" , "WingDings" , OSD_FA_Regular }, { "ZapfDingbats" , "WingDings" , Font_FA_Regular },
{ "Rock" , "Arial" , OSD_FA_Regular }, { "Rock" , "Arial" , Font_FA_Regular },
{ "Iris" , "Lucida Console" , OSD_FA_Regular } { "Iris" , "Lucida Console" , Font_FA_Regular }
#else //X11 #else //X11
{ "Courier" , "Courier" , OSD_FA_Regular }, { "Courier" , "Courier" , Font_FA_Regular },
{ "Times-Roman" , "Times" , OSD_FA_Regular }, { "Times-Roman" , "Times" , Font_FA_Regular },
{ "Times-Bold" , "Times" , OSD_FA_Bold }, { "Times-Bold" , "Times" , Font_FA_Bold },
{ "Times-Italic" , "Times" , OSD_FA_Italic }, { "Times-Italic" , "Times" , Font_FA_Italic },
{ "Times-BoldItalic" , "Times" , OSD_FA_BoldItalic }, { "Times-BoldItalic" , "Times" , Font_FA_BoldItalic },
{ "Arial" , "Helvetica" , OSD_FA_Regular }, { "Arial" , "Helvetica" , Font_FA_Regular },
{ "ZapfChancery-MediumItalic", "-adobe-itc zapf chancery-medium-i-normal--*-*-*-*-*-*-iso8859-1" , OSD_FA_Regular }, { "ZapfChancery-MediumItalic", "-adobe-itc zapf chancery-medium-i-normal--*-*-*-*-*-*-iso8859-1" , Font_FA_Regular },
{ "Symbol" , "-adobe-symbol-medium-r-normal--*-*-*-*-*-*-adobe-fontspecific" , OSD_FA_Regular }, { "Symbol" , "-adobe-symbol-medium-r-normal--*-*-*-*-*-*-adobe-fontspecific" , Font_FA_Regular },
{ "ZapfDingbats" , "-adobe-itc zapf dingbats-medium-r-normal--*-*-*-*-*-*-adobe-fontspecific" , OSD_FA_Regular }, { "ZapfDingbats" , "-adobe-itc zapf dingbats-medium-r-normal--*-*-*-*-*-*-adobe-fontspecific" , Font_FA_Regular },
{ "Rock" , "-sgi-rock-medium-r-normal--*-*-*-*-p-*-iso8859-1" , OSD_FA_Regular }, { "Rock" , "-sgi-rock-medium-r-normal--*-*-*-*-p-*-iso8859-1" , Font_FA_Regular },
{ "Iris" , "--iris-medium-r-normal--*-*-*-*-m-*-iso8859-1" , OSD_FA_Regular } { "Iris" , "--iris-medium-r-normal--*-*-*-*-m-*-iso8859-1" , Font_FA_Regular }
#endif #endif
}; };
@ -154,7 +154,7 @@ void OpenGl_Display::getGL2PSFontName (const char *src_font, char *ps_font)
/*-----------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------*/
int OpenGl_Display::FindFont (const char* AFontName, const OSD_FontAspect AFontAspect, int OpenGl_Display::FindFont (const char* AFontName, const Font_FontAspect AFontAspect,
const int ABestSize, const float AXScale, const float AYScale) const int ABestSize, const float AXScale, const float AYScale)
{ {
if (!AFontName) if (!AFontName)
@ -194,7 +194,7 @@ int OpenGl_Display::FindFont (const char* AFontName, const OSD_FontAspect AFontA
// The last resort: trying to use ANY font available in the system // The last resort: trying to use ANY font available in the system
if ( myFont == -1 ) if ( myFont == -1 )
{ {
myFont = mgr->request_font( family_name, OSD_FA_Undefined, -1 ); myFont = mgr->request_font( family_name, Font_FA_Undefined, -1 );
} }
if ( myFont != -1 ) if ( myFont != -1 )

46
src/OpenGl/OpenGl_FontMgr.cxx
View File

@ -81,22 +81,22 @@ OpenGl_FontMgr* OpenGl_FontMgr::instance()
void OpenGl_FontMgr::_initializeFontDB() void OpenGl_FontMgr::_initializeFontDB()
{ {
Handle(OSD_FontMgr) fntMgr = OSD_FontMgr::GetInstance(); Handle(Font_FontMgr) fntMgr = Font_FontMgr::GetInstance();
if ( !fntMgr.IsNull() ) { if ( !fntMgr.IsNull() ) {
OSD_NListOfSystemFont fontList = fntMgr->GetAvalableFonts(); Font_NListOfSystemFont fontList = fntMgr->GetAvalableFonts();
if ( fontList.Size() != 0 ) { if ( fontList.Size() != 0 ) {
// The library used as a tool for checking font aspect since OSD_FontMgr // The library used as a tool for checking font aspect since Font_FontMgr
// fails to get aspect for the fonts that have name dependant // fails to get aspect for the fonts that have name dependant
// on system locale. // on system locale.
FT_Library aFtLibrary; FT_Library aFtLibrary;
FT_Error aLibError = FT_Init_FreeType(&aFtLibrary); FT_Error aLibError = FT_Init_FreeType(&aFtLibrary);
OSD_NListOfSystemFont::Iterator it(fontList); Font_NListOfSystemFont::Iterator it(fontList);
for ( ; it.More(); it.Next() ) { for ( ; it.More(); it.Next() ) {
OGLFont_SysInfo* info = new OGLFont_SysInfo(); OGLFont_SysInfo* info = new OGLFont_SysInfo();
if ( it.Value()->FontAspect() == OSD_FA_Regular ) { if ( it.Value()->FontAspect() == Font_FA_Regular ) {
Handle(TCollection_HAsciiString) aFontPath = it.Value()->FontPath(); Handle(TCollection_HAsciiString) aFontPath = it.Value()->FontPath();
@ -119,20 +119,20 @@ void OpenGl_FontMgr::_initializeFontDB()
<< "\tFont New Name: " << aFontFace->family_name << endl << "\tFont New Name: " << aFontFace->family_name << endl
<< "\tFont Aspect: " << aFontFace->style_flags << endl; << "\tFont Aspect: " << aFontFace->style_flags << endl;
#endif #endif
OSD_FontAspect aspect = OSD_FA_Regular; Font_FontAspect aspect = Font_FA_Regular;
if ( aFontFace->style_flags == (FT_STYLE_FLAG_ITALIC | FT_STYLE_FLAG_BOLD) ) if ( aFontFace->style_flags == (FT_STYLE_FLAG_ITALIC | FT_STYLE_FLAG_BOLD) )
aspect = OSD_FA_BoldItalic; aspect = Font_FA_BoldItalic;
else if ( aFontFace->style_flags == FT_STYLE_FLAG_ITALIC ) else if ( aFontFace->style_flags == FT_STYLE_FLAG_ITALIC )
aspect = OSD_FA_Italic; aspect = Font_FA_Italic;
else if ( aFontFace->style_flags == FT_STYLE_FLAG_BOLD ) else if ( aFontFace->style_flags == FT_STYLE_FLAG_BOLD )
aspect = OSD_FA_Bold; aspect = Font_FA_Bold;
#ifdef TRACE #ifdef TRACE
cout << "\tOSD_FontAspect: " << aspect << endl; cout << "\tFont_FontAspect: " << aspect << endl;
#endif #endif
Handle(TCollection_HAsciiString) aFontName = Handle(TCollection_HAsciiString) aFontName =
new TCollection_HAsciiString( aFontFace->family_name ); new TCollection_HAsciiString( aFontFace->family_name );
info->SysFont = new OSD_SystemFont( aFontName, aspect, aFontPath ); info->SysFont = new Font_SystemFont( aFontName, aspect, aFontPath );
} }
FT_Done_Face(aFontFace); FT_Done_Face(aFontFace);
@ -174,10 +174,10 @@ bool OpenGl_FontMgr::requestFontList( Graphic3d_NListOfHAsciiString& lst)
} }
// Empty fontName means that ANY family name can be used. // Empty fontName means that ANY family name can be used.
// fontAspect == OSD_FA_Undefined means ANY font aspect is acceptable. // fontAspect == Font_FA_Undefined means ANY font aspect is acceptable.
// fontheight == -1 means ANY font height is acceptable. // fontheight == -1 means ANY font height is acceptable.
int OpenGl_FontMgr::request_font( const Handle(TCollection_HAsciiString)& fontName, int OpenGl_FontMgr::request_font( const Handle(TCollection_HAsciiString)& fontName,
const OSD_FontAspect fontAspect, const Font_FontAspect fontAspect,
const Standard_Integer fontHeight ) const Standard_Integer fontHeight )
{ {
Standard_Integer aFontHeight = fontHeight; Standard_Integer aFontHeight = fontHeight;
@ -216,7 +216,7 @@ int OpenGl_FontMgr::request_font( const Handle(TCollection_HAsciiString)& fontNa
#endif #endif
//check for font aspect //check for font aspect
if (fontAspect != OSD_FA_Undefined && DBit.Value()->SysFont->FontAspect() != fontAspect) { if (fontAspect != Font_FA_Undefined && DBit.Value()->SysFont->FontAspect() != fontAspect) {
#ifdef TRACE #ifdef TRACE
cout << "\tAspect of candidate font: " << DBit.Value()->SysFont->FontAspect() << endl; cout << "\tAspect of candidate font: " << DBit.Value()->SysFont->FontAspect() << endl;
cout << "\tAspects are not equal! Continue seaching...\n"; cout << "\tAspects are not equal! Continue seaching...\n";
@ -322,20 +322,20 @@ int OpenGl_FontMgr::request_font( const Handle(TCollection_HAsciiString)& fontNa
switch( fontAspect ) switch( fontAspect )
{ {
case OSD_FA_Bold: case Font_FA_Bold:
cout << "OSD_FA_Bold\n"; cout << "Font_FA_Bold\n";
break; break;
case OSD_FA_BoldItalic: case Font_FA_BoldItalic:
cout << "OSD_FA_BoldItalic\n"; cout << "Font_FA_BoldItalic\n";
break; break;
case OSD_FA_Italic: case Font_FA_Italic:
cout << "OSD_FA_Italic\n"; cout << "Font_FA_Italic\n";
break; break;
case OSD_FA_Regular: case Font_FA_Regular:
cout << "OSD_FA_Regular\n"; cout << "Font_FA_Regular\n";
break; break;
default: default:
cout << "OSD_FA_Undefined\n"; cout << "Font_FA_Undefined\n";
break; break;
} }
cout << " font height: "<<aFontHeight<<"\n"; cout << " font height: "<<aFontHeight<<"\n";

6
src/OpenGl/OpenGl_FontMgr.hxx
View File

@ -34,7 +34,7 @@
#include <NCollection_List.hxx> #include <NCollection_List.hxx>
#include <NCollection_DataMap.hxx> #include <NCollection_DataMap.hxx>
#include <Graphic3d_NListOfHAsciiString.hxx> #include <Graphic3d_NListOfHAsciiString.hxx>
#include <OSD_FontMgr.hxx> #include <Font_FontMgr.hxx>
void dump_texture(); void dump_texture();
@ -44,7 +44,7 @@ class OpenGl_FontMgr
static OpenGl_FontMgr* instance(); static OpenGl_FontMgr* instance();
int request_font( const Handle(TCollection_HAsciiString)& fontName, int request_font( const Handle(TCollection_HAsciiString)& fontName,
const OSD_FontAspect fontAspect, const Font_FontAspect fontAspect,
const Standard_Integer fontHeight ); const Standard_Integer fontHeight );
void render_text( const Standard_Integer id, void render_text( const Standard_Integer id,
@ -78,7 +78,7 @@ private:
typedef NCollection_List<Standard_Integer> IDList; typedef NCollection_List<Standard_Integer> IDList;
struct OGLFont_SysInfo { struct OGLFont_SysInfo {
Handle(OSD_SystemFont) SysFont; Handle(Font_SystemFont) SysFont;
IDList GeneratedFonts; IDList GeneratedFonts;
}; };

2
src/OpenGl/OpenGl_GraduatedTrihedron.cxx
View File

@ -135,7 +135,7 @@ static char getFarestCorner(float d000, float d100, float d010, float d001,
return 8; /* d111 */ return 8; /* d111 */
} }
static void drawText(const Handle(OpenGl_Workspace) &AWorkspace, const wchar_t* text, const char* font, OSD_FontAspect style, int size, float x, float y, float z) static void drawText(const Handle(OpenGl_Workspace) &AWorkspace, const wchar_t* text, const char* font, Font_FontAspect style, int size, float x, float y, float z)
{ {
AWorkspace->FindFont(font, style, size); AWorkspace->FindFont(font, style, size);
AWorkspace->RenderText(text, 0, x, y, z); AWorkspace->RenderText(text, 0, x, y, z);

4
src/OpenGl/OpenGl_GraduatedTrihedron.hxx
View File

@ -64,10 +64,10 @@ class OpenGl_GraduatedTrihedron : public MMgt_TShared
float myYColor[3]; float myYColor[3];
float myZColor[3]; float myZColor[3];
const char *myFontOfNames; const char *myFontOfNames;
OSD_FontAspect myStyleOfNames; Font_FontAspect myStyleOfNames;
int mySizeOfNames; int mySizeOfNames;
const char* myFontOfValues; const char* myFontOfValues;
OSD_FontAspect myStyleOfValues; Font_FontAspect myStyleOfValues;
int mySizeOfValues; int mySizeOfValues;
minMaxValuesCallback myCbCubicAxes; minMaxValuesCallback myCbCubicAxes;
void* myPtrVisual3dView; void* myPtrVisual3dView;

4
src/OpenGl/OpenGl_GraphicDriver_Layer.cxx
View File

@ -22,7 +22,7 @@
#include <OpenGl_GraphicDriver.hxx> #include <OpenGl_GraphicDriver.hxx>
#include <OSD_FontAspect.hxx> #include <Font_FontAspect.hxx>
#include <OpenGl_Display.hxx> #include <OpenGl_Display.hxx>
#include <OpenGl_AspectText.hxx> #include <OpenGl_AspectText.hxx>
@ -64,7 +64,7 @@ static const CALL_DEF_CONTEXTTEXT myDefaultContextText =
{ 1.F, 1.F, 1.F }, //ColorSubTitle { 1.F, 1.F, 1.F }, //ColorSubTitle
0, //TextZoomable 0, //TextZoomable
0.F, //TextAngle 0.F, //TextAngle
(int)OSD_FA_Regular //TextFontAspect (int)Font_FA_Regular //TextFontAspect
}; };
static Standard_Boolean TheLayerIsOpen = Standard_False; static Standard_Boolean TheLayerIsOpen = Standard_False;

2
src/OpenGl/OpenGl_Trihedron.cxx
View File

@ -63,7 +63,7 @@ static const CALL_DEF_CONTEXTTEXT myDefaultContextText =
{ 1.F, 1.F, 1.F }, //ColorSubTitle { 1.F, 1.F, 1.F }, //ColorSubTitle
0, //TextZoomable 0, //TextZoomable
0.F, //TextAngle 0.F, //TextAngle
OSD_FA_Regular //TextFontAspect Font_FA_Regular //TextFontAspect
}; };
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/

10
src/OpenGl/OpenGl_Workspace.hxx
View File

@ -167,11 +167,11 @@ public:
//// RELATED TO FONTS //// //// RELATED TO FONTS ////
int FindFont (const char* theFontName, int FindFont (const char* theFontName,
const OSD_FontAspect theFontAspect, const Font_FontAspect theFontAspect,
const int theBestSize = -1, const int theBestSize = -1,
const float theXScale = 1.0f, const float theXScale = 1.0f,
const float theYScale = 1.0f) const float theYScale = 1.0f)
{ {
return myDisplay->FindFont (theFontName, theFontAspect, theBestSize, theXScale, theYScale); return myDisplay->FindFont (theFontName, theFontAspect, theBestSize, theXScale, theYScale);
} }

1
src/TKService/PACKAGES
View File

@ -12,3 +12,4 @@ PlotMgt
ImageUtility ImageUtility
WNT WNT
TColQuantity TColQuantity
Font

3
src/V3d/V3d.cdl
View File

@ -58,7 +58,8 @@ uses
PlotMgt, PlotMgt,
Image, Image,
gp, gp,
OSD OSD,
Font
is is

10
src/V3d/V3d_View.cdl
View File

@ -149,7 +149,7 @@ uses
GraphicCallbackProc from Aspect, GraphicCallbackProc from Aspect,
FillMethod from Aspect, FillMethod from Aspect,
GradientFillMethod from Aspect, GradientFillMethod from Aspect,
FontAspect from OSD, FontAspect from Font,
AsciiString from TCollection, AsciiString from TCollection,
ExtendedString from TCollection, ExtendedString from TCollection,
PrintAlgo from Aspect PrintAlgo from Aspect
@ -524,13 +524,13 @@ is
-- Name of font for names of axes -- -- Name of font for names of axes --
fontOfNames : out AsciiString from TCollection; fontOfNames : out AsciiString from TCollection;
-- Style of names of axes -- -- Style of names of axes --
styleOfNames : out FontAspect from OSD; styleOfNames : out FontAspect from Font;
-- Size of names of axes -- -- Size of names of axes --
sizeOfNames : out Integer from Standard; sizeOfNames : out Integer from Standard;
-- Name of font for values -- -- Name of font for values --
fontOfValues : out AsciiString from TCollection; fontOfValues : out AsciiString from TCollection;
-- Style of values -- -- Style of values --
styleOfValues : out FontAspect from OSD; styleOfValues : out FontAspect from Font;
-- Size of values -- -- Size of values --
sizeOfValues : out Integer from Standard) sizeOfValues : out Integer from Standard)
---Purpose: Returns data of a graduated trihedron. ---Purpose: Returns data of a graduated trihedron.
@ -590,13 +590,13 @@ is
-- Name of font for names of axes -- -- Name of font for names of axes --
fontOfNames : AsciiString from TCollection = "Arial"; fontOfNames : AsciiString from TCollection = "Arial";
-- Style of names of axes -- -- Style of names of axes --
styleOfNames : FontAspect from OSD = OSD_FA_Bold; styleOfNames : FontAspect from Font = Font_FA_Bold;
-- Size of names of axes -- -- Size of names of axes --
sizeOfNames : Integer from Standard = 12; sizeOfNames : Integer from Standard = 12;
-- Name of font for values -- -- Name of font for values --
fontOfValues : AsciiString from TCollection = "Arial"; fontOfValues : AsciiString from TCollection = "Arial";
-- Style of values -- -- Style of values --
styleOfValues : FontAspect from OSD = OSD_FA_Regular; styleOfValues : FontAspect from Font = Font_FA_Regular;
-- Size of values -- -- Size of values --
sizeOfValues : Integer from Standard = 12) sizeOfValues : Integer from Standard = 12)
---Purpose: Displays a graduated trihedron. ---Purpose: Displays a graduated trihedron.

8
src/V3d/V3d_View_4.cxx
View File

@ -562,13 +562,13 @@ void V3d_View::GetGraduatedTrihedron(/* Names of axes */
/* Name of font for names of axes */ /* Name of font for names of axes */
TCollection_AsciiString &fontOfNames, TCollection_AsciiString &fontOfNames,
/* Style of names of axes */ /* Style of names of axes */
OSD_FontAspect& styleOfNames, Font_FontAspect& styleOfNames,
/* Size of names of axes */ /* Size of names of axes */
Standard_Integer& sizeOfNames, Standard_Integer& sizeOfNames,
/* Name of font for values */ /* Name of font for values */
TCollection_AsciiString &fontOfValues, TCollection_AsciiString &fontOfValues,
/* Style of values */ /* Style of values */
OSD_FontAspect& styleOfValues, Font_FontAspect& styleOfValues,
/* Size of values */ /* Size of values */
Standard_Integer& sizeOfValues) const Standard_Integer& sizeOfValues) const
{ {
@ -689,13 +689,13 @@ void V3d_View::GraduatedTrihedronDisplay(/* Names of axes */
/* Name of font for names of axes */ /* Name of font for names of axes */
const TCollection_AsciiString &fontOfNames, const TCollection_AsciiString &fontOfNames,
/* Style of names of axes */ /* Style of names of axes */
const OSD_FontAspect styleOfNames, const Font_FontAspect styleOfNames,
/* Size of names of axes */ /* Size of names of axes */
const Standard_Integer sizeOfNames, const Standard_Integer sizeOfNames,
/* Name of font for values */ /* Name of font for values */
const TCollection_AsciiString &fontOfValues, const TCollection_AsciiString &fontOfValues,
/* Style of values */ /* Style of values */
const OSD_FontAspect styleOfValues, const Font_FontAspect styleOfValues,
/* Size of values */ /* Size of values */
const Standard_Integer sizeOfValues) const Standard_Integer sizeOfValues)
{ {

8
src/ViewerTest/ViewerTest_ObjectCommands.cxx
View File

@ -2301,7 +2301,7 @@ public:
Standard_Real Angle , Standard_Real Angle ,
Standard_Boolean Zoom , Standard_Boolean Zoom ,
Standard_Real Height, Standard_Real Height,
OSD_FontAspect FontAspect, Font_FontAspect FontAspect,
Standard_CString Font Standard_CString Font
); );
@ -2325,7 +2325,7 @@ protected:
Standard_Boolean aZoomable; Standard_Boolean aZoomable;
Quantity_Color aColor; Quantity_Color aColor;
Standard_CString aFont; Standard_CString aFont;
OSD_FontAspect aFontAspect; Font_FontAspect aFontAspect;
Graphic3d_HorizontalTextAlignment aHJustification; Graphic3d_HorizontalTextAlignment aHJustification;
Graphic3d_VerticalTextAlignment aVJustification; Graphic3d_VerticalTextAlignment aVJustification;
}; };
@ -2343,7 +2343,7 @@ MyTextClass::MyTextClass( const TCollection_ExtendedString& text, const gp_Pnt&
Standard_Real angle = 0.0 , Standard_Real angle = 0.0 ,
Standard_Boolean zoomable = Standard_True, Standard_Boolean zoomable = Standard_True,
Standard_Real height = 12., Standard_Real height = 12.,
OSD_FontAspect fontAspect = OSD_FA_Regular, Font_FontAspect fontAspect = Font_FA_Regular,
Standard_CString font = "Courier") Standard_CString font = "Courier")
{ {
aText = text; aText = text;
@ -2443,7 +2443,7 @@ static int VDrawText (Draw_Interpretor& di, Standard_Integer argc, const char**
const Standard_Real height = atof(argv[12]); const Standard_Real height = atof(argv[12]);
// Text aspect // Text aspect
const OSD_FontAspect aspect = OSD_FontAspect(atoi(argv[13])); const Font_FontAspect aspect = Font_FontAspect(atoi(argv[13]));
// Text font // Text font
TCollection_AsciiString font; TCollection_AsciiString font;

3
src/Visual3d/Visual3d.cdl
View File

@ -59,7 +59,8 @@ uses
MMgt, MMgt,
Xw, Xw,
WNT, WNT,
OSD OSD,
Font
is is

2
src/Visual3d/Visual3d_Layer.cdl
View File

@ -47,7 +47,7 @@ uses
LayerItem from Visual3d, LayerItem from Visual3d,
NListOfLayerItem from Visual3d, NListOfLayerItem from Visual3d,
FontAspect from OSD FontAspect from Font
raises raises
LayerDefinitionError from Visual3d LayerDefinitionError from Visual3d

10
src/Visual3d/Visual3d_View.cdl
View File

@ -117,7 +117,7 @@ uses
ExportFormat from Graphic3d, ExportFormat from Graphic3d,
SortType from Graphic3d, SortType from Graphic3d,
Color from Quantity, Color from Quantity,
FontAspect from OSD, FontAspect from Font,
AsciiString from TCollection, AsciiString from TCollection,
ExtendedString from TCollection, ExtendedString from TCollection,
CGraduatedTrihedron from Graphic3d, CGraduatedTrihedron from Graphic3d,
@ -635,13 +635,13 @@ is
-- Name of font for names of axes -- -- Name of font for names of axes --
fontOfNames : out AsciiString from TCollection; fontOfNames : out AsciiString from TCollection;
-- Style of names of axes -- -- Style of names of axes --
styleOfNames : out FontAspect from OSD; styleOfNames : out FontAspect from Font;
-- Size of names of axes -- -- Size of names of axes --
sizeOfNames : out Integer from Standard; sizeOfNames : out Integer from Standard;
-- Name of font for values -- -- Name of font for values --
fontOfValues : out AsciiString from TCollection; fontOfValues : out AsciiString from TCollection;
-- Style of values -- -- Style of values --
styleOfValues : out FontAspect from OSD; styleOfValues : out FontAspect from Font;
-- Size of values -- -- Size of values --
sizeOfValues : out Integer from Standard) sizeOfValues : out Integer from Standard)
returns Boolean from Standard returns Boolean from Standard
@ -678,13 +678,13 @@ is
-- Name of font for names of axes -- -- Name of font for names of axes --
fontOfNames : AsciiString from TCollection; fontOfNames : AsciiString from TCollection;
-- Style of names of axes -- -- Style of names of axes --
styleOfNames : FontAspect from OSD; styleOfNames : FontAspect from Font;
-- Size of names of axes -- -- Size of names of axes --
sizeOfNames : Integer from Standard; sizeOfNames : Integer from Standard;
-- Name of font for values -- -- Name of font for values --
fontOfValues : AsciiString from TCollection; fontOfValues : AsciiString from TCollection;
-- Style of values -- -- Style of values --
styleOfValues : FontAspect from OSD; styleOfValues : FontAspect from Font;
-- Size of values -- -- Size of values --
sizeOfValues : Integer from Standard) sizeOfValues : Integer from Standard)
---Purpose: Displays a graduated trihedron. ---Purpose: Displays a graduated trihedron.

8
src/Visual3d/Visual3d_View.cxx
View File

@ -3734,13 +3734,13 @@ Standard_Boolean Visual3d_View::GetGraduatedTrihedron
/* Name of font for names of axes */ /* Name of font for names of axes */
TCollection_AsciiString& fontOfNames, TCollection_AsciiString& fontOfNames,
/* Style of names of axes */ /* Style of names of axes */
OSD_FontAspect& styleOfNames, Font_FontAspect& styleOfNames,
/* Size of names of axes */ /* Size of names of axes */
Standard_Integer& sizeOfNames, Standard_Integer& sizeOfNames,
/* Name of font for values */ /* Name of font for values */
TCollection_AsciiString& fontOfValues, TCollection_AsciiString& fontOfValues,
/* Style of values */ /* Style of values */
OSD_FontAspect& styleOfValues, Font_FontAspect& styleOfValues,
/* Size of values */ /* Size of values */
Standard_Integer& sizeOfValues) const Standard_Integer& sizeOfValues) const
{ {
@ -3859,13 +3859,13 @@ void Visual3d_View::GraduatedTrihedronDisplay
/* Name of font for names of axes */ /* Name of font for names of axes */
const TCollection_AsciiString &fontOfNames, const TCollection_AsciiString &fontOfNames,
/* Style of names of axes */ /* Style of names of axes */
const OSD_FontAspect styleOfNames, const Font_FontAspect styleOfNames,
/* Size of names of axes */ /* Size of names of axes */
const Standard_Integer sizeOfNames, const Standard_Integer sizeOfNames,
/* Name of font for values */ /* Name of font for values */
const TCollection_AsciiString &fontOfValues, const TCollection_AsciiString &fontOfValues,
/* Style of values */ /* Style of values */
const OSD_FontAspect styleOfValues, const Font_FontAspect styleOfValues,
/* Size of values */ /* Size of values */
const Standard_Integer sizeOfValues) const Standard_Integer sizeOfValues)
{ {