Merge pull request #542 from pro3d-space/features/annotationImprovements

Surface intersection preview & ellipse annotations

Author: Brunnhuber

docs/AdvancedAnnotations.md

@@ -0,0 +1,19 @@
+## Advanced Annotation & Preview picking
+
+
+Previously PRo3D provided no feedback where the intersection will happen. This one adds a 3D cursor which is continously computes intersections given cursor movements.
+It runs in a background thread.
+
+The feature can be explicityly disabled via `--disablePreviewIntersections`
+
+Here is the additional annotation type: https://github.com/pro3d-space/PRo3D/pull/542/commits/54ff51f2545b7727b8bd2121a94a3a90a5d35c83#diff-e3ae8667e8128f79e46ea606a6958260ad62ddc73b7e187fccace130e9f14a01R33
+
+Preview intersections can be controlled via: https://github.com/pro3d-space/PRo3D/pull/542/commits/54ff51f2545b7727b8bd2121a94a3a90a5d35c83#diff-5b8179e37acaceeb2a6bf8b9ce4ceedf9785501303594064bbee53391179b622R88
+
+
+Async preview pickign is controlled via `PreviewPickSurface` message, see https://github.com/pro3d-space/PRo3D/pull/542/commits/c7435faa1963e592cdd5829157b4c804744d40d9#diff-0e871cb4421e88e1ad3efc5e947173c95acb60eedb089a13a0477143e2199f11R516.
+
+## Caveats
+
+Additional memory footprint due to stressed kdtre cache. The kdtree cache however should be reworked to use a LRU queue or similarly.
+

paket.dependencies

@@ -48,19 +48,20 @@ nuget Adaptify.Core                         ~> 1.3.0
 nuget Aardvark.Data.Opc                     ~> 0.11.0
 nuget Aardvark.Data.Wavefront               ~> 5.3.10
 nuget Aardvark.GeoSpatial.Opc               ~> 5.11.2
+nuget Aardvark.Data.GLTF  ~> 1.0.1
 
 nuget Aardvark.PixImage.FreeImage           == 5.3.5
 
-nuget Aardium                               ~> 2.1.1
-
 nuget OPCViewer.Base                        ~> 1.9.2
 
+nuget MathNet.Numerics.FSharp               ~> 5.0.0
 nuget Uncodium.Eigensystems                 ~> 1.1.2
 nuget Chiron                                ~> 6.3.1
 
 nuget Microsoft.Diagnostics.Runtime         ~> 2.0.1
 nuget Microsoft.AspNetCore.Authentication.JwtBearer ~> 6.0.10
 
+nuget Aardium                               ~> 2.1.1
 nuget Giraffe
 nuget Saturn
 nuget Thoth.Json.Giraffe
@@ -73,7 +74,6 @@ nuget CommandLineParser.FSharp ~> 2.9.1
 
 nuget PRo3D.SPICE ~> 1.0.6
 
-nuget Aardvark.Data.GLTF  ~> 1.0.1
 
 
 group Test

paket.lock

@@ -314,6 +314,10 @@ NUGET
     glTF2Loader (1.1.4-alpha)
       NETStandard.Library (>= 1.6.1)
       Newtonsoft.Json (>= 10.0.3)
+    MathNet.Numerics (5.0)
+    MathNet.Numerics.FSharp (5.0)
+      FSharp.Core (>= 6.0.2)
+      MathNet.Numerics (>= 5.0)
     Microsoft.AspNetCore.Authentication.JwtBearer (6.0.35)
       Microsoft.IdentityModel.Protocols.OpenIdConnect (>= 6.35) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net6.0))
     Microsoft.Bcl.AsyncInterfaces (8.0)

src/PRo3D.Base/Annotation/Annotation-Model.fs

@@ -29,6 +29,8 @@ type Geometry =
 | Polygon   = 3 
 | DnS       = 4
 | TT        = 5
+| Ellipse   = 6
+| AxisEllipse = 7
 
 type Semantic = 
 | Horizon0 = 0 
