Merge branch 'Correzione_Incidi_(Ovale)'

Aggiornamento versione 2.4a2
Merge remote-tracking branch 'origin/DB_WaterJet_Renzo' into Correzione_Incidi_(Ovale)
2022-01-17 16:24:09 +01:00 · 2022-01-17 16:23:21 +01:00 · 2022-01-17 16:14:45 +01:00 · 2022-01-17 16:14:29 +01:00 · 2022-01-17 15:49:08 +01:00 · 2022-01-17 10:18:57 +01:00
5 changed files with 207 additions and 157 deletions
@@ -674,6 +674,9 @@ Friend Module CamAuto
      End If
      ' Lo sposto dalla lavorazione al pezzo
      Dim nId As Integer = EgtGetFirstInGroup(nMchPvId)
+
+      If nId = GDB_ID.NULL Then Return False
+
      While nId <> GDB_ID.NULL
         EgtRelocateGlob(nId, nPartPvId)
         nId = EgtGetFirstInGroup(nMchPvId)
@@ -41,6 +41,8 @@ Public Class SplitPageUC
   Private m_nDragType As Integer = 0           '0=niente, 1=attacco, 2=uscita
   Private m_ptDragPrev As Point3d
   Private m_bDragging As Boolean = False
+   ' Selected cut
+   Private m_nSelected As Integer = GDB_ID.NULL

   Private Sub SplitPageUC_Initialized(sender As Object, e As EventArgs)
      PrevBtn.IsEnabled = False
@@ -204,6 +206,8 @@ Public Class SplitPageUC
      ' Reset drag
      m_nDragInd = -1
      m_nDragType = 0
+      ' Reset selection interface
+      m_nSelected = GDB_ID.NULL
      ' Verifico se selezionato estremo di taglio con lama
      EgtSetObjFilterForSelWin(False, True, False, False, False)
      Dim nSel As Integer
@@ -218,8 +222,10 @@ Public Class SplitPageUC
            nType = 1
         ElseIf String.Compare(sName, NAME_PV_POSTCUT) = 0 Then
            nType = 2
+         ElseIf String.Compare(sName, NAME_PV_CUT) = 0 Then
+            nType = 3
         End If
-         If nType <> 0 Then
+         If nType = 1 Or nType = 2 Then
            Dim nPvId As Integer = EgtGetParent(EgtGetParent(nId))
            Dim nMchId As Integer = GDB_ID.NULL
            If EgtGetInfo(nPvId, "MId", nMchId) Then
@@ -235,19 +241,46 @@ Public Class SplitPageUC
                        Exit For
                     End If
                  Next
-                  If m_nDragInd >= 0 Then Exit For
+                  If m_nDragInd >= 0 Then
+                     ' Assegno l'id dell'elemnto selezionato
+                     m_nSelected = m_nDragInd
+                     Exit For
+                  End If
               Next
            End If
-            If m_nDragInd >= 0 Then Exit While
+            If m_nDragInd >= 0 Then
+               ' Assegno l'id dell'elemnto selezionato
+               m_nSelected = m_nDragInd
+               Exit While
+            End If
+         ElseIf nType = 3 Then
+            Dim nPvId As Integer = EgtGetParent(EgtGetParent(nId))
+            Dim nMchId As Integer = GDB_ID.NULL
+            If EgtGetInfo(nPvId, "MId", nMchId) Then
+               For nInd As Integer = 0 To m_MachiningList.Count() - 1
+                  If m_MachiningList(nInd).m_nId = nMchId Then
+                     m_nSelected = nInd
+                  End If
+                  For nJ As Integer = 0 To m_MachiningList(nInd).m_vOthId.Count() - 1
+                     If m_MachiningList(nInd).m_vOthId(nJ) = nMchId Then
+                        m_nSelected = nInd
+                        Exit For
+                     End If
+                  Next
+                  If m_nSelected >= 0 Then Exit For
+               Next
+            End If
+            If m_nSelected >= 0 Then Exit While
         End If
         nId = EgtGetNextObjInSelWin()
      End While
      ' Sistemazioni per drag
