diff --git a/App/Hi.Wpf.dll b/App/Hi.Wpf.dll index 9d73e75..f5b7822 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 79febb7..7ed1388 100644 Binary files a/App/HiCbtr.dll and b/App/HiCbtr.dll differ diff --git a/App/HiDisp.dll b/App/HiDisp.dll index 13d4d7b..ead00d1 100644 Binary files a/App/HiDisp.dll and b/App/HiDisp.dll differ diff --git a/App/HiGeom.dll b/App/HiGeom.dll index fa32f27..943d450 100644 Binary files a/App/HiGeom.dll and b/App/HiGeom.dll differ diff --git a/App/HiLicense.dll b/App/HiLicense.dll index 98bc91a..b9907f2 100644 Binary files a/App/HiLicense.dll and b/App/HiLicense.dll differ diff --git a/App/HiMech.dll b/App/HiMech.dll index 1217ab6..6df03f1 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 4470c72..5d6b36f 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.67", - "HiNc": "3.1.88", + "Hi.Wpf": "3.1.68", + "HiNc": "3.1.89", "runtimepack.Microsoft.NETCore.App.Runtime.win-x64": "9.0.11", "runtimepack.Microsoft.WindowsDesktop.App.Runtime.win-x64": "9.0.11", "runtimepack.Microsoft.AspNetCore.App.Runtime.win-x64": "9.0.11" @@ -1600,39 +1600,39 @@ } } }, - "Hi.Wpf/3.1.67": { + "Hi.Wpf/3.1.68": { "dependencies": { - "HiDisp": "3.1.72" + "HiDisp": "3.1.73" }, "runtime": { "lib/net9.0-windows7.0/Hi.Wpf.dll": { - "assemblyVersion": "3.1.67.0", - "fileVersion": "3.1.67.0" + "assemblyVersion": "3.1.68.0", + "fileVersion": "3.1.68.0" } } }, - "HiCbtr/3.1.72": { + "HiCbtr/3.1.73": { "dependencies": { - "HiDisp": "3.1.72" + "HiDisp": "3.1.73" }, "runtime": { "lib/net9.0/HiCbtr.dll": { - "assemblyVersion": "3.1.72.0", - "fileVersion": "3.1.72.0" + "assemblyVersion": "3.1.73.0", + "fileVersion": "3.1.73.0" } } }, - "HiDisp/3.1.72": { + "HiDisp/3.1.73": { "dependencies": { - "HiGeom": "3.1.67", + "HiGeom": "3.1.68", "System.Configuration.ConfigurationManager": "10.0.0", "System.Drawing.Common": "10.0.0", "System.Resources.Extensions": "10.0.0" }, "runtime": { "lib/net9.0/HiDisp.dll": { - "assemblyVersion": "3.1.72.0", - "fileVersion": "3.1.72.0" + "assemblyVersion": "3.1.73.0", + "fileVersion": "3.1.73.0" } }, "native": { @@ -1647,7 +1647,7 @@ } } }, - "HiGeom/3.1.67": { + "HiGeom/3.1.68": { "dependencies": { "Google.Protobuf": "3.28.3", "Grpc.AspNetCore": "2.66.0", @@ -1658,8 +1658,8 @@ }, "runtime": { "lib/net9.0/HiGeom.dll": { - "assemblyVersion": "3.1.67.0", - "fileVersion": "3.1.67.0" + "assemblyVersion": "3.1.68.0", + "fileVersion": "3.1.68.0" } }, "resources": { @@ -1671,27 +1671,27 @@ } } }, - "HiLicense/3.1.67": { + "HiLicense/3.1.68": { "dependencies": { - "HiGeom": "3.1.67" + "HiGeom": "3.1.68" }, "runtime": { "lib/net9.0/HiLicense.dll": { - "assemblyVersion": "3.1.67.0", - "fileVersion": "3.1.67.0" + "assemblyVersion": "3.1.68.0", + "fileVersion": "3.1.68.0" } } }, - "HiMech/3.1.79": { + "HiMech/3.1.80": { "dependencies": { "CommandLineParser": "2.9.1", - "HiCbtr": "3.1.72", + "HiCbtr": "3.1.73", "Microsoft.CodeAnalysis.CSharp.Scripting": "5.0.0" }, "runtime": { "lib/net9.0/HiMech.dll": { - "assemblyVersion": "3.1.79.0", - "fileVersion": "3.1.79.0" + "assemblyVersion": "3.1.80.0", + "fileVersion": "3.1.80.0" } }, "resources": { @@ -1706,20 +1706,20 @@ } } }, - "HiNc/3.1.88": { + "HiNc/3.1.89": { "dependencies": { "Google.Protobuf": "3.28.3", "Grpc.AspNetCore": "2.66.0", "Grpc.Net.Client": "2.66.0", - "HiLicense": "3.1.67", - "HiMech": "3.1.79", - "HiUniNc": "3.1.76", + "HiLicense": "3.1.68", + "HiMech": "3.1.80", + "HiUniNc": "3.1.77", "System.IO.Pipelines": "10.0.0" }, "runtime": { "lib/net9.0/HiNc.dll": { - "assemblyVersion": "3.1.88.0", - "fileVersion": "3.1.88.0" + "assemblyVersion": "3.1.89.0", + "fileVersion": "3.1.89.0" } }, "resources": { @@ -1731,14 +1731,14 @@ } } }, - "HiUniNc/3.1.76": { + "HiUniNc/3.1.77": { "dependencies": { - "HiMech": "3.1.79" + "HiMech": "3.1.80" }, "runtime": { "lib/net9.0/HiUniNc.dll": { - "assemblyVersion": "3.1.76.0", - "fileVersion": "3.1.76.0" + "assemblyVersion": "3.1.77.0", + "fileVersion": "3.1.77.0" } } }, @@ -2219,61 +2219,61 @@ "path": "grpc.net.common/2.66.0", "hashPath": "grpc.net.common.2.66.0.nupkg.sha512" }, - "Hi.Wpf/3.1.67": { + "Hi.Wpf/3.1.68": { "type": "package", "serviceable": true, - "sha512": "sha512-0zrTQuGkONCcBgyWdZFzjqLslyKtLqSR5NF5RTZhpHKK80lEzoh/KSEbIXknd6JcCWsru4FLGvcwYuBiMVpRIA==", - "path": "hi.wpf/3.1.67", - "hashPath": "hi.wpf.3.1.67.nupkg.sha512" + "sha512": "sha512-47lo+Zr99SD1/INkNAwz2gk+5NE0Lt2ZGGER1ae2joZVb/T9sNCIdJ3slFks45SIUdBd/XP7RR/r80bqHuYk2g==", + "path": "hi.wpf/3.1.68", + "hashPath": "hi.wpf.3.1.68.nupkg.sha512" }, - "HiCbtr/3.1.72": { + "HiCbtr/3.1.73": { "type": "package", "serviceable": true, - "sha512": "sha512-DjdVfnqK9ezMy83NecAdo82e/+UrLddx/b7PpRfmNU03qITJrLUdZX/84zMTvjSKYS8LsJ8rBL+ColKLHny8zw==", - "path": "hicbtr/3.1.72", - "hashPath": "hicbtr.3.1.72.nupkg.sha512" + "sha512": "sha512-rR9DyzXGkGZLGL7GYH8g2nO/8pqlhDwalpH51LMShuuZWNjPwPQDeQ1LDmH56y589OhkqG1ta26+9nssUwmSMA==", + "path": "hicbtr/3.1.73", + "hashPath": "hicbtr.3.1.73.nupkg.sha512" }, - "HiDisp/3.1.72": { + "HiDisp/3.1.73": { "type": "package", "serviceable": true, - "sha512": "sha512-HseZ2V1Zz2LOV/DZD6l9S40gMpv+Cv6Yrlxub+Y9eI7I/EX02zDwh8b2NZlKFYP8x6SDvgqnDcd5w3QUWVj6yg==", - "path": "hidisp/3.1.72", - "hashPath": "hidisp.3.1.72.nupkg.sha512" + "sha512": "sha512-eg0Nm/xUQ6M44Idl4U2XIcHAwrNJumvdK2KkdLA+YTb6gOtyvCEan0dA05cf/H6sJ5OicrCeEB4NdnfYP9Uw2g==", + "path": "hidisp/3.1.73", + "hashPath": "hidisp.3.1.73.nupkg.sha512" }, - "HiGeom/3.1.67": { + "HiGeom/3.1.68": { "type": "package", "serviceable": true, - "sha512": "sha512-5eK986BtFuffkIdUC7BMBVspY8azZSN1cpP/QX01mUR4GXuAsTEwNbaC6p6mrCI+BgVOlaXqN2a7l1f0J+8nFg==", - "path": "higeom/3.1.67", - "hashPath": "higeom.3.1.67.nupkg.sha512" + "sha512": "sha512-617ZiKB3OBH4uwk8P4nyQAFQd7NPISWUXQ/VW0ySR0MuvgXKSh9R+gXIY7UH/HDT1JY6bdFD9mCL9/j6K2htyg==", + "path": "higeom/3.1.68", + "hashPath": "higeom.3.1.68.nupkg.sha512" }, - "HiLicense/3.1.67": { + "HiLicense/3.1.68": { "type": "package", "serviceable": true, - "sha512": "sha512-wFb+3Gv3qf4McyLgfSvbjwH3OYa927qYMQLQEOEt+GfiXxm+37hYvz8ZKx7Ax7aPMdxxF/Lv6eJHIyEjMdvB9w==", - "path": "hilicense/3.1.67", - "hashPath": "hilicense.3.1.67.nupkg.sha512" + "sha512": "sha512-cl7qcGD3M40+gfbKFLuWO2HtcOeJsGnsk0gLUmd8oBXkIKtaoAZCOnuB3f/wEzr6IlOSpP48RvAPvPP4DaRgGA==", + "path": "hilicense/3.1.68", + "hashPath": "hilicense.3.1.68.nupkg.sha512" }, - "HiMech/3.1.79": { + "HiMech/3.1.80": { "type": "package", "serviceable": true, - "sha512": "sha512-Nn1RLi8Lp+7+U5AWA3/ICVTX/lbdggxiWLVWMDPZKhU/vhqy0ok74NXKXsnuznB6RYRCHJdQsajLOq/Q3jSoYw==", - "path": "himech/3.1.79", - "hashPath": "himech.3.1.79.nupkg.sha512" + "sha512": "sha512-gOZkPDfM4vGQN8KU2GlPMQgeSqUMdOkf4uUV9NXu51ojYtzBNazhpFHPNV/MkpAHOyzL1cQEmJ7oc4x7YzEZXA==", + "path": "himech/3.1.80", + "hashPath": "himech.3.1.80.nupkg.sha512" }, - "HiNc/3.1.88": { + "HiNc/3.1.89": { "type": "package", "serviceable": true, - "sha512": "sha512-bOCV1fk2+VJ3BwS6ZWUZ65BBhvvLZBORVEdCA5N67ZmLfdNP4Na0A7F+4Ia9hVIYADmC4PlR0qU9R5oovisaCA==", - "path": "hinc/3.1.88", - "hashPath": "hinc.3.1.88.nupkg.sha512" + "sha512": "sha512-IEecTPyS9WyRlEnsDZxLiS6lIuEFUErT/Hs6qrF2PkVYRquv7sLz/sraLLRi8lsRnkvI3oMnw50hW5cVGzNUIg==", + "path": "hinc/3.1.89", + "hashPath": "hinc.3.1.89.nupkg.sha512" }, - "HiUniNc/3.1.76": { + "HiUniNc/3.1.77": { "type": "package", "serviceable": true, - "sha512": "sha512-XbFy9gWOXkcgy69ZQ8LvWPaN9brfjayttoobXgL6GufvWUAKgI4QS++KhrMrq7vaDMn5A3Z8E65h+zRNlDruTQ==", - "path": "hiuninc/3.1.76", - "hashPath": "hiuninc.3.1.76.nupkg.sha512" + "sha512": "sha512-lkEdgDdNi5g0eJjLxExFWlWr9O8stcHiZ0J2fI4vEZQIIgJn23NtNx7SpBUhmvUvnMIeXae6Lfb5KE69GU+ZGg==", + "path": "hiuninc/3.1.77", + "hashPath": "hiuninc.3.1.77.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 cb9fdd3..3ae2922 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 f1154d3..2b4a98a 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 df66319..ec2f763 100644 Binary files a/App/HiNc.dll and b/App/HiNc.dll differ diff --git a/App/HiUniNc.dll b/App/HiUniNc.dll index 95b1d4e..bc6ce6c 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 9c5c676..4fc30b4 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 afad1dc..ca7b233 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.MachiningProcs.RuntimeApi.html b/App/wwwroot/HiAPI-docsite/api/Hi.MachiningProcs.RuntimeApi.html index dd19552..dea55e4 100644 --- a/App/wwwroot/HiAPI-docsite/api/Hi.MachiningProcs.RuntimeApi.html +++ b/App/wwwroot/HiAPI-docsite/api/Hi.MachiningProcs.RuntimeApi.html @@ -1040,38 +1040,6 @@ public bool OptEnableFeedrate { get; set; } - - -

