paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-10 22:19:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fpvectorial: Removes part of the unfinished layer tools system

Browse Source 
git-svn-id: trunk@40784 -
This commit is contained in:
sekelsenmat 2013-04-10 13:28:33 +00:00
parent 882739042e
commit f4ab0c51f3
1 changed files with 4 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
components/fpvectorial/fpvectorial.pas
View File

@ -232,7 +232,7 @@ type
TvEntity = class TvEntity = class
public public
Parent: TvEntity; // Might be nil if this is placed directly in the page!!! //not used currently Parent: TvEntity; // Might be nil if this is placed directly in the page!!!
X, Y, Z: Double; X, Y, Z: Double;
constructor Create; virtual; constructor Create; virtual;
procedure Clear; virtual; procedure Clear; virtual;
@ -249,7 +249,6 @@ type
procedure Render(ADest: TFPCustomCanvas; ARenderInfo: TvRenderInfo; ADestX: Integer = 0; procedure Render(ADest: TFPCustomCanvas; ARenderInfo: TvRenderInfo; 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;
function AdjustColorToBackground(AColor: TFPColor; ARenderInfo: TvRenderInfo): TFPColor; function AdjustColorToBackground(AColor: TFPColor; ARenderInfo: TvRenderInfo): TFPColor;
procedure CreateFinalDrawingTools(AEntity: TvEntity; var AFinalPen: TvPen; var AFinalBrush: TvBrush; var AFinalFont: TvFont);
function GetNormalizedPos(APage: TvVectorialPage; ANewMin, ANewMax: Double): T3DPoint; function GetNormalizedPos(APage: TvVectorialPage; ANewMin, ANewMax: Double): T3DPoint;
function GenerateDebugTree(ADestRoutine: TvDebugAddItemProc; APageItem: Pointer): Pointer; virtual; function GenerateDebugTree(ADestRoutine: TvDebugAddItemProc; APageItem: Pointer): Pointer; virtual;
function GenerateDebugStrForFPColor(AColor: TFPColor): string; function GenerateDebugStrForFPColor(AColor: TFPColor): string;
@ -1122,52 +1121,6 @@ begin
end; end;
end; end;
procedure TvEntity.CreateFinalDrawingTools(AEntity: TvEntity;
var AFinalPen: TvPen; var AFinalBrush: TvBrush; var AFinalFont: TvFont);
var
lParent: TvEntity;
lAsLayer: TvLayer;
begin
// Recurse through all parents
lParent := AEntity.Parent;
if lParent <> nil then
CreateFinalDrawingTools(lParent, AFinalPen, AFinalBrush, AFinalFont);
// And after that add our own data, since our own data has a higher priority
// then parent's data
if not (AEntity is TvLayer) then
begin
if AEntity is TvEntityWithPen then
AFinalPen := (AEntity as TvEntityWithPen).Pen;
if AEntity is TvEntityWithPenAndBrush then
AFinalBrush := (AEntity as TvEntityWithPenAndBrush).Brush;
if AEntity is TvEntityWithPenBrushAndFont then
AFinalFont := (AEntity as TvEntityWithPenBrushAndFont).Font;
end;
if AEntity is TvLayer then
begin
lAsLayer := AEntity as TvLayer;
// Pen
if spbfPenColor in lAsLayer.SetPenBrushAndFontElements then
AFinalPen.Color := lAsLayer.Pen.Color;
if spbfPenStyle in lAsLayer.SetPenBrushAndFontElements then
AFinalPen.Style := lAsLayer.Pen.Style;
if spbfPenWidth in lAsLayer.SetPenBrushAndFontElements then
AFinalPen.Width := lAsLayer.Pen.Width;
// Brush
if spbfBrushColor in lAsLayer.SetPenBrushAndFontElements then
AFinalBrush.Color := lAsLayer.Brush.Color;
if spbfBrushStyle in lAsLayer.SetPenBrushAndFontElements then
AFinalBrush.Style := lAsLayer.Brush.Style;
// Font
if spbfFontColor in lAsLayer.SetPenBrushAndFontElements then
AFinalFont.Color := lAsLayer.Font.Color;
if spbfFontSize in lAsLayer.SetPenBrushAndFontElements then
AFinalFont.Size := lAsLayer.Font.Size;
end;
end;
function TvEntity.GetNormalizedPos(APage: TvVectorialPage; ANewMin, function TvEntity.GetNormalizedPos(APage: TvVectorialPage; ANewMin,
ANewMax: Double): T3DPoint; ANewMax: Double): T3DPoint;
begin begin
@ -3188,7 +3141,7 @@ end;
procedure TvEntityWithSubEntities.AddEntity(AEntity: TvEntity); procedure TvEntityWithSubEntities.AddEntity(AEntity: TvEntity);
begin begin
AEntity.Parent := Self; //AEntity.Parent := Self;
FElements.Add(AEntity); FElements.Add(AEntity);
end; end;
@ -3477,14 +3430,14 @@ begin
if FCurrentLayer = nil then if FCurrentLayer = nil then
begin begin
Result := FEntities.Count; Result := FEntities.Count;
AEntity.Parent := nil; //AEntity.Parent := nil;
FEntities.Add(Pointer(AEntity)); FEntities.Add(Pointer(AEntity));
end end
// If a layer is selected as current, add elements to it instead // If a layer is selected as current, add elements to it instead
else else
begin begin
Result := FCurrentLayer.GetSubpartCount(); Result := FCurrentLayer.GetSubpartCount();
AEntity.Parent := FCurrentLayer; //AEntity.Parent := FCurrentLayer;
FCurrentLayer.AddEntity(AEntity); FCurrentLayer.AddEntity(AEntity);
end; end;
end; end;