diff --git a/App/Hi.Wpf.dll b/App/Hi.Wpf.dll index 899b668..0be5741 100644 Binary files a/App/Hi.Wpf.dll and b/App/Hi.Wpf.dll differ diff --git a/App/HiCbtr.dll b/App/HiCbtr.dll index 96400ca..ba7cbaf 100644 Binary files a/App/HiCbtr.dll and b/App/HiCbtr.dll differ diff --git a/App/HiDisp.dll b/App/HiDisp.dll index 4f4b974..137cb84 100644 Binary files a/App/HiDisp.dll and b/App/HiDisp.dll differ diff --git a/App/HiGeom.dll b/App/HiGeom.dll index 8d2b4e4..b520546 100644 Binary files a/App/HiGeom.dll and b/App/HiGeom.dll differ diff --git a/App/HiLicense.dll b/App/HiLicense.dll index 7ff4610..e26af45 100644 Binary files a/App/HiLicense.dll and b/App/HiLicense.dll differ diff --git a/App/HiMech.dll b/App/HiMech.dll index 154ca93..81d5d52 100644 Binary files a/App/HiMech.dll and b/App/HiMech.dll differ diff --git a/App/HiNC-2025-win-desktop.deps.json b/App/HiNC-2025-win-desktop.deps.json index 1064fd3..f2a8a12 100644 --- a/App/HiNC-2025-win-desktop.deps.json +++ b/App/HiNC-2025-win-desktop.deps.json @@ -11,8 +11,8 @@ "dependencies": { "AvalonEdit": "6.3.0.90", "FontAwesome.Sharp": "6.3.0", - "Hi.Wpf": "3.1.39", - "HiNc": "3.1.59", + "Hi.Wpf": "3.1.40", + "HiNc": "3.1.60", "Microsoft.Extensions.Configuration.Json": "9.0.0", "Microsoft.Extensions.DependencyInjection": "9.0.0", "Microsoft.Extensions.Hosting": "9.0.0", @@ -1659,39 +1659,39 @@ } }, "Grpc.Tools/2.66.0": {}, - "Hi.Wpf/3.1.39": { + "Hi.Wpf/3.1.40": { "dependencies": { - "HiDisp": "3.1.44" + "HiDisp": "3.1.45" }, "runtime": { "lib/net9.0-windows7.0/Hi.Wpf.dll": { - "assemblyVersion": "3.1.39.0", - "fileVersion": "3.1.39.0" + "assemblyVersion": "3.1.40.0", + "fileVersion": "3.1.40.0" } } }, - "HiCbtr/3.1.44": { + "HiCbtr/3.1.45": { "dependencies": { - "HiDisp": "3.1.44" + "HiDisp": "3.1.45" }, "runtime": { "lib/net9.0/HiCbtr.dll": { - "assemblyVersion": "3.1.44.0", - "fileVersion": "3.1.44.0" + "assemblyVersion": "3.1.45.0", + "fileVersion": "3.1.45.0" } } }, - "HiDisp/3.1.44": { + "HiDisp/3.1.45": { "dependencies": { - "HiGeom": "3.1.40", + "HiGeom": "3.1.41", "System.Configuration.ConfigurationManager": "9.0.9", "System.Drawing.Common": "9.0.9", "System.Resources.Extensions": "9.0.9" }, "runtime": { "lib/net9.0/HiDisp.dll": { - "assemblyVersion": "3.1.44.0", - "fileVersion": "3.1.44.0" + "assemblyVersion": "3.1.45.0", + "fileVersion": "3.1.45.0" } }, "native": { @@ -1706,7 +1706,7 @@ } } }, - "HiGeom/3.1.40": { + "HiGeom/3.1.41": { "dependencies": { "Google.Protobuf": "3.28.3", "Grpc.AspNetCore": "2.66.0", @@ -1717,8 +1717,8 @@ }, "runtime": { "lib/net9.0/HiGeom.dll": { - "assemblyVersion": "3.1.40.0", - "fileVersion": "3.1.40.0" + "assemblyVersion": "3.1.41.0", + "fileVersion": "3.1.41.0" } }, "resources": { @@ -1730,27 +1730,27 @@ } } }, - "HiLicense/3.1.38": { + "HiLicense/3.1.39": { "dependencies": { - "HiGeom": "3.1.40" + "HiGeom": "3.1.41" }, "runtime": { "lib/net9.0/HiLicense.dll": { - "assemblyVersion": "3.1.38.0", - "fileVersion": "3.1.38.0" + "assemblyVersion": "3.1.39.0", + "fileVersion": "3.1.39.0" } } }, - "HiMech/3.1.48": { + "HiMech/3.1.49": { "dependencies": { "CommandLineParser": "2.9.1", - "HiCbtr": "3.1.44", + "HiCbtr": "3.1.45", "Microsoft.CodeAnalysis.CSharp.Scripting": "4.14.0" }, "runtime": { "lib/net9.0/HiMech.dll": { - "assemblyVersion": "3.1.48.0", - "fileVersion": "3.1.48.0" + "assemblyVersion": "3.1.49.0", + "fileVersion": "3.1.49.0" } }, "resources": { @@ -1765,20 +1765,20 @@ } } }, - "HiNc/3.1.59": { + "HiNc/3.1.60": { "dependencies": { "Google.Protobuf": "3.28.3", "Grpc.AspNetCore": "2.66.0", "Grpc.Net.Client": "2.66.0", - "HiLicense": "3.1.38", - "HiMech": "3.1.48", - "HiUniNc": "3.1.45", + "HiLicense": "3.1.39", + "HiMech": "3.1.49", + "HiUniNc": "3.1.46", "System.IO.Pipelines": "9.0.9" }, "runtime": { "lib/net9.0/HiNc.dll": { - "assemblyVersion": "3.1.59.0", - "fileVersion": "3.1.59.0" + "assemblyVersion": "3.1.60.0", + "fileVersion": "3.1.60.0" } }, "resources": { @@ -1790,14 +1790,14 @@ } } }, - "HiUniNc/3.1.45": { + "HiUniNc/3.1.46": { "dependencies": { - "HiMech": "3.1.48" + "HiMech": "3.1.49" }, "runtime": { "lib/net9.0/HiUniNc.dll": { - "assemblyVersion": "3.1.45.0", - "fileVersion": "3.1.45.0" + "assemblyVersion": "3.1.46.0", + "fileVersion": "3.1.46.0" } } }, @@ -2442,61 +2442,61 @@ "path": "grpc.tools/2.66.0", "hashPath": "grpc.tools.2.66.0.nupkg.sha512" }, - "Hi.Wpf/3.1.39": { + "Hi.Wpf/3.1.40": { "type": "package", "serviceable": true, - "sha512": "sha512-ben+X5ic6hZAyo1dxCB88oA2dKE9siSjXBOEJjqaS46Jq/vA6vKX0CnuTFmJUH9Cwnn0S9AGHO9GzueJDyjS3A==", - "path": "hi.wpf/3.1.39", - "hashPath": "hi.wpf.3.1.39.nupkg.sha512" + "sha512": "sha512-R1Nz+rndjXHLdgUNDFwQN80GXj/LjE2Pw2IPqBBPtsVXrf/i16iz/8nQllwDYOtvusvnIJViS/VqdGYPTmNNLw==", + "path": "hi.wpf/3.1.40", + "hashPath": "hi.wpf.3.1.40.nupkg.sha512" }, - "HiCbtr/3.1.44": { + "HiCbtr/3.1.45": { "type": "package", "serviceable": true, - "sha512": "sha512-AA78pD9NeID7USbQeWJeAkO7pBJZRAvC2XVgg5ftDJHJodGYtEhWdeKVTiRBkDVXnSrkaSJYAUa6E4eCxiNBcQ==", - "path": "hicbtr/3.1.44", - "hashPath": "hicbtr.3.1.44.nupkg.sha512" + "sha512": "sha512-stmPH2ezocYpzmOtxNgeARSQVBUTQQ20zR6UvLPkDEmWuaW+7BIuRTKB3XwlFlWwcTWDp//I5dXFFlm9suO+mA==", + "path": "hicbtr/3.1.45", + "hashPath": "hicbtr.3.1.45.nupkg.sha512" }, - "HiDisp/3.1.44": { + "HiDisp/3.1.45": { "type": "package", "serviceable": true, - "sha512": "sha512-Qq2JGhjnRkMynbtSgMVUE7j4aPhsdpilHDTARv+LNrh7KwVLqceDpphrTahqR+D+l22L9luNnmTnoP9cSyzUtA==", - "path": "hidisp/3.1.44", - "hashPath": "hidisp.3.1.44.nupkg.sha512" + "sha512": "sha512-EpQ97N1/wZ0MgHMbEt4ye4dAKPPSOwr5suKuHrBioEdQsW5Road1QF7Gf9D4WRxquql2QPrpbKrlREo5ughqZg==", + "path": "hidisp/3.1.45", + "hashPath": "hidisp.3.1.45.nupkg.sha512" }, - "HiGeom/3.1.40": { + "HiGeom/3.1.41": { "type": "package", "serviceable": true, - "sha512": "sha512-u/ocQIX+g9wfCiUaOJQoiZViMzaCYWXX7+OvGyp/JXcWX8ZH7unDobtCkiPWSodL/mZOKhcq5h5hbEvUs/dQIQ==", - "path": "higeom/3.1.40", - "hashPath": "higeom.3.1.40.nupkg.sha512" + "sha512": "sha512-OP73LkBIj+nSWG5WFnAoqoIy2G78yqpwTjtBBplAcPMH3tvdiPMVTHMNuczLe5QrZUc1r89rcluL6MUxTUXCEw==", + "path": "higeom/3.1.41", + "hashPath": "higeom.3.1.41.nupkg.sha512" }, - "HiLicense/3.1.38": { + "HiLicense/3.1.39": { "type": "package", "serviceable": true, - "sha512": "sha512-0oFpMu/lYt3CYkaBpatfibzeOil/1n5x+g2vo7igBP93x9o7TxV3TcA+jJHZ16ekC4T4SZxgpY+rZyuNGncy6w==", - "path": "hilicense/3.1.38", - "hashPath": "hilicense.3.1.38.nupkg.sha512" + "sha512": "sha512-3d4WhoqCEUdVYuxHs5/mjhELYbsemqGMJE1xl7gnDVvXjy03SRbQNGa9a08NlAMG2vYSyXe4QueD5UeidWO+nA==", + "path": "hilicense/3.1.39", + "hashPath": "hilicense.3.1.39.nupkg.sha512" }, - "HiMech/3.1.48": { + "HiMech/3.1.49": { "type": "package", "serviceable": true, - "sha512": "sha512-B0DHBkw72EQcZXJ4b3zztYU4Bb1ECOYHQS9m/6JqLaQtyYe8SXCwqiaUcd5b79Aj3zmbZiV5chHl80sECsbZOw==", - "path": "himech/3.1.48", - "hashPath": "himech.3.1.48.nupkg.sha512" + "sha512": "sha512-dp+swSYJgu6rU0YI/1Eg4jRESp8kvrJv6N159ptYqCBsThKlmdKmfm/CTmsy77VpKQkzh0pD8BxdsM8/NdKUvg==", + "path": "himech/3.1.49", + "hashPath": "himech.3.1.49.nupkg.sha512" }, - "HiNc/3.1.59": { + "HiNc/3.1.60": { "type": "package", "serviceable": true, - "sha512": "sha512-9yNH4gOuVJ9qSXX6J/3x4X9sDAtFIg6GX6g5E6z9qHmPkrNspDIcLB+QdiGZpLCx2Ix96Ov9OdhUnO+jnht8TA==", - "path": "hinc/3.1.59", - "hashPath": "hinc.3.1.59.nupkg.sha512" + "sha512": "sha512-bi3x+WpCIFMngoqvVui/G29Ah4P76RClCBoSVUINPpJi98hoavv7Ejzavi2437LYIhN1WBLZoJb6hQmVLfXGYg==", + "path": "hinc/3.1.60", + "hashPath": "hinc.3.1.60.nupkg.sha512" }, - "HiUniNc/3.1.45": { + "HiUniNc/3.1.46": { "type": "package", "serviceable": true, - "sha512": "sha512-bhqLTOPQJy9UXiVnYDtiSigB0CyQGpAUlI48SokDabHQ/5SAcOLcsslVbj73uIFXitpFNCNW/qKj+RUs0SwYow==", - "path": "hiuninc/3.1.45", - "hashPath": "hiuninc.3.1.45.nupkg.sha512" + "sha512": "sha512-ouyvIaxLdN6OxhQTNB7k2WkdSHu4EAVanVSppc+iXN0qHjEsbYY/H8kOxSkqLbEP/Zyzz9i4efKN3arQwXbXuQ==", + "path": "hiuninc/3.1.46", + "hashPath": "hiuninc.3.1.46.nupkg.sha512" }, "MathNet.Numerics/5.0.0": { "type": "package", diff --git a/App/HiNC-2025-win-desktop.dll b/App/HiNC-2025-win-desktop.dll index 023977e..15fc18e 100644 Binary files a/App/HiNC-2025-win-desktop.dll and b/App/HiNC-2025-win-desktop.dll differ diff --git a/App/HiNC-2025-win-desktop.pdb b/App/HiNC-2025-win-desktop.pdb index 57c8289..a3d7ea2 100644 Binary files a/App/HiNC-2025-win-desktop.pdb and b/App/HiNC-2025-win-desktop.pdb differ diff --git a/App/HiNc.dll b/App/HiNc.dll index 7077dc7..1812fd0 100644 Binary files a/App/HiNc.dll and b/App/HiNc.dll differ diff --git a/App/HiUniNc.dll b/App/HiUniNc.dll index 935b6b0..9846fbb 100644 Binary files a/App/HiUniNc.dll and b/App/HiUniNc.dll differ diff --git a/App/en/HiGeom.resources.dll b/App/en/HiGeom.resources.dll index 3a8ac2a..fdf0c16 100644 Binary files a/App/en/HiGeom.resources.dll and b/App/en/HiGeom.resources.dll differ diff --git a/App/en/HiMech.resources.dll b/App/en/HiMech.resources.dll index ea2289d..26e2a8d 100644 Binary files a/App/en/HiMech.resources.dll and b/App/en/HiMech.resources.dll differ diff --git a/App/wwwroot/HiAPI-docsite/api/Hi.Numerical.NcFlagUtil.html b/App/wwwroot/HiAPI-docsite/api/Hi.Numerical.NcFlagUtil.html index 02203da..77689d4 100644 --- a/App/wwwroot/HiAPI-docsite/api/Hi.Numerical.NcFlagUtil.html +++ b/App/wwwroot/HiAPI-docsite/api/Hi.Numerical.NcFlagUtil.html @@ -1328,6 +1328,42 @@ Class NcFlagUtil + + +
public static bool IsRapidMode(this BitArray ncFlagBitArray)
+ ncFlagBitArray
BitArrayFeedrate on NC code in mm/min. +
Feedrate on NC code in current mode in mm/min. See F.
Feedrate on NC code in mm/sec. -See F.
+Feedrate on NC code in current mode in mm/sec.
Machining Feedrate on NC code in machining mode (such as G01,G02,G03 but not G00) in mm/min.
+public double MachiningFeedrate_mmdmin { get; set; }
+ Machining Feedrate on NC code in machining mode (such as G01,G02,G03 but not G00) in mm/sec.
+public double MachiningFeedrate_mmds { get; set; }
+ Rapid Feedrate on NC code in rapid mode (such as G00 but not G01,G02,G03) in mm/min.
+public double RapidFeedrate_mmdmin { get; set; }
+ Rapid Feedrate on NC code in rapid mode (such as G00 but not G01,G02,G03) in mm/sec.
+public double RapidFeedrate_mmds { get; set; }
+