Merge pull request #469 from FastReports/sync_branch_2022.3.0

FastReport.OpenSource 2022.3.0
FastReports · Sep 6, 2022 · 6fdfb71 · 6fdfb71
2 parents 10b81db + 0c4a302
commit 6fdfb71
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/...ore/FastReport.Data/FastReport.Data.Cassandra/FastReport.OpenSource.Data.Cassandra.csproj b/...ore/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
     <PackageReleaseNotes></PackageReleaseNotes>
   </PropertyGroup>
   <ItemGroup>
-	PackageReference Include="CassandraCSharpDriver" Version="3.17.1" />
+	  <PackageReference Include="CassandraCSharpDriver" Version="3.17.1" />
   </ItemGroup>
   <ItemGroup>
     <Compile Remove="CassandraConnectionEditor.cs" />

diff --git a/FastReport.Base/LineObject.cs b/FastReport.Base/LineObject.cs
@@ -167,6 +167,26 @@ public override void Draw(FRPaintEventArgs e)
             }
         }
 
+        /// <inheritdoc/>
+        public override List<ValidationError> Validate()
+        {
+            List<ValidationError> listError = new List<ValidationError>();
+
+            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;
+        }
+
         /// <inheritdoc/>
         public override void Serialize(FRWriter writer)
         {

diff --git 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
@@ -4,10 +4,10 @@
     <PropertyGroup>
 
         <FRCompatVersion>2022.2.0</FRCompatVersion>
-        <FRCompatSkiaVersion>2022.2.12-dev</FRCompatSkiaVersion>
+        <FRCompatSkiaVersion>2022.3.0</FRCompatSkiaVersion>
 
         <FRDataVisualizationVersion>2022.2.0</FRDataVisualizationVersion>
-        <FRDataVisualizationSkiaVersion>2022.2.12-dev</FRDataVisualizationSkiaVersion>
+        <FRDataVisualizationSkiaVersion>2022.3.0</FRDataVisualizationSkiaVersion>
 
         <!-- Not available in Core3 -->
         <SystemDrawingCommonVersion>[4.7.0,)</SystemDrawingCommonVersion>