diff --git a/components/nicechart/demo/Delphi/Project1.dproj b/components/nicechart/demo/Delphi/Project1.dproj index 5eef4c6aa..02a07fb7f 100644 --- a/components/nicechart/demo/Delphi/Project1.dproj +++ b/components/nicechart/demo/Delphi/Project1.dproj @@ -100,6 +100,8 @@ true 1033 CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) + true + true diff --git a/components/nicechart/packages/Delphi XE11 Alexandria/NiceChartDXE11.dpk b/components/nicechart/packages/Delphi XE11 Alexandria/NiceChartDXE11.dpk index 163dae671..bd22db219 100644 --- a/components/nicechart/packages/Delphi XE11 Alexandria/NiceChartDXE11.dpk +++ b/components/nicechart/packages/Delphi XE11 Alexandria/NiceChartDXE11.dpk @@ -34,7 +34,7 @@ requires vcl; contains - NiceChart in '..\..\source\NiceChart.pas', - BSplines in '..\..\source\BSplines.pas'; + nicechart in '..\..\source\nicechart.pas', + nicesplines in '..\..\source\nicesplines.pas'; end. diff --git a/components/nicechart/packages/Delphi XE11 Alexandria/NiceChartDXE11.dproj b/components/nicechart/packages/Delphi XE11 Alexandria/NiceChartDXE11.dproj index 330d56e79..0c4157662 100644 --- a/components/nicechart/packages/Delphi XE11 Alexandria/NiceChartDXE11.dproj +++ b/components/nicechart/packages/Delphi XE11 Alexandria/NiceChartDXE11.dproj @@ -84,8 +84,9 @@ true 1033 - CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=2.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=2.0.1.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) 2 + 1 @@ -94,8 +95,8 @@ - - + + Base @@ -132,9 +133,741 @@ True False + + + + NiceChartDXE11.bpl + true + + + + + 1 + + + 0 + + + + + classes + 64 + + + classes + 64 + + + + + res\xml + 1 + + + res\xml + 1 + + + + + library\lib\armeabi-v7a + 1 + + + + + library\lib\armeabi + 1 + + + library\lib\armeabi + 1 + + + + + library\lib\armeabi-v7a + 1 + + + + + library\lib\mips + 1 + + + library\lib\mips + 1 + + + + + library\lib\armeabi-v7a + 1 + + + library\lib\arm64-v8a + 1 + + + + + library\lib\armeabi-v7a + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\values + 1 + + + res\values + 1 + + + + + res\values-v21 + 1 + + + res\values-v21 + 1 + + + + + res\values + 1 + + + res\values + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-xxhdpi + 1 + + + res\drawable-xxhdpi + 1 + + + + + res\drawable-xxxhdpi + 1 + + + res\drawable-xxxhdpi + 1 + + + + + res\drawable-ldpi + 1 + + + res\drawable-ldpi + 1 + + + + + res\drawable-mdpi + 1 + + + res\drawable-mdpi + 1 + + + + + res\drawable-hdpi + 1 + + + res\drawable-hdpi + 1 + + + + + res\drawable-xhdpi + 1 + + + res\drawable-xhdpi + 1 + + + + + res\drawable-mdpi + 1 + + + res\drawable-mdpi + 1 + + + + + res\drawable-hdpi + 1 + + + res\drawable-hdpi + 1 + + + + + res\drawable-xhdpi + 1 + + + res\drawable-xhdpi + 1 + + + + + res\drawable-xxhdpi + 1 + + + res\drawable-xxhdpi + 1 + + + + + res\drawable-xxxhdpi + 1 + + + res\drawable-xxxhdpi + 1 + + + + + res\drawable-small + 1 + + + res\drawable-small + 1 + + + + + res\drawable-normal + 1 + + + res\drawable-normal + 1 + + + + + res\drawable-large + 1 + + + res\drawable-large + 1 + + + + + res\drawable-xlarge + 1 + + + res\drawable-xlarge + 1 + + + + + res\values + 1 + + + res\values + 1 + + + + + 1 + + + 1 + + + 0 + + + + + 1 + .framework + + + 1 + .framework + + + 1 + .framework + + + 0 + + + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 0 + .dll;.bpl + + + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 0 + .bpl + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 1 + + + 1 + + + + + + + + Contents\Resources + 1 + + + Contents\Resources + 1 + + + Contents\Resources + 1 + + + + + library\lib\armeabi-v7a + 1 + + + library\lib\arm64-v8a + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 0 + + + + + library\lib\armeabi-v7a + 1 + + + + + 1 + + + 1 + + + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + + + + + + 1 + + + 1 + + + 1 + + + + + Assets + 1 + + + Assets + 1 + + + + + Assets + 1 + + + Assets + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + + + + + + + + + + 12 + diff --git a/components/nicechart/packages/Delphi XE11 Alexandria/NiceChartDXE11.res b/components/nicechart/packages/Delphi XE11 Alexandria/NiceChartDXE11.res index f2bbbba9e..473908310 100644 Binary files a/components/nicechart/packages/Delphi XE11 Alexandria/NiceChartDXE11.res and b/components/nicechart/packages/Delphi XE11 Alexandria/NiceChartDXE11.res differ diff --git a/components/nicechart/packages/Delphi7/NiceChartD7.dof b/components/nicechart/packages/Delphi7/NiceChartD7.dof index 9d521a0fd..e6c46045b 100644 --- a/components/nicechart/packages/Delphi7/NiceChartD7.dof +++ b/components/nicechart/packages/Delphi7/NiceChartD7.dof @@ -114,7 +114,7 @@ IncludeVerInfo=1 AutoIncBuild=0 MajorVer=2 MinorVer=0 -Release=0 +Release=1 Build=0 Debug=0 PreRelease=0 @@ -126,7 +126,7 @@ CodePage=1252 [Version Info Keys] CompanyName= FileDescription= -FileVersion=2.0.0.0 +FileVersion=2.0.1.0 InternalName= LegalCopyright= LegalTrademarks= diff --git a/components/nicechart/packages/Delphi7/NiceChartD7.dpk b/components/nicechart/packages/Delphi7/NiceChartD7.dpk index 2d66d4329..13b8428a4 100644 --- a/components/nicechart/packages/Delphi7/NiceChartD7.dpk +++ b/components/nicechart/packages/Delphi7/NiceChartD7.dpk @@ -1,7 +1,7 @@ package NiceChartD7; {$R *.res} -{$R 'NiceChart.dcr'} +{$R 'nicechart.dcr'} {$ALIGN 8} {$ASSERTIONS ON} {$BOOLEVAL OFF} @@ -31,7 +31,7 @@ requires vcl; contains - NiceChart in '..\..\source\NiceChart.pas', - BSplines in '..\..\source\BSplines.pas'; + NiceChart in '..\..\source\nicechart.pas', + NiceSplines in '..\..\source\nicesplines.pas'; end. diff --git a/components/nicechart/packages/Delphi7/NiceChartD7.res b/components/nicechart/packages/Delphi7/NiceChartD7.res index da0b2e57d..b137afd63 100644 Binary files a/components/nicechart/packages/Delphi7/NiceChartD7.res and b/components/nicechart/packages/Delphi7/NiceChartD7.res differ diff --git a/components/nicechart/packages/Lazarus/nicechartlaz.lpk b/components/nicechart/packages/Lazarus/nicechartlaz.lpk index 95d2cfc18..71271957c 100644 --- a/components/nicechart/packages/Lazarus/nicechartlaz.lpk +++ b/components/nicechart/packages/Lazarus/nicechartlaz.lpk @@ -15,16 +15,16 @@ - + - - - - - + + + + + diff --git a/components/nicechart/packages/Lazarus/nicechartlaz.pas b/components/nicechart/packages/Lazarus/nicechartlaz.pas index 7507c4de3..a95de4ae9 100644 --- a/components/nicechart/packages/Lazarus/nicechartlaz.pas +++ b/components/nicechart/packages/Lazarus/nicechartlaz.pas @@ -8,7 +8,7 @@ unit NiceChartLaz; interface uses - BSplines, NiceChart, LazarusPackageIntf; + NiceChart, NiceSplines, LazarusPackageIntf; implementation diff --git a/components/nicechart/source/NiceChart.dcr b/components/nicechart/source/nicechart.dcr similarity index 100% rename from components/nicechart/source/NiceChart.dcr rename to components/nicechart/source/nicechart.dcr diff --git a/components/nicechart/source/NiceChart.pas b/components/nicechart/source/nicechart.pas similarity index 99% rename from components/nicechart/source/NiceChart.pas rename to components/nicechart/source/nicechart.pas index caafcf28b..bdd2be62e 100644 --- a/components/nicechart/source/NiceChart.pas +++ b/components/nicechart/source/nicechart.pas @@ -41,7 +41,7 @@ uses Windows, Messages, {$ENDIF} Classes, Graphics, Forms, Controls, ExtCtrls, SysUtils, - BSplines, Math; + NiceSplines, Math; const UndefinedValueChart: Double = MaxDouble; @@ -855,7 +855,7 @@ end; procedure RotTextOut(ACanvas: TCanvas; x, y, Angle: Integer; Txt: String); {$IFNDEF FPC} var - RotFont, OldFont: Integer; + RotFont, OldFont: THandle; FBold, FItalic, FUnderline, FStrikeOut: integer; {$ENDIF} begin @@ -916,7 +916,7 @@ begin DoCalculate(Canvas, AWidth, AHeight) else begin - // Use an auxiliary bitmap in case of early calls when the Canvas has not handle, yet. + // Use an auxiliary bitmap in case of early calls when the Canvas has no handle, yet. bmp := TBitmap.Create; try bmp.Width := AWidth; @@ -1020,6 +1020,8 @@ var I, J: Integer; P, T: Double; begin + {$IFOPT R+}{$DEFINE RangeCheck}{$ENDIF} + {$R-} repeat I := L; J := R; @@ -1042,6 +1044,7 @@ begin then QuickSortDouble(SortList, L, J); L := I; until I >= R; + {$IFDEF RangeCheck}{$R+}{$ENDIF} end; function TNiceChart.GetLabel(Value: Double): string; @@ -1068,6 +1071,9 @@ begin if (List.Count = 0) or ChartEmpty then Exit; + {$IFOPT R+}{$DEFINE RangeCheck}{$ENDIF} + {$R-} + BarCount := 0; for x := 0 to List.Count-1 do begin @@ -1158,7 +1164,8 @@ begin FXTranslate.Scale := Scale; FXTranslate.Base := RcChart.Left; end; - + + {$IFDEF RangeCheck}{$R+}{$ENDIF} end; procedure TNiceChart.BuildYAxis; diff --git a/components/nicechart/source/NiceChart.res b/components/nicechart/source/nicechart.res similarity index 100% rename from components/nicechart/source/NiceChart.res rename to components/nicechart/source/nicechart.res diff --git a/components/nicechart/source/BSplines.pas b/components/nicechart/source/nicesplines.pas similarity index 99% rename from components/nicechart/source/BSplines.pas rename to components/nicechart/source/nicesplines.pas index 35b326425..477b20256 100644 --- a/components/nicechart/source/BSplines.pas +++ b/components/nicechart/source/nicesplines.pas @@ -1,4 +1,4 @@ -Unit BSplines; +Unit NiceSplines; {------------------------------------------------------------------------------} { } { This code was written by : M. v. Engeland } @@ -226,6 +226,8 @@ end;{TBSpline.FGetNumberOfPoints} function TBSpline.FGetPoint(Index:Integer):TVertex; begin + {$IFOPT R+}{$DEFINE RangeCheck}{$ENDIF} + {$R-} if (Index>=1) and (Index<=FNoPoints) then Result:=FPointList^[Index] else begin Result.X:=0; @@ -233,13 +235,17 @@ begin Result.Y:=0; Raise Exception.Create('List index out of bounds in '+Self.ClassName+'.FGetPoint. ('+IntToStr(Index)+').'); end; + {$IFDEF RangeChecke}{$R+}{$ENDIF} end;{TBSpline.FGetPoint} procedure TBSpline.FSetPoint(Index:Integer;Value:TVertex); begin if (Index>=1) and (Index<=FNoPoints) then begin + {$IFOPT R+}{$DEFINE RangeCheck}{$ENDIF} + {$R-} FPointList^[Index]:=Value; + {$IFDEF RangeChecke}{$R+}{$ENDIF} Build:=False; end else Raise Exception.Create('List index out of bounds in '+Self.ClassName+'.FSetPoint. ('+IntToStr(Index)+').'); end;{TBSpline.FSetPoint}