-      If m_nDragInd >= 0 AndAlso EgtUnProjectPoint(e.Location, m_ptDragPrev) Then
-         MachiningLsBx.SelectedIndex = m_nDragInd
+      If m_nSelected >= 0 AndAlso EgtUnProjectPoint(e.Location, m_ptDragPrev) Then
+         MachiningLsBx.SelectedIndex = m_nSelected
      Else
         m_nDragInd = -1
         m_nDragType = 0
+         m_nSelected = GDB_ID.NULL
      End If
   End Sub

@@ -265,54 +298,70 @@ Public Class SplitPageUC
      Dim vtMove As Vector3d = ptCurr - m_ptDragPrev
      Dim dDelta = vtMove * m_MachiningList(m_nDragInd).m_vtDir
      If m_nDragType = 1 Then
-         dDelta = -dDelta
-         ' Leggo il valore salvato nella geometria
         Dim dOrigUsal As Double = 0
-         EgtGetInfo(nOperId, INFO_MCH_USER_SAL, dOrigUsal)
-         Dim dUsal As Double = dOrigUsal + dDelta
-         ' Se c'è limite alla lunghezza libera
-         If m_MachiningList(m_nDragInd).m_dStartFreeLen < FREELEN_INF Then
-            ' Recupero sicurezza in corner interno
-            Dim dCornerSafety As Double = Math.Max(GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, m_MainWindow.GetMachIniFile()), 10 * EPS_SMALL)
-            ' Recupero lunghezza baffo del taglio
-            Dim nPvId As Integer = GDB_ID.NULL
-            EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
-            Dim dDT As Double = 0
-            EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT)
-            dUsal = Math.Min(dUsal, m_MachiningList(m_nDragInd).m_dStartFreeLen - dDT - dCornerSafety)
-         End If
-         ' Modifica della lavorazione
-         EgtSetCurrMachining(nOperId)
-         Dim dAddLen As Double = 0
-         EgtGetMachiningParam(MCH_MP.STARTADDLEN, dAddLen)
-         If dAddLen - dOrigUsal < -10 * EPS_SMALL Then Return
-         EgtSetMachiningParam(MCH_MP.STARTADDLEN, dAddLen + dUsal - dOrigUsal)
-         EgtSetInfo(nOperId, INFO_MCH_USER_SAL, dUsal)
-         UpdateMachiningPreview(m_MachiningList(m_nDragInd).m_nId, True)
+         Dim dUsal As Double
+         ' ----------------------- REPEAT -----------------------
+         Do
+            dDelta = -dDelta
+            ' Leggo il valore salvato nella geometria
+            EgtGetInfo(nOperId, INFO_MCH_USER_SAL, dOrigUsal)
+            dUsal = dOrigUsal + dDelta
+            ' Se c'è limite alla lunghezza libera
+            If m_MachiningList(m_nDragInd).m_dStartFreeLen < FREELEN_INF Then
+               ' Recupero sicurezza in corner interno
+               Dim dCornerSafety As Double = Math.Max(GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, m_MainWindow.GetMachIniFile()), 10 * EPS_SMALL)
+               ' Recupero lunghezza baffo del taglio
+               Dim nPvId As Integer = GDB_ID.NULL
+               EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
+               Dim dDT As Double = 0
+               EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT)
+               dUsal = Math.Min(dUsal, m_MachiningList(m_nDragInd).m_dStartFreeLen - dDT - dCornerSafety)
+            End If
+            ' Modifica della lavorazione
+            EgtSetCurrMachining(nOperId)
+            Dim dAddLen As Double = 0
+            EgtGetMachiningParam(MCH_MP.STARTADDLEN, dAddLen)
+
+            If dAddLen - dOrigUsal < -10 * EPS_SMALL Then
+               m_bDragging = False
+               Return
+            End If
+            EgtSetMachiningParam(MCH_MP.STARTADDLEN, dAddLen + dUsal - dOrigUsal)
+            EgtSetInfo(nOperId, INFO_MCH_USER_SAL, dUsal)
+         Loop Until UpdateMachiningPreview(m_MachiningList(m_nDragInd).m_nId, True)
+         ' ----------------------- REPEAT (solo se il segmento scompare) -----------------------
      Else
