diff --git a/applications/lazstats/source/LazStats.lpi b/applications/lazstats/source/LazStats.lpi index a8ca0c40a..4918f8da7 100644 --- a/applications/lazstats/source/LazStats.lpi +++ b/applications/lazstats/source/LazStats.lpi @@ -1,13 +1,11 @@ - + - - - + @@ -23,6 +21,7 @@ + diff --git a/applications/lazstats/source/LazStats.res b/applications/lazstats/source/LazStats.res index 608538ce6..73ed432af 100644 Binary files a/applications/lazstats/source/LazStats.res and b/applications/lazstats/source/LazStats.res differ diff --git a/applications/lazstats/source/forms/analysis/descriptive/frequnit.pas b/applications/lazstats/source/forms/analysis/descriptive/frequnit.pas index d69c06d24..d2018d89f 100644 --- a/applications/lazstats/source/forms/analysis/descriptive/frequnit.pas +++ b/applications/lazstats/source/forms/analysis/descriptive/frequnit.pas @@ -7,9 +7,9 @@ unit FreqUnit; interface uses - Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, + Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, LCLVersion, StdCtrls, Buttons, ExtCtrls, ComCtrls, Spin, - Globals, MainUnit, GraphLib, DataProcs, + Globals, MainUnit, DataProcs, BasicStatsFormUnit, ReportFrameUnit, ChartFrameUnit; type @@ -84,7 +84,7 @@ implementation uses Math, TAChartUtils, TALegend, TASources, TACustomSeries, TASeries, - Utils, MathUnit, FreqSpecsUnit; + Utils, MathUnit; { TFreqFrm } @@ -407,18 +407,13 @@ procedure TFreqFrm.FormCreate(Sender: TObject); begin Assert(OS3MainFrm <> nil); - if FreqSpecsFrm = nil then - Application.CreateForm(TFreqSpecsFrm, FreqSpecsFrm); - - if GraphFrm = nil then - Application.CreateForm(TGraphFrm, GraphFrm); - InitForm(Self); FReportFrame := TReportFrame.Create(self); FReportFrame.Parent := ReportPage; FReportFrame.Align := alClient; + Position := poDefault; Reset; end; @@ -491,7 +486,9 @@ begin with (ser as TBarSeries) do begin BarBrush.Color := DATA_COLORS[(AColIndex-1) mod Length(DATA_COLORS)]; + {$IF LCL_FullVersion >= 2010000} DepthBrightnessDelta := -30; + {$IFEND} end; if HorBarsBtn.Down then isRotated := true; @@ -505,7 +502,9 @@ begin with TLineSeries(ser) do begin LinePen.Color := DATA_COLORS[(AColIndex-1) mod Length(DATA_COLORS)]; + {$IF LCL_FullVersion >= 2010000} DepthBrightnessDelta := -30; + {$IFEND} end; margin := 4; end @@ -519,7 +518,9 @@ begin AreaBrush.Color := DATA_COLORS[(AColIndex-1) mod Length(DATA_COLORS)]; AreaLinesPen.Color := AreaBrush.Color; AreaContourPen.Color := clBlack; //AreaBrush.Color; + {$IF LCL_FullVersion >= 2010000} DepthBrightnessDelta := -30; + {$IFEND} end; margin := 0; end;