From 2117d39cf8b12f09a03e5822dbedf9c505fc61a7 Mon Sep 17 00:00:00 2001 From: ask Date: Tue, 21 Apr 2009 05:49:44 +0000 Subject: [PATCH] TAChart: add default values to published properties, minor cleanups. git-svn-id: trunk@19540 - --- components/tachart/demo/unit1.lfm | 6 - components/tachart/demo/unit1.lrs | 161 +++++++++++++-------------- components/tachart/funcdemo/main.lfm | 6 +- components/tachart/funcdemo/main.lrs | 31 +++--- components/tachart/tachartutils.pas | 4 +- components/tachart/tagraph.pas | 25 ++--- components/tachart/taseries.pas | 14 +-- components/tachart/tatypes.pas | 20 ++-- 8 files changed, 125 insertions(+), 142 deletions(-) diff --git a/components/tachart/demo/unit1.lfm b/components/tachart/demo/unit1.lfm index 82bbdef942..d2949902ca 100644 --- a/components/tachart/demo/unit1.lfm +++ b/components/tachart/demo/unit1.lfm @@ -11,10 +11,8 @@ object Form1: TForm1 object Chart1: TChart Height = 392 Width = 585 - Legend.Alignment = laRight Legend.Font.Height = -11 Legend.Font.Name = 'MS Sans Serif' - Title.Alignment = taCenter Title.Brush.Color = clBtnFace Title.Font.Color = clBlue Title.Font.Height = -11 @@ -37,17 +35,13 @@ object Form1: TForm1 LeftAxis.Title.Angle = 90 LeftAxis.Title.Font.Height = -11 LeftAxis.Title.Font.Name = 'MS Sans Serif' - LeftAxis.Visible = True BottomAxis.Grid.Color = clGray BottomAxis.Grid.Style = psDot BottomAxis.Grid.Visible = True BottomAxis.Title.Font.Height = -11 BottomAxis.Title.Font.Name = 'MS Sans Serif' - BottomAxis.Visible = True Frame.Visible = True - BackColor = clBtnFace Align = alClient - Color = clBtnFace ParentColor = False object Chart1LineHor: TLine ShowInLegend = False diff --git a/components/tachart/demo/unit1.lrs b/components/tachart/demo/unit1.lrs index 227bace6ab..c2be7188df 100644 --- a/components/tachart/demo/unit1.lrs +++ b/components/tachart/demo/unit1.lrs @@ -4,86 +4,83 @@ LazarusResources.Add('TForm1','FORMDATA',[ 'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'U'#1#6'Height'#3#238#1#3'Top'#3#225#0#5'W' +'idth'#3'I'#2#7'Caption'#6#5'Form1'#12'ClientHeight'#3#238#1#11'ClientWidth' +#3'I'#2#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#6'TCha' - +'rt'#6'Chart1'#6'Height'#3#136#1#5'Width'#3'I'#2#16'Legend.Alignment'#7#7'la' - +'Right'#18'Legend.Font.Height'#2#245#16'Legend.Font.Name'#6#13'MS Sans Serif' - +#15'Title.Alignment'#7#8'taCenter'#17'Title.Brush.Color'#7#9'clBtnFace'#16'T' - +'itle.Font.Color'#7#6'clBlue'#17'Title.Font.Height'#2#245#15'Title.Font.Name' - +#6#13'MS Sans Serif'#18'Title.Text.Strings'#1#6#20'Centered Chart Title'#0#13 - +'Title.Visible'#9#16'Foot.Brush.Color'#7#9'clBtnFace'#15'Foot.Font.Color'#7#5 - +'clRed'#16'Foot.Font.Height'#2#243#14'Foot.Font.Name'#6#13'MS Sans Serif'#15 - +'Foot.Font.Style'#11#6'fsBold'#0#17'Foot.Text.Strings'#1#6#25'This a LeftAli' - +'gned Footer'#0#19'LeftAxis.Grid.Color'#7#6'clGray'#19'LeftAxis.Grid.Style'#7 - +#5'psDot'#21'LeftAxis.Grid.Visible'#9#20'LeftAxis.Title.Angle'#2'Z'#26'LeftA' - +'xis.Title.Font.Height'#2#245#24'LeftAxis.Title.Font.Name'#6#13'MS Sans Seri' - +'f'#16'LeftAxis.Visible'#9#21'BottomAxis.Grid.Color'#7#6'clGray'#21'BottomAx' - +'is.Grid.Style'#7#5'psDot'#23'BottomAxis.Grid.Visible'#9#28'BottomAxis.Title' - +'.Font.Height'#2#245#26'BottomAxis.Title.Font.Name'#6#13'MS Sans Serif'#18'B' - +'ottomAxis.Visible'#9#13'Frame.Visible'#9#9'BackColor'#7#9'clBtnFace'#5'Alig' - +'n'#7#8'alClient'#5'Color'#7#9'clBtnFace'#11'ParentColor'#8#0#5'TLine'#13'Ch' - +'art1LineHor'#12'ShowInLegend'#8#9'Pen.Style'#7#6'psDash'#11'SeriesColor'#7#7 - +'clBlack'#0#0#5'TLine'#14'Chart1LineVert'#12'ShowInLegend'#8#9'LineStyle'#7 - +#10'lsVertical'#9'Pen.Style'#7#6'psDash'#11'SeriesColor'#7#7'clBlack'#0#0#0#6 - +'TPanel'#6'Panel1'#6'Height'#2'f'#3'Top'#3#136#1#5'Width'#3'I'#2#5'Align'#7#8 - +'alBottom'#12'ClientHeight'#2'f'#11'ClientWidth'#3'I'#2#8'TabOrder'#2#0#0#6 - +'TLabel'#6'lblAdd'#4'Left'#2#13#6'Height'#2#14#3'Top'#2#10#5'Width'#2#24#7'C' - +'aption'#6#4'Add:'#11'ParentColor'#8#0#0#6'TLabel'#8'lblClear'#4'Left'#2#13#6 - +'Height'#2#14#3'Top'#2'('#5'Width'#2#30#7'Caption'#6#6'Clear:'#11'ParentColo' - +'r'#8#0#0#6'TLabel'#11'lblAddCount'#4'Left'#3' '#1#6'Height'#2#14#3'Top'#2#8 - +#5'Width'#2':'#7'Caption'#6#12'Multiple add'#11'ParentColor'#8#0#0#6'TLabel' - +#12'lblMarkStyle'#4'Left'#2'0'#6'Height'#2#14#3'Top'#2'P'#5'Width'#2'N'#7'Ca' - +'ption'#6#15'Add with marks:'#11'ParentColor'#8#0#0#6'TLabel'#11'lblReticule' - +#4'Left'#3'h'#1#6'Height'#2#14#3'Top'#2'P'#5'Width'#2'+'#7'Caption'#6#9'Reti' - +'cule:'#11'ParentColor'#8#0#0#7'TButton'#9'btnAddPie'#4'Left'#2'0'#6'Height' - +#2#24#3'Top'#2#8#5'Width'#2'4'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6 - +#3'Pie'#7'OnClick'#7#14'btnAddPieClick'#8'TabOrder'#2#0#0#0#7'TButton'#10'bt' - +'nAddLine'#4'Left'#3#216#0#6'Height'#2#24#3'Top'#2#8#5'Width'#2'4'#25'Border' - +'Spacing.InnerBorder'#2#4#7'Caption'#6#4'Line'#7'OnClick'#7#15'btnAddLineCli' - +'ck'#8'TabOrder'#2#1#0#0#7'TButton'#10'btnAddArea'#4'Left'#2'h'#6'Height'#2 - +#24#3'Top'#2#8#5'Width'#2'4'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#4 - +'Area'#7'OnClick'#7#15'btnAddAreaClick'#8'TabOrder'#2#2#0#0#7'TButton'#9'btn' - +'AddBar'#4'Left'#3#160#0#6'Height'#2#24#3'Top'#2#8#5'Width'#2'4'#25'BorderSp' - +'acing.InnerBorder'#2#4#7'Caption'#6#3'Bar'#7'OnClick'#7#14'btnAddBarClick'#8 - +'TabOrder'#2#3#0#0#9'TCheckBox'#8'cbLegend'#4'Left'#3#128#1#6'Height'#2#17#3 - +'Top'#2#8#5'Width'#2'8'#7'Caption'#6#6'Legend'#8'OnChange'#7#14'cbLegendChan' - +'ge'#8'TabOrder'#2#4#0#0#9'TCheckBox'#12'cbBottomAxis'#4'Left'#3#128#1#6'Hei' - +'ght'#2#17#3'Top'#2#24#5'Width'#2'K'#7'Caption'#6#11'Bottom Axis'#7'Checked' - +#9#8'OnChange'#7#18'cbBottomAxisChange'#5'State'#7#9'cbChecked'#8'TabOrder'#2 - +#5#0#0#9'TCheckBox'#10'cbLeftAxis'#4'Left'#3#128#1#6'Height'#2#17#3'Top'#2'(' - +#5'Width'#2'<'#7'Caption'#6#9'Left Axis'#7'Checked'#9#8'OnChange'#7#16'cbLef' - +'tAxisChange'#5'State'#7#9'cbChecked'#8'TabOrder'#2#6#0#0#9'TCheckBox'#7'cbT' - +'itle'#4'Left'#3#240#1#6'Height'#2#17#3'Top'#2#8#5'Width'#2'('#7'Caption'#6#5 - +'Title'#7'Checked'#9#8'OnChange'#7#13'cbTitleChange'#5'State'#7#9'cbChecked' - +#8'TabOrder'#2#7#0#0#9'TCheckBox'#8'cbFooter'#4'Left'#3#240#1#6'Height'#2#17 - +#3'Top'#2#24#5'Width'#2'2'#7'Caption'#6#6'Footer'#8'OnChange'#7#14'cbFooterC' - +'hange'#8'TabOrder'#2#8#0#0#9'TCheckBox'#10'cbInverted'#4'Left'#3#240#1#6'He' - +'ight'#2#17#3'Top'#2'('#5'Width'#2';'#7'Caption'#6#8'Inverted'#8'OnChange'#7 - +#16'cbInvertedChange'#8'TabOrder'#2#9#0#0#7'TButton'#11'btnClearBar'#4'Left' - +#3#160#0#6'Height'#2#24#3'Top'#2'&'#5'Width'#2'4'#25'BorderSpacing.InnerBord' - +'er'#2#4#7'Caption'#6#3'Bar'#7'OnClick'#7#16'btnClearBarClick'#8'TabOrder'#2 - +#10#0#0#7'TButton'#12'btnClearArea'#4'Left'#2'h'#6'Height'#2#24#3'Top'#2'&'#5 - +'Width'#2'4'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#4'Area'#7'OnClic' - +'k'#7#17'btnClearAreaClick'#8'TabOrder'#2#11#0#0#7'TButton'#12'btnClearLine' - +#4'Left'#3#216#0#6'Height'#2#24#3'Top'#2'&'#5'Width'#2'4'#25'BorderSpacing.I' - +'nnerBorder'#2#4#7'Caption'#6#4'Line'#7'OnClick'#7#17'btnClearLineClick'#8'T' - ,'abOrder'#2#12#0#0#7'TButton'#11'btnClearPie'#4'Left'#2'0'#6'Height'#2#24#3 - +'Top'#2'&'#5'Width'#2'4'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#3'Pi' - +'e'#7'OnClick'#7#16'btnClearPieClick'#8'TabOrder'#2#13#0#0#9'TSpinEdit'#10'e' - +'dAddCount'#4'Left'#3' '#1#6'Height'#2#21#3'Top'#2#24#5'Width'#2'Z'#8'MaxVal' - +'ue'#4'@B'#15#0#8'MinValue'#2#1#8'TabOrder'#2#14#5'Value'#2#1#0#0#9'TCheckBo' - +'x'#18'cbShowGridCheckBox'#4'Left'#3#128#1#6'Height'#2#17#3'Top'#2'8'#5'Widt' - +'h'#2'F'#7'Caption'#6#10'Show grid '#7'Checked'#9#8'OnChange'#7#24'cbShowGri' - +'dCheckBoxChange'#5'State'#7#9'cbChecked'#8'TabOrder'#2#15#0#0#9'TCheckBox' - +#16'cbShowAxisTitles'#4'Left'#3#240#1#6'Height'#2#17#3'Top'#2'8'#5'Width'#2 - +'?'#7'Caption'#6#11'Axis titles'#8'OnChange'#7#22'cbShowAxisTitlesChange'#8 - +'TabOrder'#2#16#0#0#9'TComboBox'#11'cbMarkStyle'#4'Left'#3#132#0#6'Height'#2 - +#21#3'Top'#2'L'#5'Width'#3#136#0#10'ItemHeight'#2#13#9'ItemIndex'#2#5#13'Ite' - +'ms.Strings'#1#6#9'smsCustom'#6#7'smsNone'#6#8'smsValue'#6#10'smsPercent'#6#8 - +'smsLabel'#6#15'smsLabelPercent'#6#13'smsLabelValue'#6#9'smsLegend'#6#15'sms' - +'PercentTotal'#6#20'smsLabelPercentTotal'#6#9'smsXValue'#0#5'Style'#7#14'csD' - +'ropDownList'#8'TabOrder'#2#17#4'Text'#6#15'smsLabelPercent'#0#0#9'TComboBox' - +#10'cbReticule'#4'Left'#3#160#1#6'Height'#2#21#3'Top'#2'L'#5'Width'#3#136#0 - +#10'ItemHeight'#2#13#9'ItemIndex'#2#0#13'Items.Strings'#1#6#6'rmNone'#6#10'r' - +'mVertical'#6#12'rmHorizontal'#6#7'rmCross'#0#8'OnChange'#7#16'cbReticuleCha' - +'nge'#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#18#4'Text'#6#6'rmNone'#0#0 - +#0#0 + +'rt'#6'Chart1'#6'Height'#3#136#1#5'Width'#3'I'#2#18'Legend.Font.Height'#2#245 + +#16'Legend.Font.Name'#6#13'MS Sans Serif'#17'Title.Brush.Color'#7#9'clBtnFac' + +'e'#16'Title.Font.Color'#7#6'clBlue'#17'Title.Font.Height'#2#245#15'Title.Fo' + +'nt.Name'#6#13'MS Sans Serif'#18'Title.Text.Strings'#1#6#20'Centered Chart T' + +'itle'#0#13'Title.Visible'#9#16'Foot.Brush.Color'#7#9'clBtnFace'#15'Foot.Fon' + +'t.Color'#7#5'clRed'#16'Foot.Font.Height'#2#243#14'Foot.Font.Name'#6#13'MS S' + +'ans Serif'#15'Foot.Font.Style'#11#6'fsBold'#0#17'Foot.Text.Strings'#1#6#25 + +'This a LeftAligned Footer'#0#19'LeftAxis.Grid.Color'#7#6'clGray'#19'LeftAxi' + +'s.Grid.Style'#7#5'psDot'#21'LeftAxis.Grid.Visible'#9#20'LeftAxis.Title.Angl' + +'e'#2'Z'#26'LeftAxis.Title.Font.Height'#2#245#24'LeftAxis.Title.Font.Name'#6 + +#13'MS Sans Serif'#21'BottomAxis.Grid.Color'#7#6'clGray'#21'BottomAxis.Grid.' + +'Style'#7#5'psDot'#23'BottomAxis.Grid.Visible'#9#28'BottomAxis.Title.Font.He' + +'ight'#2#245#26'BottomAxis.Title.Font.Name'#6#13'MS Sans Serif'#13'Frame.Vis' + +'ible'#9#5'Align'#7#8'alClient'#11'ParentColor'#8#0#5'TLine'#13'Chart1LineHo' + +'r'#12'ShowInLegend'#8#9'Pen.Style'#7#6'psDash'#11'SeriesColor'#7#7'clBlack' + +#0#0#5'TLine'#14'Chart1LineVert'#12'ShowInLegend'#8#9'LineStyle'#7#10'lsVert' + +'ical'#9'Pen.Style'#7#6'psDash'#11'SeriesColor'#7#7'clBlack'#0#0#0#6'TPanel' + +#6'Panel1'#6'Height'#2'f'#3'Top'#3#136#1#5'Width'#3'I'#2#5'Align'#7#8'alBott' + +'om'#12'ClientHeight'#2'f'#11'ClientWidth'#3'I'#2#8'TabOrder'#2#0#0#6'TLabel' + +#6'lblAdd'#4'Left'#2#13#6'Height'#2#14#3'Top'#2#10#5'Width'#2#24#7'Caption'#6 + +#4'Add:'#11'ParentColor'#8#0#0#6'TLabel'#8'lblClear'#4'Left'#2#13#6'Height'#2 + +#14#3'Top'#2'('#5'Width'#2#30#7'Caption'#6#6'Clear:'#11'ParentColor'#8#0#0#6 + +'TLabel'#11'lblAddCount'#4'Left'#3' '#1#6'Height'#2#14#3'Top'#2#8#5'Width'#2 + +':'#7'Caption'#6#12'Multiple add'#11'ParentColor'#8#0#0#6'TLabel'#12'lblMark' + +'Style'#4'Left'#2'0'#6'Height'#2#14#3'Top'#2'P'#5'Width'#2'N'#7'Caption'#6#15 + +'Add with marks:'#11'ParentColor'#8#0#0#6'TLabel'#11'lblReticule'#4'Left'#3 + +'h'#1#6'Height'#2#14#3'Top'#2'P'#5'Width'#2'+'#7'Caption'#6#9'Reticule:'#11 + +'ParentColor'#8#0#0#7'TButton'#9'btnAddPie'#4'Left'#2'0'#6'Height'#2#24#3'To' + +'p'#2#8#5'Width'#2'4'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#3'Pie'#7 + +'OnClick'#7#14'btnAddPieClick'#8'TabOrder'#2#0#0#0#7'TButton'#10'btnAddLine' + +#4'Left'#3#216#0#6'Height'#2#24#3'Top'#2#8#5'Width'#2'4'#25'BorderSpacing.In' + +'nerBorder'#2#4#7'Caption'#6#4'Line'#7'OnClick'#7#15'btnAddLineClick'#8'TabO' + +'rder'#2#1#0#0#7'TButton'#10'btnAddArea'#4'Left'#2'h'#6'Height'#2#24#3'Top'#2 + +#8#5'Width'#2'4'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#4'Area'#7'On' + +'Click'#7#15'btnAddAreaClick'#8'TabOrder'#2#2#0#0#7'TButton'#9'btnAddBar'#4 + +'Left'#3#160#0#6'Height'#2#24#3'Top'#2#8#5'Width'#2'4'#25'BorderSpacing.Inne' + +'rBorder'#2#4#7'Caption'#6#3'Bar'#7'OnClick'#7#14'btnAddBarClick'#8'TabOrder' + +#2#3#0#0#9'TCheckBox'#8'cbLegend'#4'Left'#3#128#1#6'Height'#2#17#3'Top'#2#8#5 + +'Width'#2'8'#7'Caption'#6#6'Legend'#8'OnChange'#7#14'cbLegendChange'#8'TabOr' + +'der'#2#4#0#0#9'TCheckBox'#12'cbBottomAxis'#4'Left'#3#128#1#6'Height'#2#17#3 + +'Top'#2#24#5'Width'#2'K'#7'Caption'#6#11'Bottom Axis'#7'Checked'#9#8'OnChang' + +'e'#7#18'cbBottomAxisChange'#5'State'#7#9'cbChecked'#8'TabOrder'#2#5#0#0#9'T' + +'CheckBox'#10'cbLeftAxis'#4'Left'#3#128#1#6'Height'#2#17#3'Top'#2'('#5'Width' + +#2'<'#7'Caption'#6#9'Left Axis'#7'Checked'#9#8'OnChange'#7#16'cbLeftAxisChan' + +'ge'#5'State'#7#9'cbChecked'#8'TabOrder'#2#6#0#0#9'TCheckBox'#7'cbTitle'#4'L' + +'eft'#3#240#1#6'Height'#2#17#3'Top'#2#8#5'Width'#2'('#7'Caption'#6#5'Title'#7 + +'Checked'#9#8'OnChange'#7#13'cbTitleChange'#5'State'#7#9'cbChecked'#8'TabOrd' + +'er'#2#7#0#0#9'TCheckBox'#8'cbFooter'#4'Left'#3#240#1#6'Height'#2#17#3'Top'#2 + +#24#5'Width'#2'2'#7'Caption'#6#6'Footer'#8'OnChange'#7#14'cbFooterChange'#8 + +'TabOrder'#2#8#0#0#9'TCheckBox'#10'cbInverted'#4'Left'#3#240#1#6'Height'#2#17 + +#3'Top'#2'('#5'Width'#2';'#7'Caption'#6#8'Inverted'#8'OnChange'#7#16'cbInver' + +'tedChange'#8'TabOrder'#2#9#0#0#7'TButton'#11'btnClearBar'#4'Left'#3#160#0#6 + +'Height'#2#24#3'Top'#2'&'#5'Width'#2'4'#25'BorderSpacing.InnerBorder'#2#4#7 + +'Caption'#6#3'Bar'#7'OnClick'#7#16'btnClearBarClick'#8'TabOrder'#2#10#0#0#7 + +'TButton'#12'btnClearArea'#4'Left'#2'h'#6'Height'#2#24#3'Top'#2'&'#5'Width'#2 + +'4'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#4'Area'#7'OnClick'#7#17'b' + +'tnClearAreaClick'#8'TabOrder'#2#11#0#0#7'TButton'#12'btnClearLine'#4'Left'#3 + +#216#0#6'Height'#2#24#3'Top'#2'&'#5'Width'#2'4'#25'BorderSpacing.InnerBorder' + +#2#4#7'Caption'#6#4'Line'#7'OnClick'#7#17'btnClearLineClick'#8'TabOrder'#2#12 + +#0#0#7'TButton'#11'btnClearPie'#4'Left'#2'0'#6'Height'#2#24#3'Top'#2'&'#5'Wi' + +'dth'#2'4'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#3'Pie'#7'OnClick'#7 + ,#16'btnClearPieClick'#8'TabOrder'#2#13#0#0#9'TSpinEdit'#10'edAddCount'#4'Lef' + +'t'#3' '#1#6'Height'#2#21#3'Top'#2#24#5'Width'#2'Z'#8'MaxValue'#4'@B'#15#0#8 + +'MinValue'#2#1#8'TabOrder'#2#14#5'Value'#2#1#0#0#9'TCheckBox'#18'cbShowGridC' + +'heckBox'#4'Left'#3#128#1#6'Height'#2#17#3'Top'#2'8'#5'Width'#2'F'#7'Caption' + +#6#10'Show grid '#7'Checked'#9#8'OnChange'#7#24'cbShowGridCheckBoxChange'#5 + +'State'#7#9'cbChecked'#8'TabOrder'#2#15#0#0#9'TCheckBox'#16'cbShowAxisTitles' + +#4'Left'#3#240#1#6'Height'#2#17#3'Top'#2'8'#5'Width'#2'?'#7'Caption'#6#11'Ax' + +'is titles'#8'OnChange'#7#22'cbShowAxisTitlesChange'#8'TabOrder'#2#16#0#0#9 + +'TComboBox'#11'cbMarkStyle'#4'Left'#3#132#0#6'Height'#2#21#3'Top'#2'L'#5'Wid' + +'th'#3#136#0#10'ItemHeight'#2#13#9'ItemIndex'#2#5#13'Items.Strings'#1#6#9'sm' + +'sCustom'#6#7'smsNone'#6#8'smsValue'#6#10'smsPercent'#6#8'smsLabel'#6#15'sms' + +'LabelPercent'#6#13'smsLabelValue'#6#9'smsLegend'#6#15'smsPercentTotal'#6#20 + +'smsLabelPercentTotal'#6#9'smsXValue'#0#5'Style'#7#14'csDropDownList'#8'TabO' + +'rder'#2#17#4'Text'#6#15'smsLabelPercent'#0#0#9'TComboBox'#10'cbReticule'#4 + +'Left'#3#160#1#6'Height'#2#21#3'Top'#2'L'#5'Width'#3#136#0#10'ItemHeight'#2 + +#13#9'ItemIndex'#2#0#13'Items.Strings'#1#6#6'rmNone'#6#10'rmVertical'#6#12'r' + +'mHorizontal'#6#7'rmCross'#0#8'OnChange'#7#16'cbReticuleChange'#5'Style'#7#14 + +'csDropDownList'#8'TabOrder'#2#18#4'Text'#6#6'rmNone'#0#0#0#0 ]); diff --git a/components/tachart/funcdemo/main.lfm b/components/tachart/funcdemo/main.lfm index 39eda493b5..8b9009b1ea 100644 --- a/components/tachart/funcdemo/main.lfm +++ b/components/tachart/funcdemo/main.lfm @@ -11,9 +11,7 @@ object Form1: TForm1 object Chart1: TChart Height = 362 Width = 461 - Legend.Alignment = laRight Legend.Visible = True - Title.Alignment = taCenter Title.Brush.Color = clBtnFace Title.Font.Color = clBlue Title.Text.Strings = ( @@ -24,12 +22,12 @@ object Form1: TForm1 LeftAxis.Grid.Style = psDot LeftAxis.Grid.Visible = True LeftAxis.Title.Angle = 90 + LeftAxis.Visible = False BottomAxis.Grid.Style = psDot BottomAxis.Grid.Visible = True + BottomAxis.Visible = False Frame.Visible = True - BackColor = clBtnFace Align = alClient - Color = clBtnFace ParentColor = False object Chart1FuncSeries1: TFuncSeries Extent.XMin = -6.28 diff --git a/components/tachart/funcdemo/main.lrs b/components/tachart/funcdemo/main.lrs index 765ee409f8..876cf7e2dc 100644 --- a/components/tachart/funcdemo/main.lrs +++ b/components/tachart/funcdemo/main.lrs @@ -4,20 +4,19 @@ LazarusResources.Add('TForm1','FORMDATA',[ 'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'"'#1#6'Height'#3'j'#1#3'Top'#3#152#0#5'Wi' +'dth'#3#205#1#7'Caption'#6#5'Form1'#12'ClientHeight'#3'j'#1#11'ClientWidth'#3 +#205#1#8'OnCreate'#7#10'FormCreate'#10'LCLVersion'#6#6'0.9.27'#0#6'TChart'#6 - +'Chart1'#6'Height'#3'j'#1#5'Width'#3#205#1#16'Legend.Alignment'#7#7'laRight' - +#14'Legend.Visible'#9#15'Title.Alignment'#7#8'taCenter'#17'Title.Brush.Color' - +#7#9'clBtnFace'#16'Title.Font.Color'#7#6'clBlue'#18'Title.Text.Strings'#1#6#7 - +'TAChart'#0#16'Foot.Brush.Color'#7#9'clBtnFace'#15'Foot.Font.Color'#7#6'clBl' - +'ue'#19'LeftAxis.Grid.Style'#7#5'psDot'#21'LeftAxis.Grid.Visible'#9#20'LeftA' - +'xis.Title.Angle'#2'Z'#21'BottomAxis.Grid.Style'#7#5'psDot'#23'BottomAxis.Gr' - +'id.Visible'#9#13'Frame.Visible'#9#9'BackColor'#7#9'clBtnFace'#5'Align'#7#8 - +'alClient'#5'Color'#7#9'clBtnFace'#11'ParentColor'#8#0#11'TFuncSeries'#17'Ch' - +'art1FuncSeries1'#11'Extent.XMin'#5#0#248'(\'#143#194#245#200#1#192#11'Exten' - +'t.YMin'#5#0#0#0#0#0#0#0#128#255#191#11'Extent.XMax'#5#0#248'(\'#143#194#245 - +#200#1'@'#11'Extent.YMax'#5#0#0#0#0#0#0#0#128#255'?'#14'Extent.UseXMin'#9#14 - +'Extent.UseYMin'#9#14'Extent.UseXMax'#9#14'Extent.UseYMax'#9#9'Pen.Color'#7#7 - +'clOlive'#9'Pen.Width'#2#2#4'Step'#2#4#5'Title'#6#6'Sin(x)'#0#0#5'TLine'#11 - +'Chart1XAxis'#12'ShowInLegend'#8#11'SeriesColor'#7#7'clBlack'#0#0#5'TLine'#11 - +'Chart1YAxis'#12'ShowInLegend'#8#9'LineStyle'#7#10'lsVertical'#11'SeriesColo' - +'r'#7#7'clBlack'#0#0#0#0 + +'Chart1'#6'Height'#3'j'#1#5'Width'#3#205#1#14'Legend.Visible'#9#17'Title.Bru' + +'sh.Color'#7#9'clBtnFace'#16'Title.Font.Color'#7#6'clBlue'#18'Title.Text.Str' + +'ings'#1#6#7'TAChart'#0#16'Foot.Brush.Color'#7#9'clBtnFace'#15'Foot.Font.Col' + +'or'#7#6'clBlue'#19'LeftAxis.Grid.Style'#7#5'psDot'#21'LeftAxis.Grid.Visible' + +#9#20'LeftAxis.Title.Angle'#2'Z'#16'LeftAxis.Visible'#8#21'BottomAxis.Grid.S' + +'tyle'#7#5'psDot'#23'BottomAxis.Grid.Visible'#9#18'BottomAxis.Visible'#8#13 + +'Frame.Visible'#9#5'Align'#7#8'alClient'#11'ParentColor'#8#0#11'TFuncSeries' + +#17'Chart1FuncSeries1'#11'Extent.XMin'#5#0#248'(\'#143#194#245#200#1#192#11 + +'Extent.YMin'#5#0#0#0#0#0#0#0#128#255#191#11'Extent.XMax'#5#0#248'(\'#143#194 + +#245#200#1'@'#11'Extent.YMax'#5#0#0#0#0#0#0#0#128#255'?'#14'Extent.UseXMin'#9 + +#14'Extent.UseYMin'#9#14'Extent.UseXMax'#9#14'Extent.UseYMax'#9#9'Pen.Color' + +#7#7'clOlive'#9'Pen.Width'#2#2#4'Step'#2#4#5'Title'#6#6'Sin(x)'#0#0#5'TLine' + +#11'Chart1XAxis'#12'ShowInLegend'#8#11'SeriesColor'#7#7'clBlack'#0#0#5'TLine' + +#11'Chart1YAxis'#12'ShowInLegend'#8#9'LineStyle'#7#10'lsVertical'#11'SeriesC' + +'olor'#7#7'clBlack'#0#0#0#0 ]); diff --git a/components/tachart/tachartutils.pas b/components/tachart/tachartutils.pas index 57c2826c3f..d72bf834bb 100644 --- a/components/tachart/tachartutils.pas +++ b/components/tachart/tachartutils.pas @@ -86,10 +86,10 @@ type TPenBrushFontRecall = class private - FPen: TPen; FBrush: TBrush; - FFont: TFont; FCanvas: TCanvas; + FFont: TFont; + FPen: TPen; public constructor Create(ACanvas: TCanvas; AParams: TPenBrushFont); destructor Destroy; override; diff --git a/components/tachart/tagraph.pas b/components/tachart/tagraph.pas index 4f5853b5d5..8da09f1b42 100644 --- a/components/tachart/tagraph.pas +++ b/components/tachart/tagraph.pas @@ -29,7 +29,7 @@ interface uses LCLIntF, LCLType, LResources, - SysUtils, Classes, Controls, Graphics, Dialogs, StdCtrls, + SysUtils, Classes, Controls, Graphics, Dialogs, TAChartUtils, TATypes; const @@ -147,8 +147,6 @@ type FFrame: TChartPen; - FBackColor: TColor; - FAxisVisible: Boolean; function GetMargins(ACanvas: TCanvas): TRect; @@ -176,7 +174,6 @@ type procedure SetFrame(Value: TChartPen); - procedure SetBackColor(Value: TColor); procedure SetAxisVisible(Value: Boolean); function GetChartHeight: Integer; @@ -252,7 +249,7 @@ type property YGraphMin: Double read FYGraphMin write SetYGraphMin; property XGraphMax: Double read FXGraphMax write SetXGraphMax; property YGraphMax: Double read FYGraphMax write SetYGraphMax; - property MirrorX: Boolean read FMirrorX write SetMirrorX; + property MirrorX: Boolean read FMirrorX write SetMirrorX default false; property GraphBrush: TBrush read FGraphBrush write SetGraphBrush; property ReticuleMode: TReticuleMode read FReticuleMode write SetReticuleMode default rmNone; @@ -271,13 +268,11 @@ type property BottomAxis: TChartAxis read FBottomAxis write SetBottomAxis; property Frame: TChartPen read FFrame write SetFrame; - property BackColor: TColor read FBackColor write SetBackColor; - property AxisVisible: Boolean read FAxisVisible write SetAxisVisible default true; property Align; property Anchors; - property Color; + property Color default clBtnFace; property DoubleBuffered; property DragCursor; property DragMode; @@ -365,7 +360,6 @@ begin MirrorX := false; FIsZoomed := false; - FBackColor := Color; FGraphBrush := TBrush.Create; FGraphBrush.OnChange := @StyleChanged; @@ -705,7 +699,7 @@ begin Pen.Assign(FFrame) else Pen.Style := psClear; - Brush.Color := FBackColor; + Brush.Color := Color; Rectangle(FClipRect); end; @@ -895,10 +889,12 @@ begin end; function TChart.GetMargins(ACanvas: TCanvas): TRect; +const + DEF_MARGIN = 4; var i: Integer; begin - Result := Rect(4, 4, 4, 4); + Result := Rect(DEF_MARGIN, DEF_MARGIN, DEF_MARGIN, DEF_MARGIN); for i := 0 to SeriesCount - 1 do if Series[i].Active then Series[i].UpdateMargins(ACanvas, Result); @@ -1255,12 +1251,6 @@ begin Invalidate; end; -procedure TChart.SetBackColor(Value: TColor); -begin - FBackColor := Value; - Invalidate; -end; - procedure TChart.SetAxisVisible(Value: Boolean); begin FAxisVisible := Value; @@ -1469,6 +1459,7 @@ end; initialization {$I tagraph.lrs} + RegisterPropertyToSkip(TChart, 'BackColor', 'Obsolete, use Color instead', ''); SeriesClassRegistry := TStringList.Create; finalization diff --git a/components/tachart/taseries.pas b/components/tachart/taseries.pas index 0b6247cea1..d67a3112b8 100644 --- a/components/tachart/taseries.pas +++ b/components/tachart/taseries.pas @@ -29,7 +29,7 @@ unit TASeries; interface uses - Classes, Dialogs, Graphics, sysutils, + Classes, Graphics, SysUtils, TAGraph, TAChartUtils, TATypes; type @@ -177,9 +177,10 @@ type published property AreaLinesPen: TChartPen read FAreaLinesPen write FAreaLinesPen; property AreaBrush: TBrush read FAreaBrush write SetAreaBrush; - property InvertedStairs: Boolean read FInvertedStairs write SetInvertedStairs; + property InvertedStairs: Boolean + read FInvertedStairs write SetInvertedStairs default false; property SeriesColor; - property Stairs: Boolean read FStairs write SetStairs; + property Stairs: Boolean read FStairs write SetStairs default false; end; { TBasicLineSeries } @@ -252,7 +253,7 @@ type property Pointer: TSeriesPointer read FPointer write SetPointer; property SeriesColor; property ShowLines: Boolean read FShowLines write SetShowLines default true; - property ShowPoints: Boolean read FShowPoints write SetShowPoints; + property ShowPoints: Boolean read FShowPoints write SetShowPoints default false; end; // 'TSerie' alias is for compatibility with older versions of TAChart. @@ -1089,9 +1090,8 @@ end; procedure TBarSeries.SetBarWidthPercent(Value: Integer); begin if (Value < 1) or (Value > 100) then - raise BarException.Create('Wrong BarWidth Percent') - else - FBarWidthPercent := Value; + raise BarException.Create('Wrong BarWidth Percent'); + FBarWidthPercent := Value; end; procedure TBarSeries.SetSeriesColor(const AValue: TColor); diff --git a/components/tachart/tatypes.pas b/components/tachart/tatypes.pas index 37e39480bb..8a76676ccc 100644 --- a/components/tachart/tatypes.pas +++ b/components/tachart/tatypes.pas @@ -41,7 +41,7 @@ type public procedure Assign(Source: TPersistent); override; published - property Visible: Boolean read FVisible write SetVisible; + property Visible: Boolean read FVisible write SetVisible default false; end; TLegendAlignment = (laLeft, laRight, laTop, laBottom); @@ -83,10 +83,11 @@ type procedure Assign(Source: TPersistent); override; published - property Alignment: TLegendAlignment read FAlignment write SetAlignment; + property Alignment: TLegendAlignment + read FAlignment write SetAlignment default laRight; property Font: TFont read FFont write SetFont; property Frame: TChartPen read FFrame write SetFrame; - property Visible; + property Visible default false; end; TChartTitle = class(TChartElement) @@ -108,12 +109,13 @@ type procedure Assign(Source: TPersistent); override; published - property Alignment: TAlignment read FAlignment write SetAlignment; + property Alignment: TAlignment + read FAlignment write SetAlignment default taCenter; property Brush: TBrush read FBrush write SetBrush; property Font: TFont read FFont write SetFont; property Frame: TChartPen read FFrame write SetFrame; property Text: TStrings read FText write SetText; - property Visible; + property Visible default false; end; TChartAxisTitle = class(TChartElement) @@ -131,9 +133,10 @@ type procedure Assign(Source: TPersistent); override; published - property Angle: Integer read FAngle write SetAngle; + property Angle: Integer read FAngle write SetAngle default 0; property Caption: String read FCaption write SetCaption; property Font: TFont read FFont write SetFont; + property Visible default false; end; TChartAxis = class(TChartElement) @@ -153,9 +156,9 @@ type published property Grid: TChartPen read FGrid write SetGrid; // Inverts the axis scale from increasing to decreasing. - property Inverted: boolean read FInverted write SetInverted; + property Inverted: boolean read FInverted write SetInverted default false; property Title: TChartAxisTitle read FTitle write SetTitle; - property Visible; + property Visible default true; end; TChartLinkPen = class(TChartPen) @@ -397,6 +400,7 @@ constructor TChartTitle.Create(AOwner: TCustomChart); begin inherited Create(AOwner); + FAlignment := taCenter; InitHelper(FBrush, TBrush); FBrush.Color := FOwner.Color; InitHelper(FFont, TFont);