-         ' Leggo il valore salvato nella geometria
         Dim dOrigUeal As Double = 0
-         EgtGetInfo(nOperId, INFO_MCH_USER_EAL, dOrigUeal)
-         Dim dUeal As Double = dOrigUeal + dDelta
-         ' Se c'è limite alla lunghezza libera
-         If m_MachiningList(m_nDragInd).m_dEndFreeLen < FREELEN_INF Then
-            ' Recupero sicurezza in corner interno
-            Dim dCornerSafety As Double = Math.Max(GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, m_MainWindow.GetMachIniFile()), 10 * EPS_SMALL)
-            ' Recupero lunghezza baffo del taglio
-            Dim nPvId As Integer = GDB_ID.NULL
-            EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
-            Dim dDT As Double = 0
-            EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT)
-            dUeal = Math.Min(dUeal, m_MachiningList(m_nDragInd).m_dEndFreeLen - dDT - dCornerSafety)
-         End If
-         ' Modifica della lavorazione
-         EgtSetCurrMachining(nOperId)
-         Dim dAddLen As Double = 0
-         EgtGetMachiningParam(MCH_MP.ENDADDLEN, dAddLen)
-         If dAddLen - dOrigUeal < -10 * EPS_SMALL Then Return
-         EgtSetMachiningParam(MCH_MP.ENDADDLEN, dAddLen + dUeal - dOrigUeal)
-         EgtSetInfo(nOperId, INFO_MCH_USER_EAL, dUeal)
-         UpdateMachiningPreview(m_MachiningList(m_nDragInd).m_nId, True)
+         Dim dUeal As Double
+         dDelta = -dDelta
+         Do
+            dDelta = -dDelta
+            ' Leggo il valore salvato nella geometria
+            EgtGetInfo(nOperId, INFO_MCH_USER_EAL, dOrigUeal)
+            dUeal = dOrigUeal + dDelta
+            ' Se c'è limite alla lunghezza libera
+            If m_MachiningList(m_nDragInd).m_dEndFreeLen < FREELEN_INF Then
+               ' Recupero sicurezza in corner interno
+               Dim dCornerSafety As Double = Math.Max(GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, m_MainWindow.GetMachIniFile()), 10 * EPS_SMALL)
+               ' Recupero lunghezza baffo del taglio
+               Dim nPvId As Integer = GDB_ID.NULL
+               EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
+               Dim dDT As Double = 0
+               EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT)
+               dUeal = Math.Min(dUeal, m_MachiningList(m_nDragInd).m_dEndFreeLen - dDT - dCornerSafety)
+            End If
+            ' Modifica della lavorazione
+            EgtSetCurrMachining(nOperId)
+            Dim dAddLen As Double = 0
+            EgtGetMachiningParam(MCH_MP.ENDADDLEN, dAddLen)
+
+            If dAddLen - dOrigUeal < -10 * EPS_SMALL Then
+               m_bDragging = False
+               Return
+            End If
+            EgtSetMachiningParam(MCH_MP.ENDADDLEN, dAddLen + dUeal - dOrigUeal)
+            EgtSetInfo(nOperId, INFO_MCH_USER_EAL, dUeal)
+         Loop Until UpdateMachiningPreview(m_MachiningList(m_nDragInd).m_nId, True)
      End If
      ' verifico interferenza
      EgtVerifyMachining(m_MachiningList(m_nDragInd).m_nId, m_MachiningList(m_nDragInd).m_nInterf)
