diff --git a/App/Hi.Wpf.dll b/App/Hi.Wpf.dll index 2cde1cdd..6cf6e6e0 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 264c3d6f..879c22a5 100644 Binary files a/App/HiCbtr.dll and b/App/HiCbtr.dll differ diff --git a/App/HiDisp.dll b/App/HiDisp.dll index 196cfa5c..f1bb42d3 100644 Binary files a/App/HiDisp.dll and b/App/HiDisp.dll differ diff --git a/App/HiGeom.dll b/App/HiGeom.dll index 252d3897..e9ed022a 100644 Binary files a/App/HiGeom.dll and b/App/HiGeom.dll differ diff --git a/App/HiLicense.dll b/App/HiLicense.dll index 743e72ca..59b5cbc7 100644 Binary files a/App/HiLicense.dll and b/App/HiLicense.dll differ diff --git a/App/HiMech.dll b/App/HiMech.dll index 43e8daa7..afe9ae2d 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 364d01e7..31f7d787 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.65", - "HiNc": "3.1.86", + "Hi.Wpf": "3.1.66", + "HiNc": "3.1.87", "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.65": { + "Hi.Wpf/3.1.66": { "dependencies": { - "HiDisp": "3.1.70" + "HiDisp": "3.1.71" }, "runtime": { "lib/net9.0-windows7.0/Hi.Wpf.dll": { - "assemblyVersion": "3.1.65.0", - "fileVersion": "3.1.65.0" + "assemblyVersion": "3.1.66.0", + "fileVersion": "3.1.66.0" } } }, - "HiCbtr/3.1.70": { + "HiCbtr/3.1.71": { "dependencies": { - "HiDisp": "3.1.70" + "HiDisp": "3.1.71" }, "runtime": { "lib/net9.0/HiCbtr.dll": { - "assemblyVersion": "3.1.70.0", - "fileVersion": "3.1.70.0" + "assemblyVersion": "3.1.71.0", + "fileVersion": "3.1.71.0" } } }, - "HiDisp/3.1.70": { + "HiDisp/3.1.71": { "dependencies": { - "HiGeom": "3.1.65", + "HiGeom": "3.1.66", "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.70.0", - "fileVersion": "3.1.70.0" + "assemblyVersion": "3.1.71.0", + "fileVersion": "3.1.71.0" } }, "native": { @@ -1647,7 +1647,7 @@ } } }, - "HiGeom/3.1.65": { + "HiGeom/3.1.66": { "dependencies": { "Google.Protobuf": "3.28.3", "Grpc.AspNetCore": "2.66.0", @@ -1658,8 +1658,8 @@ }, "runtime": { "lib/net9.0/HiGeom.dll": { - "assemblyVersion": "3.1.65.0", - "fileVersion": "3.1.65.0" + "assemblyVersion": "3.1.66.0", + "fileVersion": "3.1.66.0" } }, "resources": { @@ -1671,27 +1671,27 @@ } } }, - "HiLicense/3.1.65": { + "HiLicense/3.1.66": { "dependencies": { - "HiGeom": "3.1.65" + "HiGeom": "3.1.66" }, "runtime": { "lib/net9.0/HiLicense.dll": { - "assemblyVersion": "3.1.65.0", - "fileVersion": "3.1.65.0" + "assemblyVersion": "3.1.66.0", + "fileVersion": "3.1.66.0" } } }, - "HiMech/3.1.77": { + "HiMech/3.1.78": { "dependencies": { "CommandLineParser": "2.9.1", - "HiCbtr": "3.1.70", + "HiCbtr": "3.1.71", "Microsoft.CodeAnalysis.CSharp.Scripting": "5.0.0" }, "runtime": { "lib/net9.0/HiMech.dll": { - "assemblyVersion": "3.1.77.0", - "fileVersion": "3.1.77.0" + "assemblyVersion": "3.1.78.0", + "fileVersion": "3.1.78.0" } }, "resources": { @@ -1706,20 +1706,20 @@ } } }, - "HiNc/3.1.86": { + "HiNc/3.1.87": { "dependencies": { "Google.Protobuf": "3.28.3", "Grpc.AspNetCore": "2.66.0", "Grpc.Net.Client": "2.66.0", - "HiLicense": "3.1.65", - "HiMech": "3.1.77", - "HiUniNc": "3.1.74", + "HiLicense": "3.1.66", + "HiMech": "3.1.78", + "HiUniNc": "3.1.75", "System.IO.Pipelines": "10.0.0" }, "runtime": { "lib/net9.0/HiNc.dll": { - "assemblyVersion": "3.1.86.0", - "fileVersion": "3.1.86.0" + "assemblyVersion": "3.1.87.0", + "fileVersion": "3.1.87.0" } }, "resources": { @@ -1731,14 +1731,14 @@ } } }, - "HiUniNc/3.1.74": { + "HiUniNc/3.1.75": { "dependencies": { - "HiMech": "3.1.77" + "HiMech": "3.1.78" }, "runtime": { "lib/net9.0/HiUniNc.dll": { - "assemblyVersion": "3.1.74.0", - "fileVersion": "3.1.74.0" + "assemblyVersion": "3.1.75.0", + "fileVersion": "3.1.75.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.65": { + "Hi.Wpf/3.1.66": { "type": "package", "serviceable": true, - "sha512": "sha512-8SIDG+mpmKmt9d+F6+X12IgFM+7ZSojkh0ji/n2fgKKERHNc4/miIKEYdJ/SirYFHV+aMhmssrlYdmS/DCBNww==", - "path": "hi.wpf/3.1.65", - "hashPath": "hi.wpf.3.1.65.nupkg.sha512" + "sha512": "sha512-g94DIO6rCAobe7D9AtauX1cQxMIoYIOGvHuPcWSbj5hXFsBBdpxO9r0ghPJlp6GPiX7Twks8zf5KneAsOM0JeQ==", + "path": "hi.wpf/3.1.66", + "hashPath": "hi.wpf.3.1.66.nupkg.sha512" }, - "HiCbtr/3.1.70": { + "HiCbtr/3.1.71": { "type": "package", "serviceable": true, - "sha512": "sha512-xiZ7lk/UQVJIMzbwJsZOY6px/zZN9XbnJmNdgzcJFo4tM0gdPQhCrROTZ6AIbMD4/jgMfTwIWgXOD9s+Gf9ivw==", - "path": "hicbtr/3.1.70", - "hashPath": "hicbtr.3.1.70.nupkg.sha512" + "sha512": "sha512-Mzbc5qqBj1dm7Am2rUhu4kpPv8LstkQPt+zLWDh6xT4caD5OKySwHf8xrCZN2G9wGGadmvGG6UHLdBWHD37ITQ==", + "path": "hicbtr/3.1.71", + "hashPath": "hicbtr.3.1.71.nupkg.sha512" }, - "HiDisp/3.1.70": { + "HiDisp/3.1.71": { "type": "package", "serviceable": true, - "sha512": "sha512-ldquz1EpuiZDMdDM6qNQT2sSk0Og1KoKytZ9CcWyE2GomjuLOFA/HOhxi1Pe8PBHsA2AH3jehbI/G4l5QtujUg==", - "path": "hidisp/3.1.70", - "hashPath": "hidisp.3.1.70.nupkg.sha512" + "sha512": "sha512-ehx1WHGVma9D8xrQwLOTFrCkfOHIE7pYYM4o1E52CFZpA13QRbD7zLLeOh0/1KYruCsVvPlB+RFnGJQulgE2eg==", + "path": "hidisp/3.1.71", + "hashPath": "hidisp.3.1.71.nupkg.sha512" }, - "HiGeom/3.1.65": { + "HiGeom/3.1.66": { "type": "package", "serviceable": true, - "sha512": "sha512-0upPzxgNfvQ1PhLm94pCDJ7/Czr0sWfbijxpbzaKEYXkQWTVsFZY8KGCdC3XpKqypyNgAUl4PfNDHNpsDZ8o7g==", - "path": "higeom/3.1.65", - "hashPath": "higeom.3.1.65.nupkg.sha512" + "sha512": "sha512-zbBqQLEdfGFZcZ3Wem5RHCAiSinTEs57QEUWb2+NhIKVMyA4w/ZE38Xko/+J8x+Zci2MSM5bem8tDDC5J69kzA==", + "path": "higeom/3.1.66", + "hashPath": "higeom.3.1.66.nupkg.sha512" }, - "HiLicense/3.1.65": { + "HiLicense/3.1.66": { "type": "package", "serviceable": true, - "sha512": "sha512-6vEKfxyuN9vPRvWwCSrlh/M5GRUZCK1Azy3qarBRhNDqLLOig0L1/lmZZbaQ9Fh5Vo5AlAjIxfSUYG1NkK7qhA==", - "path": "hilicense/3.1.65", - "hashPath": "hilicense.3.1.65.nupkg.sha512" + "sha512": "sha512-1qy+3IooEg1/w9dW2FkwqS1Pvj4DskJ/Y0/Ofu+tPnvXMu9CTVgHJ7HgaHu9/iAQTPdp7GLWcIh9fqh7BQdBoQ==", + "path": "hilicense/3.1.66", + "hashPath": "hilicense.3.1.66.nupkg.sha512" }, - "HiMech/3.1.77": { + "HiMech/3.1.78": { "type": "package", "serviceable": true, - "sha512": "sha512-Ai5/vrYkN48Wcl2Mqv4amu+ikWd3NgjdtT/P0UbXRNGiJKcRmH81A0yAg3kokfGL3qZhHQCMAOQndc51+Nhc3A==", - "path": "himech/3.1.77", - "hashPath": "himech.3.1.77.nupkg.sha512" + "sha512": "sha512-JvLO9pIxT4s2+GEPiyjlLdYniWsH1b0SIrUqynm8SPs+aiOD9RaAX9K3DQk272uOPRqtQONJqv5IN16PHs3H3w==", + "path": "himech/3.1.78", + "hashPath": "himech.3.1.78.nupkg.sha512" }, - "HiNc/3.1.86": { + "HiNc/3.1.87": { "type": "package", "serviceable": true, - "sha512": "sha512-TN/T2rV9x6jwrKQIhBxUzErMBgKVZlCtD5873MJ+uBZhqUbIGJSCVFjeeEusOqMh+kiy0JSYP4z2iST1bEZkRQ==", - "path": "hinc/3.1.86", - "hashPath": "hinc.3.1.86.nupkg.sha512" + "sha512": "sha512-COTm9wO+3RJJ71b0wHUXbgtlP8eRiB8o213QgCkZSK8r6ztL3wlurZyMIszuryHYhuFcbgl8qSTu8RtHDFUivw==", + "path": "hinc/3.1.87", + "hashPath": "hinc.3.1.87.nupkg.sha512" }, - "HiUniNc/3.1.74": { + "HiUniNc/3.1.75": { "type": "package", "serviceable": true, - "sha512": "sha512-X+ad8OLhfyFIRzPyhuG5KIFSP7ToHDy6pc2VzeLMjroq/EdfD+E5KBb8y7OoPSM+09OaSeS1NWHoeApXY7qbqA==", - "path": "hiuninc/3.1.74", - "hashPath": "hiuninc.3.1.74.nupkg.sha512" + "sha512": "sha512-O4s77AfgydjHN6arQJnY0t2+tByYNO/YiTtOV6idMohfJ4j65+e0w+uMjwTRJBHmDDBuSt0Yqpi052Ou0m4IEA==", + "path": "hiuninc/3.1.75", + "hashPath": "hiuninc.3.1.75.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 eb067e7c..55f6e18d 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 2e125623..6d808d95 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 beac5f09..0e80b4af 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 6d65d483..763b1f91 100644 Binary files a/App/HiNc.dll and b/App/HiNc.dll differ diff --git a/App/HiUniNc.dll b/App/HiUniNc.dll index 5b93cc7b..52a21b70 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 1474eebd..eb01e692 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 f4126560..5d796737 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 50a53605..dd195528 100644 --- a/App/wwwroot/HiAPI-docsite/api/Hi.MachiningProcs.RuntimeApi.html +++ b/App/wwwroot/HiAPI-docsite/api/Hi.MachiningProcs.RuntimeApi.html @@ -975,6 +975,38 @@ public bool OptEnableDepthCompensation { get; set; } + + +

