diff --git a/App/Hi.Wpf.dll b/App/Hi.Wpf.dll index a685790..2a24d93 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 e5a4704..67105ec 100644 Binary files a/App/HiCbtr.dll and b/App/HiCbtr.dll differ diff --git a/App/HiDisp.dll b/App/HiDisp.dll index e580f04..df4458f 100644 Binary files a/App/HiDisp.dll and b/App/HiDisp.dll differ diff --git a/App/HiGeom.dll b/App/HiGeom.dll index 803bf3c..f9173ab 100644 Binary files a/App/HiGeom.dll and b/App/HiGeom.dll differ diff --git a/App/HiLicense.dll b/App/HiLicense.dll index 3e76199..9762505 100644 Binary files a/App/HiLicense.dll and b/App/HiLicense.dll differ diff --git a/App/HiMech.dll b/App/HiMech.dll index 59b84f1..06e939e 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 ff03639..145e4e4 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.54", - "HiNc": "3.1.75", + "Hi.Wpf": "3.1.55", + "HiNc": "3.1.76", "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.54": { + "Hi.Wpf/3.1.55": { "dependencies": { - "HiDisp": "3.1.59" + "HiDisp": "3.1.60" }, "runtime": { "lib/net9.0-windows7.0/Hi.Wpf.dll": { - "assemblyVersion": "3.1.54.0", - "fileVersion": "3.1.54.0" + "assemblyVersion": "3.1.55.0", + "fileVersion": "3.1.55.0" } } }, - "HiCbtr/3.1.59": { + "HiCbtr/3.1.60": { "dependencies": { - "HiDisp": "3.1.59" + "HiDisp": "3.1.60" }, "runtime": { "lib/net9.0/HiCbtr.dll": { - "assemblyVersion": "3.1.59.0", - "fileVersion": "3.1.59.0" + "assemblyVersion": "3.1.60.0", + "fileVersion": "3.1.60.0" } } }, - "HiDisp/3.1.59": { + "HiDisp/3.1.60": { "dependencies": { - "HiGeom": "3.1.54", + "HiGeom": "3.1.55", "System.Configuration.ConfigurationManager": "9.0.10", "System.Drawing.Common": "9.0.10", "System.Resources.Extensions": "9.0.10" }, "runtime": { "lib/net9.0/HiDisp.dll": { - "assemblyVersion": "3.1.59.0", - "fileVersion": "3.1.59.0" + "assemblyVersion": "3.1.60.0", + "fileVersion": "3.1.60.0" } }, "native": { @@ -1706,7 +1706,7 @@ } } }, - "HiGeom/3.1.54": { + "HiGeom/3.1.55": { "dependencies": { "Google.Protobuf": "3.28.3", "Grpc.AspNetCore": "2.66.0", @@ -1717,8 +1717,8 @@ }, "runtime": { "lib/net9.0/HiGeom.dll": { - "assemblyVersion": "3.1.54.0", - "fileVersion": "3.1.54.0" + "assemblyVersion": "3.1.55.0", + "fileVersion": "3.1.55.0" } }, "resources": { @@ -1730,27 +1730,27 @@ } } }, - "HiLicense/3.1.54": { + "HiLicense/3.1.55": { "dependencies": { - "HiGeom": "3.1.54" + "HiGeom": "3.1.55" }, "runtime": { "lib/net9.0/HiLicense.dll": { - "assemblyVersion": "3.1.54.0", - "fileVersion": "3.1.54.0" + "assemblyVersion": "3.1.55.0", + "fileVersion": "3.1.55.0" } } }, - "HiMech/3.1.66": { + "HiMech/3.1.67": { "dependencies": { "CommandLineParser": "2.9.1", - "HiCbtr": "3.1.59", + "HiCbtr": "3.1.60", "Microsoft.CodeAnalysis.CSharp.Scripting": "4.14.0" }, "runtime": { "lib/net9.0/HiMech.dll": { - "assemblyVersion": "3.1.66.0", - "fileVersion": "3.1.66.0" + "assemblyVersion": "3.1.67.0", + "fileVersion": "3.1.67.0" } }, "resources": { @@ -1765,20 +1765,20 @@ } } }, - "HiNc/3.1.75": { + "HiNc/3.1.76": { "dependencies": { "Google.Protobuf": "3.28.3", "Grpc.AspNetCore": "2.66.0", "Grpc.Net.Client": "2.66.0", - "HiLicense": "3.1.54", - "HiMech": "3.1.66", - "HiUniNc": "3.1.63", + "HiLicense": "3.1.55", + "HiMech": "3.1.67", + "HiUniNc": "3.1.64", "System.IO.Pipelines": "9.0.10" }, "runtime": { "lib/net9.0/HiNc.dll": { - "assemblyVersion": "3.1.75.0", - "fileVersion": "3.1.75.0" + "assemblyVersion": "3.1.76.0", + "fileVersion": "3.1.76.0" } }, "resources": { @@ -1790,14 +1790,14 @@ } } }, - "HiUniNc/3.1.63": { + "HiUniNc/3.1.64": { "dependencies": { - "HiMech": "3.1.66" + "HiMech": "3.1.67" }, "runtime": { "lib/net9.0/HiUniNc.dll": { - "assemblyVersion": "3.1.63.0", - "fileVersion": "3.1.63.0" + "assemblyVersion": "3.1.64.0", + "fileVersion": "3.1.64.0" } } }, @@ -2442,61 +2442,61 @@ "path": "grpc.tools/2.66.0", "hashPath": "grpc.tools.2.66.0.nupkg.sha512" }, - "Hi.Wpf/3.1.54": { + "Hi.Wpf/3.1.55": { "type": "package", "serviceable": true, - "sha512": "sha512-cYCjlGhyL1bpRDuD1uIKV96P8AaebRz850zn75kT6inM/RhAD9RgD5ANUnJpFMc7ZP8T6pJvsI9mfTUdjHy5Fw==", - "path": "hi.wpf/3.1.54", - "hashPath": "hi.wpf.3.1.54.nupkg.sha512" + "sha512": "sha512-aif4JEWfhih3uleCJceBLtHYZ3nsmAKdc/sSut4KpVsQpEJDlAb8GyCBcn+ZWVwh7gJGe2GmsBuu81KI//Ochg==", + "path": "hi.wpf/3.1.55", + "hashPath": "hi.wpf.3.1.55.nupkg.sha512" }, - "HiCbtr/3.1.59": { + "HiCbtr/3.1.60": { "type": "package", "serviceable": true, - "sha512": "sha512-mbcoIwhznaUo3wYl7JGPqXmA6jDhbz3vm+sJHodQHlEngk4Gn4DdsJrwCtjAdqcYtAq0nLKAs7NmzBSM42jC5Q==", - "path": "hicbtr/3.1.59", - "hashPath": "hicbtr.3.1.59.nupkg.sha512" + "sha512": "sha512-3adQkSPUz32Bdp4ZCfS86zBTfoBFpBt6tqfJZ/jKxbJxasxmzX3iOAhoDNaOH7Ou/h074CSiYCESMwf83Cloxw==", + "path": "hicbtr/3.1.60", + "hashPath": "hicbtr.3.1.60.nupkg.sha512" }, - "HiDisp/3.1.59": { + "HiDisp/3.1.60": { "type": "package", "serviceable": true, - "sha512": "sha512-zX+EQCx7it8cWAKZNNSCEVV65UxSvDks/nb85hJGZhq2bjNp4upth+daj19yVJFiB7J+8tGiovLZqfeRl6vurA==", - "path": "hidisp/3.1.59", - "hashPath": "hidisp.3.1.59.nupkg.sha512" + "sha512": "sha512-c5W29uGAUZz+Pb4Z71VBM40jE9ddvAPUDLdPB48QjH+H6UeS9RcXxLVRaxjUEDe94FDBq/dmh9WW8GwvI/DsGA==", + "path": "hidisp/3.1.60", + "hashPath": "hidisp.3.1.60.nupkg.sha512" }, - "HiGeom/3.1.54": { + "HiGeom/3.1.55": { "type": "package", "serviceable": true, - "sha512": "sha512-BA9OLhuJEA27V93jeRfc67XCV/hzR2YCce1eSEk/1O7P3HINXm47WM0Aa9BHptMnDfr/DDsSdWqc7o/NUTcF2g==", - "path": "higeom/3.1.54", - "hashPath": "higeom.3.1.54.nupkg.sha512" + "sha512": "sha512-SzNJnS3bYqwsY+v6GHoA1EhdAII0uX2FLDYKDR4fvRzAI3L4yVHvy9n/N95qXAW7V+pDEpyA/2fqYxK3oYJOIw==", + "path": "higeom/3.1.55", + "hashPath": "higeom.3.1.55.nupkg.sha512" }, - "HiLicense/3.1.54": { + "HiLicense/3.1.55": { "type": "package", "serviceable": true, - "sha512": "sha512-aMiceiCj3gPR1gAdHOPWsgUB5innBnzFCUktG2T4swyU3SFQFKeI92n4bRCed20UZX4qpr/GvgGPjEHbGIPSqQ==", - "path": "hilicense/3.1.54", - "hashPath": "hilicense.3.1.54.nupkg.sha512" + "sha512": "sha512-bIYFdnoTRNvYmBfGrFgdj4cDuZXUh81/3h+ZEqaoqsXKMh5q2B5Wm3qJYAWvcY1beSpFbfwwDTJj4Hu5zZIGcA==", + "path": "hilicense/3.1.55", + "hashPath": "hilicense.3.1.55.nupkg.sha512" }, - "HiMech/3.1.66": { + "HiMech/3.1.67": { "type": "package", "serviceable": true, - "sha512": "sha512-VwXs/8kKDaZ8Xu+kyRX9Cex6/PlJ4HMKDkOjuCR6oHc5LtaYpvkODF171ViZxvQah0kiLHPc3DOTvK1SDn1JxA==", - "path": "himech/3.1.66", - "hashPath": "himech.3.1.66.nupkg.sha512" + "sha512": "sha512-yKZ3jK4hcuwPJjj6ZB3zphkil2TM6mh9zsAkkaNuHegznuriQs7ZV73023Xy2/K2ka421TakPQLXF+dNMkwD0A==", + "path": "himech/3.1.67", + "hashPath": "himech.3.1.67.nupkg.sha512" }, - "HiNc/3.1.75": { + "HiNc/3.1.76": { "type": "package", "serviceable": true, - "sha512": "sha512-DPf6zShveGTsWgDPYZFoG+Ka5G7IYRGxhPOaaRXhYbMcYbjNDaoAG8plOgJq2LHB72jqFp+gkO19lYiKWkgzFQ==", - "path": "hinc/3.1.75", - "hashPath": "hinc.3.1.75.nupkg.sha512" + "sha512": "sha512-S5EuUxJIogijvVJNuHnlmV3RoF8PT0kw7eOsiS0b/YrDN6TGWFe3MXOghsQmMseyIzIoVfAMuVd2LJpFBkpTMA==", + "path": "hinc/3.1.76", + "hashPath": "hinc.3.1.76.nupkg.sha512" }, - "HiUniNc/3.1.63": { + "HiUniNc/3.1.64": { "type": "package", "serviceable": true, - "sha512": "sha512-U887ylisdzWmT3s6dSOsOLQ2HAbcRJNaExWlqfd1Q81xpIoKPGJAK71OsgzdJ14IQB0NXkStHIY61q7NHDdEBA==", - "path": "hiuninc/3.1.63", - "hashPath": "hiuninc.3.1.63.nupkg.sha512" + "sha512": "sha512-yywDzJozfVJQyZcwkRusvfZnP+WkSMZoSjxwT7bsR4kf7HhmAu4Ko4qM7HRB5qp5Cz7GRnUdhQU0RK96juhxHw==", + "path": "hiuninc/3.1.64", + "hashPath": "hiuninc.3.1.64.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 d2dadf3..4c2209e 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 4c6d9b8..f69efef 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 da60fe8..fabe782 100644 Binary files a/App/HiNc.dll and b/App/HiNc.dll differ diff --git a/App/HiUniNc.dll b/App/HiUniNc.dll index b0478e9..2a35ec6 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 61ea80e..6ffa78d 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 1d591ca..462dee4 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 6a8b5be..fb63688 100644 --- a/App/wwwroot/HiAPI-docsite/api/Hi.MachiningProcs.RuntimeApi.html +++ b/App/wwwroot/HiAPI-docsite/api/Hi.MachiningProcs.RuntimeApi.html @@ -2547,6 +2547,40 @@ public double GetUniformContourTrayShiftAngle_deg(int toolId) + + +

