Merge pull request #563 from pro3d-space/features/area-of-polygons

Features/area of polygons

Already merged as base for next steps

Author: Brunnhuber

PRODUCT_RELEASE_NOTES.md

@@ -1,3 +1,8 @@
+## 5.3.0-prerelease1
+- axis-ellipses added 
+- area calculation for closed polygons and ellipses included
+- surface intersection preview added
+
 ## 5.1.2           
 - fixed legacy traverse scene file / m20 waypoint loading
 

aardium/package.json

@@ -1,7 +1,7 @@
 {
   "name": "PRo3D",
   "productName": "PRo3D.Viewer",
-  "version": "5.1.2",
+  "version": "5.3.0-prerelease1",
   "description": "PRo3D, short for Planetary Robotics 3D Viewer, is an interactive 3D visualization tool to allow planetary scientists to work with high-resolution 3D reconstructions of the Martian surface.",
   "license": "AGPL",
   "copyright": "VRVis Zentrum für Virtual Reality und Visualisierung Forschungs-GmbH",

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

@@ -257,9 +257,10 @@ type AnnotationResults = {
     slope             : float
     trueThickness     : float
     verticalThickness : float
+    area              : float
 }
 with 
-    static member current = 2
+    static member current = 3
     static member private readV0 =
         json {      
             let! height      = Json.readFloat "height"     
@@ -281,6 +282,7 @@ with
                 slope             = slope            
                 trueThickness     = Double.NaN
                 verticalThickness = Double.NaN
+                area              = Double.NaN
             }
         }
 
@@ -306,6 +308,7 @@ with
                 slope             = slope
                 trueThickness     = trueThickness
                 verticalThickness = Double.NaN
+                area              = Double.NaN
             }
         }
 
@@ -332,6 +335,35 @@ with
                 slope             = slope
                 trueThickness     = trueThickness
                 verticalThickness = verticalThickness
+                area              = Double.NaN
+            }
+        }
+
+    static member private readV3 = 
+        json {      
+            let! height             = Json.readFloat "height"     
+            let! heightDelta        = Json.readFloat "heightDelta"
+            let! avgAltitude        = Json.readFloat "avgAltitude"
+            let! length             = Json.readFloat "length"     
+            let! wayLength          = Json.readFloat "wayLength"  
+            let! bearing            = Json.readFloat "bearing"    
+            let! slope              = Json.readFloat "slope"
+            let! trueThickness      = Json.readFloat "trueThickness"
+            let! verticalThickness  = Json.readFloat "verticalThickness"
+            let! area               = Json.readFloat "area"
+            
+            return {
+                version           = AnnotationResults.current    
+                height            = height     
+                heightDelta       = heightDelta
+                avgAltitude       = avgAltitude
+                length            = length
+                wayLength         = wayLength  
+                bearing           = bearing
+                slope             = slope
+                trueThickness     = trueThickness
+                verticalThickness = verticalThickness
+                area              = area
             }
         }
 
@@ -342,6 +374,7 @@ with
             | 0 -> return! AnnotationResults.readV0
             | 1 -> return! AnnotationResults.readV1
             | 2 -> return! AnnotationResults.readV2
+            | 3 -> return! AnnotationResults.readV3
             | _ -> return! v |> sprintf "don't know version %A  of AnnotationResults" |> Json.error
         }
 
@@ -357,6 +390,7 @@ with
             do! Json.writeFloat "slope"             x.slope       
             do! Json.writeFloat "trueThickness"     x.trueThickness
             do! Json.writeFloat "verticalThickness" x.verticalThickness
+            do! Json.writeFloat "area"              x.area
         }
 
 
@@ -409,6 +443,7 @@ module AnnotationResults =
             slope             = Double.NaN
             trueThickness     = Double.NaN
             verticalThickness = Double.NaN
+            area              = Double.NaN
         }  
 
 type SemanticId = SemanticId of string

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

@@ -1,5 +1,5 @@
-//bfe6acfa-0299-89a4-8870-5436b29c454b
-//124b09b1-6601-961c-adac-7438070f4a0a
+//d57beed9-6fc2-ac59-849a-0162bb994dd5
+//f8c5a4a6-357e-5ffe-e148-5d422bdaddc4
 #nowarn "49" // upper case patterns
 #nowarn "66" // upcast is unncecessary
 #nowarn "1337" // internal types
@@ -140,6 +140,7 @@ type AdaptiveAnnotationResults(value : AnnotationResults) =
     let _slope_ = FSharp.Data.Adaptive.cval(value.slope)
     let _trueThickness_ = FSharp.Data.Adaptive.cval(value.trueThickness)
     let _verticalThickness_ = FSharp.Data.Adaptive.cval(value.verticalThickness)