+ OptEnableEmbeddedLog + +

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

Property Value

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

@@ -1008,10 +1040,10 @@ public bool OptEnableFeedrate { get; set; } - + -

- OptEnableFirstSituProcLog +

+ OptEnableFlatProcLog

@@ -1020,7 +1052,7 @@ public bool OptEnableFeedrate { get; set; }
[JsAce]
-public static bool OptEnableFirstSituProcLog { get; set; }
+public static bool OptEnableFlatProcLog { get; set; }
@@ -1106,38 +1138,6 @@ public bool OptEnableInterpolation { get; set; } - - -

- OptEnableNcEmbeddedLog - -

- -
-
- -
-
[JsAce]
-public static bool OptEnableNcEmbeddedLog { 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 cdebc15d..3d33fa3c 100644 --- a/App/wwwroot/HiAPI-docsite/api/Hi.NcOpt.NcOptProc.html +++ b/App/wwwroot/HiAPI-docsite/api/Hi.NcOpt.NcOptProc.html @@ -292,19 +292,19 @@ Class NcOptProc - + -

- EnableFirstSituProcLog +

+ EnableEmbeddedLog

-

Enable create log file for first (independent) situ process.

+

Enable embedded log to optimized NC file.

-
public static bool EnableFirstSituProcLog { get; set; }
+
public static bool EnableEmbeddedLog { get; set; }
@@ -324,19 +324,19 @@ Class NcOptProc - + -

- EnableNcEmbeddedLog +

+ EnableFlatProcLog

-

Enable embedded log to optimized NC file.

+

Enable create log file for first (independent) situ process.

-
public static bool EnableNcEmbeddedLog { get; set; }
+
public static bool EnableFlatProcLog { get; set; }
diff --git a/App/wwwroot/HiAPI-docsite/brief/dev-doc/build-hinc/general-rules.html b/App/wwwroot/HiAPI-docsite/brief/dev-doc/build-hinc/general-rules.html index f441a637..f2dda373 100644 --- a/App/wwwroot/HiAPI-docsite/brief/dev-doc/build-hinc/general-rules.html +++ b/App/wwwroot/HiAPI-docsite/brief/dev-doc/build-hinc/general-rules.html @@ -92,7 +92,7 @@

You MUST read the cited hyperlink before you do the job. ASK if you think the hyperlink is not work.

Handle Message and Exception

-

If message is well-managed, apply <xref:Hi.Common.Messages.MessageKit> to show the message; if the message is Exception, apply ExceptionUtil.ShowException(Exception, object) to show the exception for detail treatment. The messages are shown in Message Section on Main Panel.

+

If message is well-managed, apply MessageHost to show the message; if the message is Exception, apply ExceptionUtil.ShowException(Exception, object) to show the exception for detail treatment. The messages are shown in Message Section on Main Panel.

For examples of message and exception handling patterns:

  1. Normal message handling:
  2. diff --git a/App/wwwroot/HiAPI-docsite/brief/dev-doc/build-hinc/main-panel.html b/App/wwwroot/HiAPI-docsite/brief/dev-doc/build-hinc/main-panel.html index 9792f78f..e46a240e 100644 --- a/App/wwwroot/HiAPI-docsite/brief/dev-doc/build-hinc/main-panel.html +++ b/App/wwwroot/HiAPI-docsite/brief/dev-doc/build-hinc/main-panel.html @@ -156,11 +156,11 @@ Users can refresh the log content or download the current day's log file for off

    The Project Menu Managing MachiningProject.

    To New (create), Save and Save As the MachiningProject, See DemoBuildGeomOnlyMachiningProject for the example.

    To Load MachiningProject, See DemoUseMachiningProject for the example.

    -

    Show message for the actions result (successed or has exception) by <xref:Hi.Common.Messages.MessageKit>.

    +

    Show message for the actions result (successed or has exception) by MessageHost.

    Tip
    -

    Recommmand using static function of <xref:Hi.Common.Messages.MessageKit> to do the job. -Read document of <xref:Hi.Common.Messages.MessageKit> to ensure the proper usage.

    +

    Recommmand using static function of MessageHost to do the job. +Read document of MessageHost to ensure the proper usage.

    On project loaded (Navigation Menu/Project/Load MenuItem) , set the Player.Panel.RenderingCanvas.DispEngine to SetViewToIsometricView().

    diff --git a/App/wwwroot/HiAPI-docsite/brief/dev-doc/build-hinc/message-section-on-main-panel.html b/App/wwwroot/HiAPI-docsite/brief/dev-doc/build-hinc/message-section-on-main-panel.html index 822ee44b..22be81f3 100644 --- a/App/wwwroot/HiAPI-docsite/brief/dev-doc/build-hinc/message-section-on-main-panel.html +++ b/App/wwwroot/HiAPI-docsite/brief/dev-doc/build-hinc/message-section-on-main-panel.html @@ -87,8 +87,8 @@

    Message Section on Main Panel

    -

    Initialize <xref:Hi.Common.Messages.MessageKit>.<xref:Hi.Common.Messages.MessageKit.Default> with Message Section

    -

    To show and save the message on Brief Message Text Field, add event to <xref:Hi.Common.Messages.MessageKit.Default>.<xref:Hi.Common.Messages.MessageKit.OnAdding>.

    +

    Initialize MessageHost.Default with Message Section

    +

    To show and save the message on Brief Message Text Field, add event to Default.OnAdding.

    The event contains:

    • update the text content of Brief Message Text Field
    • @@ -98,7 +98,7 @@
      Tip
      • Handle the situation that logs over one day.
      • -
      • Check if passing argument of <xref:Hi.Common.Messages.MessageKit.OnAdding> is Exception. If the it is Exception, update text content by Exception.Message but log to file with the full Exception information.
      • +
      • Check if passing argument of OnAdding event is Exception. If the it is Exception, update text content by Message but log to file with the full Exception information.
      • Consider MessageFlag to set the behavior of Message Section. For example, apply alert style if passing argument is exception. The Info (and the other flags that the priority lower than it) should only record in the logs but not shows in the Message Section.
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 c9f4e328..a52c1c0f 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,19 @@

Release Note

+

HiNc Packages Version 3.1.87

+

HiNc Packages Version 3.1.84