From 0c4a30219dccb6ca325734a3740001542cebe10b Mon Sep 17 00:00:00 2001 From: FastReports-bot Date: Tue, 6 Sep 2022 11:27:51 +0300 Subject: [PATCH] * sync 9/6/2022 version: 2022.3.0 --- ...astReport.OpenSource.Data.Cassandra.csproj | 2 +- FastReport.Base/LineObject.cs | 20 +++++++++++++++++++ Pack/BuildScripts/Tasks/BaseTasks.cs | 1 + UsedPackages.version | 4 ++-- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/Extras/Core/FastReport.Data/FastReport.Data.Cassandra/FastReport.OpenSource.Data.Cassandra.csproj b/Extras/Core/FastReport.Data/FastReport.Data.Cassandra/FastReport.OpenSource.Data.Cassandra.csproj index 9c0555e2..ab8621e7 100644 --- a/Extras/Core/FastReport.Data/FastReport.Data.Cassandra/FastReport.OpenSource.Data.Cassandra.csproj +++ b/Extras/Core/FastReport.Data/FastReport.Data.Cassandra/FastReport.OpenSource.Data.Cassandra.csproj @@ -24,7 +24,7 @@ This package will not be updated. The $(AssemblyName) package now includes a con - PackageReference Include="CassandraCSharpDriver" Version="3.17.1" /> + diff --git a/FastReport.Base/LineObject.cs b/FastReport.Base/LineObject.cs index d4c2cd6a..df51d5ee 100644 --- a/FastReport.Base/LineObject.cs +++ b/FastReport.Base/LineObject.cs @@ -167,6 +167,26 @@ public override void Draw(FRPaintEventArgs e) } } + /// + public override List Validate() + { + List listError = new List(); + + if (IsIntersectingWithOtherObject && !(Parent is ReportComponentBase && !Validator.RectContainInOtherRect((Parent as ReportComponentBase).AbsBounds, this.AbsBounds))) + listError.Add(new ValidationError(Name, ValidationError.ErrorLevel.Warning, Res.Get("Messages,Validator,IntersectedObjects"), this)); + + if ((Height < 0 || Width < 0) && diagonal || (Height <= 0 && Width <= 0)) + listError.Add(new ValidationError(Name, ValidationError.ErrorLevel.Error, Res.Get("Messages,Validator,IncorrectSize"), this)); + + if (Name == "") + listError.Add(new ValidationError(Name, ValidationError.ErrorLevel.Error, Res.Get("Messages,Validator,UnnamedObject"), this)); + + if (Parent is ReportComponentBase && !Validator.RectContainInOtherRect((Parent as ReportComponentBase).AbsBounds, this.AbsBounds)) + listError.Add(new ValidationError(Name, ValidationError.ErrorLevel.Error, Res.Get("Messages,Validator,OutOfBounds"), this)); + + return listError; + } + /// public override void Serialize(FRWriter writer) { diff --git a/Pack/BuildScripts/Tasks/BaseTasks.cs b/Pack/BuildScripts/Tasks/BaseTasks.cs index 7409b064..a10852e4 100644 --- a/Pack/BuildScripts/Tasks/BaseTasks.cs +++ b/Pack/BuildScripts/Tasks/BaseTasks.cs @@ -36,6 +36,7 @@ partial class Program "ClickHouse", "Firebird", "Excel", + "Cassandra" }; internal string SolutionFile => Path.Combine(solutionDirectory, solutionFilename); diff --git a/UsedPackages.version b/UsedPackages.version index fbf5275e..4f3281aa 100644 --- a/UsedPackages.version +++ b/UsedPackages.version @@ -4,10 +4,10 @@ 2022.2.0 - 2022.2.12-dev + 2022.3.0 2022.2.0 - 2022.2.12-dev + 2022.3.0 [4.7.0,)