pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Adds a font orientation property and moves the font to a separate record

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1667 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
sekelsenmat
2011-06-08 06:29:17 +00:00
parent be3e53b19f
commit 91a6b7a6f6
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
applications/fpvviewer/fpvectorialsrc/fpvectorial.pas
View File

@@ -153,6 +153,18 @@ type
function Next(): TPathSegment; function Next(): TPathSegment;
end; end;
TvFont = record
Color: TvColor;
Size: integer;
Name: utf8string;
{@@
Font orientation is measured in degrees and uses the
same direction as the LCL TFont.orientation, which is counter-clockwise.
Zero is the normal, horizontal, orientation.
}
Orientation: Double;
end;
{@@ {@@
TvText represents a text in memory. TvText represents a text in memory.
@@ -163,9 +175,7 @@ type
public public
X, Y, Z: Double; // Z is ignored in 2D formats X, Y, Z: Double; // Z is ignored in 2D formats
Value: utf8string; Value: utf8string;
FontColor: TvColor; Font: TvFont;
FontSize: integer;
FontName: utf8string;
end; end;
{@@ {@@
@@ -744,8 +754,8 @@ begin
lText.X := AX; lText.X := AX;
lText.Y := AY; lText.Y := AY;
lText.Z := AZ; lText.Z := AZ;
lText.FontName := FontName; lText.Font.Name := FontName;
lText.FontSize := FontSize; lText.Font.Size := FontSize;
FTexts.Add(lText); FTexts.Add(lText);
end; end;

7
applications/fpvviewer/fpvectorialsrc/fpvtocanvas.pas
View File

@@ -491,7 +491,8 @@ begin
for i := 0 to ASource.GetTextCount - 1 do for i := 0 to ASource.GetTextCount - 1 do
begin begin
CurText := ASource.GetText(i); CurText := ASource.GetText(i);
ADest.Font.Size := Round(AmulX * CurText.FontSize);
ADest.Font.Size := Round(AmulX * CurText.Font.Size);
ADest.Pen.Style := psSolid; ADest.Pen.Style := psSolid;
{$ifdef USE_LCL_CANVAS} {$ifdef USE_LCL_CANVAS}
ADest.Pen.Color := clBlack; ADest.Pen.Color := clBlack;
@@ -499,7 +500,9 @@ begin
ADest.Pen.FPColor := colBlack; ADest.Pen.FPColor := colBlack;
{$endif} {$endif}
ADest.Brush.Style := bsClear; ADest.Brush.Style := bsClear;
LowerDim.Y := CurText.Y + CurText.FontSize; ADest.Font.Orientation := Round(CurText.Font.Orientation * 16);
LowerDim.Y := CurText.Y + CurText.Font.Size;
ADest.TextOut(CoordToCanvasX(CurText.X), CoordToCanvasY(LowerDim.Y), CurText.Value); ADest.TextOut(CoordToCanvasX(CurText.X), CoordToCanvasY(LowerDim.Y), CurText.Value);
end; end;
end; end;

2
applications/fpvviewer/fpvectorialsrc/svgvectorialwriter.pas
View File

@@ -243,7 +243,7 @@ begin
AData, lText.X, lText.Y, PtX, PtY); AData, lText.X, lText.Y, PtX, PtY);
TextStr := lText.Value; TextStr := lText.Value;
FontSize:= ceil(lText.FontSize / FLOAT_MILIMETERS_PER_PIXEL); FontSize:= ceil(lText.Font.Size / FLOAT_MILIMETERS_PER_PIXEL);
SVGFontFamily := 'Arial, sans-serif';//lText.FontName; SVGFontFamily := 'Arial, sans-serif';//lText.FontName;
AStrings.Add(' <text '); AStrings.Add(' <text ');