HiNC-Deploy/Hi.Sample
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(Hi.Sample): the two coordinate-entry displayees place their markers through TryGetIsoCoordinatePosition and TryGetMachinePositionAtTableMountZero -- follows HiMech

Browse Source 
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
iamboss
2026-09-23 00:21:35 +08:00
co-authored by Claude Fable 5.1
parent 2cf5d31bf6
commit f4ec31806b
2 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disp/HeidenhainCoordinateEntryDisplayee.cs
+6 -6
View File
@@ -60,9 +60,9 @@ namespace Sample.Disp
return; return;
////Console.WriteLine($"B: {CoordinateIndex}; {coordinateMove}"); ////Console.WriteLine($"B: {CoordinateIndex}; {coordinateMove}");
Vec3d mcXyz_AttacherAtTableMountZero = MillingEquipmentFunc?.Invoke() IMachiningEquipment equipment = MillingEquipmentFunc?.Invoke();
?.GetMachinePositionAtTableMountZero(); if (equipment == null
if (mcXyz_AttacherAtTableMountZero == null) || !equipment.TryGetMachinePositionAtTableMountZero(out Vec3d mcXyz_AttacherAtTableMountZero))
return; return;
Vec3d coordinateMove; Vec3d coordinateMove;
@@ -96,9 +96,9 @@ namespace Sample.Disp
if (ncEnv == null || NcEnv.CncBrand != CncBrand.Heidenhain) if (ncEnv == null || NcEnv.CncBrand != CncBrand.Heidenhain)
return; return;
Vec3d mcXyz_AttacherAtTableMountZero = MillingEquipmentFunc?.Invoke() IMachiningEquipment equipment = MillingEquipmentFunc?.Invoke();
?.GetMachinePositionAtTableMountZero(); if (equipment == null
if (mcXyz_AttacherAtTableMountZero == null) || !equipment.TryGetMachinePositionAtTableMountZero(out Vec3d mcXyz_AttacherAtTableMountZero))
return; return;
Vec3d coordinateMove; Vec3d coordinateMove;
if (HeidenhainCycleDef247Q339 == 0 && HeidenhainCycleDef7Arg == null) if (HeidenhainCycleDef247Q339 == 0 && HeidenhainCycleDef7Arg == null)
Disp/IsoCoordinateEntryDisplayee.cs
+8 -17
View File
@@ -45,19 +45,13 @@ public class IsoCoordinateEntryDisplayee : IAnchoredDisplayee
if (ncEnv == null) if (ncEnv == null)
return; return;
Vec3d coordinateMove; if (ncEnv.IsoCoordinateTable?.TryGetValue(IsoCoordinateId, out Vec3d coordinateMove) != true)
string text;
if (ncEnv.IsoCoordinateTable?.TryGetValue(
IsoCoordinateId, out coordinateMove) != true
|| coordinateMove == null)
return; return;
if (coordinateMove == null) string text = IsoCoordinateId ?? "";
return;
text = IsoCoordinateId ?? "";
Vec3d attacherPos = MillingEquipmentFunc?.Invoke() IMachiningEquipment equipment = MillingEquipmentFunc?.Invoke();
?.GetIsoCoordinatePosition(coordinateMove); if (equipment == null || !equipment.TryGetIsoCoordinatePosition(coordinateMove, out Vec3d attacherPos))
return;
bind.ModelMatStack.Push(); bind.ModelMatStack.Push();
bind.ModelMatStack.Trans(attacherPos); bind.ModelMatStack.Trans(attacherPos);
@@ -70,14 +64,11 @@ public class IsoCoordinateEntryDisplayee : IAnchoredDisplayee
HardNcEnv ncEnv = NcEnv; HardNcEnv ncEnv = NcEnv;
if (ncEnv == null) if (ncEnv == null)
return; return;
Vec3d coordinateMove; if (ncEnv.IsoCoordinateTable?.TryGetValue(IsoCoordinateId, out Vec3d coordinateMove) != true)
if (ncEnv.IsoCoordinateTable?.TryGetValue(IsoCoordinateId, out coordinateMove) != true
|| coordinateMove == null)
return; return;
Vec3d attacherPos = MillingEquipmentFunc?.Invoke() IMachiningEquipment equipment = MillingEquipmentFunc?.Invoke();
?.GetIsoCoordinatePosition(coordinateMove); if (equipment == null || !equipment.TryGetIsoCoordinatePosition(coordinateMove, out Vec3d attacherPos))
if (attacherPos == null)
return; return;
dst.Expand(attacherPos); dst.Expand(attacherPos);
} }