From faba640eee175e341c444f43988e235f4dafce5c Mon Sep 17 00:00:00 2001 From: NicolaP Date: Wed, 25 May 2022 15:19:22 +0200 Subject: [PATCH] Gestione comando per separazione lavorazione WaterJet --- EgtStoneLib/CamAuto.vb | 28 +++ MyMachGroupPanel/MyMachGroupPanelVM.vb | 3 + OptionPanel/NestingTab/NestingTabV.xaml | 14 +- OptionPanel/NestingTab/NestingTabVM.vb | 245 +++++++++++++++++++++++- 4 files changed, 273 insertions(+), 17 deletions(-) diff --git a/EgtStoneLib/CamAuto.vb b/EgtStoneLib/CamAuto.vb index e9a5b52..03398cd 100644 --- a/EgtStoneLib/CamAuto.vb +++ b/EgtStoneLib/CamAuto.vb @@ -95,6 +95,34 @@ Friend Module CamAuto Return True End Function + Friend Function ResetAllSplitCurv() As Boolean + Dim bOk As Boolean = True + Dim nIdPart As Integer = EgtGetFirstPart() + While nIdPart <> GDB_ID.NULL + ' accedo al Layer OutLoop + Dim nIdLayerOutLoop As Integer = EgtGetFirstNameInGroup(nIdPart, NAME_OUTLOOP) + Dim nIdMy As Integer = EgtGetFirstInGroup(nIdLayerOutLoop) + While nIdMy <> GDB_ID.NULL + EgtRemoveInfo(nIdMy, "JoinEntity") + nIdMy = EgtGetNext(nIdMy) + End While + nIdPart = EgtGetNextPart(nIdPart) + End While + Dim nRawId As Integer = CamAuto.GetCurrentRaw() + nIdPart = EgtGetFirstPartInRawPart(nRawId) + While nIdPart <> GDB_ID.NULL + ' accedo al Layer OutLoop + Dim nIdLayerOutLoop As Integer = EgtGetFirstNameInGroup(nIdPart, NAME_OUTLOOP) + Dim nIdMy As Integer = EgtGetFirstInGroup(nIdLayerOutLoop) + While nIdMy <> GDB_ID.NULL + EgtRemoveInfo(nIdMy, "JoinEntity") + nIdMy = EgtGetNext(nIdMy) + End While + nIdPart = EgtGetNextPartInRawPart(nIdPart) + End While + Return bOk + End Function + Friend Function RemoveFinalEmptyPhases() As Boolean Dim nOpeId As Integer = EgtGetLastOperation() While nOpeId <> GDB_ID.NULL diff --git a/MyMachGroupPanel/MyMachGroupPanelVM.vb b/MyMachGroupPanel/MyMachGroupPanelVM.vb index 4ec1c22..83bfe1d 100644 --- a/MyMachGroupPanel/MyMachGroupPanelVM.vb +++ b/MyMachGroupPanel/MyMachGroupPanelVM.vb @@ -248,6 +248,9 @@ Public Class MyMachGroupPanelVM ' aggiungo alla lista delle lastre correnti/orig Dim sSlabNameDB As String = GetSlabName() LoadSlabsList(sSlabNameDB) + + ' imposto la visibilità dei comandi per il waterjet + OmagOFFICEMap.refNestingTabVM.Set_SplitCurvWJ_Visibility() Return True End Function diff --git a/OptionPanel/NestingTab/NestingTabV.xaml b/OptionPanel/NestingTab/NestingTabV.xaml index 88e80c6..f778500 100644 --- a/OptionPanel/NestingTab/NestingTabV.xaml +++ b/OptionPanel/NestingTab/NestingTabV.xaml @@ -148,13 +148,8 @@ Margin="2.5,0,0,0"/> - - - - - +