@@ -357,40 +406,8 @@ Public Class SplitPageUC
         ItemList.Add(Item)
      Next

-      ' ------------------------ verifico che le lavorazioni siano dello stesso tipo ------------------------
+      ' verifico che le lavorazioni siano dello stesso tipo
      VerifyHomogenousMachining(ItemList)
-      'Dim nSawing As Integer = 0
-      'Dim nWaterjetting As Integer = 0
-      'Dim nOtherMachining As Integer = 0
-      '' conto il numero di tipi di lavprazioni
-      'For Each Item As NameIdLsBxItem In ItemList
-      '   If Item.Type = MCH_OY.SAWING Then
-      '      nSawing += 1
-      '   ElseIf Item.Type = MCH_OY.WATERJETTING Then
-      '      nWaterjetting += 1
-      '   Else
-      '      nOtherMachining += 1
-      '   End If
-      'Next
-      '' verifico se le lavorazioni sono omeogenee
-      'If nSawing > 0 And (nWaterjetting > 0 Or nOtherMachining > 0) Then
-      '   m_bAreHomogeneous = False
-      '   VisibilityButtonFromMachinig(MCH_OY.SAWING)
-      'ElseIf nSawing = 0 And nOtherMachining > 0 And nWaterjetting > 0 Then
-      '   m_bAreHomogeneous = False
-      '   VisibilityButtonFromMachinig(MCH_OY.WATERJETTING)
-      'Else
-      '   VisibilityButtonFromMachinig(ItemList(0).Type)
-      '   m_bAreHomogeneous = True
-      'End If
-      '' eventualmente stampo messaggio
-      'If Not m_bAreHomogeneous Then
-      '   m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
-      '   m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage("Lavorazioni non omogenee")
-      'Else
-      '   m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
-      'End If
-      ' -----------------------------------------------------------------------------------------------------

      ItemList.Sort(Function(x, y) Comparer(Of Integer).Default.Compare(m_ItemList.IndexOf(x), m_ItemList.IndexOf(y)))
      ' verifico che siano contigui
@@ -494,16 +511,13 @@ Public Class SplitPageUC
      EgtDraw()
      ' Imposto flag di modifica
      m_bModified = True
-      ' Abilitazione bottone Next
-      ' EnableButtons()
+
      ' recupero l'elenco degli elementi selezionati
      Dim ItemList As New List(Of NameIdLsBxItem)
      For Each Item As NameIdLsBxItem In MachiningLsBx.SelectedItems
         ItemList.Add(Item)
      Next
-      'For Each Item As NameIdLsBxItem In m_ItemList
-      '   If Item.bIsActive Then ItemList.Add(Item)
-      'Next
+
      VerifyHomogenousMachining(ItemList)
   End Sub

@@ -988,26 +1002,37 @@ Public Class SplitPageUC
               bFirstInd = False
            End If
            ' ------------------ FINE PREPARAZIONE TASTIERINO VIRTUALE ------------------
+            Dim bRepeat As Boolean = False
+            Do
+               ' Se c'è limite alla lunghezza libera
+               If m_MachiningList(nI).m_dStartFreeLen < FREELEN_INF Then
+                  ' Recupero sicurezza in corner interno
+                  Dim dCornerSafety As Double = Math.Max(GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, m_MainWindow.GetMachIniFile()), 10 * EPS_SMALL)
+                  ' Recupero lunghezza baffo del taglio
+                  Dim nPvId As Integer = GDB_ID.NULL
+                  EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
+                  Dim dDT As Double = 0
+                  EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT)
+                  dUsal = Math.Min(dUsal, m_MachiningList(nI).m_dStartFreeLen - dDT - dCornerSafety)
+               End If
+               ' Modifica della lavorazione
+               EgtSetCurrMachining(nOperId)
+               Dim dAddLen As Double = 0
+               EgtGetMachiningParam(MCH_MP.STARTADDLEN, dAddLen)
+               ' verifico che non sia sull'angolo interno (altrimenti vieto la modifica)
+               If dAddLen - dOrigUsal < -10 * EPS_SMALL Then
+                  Return
+               End If
+               EgtSetMachiningParam(MCH_MP.STARTADDLEN, dAddLen + dUsal - dOrigUsal)
+               EgtSetInfo(nOperId, INFO_MCH_USER_SAL, dUsal)
+               bRepeat = Not UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
+               If bRepeat Then
+                  EgtSetMachiningParam(MCH_MP.STARTADDLEN, dOrigUsal)
+                  EgtSetInfo(nOperId, INFO_MCH_USER_SAL, dOrigUsal)
+                  dUsal = dOrigUsal
+               End If
+            Loop Until Not bRepeat

