remove FsEx, use Pretty

Author: goswinr

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.10.0] - 2025-03-07
+### Changed
+- Referencing Rhino.Scripting 0.10.0
+- removed FsEx dependency
+- rename .ToNiceString to .Pretty
+
 ## [0.8.2] - 2025-02-23
 ### Changed
 - Referencing Rhino.Scripting 0.8.0
@@ -27,7 +33,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Referencing Rhino.Scripting 0.5.0
 
 
-[Unreleased]: https://github.com/goswinr/Rhino.Scripting.FSharp/compare/0.8.2...HEAD
+[Unreleased]: https://github.com/goswinr/Rhino.Scripting.FSharp/compare/0.10.0...HEAD
+[0.10.0]: https://github.com/goswinr/Rhino.Scripting.FSharp/compare/0.8.2...0.10.0
 [0.8.2]: https://github.com/goswinr/Rhino.Scripting.FSharp/compare/0.8.1...0.8.2
 [0.8.1]: https://github.com/goswinr/Rhino.Scripting.FSharp/compare/0.8.0...0.8.1
 [0.8.0]: https://github.com/goswinr/Rhino.Scripting.FSharp/compare/0.5.0...0.8.0

README.md

@@ -39,8 +39,8 @@ rs.SetUserText (guid, "id", "point123")
 rs.ObjectName (guid, "123")
 ```
 
-The `|>!` operator is part of Rhino.Scripting via the [FsEx](https://github.com/goswinr/FsEx) library.
-It passes it's input on as output. See [definition](https://github.com/goswinr/FsEx/blob/dd993e737fa70878f8a10e5357e8331dd68857a6/Src/TopLevelFunctions.fs#L126).
+The `|>!` operator is part of Rhino.Scripting.FSharp library.
+It passes it's input on as output. See [definition](https://github.com/goswinr/Rhino.Scripting.Fsharp/blob/main/Src/Rhino.Scripting/Curried.fs#L16).
 
 ### Full API Documentation
 

Rhino.Scripting.Fsharp.fsproj

@@ -64,9 +64,8 @@
     <PackageReference Include="RhinoCommon" Version="7.0.20314.3001" PrivateAssets="all" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     <PackageReference Include="Ionide.KeepAChangelog.Tasks" Version="0.1.8" PrivateAssets="all"  />
-    <PackageReference Include="Rhino.Scripting" Version="0.9.0" />
+    <PackageReference Include="Rhino.Scripting" Version="0.10.0" />
 
-    <!-- <Reference Include="FsEx" HintPath="../FsEx/bin/Release/net472/FsEx.dll" /> -->
     <!-- <Reference Include="Rhino.Scripting" HintPath="../Rhino.Scripting/bin/Release/net48/Rhino.Scripting.dll" /> -->
   </ItemGroup>
 
@@ -79,13 +78,15 @@
     <Compile Include="Src/Point3d.fs" />
     <Compile Include="Src/Line.fs" />
     <Compile Include="Src/Plane.fs" />
+
     <Compile Include="Src/Rhino.Scripting/Printing.fs" />
     <Compile Include="Src/Rhino.Scripting/Selection.fs" />
     <Compile Include="Src/Rhino.Scripting/Curried.fs" />
     <Compile Include="Src/Rhino.Scripting/Vectors.fs" />
     <Compile Include="Src/Rhino.Scripting/Curve.fs" />
     <Compile Include="Src/Rhino.Scripting/Brep.fs" />
     <Compile Include="Src/Rhino.Scripting/Mesh.fs" />
+
     <Compile Include="Src/RhPoints.fs" />
     <Compile Include="Src/RhTopology.fs" />
   </ItemGroup>

Src/Line.fs

@@ -2,8 +2,7 @@
 open Rhino.Scripting
 open Rhino
 open Rhino.Geometry
-open FsEx.UtilMath
-open FsEx
+open Rhino.Scripting.RhinoScriptingUtils
 open UtilRHinoScriptingFSharp
 
 
@@ -33,12 +32,12 @@ module AutoOpenLine =
     /// But without full type name as in v.ToString()
     member ln.AsString =
         sprintf "%s, %s, %s to %s, %s, %s"
-            (NiceFormat.float ln.FromX)
-            (NiceFormat.float ln.FromY)
-            (NiceFormat.float ln.FromZ)
-            (NiceFormat.float ln.ToX)
-            (NiceFormat.float ln.ToY)
-            (NiceFormat.float ln.ToZ)
+            (PrettyFormat.float ln.FromX)
+            (PrettyFormat.float ln.FromY)
+            (PrettyFormat.float ln.FromZ)
+            (PrettyFormat.float ln.ToX)
+            (PrettyFormat.float ln.ToY)
+            (PrettyFormat.float ln.ToZ)
 
 
     /// Same as ln.Vector or ln.Tangent.
@@ -496,7 +495,6 @@ module AutoOpenLine =
         dot > 1e-12
 
 
-
     /// Checks if the angle between the two 3D lines is less than 90 degrees.
     /// Calculates the dot product of the unit-vectors of the two 3D lines.
     /// Then checks if it is bigger than 0.707107 (cosine of 90 degrees).
@@ -1301,11 +1299,11 @@ module AutoOpenLine =
     /// Returns point on lnB (the last parameter)
     static member intersectInOnePoint (lnA:Line) (lnB:Line) : Point3d =
         let ok, ta, tb = Intersect.Intersection.LineLine(lnA,lnB)
-        if not ok then RhinoScriptingFSharpException.Raise "Rhino.Scripting.FSharp: RhinoScriptSyntax.Line.intersectInOnePoint failed, parallel ?  on %s and %s" lnA.ToNiceString lnB.ToNiceString
+        if not ok then RhinoScriptingFSharpException.Raise "Rhino.Scripting.FSharp: RhinoScriptSyntax.Line.intersectInOnePoint failed, parallel ?  on %s and %s" lnA.Pretty lnB.Pretty
         let a = lnA.PointAt(ta)
         let b = lnB.PointAt(tb)
         if (a-b).SquareLength > RhinoMath.ZeroTolerance then // = Length > 1e-6
-            RhinoScriptingFSharpException.Raise "Rhino.Scripting.FSharp: RhinoScriptSyntax.Line.intersect intersectInOnePoint, they are skew. distance: %g  on %s and %s" (a-b).Length lnA.ToNiceString lnB.ToNiceString
+            RhinoScriptingFSharpException.Raise "Rhino.Scripting.FSharp: RhinoScriptSyntax.Line.intersect intersectInOnePoint, they are skew. distance: %g  on %s and %s" (a-b).Length lnA.Pretty lnB.Pretty
         b
 
     /// Finds intersection of two Infinite Lines.
@@ -1315,7 +1313,7 @@ module AutoOpenLine =
     /// Considers Lines infinite
     static member intersectSkew (lnA:Line) (lnB:Line) :Point3d*Point3d=
         let ok, ta, tb = Intersect.Intersection.LineLine(lnA,lnB)
-        if not ok then RhinoScriptingFSharpException.Raise "Rhino.Scripting.FSharp: RhinoScriptSyntax.Line.intersectSkew failed, parallel ?  on %s and %s" lnA.ToNiceString lnB.ToNiceString
+        if not ok then RhinoScriptingFSharpException.Raise "Rhino.Scripting.FSharp: RhinoScriptSyntax.Line.intersectSkew failed, parallel ?  on %s and %s" lnA.Pretty lnB.Pretty
         let a = lnA.PointAt(ta)
         let b = lnB.PointAt(tb)
         a,b
@@ -1340,10 +1338,16 @@ module AutoOpenLine =
     /// Considers Lines finite
     static member intersectFinite (lnA:Line) (lnB:Line) : Point3d[]=
         let ok, ta, tb = Intersect.Intersection.LineLine(lnA,lnB)
-        if not ok then [||] //RhinoScriptingFSharpException.Raise "Rhino.Scripting.FSharp: RhinoScriptSyntax.Line.intersectFinite failed, parallel ?  on %s and %s" lnA.ToNiceString lnB.ToNiceString
+        if not ok then [||] //RhinoScriptingFSharpException.Raise "Rhino.Scripting.FSharp: RhinoScriptSyntax.Line.intersectFinite failed, parallel ?  on %s and %s" lnA.Pretty lnB.Pretty
         else
-            let ca = clamp 0. 1. ta
-            let cb = clamp 0. 1. tb
+            let inline clamp01 x =
+                if x < 0.0 then 0.0
+                elif x > 1.0 then 1.0
+                else x
+
+
+            let ca = clamp01 ta
+            let cb = clamp01 tb
             let a = lnA.PointAt(ca)
             let b = lnB.PointAt(cb)
             let d = Point3d.distance a b

Src/Plane.fs

@@ -1,12 +1,11 @@
 namespace Rhino.Scripting.FSharp
 
-open FsEx
 open System
 open Rhino
 open Rhino.Geometry
-open FsEx.UtilMath
 open Rhino.Scripting
 open UtilRHinoScriptingFSharp
+open Rhino.Scripting.RhinoScriptingUtils
 
 
 
@@ -129,8 +128,8 @@ module AutoOpenPlane=
     /// Counter clockwise in top view (for WorldXY Plane).
     static member inline rotateZ (angDegree:float) (pl:Plane) =
         let mutable p = pl.Clone()
-        if not <| p.Rotate(UtilMath.toRadians angDegree, Vector3d.ZAxis) then
-            RhinoScriptingFSharpException.Raise "Rhino.Scripting.FSharp: RhinoScriptSyntax.RhPlane.rotateZ by %s for %s" angDegree.ToNiceString pl.ToNiceString
+        if not <| p.Rotate(toRadians angDegree, Vector3d.ZAxis) then
+            RhinoScriptingFSharpException.Raise "Rhino.Scripting.FSharp: RhinoScriptSyntax.RhPlane.rotateZ by %s for %s" (PrettyFormat.float angDegree) pl.Pretty
         p
 
 

Src/Point3d.fs

@@ -4,7 +4,7 @@ open Rhino.Scripting
 open System
 open Rhino
 open Rhino.Geometry
-open FsEx
+open Rhino.Scripting.RhinoScriptingUtils
 open UtilRHinoScriptingFSharp
 open System
 
@@ -23,7 +23,7 @@ module AutoOpenPnt =
 
         /// Format 3D point into string with nice floating point number formatting of X, Y and Z
         /// But without full type name as in pt.ToString()
-        member p.AsString = sprintf "X=%s|Y=%s|Z=%s" (NiceFormat.float p.X) (NiceFormat.float p.Y) (NiceFormat.float p.Z)
+        member p.AsString = sprintf "X=%s|Y=%s|Z=%s" (PrettyFormat.float p.X) (PrettyFormat.float p.Y) (PrettyFormat.float p.Z)
 
         //-----------------------------------------------------------------------------------------------------
         // These static members can't be extension methods to be useful for Array.sum and Array.average :
@@ -533,7 +533,7 @@ module AutoOpenPnt =
                 let lp = Line(thisPt + sp , vp)  //|>! ( RhinoScriptSyntax.Doc.Objects.AddLine>>ignore)
                 let ln = Line(thisPt + sn , vn)  //|>! ( RhinoScriptSyntax.Doc.Objects.AddLine>> ignore)
                 let ok, tp , _ = Intersect.Intersection.LineLine(lp, ln) //could also be solved with trigonometry functions
-                if not ok then RhinoScriptingFSharpException.Raise "Rhino.Scripting.FSharp: RhinoScriptSyntax.RhPnt.findOffsetCorner: Intersect.Intersection.LineLine failed on %s and %s" lp.ToNiceString ln.ToNiceString
+                if not ok then RhinoScriptingFSharpException.Raise "Rhino.Scripting.FSharp: RhinoScriptSyntax.RhPnt.findOffsetCorner: Intersect.Intersection.LineLine failed on %s and %s" lp.Pretty ln.Pretty
                 struct(sp, sn, lp.PointAt(tp), n)  //or ln.PointAt(tn), should be same
 
 

Src/RhPlane.fs

@@ -1,11 +1,11 @@
 namespace Rhino.Scripting.FSharp
 
-open FsEx
+
 open System
 open Rhino
 open Rhino.Geometry
-open FsEx.UtilMath
 open Rhino.Scripting
+open Rhino.Scripting.RhinoScriptingUtils
 
 
 
@@ -87,5 +87,5 @@ module AutoOpenPlane =
     static member inline rotateZ (angDegree:float) (pl:Plane) =
         let mutable p = pl.Clone()
         if not <| p.Rotate(UtilMath.toRadians angDegree, Vector3d.ZAxis) then
-            RhinoScriptingFSharpException.Raise "Rhino.Scripting.FSharp: RhinoScriptSyntax.RhPlane.rotateZ by %s for %s" angDegree.ToNiceString pl.ToNiceString
+            RhinoScriptingFSharpException.Raise "Rhino.Scripting.FSharp: RhinoScriptSyntax.RhPlane.rotateZ by %s for %s" angDegree.Pretty pl.Pretty
         p