+ MapByActualTime(string, CycleSamplingMode) + +

+ +
+
+ +
+
[JsAce("MapByActualTime($1timeShotRelFile)")]
+public void MapByActualTime(string timeShotRelFile, StepTimeShotUtil.CycleSamplingMode cycleSamplingMode = CycleSamplingMode.SpindleCycle)
+
+ +

Parameters

+
+
timeShotRelFile string
+
+
cycleSamplingMode StepTimeShotUtil.CycleSamplingMode
+
+
+ + + + + + + + + + + +

diff --git a/App/wwwroot/HiAPI-docsite/api/Hi.Mapping.StepTimeShotUtil.html b/App/wwwroot/HiAPI-docsite/api/Hi.Mapping.StepTimeShotUtil.html index 1628fbb..2b24224 100644 --- a/App/wwwroot/HiAPI-docsite/api/Hi.Mapping.StepTimeShotUtil.html +++ b/App/wwwroot/HiAPI-docsite/api/Hi.Mapping.StepTimeShotUtil.html @@ -155,8 +155,8 @@ Class StepTimeShotUtil -

- GetStepToShotsDictionaryByActualTime(ClStrip, Range<int>, CycleSamplingMode, string, GetTimeShotByFileDelegate) +

+ GetStepToShotsDictionaryByActualTime(ClStrip, CycleSamplingMode, string, GetTimeShotByFileDelegate, IDictionary<int, List<ITimeShot>>, SessionMessageHost, CancellationToken?)