-            ' Se c'è limite alla lunghezza libera
-            If m_MachiningList(nI).m_dStartFreeLen < FREELEN_INF Then
-               ' Recupero sicurezza in corner interno
-               Dim dCornerSafety As Double = Math.Max(GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, m_MainWindow.GetMachIniFile()), 10 * EPS_SMALL)
-               ' Recupero lunghezza baffo del taglio
-               Dim nPvId As Integer = GDB_ID.NULL
-               EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
-               Dim dDT As Double = 0
-               EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT)
-               dUsal = Math.Min(dUsal, m_MachiningList(nI).m_dStartFreeLen - dDT - dCornerSafety)
-            End If
-            ' Modifica della lavorazione
-            EgtSetCurrMachining(nOperId)
-            Dim dAddLen As Double = 0
-            EgtGetMachiningParam(MCH_MP.STARTADDLEN, dAddLen)
-            If dAddLen - dOrigUsal < -10 * EPS_SMALL Then Return
-            EgtSetMachiningParam(MCH_MP.STARTADDLEN, dAddLen + dUsal - dOrigUsal)
-            EgtSetInfo(nOperId, INFO_MCH_USER_SAL, dUsal)
-            UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
            ' verifico interferenza
            EgtVerifyMachining(m_MachiningList(nI).m_nId, m_MachiningList(nI).m_nInterf)
            ColorMachining(m_MachiningList(nI))
@@ -1140,26 +1165,38 @@ Public Class SplitPageUC
               bFirstInd = False
            End If
            ' ------------------ FINE PREPARAZIONE TASTIERINO VIRTUALE ------------------
+            Dim bRepeat As Boolean = False
+            Do
+               ' Se c'è limite alla lunghezza libera
+               If m_MachiningList(nI).m_dEndFreeLen < FREELEN_INF Then
+                  ' Recupero sicurezza in corner interno
+                  Dim dCornerSafety As Double = Math.Max(GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, m_MainWindow.GetMachIniFile()), 10 * EPS_SMALL)
+                  ' Recupero lunghezza baffo del taglio
+                  Dim nPvId As Integer = GDB_ID.NULL
+                  EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
+                  Dim dDT As Double = 0
+                  EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT)
+                  dUeal = Math.Min(dUeal, m_MachiningList(nI).m_dEndFreeLen - dDT - dCornerSafety)
+               End If
+
+               ' Modifica della lavorazione
+               EgtSetCurrMachining(nOperId)
+               Dim dAddLen As Double = 0
+               EgtGetMachiningParam(MCH_MP.ENDADDLEN, dAddLen)
+               If dAddLen - dOrigUeal < -10 * EPS_SMALL Then
+                  Return
+               End If
+               EgtSetMachiningParam(MCH_MP.ENDADDLEN, dAddLen + dUeal - dOrigUeal)
+               EgtSetInfo(nOperId, INFO_MCH_USER_EAL, dUeal)
+               UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
+               bRepeat = Not UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
+               If bRepeat Then
+                  EgtSetMachiningParam(MCH_MP.STARTADDLEN, dOrigUeal)
+                  EgtSetInfo(nOperId, INFO_MCH_USER_SAL, dOrigUeal)
+                  dUeal = dOrigUeal
+               End If
+            Loop Until Not bRepeat

