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

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
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Graphic3d/Graphic3d.cdl
View File

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

10
src/Graphic3d/Graphic3d_AspectText3d.cdl
View File

@@ -40,7 +40,7 @@ uses
TypeOfStyleText from Aspect,
TypeOfDisplayText from Aspect,
AsciiString from TCollection,
FontAspect from OSD
FontAspect from Font
raises
@@ -169,12 +169,12 @@ is
---Purpose: Returns Angle of degree
SetTextFontAspect ( me : mutable;
AFontAspect : FontAspect from OSD );
AFontAspect : FontAspect from Font );
---Level: Public
---Purpose: Turns usage of Aspect text
---Category: Methods to modify the class definition
GetTextFontAspect( me ) returns FontAspect from OSD;
GetTextFontAspect( me ) returns FontAspect from Font;
---Level: Public
---Purpose: Returns text FontAspect
@@ -239,7 +239,7 @@ is
AColorSubTitle : out Color from Quantity;
ATextZoomable : out Boolean from Standard;
ATextAngle : out Real from Standard;
ATextFontAspect : out FontAspect from OSD)
ATextFontAspect : out FontAspect from Font)
is static;
---Level: Public
---Purpose: Returns the current values of the group <me>.
@@ -290,6 +290,6 @@ fields
MyTextAngle : Real from Standard;
-- the variable turning FontAspect of the text
MyTextFontAspect : FontAspect from OSD;
MyTextFontAspect : FontAspect from Font;
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) {
MyTextZoomable = Standard_False;
MyTextAngle = 0.0;
MyTextFontAspect = OSD_FA_Regular;
MyTextFontAspect = Font_FA_Regular;
}
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) {
MyTextZoomable = Standard_False;
MyTextAngle = 0.0;
MyTextFontAspect = OSD_FA_Regular;
MyTextFontAspect = Font_FA_Regular;
if(MyFont.Length() == 0)
MyFont.AssignCat(Graphic3d_NOF_ASCII_MONO);
@@ -181,12 +181,12 @@ Standard_Real Graphic3d_AspectText3d::GetTextAngle() const
return MyTextAngle;
}
void Graphic3d_AspectText3d::SetTextFontAspect(const OSD_FontAspect AFontAspect)
void Graphic3d_AspectText3d::SetTextFontAspect(const Font_FontAspect AFontAspect)
{
MyTextFontAspect = AFontAspect;
}
OSD_FontAspect Graphic3d_AspectText3d::GetTextFontAspect() const
Font_FontAspect Graphic3d_AspectText3d::GetTextFontAspect() const
{
return MyTextFontAspect;
}
@@ -236,7 +236,7 @@ void Graphic3d_AspectText3d::Values ( Quantity_Color& AColor,
Quantity_Color& AColorSubTitle,
Standard_Boolean& ATextZoomable,
Standard_Real& ATextAngle,
OSD_FontAspect& ATextFontAspect ) const
Font_FontAspect& ATextFontAspect ) const
{
AColor = MyColor;

6
src/Graphic3d/Graphic3d_CGraduatedTrihedron.hxx
View File

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

2
src/Graphic3d/Graphic3d_GraphicDriver.cdl
View File

@@ -129,7 +129,7 @@ uses
HArray1OfReal from TColStd,
CUserDraw from Graphic3d,
NListOfHAsciiString from Graphic3d,
FontAspect from OSD,
FontAspect from Font,
CGraduatedTrihedron from Graphic3d
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;
Standard_Boolean ATextZoomable;
Standard_Real ATextAngle;
OSD_FontAspect ATextFontAspect;
Font_FontAspect ATextFontAspect;
CTX->Values (AColor, AFont, AnExpansion, ASpace, AStyle, ADisplayType,AColorSubTitle,ATextZoomable,ATextAngle,ATextFontAspect);
AColor.Values (R, G, B, Quantity_TOC_RGB);
@@ -664,7 +664,7 @@ void Graphic3d_Group::SetPrimitivesAspect (const Handle(Graphic3d_AspectText3d)&
Quantity_Color AColorSubTitle;
Standard_Boolean ATextZoomable;
Standard_Real ATextAngle;
OSD_FontAspect ATextFontAspect;
Font_FontAspect ATextFontAspect;
CTX->Values (AColor, AFont, AnExpansion, ASpace, AStyle, ADisplayType,AColorSubTitle,ATextZoomable,ATextAngle,ATextFontAspect);
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;
Standard_Boolean ATextZoomable;
Standard_Real ATextAngle;
OSD_FontAspect ATextFontAspect;
Font_FontAspect ATextFontAspect;
CTX->Values (AColor, AFont, AnExpansion, ASpace, AStyle, ADisplayType,AColorSubTitle,ATextZoomable,ATextAngle,ATextFontAspect);
AColor.Values (R, G, B, Quantity_TOC_RGB);
@@ -2113,7 +2113,7 @@ void Graphic3d_Structure::UpdateStructure (const Handle(Graphic3d_AspectLine3d)&
Quantity_Color AColorSubTitle;
Standard_Boolean ATextZoomable;
Standard_Real ATextAngle;
OSD_FontAspect ATextFontAspect;
Font_FontAspect ATextFontAspect;
CTXL->Values (AColor, ALType, AWidth);