+    let _area_ = FSharp.Data.Adaptive.cval(value.area)
     let mutable __value = value
     let __adaptive = FSharp.Data.Adaptive.AVal.custom((fun (token : FSharp.Data.Adaptive.AdaptiveToken) -> __value))
     static member Create(value : AnnotationResults) = AdaptiveAnnotationResults(value)
@@ -158,6 +159,7 @@ type AdaptiveAnnotationResults(value : AnnotationResults) =
             _slope_.Value <- value.slope
             _trueThickness_.Value <- value.trueThickness
             _verticalThickness_.Value <- value.verticalThickness
+            _area_.Value <- value.area
     member __.Current = __adaptive
     member __.version = _version_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.int>
     member __.height = _height_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.float>
@@ -169,6 +171,7 @@ type AdaptiveAnnotationResults(value : AnnotationResults) =
     member __.slope = _slope_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.float>
     member __.trueThickness = _trueThickness_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.float>
     member __.verticalThickness = _verticalThickness_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.float>
+    member __.area = _area_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.float>
 [<AutoOpen; System.Diagnostics.CodeAnalysis.SuppressMessage("NameConventions", "*")>]
 module AnnotationResultsLenses = 
     type AnnotationResults with
@@ -182,6 +185,7 @@ module AnnotationResultsLenses =
         static member slope_ = ((fun (self : AnnotationResults) -> self.slope), (fun (value : Microsoft.FSharp.Core.float) (self : AnnotationResults) -> { self with slope = value }))
         static member trueThickness_ = ((fun (self : AnnotationResults) -> self.trueThickness), (fun (value : Microsoft.FSharp.Core.float) (self : AnnotationResults) -> { self with trueThickness = value }))
         static member verticalThickness_ = ((fun (self : AnnotationResults) -> self.verticalThickness), (fun (value : Microsoft.FSharp.Core.float) (self : AnnotationResults) -> { self with verticalThickness = value }))
+        static member area_ = ((fun (self : AnnotationResults) -> self.area), (fun (value : Microsoft.FSharp.Core.float) (self : AnnotationResults) -> { self with area = value }))
 [<System.Diagnostics.CodeAnalysis.SuppressMessage("NameConventions", "*")>]
 type AdaptiveAnnotation(value : Annotation) =
     let _version_ = FSharp.Data.Adaptive.cval(value.version)

src/PRo3D.Base/Annotation/AnnotationHelpers.fs

@@ -95,6 +95,35 @@ module Calculations =
                 yield getSegmentDistance s
         ] 
         |> List.sum
+
+    
+    let calculateVertexPlane (points: V3d[]) = 
+        if points.Length < 3 then Plane3d.Invalid
+        else 
+            (PlaneFitting.planeFit(points))
+
+    let calculatePolygonArea (points:IndexList<V3d>) = 
+        if points.Count < 3 then
+            0.0
+        else
+            let points = points |> IndexList.filter(fun x -> not x.IsNaN)
+            let v3dArray = points.AsArray
+
+            let vertexPlane = calculateVertexPlane v3dArray
+
+            if vertexPlane.IsValid then 
+             
+                let w2Plane = vertexPlane.GetWorldToPlane()
+
+                let v2dArray = 
+                    v3dArray 
+                    |> Array.map(fun p -> (w2Plane.TransformPos p).XY)
+
+                let p2D = Polygon2d(v2dArray)                
+                p2D.ComputeArea()
+            else
+                0.0
+
 
     let calcResultsLine (annotation : Annotation) (upVec:V3d) (northVec:V3d) (planet:Planet) : AnnotationResults =
         let count = annotation.points.Count
@@ -136,6 +165,14 @@ module Calculations =
                 planeHeight, verticalDistance
             | _ -> Double.NaN, Double.NaN
 
+        let area = 
+            match (annotation.geometry) with
+            | Geometry.Polygon
+            | Geometry.Ellipse
+            | Geometry.AxisEllipse ->
+                calculatePolygonArea annotation.points
+            | _ -> Double.NaN
+
         {   
             version           = AnnotationResults.current
             height            = height
@@ -147,6 +184,7 @@ module Calculations =
             slope             = slope
             trueThickness     = trueThickness
             verticalThickness = verticalThickness
+            area              = area
         }
 
     let calculateAnnotationResults (model:Annotation) (upVec:V3d) (northVec:V3d) (planet:Planet) : AnnotationResults =

src/PRo3D.Base/Annotation/Exporters/CSV.Export.fs

@@ -45,6 +45,7 @@ module CSVExport =
         dipAzimuth         : float
         strikeAzimuth      : float
         rake               : float
