This commit is contained in:
unknown 2025-09-18 17:52:16 +08:00
parent ab2576b777
commit 62fdb36f3a
22 changed files with 121 additions and 97 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -11,8 +11,8 @@
"dependencies": {
"AvalonEdit": "6.3.0.90",
"FontAwesome.Sharp": "6.3.0",
"Hi.Wpf": "3.1.36",
"HiNc": "3.1.56",
"Hi.Wpf": "3.1.37",
"HiNc": "3.1.57",
"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.36": {
"Hi.Wpf/3.1.37": {
"dependencies": {
"HiDisp": "3.1.41"
"HiDisp": "3.1.42"
},
"runtime": {
"lib/net9.0-windows7.0/Hi.Wpf.dll": {
"assemblyVersion": "3.1.36.0",
"fileVersion": "3.1.36.0"
"assemblyVersion": "3.1.37.0",
"fileVersion": "3.1.37.0"
}
}
},
"HiCbtr/3.1.41": {
"HiCbtr/3.1.42": {
"dependencies": {
"HiDisp": "3.1.41"
"HiDisp": "3.1.42"
},
"runtime": {
"lib/net9.0/HiCbtr.dll": {
"assemblyVersion": "3.1.41.0",
"fileVersion": "3.1.41.0"
"assemblyVersion": "3.1.42.0",
"fileVersion": "3.1.42.0"
}
}
},
"HiDisp/3.1.41": {
"HiDisp/3.1.42": {
"dependencies": {
"HiGeom": "3.1.37",
"HiGeom": "3.1.38",
"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.41.0",
"fileVersion": "3.1.41.0"
"assemblyVersion": "3.1.42.0",
"fileVersion": "3.1.42.0"
}
},
"native": {
@ -1706,7 +1706,7 @@
}
}
},
"HiGeom/3.1.37": {
"HiGeom/3.1.38": {
"dependencies": {
"Google.Protobuf": "3.28.3",
"Grpc.AspNetCore": "2.66.0",
@ -1717,8 +1717,8 @@
},
"runtime": {
"lib/net9.0/HiGeom.dll": {
"assemblyVersion": "3.1.37.0",
"fileVersion": "3.1.37.0"
"assemblyVersion": "3.1.38.0",
"fileVersion": "3.1.38.0"
}
},
"resources": {
@ -1730,27 +1730,27 @@
}
}
},
"HiLicense/3.1.35": {
"HiLicense/3.1.36": {
"dependencies": {
"HiGeom": "3.1.37"
"HiGeom": "3.1.38"
},
"runtime": {
"lib/net9.0/HiLicense.dll": {
"assemblyVersion": "3.1.35.0",
"fileVersion": "3.1.35.0"
"assemblyVersion": "3.1.36.0",
"fileVersion": "3.1.36.0"
}
}
},
"HiMech/3.1.45": {
"HiMech/3.1.46": {
"dependencies": {
"CommandLineParser": "2.9.1",
"HiCbtr": "3.1.41",
"HiCbtr": "3.1.42",
"Microsoft.CodeAnalysis.CSharp.Scripting": "4.14.0"
},
"runtime": {
"lib/net9.0/HiMech.dll": {
"assemblyVersion": "3.1.45.0",
"fileVersion": "3.1.45.0"
"assemblyVersion": "3.1.46.0",
"fileVersion": "3.1.46.0"
}
},
"resources": {
@ -1765,20 +1765,20 @@
}
}
},
"HiNc/3.1.56": {
"HiNc/3.1.57": {
"dependencies": {
"Google.Protobuf": "3.28.3",
"Grpc.AspNetCore": "2.66.0",
"Grpc.Net.Client": "2.66.0",
"HiLicense": "3.1.35",
"HiMech": "3.1.45",
"HiUniNc": "3.1.42",
"HiLicense": "3.1.36",
"HiMech": "3.1.46",
"HiUniNc": "3.1.43",
"System.IO.Pipelines": "9.0.9"
},
"runtime": {
"lib/net9.0/HiNc.dll": {
"assemblyVersion": "3.1.56.0",
"fileVersion": "3.1.56.0"
"assemblyVersion": "3.1.57.0",
"fileVersion": "3.1.57.0"
}
},
"resources": {
@ -1790,14 +1790,14 @@
}
}
},
"HiUniNc/3.1.42": {
"HiUniNc/3.1.43": {
"dependencies": {
"HiMech": "3.1.45"
"HiMech": "3.1.46"
},
"runtime": {
"lib/net9.0/HiUniNc.dll": {
"assemblyVersion": "3.1.42.0",
"fileVersion": "3.1.42.0"
"assemblyVersion": "3.1.43.0",
"fileVersion": "3.1.43.0"
}
}
},
@ -2442,61 +2442,61 @@
"path": "grpc.tools/2.66.0",
"hashPath": "grpc.tools.2.66.0.nupkg.sha512"
},
"Hi.Wpf/3.1.36": {
"Hi.Wpf/3.1.37": {
"type": "package",
"serviceable": true,
"sha512": "sha512-EVN8K4gzFqnFgRQtADXxZQnRTjIFhIO9QLfi+5mWbbb2UMDyEYDyvwiu0IDw4eA1DR6b5vfdQobs0Av1pPqO3w==",
"path": "hi.wpf/3.1.36",
"hashPath": "hi.wpf.3.1.36.nupkg.sha512"
"sha512": "sha512-EtVr2HqJmcDL4lYKdat1oiQKOLFlh12jrdpBQFFt3YdBxtpxbsbLNGGvY+mzxcIBgvQm1kfogFENbuJd7abfWg==",
"path": "hi.wpf/3.1.37",
"hashPath": "hi.wpf.3.1.37.nupkg.sha512"
},
"HiCbtr/3.1.41": {
"HiCbtr/3.1.42": {
"type": "package",
"serviceable": true,
"sha512": "sha512-XBU9N0INH8icytWhDlfwa1iDqqbSQvX44uswnr6ijwFuM+HFg60/Ppl9hX2dNE4q/uNxoyXE/TmnZLO4bayjpg==",
"path": "hicbtr/3.1.41",
"hashPath": "hicbtr.3.1.41.nupkg.sha512"
"sha512": "sha512-yQCJsbfgygBSbrHlnSARlddqg6b8M5JdtTnTxOLwxCMTNU85n09YpwErBVRCV+5m7q808NkD/WeYMFvHPX/xow==",
"path": "hicbtr/3.1.42",
"hashPath": "hicbtr.3.1.42.nupkg.sha512"
},
"HiDisp/3.1.41": {
"HiDisp/3.1.42": {
"type": "package",
"serviceable": true,
"sha512": "sha512-nrZDGaDHfum6mjf8+7NJSKnMDNgQrse/FNwX098lAs86/5teglcWlZaC5TE6ZtVB6nJ3pfVSz3Efb2SPfn0ucA==",
"path": "hidisp/3.1.41",
"hashPath": "hidisp.3.1.41.nupkg.sha512"
"sha512": "sha512-Bx/wHrgl8NW8u8tolcpQjLFdgKCWGb5Rjz7dpRqQXrjiqDjBn0c5PusGvBIuBuAz3YYbM5igHXcX4sH76MMm9g==",
"path": "hidisp/3.1.42",
"hashPath": "hidisp.3.1.42.nupkg.sha512"
},
"HiGeom/3.1.37": {
"HiGeom/3.1.38": {
"type": "package",
"serviceable": true,
"sha512": "sha512-L0K4B8LNMuPg+LPsirhC6n4FQEMgRETTaRuVuupl41NouAcLGItScojYwoN82qhWEiuKCSTJenhLCfbzIN+Wsw==",
"path": "higeom/3.1.37",
"hashPath": "higeom.3.1.37.nupkg.sha512"
"sha512": "sha512-3PPkKj5rxbNEGn+S5GW1Y2UBD6NYOWYtBapUrOBXxUgQ5GnhpzJ8m+SbH1vFZCemhMvh7smFceZNom/1ed/Olw==",
"path": "higeom/3.1.38",
"hashPath": "higeom.3.1.38.nupkg.sha512"
},
"HiLicense/3.1.35": {
"HiLicense/3.1.36": {
"type": "package",
"serviceable": true,
"sha512": "sha512-WX+X6qB6A5Y3gapFVlkfu6JZqd22/QPTIGKoVWgd1VhKYm9OdtprEFRvOPOfdLpSWv9kObt4Ej7C+AcCIeFcqg==",
"path": "hilicense/3.1.35",
"hashPath": "hilicense.3.1.35.nupkg.sha512"
"sha512": "sha512-Sa7hSVrrt0SY87F1kaFpCUOJrRRTutgP8S8RnHQCw/xYFHXWLBMwRSXTPhsfaUbEkVsQr81p0kM+XVf7F9fWzA==",
"path": "hilicense/3.1.36",
"hashPath": "hilicense.3.1.36.nupkg.sha512"
},
"HiMech/3.1.45": {
"HiMech/3.1.46": {
"type": "package",
"serviceable": true,
"sha512": "sha512-r3SUyfGLn379fZuvI1vlTs2wwk+Eu0BqhuYE1NH+3aggKZKppXFiH+0Q4Nbbqo79mCojTu5ufschfxvCgBkL8A==",
"path": "himech/3.1.45",
"hashPath": "himech.3.1.45.nupkg.sha512"
"sha512": "sha512-EipzArFnhYKy/lf+Uao/eicLyOcIkNybFOh4V94KSu5zgkZQqIwuIdnYy7/LNXQf+0Wu8A4EyoSTZ8bWzw3ccA==",
"path": "himech/3.1.46",
"hashPath": "himech.3.1.46.nupkg.sha512"
},
"HiNc/3.1.56": {
"HiNc/3.1.57": {
"type": "package",
"serviceable": true,
"sha512": "sha512-ycLAca8GH3a2onWeUzd2ybb3vN9ecfUTgg95U1L4zb0ids58dtBsLnr3Bh9Xd+zsag6hGaB2F+ZGo/skh+uD1g==",
"path": "hinc/3.1.56",
"hashPath": "hinc.3.1.56.nupkg.sha512"
"sha512": "sha512-P6oXneQ9CLCf32ubZ+dc0lqUuMpm+MmFiq2Pj/faE3As9GbhxXbF3idr+tZVv7yLWQL+Xcsa7so94gNIYKRvWA==",
"path": "hinc/3.1.57",
"hashPath": "hinc.3.1.57.nupkg.sha512"
},
"HiUniNc/3.1.42": {
"HiUniNc/3.1.43": {
"type": "package",
"serviceable": true,
"sha512": "sha512-StmovVfODJqZD5ObgdP8EmylZeLP+kSGjvENXUDNlCVrwF28A+hK2UHN+aE8QKHBvldzQUWTedtHzcxqkil3iA==",
"path": "hiuninc/3.1.42",
"hashPath": "hiuninc.3.1.42.nupkg.sha512"
"sha512": "sha512-balFPw+bQMyoNZO9fQATCkeyYhFoDQVN/CtJXCBJaK1PiNwUoI23o2iyMX3QqQ+dZ+xAmSAphLuluNg6Z82h8A==",
"path": "hiuninc/3.1.43",
"hashPath": "hiuninc.3.1.43.nupkg.sha512"
},
"MathNet.Numerics/5.0.0": {
"type": "package",

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1507,7 +1507,8 @@ public double CuttingDepth_mm { get; }</code></pre>
</h3>
<div class="markdown level1 summary"><p>Gets the cutting speed in mm/s.</p>
<div class="markdown level1 summary"><p>Gets the cutting speed in mm/s.
The speed on the cutter outer radius by the spindle rotating.</p>
</div>
<div class="markdown level1 conceptual"></div>
@ -1846,7 +1847,7 @@ public string FlagsText { get; }</code></pre>
</h3>
<div class="markdown level1 summary"><p>friction power to workpiece per cycle.
<div class="markdown level1 summary"><p>friction power takes by workpiece per cycle.
the unit is watt.</p>
</div>
<div class="markdown level1 conceptual"></div>
@ -2253,7 +2254,9 @@ public double? MaxAbsForce_N { get; }</code></pre>
</h3>
<div class="markdown level1 summary"><p>Gets the maximum bottom edge deflection on tool running coordinate in millimeters</p>
<div class="markdown level1 summary"><p>Gets the maximum bottom edge deflection on tool running coordinate in millimeters
It only make sense in end mill.
The z value of this factor is re-cut depth.</p>
</div>
<div class="markdown level1 conceptual"></div>
@ -2723,7 +2726,9 @@ public double ProgramSideCusp_um { get; }</code></pre>
</h3>
<div class="markdown level1 summary"><p>Gets or sets the recut depth in micrometers.</p>
<div class="markdown level1 summary"><p>Gets or sets the recut depth in micrometers.
The recut depth cause the cutting mark by the end mill.
The recut depth increased by the cutter radius increased.</p>
</div>
<div class="markdown level1 conceptual"></div>
@ -2822,7 +2827,7 @@ public List&lt;double&gt; SideCuspList_um { get; }</code></pre>
</h3>
<div class="markdown level1 summary"><p>Gets the spindle cycle period in seconds.</p>
<div class="markdown level1 summary"><p>Gets the spindle rotation cycle period in seconds.</p>
</div>
<div class="markdown level1 conceptual"></div>
@ -3233,7 +3238,8 @@ public int ToolId { get; }</code></pre>
</h3>
<div class="markdown level1 summary"><p>Gets the tooth arc duration in seconds.</p>
<div class="markdown level1 summary"><p>Gets the tooth arc duration in seconds by the spindle rotation.
The value is <a class="xref" href="Hi.MachiningSteps.MachiningStep.html#Hi_MachiningSteps_MachiningStep_SpindleCyclePeriod_s">SpindleCyclePeriod_s</a> div Cutter's teeth number.</p>
</div>
<div class="markdown level1 conceptual"></div>
@ -3333,7 +3339,9 @@ public double? WorkpieceDermisTemperature_C { get; }</code></pre>
</h3>
<div class="markdown level1 summary"><p>Gets the workpiece plastic depth in micrometers</p>
<div class="markdown level1 summary"><p>Gets the workpiece plastic depth in micrometers.
The depth is at the location that the cutting stress is equal to the yielding stress.
The cutting stress exert to the workpiece decreased on the depth increased.</p>
</div>
<div class="markdown level1 conceptual"></div>

View File

@ -761,7 +761,7 @@ Class RakeFacePhysicsBrief
</h3>
<div class="markdown level1 summary"><p>friction power to workpiece per cycle.
<div class="markdown level1 summary"><p>friction power takes by workpiece per cycle.
the unit is watt.</p>
</div>
<div class="markdown level1 conceptual"></div>

View File

@ -329,37 +329,53 @@ namespace HiNcRcl.Areas.Player
{
InvokeAsync(StateHasChanged).ConfigureAwait(false);
}
public void StartOrContinue()
public async Task StartOrContinue()
{
if (!MachiningProject.PacePlayer.IsLocked)
await Task.Run(() =&gt;
{
MachiningProject.PacePlayer.Start();
}
else if (!MachiningProject.PacePlayer.IsRunning
&amp;&amp; !MachiningProject.PacePlayer.IsFinished)
if (!MachiningProject.PacePlayer.IsLocked)
{
MachiningProject.PacePlayer.Start();
}
else if (!MachiningProject.PacePlayer.IsRunning
&amp;&amp; !MachiningProject.PacePlayer.IsFinished)
{
MachiningProject.PacePlayer.Resume();
}
}).ShowIfCatched(this);
}
public async Task Pause()
{
await Task.Run(() =&gt;
{
MachiningProject.PacePlayer.Resume();
}
MachiningProject?.PacePlayer.Pause();
}).ShowIfCatched(this);
}
public void Pause()
public async Task RunToLineEnd()
{
MachiningProject?.PacePlayer.Pause();
await Task.Run(() =&gt;
{
MachiningProject?.NcRunner.RunToLineEnd();
}).ShowIfCatched(this);
}
public void RunToLineEnd()
public async Task RunToNextPace()
{
MachiningProject?.NcRunner.RunToLineEnd();
await Task.Run(() =&gt;
{
MachiningProject?.PacePlayer.RunToNextPace();
}).ShowIfCatched(this);
}
public void RunToNextPace()
public async Task Break()
{
MachiningProject?.PacePlayer.RunToNextPace();
}
public void Break()
{
MachiningProject?.PacePlayer.Terminate();
await Task.Run(() =&gt;
{
MachiningProject?.PacePlayer.Terminate();
}).ShowIfCatched(this);
}
public async Task Reset()
{
await Task.Run(() =&gt; {
await Task.Run(() =&gt;
{
MachiningProject?.PacePlayer.Reset();
}).ShowIfCatched(this);
}

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.