diff --git a/App/Hi.Wpf.dll b/App/Hi.Wpf.dll index b3e18b0..e552bd3 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 c56a7db..becd67b 100644 Binary files a/App/HiCbtr.dll and b/App/HiCbtr.dll differ diff --git a/App/HiDisp.dll b/App/HiDisp.dll index 41147f0..9b2613e 100644 Binary files a/App/HiDisp.dll and b/App/HiDisp.dll differ diff --git a/App/HiGeom.dll b/App/HiGeom.dll index 20a3da1..4fa2b7f 100644 Binary files a/App/HiGeom.dll and b/App/HiGeom.dll differ diff --git a/App/HiLicense.dll b/App/HiLicense.dll index 30f6bc5..8ce243e 100644 Binary files a/App/HiLicense.dll and b/App/HiLicense.dll differ diff --git a/App/HiMech.dll b/App/HiMech.dll index 7ead020..b51c698 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 4631222..12f895f 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.69", - "HiNc": "3.1.90", + "Hi.Wpf": "3.1.70", + "HiNc": "3.1.91", "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.69": { + "Hi.Wpf/3.1.70": { "dependencies": { - "HiDisp": "3.1.74" + "HiDisp": "3.1.75" }, "runtime": { "lib/net9.0-windows7.0/Hi.Wpf.dll": { - "assemblyVersion": "3.1.69.0", - "fileVersion": "3.1.69.0" + "assemblyVersion": "3.1.70.0", + "fileVersion": "3.1.70.0" } } }, - "HiCbtr/3.1.74": { + "HiCbtr/3.1.75": { "dependencies": { - "HiDisp": "3.1.74" + "HiDisp": "3.1.75" }, "runtime": { "lib/net9.0/HiCbtr.dll": { - "assemblyVersion": "3.1.74.0", - "fileVersion": "3.1.74.0" + "assemblyVersion": "3.1.75.0", + "fileVersion": "3.1.75.0" } } }, - "HiDisp/3.1.74": { + "HiDisp/3.1.75": { "dependencies": { - "HiGeom": "3.1.69", + "HiGeom": "3.1.70", "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.74.0", - "fileVersion": "3.1.74.0" + "assemblyVersion": "3.1.75.0", + "fileVersion": "3.1.75.0" } }, "native": { @@ -1647,7 +1647,7 @@ } } }, - "HiGeom/3.1.69": { + "HiGeom/3.1.70": { "dependencies": { "Google.Protobuf": "3.28.3", "Grpc.AspNetCore": "2.66.0", @@ -1658,8 +1658,8 @@ }, "runtime": { "lib/net9.0/HiGeom.dll": { - "assemblyVersion": "3.1.69.0", - "fileVersion": "3.1.69.0" + "assemblyVersion": "3.1.70.0", + "fileVersion": "3.1.70.0" } }, "resources": { @@ -1671,27 +1671,27 @@ } } }, - "HiLicense/3.1.69": { + "HiLicense/3.1.70": { "dependencies": { - "HiGeom": "3.1.69" + "HiGeom": "3.1.70" }, "runtime": { "lib/net9.0/HiLicense.dll": { - "assemblyVersion": "3.1.69.0", - "fileVersion": "3.1.69.0" + "assemblyVersion": "3.1.70.0", + "fileVersion": "3.1.70.0" } } }, - "HiMech/3.1.81": { + "HiMech/3.1.82": { "dependencies": { "CommandLineParser": "2.9.1", - "HiCbtr": "3.1.74", + "HiCbtr": "3.1.75", "Microsoft.CodeAnalysis.CSharp.Scripting": "5.0.0" }, "runtime": { "lib/net9.0/HiMech.dll": { - "assemblyVersion": "3.1.81.0", - "fileVersion": "3.1.81.0" + "assemblyVersion": "3.1.82.0", + "fileVersion": "3.1.82.0" } }, "resources": { @@ -1706,20 +1706,20 @@ } } }, - "HiNc/3.1.90": { + "HiNc/3.1.91": { "dependencies": { "Google.Protobuf": "3.28.3", "Grpc.AspNetCore": "2.66.0", "Grpc.Net.Client": "2.66.0", - "HiLicense": "3.1.69", - "HiMech": "3.1.81", - "HiUniNc": "3.1.78", + "HiLicense": "3.1.70", + "HiMech": "3.1.82", + "HiUniNc": "3.1.79", "System.IO.Pipelines": "10.0.0" }, "runtime": { "lib/net9.0/HiNc.dll": { - "assemblyVersion": "3.1.90.0", - "fileVersion": "3.1.90.0" + "assemblyVersion": "3.1.91.0", + "fileVersion": "3.1.91.0" } }, "resources": { @@ -1731,14 +1731,14 @@ } } }, - "HiUniNc/3.1.78": { + "HiUniNc/3.1.79": { "dependencies": { - "HiMech": "3.1.81" + "HiMech": "3.1.82" }, "runtime": { "lib/net9.0/HiUniNc.dll": { - "assemblyVersion": "3.1.78.0", - "fileVersion": "3.1.78.0" + "assemblyVersion": "3.1.79.0", + "fileVersion": "3.1.79.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.69": { + "Hi.Wpf/3.1.70": { "type": "package", "serviceable": true, - "sha512": "sha512-eeh5Rtl+QCxA7Ikm2Bwv9AGWvDBlN4tWIs/KZRlboDNt/ODXk2D9Pws5Y7Y1sWYQOAh5vd6LvITH8f6CbCTIVw==", - "path": "hi.wpf/3.1.69", - "hashPath": "hi.wpf.3.1.69.nupkg.sha512" + "sha512": "sha512-XWWn/kqW/B+uJe9wrcVJbJM4oNyrTy81Gt5lkLdZiik62ZybFyzr+wkzyi7fhvEZdtYdx/Bh4O9HLB/vB9LPhA==", + "path": "hi.wpf/3.1.70", + "hashPath": "hi.wpf.3.1.70.nupkg.sha512" }, - "HiCbtr/3.1.74": { + "HiCbtr/3.1.75": { "type": "package", "serviceable": true, - "sha512": "sha512-DrBrm0QWJidZ/u5cgt+s6jyUZDs5RuLzKV3h8ur5cIlS1uzfqAB9WmBfVOlN069CeJfkEm8l8+JicLykOEenwQ==", - "path": "hicbtr/3.1.74", - "hashPath": "hicbtr.3.1.74.nupkg.sha512" + "sha512": "sha512-UFRlHCWAiAKJ/ri+kOWBvibIcQuelhUg/oARfuHl40zykStEDieE7Pj11G0zBuD4HdCBI9g6leQYBQ/fhjFTVw==", + "path": "hicbtr/3.1.75", + "hashPath": "hicbtr.3.1.75.nupkg.sha512" }, - "HiDisp/3.1.74": { + "HiDisp/3.1.75": { "type": "package", "serviceable": true, - "sha512": "sha512-pP/vEIiz6iYVwHpq8kkzcDMATG5SBFZjb7oqafh+frrBV/2jkCBNy0RYbhttpHm4dl+n0SrxYfxSScD8rlxPzA==", - "path": "hidisp/3.1.74", - "hashPath": "hidisp.3.1.74.nupkg.sha512" + "sha512": "sha512-+9eKXTkiRtV6XWJJKFRwnL17dXauNe3+tXUrpMucR/VBcBxN8nORjVyY4Zwtd30oElcsfXhVM+n6OBC3VTiq5w==", + "path": "hidisp/3.1.75", + "hashPath": "hidisp.3.1.75.nupkg.sha512" }, - "HiGeom/3.1.69": { + "HiGeom/3.1.70": { "type": "package", "serviceable": true, - "sha512": "sha512-8RFW9qMraHvYufrxKor69bWzGrueiamy4hOd7Tc9+Fqz7nBduTKzVvCPKX1xQixQaAzk5RB3GiYNXuPIh80srg==", - "path": "higeom/3.1.69", - "hashPath": "higeom.3.1.69.nupkg.sha512" + "sha512": "sha512-d7QgPPw914inkiW9CKHiMxxDK00YkP+JzbsryONDpWj7DA8FwdKaT2iZ84yL+3uxkw61Hb2KZ1/YaBsaGqauFg==", + "path": "higeom/3.1.70", + "hashPath": "higeom.3.1.70.nupkg.sha512" }, - "HiLicense/3.1.69": { + "HiLicense/3.1.70": { "type": "package", "serviceable": true, - "sha512": "sha512-dSIp1pnmP7nqjG5AI8TQdHUkGPX93qDwk4OVoSMNOFyNfoI7a5ZR9hyad9vUgRgSLQhNmTgGbYuT8VP+/gUhUA==", - "path": "hilicense/3.1.69", - "hashPath": "hilicense.3.1.69.nupkg.sha512" + "sha512": "sha512-Qw0yWnQicboO9He979f9cz6fyZFpaEwIXjWJDkebQxPDCIFxeFnsHj//6rYulR1mvdkYOk19QMsqKoMRzRm0vw==", + "path": "hilicense/3.1.70", + "hashPath": "hilicense.3.1.70.nupkg.sha512" }, - "HiMech/3.1.81": { + "HiMech/3.1.82": { "type": "package", "serviceable": true, - "sha512": "sha512-CzMve1k9P9iqcBYcALiCDe4tkTEkMWFHEbbH58njjza8gK8qPXUBPQcxSUo5VEDGYxT6Pfl7JW2KCfw37mRNbg==", - "path": "himech/3.1.81", - "hashPath": "himech.3.1.81.nupkg.sha512" + "sha512": "sha512-7dqJ5I6p56qgadthQNcH9DlKeOB/T5/AKua0g2C4KLn9APXsQKPcKbGV5KtYIrTD/TOBFEG6elpODkUYkF76Iw==", + "path": "himech/3.1.82", + "hashPath": "himech.3.1.82.nupkg.sha512" }, - "HiNc/3.1.90": { + "HiNc/3.1.91": { "type": "package", "serviceable": true, - "sha512": "sha512-wwuecFVd4yJBz000fR4e9ffPv1XTW6Ou0noyvrWt1OYHy15Fg6/yBOOmUJXnm05qdgLpdQWn2mTUKv1gY9zI0Q==", - "path": "hinc/3.1.90", - "hashPath": "hinc.3.1.90.nupkg.sha512" + "sha512": "sha512-bwN/vgKnBv9JHxyQZEal7xgdE52nwVvplOVcK7J5Myw5uPE+5/uylpA3DidrE1YiJAdcrT+M+vRe1pNJyGwwNw==", + "path": "hinc/3.1.91", + "hashPath": "hinc.3.1.91.nupkg.sha512" }, - "HiUniNc/3.1.78": { + "HiUniNc/3.1.79": { "type": "package", "serviceable": true, - "sha512": "sha512-a/NpehkA+3sH3TATGIcZNoonh7sbOj6nrE6+uqpmlBXMvlthPAbbhXZU95fidj2KAQbn1z2XsbAwd7gWQlil5A==", - "path": "hiuninc/3.1.78", - "hashPath": "hiuninc.3.1.78.nupkg.sha512" + "sha512": "sha512-bMbAWwRVuRN1QF+rYd4/99L8bHFXfYQmlJJlSn2q1FI6DzXNMZ5RtPUpWKeUT8IXU7dOkQcZPOO5vsnOM5JAzQ==", + "path": "hiuninc/3.1.79", + "hashPath": "hiuninc.3.1.79.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 26336fb..8f2df7a 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.exe b/App/HiNC-2025-win-desktop.exe index 6d808d9..24a770c 100644 Binary files a/App/HiNC-2025-win-desktop.exe and b/App/HiNC-2025-win-desktop.exe differ diff --git a/App/HiNC-2025-win-desktop.pdb b/App/HiNC-2025-win-desktop.pdb index cc97c77..51fd64a 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 8e80732..38855b6 100644 Binary files a/App/HiNc.dll and b/App/HiNc.dll differ diff --git a/App/HiUniNc.dll b/App/HiUniNc.dll index 6965633..0bf203a 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 9ffdc6c..b238c6d 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 07e6f48..c45ff60 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.MachiningProject.html b/App/wwwroot/HiAPI-docsite/api/Hi.MachiningProcs.MachiningProject.html index 81f488b..39ba9bd 100644 --- a/App/wwwroot/HiAPI-docsite/api/Hi.MachiningProcs.MachiningProject.html +++ b/App/wwwroot/HiAPI-docsite/api/Hi.MachiningProcs.MachiningProject.html @@ -2165,7 +2165,7 @@ Since the folder can be moving with the configuration file.