- OptEnableFlatProcLog - -

- -
-
- -
-
[JsAce]
-public static bool OptEnableFlatProcLog { get; set; }
-
- - - - - -

Property Value

-
-
bool
-
-
- - - - - - - -

@@ -1171,6 +1139,38 @@ public bool OptEnableSideCompensation { get; set; } + + +

+ OptEnableSituStepAdjustmentLog + +

+ +
+
+ +
+
[JsAce]
+public static bool OptEnableSituStepAdjustmentLog { get; set; }
+
+ + + + + +

Property Value

+
+
bool
+
+
+ + + + + + + +

diff --git a/App/wwwroot/HiAPI-docsite/api/Hi.NcOpt.NcOptProc.html b/App/wwwroot/HiAPI-docsite/api/Hi.NcOpt.NcOptProc.html index 446b460..a92357f 100644 --- a/App/wwwroot/HiAPI-docsite/api/Hi.NcOpt.NcOptProc.html +++ b/App/wwwroot/HiAPI-docsite/api/Hi.NcOpt.NcOptProc.html @@ -324,19 +324,19 @@ Class NcOptProc - + -

- EnableFlatProcLog +

+ EnableSituStepAdjustmentLog

-

Enable create log file for building situ (independent) FlatExtendedStep process.

+

Enable create log file for building situ (independent) StepOptContext process.

-
public static bool EnableFlatProcLog { get; set; }
+
public static bool EnableSituStepAdjustmentLog { get; set; }
diff --git a/App/wwwroot/HiAPI-docsite/brief/dev-doc/release-note/index.html b/App/wwwroot/HiAPI-docsite/brief/dev-doc/release-note/index.html index e918337..d38ce82 100644 --- a/App/wwwroot/HiAPI-docsite/brief/dev-doc/release-note/index.html +++ b/App/wwwroot/HiAPI-docsite/brief/dev-doc/release-note/index.html @@ -87,13 +87,24 @@

Release Note

+

HiNc Packages Version 3.1.88

+

HiNc Packages Version 3.1.86