@@ -164,26 +164,24 @@ Class StepTimeShotUtil
-
public static Dictionary<int, List<ITimeShot>> GetStepToShotsDictionaryByActualTime(ClStrip clStrip, Range<int> stepSection, StepTimeShotUtil.CycleSamplingMode cycleSamplingMode, string timeShotRelFile, StepTimeShotUtil.GetTimeShotByFileDelegate getTimeShotByRelFileFunc)
+
public static void GetStepToShotsDictionaryByActualTime(ClStrip clStrip, StepTimeShotUtil.CycleSamplingMode cycleSamplingMode, string timeShotRelFile, StepTimeShotUtil.GetTimeShotByFileDelegate getTimeShotByRelFileFunc, IDictionary<int, List<ITimeShot>> dstStepToShotsDictionary, SessionMessageHost sessionMessageHost, CancellationToken? cancellationToken)

Parameters

clStrip ClStrip
-
stepSection Range<int>
-
cycleSamplingMode StepTimeShotUtil.CycleSamplingMode
timeShotRelFile string
getTimeShotByRelFileFunc StepTimeShotUtil.GetTimeShotByFileDelegate
-
- -

Returns

-
-
Dictionary<int, List<ITimeShot>>
+
dstStepToShotsDictionary IDictionary<int, List<ITimeShot>>
+
+
sessionMessageHost SessionMessageHost
+
+
cancellationToken CancellationToken?
@@ -197,6 +195,7 @@ Class StepTimeShotUtil +

