paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-21 11:39:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

TAChart: Clean-up: Remove out-dated version checks. Add missing compiler mode directives.

Browse Source
This commit is contained in:
wp_xyz 2023-06-03 17:37:23 +02:00
parent d8efd39359
commit 68228adb4e
46 changed files with 46 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/tachart/demo/area/main.lfm
View File

@ -33,6 +33,7 @@ object Form1: TForm1
ClientHeight = 87 ClientHeight = 87
ClientWidth = 678 ClientWidth = 678
Color = clNone Color = clNone
ParentBackground = False
ParentColor = False ParentColor = False
TabOrder = 0 TabOrder = 0
object CbRotated: TCheckBox object CbRotated: TCheckBox

23
components/tachart/demo/area/main.pas
View File

@ -112,15 +112,11 @@ end;
procedure TForm1.CbBandedChange(Sender: TObject); procedure TForm1.CbBandedChange(Sender: TObject);
begin begin
{$IF LCL_FullVersion >= 1090000}
Chart1AreaSeries1.Banded := CbBanded.Checked; Chart1AreaSeries1.Banded := CbBanded.Checked;
if Chart1AreaSeries1.Banded then if Chart1AreaSeries1.Banded then
UpdateStyles(Chart1AreaSeries1.ListSource.YCount-1) UpdateStyles(Chart1AreaSeries1.ListSource.YCount-1)
else else
UpdateStyles(Chart1AreaSeries1.ListSource.YCount); UpdateStyles(Chart1AreaSeries1.ListSource.YCount);
{$ELSE}
ShowMessage('This functionality requires at least Lazarus version 1.9');
{$IFEND}
end; end;
procedure TForm1.CbCenteredChange(Sender: TObject); procedure TForm1.CbCenteredChange(Sender: TObject);
@ -276,12 +272,8 @@ begin
ChartSourceArea2.YCount := 3; ChartSourceArea2.YCount := 3;
ChartSourceArea2.PointsNumber := N2; ChartSourceArea2.PointsNumber := N2;
{$IF LCL_FullVersion >= 1090000}
Chart2AreaSeries1.Banded := true; Chart2AreaSeries1.Banded := true;
Chart2AreaSeries2.Banded := true; Chart2AreaSeries2.Banded := true;
{$ELSE}
Label1.Show;
{$ENDIF}
end; end;
procedure TForm1.EdCountChange(Sender: TObject); procedure TForm1.EdCountChange(Sender: TObject);
@ -320,27 +312,12 @@ var
begin begin
ChartStyles1.Styles.Clear; ChartStyles1.Styles.Clear;
for i := 1 to Count do for i := 1 to Count do
{$IF LCL_FullVersion >= 1090000}
with ChartStyles1.Add do begin with ChartStyles1.Add do begin
{$ELSE}
with TChartStyle(ChartStyles1.Styles.Add) do begin
{$IFEND}
Brush.Color := COLORS[i-1]; Brush.Color := COLORS[i-1];
Pen.Width := 3; Pen.Width := 3;
Text := 'Curve ' + IntToStr(i); Text := 'Curve ' + IntToStr(i);
end; end;
end; end;
{
if CbStacked.Checked then begin
Chart1AreaSeries1.AxisIndexX := 0;
Chart1AreaSeries1.AxisIndexY := 1;
end else begin
Chart1AreaSeries1.AxisIndexX := 1;
Chart1AreaSeries1.AxisIndexY := 0;
end;
end;
}
end. end.

2
components/tachart/editors/taserieseditor.pas
View File

@ -17,7 +17,7 @@
} }
unit TASeriesEditor; unit TASeriesEditor;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/editors/taseriespropeditors.pas
View File

@ -1,6 +1,6 @@
unit TASeriesPropEditors; unit TASeriesPropEditors;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/editors/tasubcomponentseditor.pas
View File

@ -9,7 +9,7 @@
} }
unit TASubcomponentsEditor; unit TASubcomponentsEditor;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/editors/tatooleditors.pas
View File

@ -11,7 +11,7 @@
unit TAToolEditors; unit TAToolEditors;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/taaxissource.pas
View File

@ -11,7 +11,7 @@
unit TAAxisSource; unit TAAxisSource;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/tachartaxis.pas
View File