-
public void TrainMillingPara(SampleFlag sampleFlags, bool enableFzOnlyDuringDrilling, double outlierRatio, string dstRelFile, CancellationToken cancellationToken, ICuttingPara paraTemplate = null)
+
public void TrainMillingPara(SampleFlag sampleFlags, bool enableFzOnlyDuringDrilling, double outlierRatio, string dstRelFile, CancellationToken cancellationToken, ICuttingPara paraTemplate)

Parameters

diff --git a/App/wwwroot/HiAPI-docsite/api/Hi.Mapping.StepTimeShotUtil.html b/App/wwwroot/HiAPI-docsite/api/Hi.Mapping.StepTimeShotUtil.html index 8fc5478..16e5898 100644 --- a/App/wwwroot/HiAPI-docsite/api/Hi.Mapping.StepTimeShotUtil.html +++ b/App/wwwroot/HiAPI-docsite/api/Hi.Mapping.StepTimeShotUtil.html @@ -216,7 +216,7 @@ Class StepTimeShotUtil
-
public static List<ITimeShot> GetTimeShotByFile(string file, Action<int> LineReaded, CancellationToken? cancellationToken = null)
+
public static List<ITimeShot> GetTimeShotByFile(string file, Action<int> lineReaded, CancellationToken? cancellationToken = null)

