first version of working cross sections

Author: haraldsteinlechner

profileDrawing/README.md

@@ -34,6 +34,9 @@ python draw_profile.py --profile testProfile.csv --curtain-height 30 --min-altit
 | `--y-interval` | Optional. Major tick/label interval for y-axis in meters |
 | `--x-grid` | Optional. Minor grid line interval for x-axis in meters |
 | `--y-grid` | Optional. Minor grid line interval for y-axis in meters |
+| `--hide-zero` | Optional. Hide the first x-tick label (0) to avoid clipping at the left edge |
+| `--grid-opacity` | Optional. Grid line opacity from 0.0 to 1.0 (default: 0.4, minor grid is 60% of this) |
+| `--grid-width` | Optional. Major grid line width in points (default: 1.0, minor grid is half) |
 
 ### CSV format
 
@@ -51,3 +54,8 @@ python test_draw_profile.py
 ```
 
 This reads `testProfile.csv`, auto-computes sensible bounds with 5 m margin, and writes both `test_profile_normal.svg` (labels outside) and `test_profile_overlay.svg` (labels overlaid).
+
+
+## Example:
+
+`python draw_profile.py --profile testProfile.csv --curtain-height 100 --min-altitude -2600 --vertical-px 4000 --overlay --x-interval 20 --y-interval 20 --x-grid 25 --y-grid 1 --output profile.png --grid-opacity 1.0 --grid-width 3.0`

profileDrawing/__pycache__/draw_profile.cpython-312.pyc

@@ -15,7 +15,7 @@ def read_profile(csv_path):
     return distances, elevations
 
 
-def draw_profile(csv_path, curtain_height, min_altitude, vertical_px, output_path="profile_output.svg", overlay=False, x_interval=None, y_interval=None, x_grid=None, y_grid=None, hide_zero=False):
+def draw_profile(csv_path, curtain_height, min_altitude, vertical_px, output_path="profile_output.svg", overlay=False, x_interval=None, y_interval=None, x_grid=None, y_grid=None, hide_zero=False, grid_opacity=None, grid_width=None):
     distances, elevations = read_profile(csv_path)
 
     max_altitude = min_altitude + curtain_height
@@ -51,8 +51,12 @@ def draw_profile(csv_path, curtain_height, min_altitude, vertical_px, output_pat
     ax.xaxis.set_minor_locator(ticker.MultipleLocator(x_grid) if x_grid else ticker.AutoMinorLocator())
     ax.yaxis.set_minor_locator(ticker.MultipleLocator(y_grid) if y_grid else ticker.AutoMinorLocator())
 
-    ax.grid(True, which="major", linestyle="--", alpha=0.4)
-    ax.grid(True, which="minor", linestyle=":", linewidth=0.5, alpha=0.25)
+    major_alpha = grid_opacity if grid_opacity is not None else 0.4
+    minor_alpha = major_alpha * 0.6
+    major_lw = grid_width if grid_width is not None else 1.0
+    minor_lw = major_lw * 0.5
+    ax.grid(True, which="major", linestyle="--", alpha=major_alpha, linewidth=major_lw)
+    ax.grid(True, which="minor", linestyle=":", alpha=minor_alpha, linewidth=minor_lw)
 
     if overlay:
         # scale font size to be readable relative to the vertical image size
@@ -153,7 +157,9 @@ def draw_profile(csv_path, curtain_height, min_altitude, vertical_px, output_pat
     parser.add_argument("--x-grid", type=float, default=None, help="Minor grid line interval for x-axis (meters)")
     parser.add_argument("--y-grid", type=float, default=None, help="Minor grid line interval for y-axis (meters)")
     parser.add_argument("--hide-zero", action="store_true", help="Hide the first x-tick label (0) to avoid clipping at the left edge")
+    parser.add_argument("--grid-opacity", type=float, default=None, help="Grid line opacity 0.0–1.0 (default: 0.4, minor grid is 60%% of this)")
+    parser.add_argument("--grid-width", type=float, default=None, help="Major grid line width in points (default: 1.0, minor is half)")
     args = parser.parse_args()
 
     draw_profile(args.profile, args.curtain_height, args.min_altitude, args.vertical_px, args.output, args.overlay,
-                 args.x_interval, args.y_interval, args.x_grid, args.y_grid, args.hide_zero)
+                 args.x_interval, args.y_interval, args.x_grid, args.y_grid, args.hide_zero, args.grid_opacity, args.grid_width)

profileDrawing/draw_profile.py

@@ -33,8 +33,9 @@ type CrossSectionModel = {
     curtainExtrusionDepth : NumericInput
     curtainAbsoluteMode   : bool
     curtainTargetAltitude : NumericInput
-    curtainTextureDepth   : NumericInput
-    curtainBaseColor      : ColorInput
+    curtainTextureDepth          : NumericInput
+    curtainTextureStartAltitude  : NumericInput
+    curtainBaseColor             : ColorInput
 }
 
 module CrossSectionModel =
@@ -56,6 +57,10 @@ module CrossSectionModel =
             value = 50.0; min = 1.0; max = 10000.0
             step = 10.0; format = "{0:0}"
         }
+        curtainTextureStartAltitude = {
+            value = 0.0; min = -10000.0; max = 100000.0
+            step = 10.0; format = "{0:0}"
+        }
         curtainBaseColor = { c = C4b.Gray }
     }
 
@@ -111,6 +116,11 @@ type CrossSectionModel with
                 match curtainTextureDepthOpt with
                 | Some (_ : Chiron.Json) -> Json.readWith Ext.fromJson<NumericInput,Ext> "curtainTextureDepth"
                 | None -> json { return initial.curtainTextureDepth }
+            let! curtainTextureStartAltOpt = Json.tryRead "curtainTextureStartAltitude"
+            let! curtainTextureStartAltitude =
+                match curtainTextureStartAltOpt with
+                | Some (_ : Chiron.Json) -> Json.readWith Ext.fromJson<NumericInput,Ext> "curtainTextureStartAltitude"
+                | None -> json { return initial.curtainTextureStartAltitude }
             let! curtainBaseColorOpt = Json.tryRead "curtainBaseColor"
             let! curtainBaseColor =
                 match curtainBaseColorOpt with
@@ -125,6 +135,7 @@ type CrossSectionModel with
                 curtainAbsoluteMode   = curtainAbsoluteMode   |> Option.defaultValue initial.curtainAbsoluteMode
                 curtainTargetAltitude = curtainTargetAltitude
                 curtainTextureDepth   = curtainTextureDepth
+                curtainTextureStartAltitude = curtainTextureStartAltitude
                 curtainBaseColor      = curtainBaseColor
             }
         }
@@ -137,5 +148,6 @@ type CrossSectionModel with
             do! Json.write "curtainAbsoluteMode"   x.curtainAbsoluteMode
             do! Json.writeWith (Ext.toJson<NumericInput,Ext>) "curtainTargetAltitude" x.curtainTargetAltitude
             do! Json.writeWith (Ext.toJson<NumericInput,Ext>) "curtainTextureDepth"  x.curtainTextureDepth
+            do! Json.writeWith (Ext.toJson<NumericInput,Ext>) "curtainTextureStartAltitude" x.curtainTextureStartAltitude
             do! Json.writeWith (Ext.toJson<ColorInput,Ext>)   "curtainBaseColor"     x.curtainBaseColor
         }

src/PRo3D.Core/CrossSection-Model.fs

@@ -1,5 +1,5 @@
-//4d435630-40b4-2568-d813-1635eec11225
-//f4885c54-f359-c9e6-e8a7-4377e7f249be
+//51a55be8-10c1-3aa7-69b8-c42015a5b17e
+//42366d6f-52d2-43a5-d199-5eaa084b5e1a
 #nowarn "49" // upper case patterns
 #nowarn "66" // upcast is unncecessary
 #nowarn "1337" // internal types
@@ -19,6 +19,7 @@ type AdaptiveCrossSectionModel(value : CrossSectionModel) =
     let _curtainAbsoluteMode_ = FSharp.Data.Adaptive.cval(value.curtainAbsoluteMode)
     let _curtainTargetAltitude_ = Aardvark.UI.Primitives.AdaptiveNumericInput(value.curtainTargetAltitude)
     let _curtainTextureDepth_ = Aardvark.UI.Primitives.AdaptiveNumericInput(value.curtainTextureDepth)
+    let _curtainTextureStartAltitude_ = Aardvark.UI.Primitives.AdaptiveNumericInput(value.curtainTextureStartAltitude)
     let _curtainBaseColor_ = Aardvark.UI.AdaptiveColorInput(value.curtainBaseColor)
     let mutable __value = value
     let __adaptive = FSharp.Data.Adaptive.AVal.custom((fun (token : FSharp.Data.Adaptive.AdaptiveToken) -> __value))
@@ -35,6 +36,7 @@ type AdaptiveCrossSectionModel(value : CrossSectionModel) =
             _curtainAbsoluteMode_.Value <- value.curtainAbsoluteMode
             _curtainTargetAltitude_.Update(value.curtainTargetAltitude)
             _curtainTextureDepth_.Update(value.curtainTextureDepth)
+            _curtainTextureStartAltitude_.Update(value.curtainTextureStartAltitude)
             _curtainBaseColor_.Update(value.curtainBaseColor)
     member __.Current = __adaptive
     member __.crossSection = _crossSection_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.Option<CrossSection>>
@@ -44,6 +46,7 @@ type AdaptiveCrossSectionModel(value : CrossSectionModel) =
     member __.curtainAbsoluteMode = _curtainAbsoluteMode_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.bool>
     member __.curtainTargetAltitude = _curtainTargetAltitude_
     member __.curtainTextureDepth = _curtainTextureDepth_
+    member __.curtainTextureStartAltitude = _curtainTextureStartAltitude_
     member __.curtainBaseColor = _curtainBaseColor_
 [<AutoOpen; System.Diagnostics.CodeAnalysis.SuppressMessage("NameConventions", "*")>]
 module CrossSectionModelLenses = 
@@ -55,5 +58,6 @@ module CrossSectionModelLenses =
         static member curtainAbsoluteMode_ = ((fun (self : CrossSectionModel) -> self.curtainAbsoluteMode), (fun (value : Microsoft.FSharp.Core.bool) (self : CrossSectionModel) -> { self with curtainAbsoluteMode = value }))
         static member curtainTargetAltitude_ = ((fun (self : CrossSectionModel) -> self.curtainTargetAltitude), (fun (value : Aardvark.UI.Primitives.NumericInput) (self : CrossSectionModel) -> { self with curtainTargetAltitude = value }))
         static member curtainTextureDepth_ = ((fun (self : CrossSectionModel) -> self.curtainTextureDepth), (fun (value : Aardvark.UI.Primitives.NumericInput) (self : CrossSectionModel) -> { self with curtainTextureDepth = value }))
+        static member curtainTextureStartAltitude_ = ((fun (self : CrossSectionModel) -> self.curtainTextureStartAltitude), (fun (value : Aardvark.UI.Primitives.NumericInput) (self : CrossSectionModel) -> { self with curtainTextureStartAltitude = value }))
         static member curtainBaseColor_ = ((fun (self : CrossSectionModel) -> self.curtainBaseColor), (fun (value : Aardvark.UI.ColorInput) (self : CrossSectionModel) -> { self with curtainBaseColor = value }))
 

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

@@ -16,8 +16,9 @@ type CrossSectionAction =
     | SetCurtainExtrusionDepth of Numeric.Action
     | ToggleCurtainAbsoluteMode
     | SetCurtainTargetAltitude of Numeric.Action
-    | SetCurtainTextureDepth   of Numeric.Action
-    | ChangeCurtainBaseColor   of ColorPicker.Action
+    | SetCurtainTextureDepth          of Numeric.Action
+    | SetCurtainTextureStartAltitude  of Numeric.Action
+    | ChangeCurtainBaseColor          of ColorPicker.Action
 
 module CrossSectionApp =
 
@@ -39,6 +40,8 @@ module CrossSectionApp =
             { model with curtainTargetAltitude = Numeric.update model.curtainTargetAltitude a }
         | SetCurtainTextureDepth a ->
             { model with curtainTextureDepth = Numeric.update model.curtainTextureDepth a }
+        | SetCurtainTextureStartAltitude a ->
+            { model with curtainTextureStartAltitude = Numeric.update model.curtainTextureStartAltitude a }
         | ChangeCurtainBaseColor a ->
             { model with curtainBaseColor = ColorPicker.update model.curtainBaseColor a }
 
@@ -65,7 +68,8 @@ module CrossSectionApp =
                         }
                     )
                 ]
-                Html.row "Texture Depth (m):" [Numeric.view' [InputBox] model.curtainTextureDepth |> UI.map SetCurtainTextureDepth]
+                Html.row "Tex Start Alt (m):" [Numeric.view' [InputBox] model.curtainTextureStartAltitude |> UI.map SetCurtainTextureStartAltitude]
+                Html.row "Tex Depth (m):" [Numeric.view' [InputBox] model.curtainTextureDepth |> UI.map SetCurtainTextureDepth]
                 Html.row "Base Color:" [ColorPicker.view model.curtainBaseColor |> UI.map ChangeCurtainBaseColor]
             ]
         )

src/PRo3D.Core/CrossSectionApp.fs

@@ -1,5 +1,5 @@
 //e4eebad7-e3e9-5330-2090-496649038ecb
-//bb4e2d0a-2744-801c-ce26-3edcf884df74
+//6b5b11fb-9c2b-6bde-6ca1-76fc5fcc5f1d
 #nowarn "49" // upper case patterns
 #nowarn "66" // upcast is unncecessary
 #nowarn "1337" // internal types
@@ -13,10 +13,10 @@ open PRo3D.Core.SequencedBookmarks
 [<System.Diagnostics.CodeAnalysis.SuppressMessage("NameConventions", "*")>]
 type AdaptiveSequencedBookmarkModel(value : SequencedBookmarkModel) =
     let mutable _key_ = FSharp.Data.Adaptive.cval(value.key)
-    let mutable _filename_ = FSharp.Data.Adaptive.cval(value.filename)
-    let mutable _name_ = FSharp.Data.Adaptive.cval(value.name)
     let mutable _cameraView_ = FSharp.Data.Adaptive.cval(value.cameraView)
+    let mutable _name_ = FSharp.Data.Adaptive.cval(value.name)
     let mutable _path_ = FSharp.Data.Adaptive.cval(value.path)
+    let mutable _filename_ = FSharp.Data.Adaptive.cval(value.filename)
     let _bookmark_ = PRo3D.Core.AdaptiveBookmark(value.bookmark)
     let _metadata_ = FSharp.Data.Adaptive.cval(value.metadata)
     let _frustumParameters_ = FSharp.Data.Adaptive.cval(value.frustumParameters)
@@ -42,10 +42,10 @@ type AdaptiveSequencedBookmarkModel(value : SequencedBookmarkModel) =
             __value <- value
             __adaptive.MarkOutdated()
             _key_.Value <- value.key
-            _filename_.Value <- value.filename
-            _name_.Value <- value.name
             _cameraView_.Value <- value.cameraView
+            _name_.Value <- value.name
             _path_.Value <- value.path
+            _filename_.Value <- value.filename
             _bookmark_.Update(value.bookmark)
             _metadata_.Value <- value.metadata
             _frustumParameters_.Value <- value.frustumParameters
@@ -57,10 +57,10 @@ type AdaptiveSequencedBookmarkModel(value : SequencedBookmarkModel) =
             _observationInfo_.Update(value.observationInfo)
     member __.Current = __adaptive
     member __.key = _key_ :> FSharp.Data.Adaptive.aval<System.Guid>
-    member __.filename = _filename_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.string>
-    member __.name = _name_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.string>
     member __.cameraView = _cameraView_ :> FSharp.Data.Adaptive.aval<Aardvark.Rendering.CameraView>
+    member __.name = _name_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.string>
     member __.path = _path_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.string>
+    member __.filename = _filename_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.string>
     member __.version = __value.version
     member __.bookmark = _bookmark_
     member __.metadata = _metadata_ :> FSharp.Data.Adaptive.aval<Microsoft.FSharp.Core.option<Microsoft.FSharp.Core.string>>