mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-06 11:18:10 +02:00
TAChart: Clean-up: Remove out-dated version checks. Add missing compiler mode directives.
This commit is contained in:
parent
d8efd39359
commit
68228adb4e
@ -33,6 +33,7 @@ object Form1: TForm1
|
||||
ClientHeight = 87
|
||||
ClientWidth = 678
|
||||
Color = clNone
|
||||
ParentBackground = False
|
||||
ParentColor = False
|
||||
TabOrder = 0
|
||||
object CbRotated: TCheckBox
|
||||
|
@ -112,15 +112,11 @@ end;
|
||||
|
||||
procedure TForm1.CbBandedChange(Sender: TObject);
|
||||
begin
|
||||
{$IF LCL_FullVersion >= 1090000}
|
||||
Chart1AreaSeries1.Banded := CbBanded.Checked;
|
||||
if Chart1AreaSeries1.Banded then
|
||||
UpdateStyles(Chart1AreaSeries1.ListSource.YCount-1)
|
||||
else
|
||||
UpdateStyles(Chart1AreaSeries1.ListSource.YCount);
|
||||
{$ELSE}
|
||||
ShowMessage('This functionality requires at least Lazarus version 1.9');
|
||||
{$IFEND}
|
||||
end;
|
||||
|
||||
procedure TForm1.CbCenteredChange(Sender: TObject);
|
||||
@ -276,12 +272,8 @@ begin
|
||||
ChartSourceArea2.YCount := 3;
|
||||
ChartSourceArea2.PointsNumber := N2;
|
||||
|
||||
{$IF LCL_FullVersion >= 1090000}
|
||||
Chart2AreaSeries1.Banded := true;
|
||||
Chart2AreaSeries2.Banded := true;
|
||||
{$ELSE}
|
||||
Label1.Show;
|
||||
{$ENDIF}
|
||||
end;
|
||||
|
||||
procedure TForm1.EdCountChange(Sender: TObject);
|
||||
@ -320,27 +312,12 @@ var
|
||||
begin
|
||||
ChartStyles1.Styles.Clear;
|
||||
for i := 1 to Count do
|
||||
{$IF LCL_FullVersion >= 1090000}
|
||||
with ChartStyles1.Add do begin
|
||||
{$ELSE}
|
||||
with TChartStyle(ChartStyles1.Styles.Add) do begin
|
||||
{$IFEND}
|
||||
Brush.Color := COLORS[i-1];
|
||||
Pen.Width := 3;
|
||||
Text := 'Curve ' + IntToStr(i);
|
||||
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.
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
}
|
||||
unit TASeriesEditor;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
unit TASeriesPropEditors;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
}
|
||||
unit TASubcomponentsEditor;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
unit TAToolEditors;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
unit TAAxisSource;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
}
|
||||
unit TAChartAxis;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
|
||||
interface
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
}
|
||||
unit TAChartAxisUtils;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
|
||||
interface
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
unit TAChartExtentLink;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
|
||||
interface
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
unit TAChartImageList;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -18,10 +18,7 @@
|
||||
|
||||
unit TAChartUtils;
|
||||
|
||||
{$H+}
|
||||
{$IF FPC_FULLVERSION<20700}
|
||||
{$OPTIMIZATION NOSTACKFRAME}
|
||||
{$ENDIF}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
}
|
||||
unit TACustomFuncSeries;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
}
|
||||
unit TACustomSeries;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
|
||||
interface
|
||||
|
||||
@ -128,7 +128,6 @@ type
|
||||
property Shadow;
|
||||
property ShowInLegend: Boolean
|
||||
read GetShowInLegend write SetShowInLegend stored false default true;
|
||||
deprecated;
|
||||
property Transparency;
|
||||
end;
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
}
|
||||
unit TADataPointsEditor;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
unit TADataTools;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
|
||||
|
||||
interface
|
||||
|
@ -10,7 +10,7 @@
|
||||
}
|
||||
unit TADbSource;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
|
||||
interface
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
}
|
||||
unit TADiagram;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
|
||||
|
||||
interface
|
||||
|
@ -9,7 +9,7 @@
|
||||
}
|
||||
unit TADiagramDrawing;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
}
|
||||
unit TADiagramLayout;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -373,11 +373,7 @@ begin
|
||||
Include(st, fsBold);
|
||||
if AFont.Underline then
|
||||
Include(st, fsUnderline);
|
||||
{$IF (FPC_FULLVERSION<=20600) or (FPC_FULLVERSION=20602)}
|
||||
if AFont.StrikeTrough then
|
||||
{$ELSE}
|
||||
if AFont.StrikeThrough then
|
||||
{$ENDIF}
|
||||
Include(st, fsStrikeOut);
|
||||
Style := st;
|
||||
EndUpdate;
|
||||
|
@ -9,7 +9,7 @@
|
||||
}
|
||||
unit TADrawerFPCanvas;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
}
|
||||
unit TADrawerSVG;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
unit TADrawUtils;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
}
|
||||
unit TAEnumerators;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
unit TAExpressionSeries;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
|
||||
|
||||
interface
|
||||
|
@ -10,7 +10,7 @@
|
||||
}
|
||||
unit TAFitUtils;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
}
|
||||
unit TAFuncSeries;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
|
||||
|
||||
interface
|
||||
|
@ -9,7 +9,7 @@
|
||||
}
|
||||
unit TAGeometry;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
|
||||
|
||||
interface
|
||||
|
@ -17,7 +17,7 @@
|
||||
}
|
||||
unit TAGraph;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
|
||||
|
||||
interface
|
||||
|
@ -10,7 +10,7 @@
|
||||
}
|
||||
unit TAGUIConnector;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
unit TAHtml;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
unit TAIntervalSources;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
}
|
||||
unit TALegend;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
}
|
||||
unit TALegendPanel;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
}
|
||||
unit TAMath;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
unit TAMultiSeries;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
|
||||
|
||||
interface
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
unit TANavigation;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
unit TARadialSeries;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
@ -180,11 +180,11 @@ type
|
||||
FAngleCache: array of TSinCos;
|
||||
function GraphPoint(AIndex, AYIndex: Integer): TDoublePoint;
|
||||
procedure PrepareAngleCache;
|
||||
procedure PrepareGraphPoints(AYIndex: Integer);
|
||||
protected
|
||||
function GetLabelDataPoint(AIndex, AYIndex: Integer): TDoublePoint; override;
|
||||
procedure GetLegendItems(AItems: TChartLegendItems); override;
|
||||
procedure SourceChanged(ASender: TObject); override;
|
||||
procedure PrepareGraphPoints(AYIndex: Integer); virtual; reintroduce;
|
||||
procedure UpdateLabelDirectionReferenceLevel(AIndex, AYIndex: Integer;
|
||||
var ALevel: Double); override;
|
||||
public
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
unit TASeries;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
|
||||
|
||||
interface
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
unit TASources;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
}
|
||||
unit TAStyles;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
}
|
||||
unit TATextElements;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -10,12 +10,12 @@
|
||||
}
|
||||
|
||||
unit TATools;
|
||||
|
||||
{$MODE ObjFPC}{$H+}
|
||||
{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
|
||||
|
||||
interface
|
||||
|
||||
{$H+}
|
||||
|
||||
uses
|
||||
Classes, SysUtils, Types, Math, FPCanvas,
|
||||
// LCL
|
||||
|
@ -12,7 +12,7 @@
|
||||
}
|
||||
unit TATransformations;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
}
|
||||
unit TATypes;
|
||||
|
||||
{$H+}
|
||||
{$MODE ObjFPC}{$H+}
|
||||
|
||||
interface
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user