Merge remote-tracking branch 'remotes/origin/master' into hera-queries

aardvark-platform · Jan 21, 2021 · da7457e · da7457e
2 parents 7186d80 + d7486d3
commit da7457e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/src/Aardvark.Algodat.Tests/Program.cs b/src/Aardvark.Algodat.Tests/Program.cs
@@ -116,7 +116,7 @@ internal static void TestE57()
             //var sw = new Stopwatch();
 
             CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
-            var filename = @"T:\Vgm\Data\E57\2020-11-13-Walenta\2020452-B-3-5.e57";
+            var filename = @"T:\Vgm\Data\E57\2020-12-14_Trimble_Scan.e57";
             //var fileSizeInBytes = new FileInfo(filename).Length;
 
             var key = Path.GetFileName(filename);
@@ -162,14 +162,15 @@ internal static void TestE57()
             //var cloud = PointCloud.Chunks(chunks, config);
 
             var pcl = store.GetPointSet(key);
-            var maxCount = pcl.PointCount / 30;
-            var level = pcl.GetMaxOctreeLevelWithLessThanGivenPointCount(maxCount);
-            var foo = pcl.QueryPointsInOctreeLevel(level);
-            var fooCount = 0;
-            foreach (var chunk in foo) 
-            {
-                Report.WarnNoPrefix($"{++fooCount}");
-            }
+            Report.Line($"{storePath}:{key} : {pcl.PointCount:N0} points");
+            //var maxCount = pcl.PointCount / 30;
+            //var level = pcl.GetMaxOctreeLevelWithLessThanGivenPointCount(maxCount);
+            //var foo = pcl.QueryPointsInOctreeLevel(level);
+            //var fooCount = 0;
+            //foreach (var chunk in foo) 
+            //{
+            //    Report.WarnNoPrefix($"{++fooCount}");
+            //}
 
             //var intensityRange =
             //    foo

diff --git a/src/Aardvark.Data.E57/ASTM_E57.cs b/src/Aardvark.Data.E57/ASTM_E57.cs
@@ -1223,15 +1223,13 @@ internal static E57Data3D Parse(XElement root, Stream stream)
 #region 8.4.3.4
                 if (data3d.HasCartesianCoordinates && data3d.CartesianBounds == null)
                 {
-                    #if DEBUG
-                    Console.WriteLine("[Warning][8.4.3.4] CartesianBounds must be defined (if cartesian coordinates are defined).");
-                    #endif
+                    Report.Warn("[8.4.3.4] CartesianBounds must be defined (if cartesian coordinates are defined).");
                 }
 #endregion
 #region 8.4.3.5
                 if (data3d.HasSphericalCoordinates && data3d.SphericalBounds == null)
                 {
-                    throw new ArgumentException("[8.4.3.5] SphericalBounds must be defined (if spherical coordinates are defined).");
+                    Report.Warn("[8.4.3.5] SphericalBounds must be defined (if spherical coordinates are defined).");
                 }
 #endregion
 #region 8.4.3.6

diff --git a/src/Aardvark.Data.E57/ImportE57.cs b/src/Aardvark.Data.E57/ImportE57.cs
@@ -18,7 +18,6 @@
 using System.Linq;
 using System.Threading;
 using System.Xml.Linq;
-using static System.Console;
 
 namespace Aardvark.Data.Points.Import
 {

diff --git a/src/Aardvark.Data.Points.Base/Chunk.cs b/src/Aardvark.Data.Points.Base/Chunk.cs
@@ -184,8 +184,8 @@ public static Chunk ImmutableMerge(IEnumerable<Chunk> chunks)
 
             if (colors != null && positions.Count != colors.Count)
             {
-                colors = new C4b[positions.Count];
                 Report.Warn("[Chunk-ctor] inconsistent length: pos.length = {0} vs cs.length = {1}", positions.Count, colors.Count);
+                colors = new C4b[positions.Count];
             }
 
             Positions       = positions;