Merge pull request ZEISS-PiWeb#18 from ZEISS-PiWeb/hotfix/PropertySerialization

Schnjan · web-flow · commit bc9ecb9c93ea · 2023-01-04T11:31:41.000+01:00
fix: faulty serialization of point property ranges.
diff --git a/src/Formplot/FileFormat/FormplotWriter.cs b/src/Formplot/FileFormat/FormplotWriter.cs
@@ -313,7 +313,7 @@ private static void CollectPointProperties( Point point, IDictionary<Property, R
 				if( lastPoint == null )
 					continue;
 
-				if( lastPoint.Properties.Contains( property ) )
+				if( Equals( lastPoint.Properties[ property.Name ], property ) )
 					propertyLists[ property ].Last().End = index;
 				else
 					propertyLists[ property ].Add( new Range( index ) );
diff --git a/src/Formplot/FileFormat/Property.cs b/src/Formplot/FileFormat/Property.cs
@@ -287,7 +287,8 @@ private static bool Equals( Property? m1, Property? m2 )
 			{
 				return m1.Name == m2.Name &&
 						m1.DataType == m2.DataType &&
-						Equals( m1.Value, m2.Value );
+						Equals( m1.Value, m2.Value ) &&
+						Equals( m1.Unit, m2.Unit );
 			}
 
 			return false;
diff --git a/src/Formplot/Formplot.csproj b/src/Formplot/Formplot.csproj
@@ -9,7 +9,7 @@
     <Copyright>Copyright © $([System.DateTime]::UtcNow.Year) Carl Zeiss Industrielle Messtechnik GmbH</Copyright>
     <Company>Carl Zeiss Industrielle Messtechnik GmbH</Company>
     <Authors>$(Company)</Authors>
-    <PackageVersion>3.1.1</PackageVersion>
+    <PackageVersion>3.1.2</PackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="NuGet package specifications">
@@ -18,7 +18,7 @@
       An API to read and write plot data for the ZEISS PiWeb quality data management system.
     </Description>
     <PackageId>Zeiss.PiWeb.Formplot</PackageId>
-    <Version>3.1.1</Version>
+    <Version>3.1.2</Version>
     <PackageIcon>logo_128x128.png</PackageIcon>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/ZEISS-PiWeb/PiWeb-Formplots</PackageProjectUrl>
diff --git a/src/Tests/FileFormat/PropertyWriterTest.cs b/src/Tests/FileFormat/PropertyWriterTest.cs
@@ -0,0 +1,46 @@
+﻿namespace Zeiss.PiWeb.Formplot.Tests.FileFormat
+{
+	using System.IO;
+	using NUnit.Framework;
+	using Zeiss.PiWeb.Formplot.FileFormat;
+
+	[TestFixture]
+	public class PropertyWriterTest
+	{
+		#region methods
+
+		[Test]
+		public void Test_RangeLists()
+		{
+			const int pointCount = 10;
+			const string propertyName = "Any";
+
+			var plot = new StraightnessPlot();
+			var segment = new Segment<LinePoint, LineGeometry>( string.Empty, SegmentTypes.Line );
+
+			for( var i = 0; i < pointCount; i++ )
+			{
+				var point = new LinePoint( 0, 0 );
+				point.Properties.Add( Property.Create( propertyName, i % 2 ) );
+				segment.Points.Add( point );
+			}
+
+			plot.Segments.Add( segment );
+			var stream = new MemoryStream();
+			plot.WriteTo( stream );
+			stream.Seek( 0, SeekOrigin.Begin );
+			var clone = Formplot.ReadFrom<StraightnessPlot>( stream );
+
+			Assert.That( clone, Is.Not.Null );
+			Assert.That( clone.Segments.Count, Is.EqualTo( 1 ) );
+			Assert.That( clone.Segments[ 0 ].Points.Count, Is.EqualTo( pointCount ) );
+
+			for( var i = 0; i < 10; i++ )
+			{
+				Assert.That( clone.Segments[ 0 ].Points[ i ].Properties[ propertyName ]?.Value, Is.EqualTo( i % 2 ) );
+			}
+		}
+
+		#endregion
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,8 @@ private static bool Equals( Property? m1, Property? m2 )`
`287`	`287`	`{`
`288`	`288`	`return m1.Name == m2.Name &&`
`289`	`289`	`m1.DataType == m2.DataType &&`
`290`		`- Equals( m1.Value, m2.Value );`
	`290`	`+ Equals( m1.Value, m2.Value ) &&`
	`291`	`+ Equals( m1.Unit, m2.Unit );`
`291`	`292`	`}`
`292`	`293`
`293`	`294`	`return false;`