Parameters

@@ -224,7 +224,7 @@ Class StepTimeShotUtil
file string

The file path to read time shots from.

-
LineReaded Action<int>
+
lineReaded Action<int>

Action to call when a line is read, providing progress feedback with the current line number.

cancellationToken CancellationToken?
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 6d2738b..f2056cb 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,19 +87,10 @@

Release Note

-

HiNc Packages Version 3.1.89

+

HiNc Packages Version 3.1.90

-

HiNc Packages Version 3.1.88

- diff --git a/App/wwwroot/HiAPI-docsite/brief/user-guide/zh-Hant/script/NcOptimization/index.html b/App/wwwroot/HiAPI-docsite/brief/user-guide/zh-Hant/script/NcOptimization/index.html index 8e20cb4..60320fa 100644 --- a/App/wwwroot/HiAPI-docsite/brief/user-guide/zh-Hant/script/NcOptimization/index.html +++ b/App/wwwroot/HiAPI-docsite/brief/user-guide/zh-Hant/script/NcOptimization/index.html @@ -242,7 +242,7 @@ N0170 X-4.125 Y45.875

優化日誌

優化過程提供兩種日誌功能,方便分析與除錯。

優化過程日誌檔

-

<xref:Hi.MachiningProcs.RuntimeApi.OptEnableSituStepAdjustmentLog*>(API):啟用優化過程日誌檔輸出。預設為真。

+

EnableIndividualStepAdjustmentLog(API):啟用優化過程日誌檔輸出。預設為真。

啟用後,優化過程會為每個NC檔輸出一個 .flatproc.log 檔案,記錄各步階的優化條件經OptExtendedPreDistance_mm(API)OptExtendedPostDistance_mm(API)展開後獨立優化計算的資訊(不包含步階間的交互關係,如加減速)。

日誌檔案內容依步階順序輸出(即使平行計算時也會保持順序),每行包含: