paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-04 19:39:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

fpvectorial: Advances the mathml rendering

Browse Source 
git-svn-id: trunk@37863 -
This commit is contained in:
sekelsenmat 2012-07-04 06:14:03 +00:00
parent 15e52b52b5
commit 355ce3cab8
1 changed files with 87 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
components/fpvectorial/fpvectorial.pas
View File

@ -426,9 +426,9 @@ type
Formula: TvFormula; Formula: TvFormula;
AdjacentFormula: TvFormula; AdjacentFormula: TvFormula;
public public
Top, Left, Width, Height: Integer; Top, Left, Width, Height: Double;
function CalculateHeight(ADest: TFPCustomCanvas): Single; // 1.0 = the normal text height, will return for example 2.2 for 2,2 times the text height function CalculateHeight(ADest: TFPCustomCanvas): Double; // 1.0 = the normal text height, will return for example 2.2 for 2,2 times the text height
function CalculateWidth(ADest: TFPCustomCanvas): Integer; // in pixels function CalculateWidth(ADest: TFPCustomCanvas): Double; // in pixels
function AsText: string; function AsText: string;
procedure Render(ADest: TFPCustomCanvas; ADestX: Integer = 0; procedure Render(ADest: TFPCustomCanvas; ADestX: Integer = 0;
ADestY: Integer = 0; AMulX: Double = 1.0; AMulY: Double = 1.0); virtual; ADestY: Integer = 0; AMulX: Double = 1.0; AMulY: Double = 1.0); virtual;
@ -445,7 +445,7 @@ type
protected protected
FElements: TFPList; // of TvFormulaElement FElements: TFPList; // of TvFormulaElement
public public
Top, Left, Width, Height: Integer; Top, Left, Width, Height: Double;
constructor Create; override; constructor Create; override;
destructor Destroy; override; destructor Destroy; override;
// //
@ -456,9 +456,9 @@ type
function AddElementWithKindAndText(AKind: TvFormulaElementKind; AText: string): TvFormulaElement; function AddElementWithKindAndText(AKind: TvFormulaElementKind; AText: string): TvFormulaElement;
procedure Clear; procedure Clear;
// //
function CalculateHeight(ADest: TFPCustomCanvas): Single; // 1.0 = the normal text height, will return for example 2.2 for 2,2 times the text height function CalculateHeight(ADest: TFPCustomCanvas): Double; // 1.0 = the normal text height, will return for example 2.2 for 2,2 times the text height
function CalculateWidth(ADest: TFPCustomCanvas): Integer; function CalculateWidth(ADest: TFPCustomCanvas): Double;
procedure PositionElements(ADest: TFPCustomCanvas; ABaseX, ABaseY: Integer); procedure PositionElements(ADest: TFPCustomCanvas; ABaseX, ABaseY: Double);
procedure CalculateBoundingBox(ADest: TFPCustomCanvas; var ALeft, ATop, ARight, ABottom: Double); override; procedure CalculateBoundingBox(ADest: TFPCustomCanvas; var ALeft, ATop, ARight, ABottom: Double); override;
procedure Render(ADest: TFPCustomCanvas; ADestX: Integer = 0; procedure Render(ADest: TFPCustomCanvas; ADestX: Integer = 0;
ADestY: Integer = 0; AMulX: Double = 1.0; AMulY: Double = 1.0); override; ADestY: Integer = 0; AMulX: Double = 1.0; AMulY: Double = 1.0); override;
@ -1686,7 +1686,7 @@ end;
{ TvFormulaElement } { TvFormulaElement }
function TvFormulaElement.CalculateHeight(ADest: TFPCustomCanvas): Single; function TvFormulaElement.CalculateHeight(ADest: TFPCustomCanvas): Double;
begin begin
case Kind of case Kind of
//fekVariable, // Text is the text of the variable //fekVariable, // Text is the text of the variable
@ -1695,16 +1695,23 @@ begin
//fekMultiplication, // either a point . or a small x //fekMultiplication, // either a point . or a small x
//fekSum, // + symbol //fekSum, // + symbol
//fekPlusMinus, // The +/- symbol //fekPlusMinus, // The +/- symbol
fekFraction: Result := 2.3; fekFraction:
fekRoot: Result := Formula.CalculateHeight(ADest); begin
fekPower: Result := 1.1; Formula.CalculateHeight(ADest);
fekSomatory: Result := 1.5; AdjacentFormula.CalculateHeight(ADest);
else Result := Formula.Height + AdjacentFormula.Height + 5;
Result := 1.0;
end; end;
fekRoot: Result := Formula.CalculateHeight(ADest) * 1.2;
fekPower: Result := 11;
fekSomatory: Result := 15;
else
Result := 10;
end; end;
function TvFormulaElement.CalculateWidth(ADest: TFPCustomCanvas): Integer; Height := Result;
end;
function TvFormulaElement.CalculateWidth(ADest: TFPCustomCanvas): Double;
var var
lText: String; lText: String;
begin begin
@ -1718,12 +1725,19 @@ begin
end; end;
case Kind of case Kind of
// fekFraction: Result := 2.3; fekFraction:
begin
Formula.CalculateWidth(ADest);
AdjacentFormula.CalculateWidth(ADest);
Result := Max(Formula.Width, AdjacentFormula.Width);
end;
fekRoot: Result := Formula.CalculateWidth(ADest) + 5; fekRoot: Result := Formula.CalculateWidth(ADest) + 5;
fekPower: Result := Round(Result * 1.2); fekPower: Result := Result * 1.5;
fekSomatory: Result := 8; fekSomatory: Result := 8;
else else
end; end;
Width := Result;
end; end;
function TvFormulaElement.AsText: string; function TvFormulaElement.AsText: string;
@ -1747,26 +1761,48 @@ end;
procedure TvFormulaElement.Render(ADest: TFPCustomCanvas; ADestX: Integer; procedure TvFormulaElement.Render(ADest: TFPCustomCanvas; ADestX: Integer;
ADestY: Integer; AMulX: Double; AMulY: Double); ADestY: Integer; AMulX: Double; AMulY: Double);
function CoordToCanvasX(ACoord: Double): Integer;
begin begin
Result := Round(ADestX + AmulX * ACoord);
end;
function CoordToCanvasY(ACoord: Double): Integer;
begin
Result := Round(ADestY + AmulY * ACoord);
end;
var
LeftC, TopC: Integer;
begin
LeftC := CoordToCanvasX(Left);
TopC := CoordToCanvasY(Top);
case Kind of case Kind of
fekVariable: ADest.TextOut(ADestX + Left, ADestY + Top, Text); fekVariable: ADest.TextOut(LeftC, TopC, Text);
fekEqual: ADest.TextOut(ADestX + Left, ADestY + Top, '='); fekEqual: ADest.TextOut(LeftC, TopC, '=');
fekSubtraction: ADest.TextOut(ADestX + Left, ADestY + Top, '-'); fekSubtraction: ADest.TextOut(LeftC, TopC, '-');
fekMultiplication: ADest.TextOut(ADestX + Left, ADestY + Top, '×'); // Unicode times symbol fekMultiplication: ADest.TextOut(LeftC, TopC, '×'); // Unicode times symbol
fekSum: ADest.TextOut(ADestX + Left, ADestY + Top, '+'); fekSum: ADest.TextOut(LeftC, TopC, '+');
fekPlusMinus:ADest.TextOut(ADestX + Left, ADestY + Top, '±'); fekPlusMinus:ADest.TextOut(LeftC, TopC, '±');
fekLessThan: ADest.TextOut(ADestX + Left, ADestY + Top, '<'); fekLessThan: ADest.TextOut(LeftC, TopC, '<');
fekLessOrEqualThan: ADest.TextOut(ADestX + Left, ADestY + Top, '≤'); fekLessOrEqualThan: ADest.TextOut(LeftC, TopC, '≤');
fekGreaterThan: ADest.TextOut(ADestX + Left, ADestY + Top, '>'); fekGreaterThan: ADest.TextOut(LeftC, TopC, '>');
fekGreaterOrEqualThan: ADest.TextOut(ADestX + Left, ADestY + Top, '≥'); fekGreaterOrEqualThan: ADest.TextOut(LeftC, TopC, '≥');
{fekFraction: fekFraction:
begin begin
Formula.Render(ADest, ADestX, ADestY, AMulX, AMulY); Formula.Render(ADest, ADestX, ADestY, AMulX, AMulY);
AdjacentFormula.Render(ADest, ADestX, ADestY, AMulX, AMulY);
end;
fekRoot:
begin
Formula.Render(ADest, ADestX, ADestY, AMulX, AMulY); Formula.Render(ADest, ADestX, ADestY, AMulX, AMulY);
end;} end;
//fekRoot: Result := Formula.CalculateHeight(); fekPower:
//fekNumberWithPower, begin
//fekVariableWithPower: Result := 1.1; Formula.Render(ADest, ADestX, ADestY, AMulX, AMulY);
AdjacentFormula.Render(ADest, ADestX, ADestY, AMulX, AMulY);
end;
//fekParenteses: Result,// This is utilized to group elements. Inside it goes a Formula //fekParenteses: Result,// This is utilized to group elements. Inside it goes a Formula
//fekParentesesWithPower: Result := 1.1; //fekParentesesWithPower: Result := 1.1;
//fekSomatory: Result := 1.5; //fekSomatory: Result := 1.5;
@ -1867,7 +1903,7 @@ begin
FElements.Clear; FElements.Clear;
end; end;
function TvFormula.CalculateHeight(ADest: TFPCustomCanvas): Single; function TvFormula.CalculateHeight(ADest: TFPCustomCanvas): Double;
var var
lElement: TvFormulaElement; lElement: TvFormulaElement;
begin begin
@ -1880,10 +1916,10 @@ begin
end; end;
// Cache the result // Cache the result
if ADest <> nil then if ADest <> nil then
Height := Round(Result * TCanvas(ADest).TextHeight('T')); Height := Result * TCanvas(ADest).TextHeight('T');
end; end;
function TvFormula.CalculateWidth(ADest: TFPCustomCanvas): Integer; function TvFormula.CalculateWidth(ADest: TFPCustomCanvas): Double;
var var
lElement: TvFormulaElement; lElement: TvFormulaElement;
begin begin
@ -1898,16 +1934,16 @@ begin
Width := Result; Width := Result;
end; end;
procedure TvFormula.PositionElements(ADest: TFPCustomCanvas; ABaseX, ABaseY: Integer); procedure TvFormula.PositionElements(ADest: TFPCustomCanvas; ABaseX, ABaseY: Double);
var var
lElement: TvFormulaElement; lElement: TvFormulaElement;
lPosX: Integer = 0; lPosX: Double = 0;
lPosY: Integer = 0; lPosY: Double = 0;
begin begin
CalculateHeight(ADest); CalculateHeight(ADest);
CalculateWidth(ADest); CalculateWidth(ADest);
Top := ABaseX; Left := ABaseX;
Left := ABaseY; Top := ABaseY;
// Then calculate the position of each element // Then calculate the position of each element
lElement := GetFirstElement(); lElement := GetFirstElement();
@ -1921,8 +1957,17 @@ begin
if lElement.Formula <> nil then if lElement.Formula <> nil then
lElement.Formula.PositionElements(ADest, lElement.Left, lElement.Top); lElement.Formula.PositionElements(ADest, lElement.Left, lElement.Top);
if lElement.AdjacentFormula <> nil then case lElement.Kind of
lElement.AdjacentFormula.PositionElements(ADest, lElement.Left, lElement.Top); fekFraction:
begin
//if lElement.AdjacentFormula = nil then
lElement.AdjacentFormula.PositionElements(ADest, lElement.Left, lElement.Top - lElement.Formula.Height - 3);
end;
//fekRoot:
//fekPower:
///fekSubscript:
//fekSomatory:
end;
lElement := GetNextElement(); lElement := GetNextElement();
end; end;
@ -1946,7 +1991,7 @@ var
lElement: TvFormulaElement; lElement: TvFormulaElement;
begin begin
// First position all elements // First position all elements
PositionElements(ADest, 0, 0); PositionElements(ADest, Left, Top);
// Now draw them all // Now draw them all
lElement := GetFirstElement(); lElement := GetFirstElement();