@@ -357,6 +359,42 @@ with
             do! Json.writeFloat "verticalThickness" x.verticalThickness
         }
 
+
+type EllipticAnnotationResult = 
+    {
+        geographicalEllipse : Ellipse2d
+    }
+    with
+        static let version = 0
+
+        static member private readV0 =
+            json {      
+                let! center             = Json.read "center"     
+                let! major              = Json.read "major"
+                let! minor              = Json.read "minor"
+            
+                return {
+                    geographicalEllipse = Ellipse2d(V2d.Parse(center), V2d.Parse(major), V2d.Parse(minor))
+                }
+            }
+
+        static member FromJson(_: EllipticAnnotationResult) =
+            json {
+                let! v = Json.read "version"
+                match v with 
+                | 0 -> return! EllipticAnnotationResult.readV0
+                | _ -> return! v |> sprintf "don't know version %A  of AnnotationResults" |> Json.error
+            }
+    
+        static member ToJson (x : EllipticAnnotationResult) =
+            json {
+                do! Json.write   "version"  version
+                do! Json.write   "center"   (string x.geographicalEllipse.Center)
+                do! Json.write   "major"    (string x.geographicalEllipse.Axis0)
+                do! Json.write   "minor"    (string x.geographicalEllipse.Axis1)
+            }
+    
+
 module AnnotationResults =    
 
     let initial = 
@@ -400,6 +438,7 @@ type Annotation = {
 
     results        : Option<AnnotationResults>
     dnsResults     : Option<DipAndStrikeResults>
+    ellipticResults : Option<EllipticAnnotationResult>
 
     visible          : bool
     showDns          : bool
@@ -490,6 +529,7 @@ with
                 manualDipAzimuth = Annotation.initialmanualDipAzimuth
                 bookmarkId       = None
                 referenceSystem  = None
+                ellipticResults  = None
             }
         }
 
@@ -551,6 +591,7 @@ with
                 manualDipAzimuth = Annotation.initialmanualDipAzimuth
                 bookmarkId       = None
                 referenceSystem  = None
+                ellipticResults  = None
             }
         }
 
@@ -612,6 +653,7 @@ with
                 manualDipAzimuth = Annotation.initialmanualDipAzimuth
                 bookmarkId       = None
                 referenceSystem  = None
+                ellipticResults  = None
             }
         }
 
@@ -676,6 +718,7 @@ with
                 manualDipAzimuth = Annotation.initialmanualDipAzimuth
                 bookmarkId       = bookmarkId
                 referenceSystem  = None
+                ellipticResults  = None
             }
         }
 
@@ -741,6 +784,7 @@ with
                 manualDipAzimuth = manualDipAzimuth
                 bookmarkId       = bookmarkId
                 referenceSystem  = None
+                ellipticResults  = None
             }
         }
 
@@ -780,6 +824,8 @@ with
 
             let! manualDipAngle = Json.readWith Ext.fromJson<NumericInput,Ext> "manualDipAngle"
             let! manualDipAzimuth = Json.readWith Ext.fromJson<NumericInput,Ext> "manualDipAzimuth"
+
+            let! ellipseProperties = Json.tryRead "ellipseResults" 
 
             return {
                 version          = Annotation.current
@@ -807,6 +853,7 @@ with
                 manualDipAzimuth = manualDipAzimuth
                 bookmarkId       = bookmarkId
                 referenceSystem  = None
+                ellipticResults  = ellipseProperties
             }
         }
 
@@ -856,7 +903,12 @@ with
             do! Json.write "semanticType" (x.semanticType |> int)
 
             do! Json.writeWith (Ext.toJson<NumericInput,Ext>) "manualDipAngle" (x.manualDipAngle)
-            do! Json.writeWith (Ext.toJson<NumericInput,Ext>) "manualDipAzimuth" (x.manualDipAzimuth)          
+            do! Json.writeWith (Ext.toJson<NumericInput,Ext>) "manualDipAzimuth" (x.manualDipAzimuth)    
+            
+            match x.ellipticResults with
+            | None -> ()
+            | Some e -> 
+                do! Json.write "ellipseResults" x.ellipticResults
         }
 
 module Annotation =