-            ' Se c'è limite alla lunghezza libera
-            If m_MachiningList(nI).m_dEndFreeLen < FREELEN_INF Then
-               ' Recupero sicurezza in corner interno
-               Dim dCornerSafety As Double = Math.Max(GetPrivateProfileDouble(S_MACH_NEST, K_MACH_SAFE_LEN_INTCORNER, 1, m_MainWindow.GetMachIniFile()), 10 * EPS_SMALL)
-               ' Recupero lunghezza baffo del taglio
-               Dim nPvId As Integer = GDB_ID.NULL
-               EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
-               Dim dDT As Double = 0
-               EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT)
-               dUeal = Math.Min(dUeal, m_MachiningList(nI).m_dEndFreeLen - dDT - dCornerSafety)
-            End If
-            ' Modifica della lavorazione
-            EgtSetCurrMachining(nOperId)
-            Dim dAddLen As Double = 0
-            EgtGetMachiningParam(MCH_MP.ENDADDLEN, dAddLen)
-            If dAddLen - dOrigUeal < -10 * EPS_SMALL Then Return
-            EgtSetMachiningParam(MCH_MP.ENDADDLEN, dAddLen + dUeal - dOrigUeal)
-            EgtSetInfo(nOperId, INFO_MCH_USER_EAL, dUeal)
-            UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
            ' verifico interferenza
            EgtVerifyMachining(m_MachiningList(nI).m_nId, m_MachiningList(nI).m_nInterf)
            ColorMachining(m_MachiningList(nI))
@@ -755,6 +755,10 @@ Public Class SideAngleUC
            vJoint.Add(False)
         End If
      Next
+
+      ' se non riesco a generare un elenco allora esco
+      If vJoint.Count < 1 Then Return
+
      If vJoint(0) And vJoint(vJoint.Count - 1) Then
         bJointStart = True
      End If
@@ -552,12 +552,15 @@ Public Class MachiningDbPageUC
      HeadSideCmBx.SelectedIndex = ToolInt - 1
      EgtMdbGetCurrMachiningParam(MCH_MP.LEADINTYPE, ToolInt)
      If LeadInTypeCmBx.Items.Count > 0 Then
-         LeadInTypeCmBx.SelectedItem =  LeadInTypeCmBx.Items(0)
+         LeadInTypeCmBx.SelectedItem = LeadInTypeCmBx.Items(0)
      Else
         LeadInTypeCmBx.SelectedItem = Nothing
      End If
      For Each LInType As IdNameStruct In LeadInTypeCmBx.Items
-         If ToolInt = LInType.Id Then LeadInTypeCmBx.SelectedItem = LInType
+         If ToolInt = LInType.Id Then
+            LeadInTypeCmBx.SelectedItem = LInType
+            Exit For
+         End If
      Next
      EgtMdbGetCurrMachiningParam(MCH_MP.EXTLINKTYPE, ToolInt)
      ExtLinkTypeCmBx.SelectedIndex = ToolInt
@@ -819,13 +822,13 @@ Public Class MachiningDbPageUC
      ' Parmetri nascosti di svuotatura
      If nMachiningType = MCH_MY.POCKETING Then
         EgtMdbSetCurrMachiningParam(MCH_MP.SUBTYPE, MCH_POCK_SUB.SPIRALOUT)
-         EgtMdbSetCurrMachiningParam( MCH_MP.LEADINTYPE, MCH_POCK_LI.HELIX)
+         ' EgtMdbSetCurrMachiningParam( MCH_MP.LEADINTYPE, MCH_POCK_LI.HELIX)
         Dim dToolDiam As Double = 100
         If Not IsNothing(ToolCmBx.SelectedItem) Then
            EgtTdbSetCurrTool( ToolCmBx.SelectedItem.ToString())
            EgtTdbGetCurrToolParam( MCH_TP.DIAM, dToolDiam)
         End If
