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

TAChart: bug fixes and implemented Series.ShowInLegend from Luis Rodrigues

Browse Source 
git-svn-id: trunk@10791 -
This commit is contained in:
vincents 2007-03-23 19:38:50 +00:00
parent e0972c9bf0
commit ebefd69526
4 changed files with 108 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/tachart/README.txt
View File

@ -41,6 +41,12 @@ Installation
* Click on Compile
* Click on Install
Changes
-------
* 12/03/2007 - Bugfixes and implement ShowInLegend
* 01/01/2007 - Initial Release
Copyright (C) 2005-2006 by Philippe Martinole <philippe.martinole@teleauto.org>
Copyright (C) 2006-2006 by Luis Rodrigues <lr@neei.uevora.pt>
Copyright (C) 2006-2007 by Luis Rodrigues <lr@neei.uevora.pt>

16
components/tachart/taengine.pas
View File

@ -22,12 +22,22 @@
}
unit TAEngine;
interface
uses Classes;
type
//not completetly implemented (only TPieSeries - not all)
TSeriesMarksStyle=( smsValue, { 1234 }
smsPercent, { 12 % }
smsLabel, { Cars }
smsLabelPercent, { Cars 12 % }
smsLabelValue, { Cars 1234 }
smsLegend, { ? }
smsPercentTotal, { 12 % of 1234 }
smsLabelPercentTotal, { Cars 12 % of 1234 }
smsXValue); { 21/6/1996 }
TSeriesList = class(TList)
@ -38,8 +48,6 @@ type
end;
implementation
end.

164
components/tachart/tagraph.pas
View File