@@ -937,6 +989,7 @@ module Annotation =
             manualDipAzimuth = Annotation.initialmanualDipAzimuth 
             bookmarkId       = bookmarkId
             referenceSystem  = referenceSystem
+            ellipticResults  = None
         }
 
     let initial =

src/PRo3D.Base/Annotation/Annotation-Model.g.fs

@@ -1,5 +1,5 @@
-//7ee60322-ffc9-9bed-080f-d357fa699a22
-//98622bb4-7bf2-1f2e-b011-a4b0e555e5e7
+//bfe6acfa-0299-89a4-8870-5436b29c454b
+//124b09b1-6601-961c-adac-7438070f4a0a
 #nowarn "49" // upper case patterns
 #nowarn "66" // upcast is unncecessary
 #nowarn "1337" // internal types
@@ -215,6 +215,7 @@ type AdaptiveAnnotation(value : Annotation) =
             (unbox<AdaptiveDipAndStrikeResults> o).Update(v)
             o
         Adaptify.FSharp.Core.AdaptiveOption<PRo3D.Base.Annotation.DipAndStrikeResults, PRo3D.Base.Annotation.AdaptiveDipAndStrikeResults, PRo3D.Base.Annotation.AdaptiveDipAndStrikeResults>(value.dnsResults, (fun (v : DipAndStrikeResults) -> AdaptiveDipAndStrikeResults(v) :> System.Object), __arg2, (fun (o : System.Object) -> unbox<AdaptiveDipAndStrikeResults> o), (fun (v : DipAndStrikeResults) -> AdaptiveDipAndStrikeResults(v) :> System.Object), __arg5, (fun (o : System.Object) -> unbox<AdaptiveDipAndStrikeResults> o))
+    let _ellipticResults_ = FSharp.Data.Adaptive.cval(value.ellipticResults)
     let _visible_ = FSharp.Data.Adaptive.cval(value.visible)
     let _showDns_ = FSharp.Data.Adaptive.cval(value.showDns)
     let _text_ = FSharp.Data.Adaptive.cval(value.text)
@@ -247,6 +248,7 @@ type AdaptiveAnnotation(value : Annotation) =
             _thickness_.Update(value.thickness)
             _results_.Update(value.results)
             _dnsResults_.Update(value.dnsResults)
+            _ellipticResults_.Value <- value.ellipticResults
             _visible_.Value <- value.visible
             _showDns_.Value <- value.showDns
             _text_.Value <- value.text
@@ -273,6 +275,7 @@ type AdaptiveAnnotation(value : Annotation) =
     member __.thickness = _thickness_
     member __.results = _results_ :> FSharp.Data.Adaptive.aval<Adaptify.FSharp.Core.AdaptiveOptionCase<AnnotationResults, AdaptiveAnnotationResults, AdaptiveAnnotationResults>>
     member __.dnsResults = _dnsResults_ :> FSharp.Data.Adaptive.aval<Adaptify.FSharp.Core.AdaptiveOptionCase<DipAndStrikeResults, AdaptiveDipAndStrikeResults, AdaptiveDipAndStrikeResults>>
+    member __.ellipticResults = _ellipticResults_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.Option<EllipticAnnotationResult>>
     member __.visible = _visible_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.bool>
     member __.showDns = _showDns_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.bool>
     member __.text = _text_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.string>
@@ -301,6 +304,7 @@ module AnnotationLenses =
         static member thickness_ = ((fun (self : Annotation) -> self.thickness), (fun (value : Aardvark.UI.Primitives.NumericInput) (self : Annotation) -> { self with thickness = value }))
         static member results_ = ((fun (self : Annotation) -> self.results), (fun (value : Microsoft.FSharp.Core.Option<AnnotationResults>) (self : Annotation) -> { self with results = value }))
         static member dnsResults_ = ((fun (self : Annotation) -> self.dnsResults), (fun (value : Microsoft.FSharp.Core.Option<DipAndStrikeResults>) (self : Annotation) -> { self with dnsResults = value }))