-         EgtMdbSetCurrMachiningParam( MCH_MP.LITANG, 0.495 * dToolDiam)
+         EgtMdbSetCurrMachiningParam(MCH_MP.LITANG, 0.99 * dToolDiam)
         EgtMdbSetCurrMachiningParam( MCH_MP.LIELEV, 2.0)
      End If
      ' Parametri WaterJetting
@@ -1138,30 +1141,26 @@ Public Class MachiningDbPageUC
            ' Definizione della grid TypeGrd con la giusta altezza e numero di righe
            Dim RowNum As Integer = TypeGrd.RowDefinitions.Count
            If RowNum > 2 Then
+               ' elimino eventuali righe in eccesso
               For Index As Integer = RowNum - 1 To 2 Step -1
                  TypeGrd.RowDefinitions.RemoveAt(Index)
               Next
-               LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 2)
-               LeadInTypeCmBx.SetValue(Grid.ColumnProperty, 3)
-               LeadOutTypeTxBl.SetValue(Grid.RowProperty, 1)
-               LeadOutTypeTxBl.SetValue(Grid.ColumnProperty, 2)
-               LeadOutTypeCmBx.SetValue(Grid.RowProperty, 1)
-               LeadOutTypeCmBx.SetValue(Grid.ColumnProperty, 3)
-               TypeBrd.SetValue(Grid.RowProperty, 12)
-               TypeBrd.SetValue(Grid.RowSpanProperty, 6)
            ElseIf RowNum < 2 Then
               ' costruiso una riga in più da inserire
               Dim Row As New RowDefinition
               TypeGrd.RowDefinitions.Add(Row)
-               LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 2)
-               LeadInTypeCmBx.SetValue(Grid.ColumnProperty, 3)
-               LeadOutTypeTxBl.SetValue(Grid.RowProperty, 1)
-               LeadOutTypeTxBl.SetValue(Grid.ColumnProperty, 2)
-               LeadOutTypeCmBx.SetValue(Grid.RowProperty, 1)
-               LeadOutTypeCmBx.SetValue(Grid.ColumnProperty, 3)
-               TypeBrd.SetValue(Grid.RowProperty, 12)
-               TypeBrd.SetValue(Grid.RowSpanProperty, 6)
            End If
+            LeadInTypeTxBl.SetValue(Grid.RowProperty, 1)
+            LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 0)
+            LeadInTypeCmBx.SetValue(Grid.RowProperty, 1)
+            LeadInTypeCmBx.SetValue(Grid.ColumnProperty, 1)
+            LeadOutTypeTxBl.SetValue(Grid.RowProperty, 1)
+            LeadOutTypeTxBl.SetValue(Grid.ColumnProperty, 2)
+            LeadOutTypeCmBx.SetValue(Grid.RowProperty, 1)
+            LeadOutTypeCmBx.SetValue(Grid.ColumnProperty, 3)
+            TypeBrd.SetValue(Grid.RowProperty, 12)
+            TypeBrd.SetValue(Grid.RowSpanProperty, 6)
+
            LeadInTypeTxBl.Visibility = Windows.Visibility.Visible
            LeadInTypeCmBx.Visibility = Windows.Visibility.Visible
            ExtLinkTypeTxBl.Visibility = Windows.Visibility.Hidden
@@ -1779,7 +1778,7 @@ Public Class MachiningDbPageUC
            StepTypeTxBl.Visibility = Windows.Visibility.Hidden
            StepTypeCmBx.Visibility = Windows.Visibility.Hidden
            SideBrd.SetValue(Grid.RowProperty, 9)
-            SideBrd.Visibility = Windows.Visibility.Visible
+            SideBrd.Visibility = Windows.Visibility.Hidden
            WorkSideTxBl.Visibility = Windows.Visibility.Hidden
            WorkSideCmBx.Visibility = Windows.Visibility.Hidden
            HeadSideTxBl.Visibility = Windows.Visibility.Hidden