+        area               : float
 
         manualDip          : float
         trueThickness      : float
@@ -173,12 +174,13 @@ module CSVExport =
 
             horizontalDelta = horizontalDelta //
             verticalDelta   = verticalDelta //
+            area            = results.area //
 
             //dns
             dipAngle      = dnsResults.dipAngle //
             dipAzimuth    = dnsResults.dipAzimuth //
             strikeAzimuth = dnsResults.strikeAzimuth //
-            rake          = dnsResults.rake
+            rake          = dnsResults.rake            
 
             //error measures
             errorAvg     = dnsResults.errorAvg

src/PRo3D.Core/Drawing/Drawing-App.fs

@@ -488,6 +488,40 @@ module DrawingApp =
             | GroupsMessage msg,_, _ ->
                 let m = { model with annotations = GroupsApp.update model.annotations msg}
                 m
+            | RecalculateMeasurements, _,_ -> 
+                let up    = smallConfig.up.Get(bigConfig)
+                let north = smallConfig.north.Get(bigConfig)
+                let planet = smallConfig.planet.Get(bigConfig)
+                
+                let selected = 
+                    model.annotations.selectedLeaves
+                    |> HashSet.map(fun selection -> selection.id)                    
+
+                let selected = 
+                    if selected.IsEmpty then
+                        model.annotations.singleSelectLeaf
+                        |> Option.map(fun leafGuid -> 
+                            HashSet.empty |> HashSet.add leafGuid)
+                        |> Option.defaultValue selected
+                    else
+                        selected
+
+                let annotationsFlat = 
+                    selected
+                    |> HashSet.fold(fun annotations guid -> 
+                        let a = 
+                            model.annotations.flat.TryFind guid
+                            |> Option.map (fun anno -> anno |> Leaf.toAnnotation)
+                            
+                        match a with 
+                        | Some annotation -> 
+                            let results = Calculations.calculateAnnotationResults annotation up north planet
+                            let annotation = { annotation with results = Some(results) }
+                            annotations |> HashMap.add guid (Leaf.Annotations annotation)
+                        | None -> annotations
+                        ) model.annotations.flat
+                
+                { model with annotations = { model.annotations with flat = annotationsFlat }}
             | DnsColorLegendMessage msg,_, _ -> 
                 { model with dnsColorLegend = FalseColorLegendApp.update model.dnsColorLegend msg }
             | FlyToAnnotation msg, _, _ ->               

src/PRo3D.Core/Drawing/Drawing-Model.fs

@@ -56,6 +56,7 @@ type DrawingAction =
 | UpVectorChanged        of V3d
 | NorthVectorChanged     of V3d
 | GroupsMessage          of GroupsAppAction
+| RecalculateMeasurements
 | DnsColorLegendMessage  of FalseColorLegendApp.Action  
 | ExportAsAnnotations    of string
 | AddAnnotations         of list<string>

src/PRo3D.Core/Drawing/Drawing-Model.g.fs

@@ -1,4 +1,4 @@
-//5f52137c-4504-3d0c-e38d-92b4e1fe881d
+//551da2aa-09ea-8000-db8d-bb1b622e2009
 //011fab16-2e0f-378e-5edf-99b0128f7a93
 #nowarn "49" // upper case patterns
 #nowarn "66" // upcast is unncecessary

src/PRo3D.Core/Drawing/Drawing-Properties.fs

@@ -113,6 +113,7 @@ module AnnotationProperties =
         let slope             = AVal.bindOption results Double.NaN (fun a -> a.slope)
         let trueThickness     = AVal.bindOption results Double.NaN (fun a -> a.trueThickness)
         let verticalThickness = AVal.bindOption results Double.NaN (fun a -> a.verticalThickness)
+        let area              = AVal.bindOption results Double.NaN (fun a -> a.area)
 
         // TODO refactor: why so complicated to list stuff?, not incremental
         let vertDist = AVal.map( fun u -> Calculations.verticalDelta   (model.points |> AList.force |> IndexList.toList) u ) up 
@@ -142,6 +143,7 @@ module AnnotationProperties =
                 yield Html.row "Horizontal Distance:"   [Incremental.text (horDist   |> AVal.map  (fun d -> sprintf "%.4f m" (d)))]
                 yield Html.row "True Thickness:"        [Incremental.text (trueThickness |> AVal.map  (fun d -> sprintf "%.4f m" (d)))]
                 yield Html.row "Vertical Thickness:"    [Incremental.text (verticalThickness |> AVal.map  (fun d -> sprintf "%.4f m" (d)))]
+                yield Html.row "Area:"                  [Incremental.text (area |> AVal.map  (fun d -> sprintf "%.4f m\xB2" (d)))]
             ]
         )