+        static member ellipticResults_ = ((fun (self : Annotation) -> self.ellipticResults), (fun (value : Microsoft.FSharp.Core.Option<EllipticAnnotationResult>) (self : Annotation) -> { self with ellipticResults = value }))
         static member visible_ = ((fun (self : Annotation) -> self.visible), (fun (value : Microsoft.FSharp.Core.bool) (self : Annotation) -> { self with visible = value }))
         static member showDns_ = ((fun (self : Annotation) -> self.showDns), (fun (value : Microsoft.FSharp.Core.bool) (self : Annotation) -> { self with showDns = value }))
         static member text_ = ((fun (self : Annotation) -> self.text), (fun (value : Microsoft.FSharp.Core.string) (self : Annotation) -> { self with text = value }))

src/PRo3D.Base/Annotation/AnnotationHelpers.fs

@@ -170,14 +170,14 @@ module DipAndStrike =
 
     let projectOntoPlane (x:V3d) (n:V3d) = (x - (x * n)).Normalized
 
-    let computeStandardDeviation avg (input : List<float>) =
+    let computeStandardDeviation avg (input : array<float>) =
 
         let sosq = 
             input 
-            |> List.map(fun (x:double) ->
+            |> Array.sumBy(fun (x:double) ->
                 let k = (x.Abs() - avg)
-                Math.Pow(k,2.0))
-            |> List.sum
+                Math.Pow(k,2.0)
+            )
 
         Math.Sqrt (sosq / float (input.Length - 1))          
 
@@ -258,18 +258,13 @@ module DipAndStrike =
         Some dns
 
     let calculateDipAndStrikeResults (up:V3d) (north : V3d) (points:IndexList<V3d>) =
+
+        let points = points |> IndexList.toArray |> Array.filter (_.IsNaN >> not)
 
-        let points = points |> IndexList.filter(fun x -> not x.IsNaN)
-    
-        match points.Count with 
+        match points.Length with 
         | x when x > 2 ->
-    
-            let v3dArray = points.AsList |> List.toArray // points.toArray not possible because of: int -> V3d[]
-    
-            //let p = v3dArray.[0]
-           // let up = p.Normalized        
-    
-            let linRegression = (new LinearRegression3d(v3dArray)).TryGetRegressionInfo()
+
+            let linRegression = LinearRegression3d(points).TryGetRegressionInfo()
 
             Log.line "[AnnotationHelpers.fs] %A" linRegression
 
@@ -278,18 +273,17 @@ module DipAndStrike =
                 | Some lr -> lr.Plane
                 | None ->
                     Log.line "[dns computation] linear regression failed, fallback to evd"
-                    PlaneFitting.planeFit(v3dArray)
+                    PlaneFitting.planeFit(points)
 
             let distances = 
                 points 
-                |> IndexList.toList
-                |> List.map(fun x -> (plane.Height x).Abs())
+                |> Array.map(fun x -> (plane.Height x).Abs())
 
-            let sos = distances |> List.map(fun x -> x * x) |> List.sum /// (float distances.Length)
+            let sos = distances |> Array.map (fun x -> x * x) |> Array.sum /// (float distances.Length)
             
-            let avg = distances |> List.average
-            let max = distances |> List.max
-            let min = distances |> List.min
+            let avg = distances |> Array.average
+            let max = distances |> Array.max
+            let min = distances |> Array.min
 
             let std = distances |> computeStandardDeviation avg
 
@@ -311,8 +305,8 @@ module DipAndStrike =
             let v = strike.Cross(up).Normalized                       
 
             let centerOfMass =
-                let sum = IndexList.sum points
-                sum / (float)points.Count
+                let sum = Array.sum points
+                sum / float points.Length
 
             let dns = {
                 version         = DipAndStrikeResults.current