diff --git a/App/wwwroot/HiAPI-docsite/api/Hi.Mapping.TimeMapping.html b/App/wwwroot/HiAPI-docsite/api/Hi.Mapping.TimeMapping.html index eb72a31..8919e69 100644 --- a/App/wwwroot/HiAPI-docsite/api/Hi.Mapping.TimeMapping.html +++ b/App/wwwroot/HiAPI-docsite/api/Hi.Mapping.TimeMapping.html @@ -907,8 +907,8 @@ This method is thread-safe and can be called concurrently.

-

- MapByActualTime(Range<int>, string, CycleSamplingMode, CancellationToken?) +

+ MapByActualTime(string, CycleSamplingMode, SessionMessageHost, CancellationToken?)

@@ -916,17 +916,17 @@ This method is thread-safe and can be called concurrently.

-
public void MapByActualTime(Range<int> stepSection, string timeShotRelFile, StepTimeShotUtil.CycleSamplingMode cycleSamplingMode, CancellationToken? cancellationToken = null)
+
public void MapByActualTime(string timeShotRelFile, StepTimeShotUtil.CycleSamplingMode cycleSamplingMode, SessionMessageHost sessionMessageHost, CancellationToken? cancellationToken = null)

Parameters

-
stepSection Range<int>
-
timeShotRelFile string
cycleSamplingMode StepTimeShotUtil.CycleSamplingMode
+
sessionMessageHost SessionMessageHost
+
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 cd8cb6e..eaddb01 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,6 +87,11 @@

Release Note

+

HiNc Packages Version 3.1.75

+

HiNc Packages Version 3.1.74