@@ -1791,15 +1790,22 @@ Public Class MachiningDbPageUC
               For Index As Integer = RowNum - 1 To 2 Step -1
                  TypeGrd.RowDefinitions.RemoveAt(Index)
               Next
-               LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 2)
-               LeadInTypeCmBx.SetValue(Grid.ColumnProperty, 3)
-               LeadOutTypeTxBl.SetValue(Grid.RowProperty, 1)
-               LeadOutTypeTxBl.SetValue(Grid.ColumnProperty, 2)
-               LeadOutTypeCmBx.SetValue(Grid.RowProperty, 1)
-               LeadOutTypeCmBx.SetValue(Grid.ColumnProperty, 3)
-               TypeBrd.SetValue(Grid.RowProperty, 12)
-               TypeBrd.SetValue(Grid.RowSpanProperty, 6)
+            ElseIf RowNum < 2 Then
+               ' costruiso una riga in più da inserire
+               Dim Row As New RowDefinition
+               TypeGrd.RowDefinitions.Add(Row)
            End If
+            LeadInTypeTxBl.SetValue(Grid.RowProperty, 1)
+            LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 0)
+            LeadInTypeCmBx.SetValue(Grid.RowProperty, 1)
+            LeadInTypeCmBx.SetValue(Grid.ColumnProperty, 1)
+            LeadOutTypeTxBl.SetValue(Grid.RowProperty, 1)
+            LeadOutTypeTxBl.SetValue(Grid.ColumnProperty, 2)
+            LeadOutTypeCmBx.SetValue(Grid.RowProperty, 1)
+            LeadOutTypeCmBx.SetValue(Grid.ColumnProperty, 3)
+            TypeBrd.SetValue(Grid.RowProperty, 12)
+            TypeBrd.SetValue(Grid.RowSpanProperty, 6)
+
            LeadInTypeTxBl.Visibility = Windows.Visibility.Visible
            LeadInTypeCmBx.Visibility = Windows.Visibility.Visible
            ExtLinkTypeTxBl.Visibility = Windows.Visibility.Hidden
@@ -62,5 +62,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("2.4.1.1")>
-<Assembly: AssemblyFileVersion("2.4.1.1")>
+<Assembly: AssemblyVersion("2.4.1.2")>
+<Assembly: AssemblyFileVersion("2.4.1.2")>
Author	SHA1	Message	Date
NicolaP	1645a39506	Merge branch 'Correzione_Incidi_(Ovale)'	2022-01-17 16:24:09 +01:00
NicolaP	9e2c2c1b98	Aggiornamento versione 2.4a2	2022-01-17 16:23:21 +01:00
NicolaP	51f15818c2	Merge remote-tracking branch 'origin/DB_WaterJet_Renzo' into Correzione_Incidi_(Ovale)	2022-01-17 16:14:45 +01:00
NicolaP	b0081241d8	Merge branch 'Feature/Mach_WaterJet' into Correzione_Incidi_(Ovale)	2022-01-17 16:14:29 +01:00
NicolaP	173230df5a	Correzione e modifica impaginazione Lavorazione di Scasso	2022-01-17 15:49:08 +01:00
NicolaP	22afb6edcd	Gestione modifica inizio/fine sugli angoli interni	2022-01-17 10:18:57 +01:00
NicolaP	9c8faf25bf	Gestione Modifica Inizio/Fine da comando diretto	2022-01-13 18:05:00 +01:00
NicolaP	58775595c7	Gestione minimo accorciamento tagli con cursore	2022-01-12 17:22:45 +01:00
NicolaP	9750fdfe75	Selezione da interfaccia delle lavorazioni	2022-01-12 12:27:48 +01:00
NicolaP	39bc4f55ea	Merge commit '803a7bdbfc50a45289bb4fddec345318bd22a07d' into Feature/Mach_WaterJet	2022-01-12 10:10:49 +01:00