@ -11,7 +11,7 @@
} }
unit TAChartAxis; unit TAChartAxis;
{$H+} {$MODE ObjFPC}{$H+}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined} {$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface interface

2
components/tachart/tachartaxisutils.pas
View File

@ -9,7 +9,7 @@
} }
unit TAChartAxisUtils; unit TAChartAxisUtils;
{$H+} {$MODE ObjFPC}{$H+}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined} {$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface interface

2
components/tachart/tachartextentlink.pas
View File

@ -1,6 +1,6 @@
unit TAChartExtentLink; unit TAChartExtentLink;
{$H+} {$MODE ObjFPC}{$H+}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined} {$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface interface

2
components/tachart/tachartimagelist.pas
View File

@ -21,7 +21,7 @@
unit TAChartImageList; unit TAChartImageList;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

5
components/tachart/tachartutils.pas
View File

@ -18,10 +18,7 @@
unit TAChartUtils; unit TAChartUtils;
{$H+} {$MODE ObjFPC}{$H+}
{$IF FPC_FULLVERSION<20700}
{$OPTIMIZATION NOSTACKFRAME}
{$ENDIF}
interface interface

2
components/tachart/tacustomfuncseries.pas
View File

@ -12,7 +12,7 @@
} }
unit TACustomFuncSeries; unit TACustomFuncSeries;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

3
components/tachart/tacustomseries.pas
View File

@ -11,7 +11,7 @@
} }
unit TACustomSeries; unit TACustomSeries;
{$H+} {$MODE ObjFPC}{$H+}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined} {$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface interface
@ -128,7 +128,6 @@ type
property Shadow; property Shadow;
property ShowInLegend: Boolean property ShowInLegend: Boolean
read GetShowInLegend write SetShowInLegend stored false default true; read GetShowInLegend write SetShowInLegend stored false default true;
deprecated;
property Transparency; property Transparency;
end; end;

2
components/tachart/tadatapointseditor.pas
View File

@ -9,7 +9,7 @@
} }
unit TADataPointsEditor; unit TADataPointsEditor;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/tadatatools.pas
View File

@ -11,7 +11,7 @@
unit TADataTools; unit TADataTools;
{$H+} {$MODE ObjFPC}{$H+}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined} {$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface interface

2
components/tachart/tadbsource.pas
View File

@ -10,7 +10,7 @@
} }
unit TADbSource; unit TADbSource;
{$H+} {$MODE ObjFPC}{$H+}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined} {$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface interface

2
components/tachart/tadiagram.pas
View File

@ -9,7 +9,7 @@
} }
unit TADiagram; unit TADiagram;
{$H+} {$MODE ObjFPC}{$H+}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined} {$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface interface

2
components/tachart/tadiagramdrawing.pas
View File

@ -9,7 +9,7 @@
} }
unit TADiagramDrawing; unit TADiagramDrawing;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/tadiagramlayout.pas
View File

@ -9,7 +9,7 @@
} }
unit TADiagramLayout; unit TADiagramLayout;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

4
components/tachart/tadrawercanvas.pas
View File

@ -373,11 +373,7 @@ begin
Include(st, fsBold); Include(st, fsBold);
if AFont.Underline then if AFont.Underline then
Include(st, fsUnderline); Include(st, fsUnderline);
{$IF (FPC_FULLVERSION<=20600) or (FPC_FULLVERSION=20602)}
if AFont.StrikeTrough then
{$ELSE}
if AFont.StrikeThrough then if AFont.StrikeThrough then
{$ENDIF}
Include(st, fsStrikeOut); Include(st, fsStrikeOut);
Style := st; Style := st;
EndUpdate; EndUpdate;

2
components/tachart/tadrawerfpcanvas.pas
View File

@ -9,7 +9,7 @@
} }
unit TADrawerFPCanvas; unit TADrawerFPCanvas;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/tadrawersvg.pas
View File

@ -9,7 +9,7 @@
} }
unit TADrawerSVG; unit TADrawerSVG;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/tadrawutils.pas
View File

@ -10,7 +10,7 @@
unit TADrawUtils; unit TADrawUtils;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/taenumerators.pas
View File

@ -10,7 +10,7 @@
} }
unit TAEnumerators; unit TAEnumerators;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/taexpressionseries.pas
View File

@ -18,7 +18,7 @@
unit TAExpressionSeries; unit TAExpressionSeries;
{$H+} {$MODE ObjFPC}{$H+}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined} {$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface interface

2
components/tachart/tafitutils.pas
View File

@ -10,7 +10,7 @@
} }
unit TAFitUtils; unit TAFitUtils;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/tafuncseries.pas
View File

