diff --git a/App/Hi.Wpf.dll b/App/Hi.Wpf.dll index e8a4399..d614536 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 46e41fd..4cfa619 100644 Binary files a/App/HiCbtr.dll and b/App/HiCbtr.dll differ diff --git a/App/HiDisp.dll b/App/HiDisp.dll index 695588b..91ed0d1 100644 Binary files a/App/HiDisp.dll and b/App/HiDisp.dll differ diff --git a/App/HiGeom.dll b/App/HiGeom.dll index 418a503..0ab978b 100644 Binary files a/App/HiGeom.dll and b/App/HiGeom.dll differ diff --git a/App/HiLicense.dll b/App/HiLicense.dll index bf0af6a..2a7198c 100644 Binary files a/App/HiLicense.dll and b/App/HiLicense.dll differ diff --git a/App/HiMech.dll b/App/HiMech.dll index 09c1e74..09ac33a 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 e25c61f..3d86511 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.45", - "HiNc": "3.1.64", + "Hi.Wpf": "3.1.46", + "HiNc": "3.1.65", "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.45": { + "Hi.Wpf/3.1.46": { "dependencies": { - "HiDisp": "3.1.50" + "HiDisp": "3.1.51" }, "runtime": { "lib/net9.0-windows7.0/Hi.Wpf.dll": { - "assemblyVersion": "3.1.45.0", - "fileVersion": "3.1.45.0" + "assemblyVersion": "3.1.46.0", + "fileVersion": "3.1.46.0" } } }, - "HiCbtr/3.1.50": { + "HiCbtr/3.1.51": { "dependencies": { - "HiDisp": "3.1.50" + "HiDisp": "3.1.51" }, "runtime": { "lib/net9.0/HiCbtr.dll": { - "assemblyVersion": "3.1.50.0", - "fileVersion": "3.1.50.0" + "assemblyVersion": "3.1.51.0", + "fileVersion": "3.1.51.0" } } }, - "HiDisp/3.1.50": { + "HiDisp/3.1.51": { "dependencies": { - "HiGeom": "3.1.45", + "HiGeom": "3.1.46", "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.50.0", - "fileVersion": "3.1.50.0" + "assemblyVersion": "3.1.51.0", + "fileVersion": "3.1.51.0" } }, "native": { @@ -1706,7 +1706,7 @@ } } }, - "HiGeom/3.1.45": { + "HiGeom/3.1.46": { "dependencies": { "Google.Protobuf": "3.28.3", "Grpc.AspNetCore": "2.66.0", @@ -1717,8 +1717,8 @@ }, "runtime": { "lib/net9.0/HiGeom.dll": { - "assemblyVersion": "3.1.45.0", - "fileVersion": "3.1.45.0" + "assemblyVersion": "3.1.46.0", + "fileVersion": "3.1.46.0" } }, "resources": { @@ -1730,27 +1730,27 @@ } } }, - "HiLicense/3.1.45": { + "HiLicense/3.1.46": { "dependencies": { - "HiGeom": "3.1.45" + "HiGeom": "3.1.46" }, "runtime": { "lib/net9.0/HiLicense.dll": { - "assemblyVersion": "3.1.45.0", - "fileVersion": "3.1.45.0" + "assemblyVersion": "3.1.46.0", + "fileVersion": "3.1.46.0" } } }, - "HiMech/3.1.54": { + "HiMech/3.1.55": { "dependencies": { "CommandLineParser": "2.9.1", - "HiCbtr": "3.1.50", + "HiCbtr": "3.1.51", "Microsoft.CodeAnalysis.CSharp.Scripting": "4.14.0" }, "runtime": { "lib/net9.0/HiMech.dll": { - "assemblyVersion": "3.1.54.0", - "fileVersion": "3.1.54.0" + "assemblyVersion": "3.1.55.0", + "fileVersion": "3.1.55.0" } }, "resources": { @@ -1765,20 +1765,20 @@ } } }, - "HiNc/3.1.64": { + "HiNc/3.1.65": { "dependencies": { "Google.Protobuf": "3.28.3", "Grpc.AspNetCore": "2.66.0", "Grpc.Net.Client": "2.66.0", - "HiLicense": "3.1.45", - "HiMech": "3.1.54", - "HiUniNc": "3.1.51", + "HiLicense": "3.1.46", + "HiMech": "3.1.55", + "HiUniNc": "3.1.52", "System.IO.Pipelines": "9.0.9" }, "runtime": { "lib/net9.0/HiNc.dll": { - "assemblyVersion": "3.1.64.0", - "fileVersion": "3.1.64.0" + "assemblyVersion": "3.1.65.0", + "fileVersion": "3.1.65.0" } }, "resources": { @@ -1790,14 +1790,14 @@ } } }, - "HiUniNc/3.1.51": { + "HiUniNc/3.1.52": { "dependencies": { - "HiMech": "3.1.54" + "HiMech": "3.1.55" }, "runtime": { "lib/net9.0/HiUniNc.dll": { - "assemblyVersion": "3.1.51.0", - "fileVersion": "3.1.51.0" + "assemblyVersion": "3.1.52.0", + "fileVersion": "3.1.52.0" } } }, @@ -2442,61 +2442,61 @@ "path": "grpc.tools/2.66.0", "hashPath": "grpc.tools.2.66.0.nupkg.sha512" }, - "Hi.Wpf/3.1.45": { + "Hi.Wpf/3.1.46": { "type": "package", "serviceable": true, - "sha512": "sha512-sYt/QomQRYRU53omKomaWyWCpp8km2bP7hY/oeuGlI6mmpWtSXMcfq4Huk0vyPP8ZCkgdQMy0pcSTz1dk5a3pQ==", - "path": "hi.wpf/3.1.45", - "hashPath": "hi.wpf.3.1.45.nupkg.sha512" + "sha512": "sha512-c+9wQlZBe+rSby7+UszWebrnSAmSL/C1mmcf7RUtqwdvk5xAir1yvnX2GBWteEiiaPxKwTizRPpF7b8xmR9Y/g==", + "path": "hi.wpf/3.1.46", + "hashPath": "hi.wpf.3.1.46.nupkg.sha512" }, - "HiCbtr/3.1.50": { + "HiCbtr/3.1.51": { "type": "package", "serviceable": true, - "sha512": "sha512-FUijuRvZ4jAFy07RgNZoeHI/3Vg9n4aPD/i9Qdfc9AyM+3rdB3zBgGhrFf8Qb/MkxP+AtzmGtJGsfrOe/e9wbA==", - "path": "hicbtr/3.1.50", - "hashPath": "hicbtr.3.1.50.nupkg.sha512" + "sha512": "sha512-u0qzT9f1Er3618W3B50EgmR4zwLeXqUpCImFO1l2SzpxFpLt0y7PUv49KB9QmZKZ+OPrTk1a4A8MdQQZbAkeog==", + "path": "hicbtr/3.1.51", + "hashPath": "hicbtr.3.1.51.nupkg.sha512" }, - "HiDisp/3.1.50": { + "HiDisp/3.1.51": { "type": "package", "serviceable": true, - "sha512": "sha512-N7idrFlqP0tzkUVFbc1Iv98lPm6SnuV2e1Urav6XUCnFArLHRgSBNG1Szt+elv3UQiycbolZnthi7dN6C4Zz+A==", - "path": "hidisp/3.1.50", - "hashPath": "hidisp.3.1.50.nupkg.sha512" + "sha512": "sha512-Ja9+HMYQUtF7/9P2K3XPvtBYRDAKwkTqzohbIDpNzr5Wt2UgUe2jg9WrBeM2LPqKtpfDpBprNHZkLik0Cl24tA==", + "path": "hidisp/3.1.51", + "hashPath": "hidisp.3.1.51.nupkg.sha512" }, - "HiGeom/3.1.45": { + "HiGeom/3.1.46": { "type": "package", "serviceable": true, - "sha512": "sha512-YvEXGrh9jVrDIDrCSFcZKcUPduUv7WisPgsD/s5JHJb8Zq7MXv1RXB+DExheSIa+niugDTsDFGpOfK9c3Ss+HA==", - "path": "higeom/3.1.45", - "hashPath": "higeom.3.1.45.nupkg.sha512" + "sha512": "sha512-5kDlXyYQVgCcYIultEP29kN+EUm9j8Cc9VX4h6XY+eGBz4nZC0iJvuzHLU24YGCOxE+peNf1JMY+f+r9tdlp7Q==", + "path": "higeom/3.1.46", + "hashPath": "higeom.3.1.46.nupkg.sha512" }, - "HiLicense/3.1.45": { + "HiLicense/3.1.46": { "type": "package", "serviceable": true, - "sha512": "sha512-OKeUP4ct4Z8tQ+CJJEK4347NVItDxEYMOouuZlR1OYr5mf67SlwPmiGIeJcnyF7Shvj/1RsydEVKXOI9VVY7/A==", - "path": "hilicense/3.1.45", - "hashPath": "hilicense.3.1.45.nupkg.sha512" + "sha512": "sha512-mEFeiG2VKqXbjPI2wiPR+i05TYA7L2IlcXIrSA5myC0FDOYLaVlzaeKv7y9KBtdXXx6Tt4RiUWvOMprs9T/4CA==", + "path": "hilicense/3.1.46", + "hashPath": "hilicense.3.1.46.nupkg.sha512" }, - "HiMech/3.1.54": { + "HiMech/3.1.55": { "type": "package", "serviceable": true, - "sha512": "sha512-9EOBjoJiYaofex/UnuU8J4z1BBNTQ7fc0UuVfRcFubvEQxmynKGI084YRScJ4FZvtcatRRnad76y65yaM+hgoA==", - "path": "himech/3.1.54", - "hashPath": "himech.3.1.54.nupkg.sha512" + "sha512": "sha512-3RWyRheFvjj6qMBrUbtTtRAeMlO0iJu1pL2bgv7FBLL/TQx0xdrTTh5IEgrrQ+odwZDveu1jzxSmuzTJ4vtjuA==", + "path": "himech/3.1.55", + "hashPath": "himech.3.1.55.nupkg.sha512" }, - "HiNc/3.1.64": { + "HiNc/3.1.65": { "type": "package", "serviceable": true, - "sha512": "sha512-fbf3ajBC68wa5DY2rE5PK/qVL48IpZIU/afsR3Ce9Dm8KUvxAvxSgX8v9ZCAsoKWxpDiMW4mCLFmIVE7HPX20g==", - "path": "hinc/3.1.64", - "hashPath": "hinc.3.1.64.nupkg.sha512" + "sha512": "sha512-M+LuJTCO2H/npfOfKo9XE8l6kIjIbwvfa8+OY6YXHRJpXs+PE3hm2MajJXlr+/k4yPYirl8Zg087cwdqDgy6Lw==", + "path": "hinc/3.1.65", + "hashPath": "hinc.3.1.65.nupkg.sha512" }, - "HiUniNc/3.1.51": { + "HiUniNc/3.1.52": { "type": "package", "serviceable": true, - "sha512": "sha512-BCoTqMA/Wf86nEojrRYZ/KaIx28buF1RnLHhBh6DsDgl+rBIixXuWGi93e5JORyetr63zsRNzAEw4Nbn123sEg==", - "path": "hiuninc/3.1.51", - "hashPath": "hiuninc.3.1.51.nupkg.sha512" + "sha512": "sha512-/VYrtd3LOXEiOsMT5NteoMGSDCSXeYswuZ3uxjN5c9KO+tSlJdpGKihli5V5sc2S0TRRlX6zQbXGVlPDT5FVzw==", + "path": "hiuninc/3.1.52", + "hashPath": "hiuninc.3.1.52.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 b6b767f..76decf5 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 4f9be93..d2b96bc 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 1629329..ca64e79 100644 Binary files a/App/HiNc.dll and b/App/HiNc.dll differ diff --git a/App/HiUniNc.dll b/App/HiUniNc.dll index 7c67070..4636408 100644 Binary files a/App/HiUniNc.dll and b/App/HiUniNc.dll differ diff --git a/App/Resource/WorkpieceMaterial/SUS316.WorkpieceMaterial b/App/Resource/WorkpieceMaterial/SUS316.WorkpieceMaterial new file mode 100644 index 0000000..04542ce --- /dev/null +++ b/App/Resource/WorkpieceMaterial/SUS316.WorkpieceMaterial @@ -0,0 +1,14 @@ + + SUS316 + EN-X5CrNiMo17-12-2; AISI-316; UNS-S31600; JIS-SUS316; DIN-1.4401; GB-022Cr17Ni12Mo2; BS-316S31; AFNOR-Z6CND17-11-02 + 193 + 290 + 290 + 0.45 + 0.50 + 16 + 8.0 + 0.30 + 260 + 1400 + \ No newline at end of file diff --git a/App/en/HiGeom.resources.dll b/App/en/HiGeom.resources.dll index 2ec9e91..838f3aa 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 8c31390..839bb15 100644 Binary files a/App/en/HiMech.resources.dll and b/App/en/HiMech.resources.dll differ diff --git a/App/zh-Hans/HiMech.resources.dll b/App/zh-Hans/HiMech.resources.dll index 37142e1..5029ebc 100644 Binary files a/App/zh-Hans/HiMech.resources.dll and b/App/zh-Hans/HiMech.resources.dll differ diff --git a/App/zh-Hans/HiNc.resources.dll b/App/zh-Hans/HiNc.resources.dll index daf5b4c..24ef1f8 100644 Binary files a/App/zh-Hans/HiNc.resources.dll and b/App/zh-Hans/HiNc.resources.dll differ diff --git a/App/zh-Hant/HiGeom.resources.dll b/App/zh-Hant/HiGeom.resources.dll index 2d5b737..85b72c9 100644 Binary files a/App/zh-Hant/HiGeom.resources.dll and b/App/zh-Hant/HiGeom.resources.dll differ diff --git a/App/zh-Hant/HiMech.resources.dll b/App/zh-Hant/HiMech.resources.dll index 129c6fa..9ae9c05 100644 Binary files a/App/zh-Hant/HiMech.resources.dll and b/App/zh-Hant/HiMech.resources.dll differ diff --git a/App/zh-Hant/HiNc.resources.dll b/App/zh-Hant/HiNc.resources.dll index 85822e4..59c43aa 100644 Binary files a/App/zh-Hant/HiNc.resources.dll and b/App/zh-Hant/HiNc.resources.dll differ