@ -22,7 +22,6 @@
}
unit TAGraph;
{$IFDEF fpc}
{$MODE DELPHI}{$H+}
{$ENDIF}
@ -43,7 +42,7 @@ const
MaxArray=2;
MaxColor=15;
Colors:array[1..MaxColor] of TColor=
( clRed,
( clRed,
clGreen,
clyellow,
clBlue,
@ -62,13 +61,10 @@ const
type
TDrawVertReticule=procedure(Sender:TComponent;IndexSerie,Index,Xi,Yi:Integer;Xg,Yg:Double) of object;
TDrawReticule=procedure(Sender:TComponent;IndexSerie,Index,Xi,Yi:Integer;Xg,Yg:Double) of object;
///luis teste
TCustomChart = class(TGraphicControl);
TChartPen = class(TPen)
@ -83,9 +79,6 @@ type
property OnChange: TNotifyEvent read FChanged write FChanged;
end;
TLegendAlignment=(laLeft,laRight,laTop,laBottom);
TChartLegend = class(TPersistent)
private
@ -172,7 +165,6 @@ type
property OnChange: TNotifyEvent read FChanged write FChanged;
end;
TChartAxis = class(TPersistent)
private
FVisible: boolean;
@ -197,9 +189,6 @@ type
property OnChange: TNotifyEvent read FChanged write FChanged;
end;
TChart = class(TCustomChart)
private
{ Déclarations privées }
@ -224,7 +213,6 @@ type
FAllowZoom: Boolean;
FGraphBrush:TBrush;
AxisColor:TColor; // Axis color
ax,bx,ay,by:Double; // Image<->Graphe conversion coefs
@ -250,7 +238,6 @@ type
FAxisVisible: boolean;
procedure SetAutoUpdateXMin(Value:Boolean);
procedure SetAutoUpdateXMax(Value:Boolean);
procedure SetAutoUpdateYMin(Value:Boolean);
@ -287,8 +274,8 @@ type
function GetSeriesCount: Integer;
function only_pie: boolean;
function get_pie: pointer;
function get_pie: pointer;
function SeriesInLegendCount: integer;
protected
{ Déclarations protégées }
procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override;
@ -297,10 +284,9 @@ type
procedure DoDrawVertReticule(IndexSerie,Index,Xi,Yi:Integer;Xg,Yg:Double); virtual;
procedure DoDrawReticule(IndexSerie,Index,Xi,Yi:Integer;Xg,Yg:Double); virtual;
public
XImageMin,YImageMin:Integer; // Image coordinates of limits
XImageMin,YImageMin:Integer; // Image coordinates of limits
XImageMax,YImageMax:Integer;
{ Déclarations publiques }
constructor Create(AOwner:TComponent); override;
destructor Destroy; override;
@ -312,7 +298,7 @@ type
procedure DrawLegend;
procedure AddSerie(Serie:TComponent);
// procedure DeleteSerie(Serie:TTASerie);
// procedure DeleteSerie(Serie:TSerie);
procedure DeleteSerie(Serie:TComponent);
function GetSerie(i:Integer):TComponent;
procedure SetAutoXMin(Auto:Boolean);
@ -361,7 +347,6 @@ type
property Title: TChartTitle read FTitle write SetTitle;
property Foot: TChartTitle read FFoot write SetFoot;
property AllowZoom: Boolean read FAllowZoom write FAllowZoom;
property LeftAxis: TChartAxis read FLeftAxis write SetLeftAxis;
@ -422,8 +407,6 @@ begin
DeleteObject(SelectObject(DC,OldFont));
end;
procedure TChartPen.SetVisible(Value: Boolean);
begin
FVisible := Value;
@ -465,7 +448,6 @@ begin
inherited;
end;
procedure TChartAxis.SetVisible(value: boolean);
begin
FVisible := value;
@ -484,7 +466,6 @@ begin
if assigned( FChanged ) then FChanged(Self);
end;
procedure TChartAxis.Assign(Source:TPersistent);
begin
if Source is TChartAxis then
@ -500,12 +481,10 @@ begin
if assigned( FChanged ) then FChanged(Self);
end;
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
Constructor TChartAxisTitle.Create(AOwner: TCustomChart);
begin
inherited Create;
@ -552,13 +531,10 @@ begin
inherited Assign(Source);
end;
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
Constructor TChartLegend.Create(AOwner: TCustomChart);
begin
inherited create;
@ -836,7 +812,7 @@ if (Mini<0) and (Maxi>0) then
end
else
begin
// Don't work if mini is negative and > 1
// Don''t work if mini is negative and > 1
// if Abs(Mini)<1 then
Debut:=Round((Mini-Pas)*Mult[Index[j]])/Mult[Index[j]]
// else
@ -920,10 +896,12 @@ var
MySerie:TChartSeries;
i,c: integer;
begin
c := FSeries.Count - 1;
for i := 0 to c do begin
TChartSeries(FSeries.Items[0]).Free;
FSeries.Delete( 0 );
if FSeries.Count > 0 then begin
c := FSeries.Count - 1;
for i := 0 to c do begin
TChartSeries(FSeries.Items[0]).Free;
FSeries.Delete( 0 );
end;
end;
FSeries.Free;
@ -1225,7 +1203,6 @@ procedure TChart.DrawLegend;
var
w,h,x1,y1,x2,y2,i,TH:Integer;
MySerie:TSerie;
begin
TmpBrush.Assign(Canvas.Brush);
TmpPen.Assign(Canvas.Pen);
@ -1238,7 +1215,7 @@ begin
MySerie := get_pie;
h:=5+MySerie.Count*(TH+5);
end else begin
h:=5+SeriesCount*(TH+5);
h:=5+SeriesInLegendCount*(TH+5);
end;
x1:=Width-w-5;
y1 := YImageMax;
@ -1265,10 +1242,12 @@ begin
end else begin
for i:=0 to SeriesCount-1 do begin
MySerie:=Series[i];
Canvas.TextOut(x1+20,y1+5+i*(TH+5),MySerie.Title);
Canvas.Pen.Color := MySerie.SeriesColor;
Canvas.MoveTo(x1+5,y1+5+i*(TH+5)+TH div 2);
Canvas.LineTo(x1+15,y1+5+i*(TH+5)+TH div 2);
if MySerie.ShowInLegend then begin
Canvas.TextOut(x1+20,y1+5+i*(TH+5),MySerie.Title);
Canvas.Pen.Color := MySerie.SeriesColor;
Canvas.MoveTo(x1+5,y1+5+i*(TH+5)+TH div 2);
Canvas.LineTo(x1+15,y1+5+i*(TH+5)+TH div 2);
end;
end;
end;
@ -1360,7 +1339,7 @@ var
i,j,k:Integer;
MySerie:TSerie;
begin
if not FLegend.Visible then begin Result:=0; Exit; end;
if (not FLegend.Visible) or (SeriesInLegendCount = 0) then begin Result:=0; Exit; end;
if only_pie then begin//if only one pie show diferent legend
MySerie := get_pie;
@ -1374,8 +1353,10 @@ if not FLegend.Visible then begin Result:=0; Exit; end;
j:=0;
for i:=0 to SeriesCount-1 do begin
MySerie:=Series[i];
k:=Canvas.TextWidth(MySerie.Title);
if k>j then j:=k;
if MySerie.ShowInLegend then begin
k:=Canvas.TextWidth(MySerie.Title);
if k>j then j:=k;
end;
end;
Result:=j+20+10;
end;
@ -1406,7 +1387,7 @@ Series.Add(Serie);
TChartSeries(Serie).Chart := Self;
end;
//procedure TChart.DeleteSerie(Serie:TTASerie);
//procedure TChart.DeleteSerie(Serie:TSerie);
procedure TChart.DeleteSerie(Serie:TComponent);
var
i:Integer;
@ -1970,68 +1951,75 @@ end;
procedure TChart.SetBackColor(Value: TColor);
begin
FBackColor := Value;
Invalidate;
end;
FBackColor := Value;
Invalidate;
end;
procedure TChart.SetAxisVisible(Value: boolean);
begin
FAxisVisible := Value;
Invalidate;
end;
FAxisVisible := Value;
Invalidate;
end;
function TChart.GetChartHeight: integer;
begin
result := YImageMax - YImageMin;
result := YImageMax - YImageMin;
end;
function TChart.GetChartWidth: integer;
begin
result := XImageMax - XImageMin;
end;
result := XImageMax - XImageMin;
end;
function TChart.GetSeriesCount: integer;
var i: integer;
begin
result := 0;
for i := 0 to FSeries.count -1 do
if TChartSeries(FSeries.Items[i]).Active then inc(Result);
{result := 0;
for i := 0 to FSeries.count -1 do
if TChartSeries(FSeries.Items[i]).Active then
inc(Result); }
result := FSeries.count;
end;
////////////////////////UTILS.... clean a bit
//checks if only a pie chart is enabled
function TChart.only_pie: boolean;
var i: integer;
begin
if FSeries.count > 0 then result := true
else result := false;
for i := 0 to FSeries.count -1 do begin
if ( not (TChartSeries(Series.Items[i]) is TPieSeries)) and
TChartSeries(FSeries.Items[i]).Active then begin
result := false;
break;
end;
end;
end;
/////////////////////////UTILS.... clean a bit
//checks if only a pie chart is enabled
function TChart.only_pie: boolean;
var i: integer;
begin
if FSeries.count > 0 then result := true
else result := false;
for i := 0 to FSeries.count -1 do begin
if ( not (TChartSeries(Series.Items[i]) is TPieSeries)) and
TChartSeries(FSeries.Items[i]).Active then begin
result := false;
break;
end;
end;
end;
//get enabled pie chart
function TChart.get_pie: pointer;
var i: integer;
begin
result := nil;
for i := 0 to FSeries.count -1 do begin
if ( (TChartSeries(Series.Items[i]) is TPieSeries)) and
TChartSeries(FSeries.Items[i]).Active then begin
result := TChartSeries(Series.Items[i]) ;
break;
end;
end;
end;
//get enabled pie chart
function TChart.get_pie: pointer;
var i: integer;
begin
result := nil;
for i := 0 to FSeries.count -1 do begin
if ( (TChartSeries(Series.Items[i]) is TPieSeries)) and
TChartSeries(FSeries.Items[i]).Active then begin
result := TChartSeries(Series.Items[i]) ;
break;
end;
end;
end;
function TChart.SeriesInLegendCount: integer;
var i: integer;
begin
Result := 0;
for i:=0 to SeriesCount-1 do
if TChartSeries(Series[i]).ShowInLegend then
Inc(Result);
end;
procedure Register;
begin
@ -2042,4 +2030,6 @@ end;
initialization
{$I tagraph.lrs}
{$ENDIF}
end.

27
components/tachart/taseries.pas
View File

@ -23,7 +23,6 @@
unit TASeries;
{$IFDEF fpc}
{$MODE DELPHI}{$H+}
{$ENDIF}
@ -35,7 +34,7 @@ uses
{$ELSE}
Windows,
{$ENDIF}
classes, graphics, tagraph, sysutils, dialogs;
classes, graphics, tagraph, taengine, sysutils, dialogs;
Const clTAColor = clScrollBar;
@ -49,17 +48,6 @@ type
PChartCoord = ^ChartCoord;
TPointStyle=(psRectangle,psCircle,psCross,psDiagCross,psStar);
//not completetly implemented (only TPieSeries - not all)
TSeriesMarksStyle =( smsValue, { 1234 }
smsPercent, { 12 % }
smsLabel, { Cars }
smsLabelPercent, { Cars 12 % }
smsLabelValue, { Cars 1234 }
smsLegend, { ? }
smsPercentTotal, { 12 % of 1234 }
smsLabelPercentTotal, { Cars 12 % of 1234 }
smsXValue); { 21/6/1996 }
BarException=class(Exception);
@ -73,10 +61,12 @@ type
FCoordList: TList;
FActive:Boolean;
FMarks: TSeriesMarksStyle;
FShowInLegend: Boolean;
procedure SetActive(Value:Boolean);
procedure SetMarks(Value:TSeriesMarksStyle);
function GetXMinVal: Integer;
procedure SetShowInLegend(Value: Boolean);
public
Chart:TChart;
procedure Draw; virtual; abstract;
@ -101,11 +91,11 @@ type
published
property MarksStyle: TSeriesMarksStyle read FMarks write SetMarks; //this should be an object
property Active:Boolean read FActive write SetActive;
property ShowInLegend:Boolean read FShowInLegend write SetShowInLegend;
end;
{ TCustomSeries = class(TChartSeries);
{ TTACustomSeries = class(TChartSeries);
TTACustomBarSeries = class(TChartSeries)
public
@ -312,6 +302,7 @@ begin
YGraphMax:=MinDouble;
FActive := True;
FShowInLegend := True;
FMarks := smsLabel;
FCoordList := TList.Create;
end;
@ -388,6 +379,12 @@ begin
if Chart <> nil then Chart.Invalidate;
end;
procedure TChartSeries.SetShowInLegend(Value:Boolean);
begin
FShowInLegend:=Value;
if Chart <> nil then Chart.Invalidate;
end;
procedure TChartSeries.SetMarks(Value:TSeriesMarksStyle);
begin
FMarks := Value;