@ -12,7 +12,7 @@
} }
unit TAFuncSeries; unit TAFuncSeries;
{$H+} {$MODE ObjFPC}{$H+}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined} {$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface interface

2
components/tachart/tageometry.pas
View File

@ -9,7 +9,7 @@
} }
unit TAGeometry; unit TAGeometry;
{$H+} {$MODE ObjFPC}{$H+}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined} {$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface interface

2
components/tachart/tagraph.pas
View File

@ -17,7 +17,7 @@
} }
unit TAGraph; unit TAGraph;
{$H+} {$MODE ObjFPC}{$H+}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined} {$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface interface

2
components/tachart/taguiconnector.pas
View File

@ -10,7 +10,7 @@
} }
unit TAGUIConnector; unit TAGUIConnector;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/tahtml.pas
View File

@ -1,6 +1,6 @@
unit TAHtml; unit TAHtml;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/taintervalsources.pas
View File

@ -11,7 +11,7 @@
unit TAIntervalSources; unit TAIntervalSources;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/talegend.pas
View File

@ -9,7 +9,7 @@
} }
unit TALegend; unit TALegend;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/talegendpanel.pas
View File

@ -9,7 +9,7 @@
} }
unit TALegendPanel; unit TALegendPanel;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/tamath.pas
View File

@ -9,7 +9,7 @@
} }
unit TAMath; unit TAMath;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/tamultiseries.pas
View File

@ -10,7 +10,7 @@
unit TAMultiSeries; unit TAMultiSeries;
{$H+} {$MODE ObjFPC}{$H+}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined} {$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface interface

2
components/tachart/tanavigation.pas
View File

@ -10,7 +10,7 @@
unit TANavigation; unit TANavigation;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

4
components/tachart/taradialseries.pas
View File

@ -11,7 +11,7 @@
unit TARadialSeries; unit TARadialSeries;
{$H+} {$MODE ObjFPC}{$H+}
interface interface
@ -180,11 +180,11 @@ type
FAngleCache: array of TSinCos; FAngleCache: array of TSinCos;
function GraphPoint(AIndex, AYIndex: Integer): TDoublePoint; function GraphPoint(AIndex, AYIndex: Integer): TDoublePoint;
procedure PrepareAngleCache; procedure PrepareAngleCache;
procedure PrepareGraphPoints(AYIndex: Integer);
protected protected
function GetLabelDataPoint(AIndex, AYIndex: Integer): TDoublePoint; override; function GetLabelDataPoint(AIndex, AYIndex: Integer): TDoublePoint; override;
procedure GetLegendItems(AItems: TChartLegendItems); override; procedure GetLegendItems(AItems: TChartLegendItems); override;
procedure SourceChanged(ASender: TObject); override; procedure SourceChanged(ASender: TObject); override;
procedure PrepareGraphPoints(AYIndex: Integer); virtual; reintroduce;
procedure UpdateLabelDirectionReferenceLevel(AIndex, AYIndex: Integer; procedure UpdateLabelDirectionReferenceLevel(AIndex, AYIndex: Integer;
var ALevel: Double); override; var ALevel: Double); override;
public public

2
components/tachart/taseries.pas
View File

@ -18,7 +18,7 @@
unit TASeries; unit TASeries;
{$H+} {$MODE ObjFPC}{$H+}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined} {$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface interface

2
components/tachart/tasources.pas
View File

@ -11,7 +11,7 @@
unit TASources; unit TASources;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/tastyles.pas
View File

@ -10,7 +10,7 @@
} }
unit TAStyles; unit TAStyles;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/tatextelements.pas
View File

@ -10,7 +10,7 @@
} }
unit TATextElements; unit TATextElements;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

4
components/tachart/tatools.pas
View File

@ -10,12 +10,12 @@
} }
unit TATools; unit TATools;
{$MODE ObjFPC}{$H+}
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined} {$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
interface interface
{$H+}
uses uses
Classes, SysUtils, Types, Math, FPCanvas, Classes, SysUtils, Types, Math, FPCanvas,
// LCL // LCL

2
components/tachart/tatransformations.pas
View File

@ -12,7 +12,7 @@
} }
unit TATransformations; unit TATransformations;
{$H+} {$MODE ObjFPC}{$H+}
interface interface

2
components/tachart/tatypes.pas
View File

@ -17,7 +17,7 @@
} }
unit TATypes; unit TATypes;
{$H+} {$MODE ObjFPC}{$H+}
interface interface