diff --git a/.gitattributes b/.gitattributes
index a58cd413f5..f36b200f5c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2058,7 +2058,6 @@ components/tachart/Makefile svneol=native#text/plain
components/tachart/Makefile.fpc svneol=native#text/plain
components/tachart/README.txt svneol=native#text/plain
components/tachart/demo/3d/main.lfm svneol=native#text/plain
-components/tachart/demo/3d/main.lrs svneol=native#text/pascal
components/tachart/demo/3d/main.pas svneol=native#text/plain
components/tachart/demo/3d/zdemo.lpi svneol=native#text/plain
components/tachart/demo/3d/zdemo.lpr svneol=native#text/plain
diff --git a/components/tachart/demo/3d/main.lfm b/components/tachart/demo/3d/main.lfm
index cbc7202993..3aec3b3501 100644
--- a/components/tachart/demo/3d/main.lfm
+++ b/components/tachart/demo/3d/main.lfm
@@ -7,19 +7,28 @@ object Form1: TForm1
ClientHeight = 300
ClientWidth = 560
Position = poScreenCenter
- LCLVersion = '0.9.27'
+ LCLVersion = '0.9.29'
object Chart1: TChart
Left = 0
Height = 300
Top = 0
Width = 560
+ AxisList = <
+ item
+ Alignment = calLeft
+ Title.Font.Orientation = 900
+ Transformation.Offset = 0
+ Transformation.Scale = 1
+ end
+ item
+ Alignment = calBottom
+ Transformation.Offset = 0
+ Transformation.Scale = 1
+ end>
BackColor = clSilver
- BottomAxis.Grid.Style = psDot
Depth = 50
Foot.Brush.Color = clBtnFace
Foot.Font.Color = clBlue
- LeftAxis.Grid.Style = psDot
- LeftAxis.Title.Angle = 90
Margins.Bottom = 0
Title.Brush.Color = clBtnFace
Title.Font.Color = clBlue
diff --git a/components/tachart/demo/3d/main.lrs b/components/tachart/demo/3d/main.lrs
deleted file mode 100644
index 38dd5e2eff..0000000000
--- a/components/tachart/demo/3d/main.lrs
+++ /dev/null
@@ -1,28 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TForm1','FORMDATA',[
- 'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'>'#1#6'Height'#3','#1#3'Top'#3#150#0#5'Wi'
- +'dth'#3'0'#2#7'Caption'#6#5'Form1'#12'ClientHeight'#3','#1#11'ClientWidth'#3
- +'0'#2#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#6'TChart'
- +#6'Chart1'#4'Left'#2#0#6'Height'#3','#1#3'Top'#2#0#5'Width'#3'0'#2#9'BackCol'
- +'or'#7#8'clSilver'#21'BottomAxis.Grid.Style'#7#5'psDot'#5'Depth'#2'2'#16'Foo'
- +'t.Brush.Color'#7#9'clBtnFace'#15'Foot.Font.Color'#7#6'clBlue'#19'LeftAxis.G'
- +'rid.Style'#7#5'psDot'#20'LeftAxis.Title.Angle'#2'Z'#14'Margins.Bottom'#2#0
- +#17'Title.Brush.Color'#7#9'clBtnFace'#16'Title.Font.Color'#7#6'clBlue'#18'Ti'
- +'tle.Text.Strings'#1#6#7'TAChart'#0#5'Align'#7#8'alClient'#5'Color'#7#7'clWh'
- +'ite'#11'ParentColor'#8#0#10'TBarSeries'#16'Chart1BarSeries1'#9'ZPosition'#2
- +#10#14'BarBrush.Color'#7#6'clTeal'#15'BarWidthPercent'#2'2'#5'Depth'#2#10#11
- +'SeriesColor'#7#6'clTeal'#6'Source'#7#18'RandomChartSource1'#0#0#10'TBarSeri'
- +'es'#16'Chart1BarSeries2'#9'ZPosition'#2#30#14'BarBrush.Color'#7#8'clMaroon'
- +#15'BarWidthPercent'#2'2'#5'Depth'#2#10#11'SeriesColor'#7#8'clMaroon'#6'Sour'
- +'ce'#7#18'RandomChartSource2'#0#0#11'TLineSeries'#17'Chart1LineSeries1'#9'ZP'
- +'osition'#2'2'#5'Depth'#2#10#13'LinePen.Color'#7#6'clBlue'#11'SeriesColor'#7
- +#6'clBlue'#6'Source'#7#18'RandomChartSource1'#0#0#0#18'TRandomChartSource'#18
- +'RandomChartSource1'#12'PointsNumber'#2#7#8'RandSeed'#4#249#234#131' '#4'XMa'
- +'x'#5#0#0#0#0#0#0#0#224#1'@'#4'XMin'#5#0#0#0#0#0#0#0#128#255'?'#4'YMax'#5#0#0
- +#0#0#0#0#0#192#2'@'#4'YMin'#5#0#0#0#0#0#0#0#128#1'@'#4'left'#2'x'#3'top'#2'4'
- +#0#0#18'TRandomChartSource'#18'RandomChartSource2'#12'PointsNumber'#2#7#8'Ra'
- +'ndSeed'#4't18'#5#4'XMax'#5#0#0#0#0#0#0#0#224#1'@'#4'XMin'#5#0#0#0#0#0#0#0
- +#128#255'?'#4'YMax'#5#0#0#0#0#0#0#0#192#2'@'#4'YMin'#5#0#0#0#0#0#0#0#128#255
- +'?'#4'left'#2'x'#3'top'#2'd'#0#0#0
-]);
diff --git a/components/tachart/demo/3d/main.pas b/components/tachart/demo/3d/main.pas
index 5abcdbae3a..f2f43933a8 100644
--- a/components/tachart/demo/3d/main.pas
+++ b/components/tachart/demo/3d/main.pas
@@ -5,7 +5,7 @@ unit main;
interface
uses
- Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
+ Forms,
TAGraph, TASeries, TASources;
type
@@ -26,8 +26,7 @@ var
implementation
-initialization
- {$I main.lrs}
+{$R *.lfm}
end.
diff --git a/components/tachart/demo/3d/zdemo.lpi b/components/tachart/demo/3d/zdemo.lpi
index 7e22967da8..2c7fd1dbcc 100644
--- a/components/tachart/demo/3d/zdemo.lpi
+++ b/components/tachart/demo/3d/zdemo.lpi
@@ -6,12 +6,13 @@
+
-
+
@@ -69,4 +70,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+