Merge branch 'master' into Features/Conferma_Ciclo_Start

CAM/CamAuto.vb

@@ -93,7 +93,7 @@ Friend Module CamAuto
       If nPrjType = CurrentProjectPageUC.PRJ_TYPE.FLATS Then
          ' Reinserisco tutte le lavorazioni piane
          AddMachinings(GDB_ID.NULL, nWarn)
-         ' Se altrimenti progetto con cornici
+      ' Se altrimenti progetto con cornici
       ElseIf nPrjType = CurrentProjectPageUC.PRJ_TYPE.FRAMES Then
          ' Reinserisco tutte le lavorazioni delle cornici
          AddFrameMachinings(m_MainWindow.m_FrameCutPageUC.m_FrameMachiningUC.m_dStartTrim, m_MainWindow.m_FrameCutPageUC.m_FrameMachiningUC.m_dEndTrim)
@@ -101,82 +101,6 @@ 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
-         ' elimino il layer dei flag di separazione "AUX_SPLIT_WJ"
-         Dim IdAuxLayer As Integer = EgtGetFirstNameInGroup(nIdPart, INFO_AUX_SPLIT_WJ)
-         EgtErase(IdAuxLayer)
-         ' 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, INFO_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
-         ' elimino il layer dei flag di separazione "AUX_SPLIT_WJ"
-         Dim IdAuxLayer As Integer = EgtGetFirstNameInGroup(nIdPart, INFO_AUX_SPLIT_WJ)
-         EgtErase(IdAuxLayer)
-         ' 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, INFO_JOINENTITY)
-            nIdMy = EgtGetNext(nIdMy)
-         End While
-         nIdPart = EgtGetNextPartInRawPart(nIdPart)
-      End While
-      Return bOk
-   End Function
-
-   Friend Function ResetAllStartCurv() 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)
-         EgtRemoveInfo(nIdLayerOutLoop, INFO_START)
-         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)
-         EgtRemoveInfo(nIdLayerOutLoop, INFO_START)
-         nIdPart = EgtGetNextPartInRawPart(nIdPart)
-      End While
-      Return bOk
-   End Function
-
-   Friend Function ResetAllBRidges() As Boolean
-      Dim bOk As Boolean = True
-      Dim nMachGroup As Integer = EgtGetCurrMachGroup()
-      Dim nBridgesGroup As Integer = EgtGetFirstNameInGroup(nMachGroup, "Bridges")
-      bOk = EgtErase(nBridgesGroup)
-      Return bOk
-   End Function
-
-   ' verifico che il contorno passato non sia stato separato
-   Friend Function VerifyOutLoopIsClosed(nIdLayerOutLoop As Integer)
-      Dim nIdMy As Integer = EgtGetFirstInGroup(nIdLayerOutLoop)
-      While nIdMy <> GDB_ID.NULL
-         Dim nValInfo As Integer = 1
-         If EgtGetInfo(nIdMy, INFO_JOINENTITY, nValInfo) Then
-            If nValInfo = 0 Then Return False
-         End If
-         EgtRemoveInfo(nIdMy, INFO_JOINENTITY)
-         nIdMy = EgtGetNext(nIdMy)
-      End While
-      Return True
-   End Function
-
    Friend Function RemoveFinalEmptyPhases() As Boolean
       Dim nOpeId As Integer = EgtGetLastOperation()
       While nOpeId <> GDB_ID.NULL
@@ -518,7 +442,7 @@ Friend Module CamAuto
       Dim sInfo As String = String.Empty
       If EgtGetInfo(nOperId, INFO_MCH_OTHMID, sInfo) Then
          Dim sItems() As String = sInfo.Split(",".ToCharArray)
-         For Each sId As String In sItems
+         For Each sId In sItems
             Dim nId As Integer = 0
             StringToInt(sId, nId)
             If nId > 0 Then vOthId.Add(nId)
@@ -736,7 +660,7 @@ Friend Module CamAuto
       Dim sInfo As String = String.Empty
       If EgtGetInfo(nMchId, INFO_MCH_OTHMID, sInfo) Then
          Dim sItems() As String = sInfo.Split(",".ToCharArray)
-         For Each sId2 As String In sItems
+         For Each sId2 In sItems
             ' Indice gruppo di preview nella lavorazione
             Dim nId2 As Integer = GDB_ID.NULL
             StringToInt(sId2, nId2)
@@ -750,9 +674,6 @@ 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)
@@ -778,33 +699,11 @@ Friend Module CamAuto
       Return True
    End Function
 
-   Friend Function IsExitPreCut(nOperId As Integer) As Boolean
-      ' Deve essere una lavorazione
-      If Not EgtSetCurrMachining(nOperId) Then Return False
-      ' Verifico presenza Info di PreCut
-      Return EgtExistsInfo(nOperId, INFO_MCH_EPC)
-   End Function
-
-   Friend Function RemoveAllExitPreCuts() As Boolean
-      Dim nOperId As Integer = EgtGetFirstOperation()
-      While nOperId <> GDB_ID.NULL
-         Dim nNextOperId As Integer = EgtGetNextOperation( nOperId)
-         If EgtGetType( nOperId) <> MCH_OY.DISP AndAlso EgtExistsInfo(nOperId, INFO_MCH_EPC) Then
-            EgtRemoveOperation( nOperId)
-         End If
-         nOperId = nNextOperId
-      End While
-      Return True
-   End Function
-
    Private Function SetLuaStandardCamParams(Optional bDripOk As Boolean = True) As Boolean
-      Dim sMaterial As String = m_MainWindow.m_CurrentMachine.CurrMat.sName
       Dim sSawMch As String = m_MainWindow.m_CurrentMachine.sCurrSawing
       Dim sMillMch As String = m_MainWindow.m_CurrentMachine.sCurrMilling
       Dim sDrillMch As String = m_MainWindow.m_CurrentMachine.sCurrDrilling
       Dim sWaterJetMch As String = m_MainWindow.m_CurrentMachine.sCurrWaterJetting
-      Dim sWaterJetQual As String = m_MainWindow.m_CurrentMachine.sCurrWaterJettingQuality
-      Dim sPocketMch As String = m_MainWindow.m_CurrentMachine.sCurrPocketing
       Dim sDripSawMch As String = If(bDripOk, m_MainWindow.m_CurrentMachine.sCurrDripSawing, "")
       Dim sDripDrillMch As String = If(bDripOk, m_MainWindow.m_CurrentMachine.sCurrDripDrilling, "")
       Dim dReducedDepth As Double = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_REDUCEDDEPTH, 1, m_MainWindow.GetMachIniFile())
@@ -816,13 +715,10 @@ Friend Module CamAuto
       Dim bMillingOnCorners As Boolean = (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0)
       Dim bMillingOnSinks As Boolean = (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0)
       Dim dMillingShort As Double = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_MILLING_SHORTENING, 0, m_MainWindow.GetMachIniFile())
-      EgtLuaSetGlobStringVar("CAM.MATERIAL", sMaterial)
       EgtLuaSetGlobStringVar("CAM.SAWMCH", sSawMch)
       EgtLuaSetGlobStringVar("CAM.MILLMCH", sMillMch)
       EgtLuaSetGlobStringVar("CAM.DRILLMCH", sDrillMch)
-      EgtLuaSetGlobStringVar("CAM.POCKETMCH", sPocketMch)
       EgtLuaSetGlobStringVar("CAM.WATERJETMCH", sWaterJetMch)
-      EgtLuaSetGlobStringVar("CAM.WATERJETQLTY", sWaterJetQual)
       EgtLuaSetGlobStringVar("CAM.DRIPSAWMCH", sDripSawMch)
       EgtLuaSetGlobStringVar("CAM.DRIPDRILLMCH", sDripDrillMch)
       EgtLuaSetGlobNumVar("CAM.REDUCEDDEPTH", dReducedDepth)

CadCuts/CSVFile.vb

@@ -1,5 +1,5 @@
 Imports EgtUILib
-Imports System.IO
+
 
 Friend Module CSVFile
 
@@ -7,7 +7,6 @@ Friend Module CSVFile
 
    '-----------------------------------------------------------------------------------------------
    Friend Class CsvPart
-      Public m_sPath As String = String.Empty
       Public m_sName As String = String.Empty
       Public m_sOrd As String = String.Empty
       Public m_sDist As String = String.Empty
@@ -20,20 +19,8 @@ Friend Module CSVFile
       Public m_dDimX As Double = 0
       Public m_dDimY As Double = 0
       Public m_dTh As Double = 0
-      Public m_dAng1 As Double = 0
-      Public m_dHeel1 As Double = 0
-      Public m_dAng2 As Double = 0
-      Public m_dHeel2 As Double = 0
-      Public m_dAng3 As Double = 0
-      Public m_dHeel3 As Double = 0
-      Public m_dAng4 As Double = 0
-      Public m_dHeel4 As Double = 0
       Public m_nOriInd As Integer = 0
       Public m_nId As Integer = GDB_ID.NULL
-      ' definsco il riferimento al gruppo
-      Public m_sRefGuid As String = System.Guid.NewGuid.ToString
-      ' definisco il colore del gruppo che sto inserendo
-      Public m_cColor As Color3d = CompoColor(m_MainWindow.GetIniFile())
    End Class
 
    '-----------------------------------------------------------------------------------------------
@@ -64,7 +51,6 @@ Friend Module CSVFile
       For i As Integer = 1 To nNbr
          Dim OnePart As New CsvPart
          Dim sN As String = i.ToString()
-         OnePart.m_sPath = sFile
          EgtLuaGetGlobStringVar("CSV.NAME" & sN, OnePart.m_sName)
          OnePart.m_bActive = True
          EgtLuaGetGlobStringVar("CSV.ORD" & sN, OnePart.m_sOrd)
@@ -76,18 +62,7 @@ Friend Module CSVFile
          EgtLuaGetGlobNumVar("CSV.DIMX" & sN, OnePart.m_dDimX)
          EgtLuaGetGlobNumVar("CSV.DIMY" & sN, OnePart.m_dDimY)
          EgtLuaGetGlobNumVar("CSV.TH" & sN, OnePart.m_dTh)
-         EgtLuaGetGlobNumVar("CSV.A1_" & sN, OnePart.m_dAng1)
-         EgtLuaGetGlobNumVar("CSV.H1_" & sN, OnePart.m_dHeel1)
-         EgtLuaGetGlobNumVar("CSV.A2_" & sN, OnePart.m_dAng2)
-         EgtLuaGetGlobNumVar("CSV.H2_" & sN, OnePart.m_dHeel2)
-         EgtLuaGetGlobNumVar("CSV.A3_" & sN, OnePart.m_dAng3)
-         EgtLuaGetGlobNumVar("CSV.H3_" & sN, OnePart.m_dHeel3)
-         EgtLuaGetGlobNumVar("CSV.A4_" & sN, OnePart.m_dAng4)
-         EgtLuaGetGlobNumVar("CSV.H4_" & sN, OnePart.m_dHeel4)
          OnePart.m_nOriInd = i
-         If OnePart.m_nCount > 1 Then
-            OnePart.m_sRefGuid = System.Guid.NewGuid.ToString
-         End If
          ' inserisco in lista
          CsvPartList.Add(OnePart)
       Next
@@ -148,9 +123,7 @@ Friend Module CSVFile
             Else
                Dim sItems() As String = sLine.Split("=".ToCharArray)
                If sItems.Count() >= 2 Then
-                  If sItems(0) = "Path" Then
-                     OnePart.m_sPath = sItems(1)
-                  ElseIf sItems(0) = "Nam" Then
+                  If sItems(0) = "Nam" Then
                      OnePart.m_sName = sItems(1)
                   ElseIf sItems(0) = "Ord" Then
                      OnePart.m_sOrd = sItems(1)
@@ -174,26 +147,8 @@ Friend Module CSVFile
                      StringToDouble(sItems(1), OnePart.m_dDimY)
                   ElseIf sItems(0) = "Th" Then
                      StringToDouble(sItems(1), OnePart.m_dTh)
-                  ElseIf sItems(0) = "A1" Then
-                     StringToDouble(sItems(1), OnePart.m_dAng1)
-                  ElseIf sItems(0) = "H1" Then
-                     StringToDouble(sItems(1), OnePart.m_dHeel1)
-                  ElseIf sItems(0) = "A2" Then
-                     StringToDouble(sItems(1), OnePart.m_dAng2)
-                  ElseIf sItems(0) = "H2" Then
-                     StringToDouble(sItems(1), OnePart.m_dHeel2)
-                  ElseIf sItems(0) = "A3" Then
-                     StringToDouble(sItems(1), OnePart.m_dAng3)
-                  ElseIf sItems(0) = "H3" Then
-                     StringToDouble(sItems(1), OnePart.m_dHeel3)
-                  ElseIf sItems(0) = "A4" Then
-                     StringToDouble(sItems(1), OnePart.m_dAng4)
-                  ElseIf sItems(0) = "H4" Then
-                     StringToDouble(sItems(1), OnePart.m_dHeel4)
                   ElseIf sItems(0) = "OIn" Then
                      StringToInt(sItems(1), OnePart.m_nOriInd)
-                  ElseIf sItems(0) = "Guid" Then
-                     OnePart.m_sRefGuid = sItems(1).Trim
                   End If
                End If
             End If
@@ -221,7 +176,6 @@ Friend Module CSVFile
          For i As Integer = 1 To CsvPartList.Count()
             Dim CurrPart As CsvPart = CsvPartList(i - 1)
             Writer.WriteLine("[P" & i.ToString() & "]")
-            Writer.WriteLine("Path=" & CurrPart.m_sPath)
             Writer.WriteLine("Nam=" & CurrPart.m_sName)
             Writer.WriteLine("Ord=" & CurrPart.m_sOrd)
             Writer.WriteLine("Dist=" & CurrPart.m_sDist)
@@ -234,53 +188,20 @@ Friend Module CSVFile
             Writer.WriteLine("DX=" & DoubleToString(CurrPart.m_dDimX, 4))
             Writer.WriteLine("DY=" & DoubleToString(CurrPart.m_dDimY, 4))
             Writer.WriteLine("Th=" & DoubleToString(CurrPart.m_dTh, 4))
-            Writer.WriteLine("A1=" & DoubleToString(CurrPart.m_dAng1, 4))
-            Writer.WriteLine("H1=" & DoubleToString(CurrPart.m_dHeel1, 4))
-            Writer.WriteLine("A2=" & DoubleToString(CurrPart.m_dAng2, 4))
-            Writer.WriteLine("H2=" & DoubleToString(CurrPart.m_dHeel2, 4))
-            Writer.WriteLine("A3=" & DoubleToString(CurrPart.m_dAng3, 4))
-            Writer.WriteLine("H3=" & DoubleToString(CurrPart.m_dHeel3, 4))
-            Writer.WriteLine("A4=" & DoubleToString(CurrPart.m_dAng4, 4))
-            Writer.WriteLine("H4=" & DoubleToString(CurrPart.m_dHeel4, 4))
             Writer.WriteLine("OIn=" & CurrPart.m_nOriInd.ToString())
-            Writer.WriteLine("Guid=" & CurrPart.m_sRefGuid)
          Next
          ' Terminatore
          Writer.WriteLine("[END]")
          ' Chiudo file
          Writer.Close()
          Return True
-         ' Errore
+      ' Errore
       Catch ex As Exception
          EgtOutLog("CSV List error writing " & sFile)
          Return False
       End Try
    End Function
 
-   ' dato l'elenco completo dei file salvo ogni singolo epl 
-   Friend Function WriteCsvMergePartList(CsvPartList As List(Of CsvPart)) As Boolean
-      Dim bOk As Boolean = True
-      Dim LocalPartList As New List(Of CsvPart)
-      Dim Index As Integer = 0
-      ' devo dividere la lista in tante parti quanti sono i file che lo costituiscono
-      While Index < CsvPartList.Count
-         Dim CurrFile As String = CsvPartList(Index).m_sPath
-         Dim sFile As String = Path.ChangeExtension(CurrFile, ".epl")
-         LocalPartList.Clear()
-         While CurrFile = CsvPartList(Index).m_sPath
-            LocalPartList.Add(CsvPartList(Index))
-            Index += 1
-            ' se terminata la lista
-            If Index = CsvPartList.Count Then
-               Exit While
-            End If
-         End While
-         ' salvo l'elenco corrente
-         bOk = WriteCsvPartList(sFile, CurrFile, LocalPartList) And bOk
-      End While
-      Return bOk
-   End Function
-
    Friend Function RemoveNotToNestParts(ByRef CsvPartList As List(Of CsvPart)) As Boolean
       For i As Integer = CsvPartList.Count() - 1 To 0 Step -1
          If CsvPartList(i).m_nToNest = 0 Then

CadCuts/CSVPage.xaml.vb

@@ -11,7 +11,7 @@ Public Class CSVPage
    Private WithEvents m_CurrProjPage As CurrentProjectPageUC
    ' Flag di pagina attiva
    Private m_bActive As Boolean = False
-   ' Flag tipologia (False -> Cvs semplificato)
+   ' Flag tipologia
    Private m_bFull As Boolean = False
    ' Flag inserimento diretto
    Private m_bDirect As Boolean = True
@@ -28,10 +28,6 @@ Public Class CSVPage
    Private m_ptRawMin As Point3d
    Private m_ptRawMax As Point3d
 
-   Dim m_bIsCounterLy As Boolean = False
-   Dim m_nCurrNubrOfParts As Integer = 0
-   Dim m_nIdToSel As Integer = GDB_ID.NULL
-
    Private Sub CSVPage_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Assegno la lista dei pezzi Csv come sorgente del treeview
       PartsTreeView.ItemsSource = m_ItemsList
@@ -105,36 +101,13 @@ Public Class CSVPage
          If EgtIsPart(nPartId) Or bPartInTable Then
             Dim nStat As Integer = GDB_ST.ON_
             EgtGetStatus(nPartId, nStat)
-
-            ' verifico se l'lemento selezionato è il numero di pezzi
-            If EgtGetType(nId) = GDB_TY.EXT_TEXT Then
-               Dim NameLayer As String = String.Empty
-               EgtGetName(EgtGetParent(nId), NameLayer)
-               If NameLayer = INFO_COUNTERLY Then
-                  Dim sText As String = String.Empty
-                  If EgtTextGetContent(nId, sText) Then
-                     Dim sItems() As String = sText.Split("#")
-                     If sItems.Count > 1 Then
-                        m_nCurrNubrOfParts = 0
-                        If StringToInt(sItems(1), m_nCurrNubrOfParts) And m_nCurrNubrOfParts > 0 Then
-                           m_bIsCounterLy = True
-                           m_nIdToSel = nPartId
-                        End If
-                     End If
-                  End If
-               End If
+            ' Se già selezionato, lo deselezione
+            If nStat = GDB_ST.SEL Then
+               EgtDeselectObj(nPartId)
+            ' Altrimenti lo seleziono
+            Else
+               EgtSelectObj(nPartId)
             End If
-
-            If Not m_bIsCounterLy Then
-               ' Se già selezionato, lo deselezione
-               If nStat = GDB_ST.SEL Then
-                  EgtDeselectObj(nPartId)
-                  ' Altrimenti lo seleziono
-               Else
-                  EgtSelectObj(nPartId)
-               End If
-            End If
-
             Exit While
          End If
          nId = EgtGetNextObjInSelWin()
@@ -142,28 +115,6 @@ Public Class CSVPage
       EgtDraw()
    End Sub
 
-   Private Sub OnMyMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseUpScene
-      If m_bIsCounterLy Then
-         ' apro una finestra di dialogo per chiedere se inserire tutti i pezzi della famiglia
-         Dim SelectWD As New SelectPartFromFamilyWD(m_MainWindow, m_nCurrNubrOfParts)
-         Dim sRefGroup As String = String.Empty
-         EgtGetInfo(m_nIdToSel, INFO_REFGROUP, sRefGroup)
-         ' deseleziono il pezzo corrente
-         m_MainWindow.m_CadCutPageUC.m_NestPage.DeselectPartInFaimily(sRefGroup)
-         Select Case SelectWD.NumberOfSelection
-            Case 0    ' Annulla
-               ' continuo senza eseguire niente
-            Case Else
-               ' seleziono il numero di pezzi indicati
-               m_MainWindow.m_CadCutPageUC.m_NestPage.SelectPartInFaimily(sRefGroup, SelectWD.NumberOfSelection)
-         End Select
-         m_bIsCounterLy = False
-         ' disassegno il riferimento all'oggetto appena creato
-         SelectWD = Nothing
-         EgtDraw()
-      End If
-   End Sub
-
    Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
       m_MainWindow.m_CadCutPageUC.CadCutPageGrid.Children.Remove(Me)
       m_MainWindow.m_CadCutPageUC.CadCutPageGrid.Children.Add(m_MainWindow.m_CadCutPageUC.m_NestPage)
@@ -182,48 +133,15 @@ Public Class CSVPage
       WritePrivateProfileString(S_CSV, K_CSVLASTFILE, "", m_MainWindow.GetIniFile())
    End Sub
 
-   Private Function CreateListOfDeniedFiles() As List(Of String)
-      Dim LocalList As New List(Of String)
-      LocalList.Add("MERGE")
-      Dim Index1 As Integer = 0
-      Dim Index2 As Integer = 0
-      For Index1 = 0 To m_CsvPartList.Count - 1
-         Dim sFileName As String = m_CsvPartList(Index1).m_sPath
-         sFileName = Path.GetFileNameWithoutExtension(sFileName).ToUpper.Trim()
-         Dim bNewFile As Boolean = True
-         For Index2 = 0 To LocalList.Count - 1
-            If sFileName = LocalList(Index2) Then
-               bNewFile = False
-               Exit For
-            End If
-         Next
-         If bNewFile Then
-            LocalList.Add(Path.GetFileNameWithoutExtension(sFileName).ToUpper.Trim)
-         End If
-      Next
-      Return LocalList
-   End Function
-
    Private Sub OpenBtn_Click(sender As Object, e As RoutedEventArgs) Handles OpenBtn.Click
-      '' Salvo lista dei pezzi attuale
-      'SaveCsvPartList()
+      ' Salvo lista dei pezzi attuale
+      SaveCsvPartList()
       ' Leggo direttorio corrente dei file CSV
       Dim sCurrDir As String = ""
       GetPrivateProfileString(S_CSV, K_CSVCURRDIR, "C:\", sCurrDir, m_MainWindow.GetIniFile())
       ' Apro dialogo scelta file
-      Dim OpenFileWnd As OpenFileWD
-      Dim sDeniedFiles As List(Of String) = CreateListOfDeniedFiles()
-      ' imposto il filtro
-      If m_bFull Then
-         OpenFileWnd = New OpenFileWD(m_MainWindow, sCurrDir, ".CSV", ".EPL", sDeniedFiles)
-      Else
-         OpenFileWnd = New OpenFileWD(m_MainWindow, sCurrDir, ".CSV")
-      End If
+      Dim OpenFileWnd As New OpenFileWD(m_MainWindow, sCurrDir, ".CSV", ".EPL")
       If Not OpenFileWnd.ShowDialog() Then Return
-      ' verifico che il file inserito non appartenga al Merge attuale
-
-      ' Salvo lista dei pezzi attuale
-      SaveCsvPartList()
       ' Salvo direttorio corrente
       WritePrivateProfileString(S_CSV, K_CSVCURRDIR, OpenFileWnd.GetFileDir(), m_MainWindow.GetIniFile())
       ' Apertura file
@@ -255,28 +173,17 @@ Public Class CSVPage
       ' Pulisco path e lista dei pezzi Csv
       m_sFilePath = String.Empty
       m_sCsvPath = String.Empty
-
-      ' mantengo la lista attuale dei pezzi
-      'm_CsvPartList.Clear()
-
-      ' aggiungo i pezzi su una lista temporanea
-      Dim LocalPartList As New List(Of CsvPart)
+      m_CsvPartList.Clear()
       ' Eseguo la lettura del file Csv
-      If Not ReadCsvFile(sCsvPath, m_bFull, m_sCsvPath, LocalPartList) Then
+      If Not ReadCsvFile(sCsvPath, m_bFull, m_sCsvPath, m_CsvPartList) Then
          m_CurrProjPage.SetErrorMessage(EgtMsg(91206))    'Errore nella lettura del file CSV
          Return False
       End If
-
-      ' Creo un nuovo file che ospitarà il merge de
-      Dim sNewMergeFile As String = Path.GetDirectoryName(m_sCsvPath) & "\Merge.csv"
-      m_sCsvPath = sNewMergeFile
       m_sFilePath = m_sCsvPath
-
       ' Elimino pezzi nulli
-      RemoveWrongParts(LocalPartList)
+      RemoveWrongParts(m_CsvPartList)
       ' Aggiorno
       If m_bFull Then
-         MySaveCsvPartList(LocalPartList)
          ' Salvo come epl
          SaveCsvPartList()
          ' Rinomino file originale
@@ -289,40 +196,9 @@ Public Class CSVPage
          ' eseguo rinomina
          My.Computer.FileSystem.RenameFile(sCsvPath, sBakName)
       End If
-      ' attacco i nuovi pezzi alla lista corrente
-      For Each Item As CsvPart In LocalPartList
-         m_CsvPartList.Add(Item)
-      Next
       Return True
    End Function
 
-   Private Sub LoadCsvPartList(sFile As String)
-      ' Se Csv semplificato non va letta
-      If Not m_bFull Then Return
-      ' Pulisco path e lista dei pezzi Csv
-      m_sCsvPath = String.Empty
-
-      ' mantengo la lista attuale dei pezzi
-      'm_CsvPartList.Clear()
-
-      ' aggiungo i pezzi su una lista temporanea
-      Dim LocalPartList As New List(Of CsvPart)
-
-      ' Lettura del file
-      If ReadCsvPartList(sFile, m_sCsvPath, LocalPartList) Then
-         ' Creo un nuovo file che ospitarà il merge de
-         Dim sNewMergeFile As String = Path.GetDirectoryName(m_sCsvPath) & "\Merge.csv"
-         m_sCsvPath = sNewMergeFile
-         m_sFilePath = m_sCsvPath
-      End If
-      ' Elimino pezzi nulli
-      RemoveWrongParts(LocalPartList)
-      ' attacco i nuovi pezzi alla lista corrente
-      For Each Item As CsvPart In LocalPartList
-         m_CsvPartList.Add(Item)
-      Next
-   End Sub
-
    Private Sub ShowTreeView()
       ' Path del file Csv
       Dim TempPath As New Text.StringBuilder(260)
@@ -332,7 +208,6 @@ Public Class CSVPage
       m_ItemsList.Clear()
       Dim sCurrMat As String = String.Empty
       Dim dCurrTh As Double = 0
-      Dim sCurrPath As String = String.Empty
       Dim nCatToNest As Integer = 0
       Dim nCatCount As Integer = 0
       Dim PartCathegory As New PartCathegoryItem("", 0)
@@ -343,28 +218,19 @@ Public Class CSVPage
          If i = 1 Then
             sCurrMat = CurrPart.m_sMaterial
             dCurrTh = CurrPart.m_dTh
-            sCurrPath = CurrPart.m_sPath
          ElseIf String.Compare(sCurrMat, CurrPart.m_sMaterial, True) <> 0 Or
-                String.Compare(sCurrPath, CurrPart.m_sPath, True) <> 0 Or
                 Math.Abs(dCurrTh - CurrPart.m_dTh) > 10 * EPS_SMALL Then
             If m_bFull Then
                PartCathegory.Name = If(String.IsNullOrWhiteSpace(sCurrMat), "***", sCurrMat) &
                                     " - " & LenToString(dCurrTh, 2) &
                                     " - " & nCatToNest.ToString() & "/" & nCatCount.ToString()
-               If Not String.IsNullOrWhiteSpace(sCurrPath) Then
-                  PartCathegory.Name &= vbCrLf & Path.GetFileNameWithoutExtension(sCurrPath)
-               End If
             Else
                PartCathegory.Name = nCatToNest.ToString() & "/" & nCatCount.ToString()
-               If Not String.IsNullOrWhiteSpace(sCurrPath) Then
-                  PartCathegory.Name &= vbCrLf & Path.GetFileNameWithoutExtension(sCurrPath)
-               End If
             End If
             PartCathegory.IsExpanded = True
             m_ItemsList.Add(PartCathegory)
             sCurrMat = CurrPart.m_sMaterial
             dCurrTh = CurrPart.m_dTh
-            sCurrPath = CurrPart.m_sPath
             PartCathegory = New PartCathegoryItem("", 0)
             nCatToNest = 0
             nCatCount = 0
@@ -382,14 +248,8 @@ Public Class CSVPage
          PartCathegory.Name = If(String.IsNullOrWhiteSpace(sCurrMat), "***", sCurrMat) &
                               " - " & LenToString(dCurrTh, 2) &
                               " - " & nCatToNest.ToString() & "/" & nCatCount.ToString()
-         If Not String.IsNullOrWhiteSpace(sCurrPath) Then
-            PartCathegory.Name &= vbCrLf & Path.GetFileNameWithoutExtension(sCurrPath)
-         End If
       Else
          PartCathegory.Name = nCatToNest.ToString() & "/" & nCatCount.ToString()
-         If Not String.IsNullOrWhiteSpace(sCurrPath) Then
-            PartCathegory.Name &= vbCrLf & Path.GetFileNameWithoutExtension(sCurrPath)
-         End If
       End If
       PartCathegory.IsExpanded = True
       m_ItemsList.Add(PartCathegory)
@@ -399,7 +259,6 @@ Public Class CSVPage
       For Each CatItem As PartCathegoryItem In m_ItemsList
          Dim sCurrMat As String = String.Empty
          Dim dCurrTh As Double = 0
-         Dim sCurrPath As String = String.Empty
          Dim nCatToNest As Integer = 0
          Dim nCatCount As Integer = 0
          For Each PrtItem As PartCustomItem In CatItem.Items
@@ -409,7 +268,6 @@ Public Class CSVPage
             PrtItem.sText1 = sCount
             sCurrMat = PartData.m_sMaterial
             dCurrTh = PartData.m_dTh
-            sCurrPath = PartData.m_sPath
             nCatToNest += PartData.m_nToNest
             nCatCount += PartData.m_nCount
          Next
@@ -417,14 +275,8 @@ Public Class CSVPage
             CatItem.Name = If(String.IsNullOrWhiteSpace(sCurrMat), "***", sCurrMat) &
                            " - " & LenToString(dCurrTh, 2) &
                            " - " & nCatToNest.ToString() & "/" & nCatCount.ToString()
-            If Not String.IsNullOrWhiteSpace(sCurrPath) Then
-               CatItem.Name &= vbCrLf & Path.GetFileNameWithoutExtension(sCurrPath)
-            End If
          Else
             CatItem.Name = nCatToNest.ToString() & "/" & nCatCount.ToString()
-            If Not String.IsNullOrWhiteSpace(sCurrPath) Then
-               CatItem.Name &= vbCrLf & Path.GetFileNameWithoutExtension(sCurrPath)
-            End If
          End If
       Next
    End Sub
@@ -493,7 +345,6 @@ Public Class CSVPage
    End Function
 
    Private Sub InsertBtn_Click(sender As Object, e As RoutedEventArgs) Handles InsertBtn.Click
-      'm_CurrProjPage.ClearMessage()
       ' Recupero lo spessore della lastra corrente
       Dim dRawHeight As Double = GetRawHeight()
       If dRawHeight < EPS_SMALL Then Return
@@ -504,17 +355,20 @@ Public Class CSVPage
       End If
       ' Recupero la tolleranza sullo spessore
       Dim dToler As Double = GetPrivateProfileDouble(S_CSV, K_THICKTOLERANCE, 100 * EPS_SMALL, m_MainWindow.GetIniFile())
-      dToler = Math.Max(dToler, 100 * EPS_SMALL)
+      dToler = Math.Max( dToler, 100 * EPS_SMALL)
       ' Creo la lista dei pezzi inseribili nella lastra corrente
       Dim InsPartList As New List(Of CsvPart)
       For i As Integer = 1 To m_CsvPartList.Count()
          Dim CurrPart As CsvPart = m_CsvPartList(i - 1)
          If CurrPart.m_bActive And
-            (Math.Abs(CurrPart.m_dTh - dRawHeight) < dToler Or CurrPart.m_dTh < EPS_SMALL) And
-            (String.IsNullOrWhiteSpace(CurrPart.m_sMaterial) Or String.IsNullOrWhiteSpace(sCurrMat) Or CurrPart.m_sMaterial = "***" Or sCurrMat = "***" Or String.Compare(CurrPart.m_sMaterial, sCurrMat, True) = 0) Then
+            (Math.Abs(CurrPart.m_dTh - dRawHeight) < dToler Or
+              CurrPart.m_dTh < EPS_SMALL) And
+            (String.IsNullOrWhiteSpace(CurrPart.m_sMaterial) Or
+             String.IsNullOrWhiteSpace(sCurrMat) Or
+             CurrPart.m_sMaterial = "***" Or
+             sCurrMat = "***" Or
+             String.Compare(CurrPart.m_sMaterial, sCurrMat, True) = 0) Then
             InsPartList.Add(CurrPart)
-            'ElseIf CurrPart.m_bActive Then
-            '   m_CurrProjPage.SetWarningMessage("Grezzo non compatibile")
          End If
       Next
       ' Lancio l'inserimento dei pezzi
@@ -570,14 +424,10 @@ Public Class CSVPage
          ' Definizione variabili
          Dim dDimX = CurrPart.m_dDimX
          Dim dDimY = CurrPart.m_dDimY
-         Dim dAng = New Double() {CurrPart.m_dAng1,CurrPart.m_dAng2,CurrPart.m_dAng3,CurrPart.m_dAng4}
-         Dim dHeel = New Double() {CurrPart.m_dHeel1,CurrPart.m_dHeel2,CurrPart.m_dHeel3,CurrPart.m_dHeel4}
          If bMaxDimOnX And dDimY > dDimX Then
             Dim dTemp As Double = dDimX
             dDimX = dDimY
             dDimY = dTemp
-            dAng = New Double() {CurrPart.m_dAng2,CurrPart.m_dAng3,CurrPart.m_dAng4,CurrPart.m_dAng1}
-            dHeel = New Double() {CurrPart.m_dHeel2,CurrPart.m_dHeel3,CurrPart.m_dHeel4,CurrPart.m_dHeel1}
          End If
          EgtLuaSetGlobNumVar("CMP.V1", dDimX)
          EgtLuaSetGlobNumVar("CMP.V2", dDimY)
@@ -589,7 +439,7 @@ Public Class CSVPage
          If nId = GDB_ID.NULL Then Continue For
          CurrPart.m_nId = nId
          ' Muovo la regione in Z per evitare problemi in visualizzazione
-         Dim nRegId As Integer = EgtGetFirstNameInGroup(nId, NAME_REGION)
+         Dim nRegId = EgtGetFirstNameInGroup(nId, NAME_REGION)
          EgtMove(nRegId, New Vector3d(0, 0, DELTAZ_REG), GDB_RT.GLOB)
          ' Eventuale testo per indicare il sopra
          If Not bMaxDimOnX Then
@@ -597,36 +447,11 @@ Public Class CSVPage
             Dim nText As Integer = EgtCreateTextAdv(nRegId, New Point3d(dDimX / 2, dDimY - 0.6 * dH, 0), 0, "*TOP*", "", 500, False, dH, 1, 0, INS_POS.MC)
             EgtSetColor(nText, New Color3d( 0, 0, 0))
          End If
-         ' Inserisco eventuali angoli di fianco
-         Dim bSideAngs As Boolean = False
-         Dim nOutLoopId As Integer = EgtGetFirstNameInGroup( nId, NAME_OUTLOOP)
-         For nSide As Integer = 1 To 4
-            Dim dSideAng As Double = dAng( nSide - 1)
-            Dim dSideHeel As Double = dHeel( nSide - 1)
-            If Math.Abs( dSideAng) > EPS_ANG_SMALL Then
-               Dim nEntId As Integer = EgtGetFirstNameInGroup( nOutLoopId, "A" & nSide.ToString())
-               If nEntId <> GDB_ID.NULL Then
-                  bSideAngs = True
-                  ' Assegno valori
-                  EgtSetInfo(nEntId, INFO_SIDE_ANGLE, dSideAng)
-                  EgtSetInfo(nEntId, INFO_ORIG_SIDE_ANGLE, dSideAng)
-                  EgtSetInfo(nEntId, INFO_HEEL, dSideHeel)
-               End If
-            End If
-         Next
-         ' Creo layer per testi nesting
-         If bSideAngs Then
-            Dim TextLayId As Integer = EgtCreateGroup(nId)
-            EgtSetName(TextLayId, SIDE_ANGLE_LAYER)
-            EgtSetColor(TextLayId, New Color3d(0, 0, 128))
-            ' Opero su geometria esterna pezzo
-            SideAngle.WriteSideAngleOnLoop(nOutLoopId, TextLayId)
-         End If
          ' Aggiusto per lavorazioni
          EgtAdjustFlatPart(nId)
          ' Se Csv completo, aggiungo info su CSV di origine
          If m_bFull Then
-            EgtSetInfo(nId, INFO_CSV_PATH, CurrPart.m_sPath)
+            EgtSetInfo(nId, INFO_CSV_PATH, m_sCsvPath)
             EgtSetInfo(nId, INFO_CSV_PART, CurrPart.m_sName)
             EgtSetInfo(nId, INFO_CSV_ORD, CurrPart.m_sOrd)
             EgtSetInfo(nId, INFO_CSV_DIST, CurrPart.m_sDist)
@@ -636,36 +461,14 @@ Public Class CSVPage
          Utility.SetTextColor( nRegId)
          ' Lo sposto nel gruppo speciale
          EgtRelocate(nId, nIpGrp)
-
-
-         ' assegno l'identificatico del pezzo, se esiste
-         If Not String.IsNullOrEmpty(CurrPart.m_sRefGuid) Then
-            ' GuidCode dovrebbe contenere 36 caratteri, il precode 5: tot = 41
-            If CurrPart.m_sRefGuid.Count <= 36 Then
-               Dim sPreGuid As String = CreatePreGuidCode(CurrPart.m_nId)
-               CurrPart.m_sRefGuid = sPreGuid & CurrPart.m_sRefGuid
-            End If
-            EgtSetInfo(CurrPart.m_nId, INFO_REFGROUP, CurrPart.m_sRefGuid)
-         End If
-         Dim nRegLayId As Integer = EgtGetFirstNameInGroup(CurrPart.m_nId, NAME_REGION)
-         ' Imposto il colore del pezzo inserito nel progetto
-         EgtSetColor(nRegLayId, CurrPart.m_cColor)
-         Dim EntId As Integer = EgtGetFirstInGroup(nRegLayId)
-         While EntId <> GDB_ID.NULL
-            If EgtGetType(EntId) = GDB_TY.SRF_FRGN Then EgtSetColor(EntId, CurrPart.m_cColor)
-            EntId = EgtGetNext(EntId)
-         End While
-
       Next
       EgtLuaResetGlobVar("CMP")
       EgtLuaResetGlobVar("CMP_Draw")
-
       ' Provo ad inserire i pezzi
       Dim dNewArea As Double = 0
       For i As Integer = 1 To InsPartList.Count()
          Dim CurrPart As CsvPart = InsPartList(i - 1)
          While CurrPart.m_nToNest > 0
-
             If m_bDirect Then
                If NestOnePart(CurrPart.m_nId) Then
                   dNewArea += GeomCalc.GetPartArea(CurrPart.m_nId)
@@ -687,7 +490,6 @@ Public Class CSVPage
       m_CurrProjPage.UpdateTotalArea( dNewArea)
       m_CurrProjPage.UpdateToProduceArea()
       m_MainWindow.m_CurrentProjectPageUC.ShowAreas()
-
       Return True
    End Function
 
@@ -764,11 +566,11 @@ Public Class CSVPage
       Dim sName As String = String.Empty
       EgtGetInfo(nId, INFO_CSV_PART, sName)
       ' Verifico che il pezzo appartenga a questo Csv
-      If SearchCurrCSV(sCsvPath) Then
+      If String.Compare(sCsvPath, m_sCsvPath, True) = 0 Then
          ' Cerco il pezzo nella lista dei pezzi
-         For i As Integer = 1 To m_CsvPartList.Count()
+         For i = 1 To m_CsvPartList.Count()
             Dim CurrPart As CsvPart = m_CsvPartList(i - 1)
-            If String.Compare(sName, CurrPart.m_sName, True) = 0 And String.Compare(sCsvPath, CurrPart.m_sPath, True) = 0 Then
+            If String.Compare(sName, CurrPart.m_sName, True) = 0 Then
                ' Se nel grezzo
                If EgtGetParent(nId) = m_nRawId Then
                   ' Rimuovo le lavorazioni
@@ -776,38 +578,19 @@ Public Class CSVPage
                   ' Rimuovo dal grezzo
                   EgtRemovePartFromRawPart(nId)
                End If
-               ' recupero il Guid del pezzo corrente (potrebbe essere stato modificato a causa di rotazioni quando il pezzo è passato in parcheggio)
-               Dim sCurrRefGuid As String = String.Empty
-               EgtGetInfo(nId, INFO_REFGROUP, sCurrRefGuid)
                ' Cancello il pezzo
                EgtErase(nId)
-               ' aggiorno il layer che indica il numero di pezzi in parcheggio (se sRefGroup<>"")
-               m_MainWindow.m_CadCutPageUC.m_NestPage.CountPartInFamily(sCurrRefGuid)
                ' Aggiorno il contatore
                CurrPart.m_nToNest += 1
-               ' ricreo la lista delle famiglie di pezzi presenti in parcheggio
-               m_MainWindow.m_CadCutPageUC.m_NestPage.GetFamilyGroupInPark()
                ' Esco
                Return True
             End If
          Next
       End If
-      ' creo la lista delle famiglie di pezzi presenti in parcheggio
-      m_MainWindow.m_CadCutPageUC.m_NestPage.GetFamilyGroupInPark()
       ' Pezzo non appartenente al Csv corrente
       Return False
    End Function
 
-   Private Function SearchCurrCSV(ByVal sCSVFile As String) As Boolean
-      For i As Integer = 1 To m_CsvPartList.Count()
-         Dim CurrPart As CsvPart = m_CsvPartList(i - 1)
-         If String.Compare(sCSVFile, CurrPart.m_sPath, True) = 0 Then
-            Return True
-         End If
-      Next
-      Return False
-   End Function
-
    Friend Sub SaveCsvPartList()
       ' Se Csv semplificato non va salvata
       If Not m_bFull Then Return
@@ -818,33 +601,24 @@ Public Class CSVPage
       End If
       ' Path del file
       Dim sFile As String = Path.ChangeExtension(m_sFilePath, ".epl")
-      ' Scrittura dei file
-      If WriteCsvMergePartList(m_CsvPartList) Then
-         ' Scrittura dei file Merge
-         If WriteCsvPartList(sFile, m_sCsvPath, m_CsvPartList) Then
-            WritePrivateProfileString(S_CSV, K_CSVLASTFILE, sFile, m_MainWindow.GetIniFile())
-         End If
+      ' Scrittura del file
+      If WriteCsvPartList(sFile, m_sCsvPath, m_CsvPartList) Then
+         ' Registro in ini path
+         WritePrivateProfileString(S_CSV, K_CSVLASTFILE, sFile, m_MainWindow.GetIniFile())
       End If
    End Sub
 
-   ' salvo il sottoelenco dei pezzi
-   Friend Sub MySaveCsvPartList(ByVal CurrPartList As List(Of CsvPart))
-      ' Se Csv semplificato non va salvata
+   Private Sub LoadCsvPartList(sFile As String)
+      ' Se Csv semplificato non va letta
       If Not m_bFull Then Return
-      Dim sCurrPath As String = String.Empty
-      ' recupero dalla lista il nome del file corrente
-      For Each Item As CsvPart In CurrPartList
-         sCurrPath = Item.m_sPath
-      Next
-      ' se non trov il nome del file assocciato all'elenco di pezzi esco
-      If String.IsNullOrEmpty(sCurrPath) Then
-         EgtOutLog("CSV Curr list missing")
-         Return
-      End If
-      ' Path del file
-      Dim sFile As String = Path.ChangeExtension(sCurrPath, ".epl")
-      ' Scrittura del file
-      WriteCsvPartList(sFile, sCurrPath, CurrPartList)
+      ' Pulisco path e lista dei pezzi Csv
+      m_sCsvPath = String.Empty
+      m_CsvPartList.Clear()
+      ' Lettura del file
+      ReadCsvPartList(sFile, m_sCsvPath, m_CsvPartList)
+      m_sFilePath = sFile
+      ' Elimino pezzi nulli
+      RemoveWrongParts(m_CsvPartList)
    End Sub
 
    Friend Sub UpdateCsvPartList()

CadCuts/CadCutPageUC.xaml.vb

@@ -107,9 +107,6 @@ Public Class CadCutPageUC
 
    Private Sub PhotoBtn_Click(sender As Object, e As RoutedEventArgs) Handles PhotoBtn.Click
       m_MainWindow.TestOff()
-      m_MainWindow.DragRettangleOff()
-      m_MainWindow.SplitCurvWJOff()
-      m_MainWindow.StartCurvWJOff()
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
       ' Se macchina fotografica collegata, faccio una foto
@@ -143,9 +140,6 @@ Public Class CadCutPageUC
 
    Private Sub RawPartBtn_Click(sender As Object, e As RoutedEventArgs) Handles RawPartBtn.Click
       m_MainWindow.TestOff()
-      m_MainWindow.DragRettangleOff()
-      m_MainWindow.SplitCurvWJOff()
-      m_MainWindow.StartCurvWJOff()
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_RawPartPage)
@@ -171,9 +165,6 @@ Public Class CadCutPageUC
 
    Private Sub DrawBtn_Click(sender As Object, e As RoutedEventArgs) Handles DrawBtn.Click
       m_MainWindow.TestOff()
-      m_MainWindow.DragRettangleOff()
-      m_MainWindow.SplitCurvWJOff()
-      m_MainWindow.StartCurvWJOff()
       m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_CurrentProjectPageUC)
       m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_DrawPageUC)
       m_MainWindow.m_ActivePage = MainWindow.Pages.Draw
@@ -181,9 +172,6 @@ Public Class CadCutPageUC
 
    Private Sub ImportBtn_Click(sender As Object, e As RoutedEventArgs) Handles ImportBtn.Click
       m_MainWindow.TestOff()
-      m_MainWindow.DragRettangleOff()
-      m_MainWindow.SplitCurvWJOff()
-      m_MainWindow.StartCurvWJOff()
       m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_CurrentProjectPageUC)
       m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_ImportPageUC)
       m_MainWindow.m_ActivePage = MainWindow.Pages.Import
@@ -205,13 +193,10 @@ Public Class CadCutPageUC
    End Sub
 
    Private Sub SplitBtn_Click(sender As Object, e As RoutedEventArgs) Handles SplitBtn.Click
-      m_MainWindow.DragRettangleOff()
-      m_MainWindow.SplitCurvWJOff()
-      m_MainWindow.StartCurvWJOff()
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       EgtDeselectObj(m_NestPage.m_CurrSelectedCurv)
       m_ProjectMgr.TestBtn.IsChecked = False
-      m_MainWindow.m_CadCutPageUC.m_NestPage.m_bSelectCurv = False
+      m_CurrProjPage.m_bSelectCurv = False
       Select Case m_CadCutMode
          Case CadCutModes.Nest, CadCutModes.FastGrid
             ' Passo alla pagina Split
@@ -221,9 +206,9 @@ Public Class CadCutPageUC
                SplitImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/Nest.png", UriKind.Relative))
             End If
             If m_CadCutMode = CadCutModes.Nest Then
-               CadCutPageGrid.Children.Remove(m_NestPage)
-            Else
-               CadCutPageGrid.Children.Remove(m_FastGridSlabManager)
+                  CadCutPageGrid.Children.Remove(m_NestPage)
+               Else
+                  CadCutPageGrid.Children.Remove(m_FastGridSlabManager)
             End If
             CadCutPageGrid.Children.Add(m_SplitPage)
             m_CadCutMode = CadCutModes.Split

CadCuts/EditValueWD.xaml

@@ -25,15 +25,7 @@
          <TextBlock Name="ValueTxbl" Grid.Column="1" Grid.Row="0"
             Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
          <EgtWPFLib:EgtTextBox Name="ValueTxBx" Grid.Column="1" Grid.Row="1"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-
-         <ComboBox Name="ValueCmBx" Grid.Column="1" Grid.Row="1">
-            <ComboBox.ItemTemplate>
-               <DataTemplate>
-                  <TextBlock Text="{Binding}" FontSize="20" />
-               </DataTemplate>
-            </ComboBox.ItemTemplate>
-         </ComboBox>
+            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
          <Grid Name="ButtonsGrid" Grid.Column="1" Grid.Row="3" Grid.RowSpan="1">
             <Grid.ColumnDefinitions>

CadCuts/EditValueWD.xaml.vb

@@ -1,7 +1,6 @@
 Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib
-Imports System.Collections.ObjectModel
 
 Public Class EditValueWD
 
@@ -9,89 +8,36 @@ Public Class EditValueWD
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
    Private m_sMsg As String = "Value"
    Private m_sValue As String = ""
-   Private m_sList As ObservableCollection(Of String)
-   Private m_IsText As Boolean = True
 
-   ' avvia la visualizzazione della textbox
    Sub New(Owner As Window, Optional sMsg As String = "")
       Me.Owner = Owner
       m_sMsg = sMsg
-      m_IsText = True
       InitializeComponent()
    End Sub
 
-   Friend Function SetVal(dVal As Double, Optional ByVal bLen As Boolean = False) As Boolean
-      If bLen Then
-         m_sValue = LenToString(dVal, 3)
-      Else
-         m_sValue = DoubleToString(dVal, 3)
-      End If
+   Friend Function SetVal( dVal As Double) As Boolean
+      m_sValue = DoubleToString( dVal, 3)
       ValueTxBx.Text = m_sValue
-      Return True
+      Return true
    End Function
 
-   ' avvia la visualizzazione della combobox
-   Sub New(Owner As Window, sList As ObservableCollection(Of String), Optional sMsg As String = "")
-      Me.Owner = Owner
-      m_sMsg = sMsg
-      m_IsText = False
-      InitializeComponent()
-      m_sList = sList
-      SetComboBox(m_sList)
-   End Sub
-
-   Friend Function GetVal(Optional ByVal bLen As Boolean = False) As Double
+   Friend Function GetVal() As Double
       Dim dVal As Double = 0
-      If bLen Then
-         StringToLen(m_sValue, dVal)
-      Else
-         StringToDouble(m_sValue, dVal)
-      End If
+      StringToDouble( m_sValue, dVal)
       Return dVal
    End Function
 
-   Friend Function SetComboBox(sList As ObservableCollection(Of String)) As Boolean
-      ValueCmBx.ItemsSource = sList
-      Return True
-   End Function
-
-   Friend Function SetItemComboBox(sItem As String) As Boolean
-      For Each MyItem As String In ValueCmBx.ItemsSource
-         If MyItem = sItem Then
-            ValueCmBx.SelectedItem = MyItem
-         End If
-      Next
-      Return True
-   End Function
-
-   Friend Function GetItemComboBox() As String
-      Dim sVal As String = ValueCmBx.SelectedItem
-      Return sVal
-   End Function
-
    Private Sub EditValueWD_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       Me.Top = Owner.Top + Owner.Height / 2 - Me.Height / 2
       Me.Left = Owner.Left + Owner.Width / 2 - Me.Width / 2
       ValueTxbl.Text = m_sMsg
-      If m_IsText Then
-         ValueCmBx.Visibility = Visibility.Collapsed
-         ValueTxBx.Visibility = Visibility.Visible
-      Else
-         ValueCmBx.Visibility = Visibility.Visible
-         ValueTxBx.Visibility = Visibility.Collapsed
-      End If
    End Sub
 
    Private Sub EditValueWD_Rendered(sender As Object, e As EventArgs) Handles Me.ContentRendered
-      ' ValueTxBx.Focus()
-      ' ValueTxBx.OpenKeyboard(ValueTxBx, ValueTxBx)
+      ValueTxBx.Focus()
+      ValueTxBx.OpenKeyboard(ValueTxBx, ValueTxBx)
    End Sub
 
-   'Private Sub ValueTxBx_Closed(Sender As Object, e As EventArgs) Handles ValueTxBx.EgtClosed
-   '   m_sValue = ValueTxBx.Text
-   '   DialogResult = True
-   'End Sub
-
    Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
       m_sValue = ValueTxBx.Text
       DialogResult = True

CadCuts/FastGridSlabManager.xaml.vb

@@ -41,7 +41,7 @@ Public Class FastGridSlabManager
       ' Recupero parametri per nesting
       m_MainWindow.m_CadCutPageUC.m_NestPage.LoadParams()
       ' Recupero dimensioni pezzi da ini
-      For Index As Integer = 1 To 5
+      For Index = 1 To 5
          GetPieceDimensions(Index)
       Next
       ' Ne imposto i valori

CadCuts/MoveRawPartPage.xaml

@@ -120,7 +120,7 @@
                <ColumnDefinition Width="Auto"/>
                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <EgtWPFLib:EgtTextBox Name="RotationAngleTxBx"  Width="50" IsLength="False"
+            <EgtWPFLib:EgtTextBox Name="RotationAngleTxBx"  Width="50"
             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
             <TextBlock Grid.Column="1" FontSize="30" Margin="2,-5,0,0"
             Text="°"/>
@@ -133,14 +133,10 @@
          </Button>
 
 
-         <Button Name="RemovePartBtn" Grid.ColumnSpan="2" Grid.Row="6"
-                 Style="{DynamicResource OmagCut_YellowTextButton}"/>
+         <Button Name="RemovePartBtn" Grid.ColumnSpan="3" Grid.Row="6"
+         Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
-         <Button Name="ScrapsBtn" Grid.Column="3" Grid.Row="6"
-                 Style="{DynamicResource OmagCut_YellowTextButton}"/>
-
-
-            <Grid Grid.Row="7" Grid.ColumnSpan="3">
+         <Grid Grid.Row="7" Grid.ColumnSpan="3">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="0.5*"/>
                <ColumnDefinition Width="1*"/>
@@ -159,11 +155,9 @@
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="10*"/>
          </Grid.ColumnDefinitions>
-            <!-- Inserimento della pausa durante il movimento sulla tavola di scarico-->
-            <Button Name="PauseBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource Pausa-ON_OFFImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-        </Grid>
+
+
+      </Grid>
 
    </Grid>
 

CadCuts/MoveRawPartPage.xaml.vb

@@ -11,12 +11,8 @@ Public Class MoveRawPartPage
    Private m_nAuxTabId As Integer = GDB_ID.NULL
    ' Fase corrente
    Private m_nCurrPhase As Integer = 0
-   ' Disposizione corrente
-   Private m_nCurrDisposition As Integer = GDB_ID.NULL
    ' Premuto Prev
    Private m_bPrev As Boolean = False
-   ' Pemuto Next
-   Private m_bToNext As Boolean = False
    ' Dati movimento
    Private m_dStep As Double = 0
    Private m_dRotation As Double = 0
@@ -31,24 +27,18 @@ Public Class MoveRawPartPage
    Private m_bRemovedRaw As Boolean = False                 ' flag per rimozione manuale pezzi
    Private m_RawMoveDataList As New List(Of RawMoveData)    ' dati di movimento
    Private m_bRawWithCups As Boolean = False                ' flag per pezzo corrente con ventose
-   ' Visibilità comando Scrap
-   Private m_ScrapsVisibility As Visibility = Visibility.Visible
-   Private m_CurrRawOnVacuum As Integer = GDB_ID.NULL
 
    Private Sub MoveRawPartPage_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Assegno testi
       RemovePartBtn.Content = EgtMsg(MSG_MOVERAWPAGEUC + 1)  'Rimuovi
       ModifyBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 17)       'Modifica
       ResetBtn.Content = EgtMsg(MSG_NESTPAGEUC + 6)          'Reset
-      ScrapsBtn.Content = "Add Scraps"
    End Sub
 
    Private Sub MoveRawPartPage_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded
       m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
       m_SplitPage = m_MainWindow.m_CadCutPageUC.m_SplitPage
       m_bActive = True
-      ' resetto l'inidice del pezzo da mnovimentare
-      m_CurrRawOnVacuum = GDB_ID.NULL
       ' Leggo tipo movimento grezzi
       m_bByHand = (GetVacuumType() = 0 Or
                    Not m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.AUTO_MANIP) Or
@@ -65,55 +55,46 @@ Public Class MoveRawPartPage
       m_SplitPage.GetEnabledCuts(Cuts)
       ' Fase precedente
       Dim nPrevPhase As Integer = EgtGetCurrPhase()
-      ' Creo nuova fase, eseguo spezzatura grezzi e vi sposto le lavorazioni
-      Dim vNewRaws As New List(Of Integer)
       If Not m_SplitPage.m_bShow Then
+         ' Creo nuova fase, eseguo spezzatura grezzi e vi sposto le lavorazioni
+         Dim vNewRaws As New List(Of Integer)
          SplitRawParts(nPrevPhase, Cuts, vNewRaws)
       Else
          EgtSetCurrPhase(nPrevPhase + 1)
          HideAllMachinings()
       End If
       m_nCurrPhase = EgtGetCurrPhase()
-
-      '---------------------------- SCRAPS ----------------------------
-      ' gestione visualizzazione del comando "Scraps"
-      Dim ScrapsVisibility As Visibility = Visibility.Collapsed
-      ' verifico se licenza abilitat: m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.SCRAPS)
-      If GetPrivateProfileInt(S_SCRAPS, K_ENABLESCRAPS, 0, m_MainWindow.GetIniFile()) <> 0 Then
-         ' leggo il direttorio in cui cercare il database delle lastre
-         Dim PhotDir As String = String.Empty
-         GetPrivateProfileString(S_SCRAPS, K_PHOTODIR, "", PhotDir, m_MainWindow.GetIniFile())
-         ' verifico che esista il file "OmagPHOTOVb.sqlite" nel direttorio inidicato
-         If System.IO.File.Exists(PhotDir.Trim & "\OmagPHOTODb.sqlite") Then
-            ScrapsVisibility = Visibility.Visible
-         End If
-      End If
-      ' verifico che siano stati generati dei nuovi grezzi
-      If vNewRaws.Count = 0 Then
-         ScrapsVisibility = Visibility.Collapsed
-      End If
-      ' aggiorno la grafica
-      m_ScrapsVisibility = ScrapsVisibility
-      If m_ScrapsVisibility <> Visibility.Visible Then
-         Grid.SetColumnSpan(RemovePartBtn, 3)
-      Else
-         Grid.SetColumnSpan(RemovePartBtn, 2)
-      End If
-      '---------------------------- SCRAPS ----------------------------
-
       ' Se movimento pezzi finale, sistemazioni per tavolo ausiliario
       If m_SplitPage.m_bOnAuxTab Then
-         ' assegnazione delle info tavola ausiliaria alla dispozione corrente
-         SetAuxTabInCurrDisposition()
-         ' altrimenti, aggiorno visualizzazione
+         m_nAuxTabId = EgtGetTableId(AUX_TAB)
+         ' Visualizzo tavolo ausiliario
+         Dim bOldEnMod As Boolean = EgtGetEnableModified()
+         If bOldEnMod Then EgtDisableModified()
+         EgtSetStatus(m_nAuxTabId, GDB_ST.ON_)
+         If bOldEnMod Then EgtEnableModified()
+         ' Se definizione movimenti
+         If Not m_SplitPage.m_bShow Then
+            ' Area tavolo ausiliario
+            Dim b3AuxTab As New BBox3d
+            EgtGetBBoxGlob(EgtGetFirstNameInGroup(m_nAuxTabId, "A1"), GDB_BB.STANDARD, b3AuxTab)
+            ' Area tavolo principale
+            Dim b3Tab As New BBox3d
+            EgtGetTableArea(1, b3Tab)
+            ' Imposto offset su tavolo principale per includere anche il secondario
+            Dim dOffsXP As Double = Math.Max(b3AuxTab.Max().x - b3Tab.Max().x, 0)
+            Dim dOffsYP As Double = Math.Max(b3AuxTab.Max().y - b3Tab.Max().y, 0)
+            Dim dOffsXM As Double = Math.Max(b3Tab.Min().x - b3AuxTab.Min().x, 0)
+            Dim dOffsYM As Double = Math.Max(b3Tab.Min().y - b3AuxTab.Min().y, 0)
+            EgtSetTableAreaOffset(dOffsXP, dOffsYP, dOffsXM, dOffsYM)
+         End If
+         EgtZoom(ZM.ALL)
+      ' altrimenti, aggiorno visualizzazione
       Else
          EgtDraw()
       End If
       ' Carico i parametri di movimento
       m_dStep = GetPrivateProfileDouble(S_RAWMOVE, K_RAWSTEP, 50, m_MainWindow.GetIniFile())
-      ' Ricavo la lunghezza del baffo di taglio 
-      m_dStep = SplitAuto.MaxCuttingMustache(m_dStep)
-      StepMoveTxBx.Text = LenToString(m_dStep, 1) & "+1"
+      StepMoveTxBx.Text = LenToString(m_dStep, 3)
       m_dRotation = GetPrivateProfileDouble(S_RAWMOVE, K_RAWROTATION, 30, m_MainWindow.GetIniFile())
       RotationAngleTxBx.Text = DoubleToString(m_dRotation, 3)
       ' Se movimento manuale perpendicolare
@@ -143,14 +124,14 @@ Public Class MoveRawPartPage
                ' Distanza iniziale
                m_dCurrDist = 0
             End If
-            ' Non dovrebbe mai accadere, ma inizializzo con default
+         ' Non dovrebbe mai accadere, ma inizializzo con default
          Else
             m_vtDir = Vector3d.Y_AX()
             m_ptMid = Point3d.ORIG()
             m_dOrigDist = 0
             m_dCurrDist = 0
          End If
-         ' Altrimenti movimento con ventose
+      ' Altrimenti movimento con ventose
       Else
          m_bRemovedRaw = False
          m_bRawWithCups = False
@@ -164,9 +145,6 @@ Public Class MoveRawPartPage
             GetMoveInfoInDisposition(nDispId, m_RawMoveDataList)
          End If
       End If
-
-      ' aggiorno il messaggio del comando per gestire gli sfridi
-      VerifyIsNewScrap(m_CurrRawOnVacuum)
       ' Aggiorno interfaccia per taglio perpendicolare
       If m_bByHand Then
          UpBtn.Visibility = Windows.Visibility.Visible
@@ -182,10 +160,8 @@ Public Class MoveRawPartPage
          TopRBtn.Visibility = Windows.Visibility.Hidden
          BottomLBtn.Visibility = Windows.Visibility.Hidden
          BottomRBtn.Visibility = Windows.Visibility.Hidden
-         PauseBtn.Visibility = Windows.Visibility.Hidden
          ResetBtn.Visibility = Windows.Visibility.Hidden
-         ScrapsBtn.Visibility = m_ScrapsVisibility
-         ' altrimenti per movimento con ventose
+      ' altrimenti per movimento con ventose
       ElseIf Not m_SplitPage.m_bOnAuxTab Then
          UpBtn.Visibility = Windows.Visibility.Visible
          LeftBtn.Visibility = Windows.Visibility.Visible
@@ -200,10 +176,8 @@ Public Class MoveRawPartPage
          TopRBtn.Visibility = Windows.Visibility.Hidden
          BottomLBtn.Visibility = Windows.Visibility.Hidden
          BottomRBtn.Visibility = Windows.Visibility.Hidden
-         PauseBtn.Visibility = Windows.Visibility.Hidden
          ResetBtn.Visibility = Windows.Visibility.Hidden
-         ScrapsBtn.Visibility = m_ScrapsVisibility
-         ' altrimenti per movimento finale dei pezzi
+      ' altrimenti per movimento finale dei pezzi
       Else
          UpBtn.Visibility = Windows.Visibility.Hidden
          LeftBtn.Visibility = Windows.Visibility.Hidden
@@ -218,45 +192,14 @@ Public Class MoveRawPartPage
          TopRBtn.Visibility = Windows.Visibility.Visible
          BottomLBtn.Visibility = Windows.Visibility.Visible
          BottomRBtn.Visibility = Windows.Visibility.Visible
-         PauseBtn.Visibility = Windows.Visibility.Visible
          ResetBtn.Visibility = Windows.Visibility.Visible
-         ScrapsBtn.Visibility = Windows.Visibility.Hidden
       End If
-      ' salvo l'idice della fase corrente
-      m_nCurrDisposition = EgtGetPhaseDisposition(m_nCurrPhase)
       ' Abilitazione bottone modifica
       ModifyBtn.IsEnabled = m_SplitPage.m_bShow
       ' gestione abilitazione altri bottoni
       EnableButtons()
    End Sub
 
-   Private Sub SetAuxTabInCurrDisposition()
-      ' Se movimento pezzi finale, sistemazioni per tavolo ausiliario
-      m_nAuxTabId = EgtGetTableId(AUX_TAB)
-      ' Visualizzo tavolo ausiliario
-      Dim bOldEnMod As Boolean = EgtGetEnableModified()
-      If bOldEnMod Then EgtDisableModified()
-      EgtSetStatus(m_nAuxTabId, GDB_ST.ON_)
-      If bOldEnMod Then EgtEnableModified()
-      ' Se definizione movimenti
-      If Not m_SplitPage.m_bShow Then
-         ' Area tavolo ausiliario
-         Dim b3AuxTab As New BBox3d
-         EgtGetBBoxGlob(EgtGetFirstNameInGroup(m_nAuxTabId, "A1"), GDB_BB.STANDARD, b3AuxTab)
-         ' Area tavolo principale
-         Dim b3Tab As New BBox3d
-         EgtGetTableArea(1, b3Tab)
-         ' Imposto offset su tavolo principale per includere anche il secondario
-         Dim dOffsXP As Double = Math.Max(b3AuxTab.Max().x - b3Tab.Max().x, 0)
-         Dim dOffsYP As Double = Math.Max(b3AuxTab.Max().y - b3Tab.Max().y, 0)
-         Dim dOffsXM As Double = Math.Max(b3Tab.Min().x - b3AuxTab.Min().x, 0)
-         Dim dOffsYM As Double = Math.Max(b3Tab.Min().y - b3AuxTab.Min().y, 0)
-         EgtSetTableAreaOffset(dOffsXP, dOffsYP, dOffsXM, dOffsYM)
-      End If
-      EgtZoom(ZM.ALL)
-
-   End Sub
-
    Private Sub OnMyMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseDownScene
       ' Verifico di essere il gestore attivo
       If Not m_bActive Then Return
@@ -285,52 +228,16 @@ Public Class MoveRawPartPage
          If nParentId = nRawGroupId Then
             Dim nStat As Integer = GDB_ST.ON_
             EgtGetStatus(nId, nStat)
-            ' aggiorno il messaggio del bottone "Scrap" a seconda che il grezzo sia già uno scrap
-            VerifyIsNewScrap(nId)
-            ' Se il pezzo corrente è selezionato allora lo disattivo -> deposito del pezzo
             If nStat = GDB_ST.SEL Then
                EgtSetStatus(nId, GDB_ST.ON_)
-               ' prima di rilasciare il pezzo verifico che non vada in collisione con altri pezzi sulla tavola (evito il controllo se ultima fase)
-               If VerifyCollisionWithOtherRawPart(nId) Then
-                     ' mantengo la selezione del pezzo
-                     EgtSetStatus(nId, GDB_ST.SEL)
-                     m_CurrProjPage.SetErrorMessage("Collisione pezzi")
-                  Else
-                     ' Se con ventose, le nascondo
-                     If Not m_bByHand Then EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
-               End If
+               ' Se con ventose, le nascondo
+               If Not m_bByHand Then EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
             Else
-
-               ' verifico che il pezzo precedente possa essere depositato correttamente
-               If VerifyCollisionWithOtherRawPart(m_CurrRawOnVacuum) Then
-                  ' mantengo la selezione del pezzo
-                  EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL)
-                  m_CurrProjPage.SetErrorMessage("Collisione pezzi")
-                  EgtDraw()
-                  ' esco dal ciclo, prima devo depositare correttamente il pezzo
-                  Exit While
-               End If
-               ' salvo l'indice del pezzo correntemente attaccato alle ventose
-               m_CurrRawOnVacuum = nId
-
-               ' Deseleziono tutto e abilito la selezione del pezzo corrente
                EgtDeselectAll()
                EgtSetStatus(nId, GDB_ST.SEL)
                ' Se con ventose, le posiziono sul grezzo
                If Not m_bByHand Then
                   Dim rmData As New RawMoveData
-                  ' inizializzo i dati del grezzo per il cacolo del peso
-                  Dim MaxSinglePlugger As Double = 250
-                  MaxSinglePlugger = GetPrivateProfileDouble(S_MACH_RAWMOVE, K_MACH_WEIGHT_SINGLEPLUGGER, MaxSinglePlugger, m_MainWindow.GetMachIniFile())
-                  Dim MaxDoublePlugger As Double = 750
-                  MaxDoublePlugger = GetPrivateProfileDouble(S_MACH_RAWMOVE, K_MACH_WEIGHT_DOUBLEPLUGGER, MaxDoublePlugger, m_MainWindow.GetMachIniFile())
-                  Dim AverageDensity As Double = 2700
-                  AverageDensity = GetPrivateProfileDouble(S_MATERIALS, K_AVERAGEDENSITY, AverageDensity, m_MainWindow.GetMachIniFile())
-                  VacuumCups.SetWeightInformation(AverageDensity, MaxSinglePlugger, MaxDoublePlugger)
-                  VacuumCups.SetRotationForExtraStrokeY(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEY, 0, m_MainWindow.GetMachIniFile()) <> 0)
-                  VacuumCups.SetRotationForExtraStrokeX(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEX, 0, m_MainWindow.GetMachIniFile()) <> 0)
-                  ' se su scarico frontale allora devo modificare la scelta delle ventose
-                  VacuumCups.bUnloadingOnAuxTab = m_SplitPage.m_bOnAuxTab
                   If PutVacuumCupsOnRaw(nId, rmData) Then
                      ' Visualizzo le ventose
                      EgtSetStatus(GetVacuumId(), GDB_ST.ON_)
@@ -340,18 +247,10 @@ Public Class MoveRawPartPage
                      ' Reset eventuale messaggio
                      m_CurrProjPage.ClearMessage()
                   Else
-                     ' nascondo la visualizzazione delle ventose
-                     EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
                      ' Aggiorno i dati
                      m_bRawWithCups = False
-                     If VacuumCups.bOverWeight Then
-                        m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 4)) 'Pezzo troppo pesante : non si può muovere
-                     ElseIf VacuumCups.bExtraStroke Then
-                        m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 5)) 'Pezzo oltre le corse : non si può muovere
-                     Else
-                        ' Messaggio di avvertimento
-                        m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
-                     End If
+                     ' Messaggio di avvertimento
+                     m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
                   End If
                End If
             End If
@@ -360,75 +259,8 @@ Public Class MoveRawPartPage
          End If
          nId = EgtGetNextObjInSelWin()
       End While
-
-      ' clicco su un oggetto che non è un grezzo -> verifico che il pezzo precedente possa essere depositato correttamente
-      If VerifyCollisionWithOtherRawPart(m_CurrRawOnVacuum) Then
-         ' mantengo la selezione del pezzo
-         EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL)
-         m_CurrProjPage.SetErrorMessage("Collisione pezzi")
-         EgtDraw()
-      End If
-
    End Sub
 
-   ' Veririfica che il grezzo non entri in colliosione con altri pezzi 
-   Private Function VerifyCollisionWithOtherRawPart(nIdOnVacumm As Integer) As Boolean
-      ' se movimento su tavola di scarico non eseguo il controllo (evito di segnalre errori per pezzi ricavati interni al grezzo...)
-      If m_SplitPage.m_bOnAuxTab Then Return False
-      If nIdOnVacumm = GDB_ID.NULL Then Return False
-      ' Creo gruppo temporaneo in cui generare le superfici per la veririfica di collisione
-      Dim m_nTempId As Integer = EgtCreateGroup(GDB_ID.ROOT)
-      If m_nTempId = GDB_ID.NULL Then Return False
-      EgtSetName(m_nTempId, "RawTemp")
-      Dim nIdActualRawOutLine As Integer = EgtGetFirstNameInGroup(nIdOnVacumm, "RawOutline")
-      Dim ActualRawFlatRegion As Integer = EgtCreateSurfFlatRegion(m_nTempId, nIdActualRawOutLine)
-      Dim nCurrPhase As Integer = EgtGetCurrPhase()
-      Dim nRawGroupId = EgtGetParent(EgtGetFirstRawPart())
-      Dim nIdRaw As Integer = EgtGetFirstRawPart()
-      ' ciclo su tutti i grezzi per veririficare eventuali collisioni
-      While nIdRaw <> GDB_ID.NULL
-         ' verifico la fase del grezzo
-         If EgtVerifyRawPartCurrPhase(nIdRaw) And nIdOnVacumm <> nIdRaw Then
-            ' recupero il contorno del pezzo
-            Dim nIdRawOutLine As Integer = EgtGetFirstNameInGroup(nIdRaw, "RawOutline")
-            Dim nIdRawFlatRegion As Integer = EgtCreateSurfFlatRegion(m_nTempId, nIdRawOutLine)
-            If EgtSurfFrIntersect(nIdRawFlatRegion, ActualRawFlatRegion) Then
-               If EgtExistsObj(nIdRawFlatRegion) Then
-                  EgtErase(m_nTempId)
-                  ' esiste una intersezione delle superfici
-                  Return True
-               End If
-            End If
-         End If
-         nIdRaw = EgtGetNextRawPart(nIdRaw)
-      End While
-      EgtErase(m_nTempId)
-      Return False
-   End Function
-
-   Private Function VerifyIsNewScrap(nMyId As Integer) As Boolean
-      Dim nVal As Integer = 0
-      If EgtGetInfo(nMyId, K_ISNEWSCRAPS, nVal) Then
-         If nVal = 1 Or nVal = 2 Then
-            ' 1 → è stato definito come nuovo grezzo oppure, 2 → è stato definito come nuovo grezzo ed è stato inserito nel DB delle lastre
-            ScrapsBtn.Content = "Remove Scrap"
-            ScrapsBtn.IsEnabled = True And Not m_SplitPage.m_bShow
-            Return True
-         ElseIf nVal = 3 Then
-            ' non è possibile rimuovere il grezzo in questa fase
-            ScrapsBtn.Content = "Defined as Scrap"
-            ScrapsBtn.IsEnabled = False
-            Return True
-         End If
-      End If
-      ' non è un nuovo grezzo
-      ScrapsBtn.Content = "Add Scrap"
-      ScrapsBtn.IsEnabled = True And Not m_SplitPage.m_bShow
-      Return False
-   End Function
-
-#Region "Move Up/Down/Left/Right"
-
    Private Sub UpBtn_Click(sender As Object, e As RoutedEventArgs) Handles UpBtn.Click
       Dim nRawId As Integer = EgtGetFirstSelectedObj()
       While nRawId <> GDB_ID.NULL
@@ -451,15 +283,9 @@ Public Class MoveRawPartPage
          Else
             If m_bRawWithCups Then
                Dim vtMove As New Vector3d(0, m_dStep, 0)
-               ' ----------- INIZIO verifica di essere entro i limiti macchina -----------
-               m_CurrProjPage.ClearMessage()
-               VerifyReleasdPositionIsValid(vtMove)
-               ' ----------- FINE verifica di essere entro i limiti macchina -----------
                If EgtMoveRawPart(nRawId, vtMove) Then
                   EgtMove(GetVacuumId(), vtMove, GDB_RT.GLOB)
                   AddRawMoveData(nRawId, vtMove, m_RawMoveDataList)
-               Else
-                  VacuumCups.ptStartPointLift.y -= vtMove.y
                End If
             Else
                m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
@@ -494,15 +320,9 @@ Public Class MoveRawPartPage
          Else
             If m_bRawWithCups Then
                Dim vtMove As New Vector3d(0, -m_dStep, 0)
-               ' ----------- INIZIO verifica di essere entro i limiti macchina -----------
-               m_CurrProjPage.ClearMessage()
-               VerifyReleasdPositionIsValid(vtMove)
-               ' ----------- FINE verifica di essere entro i limiti macchina -----------
                If EgtMoveRawPart(nRawId, vtMove) Then
                   EgtMove(GetVacuumId(), vtMove, GDB_RT.GLOB)
                   AddRawMoveData(nRawId, vtMove, m_RawMoveDataList)
-               Else
-                  VacuumCups.ptStartPointLift.y -= vtMove.y
                End If
             Else
                m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
@@ -520,15 +340,9 @@ Public Class MoveRawPartPage
       While nRawId <> GDB_ID.NULL
          If m_bRawWithCups Then
             Dim vtMove As New Vector3d(m_dStep, 0, 0)
-            ' ----------- INIZIO verifica di essere entro i limiti macchina -----------
-            m_CurrProjPage.ClearMessage()
-            VerifyReleasdPositionIsValid(vtMove)
-            ' ----------- FINE verifica di essere entro i limiti macchina -----------
             If EgtMoveRawPart(nRawId, vtMove) Then
                EgtMove(GetVacuumId(), vtMove, GDB_RT.GLOB)
                AddRawMoveData(nRawId, vtMove, m_RawMoveDataList)
-            Else
-               VacuumCups.ptStartPointLift.x -= vtMove.x
             End If
          Else
             m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
@@ -545,15 +359,9 @@ Public Class MoveRawPartPage
       While nRawId <> GDB_ID.NULL
          If m_bRawWithCups Then
             Dim vtMove As New Vector3d(-m_dStep, 0, 0)
-            ' ----------- INIZIO verifica di essere entro i limiti macchina -----------
-            m_CurrProjPage.ClearMessage()
-            VerifyReleasdPositionIsValid(vtMove)
-            ' ----------- FINE verifica di essere entro i limiti macchina -----------
             If EgtMoveRawPart(nRawId, vtMove) Then
                EgtMove(GetVacuumId(), vtMove, GDB_RT.GLOB)
                AddRawMoveData(nRawId, vtMove, m_RawMoveDataList)
-            Else
-               VacuumCups.ptStartPointLift.x -= vtMove.x
             End If
          Else
             m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
@@ -563,77 +371,6 @@ Public Class MoveRawPartPage
       EgtDraw()
    End Sub
 
-#End Region   'Move Up/Down/Left/Right
-
-   ' verifica che la poszione da raggiungere sia nei limiti delle corse
-   Private Function VerifyReleasdPositionIsValid(ByRef vtMove As Vector3d) As Boolean
-      Dim bOk As Boolean = True
-      ' determino il punto finale dello spostamento
-      Dim ptEndPointLift As Point3d = VacuumCups.ptStartPointLift
-      ptEndPointLift.x += vtMove.x
-      ptEndPointLift.y += vtMove.y
-      Dim sInfo As String = String.Empty
-      Select Case VacuumCups.VerifyOutOfStrokes(ptEndPointLift, VacuumCups.dDegRotStartAng)
-         Case 1
-            ' extra corsa sulla x-: devo ridurre del valore di extra corsa
-            EgtGetOutstrokeInfo(sInfo)
-            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo)        'Extracorsa ...
-            ptEndPointLift.x -= vtMove.x
-            Dim dMaxMove As Double = VacuumCups.GetExtraStrokeValue(sInfo)
-            If Math.Abs(dMaxMove - vtMove.x) <= EPS_SMALL * 100 Then
-               vtMove.x = 0
-            Else
-               vtMove.x -= dMaxMove - EPS_SMALL * 100
-            End If
-            ptEndPointLift.x += vtMove.x
-            bOk = False
-         Case 2
-            ' extra corsa sulla x+: devo ridurre del valore di extra corsa
-            EgtGetOutstrokeInfo(sInfo)
-            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo)        'Extracorsa ...
-            ptEndPointLift.x -= vtMove.x
-            Dim dMaxMove As Double = VacuumCups.GetExtraStrokeValue(sInfo)
-            If Math.Abs(dMaxMove - vtMove.x) <= EPS_SMALL * 100 Then
-               vtMove.x = 0
-            Else
-               vtMove.x -= dMaxMove + EPS_SMALL * 100
-            End If
-            ptEndPointLift.x += vtMove.x
-            bOk = False
-         Case 4
-            ' extra corsa sulla y-
-            EgtGetOutstrokeInfo(sInfo)
-            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo)        'Extracorsa ...
-            ptEndPointLift.y -= vtMove.y
-            Dim dMaxMove As Double = VacuumCups.GetExtraStrokeValue(sInfo)
-            If Math.Abs(dMaxMove - vtMove.y) <= EPS_SMALL * 100 Then
-               vtMove.y = 0
-            Else
-               vtMove.y -= dMaxMove - EPS_SMALL * 100
-            End If
-            ptEndPointLift.y += vtMove.y
-            bOk = False
-         Case 8
-            ' extra corsa sulla y+
-            EgtGetOutstrokeInfo(sInfo)
-            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo)        'Extracorsa ...
-            ptEndPointLift.y -= vtMove.y
-            Dim dMaxMove As Double = VacuumCups.GetExtraStrokeValue(sInfo)
-            If Math.Abs(dMaxMove - vtMove.y) <= EPS_SMALL * 100 Then
-               vtMove.y = 0
-            Else
-               vtMove.y -= dMaxMove + EPS_SMALL * 100
-            End If
-            ptEndPointLift.y += vtMove.y
-            bOk = False
-      End Select
-      ' il movimento del pezzo è accettabile, aggiorno le posizione per la verifica dello step successivo
-      VacuumCups.ptStartPointLift = ptEndPointLift
-      Return bOk
-   End Function
-
-#Region "Rotate CounterClockWise/ClockWise"
-
    Private Sub RotateCounterClockwiseBtn_Click(sender As Object, e As RoutedEventArgs) Handles RotateCounterClockwiseBtn.Click
       ' Solo movimento con ventose
       If m_bByHand Then Return
@@ -641,24 +378,14 @@ Public Class MoveRawPartPage
       While nRawId <> GDB_ID.NULL
          If m_bRawWithCups Then
             Dim dAng As Double = m_dRotation
-            ' ----------- INIZIO verifica di essere entro i limiti macchina -----------
-            ' Recupero il centro del grezzo
-            Dim ptRawCen As Point3d
-            EgtGetRawPartCenter(nRawId, ptRawCen)
-            m_CurrProjPage.ClearMessage()
-            VerifyReleasdAngleIsValid(dAng, ptRawCen)
-            ' ----------- FINE verifica di essere entro i limiti macchina -----------
             If EgtRotateRawPart(nRawId, Vector3d.Z_AX(), dAng) Then
-               '' Recupero il centro del grezzo
-               'Dim ptRawCen As Point3d
-               'EgtGetRawPartCenter(nRawId, ptRawCen)
+               ' Recupero il centro del grezzo
+               Dim ptRawCen As Point3d
+               EgtGetRawPartCenter(nRawId, ptRawCen)
                ' Eseguo la rotazione della ventosa
                EgtRotate(GetVacuumId(), ptRawCen, Vector3d.Z_AX(), dAng, GDB_RT.GLOB)
                ' Memorizzo
                AddRawMoveData(nRawId, dAng, m_RawMoveDataList)
-            Else
-               VacuumCups.ptStartPointLift.Rotate(ptRawCen, Vector3d.Z_AX(), dAng)
-               VacuumCups.dDegRotStartAng -= dAng
             End If
          Else
             m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
@@ -675,24 +402,14 @@ Public Class MoveRawPartPage
       While nRawId <> GDB_ID.NULL
          If m_bRawWithCups Then
             Dim dAng As Double = -m_dRotation
-            ' ----------- INIZIO verifica di essere entro i limiti macchina -----------
-            ' Recupero il centro del grezzo
-            Dim ptRawCen As Point3d
-            EgtGetRawPartCenter(nRawId, ptRawCen)
-            m_CurrProjPage.ClearMessage()
-            VerifyReleasdAngleIsValid(dAng, ptRawCen)
-            ' ----------- FINE verifica di essere entro i limiti macchina -----------
             If EgtRotateRawPart(nRawId, Vector3d.Z_AX(), dAng) Then
-               '' Recupero il centro del grezzo
-               'Dim ptRawCen As Point3d
-               'EgtGetRawPartCenter(nRawId, ptRawCen)
+               ' Recupero il centro del grezzo
+               Dim ptRawCen As Point3d
+               EgtGetRawPartCenter(nRawId, ptRawCen)
                ' Eseguo la rotazione della ventosa
                EgtRotate(GetVacuumId(), ptRawCen, Vector3d.Z_AX(), dAng, GDB_RT.GLOB)
                ' Memorizzo
                AddRawMoveData(nRawId, dAng, m_RawMoveDataList)
-            Else
-               VacuumCups.ptStartPointLift.Rotate(ptRawCen, Vector3d.Z_AX(), dAng)
-               VacuumCups.dDegRotStartAng -= dAng
             End If
          Else
             m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
@@ -702,44 +419,6 @@ Public Class MoveRawPartPage
       EgtDraw()
    End Sub
 
-#End Region  ' Rotate CounterClockWise/ClockWise
-
-   ' verifica che la rotazione da raggiungere sia nei limiti delle corse
-   Private Function VerifyReleasdAngleIsValid(ByRef dAngDeg As Double, ByVal ptCenter As Point3d) As Boolean
-      Dim bOk As Boolean = True
-      ' determino il punto finale dello spostamento
-      Dim ptEndPointLift As Point3d = VacuumCups.ptStartPointLift
-      Dim dDegRotEndAng As Double = VacuumCups.dDegRotStartAng + dAngDeg
-      ptEndPointLift.Rotate(ptCenter, Vector3d.Z_AX(), dAngDeg)
-      Dim sInfo As String = String.Empty
-      Select Case VacuumCups.VerifyOutOfStrokes(ptEndPointLift, dDegRotEndAng)
-         Case 16
-            ' extra corsa sulla c-
-            EgtGetOutstrokeInfo(sInfo)
-            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo)        'Extracorsa ...
-            ptEndPointLift.Rotate(ptCenter, Vector3d.Z_AX(), -dAngDeg)
-            dDegRotEndAng -= dAngDeg
-            dAngDeg += VacuumCups.GetExtraStrokeValue(sInfo) + EPS_SMALL
-            dDegRotEndAng += dAngDeg
-            ptEndPointLift.Rotate(ptCenter, Vector3d.Z_AX(), dAngDeg)
-            bOk = False
-         Case 34
-            ' extra corsa sulla c+
-            EgtGetOutstrokeInfo(sInfo)
-            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo)        'Extracorsa ...
-            ptEndPointLift.Rotate(ptCenter, Vector3d.Z_AX(), -dAngDeg)
-            dDegRotEndAng -= dAngDeg
-            dAngDeg -= VacuumCups.GetExtraStrokeValue(sInfo) + EPS_SMALL
-            dDegRotEndAng += dAngDeg
-            ptEndPointLift.Rotate(ptCenter, Vector3d.Z_AX(), dAngDeg)
-            bOk = False
-      End Select
-      ' il movimento del pezzo è accettabile, aggiorno le posizione per la verifica dello step successivo
-      VacuumCups.ptStartPointLift = ptEndPointLift
-      VacuumCups.dDegRotStartAng = dDegRotEndAng
-      Return bOk
-   End Function
-
    Private Sub RemovePartBtn_Click(sender As Object, e As RoutedEventArgs) Handles RemovePartBtn.Click
       Dim nRawId As Integer = EgtGetFirstSelectedObj()
       While nRawId <> GDB_ID.NULL
@@ -759,29 +438,6 @@ Public Class MoveRawPartPage
       EgtDraw()
    End Sub
 
-   Private Sub ScrapsBtn_Click(Sender As Object, e As RoutedEventArgs) Handles ScrapsBtn.Click
-      Dim nRawId As Integer = EgtGetFirstSelectedObj()
-      While nRawId <> GDB_ID.NULL
-         ' verifico che il grezzo non contenga dei pezzi (altrimenti non risulta selezionabile)
-         Dim nPartInRaw As Integer = EgtGetFirstPartInRawPart(nRawId)
-         If nPartInRaw = GDB_ID.NULL Then
-            If Not VerifyIsNewScrap(nRawId) Then
-               EgtSetInfo(nRawId, K_ISNEWSCRAPS, "1")
-            Else
-               EgtRemoveInfo(nRawId, K_ISNEWSCRAPS)
-            End If
-            ' aggiorno il contenuto del bottone
-            VerifyIsNewScrap(nRawId)
-         Else
-            ' coumico che il grezzo contiene un pezzo e quindi non può essere definito come grezzo
-            m_CurrProjPage.ClearMessage()
-            m_CurrProjPage.SetErrorMessage("Part inside raw!")
-         End If
-         ' passo al grezzo succesivo (NON dovrebbero esserci altri grezzi selezionabili contemporaneamente!)
-         nRawId = EgtGetNextSelectedObj()
-      End While
-   End Sub
-
    Private Sub StepMoveTxBx_EgtClosed(sender As Object, e As EventArgs) Handles StepMoveTxBx.EgtClosed
       Dim dStep As Double
       If StringToLen(StepMoveTxBx.Text, dStep) Then
@@ -839,23 +495,19 @@ Public Class MoveRawPartPage
       EgtGetRawPartCenter(nRawId, ptRawCen)
       ' Sposto il grezzo in battuta sul corner
       Dim dAngRaw As Double = 0
-      Dim dNewAngRot As Double = 0
 
       Dim AngRotList As New List(Of Double)
 
       ' ricavo l'angolo di posizionamento del grezzo/pezzo sulla tavola
       If Not DispositionRawOnTable(nRawId, dAngRaw, AngRotList) Then Return
-      Dim bb3dRaw As New BBox3d
-      EgtGetRawPartBBox(nRawId, bb3dRaw)
-      Dim ForceToRotate As Boolean = bb3dRaw.DimX < bb3dRaw.DimY
 
       ' provo a verificare di poter depositare il pezzo (senza applicare delle rotazioni)
-      If Not EgtMoveToCornerRawPart(nRawId, ptRef, nCorn) Or ForceToRotate Then
+      If Not EgtMoveToCornerRawPart(nRawId, ptRef, nCorn) Then
          ' se sono impostati degli step di rotazione
          If AngRotList.Count > 0 Then
             Dim bOkRotate As Boolean = False
             ' allora provo a ruotare il pezzo nel verso di rotazione della ventosa
-            For Each AngStep As Double In AngRotList
+            For Each AngStep In AngRotList
                If EgtRotateRawPart(nRawId, Vector3d.Z_AX(), -AngStep) Then
                   If Not EgtMoveToCornerRawPart(nRawId, ptRef, nCorn) Then
                      ' riposiziono il pezzo come era prima
@@ -870,26 +522,12 @@ Public Class MoveRawPartPage
             Next
             If Not bOkRotate Then Return
          Else
-            ' sposto il pezzo in centro tavola → perchè tutti i movimenti sono fatti ruotando il pezzo in centro tavola!
-            Dim b3Area As New BBox3d
-            EgtGetTableArea(1, b3Area)
-            Dim b3RawTemp As New BBox3d
-            EgtGetRawPartBBox(nRawId, b3RawTemp)
-            ' ricavo il riferimento dell'angolo in basso a sinstra del grezzo rispetto alla tavola
-            Dim ptCorner As Point3d = New Point3d(b3Area.DimX / 2, b3Area.DimY / 2, 0) - New Vector3d(b3RawTemp.DimX / 2, b3RawTemp.DimY / 2, 0)
-            ' sposto il pezzo in questa posizione
-            EgtMoveToCornerRawPart(nRawId, ptCorner, MCH_CR.BL)
-            ' riprovo il movimento
-            dNewAngRot = GetPrefRotAng(dAngRaw)
-            'dNewAngRot = DeltaAngC
-            If EgtRotateRawPart(nRawId, Vector3d.Z_AX(), dNewAngRot) Then
+            If EgtRotateRawPart(nRawId, Vector3d.Z_AX(), -dAngRaw) Then
                If Not EgtMoveToCornerRawPart(nRawId, ptRef, nCorn) Then
                   ' riposiziono il pezzo come era prima
-                  EgtRotateRawPart(nRawId, Vector3d.Z_AX(), -dAngRaw)
-                  EgtDraw()
+                  EgtRotateRawPart(nRawId, Vector3d.Z_AX(), dAngRaw)
                   Return
                End If
-               dAngRaw = dNewAngRot
             Else
                Return
             End If
@@ -915,18 +553,17 @@ Public Class MoveRawPartPage
          End If
          nOtherRaw = EgtGetNextRawPart(nOtherRaw)
       End While
-
       ' Determino il movimento effettuato
       Dim ptNewRawCen As Point3d
       EgtGetRawPartCenter(nRawId, ptNewRawCen)
       ' Se tutto bene, aggiorno lista movimenti
       If bRawOk Then
          AddRawMoveData(nRawId, ptNewRawCen - ptRawCen, m_RawMoveDataList)
-         If dAngRaw <> 0 Then AddRawMoveData(nRawId, dAngRaw, m_RawMoveDataList)
+         If dAngRaw <> 0 Then AddRawMoveData(nRawId, -dAngRaw, m_RawMoveDataList)
          ' altrimenti annullo il movimento
       Else
          EgtMoveRawPart(nRawId, ptRawCen - ptNewRawCen)
-         EgtRotateRawPart(nRawId, Vector3d.Z_AX(), -dAngRaw)
+         EgtRotateRawPart(nRawId, Vector3d.Z_AX(), dAngRaw)
          m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 3))    ' Posizione scelta già occupata
       End If
       ' Disabilito pezzo e nascondo le ventose
@@ -999,73 +636,6 @@ Public Class MoveRawPartPage
       Return True
    End Function
 
-   ' determino la migliore rotazione per portare il pezzo in orizzontale
-   Private Function GetPrefRotAng(ByVal dAngDeg As Double) As Double
-      Dim dNewAngDeg As Double = -dAngDeg
-      If dAngDeg > 90 And dAngDeg < 270 Then
-         dNewAngDeg = 180 - dAngDeg
-      End If
-      Return dNewAngDeg
-   End Function
-
-   Private Sub PauseBtn_Click(sender As Object, e As RoutedEventArgs) Handles PauseBtn.Click
-      ' verifico che ci sia almeno un elemto selezionato (dati di aggancio pezzo)
-      If m_RawMoveDataList.Count = 0 Then Return
-      ' verifico che sia stato inseito almeno uno spostamento, altrimenti lo rimuovo
-      Dim Index As Integer = 0
-      For Index = m_RawMoveDataList.Count - 1 To 0 Step -1
-         If Math.Abs(m_RawMoveDataList(Index).m_vtRawMove.x) < EPS_SMALL AndAlso Math.Abs(m_RawMoveDataList(Index).m_vtRawMove.y) < EPS_SMALL Then
-            m_RawMoveDataList.RemoveAt(Index)
-         End If
-      Next
-      ' verifico che la lista non sia vuota
-      If m_RawMoveDataList.Count = 0 Then Return
-
-      ' recupero disposizione fase corrente
-      Dim nDispId As Integer = EgtGetPhaseDisposition(m_nCurrPhase)
-      ' imposto la pausa nella disposizione corrente
-      SetPause(nDispId)
-      ' aggiungo al gruppo disposizione dei sottogruppi con i dati di movimento dei grezzi spostati
-      SaveMoveInfoInDisposition(nDispId, m_RawMoveDataList)
-      ' imposto eventuale movimento pezzi su tavola ausiliaria
-      SaveMovePartsOnAuxTable(nDispId, m_SplitPage.m_bOnAuxTab)
-      '' Eseguo calcolo speciale dei movimenti: per tavola multicut
-      'SpecialApplyDisposition(nDispId, True, Not m_SplitPage.m_bOnAuxTab)
-
-      ' Creo nuova fase
-      Dim nNewPhase As Integer = EgtAddPhase()
-
-      ' Eseguo eventuali spezzature dei grezzi e vi sposto i pezzi (i grezzi devono essere sempre copiati per Registrazione con rotazione)
-      Dim nRawId As Integer = EgtGetFirstRawPart()
-      While nRawId <> GDB_ID.NULL
-         ' se il grezzo è presente nella fase precedente e non è quello selezionato allora procedo a creare una copia nella nuova fase
-         If EgtVerifyRawPartPhase(nRawId, nNewPhase - 1) Then
-            Dim bKeepRawPart As Boolean = True
-            For Each RawOnAuxTabData As RawMoveData In m_RawMoveDataList
-               If nRawId = RawOnAuxTabData.m_nId Then
-                  bKeepRawPart = False
-                  Exit For
-               End If
-            Next
-            If bKeepRawPart Then EgtKeepRawPart(nRawId, nNewPhase - 1)
-         End If
-         ' passo al successivo grezzo
-         nRawId = EgtGetNextRawPart(nRawId)
-      End While
-
-      Dim nCurrDisposition As Integer = EgtGetPhaseDisposition(nNewPhase)
-      'SetPause(nCurrDisposition)
-      m_nCurrDisposition = nCurrDisposition
-      ' EgtSetStatus(nRawIdSlected, GDB_ST.OFF)
-      EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
-      EgtSetCurrPhase(nNewPhase)
-      SetAuxTabInCurrDisposition()
-      ' ripulisco la lista degli spostamenti
-      m_RawMoveDataList.Clear()
-      ' aggiorno la fase corrente
-      m_nCurrPhase = EgtGetCurrPhase()
-   End Sub
-
    Private Sub ResetBtn_Click(sender As Object, e As RoutedEventArgs) Handles ResetBtn.Click
       ' Recupero il primo grezzo selezionato
       Dim nRawId As Integer = EgtGetFirstSelectedObj()
@@ -1086,75 +656,17 @@ Public Class MoveRawPartPage
    End Sub
 
    Private Sub PrevBtn_Click(sender As Object, e As RoutedEventArgs) Handles PrevBtn.Click
-      ' verifico che il pezzo sia depositabile
-      If VerifyCollisionWithOtherRawPart(m_CurrRawOnVacuum) Then
-         ' mantengo la selezione del pezzo
-         EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL)
-         m_CurrProjPage.SetErrorMessage("Collisione pezzi")
-         EgtDraw()
-         ' non cambio pagina
-         Return
-      End If
-      ' resetto l'inidice del pezzo da mnovimentare
-      m_CurrRawOnVacuum = GDB_ID.NULL
       ' Deseleziono tutto
       EgtDeselectAll()
       ' Torno alla fase precedente
       m_bPrev = True
-      ' Passo alla pagina delle spezzature solo se non esiste prima una fased di deposito sulla tavola di scarico
-
-      Dim nPrevDispId As Integer = EgtGetPrevOperation(m_nCurrDisposition)
-      ' verifico se la fasa precedente è di tipo scarico
-      If IsDispUnloadOnAuxTab(nPrevDispId) <> 0 Then
-         EgtSetCurrPhase(m_nCurrPhase - 1)
-         m_nCurrDisposition = nPrevDispId
-         m_nCurrPhase -= 1
-         m_bPrev = False
-         m_SplitPage.m_bShow = True
-         EgtDraw()
-         Return
-      End If
-
-      'If EgtGetOperationType(EgtGetPrevOperation(m_nCurrDisposition)) = MCH_OY.DISP AndAlso m_SplitPage.m_bOnAuxTab Then
-      '   EgtSetCurrPhase(m_nCurrPhase - 1)
-      '   m_nCurrDisposition = EgtGetPrevOperation(m_nCurrDisposition)
-      '   m_nCurrPhase -= 1
-      '   m_bPrev = False
-      '   m_SplitPage.m_bShow = True
-      '   EgtDraw()
-      '   Return
-      'End If
-
+      ' Passo alla pagina delle spezzature
       m_MainWindow.m_CadCutPageUC.CadCutPageGrid.Children.Remove(Me)
       m_MainWindow.m_CadCutPageUC.CadCutPageGrid.Children.Add(m_SplitPage)
       m_MainWindow.m_CadCutPageUC.m_CadCutMode = CadCutPageUC.CadCutModes.Split
    End Sub
 
    Private Sub NextBtn_Click(sender As Object, e As RoutedEventArgs) Handles NextBtn.Click
-      ' verifico che il pezzo sia depositabile
-      If VerifyCollisionWithOtherRawPart(m_CurrRawOnVacuum) Then
-         ' mantengo la selezione del pezzo
-         EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL)
-         m_CurrProjPage.SetErrorMessage("Collisione pezzi")
-         EgtDraw()
-         ' non cambio pagina
-         Return
-      End If
-
-      ' se la disposizione corrente è sulla tavola ausiliaria allora lo sarà anche quella successiva
-      If IsDispUnloadOnAuxTab(m_nCurrDisposition) <> 0 Then
-         EgtSetCurrPhase(m_nCurrPhase + 1)
-         m_nCurrDisposition = EgtGetNextOperation(m_nCurrDisposition)
-         m_nCurrPhase += 1
-         m_bToNext = False
-         m_SplitPage.m_bShow = True
-         EgtDraw()
-         EnableButtons()
-         Return
-      End If
-
-      ' resetto l'inidice del pezzo da mnovimentare
-      m_CurrRawOnVacuum = GDB_ID.NULL
       ' Deseleziono tutto
       EgtDeselectAll()
       ' Passo alla pagina delle spezzature
@@ -1198,26 +710,6 @@ Public Class MoveRawPartPage
       EnableButtons()
    End Sub
 
-   ' verifica se la disposizione indicata è uno scarico sulla tavola ausiliaria
-   Public Function IsDispUnloadOnAuxTab(nCurrDispId As Integer) As Integer
-      ' verifico se la fase precedente è uno scarico su tavola ausiliaria
-      Dim bVal As Integer = 0
-      EgtGetInfo(nCurrDispId, "Pat", bVal)
-      Return bVal
-   End Function
-
-   ' recupero la prima disposizione disponibile tra l'elenco delle operazioni presenti
-   Public Function GetNextDisposition(nCurrDisposId As Integer) As Integer
-      Dim nDispId As Integer = nCurrDisposId
-      While nDispId <> GDB_ID.NULL
-         If EgtGetOperationType(nDispId) = MCH_OY.DISP Then
-            Return nDispId
-         End If
-         nDispId = EgtGetNextOperation(nDispId)
-      End While
-      Return GDB_ID.NULL
-   End Function
-
    Private Sub EnableButtons()
       UpBtn.IsEnabled = Not m_SplitPage.m_bShow
       LeftBtn.IsEnabled = Not m_SplitPage.m_bShow
@@ -1232,22 +724,11 @@ Public Class MoveRawPartPage
       TopRBtn.IsEnabled = Not m_SplitPage.m_bShow
       BottomLBtn.IsEnabled = Not m_SplitPage.m_bShow
       BottomRBtn.IsEnabled = Not m_SplitPage.m_bShow
-      PauseBtn.IsEnabled = Not m_SplitPage.m_bShow
       ResetBtn.IsEnabled = Not m_SplitPage.m_bShow
-      If m_SplitPage.m_bShow Then
-         NextBtn.IsEnabled = (m_nCurrPhase < EgtGetPhaseCount())
-      Else
-         NextBtn.IsEnabled = Not m_SplitPage.m_bOnAuxTab
-      End If
+      NextBtn.IsEnabled = Not m_SplitPage.m_bOnAuxTab
    End Sub
 
    Private Sub MoveRawPartPage_Unloaded(sender As Object, e As EventArgs) Handles Me.Unloaded
-      ' verifico che la fase corrente non sia vuota
-      Dim nLastDispId As Integer = EgtGetPhaseDisposition(m_nCurrPhase)
-      If EgtIsOperationEmpty(nLastDispId) And m_SplitPage.m_bOnAuxTab And m_RawMoveDataList.Count = 0 Then
-         EgtErase(nLastDispId)
-      End If
-
       ' Se movimento con ventose
       If Not m_bByHand Then
          ' nascondo le ventose
@@ -1263,11 +744,11 @@ Public Class MoveRawPartPage
             ' imposto eventuale presenza rimozioni manuali
             SaveRemoveByHandInDisposition(nDispId, m_bRemovedRaw)
             ' imposto eventuale movimento pezzi su tavola ausiliaria
-            SaveMovePartsOnAuxTable(nDispId, m_SplitPage.m_bOnAuxTab)
+            SaveMovePartsOnAuxTable( nDispId, m_SplitPage.m_bOnAuxTab)
             ' Eseguo calcolo speciale dei movimenti
             SpecialApplyDisposition(nDispId, True, Not m_SplitPage.m_bOnAuxTab)
          End If
-         ' se altrimenti movimento senza ventose perchè lama troppo grande
+      ' se altrimenti movimento senza ventose perchè lama troppo grande
       ElseIf GetVacuumType() > 0 Then
          ' se non solo visualizzazione
          If Not m_SplitPage.m_bShow Then

CadCuts/NestPageUC.xaml

@@ -8,7 +8,7 @@
    d:DesignHeight="853.3" d:DesignWidth="1280" Initialized="NestPage_Initialized" Loaded="NestPage_Loaded" Unloaded="NestPage_Unloaded">
       
    <!-- Definizione della NestPage -->
-   <Grid Name="NestPageGrid">
+   <Grid Name="NestPageGrid" >
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="3*"/>
          <ColumnDefinition Width="12*"/>
@@ -78,7 +78,7 @@
                <ColumnDefinition Width="Auto"/>
                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <EgtWPFLib:EgtTextBox Name="RotationAngleTxBx"  Width="50" IsLength="False"
+            <EgtWPFLib:EgtTextBox Name="RotationAngleTxBx"  Width="50"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
             <TextBlock Grid.Column="1" FontSize="30" Margin="2,-5,0,0"
                Text="°"/>
@@ -99,38 +99,18 @@
             <Image Source="{DynamicResource ClockwiseRotateImg}" Width="65" Height="65" HorizontalAlignment="Center"
                VerticalAlignment="Center" />
          </Button>
+         
+         <UniformGrid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2" >
+            <Button Name="InsertPartBtn" Style="{DynamicResource OmagCut_YellowTextButton}" Padding="1"/>
+            <Button Name="StorePartBtn" Style="{DynamicResource OmagCut_YellowTextButton}" Padding="1"/>
+         </UniformGrid>
 
-            <UniformGrid Name ="UG0" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="3" >
-                <Button Name="InsertPartBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource Inserisci-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
-                <Button Name="StorePartBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource Parcheggia-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
-                <ToggleButton Name="StartCurveWJBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource StartWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </ToggleButton>
-            </UniformGrid>
-          
-            <UniformGrid Name ="UG1"  Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Columns="3" >
-                <Button Name="RemovePartBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource Elimina-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
-                <ToggleButton Name="DragRettanleBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Drag_RettangleImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </ToggleButton>
-                <ToggleButton Name="SplitCurveWJBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource SplitWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </ToggleButton>
-            </UniformGrid>
+         <Button Name="RemovePartBtn" Grid.ColumnSpan="3" Grid.Row="6"
+            Style="{DynamicResource OmagCut_YellowTextButton}" Padding="1"/>
 
-            <UniformGrid Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="3" Columns="2" >
-                <Button Name="SelectAllBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource Seleziona-tuttoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
-                <Button Name="DeselectAllBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource Deseleziona-tuttoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
+         <UniformGrid Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="3" Columns="2" >
+            <Button Name="SelectAllBtn" Style="{DynamicResource OmagCut_YellowTextButton}" Padding="1"/>
+            <Button Name="DeselectAllBtn" Style="{DynamicResource OmagCut_YellowTextButton}" Padding="1"/>
          </UniformGrid>
 
       </Grid>

CadCuts/OpenFileWD.xaml.vb

@@ -9,7 +9,6 @@ Public Class OpenFileWD
    Private m_sCurrFile As String = String.Empty
    Private m_sExt As String = String.Empty
    Private m_sExt2 As String = String.Empty
-   Private n_sDeniedFiles As New List(Of String)
 
    Private m_OpenItemList As New ObservableCollection(Of IconListBoxItem)
 
@@ -28,15 +27,6 @@ Public Class OpenFileWD
       InitializeComponent()
    End Sub
 
-   Sub New(Owner As Window, sDir As String, sExt As String, sExt2 As String, DeniedFiles As List(Of String))
-      Me.Owner = Owner
-      m_sCurrDir = sDir
-      m_sExt = sExt
-      m_sExt2 = sExt2
-      n_sDeniedFiles = DeniedFiles
-      InitializeComponent()
-   End Sub
-
    Private Sub OpenFile_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Posizione finestra
       Me.Top = Owner.Top + Owner.Height / 2 - Me.Height / 2
@@ -81,20 +71,13 @@ Public Class OpenFileWD
       Dim FileI As FileInfo
       For Each FileI In vFileI
          Dim sExt As String = Path.GetExtension(FileI.Name).ToUpper()
-         Dim sFileName As String = Path.GetFileNameWithoutExtension(FileI.Name).ToUpper.Trim
-         Dim bDenied As Boolean = False
-         For Each ItemFile As String In n_sDeniedFiles
-            If ItemFile.ToUpper.Trim = sFileName Then
-               bDenied = True
-               Exit For
-            End If
-         Next
-         If (String.Compare(sExt, m_sExt, True) = 0 Or String.Compare(sExt, m_sExt2, True) = 0) And Not bDenied Then
+         If String.Compare(sExt, m_sExt, True) = 0 Or
+            String.Compare(sExt, m_sExt2, True) = 0 Then
             m_OpenItemList.Add(New IconListBoxItem(FileI.Name, 3))
          End If
       Next
-         ' riporto visualizzazione in cima alla lista (esiste sempre almeno un elemento)
-         FileListBox.ScrollIntoView(m_OpenItemList(0))
+      ' riporto visualizzazione in cima alla lista (esiste sempre almeno un elemento)
+      FileListBox.ScrollIntoView(m_OpenItemList(0))
       Return True
    End Function
 

CadCuts/SelectPartFromFamilyWD.xaml

@@ -1,72 +0,0 @@
-<Window x:Class="SelectPartFromFamilyWD"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-        FontFamily="{DynamicResource OmagCut_Font}"
-        ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
-        Title="SaveNameWD" Height="200" Width="400" ShowInTaskbar="False">
-    <!--Definizione della pagina di scelta del nome con cui salvare il progetto-->
-    <Border Style="{DynamicResource OmagCut_Border}">
-        <Grid x:Name="SaveNameGrid">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="0.5*"/>
-                <ColumnDefinition Width="4*"/>
-                <ColumnDefinition Width="0.5*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="0.1*"/>
-                <RowDefinition Height="0.3*"/>
-                <RowDefinition Height="0.2*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="0.2*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="0.2*"/>
-
-            </Grid.RowDefinitions>
-
-            <!--Messaggio: Seleziona il numero di pezzi-->
-            <TextBlock Name="TitleWDTxbl" Grid.Column="1" Grid.Row="1"
-                       Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-
-            <UniformGrid Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" Columns="2">
-                <TextBlock Name="NbrOfPartsMsg"
-                           Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="NbrOfParts"
-                            Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-            </UniformGrid>
-
-            <Grid Name="ButtonsGrid" Grid.Column="1" Grid.Row="5" Grid.RowSpan="1">
-                <Grid.ColumnDefinitions>
-
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="0.5*"/>
-
-                </Grid.ColumnDefinitions>
-
-                <!--ultimo progetto-->
-                <Button Name="ConfirmSelection" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}"
-                        ToolTip="Confirm">
-                    <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <!--nuovo progetto-->
-                <Button Name="SelectAllPart" Grid.Column="2" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}"
-                        ToolTip="Select all" Visibility="Collapsed">
-                    <Image Source="{DynamicResource NuovoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <!--apri folder progetti-->
-                <Button Name="CancelSelection" Grid.Column="5" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}"
-                        ToolTip="Cancel">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-
-            </Grid>
-
-        </Grid>
-
-    </Border>
-</Window>

CadCuts/SelectPartFromFamilyWD.xaml.vb

@@ -1,66 +0,0 @@
-Public Class SelectPartFromFamilyWD
-   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
-
-   Private m_NumberOfParts As Integer = 1
-   Public Property NumberOfParts As Integer
-      Get
-         Return m_NumberOfParts
-      End Get
-      Set(value As Integer)
-         m_NumberOfParts = value
-      End Set
-   End Property
-
-   Private m_NumberOfSelection As Integer = 1
-   Public Property NumberOfSelection As Integer
-      Get
-         Return m_NumberOfSelection
-      End Get
-      Set(value As Integer)
-         m_NumberOfSelection = value
-      End Set
-   End Property
-   Public Sub New(Owner As Window, NbrParts As Integer)
-      Me.Owner = Owner
-      m_NumberOfParts = NbrParts
-      InitializeComponent()
-      Me.ShowDialog()
-   End Sub
-
-   ' inizializzo la finestra
-   Private Sub SelectPartFromFamilyWD_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
-      ' posiziono la fistra in centro alla pagina
-      Me.Top = Owner.Top + Owner.Height / 2 - Me.Height / 2
-      Me.Left = Owner.Left + Owner.Width / 2 - Me.Width / 2
-
-      TitleWDTxbl.Text = "Selection parts"
-      NbrOfPartsMsg.Text = "Number of parts"
-      NbrOfParts.Text = m_NumberOfParts.ToString
-   End Sub
-
-   ' seleziono il numero di elementi indicati
-   Private Sub ConfirmSelection_Click(sender As Object, e As RoutedEventArgs) Handles ConfirmSelection.Click
-      Dim nVal As Integer = 0
-      StringToInt(NbrOfParts.Text, nVal)
-      If nVal >= 0 Then
-         m_NumberOfSelection = nVal
-      Else
-         ' indice non valido per la selezione
-         m_NumberOfSelection = 0
-      End If
-      Me.Close()
-   End Sub
-
-   '' seleziona tutti
-   'Private Sub SelectAllPart_Click(sender As Object, e As RoutedEventArgs) Handles SelectAllPart.Click
-   '   m_NumberOfSelection = m_NumberOfParts
-   '   Me.Close()
-   'End Sub
-
-   ' Deseleziomo tutto
-   Private Sub CancelSelection_Click(sender As Object, e As RoutedEventArgs) Handles CancelSelection.Click
-      m_NumberOfSelection = 0
-      Me.Close()
-   End Sub
-
-End Class

CadCuts/SplitAuto.vb

@@ -5,11 +5,6 @@ Public Module SplitAuto
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
 
    Private m_dLastDT As Double = 0
-   Public ReadOnly Property dLastDT As Double
-      Get
-         Return m_dLastDT
-      End Get
-   End Property
 
    '-----------------------------------------------------------------------------------------------
    Friend Class SplitMach
@@ -57,7 +52,7 @@ Public Module SplitAuto
                Dim sInfo As String = String.Empty
                If EgtGetInfo(nOperId, INFO_MCH_OTHMID, sInfo) Then
                   Dim sItems() As String = sInfo.Split(",".ToCharArray)
-                  For Each sId As String In sItems
+                  For Each sId In sItems
                      Dim nId As Integer = 0
                      StringToInt(sId, nId)
                      If nId > 0 Then Mach.m_vOthId.Add(nId)
@@ -98,15 +93,14 @@ Public Module SplitAuto
                   Mach.m_dStartFreeLen = FREELEN_INF + 1
                   Mach.m_dEndFreeLen = FREELEN_INF + 1
                   Dim nEntId, nSub As Integer
-                  If EgtGetMachiningGeometry(0, nEntId, nSub) Then
-                     ' EgtGetType( nEntId) = GDB_TY.CRV_ARC OrElse
-                     If EgtGetType(nEntId) = GDB_TY.CRV_COMPO Then Mach.m_bIsLine = False
-                     EgtGetInfo(nEntId, If(Not Mach.m_bInvert, INFO_PREVANG, INFO_NEXTANG), Mach.m_dPrevAng)
-                     EgtGetInfo(nEntId, If(Not Mach.m_bInvert, INFO_NEXTANG, INFO_PREVANG), Mach.m_dNextAng)
-                     EgtGetInfo(nEntId, If(Not Mach.m_bInvert, INFO_START_FREELEN, INFO_END_FREELEN), Mach.m_dStartFreeLen)
-                     EgtGetInfo(nEntId, If(Not Mach.m_bInvert, INFO_END_FREELEN, INFO_START_FREELEN), Mach.m_dEndFreeLen)
-                     Mach.m_bEnableInvert = GetEnableInvert(nEntId)
-                     EgtMidVector(nEntId, GDB_ID.ROOT, Mach.m_vtDir)
+                  If EgtGetMachiningGeometry( 0, nEntId, nSub) Then
+                     If EgtGetType( nEntId) = GDB_TY.CRV_ARC OrElse EgtGetType( nEntId) = GDB_TY.CRV_COMPO Then Mach.m_bIsLine = False
+                     EgtGetInfo( nEntId, If( Not Mach.m_bInvert, INFO_PREVANG, INFO_NEXTANG), Mach.m_dPrevAng)
+                     EgtGetInfo( nEntId, If( Not Mach.m_bInvert, INFO_NEXTANG, INFO_PREVANG), Mach.m_dNextAng)
+                     EgtGetInfo( nEntId, If( Not Mach.m_bInvert, INFO_START_FREELEN, INFO_END_FREELEN), Mach.m_dStartFreeLen)
+                     EgtGetInfo( nEntId, If( Not Mach.m_bInvert, INFO_END_FREELEN, INFO_START_FREELEN), Mach.m_dEndFreeLen)
+                     Mach.m_bEnableInvert = GetEnableInvert( nEntId)
+                     EgtMidVector( nEntId, GDB_ID.ROOT, Mach.m_vtDir)
                      If Mach.m_bInvert Then Mach.m_vtDir = -Mach.m_vtDir
                      Mach.m_nEntId = nEntId
                   End If
@@ -167,17 +161,6 @@ Public Module SplitAuto
    End Function
 
    '-----------------------------------------------------------------------------------------------
-   ' calcolo il numero di tipi di lavorazioni
-   Friend Sub CountMachiningType(MachSplit As SplitMach, ByRef nCountSawing As Integer, ByRef nCountWaterjetting As Integer, ByRef nCountOtherMachining As Integer)
-      If MachSplit.m_nType = MCH_OY.SAWING Then
-         nCountSawing += 1
-      ElseIf MachSplit.m_nType = MCH_OY.WATERJETTING Then
-         nCountWaterjetting += 1
-      Else
-         nCountOtherMachining += 1
-      End If
-   End Sub
-
    Friend Sub ColorMachining(MachSplit As SplitMach, Optional bReset As Boolean = False)
       EgtDisableModified()
       ' Assegno stato
@@ -285,7 +268,7 @@ Public Module SplitAuto
             Dim sInfo As String = String.Empty
             If EgtGetInfo(nOpeId, INFO_MCH_OTHMID, sInfo) Then
                Dim sItems() As String = sInfo.Split(",".ToCharArray)
-               For Each sId As String In sItems
+               For Each sId In sItems
                   Dim nId As Integer = GDB_ID.NULL
                   StringToInt(sId, nId)
                   Dim nPvId2 As Integer = GDB_ID.NULL
@@ -315,7 +298,7 @@ Public Module SplitAuto
             Dim sInfo As String = String.Empty
             If EgtGetInfo(nOpeId, INFO_MCH_OTHMID, sInfo) Then
                Dim sItems() As String = sInfo.Split(",".ToCharArray)
-               For Each sId As String In sItems
+               For Each sId In sItems
                   Dim nId As Integer = GDB_ID.NULL
                   StringToInt(sId, nId)
                   Dim nPvId2 As Integer = GDB_ID.NULL
@@ -364,13 +347,6 @@ Public Module SplitAuto
                   vNewRaws.Add(nNewRawId)
                   nNewRawId = EgtGetNextRawPart(nNewRawId)
                End While
-            Else
-               ' verifico che nella fase precedente è stato definito come sfrido, allora lo riassegno
-               Dim nVal As Integer = 0
-               EgtGetInfo(nRawId, K_ISNEWSCRAPS, nVal)
-               If nVal = 1 Or nVal = 2 Or nVal = 3 Then
-                  EgtSetInfo(nRaw1Id, K_ISNEWSCRAPS, "3")
-               End If
             End If
             ' Assegno ai nuovi grezzi eventuale texture del grezzo originale
             Dim nSolidId = EgtGetFirstNameInGroup(nRawId, NAME_RAW_SOLID)
@@ -408,7 +384,7 @@ Public Module SplitAuto
             Dim sInfo As String = String.Empty
             If EgtGetInfo(nId, INFO_MCH_OTHMID, sInfo) Then
                Dim sItems() As String = sInfo.Split(",".ToCharArray)
-               For Each sId2 As String In sItems
+               For Each sId2 In sItems
                   Dim nId2 As Integer = 0
                   StringToInt(sId2, nId2)
                   If nId2 > 0 Then EgtChangeOperationPhase(nId2, nNewPhase)
@@ -761,55 +737,35 @@ Public Module SplitAuto
    End Function
 
    Private Function SafeMoveRawPart(nRawId As Integer, ByRef vtMove As Vector3d, dMindist As Double) As Boolean
-      ' Spostamento originale
-      Dim vtOriMove As New Vector3d( vtMove)
-      ' Livello di movimento
-      Dim nMoveLevel As Integer = GetPrivateProfileInt( S_SPLIT, K_MOVE_LEV, 5, m_MainWindow.GetIniFile())
-      Dim nMove As Integer = 1
       ' Se esce dalla tavola, movimento già annullato ed esco con errore
-      If Not EgtMoveRawPart(nRawId, vtOriMove) Then Return False
+      If Not EgtMoveRawPart(nRawId, vtMove) Then Return False
       ' Se interferisce con altri grezzi, annullo movimento ed esco con errore
       If Not VerifyRawWithOtherRaws(nRawId, dMindist) Then
-         EgtMoveRawPart(nRawId, -vtOriMove)
+         EgtMoveRawPart(nRawId, -vtMove)
          Return False
       End If
-      If nMoveLevel < 2 Then Return True
       ' Provo ad aggiungere un altro movimento
-      If EgtMoveRawPart(nRawId, vtOriMove) Then
+      If EgtMoveRawPart(nRawId, vtMove) Then
          If VerifyRawWithOtherRaws(nRawId, dMindist) Then
-            vtMove += vtOriMove
-            nMove += 1
-            If nMoveLevel = nMove Then Return True
+            vtMove += vtMove
          Else
-            EgtMoveRawPart(nRawId, -vtOriMove)
-         End If
-      End If
-      ' Provo ad aggiungere un altro movimento
-      If EgtMoveRawPart(nRawId, vtOriMove) Then
-         If VerifyRawWithOtherRaws(nRawId, dMindist) Then
-            vtMove += vtOriMove
-            nMove += 1
-            If nMoveLevel = nMove Then Return True
-         Else
-            EgtMoveRawPart(nRawId, -vtOriMove)
+            EgtMoveRawPart(nRawId, -vtMove)
          End If
       End If
       ' Provo ad aggiungere un movimento dimezzato
-      If EgtMoveRawPart(nRawId, 0.5 * vtOriMove) Then
+      If EgtMoveRawPart(nRawId, 0.5 * vtMove) Then
          If VerifyRawWithOtherRaws(nRawId, dMindist) Then
-            vtMove += 0.5 * vtOriMove
-            nMove += 1
-            If nMoveLevel = nMove Then return True
+            vtMove += 0.5 * vtMove
          Else
-            EgtMoveRawPart(nRawId, -0.5 * vtOriMove)
+            EgtMoveRawPart(nRawId, -0.5 * vtMove)
          End If
       End If
-      ' Provo ad aggiungere un movimento 1/4
-      If EgtMoveRawPart(nRawId, 0.25 * vtOriMove) Then
+      ' Provo ad aggiunger un movimento 1/4
+      If EgtMoveRawPart(nRawId, 0.25 * vtMove) Then
          If VerifyRawWithOtherRaws(nRawId, dMindist) Then
-            vtMove += 0.25 * vtOriMove
+            vtMove += 0.25 * vtMove
          Else
-            EgtMoveRawPart(nRawId, -0.25 * vtOriMove)
+            EgtMoveRawPart(nRawId, -0.25 * vtMove)
          End If
       End If
       Return True
@@ -855,36 +811,10 @@ Public Module SplitAuto
          End If
       Next
       ' Cancello curve offset
-      For i As Integer = 0 To nCount - 1
+      For i = 0 To nCount - 1
          EgtErase(nOffsId + i)
       Next
       Return (Not bInterf)
    End Function
 
-   Public Function MaxCuttingMustache(dMustache As Double) As Double
-      Dim MachSplitList As New List(Of SplitMach)
-      ' Recupero l'indice della fase corrente
-      Dim nCurrPhase As Integer = EgtGetCurrPhase()
-      ' se non è stata creata nessuna lista allora restituisco il valore di Default
-      If Not CalculateSplitMachList(nCurrPhase, MachSplitList) Then Return dMustache
-      Dim NewMustache As Double = 0
-      Dim ItemMachSplit As SplitMach
-      For Each ItemMachSplit In MachSplitList
-         ' Recupero lunghezza baffo secondo taglio
-         Dim nPvId As Integer = GDB_ID.NULL
-         EgtGetInfo(EgtGetFirstNameInGroup(ItemMachSplit.m_nId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
-         Dim dDT As Double
-         If EgtGetInfo(EgtGetFirstGroupInGroup(nPvId), "DT", dDT) Then
-            If NewMustache < dDT Then NewMustache = dDT
-         End If
-      Next
-      Dim dExtraL As Double = 0
-      EgtMdbGetGeneralParam(MCH_GP.EXTRALONCUTREG, dExtraL)
-      ' se esiste il valore di un baffo allora sovrascrivo il valore di default
-      If NewMustache > 0 Then
-         dMustache = Math.Ceiling(NewMustache)
-      End If
-      Return dMustache + dExtraL
-   End Function
-
 End Module

CadCuts/SplitPageUC.xaml

@@ -38,7 +38,7 @@
                <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
             </Button>
             <Button Name="NextBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}" RenderTransformOrigin="0.5,0.5">
+                    <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}" RenderTransformOrigin="0.5,0.5">
                   <Image.RenderTransform>
                      <TransformGroup>
                         <RotateTransform Angle="180"/>
@@ -63,27 +63,17 @@
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
 
-         <ListBox Name="MachiningLsBx" Grid.Row="1"
+         <ListBox Name="MachiningLsBx" Grid.Row="1" ItemTemplate="{DynamicResource NameIdLsBxItem}"
             SelectionMode="Extended">
-            <ListBox.ItemTemplate>
-               <DataTemplate>
-                  <TextBlock Text="{Binding Name}">
-                     <TextBlock.Style>
-                        <Style TargetType="TextBlock" BasedOn="{StaticResource OmagCut_CurrProjSummeryTextBlock}">
-                           <Style.Triggers>
-                              <DataTrigger Binding="{Binding bIsActive}" Value="False">
-                                 <Setter Property="TextDecorations" Value="Strikethrough"/>
-                                 <Setter Property="Foreground" Value="{StaticResource OmagCut_White}"/>
-                              </DataTrigger>
-                              <DataTrigger Binding="{Binding bIsActive}" Value="True">
-                                 <Setter Property="Foreground" Value="Black"/>
-                              </DataTrigger>
-                           </Style.Triggers>
-                        </Style>
-                     </TextBlock.Style>
-                  </TextBlock>
-               </DataTemplate>
-            </ListBox.ItemTemplate>
+            <ListBox.ItemContainerStyle>
+               <Style TargetType="ListBoxItem">
+                  <Style.Triggers>
+                     <DataTrigger Binding="{Binding bIsActive}" Value="False">
+                        <Setter Property="Foreground" Value="{StaticResource OmagCut_White}"/>
+                     </DataTrigger>
+                  </Style.Triggers>
+               </Style>
+            </ListBox.ItemContainerStyle>
          </ListBox>
 
          <Grid Grid.Row="2">
@@ -110,15 +100,9 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-            <Button Name="OnOffBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource ON_OFF-singolo-taglioImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <Button Name="AllOnBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource Tutti-ONImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            <Button Name="AllOffBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource Tutti-OFFImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
+            <Button Name="OnOffBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
+            <Button Name="AllOnBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
+            <Button Name="AllOffBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
 
          </Grid>
 
@@ -129,34 +113,9 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-            <Button Name="CutBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource Allunga-AccorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            
-            <Button Name="CutStartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource Inizio-Allunga-AccorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-
-            <Button Name="CutEndBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource Fine-Allunga-AccorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-
-            <!-- solo per macchine con lavorazioni Waterjet -->
-            <ToggleButton Name="BridgesWJBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-               <Image Source="{DynamicResource PonticelliWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </ToggleButton>
-
-             <!--solo per macchine con lavorazioni Waterjet--> 
-            <Button Name="QualityWJBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource QualityWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
-            
-            <!-- solo per macchine con lavorazioni Waterjet -->
-            <ToggleButton Name="BridgesDeleteWJBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-               <Image Source="{DynamicResource PonticelliDeleteWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </ToggleButton>
-
-           
+            <Button Name="CutBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
+            <Button Name="CutStartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
+            <Button Name="CutEndBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
 
          </Grid>
 
@@ -180,42 +139,18 @@
          </Grid.ColumnDefinitions>
 
 
-         <Button Name="OutCenStartBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Image Source="{DynamicResource Inizio-Centro-FuoriImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="OutCenEndBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Image Source="{DynamicResource Fine-Centro-FuoriImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="ModifStartBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Image Source="{DynamicResource Modifica-InizioImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="ModifEndBtn" Grid.Column="3"  Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Image Source="{DynamicResource Modifica-FineImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="InvertBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Image Source="{DynamicResource InvertiImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="PauseBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Image Source="{DynamicResource Pausa-ON_OFFImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="AllOutStartBtn" Grid.Column="6" Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Image Source="{DynamicResource Inizio-tutti-fuoriImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="AllCenStartBtn" Grid.Column="7" Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Image Source="{DynamicResource Inizio-tutti-centroImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="AllOutEndBtn" Grid.Column="8" Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Image Source="{DynamicResource Fine-tutti-fuoriImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="AllCenEndBtn" Grid.Column="9" Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Image Source="{DynamicResource Fine-tutti-centroImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="AllExtendBtn" Grid.Column="10" Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Image Source="{DynamicResource Tutti-allungaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="AllReduceBtn" Grid.Column="11" Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Image Source="{DynamicResource Tutti-accorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
+         <Button Name="OutCenStartBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
+         <Button Name="OutCenEndBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
+         <Button Name="ModifStartBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
+         <Button Name="ModifEndBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
+         <Button Name="InvertBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
+         <Button Name="PauseBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
+         <Button Name="AllOutStartBtn" Grid.Column="6" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
+         <Button Name="AllCenStartBtn" Grid.Column="7" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
+         <Button Name="AllOutEndBtn" Grid.Column="8" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
+         <Button Name="AllCenEndBtn" Grid.Column="9" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
+         <Button Name="AllExtendBtn" Grid.Column="10" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
+         <Button Name="AllReduceBtn" Grid.Column="11" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
 
       </Grid>
 

CadCuts/VacuumCups.vb

@@ -1,5 +1,4 @@
 Imports EgtUILib
-Imports System.Text.RegularExpressions
 
 Module VacuumCups
    ' Tipo manipolatore con ventosa (0=assente, 1=dietro, 2=laterale)
@@ -9,24 +8,7 @@ Module VacuumCups
    Private m_nVacId As Integer = GDB_ID.NULL
    Private m_nRefId As Integer = GDB_ID.NULL
    Private m_dPreferredRot As Double = 0
-   Private m_dPrefVertRotXMinus As Double = 0
-   Private m_dPrefVertRotXPlus As Double = 0
-   Private m_dPrefVertRotYMinus As Double = 0
-   Private m_dPrefVertRotYPlus As Double = 0
    Private m_dDripRefAng As Double = 0
-   ' dati carico massimo manipolatore
-   Private m_RawDensity As Double = 2500
-   Private m_RawWeight As Double = 0
-   Private m_MaxWeightSinglePlugger As Double = 250
-   Private m_MaxWeightDoublePlugger As Double = 750
-   Public bOverWeight As Boolean = False
-   ' dati per rotazione ventose vicono al fine corsa Y e X
-   Private bRotateVacuumNearExtraStrokeY As Boolean = False
-   Private bRotateVacuumNearExtraStrokeX As Boolean = False
-   ' dati stroke
-   Public bExtraStroke As Boolean = False
-   Public ptStartPointLift As Point3d
-   Public dDegRotStartAng As Double
 
    ' Nome del gruppo temporaneo per le ventose
    Private Const VACTMP_GRP As String = "VacTmp"
@@ -66,20 +48,6 @@ Module VacuumCups
       Return m_nVacType
    End Function
 
-   ' carico i dati macchina relativi al peso massimo movimentabile
-   Friend Sub SetWeightInformation(Density As Double, MaxSingle As Double, MaxDouble As Double)
-      m_RawDensity = Density
-      m_MaxWeightSinglePlugger = MaxSingle
-      m_MaxWeightDoublePlugger = MaxDouble
-   End Sub
-
-   Friend Sub SetRotationForExtraStrokeY(Rotate As Boolean)
-      bRotateVacuumNearExtraStrokeY = Rotate
-   End Sub
-
-   Friend Sub SetRotationForExtraStrokeX(Rotate As Boolean)
-      bRotateVacuumNearExtraStrokeX = Rotate
-   End Sub
    Friend Function GetVacuumId() As Integer
       Return m_nVacId
    End Function
@@ -96,8 +64,6 @@ Module VacuumCups
       ' Identificativo riferimento della testa nella macchina
       Dim nT1Id As Integer = EgtGetFirstNameInGroup(EgtGetHeadId(VACUUM_HEAD), HEAD_FIRST_EXIT)
       If nT1Id = GDB_ID.NULL Then Return False
-      ' imposto la l'uscita della ventosa come fosse l'uscita di un utensile
-      EgtSetCalcTool("", "H4", 1)
       ' Creo gruppo temporaneo in cui copiarli
       m_nTempId = EgtCreateGroup(GDB_ID.ROOT)
       If m_nTempId = GDB_ID.NULL Then Return False
@@ -108,11 +74,6 @@ Module VacuumCups
       If m_nVacId = GDB_ID.NULL Then Return False
       ' Angolo di rotazione preferito
       EgtGetInfo( m_nVacId, KEY_VACLAY_PREFROT, m_dPreferredRot)
-      ' Angoli di rotazione preferiti per ventosa in verticale (lungo Y) a sinistra e a destra del centro tavola
-      EgtGetInfo( m_nVacId, KEY_VACLAY_PREFVROTXMINUS, m_dPrefVertRotXMinus)
-      EgtGetInfo(m_nVacId, KEY_VACLAY_PREFVROTXPLUS, m_dPrefVertRotXPlus)
-      EgtGetInfo(m_nVacId, KEY_VACLAY_PREFVROTYMINUS, m_dPrefVertRotYMinus)
-      EgtGetInfo(m_nVacId, KEY_VACLAY_PREFVROTYPLUS, m_dPrefVertRotYPlus)
       ' Direzione di riferimento per tagli Drip
       EgtGetInfo( m_nVacId, KEY_VACLAY_DRIPREFDIR, m_dDripRefAng)
       ' Nascondo il gruppo ma rendo visibili le curve di contorno delle ventose
@@ -199,18 +160,6 @@ Module VacuumCups
       EgtGetBBoxGlob(nRKerfId, GDB_BB.STANDARD, b3Kerf)
       Dim ptKerfCen As Point3d
       EgtCentroid(nRKerfId, GDB_ID.ROOT, ptKerfCen)
-
-      '-------------------- INIZIO CALCOLO PESO --------------------
-      ' recupero l'area del grezzo da muovere
-      Dim RawArea As Double = 0
-      ' superficie del grezzo senza considerare eventuali fori
-      EgtSurfFrGrossArea(nRKerfId, RawArea)
-      ' volume calcolato in mmc
-      Dim RawVolume As Double = RawArea * b3Raw.DimZ()
-      ' peso calolato in kg
-      m_RawWeight = RawVolume * m_RawDensity / Math.Pow(10, 9)
-      '-------------------- FINE CALCOLO PESO --------------------
-
       ' Eseguo ricerca
       If FindVacuumCupsOnRaw(nRawId, ptRawCen, b3Kerf, ptKerfCen, nKerfId, nRKerfId, rmData) Then
          Return True
@@ -233,7 +182,6 @@ Module VacuumCups
       Return False
    End Function
 
-   ' utilizzata per gestire la movimentazione dei pezzi per eseguire i drip
    Friend Function PutVacuumCupsOnPart(nPartId As Integer,
                                        ByRef rmData As RawMoveData, ByRef b3Part As BBox3d) As Boolean
       ' Ripristino posizione originale ventose
@@ -313,7 +261,6 @@ Module VacuumCups
          Dim sCups() As String = Nothing
          Dim sCups2() As String = Nothing
          If Not GetVacuumCupSelection(nI, sCups, sCups2) Then Return False
-         bExtraStroke = False
          ' Determino validità soluzioni della configurazione
          Dim vtMove As New Vector3d
          Dim ptRotCen As New Point3d
@@ -342,7 +289,6 @@ Module VacuumCups
          Dim frCurrRef As New Frame3d
          EgtFrame(m_nRefId, GDB_ID.ROOT, frCurrRef)
          Dim vtDelta As Vector3d = frCurrRef.Orig() - ptRawCen
-
          ' Assegno dati noti al movimento del grezzo
          rmData.m_nId = nRawId
          rmData.m_vtRawMove = Vector3d.NULL()
@@ -417,26 +363,6 @@ Module VacuumCups
       If b3Vac.IsEmpty() Then Return INFINITO
       ' Se box maggiore di quello del pezzo, scarto soluzione
       If b3Vac.Radius() > b3Raw.Radius() Then Return INFINITO
-      '-------------------- INIZIO VERIFICA PESO --------------------
-      bOverWeight = False
-      Select Case GetPluggerFromCameras(sCups)
-         Case 2
-            ' se peso del grezzo oltre il limite consentito allora scarto la soluzione
-            If m_RawWeight > m_MaxWeightDoublePlugger Then
-               bOverWeight = True
-               Return INFINITO
-            End If
-         Case 1
-            ' se peso del grezzo oltre il limite consentito allora scarto la soluzione
-            If m_RawWeight > m_MaxWeightSinglePlugger Then
-               bOverWeight = True
-               Return INFINITO
-            End If
-      End Select
-      '-------------------- FINE VERIFICA PESO --------------------
-      ' Recupero l'area della tavola
-      Dim b3Tab As New BBox3d
-      EgtGetTableArea(1, b3Tab)
       ' Determino il movimento
       vtMove = ptRawCen - b3Vac.Center()
       b3Vac.Move(vtMove)
@@ -448,30 +374,11 @@ Module VacuumCups
          frMinRect.VersX().ToSpherical(dLen, dAngVertDeg, dAngOrizzDeg)
          dRotAngDeg = dAngOrizzDeg
          If b3Vac.DimY() > b3Vac.DimX() + EPS_SMALL Then dRotAngDeg -= 90
-         Dim dPreferredRot As Double = m_dPreferredRot
-         ' -------------------- INIZIO GESTIONE ROTAZIONE ASSE C PER NON ANDARE IN EXTRA-CORSA --------------------
-         ' verifico l'orientamento del pezzo
-         If bRotateVacuumNearExtraStrokeX And Not IsHorizontal(dAngOrizzDeg) Then
-            ' se l'orientamento è verticale
-            If frMinRect.Orig().x < b3Tab.Center().x Then
-               dPreferredRot = m_dPrefVertRotXMinus
-            Else
-               dPreferredRot = m_dPrefVertRotXPlus
-            End If
-         ElseIf bRotateVacuumNearExtraStrokeY And IsHorizontal(dAngOrizzDeg) Then
-            ' se l'orientemanto è orizzontale e la macchina è stata abilitata
-            If frMinRect.Orig().y < b3Tab.Center().y Then
-               dPreferredRot = m_dPrefVertRotYPlus
-            Else
-               dPreferredRot = m_dPrefVertRotYMinus
-            End If
-         End If
-         ' -------------------- FINE GESTIONE ROTAZIONE ASSE C PER NON ANDARE IN EXTRA-CORSA --------------------
-         Dim dAngDelta As Double = If(Math.Abs(b3Vac.DimY() - b3Vac.DimX()) < 10 * EPS_SMALL, 90, 180)
-         While dRotAngDeg - dPreferredRot >= dAngDelta / 2
+         Dim dAngDelta As Double = If( Math.Abs( b3Vac.DimY() - b3Vac.DimX()) < 10 * EPS_SMALL, 90, 180)
+         While dRotAngDeg - m_dPreferredRot >= dAngDelta / 2 
             dRotAngDeg -= dAngDelta
          End While
-         While dRotAngDeg - dPreferredRot <= -dAngDelta / 2
+         While dRotAngDeg - m_dPreferredRot <= -dAngDelta / 2
             dRotAngDeg += dAngDelta
          End While
       Else
@@ -523,62 +430,13 @@ Module VacuumCups
       ' Applico movimento e rotazione al punto
       ptRef.Move(vtMove)
       ptRef.Rotate(ptRotCen, Vector3d.Z_AX(), dRotAngDeg)
-
-      ' -------------- INIZIO verifica di essere nel limite delle corse macchina --------------
-      If VerifyOutOfStrokes(ptRef, dRotAngDeg) <> 0 Then
-         bExtraStroke = True
-         Return INFINITO
-      End If
-      ' se la posizione è accettbaile allora salvo i dati
-      ptStartPointLift = ptRef
-      dDegRotStartAng = dRotAngDeg
-      ' -------------- FINE verifica di essere nel limite delle corse macchina --------------
-
       ' Ne calcolo la distanza dal centro della tavola
+      Dim b3Tab As New BBox3d
+      EgtGetTableArea(1, b3Tab)
       Dim dDist As Double = Point3d.DistXY(ptRef, b3Tab.Center())
       Return dDist
    End Function
 
-   Private Function IsHorizontal(dDegAng As Double) As Boolean
-      If (Math.Abs(dDegAng) > 45 And Math.Abs(dDegAng) < 135) Or (Math.Abs(dDegAng) > 225 And Math.Abs(dDegAng) < 315) Then
-         Return False
-      End If
-      Return True
-   End Function
-
-   ' assegante le posizioni del centro delle ventose e l'angolo di posizionamento orizzontale verifica che la posizione sia raggiungibile
-   Public Function VerifyOutOfStrokes(ptRef As Point3d, dRotAngDeg As Double) As Integer
-      Dim dX, dY, dZ As Double
-      Dim nStat As Integer
-      Dim dCHome As Double
-      EgtGetAxisHomePos("C", dCHome)
-      ' imposto la l'uscita della ventosa come fosse l'uscita di un utensile
-      EgtSetCalcTool("", "H4", 1)
-      EgtGetCalcPositions(ptRef, dRotAngDeg + dCHome, 0, nStat, dX, dY, dZ)
-      EgtVerifyOutstroke(dX, dY, dZ, dRotAngDeg + dCHome, 0, nStat)
-      Return nStat
-   End Function
-
-   ' dall'informazione di extra corsa recupera il valore indicato
-   Public Function GetExtraStrokeValue(sInfo As String) As Double
-      Dim dExtraStroke As Double = 0
-      Dim sItems As String() = sInfo.Split("="c)
-      If sItems.Count = 2 Then
-         Dim nStartIndex As Integer = 0
-         For Each ItemChar As Char In sItems(1)
-            If ItemChar = "("c Then
-               Exit For
-            End If
-            nStartIndex += 1
-         Next
-         If nStartIndex > 0 Then
-            Dim sValue As String = sItems(1).Remove(nStartIndex, sItems(1).Count - nStartIndex)
-            StringToLen(sValue, dExtraStroke)
-         End If
-      End If
-      Return dExtraStroke
-   End Function
-
    Private Function TestVacuumCups(nCups() As Integer, nRawRegId As Integer,
                                    vtMove As Vector3d, ptRotCen As Point3d, dRotAngDeg As Double) As Boolean
       ' Eseguo verifica delle ventose rispetto al grezzo
@@ -599,28 +457,6 @@ Module VacuumCups
       Return bVacOk
    End Function
 
-   ' dato il vettore delle camere restituisco il quali attuatori sono coinvolti
-   Private Function GetPluggerFromCameras(sCups() As String) As Integer
-      Dim nCountPlunger As Integer = 1
-      Dim bPlugger1 As Boolean = False
-      Dim bPlugger2 As Boolean = False
-      For Each Camera As String In sCups
-         If (Camera.Contains("1") Or Camera.Contains("2") Or Camera.Contains("3")) Then
-            bPlugger1 = True
-         Else
-            bPlugger2 = True
-         End If
-      Next
-      ' verifico quali sono le camere attive
-      If bPlugger1 And bPlugger2 Then
-         nCountPlunger = 2
-      ElseIf Not bPlugger1 And Not bPlugger2 Then
-         nCountPlunger = 0
-      End If
-      ' restituisco il numero di Plugger in uso
-      Return nCountPlunger
-   End Function
-
    Friend Function SaveOneMoveInfo(nId As Integer, rmData As RawMoveData) As Boolean
       ' Assegno le informazioni
       EgtSetInfo(nId, "Id", rmData.m_nId)

Constants/ConstGen.vb

@@ -67,8 +67,6 @@ Module ConstGen
    Public Const MACHININGS_DIR As String = "Machinings"
    ' Nome file Dati delle lucidature
    Public Const KITS_FILE As String = "Kits.data"
-   ' Nome file Dati per waterJet
-   Public Const WATERJETDB_FILE As String = "WaterjetDB.data"
 
    ' File dei pezzi rovinati
    Public Const CURR_RUINED_EPL As String = "RuinedParts.epl"
@@ -92,10 +90,6 @@ Module ConstGen
    Public Const KEY_VACLAY_SEL As String = "Sel"
    ' Info in gruppo layout per angolo di rotazione preferito
    Public Const KEY_VACLAY_PREFROT As String = "PreferredRot"
-   Public Const KEY_VACLAY_PREFVROTXMINUS As String = "PrefVertRotXMinus"
-   Public Const KEY_VACLAY_PREFVROTXPLUS As String = "PrefVertRotXPlus"
-   Public Const KEY_VACLAY_PREFVROTYMINUS As String = "PrefVertRotYMinus"
-   Public Const KEY_VACLAY_PREFVROTYPLUS As String = "PrefVertRotYPlus"
    ' Info in gruppo layout per direzione di riferimento ventose per tagli da sotto
    Public Const KEY_VACLAY_DRIPREFDIR As String = "DripRefDir"
    ' Info in asse rotante ventosa per step discreti
@@ -149,9 +143,6 @@ Module ConstGen
    Public Const INFO_RAW_BLOCK = "Block"
    ' Info per numero lastra nel blocco
    Public Const INFO_RAW_SLABNBR = "SlabNbr"
-   ' Info per identificazione gruppo pezzi
-   Public Const INFO_REFGROUP As String = "RefGroup"
-   Public Const INFO_COUNTERLY As String = "CounterPz"
 
    ' Contrassegno di progetto OmagCut
    Public Const NAME_PROJMARK As String = "OmagCut"
@@ -187,8 +178,6 @@ Module ConstGen
    Public Const INFO_TOTAREA As String = "TotArea"
    ' Info per area da produrre dei pezzi del progetto
    Public Const INFO_TOPRODAREA As String = "ToProdArea"
-   ' Info per nome progetti
-   Public Const INFO_PROJNAME As String = "ProjName"
 
    ' Nome layer delle regioni
    Public Const NAME_REGION As String = "Region"
@@ -214,8 +203,6 @@ Module ConstGen
    Public Const INFO_DEPTH As String = "Depth"
    Public Const INFO_WIDTH As String = "Width"
    Public Const INFO_DEPTH2 As String = "Depth2"
-   Public Const INFO_AGG2 As String = "Agg2"
-   Public Const INFO_ROUNDOFF As String = "RoundOff"
    ' Info in entità da tagliare per taglio ristretto
    Public Const INFO_STRICT As String = "Strict"
    ' Info in entità da tagliare per angolo di lato e tallone
@@ -257,8 +244,6 @@ Module ConstGen
    Public Const INFO_MCH_USER_SAL As String = "Usal"
    ' Info allungamento finale lavorazione imposto dall'utente
    Public Const INFO_MCH_USER_EAL As String = "Ueal"
-   ' Info lavorazione di tipo pretaglio sull'uscita
-   Public Const INFO_MCH_EPC As String = "EPC"
    ' Nome contorno taglio
    Public Const NAME_PV_CUT As String = "CUT"
    ' Nome contorno pre-taglio
@@ -305,12 +290,6 @@ Module ConstGen
    Public Const INFO_PARTOK As String = "POK"
    ' Info in pezzo per stato rotazione
    Public Const INFO_PARTROT As String = "ROT"
-   ' Info in entità in OutLoop per indicare se è separata WaterJet
-   Public Const INFO_JOINENTITY As String = "JoinEntity"
-   ' Nome layer per "*" inidcanti un lato separato nel taglio WaterJet
-   Public Const INFO_AUX_SPLIT_WJ As String = "AUX_SPLIT_WJ"
-   ' Info in OutLoop per punto inzio lavorazione WaterJet
-   Public Const INFO_START As String = "Start"
 
    ' Nome di pezzo che è una cornice
    Public Const NAME_FRAME As String = "Frame"
@@ -343,11 +322,6 @@ Module ConstGen
    ' Info in pezzo per facet di ultima superficie selezionata
    Public Const INFO_FRAME_FACET As String = "Facet"
 
-   ' Nome del groppo dei ponticelli per lavorazioni Water
-   Public Const BRIDGES As String = "Bridges"
-   ' Nome dell'entità ponticello contenuta nel gruppo BRIDGES
-   Public Const BRIDGELINE As String = "BridgeLine"
-
    ' utensile per le lavorazioni manuali
    Public Const DUMMY_SAW As String = "DummySAW"
    ' lavorazione manuale
@@ -358,8 +332,6 @@ Module ConstGen
    ' Nome di pezzo temporaneo che serve per copia dime
    Public Const NAME_COPYTEMPLATE As String = "CopyTemplate"
 
-   ' Nome layer solidi per VM
-   Public Const NAME_VM_SOLID As String = "Solid"
    ' Chiave per Id originale del pezzo per VeinMatch
    Public Const KEY_ORI_ID As String = "OriId"
 
@@ -369,9 +341,6 @@ Module ConstGen
    ' Lunghezza libera infinita
    Public Const FREELEN_INF = 9999
 
-   ' Costante per lunghezza gambo di lama
-   Public Const STEM = 131072
-
    ' Colori per lavorazioni
    Public Function COL_MCH_CUT() As Color3d
       Return New Color3d(0, 255, 0)
@@ -391,9 +360,6 @@ Module ConstGen
    Public Function COL_MCH_DRIPCUT() As Color3d
       Return New Color3d(255, 0, 165)
    End Function
-   Public Function COL_MCH_ONENGRAVE_ANG() As Color3d
-      Return New Color3d(255, 255, 100)
-   End Function
    Public Function COL_MCH_DRIPFREE() As Color3d
       Return New Color3d(192, 0, 128)
    End Function

Constants/ConstIni.vb

@@ -18,7 +18,6 @@ Module ConstIni
    Public Const S_GENERAL As String = "General"
    Public Const K_DEBUG As String = "Debug"
    Public Const K_LICENCE As String = "Licence"
-   Public Const K_NETKEY As String = "NetKey"
    Public Const K_MESSAGESDIR As String = "MessagesDir"
    Public Const K_MESSAGES As String = "Messages"
    Public Const K_SUPPORT As String = "Support"
@@ -46,13 +45,6 @@ Module ConstIni
    Public Const K_VIRTUALKEYBOARD As String = "VirtualKeyboard"
    Public Const K_THEME As String = "Theme"
    Public Const K_MANUAL_CUT As String = "ManualCut"
-   Public Const K_TEST As String = "Test"
-   Public Const K_SMARTMACHININGPAGE As String = "SmartMachiningPage"
-   Public Const K_STARTPROGRAM As String = "StartProgram"
-   Public Const K_GENERATECN As String = "GenerateCN"
-   Public Const K_FRACTIONPATTERN As String = "FractionPattern"
-   Public Const K_PRECISION As String = "Precision"
-
 
    Public Const S_LANGUAGES As String = "Languages"
    Public Const K_LANGUAGE As String = "Language"
@@ -87,13 +79,6 @@ Module ConstIni
    Public Const K_ZOOMWIN As String = "ZoomWin"
    Public Const K_DISTLINE As String = "DistLine"
 
-   Public Const S_ALZFRONT As String = "Alz&Front"
-   Public Const K_ALZFRONT As String = "Alz&Front"
-   Public Const K_ALZ_HEIGHT As String = "A_Height"
-   Public Const K_ALZ_DELTA_ANG As String = "A_DeltaAng"
-   Public Const K_FRONT_HEIGHT As String = "F_Height"
-   Public Const K_FRONT_DELTA_ANG As String = "F_DeltaAng"
-
    Public Const S_GRID As String = "Grid"
    Public Const K_SHOWGRID As String = "ShowGrid"
    Public Const K_SHOWFRAME As String = "ShowFrame"
@@ -112,15 +97,6 @@ Module ConstIni
    Public Const K_TRFDATA As String = "TrfData"
    Public Const K_CSVDATA As String = "CsvData"
    Public Const K_COMPODIR As String = "CompoDir"
-   Public Const K_CMP_COUNT As String = "Count"
-   Public Const K_LASTCOLOR As String = "LastColor"
-   Public Const K_COLOR As String = "Color"
-
-   Public Const S_EXTCOMPO As String = "Compo"
-
-   Public Const S_INTCOMPO As String = "InternalCompo"
-   Public Const K_INT_COMPODIR As String = "CompoDir"
-   Public Const K_INT_COUNT As String = "Count"
 
    Public Const S_FLATPARTS As String = "FlatParts"
    Public Const K_FLPCURRDIR As String = "CurrDir"
@@ -136,9 +112,7 @@ Module ConstIni
    Public Const K_ENGRAVENUMBER2 As String = "EngraveNumber2"
    Public Const K_ENGRAVEOFFSET2 As String = "EngraveOffset2"
    Public Const K_ENGRAVEDEPTH As String = "EngraveDepth"
-   Public Const K_ENGRAVEDEPTH2 As String = "EngraveDepth2"
    Public Const K_ENGRAVESHORT As String = "EngraveShort"
-   Public Const K_ENGRAVEANGLE As String = "EngraveAngle"
    Public Const K_DRIPOFFSET As String = "DripOffset"
    Public Const K_DRIPOFFSET2 As String = "DripOffset2"
    Public Const K_DRIPDEPTH As String = "DripDepth"
@@ -146,7 +120,6 @@ Module ConstIni
    Public Const K_UNDERDRILLDEPTH As String = "UnderDrillDepth"
    Public Const K_FILOTOPOFFSET As String = "FiloTopOffset"
    Public Const K_FILOTOPDEPTH As String = "FiloTopDepth"
-   Public Const K_ROUNDOFF As String = "RoundOff"
 
    Public Const S_NEST As String = "Nest"
    Public Const K_DIRECT As String = "Direct"
@@ -158,11 +131,6 @@ Module ConstIni
    Public Const K_TEXTCOLOR As String = "TextColor"
    Public Const K_AUTOMATICOPTIMIZE As String = "AutomaticOptimize"
    Public Const K_AUTOMATICMAXTIME As String = "AutomaticMaxTime"
-   Public Const K_DRAG_RETTANGLE As String = "DragRectangle"
-   Public Const K_STARTENDMODIFYONINTCORNER As String = "StartEndModifyOnIntCorner"
-
-   Public Const S_SPLIT As String = "Split"
-   Public Const K_MOVE_LEV As String = "MoveLevel"
 
    Public Const S_CSV As String = "Csv"
    Public Const K_FULL As String = "Full"
@@ -175,14 +143,6 @@ Module ConstIni
    Public Const K_CSVCURRDIR As String = "CurrDir"
    Public Const K_CSVLASTFILE As String = "LastFile"
 
-   Public Const S_TRF As String = "TRF"
-   Public Const K_ORDCODE As String = "OrdCode"
-   Public Const K_ORDDESC As String = "OrdDesc"
-   Public Const K_PARTCODE As String = "PartCode"
-   Public Const K_MATCODE As String = "MatCode"
-   Public Const K_SURFCODE As String = "SurfCode"
-   Public Const K_TRFTHICKNESS As String = "TrfThickness"
-
    Public Const S_SLABDXF As String = "SlabDxf"
    Public Const K_IMPORTSLABDXF As String = "ImportSlabDxf"
    Public Const K_SLABLAYER As String = "SlabLayer"
@@ -229,15 +189,6 @@ Module ConstIni
    Public Const K_RAWROTATION As String = "Rotation"
    Public Const K_PERPENDICULAR As String = "Perpendicular"
 
-   Public Const S_SCRAPS As String = "Scraps"
-   Public Const K_ENABLESCRAPS As String = "EnableScraps"
-   Public Const K_PHOTODIR As String = "PhotoDir"
-   Public Const K_LASTBLOCK As String = "LastBlock"
-   Public Const K_TEMPLATE As String = "Template"
-   Public Const K_DAT As String = "Dat"
-   Public Const K_ZEBRAUTILITIES As String = "ZebraUtilities"
-   Public Const K_ENABLE_PRINTER As String = "EnablePrinter"
-
    Public Const S_REG As String = "Reg"
    Public Const K_REGSTEP As String = "Step"
    Public Const K_REGANGSTEP As String = "AngStep"
@@ -330,8 +281,6 @@ Module ConstIni
    Public Const K_DC_TEST_LENGTH As String = "TestLength"
    Public Const K_DC_TEST_ANGH As String = "TestAngH"
    Public Const K_DC_TEST_OFFSET As String = "TestOffset"
-   Public Const K_DC_OFFSET_SQUARING As String = "OffsetSquaring"
-   Public Const K_DC_EXTRA_LEN_SQUARING As String = "ExtraLenSquaring"
 
    Public Const S_STATDATA As String = "StatData"
    Public Const K_SD_DAY As String = "Day"

Constants/ConstKitData.vb

@@ -11,18 +11,9 @@
    Public Const K_ZIGZAGX As String = "ZigZagX"
    Public Const K_OFFZIGZAGX As String = "OffZigZagX"
    Public Const K_STEPX As String = "StepX"
-   Public Const K_RADIUSX As String = "RadiusX"
-   Public Const K_DISTANCEX As String = "DistanceX"
    Public Const K_ZIGZAGY As String = "ZigZagY"
    Public Const K_OFFZIGZAGY As String = "OffZigZagY"
    Public Const K_STEPY As String = "StepY"
-   Public Const K_RADIUSY As String = "RadiusY"
-   Public Const K_DISTANCEY As String = "DistanceY"
-   Public Const K_SPIRAL As String = "Spiral"
-   Public Const K_OFFSPIRAL As String = "OffSpiral"
-   Public Const K_STEPSPIRAL As String = "StepSpiral"
-   Public Const K_RADIUSSPIRAL As String = "RadiusSpiral"
-   Public Const K_DISTANCESPIRAL As String = "DistanceSpiral"
    Public Const K_LILEN As String = "LiLen"
    Public Const K_LIHEIGHT As String = "LiHeight"
    Public Const K_LILOAD As String = "LiLoad"

Constants/ConstMachIni.vb

@@ -37,22 +37,14 @@
    Public Const K_PATH_HMI As String = "PathHmi"
    Public Const K_USENEWMDI As String = "UseNewMDI"
    Public Const K_ISSIEMENSONE As String = "IsSiemensOne"
-   Public Const K_ISACTIVEMODESUBSCR As String = "IsActiveModeSubscr"
    Public Const K_DBVARPATH As String = "DBVarPath"
-   Public Const K_NEWWRITECNCMODE As String = "NewWriteCNCMode"
 
    Public Const S_NCNUM As String = "NcNUM"
    Public Const K_RESETSENDDELAY As String = "ResetSendDelay"
-   Public Const K_THREADSLEEP As String = "ThreadSleep"
-   Public Const K_PHOTODELEY As String = "PhotoDeley"
-
-   Public Const S_EXECLUA As String = "ExecLua"
-   Public Const K_FILESCRIPT_LUA As String = "FileScript"
 
    Public Const S_NCDATA As String = "NcData"
    Public Const K_NEWVARIABLE As String = "NewVariable"
    Public Const K_NEWCONSOLE As String = "NewConsole"
-   Public Const K_WRITECNCMODEVAR As String = "WriteCNCModeVar"
    Public Const K_COMM As String = "Comm"
    Public Const K_REFRESH As String = "Refresh"
    Public Const K_MODE As String = "Mode"
@@ -80,9 +72,6 @@
    Public Const K_DOORCLOSED As String = "DoorClosed"
    Public Const K_LIMITZ As String = "LimitZ"
    Public Const K_POWEROVR As String = "PowerOvr"
-   Public Const K_PARKING As String = "Parking"
-   Public Const K_ENABLEZONE As String = "EnableZone"
-   Public Const K_ENABLEPC As String = "EnablePC"
    Public Const K_HSM As String = "Hsm"
    Public Const K_VACUUMUP As String = "VacuumUp"
    Public Const K_VACUUMDOWN As String = "VacuumDown"
@@ -110,16 +99,12 @@
    Public Const K_VACUUMOFF As String = "VacuumOff"
    Public Const K_BYPASSTATE As String = "BypassState"
    Public Const K_FEEDHOLD As String = "FeedHold"
-   Public Const K_SPOTLIGHT1 As String = "SpotLight1"
-   Public Const K_SPOTLIGHT2 As String = "SpotLight2"
    ' Nuove variabili
    Public Const K_SPEEDHOLD As String = "SpeedHold"
-   Public Const K_XYJOG As String = "XYJog"
-   Public Const K_ZCJOG As String = "ZCJog"
-   Public Const K_ZBJOG As String = "ZBJog"
+   Public Const K_XYAXES As String = "XYAxes"
+   Public Const K_ZAXES As String = "ZAxes"
+   Public Const K_BCAXES As String = "BCAxes"
    Public Const K_POWERON As String = "PowerON"
-   Public Const K_POWEROFF As String = "PowerOFF"
-   Public Const K_REMOTE As String = "Remote"
 
    Public Const S_PRODUCTIONLINE As String = "ProductionLine"
    Public Const K_ACTIVE As String = "Active"
@@ -151,7 +136,6 @@
    Public Const K_TAB2_ADDITIONALTABLE As String = "Tab2AdditionalTable"
    Public Const K_TAB3_ADDITIONALTABLE As String = "Tab3AdditionalTable"
    Public Const K_CENTER_RAW_ONX As String = "CenterRawOnX"
-   Public Const K_CHANGETABWD As String = "ChangeTabWD"
 
    Public Const S_PHOTO As String = "Photo"
    Public Const K_PHOTO_OFFSETX As String = "OffsetX"
@@ -202,7 +186,6 @@
    Public Const K_MACH_REDUCEDDEPTH As String = "ReducedDepth"
    Public Const K_MACH_EXTARCMINRAD As String = "ExtArcMinRad"
    Public Const K_MACH_INTARCMAXSIDEANG As String = "IntArcMaxSideAng"
-   Public Const K_MACH_PRECUTEXIT As String = "PreCutExit"
    Public Const K_MACH_MILLING_ON_CORNERS As String = "MillingOnCorners"
    Public Const K_MACH_MILLING_ON_SINKS As String = "MillingOnSinks"
    Public Const K_MACH_MILLING_SHORTENING As String = "MillingShortening"
@@ -210,7 +193,7 @@
    Public Const K_MACH_ENGRAVING_DEPTH As String = "EngravingDepth"
    Public Const K_MACH_ENGRAVING_WIDTH As String = "EngravingWidth"
    Public Const K_MACH_NEST_ALIGNED As String = "Aligned"
-   Public Const K_MACH_NEST_GHIGLIOTTINA As String = "Guillotine"
+   Public Const K_MACH_NEST_AUTOMATIC As String = "Automatic"
    Public Const K_MACH_WASHING As String = "Washing"
    Public Const K_MACH_SACPROBE As String = "SacProbe"
    Public Const K_MACH_ENABLERESTART As String = "EnableRestart"
@@ -218,30 +201,15 @@
    Public Const K_MACH_CUTFSEVENABLE As String = "CutFsevEnable"
    Public Const K_MACH_CUTFSEVLEN As String = "CutFsevLen"
    Public Const K_MACH_CUTFSEVPERC As String = "CutFsevPerc"
-   Public Const K_USELASERORIGIN As String = "UseLaserOrigin"
-   Public Const K_HOLES_DIAMITERWJ As String = "HolesDiameterWJ"
-   Public Const K_HOLES_OFFSETWJ As String = "HolesOffsetWJ"
-   Public Const K_MIN_RADIUSWJ As String = "MinRadiusWJ"
-   Public Const K_MACH_DRILLINGWJ_ON_CORNERS As String = "DrillingWJOnCorners"
    ' DrillMillC90
    ' CutLongDxSx
    ' AngRotMultiCut
    ' MinDistHeadsMultiCut
    ' MinSawRbHeight
 
-   Public Const S_MACH_FRAME As String = "Frame"
-   Public Const K_MACH_PAUSE As String = "Pause"
-
    Public Const S_MACH_RAWMOVE As String = "RawMove"
    Public Const K_MACH_RM_ROTATE As String = "Rotate"
    Public Const K_MACH_RM_FINALMOVE As String = "FinalMove"
-   Public Const K_MACH_WEIGHT_SINGLEPLUGGER As String = "MaxWeightSinglePlugger"
-   Public Const K_MACH_WEIGHT_DOUBLEPLUGGER As String = "MaxWeightDoublePlugger"
-   Public Const K_MACH_ROTATEVACUUMFOREXTRASTROKEY As String = "RotateVacuumForExtraStrokeY"
-   Public Const K_MACH_ROTATEVACUUMFOREXTRASTROKEX As String = "RotateVacuumForExtraStrokeX"
-
-   Public Const K_ISNEWSCRAPS As String = "IsNewScraps"
-   Public Const K_DATABASEID As String = "DatabaseID"
 
    Public Const S_MACH_REG As String = "Reg"
    Public Const K_MACH_MAX_ROT_ANG As String = "MaxRotAng"
@@ -265,7 +233,6 @@
 
    Public Const S_MACH_INPROGRESS As String = "InProgress"
    Public Const K_PHASEVAR As String = "PhaseVar"
-   Public Const K_WP_STEPTIME As String = "WPStepTime"
 
    Public Const S_MACH_PROBING As String = "Probing"
    Public Const K_PROBINGSTATEVAR As String = "ProbingStateVar"
@@ -298,12 +265,9 @@
    Public Const K_CURRDRIPSAWING As String = "CurrDripSawing"
    Public Const K_CURRDRIPDRILLING As String = "CurrDripDrilling"
    Public Const K_CURRWATERJETTING As String = "CurrWaterJetting"
-   Public Const K_CURRWATERJETTINGQUALITY As String = "CurrWaterJettingQualilty"
 
    Public Const S_MATERIALS As String = "Materials"
    Public Const K_CURRMATERIAL As String = "CurrMaterial"
    Public Const K_MATERIAL As String = "Material"
-   Public Const K_FROMDBWATERJET As String = "FromDBWaterJet"
-   Public Const K_AVERAGEDENSITY As String = "AverageDensity"
 
 End Module

DirectCuts/ControlsDirectCutUC.xaml

@@ -1,177 +0,0 @@
-<UserControl x:Class="ControlsDirectCutUC"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             DataContext="Self"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:OmagCUT="clr-namespace:OmagCUT"
-             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" 
-             mc:Ignorable="d" 
-             d:DesignHeight="597.3" d:DesignWidth="256">
-
-   <Grid Name="LeftButtonGrid" Grid.Row="1" >
-      <Grid.RowDefinitions>
-         <!--<RowDefinition Height="1*"/>
-            <RowDefinition Height="7*"/>-->
-         <RowDefinition Height="9*"/>
-      </Grid.RowDefinitions>
-      <!-- Definizione della Grid laterale -->
-      <Grid Name="CutTypeGrid" Grid.Row="1" >
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <!--<RowDefinition Height="1*"/>-->
-         </Grid.RowDefinitions>
-         <Button Name="ManualBtn" Grid.Column="2" Grid.Row="0"                    
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="80"/>
-                  <ColumnDefinition Width="140"/>
-               </Grid.ColumnDefinitions>
-               <Image Source="{DynamicResource Movimento-manualeImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-               <TextBlock Name="ManualTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-            </Grid>
-         </Button>
-
-         <Button Name="SingleCutBtn" Grid.Row="1"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="80"/>
-                  <ColumnDefinition Width="140"/>
-               </Grid.ColumnDefinitions>
-               <Image Source="{DynamicResource Taglio-singoloImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-               <TextBlock Name="SingleCutTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-            </Grid>
-         </Button>
-
-         <Button Name="MultipleCutBtn" Grid.Row="2"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="80"/>
-                  <ColumnDefinition Width="140"/>
-               </Grid.ColumnDefinitions>
-               <Image Source="{DynamicResource Taglio-multiploImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-               <TextBlock Name="MultipleCutTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-            </Grid>
-         </Button>
-
-         <Button Name="GridCutBtn" Grid.Row="3"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="80"/>
-                  <ColumnDefinition Width="140"/>
-               </Grid.ColumnDefinitions>
-               <Image Source="{DynamicResource Taglio-grigliaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-               <TextBlock Name="GridCutTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-            </Grid>
-         </Button>
-
-
-         <Button Name="SingleDrillBtn" Grid.Row="4"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="80"/>
-                  <ColumnDefinition Width="140"/>
-               </Grid.ColumnDefinitions>
-               <Image Source="{DynamicResource Foro-singoloImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-               <TextBlock Name="SingleDrillTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-            </Grid>
-         </Button>
-
-         <Button Name="FlatteningCutBtn" Grid.Row="5"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="80"/>
-                  <ColumnDefinition Width="140"/>
-               </Grid.ColumnDefinitions>
-               <Image Source="{DynamicResource SpianaturaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-               <TextBlock Name="FlatteningCutTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-            </Grid>
-         </Button>
-
-         <!--<Button Name="PolishingBtn" Grid.Row="6"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="80"/>
-                  <ColumnDefinition Width="140"/>
-               </Grid.ColumnDefinitions>
-               <Image Source="{DynamicResource LucidaturaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-               <TextBlock Name="PolishingTxt" Grid.Column="1"
-                               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-            </Grid>
-         </Button>-->
-
-         <!--<Button Name="CopyTemplateBtn" Grid.Row="7"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="80"/>
-                            <ColumnDefinition Width="140"/>
-                        </Grid.ColumnDefinitions>
-                        <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-                        <TextBlock Name="CopyTemplateTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                    </Grid>
-                </Button>-->
-
-         <Button Name="SquaringBtn" Grid.Row="6"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="80"/>
-                  <ColumnDefinition Width="140"/>
-               </Grid.ColumnDefinitions>
-               <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-               <TextBlock Name="SquaringTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-            </Grid>
-         </Button>
-
-         <!--<Button Name="SawTestBtn" Grid.Row="6"
-                    Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="140"/>
-                    </Grid.ColumnDefinitions>
-                    <Image Source="{DynamicResource Test-lamaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-                    <TextBlock Name="SawTestTxt" Grid.Column="1"
-                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                </Grid>
-            </Button>-->
-
-         <Grid Name="ChangeUCGrid" Grid.Row="7">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Button Name="ChangeUCBtn" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Grid>
-                  <!--<Image Name="ImageCompo9" Source="{DynamicResource NumericKeyboardArrowImg}" />-->
-                  <TextBlock Name="ChangeUCTxBl" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-               </Grid>
-            </Button>
-         </Grid>
-
-      </Grid>
-   </Grid>
-</UserControl>

DirectCuts/ControlsDirectCutUC.xaml.vb

@@ -1,262 +0,0 @@
-Imports EgtUILib
-Public Class ControlsDirectCutUC
-
-   ' Dichiarazione delle Page UserControl
-   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
-   ' ---- MAI USATA ---- nuova finestra per i comandi per il taglio manuale nuovo
-   Friend m_SingleCutAuto As SingleCutAuto
-   ' ---- MAI USATA ----
-   Friend m_MachineButtons As MachineButtonsUC
-   Friend m_ManualAxesMove As ManualAxesMoveUC
-   Friend m_SingleCut As SingleCutUC
-   Friend m_SingleDrill As SingleDrillUC
-   Friend m_MultipleCut As MultipleCut
-   Friend m_GridCut As GridCut
-   Friend m_FlatteningCut As FlatteningCut
-   Friend m_Squaring As SquaringUC
-   Friend m_ControlsMachineButton As ControlsMachineButtonUC
-   Friend m_VacuumMachineButton As VacuumMachineButtonUC
-
-   Friend m_ControlDirectCutPage1 As ControlsDirectCutUC1
-
-   ' Stato di visualizzazione della macchina
-   Friend m_bShowMachine As Boolean = False
-   Friend m_nMachLook As Integer = MCH_LOOK.ALL
-   ' Dati generali CN
-   Friend m_CN As CN_generico
-   Private m_bFirst As Boolean = True
-   ' Riferimento alla pagina correntemente attiva
-   Friend m_ActiveDirectCutPage As DirectCutPages = DirectCutPages.DirectCut
-   ' Variabili che indicano attivazione paginette con bottoni macchina
-   Private m_ControlsBtn_IsActive As Boolean
-
-   Public Shared m_dZSafe As Double = 52
-
-   ' Variabile che indica se sono attivi i bottoni macchina nuovi o vecchi
-   Friend m_NewMachineButtonsType As Boolean
-   ' Indica che la finestra del talio Singolo deve essere di tipo manuale
-   Friend m_bManulaCut As Boolean = False
-
-   ' elenco dei nuovi bottoni
-   Private m_ButtonJogList As New List(Of MachineButton)
-
-   Enum DirectCutPages
-      ' pagina principale di tagli diretti
-      DirectCut
-      ' nuova pagina di tagli diretti
-      DirectCut1
-      ' elenco dei comandi associati
-      ManualAxesMove
-      SingleCut
-      MultipleCut
-      GridCut
-      FlatteningCut
-      Polishing
-      CopyTemplate
-      SawTest
-      SingleCutAuto
-      SingleDrill
-      Squaring
-   End Enum
-
-   Private Sub ControlsDirectCutUC_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
-      ' leggo la configurazione del programma per i nuovi tagli manuali
-      m_bManulaCut = GetPrivateProfileInt(S_GENERAL, K_MANUAL_CUT, 0, m_MainWindow.GetIniFile()) <> 0
-
-      'Creazione delle Page UserControl
-      m_MachineButtons = New MachineButtonsUC
-      m_ManualAxesMove = New ManualAxesMoveUC
-      m_SingleCut = New SingleCutUC
-      m_SingleDrill = New SingleDrillUC
-      m_MultipleCut = New MultipleCut
-      m_GridCut = New GridCut
-      m_FlatteningCut = New FlatteningCut
-      m_Squaring = New SquaringUC
-      m_ControlsMachineButton = New ControlsMachineButtonUC
-      m_VacuumMachineButton = New VacuumMachineButtonUC
-      ' reiferimento alla pagina succesiva
-      m_ControlDirectCutPage1 = New ControlsDirectCutUC1
-      ' Costruisco la finestra per il nuovo tipo di taglio manuale
-      m_SingleCutAuto = New SingleCutAuto
-
-      'Posizionemento nella griglia delle Page UserControl DirectCutPageUC
-      m_MachineButtons.SetValue(Grid.RowProperty, 2)
-      m_MachineButtons.SetValue(Grid.ColumnSpanProperty, 7)
-      m_ManualAxesMove.SetValue(Grid.RowProperty, 1)
-      If m_bManulaCut Then
-         m_SingleCutAuto.SetValue(Grid.RowProperty, 1)
-      Else
-         m_SingleCut.SetValue(Grid.RowProperty, 1)
-      End If
-      m_SingleDrill.SetValue(Grid.RowProperty, 1)
-      m_MultipleCut.SetValue(Grid.RowProperty, 1)
-      m_GridCut.SetValue(Grid.RowProperty, 1)
-      m_FlatteningCut.SetValue(Grid.RowProperty, 1)
-      m_Squaring.SetValue(Grid.RowProperty, 1)
-      m_ControlsMachineButton.SetValue(Grid.RowProperty, 1)
-      m_VacuumMachineButton.SetValue(Grid.RowProperty, 1)
-
-      ' ManualBtn.Content = EgtMsg(90201)
-      ManualTxt.Text = EgtMsg(90201)
-      'SingleCutBtn.Content = EgtMsg(90202)
-      SingleCutTxt.Text = EgtMsg(90202)
-      'SingleDrillBtn.Content = "Foro singolo"
-      SingleDrillTxt.Text = EgtMsg(90258)
-      'MultipleCutBtn.Content = EgtMsg(90203)
-      MultipleCutTxt.Text = EgtMsg(90203)
-      'GridCutBtn.Content = EgtMsg(90204)
-      GridCutTxt.Text = EgtMsg(90204)
-      'FlatteningCutBtn.Content = EgtMsg(90206)
-      FlatteningCutTxt.Text = EgtMsg(90206)
-      ' 90261=Squaring
-      SquaringTxt.Text = EgtMsg(90261)
-      ' 90409=Others
-      ChangeUCTxBl.Text = EgtMsg(90409)
-
-   End Sub
-
-   Private Sub ControlsDirectCutUC_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
-      ' Se rientro da simulazione
-      If m_ActiveDirectCutPage = DirectCutPages.SingleCut Then
-         LeftButtonGrid.Children.Add(m_SingleCut)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.SingleCutAuto Then
-         LeftButtonGrid.Children.Add(m_SingleCutAuto)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.MultipleCut Then
-         LeftButtonGrid.Children.Add(m_MultipleCut)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.GridCut Then
-         LeftButtonGrid.Children.Add(m_GridCut)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.FlatteningCut Then
-         LeftButtonGrid.Children.Add(m_FlatteningCut)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.SingleDrill Then
-         LeftButtonGrid.Children.Add(m_SingleDrill)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.Squaring Then
-         LeftButtonGrid.Children.Add(m_Squaring)
-         Return
-      End If
-
-      ' Caso standard
-      m_ActiveDirectCutPage = DirectCutPages.DirectCut
-
-      ' Attivo le lavorazioni solo se esiste il grezzo e se presente testa H1
-      Dim bRawOk As Boolean = (GetRawHeight() > EPS_SMALL)
-      Dim bH1Exists As Boolean = (EgtGetHeadId("H1") <> GDB_ID.NULL)
-
-      ManualBtn.IsEnabled = bH1Exists
-      ' sviluppo rimasto in sospeso
-      If m_bManulaCut Then
-         ' anche se non è presente un grezzo mantengo abilitato il bottone
-         SingleCutBtn.IsEnabled = True
-      Else
-         SingleCutBtn.IsEnabled = bRawOk
-      End If
-      MultipleCutBtn.IsEnabled = bRawOk
-      GridCutBtn.IsEnabled = bRawOk
-      SingleDrillBtn.IsEnabled = (bRawOk And bH1Exists)
-      FlatteningCutBtn.IsEnabled = (bRawOk And bH1Exists)
-      SquaringBtn.IsEnabled = bRawOk
-
-      ' aggiorno la visualizzazione dei parametri
-      ReloadParam()
-
-      ' Nascondo i pezzi in parcheggio
-      HideParkedParts()
-      EgtZoom(ZM.ALL)
-
-   End Sub
-
-   ' ricarico i parametri utensili per definizione 
-   Public Sub ReloadParam()
-      Dim sCurrSawing As String = m_MainWindow.m_CurrentMachine.sCurrSawing
-      Dim sCurrSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
-      Dim bSaw As Boolean = False
-
-      ' se esiste una lavorazione di lama corrente vuol dire che deve essere preferita
-      If Not String.IsNullOrEmpty(sCurrSaw) And Not String.IsNullOrEmpty(sCurrSawing) Then
-         bSaw = EgtSetCalcTool(sCurrSaw, "H1", 1)
-      End If
-      m_SingleCut.SetEnableParam(bSaw)
-      m_MultipleCut.SetEnableParam(bSaw)
-      m_GridCut.SetEnableParam(bSaw)
-   End Sub
-
-#Region "COMMAND CLICK BTN"
-
-   Private Sub ManualBtn_Click(sender As Object, e As RoutedEventArgs) Handles ManualBtn.Click
-      LeftButtonGrid.Children.Add(m_ManualAxesMove)
-      m_ActiveDirectCutPage = DirectCutPages.ManualAxesMove
-   End Sub
-
-   Private Sub SingleCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles SingleCutBtn.Click
-      If m_bManulaCut Then
-         LeftButtonGrid.Children.Add(m_SingleCutAuto)
-         m_ActiveDirectCutPage = DirectCutPages.SingleCutAuto
-      Else
-         LeftButtonGrid.Children.Add(m_SingleCut)
-         m_ActiveDirectCutPage = DirectCutPages.SingleCut
-      End If
-
-   End Sub
-
-   Private Sub MultipleCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles MultipleCutBtn.Click
-      LeftButtonGrid.Children.Add(m_MultipleCut)
-      m_ActiveDirectCutPage = DirectCutPages.MultipleCut
-   End Sub
-
-   Private Sub GridCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles GridCutBtn.Click
-      LeftButtonGrid.Children.Add(m_GridCut)
-      m_ActiveDirectCutPage = DirectCutPages.GridCut
-   End Sub
-
-   Private Sub FlatteningCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles FlatteningCutBtn.Click
-      LeftButtonGrid.Children.Add(m_FlatteningCut)
-      m_ActiveDirectCutPage = DirectCutPages.FlatteningCut
-   End Sub
-
-   Private Sub SquaringBtn_Click(sender As Object, e As RoutedEventArgs) Handles SquaringBtn.Click
-      LeftButtonGrid.Children.Add(m_Squaring)
-      m_ActiveDirectCutPage = DirectCutPages.Squaring
-   End Sub
-
-   Private Sub SingleDrillBtn_Click(sender As Object, e As RoutedEventArgs) Handles SingleDrillBtn.Click
-      LeftButtonGrid.Children.Add(m_SingleDrill)
-      m_ActiveDirectCutPage = DirectCutPages.SingleDrill
-   End Sub
-
-   ' cambio pagina
-   Private Sub ChangeUCBtn_Click(sender As Object, e As RoutedEventArgs) Handles ChangeUCBtn.Click
-      DirectCutPage_Unloaded(Nothing, Nothing)
-      m_ActiveDirectCutPage = DirectCutPages.DirectCut
-      m_MainWindow.m_DirectCutPageUC.LoadDirectCutUC1()
-   End Sub
-
-#End Region    ' Command Click Btn
-
-
-   Friend Sub DirectCutPage_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
-      Select Case m_ActiveDirectCutPage
-         Case DirectCutPages.DirectCut Or DirectCutPages.ManualAxesMove
-            ' Non è necessario fare alcunché
-         Case DirectCutPages.SingleCut
-            LeftButtonGrid.Children.Remove(m_SingleCut)
-         Case DirectCutPages.SingleCutAuto
-            LeftButtonGrid.Children.Remove(m_SingleCutAuto)
-         Case DirectCutPages.MultipleCut
-            LeftButtonGrid.Children.Remove(m_MultipleCut)
-         Case DirectCutPages.GridCut
-            LeftButtonGrid.Children.Remove(m_GridCut)
-         Case DirectCutPages.FlatteningCut
-            LeftButtonGrid.Children.Remove(m_FlatteningCut)
-         Case DirectCutPages.SingleDrill
-            LeftButtonGrid.Children.Remove(m_SingleDrill)
-         Case DirectCutPages.Squaring
-            LeftButtonGrid.Children.Remove(m_Squaring)
-      End Select
-   End Sub
-
-End Class

DirectCuts/ControlsDirectCutUC1.xaml

@@ -1,86 +0,0 @@
-<UserControl x:Class="ControlsDirectCutUC1"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             DataContext="Self"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:OmagCUT="clr-namespace:OmagCUT"
-             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" 
-             mc:Ignorable="d" 
-             d:DesignHeight="597.3" d:DesignWidth="256">
-
-   <Grid Name="LeftButtonGrid" Grid.Row="1" >
-      <Grid.RowDefinitions>
-         <!--<RowDefinition Height="1*"/>
-            <RowDefinition Height="7*"/>-->
-         <RowDefinition Height="9*"/>
-      </Grid.RowDefinitions>
-      <!-- Definizione della Grid laterale -->
-      <Grid Name="CutTypeGrid" Grid.Row="1" >
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <!--<RowDefinition Height="1*"/>-->
-         </Grid.RowDefinitions>
-
-         <Button Name="SawTestBtn" Grid.Row="0"
-                    Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="80"/>
-                  <ColumnDefinition Width="140"/>
-               </Grid.ColumnDefinitions>
-               <Image Source="{DynamicResource Test-lamaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-               <TextBlock Name="SawTestTxt" Grid.Column="1"
-                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-            </Grid>
-         </Button>
-
-         <Button Name="PolishingBtn" Grid.Row="1"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="80"/>
-                  <ColumnDefinition Width="140"/>
-               </Grid.ColumnDefinitions>
-               <Image Source="{DynamicResource LucidaturaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-               <TextBlock Name="PolishingTxt" Grid.Column="1"
-                               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-            </Grid>
-         </Button>
-
-         <Button Name="CopyTemplateBtn" Grid.Row="2"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="80"/>
-                  <ColumnDefinition Width="140"/>
-               </Grid.ColumnDefinitions>
-               <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-               <TextBlock Name="CopyTemplateTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-            </Grid>
-         </Button>
-
-         <Grid Name="ChangeUC1Grid" Grid.Row="7">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Button Name="ChangeUC1Btn" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Grid>
-                  <Image Name="ImageCompo9" Source="{DynamicResource NumericKeyboardArrowImg}" />
-                  <!--<TextBlock Name="LabelCompo9" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>-->
-               </Grid>
-            </Button>
-         </Grid>
-
-      </Grid>
-   </Grid>
-</UserControl>

DirectCuts/ControlsDirectCutUC1.xaml.vb

@@ -1,142 +0,0 @@
-Imports EgtUILib
-Public Class ControlsDirectCutUC1
-
-   ' Dichiarazione delle Page UserControl
-   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
-   Friend m_Polishing As Polishing
-   Friend m_CopyTemplate As CopyTemplateUC
-   Friend m_SawTest As SawTestUC
-
-   ' Stato di visualizzazione della macchina
-   Friend m_bShowMachine As Boolean = False
-   Friend m_nMachLook As Integer = MCH_LOOK.ALL
-   ' Dati generali CN
-   Friend m_CN As CN_generico
-   Private m_bFirst As Boolean = True
-   ' Riferimento alla pagina correntemente attiva
-   Friend m_ActiveDirectCutPage As DirectCutPages = DirectCutPages.DirectCut
-   ' Variabili che indicano attivazione paginette con bottoni macchina
-   Private m_ControlsBtn_IsActive As Boolean
-
-   Public Shared m_dZSafe As Double = 52
-
-   ' Variabile che indica se sono attivi i bottoni macchina nuovi o vecchi
-   Friend m_NewMachineButtonsType As Boolean
-   ' Indica che la finestra del talio Singolo deve essere di tipo manuale
-   Friend m_bManulaCut As Boolean = False
-
-   Enum DirectCutPages
-      DirectCut
-      DirectCut1
-      Polishing
-      CopyTemplate
-      SawTest
-   End Enum
-
-   Private Sub ControlsDirectCutUC_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
-      ' leggo la configurazione del programma per i nuovi tagli manuali
-      m_bManulaCut = GetPrivateProfileInt(S_GENERAL, K_MANUAL_CUT, 0, m_MainWindow.GetIniFile()) <> 0
-
-      'Creazione delle Page UserControl
-      m_SawTest = New SawTestUC
-      m_Polishing = New Polishing
-      m_CopyTemplate = New CopyTemplateUC
-
-      'Posizionemento nella griglia delle Page UserControl
-      m_SawTest.SetValue(Grid.RowProperty, 1)
-      m_Polishing.SetValue(Grid.RowProperty, 1)
-      m_CopyTemplate.SetValue(Grid.RowProperty, 1)
-
-      ' assegno i nomi ai pulsanti
-      SawTestTxt.Text = EgtMsg(90207)
-      PolishingTxt.Text = EgtMsg(90231)
-      'CopyTemplateBtn.Content = EgtMsg(90209)
-      CopyTemplateTxt.Text = EgtMsg(90209)
-      'SquaringTxt.Text = "Squaring"
-
-   End Sub
-
-   Private Sub ControlsDirectCutUC1_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
-      ' Se rientro da simulazione
-      If m_ActiveDirectCutPage = DirectCutPages.SawTest Then
-         LeftButtonGrid.Children.Add(m_SawTest)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.CopyTemplate Then
-         Me.LeftButtonGrid.Children.Add(m_CopyTemplate)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.Polishing Then
-         Me.LeftButtonGrid.Children.Add(m_Polishing)
-         Return
-      End If
-
-      ' Caso standard
-      m_ActiveDirectCutPage = DirectCutPages.DirectCut1
-
-      ' Attivo le lavorazioni solo se esiste il grezzo e se presente testa H1
-      Dim bRawOk As Boolean = (GetRawHeight() > EPS_SMALL)
-      Dim bH1Exists As Boolean = (EgtGetHeadId("H1") <> GDB_ID.NULL)
-
-      PolishingBtn.IsEnabled = (bRawOk And m_MainWindow.m_CurrentMachine.bPolishing)
-      SawTestBtn.IsEnabled = (bRawOk And bH1Exists)
-      CopyTemplateBtn.IsEnabled = bH1Exists
-
-      ' aggiorno la visualizzazione dei parametri
-      ReloadParam()
-
-      ' Nascondo i pezzi in parcheggio
-      HideParkedParts()
-      EgtZoom(ZM.ALL)
-
-   End Sub
-
-   ' ricarica i dati utensili
-   Public Sub ReloadParam()
-      Dim sCurrSawing As String = m_MainWindow.m_CurrentMachine.sCurrSawing
-      Dim sCurrSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
-      Dim bSaw As Boolean = False
-
-      ' se esiste una lavorazione di lama corrente vuol dire che deve essere preferita
-      If Not String.IsNullOrEmpty(sCurrSaw) And Not String.IsNullOrEmpty(sCurrSawing) Then
-         bSaw = EgtSetCalcTool(sCurrSaw, "H1", 1)
-      End If
-      'm_SingleCut.SetEnableParam(bSaw)
-      'm_MultipleCut.SetEnableParam(bSaw)
-      'm_GridCut.SetEnableParam(bSaw)
-   End Sub
-
-#Region "COMMAND CLICK BTN"
-   Private Sub SawTestBtn_Click(sender As Object, e As RoutedEventArgs) Handles SawTestBtn.Click
-      LeftButtonGrid.Children.Add(m_SawTest)
-      m_ActiveDirectCutPage = DirectCutPages.SawTest
-   End Sub
-
-   Private Sub PolishingBtn_Click(sender As Object, e As RoutedEventArgs) Handles PolishingBtn.Click
-      LeftButtonGrid.Children.Add(m_Polishing)
-      m_ActiveDirectCutPage = DirectCutPages.Polishing
-   End Sub
-
-   Private Sub CopyTemplateBtn_Click(sender As Object, e As RoutedEventArgs) Handles CopyTemplateBtn.Click
-      LeftButtonGrid.Children.Add(m_CopyTemplate)
-      m_ActiveDirectCutPage = DirectCutPages.CopyTemplate
-   End Sub
-
-   Private Sub ChangeUC1Btn_Click(sender As Object, e As RoutedEventArgs) Handles ChangeUC1Btn.Click
-      DirectCutPage_Unloaded(Nothing, Nothing)
-      m_ActiveDirectCutPage = DirectCutPages.DirectCut1
-      m_MainWindow.m_DirectCutPageUC.LoadDirectCutUC()
-   End Sub
-
-#End Region    ' Command Click Btn
-
-   Friend Sub DirectCutPage_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
-      Select Case m_ActiveDirectCutPage
-         Case DirectCutPages.SawTest
-            LeftButtonGrid.Children.Remove(m_SawTest)
-         Case DirectCutPages.Polishing
-            LeftButtonGrid.Children.Remove(m_Polishing)
-         Case DirectCutPages.CopyTemplate
-            LeftButtonGrid.Children.Remove(m_CopyTemplate)
-      End Select
-   End Sub
-
-End Class

DirectCuts/ControlsMachineButtonUC.xaml.vb

@@ -78,7 +78,7 @@ Public Class ControlsMachineButtonUC
 
    Friend Sub SpindleStateChanged(SpindleState As Boolean)
       Dim SpindleButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_SPINDLE Then
             SpindleButton = MachineButton
          End If
@@ -90,7 +90,7 @@ Public Class ControlsMachineButtonUC
 
    Friend Sub LaserStateChanged(LaserState As Boolean)
       Dim LaserButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_LASER Then
             LaserButton = MachineButton
          End If
@@ -102,7 +102,7 @@ Public Class ControlsMachineButtonUC
 
    Friend Sub FeedHoldChanged(FeedHoldState As Boolean)
       Dim FeedHoldButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_FEEDHOLD Then
             FeedHoldButton = MachineButton
          End If
@@ -114,7 +114,7 @@ Public Class ControlsMachineButtonUC
 
    Friend Sub SpeedHoldChanged(SpeedHoldState As Boolean)
       Dim SpeedHoldButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_SPEEDHOLD Then
             SpeedHoldButton = MachineButton
          End If
@@ -126,7 +126,7 @@ Public Class ControlsMachineButtonUC
 
    Friend Sub LaserTracStateChanged(LaserTracState As Boolean)
       Dim LaserTracButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_LASERTRAC Then
             LaserTracButton = MachineButton
          End If
@@ -138,7 +138,7 @@ Public Class ControlsMachineButtonUC
 
    Friend Sub CoolantStateChanged(CoolantState As Boolean)
       Dim CoolantButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_COOLANT Then
             CoolantButton = MachineButton
          End If
@@ -150,7 +150,7 @@ Public Class ControlsMachineButtonUC
 
    Friend Sub InternalCoolantStateChanged(InternalCoolantState As Boolean)
       Dim IntCoolantButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_INTERNALCOOLANT Then
             IntCoolantButton = MachineButton
          End If
@@ -162,7 +162,7 @@ Public Class ControlsMachineButtonUC
 
    Friend Sub ExternCoolantStateChanged(ExternCoolantState As Boolean)
       Dim ExtCoolantButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_EXTERNCOOLANT Then
             ExtCoolantButton = MachineButton
          End If
@@ -175,7 +175,7 @@ Public Class ControlsMachineButtonUC
    Friend Sub CBAxesStateChanged(CBAxesState As Boolean)
       Dim CAxesButton As TwoStateButton = Nothing
       Dim BAxesButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_CAXES Then
             CAxesButton = MachineButton
          ElseIf MachineButton.StateFlag = K_BAXES Then
@@ -192,7 +192,7 @@ Public Class ControlsMachineButtonUC
 
    Friend Sub AirBlowStateChanged(AirBlowState As Boolean)
       Dim AirBlowButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_AIRBLOW Then
             AirBlowButton = MachineButton
          End If
@@ -204,7 +204,7 @@ Public Class ControlsMachineButtonUC
 
    Friend Sub HomeStateChanged(HomeState As Boolean)
       Dim HomeButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_HOME Then
             HomeButton = MachineButton
          End If
@@ -216,7 +216,7 @@ Public Class ControlsMachineButtonUC
 
    Friend Sub TableUpChanged(TableUpState As Boolean)
       Dim TableUpButton As PressedCommandButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_TABLEUP Then
             TableUpButton = MachineButton
          End If
@@ -228,7 +228,7 @@ Public Class ControlsMachineButtonUC
 
    Friend Sub TableDownChanged(TableDownState As Boolean)
       Dim TableDownButton As PressedCommandButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_TABLEDOWN Then
             TableDownButton = MachineButton
          End If
@@ -240,7 +240,7 @@ Public Class ControlsMachineButtonUC
 
    Friend Sub HSMChanged(HsmState As Boolean)
       Dim HsmButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_HSM Then
             HsmButton = MachineButton
          End If
@@ -253,7 +253,7 @@ Public Class ControlsMachineButtonUC
    Friend Sub DoorClosedChanged(DoorClosedState As Integer)
       Dim DoorClosedButton As ThreeStateButton = Nothing
       Dim DoorOpenedButton As ThreeStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_DOORCLOSED Then
             'If TypeOf MachineButton Is NoStateButton Then
             '   DoorClosedButton = DirectCast(MachineButton, NoStateButton)
@@ -295,7 +295,7 @@ Public Class ControlsMachineButtonUC
    Friend Sub LimitZChanged(LimitZState As Boolean)
       Dim TwoLimitZButton As TwoStateButton = Nothing
       Dim DoubleLimitZButton As DoubleCommandButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_LIMITZ Then
             If TypeOf MachineButton Is DoubleCommandButton Then
                DoubleLimitZButton = MachineButton
@@ -315,7 +315,7 @@ Public Class ControlsMachineButtonUC
    Friend Sub FiveAxisStateChanged(FiveAxisState As Boolean)
       Dim ThreeAxesButton As TwoStateButton = Nothing
       Dim FiveAxesButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_THREEAXES Then
             ThreeAxesButton = MachineButton
          ElseIf MachineButton.StateFlag = K_FIVEAXES Then
@@ -330,49 +330,6 @@ Public Class ControlsMachineButtonUC
       End If
    End Sub
 
-   Friend Sub ParkingStateChanged(ParkingState As Boolean)
-      Dim ParkingButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
-         If MachineButton.StateFlag = K_PARKING Then
-            ParkingButton = MachineButton
-         End If
-      Next
-      If Not IsNothing(ParkingButton) Then
-         ParkingButton.SetIsChecked(ParkingState)
-      End If
-   End Sub
-
-   Friend Sub ZoneStateChanged(ZoneState As Integer)
-      'Dim sFlag As String = String.Empty
-      'If ZoneState = 1 Then
-      '   sFlag = BTN_ENABLE_ZONE_1
-      'ElseIf ZoneState = 2 Then
-      '   sFlag = BTN_ENABLE_ZONE_2
-      'End If
-      'Dim EnableZoneButton As TwoStateButton = Nothing
-      'For Each MachineButton As MachineButton In m_ButtonList
-      '   If MachineButton.StateFlag = K_ENABLEZONE Then
-      '      EnableZoneButton = MachineButton
-      '   End If
-      'Next
-      'If Not IsNothing(EnableZoneButton) Then
-      '   EnableZoneButton.SetIsChecked(EnableZone)
-      'End If
-   End Sub
-
-   Friend Sub PcStateChanged(EnablePC As Boolean)
-      'Dim EnablePCButton As TwoStateButton = Nothing
-      'For Each MachineButton As MachineButton In m_ButtonList
-      '   If MachineButton.StateFlag = K_ENABLEPC Then
-      '      EnablePCButton = MachineButton
-      '   End If
-      'Next
-      'If Not IsNothing(EnablePCButton) Then
-      '   EnablePCButton.SetIsChecked(EnablePC)
-      'End If
-   End Sub
-
-
    Public Function GetPrivateProfileMachineButtons(
                          ByVal lpAppName As String,
                          ByVal lpKeyName As String,
@@ -445,8 +402,6 @@ Public MustInherit Class MachineButton
    Friend Const BTN_STATE_THREEAXIS As String = "ThreeAxis"
    Friend Const BTN_STATE_FIVEAXIS As String = "FiveAxis"
    Friend Const BTN_STATE_NOTHING As String = "Nothing"
-   Friend Const BTN_ENABLE_ZONE_1 As String = "EnableZone1"
-   Friend Const BTN_ENABLE_ZONE_2 As String = "EnableZone2"
 
    ' Dichiarazione delle Page UserControl
    Friend Shared m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
@@ -520,7 +475,7 @@ Public MustInherit Class MachineButton
                If m_CN.m_NewVariable And m_MainWindow.m_CNCommunication.m_nNCType = 2 Then
                   ' solo per Flexium
                   m_CN.DPlcVariables_WriteVariables(ENumber, EValue)
-                  If Not String.IsNullOrEmpty(ENumber2) And Not String.IsNullOrEmpty(EValue2) Then
+                  If Not IsNothing(ENumber2) And Not IsNothing(EValue2) Then
                      m_CN.DPlcVariables_WriteVariables(ENumber2, EValue2)
                   End If
                   ' altrimenti scrittura delle variabili E
@@ -692,7 +647,6 @@ Public Class TwoStateButton
          Return m_IsChecked
       End Get
       Set(value As Boolean)
-         ' accendo il comando, anche se dovrei aspettare di leggere lo stato da PLC
          m_IsChecked = value
          If value Then
             ExecuteMDICommand(TLuaScriptName)

DirectCuts/CopyTemplateUC.xaml

@@ -35,11 +35,10 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <Button Name="Point1Btn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource Acquisisci-PImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
+            <Button Name="Point1Btn" Grid.Column="0"
+               Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
-            </Grid>
+         </Grid>
 
          <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}"
             Margin="6,0,6,0">
@@ -56,12 +55,10 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <ToggleButton Name="LineBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource LineaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </ToggleButton>
-                <ToggleButton Name="ArcBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource ArcoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </ToggleButton>
+            <ToggleButton Name="LineBtn" Grid.Column="0"
+               Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+            <ToggleButton Name="ArcBtn" Grid.Column="1"
+               Style="{DynamicResource OmagCut_YellowToggleButton}"/>
 
          </Grid>
 
@@ -72,18 +69,14 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <Button Name="RemoveBtn" Grid.Column="0" Grid.Row="3" Grid.RowSpan="2" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-                    <Image Source="{DynamicResource Rimuovi-segmentoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
-                <Button Name="CloseBtn" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-                    <Image Source="{DynamicResource ChiudiImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
+            <Button Name="RemoveBtn" Grid.Column="0" Grid.Row="3" Grid.RowSpan="2"
+            Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
+            <Button Name="CloseBtn" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2"
+            Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
 
-            </Grid>
+         </Grid>
 
-            <Button Name="SaveBtn" Grid.Column="0" Grid.Row="10"  Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-                <Image Source="{DynamicResource Salva-taglioImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
+            <Button Name="SaveBtn" Grid.Column="0" Grid.Row="10" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
 
             <Button Name="ExitBtn" Grid.Column="2" Grid.Row="10" Style="{DynamicResource OmagCut_YellowIconButton}">
                 <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>

DirectCuts/CopyTemplateUC.xaml.vb

@@ -5,8 +5,6 @@ Public Class CopyTemplateUC
    ' Riferimenti a pagine
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
    Private WithEvents m_CurrProjPage As CurrentProjectPageUC
-   Private m_refControlDirectCutUC As ControlsDirectCutUC1
-
    ' Flag di pagina attiva
    Private m_bActive As Boolean = False
    ' Array stringhe modalità di acquisizione dei punti
@@ -51,17 +49,16 @@ Public Class CopyTemplateUC
       ' la associo alla combobox
       PointModeCmBx.ItemsSource = m_PointsModeArray
 
-      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      LineBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 50)
-      ArcBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 51)
-      RemoveBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 52)
-      CloseBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 53)
-      SaveBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 54)
+      Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
+      LineBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 50)
+      ArcBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 51)
+      RemoveBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 52)
+      CloseBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 53)
+      SaveBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 54)
    End Sub
 
    Private Sub CopyTemplate_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
-      m_refControlDirectCutUC = m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC1
       m_bActive = True
       SaveBtn.IsEnabled = False
       LineBtn.IsChecked = True
@@ -257,7 +254,8 @@ Public Class CopyTemplateUC
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_refControlDirectCutUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
    End Sub
 
    Private Function EraseCopyTemplatePart() As Boolean

DirectCuts/DirectCutPageUC.xaml

@@ -28,10 +28,10 @@
             <ColumnDefinition Width="7*"/>
          </Grid.ColumnDefinitions>
 
-         <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+            <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
             <Image Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
          </Button>
-         <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+            <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
             <Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
          </Button>
 
@@ -42,165 +42,45 @@
 
       </Grid>
 
-      <!-- Definizione della Grid laterale -->
-      <!--
-        <Grid Name="LeftButtonGrid" Grid.Row="1" >
+         <!-- Definizione della Grid laterale -->
+      <Grid Name="LeftButtonGrid" Grid.Row="1" >
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="7*"/>
+         </Grid.RowDefinitions>
+
+         <!-- Definizione della Grid laterale -->
+         <Grid Name="CutTypeGrid" Grid.Row="1" >
             <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="7*"/>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
-
-            -->
-      <!-- Definizione della Grid laterale -->
-      <!--<Grid Name="CutTypeGrid" Grid.Row="1" >
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="1*"/>
-                </Grid.RowDefinitions>
-                <Button Name="ManualBtn" Grid.Column="2" Grid.Row="0"                    
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="80"/>
-                            <ColumnDefinition Width="140"/>
-                        </Grid.ColumnDefinitions>
-                        <Image Source="{DynamicResource Movimento-manualeImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-                        <TextBlock Name="ManualTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                    </Grid>
-                </Button>
-
-                <Button Name="SingleCutBtn" Grid.Row="1"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="80"/>
-                            <ColumnDefinition Width="140"/>
-                        </Grid.ColumnDefinitions>
-                        <Image Source="{DynamicResource Taglio-singoloImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-                        <TextBlock Name="SingleCutTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                    </Grid>
-                </Button>
-
-                <Button Name="MultipleCutBtn" Grid.Row="2"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="80"/>
-                            <ColumnDefinition Width="140"/>
-                        </Grid.ColumnDefinitions>
-                        <Image Source="{DynamicResource Taglio-multiploImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-                        <TextBlock Name="MultipleCutTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                    </Grid>
-                </Button>
-
-                <Button Name="GridCutBtn" Grid.Row="3"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="80"/>
-                            <ColumnDefinition Width="140"/>
-                        </Grid.ColumnDefinitions>
-                        <Image Source="{DynamicResource Taglio-grigliaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-                        <TextBlock Name="GridCutTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                    </Grid>
-                </Button>
-
-
-                <Button Name="SingleDrillBtn" Grid.Row="4"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="80"/>
-                            <ColumnDefinition Width="140"/>
-                        </Grid.ColumnDefinitions>
-                        <Image Source="{DynamicResource Foro-singoloImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-                        <TextBlock Name="SingleDrillTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                    </Grid>
-                </Button>
-
-                <Button Name="FlatteningCutBtn" Grid.Row="5"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="80"/>
-                            <ColumnDefinition Width="140"/>
-                        </Grid.ColumnDefinitions>
-                        <Image Source="{DynamicResource SpianaturaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-                        <TextBlock Name="FlatteningCutTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                    </Grid>
-                </Button>
-
-                <Button Name="PolishingBtn" Grid.Row="6"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="80"/>
-                            <ColumnDefinition Width="140"/>
-                        </Grid.ColumnDefinitions>
-                        <Image Source="{DynamicResource LucidaturaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-                        <TextBlock Name="PolishingTxt" Grid.Column="1"
-                               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                    </Grid>
-                </Button>
-
-                -->
-      <!--<Button Name="CopyTemplateBtn" Grid.Row="7"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="80"/>
-                            <ColumnDefinition Width="140"/>
-                        </Grid.ColumnDefinitions>
-                        <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-                        <TextBlock Name="CopyTemplateTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                    </Grid>
-                </Button>-->
-      <!--
-                <Button Name="SquaringBtn" Grid.Row="7"
-                        Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="80"/>
-                            <ColumnDefinition Width="140"/>
-                        </Grid.ColumnDefinitions>
-                        <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-                        <TextBlock Name="SquaringTxt" Grid.Column="1"
-                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                    </Grid>
-                </Button>
-
-                <Button Name="SawTestBtn" Grid.Row="8"
-                    Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="80"/>
-                            <ColumnDefinition Width="140"/>
-                        </Grid.ColumnDefinitions>
-                        <Image Source="{DynamicResource Test-lamaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-                        <TextBlock Name="SawTestTxt" Grid.Column="1"
-                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                    </Grid>
-                </Button>
-
-            </Grid>-->
-      <!--
-
-        </Grid>-->
-
+            <Button Name="ManualBtn" Grid.Column="2" Grid.Row="0"
+               Style="{DynamicResource OmagCut_YellowTextButton}"/>
+            <Button Name="SingleCutBtn" Grid.Row="1"
+               Style="{DynamicResource OmagCut_YellowTextButton}"/>
+            <Button Name="MultipleCutBtn" Grid.Row="2"
+               Style="{DynamicResource OmagCut_YellowTextButton}"/>
+            <Button Name="GridCutBtn" Grid.Row="3"
+               Style="{DynamicResource OmagCut_YellowTextButton}"/>
+            <Button Name="FlatteningCutBtn" Grid.Row="4"
+               Style="{DynamicResource OmagCut_YellowTextButton}"/>
+            <Button Name="PolishingBtn" Grid.Row="5"
+               Style="{DynamicResource OmagCut_YellowTextButton}"/>
+            <Button Name="CopyTemplateBtn" Grid.Row="6"
+               Style="{DynamicResource OmagCut_YellowTextButton}"/>
+            <Button Name="SawTestBtn" Grid.Row="7"
+               Style="{DynamicResource OmagCut_YellowTextButton}"/>
+         </Grid>
+      
+      </Grid>
+      
       <!-- Definizione della Grid laterale per bottoni macchina -->
       <Grid Name="MachineButtonGrid" Grid.Row="1">
          <Grid.RowDefinitions>
@@ -217,11 +97,9 @@
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="5*"/>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="4*"/>
-            <!--<ColumnDefinition Width="1*"/>-->
-            <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
 
          <ToggleButton Name="ControlsMachineBtn" Grid.Column="0"
@@ -233,40 +111,27 @@
                Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
             <Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
          </ToggleButton>
-
-         <!--Comando asse X-Y-->
-         <ToggleButton Name="XYBtn" Grid.Column="2"
-               Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-            <Image Source="{DynamicResource XYJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
-         </ToggleButton>
-
-         <!--Comando asse Z-C-->
-         <ToggleButton Name="ZCBtn" Grid.Column="3"   
-               Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-            <Image Source="{DynamicResource ZCJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
-         </ToggleButton>
-
-         <!--Comando asse Z-B-->
-         <ToggleButton Name="ZBBtn" Grid.Column="4"
-               Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-            <Image Source="{DynamicResource ZBJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
-         </ToggleButton>
-
-         <!--Comando Remote-->
-         <ToggleButton Name="RemoteBtn" Grid.Column="5"
+          
+          <!--Comando asse X-Y-->
+          <ToggleButton Name="XYBtn" Grid.Column="2"
                Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
             <!--<Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>-->
          </ToggleButton>
+          
+          <!--Comando asse Z-->
+          <ToggleButton Name="ZBtn" Grid.Column="3"   
+               Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
+              <!--<Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>-->
+          </ToggleButton>
 
-         <!--Parking-->
-         <ToggleButton Name="ParkingBtn" Grid.Column="6"
-              Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-            <Image Source="{DynamicResource ParkingImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
-         </ToggleButton>
+          <!--Comando asse B-C-->
+          <ToggleButton Name="BCBtn" Grid.Column="4"
+               Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
+              <!--<Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>-->
+          </ToggleButton>
 
-         <!--Comando Manula/MDI-->
-         <Button Name="ManualModeBtn" Grid.Column="8"
-                Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+            <Button Name="ManualModeBtn" Grid.Column="7"
+               Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
             <Image Source="{DynamicResource ManualImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
          </Button>
 

DirectCuts/DirectCutPageUC.xaml.vb

@@ -7,27 +7,25 @@ Public Class DirectCutPageUC
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
    Friend m_MachineButtons As MachineButtonsUC
    Friend m_ManualAxesMove As ManualAxesMoveUC
-
+   Friend m_SingleCut As SingleCutUC
+   ' nuova finestra per i comandi per il taglio manuale nuovo
+   Friend m_SingleCutAuto As SingleCutAuto
+   Friend m_MultipleCut As MultipleCut
+   Friend m_GridCut As GridCut
+   Friend m_FlatteningCut As FlatteningCut
+   Friend m_Polishing As Polishing
+   Friend m_CopyTemplate As CopyTemplateUC
+   Friend m_SawTest As SawTestUC
    Friend m_ControlsMachineButton As ControlsMachineButtonUC
    Friend m_VacuumMachineButton As VacuumMachineButtonUC
-   Friend m_ControlsDirectCutUC As ControlsDirectCutUC
-   Friend m_ControlsDirectCutUC1 As ControlsDirectCutUC1
-
-   Friend m_ActiveControl As Controls
-   Enum Controls
-      DirectCutUC
-      DirectCutUC1
-      MachineButtonUC
-      VacuumButtonUC
-   End Enum
-
-
    ' Stato di visualizzazione della macchina
    Friend m_bShowMachine As Boolean = False
    Friend m_nMachLook As Integer = MCH_LOOK.ALL
    ' Dati generali CN
    Friend m_CN As CN_generico
    Private m_bFirst As Boolean = True
+   ' Riferimento alla pagina correntemente attiva
+   Friend m_ActiveDirectCutPage As DirectCutPages = DirectCutPages.DirectCut
    ' Variabili che indicano attivazione paginette con bottoni macchina
    Private m_ControlsBtn_IsActive As Boolean
 
@@ -39,48 +37,100 @@ Public Class DirectCutPageUC
    Friend m_bManulaCut As Boolean = False
 
    ' elenco dei nuovi bottoni
-   Private m_ButtonJogList As New List(Of MachineButton)
+   Private m_ButtonAxesList As New List(Of MachineButton)
 
+   Enum DirectCutPages
+      DirectCut
+      ManualAxesMove
+      SingleCut
+      MultipleCut
+      GridCut
+      FlatteningCut
+      Polishing
+      CopyTemplate
+      SawTest
+      SingleCutAuto
+   End Enum
 
    Private Sub DirectCutPage_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+      ' leggo la configurazione del programma per i nuovi tagli manuali
+      m_bManulaCut = GetPrivateProfileInt(S_GENERAL, K_MANUAL_CUT, 0, m_MainWindow.GetIniFile()) <> 0
+
       'Creazione delle Page UserControl
       m_MachineButtons = New MachineButtonsUC
       m_ManualAxesMove = New ManualAxesMoveUC
+      m_SingleCut = New SingleCutUC
+      m_MultipleCut = New MultipleCut
+      m_GridCut = New GridCut
+      m_FlatteningCut = New FlatteningCut
+      m_Polishing = New Polishing
+      m_CopyTemplate = New CopyTemplateUC
+      m_SawTest = New SawTestUC
       m_ControlsMachineButton = New ControlsMachineButtonUC
       m_VacuumMachineButton = New VacuumMachineButtonUC
-      m_ControlsDirectCutUC = New ControlsDirectCutUC
-      m_ControlsDirectCutUC1 = New ControlsDirectCutUC1
+      ' Costruisco la finestra per il nuovo tipo di taglio manuale
+      m_SingleCutAuto = New SingleCutAuto
 
       'Posizionemento nella griglia delle Page UserControl
       m_MachineButtons.SetValue(Grid.RowProperty, 2)
-      m_MachineButtons.SetValue(Grid.ColumnSpanProperty, 7)
+      m_MachineButtons.SetValue(Grid.ColumnSpanProperty, 6)
       m_ManualAxesMove.SetValue(Grid.RowProperty, 1)
-
-      m_ControlsDirectCutUC.SetValue(Grid.RowProperty, 1)
-      m_ControlsDirectCutUC1.SetValue(Grid.RowProperty, 1)
+      If m_bManulaCut Then
+         m_SingleCutAuto.SetValue(Grid.RowProperty, 1)
+      Else
+         m_SingleCut.SetValue(Grid.RowProperty, 1)
+      End If
+      m_MultipleCut.SetValue(Grid.RowProperty, 1)
+      m_GridCut.SetValue(Grid.RowProperty, 1)
+      m_FlatteningCut.SetValue(Grid.RowProperty, 1)
+      m_Polishing.SetValue(Grid.RowProperty, 1)
+      m_CopyTemplate.SetValue(Grid.RowProperty, 1)
+      m_SawTest.SetValue(Grid.RowProperty, 1)
       m_ControlsMachineButton.SetValue(Grid.RowProperty, 1)
       m_VacuumMachineButton.SetValue(Grid.RowProperty, 1)
 
-      ' verifico che sia presente almeno uno dei bottoni della nuova console (SOLO PER MACCHINA CON paragrafo [ControlMachButtons])
-      Dim bCollapsedNewBottonsConsole As Boolean = Not m_ControlsMachineButton.GetPrivateProfileMachineButtons("JogButtons", "Button1", Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, m_MainWindow.GetMachIniFile())
+      Dim bCollpsedNewBottonsConsole As Boolean = False
       m_NewMachineButtonsType = m_ControlsMachineButton.GetPrivateProfileMachineButtons(S_CONTROLMACHBUTTONS, "Button1", Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, m_MainWindow.GetMachIniFile())
       If Not m_NewMachineButtonsType Then
          'Assegno MachineButtons alla pagina
          LowerButtonGrid.Children.Add(m_MachineButtons)
          ControlsMachineBtn.Visibility = Windows.Visibility.Collapsed
          VacuumMachineBtn.Visibility = Windows.Visibility.Collapsed
+         ' per le configurazioni diverse dalla Digitale5
+         bCollpsedNewBottonsConsole = True
       End If
 
-      ' nuovi bottoni 20/05/2021 - modifica specifiche 04/08/2021
-      ' leggo il numero di assi attivi nella macchina
-      Dim AxesNumber = GetPrivateProfileInt(S_AXES, K_AXESNUM, 5, m_MainWindow.GetMachIniFile())
+      If GetPrivateProfileInt(S_NUMERICALCONTROL, K_TYPE, 0, m_MainWindow.GetMachIniFile()) = 0 Then
+         ManualBtn.IsEnabled = False
+         ManualModeBtn.Visibility = Windows.Visibility.Hidden
+      End If
+
+      ManualBtn.Content = EgtMsg( 90201)
+      SingleCutBtn.Content = EgtMsg(90202)
+      MultipleCutBtn.Content = EgtMsg( 90203)
+      GridCutBtn.Content = EgtMsg( 90204)
+      FlatteningCutBtn.Content = EgtMsg( 90206)
+      PolishingBtn.Content = EgtMsg( 90231)
+      CopyTemplateBtn.Content = EgtMsg( 90209)
+      SawTestBtn.Content = EgtMsg(90207)
+
+      ' nuovi bottoni 20/05/2021
+      If GetPrivateProfileInt(S_NCDATA, K_NEWCONSOLE, 0, m_MainWindow.GetMachIniFile()) = 1 And Not bCollpsedNewBottonsConsole Then
+         XYBtn.Content = "X - Y"
+         ZBtn.Content = "Z"
+         BCBtn.Content = "B - C"
+      Else
+         XYBtn.Visibility = Windows.Visibility.Collapsed
+         ZBtn.Visibility = Windows.Visibility.Collapsed
+         BCBtn.Visibility = Windows.Visibility.Collapsed
+      End If
 
    End Sub
 
    Private Sub DirectCutPage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
-      '------ INIZIO NUOVI BOTTONI ----------
+      '------ NUOVI BOTTONI ----------
       ' Lettura configurazione bottoni (per impostare l'uso del Joystick) da Ini di macchina
-      m_ButtonJogList.Clear()
+      m_ButtonAxesList.Clear()
       Dim m_nCount As Integer = 1
       Dim bFoundBtn As Boolean = True
       While bFoundBtn
@@ -91,7 +141,7 @@ Public Class DirectCutPageUC
          Dim sFImageName As String = String.Empty
          Dim sFLuaScriptName As String = String.Empty
          Dim sStateFlag As String = String.Empty
-         bFoundBtn = m_ControlsMachineButton.GetPrivateProfileMachineButtons("JogButtons", sNameBtn, sMachineButtonType, sTImageName, sTLuaScriptName, sFImageName, sFLuaScriptName, sStateFlag, m_MainWindow.GetMachIniFile())
+         bFoundBtn = m_ControlsMachineButton.GetPrivateProfileMachineButtons("AxesButtons", sNameBtn, sMachineButtonType, sTImageName, sTLuaScriptName, sFImageName, sFLuaScriptName, sStateFlag, m_MainWindow.GetMachIniFile())
          If bFoundBtn Then
             m_nCount += 1
             Dim ButtonToAdd As MachineButton = Nothing
@@ -109,21 +159,56 @@ Public Class DirectCutPageUC
                   ButtonToAdd = New PressedCommandButton(sTImageName, sTLuaScriptName, sFImageName, sFLuaScriptName, sStateFlag)
             End Select
             If Not IsNothing(ButtonToAdd) Then
-               m_ButtonJogList.Add(ButtonToAdd)
+               m_ButtonAxesList.Add(ButtonToAdd)
             End If
          End If
       End While
-      ' attivo la visualizzazione dei comandi
-      SetVisibilityJogButtuns()
       ' lo stato di questi comandi vieni carico dalla lettura del PLC (refresh)
-      '----------- FINE NUOVI BOTTONI------------
 
-      LoadLastDirectCutControls()
+      '-----------NUOVI BOTTONI------------
+      ' Se rientro da simulazione
+      If m_ActiveDirectCutPage = DirectCutPages.SingleCut Then
+         LeftButtonGrid.Children.Add(m_SingleCut)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.SingleCutAuto Then
+         LeftButtonGrid.Children.Add(m_SingleCutAuto)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.MultipleCut Then
+         LeftButtonGrid.Children.Add(m_MultipleCut)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.GridCut Then
+         LeftButtonGrid.Children.Add(m_GridCut)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.FlatteningCut Then
+         LeftButtonGrid.Children.Add(m_FlatteningCut)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.Polishing Then
+         LeftButtonGrid.Children.Add(m_Polishing)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.SawTest Then
+         LeftButtonGrid.Children.Add(m_SawTest)
+         Return
+      End If
+
+      ' Caso standard
+      m_ActiveDirectCutPage = DirectCutPages.DirectCut
 
       ' Se macchina fotografica abilitata
       PhotoBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.MAN_PHOTO)
-      ' aggiorno la visualizzazione dei parametri
-      ReloadParam()
+
+      ' Attivo le lavorazioni solo se esiste il grezzo
+      Dim bRawOk As Boolean = (GetRawHeight() > EPS_SMALL)
+      If m_bManulaCut Then
+         ' anche se non è presente un grezzo mantengo abilitato il bottone
+         SingleCutBtn.IsEnabled = True
+      Else
+         SingleCutBtn.IsEnabled = bRawOk
+      End If
+      MultipleCutBtn.IsEnabled = bRawOk
+      GridCutBtn.IsEnabled = bRawOk
+      FlatteningCutBtn.IsEnabled = bRawOk
+      PolishingBtn.IsEnabled = (bRawOk And m_MainWindow.m_CurrentMachine.bPolishing)
+      SawTestBtn.IsEnabled = bRawOk
 
       ' Nascondo i pezzi in parcheggio
       HideParkedParts()
@@ -131,54 +216,6 @@ Public Class DirectCutPageUC
 
    End Sub
 
-   Public Sub ReloadParam()
-      Dim sCurrSawing As String = m_MainWindow.m_CurrentMachine.sCurrSawing
-      Dim sCurrSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
-      Dim bSaw As Boolean = False
-
-      ' se esiste una lavorazione di lama corrente vuol dire che deve essere preferita
-      If Not String.IsNullOrEmpty(sCurrSaw) And Not String.IsNullOrEmpty(sCurrSawing) Then
-         bSaw = EgtSetCalcTool(sCurrSaw, "H1", 1)
-      End If
-      m_ControlsDirectCutUC.m_SingleCut.SetEnableParam(bSaw)
-      m_ControlsDirectCutUC.m_MultipleCut.SetEnableParam(bSaw)
-      m_ControlsDirectCutUC.m_GridCut.SetEnableParam(bSaw)
-   End Sub
-
-   Private Sub SetVisibilityJogButtuns()
-      XYBtn.Visibility = Visibility.Collapsed
-      ZCBtn.Visibility = Visibility.Collapsed
-      ZBBtn.Visibility = Visibility.Collapsed
-      RemoteBtn.Visibility = Visibility.Collapsed
-      ParkingBtn.Visibility = Visibility.Collapsed
-
-      Dim Item As MachineButton = Nothing
-      For Each Item In m_ButtonJogList
-         Select Case Item.StateFlag.Trim
-            Case K_XYJOG
-               XYBtn.Visibility = Visibility.Visible
-               XYBtn.Foreground = Brushes.White
-               XYBtn.ToolTip = "X - Y"
-            Case K_ZCJOG
-               ZCBtn.Visibility = Visibility.Visible
-               ZCBtn.Foreground = Brushes.White
-               ZCBtn.ToolTip = "Z - C"
-            Case K_ZBJOG
-               ZBBtn.Visibility = Visibility.Visible
-               ZBBtn.Foreground = Brushes.White
-               ZBBtn.ToolTip = "Z - B"
-            Case K_REMOTE
-               RemoteBtn.Visibility = Visibility.Visible
-               RemoteBtn.Foreground = Brushes.White
-               RemoteBtn.Content = "Remote"
-            Case K_PARKING
-               ParkingBtn.Visibility = Visibility.Visible
-               ParkingBtn.Foreground = Brushes.White
-               ParkingBtn.ToolTip = "Parking"
-         End Select
-      Next
-   End Sub
-
    Private Sub PhotoBtn_Click(sender As Object, e As RoutedEventArgs) Handles PhotoBtn.Click
       EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
       ' Se macchina fotografica collegata, faccio una foto
@@ -186,7 +223,7 @@ Public Class DirectCutPageUC
          If Not m_MainWindow.m_Camera.CameraClick() Then
             m_MainWindow.m_CurrentProjectPageUC.SetErrorMessage(EgtMsg(90313))    'Fotografia non riuscita
          End If
-         ' Altrimenti lancio browser di immagini
+      ' Altrimenti lancio browser di immagini
       Else
          m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_CurrentProjectPageUC)
          m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_PhotoPage)
@@ -203,6 +240,52 @@ Public Class DirectCutPageUC
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
    End Sub
 
+   Private Sub ManualBtn_Click(sender As Object, e As RoutedEventArgs) Handles ManualBtn.Click
+      LeftButtonGrid.Children.Add(m_ManualAxesMove)
+      m_ActiveDirectCutPage = DirectCutPages.ManualAxesMove
+   End Sub
+
+   Private Sub SingleCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles SingleCutBtn.Click
+      If m_bManulaCut Then
+         LeftButtonGrid.Children.Add(m_SingleCutAuto)
+         m_ActiveDirectCutPage = DirectCutPages.SingleCutAuto
+      Else
+         LeftButtonGrid.Children.Add(m_SingleCut)
+         m_ActiveDirectCutPage = DirectCutPages.SingleCut
+      End If
+
+   End Sub
+
+   Private Sub MultipleCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles MultipleCutBtn.Click
+      LeftButtonGrid.Children.Add(m_MultipleCut)
+      m_ActiveDirectCutPage = DirectCutPages.MultipleCut
+   End Sub
+
+   Private Sub GridCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles GridCutBtn.Click
+      LeftButtonGrid.Children.Add(m_GridCut)
+      m_ActiveDirectCutPage = DirectCutPages.GridCut
+   End Sub
+
+   Private Sub FlatteningCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles FlatteningCutBtn.Click
+      LeftButtonGrid.Children.Add(m_FlatteningCut)
+      m_ActiveDirectCutPage = DirectCutPages.FlatteningCut
+   End Sub
+
+   Private Sub PolishingBtn_Click(sender As Object, e As RoutedEventArgs) Handles PolishingBtn.Click
+      LeftButtonGrid.Children.Add(m_Polishing)
+      m_ActiveDirectCutPage = DirectCutPages.Polishing
+   End Sub
+
+   Private Sub CopyTemplateBtn_Click(sender As Object, e As RoutedEventArgs) Handles CopyTemplateBtn.Click
+      LeftButtonGrid.Children.Add(m_CopyTemplate)
+      m_ActiveDirectCutPage = DirectCutPages.CopyTemplate
+   End Sub
+
+   Private Sub SawTestBtn_Click(sender As Object, e As RoutedEventArgs) Handles SawTestBtn.Click
+      LeftButtonGrid.Children.Add(m_SawTest)
+      m_ActiveDirectCutPage = DirectCutPages.SawTest
+   End Sub
+
    Private Sub ControlsMachineBtn_Click(sender As Object, e As RoutedEventArgs) Handles ControlsMachineBtn.Click
       If ControlsMachineBtn.IsChecked Then
          m_ControlsMachineButton = New ControlsMachineButtonUC
@@ -230,189 +313,68 @@ Public Class DirectCutPageUC
       End If
    End Sub
 
-   Friend Sub LoadDirectCutUC()
-      ManageControls()
-      m_ActiveControl = Controls.DirectCutUC
-      MachineButtonGrid.Children.Add(m_ControlsDirectCutUC)
-   End Sub
-
-   Friend Sub LoadDirectCutUC1()
-      ManageControls()
-      m_ActiveControl = Controls.DirectCutUC1
-      MachineButtonGrid.Children.Add(m_ControlsDirectCutUC1)
-   End Sub
-
-
-#Region "[JogButtons]"
-
+   '------------------NUOVI BOTTONI PER GESTIONE JOYSTICK-------------------------------------------------
    Private Sub XYBtn_Click(sender As Object, e As RoutedEventArgs) Handles XYBtn.Click
-      ' riverco in elenco il bottone XYJog
-      Dim XYJogButton As MachineButton = Nothing
-      Dim ItemButton As MachineButton = Nothing
-      For Each ItemButton In m_ButtonJogList
-         If ItemButton.StateFlag = K_XYJOG Then
-            XYJogButton = ItemButton
-            Exit For
-         End If
-      Next
-      If IsNothing(XYJogButton) Then Return
+      Dim XYAxesButton As MachineButton = m_ButtonAxesList(0)
       ' eseguo lo script lua associato
-      XYJogButton.ExecuteMDICommand(XYJogButton.TLuaScriptName)
+      XYAxesButton.ExecuteMDICommand(XYAxesButton.TLuaScriptName)
       ' che comunica al PLC di cambiare lo stato, la modifica dello stato è intercettata dalla funzione Refresh che avvia il metodo Changed
    End Sub
 
-   Friend Sub XYJogChanged(bXYAxes As Boolean)
+   Friend Sub XYAxesChanged(bXYAxes As Boolean)
       ' devo decodificare il tipo di pulsante, quindi eseguire la conversione...
-      Dim XYJogButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonJogList
-         ' elimino gli spazi ad inizio e fine della stringa
-         If MachineButton.StateFlag.Trim = K_XYJOG Then
-            XYJogButton = MachineButton
-            Exit For
+      Dim XYAxesButton As TwoStateButton = Nothing
+      For Each MachineButton In m_ButtonAxesList
+         If MachineButton.StateFlag = "XYAxes" Then
+            XYAxesButton = MachineButton
          End If
       Next
-      If Not IsNothing(XYJogButton) Then
-         XYJogButton.SetIsChecked(bXYAxes)
+      If Not IsNothing(XYAxesButton) Then
+         XYAxesButton.SetIsChecked(bXYAxes)
          XYBtn.IsChecked = bXYAxes
       End If
    End Sub
 
-   Private Sub ZCBtn_Click(sender As Object, e As RoutedEventArgs) Handles ZCBtn.Click
-      ' riverco in elenco il bottone ZCYJog
-      Dim ZJogButton As MachineButton = Nothing
-      Dim ItemButton As MachineButton = Nothing
-      For Each ItemButton In m_ButtonJogList
-         If ItemButton.StateFlag = K_ZCJOG Then
-            ZJogButton = ItemButton
-            Exit For
-         End If
-      Next
-      If IsNothing(ZJogButton) Then Return
+   Private Sub ZBtn_Click(sender As Object, e As RoutedEventArgs) Handles ZBtn.Click
+      Dim ZAxesButton As MachineButton = m_ButtonAxesList(1)
       ' eseguo lo script lua associato
-      ZJogButton.ExecuteMDICommand(ZJogButton.TLuaScriptName)
+      ZAxesButton.ExecuteMDICommand(ZAxesButton.TLuaScriptName)
    End Sub
 
-   Friend Sub ZCJogChanged(bZAxes As Boolean)
+   Friend Sub ZAxesChanged(bZAxes As Boolean)
       ' devo decodificare il tipo di pulsante, quindi eseguire la conversione...
-      Dim ZJogButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonJogList
-         If MachineButton.StateFlag.Trim = K_ZCJOG Then
-            ZJogButton = MachineButton
-            Exit For
+      Dim ZAxesButton As TwoStateButton = Nothing
+      For Each MachineButton In m_ButtonAxesList
+         If MachineButton.StateFlag = "ZAxes" Then
+            ZAxesButton = MachineButton
          End If
       Next
-      If Not IsNothing(ZJogButton) Then
-         ZJogButton.SetIsChecked(bZAxes)
-         ZCBtn.IsChecked = bZAxes
+      If Not IsNothing(ZAxesButton) Then
+         ZAxesButton.SetIsChecked(bZAxes)
+         ZBtn.IsChecked = bZAxes
       End If
    End Sub
 
-   Private Sub ZBBtn_Click(sender As Object, e As RoutedEventArgs) Handles ZBBtn.Click
-      ' riverco in elenco il bottone ZCYJog
-      Dim ZBJogButton As MachineButton = Nothing
-      Dim ItemButton As MachineButton = Nothing
-      For Each ItemButton In m_ButtonJogList
-         If ItemButton.StateFlag = K_ZBJOG Then
-            ZBJogButton = ItemButton
-            Exit For
-         End If
-      Next
-      If IsNothing(ZBJogButton) Then Return
+   Private Sub BCBtn_Click(sender As Object, e As RoutedEventArgs) Handles BCBtn.Click
+      Dim BCAxesButton As MachineButton = m_ButtonAxesList(2)
       ' eseguo lo script lua associato
-      ZBJogButton.ExecuteMDICommand(ZBJogButton.TLuaScriptName)
+      BCAxesButton.ExecuteMDICommand(BCAxesButton.TLuaScriptName)
    End Sub
 
-   Friend Sub ZBJogChanged(bBCAxes As Boolean)
+   Friend Sub BCAxesChanged(bBCAxes As Boolean)
       ' devo decodificare il tipo di pulsante, quindi eseguire la conversione...
-      Dim BCJogButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonJogList
-         If MachineButton.StateFlag.Trim = K_ZBJOG Then
-            BCJogButton = MachineButton
-            Exit For
+      Dim BCAxesButton As TwoStateButton = Nothing
+      For Each MachineButton In m_ButtonAxesList
+         If MachineButton.StateFlag = "BCAxes" Then
+            BCAxesButton = MachineButton
          End If
       Next
-      If Not IsNothing(BCJogButton) Then
-         BCJogButton.SetIsChecked(bBCAxes)
-         ZBBtn.IsChecked = bBCAxes
+      If Not IsNothing(BCAxesButton) Then
+         BCAxesButton.SetIsChecked(bBCAxes)
+         BCBtn.IsChecked = bBCAxes
       End If
    End Sub
-
-   Private Sub RemoteBtn_Click(sender As Object, e As RoutedEventArgs) Handles RemoteBtn.Click
-      Dim RemoteButton As MachineButton = Nothing
-      Dim ItemButton As MachineButton = Nothing
-      For Each ItemButton In m_ButtonJogList
-         If ItemButton.StateFlag = K_REMOTE Then
-            RemoteButton = ItemButton
-            Exit For
-         End If
-      Next
-      If IsNothing(RemoteButton) Then Return
-      ' eseguo lo script lua associato
-      Dim CurrentBtn As Primitives.ToggleButton = e.Source
-      Dim sLuaFileName As String = String.Empty
-      ' verifico lo stato del bottone per avviare il giusto script
-      If CurrentBtn.IsChecked() Then
-         sLuaFileName = RemoteButton.TLuaScriptName
-      Else
-         sLuaFileName = RemoteButton.FLuaScriptName
-      End If
-      RemoteButton.ExecuteMDICommand(sLuaFileName)
-   End Sub
-
-   Friend Sub RemoteChanged(bRemote As Boolean)
-      ' devo decodificare il tipo di pulsante, quindi eseguire la conversione...
-      Dim RemoteButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonJogList
-         If MachineButton.StateFlag.Trim = K_REMOTE Then
-            RemoteButton = MachineButton
-            Exit For
-         End If
-      Next
-      If Not IsNothing(RemoteButton) Then
-         RemoteButton.SetIsChecked(bRemote)
-         RemoteBtn.IsChecked = bRemote
-      End If
-   End Sub
-
-   Private Sub ParkingBtn_Click(sender As Object, e As RoutedEventArgs) Handles ParkingBtn.Click
-      Dim ParkingButton As MachineButton = Nothing
-      Dim ItemButton As MachineButton = Nothing
-      For Each ItemButton In m_ButtonJogList
-         If ItemButton.StateFlag = K_PARKING Then
-            ParkingButton = ItemButton
-            Exit For
-         End If
-      Next
-      If IsNothing(ParkingButton) Then Return
-      ' eseguo lo script lua associato
-      Dim CurrentBtn As Primitives.ToggleButton = e.Source
-      Dim sLuaFileName As String = String.Empty
-      ' verifico lo stato del bottone per avviare il giusto script
-      If CurrentBtn.IsChecked() Then
-         sLuaFileName = ParkingButton.TLuaScriptName
-      Else
-         sLuaFileName = ParkingButton.FLuaScriptName
-      End If
-      ParkingButton.ExecuteMDICommand(sLuaFileName)
-   End Sub
-
-   Friend Sub ParkingStateChanged(bParkingState As Boolean)
-      ' devo decodificare il tipo di pulsante, quindi eseguire la conversione...
-      Dim ParkingButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonJogList
-         If MachineButton.StateFlag.Trim = K_PARKING Then
-            ParkingButton = MachineButton
-            Exit For
-         End If
-      Next
-      If Not IsNothing(ParkingButton) Then
-         ParkingButton.SetIsChecked(bParkingState)
-         ParkingButton.IsChecked = bParkingState
-      End If
-   End Sub
-
-#End Region    '[JogButtons]
-
+   '------------------NUOVI BOTTONI PER GESTIONE JOYSTICK-------------------------------------------------
    Private Sub MachViewModeBtn_Click(sender As Object, e As RoutedEventArgs) Handles MachViewModeBtn.Click
       If m_bShowMachine Then
          ' aggiorno lo stato
@@ -431,36 +393,34 @@ Public Class DirectCutPageUC
    End Sub
 
    Friend Sub DirectCutPage_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
-      ManageControls()
-   End Sub
-
-   Friend Sub ManageControls()
-      Select Case m_ActiveControl
-         Case Controls.DirectCutUC
-            MachineButtonGrid.Children.Remove(m_ControlsDirectCutUC)
-            m_ControlsDirectCutUC.DirectCutPage_Unloaded(Nothing, Nothing)
-         Case Controls.DirectCutUC1
-            MachineButtonGrid.Children.Remove(m_ControlsDirectCutUC1)
-            m_ControlsDirectCutUC1.DirectCutPage_Unloaded(Nothing, Nothing)
-         Case Controls.MachineButtonUC
-            MachineButtonGrid.Children.Remove(m_ControlsMachineButton)
-            ControlsMachineBtn.IsChecked = False
-         Case Controls.VacuumButtonUC
-            MachineButtonGrid.Children.Remove(m_VacuumMachineButton)
-            VacuumMachineBtn.IsChecked = False
-      End Select
-   End Sub
-
-   Friend Sub LoadLastDirectCutControls()
-      Select Case m_ActiveControl
-         Case Controls.DirectCutUC
-            MachineButtonGrid.Children.Add(m_ControlsDirectCutUC)
-         Case Controls.DirectCutUC1
-            MachineButtonGrid.Children.Add(m_ControlsDirectCutUC1)
-         Case Else
-            m_ActiveControl = Controls.DirectCutUC
-            MachineButtonGrid.Children.Add(m_ControlsDirectCutUC)
+      Select Case m_ActiveDirectCutPage
+         Case DirectCutPages.DirectCut Or DirectCutPages.ManualAxesMove
+            ' Non è necessario fare alcunché
+         Case DirectCutPages.SingleCut
+            LeftButtonGrid.Children.Remove(m_SingleCut)
+         Case DirectCutPages.SingleCutAuto
+            LeftButtonGrid.Children.Remove(m_SingleCutAuto)
+         Case DirectCutPages.MultipleCut
+            LeftButtonGrid.Children.Remove(m_MultipleCut)
+         Case DirectCutPages.GridCut
+            LeftButtonGrid.Children.Remove(m_GridCut)
+         Case DirectCutPages.FlatteningCut
+            LeftButtonGrid.Children.Remove(m_FlatteningCut)
+         Case DirectCutPages.Polishing
+            LeftButtonGrid.Children.Remove(m_Polishing)
+         Case DirectCutPages.CopyTemplate
+            LeftButtonGrid.Children.Remove(m_CopyTemplate)
+         Case DirectCutPages.SawTest
+            LeftButtonGrid.Children.Remove(m_SawTest)
       End Select
+      If ControlsMachineBtn.IsChecked Then
+         MachineButtonGrid.Children.Remove(m_ControlsMachineButton)
+         ControlsMachineBtn.IsChecked = False
+      End If
+      If VacuumMachineBtn.IsChecked Then
+         MachineButtonGrid.Children.Remove(m_VacuumMachineButton)
+         VacuumMachineBtn.IsChecked = False
+      End If
    End Sub
 
    Private Sub ManualModeBtn_Click(sender As Object, e As RoutedEventArgs) Handles ManualModeBtn.Click

DirectCuts/FlatteningCut.xaml

@@ -38,17 +38,12 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <ToggleButton Name="Point1Btn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
+            <ToggleButton Name="Point1Btn" Grid.Column="0"
+            Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+            <ToggleButton Name="Point2Btn" Grid.Column="1"
+            Style="{DynamicResource OmagCut_YellowToggleButton}"/>
 
-                <ToggleButton Name="Point2Btn" Grid.Column="1"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
-
-            </Grid>
+         </Grid>
 
          <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" Margin="6,0,6,0">
             <ComboBox.ItemTemplate>
@@ -65,7 +60,7 @@
 
          <TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="3"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0" IsLength="False"
+         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="LenghtTxBl" Grid.Column="0" Grid.Row="4"
@@ -130,16 +125,12 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-            </Grid>
+            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
+            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
+            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+         </Grid>
 
       </Grid>
 

DirectCuts/FlatteningCut.xaml.vb

@@ -66,7 +66,6 @@ Public Class FlatteningCut
       Right
    End Enum
 
-   ' Per abilitare la spianatura con la FRESA deve essere imposatato a TRUE il flag "Usa Fresa" nella pagina MACCHINA (campo INCISIONI)
    Private Sub FlatteningCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Creo lista modalità di acquisizione punto 
       m_PointsModeArray(PT_MODE.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24)
@@ -80,8 +79,8 @@ Public Class FlatteningCut
       ' la associo alla combobox
       TypeCmBx.ItemsSource = m_TypeArray
       ' assegno messaggi
-      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
+      Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
+      Point2Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
       DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13)
       LenghtTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 14)
       DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
@@ -90,8 +89,8 @@ Public Class FlatteningCut
       ZReleasedTxBl.Text = "Z Svincolo"
       SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23)
       RotLockTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 29)
-      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
+      OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
       ' Carico i dati dell'ultimo taglio
       m_dDepth = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_FLATT_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
       m_dAngO = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_FLATT_ANGH, m_dAngO, m_MainWindow.GetIniFile())
@@ -190,7 +189,7 @@ Public Class FlatteningCut
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
+         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -445,8 +444,8 @@ Public Class FlatteningCut
       StringToLen(WidthTxBx.Text, dWidth)
       ' Recupero lo spessore della lama corrente
       EgtTdbSetCurrTool(m_MainWindow.m_CurrentMachine.sCurrSaw)
-      Dim dThick As Double = GetFootPrintTool()
-      'EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
+      Dim dThick As Double = 0
+      EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
       ' La larghezza della spianatura nono può essere inferiore allo spessore della lama
       m_dWid = Math.Max(dWidth, dThick)
       WidthTxBx.Text = LenToString(m_dWid, 2)
@@ -473,8 +472,8 @@ Public Class FlatteningCut
 
    Private Sub OverlapTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OverlapTxBx.EgtClosed
       ' Recupero spessore della lama correntemente attiva
-      Dim dThick As Double = GetFootPrintTool()
-      'EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
+      Dim dThick As Double = 0
+      EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
       '  Verifico che la sovrapposizione non sia superiore allo spessore della lama (meno 1mm di offset)
       Dim dOverlap As Double = 0
       Const MIN_OFFSET As Double = 1.0
@@ -568,7 +567,6 @@ Public Class FlatteningCut
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
-      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -611,28 +609,9 @@ Public Class FlatteningCut
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
       EgtMdbSetGeneralParam(MCH_GP.SAFEZ, DirectCutPageUC.m_dZSafe)
       EgtMdbSave()
-      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
-   ' ricavo l'ingombro di lavorazione in funzione dell'utensile selezionato
-   Private Function GetFootPrintTool() As Double
-      ' vedere nella pagina Allarm il capito "Incisioni"
-      Dim bForceUseMill As Boolean = (GetPrivateProfileInt(S_MACH_NEST, K_MACH_ENGRAVING_WITHMILL, 1, m_MainWindow.GetMachIniFile()) <> 0)
-      Dim dFootPrint As Double = 0
-      ' verifico quale lavorazione è attiva
-      If Not String.IsNullOrEmpty(m_MainWindow.m_CurrentMachine.sCurrSawing) AndAlso Not bForceUseMill Then
-         EgtTdbGetCurrToolParam(MCH_TP.THICK, dFootPrint)
-      ElseIf Not String.IsNullOrEmpty(m_MainWindow.m_CurrentMachine.sCurrMilling) Then
-         Dim sCurrMill = m_MainWindow.m_CurrentMachine.sCurrMill
-         'GetDrillFromDrilling(sCurrMill, m_MainWindow.m_CurrentMachine.sCurrMilling)
-         GetMillFromMilling(sCurrMill, m_MainWindow.m_CurrentMachine.sCurrMilling)
-         ' recupero informazioni della fresa in uso
-         EgtTdbSetCurrTool(sCurrMill)
-         EgtTdbGetCurrToolParam(MCH_TP.DIAM, dFootPrint)
-      End If
-      Return dFootPrint
-   End Function
-
    Private Function CreateFlatteningCut() As Boolean
       ' Verifico sia definito il punto iniziale e il grezzo
       If Not m_bPointP1Ok Or Not m_bRawOk Then
@@ -649,17 +628,13 @@ Public Class FlatteningCut
       Dim nPartId = EgtCreateGroup(GDB_ID.ROOT)
       EgtSetName(nPartId, NAME_DIRECTCUT)
       Dim nLayerId = EgtCreateGroup(nPartId)
-      ' EgtSetName(nLayerId, NAME_OUTLOOP)
-      EgtSetName(nLayerId, NAME_ONPATH)
+      EgtSetName(nLayerId, NAME_OUTLOOP)
       ' Creo il taglio
       Dim ptStart As Point3d = m_ptTipP1
       ptStart.z = 0
       Dim nCutId = EgtCreateLinePDL(nLayerId, ptStart, m_dAngO, m_dLen)
       ' Imposto affondamento e angolo di fianco sul taglio
       EgtSetInfo(nCutId, INFO_DEPTH, m_dDepth)
-      If (GetPrivateProfileInt(S_MACH_NEST, K_MACH_ENGRAVING_WITHMILL, 1, m_MainWindow.GetMachIniFile()) <> 0) Then
-         EgtSetInfo(nCutId, INFO_WIDTH, GetFootPrintTool)
-      End If
       EgtSetInfo(nCutId, INFO_SIDE_ANGLE, 0)
       ' Imposto prima direzione
       EgtSetInfo(nCutId, INFO_DIR, 1)
@@ -695,21 +670,22 @@ Public Class FlatteningCut
          RemoveFinalHome()
       End If
       UpdateSimulOkBtn()
+
+
+
       Return m_bCutOk
    End Function
 
    Private Function MultiplyCut(nLayerId As Integer, nCutId As Integer) As Boolean
-      ' Recupero spessore della lama (utensile) correntemente attiva
-      Dim dThick As Double = GetFootPrintTool()
-      If dThick = 0 Then Return False
-
+      ' Recupero spessore della lama correntemente attiva
+      Dim dThick As Double = 0
+      EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
       ' Imposto angolo di rotazione a seconda del lato dei tagli
       Dim dRotAngO As Double = If(SideChBx.IsChecked(), -90, 90)
       ' Definisco vettore di spostamento
       Dim vtDelta As Vector3d
       vtDelta = Vector3d.FromPolar(1, m_dAngO)
       vtDelta.Rotate(Vector3d.Z_AX, dRotAngO)
-
       ' Calcolo numero di iterazioni necessarie a coprire l'area impostata e lunghezza vettore delta
       Dim nStepNum As Integer
       Dim dDelta As Double

DirectCuts/GridCut.xaml

@@ -34,16 +34,12 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <ToggleButton Name="Point1Btn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
+            <ToggleButton Name="Point1Btn" Grid.Column="0"
+            Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+            <ToggleButton Name="Point2Btn" Grid.Column="1"
+            Style="{DynamicResource OmagCut_YellowToggleButton}"/>
 
-                <ToggleButton Name="Point2Btn" Grid.Column="1"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
-            </Grid>
+         </Grid>
 
          <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}"
             Margin="6,0,6,0">
@@ -61,12 +57,12 @@
 
          <TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="3"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0" IsLength="False"
+         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="SideAngleTxBl" Grid.Column="0" Grid.Row="4"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0" IsLength="False"
+         <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
          <Grid Grid.Row="5" Grid.ColumnSpan="2">
@@ -89,7 +85,7 @@
             <TextBlock Name="DimPzXTxBl" Grid.Column="2" Grid.Row="0"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
 
-            <EgtWPFLib:EgtTextBox Name="NumPzXTxBx" Grid.Column="0" Grid.Row="1" Width="75" IsLength="False"
+            <EgtWPFLib:EgtTextBox Name="NumPzXTxBx" Grid.Column="0" Grid.Row="1" Width="75"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
             <EgtWPFLib:EgtTextBox Name="DimPzXTxBx" Grid.Column="2" Grid.Row="1" Width="75"
             Style="{StaticResource OmagCut_CalculatorTextBox}" />
@@ -99,7 +95,7 @@
             <TextBlock Name="DimPzYTxBl" Grid.Column="2" Grid.Row="2"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
 
-            <EgtWPFLib:EgtTextBox Name="NumPzYTxBx" Grid.Column="0" Grid.Row="3" Width="75" IsLength="False"
+            <EgtWPFLib:EgtTextBox Name="NumPzYTxBx" Grid.Column="0" Grid.Row="3" Width="75"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
             <EgtWPFLib:EgtTextBox Name="DimPzYTxBx" Grid.Column="2" Grid.Row="3" Width="75"
             Style="{StaticResource OmagCut_CalculatorTextBox}" />
@@ -135,16 +131,12 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-            </Grid>
+            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
+            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
+            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+         </Grid>
 
       </Grid>
 

DirectCuts/GridCut.xaml.vb

@@ -63,8 +63,8 @@ Public Class GridCut
       ' la associo alla combobox
       PointModeCmBx.ItemsSource = m_PointsModeArray
       ' assegno messaggi
-      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
+      Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
+      Point2Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
       DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13)
       DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
       SideAngleTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 16)
@@ -73,8 +73,8 @@ Public Class GridCut
       NumPzYTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 21)
       DimPzYTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 22)
       SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23)
-      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
+      OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
       ' Carico i dati dell'ultimo taglio
       m_dDepth = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_GRID_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
       m_dAngO = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_GRID_ANGH, m_dAngO, m_MainWindow.GetIniFile())
@@ -152,7 +152,6 @@ Public Class GridCut
       EgtDraw()
    End Sub
 
-
    Friend Sub GridCut_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
       ' Salvo i dati correnti
       WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_DEPTH, DoubleToString( m_dDepth, 2), m_MainWindow.GetIniFile())
@@ -168,7 +167,7 @@ Public Class GridCut
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
+         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -186,11 +185,6 @@ Public Class GridCut
       m_bActive = False
    End Sub
 
-   Public Sub SetEnableParam(ByVal bIsSaw As Boolean)
-      ' se macchina solo WaterJet Disabilito/Nascondo parametri della lama
-      DepthTxBx.IsEnabled = bIsSaw
-   End Sub
-
    Private Sub UpdateSimulOkBtn()
       If m_bCutOk Then
          SimulBtn.IsEnabled = True
@@ -248,12 +242,6 @@ Public Class GridCut
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
-      ' Recupero dati utensile e testa corrente
-      Dim sTool As String = ""
-      Dim sHead As String = ""
-      Dim nExit As Integer = 0
-      EgtGetCalcTool(sTool, sHead, nExit)
-
       ' Se acquisizone lama o laser
       If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
 
@@ -268,12 +256,12 @@ Public Class GridCut
             If Not EgtSetCalcTool("", "H3", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
-            ' Reimposto eventuale precedente utensile
-            EgtSetCalcTool(sTool, sHead, nExit)
+            ' Ora imposto la lama corrente
+            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
             ' Altrimenti da lama
          Else
-            ' Reimposto eventuale precedente utensile
-            EgtSetCalcTool(sTool, sHead, nExit)
+            ' Imposto la lama corrente
+            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
          End If
@@ -297,8 +285,10 @@ Public Class GridCut
          ' Porto il tip nell'origine tavola
          m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP1Ok = True
-         ' Reimposto eventuale precedente utensile
-         EgtSetCalcTool(sTool, sHead, nExit)
+         ' Ricavo dati lama corrente
+         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
+         ' Imposto la lama corrente
+         If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
       End If
 
       ' Disegno il taglio
@@ -327,12 +317,6 @@ Public Class GridCut
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
-      ' Recupero dati utensile e testa corrente
-      Dim sTool As String = ""
-      Dim sHead As String = ""
-      Dim nExit As Integer = 0
-      EgtGetCalcTool(sTool, sHead, nExit)
-
       ' Se acquisizone lama o laser
       If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
 
@@ -347,12 +331,12 @@ Public Class GridCut
             If Not EgtSetCalcTool("", "H3", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
-            ' Reimposto eventuale precedente utensile
-            EgtSetCalcTool(sTool, sHead, nExit)
+            ' Ora imposto la lama corrente
+            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
             ' Altrimenti da lama
          Else
-            ' Reimposto eventuale precedente utensile
-            EgtSetCalcTool(sTool, sHead, nExit)
+            ' Imposto la lama corrente
+            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
          End If
@@ -374,8 +358,10 @@ Public Class GridCut
          ' Porto il tip nell'origine tavola
          m_ptTipP2.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP2Ok = True
-         ' Reimposto eventuale precedente utensile
-         EgtSetCalcTool(sTool, sHead, nExit)
+         ' Ricavo dati lama corrente
+         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
+         ' Imposto la lama corrente
+         If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
       End If
 
       ' Se il secondo punto non coincide con il primo, disegno il taglio
@@ -494,7 +480,6 @@ Public Class GridCut
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
-      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -535,7 +520,7 @@ Public Class GridCut
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreateGridCut() As Boolean

DirectCuts/MachineButtonsUC.xaml

@@ -19,8 +19,7 @@
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="1*"/>
-        </Grid.ColumnDefinitions>
+      </Grid.ColumnDefinitions>
 
       <ToggleButton Name="MachineButton1" Grid.Column="0" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
          <Image Name="ImageButton1" Style="{StaticResource OmagCut_ButtonIcon}"/>
@@ -62,10 +61,6 @@
          <Image Name="ImageButton10" Style="{StaticResource OmagCut_ButtonIcon}"/>
       </ToggleButton>
 
-        <ToggleButton Name="MachineButton11" Grid.Column="10" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
-            <Image Name="ImageButton11" Style="{StaticResource OmagCut_ButtonIcon}"/>
-        </ToggleButton>
-
-    </Grid>
+   </Grid>
 
 </UserControl>

DirectCuts/MachineButtonsUC.xaml.vb

@@ -10,8 +10,7 @@ Public Class MachineButtonsUC
    Private m_bOnlyLaser As Boolean = False
    Private m_bFirst As Boolean = True
 
-   ' 9/2 aggiunto spazio per un nuovo bottone
-   Private Const MAX_BUTTONS As Integer = 11
+   Private Const MAX_BUTTONS As Integer = 10
    Private m_nCount As Integer = 0
    Private ImageArrayY(MAX_BUTTONS - 1) As String
    Private ImageArrayN(MAX_BUTTONS - 1) As String
@@ -32,10 +31,6 @@ Public Class MachineButtonsUC
    Private Const BTN_STATE_NOTHING As String = "Nothing"
    Private Const BTN_STATE_DOOR_OPENED As String = "DoorOpened"
    Private Const BTN_STATE_DOOR_CLOSED As String = "DoorClosed"
-   Private Const BTN_STATE_PARKING As String = "Parking"
-   Private Const BTN_ENABLE_ZONE_1 As String = "EnableZone1"
-   Private Const BTN_ENABLE_ZONE_2 As String = "EnableZone2"
-   Private Const BTN_ENABLE_PC As String = "EnablePC"
 
    Public Sub New(Optional bOnlyLaser As Boolean = False)
       ' This call is required by the designer.
@@ -80,10 +75,7 @@ Public Class MachineButtonsUC
       For nIndex As Integer = 0 To m_nCount - 1
          If StateFlagArray(nIndex) = BTN_STATE_NOTHING OrElse
             StateFlagArray(nIndex) = BTN_STATE_DOOR_OPENED OrElse
-            StateFlagArray(nIndex) = BTN_STATE_DOOR_CLOSED OrElse
-            StateFlagArray(nIndex) = BTN_ENABLE_PC OrElse
-            StateFlagArray(nIndex) = BTN_ENABLE_ZONE_1 OrElse
-            StateFlagArray(nIndex) = BTN_ENABLE_ZONE_2 Then
+            StateFlagArray(nIndex) = BTN_STATE_DOOR_CLOSED Then
             ' mostra immagine fissa
             Try
                Dim s As String
@@ -119,22 +111,6 @@ Public Class MachineButtonsUC
                Catch ex As Exception
                   EgtOutLog("Error loading image " & sImage)
                End Try
-            Else
-               ' In attesa che attivono le icone di questi pulsanti scrivo il contenuto del bottone
-               Try
-                  Dim CurrToggleBtn As Primitives.ToggleButton = GetToggleButton(nIndex + 1)
-                  If StateFlagArray(nIndex) = K_XYJOG Then
-                     CurrToggleBtn.Content = "X - Y"
-                  ElseIf StateFlagArray(nIndex) = K_ZCJOG Then
-                     CurrToggleBtn.Content = "Z - C"
-                  ElseIf StateFlagArray(nIndex) = K_ZBJOG Then
-                     CurrToggleBtn.Content = "Z - B"
-                  ElseIf StateFlagArray(nIndex) = K_REMOTE Then
-                     CurrToggleBtn.Content = "Remote"
-                  End If
-               Catch ex As Exception
-                  EgtOutLog("Error loading content " & StateFlagArray(nIndex))
-               End Try
             End If
          Next
       End If
@@ -142,8 +118,7 @@ Public Class MachineButtonsUC
    End Sub
 
    Private Sub MachineButton_Click(sender As Object, e As RoutedEventArgs) Handles MachineButton1.Click, MachineButton2.Click, MachineButton3.Click, MachineButton4.Click, MachineButton5.Click,
-                                                                                   MachineButton6.Click, MachineButton7.Click, MachineButton8.Click, MachineButton9.Click, MachineButton10.Click,
-                                                                                   MachineButton11.Click
+                                                                                   MachineButton6.Click, MachineButton7.Click, MachineButton8.Click, MachineButton9.Click, MachineButton10.Click
       Dim CurrentBtn As Primitives.ToggleButton = e.Source
       ' recupero l'inidce del bottone selezionato
       Dim nIndex As Integer = GetToggleButtonIndex(CurrentBtn) - 1
@@ -162,18 +137,6 @@ Public Class MachineButtonsUC
          Return
       End If
 
-      ' Se il bottone chiamantè quello per la selezione del pannello di controllo
-      If nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_PC) Then
-         Dim sTLuaFile As String = sBaseDir & CommandArrayY(nIndex)
-         Dim sFLuaFile As String = sBaseDir & CommandArrayN(nIndex)
-         If m_CN.nEnablePc = 1 Then
-            ExecuteMDICommand(CurrentBtn, sTLuaFile)
-         ElseIf m_CN.nEnablePc = 2 Then
-            ExecuteMDICommand(CurrentBtn, sFLuaFile)
-         End If
-         Return
-      End If
-
       If CurrentBtn.IsChecked() Then
          'EgtLuaExecFile(sBaseDir & CommandArrayY(nIndex))
          sLuaFileName = sBaseDir & CommandArrayY(nIndex)
@@ -365,7 +328,6 @@ Public Class MachineButtonsUC
                 " EType2=" & If(Not String.IsNullOrEmpty(EType2), CInt(EType2).ToString, ""))
    End Sub
 
-#Region "STATE CHANGED"
 
    Friend Sub SpindleStateChanged(SpindleState As Boolean)
       Dim nIndex As Integer = Array.IndexOf(StateFlagArray, BTN_STATE_SPINDLE)
@@ -572,11 +534,7 @@ Public Class MachineButtonsUC
    End Sub
 
    Friend Sub DoorStateChanged(DoorState As Integer)
-      If IsNothing(DoorState) Then
-         EgtOutLog("Error: door state null!")
-         Return
-      End If
-      ' recupero le associazioni con i bottoni
+      ' recupero le asscociazioni con i bottoni
       Dim nIndex As Integer = Array.IndexOf(StateFlagArray, BTN_STATE_DOOR_OPENED)
       If nIndex = -1 Then Return
       ' bottone di apertura porte
@@ -586,7 +544,7 @@ Public Class MachineButtonsUC
       ' bottone di chiusura porte
       Dim DoorClosedButton As Primitives.ToggleButton = GetToggleButton(nIndex + 1)
       ' modifico il colore dei bottoni
-      If Not IsNothing(DoorState) AndAlso Not IsNothing(DoorClosedButton) Then
+      If Not IsNothing(DoorState) Then
          Select Case DoorState
             Case 0
                DoorClosedButton.Background = Application.Current.FindResource("OmagCut_Red")
@@ -594,7 +552,7 @@ Public Class MachineButtonsUC
                DoorClosedButton.Background = Application.Current.FindResource("OmagCut_LightGray")
          End Select
       End If
-      If Not IsNothing(DoorState) AndAlso Not IsNothing(DoorOpenedButton) Then
+      If Not IsNothing(DoorState) Then
          Select Case DoorState
             Case 0
                DoorOpenedButton.Background = Application.Current.FindResource("OmagCut_LightGray")
@@ -606,318 +564,104 @@ Public Class MachineButtonsUC
       End If
    End Sub
 
-   Friend Sub ParkingStateChanged(ParkingState As Boolean)
-      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, BTN_STATE_PARKING)
-      If nIndex = -1 Then Return
-      If ParkingState Then
-         GetToggleButton(nIndex + 1).IsChecked = True
-         Try
-            Dim s As String
-            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
-            End If
-            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
-            GetImage(nIndex + 1).Source = sButtonImageSource
-         Catch ex As Exception
-            EgtOutLog("Error loading image " & ImageArrayY(nIndex + 1))
-         End Try
-      Else
-         GetToggleButton(nIndex + 1).IsChecked = False
-         Try
-            Dim s As String
-            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
-            End If
-            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
-            GetImage(nIndex + 1).Source = sButtonImageSource
-         Catch ex As Exception
-            EgtOutLog("Error loading image " & ImageArrayN(nIndex + 1))
-         End Try
-      End If
-   End Sub
-
-   Friend Sub EnableZoneStateChanged(ZoneState As Integer)
-      Dim sFlag As String = String.Empty
-      If ZoneState = 1 Then
-         sFlag = BTN_ENABLE_ZONE_1
-      ElseIf ZoneState = 2 Then
-         sFlag = BTN_ENABLE_ZONE_2
-      End If
-      ' recupero il bottone che deve essere acceso (quindi spengo l'altro)
-      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, sFlag)
-
-      ' se non trovo nessun riferimento allora spengo entrambi i comandi
-      If nIndex = -1 Then
-         nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_ZONE_1)
-         GetToggleButton(nIndex + 1).IsChecked = False
-         nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_ZONE_2)
-         GetToggleButton(nIndex + 1).IsChecked = False
-         Return
-      End If
-
-      If ZoneState = 1 Then
-         GetToggleButton(nIndex + 1).IsChecked = True
-         Try
-            Dim s As String
-            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
-            End If
-            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
-            GetImage(nIndex + 1).Source = sButtonImageSource
-         Catch ex As Exception
-            EgtOutLog("Error loading image " & ImageArrayY(nIndex + 1))
-         End Try
-         ' spengo l'altro bottone (lo stato dei due bottoni sono gestiti da una sola variabile)
-         nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_ZONE_2)
-         GetToggleButton(nIndex + 1).IsChecked = False
-
-      ElseIf ZoneState = 2 Then
-         GetToggleButton(nIndex + 1).IsChecked = True
-         Try
-            Dim s As String
-            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
-            End If
-            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
-            GetImage(nIndex + 1).Source = sButtonImageSource
-         Catch ex As Exception
-            EgtOutLog("Error loading image " & ImageArrayN(nIndex + 1))
-         End Try
-         ' spengo l'altro bottone (lo stato dei due bottoni sono gestiti da una sola variabile)
-         nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_ZONE_1)
-         GetToggleButton(nIndex + 1).IsChecked = False
-      End If
-   End Sub
-
-   Friend Sub EnablePcStateChanged(PcState As Integer)
-      ' il comando ButtonY accendo il Pannello_1, il comando ButtonN accendo il Pannello_2 (uno è la negazione dell'altro)
-      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, BTN_ENABLE_PC)
-      If nIndex = -1 Then Return
-      If PcState = 1 Then
-         GetToggleButton(nIndex + 1).IsChecked = True
-         Try
-            Dim s As String
-            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
-            End If
-            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
-            GetImage(nIndex + 1).Source = sButtonImageSource
-         Catch ex As Exception
-            EgtOutLog("Error loading image " & ImageArrayY(nIndex + 1))
-         End Try
-      ElseIf PcState = 2 Then
-         GetToggleButton(nIndex + 1).IsChecked = True
-         Try
-            Dim s As String
-            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayN(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayN(nIndex)
-            End If
-            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
-            GetImage(nIndex + 1).Source = sButtonImageSource
-         Catch ex As Exception
-            EgtOutLog("Error loading image " & ImageArrayN(nIndex + 1))
-         End Try
-      Else
-         ' nessuno dei due pannelli attivo
-         GetToggleButton(nIndex + 1).IsChecked = False
-      End If
-   End Sub
-
-   Friend Sub TableUpChanged(TableUpState As Boolean)
-      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, K_TABLEUP)
-      If nIndex = -1 Then Return
-      If TableUpState Then
-         GetToggleButton(nIndex + 1).IsChecked = True
-         Try
-            Dim s As String
-            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
-            End If
-            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
-            GetImage(nIndex + 1).Source = sButtonImageSource
-         Catch ex As Exception
-            EgtOutLog("Error loading image " & ImageArrayY(nIndex + 1))
-         End Try
-      Else
-         GetToggleButton(nIndex + 1).IsChecked = False
-         Try
-            Dim s As String
-            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayN(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayN(nIndex)
-            End If
-            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
-            GetImage(nIndex + 1).Source = sButtonImageSource
-         Catch ex As Exception
-            EgtOutLog("Error loading image " & ImageArrayN(nIndex + 1))
-         End Try
-      End If
-   End Sub
-
-   Friend Sub TableDownChanged(TableDownState As Boolean)
-      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, K_TABLEDOWN)
-      If nIndex = -1 Then Return
-      If TableDownState Then
-         GetToggleButton(nIndex + 1).IsChecked = True
-         Try
-            Dim s As String
-            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
-            End If
-            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
-            GetImage(nIndex + 1).Source = sButtonImageSource
-         Catch ex As Exception
-            EgtOutLog("Error loading image " & ImageArrayY(nIndex + 1))
-         End Try
-      Else
-         GetToggleButton(nIndex + 1).IsChecked = False
-         Try
-            Dim s As String
-            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayN(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayN(nIndex)
-            End If
-            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
-            GetImage(nIndex + 1).Source = sButtonImageSource
-         Catch ex As Exception
-            EgtOutLog("Error loading image " & ImageArrayN(nIndex + 1))
-         End Try
-      End If
-   End Sub
-
    '----------------- Queste funzioni determina lo stato del bottone direttamente dalla lettura delle variabili CN
-   Friend Sub XYJogChanged(ByVal bXYAxes As Boolean)
+   Friend Sub XYAxesChanged(ByVal bXYAxes As Boolean)
       ' recupero le asscociazioni con i bottoni
-      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, K_XYJOG)
+      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, "XYAxes")
       If nIndex = -1 Then Return
       ' selezoiono lo stato del bottone
       GetToggleButton(nIndex + 1).IsChecked = bXYAxes
    End Sub
 
-   Friend Sub ZJogChanged(ByVal bZAxes As Boolean)
+   Friend Sub ZAxesChanged(ByVal bZAxes As Boolean)
       ' recupero le asscociazioni con i bottoni
-      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, K_ZCJOG)
+      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, "ZAxes")
       If nIndex = -1 Then Return
       ' selezoiono lo stato del bottone
       GetToggleButton(nIndex + 1).IsChecked = bZAxes
    End Sub
 
-   Friend Sub BCJogChanged(ByVal bBCAxes As Boolean)
+   Friend Sub BCAxesChanged(ByVal bBCAxes As Boolean)
       ' recupero le asscociazioni con i bottoni
-      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, K_ZBJOG)
+      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, "BCAxes")
       If nIndex = -1 Then Return
       ' selezoiono lo stato del bottone
       GetToggleButton(nIndex + 1).IsChecked = bBCAxes
    End Sub
-
-   Friend Sub RemoteChanged(ByVal bRemote As Boolean)
-      ' recupero le asscociazioni con i bottoni
-      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, K_REMOTE)
-      If nIndex = -1 Then Return
-      ' selezoiono lo stato del bottone
-      GetToggleButton(nIndex + 1).IsChecked = bRemote
-   End Sub
-
    '-----------------------------------------------------------------------------------------------------------------
 
-#End Region    ' State changed
-
    Private Function GetToggleButton(ByVal nIndex As Integer) As Primitives.ToggleButton
       Select Case nIndex
-         Case 1
-            Return MachineButton1
-         Case 2
-            Return MachineButton2
-         Case 3
-            Return MachineButton3
-         Case 4
-            Return MachineButton4
-         Case 5
-            Return MachineButton5
-         Case 6
-            Return MachineButton6
-         Case 7
-            Return MachineButton7
-         Case 8
-            Return MachineButton8
-         Case 9
-            Return MachineButton9
-         Case 10
-            Return MachineButton10
-         Case Else
-            Return MachineButton11
+      Case 1
+         Return MachineButton1
+      Case 2
+         Return MachineButton2
+      Case 3
+         Return MachineButton3
+      Case 4
+         Return MachineButton4
+      Case 5
+         Return MachineButton5
+      Case 6
+         Return MachineButton6
+      Case 7
+         Return MachineButton7
+      Case 8
+         Return MachineButton8
+      Case 9
+         Return MachineButton9
+      Case Else
+         Return MachineButton10
       End Select
    End Function
 
    Private Function GetToggleButtonIndex(ByVal nBtnName As Primitives.ToggleButton) As Integer
       Select Case nBtnName.Name
-         Case MachineButton1.Name
-            Return 1
-         Case MachineButton2.Name
-            Return 2
-         Case MachineButton3.Name
-            Return 3
-         Case MachineButton4.Name
-            Return 4
-         Case MachineButton5.Name
-            Return 5
-         Case MachineButton6.Name
-            Return 6
-         Case MachineButton7.Name
-            Return 7
-         Case MachineButton8.Name
-            Return 8
-         Case MachineButton9.Name
-            Return 9
-         Case MachineButton10.Name
-            Return 10
-         Case Else
-            Return 11
+      Case MachineButton1.Name
+         Return 1
+      Case MachineButton2.Name
+         Return 2
+      Case MachineButton3.Name
+         Return 3
+      Case MachineButton4.Name
+         Return 4
+      Case MachineButton5.Name
+         Return 5
+      Case MachineButton6.Name
+         Return 6
+      Case MachineButton7.Name
+         Return 7
+      Case MachineButton8.Name
+         Return 8
+      Case MachineButton9.Name
+         Return 9
+      Case Else
+         Return 10
       End Select
    End Function
 
    Private Function GetImage(ByVal nInd As Integer) As Image
       Select Case nInd
-         Case 1
-            Return ImageButton1
-         Case 2
-            Return ImageButton2
-         Case 3
-            Return ImageButton3
-         Case 4
-            Return ImageButton4
-         Case 5
-            Return ImageButton5
-         Case 6
-            Return ImageButton6
-         Case 7
-            Return ImageButton7
-         Case 8
-            Return ImageButton8
-         Case 9
-            Return ImageButton9
-         Case 10
-            Return ImageButton10
-         Case Else
-            Return ImageButton11
+      Case 1
+         Return ImageButton1
+      Case 2
+         Return ImageButton2
+      Case 3
+         Return ImageButton3
+      Case 4
+         Return ImageButton4
+      Case 5
+         Return ImageButton5
+      Case 6
+         Return ImageButton6
+      Case 7
+         Return ImageButton7
+      Case 8
+         Return ImageButton8
+      Case 9
+         Return ImageButton9
+      Case Else
+         Return ImageButton10
       End Select
    End Function
 

DirectCuts/ManualAxesMoveUC.xaml

@@ -69,10 +69,10 @@
          <EgtWPFLib:EgtTextBox x:Name="L3TxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
          <Button x:Name="R1Btn" Grid.Row="4" Height="60" Width="60" Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-         <EgtWPFLib:EgtTextBox x:Name="R1TxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0" IsLength="False"
+         <EgtWPFLib:EgtTextBox x:Name="R1TxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
          <Button x:Name="R2Btn" Grid.Row="5" Height="60" Width="60" Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-         <EgtWPFLib:EgtTextBox x:Name="R2TxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0" IsLength="False"
+         <EgtWPFLib:EgtTextBox x:Name="R2TxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
    
          <Grid Grid.Row="7" Grid.ColumnSpan="2">

DirectCuts/ManualAxesMoveUC.xaml.vb

@@ -21,12 +21,10 @@ Public Class ManualAxesMoveUC
       ' Messaggi
       L1SawThChBx.Content = EgtMsg(90232)   ' Spessore lama
       L2SawThChBx.Content = EgtMsg(90232)   ' Spessore lama
-
       AddHandler m_Timer.Tick, AddressOf Timer_tick
    End Sub
 
    Private Sub ManualAxesMove_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
-      m_CN = m_MainWindow.m_DirectCutPageUC.m_CN
       ' Valori feed e speed da lama corrente
       Dim dTemp As Double = 0
       EgtTdbSetCurrTool(m_MainWindow.m_CurrentProjectPageUC.ToolTxBx.Text)
@@ -208,7 +206,6 @@ Public Class ManualAxesMoveUC
       m_CN.MDI_command()
       System.Threading.Thread.Sleep(150)
       m_CN.DGeneralFunctions_CycleStart()
-      System.Threading.Thread.Sleep(m_MainWindow.m_CurrentMachine.nThreadSleep)
       m_CN.DGeneralFunctions_WriteCncMode(7)     ' Modalità manuale
       m_MoveClicked = False
    End Sub
@@ -340,7 +337,7 @@ Public Class ManualAxesMoveUC
    End Function
 
    Private Sub BackBtn_Click(sender As Object, e As RoutedEventArgs) Handles BackBtn.Click
-      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Sub G0Btn_Checked(sender As Object, e As RoutedEventArgs) Handles G0Btn.Checked

DirectCuts/MultipleCut.xaml

@@ -35,17 +35,12 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <ToggleButton Name="Point1Btn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
+            <ToggleButton Name="Point1Btn" Grid.Column="0"
+            Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+            <ToggleButton Name="Point2Btn" Grid.Column="1"
+            Style="{DynamicResource OmagCut_YellowToggleButton}"/>
 
-                <ToggleButton Name="Point2Btn" Grid.Column="1"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
-
-            </Grid>
+         </Grid>
 
          <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}"
             Margin="6,0,6,0">
@@ -68,12 +63,12 @@
 
          <TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="4"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0" IsLength="False"
+         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="SideAngleTxBl" Grid.Column="0" Grid.Row="5"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0" IsLength="False"
+         <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
          <Grid Grid.Row="6" Grid.ColumnSpan="2" Visibility="Visible">
@@ -124,70 +119,70 @@
 
                      <TextBlock Name="Num1TxBl" Grid.Column="0" Grid.Row="0"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                  <EgtWPFLib:EgtTextBox Name="NumPz1TxBx" Grid.Column="1" Grid.Row="0" Width="75" IsLength="False"
+                     <EgtWPFLib:EgtTextBox Name="NumPz1TxBx" Grid.Column="1" Grid.Row="0" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz1TxBx" Grid.Column="3" Grid.Row="0" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
                      <TextBlock Name="Num2TxBl" Grid.Column="0" Grid.Row="1"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                  <EgtWPFLib:EgtTextBox Name="NumPz2TxBx" Grid.Column="1" Grid.Row="1" Width="75" IsLength="False"
+                     <EgtWPFLib:EgtTextBox Name="NumPz2TxBx" Grid.Column="1" Grid.Row="1" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz2TxBx" Grid.Column="3" Grid.Row="1" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
                      <TextBlock Name="Num3TxBl" Grid.Column="0" Grid.Row="2"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                  <EgtWPFLib:EgtTextBox Name="NumPz3TxBx" Grid.Column="1" Grid.Row="2" Width="75" IsLength="False"
+                     <EgtWPFLib:EgtTextBox Name="NumPz3TxBx" Grid.Column="1" Grid.Row="2" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz3TxBx" Grid.Column="3" Grid.Row="2" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
                      <TextBlock Name="Num4TxBl" Grid.Column="0" Grid.Row="3"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                     <EgtWPFLib:EgtTextBox Name="NumPz4TxBx" Grid.Column="1" Grid.Row="3" Width="75" IsLength="False"
+                     <EgtWPFLib:EgtTextBox Name="NumPz4TxBx" Grid.Column="1" Grid.Row="3" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz4TxBx" Grid.Column="3" Grid.Row="3" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
                      <TextBlock Name="Num5TxBl" Grid.Column="0" Grid.Row="4"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                  <EgtWPFLib:EgtTextBox Name="NumPz5TxBx" Grid.Column="1" Grid.Row="4" Width="75" IsLength="False"
+                     <EgtWPFLib:EgtTextBox Name="NumPz5TxBx" Grid.Column="1" Grid.Row="4" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz5TxBx" Grid.Column="3" Grid.Row="4" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
                      <TextBlock Name="Num6TxBl" Grid.Column="0" Grid.Row="5"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                  <EgtWPFLib:EgtTextBox Name="NumPz6TxBx" Grid.Column="1" Grid.Row="5" Width="75" IsLength="False"
+                     <EgtWPFLib:EgtTextBox Name="NumPz6TxBx" Grid.Column="1" Grid.Row="5" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz6TxBx" Grid.Column="3" Grid.Row="5" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
                      <TextBlock Name="Num7TxBl" Grid.Column="0" Grid.Row="6"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                  <EgtWPFLib:EgtTextBox Name="NumPz7TxBx" Grid.Column="1" Grid.Row="6" Width="75" IsLength="False"
+                     <EgtWPFLib:EgtTextBox Name="NumPz7TxBx" Grid.Column="1" Grid.Row="6" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz7TxBx" Grid.Column="3" Grid.Row="6" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
                      <TextBlock Name="Num8TxBl" Grid.Column="0" Grid.Row="7"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                  <EgtWPFLib:EgtTextBox Name="NumPz8TxBx" Grid.Column="1" Grid.Row="7" Width="75" IsLength="False"
+                     <EgtWPFLib:EgtTextBox Name="NumPz8TxBx" Grid.Column="1" Grid.Row="7" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz8TxBx" Grid.Column="3" Grid.Row="7" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
                      <TextBlock Name="Num9TxBl" Grid.Column="0" Grid.Row="8"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                  <EgtWPFLib:EgtTextBox Name="NumPz9TxBx" Grid.Column="1" Grid.Row="8" Width="75" IsLength="False"
+                     <EgtWPFLib:EgtTextBox Name="NumPz9TxBx" Grid.Column="1" Grid.Row="8" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz9TxBx" Grid.Column="3" Grid.Row="8" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
                      <TextBlock Name="Num10TxBl" Grid.Column="0" Grid.Row="9"
                      Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                  <EgtWPFLib:EgtTextBox Name="NumPz10TxBx" Grid.Column="1" Grid.Row="9" Width="75" IsLength="False"
+                     <EgtWPFLib:EgtTextBox Name="NumPz10TxBx" Grid.Column="1" Grid.Row="9" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                      <EgtWPFLib:EgtTextBox Name="DimPz10TxBx" Grid.Column="3" Grid.Row="9" Width="75"
                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -261,16 +256,12 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-            </Grid>
+            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
+            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
+            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+         </Grid>
 
       </Grid>
 

DirectCuts/MultipleCut.xaml.vb

@@ -63,8 +63,8 @@ Public Class MultipleCut
       ' la associo alla combobox
       PointModeCmBx.ItemsSource = m_PointsModeArray
       ' assegno messaggi
-      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
+      Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
+      Point2Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
       DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13)
       LenghtTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 14)
       DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
@@ -72,8 +72,8 @@ Public Class MultipleCut
       NumPzTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 17)
       DimPzTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 18)
       SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23)
-      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
+      OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
       Num1TxBl.Text = "1"
       Num2TxBl.Text = "2"
       Num3TxBl.Text = "3"
@@ -195,7 +195,7 @@ Public Class MultipleCut
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
+         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -213,10 +213,6 @@ Public Class MultipleCut
       m_bActive = False
    End Sub
 
-   Public Sub SetEnableParam(ByVal bIsSaw As Boolean)
-      DepthTxBx.IsEnabled = bIsSaw
-   End Sub
-
    Private Sub UpdateSimulOkBtn()
       If m_bCutOk Then
          SimulBtn.IsEnabled = True
@@ -274,12 +270,6 @@ Public Class MultipleCut
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
-      ' Recupero dati utensile e testa corrente
-      Dim sTool As String = ""
-      Dim sHead As String = ""
-      Dim nExit As Integer = 0
-      EgtGetCalcTool(sTool, sHead, nExit)
-
       ' Se acquisizone lama o laser
       If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
 
@@ -294,14 +284,12 @@ Public Class MultipleCut
             If Not EgtSetCalcTool("", "H3", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
-            ' Reimposto eventuale precedente utensile
-            EgtSetCalcTool(sTool, sHead, nExit)
-
-            ' Altrimenti da lama
+            ' Ora imposto la lama corrente
+            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+         ' Altrimenti da lama
          Else
-            ' Reimposto eventuale precedente utensile
-            EgtSetCalcTool(sTool, sHead, nExit)
-
+            ' Imposto la lama corrente
+            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
          End If
@@ -324,9 +312,10 @@ Public Class MultipleCut
          ' Porto il tip nell'origine tavola
          m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP1Ok = True
-         ' Reimposto eventuale precedente utensile
-         EgtSetCalcTool(sTool, sHead, nExit)
-
+         ' Ricavo dati lama corrente
+         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
+         ' Imposto la lama corrente
+         If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
       End If
       ' Disegno il taglio
       CreateMultipleCut()
@@ -354,12 +343,6 @@ Public Class MultipleCut
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
-      ' Recupero dati utensile e testa corrente
-      Dim sTool As String = ""
-      Dim sHead As String = ""
-      Dim nExit As Integer = 0
-      EgtGetCalcTool(sTool, sHead, nExit)
-
       ' Se acquisizone lama o laser
       If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
 
@@ -374,12 +357,12 @@ Public Class MultipleCut
             If Not EgtSetCalcTool("", "H3", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
-            ' Reimposto eventuale precedente utensile
-            EgtSetCalcTool(sTool, sHead, nExit)
-            ' Altrimenti da lama
+            ' Ora imposto la lama corrente
+            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+         ' Altrimenti da lama
          Else
-            ' Reimposto eventuale precedente utensile
-            EgtSetCalcTool(sTool, sHead, nExit)
+            ' Imposto la lama corrente
+            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
          End If
@@ -400,9 +383,10 @@ Public Class MultipleCut
          ' Porto il tip nell'origine tavola
          m_ptTipP2.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP2Ok = True
-         ' Reimposto eventuale precedente utensile
-         EgtSetCalcTool(sTool, sHead, nExit)
-
+         ' Ricavo dati lama corrente
+         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
+         ' Imposto la lama corrente
+         If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
       End If
 
       ' Se il secondo punto non coincide con il primo, disegno il taglio
@@ -540,7 +524,6 @@ Public Class MultipleCut
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
-      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -581,7 +564,7 @@ Public Class MultipleCut
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreateMultipleCut() As Boolean

DirectCuts/Polishing.xaml

@@ -63,16 +63,12 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-            </Grid>
+            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
+            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
+            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+         </Grid>
 
       </Grid>
 

DirectCuts/Polishing.xaml.vb

@@ -6,8 +6,6 @@ Public Class Polishing
    ' Riferimenti a pagine
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
    Private WithEvents m_CurrProjPage As CurrentProjectPageUC
-   Private m_refControlDirectCutUC As ControlsDirectCutUC1
-
    ' Flag di pagina attiva
    Private m_bActive As Boolean = False
    ' Flag di simulazione in corso
@@ -25,14 +23,13 @@ Public Class Polishing
 
    Private Sub Polishing_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' assegno messaggi
-      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
+      OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
    End Sub
 
    Private Sub Polishing_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       ' Attivo la pagina
       m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
-      m_refControlDirectCutUC = m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC1
       m_bActive = True
       ' Se rientro da simulazione
       If m_bSimul Then
@@ -63,7 +60,7 @@ Public Class Polishing
       If PolishingCmBx.SelectedIndex < 0 Then
          m_bPoliOk = False
          UpdateSimulOkBtn()
-      End If
+      End If 
       ' Rendo semitrasparente il grezzo
       Dim nRawSolidId = EgtGetFirstNameInGroup(m_CurrProjPage.m_nRawId, NAME_RAW_SOLID)
       EgtSetAlpha( nRawSolidId, 60)
@@ -75,7 +72,7 @@ Public Class Polishing
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_refControlDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC1.DirectCutPages.DirectCut
+         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
          ' Cancello eventuali lucidature
          RemovePolishings()
          ' Riattivo eventuali lavorazioni presenti
@@ -151,7 +148,6 @@ Public Class Polishing
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
-      m_refControlDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -192,7 +188,7 @@ Public Class Polishing
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_refControlDirectCutUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreatePolishing( sKitName As String) As Boolean

DirectCuts/SawTestUC.xaml

@@ -37,17 +37,12 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <ToggleButton Name="Point1Btn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
+            <ToggleButton Name="Point1Btn" Grid.Column="0"
+               Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+            <ToggleButton Name="Point2Btn" Grid.Column="1"
+               Style="{DynamicResource OmagCut_YellowToggleButton}"/>
 
-                <ToggleButton Name="Point2Btn" Grid.Column="1"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
-
-            </Grid>
+         </Grid>
 
          <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}"
             Margin="6,0,6,0">
@@ -70,7 +65,7 @@
 
          <TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="4"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0" IsLength="False"
+         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="OffsetTxBl" Grid.Column="0" Grid.Row="5"
@@ -85,16 +80,12 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-            </Grid>
+            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
+            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
+            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+         </Grid>
    
       </Grid>
 

DirectCuts/SawTestUC.xaml.vb

@@ -5,7 +5,6 @@ Public Class SawTestUC
    ' Riferimenti a pagine
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
    Private WithEvents m_CurrProjPage As CurrentProjectPageUC
-   Private m_refControlDirectCutUC As ControlsDirectCutUC1
    ' Flag di pagina attiva
    Private m_bActive As Boolean = False
    ' Flag di simulazione in corso
@@ -59,14 +58,14 @@ Public Class SawTestUC
       ' la associo alla combobox
       PointModeCmBx.ItemsSource = m_PointsModeArray
       ' assegno messaggi
-      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
+      Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
+      Point2Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
       DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13)
       LenghtTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 14)
       DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
       OffsetTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 28)
-      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
+      OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
       ' Carico i dati dell'ultimo test
       m_dDepth = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_TEST_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
       m_dLen = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_TEST_LENGTH, m_dLen, m_MainWindow.GetIniFile())
@@ -77,7 +76,6 @@ Public Class SawTestUC
    Private Sub SawTest_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       ' Attivo la pagina
       m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
-      m_refControlDirectCutUC = m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC1
       m_bActive = True
       ' Se rientro da simulazione
       If m_bSimul Then
@@ -141,7 +139,7 @@ Public Class SawTestUC
       WritePrivateProfileString( S_DIRECTCUTS, K_DC_TEST_OFFSET, DoubleToString( m_dOffset, 2), m_MainWindow.GetIniFile())
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_refControlDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC1.DirectCutPages.DirectCut1
+         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -421,7 +419,6 @@ Public Class SawTestUC
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
-      m_refControlDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -462,7 +459,7 @@ Public Class SawTestUC
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_refControlDirectCutUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreateSingleCut() As Boolean

DirectCuts/SingleCutAuto.xaml.vb

@@ -161,7 +161,7 @@ Public Class SingleCutAuto
       ShowCoord()
       ' carico la lista dei materiali lavorabili in macchina
       m_MaterialsList.Clear()
-      For Each Material As Material In m_MainWindow.m_CurrentMachine.Materials
+      For Each Material In m_MainWindow.m_CurrentMachine.Materials
          m_MaterialsList.Add(New MachiningMaterial(Material.nId, Material.sName))
       Next
       ' Carico l'elenco dei materiali presenti in macchina per l'assegnata lavorazione
@@ -363,7 +363,7 @@ Public Class SingleCutAuto
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
+         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -715,7 +715,6 @@ Public Class SingleCutAuto
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
-      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -759,7 +758,7 @@ Public Class SingleCutAuto
       ' reimposto il precedetne utensile e lavorazione
       m_MainWindow.m_CurrentMachine.sCurrSaw = m_PrecSaw
       m_MainWindow.m_CurrentMachine.sCurrSawing = m_PrecSawing
-      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreateSingleCut() As Boolean

DirectCuts/SingleCutUC.xaml

@@ -38,16 +38,11 @@
             </Grid.ColumnDefinitions>
 
             <ToggleButton Name="Point1Btn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </ToggleButton>
-
+               Style="{DynamicResource OmagCut_YellowToggleButton}"/>
             <ToggleButton Name="Point2Btn" Grid.Column="1"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </ToggleButton>
+               Style="{DynamicResource OmagCut_YellowToggleButton}"/>
 
-            </Grid>
+         </Grid>
 
          <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" Margin="6,0,6,0">
             <ComboBox.ItemTemplate>
@@ -69,12 +64,12 @@
    
          <TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="4"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0" IsLength="False"
+         <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
    
          <TextBlock Name="SideAngleTxBl" Grid.Column="0" Grid.Row="5"
             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0" IsLength="False"
+         <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="5" Margin="0,0,6,0"
             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
          <TextBlock Name="OffsetTxBl" Grid.Column="0" Grid.Row="6"
@@ -111,14 +106,10 @@
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
-            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
+            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
+            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
             <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
             </Button>
          </Grid>
 

DirectCuts/SingleCutUC.xaml.vb

@@ -57,16 +57,16 @@ Public Class SingleCutUC
       ' la associo alla combobox
       PointModeCmBx.ItemsSource = m_PointsModeArray
       ' Assegno messaggi
-      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
+      Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
+      Point2Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
       DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13)
       LenghtTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 14)
       DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
       SideAngleTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 16)
       OffsetTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 28)
       SawThChBl.Text = EgtMsg(90232)   ' Spessore lama
-      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
+      OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
       ' Carico i dati dell'ultimo taglio
       m_dDepth = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_SING_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
       m_dLen = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_SING_LENGTH, m_dLen, m_MainWindow.GetIniFile())
@@ -137,9 +137,6 @@ Public Class SingleCutUC
       Point2Btn.IsEnabled = False
       ' Deseleziono bottone primo punto
       Point1Btn.IsChecked = False
-
-      ' la visualizzazione dei comandi è gestira dalla DirectCutPageUC richiamando la funzione ReloadParam
-
       ' Aggiorno visualizzazione
       EgtDraw()
    End Sub
@@ -157,7 +154,7 @@ Public Class SingleCutUC
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
+         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -175,12 +172,6 @@ Public Class SingleCutUC
       m_bActive = False
    End Sub
 
-   Public Sub SetEnableParam(ByVal bIsSaw As Boolean)
-      ' se macchina solo WaterJet Disabilito/Nascondo parametri della lama
-      DepthTxBx.IsEnabled = bIsSaw
-      SawThChBx.IsEnabled = bIsSaw
-   End Sub
-
    Private Sub UpdateSimulOkBtn()
       If m_bCutOk Then
          SimulBtn.IsEnabled = True
@@ -238,12 +229,6 @@ Public Class SingleCutUC
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
-      ' Recupero dati utensile e testa corrente
-      Dim sTool As String = ""
-      Dim sHead As String = ""
-      Dim nExit As Integer = 0
-      EgtGetCalcTool(sTool, sHead, nExit)
-
       ' Se acquisizione lama o laser
       If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
          ' Recupero la posizione macchina
@@ -257,12 +242,12 @@ Public Class SingleCutUC
             If Not EgtSetCalcTool("", "H3", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
-            ' Reimposto eventuale precedente utensile
-            EgtSetCalcTool(sTool, sHead, nExit)
-            ' Altrimenti da lama
+            ' Ora imposto la lama corrente
+            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+         ' Altrimenti da lama
          Else
-            ' Reimposto eventuale precedente utensile
-            EgtSetCalcTool(sTool, sHead, nExit)
+            ' Imposto la lama corrente
+            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
          End If
@@ -286,9 +271,10 @@ Public Class SingleCutUC
          ' Porto il tip nell'origine tavola
          m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP1Ok = True
-         ' Reimposto eventuale precedente utensile
-         EgtSetCalcTool(sTool, sHead, nExit)
-
+         ' Ricavo dati lama corrente
+         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
+         ' Imposto la lama corrente
+         If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
       End If
 
       ' Disegno il taglio
@@ -317,12 +303,6 @@ Public Class SingleCutUC
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
-      ' Recupero dati utensile e testa corrente
-      Dim sTool As String = ""
-      Dim sHead As String = ""
-      Dim nExit As Integer = 0
-      EgtGetCalcTool(sTool, sHead, nExit)
-
       ' Se acquisizone lama o laser
       If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
          ' Recupero la posizione macchina
@@ -336,14 +316,12 @@ Public Class SingleCutUC
             If Not EgtSetCalcTool("", "H3", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
-            ' Reimposto eventuale precedente utensile
-            EgtSetCalcTool(sTool, sHead, nExit)
-
-            ' Altrimenti da lama
+            ' Ora imposto la lama corrente
+            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+         ' Altrimenti da lama
          Else
-            ' Reimposto eventuale precedente utensile
-            EgtSetCalcTool(sTool, sHead, nExit)
-
+            ' Imposto la lama corrente
+            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
          End If
@@ -365,8 +343,10 @@ Public Class SingleCutUC
          ' Porto il tip nell'origine tavola
          m_ptTipP2.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP2Ok = True
-         ' Reimposto eventuale precedente utensile
-         EgtSetCalcTool(sTool, sHead, nExit)
+         ' Ricavo dati lama corrente
+         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
+         ' Imposto la lama corrente
+         If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
       End If
 
       ' Se il secondo punto non coincide con il primo, disegno il taglio
@@ -524,7 +504,6 @@ Public Class SingleCutUC
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
-      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -565,7 +544,7 @@ Public Class SingleCutUC
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreateSingleCut() As Boolean
@@ -580,13 +559,9 @@ Public Class SingleCutUC
       Dim dRawHeight As Double = m_ptRawMax.z - m_ptRawMin.z
       ' Recupero spessore lama corrente
       Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
-      Dim sSawing As String = m_MainWindow.m_CurrentMachine.sCurrSawing
       EgtTdbSetCurrTool(sSaw)
       Dim dThick As Double = 0
-      ' se è impostata una lavorazione di lama
-      If Not String.IsNullOrEmpty(sSawing) Then
-         EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
-      End If
+      EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
       ' Rimuovo eventuale vecchio pezzo per taglio diretto
       EraseDirectCutPart()
       ' Disattivo eventuali lavorazioni presenti

DirectCuts/SingleDrillUC.xaml

@@ -1,97 +0,0 @@
-<UserControl x:Class="SingleDrillUC"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   mc:Ignorable="d" 
-   d:DesignHeight="597.3" d:DesignWidth="256">
-
-    <!--<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{DynamicResource OmagCut_LightGray}">-->
-    <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">
-
-        <!-- Definizione della Grid SingleCut -->
-        <Grid Name="SingleCutGrid" >
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="2*"/>
-                <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <Grid Grid.Row="0" Grid.ColumnSpan="2">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-
-                <ToggleButton Name="Point1Btn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-PImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
-
-
-            </Grid>
-
-            <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" Margin="6,0,6,0">
-                <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>
-
- 
-
-            <Grid Grid.Row="9" Grid.ColumnSpan="2">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-                <TextBlock Name="XcoordTxBl" Grid.Column="0" Text="X"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                <EgtWPFLib:EgtTextBox Name="XcoordTxBx" Grid.Column="1" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                <TextBlock Name="YcoordTxBl" Grid.Column="2" Text="Y"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-                <EgtWPFLib:EgtTextBox Name="YcoordTxBx" Grid.Column="3" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-            </Grid>
-
-            <Grid Grid.Row="11" Grid.ColumnSpan="2">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-
-                <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-            </Grid>
-
-        </Grid>
-
-    </Border>
-
-</UserControl>

DirectCuts/SingleDrillUC.xaml.vb

@@ -1,496 +0,0 @@
-Imports EgtUILib
-Imports System.Collections.ObjectModel
-Public Class SingleDrillUC
-   ' Riferimenti a pagine
-   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
-   Private WithEvents m_CurrProjPage As CurrentProjectPageUC
-   ' Flag di pagina attiva
-   Private m_bActive As Boolean = False
-   ' Flag di simulazione in corso
-   Private m_bSimul As Boolean = False
-
-   ' riferimento alla macchina corrente
-   Private m_CurrentMachine As CurrentMachine
-
-   ' --------------------- VARIABILI PRESENTI NEL TAGLIO SINGOLO ---------------------
-   ' Origine tavola e dati grezzo
-   Private m_bRawOk As Boolean = False
-   Private m_ptTabOri As Point3d
-   Private m_ptRawMin As Point3d
-   Private m_ptRawMax As Point3d
-   ' Parametri P1 acquisito
-   Private m_bPointP1Ok As Boolean = False
-   Private m_ptTipP1 As Point3d
-   Private m_vtToolP1 As Vector3d
-   ' Parametri P2 acquisito
-   Private m_bPointP2Ok As Boolean = False
-   Private m_ptTipP2 As Point3d
-   Private m_vtToolP2 As Vector3d
-   ' Parametri della lavorazione
-   Private m_bCutOk As Boolean = False
-
-   ' Array delle modalità di acquisizione dei punti
-   Private m_PointsModeArray(2) As String
-   ' Punto selezionato nel disegno
-   Private m_ptPrev As Point3d
-   ' Layer per crocette temporanee
-   Private m_nTempLay As Integer = GDB_ID.NULL
-
-   Private m_dDiameter As Double = 0
-
-   Private m_sCurrDrill As String = String.Empty
-
-   ' Costanti
-   Private Const MAX_TAB_DEPTH As Double = 10.0
-   Private Const MIN_CUT_LEN As Double = 10.0
-   Private Const MAX_SIDE_ANG As Double = 60.0
-   ' Costanti che indicano la modalità di acquisizione dei punti
-   Private Enum PT_MODE As Integer
-      DRILL = 0
-      LASER = 1
-      DRAW = 2
-   End Enum
-
-   Private Sub SingleCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
-
-      ' Variabile che accorcia il riferimento alla macchina corrente
-      m_CurrentMachine = m_MainWindow.m_CurrentMachine
-
-      ' Creo lista modalità di acquisizione punto 
-      m_PointsModeArray(PT_MODE.DRILL) = EgtMsg(90752)
-      m_PointsModeArray(PT_MODE.LASER) = EgtMsg(MSG_DIRECTCUTPAGEUC + 12)
-      m_PointsModeArray(PT_MODE.DRAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 25)
-      ' la associo alla combobox
-      PointModeCmBx.ItemsSource = m_PointsModeArray
-
-      ' Assegno messaggi
-      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
-   End Sub
-
-   Private Sub SingleDrill_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
-      m_sCurrDrill = m_CurrentMachine.sCurrDrill
-      GetDrillFromDrilling(m_sCurrDrill, m_CurrentMachine.sCurrDrilling)
-
-      ' recupero informazioni del foretto usato
-      EgtTdbSetCurrTool(m_sCurrDrill)
-      EgtTdbGetCurrToolParam(MCH_TP.DIAM, m_dDiameter)
-
-      ' Attivo la pagina
-      m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
-      m_bActive = True
-      ' Se rientro da simulazione
-      If m_bSimul Then
-         m_bSimul = False
-         ' Disabilito registrazione progetto modificato
-         EgtDisableModified()
-         ' Aggiorno visualizzazione
-         SetMachineInCurrPos()
-         m_MainWindow.m_DirectCutPageUC.m_bShowMachine = True
-         EgtSetMachineLook(m_MainWindow.m_DirectCutPageUC.m_nMachLook)
-         EgtDraw()
-         Return
-      End If
-      ' Disabilito registrazione progetto modificato
-      EgtDisableModified()
-      ' Creo layer temporaneo per crocette
-      m_nTempLay = EgtCreateGroup(GDB_ID.ROOT)
-      EgtSetLevel(m_nTempLay, GDB_LV.TEMP)
-      ' Origine tavola
-      m_bRawOk = True
-      If Not EgtGetTableRef(1, m_ptTabOri) Then
-         m_bRawOk = False
-         EgtOutLog("Error on TableRef1")
-      End If
-      ' Dati del grezzo
-      If Not GetRawBox(m_ptRawMin, m_ptRawMax) Then
-         m_bRawOk = False
-         EgtOutLog("Error on RawBox")
-      End If
-      ' Reset punto acquisito
-      m_bPointP1Ok = False
-      m_bPointP2Ok = False
-      ' Inizializzo primo punto acquisito dal disegno
-      m_ptPrev = m_ptTipP1 + (m_ptTabOri - Point3d.ORIG())
-      m_ptPrev.z = m_ptRawMax.z
-      ' Disegno crocetta che indica il punto acquisito
-      CreateCross(m_nTempLay, m_ptPrev)
-      ' Imposto modalità di acquisizione punti
-      PointModeCmBx.SelectedIndex = PT_MODE.DRAW
-      SetCoordVisibility(True)
-      ShowCoord()
-      ' Reset taglio e disabilito bottone esecuzione
-      m_bCutOk = False
-      UpdateSimulOkBtn()
-      ' Deseleziono bottone primo punto
-      Point1Btn.IsChecked = False
-      ' Aggiorno visualizzazione
-      EgtDraw()
-   End Sub
-
-   ' esco dalla pagina di foro diretto
-   Friend Sub SingleCut_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
-      WritePrivateProfileString(S_DIRECTCUTS, K_DC_SING_POSX, DoubleToString(m_ptTipP1.x, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_DIRECTCUTS, K_DC_SING_POSY, DoubleToString(m_ptTipP1.y, 2), m_MainWindow.GetIniFile())
-      ' Se non vado in simulazione
-      If Not m_bSimul Then
-         ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
-         ' Rimuovo layer temporaneo per crocette
-         EgtErase(m_nTempLay)
-         ' Rimuovo eventuale pezzo per taglio diretto
-         EraseDirectCutPart()
-         ' Riattivo eventuali lavorazioni presenti
-         ActivateAllMachinings()
-         ' Abilito registrazione progetto modificato
-         EgtEnableModified()
-         ' Nascondo la macchina
-         m_MainWindow.m_DirectCutPageUC.m_bShowMachine = False
-         EgtSetMachineLook(MCH_LOOK.TAB)
-         EgtDraw()
-      End If
-      ' Dichiaro pagina non attiva
-      m_bActive = False
-   End Sub
-
-   Private Sub UpdateSimulOkBtn()
-      If m_bCutOk Then
-         SimulBtn.IsEnabled = True
-         SimulBtn.Foreground = Brushes.Black
-         OkBtn.IsEnabled = True
-         OkBtn.Foreground = Brushes.Black
-      Else
-         SimulBtn.IsEnabled = False
-         SimulBtn.Foreground = Brushes.DarkGray
-         OkBtn.IsEnabled = False
-         OkBtn.Foreground = Brushes.DarkGray
-      End If
-   End Sub
-
-   Private Sub OnMyMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseDownScene
-      ' deselezione il bottone per acquisizione
-      Point1Btn.IsChecked = False
-      ' Verifico di essere il gestore attivo
-      If Not m_bActive Then Return
-      ' Si può selezionare solo con il tasto sinistro e se stato NULL
-      If e.Button <> Windows.Forms.MouseButtons.Left Or
-         Not m_CurrProjPage.CurrentProjectScene.IsStatusNull() Then
-         Return
-      End If
-      ' Rimuovo eventuali crocette create acquisendo i punti nel disegno
-      EgtEmptyGroup(m_nTempLay)
-      ' Acquisisco punto da disegno
-      EgtUnProjectPoint(e.Location, m_ptPrev)
-      ' Aggiusto Z punto acquisito (è in globale)
-      Dim dPtPrevZ As Double = m_ptPrev.z
-      m_ptPrev.z = m_ptRawMax.z
-      ' Se direzione di vista calcolabile e da sopra posso aggiustare anche XY
-      Dim dAngVertDeg, dAngHorizDeg As Double
-      If EgtGetGenericView(dAngVertDeg, dAngHorizDeg) Then
-         Dim vtDir As Vector3d = Vector3d.FromSpherical(1, dAngVertDeg, dAngHorizDeg)
-         If vtDir.z > EPS_SMALL Then
-            m_ptPrev.z = dPtPrevZ
-            m_ptPrev += vtDir * (m_ptRawMax.z - m_ptPrev.z) / vtDir.z
-         End If
-      End If
-      ' Visualizzo coordinate (rispetto a 0 tavola)
-      ShowCoord()
-      ' Disegno crocetta che indica il punto acquisito
-      CreateCross(m_nTempLay, m_ptPrev)
-      EgtDraw()
-   End Sub
-
-   Private Sub PointModeCmBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles PointModeCmBx.SelectionChanged
-      SetCoordVisibility(PointModeCmBx.SelectedIndex = PT_MODE.DRAW)
-   End Sub
-
-   Private Sub Point1Btn_Click(sender As Object, e As RoutedEventArgs) Handles Point1Btn.Click
-      ' Rimuovo eventuali crocette create acquisendo i punti nel disegno
-      EgtEmptyGroup(m_nTempLay)
-      ' Reset punto non acquisito
-      m_bPointP1Ok = False
-      ' Verifico configurazione tavola e grezzo
-      If Not m_bRawOk Then Return
-
-      ' Se acquisizione lama o laser
-      If PointModeCmBx.SelectedIndex = PT_MODE.DRILL Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
-
-         ' Recupero la posizione macchina
-         Dim dL1, dL2, dL3, dR1, dR2 As Double
-         If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then Return
-
-         ' Ricavo dati Foretto corrente
-         Dim sDrill As String = m_sCurrDrill
-         ' Se punto da laser
-         If PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
-            ' Imposto come testa corrente il laser (senza utensile ovviamente)
-            If Not EgtSetCalcTool("", "H3", 1) Then Return
-            ' Trasformo in posizione punta utensile in basso
-            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
-            ' Ora imposto la lama corrente
-            If Not EgtSetCalcTool(sDrill, "H1", 2) Then Return
-            ' Altrimenti da lama
-         Else
-            ' Imposto la lama corrente
-            If Not EgtSetCalcTool(sDrill, "H1", 2) Then Return
-            ' Trasformo in posizione punta utensile in basso
-            If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
-         End If
-         ' Calcolo direzione asse lama
-         If Not EgtGetCalcToolDirFromAngles(dR1, dR2, m_vtToolP1) Then Return
-         ' Porto il tip nell'origine tavola
-         m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
-         m_bPointP1Ok = True
-
-         ' Altrimenti punto da click di mouse
-      Else
-         ' Assegno punto selezionato nel disegno a m_ptTipP1
-         m_ptTipP1 = m_ptPrev
-         ' Porto il tip nell'origine tavola
-         m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
-         m_bPointP1Ok = True
-         ' Ricavo dati lama corrente
-         Dim sDrill As String = m_sCurrDrill
-         ' Imposto la lama corrente
-         If Not EgtSetCalcTool(sDrill, "H1", 1) Then Return
-      End If
-
-      ' Disegno il taglio
-      CreateSingleDrill()
-      ' Disegno la macchina nella sua posizione reale
-      SetMachineInCurrPos()
-      m_MainWindow.m_DirectCutPageUC.m_bShowMachine = True
-      EgtSetMachineLook(m_MainWindow.m_DirectCutPageUC.m_nMachLook)
-      EgtDraw()
-      ' Seleziono il bottone per indicare che il primo punto è stato acquisito
-      Point1Btn.IsChecked = True
-   End Sub
-
-   'Private Sub GetDrillFromDrilling(ByRef sCurrDrill As String)
-   '   If String.IsNullOrEmpty(sCurrDrill) Or String.IsNullOrWhiteSpace(sCurrDrill) Then
-   '      ' creo l'elenco degli utensili di foratura
-   '      Dim sToolName As String = String.Empty
-   '      Dim nType As Integer = MCH_TY.NONE
-   '      Dim DrillToolList As New ObservableCollection(Of String)
-   '      DrillToolList.Clear()
-   '      If EgtTdbGetFirstTool(MCH_TF.DRILLBIT, sToolName, nType) Then
-   '         DrillToolList.Add(sToolName)
-   '         While EgtTdbGetNextTool(MCH_TF.DRILLBIT, sToolName, nType)
-   '            DrillToolList.Add(sToolName)
-   '         End While
-   '      End If
-   '      ' recupero l'utensile associato alla lavorazione
-   '      Dim sCurrDrilling As String = m_MainWindow.m_CurrentMachine.sCurrDrilling
-   '      Dim ToolString As String = String.Empty
-   '      EgtMdbSetCurrMachining(sCurrDrilling)
-   '      ' Recupero nome utensile tramite TUUID
-   '      Dim sTuuid As String = String.Empty
-   '      EgtMdbGetCurrMachiningParam(MCH_MP.TUUID, sTuuid)
-   '      EgtTdbGetToolFromUUID(sTuuid, ToolString)
-   '      Dim bToolExist As Boolean = False
-   '      For Each CurrTool As IEnumerable In DrillToolList
-   '         If CurrTool.ToString() = ToolString Then
-   '            bToolExist = True
-   '            Exit For
-   '         End If
-   '      Next
-   '      If bToolExist Then
-   '         sCurrDrill = ToolString
-   '      Else
-   '         sCurrDrill = String.Empty
-   '      End If
-   '   End If
-   'End Sub
-
-   Private Sub XcoordTxBx_EgtClosed(sender As Object, e As EventArgs) Handles XcoordTxBx.EgtClosed
-      ' Recupero il valore della coordinata (in 0 Tab)
-      Dim dXcoord As Double = 0
-      StringToLen(XcoordTxBx.Text, dXcoord)
-      XcoordTxBx.Text = LenToString(dXcoord, 2)
-      ' lo assegno al punto corrente (in 0 Macc)
-      m_ptPrev.x = dXcoord + m_ptTabOri.x
-      ' Rimuovo eventuali crocette create acquisendo i punti nel disegno
-      EgtEmptyGroup(m_nTempLay)
-      ' Disegno crocetta che indica il punto acquisito
-      CreateCross(m_nTempLay, m_ptPrev)
-      EgtDraw()
-   End Sub
-
-   Private Sub YcoordTxBx_EgtClosed(sender As Object, e As EventArgs) Handles YcoordTxBx.EgtClosed
-      ' Recupero il valore della coordinata (in 0 Tab)
-      Dim dYcoord As Double = 0
-      StringToLen(YcoordTxBx.Text, dYcoord)
-      YcoordTxBx.Text = LenToString(dYcoord, 2)
-      ' lo assegno al punto corrente (in 0 Macc)
-      m_ptPrev.y = dYcoord + m_ptTabOri.y
-      ' Rimuovo eventuali crocette create acquisendo i punti nel disegno
-      EgtEmptyGroup(m_nTempLay)
-      ' Disegno crocetta che indica il punto acquisito
-      CreateCross(m_nTempLay, m_ptPrev)
-      EgtDraw()
-   End Sub
-
-   Private Sub SimulBtn_Click(sender As Object, e As RoutedEventArgs) Handles SimulBtn.Click
-      ' Verifico ci sia un taglio valido
-      If Not m_bCutOk Then Return
-      ' Salvo il progetto con le lavorazioni
-      EgtSetCurrentContext(m_CurrProjPage.CurrentProjectScene.GetCtx())
-      Dim sMchPath As String = m_MainWindow.GetTempDir() & "\" & "DirectProj.nge"
-      m_MainWindow.m_CurrentProjectPageUC.SaveFile(sMchPath, False)
-      ' Predispongo passaggio a simulazione
-      m_bSimul = True
-      m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
-      m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
-      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
-      m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
-      m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
-      m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
-      m_MainWindow.m_ActivePage = MainWindow.Pages.Simulation
-   End Sub
-
-   Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
-#If TRIAL Then
-      m_CurrProjPage.SetWarningMessage( "Trial Version")
-#Else
-      ' Verifico non sia versione Ufficio
-      If m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.OFFICE_TYPE) Then
-         m_CurrProjPage.SetWarningMessage("Office Version")
-         Return
-      End If
-      ' Verifico ci sia un taglio valido
-      If Not m_bCutOk Then Return
-      ' Salvo il progetto con le lavorazioni
-      Dim sMchPath As String = m_MainWindow.GetTempDir() & "\" & "DirectProj.nge"
-      m_MainWindow.m_CurrentProjectPageUC.SaveFile(sMchPath, False)
-      ' Genero file CNC (lancio anche se errore in precedenza)
-      Dim sCncPath As String = m_MainWindow.GetCncDir() & "\DirectCut" & m_MainWindow.m_CurrentMachine.sIsoFileExt
-      Dim bOk As Boolean = EgtGenerate(sCncPath, "OmagCut ver." & m_MainWindow.GetVersion())
-      ' Se errore in generazione, segnalo l'errore ed esco
-      If Not bOk Then
-         m_CurrProjPage.SetErrorMessage(EgtMsg(90314))       'Errore nella generazione del programma CN
-         Return
-      End If
-      ' Download programma (eventuali errori sono segnalati dalla funzione)
-      If m_MainWindow.m_CNCommunication.SendProgram(sCncPath, 900) Then
-         ' copio il progetto corrente come progetto in lavorazione
-         Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
-         My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
-         ' lancio eventuale lua post-trasmissione
-         m_MainWindow.ExecSentProgScript(True)
-      End If
-#End If
-   End Sub
-
-   Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
-   End Sub
-
-   Private Function CreateSingleDrill() As Boolean
-      ' Verifico sia definito il punto iniziale e il grezzo
-      If Not m_bPointP1Ok Or Not m_bRawOk Then
-         m_bCutOk = False
-         Return False
-      End If
-      ' Rimuovo eventuali crocette create acquisendo i punti nel disegno
-      EgtEmptyGroup(m_nTempLay)
-      ' Spessore grezzo
-      Dim dRawHeight As Double = m_ptRawMax.z - m_ptRawMin.z
-      ' Recupero spessore lama corrente
-      Dim sDrill As String = m_sCurrDrill
-      GetDrillFromDrilling(sDrill, m_MainWindow.m_CurrentMachine.sCurrDrilling)
-      EgtTdbSetCurrTool(sDrill)
-      Dim dDiam As Double = 0
-      EgtTdbGetCurrToolParam(MCH_TP.DIAM, dDiam)
-      ' Rimuovo eventuale vecchio pezzo per taglio diretto
-      EraseDirectCutPart()
-      ' Disattivo eventuali lavorazioni presenti
-      DeactivateAllMachinings()
-
-      ' Creo nuovo pezzo per il taglio diretto
-      Dim nPartId = CreateDirectCutPart()
-      Dim nLayerId = EgtCreateGroup(nPartId)
-      EgtSetName(nLayerId, NAME_INLOOP)
-      ' Creo il Drill
-      Dim ptStart As Point3d = m_ptTipP1
-      ptStart.z = 0
-
-      ' Creo layer per crocetta di riferimento
-      Dim nCrossLayerId = EgtCreateGroup(nPartId)
-      ' Aggiungo crocetta/e
-      If m_bPointP1Ok Then
-         CreateCross(nCrossLayerId, ptStart)
-      End If
-
-      Dim nCutId = EgtCreateCircle(nLayerId, ptStart, m_dDiameter / 2)
-
-      ' Calcolo punto di inserimento nel grezzo
-      Dim ptMin, ptMax As Point3d
-      EgtGetBBoxGlob(nPartId, GDB_BB.STANDARD, ptMin, ptMax)
-      Dim ptIns As Point3d = ptMin + (m_ptTabOri - m_ptRawMin)
-      ptIns.z = dRawHeight
-      ' Inserisco il pezzo nel grezzo
-      EgtAddPartToRawPart(nPartId, ptIns, m_MainWindow.m_CurrentProjectPageUC.m_nRawId)
-      ' Inserisco la lavorazione
-      m_bCutOk = AddMachinings(nPartId) AndAlso UpdateAllMachiningsToolpaths()
-      EgtSetCurrPhase(1)
-      ' Eventuale eliminazione Home finale
-      If Not m_MainWindow.m_CurrentMachine.bDirectCutsFinalHome Then
-         RemoveFinalHome()
-      End If
-      UpdateSimulOkBtn()
-      Return m_bCutOk
-   End Function
-
-   ' crea una croce nel punto indicato e rappresenta il diametro dell'utensile corrente
-   Private Function CreateCross(nLayerId As Integer, ptP As Point3d) As Boolean
-      ' Aggiungo crocette
-      ptP += New Vector3d(0, 0, 0.15)
-      Dim vtCrossX As New Vector3d(20, 0, 0)
-      Dim vtCrossY As New Vector3d(0, 20, 0)
-      Dim nCrossId1 = EgtCreateLine(nLayerId, ptP + (-vtCrossX), ptP + vtCrossX)
-      EgtSetColor(nCrossId1, New Color3d(255, 0, 0))
-      Dim nCrossId2 = EgtCreateLine(nLayerId, ptP + (-vtCrossY), ptP + vtCrossY)
-      EgtSetColor(nCrossId2, New Color3d(255, 0, 0))
-      Dim nPntId = EgtCreateGeoPoint(nLayerId, ptP)
-      EgtSetColor(nPntId, New Color3d(255, 0, 0))
-      Dim nCirleId = EgtCreateCircle(nLayerId, ptP, m_dDiameter / 2)
-      EgtSetColor(nCirleId, New Color3d(0, 255, 0))
-      Return True
-   End Function
-
-   Private Sub SetCoordVisibility(bShow As Boolean)
-      XcoordTxBl.Visibility = If(bShow, Windows.Visibility.Visible, Windows.Visibility.Hidden)
-      XcoordTxBx.Visibility = If(bShow, Windows.Visibility.Visible, Windows.Visibility.Hidden)
-      YcoordTxBl.Visibility = If(bShow, Windows.Visibility.Visible, Windows.Visibility.Hidden)
-      YcoordTxBx.Visibility = If(bShow, Windows.Visibility.Visible, Windows.Visibility.Hidden)
-   End Sub
-
-   Private Sub ShowCoord()
-      Dim ptText As Point3d = m_ptPrev
-      ptText.ToLoc(New Frame3d(m_ptTabOri))
-      XcoordTxBx.Text = LenToString(ptText.x, 2)
-      YcoordTxBx.Text = LenToString(ptText.y, 2)
-   End Sub
-
-   Private Function SetMachineInCurrPos() As Boolean
-      ' Recupero la posizione macchina
-      Dim dL1, dL2, dL3, dR1, dR2 As Double
-      If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then Return False
-      ' Recupero il nome degli assi macchina
-      Dim sL1 As String = String.Empty
-      Dim sL2 As String = String.Empty
-      Dim sL3 As String = String.Empty
-      Dim sR1 As String = String.Empty
-      Dim sR2 As String = String.Empty
-      If Not m_MainWindow.m_CNCommunication.GetAxesNames(sL1, sL2, sL3, sR1, sR2) Then Return False
-      ' Visualizzo macchina in posizione
-      EgtSetAxisPos(sL1, dL1)
-      EgtSetAxisPos(sL2, dL2)
-      EgtSetAxisPos(sL3, dL3)
-      EgtSetAxisPos(sR1, dR1)
-      EgtSetAxisPos(sR2, dR2)
-      Return True
-   End Function
-
-End Class

DirectCuts/SquaringUC.xaml

@@ -1,162 +0,0 @@
-<UserControl x:Class="SquaringUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   mc:Ignorable="d" 
-   d:DesignHeight="597.3" d:DesignWidth="256">
-
-   <!--<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{StaticResource OmagCut_LightGray}">-->
-   <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">
-
-      <!-- Definizione della Grid MultipleCut -->
-      <Grid Name="SingleCutGrid" >
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="2*"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="2*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
-
-         <!--<Grid Grid.Row="0" Grid.ColumnSpan="2">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-
-                <ToggleButton Name="Point1Btn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
-
-                <ToggleButton Name="Point2Btn" Grid.Column="1"
-               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
-            </Grid>-->
-
-         <!--<ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}"
-            Margin="6,0,6,0">
-                <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>-->
-
-         <!--<TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="2"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
-
-         <TextBlock Name="OffsetTxBl" Grid.Column="0" Grid.Row="3"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="OffsetTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-
-         <TextBlock Name="ExtraLenTxBl" Grid.Column="0" Grid.Row="4"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="ExtraLenTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-
-         <!--<TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="3"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-
-            <TextBlock Name="SideAngleTxBl" Grid.Column="0" Grid.Row="4"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
-
-         <!--<Grid Grid.Row="5" Grid.ColumnSpan="2">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1.5*"/>
-                    <ColumnDefinition Width="2"/>
-                    <ColumnDefinition Width="1.5*"/>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                </Grid.RowDefinitions>
-
-                <Border Grid.Column="1" Grid.Row="0" Grid.RowSpan="4" Background="Black" />
-
-                <TextBlock Name="NumPzXTxBl" Grid.Column="0" Grid.Row="0"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-                <TextBlock Name="DimPzXTxBl" Grid.Column="2" Grid.Row="0"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-
-                <EgtWPFLib:EgtTextBox Name="NumPzXTxBx" Grid.Column="0" Grid.Row="1" Width="75"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                <EgtWPFLib:EgtTextBox Name="DimPzXTxBx" Grid.Column="2" Grid.Row="1" Width="75"
-            Style="{StaticResource OmagCut_CalculatorTextBox}" />
-
-                <TextBlock Name="NumPzYTxBl" Grid.Column="0" Grid.Row="2"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-                <TextBlock Name="DimPzYTxBl" Grid.Column="2" Grid.Row="2"
-            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-
-                <EgtWPFLib:EgtTextBox Name="NumPzYTxBx" Grid.Column="0" Grid.Row="3" Width="75"
-            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                <EgtWPFLib:EgtTextBox Name="DimPzYTxBx" Grid.Column="2" Grid.Row="3" Width="75"
-            Style="{StaticResource OmagCut_CalculatorTextBox}" />
-
-            </Grid>
-
-            <TextBlock Name="SideTxBl" Grid.Row="6" Grid.ColumnSpan="2"
-             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
-            <CheckBox Name="SideChBx" Grid.Row="6" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
-             HorizontalAlignment="Right" Margin="0,0,6,0"/>-->
-
-         <Grid Grid.Row="7" Grid.ColumnSpan="2">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="0.5*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="0.5*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <TextBlock Name="XcoordTxBl" Grid.Column="0" Text="X"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-            <EgtWPFLib:EgtTextBox Name="XcoordTxBx" Grid.Column="1" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-            <TextBlock Name="YcoordTxBl" Grid.Column="2" Text="Y"
-               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
-            <EgtWPFLib:EgtTextBox Name="YcoordTxBx" Grid.Column="3" Margin="0,0,6,0"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-         </Grid>
-
-         <Grid Grid.Row="11" Grid.ColumnSpan="2">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-
-            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
-            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
-            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
-         </Grid>
-
-      </Grid>
-
-   </Border>
-</UserControl>

DirectCuts/SquaringUC.xaml.vb

@@ -1,442 +0,0 @@
-Imports EgtUILib
-
-Public Class SquaringUC
-
-   ' Riferimenti a pagine
-   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
-   Private WithEvents m_CurrProjPage As CurrentProjectPageUC
-   ' Flag di pagina attiva
-   Private m_bActive As Boolean = False
-   ' Flag di simulazione in corso
-   Private m_bSimul As Boolean = False
-
-   ' Origine tavola e dati grezzo
-   Private m_bRawOk As Boolean = False
-   Private m_ptTabOri As Point3d
-   Private m_ptRawMin As Point3d
-   Private m_ptRawMax As Point3d
-   ' Parametri P1 acquisito
-   Private m_ptTipP1 As Point3d
-   Private m_vtToolP1 As Vector3d
-   ' Parametri P2 acquisito
-   Private m_ptTipP2 As Point3d
-   Private m_vtToolP2 As Vector3d
-   ' Parametri della lavorazione
-   Private m_bCutOk As Boolean = False
-   Private m_dDepth As Double = 0
-   Private m_dOffsetSquaring As Double = 150
-   Private m_dExtraLength As Double = 0
-   Private m_dAngO As Double = 180
-   Private m_dAngV As Double = 0
-   Private m_nNumX As Integer = 0
-   Private m_dDimX As Double = 0
-   Private m_nNumY As Integer = 0
-   Private m_dDimY As Double = 0
-   Private m_bHeadSide As Boolean = False
-
-   ' Punto selezionato nel disegno
-   Private m_ptPrev As Point3d
-   ' Layer per crocette temporanee
-   Private m_nTempLay As Integer = GDB_ID.NULL
-
-   ' Costanti
-   Private Const MAX_TAB_DEPTH As Double = 10.0
-   Private Const MIN_CUT_LEN As Double = 10.0
-   Private Const MAX_SIDE_ANG As Double = 60.0
-
-   'Costante che indica il lato in cui posizionare i tagli
-   Private Enum CutSide As Integer
-      Left
-      Right
-   End Enum
-
-   Private Sub GridCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
-      OffsetTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 28)
-      ' 90260=Extra length
-      ExtraLenTxBl.Text = EgtMsg(90260)
-      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
-
-      ' Carico i dati dell'ultimo taglio
-      m_dOffsetSquaring = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_OFFSET_SQUARING, m_dOffsetSquaring, m_MainWindow.GetIniFile())
-      m_dExtraLength = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_EXTRA_LEN_SQUARING, m_dExtraLength, m_MainWindow.GetIniFile())
-      m_dDepth = 0
-      m_dAngO = 90
-      m_dAngV = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_ANGV, m_dAngV, m_MainWindow.GetIniFile())
-      m_nNumX = 1
-      m_dDimX = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_DIMX, m_dDimX, m_MainWindow.GetIniFile())
-      m_nNumY = 1
-      m_dDimY = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_DIMY, m_dDimY, m_MainWindow.GetIniFile())
-      m_bHeadSide = False
-   End Sub
-
-   Private Sub Squaring_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
-      ' Attivo la pagina
-      m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
-      m_bActive = True
-      ' Se rientro da simulazione
-      If m_bSimul Then
-         m_bSimul = False
-         ' Disabilito registrazione progetto modificato
-         EgtDisableModified()
-         m_MainWindow.m_DirectCutPageUC.m_bShowMachine = False
-         EgtSetMachineLook(MCH_LOOK.TAB)
-         EgtDraw()
-         Return
-      End If
-      ' Disabilito registrazione progetto modificato
-      EgtDisableModified()
-      ' Creo layer temporaneo per crocette
-      m_nTempLay = EgtCreateGroup(GDB_ID.ROOT)
-      EgtSetLevel(m_nTempLay, GDB_LV.TEMP)
-      ' Origine tavola
-      m_bRawOk = True
-      If Not EgtGetTableRef(1, m_ptTabOri) Then
-         m_bRawOk = False
-         EgtOutLog("Error on TableRef1")
-      End If
-
-      ' Dati del grezzo
-      If Not GetRawBox(m_ptRawMin, m_ptRawMax) Then
-         m_bRawOk = False
-         EgtOutLog("Error on RawBox")
-      End If
-      ' calcolo lalavorazione di squadratura
-      RefreshSquaring()
-   End Sub
-
-   Private Sub RefreshSquaring()
-      If Not m_bRawOk Then Return
-
-      Dim m_ThickSaw As Double
-      EgtTdbGetCurrToolParam(MCH_TP.THICK, m_ThickSaw)
-
-      m_dDepth = CamAuto.GetRawHeight()
-      m_dDimX = Math.Abs(m_ptRawMax.x - m_ptRawMin.x) - 2 * (m_dOffsetSquaring)
-      m_dDimY = Math.Abs(m_ptRawMax.y - m_ptRawMin.y) - 2 * (m_dOffsetSquaring)
-
-      Dim ptStart As New Point3d(m_ptRawMin.x + m_dOffsetSquaring - m_ThickSaw, m_ptRawMin.y + m_dOffsetSquaring, m_ptRawMin.z)
-      Dim ptEnd As New Point3d(ptStart.x + m_dDimX, ptStart.y, m_ptRawMin.z)
-
-      SetCoordVisibility(True)
-      ShowCoord()
-
-      OffsetTxBx.Text = LenToString(m_dOffsetSquaring, 1)
-      ExtraLenTxBx.Text = LenToString(m_dExtraLength, 1)
-      m_bCutOk = False
-      UpdateSimulOkBtn()
-
-      SquaringPoint(ptStart, ptEnd)
-      m_ptPrev = ptStart
-   End Sub
-
-   Friend Sub Squaring_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
-      ' Salvo i dati correnti
-      ' Salvo i dati correnti
-      WritePrivateProfileString(S_DIRECTCUTS, K_DC_OFFSET_SQUARING, DoubleToString(m_dOffsetSquaring, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_DIRECTCUTS, K_DC_EXTRA_LEN_SQUARING, DoubleToString(m_dExtraLength, 2), m_MainWindow.GetIniFile())
-      ' Se non vado in simulazione
-      If Not m_bSimul Then
-         ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
-         ' Rimuovo layer temporaneo per crocette
-         EgtErase(m_nTempLay)
-         ' Rimuovo eventuale pezzo per taglio diretto
-         EraseDirectCutPart()
-         ' Riattivo eventuali lavorazioni presenti
-         ActivateAllMachinings()
-         ' Abilito registrazione progetto modificato
-         EgtEnableModified()
-         ' Nascondo la macchina
-         m_MainWindow.m_DirectCutPageUC.m_bShowMachine = False
-         EgtSetMachineLook(MCH_LOOK.TAB)
-         EgtDraw()
-      End If
-      ' Dichiaro pagina non attiva
-      m_bActive = False
-   End Sub
-
-   Private Sub UpdateSimulOkBtn()
-      If m_bCutOk Then
-         SimulBtn.IsEnabled = True
-         SimulBtn.Foreground = Brushes.Black
-         OkBtn.IsEnabled = True
-         OkBtn.Foreground = Brushes.Black
-      Else
-         SimulBtn.IsEnabled = False
-         SimulBtn.Foreground = Brushes.DarkGray
-         OkBtn.IsEnabled = False
-         OkBtn.Foreground = Brushes.DarkGray
-      End If
-   End Sub
-
-   Private Sub SquaringPoint(ptMin As Point3d, ptMax As Point3d)
-      ' Rimuovo eventuali crocette create acquisendo i punti nel disegno
-      EgtEmptyGroup(m_nTempLay)
-      ' Verifico configurazione tavola e grezzo
-      If Not m_bRawOk Then Return
-
-      ' Recupero dati utensile e testa corrente
-      Dim sTool As String = ""
-      Dim sHead As String = ""
-      Dim nExit As Integer = 0
-      EgtGetCalcTool(sTool, sHead, nExit)
-      '------------- BOTTOM LEFT -------------------
-      ' Assegno punto selezionato nel disegno a m_ptTipP1
-      m_ptTipP1 = ptMin
-      ' Porto il tip nell'origine tavola
-      m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
-      ' Reimposto eventuale precedente utensile
-      EgtSetCalcTool(sTool, sHead, nExit)
-      '-------------  TOP RIGHT   -------------------
-      ' Assegno punto selezionato nel disegno a m_ptTipP2
-      m_ptTipP2 = ptMax
-      ' Porto il tip nell'origine tavola
-      m_ptTipP2.ToLoc(New Frame3d(m_ptTabOri))
-      ' Reimposto eventuale precedente utensile
-      EgtSetCalcTool(sTool, sHead, nExit)
-
-      ' Se il secondo punto non coincide con il primo, disegno il taglio
-      Dim vtDiff As Vector3d = m_ptTipP2 - m_ptTipP1
-      vtDiff.z = 0
-      Dim dLen As Double
-      Dim dAngVertDeg As Double
-      Dim dAngOrizzDeg As Double
-      vtDiff.ToSpherical(dLen, dAngVertDeg, dAngOrizzDeg)
-      If dLen > EPS_SMALL Then
-         m_dAngO = dAngOrizzDeg
-         CreateGridCut()
-         ' visuliazzo tavola 
-         m_MainWindow.m_DirectCutPageUC.m_bShowMachine = False
-         EgtSetMachineLook(MCH_LOOK.TAB)
-         EgtDraw()
-      End If
-   End Sub
-
-   Private Sub OffsetTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OffsetTxBx.EgtClosed
-      ' Verifico che l'offset impostato non sia superiore a quello massimo
-      Dim dMaxOffset As Double = Math.Min(m_dDimX, m_dDimY) / 2 - 15
-      Dim dOffset As Double = 0
-      StringToLen(OffsetTxBx.Text, dOffset)
-      If dOffset < 0 Then
-         dOffset = 0
-      ElseIf dOffset > dMaxOffset Then
-         dOffset = dMaxOffset
-      End If
-      m_dOffsetSquaring = dOffset
-      OffsetTxBx.Text = LenToString(m_dOffsetSquaring, 2)
-      ' Disegno il taglio
-      RefreshSquaring()
-      EgtDraw()
-   End Sub
-
-   Private Sub ExtraLength_EgtClosed(sender As Object, e As EventArgs) Handles ExtraLenTxBx.EgtClosed
-      ' Verifico che il valore indicato sia almeno maggiore dell'offset indicato
-      Dim dOffset As Double = 0
-      StringToLen(OffsetTxBx.Text, dOffset)
-      Dim MadExtraLeng As Double = Math.Abs(dOffset)
-      Dim dExtraLen As Double
-      StringToLen(ExtraLenTxBx.Text, dExtraLen)
-      If dExtraLen < 0 AndAlso dExtraLen < -MadExtraLeng Then
-         dExtraLen = 0
-      End If
-      m_dExtraLength = dExtraLen
-      ExtraLenTxBx.Text = LenToString(m_dExtraLength, 2)
-      ' Disegno il taglio
-      RefreshSquaring()
-      EgtDraw()
-   End Sub
-
-   Private Sub SimulBtn_Click(sender As Object, e As RoutedEventArgs) Handles SimulBtn.Click
-      ' Verifico ci sia un taglio valido
-      If Not m_bCutOk Then Return
-      ' Salvo il progetto con le lavorazioni
-      EgtSetCurrentContext(m_CurrProjPage.CurrentProjectScene.GetCtx())
-      Dim sMchPath As String = m_MainWindow.GetTempDir() & "\" & "DirectProj.nge"
-      m_MainWindow.m_CurrentProjectPageUC.SaveFile(sMchPath, False)
-      ' Predispongo passaggio a simulazione
-      m_bSimul = True
-      m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
-      m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
-      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
-      m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
-      m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
-      m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
-      m_MainWindow.m_ActivePage = MainWindow.Pages.Simulation
-   End Sub
-
-   Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
-#If TRIAL Then
-      m_CurrProjPage.SetWarningMessage("Trial Version")
-#Else
-      ' Verifico non sia versione Ufficio
-      If m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.OFFICE_TYPE) Then
-         m_CurrProjPage.SetWarningMessage("Office Version")
-         Return
-      End If
-      ' Verifico ci sia un taglio valido
-      If Not m_bCutOk Then Return
-      ' Salvo il progetto con le lavorazioni
-      Dim sMchPath As String = m_MainWindow.GetTempDir() & "\" & "DirectProj.nge"
-      m_MainWindow.m_CurrentProjectPageUC.SaveFile(sMchPath, False)
-      ' Genero file CNC (lancio anche se errore in precedenza)
-      Dim sCncPath As String = m_MainWindow.GetCncDir() & "\DirectCut" & m_MainWindow.m_CurrentMachine.sIsoFileExt
-      Dim bOk As Boolean = EgtGenerate(sCncPath, "OmagCut ver." & m_MainWindow.GetVersion())
-      ' Se errore in generazione, segnalo l'errore ed esco
-      If Not bOk Then
-         m_CurrProjPage.SetErrorMessage(EgtMsg(90314))       'Errore nella generazione del programma CN
-         Return
-      End If
-      ' Download programma (eventuali errori sono segnalati dalla funzione)
-      If m_MainWindow.m_CNCommunication.SendProgram(sCncPath, 900) Then
-         ' copio il progetto corrente come progetto in lavorazione
-         Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
-         My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
-         ' lancio eventuale lua post-trasmissione
-         m_MainWindow.ExecSentProgScript(True)
-      End If
-#End If
-   End Sub
-
-   Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
-   End Sub
-
-   Private Function CreateGridCut() As Boolean
-      ' Verifico sia definito il punto iniziale e il grezzo
-      If Not m_bRawOk Then
-         m_bCutOk = False
-         Return False
-      End If
-      ' Spessore grezzo
-      Dim dRawHeight As Double = m_ptRawMax.z - m_ptRawMin.z
-      ' Rimuovo eventuale vecchio pezzo per taglio diretto
-      EraseDirectCutPart()
-      ' Disattivo eventuali lavorazioni presenti
-      DeactivateAllMachinings()
-      ' Creo nuovo pezzo per il taglio diretto
-      Dim nPartId = EgtCreateGroup(GDB_ID.ROOT)
-      EgtSetName(nPartId, NAME_DIRECTCUT)
-      Dim nLayerId = EgtCreateGroup(nPartId)
-      EgtSetName(nLayerId, NAME_OUTLOOP)
-      ' Creo il taglio parallelo alla lama
-      Dim ptStart As Point3d = m_ptTipP1
-      ptStart.z = 0
-      ' Funzione che crea i tagli successivi al primo
-      MultiplyCut(nLayerId)
-      ' Calcolo punto di inserimento nel grezzo
-      Dim ptMin, ptMax As Point3d
-      EgtGetBBoxGlob(nPartId, GDB_BB.STANDARD, ptMin, ptMax)
-      Dim ptIns As Point3d = ptMin + (m_ptTabOri - m_ptRawMin)
-      ptIns.z = dRawHeight
-      ' Inserisco il pezzo nel grezzo
-      EgtAddPartToRawPart(nPartId, ptIns, m_MainWindow.m_CurrentProjectPageUC.m_nRawId)
-      ' Inserisco la lavorazione
-      m_bCutOk = AddMachinings(nPartId) AndAlso UpdateAllMachiningsToolpaths()
-      EgtSetCurrPhase(1)
-      ' Eventuale eliminazione Home finale
-      If Not m_MainWindow.m_CurrentMachine.bDirectCutsFinalHome Then
-         RemoveFinalHome()
-      End If
-      UpdateSimulOkBtn()
-      Return m_bCutOk
-   End Function
-
-   Private Function MultiplyCut(nLayerId As Integer) As Boolean
-      ' Recupero lo spessore del taglio della lama o del waterjet correntemente attiva
-      Dim nType As Integer = 0
-      EgtTdbGetCurrToolParam(MCH_TP.TYPE, nType)
-      Dim dThick As Double = 0
-      EgtTdbGetCurrToolParam(If(nType = MCH_TY.SAW_STD, MCH_TP.THICK, MCH_TP.DIAM), dThick)
-      ' Ricalcolo lo spessore in base all'inclinazione
-      dThick = dThick / Math.Cos(m_dAngV * Math.PI / 180)
-      ' Imposto angolo di rotazione a seconda del lato dei tagli paralleli
-      Dim dRotAngOX As Double = 90
-      ' Recupero dati da interfaccia
-      Dim dDimPzX As Double = m_dDimX
-      Dim nNumPzX As Integer = m_nNumX
-      Dim dDimPzY As Double = m_dDimY
-      Dim nNumPzY As Integer = m_nNumY
-      ' Definisco vettore di spostamento
-      Dim vtDelta As Vector3d
-      ' Calcolo primo taglio parallelo
-      Dim ptStart As Point3d = m_ptTipP1
-      ptStart.z = 0
-      If dDimPzY <> 0 And nNumPzY > 0 And dDimPzX <> 0 And nNumPzX > 0 Then
-         Dim dLenX As Double = dThick + (dDimPzX + dThick) * nNumPzX
-         Dim nCutParaId = EgtCreateLinePDL(nLayerId, ptStart, m_dAngO, dLenX + 0.1)
-         ' Imposto affondamento e angolo di fianco sul taglio
-         EgtSetInfo(nCutParaId, INFO_DEPTH, m_dDepth)
-         EgtSetInfo(nCutParaId, INFO_SIDE_ANGLE, m_dAngV)
-         ' Allungo la geometria
-         EgtExtendCurveStartByLen(nCutParaId, m_dOffsetSquaring + m_dExtraLength)
-         EgtExtendCurveEndByLen(nCutParaId, m_dOffsetSquaring + +m_dExtraLength)
-         ' Calcolo vettore di spostamento
-         vtDelta = Vector3d.FromPolar((dDimPzY + dThick), m_dAngO)
-         ' Ruoto il vettore di traslazione 
-         vtDelta.Rotate(Vector3d.Z_AX, dRotAngOX)
-         For Index As Integer = 1 To nNumPzY
-            Dim vtPerpMove As Vector3d = Index * vtDelta
-            ' Creo copie
-            Dim nCut2Id = EgtCopyGlob(nCutParaId, nLayerId)
-            EgtMove(nCut2Id, vtPerpMove, GDB_RT.GLOB)
-         Next
-         ' Calcolo primo taglio perpendicolare
-         Dim dLenY As Double = dThick + (dDimPzY + dThick) * nNumPzY
-         ' Arretro il punto di partenza di uno spessore lama
-         Dim vtDeltaPos As Vector3d = Vector3d.FromPolar(dThick + 0.1, m_dAngO - 90)
-         Dim nCutPerpId = EgtCreateLinePDL(nLayerId, ptStart + vtDeltaPos, m_dAngO + 90, dLenY + 0.2)
-         ' Imposto affondamento e angolo di fianco sul taglio
-         EgtSetInfo(nCutPerpId, INFO_DEPTH, m_dDepth)
-         EgtSetInfo(nCutPerpId, INFO_SIDE_ANGLE, m_dAngV)
-         ' Allungo la geometria
-         EgtExtendCurveStartByLen(nCutPerpId, m_dOffsetSquaring + m_dExtraLength)
-         EgtExtendCurveEndByLen(nCutPerpId, m_dOffsetSquaring + +m_dExtraLength)
-         ' Calcolo secondo vettore di spostamento
-         vtDelta = Vector3d.FromPolar((dDimPzX + dThick), m_dAngO)
-         For Index As Integer = 1 To nNumPzX
-            Dim vtPerpMove As Vector3d = vtDelta * Index
-            ' Creo copie
-            Dim nCut3Id = EgtCopyGlob(nCutPerpId, nLayerId)
-            EgtMove(nCut3Id, vtPerpMove, GDB_RT.GLOB)
-         Next
-      End If
-      Return True
-   End Function
-
-   Private Sub SetCoordVisibility(bShow As Boolean)
-      XcoordTxBl.Visibility = If(bShow, Windows.Visibility.Visible, Windows.Visibility.Hidden)
-      XcoordTxBx.Visibility = If(bShow, Windows.Visibility.Visible, Windows.Visibility.Hidden)
-      YcoordTxBl.Visibility = If(bShow, Windows.Visibility.Visible, Windows.Visibility.Hidden)
-      YcoordTxBx.Visibility = If(bShow, Windows.Visibility.Visible, Windows.Visibility.Hidden)
-   End Sub
-
-   Private Sub ShowCoord()
-      Dim ptText As Point3d = m_ptPrev
-      ptText.ToLoc(New Frame3d(m_ptTabOri))
-      XcoordTxBx.Text = LenToString(ptText.x, 2)
-      YcoordTxBx.Text = LenToString(ptText.y, 2)
-   End Sub
-
-   Private Function SetMachineInCurrPos() As Boolean
-      ' Recupero la posizione macchina
-      Dim dL1, dL2, dL3, dR1, dR2 As Double
-      If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then Return False
-      ' Recupero il nome degli assi macchina
-      Dim sL1 As String = String.Empty
-      Dim sL2 As String = String.Empty
-      Dim sL3 As String = String.Empty
-      Dim sR1 As String = String.Empty
-      Dim sR2 As String = String.Empty
-      If Not m_MainWindow.m_CNCommunication.GetAxesNames(sL1, sL2, sL3, sR1, sR2) Then Return False
-      ' Visualizzo macchina in posizione
-      EgtSetAxisPos(sL1, dL1)
-      EgtSetAxisPos(sL2, dL2)
-      EgtSetAxisPos(sL3, dL3)
-      EgtSetAxisPos(sR1, dR1)
-      EgtSetAxisPos(sR2, dR2)
-      Return True
-   End Function
-
-End Class
-

DirectCuts/VacuumMachineButtonUC.xaml.vb

@@ -77,7 +77,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub VacuumUpChanged(VacuumUpState As Boolean)
       Dim VacuumUpButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_VACUUMUP Then
             VacuumUpButton = MachineButton
          End If
@@ -89,7 +89,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub VacuumDownChanged(VacuumDownState As Boolean)
       Dim VacuumDownButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_VACUUMDOWN Then
             VacuumDownButton = MachineButton
          End If
@@ -101,7 +101,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub Vacuum2UpChanged(Vacuum2UpState As Boolean)
       Dim Vacuum2UpButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_VACUUM2UP Then
             Vacuum2UpButton = MachineButton
          End If
@@ -113,7 +113,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub Vacuum2DownChanged(Vacuum2DownState As Boolean)
       Dim Vacuum2DownButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_VACUUM2DOWN Then
             Vacuum2DownButton = MachineButton
          End If
@@ -125,7 +125,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub Vacuum0Changed(Vacuum0State As Boolean)
       Dim Vacuum0Button As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_VACUUM0 Then
             Vacuum0Button = MachineButton
          End If
@@ -137,7 +137,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub Vacuum90Changed(Vacuum90State As Boolean)
       Dim VacuumRotButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_VACUUM90 Then
             VacuumRotButton = MachineButton
          End If
@@ -149,7 +149,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub Vacuum1Changed(Vacuum1State As Boolean)
       Dim Vacuum1StateButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_VACUUM1STATE Then
             Vacuum1StateButton = MachineButton
          End If
@@ -161,7 +161,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub Vacuum2Changed(Vacuum2State As Boolean)
       Dim Vacuum2StateButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_VACUUM2STATE Then
             Vacuum2StateButton = MachineButton
          End If
@@ -173,7 +173,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub Vacuum3Changed(Vacuum3State As Boolean)
       Dim Vacuum3StateButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_VACUUM3STATE Then
             Vacuum3StateButton = MachineButton
          End If
@@ -185,7 +185,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub Vacuum4Changed(Vacuum4State As Boolean)
       Dim Vacuum4StateButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_VACUUM4STATE Then
             Vacuum4StateButton = MachineButton
          End If
@@ -197,7 +197,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub Vacuum5Changed(Vacuum5State As Boolean)
       Dim Vacuum5StateButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_VACUUM5STATE Then
             Vacuum5StateButton = MachineButton
          End If
@@ -209,7 +209,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub Vacuum6Changed(Vacuum6State As Boolean)
       Dim Vacuum6StateButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_VACUUM6STATE Then
             Vacuum6StateButton = MachineButton
          End If
@@ -221,7 +221,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub Vacuum135Changed(Vacuum135State As Boolean)
       Dim Vacuum135StateButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_VACUUM135STATE Then
             Vacuum135StateButton = MachineButton
          End If
@@ -233,7 +233,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub Vacuum246Changed(Vacuum246State As Boolean)
       Dim Vacuum246StateButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_VACUUM246STATE Then
             Vacuum246StateButton = MachineButton
          End If
@@ -245,7 +245,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub OpenAllChanged(OpenAllState As Boolean)
       Dim OpenAllStateButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_OPENALLSTATE Then
             OpenAllStateButton = MachineButton
          End If
@@ -257,7 +257,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub CloseAllChanged(CloseAllState As Boolean)
       Dim CloseAllStateButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_CLOSEALLSTATE Then
             CloseAllStateButton = MachineButton
          End If
@@ -269,7 +269,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub Open123Changed(Open123State As Boolean)
       Dim Open123StateButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_OPEN123STATE Then
             Open123StateButton = MachineButton
          End If
@@ -281,7 +281,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub Open456Changed(Open456State As Boolean)
       Dim Open456StateButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_OPEN456STATE Then
             Open456StateButton = MachineButton
          End If
@@ -293,7 +293,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub Close123Changed(Close123State As Boolean)
       Dim Close123StateButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_CLOSE123STATE Then
             Close123StateButton = MachineButton
          End If
@@ -305,7 +305,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub Close456Changed(Close456State As Boolean)
       Dim Close456StateButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_CLOSE456STATE Then
             Close456StateButton = MachineButton
          End If
@@ -317,7 +317,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub BlowChanged(BlowState As Boolean)
       Dim BlowStateButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_BLOWSTATE Then
             BlowStateButton = MachineButton
          End If
@@ -329,7 +329,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub VacuumOnChanged(VacuumState As Boolean)
       Dim VacuumOnButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_VACUUMON Then
             VacuumOnButton = MachineButton
          End If
@@ -341,7 +341,7 @@ Public Class VacuumMachineButtonUC
 
    Friend Sub VacuumOffChanged(VacuumState As Boolean)
       Dim VacuumOffButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_VACUUMOFF Then
             VacuumOffButton = MachineButton
          End If
@@ -354,7 +354,7 @@ Public Class VacuumMachineButtonUC
    Friend Sub BypassChanged(BypassState As Boolean)
       Dim PressedBypassStateButton As PressedCommandButton = Nothing
       Dim TwoBypassStateButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
+      For Each MachineButton In m_ButtonList
          If MachineButton.StateFlag = K_BYPASSTATE Then
             If TypeOf MachineButton Is TwoStateButton Then
                TwoBypassStateButton = MachineButton

DrawImport/AlzFrontUC.xaml

@@ -1,271 +0,0 @@
-<UserControl x:Class="AlzFrontUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   mc:Ignorable="d" 
-   d:DesignHeight="768" d:DesignWidth="256">
-    <!-- Definizione della Grid Laterale -->
-    <Grid Name="VariablesCompoGrid"  Grid.RowSpan="2">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="0.3*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="0.2*"/>
-            <RowDefinition Height="4*"/>
-            <!--<RowDefinition Height="0.5*"/>
-         <RowDefinition Height="0.5*"/>
-         <RowDefinition Height="0.5*"/>-->
-        </Grid.RowDefinitions>
-
-        <!--Titolo della colonna della ALZATINE-->
-        <TextBlock Name="SideAngleBl" Grid.Row="0" Grid.Column="2" Text="Alz."
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
-
-        <!--Titolo della colonna dei FRONTALINI-->
-        <TextBlock Name="HeelBl" Grid.Row="0" Grid.Column="3" Text="Front."
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
-
-        <TextBlock Name="Entity1" Grid.Row="1" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A1" Grid.Column="2" Grid.Row="1" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-10,0,0,0"/>
-        <CheckBox Name="F1" Grid.Column="3" Grid.Row="1" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-10,0,0,0"/>
-
-        <!--<EgtWPFLib:EgtTextBox Name="A1TxBx" Grid.Column="2" Grid.Row="1" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-        <EgtWPFLib:EgtTextBox Name="H1TxBx" Grid.Column="3" Grid.Row="1" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
-
-        <TextBlock Name="Entity2" Grid.Row="2" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A2" Grid.Column="2" Grid.Row="2" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        <CheckBox Name="F2" Grid.Column="3" Grid.Row="2" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        
-        <!--<EgtWPFLib:EgtTextBox Name="A2TxBx" Grid.Column="2" Grid.Row="2" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-        <EgtWPFLib:EgtTextBox Name="H2TxBx" Grid.Column="3" Grid.Row="2" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
-
-        <TextBlock Name="Entity3" Grid.Row="3" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A3" Grid.Column="2" Grid.Row="3" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        <CheckBox Name="F3" Grid.Column="3" Grid.Row="3" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        
-        <!--<EgtWPFLib:EgtTextBox Name="A3TxBx" Grid.Column="2" Grid.Row="3" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-        <EgtWPFLib:EgtTextBox Name="H3TxBx" Grid.Column="3" Grid.Row="3" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
-
-        <TextBlock Name="Entity4" Grid.Row="4" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A4" Grid.Column="2" Grid.Row="4" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        <CheckBox Name="F4" Grid.Column="3" Grid.Row="4" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        
-        <!--<EgtWPFLib:EgtTextBox Name="A4TxBx" Grid.Column="2" Grid.Row="4" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-        <EgtWPFLib:EgtTextBox Name="H4TxBx" Grid.Column="3" Grid.Row="4" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
-
-        <TextBlock Name="Entity5" Grid.Row="5" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A5" Grid.Column="2" Grid.Row="5" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        <CheckBox Name="F5" Grid.Column="3" Grid.Row="5" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        
-        <!--<EgtWPFLib:EgtTextBox Name="A5TxBx" Grid.Column="2" Grid.Row="5" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-        <EgtWPFLib:EgtTextBox Name="H5TxBx" Grid.Column="3" Grid.Row="5" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
-
-        <TextBlock Name="Entity6" Grid.Row="6" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A6" Grid.Column="2" Grid.Row="6" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        <CheckBox Name="F6" Grid.Column="3" Grid.Row="6" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        
-        <!--<EgtWPFLib:EgtTextBox Name="A6TxBx" Grid.Column="2" Grid.Row="6" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-        <EgtWPFLib:EgtTextBox Name="H6TxBx" Grid.Column="3" Grid.Row="6" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
-
-        <TextBlock Name="Entity7" Grid.Row="7" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A7" Grid.Column="2" Grid.Row="7" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        <CheckBox Name="F7" Grid.Column="3" Grid.Row="7" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        
-        
-        <!--<EgtWPFLib:EgtTextBox Name="A7TxBx" Grid.Column="2" Grid.Row="7" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-        <EgtWPFLib:EgtTextBox Name="H7TxBx" Grid.Column="3" Grid.Row="7" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
-
-        <TextBlock Name="Entity8" Grid.Row="8" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A8" Grid.Column="2" Grid.Row="8" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        <CheckBox Name="F8" Grid.Column="3" Grid.Row="8" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        
-        <!--<EgtWPFLib:EgtTextBox Name="A8TxBx" Grid.Column="2" Grid.Row="8" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-        <EgtWPFLib:EgtTextBox Name="H8TxBx" Grid.Column="3" Grid.Row="8" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
-
-        <TextBlock Name="Entity9" Grid.Row="9" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A9" Grid.Column="2" Grid.Row="9" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        <CheckBox Name="F9" Grid.Column="3" Grid.Row="9" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-        
-        <!--<EgtWPFLib:EgtTextBox Name="A9TxBx" Grid.Column="2" Grid.Row="9" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-        <EgtWPFLib:EgtTextBox Name="H9TxBx" Grid.Column="3" Grid.Row="9" Width="60"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
-
-        <TextBlock Name="Entity10" Grid.Row="10" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-        <CheckBox Name="A10" Grid.Column="2" Grid.Row="10" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-
-        <CheckBox Name="F10" Grid.Column="3" Grid.Row="10" Height="30" Width="40" HorizontalAlignment="Right"
-                  Margin="-20,0,0,0"/>
-
-        <!--<EgtWPFLib:EgtTextBox Name="A10TxBx" Grid.Column="2" Grid.Row="10" Width="60"
-                            Margin="0,0,0,-2"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-        <EgtWPFLib:EgtTextBox Name="H10TxBx" Grid.Column="3" Grid.Row="10" Width="60"
-                            Margin="0,0,0,-2"
-                            Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
-
-        <Grid Grid.Column="0" Grid.Row="12" Grid.ColumnSpan="4">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="0.3*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="0.55*"/>
-                <RowDefinition Height="0.55*"/>
-                <RowDefinition Height="0.55*"/>
-                <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <!-- Altezza delle alette --> 
-            <TextBlock Name="Parameter1TxBl" Grid.Row="0" Grid.ColumnSpan="2"
-                           Text="Offset"
-                           Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-                           FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
-            
-            <EgtWPFLib:EgtTextBox Name="Parameter1ATxBx"                                  
-                                  Grid.Column="2" Grid.Row="0"
-                                  HorizontalAlignment="Right"
-                                  Width="60" Height="30" Margin="0,0,0,0"
-                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-            <EgtWPFLib:EgtTextBox Name="Parameter1FTxBx" 
-                                  Grid.Column="3" Grid.Row="0" 
-                                  HorizontalAlignment="Right"
-                                  Width="60" Height="30" Margin="0,0,0,0"
-                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-            
-            <!-- Delta angolo (abilitato solo per i frontalini) -->
-            <TextBlock Name="Parameter2TxBl" Grid.Row="1" Grid.ColumnSpan="2"
-                       Text="Offset2"
-                       Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-                       FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
-            <!-- temporaneamente disabilito la definizione delta angolo per alzatine  -->
-            <EgtWPFLib:EgtTextBox Name="Parameter2ATxBx" 
-                                  IsEnabled="False"
-                                  Visibility="Collapsed"
-                                  Grid.Column="2" Grid.Row="1"
-                                  HorizontalAlignment="Right"
-                                  Width="60" Height="30" Margin="0,0,0,0" IsLength="False"
-                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-            <EgtWPFLib:EgtTextBox Name="Parameter2FTxBx" 
-                                  Grid.Column="3" Grid.Row="1" 
-                                  HorizontalAlignment="Right"
-                                  Width="60" Height="30" Margin="0,0,0,0" IsLength="False"
-                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-
-            <!-- Spessore aletta -->
-            <TextBlock Name="Parameter5TxBl" Grid.Row="2" Grid.ColumnSpan="2"
-                       Text="Offset2"
-                       Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-                       FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
-            <EgtWPFLib:EgtTextBox Name="Parameter5TxBx" 
-                                  Grid.Column="2" Grid.Row="2" 
-                                  HorizontalAlignment="Right"
-                                  Width="60" Height="30" Margin="0,0,0,0"
-                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-
-            <!--Gestisco nello spazio di una TextBox due TextBoxs--><!--
-            <UniformGrid Rows="1" Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2" Width="90" >
-                <EgtWPFLib:EgtTextBox Name="Parameter2aTxBx" 
-                                      Grid.Column="2" Grid.Row="12"
-                                      Width="40" Height="30"
-                                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-                <EgtWPFLib:EgtTextBox Name="Parameter2bTxBx" 
-                                      Grid.Column="3" Grid.Row="12" 
-                                      Width="40" Height="30"
-                                      Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-            </UniformGrid>-->
-
-
-            <!--<TextBlock Name="Parameter3TxBl" Grid.Row="2" Grid.ColumnSpan="2"
-               Text="Affondamento"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
-            <EgtWPFLib:EgtTextBox Name="Parameter3TxBx" 
-                                  Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="2" 
-                                  Margin="0,0,0,-2"
-                                  Width="85" Height="30"
-                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
-
-            <!--<TextBlock Name="Parameter4TxBl" Grid.Row="3" Grid.ColumnSpan="2"
-                           Text="Accorciamento"
-                           Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-                           FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
-            <EgtWPFLib:EgtTextBox Name="Parameter4TxBx" 
-                                  Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="3" 
-                                  Margin="0,0,0,-2"
-                                  Width="85" Height="30"
-                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
-            
-            <UniformGrid Columns="2" Grid.ColumnSpan="4" Grid.Row="3">
-                <!--questo bottone è stato creato solo per garantire il corretto allinaemento-->
-                <Button Name="Vuoto" Visibility="Hidden"/>
-                <!--Bottone per tornare indietro alla selezione di CompoInterni e Alz&Front-->
-                <Button Name="BackBtn" 
-                    Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-            </UniformGrid>
-           
-        </Grid>
-
-
-
-    </Grid>
-
-</UserControl>
-

DrawImport/AlzFrontUC.xaml.vb

@@ -1,894 +0,0 @@
-Imports System.Globalization
-Imports EgtUILib
-Imports EgtWPFLib
-
-Public Class AlzFrontUC
-   Private Const NUM_VAR As Integer = 10
-   Private Const LUA_CMP_VARS As String = "CMP"
-   Private Const LUA_CMP_DRAW As String = "CMP_Draw"
-   Private Const INFO_VAR As String = "Var"
-   Private Const INFO_CMP As String = "CMP"
-   Private Const INFO_ID As String = "ID"
-   Friend Const LUA_CMP_INDEX As String = LUA_CMP_VARS & ".Ind"
-   Friend Const LUA_CMP_INTERNAL As String = LUA_CMP_VARS & ".Int"
-   Friend Const LUA_REMOVEHOLE As String = "RemoveHole"
-
-   ' Costanti layer componenti
-   Friend Const COMPO_LAYER_AUX As String = "LayAux"
-   Friend Const COMPO_LAYER_QUOTATURE As String = "Quotature"
-   Friend Const COMPO_LAYER_ETICHETTE As String = "Etichette"
-
-   ' nome della info riferita alle alzatine e ai frontalini (1=Alz, 2=Front, 0=niente)
-   Private Const INFO_ALZFRONT As String = "AF"
-   Private Const INFO_ENABLE As String = "EnableAF"
-
-   ' Properties 
-   Private m_sCompoDir As String = String.Empty
-   Private m_sCompoName As String = String.Empty
-   Friend m_bDrawOk As Boolean = False
-   Private m_bFirst As Boolean = True
-
-   ' Riferimento alla MainWindow
-   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
-   ' Riferimento alla pagina che ha aperto SideAngleUC
-   Private m_CallingPage As MainWindow.Pages
-
-   ' Gestione pagine
-   Private Const MAX_LINES As Integer = 10
-   ' lista dei lati, in cui indico il tipo di entità da associare
-   Private AlzFrontEntityList As New List(Of AlzFrontEntity)
-
-   ' numero di lati presenti nella figura
-   Private m_nCount As Integer = 0
-   ' numero di righe rese disponibili nella pagina -> m_nShow = min(m_nCount, MAX_LINE)
-   Private m_nShow As Integer = MAX_LINES
-
-   Private bInternalSelection As Boolean = False
-
-   ' raggio circoscritto al pezzo
-   Private m_dBBoxRad As Double
-   ' dimensione dei caratteri
-   Private m_dH As Double
-
-   Private Sub AlzFrontPage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
-
-      m_MainWindow.m_DrawPageUC.m_ActiveComponentPage = DrawPageUC.Pages.AlzFront
-
-      ' numero di elemnti presenti nella lista SideAngle/DripEntity
-      m_nCount = 0
-      ' numero di righe rese disponibili nella pagina -> m_nShow = min(m_nCount, MAX_LINE)
-      m_nShow = 0
-
-      ' carico la lista dei lati della figura
-      InitSides()
-      ' aggiorno la visualizzazione delle TextBox e dei CheckBox
-      TxBlChBxView()
-      ' imposto lo stato delle checkbox
-      SetCheck()
-
-      ' nascondo il bottone Back della pagina Draw
-      m_MainWindow.m_DrawPageUC.BackBtn.Visibility = Visibility.Hidden
-      m_MainWindow.m_DrawPageUC.MessageGrid.Visibility = Visibility.Hidden
-      ' Disabilito bottoni angoli di fianco e lavorazioni da sotto
-      m_MainWindow.m_DrawPageUC.SideAngleBtn.IsEnabled = False
-      m_MainWindow.m_DrawPageUC.FiloTopBtn.IsEnabled = False
-      m_MainWindow.m_DrawPageUC.EngraveBtn.IsEnabled = False
-      m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = False
-
-      ' nome dei parametri condivisi
-      Parameter1TxBl.Text = EgtMsg(91134)
-      Parameter2TxBl.Text = EgtMsg(91135)
-      Parameter5TxBl.Text = EgtMsg(91136)
-
-      EgtZoom(ZM.ALL)
-   End Sub
-
-   ' carico la lista dei lati della figura corrente
-   Private Sub InitSides()
-      ' pulisco la lista dei lati 
-      AlzFrontEntityList.Clear()
-
-      ' Id del pezzo
-      Dim PartId As Integer = GDB_ID.NULL
-      ' Id del loop eseterno
-      Dim LoopId As Integer = GDB_ID.NULL
-      ' Id delle label
-      Dim LabelId As Integer = GDB_ID.NULL
-
-      ' definisco i valori delle altezza e degli angoli di spoglia per le alzatine e i frontalini (letti da file ini del programma)
-      Dim sVal As String = String.Empty
-      Dim dVal As Double = 0
-      GetPrivateProfileString(S_ALZFRONT, K_ALZ_HEIGHT, "0", sVal, m_MainWindow.GetIniFile)
-      Utility.StringToDouble(sVal, dVal)
-      Parameter1ATxBx.Text = Utility.LenToString(dVal, 4)
-      GetPrivateProfileString(S_ALZFRONT, K_FRONT_HEIGHT, "0", sVal, m_MainWindow.GetIniFile)
-      Utility.StringToDouble(sVal, dVal)
-      Parameter1FTxBx.Text = Utility.LenToString(dVal, 4)
-      GetPrivateProfileString(S_ALZFRONT, K_ALZ_DELTA_ANG, "0", Parameter2ATxBx.Text, m_MainWindow.GetIniFile)
-      GetPrivateProfileString(S_ALZFRONT, K_FRONT_DELTA_ANG, "0", Parameter2FTxBx.Text, m_MainWindow.GetIniFile)
-      Parameter5TxBx.Text = Utility.LenToString(m_MainWindow.m_CurrentProjectPageUC.m_dRawHeight, 2)
-
-      ' Imposto contesto corrente
-      EgtSetCurrentContext(m_MainWindow.m_DrawPageUC.DrawScene.GetCtx())
-      ' Ricavo nome primo pezzo
-      PartId = EgtGetFirstPart()
-      ' se non  esiste un pezzo corrente allora esco
-      If PartId = GDB_ID.NULL Then Return
-
-      ' Recupero nome layer con geometria di contorno (esterno o interno) del pezzo
-      LoopId = EgtGetFirstNameInGroup(EgtGetFirstPart(), NAME_OUTLOOP)
-
-      ' Recupero il layer "Etichette" per inserirvi il nome dei lati
-      LabelId = EgtGetFirstNameInGroup(EgtGetFirstPart(), COMPO_LAYER_ETICHETTE)
-      If LabelId = GDB_ID.NULL Then
-         LabelId = EgtCreateGroup(PartId)
-         EgtSetName(LabelId, COMPO_LAYER_ETICHETTE)
-      Else
-         ' se esistente allora lo svuoto
-         EgtEmptyGroup(LabelId)
-      End If
-      EgtSetStatus(LabelId, GDB_ST.ON_)
-
-      'Determino se loop esterno o interno
-      Dim sLoopName As String = ""
-      Dim bOutLoop As Boolean = (EgtGetName(LoopId, sLoopName) AndAlso sLoopName = NAME_OUTLOOP)
-      ' Calcolo dimensione ingombro Loop
-      Dim ptMin, ptMax As Point3d
-      EgtGetBBoxGlob(LoopId, GDB_BB.STANDARD, ptMin, ptMax)
-      ' utilizzato per definire la dimensione dei caratteri delle label per i lati
-      m_dBBoxRad = 0.5 * Point3d.DistXY(ptMin, ptMax)
-
-      ' Recupero Id della curva del Loop Esterno
-      Dim PrevLine As Integer = EgtGetLastInGroup(LoopId)
-      Dim CurrLine As Integer = EgtGetFirstInGroup(LoopId)
-      ' Creo indice per numerare le entità in ImportPage
-      Dim nEntityIndex As Integer = 1
-      Dim nOtherIndex As Integer = 1
-
-      ' inserisco il lato nella lista 
-      While CurrLine <> GDB_ID.NULL
-         Dim NextId As Integer = EgtGetNext(CurrLine)
-         If NextId = GDB_ID.NULL Then NextId = EgtGetFirstInGroup(LoopId)
-         If VerifySideAnglePossible(PrevLine, CurrLine, NextId, bOutLoop) Then
-
-            If ApprovedSideToAlzFront(CurrLine) Then
-               ' Aggiungo il lato alla lista di quelli su cui è possibile mettere una alzatina o un frontalino
-               Dim sNameCurrLine As String = String.Empty
-               Dim nInfo As Integer = 0
-               Dim dSideAng As Integer = 0
-               EgtSetName(CurrLine, "A" & nEntityIndex.ToString)
-               EgtGetName(CurrLine, sNameCurrLine)
-               ' inserisco la numerazione dei lati della figura
-               AddTextToLine(sNameCurrLine, LabelId, CurrLine, 20, m_dBBoxRad, True)
-               ' recupero l'informazione 
-               EgtGetInfo(CurrLine, INFO_ALZFRONT, nInfo)
-               If nInfo = 1 Then
-                  AlzFrontEntityList.Add(New AlzFrontEntity(sNameCurrLine, CurrLine, AlzFrontEntity.AlzFront.ALZATINA))
-               ElseIf nInfo = 2 Then
-                  AlzFrontEntityList.Add(New AlzFrontEntity(sNameCurrLine, CurrLine, AlzFrontEntity.AlzFront.FRONTALINO))
-               Else
-                  AlzFrontEntityList.Add(New AlzFrontEntity(sNameCurrLine, CurrLine))
-               End If
-               ' inserisco riferimento univoco al lato (solo se non esiste)
-               Dim sInfoRef As String = String.Empty
-               EgtGetInfo(CurrLine, "RefAF", sInfoRef)
-               If String.IsNullOrEmpty(sInfoRef) Then
-                  Dim sRefGUID As String = System.Guid.NewGuid().ToString()
-                  EgtSetInfo(CurrLine, "RefAF", sRefGUID)
-               End If
-               nEntityIndex += 1
-            Else
-               EgtSetName(CurrLine, "B" & nOtherIndex.ToString)
-               nOtherIndex = nOtherIndex + 1
-            End If
-         End If
-         PrevLine = CurrLine
-         CurrLine = EgtGetNext(CurrLine)
-      End While
-
-      ' Aggiorno numero di lati carciati
-      m_nCount = AlzFrontEntityList.Count()
-      ' Aggiorno numero item visualizzati nella pagina iniziale
-      m_nShow = Math.Min(m_nCount, MAX_LINES)
-
-      ' Se non ci sono lati su cui operare, messaggio utente
-      If LoopId <> GDB_ID.NULL Then
-         If m_nCount = 0 Then
-            If m_CallingPage = MainWindow.Pages.Draw Then
-               m_MainWindow.m_DrawPageUC.MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 7)   ' Non ci sono lati modificabili
-               m_MainWindow.m_DrawPageUC.MessageBrd.Background = Application.Current.FindResource("OmagCut_Yellow")
-            Else
-               m_MainWindow.m_ImportPageUC.MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 7)   ' Non ci sono lati modificabili
-               m_MainWindow.m_ImportPageUC.MessageBrd.Background = Application.Current.FindResource("OmagCut_Yellow")
-            End If
-         Else
-            If m_CallingPage = MainWindow.Pages.Draw Then
-               m_MainWindow.m_DrawPageUC.MessageTxBx.Text = ""
-               m_MainWindow.m_DrawPageUC.MessageBrd.Background = Brushes.Transparent
-            Else
-               m_MainWindow.m_ImportPageUC.MessageTxBx.Text = ""
-               m_MainWindow.m_ImportPageUC.MessageBrd.Background = Brushes.Transparent
-            End If
-         End If
-      End If
-      ' aggiungo l'Info che comunica se il lato è stato modificato
-      InitList()
-
-   End Sub
-
-   ' Imposto la visibilità degli oggetti nella pagina: qui eseguo l'impaginazione
-   Private Sub TxBlChBxView()
-
-      If m_nCount = 0 Then
-         ' nascondo il nome delle colonne
-         SideAngleBl.Visibility = Windows.Visibility.Hidden
-         HeelBl.Visibility = Windows.Visibility.Hidden
-      Else
-         ' definisco il posizionamento del nome (Alz.) delle colonne all'interno della grigia
-         Grid.SetRow(SideAngleBl, MAX_LINES - m_nShow)
-         SideAngleBl.Text = "Alz."
-         SideAngleBl.Visibility = Windows.Visibility.Visible
-         ' definisco il posizionamento del nome (Front.) delle colonne all'interno della grigia
-         Grid.SetRow(HeelBl, MAX_LINES - m_nShow)
-         HeelBl.Text = "Front."
-         HeelBl.Visibility = Windows.Visibility.Visible
-      End If
-
-      ' Lati visibili
-      For nI As Integer = 1 To m_nShow
-         Dim Index As Integer = MAX_LINES - m_nShow + nI
-         ' definisco la visibilità della label
-         GetTxBlFromIndex(Index).Visibility = Windows.Visibility.Visible
-         GetTxBlFromIndex(Index).Text = "A" & nI.ToString
-         GetChBxAlzFromIndex(Index).Visibility = Windows.Visibility.Visible
-         GetChBxFrontFromIndex(Index).Visibility = Windows.Visibility.Visible
-         ' annulo le eventuali selezioni 
-         bInternalSelection = True
-         GetChBxAlzFromIndex(Index).IsChecked = False
-         bInternalSelection = True
-         GetChBxFrontFromIndex(Index).IsChecked = False
-
-         ' aggiungo i campi per allungare e accorciare i lati (adesso sostituito con le CheckBox)
-         'GetAngleTxBxFromIndex(Index).Visibility = Windows.Visibility.Visible
-         'GetHeelTxBxFromIndex(Index).Visibility = Windows.Visibility.Visible
-      Next
-
-      ' Lati nascosti: nascondo i lati partendo dall'alto (se ho 4 lati la prima TextBx disponibile è la settima -> 11-4 = 7 lati nascosti) 
-      For Index As Integer = 1 To MAX_LINES - m_nShow
-         ' definisco la visibilità della label
-         GetTxBlFromIndex(Index).Visibility = Windows.Visibility.Hidden
-         GetChBxAlzFromIndex(Index).Visibility = Windows.Visibility.Hidden
-         GetChBxFrontFromIndex(Index).Visibility = Windows.Visibility.Hidden
-         bInternalSelection = True
-         GetChBxAlzFromIndex(Index).IsChecked = False
-         bInternalSelection = True
-         GetChBxFrontFromIndex(Index).IsChecked = False
-         'GetAngleTxBxFromIndex(Index).Visibility = Windows.Visibility.Hidden
-         'GetHeelTxBxFromIndex(Index).Visibility = Windows.Visibility.Hidden
-
-      Next
-      bInternalSelection = False
-   End Sub
-
-   Private Sub SetCheck()
-      For IndexSide As Integer = 0 To AlzFrontEntityList.Count() - 1
-         Dim sNameSide As String = AlzFrontEntityList(IndexSide).SideName
-         Dim IndexCh As Integer = IndexSide + MAX_LINES - m_nShow + 1
-         If AlzFrontEntityList(IndexSide).Type = AlzFrontEntity.AlzFront.ALZATINA Then
-            bInternalSelection = True
-            GetChBxAlzFromIndex(IndexCh).IsChecked = True
-         ElseIf AlzFrontEntityList(IndexSide).Type = AlzFrontEntity.AlzFront.FRONTALINO Then
-            bInternalSelection = True
-            GetChBxFrontFromIndex(IndexCh).IsChecked = True
-         End If
-      Next
-      bInternalSelection = False
-   End Sub
-
-   ' restituisce vero se il lato possiede delle info legate al sideangle
-   Private Function VerifyIsThereSideAngle(nCurrLine As Integer) As Boolean
-      Dim dSideAngle As Double
-      return EgtGetInfo(nCurrLine, INFO_SIDE_ANGLE, dSideAngle)
-   End Function
-
-   ' restituisce vero se il lato possiede delle info legate alle alette
-   Private Function VerifyIsThereAlzFront(nCurrLine As Integer) As Boolean
-      Dim nAlzFront As Integer
-      return EgtGetInfo(nCurrLine, INFO_ALZFRONT, nAlzFront) AndAlso nAlzFront <> 0
-   End Function
-
-   ' approvo la costruzione dell'aletta sul lato indicato
-   Private Function ApprovedSideToAlzFront(nCurrLine As Integer) As Boolean
-      If VerifyIsThereSideAngle(nCurrLine) And Not VerifyIsThereAlzFront(nCurrLine) Then
-         ' se esiste SideAngle e un'aletta allora NON approvo
-         Return False
-      End If
-      Return True
-   End Function
-
-   ' Permette di aggiugere accanto alla linea passata
-   Friend Function AddTextToLine(sText As String, TextLayer As Integer, CurrLine As Integer, dDistance As Double,
-                                 dBBoxRad As Double, bTextExt As Boolean, Optional bRot As Boolean = False) As Integer
-      ' Calcolo altezza testo
-      m_dH = 0.05 * dBBoxRad
-      ' Creo testo
-      Dim nText As Integer = EgtCreateTextAdv(TextLayer, Point3d.ORIG(), 0, sText, "", 500, False, m_dH, 1, 0, INS_POS.MC)
-      ' Calcolo posizionamento
-      ' BBox del testo e suo centro
-      Dim ptMinBBox As Point3d
-      Dim ptMaxBBox As Point3d
-      EgtGetBBox(nText, GDB_BB.STANDARD, ptMinBBox, ptMaxBBox)
-      Dim ptMidBBox As Point3d
-      ptMidBBox = Point3d.Media(ptMinBBox, ptMaxBBox)
-      ' Punto medio della curva
-      Dim ptMid As Point3d
-      EgtMidPoint(CurrLine, nText, ptMid)
-      ' Versore sul punto medio della curva
-      Dim vtMid As Vector3d
-      EgtMidVector(CurrLine, nText, vtMid)
-      ' versore perpendicolare alla CurrLine che punta verso il testo
-      Dim vtOrto As New Vector3d(vtMid)
-      If bTextExt Then
-         vtOrto.Rotate(Vector3d.Z_AX(), -90)
-      Else
-         vtOrto.Rotate(Vector3d.Z_AX(), 90)
-      End If
-      ' eventuale rotazione del testo
-      Dim dRotAng As Double = 0
-      If bRot Then
-         dRotAng = Math.Atan2(vtMid.y, vtMid.x) * 180 / Math.PI
-         Dim dSpecRotAng = dRotAng
-         If dSpecRotAng > 91 Then
-            dSpecRotAng -= 180
-         ElseIf dSpecRotAng < -89 Then
-            dSpecRotAng += 180
-         End If
-         EgtRotate(nText, Point3d.ORIG(), Vector3d.Z_AX(), dSpecRotAng)
-      End If
-      ' vettore dal centro del BBox all'estremo più vicino
-      Dim vtptExtptMC As Vector3d
-      If bRot Then
-         vtptExtptMC = New Vector3d(0, ptMidBBox.y - ptMinBBox.y, 0)
-         vtptExtptMC.Rotate(Vector3d.Z_AX(), dRotAng)
-      Else
-         If bTextExt Then
-            If vtMid.x > 0 Then
-               If vtMid.y > 0 Then
-                  vtptExtptMC = ptMidBBox - New Point3d(ptMinBBox.x, ptMaxBBox.y, 0)
-               Else
-                  vtptExtptMC = ptMidBBox - ptMaxBBox
-               End If
-            Else
-               If vtMid.y > 0 Then
-                  vtptExtptMC = ptMidBBox - ptMinBBox
-               Else
-                  vtptExtptMC = ptMidBBox - New Point3d(ptMaxBBox.x, ptMinBBox.y, 0)
-               End If
-            End If
-         Else
-            If vtMid.x > 0 Then
-               If vtMid.y > 0 Then
-                  vtptExtptMC = ptMidBBox - New Point3d(ptMaxBBox.x, ptMinBBox.y, 0)
-               Else
-                  vtptExtptMC = ptMidBBox - ptMinBBox
-               End If
-            Else
-               If vtMid.y > 0 Then
-                  vtptExtptMC = ptMidBBox - ptMaxBBox
-               Else
-                  vtptExtptMC = ptMidBBox - New Point3d(ptMinBBox.x, ptMaxBBox.y, 0)
-               End If
-            End If
-         End If
-      End If
-      ' Calcolo il centro del testo
-      Dim ptTextMC As Point3d = ptMid + vtOrto * (dDistance + (vtOrto * vtptExtptMC))
-      EgtMove(nText, (ptTextMC - Point3d.ORIG()))
-      Return nText
-   End Function
-
-#Region "CHIAMATA ALLE TEXT/CHECK/LABEL"
-   Private Function GetChBxAlzFromIndex(Index As Integer) As CheckBox
-      Select Case Index
-         Case 1
-            Return A1
-         Case 2
-            Return A2
-         Case 3
-            Return A3
-         Case 4
-            Return A4
-         Case 5
-            Return A5
-         Case 6
-            Return A6
-         Case 7
-            Return A7
-         Case 8
-            Return A8
-         Case 9
-            Return A9
-         Case Else
-            Return A10
-      End Select
-   End Function
-
-   Private Function GetChBxAalZFromName(sName As String) As CheckBox
-      Select Case sName
-         Case "A1"
-            Return A1
-         Case "A2"
-            Return A2
-         Case "A3"
-            Return A3
-         Case "A4"
-            Return A4
-         Case "A5"
-            Return A5
-         Case "A6"
-            Return A6
-         Case "A7"
-            Return A7
-         Case "A8"
-            Return A8
-         Case "A9"
-            Return A9
-         Case Else
-            Return A10
-      End Select
-   End Function
-
-   Private Function GetChBxFrontFromIndex(Index As Integer) As CheckBox
-      Select Case Index
-         Case 1
-            Return F1
-         Case 2
-            Return F2
-         Case 3
-            Return F3
-         Case 4
-            Return F4
-         Case 5
-            Return F5
-         Case 6
-            Return F6
-         Case 7
-            Return F7
-         Case 8
-            Return F8
-         Case 9
-            Return F9
-         Case Else
-            Return F10
-      End Select
-   End Function
-
-   Private Function GetChBxFrontFromName(sName As String) As CheckBox
-      Select Case sName
-         Case "F1"
-            Return F1
-         Case "F2"
-            Return F2
-         Case "F3"
-            Return F3
-         Case "F4"
-            Return F4
-         Case "F5"
-            Return F5
-         Case "F6"
-            Return F6
-         Case "F7"
-            Return F7
-         Case "F8"
-            Return F8
-         Case "F9"
-            Return F9
-         Case Else
-            Return F10
-      End Select
-   End Function
-
-   'Private Function GetAngleTxBxFromIndex(Index As Integer) As EgtWPFLib.EgtTextBox
-   '   Select Case Index
-   '      Case 1
-   '         Return A1TxBx
-   '      Case 2
-   '         Return A2TxBx
-   '      Case 3
-   '         Return A3TxBx
-   '      Case 4
-   '         Return A4TxBx
-   '      Case 5
-   '         Return A5TxBx
-   '      Case 6
-   '         Return A6TxBx
-   '      Case 7
-   '         Return A7TxBx
-   '      Case 8
-   '         Return A8TxBx
-   '      Case 9
-   '         Return A9TxBx
-   '      Case Else
-   '         Return A10TxBx
-   '   End Select
-   'End Function
-
-   'Private Function GetHeelTxBxFromIndex(Index As Integer) As EgtWPFLib.EgtTextBox
-   '   Select Case Index
-   '      Case 1
-   '         Return H1TxBx
-   '      Case 2
-   '         Return H2TxBx
-   '      Case 3
-   '         Return H3TxBx
-   '      Case 4
-   '         Return H4TxBx
-   '      Case 5
-   '         Return H5TxBx
-   '      Case 6
-   '         Return H6TxBx
-   '      Case 7
-   '         Return H7TxBx
-   '      Case 8
-   '         Return H8TxBx
-   '      Case 9
-   '         Return H9TxBx
-   '      Case Else
-   '         Return H10TxBx
-   '   End Select
-   'End Function
-
-   Private Function GetTxBlFromIndex(Index As Integer) As TextBlock
-      Select Case Index
-         Case 1
-            Return Entity1
-         Case 2
-            Return Entity2
-         Case 3
-            Return Entity3
-         Case 4
-            Return Entity4
-         Case 5
-            Return Entity5
-         Case 6
-            Return Entity6
-         Case 7
-            Return Entity7
-         Case 8
-            Return Entity8
-         Case 9
-            Return Entity9
-         Case Else
-            Return Entity10
-      End Select
-   End Function
-
-#End Region    ' Chiamata elle Text/Check/Label
-
-#Region "SELEZIONE CHECKBOX"
-
-   ' Per gestire la selezione/deselezione delle Alzatine
-   Private Sub A_Checked(sender As Object, e As RoutedEventArgs) Handles A1.Checked, A2.Checked, A3.Checked, A4.Checked, A5.Checked, A6.Checked, A7.Checked, A8.Checked, A9.Checked, A10.Checked,
-                                                                         A1.Unchecked, A2.Unchecked, A3.Unchecked, A4.Unchecked, A5.Unchecked, A6.Unchecked, A7.Unchecked, A8.Unchecked, A9.Unchecked, A10.Unchecked
-      ' recupero il nome della Check selezionata
-      Dim bIsAlzatina As Boolean = True
-      Dim sChName As String = DirectCast(sender, CheckBox).Name
-      Dim bIsChecked As Boolean = DirectCast(sender, CheckBox).IsChecked
-      Dim sSideName As String = GetSideFromCheck(sChName, bIsAlzatina)
-      Dim sOppositeCheckBox As String = GetOppositeCheck(sChName, bIsAlzatina)
-      ' se la modifica della stato della checkbox avviene internamente al programma allora non devo eseguire nessun aggiornamento
-      If bInternalSelection Then
-         bInternalSelection = False
-         Return
-      End If
-      RefreshList(sSideName, sOppositeCheckBox, bIsAlzatina, bIsChecked)
-
-      EgtZoom(ZM.ALL)
-   End Sub
-
-   ' Per gestire la selezione/deselezione dei Frontalini
-   Private Sub F_Checked(sender As Object, e As RoutedEventArgs) Handles F1.Checked, F2.Checked, F3.Checked, F4.Checked, F5.Checked, F6.Checked, F7.Checked, F8.Checked, F9.Checked, F10.Checked,
-                                                                         F1.Unchecked, F2.Unchecked, F3.Unchecked, F4.Unchecked, F5.Unchecked, F6.Unchecked, F7.Unchecked, F8.Unchecked, F9.Unchecked, F10.Unchecked
-      ' recupero il nome della Check selezionata
-      Dim bIsAlzatina As Boolean = False
-      Dim sChName As String = DirectCast(sender, CheckBox).Name
-      Dim bIsChecked As Boolean = DirectCast(sender, CheckBox).IsChecked
-      Dim sSideName As String = GetSideFromCheck(sChName, bIsAlzatina)
-      Dim sOppositeCheckBox As String = GetOppositeCheck(sChName, bIsAlzatina)
-      ' se la modifica della stato della checkbox avviene internamente al programma allora non devo eseguire nessun aggiornamento
-      If bInternalSelection Then
-         bInternalSelection = False
-         Return
-      End If
-      RefreshList(sSideName, sOppositeCheckBox, bIsAlzatina, bIsChecked)
-
-      EgtZoom(ZM.ALL)
-   End Sub
-
-#End Region    ' Selezione CheckBox
-
-#Region "ALTEZZA, DELTA ANGOLO DI SPOGLIA"
-
-   ' altezza ALZATINA
-   Private Sub ParameterA1TxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter1ATxBx.EgtClosed
-      ' Nuovo angolo di inclinazione
-      Dim dValue As Double
-      StringToLen(Parameter1ATxBx.Text, dValue)
-      ' salvo il valore nel file ini e inserisco il valore nel file lua
-      WritePrivateProfileString("Alz&Front", "A_Height", DoubleToString(dValue, 3), m_MainWindow.GetIniFile())
-      ' aggiorno il disegno
-      LoadCurrentCompo()
-   End Sub
-
-   ' altezza FRONTALINO
-   Private Sub Parameter1FTxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter1FTxBx.EgtClosed
-      ' Nuovo angolo di inclinazione
-      Dim dValue As Double
-      StringToLen(Parameter1FTxBx.Text, dValue)
-      ' salvo il valore nel file ini e inserisco il valore nel file lua
-      WritePrivateProfileString("Alz&Front", "F_Height", DoubleToString(dValue, 3), m_MainWindow.GetIniFile())
-      ' aggiorno il disegno
-      LoadCurrentCompo()
-   End Sub
-
-   ' angolo di spoglia ALZATINA
-   Private Sub ParameterA2TxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter2ATxBx.EgtClosed
-      ' Nuovo angolo di inclinazione
-      Dim dValue As Double
-      StringToDouble(Parameter2ATxBx.Text, dValue)
-      ' salvo il valore nel file ini e inserisco il valore nel file lua
-      WritePrivateProfileString("Alz&Front", "A_DeltaAng", Parameter2ATxBx.Text, m_MainWindow.GetIniFile())
-      ' aggiorno il disegno
-      LoadCurrentCompo()
-   End Sub
-
-   ' angolo di spoglia FRONTALINO
-   Private Sub Parameter2FTxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter2FTxBx.EgtClosed
-      ' Nuovo angolo di inclinazione
-      Dim dValue As Double
-      StringToDouble(Parameter2FTxBx.Text, dValue)
-      ' salvo il valore nel file ini e inserisco il valore nel file lua
-      WritePrivateProfileString("Alz&Front", "F_DeltaAng", Parameter2FTxBx.Text, m_MainWindow.GetIniFile())
-      ' aggiorno il disegno
-      LoadCurrentCompo()
-   End Sub
-
-   Private Sub Parameter5TxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter5TxBx.EgtClosed
-      Dim dValue As Double
-      StringToDouble(Parameter5TxBx.Text, dValue)
-      ' aggiorno il disegno
-      LoadCurrentCompo()
-   End Sub
-
-#End Region    ' Altezza, delta angolo di spoglia
-
-#Region "METHODS"
-
-   ' noto il nome della checkbox (scritta nel codice xaml) selezionata restituisce il nome del lato (associato al disegno)
-   Private Function GetSideFromCheck(sNameCheck As String, bIsAlz As Boolean) As String
-      Dim sSideName As String = String.Empty
-      Dim sTypeCheck As String = "A"
-      If Not bIsAlz Then
-         sTypeCheck = "F"
-      End If
-      ' separo il nome in due
-      Dim sItems As String() = Split(sNameCheck, sTypeCheck)
-      Dim nIndex As Integer
-      ' costruisco il nome del lato
-      If sItems.Count > 1 Then
-         nIndex = CInt(sItems(1))
-         nIndex = nIndex - (MAX_LINES - m_nShow)
-         sSideName = "A" & nIndex.ToString
-      End If
-
-      Return sSideName
-   End Function
-
-   ' restituisce il nome del check opposto (Se passo una alzaztina restituisco il nome della checbox del frontalino)
-   Private Function GetOppositeCheck(sNameCheck As String, bIsAlz As Boolean) As String
-      Dim sSideName As String = String.Empty
-      Dim sTypeCheck As String = "A"
-      If Not bIsAlz Then
-         sTypeCheck = "F"
-      End If
-      ' separo il nome in due
-      Dim sItems As String() = Split(sNameCheck, sTypeCheck)
-
-      ' estraggo l'indice del lato selezionato e costruisco il nome del CheckBox opposto
-      If sItems.Count > 1 Then
-         If bIsAlz Then
-            sSideName = "F" & sItems(1).Trim
-         Else
-            sSideName = "A" & sItems(1).Trim
-         End If
-
-      End If
-
-      Return sSideName
-   End Function
-
-   Private Sub InitList()
-      ' quando avvio la pagina inizializzo tutti i lati comunicando che non sono stati modificati
-      For j As Integer = 0 To AlzFrontEntityList.Count() - 1
-         EgtSetInfo(AlzFrontEntityList(j).Id, "IsModify", 0)
-      Next
-   End Sub
-
-   ' aggiorno lo stato della dell'oggetto
-   Private Sub RefreshList(sSideName As String, sOppositeNameCheck As String, bIsAlz As Boolean, bIsChecked As Boolean)
-      For j As Integer = 0 To AlzFrontEntityList.Count() - 1
-         If AlzFrontEntityList(j).SideName = sSideName Then
-            ' se deseleziono
-            If Not bIsChecked Then
-               AlzFrontEntityList(j).Type = AlzFrontEntity.AlzFront.NONE
-               ' insrisco l'informazione nelle info del lato
-               EgtSetInfo(AlzFrontEntityList(j).Id, INFO_ALZFRONT, 0)
-               EgtSetInfo(AlzFrontEntityList(j).Id, "IsModify", 1)
-               Exit For
-            End If
-            ' se selezione di Alz. o Front.
-            If bIsAlz Then
-               AlzFrontEntityList(j).Type = AlzFrontEntity.AlzFront.ALZATINA
-               ' deseleziono il Check opposto
-               If GetChBxFrontFromName(sOppositeNameCheck).IsChecked Then
-                  bInternalSelection = True
-                  GetChBxFrontFromName(sOppositeNameCheck).IsChecked = False
-               End If
-               ' insrisco l'informazione nelle info del lato
-               EgtSetInfo(AlzFrontEntityList(j).Id, INFO_ALZFRONT, 1)
-               EgtSetInfo(AlzFrontEntityList(j).Id, "IsModify", 1)
-            Else
-               AlzFrontEntityList(j).Type = AlzFrontEntity.AlzFront.FRONTALINO
-               ' deseleziono il Check opposto
-               If GetChBxAalZFromName(sOppositeNameCheck).IsChecked Then
-                  bInternalSelection = True
-                  GetChBxAalZFromName(sOppositeNameCheck).IsChecked = False
-               End If
-               ' inserisco l'informazione nelle info del lato
-               EgtSetInfo(AlzFrontEntityList(j).Id, INFO_ALZFRONT, 2)
-               EgtSetInfo(AlzFrontEntityList(j).Id, "IsModify", 1)
-            End If
-            ' termino il ciclo
-            Exit For
-         End If
-      Next
-      ' questa funzione deve essere lanciata al termine di ogno selezione o modifica dei parametri di dimensione
-      LoadCurrentCompo()
-   End Sub
-
-#End Region   ' Methods
-
-   ' eseguo il file per generare le Alzatine e i Frontalini (stesso file Lua)
-   Private Sub LoadCurrentCompo()
-      ' !! ATTENZIONE !! : per problemi di spazio è stata spenta la text per stampare i messaggi (ma potrebbe servire?)
-      ' Pulisco l'ambiente lua
-      EgtLuaResetGlobVar(LUA_CMP_VARS)
-      EgtLuaResetGlobVar(LUA_CMP_DRAW)
-
-      Dim nCompoName As Integer
-      Dim sCompoFile As String = ""
-      Dim sCompoImage As String = ""
-
-      ' recupero il nome del direttorio
-      Dim sCompoDir As String = String.Empty
-      GetPrivateProfileString(S_ALZFRONT, K_COMPODIR, "", sCompoDir, m_MainWindow.GetIniFile())
-      ' leggo le info inserite nel campo "Alz&Front"
-      m_MainWindow.m_DrawPageUC.m_MainComponentPage.GetPrivateProfileCompo(S_ALZFRONT, K_ALZFRONT, nCompoName, sCompoFile, sCompoImage, m_MainWindow.GetIniFile())
-      'Dim sCompoImageSource As ImageSource
-
-      ' Costruisco path completa del componente
-      Dim sPath = sCompoDir & "\" & sCompoFile
-      ' Carico il file
-      EgtLuaExecFile(sPath)
-
-      ' carico la lista di variabili
-      Dim dVal As Double
-      If StringToLen(Parameter1ATxBx.Text, dVal) Then
-         EgtLuaSetGlobNumVar("CMP.A_Height", dVal)
-      End If
-      If StringToLen(Parameter1FTxBx.Text, dVal) Then
-         EgtLuaSetGlobNumVar("CMP.F_Height", dVal)
-      End If
-      If StringToLen(Parameter2ATxBx.Text, dVal) Then
-         EgtLuaSetGlobNumVar("CMP.A_DeltaAng", dVal)
-      End If
-      If StringToLen(Parameter2FTxBx.Text, dVal) Then
-         EgtLuaSetGlobNumVar("CMP.F_DeltaAng", dVal)
-      End If
-      If StringToLen(Parameter5TxBx.Text, dVal) Then
-         EgtLuaSetGlobNumVar("CMP.ThicknessRaw", dVal)
-      End If
-      ' parametri per la scrittura dei caratteri
-      EgtLuaSetGlobNumVar("CMP.BBoxRad", m_dBBoxRad)
-      EgtLuaSetGlobNumVar("CMP.HeightText", m_dH)
-
-
-      Dim sMsg As String = String.Empty
-      ' eseguo la funzione per il disegno della componente (CMP_Draw)
-      If Not EgtLuaExecLine(LUA_CMP_DRAW & "(true)") Then
-         sMsg = "Error in component execution"
-         m_bDrawOk = False
-      Else
-         EgtLuaGetGlobStringVar(LUA_CMP_VARS & ".MSG", sMsg)
-         Dim nErr As Integer = 0
-         EgtLuaGetGlobIntVar(LUA_CMP_VARS & ".ERR", nErr)
-         m_bDrawOk = (nErr = 0)
-      End If
-      ' aggiorno la grafica
-      EgtZoom(ZM.ALL)
-   End Sub
-
-
-   ' metodo utilizzato per tornare indietro alla pagina di selezione "CompoInterni/Alz&Front"
-   Private Sub BackBtn_Click(sender As Object, e As RoutedEventArgs) Handles BackBtn.Click
-      m_MainWindow.m_DrawPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
-
-      ' torno alla pagina iniziale di selezione del piano (Compo)
-      'm_MainWindow.m_DrawPageUC.BackBtn_Click(sender, e)
-
-      '--------- NUOVA GESTIONE ---------
-      ' rimuovo l'elenco di bottoni per selezionare il tipo di componente interna
-      m_MainWindow.m_DrawPageUC.LeftButtonGrd.Children.Remove(Me)
-      ' inserisco nella Grid VaribalsesGrid lo UeserControl per definire le dimensioni della componente
-      m_MainWindow.m_DrawPageUC.VariablesGrd.Children.Add(m_MainWindow.m_DrawPageUC.m_CompoDimension)
-      ' nascondo la lista dei parametri
-      m_MainWindow.m_DrawPageUC.m_CompoDimension.CollapsedAllParam()
-      ' sto uscendo dalla componente interna (quindi comunico il cambio di componente)
-      m_MainWindow.m_DrawPageUC.m_bInternalCompo = False
-      ' comunico che sto arrivando da una componente interna
-      m_MainWindow.m_DrawPageUC.m_bBackFromInternalCompo = True
-
-      'm_MainWindow.m_DrawPageUC.SelectedComponent(m_MainWindow.m_DrawPageUC.m_sMainCompo)
-      'm_MainWindow.m_DrawPageUC.m_ActiveComponentPage = DrawPageUC.Pages.CompoDimension
-   End Sub
-
-
-
-End Class
-
-Public Class AlzFrontEntity
-   Public Enum AlzFront
-      ALZATINA
-      FRONTALINO
-      NONE
-   End Enum
-
-   Private m_SideName As String
-   Private m_Id As Integer
-   Private m_Type As AlzFront = AlzFront.NONE
-
-   ' nome del lato scritto nel file nge (il nome deve avere la forma: A1, A2, .., An)
-   Public Property SideName As String
-      Get
-         Return m_SideName
-      End Get
-      Set(value As String)
-         m_SideName = value
-      End Set
-   End Property
-
-   Public Property Type As AlzFront
-      Get
-         Return m_Type
-      End Get
-      Set(value As AlzFront)
-         m_Type = value
-      End Set
-   End Property
-
-   Public Property Id As Integer
-      Get
-         Return m_Id
-      End Get
-      Set(value As Integer)
-         m_Id = value
-      End Set
-   End Property
-
-   Sub New(Name As String, CurrId As Integer, Optional CurrType As AlzFront = AlzFront.NONE)
-      m_SideName = Name
-      m_Id = CurrId
-      m_Type = CurrType
-   End Sub
-
-End Class

DrawImport/CompoDimensionUC.xaml

@@ -26,7 +26,7 @@
          <RowDefinition Height="0.5*"/>
          <RowDefinition Height="1*"/>
          <RowDefinition Height="1*"/>
-        </Grid.RowDefinitions>
+      </Grid.RowDefinitions>
 
       <TextBlock Name="Label1" Grid.Row="0"
                Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
@@ -69,18 +69,12 @@
       <EgtWPFLib:EgtTextBox Name="TextBox10" Grid.Column="1" Grid.Row="9" Width="90"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-       <!--Per confermare l'inserimento CompoInterno-->
-      <Button Name="AddBtn" Grid.Row="10" Style="{DynamicResource OmagCut_YellowTextButton}"/>
-      <Button Name="CancelBtn" Grid.Column="1" Grid.Row="10" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+      <Button Name="InternComponentBtn" Grid.Row="11" Grid.ColumnSpan="2"
+         Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
-       <!--Selezione delle componenti interne-->
-      <Button Name="InternComponentBtn" Grid.Row="10" Grid.ColumnSpan="2"
-              Style="{DynamicResource OmagCut_YellowTextButton}"/>
+        <Button Name="AddBtn" Grid.Row="10" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+        <Button Name="CancelBtn" Grid.Column="1" Grid.Row="10" Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
-      <!--Selezione di Alz&Front-->
-      <Button Name="AlzFrontBtn" Grid.Row="11" Grid.ColumnSpan="2"
-              Style="{DynamicResource OmagCut_YellowTextButton}"/>
-
-    </Grid>
+   </Grid>
 
 </UserControl>

DrawImport/CompoDimensionUC.xaml.vb

@@ -13,35 +13,15 @@ Public Class CompoDimensionUC
 
    ' Riferimento alla pagina di selezione dei componenti interni
    Friend m_InternalCompoPage As InternalComponentPageUC
-   ' Riferimento alla pagina di selezione della alzatine
-   Friend m_AlzFrontPage As AlzFrontUC
-   ' solo se è configurato il direttorio della componente allora mostro il bottone
-   Friend bEnableAlzFront As Boolean = False
 
    Private Sub CompoDimensionUC_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
-      'Creazione delle Page UserControl (per le componenti interne)
+      'Creazione delle Page UserControl
       m_InternalCompoPage = New InternalComponentPageUC
-      'Posizionemento nella griglia delle Page UserControl 
+      'Posizionemento nella griglia delle Page UserControl
       m_InternalCompoPage.SetValue(Grid.ColumnSpanProperty, 2)
       m_InternalCompoPage.SetValue(Grid.RowSpanProperty, 4)
 
-      'Creazione della Page UserControl (per le alzatine e i frontalini)
-      m_AlzFrontPage = New AlzFrontUC
-      'Posizionamento nella griglia della Page UserControl
-      m_AlzFrontPage.SetValue(Grid.ColumnSpanProperty, 2)
-      m_AlzFrontPage.SetValue(Grid.RowSpanProperty, 4)
-
-      Dim sCompoDir As String = String.Empty
-      GetPrivateProfileString(S_ALZFRONT, K_COMPODIR, "", sCompoDir, m_MainWindow.GetIniFile())
-      ' definisco il nome dei comandi presenti nella pagine
       InternComponentBtn.Content = EgtMsg(MSG_COMPONENTPAGEUC + 47)     ' Componenti interni
-      If Not String.IsNullOrEmpty(sCompoDir) Then
-         bEnableAlzFront = True
-         AlzFrontBtn.Content = "Alzatine & Frontalini"
-      Else
-         AlzFrontBtn.Visibility = Visibility.Collapsed
-      End If
-
       AddBtn.Content = EgtMsg(MSG_COMPONENTPAGEUC + 48)                 ' Aggiungi
       CancelBtn.Content = EgtMsg(MSG_COMPONENTPAGEUC + 49)              ' Rimuovi
    End Sub
@@ -53,19 +33,6 @@ Public Class CompoDimensionUC
       ' Imposto questa come pagina correntemente visualizzata nella drawpage
       m_DrawPage.m_ActiveComponentPage = DrawPageUC.Pages.CompoDimension
 
-      ' se arrivo dalla pagina delle componenti interne allora esco (non devo ricalcolare i parametri)
-      If m_DrawPage.m_bBackFromInternalCompo Then
-         ShowInternalBtn(True)
-         ShowAlzFrontBtn(bEnableAlzFront)
-         ' Se componente interno visualizzo bottoni aggiungi rimuovi
-         ShowAddRemoveBtn(m_DrawPage.m_bInternalCompo)
-         ' Imposto contesto corrente e faccio uno ZoomAll della scena con il componente
-         EgtSetCurrentContext(m_MainWindow.m_DrawPageUC.DrawScene.GetCtx())
-         EgtZoom(ZM.ALL)
-         ' termino il caricamento della pagina
-         Return
-      End If
-
       ' Se componente interno disabilito il bottone di ok della drawpage
       If m_DrawPage.m_bInternalCompo Then
          m_DrawPage.OkBtn.IsEnabled = False
@@ -74,11 +41,8 @@ Public Class CompoDimensionUC
       If m_DrawPage.sCompoName.StartsWith("PCucina") Or
          m_DrawPage.sCompoName.StartsWith("PBagno") Then
          ShowInternalBtn(True)
-         ShowAlzFrontBtn(bEnableAlzFront)
-         m_DrawPage.MessageGrid.Visibility = Visibility.Hidden
       Else
          ShowInternalBtn(False)
-         ShowAlzFrontBtn(False)
       End If
 
       ' Se componente interno visualizzo bottoni aggiungi rimuovi
@@ -94,7 +58,6 @@ Public Class CompoDimensionUC
       m_DrawPage.OkBtn.IsEnabled = True
    End Sub
 
-   ' rende visibile il bottone per inserire le componenti interne: solo nella pagine delle componenti
    Friend Sub ShowInternalBtn(value As Boolean)
       If value Then
          InternComponentBtn.Visibility = Windows.Visibility.Visible
@@ -103,16 +66,6 @@ Public Class CompoDimensionUC
       End If
    End Sub
 
-   ' rende visibile il bottone per inserire le azatine e i frontalini: solo nella pagina delle componenti
-   Friend Sub ShowAlzFrontBtn(ByVal value As Boolean)
-      If value Then
-         AlzFrontBtn.Visibility = Visibility.Visible
-      Else
-         AlzFrontBtn.Visibility = Visibility.Hidden
-      End If
-   End Sub
-
-   ' definisce se rendere visbile oppure no i bottone "Aggiungi" e "Rimuovi": presenti solo nella componenti interne
    Friend Sub ShowAddRemoveBtn(value As Boolean)
       If value Then
          m_DrawPage.SideAngleBtn.IsEnabled = False
@@ -280,18 +233,7 @@ Public Class CompoDimensionUC
       m_DrawPage.UpdateView()
    End Sub
 
-   Public Sub CollapsedAllParam()
-      For i As Integer = 1 To NUM_VAR
-         GetNameEdit(i).Visibility = Visibility.Collapsed
-         GetValueEdit(i).Visibility = Visibility.Collapsed
-      Next
-   End Sub
-
-#Region "METHODS for InternalCompo"
-
-   ' visualizzo la pagina per la selezione delle componenti interne
    Private Sub InternComponentBtn_Click(sender As Object, e As RoutedEventArgs) Handles InternComponentBtn.Click
-      m_DrawPage.m_bBackFromInternalCompo = False
       ' imposto contesto
       EgtSetCurrentContext(m_DrawPage.DrawScene.GetCtx())
       ' Nascondo layer etichette e quotature
@@ -306,25 +248,6 @@ Public Class CompoDimensionUC
       m_DrawPage.LeftButtonGrd.Children.Add(m_InternalCompoPage)
    End Sub
 
-   ' visualizzo la pagina per la selezione delle componenti interne
-   Private Sub AlzFrontBtn_Click(sender As Object, e As RoutedEventArgs) Handles AlzFrontBtn.Click
-      m_DrawPage.m_bBackFromInternalCompo = False
-      ' imposto contesto
-      EgtSetCurrentContext(m_DrawPage.DrawScene.GetCtx())
-      ' Nascondo layer etichette e quotature
-      Dim Pz As Integer = EgtGetFirstGroupInGroup(GDB_ID.ROOT)
-      EgtSetStatus(EgtGetFirstNameInGroup(Pz, "LayAux"), GDB_ST.OFF)
-      EgtSetStatus(EgtGetFirstNameInGroup(Pz, "Etichette"), GDB_ST.OFF)
-      EgtSetStatus(EgtGetFirstNameInGroup(Pz, "Quotature"), GDB_ST.OFF)
-      EgtDraw()
-
-      m_DrawPage.VariablesGrd.Children.Remove(Me)
-      m_DrawPage.m_bInternalCompo = True
-      m_DrawPage.LeftButtonGrd.Children.Add(m_AlzFrontPage)
-   End Sub
-
-
-   ' Bottone utilizzato per inserire le componenti interne
    Private Sub AddBtn_Click(sender As Object, e As RoutedEventArgs) Handles AddBtn.Click
       ' Se componente errato, non faccio alcunché
       If Not m_DrawPage.m_bDrawOk Then Return
@@ -337,17 +260,21 @@ Public Class CompoDimensionUC
             Dim nCmpInfo As Integer = 0
             If EgtGetInfo(nId, "ID", nCmpInfo) AndAlso nCmp = nCmpInfo Then
                EgtSetStatus(nId, GDB_ST.OFF)
-               UpdateInLoopReference(nCmp)
                Exit While
             End If
             nId = EgtGetNextName(nId, "HoleLabels")
          End While
       End If
       ' Esco dalla pagina
-      ExitInternalVariable()
+      m_DrawPage.VariablesGrd.Children.Remove(Me)
+      m_DrawPage.LeftButtonGrd.Children.Add(m_InternalCompoPage)
+      ' Reset componente
+      m_MainWindow.m_DrawPageUC.ResetCompoName()
+      ' Deseleziono oggetto corrente e aggiorno visualizzazione
+      EgtDeselectAll()
+      EgtDraw()
    End Sub
 
-   ' annulla l'inserimento della componente corrente
    Private Sub CancelBtn_Click(sender As Object, e As RoutedEventArgs) Handles CancelBtn.Click
       ' Cancello layer con contorno errato
       Dim nId As Integer = EgtGetFirstNameInGroup(EgtGetFirstGroupInGroup(GDB_ID.ROOT), "ErrorLay")
@@ -365,13 +292,7 @@ Public Class CompoDimensionUC
       Else
          m_DrawPage.m_bDrawOk = True
       End If
-      ' Esco dalla pagina
-      ExitInternalVariable()
-   End Sub
-
-   ' Esco dalla pagine delle variabili della componente interna: reimposto la pagina della componenti interne
-   Private Sub ExitInternalVariable()
-      ' Esco dalla pagina
+      ' Sistemo interfaccia
       m_DrawPage.VariablesGrd.Children.Remove(Me)
       m_DrawPage.LeftButtonGrd.Children.Add(m_InternalCompoPage)
       ' Reset componente
@@ -381,42 +302,4 @@ Public Class CompoDimensionUC
       EgtDraw()
    End Sub
 
-   Private Sub UpdateInLoopReference(nCmp As Integer)
-      ' aggiorno il layer "FiloTop"
-      Dim nIdInLoop As Integer = EgtGetFirstNameInGroup(EgtGetFirstGroupInGroup(GDB_ID.ROOT), "InLoop")
-      While nIdInLoop <> GDB_ID.NULL
-         Dim nCmpInfoIL As Integer = 0
-         If EgtGetInfo(nIdInLoop, "ID", nCmpInfoIL) AndAlso nCmp = nCmpInfoIL Then
-            Dim nLayFiloTop As Integer = GDB_ID.NULL
-            EgtGetInfo(nIdInLoop, "FiloTopRef", nLayFiloTop)
-            If nLayFiloTop <> GDB_ID.NULL Then
-               Dim LocalList As New List(Of Integer) From {nIdInLoop}
-               m_DrawPage.m_FiloTopUC.CreateFiloTopPreView(LocalList)
-               EgtSetStatus(nLayFiloTop, GDB_ST.ON_)
-               Exit While
-            End If
-         End If
-         nIdInLoop = EgtGetNextName(nIdInLoop, "InLoop")
-      End While
-   End Sub
-
-   ' riceve la info "ID" della componente
-   Public Sub SetStatusVisibilityInLoopReference(nCmp As Integer, Status As GDB_ST)
-      ' aggiorno il layer "FiloTop"
-      Dim nIdInLoop As Integer = EgtGetFirstNameInGroup(EgtGetFirstGroupInGroup(GDB_ID.ROOT), "InLoop")
-      While nIdInLoop <> GDB_ID.NULL
-         Dim nCmpInfoIL As Integer = 0
-         If EgtGetInfo(nIdInLoop, "ID", nCmpInfoIL) AndAlso nCmp = nCmpInfoIL Then
-            Dim nLayFiloTop As Integer = GDB_ID.NULL
-            EgtGetInfo(nIdInLoop, "FiloTopRef", nLayFiloTop)
-            If nLayFiloTop <> GDB_ID.NULL Then
-               EgtSetStatus(nLayFiloTop, Status)
-               Exit While
-            End If
-         End If
-         nIdInLoop = EgtGetNextName(nIdInLoop, "InLoop")
-      End While
-   End Sub
-
-#End Region    ' METHODS for InternalCompo
 End Class

DrawImport/CompoTrfData.xaml.vb

@@ -24,7 +24,6 @@ Public Class CompoTrfData
 
    Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
       DialogResult = True
-      SaveData()
       Close()
    End Sub
 
@@ -33,30 +32,7 @@ Public Class CompoTrfData
       Close()
    End Sub
 
-   Private Sub SaveData()
-      WritePrivateProfileString(S_TRF, K_ORDCODE, OrdCodeTxBx.Text, m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_TRF, K_ORDDESC, OrdDescTxBx.Text, m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_TRF, K_PARTCODE, PartCodeTxBx.Text, m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_TRF, K_MATCODE, MatCodeTxBx.Text, m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_TRF, K_SURFCODE, SurfCodeTxBx.Text, m_MainWindow.GetIniFile())
-      ' prima di salvare lo spessore converto in mm e poi di nuovo in stringa
-      Dim dVal As Double = 0
-      StringToLen(ThicknessTxBx.Text, dVal)
-      WritePrivateProfileString(S_TRF, K_TRFTHICKNESS, DoubleToString(dVal, 4), m_MainWindow.GetIniFile())
-   End Sub
-
    Friend Sub SetData(sOrdCode As String, sOrdDesc As String, sPartCode As String, sMatCode As String, sSurfCode As String, dTh As Double)
-      ' se verifico che non sono stati iniziliazzti i campi allora provvedo a leggere il file ini del programma
-      If sOrdCode = "" And sOrdDesc = "" And sPartCode = "" And sMatCode = "" And sSurfCode = "" Then
-         GetPrivateProfileString(S_TRF, K_ORDCODE, sOrdCode, sOrdCode, m_MainWindow.GetIniFile())
-         GetPrivateProfileString(S_TRF, K_ORDDESC, sOrdDesc, sOrdDesc, m_MainWindow.GetIniFile())
-         GetPrivateProfileString(S_TRF, K_PARTCODE, sPartCode, sPartCode, m_MainWindow.GetIniFile())
-         GetPrivateProfileString(S_TRF, K_MATCODE, sMatCode, sMatCode, m_MainWindow.GetIniFile())
-         GetPrivateProfileString(S_TRF, K_SURFCODE, sSurfCode, sSurfCode, m_MainWindow.GetIniFile())
-         ' recupero il dato dello spessore che deve essere in mm
-         dTh = GetPrivateProfileDouble(S_TRF, K_TRFTHICKNESS, dTh, m_MainWindow.GetIniFile())
-      End If
-      ' inizializzo i campi della finestra
       OrdCodeTxBx.Text = sOrdCode
       OrdDescTxBx.Text = sOrdDesc
       PartCodeTxBx.Text = sPartCode

DrawImport/DrawPageUC.xaml

@@ -64,7 +64,7 @@
                <ToggleButton Name="DimensionBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowToggleButton}" Visibility="Collapsed"/>
             </Grid>
 
-            <Grid Name="VariablesGrd" Grid.Row="1" Grid.RowSpan="2" Grid.ColumnSpan="2"/>
+            <Grid Name="VariablesGrd" Grid.Row="1" Grid.ColumnSpan="2"/>
             
             <Grid Name="MessageGrid" Grid.Row="2" Grid.ColumnSpan="2">
                <TextBlock Name="MessageTxBl" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
@@ -124,7 +124,7 @@
 
             <TextBlock Name="PartNumTxBl" Grid.Column="0" Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"
                TextAlignment="Right"/>
-            <EgtWPFLib:EgtTextBox Name="PartNumTxBx" Grid.Column="1" Width="60" IsLength="False"
+            <EgtWPFLib:EgtTextBox Name="PartNumTxBx" Grid.Column="1" Width="60"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
             </Grid>

DrawImport/DrawPageUC.xaml.vb

@@ -30,9 +30,8 @@ Public Class DrawPageUC
    Friend m_SideAngleUC As SideAngleUC
    Friend m_FiloTopUC As FiloTopUC
 
-   ' Variabile che indica se componenti interni o esterni (usato anche per definire le alzatine e i fronatlini)
+   ' Variabile che indica se componenti interni o esterni
    Friend m_bInternalCompo As Boolean = False
-   Friend m_bBackFromInternalCompo As Boolean = False
 
    ' Properties 
    Private m_sCompoDir As String = String.Empty
@@ -41,13 +40,6 @@ Public Class DrawPageUC
    Friend m_bDrawOk As Boolean = False
    Private m_bFirst As Boolean = True
 
-   Private m_SelListHole As New List(Of Integer)
-   Private m_DeselectListHole As New List(Of Integer)
-
-   ' questa variabile serve per risalire al nome della componente che ospita i componenti interni att
-   Friend m_sMainCompo As String = String.Empty
-
-
    ' Trf Data
    Private m_bTrfData As Boolean = False
    Private m_TrfOrderCode As String = ""
@@ -108,9 +100,6 @@ Public Class DrawPageUC
          Return m_nSelectedLayer
       End Get
    End Property
-   Public Sub SetCurrLayer(ByVal nCurrLayer As Integer)
-      m_nSelectedLayer = nCurrLayer
-   End Sub
 
    Enum Pages
       MainComponent
@@ -120,7 +109,6 @@ Public Class DrawPageUC
       CompoDimension
       SideAngle
       FiloTop
-      AlzFront
    End Enum
 
    Private Sub DrawPage_Initialized(sender As Object, e As EventArgs)
@@ -191,7 +179,6 @@ Public Class DrawPageUC
 
    End Sub
 
-   ' carico le impostazioni grafiche della scena (solo al primo avvio)
    Private Sub DrawPage_Loaded(sender As Object, e As RoutedEventArgs)
 
       If m_bFirst Then
@@ -218,14 +205,6 @@ Public Class DrawPageUC
          Dim DstLnColor As New Color3d(255, 0, 0)
          GetPrivateProfileColor(S_SCENE, K_DISTLINE, DstLnColor, m_MainWindow.GetIniFile())
          DrawScene.SetDistLineMaterial(DstLnColor)
-
-         '' imposto il colore di sfondo del disegno
-         'Dim BAckTopColor As New Color3d(192, 192, 192)
-         'GetPrivateProfileColor(S_SCENE, "BackTop", BAckTopColor, m_MainWindow.GetIniFile())
-         'Dim BackBottom As New Color3d(192, 192, 192)
-         'GetPrivateProfileColor(S_SCENE, "BackBottom", BackBottom, m_MainWindow.GetIniFile())
-         'DrawScene.SetViewBackground(BAckTopColor, BackBottom)
-
          ' imposto parametri OpenGL
          Dim nDriver As Integer = GetPrivateProfileInt(S_OPENGL, K_DRIVER, 3, m_MainWindow.GetIniFile())
          Dim b2Buff As Boolean = (GetPrivateProfileInt(S_OPENGL, K_DOUBLEBUFFER, 1, m_MainWindow.GetIniFile()) <> 0)
@@ -285,20 +264,16 @@ Public Class DrawPageUC
       m_sCsvName = ""
    End Sub
 
-   ' recupero il click sulla scena ed assegno il metodo a secondo della pagina aperta
    Private Sub OnMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles DrawScene.OnMouseDownScene
       ' Si può selezionare solo con il tasto sinistro e se stato NULL
       If e.Button <> Windows.Forms.MouseButtons.Left Or Not DrawScene.IsStatusNull() Then Return
       ' Si può selezionare solo se non si sta già editando un componente
       If m_ActiveComponentPage = Pages.InternalComponent Then
-         OnMouseDownSceneInternalComponent(e)
+         OnMouseDownSceneInternalComponent( e)
       ElseIf m_ActiveComponentPage = Pages.SideAngle Then
-         OnMouseDownSceneSideAngle(e)
+         OnMouseDownSceneSideAngle( e)
       ElseIf m_ActiveComponentPage = Pages.FiloTop Then
-         OnMouseDownSceneFiloTop(e)
-      ElseIf m_ActiveComponentPage = Pages.AlzFront Then
-         ' da definire
-
+         OnMouseDownSceneFiloTop( e)
       End If
    End Sub
 
@@ -363,8 +338,6 @@ Public Class DrawPageUC
          Dim nCmpInfo As Integer = 0
          If EgtGetInfo(nHLId, "ID", nCmpInfo) AndAlso nCmp = nCmpInfo Then
             EgtSetStatus(nHLId, GDB_ST.ON_)
-            ' nascondo eventuali FiloTop
-            m_CompoDimension.SetStatusVisibilityInLoopReference(nCmp, GDB_ST.OFF)
             Exit While
          End If
          nHLId = EgtGetNextName(nHLId, "HoleLabels")
@@ -467,25 +440,21 @@ Public Class DrawPageUC
                   EgtDeselectObj(nId)
                   EgtDeselectObj(nLayId)
                   Dim sLayName As String = ""
-                  If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo(nLayId, INFO_FILOTOP) Then
-                     EgtRemoveInfo(nLayId, INFO_FILOTOP)
-                     EgtRemoveInfo(nLayId, INFO_OFFSET)
-                     EgtRemoveInfo(nLayId, INFO_DEPTH)
-                     EgtResetColor(nLayId)
+                  If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo( nLayId, INFO_FILOTOP) Then
+                     EgtRemoveInfo( nLayId, INFO_FILOTOP)
+                     EgtRemoveInfo( nLayId, INFO_OFFSET)
+                     EgtRemoveInfo( nLayId, INFO_DEPTH)
+                     EgtResetColor( nLayId)
                   End If
-                  m_DeselectListHole.Add(nLayId)
-                  m_SelListHole.Remove(nLayId)
                Else
                   Dim sLayName As String = ""
-                  If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP Then
-                     EgtSelectObj(nId)
-                     EgtSelectObj(nLayId)
-                     EgtSetInfo(nLayId, INFO_FILOTOP, 1)
-                     EgtSetInfo(nLayId, INFO_OFFSET, m_FiloTopUC.FiloTopOffset)
-                     EgtSetInfo(nLayId, INFO_DEPTH, m_FiloTopUC.FiloTopDepth)
-                     EgtSetColor(nLayId, New Color3d(255, 255, 255))
-                     m_SelListHole.Add(nLayId)
-                     m_DeselectListHole.Remove(nLayId)
+                  If EgtGetName( nLayId, sLayName) AndAlso sLayName = NAME_INLOOP Then
+                     EgtSelectObj( nId)
+                     EgtSelectObj( nLayId)
+                     EgtSetInfo( nLayId, INFO_FILOTOP, 1)
+                     EgtSetInfo( nLayId, INFO_OFFSET, m_FiloTopUC.FiloTopOffset)
+                     EgtSetInfo( nLayId, INFO_DEPTH, m_FiloTopUC.FiloTopDepth)
+                     EgtSetColor( nLayId, New Color3d(255, 255, 255))
                   End If
                End If
                EgtDraw()
@@ -493,8 +462,6 @@ Public Class DrawPageUC
          End If
          nId = EgtGetNextObjInSelWin()
       End While
-      m_FiloTopUC.CreateFiloTopPreView(m_SelListHole)
-      m_FiloTopUC.EraseFiloTopPreview(m_DeselectListHole)
    End Sub
 
    Private Sub OnShowDistanceVector(sender As Object, vtDist As Vector3d) Handles DrawScene.OnShowDistanceVector
@@ -530,7 +497,6 @@ Public Class DrawPageUC
       If sCompo = m_sCompoName Then
          Return
       End If
-
       m_sCompoName = sCompo
       ' Pulisco l'ambiente lua
       ResetLuaVariables()
@@ -644,17 +610,10 @@ Public Class DrawPageUC
          m_CompoDimension.GetNameEdit(j).Text = m_CVars(i - 1).m_sName
          m_CompoDimension.GetNameEdit(j).Visibility = Windows.Visibility.Visible
          m_CompoDimension.GetValueEdit(j).Text = m_CVars(i - 1).ToString()
-         'Dim dVal As Double
-         'StringToLen(m_CVars(i - 1).ToString(), dVal)
-         'm_CompoDimension.GetValueEdit(j).Text = LenToString(dVal, 3)
          m_CompoDimension.GetValueEdit(j).Visibility = Windows.Visibility.Visible
          If m_CVars(i - 1).m_nType = 5 Then
             TryCast(m_CompoDimension.GetValueEdit(j), EgtTextBox).Keyboard = EgtTextBox.KeyboardType.Alphanumeric
             TryCast(m_CompoDimension.GetValueEdit(j), EgtTextBox).KeyboardDimension = 600
-         ElseIf m_CVars(i - 1).m_nType = 4 Then
-            TryCast(m_CompoDimension.GetValueEdit(j), EgtTextBox).Keyboard = EgtTextBox.KeyboardType.Calculator
-            TryCast(m_CompoDimension.GetValueEdit(j), EgtTextBox).IsLength = False
-            TryCast(m_CompoDimension.GetValueEdit(j), EgtTextBox).KeyboardDimension = 300
          Else
             TryCast(m_CompoDimension.GetValueEdit(j), EgtTextBox).Keyboard = EgtTextBox.KeyboardType.Calculator
             TryCast(m_CompoDimension.GetValueEdit(j), EgtTextBox).KeyboardDimension = 300
@@ -898,236 +857,7 @@ Public Class DrawPageUC
       Return True
    End Function
 
-   ' permette di inserire più di un part
-   Private Function MakeMultipleInsert(ByVal nNbr As Integer, sName As String) As Boolean
-
-      Dim InsertColor As Color3d = CompoColor(m_MainWindow.GetIniFile())
-
-      ' Imposto il contesto corrente
-      EgtSetCurrentContext(DrawScene.GetCtx())
-      Dim Pz As Integer = -1
-      Dim NxtPz As Integer = -1
-
-      ' Cancello layer regioni per selezione buchi
-      Pz = EgtGetFirstGroupInGroup(GDB_ID.ROOT)
-
-      ' identificativo univoico del gruppo di pezzi, se più di un pezzo
-      Dim sGUICode As String = String.Empty
-
-      While Pz <> -1
-         ' imposto il contesto corrente
-         EgtSetCurrentContext(DrawScene.GetCtx())
-         ' cerco un altro pezzo nell'elenco
-         NxtPz = EgtGetNextPart(Pz)
-
-         Dim SelectRegion As Integer = EgtGetFirstNameInGroup(Pz, "SelectRegion")
-         EgtErase(SelectRegion)
-         ' Cancello layer etichette, quotatura,ausiliario e box
-         EgtErase(EgtGetFirstNameInGroup(Pz, "LayAux"))
-         EgtErase(EgtGetFirstNameInGroup(Pz, "Etichette"))
-         EgtErase(EgtGetFirstNameInGroup(Pz, "Quotature"))
-         EgtErase(EgtGetFirstNameInGroup(Pz, "Box"))
-
-         ' Cancello layer etichette dei componenti interni (buchi)
-         Dim nHLId As Integer = EgtGetFirstNameInGroup(Pz, "HoleLabels")
-         While nHLId <> GDB_ID.NULL
-            EgtErase(nHLId)
-            nHLId = EgtGetFirstNameInGroup(Pz, "HoleLabels")
-         End While
-
-         ' Attivo visualizzazione misura
-         Dim nRegLayId As Integer = EgtGetFirstNameInGroup(Pz, NAME_REGION)
-         Dim nId As Integer = EgtGetFirstInGroup(nRegLayId)
-         While nId <> GDB_ID.NULL
-            If EgtGetType(nId) = GDB_TY.EXT_TEXT Then
-               EgtSetStatus(nId, GDB_ST.ON_)
-            End If
-            nId = EgtGetNext(nId)
-         End While
-
-         ' Calcolo dimensione ingombro Pezzo tramite OutLoop
-         Dim nOutLoopLayer = EgtGetFirstNameInGroup(Pz, NAME_OUTLOOP)
-         Dim b3Part As New BBox3d
-         EgtGetBBoxGlob(nOutLoopLayer, GDB_BB.STANDARD, b3Part)
-         ' Muovo la regione in Z per evitare problemi in visualizzazione
-         EgtMove(nRegLayId, New Vector3d(0, 0, DELTAZ_REG), GDB_RT.GLOB)
-
-         ' Se pezzo con dati TRF
-         If m_bTrfData Then
-            ' Nome da dati Trf
-            Dim nTextId = EgtGetFirstInGroup(nRegLayId)
-            While nTextId <> GDB_ID.NULL
-               If EgtGetType(nTextId) = GDB_TY.EXT_TEXT Then
-                  Dim sText As String = m_TrfOrderCode & "-" & m_TrfOrderDesc
-                  Dim sText2 As String = m_TrfMatCode & "-" & m_TrfSurfCode
-                  Dim sText3 As String = LenToString(b3Part.DimX(), 0) & " x " & LenToString(b3Part.DimY(), 0) & " x " & LenToString(m_TrfThickness, 0)
-                  Dim dRatio As Double = Math.Max(b3Part.DimX(), b3Part.DimY()) / Math.Min(b3Part.DimX(), b3Part.DimY())
-                  If dRatio < 5 Then
-                     sText = sText & "<br/>" & sText2 & "<br/>" & sText3
-                  Else
-                     sText = sText & "  " & sText2 & "  " & sText3
-                  End If
-                  EgtModifyText(nTextId, sText)
-                  Dim ptCen As Point3d
-                  EgtCenterPoint(nTextId, ptCen)
-                  Dim b3Text As New BBox3d
-                  EgtGetBBoxGlob(nTextId, GDB_BB.STANDARD, b3Text)
-                  Dim dCoeff As Double = Math.Min(b3Part.DimX() / b3Text.DimX(), b3Part.DimY() / b3Text.DimY()) / 1.25
-                  If dCoeff < 1 Then EgtScale(nTextId, New Frame3d(ptCen), dCoeff, dCoeff, dCoeff)
-                  Exit While
-               End If
-               nTextId = EgtGetNext(nTextId)
-            End While
-            ' Info di pezzo da dati Trf
-            EgtSetInfo(Pz, "OC", m_TrfOrderCode)
-            EgtSetInfo(Pz, "OD", m_TrfOrderDesc)
-            EgtSetInfo(Pz, "PC", m_TrfPartCode)
-            EgtSetInfo(Pz, "MT", m_TrfMatCode)
-            EgtSetInfo(Pz, "SRF", m_TrfSurfCode)
-            EgtSetInfo(Pz, "L", DoubleToString(b3Part.DimX(), 1))
-            EgtSetInfo(Pz, "W", DoubleToString(b3Part.DimY(), 1))
-            EgtSetInfo(Pz, "T", m_TrfThickness)
-            EgtSetInfo(Pz, "V1", DoubleToString(b3Part.DimX(), 1))
-            EgtSetInfo(Pz, "V2", DoubleToString(b3Part.DimY(), 1))
-            ' Se altrimenti pezzo con dati Csv
-         ElseIf m_bCsvData Then
-            ' Nome del pezzo
-            EgtSetName(Pz, m_sCsvName)
-            ' Dati Csv
-            EgtSetInfo(Pz, INFO_CSV_PART, m_sCsvName)
-            EgtSetInfo(Pz, INFO_CSV_ORD, m_sCsvOrder)
-            EgtSetInfo(Pz, INFO_CSV_DIST, m_sCsvList)
-            EgtSetInfo(Pz, INFO_CSV_MAT, m_MainWindow.m_CurrentMachine.CurrMat.sName)
-            EgtSetInfo(Pz, INFO_CSV_V1, DoubleToString(b3Part.DimX(), 1))
-            EgtSetInfo(Pz, INFO_CSV_V2, DoubleToString(b3Part.DimY(), 1))
-            ' Se definito nome lo inserisco nel testo
-            If Not String.IsNullOrWhiteSpace(m_sCsvName) Then
-               Dim nTextId = EgtGetFirstInGroup(nRegLayId)
-               While nTextId <> GDB_ID.NULL
-                  If EgtGetType(nTextId) = GDB_TY.EXT_TEXT Then
-                     Dim sText As String = String.Empty
-                     EgtTextGetContent(nTextId, sText)
-                     Dim sNewText = m_sCsvName & "<br/>" & sText
-                     EgtModifyText(nTextId, sNewText)
-                     Exit While
-                  End If
-                  nTextId = EgtGetNext(nTextId)
-               End While
-            End If
-            ' Altrimenti pezzo con dati normali
-         Else
-            ' Se definito nome lo inserisco nel testo
-            If Not String.IsNullOrWhiteSpace(sName) Then
-               Dim nTextId = EgtGetFirstInGroup(nRegLayId)
-               While nTextId <> GDB_ID.NULL
-                  If EgtGetType(nTextId) = GDB_TY.EXT_TEXT Then
-                     Dim sText As String = String.Empty
-                     EgtTextGetContent(nTextId, sText)
-                     Dim sNewText = sName & "<br/>" & sText
-                     EgtModifyText(nTextId, sNewText)
-                     Exit While
-                  End If
-                  nTextId = EgtGetNext(nTextId)
-               End While
-            End If
-         End If
-         ' Eventuale testo per indicare il sopra (solo nel caso di rettangolo)
-         If TopChBx.IsVisible() And TopChBx.IsChecked() Then
-            Utility.AddTopToPartRegion(nRegLayId)
-         End If
-         ' Scrivo testi per nesting
-         SideAngle.WriteSideAngleForNest(DrawScene.GetCtx())
-         ' Imposto colore testi
-         Utility.SetTextColor(nRegLayId)
-         ' Imposto il colore del pezzo inserito nel progetto
-         EgtSetColor(nRegLayId, InsertColor)
-         Dim EntId As Integer = EgtGetFirstInGroup(nRegLayId)
-         While EntId <> GDB_ID.NULL
-            If EgtGetType( EntId) = GDB_TY.SRF_FRGN Then EgtSetColor(EntId, InsertColor)
-            EntId = EgtGetNext(EntId)
-         End While
-
-         ' Esporto il pezzo in un file temporaneo
-         Dim sTmpFile As String = m_MainWindow.GetTempDir() & "\FlatPartCompo.Nge"
-         If Not EgtSaveObjToFile(Pz, sTmpFile, NGE.BIN) Then
-            Return False
-         End If
-
-         ' Passo al contesto principale
-         EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
-         ' Recupero flag per inserimento diretto in grezzo (altrimenti in parcheggio)
-         Dim bDirect As Boolean = (GetPrivateProfileInt(S_NEST, K_DIRECT, 0, m_MainWindow.GetIniFile()) <> 0)
-         ' Elimino eventuali precedenti pezzi vuoti
-         EgtEraseEmptyParts()
-         ' Area dei nuovi pezzi
-         Dim dNewArea As Double = 0
-
-         If nNbr > 1 Then
-            sGUICode = System.Guid.NewGuid.ToString
-         End If
-
-         ' Se esiste il file del pezzo
-         If My.Computer.FileSystem.FileExists(sTmpFile) Then
-            ' eseguo inserimento
-            For i As Integer = 1 To nNbr
-               ' Inserisco il pezzo
-               EgtInsertFile(sTmpFile)
-               ' Ne recupero l'Id
-               Dim nId2 As Integer = EgtGetLastPart()
-               ' Aggiusto per lavorazioni
-               EgtAdjustFlatPart(nId2)
-               ' Se dati Trf assegno nome univoco
-               If m_bTrfData Then EgtSetInfo(nId2, "CsvPart", m_TrfOrderCode & "-" & nId2.ToString())
-               ' Aggiorno l'area dei nuovi pezzi
-               dNewArea += GeomCalc.GetPartArea(nId2)
-
-               ' assegno l'identificatico del pezzo, se esiste
-               If Not String.IsNullOrEmpty(sGUICode) Then
-                  Dim sPreGuid As String = CreatePreGuidCode(nId2)
-                  EgtSetInfo(nId2, INFO_REFGROUP, sPreGuid & sGUICode)
-               End If
-               ' muovo il pezzo nella prima posizione di parcheggio libera
-               m_MainWindow.m_CadCutPageUC.m_NestPage.StoreOnePart(nId2, True)
-
-               ' ------------------------ AGGIUNGO PEZZO NEL VEINMATCH ----------------------------------
-               ' verifico che il pezzo sia un Piano Cucina o un Piano Bagno o un'Aletta
-               Dim sCMP As String = String.Empty
-               EgtGetInfo(nId2, "CMP", sCMP)
-               If sCMP.StartsWith("PCucina") Or sCMP.StartsWith("PBagno") Or sCMP.StartsWith("AlzFront") Then
-                  ' Aggiungo riferimento e lo inserisco in VeinMatching
-                  VeinMatching.SetRefOnPart(nId2)
-                  VeinMatching.AddPartFromDraw(nId2)
-                  ' Se richiesto posizionamento diretto, lo eseguo
-                  If bDirect Then
-                     If m_MainWindow.m_CadCutPageUC.m_NestPage.InsertOnePart(nId2) Then
-                        ' Eventuale notifica al VeinMatching
-                        VeinMatching.OnInsertPartInRaw(nId2)
-                     End If
-                  End If
-               End If
-               ' ------------------------ AGGIUNGO PEZZO NEL VEINMATCH ----------------------------------
-
-            Next
-            ' Cancello il file
-            My.Computer.FileSystem.DeleteFile(sTmpFile)
-         End If
-         ' Aggiorno Aree totale
-         m_MainWindow.m_CurrentProjectPageUC.UpdateTotalArea(dNewArea)
-         ' passo al pezzo successivo
-         Pz = NxtPz
-      End While
-      ' Aggiorno Aree da lavorare dei pezzi
-      m_MainWindow.m_CurrentProjectPageUC.UpdateToProduceArea()
-      m_MainWindow.m_CurrentProjectPageUC.ShowAreas()
-      ' Aggiorno ambiente principale
-      EgtZoom(ZM.ALL)
-      Return True
-   End Function
-
    Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
-      m_bBackFromInternalCompo = False
-      m_bInternalCompo = False
-
       m_SceneButtons.MeasureBtn.IsChecked = False
       ' se sto definendo un componente interno non posso uscire
       If m_ActiveComponentPage = Pages.CompoDimension And m_bInternalCompo Then Return
@@ -1138,8 +868,7 @@ Public Class DrawPageUC
       ' Leggo numero di pezzi da inserire
       Dim InsNbr As Integer = Int32.Parse(PartNumTxBx.Text)
       ' Passo al contesto principale
-      'MakeInsert(InsNbr, sPartName)
-      MakeMultipleInsert(InsNbr, sPartName)
+      MakeInsert(InsNbr, sPartName)
       ' Aggiorno ambiente principale
       EgtZoom(ZM.ALL)
       ' Elimino nome del componente precedente
@@ -1147,9 +876,7 @@ Public Class DrawPageUC
       ' Reset inclinazioni
       m_SideAngleUC.DeleteSideAngle()
       ' Chiudo compo interni nel caso siano aperti
-      LeftButtonGrd.Children.Remove(m_MainComponentPage.m_SecondaryComponentPage)
       LeftButtonGrd.Children.Remove(m_CompoDimension.m_InternalCompoPage)
-      LeftButtonGrd.Children.Remove(m_CompoDimension.m_AlzFrontPage)
       ' Istruzioni per chiudere ImportPageUC e aprire CadCutPageUC
       m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_DrawPageUC)
       m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_CurrentProjectPageUC)
@@ -1157,11 +884,7 @@ Public Class DrawPageUC
 
    End Sub
 
-   ' esco dalla pagina corrente
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_bBackFromInternalCompo = False
-      m_bInternalCompo = False
-
       m_SceneButtons.MeasureBtn.IsChecked = False
       ' Elimino nome del componente precedente
       m_sCompoName = String.Empty
@@ -1170,7 +893,6 @@ Public Class DrawPageUC
       ' Chiudo compo secondari e interni nel caso siano aperti
       LeftButtonGrd.Children.Remove(m_MainComponentPage.m_SecondaryComponentPage)
       LeftButtonGrd.Children.Remove(m_CompoDimension.m_InternalCompoPage)
-      LeftButtonGrd.Children.Remove(m_CompoDimension.m_AlzFrontPage)
       ' Istruzioni per chiudere ImportPageUC e aprire CadCutPageUC
       m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_DrawPageUC)
       m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_CurrentProjectPageUC)
@@ -1180,10 +902,8 @@ Public Class DrawPageUC
    Private Sub TrfDataBtn_Click(sender As Object, e As RoutedEventArgs) Handles TrfDataBtn.Click
       If m_bTrfData Then
          Dim DlgTrfData As New CompoTrfData(m_MainWindow)
-         ' carico i dati appena salvati nella pagina
          DlgTrfData.SetData(m_TrfOrderCode, m_TrfOrderDesc, m_TrfPartCode, m_TrfMatCode, m_TrfSurfCode, m_TrfThickness)
          If DlgTrfData.ShowDialog() Then
-            ' recupero i dati salvati nella pagina
             DlgTrfData.GetData(m_TrfOrderCode, m_TrfOrderDesc, m_TrfPartCode, m_TrfMatCode, m_TrfSurfCode, m_TrfThickness)
          End If
       ElseIf m_bCsvData Then
@@ -1206,9 +926,6 @@ Public Class DrawPageUC
          ElseIf m_ActiveComponentPage = Pages.InternalComponent Then
             m_PrevSideAnglePage = Pages.InternalComponent
             LeftButtonGrd.Children.Remove(m_CompoDimension.m_InternalCompoPage)
-         ElseIf m_ActiveComponentPage = Pages.AlzFront Then
-            m_PrevSideAnglePage = Pages.AlzFront
-            LeftButtonGrd.Children.Remove(m_CompoDimension.m_AlzFrontPage)
          End If
          VariablesGrd.Children.Add(m_SideAngleUC)
          FiloTopBtn.IsEnabled = False
@@ -1262,8 +979,6 @@ Public Class DrawPageUC
    Private Sub EngraveBtn_Click(sender As Object, e As RoutedEventArgs) Handles EngraveBtn.Click
       m_SceneButtons.MeasureBtn.IsChecked = False
       If EngraveBtn.IsChecked Then
-         ' Aumento lo spazio disponibile per inserirei i parametri (tolgo spazio ad eventuali messaggi)
-         Grid.SetRowSpan(VariablesGrd, 2)
          ' Imposto modalità
          m_SideAngleUC.m_Mode = SideAngleUC.ModeOpt.ENGRAVE
          If m_ActiveComponentPage = Pages.CompoDimension Then
@@ -1272,9 +987,6 @@ Public Class DrawPageUC
          ElseIf m_ActiveComponentPage = Pages.InternalComponent Then
             m_PrevSideAnglePage = Pages.InternalComponent
             LeftButtonGrd.Children.Remove(m_CompoDimension.m_InternalCompoPage)
-         ElseIf m_ActiveComponentPage = Pages.AlzFront Then
-            m_PrevSideAnglePage = Pages.AlzFront
-            LeftButtonGrd.Children.Remove(m_CompoDimension.m_AlzFrontPage)
          End If
          VariablesGrd.Children.Add(m_SideAngleUC)
          FiloTopBtn.IsEnabled = False
@@ -1295,7 +1007,6 @@ Public Class DrawPageUC
          EgtSetStatus(EgtGetFirstNameInGroup(PartId, COMPO_LAYER_QUOTATURE), GDB_ST.OFF)
          EgtSetStatus(EgtGetFirstNameInGroup(PartId, COMPO_LAYER_ETICHETTE), GDB_ST.OFF)
       Else
-         Grid.SetRowSpan(VariablesGrd, 2)
          VariablesGrd.Children.Remove(m_SideAngleUC)
          If m_PrevSideAnglePage = Pages.CompoDimension Then
             VariablesGrd.Children.Add(m_CompoDimension)
@@ -1334,9 +1045,6 @@ Public Class DrawPageUC
          ElseIf m_ActiveComponentPage = Pages.InternalComponent Then
             m_PrevSideAnglePage = Pages.InternalComponent
             LeftButtonGrd.Children.Remove(m_CompoDimension.m_InternalCompoPage)
-         ElseIf m_ActiveComponentPage = Pages.AlzFront Then
-            m_PrevSideAnglePage = Pages.AlzFront
-            LeftButtonGrd.Children.Remove(m_CompoDimension.m_AlzFrontPage)
          End If
          VariablesGrd.Children.Add(m_SideAngleUC)
          SideAngleBtn.IsEnabled = False
@@ -1385,40 +1093,35 @@ Public Class DrawPageUC
    End Sub
 
    Private Sub FiloTopBtn_Click(sender As Object, e As RoutedEventArgs) Handles FiloTopBtn.Click
-      m_SelListHole.Clear()
-      m_DeselectListHole.Clear()
       m_SceneButtons.MeasureBtn.IsChecked = False
       If FiloTopBtn.IsChecked Then
          ' Imposto modalità
          If m_ActiveComponentPage = Pages.CompoDimension Then
             m_PrevSideAnglePage = Pages.CompoDimension
-            VariablesGrd.Children.Remove(m_CompoDimension)
+            VariablesGrd.Children.Remove( m_CompoDimension)
          ElseIf m_ActiveComponentPage = Pages.InternalComponent Then
             m_PrevSideAnglePage = Pages.InternalComponent
-            LeftButtonGrd.Children.Remove(m_CompoDimension.m_InternalCompoPage)
-         ElseIf m_ActiveComponentPage = Pages.AlzFront Then
-            m_PrevSideAnglePage = Pages.AlzFront
-            LeftButtonGrd.Children.Remove(m_CompoDimension.m_AlzFrontPage)
+            LeftButtonGrd.Children.Remove( m_CompoDimension.m_InternalCompoPage)
          End If
-         VariablesGrd.Children.Add(m_FiloTopUC)
+         VariablesGrd.Children.Add( m_FiloTopUC)
          SideAngleBtn.IsEnabled = False
          EngraveBtn.IsEnabled = False
          DripCutBtn.IsEnabled = False
          MessageGrid.Visibility = Windows.Visibility.Hidden
          BackBtn.Visibility = Windows.Visibility.Hidden
-         MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6)   ' Selezionare un contorno
+         MessageTxBx.Text = EgtMsg( MSG_DRAWPAGEUC + 6)   ' Selezionare un contorno
          MessageBrd.Background = Application.Current.FindResource("OmagCut_Green")
          ' In ogni caso, nascondo layer delle misure
-         Dim PartId As Integer = EgtGetFirstInGroup(GDB_ID.ROOT)
-         EgtSetStatus(EgtGetFirstNameInGroup(PartId, COMPO_LAYER_AUX), GDB_ST.OFF)
-         EgtSetStatus(EgtGetFirstNameInGroup(PartId, COMPO_LAYER_QUOTATURE), GDB_ST.OFF)
-         EgtSetStatus(EgtGetFirstNameInGroup(PartId, COMPO_LAYER_ETICHETTE), GDB_ST.OFF)
+         Dim PartId As Integer = EgtGetFirstInGroup( GDB_ID.ROOT)
+         EgtSetStatus(EgtGetFirstNameInGroup( PartId, COMPO_LAYER_AUX), GDB_ST.OFF)
+         EgtSetStatus(EgtGetFirstNameInGroup( PartId, COMPO_LAYER_QUOTATURE), GDB_ST.OFF)
+         EgtSetStatus(EgtGetFirstNameInGroup( PartId, COMPO_LAYER_ETICHETTE), GDB_ST.OFF)
       Else
-         VariablesGrd.Children.Remove(m_FiloTopUC)
+         VariablesGrd.Children.Remove( m_FiloTopUC)
          If m_PrevSideAnglePage = Pages.CompoDimension Then
-            VariablesGrd.Children.Add(m_CompoDimension)
+            VariablesGrd.Children.Add( m_CompoDimension)
          ElseIf m_PrevSideAnglePage = Pages.InternalComponent Then
-            LeftButtonGrd.Children.Add(m_CompoDimension.m_InternalCompoPage)
+            LeftButtonGrd.Children.Add( m_CompoDimension.m_InternalCompoPage)
          End If
          SideAngleBtn.IsEnabled = m_bEnableSideAngle
          EngraveBtn.IsEnabled = True
@@ -1456,7 +1159,7 @@ Public Class DrawPageUC
          Case Pages.SideAngle
             VariablesGrd.Children.Remove( m_SideAngleUC)
          Case Pages.FiloTop
-            VariablesGrd.Children.Remove(m_FiloTopUC)
+            VariablesGrd.Children.Remove( m_FiloTopUC)
       End Select
 
       ' Pulisco l'ambiente lua
@@ -1492,10 +1195,7 @@ Public Class DrawPageUC
             Case 2        ' intero
                Return m_nVal.ToString()
             Case 3        ' lunghezza
-               'Dim dVal As Double
-               'StringToLen(m_sVal, dVal)
-               Return LenToString(m_dVal, 4)
-               'Return DoubleToString(EgtToUiUnits(m_dVal), 4)
+               Return DoubleToString(EgtToUiUnits(m_dVal), 4)
             Case 4        ' double
                Return DoubleToString(m_dVal, 4)
             Case 5        ' stringa
@@ -1520,13 +1220,12 @@ Public Class DrawPageUC
                End If
             Case 3        ' lunghezza
                Dim dVal As Double
-               If bConvertUnits Then
-                  StringToLen(sVal, dVal)
-                  m_dVal = dVal
-                  Return True
-               Else
-                  StringToDouble(sVal, dVal)
-                  m_dVal = dVal
+               If StringToDouble(sVal, dVal) Then
+                  If bConvertUnits Then
+                     m_dVal = EgtFromUiUnits(dVal)
+                  Else
+                     m_dVal = dVal
+                  End If
                   Return True
                End If
             Case 4        ' double

DrawImport/Engrave.vb

@@ -79,7 +79,7 @@ Module Engrave
       End Function
 
       Friend Function GetEngraveAff(cCol As Color3d, ByRef dAff As Double, ByRef dLar As Double) As Boolean
-         For Each Ctsa As CTE In m_ListCte
+         For Each Ctsa In m_ListCte
             If Ctsa.m_bOk And
                Math.Abs(cCol.R - Ctsa.m_R) < m_nTol And
                Math.Abs(cCol.G - Ctsa.m_G) < m_nTol And

DrawImport/FiloTopUC.xaml

@@ -41,11 +41,7 @@
                FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
       <EgtWPFLib:EgtTextBox Name="Parameter2TxBx" Grid.Column="1" Grid.Row="11" Width="90"
                Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-      <TextBlock Name="Parameter3TxBl" Grid.Row="12" Text="Arrotonda"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
-      <CheckBox Name="Parameter3ChBx" Grid.Row="12" Grid.Column="1" Style="{StaticResource OmagCut_CheckBox_Single}"
-             HorizontalAlignment="Center" Margin="0,0,6,0"/>
-    </Grid>
+
+   </Grid>
 
 </UserControl>

DrawImport/FiloTopUC.xaml.vb

@@ -7,8 +7,6 @@ Public Class FiloTopUC
    ' Riferimento alla pagina che ha aperto SideAngleUC
    Private m_CallingPage As MainWindow.Pages
 
-   Private m_SelList As New List(Of Integer)
-
    ' Offset della sfilettatura
    Private m_dFiloTopOffset As Double = 0
    Friend ReadOnly Property FiloTopOffset As Double
@@ -25,13 +23,6 @@ Public Class FiloTopUC
       End Get
    End Property
 
-   ' esegue l'arrotindamento sugli angoli del percorso utensile
-   Private m_bCornerradius As Boolean = False
-   Friend ReadOnly Property bCornerRadius As Boolean
-      Get
-         Return m_bCornerradius
-      End Get
-   End Property
 
    Private Sub FiloTopUC_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       ' Imposto riferimenti ad altre pagine
@@ -52,18 +43,14 @@ Public Class FiloTopUC
       End If
 
       ' Gestisco visualizzazione dei parametri
-      ParameterTxBl.Visibility = Windows.Visibility.Visible
+      Parameter2TxBl.Visibility = Windows.Visibility.Visible
       Parameter2TxBx.Visibility = Windows.Visibility.Visible
-      Parameter3TxBl.Visibility = Windows.Visibility.Visible
 
       ' Aggiorno valori
       m_dFiloTopOffset = GetPrivateProfileDouble( S_SIDES, K_FILOTOPOFFSET, 5, m_MainWindow.GetIniFile())
       ParameterTxBx.Text = LenToString( m_dFiloTopOffset, 3)
       m_dFiloTopDepth = GetPrivateProfileDouble( S_SIDES, K_FILOTOPDEPTH, 5, m_MainWindow.GetIniFile())
-      Parameter2TxBx.Text = LenToString(m_dFiloTopDepth, 3)
-      m_bCornerradius = GetPrivateProfileInt(S_SIDES, K_ROUNDOFF, 0, m_MainWindow.GetIniFile()) <> 0
-      Parameter3ChBx.IsChecked = m_bCornerradius
-      m_SelList.Clear()
+      Parameter2TxBx.Text = LenToString( m_dFiloTopDepth, 3)
    End Sub
 
    Private Sub FiloTopUC_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
@@ -87,8 +74,6 @@ Public Class FiloTopUC
          End While
          nPartId = EgtGetNextPart(nPartId)
       End While
-      ' aggiorno la preview
-      CreateFiloTopPreView(m_SelList, False)
    End Sub
 
    Private Sub Parameter2TxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter2TxBx.EgtClosed
@@ -110,161 +95,4 @@ Public Class FiloTopUC
       End While
    End Sub
 
-   Private Sub Parameter3ChBx_Checked() Handles Parameter3ChBx.Click
-      ' Assegno il valore
-      m_bCornerradius = Parameter3ChBx.IsChecked
-      WritePrivateProfileString(S_SIDES, K_ROUNDOFF, If(m_bCornerradius, "1", "0"), m_MainWindow.GetIniFile())
-      ' Aggiorno le info del profilo
-      Dim nPartId As Integer = EgtGetFirstPart()
-      While nPartId <> GDB_ID.NULL
-         Dim nLayId As Integer = EgtGetFirstLayer(nPartId)
-         While nLayId <> GDB_ID.NULL
-            Dim sLayName As String = ""
-            If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo(nLayId, INFO_FILOTOP) Then
-               EgtSetInfo(nLayId, INFO_ROUNDOFF, If(m_bCornerradius, 1, 0))
-            End If
-            nLayId = EgtGetNextLayer(nLayId)
-         End While
-         nPartId = EgtGetNextPart(nPartId)
-      End While
-      ' aggiorno la preview (False = blocco la lettura dei dati della componente)
-      CreateFiloTopPreView(m_SelList, False)
-   End Sub
-
-   Public Sub CreateFiloTopPreView(SelList As List(Of Integer), Optional bReadInfo As Boolean = True)
-      m_SelList = SelList
-      If m_SelList.Count < 1 Then Return
-      Dim nPartId As Integer = EgtGetFirstPart()
-      While nPartId <> GDB_ID.NULL
-         Dim nLayId As Integer = EgtGetFirstLayer(nPartId)
-         While nLayId <> GDB_ID.NULL
-            Dim sLayName As String = ""
-            ' verifico che lemento corrente appartenga all'elenco degli elementi selezionati
-            Dim bIsSelected As Boolean = m_SelList.Find(Function(value As Integer)
-                                                           Return value = nLayId
-                                                        End Function) <> 0
-            If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo(nLayId, INFO_FILOTOP) AndAlso bIsSelected Then
-               ' ---------------------- Inizio GESTIONE PREVIEW percorso -------------------------------
-               Dim nLayFiloTop As Integer = GDB_ID.NULL
-               Dim nInLoopRef As Integer = GDB_ID.NULL
-               nLayFiloTop = EgtGetFirstNameInGroup(nPartId, "FiloTop")
-               EgtGetInfo(nLayFiloTop, "InLoopRef", nInLoopRef)
-               ' verifico il Layer "FiloTop" sia associato all'InLoop corrente
-               While (nLayFiloTop <> GDB_ID.NULL AndAlso nInLoopRef <> nLayId)
-                  nLayFiloTop = EgtGetNextName(nLayFiloTop, "FiloTop")
-                  EgtGetInfo(nLayFiloTop, "InLoopRef", nInLoopRef)
-               End While
-
-               ' se non esiste il Layer "FiloTop"
-               If nLayFiloTop = GDB_ID.NULL Then
-                  ' lo creo
-                  nLayFiloTop = EgtCreateGroup(nPartId)
-                  EgtSetName(nLayFiloTop, "FiloTop")
-                  EgtSetInfo(nLayFiloTop, "InLoopRef", nLayId)
-                  EgtSetInfo(nLayId, "FiloTopRef", nLayFiloTop)
-               End If
-
-               ' carico i dati del filo top selezionato
-               If bReadInfo Then
-                  EgtGetInfo(nLayFiloTop, INFO_OFFSET, m_dFiloTopOffset)
-                  ParameterTxBx.Text = LenToString(m_dFiloTopOffset, 3)
-                  EgtGetInfo(nLayFiloTop, INFO_DEPTH, m_dFiloTopDepth)
-                  Parameter2TxBx.Text = LenToString(m_dFiloTopDepth, 3)
-                  Dim nVal As Integer = If(m_bCornerradius, 1, 0)
-                  EgtGetInfo(nLayFiloTop, INFO_ROUNDOFF, nVal)
-                  Parameter3ChBx.IsChecked = If(nVal = 1, True, False)
-                  m_bCornerradius = Parameter3ChBx.IsChecked
-               End If
-
-               ' procedo alla creazione della curva
-               Dim nIdCompoCurve As Integer = GDB_ID.NULL
-               ' cancello un eventuale curva composita creata in precedenza
-               nIdCompoCurve = EgtGetFirstNameInGroup(nLayFiloTop, "OffsetPreView")
-               If nIdCompoCurve <> GDB_ID.NULL Then
-                  EgtErase(nIdCompoCurve)
-               End If
-               Dim nCompoCurve As New List(Of Integer)
-               ' costruisco il percorso chiuso dati i lati di contorno 
-               Dim nLine As Integer = EgtGetFirstInGroup(nLayId)
-               While nLine <> GDB_ID.NULL
-                  nCompoCurve.Add(nLine)
-                  nLine = EgtGetNext(nLine)
-               End While
-               Dim PtNearStart As Point3d
-               Dim nInfoRoundOff As Integer = If(m_bCornerradius, 1, 0)
-
-               nIdCompoCurve = EgtCreateCurveCompoByChain(nLayFiloTop, nCompoCurve.ToArray, PtNearStart, False)
-               EgtSetName(nIdCompoCurve, "OffsetPreView")
-
-               ' salvo i dati nel layer FiloTop
-               EgtSetInfo(nLayFiloTop, INFO_OFFSET, m_dFiloTopOffset)
-               EgtSetInfo(nLayFiloTop, INFO_DEPTH, m_dFiloTopDepth)
-               EgtSetInfo(nLayFiloTop, INFO_ROUNDOFF, nInfoRoundOff)
-
-               Dim bOk As Boolean = False
-               ' leggo che tipo di offset applicare (Round, Extend)
-               If nInfoRoundOff <> 1 Then
-                  bOk = EgtOffsetCurve(nIdCompoCurve, -m_dFiloTopOffset, OFF_TYPE.EXTEND)
-               Else
-                  bOk = EgtOffsetCurve(nIdCompoCurve, -m_dFiloTopOffset, OFF_TYPE.FILLET)
-               End If
-
-               ' se la generazione della curva non va a buon fine
-               If Not bOk Then
-                  EgtErase(nLayFiloTop)
-                  EgtRemoveInfo(nLayId, "FiloTopRef")
-                  EgtOutLog("Error in generation OffsetPreView in TopEgde ")
-               End If
-               ' ---------------------- Fine GESTIONE PREVIEW percorso -------------------------------
-            End If
-               nLayId = EgtGetNextLayer(nLayId)
-         End While
-         nPartId = EgtGetNextPart(nPartId)
-      End While
-      EgtDraw()
-   End Sub
-
-   ' riceve la lista dei LayerFiloTop che devono essere eliminati
-   Public Sub EraseFiloTopPreview(EraseList As List(Of Integer))
-      Dim m_EraseList As List(Of Integer) = EraseList
-      If m_EraseList.Count < 1 Then Return
-      Dim nPartId As Integer = EgtGetFirstPart()
-      While nPartId <> GDB_ID.NULL
-         Dim nLayId As Integer = EgtGetFirstLayer(nPartId)
-         While nLayId <> GDB_ID.NULL
-            Dim sLayName As String = ""
-            Dim bIsSelected As Boolean = m_EraseList.Find(Function(value As Integer)
-                                                             Return value = nLayId
-                                                          End Function) <> 0
-            If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso bIsSelected Then
-               ' ---------------------- Inizio GESTIONE PREVIEW percorso -------------------------------
-               Dim nLayFiloTop As Integer = GDB_ID.NULL
-               Dim nInLoopRef As Integer = GDB_ID.NULL
-               nLayFiloTop = EgtGetFirstNameInGroup(nPartId, "FiloTop")
-               EgtGetInfo(nLayFiloTop, "InLoopRef", nInLoopRef)
-               ' cerco il Layer associato all'InLoop corrente
-               While (nLayFiloTop <> GDB_ID.NULL AndAlso nInLoopRef <> nLayId)
-                  nLayFiloTop = EgtGetNextName(nLayFiloTop, "FiloTop")
-                  EgtGetInfo(nLayFiloTop, "InLoopRef", nInLoopRef)
-               End While
-
-               ' se non esiste il Layer
-               If nLayFiloTop = GDB_ID.NULL Then
-                  ' esco 
-                  Return
-               Else
-                  ' lo elimino
-                  EgtErase(nLayFiloTop)
-                  EraseList.Remove(nLayId)
-               End If
-               ' ---------------------- Fine GESTIONE PREVIEW percorso -------------------------------
-            End If
-            nLayId = EgtGetNextLayer(nLayId)
-         End While
-         nPartId = EgtGetNextPart(nPartId)
-      End While
-      EgtDraw()
-   End Sub
-
-
 End Class

DrawImport/ImportPageUC.xaml

@@ -49,28 +49,15 @@
             <Grid.RowDefinitions>
                <RowDefinition Height="0.5*"/>
                <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="7.25*"/>
-               <RowDefinition Height="0.75*"/>
+               <RowDefinition Height="8*"/>
                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
             <TextBlock Name="FilePathTxBl" Foreground="White" Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             <ListBox Name="FileListBox" Grid.Row="1" Grid.RowSpan="2" ItemTemplate="{DynamicResource DataTemplateItem}"
-                     ItemsSource="{Binding ItemList}"/>
+                ItemsSource="{Binding ItemList}"/>
 
-                <Grid Grid.Row="3" Margin="0,0,8,0">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="4*"/>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
-                    <EgtWPFLib:EgtTextBox Name="FindTxBx" Grid.Column="0"
-                               Style="{DynamicResource OmagCut_LeftKeyboardTextBoxNoBorder}"/>
-                    <Button Name="ClearFindBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" Margin="0,6,2,6">
-                        <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}" Width="30" />
-                    </Button>
-                </Grid> 
-            
-            <Border Name="MessageBrd" Grid.Row="5" BorderThickness="0,1,0,0" BorderBrush="Gray">
+            <Border Name="MessageBrd" Grid.Row="4" BorderThickness="0,1,0,0" BorderBrush="Gray">
                <TextBlock Name="MessageTxBx" TextAlignment="Center"
                    Style="{DynamicResource OmagCut_LowerCaseCharacterTextBlock}"/>
             </Border>
@@ -114,7 +101,7 @@
 
                <TextBlock Name="PartNumTxBl" Grid.Column="0" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"
                   TextAlignment="Right"/>
-               <EgtWPFLib:EgtTextBox Name="PartNumTxBx" Grid.Column="1" Width="60" IsLength="False"
+               <EgtWPFLib:EgtTextBox Name="PartNumTxBx" Grid.Column="1" Width="60"
                   Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
             </Grid>
 

DrawImport/ImportPageUC.xaml.vb

@@ -297,36 +297,6 @@ Public Class ImportPageUC
       End Select
    End Sub
 
-   Private Sub FindTxBx_EgtClosed(sender As Object, e As EventArgs) Handles FindTxBx.EgtClosed
-      ' Elimino spazi iniziali e finali
-      FindTxBx.Text = FindTxBx.Text.Trim()
-      ' ricarico la lista dei file
-      LoadCurrDir()
-      Dim UpdateListFile As New List(Of IconListBoxItem)
-      ' Se esiste un nome
-      If Not String.IsNullOrWhiteSpace(FindTxBx.Text) Then
-         For Each Item As IconListBoxItem In FileListBox.ItemsSource
-            If Item.Name.ToLower.Contains(FindTxBx.Text.ToLower) Then
-               UpdateListFile.Add(Item)
-            End If
-         Next
-      End If
-      If UpdateListFile.Count > 0 Then
-         FileListBox.ItemsSource = UpdateListFile
-      Else
-         FileListBox.ItemsSource = m_MainWindow.m_ImportItemList
-      End If
-   End Sub
-
-   Private Sub ClearFindBtn_Click() Handles ClearFindBtn.Click
-      ' svuoto la text
-      FindTxBx.Text = ""
-      ' ricarico la lista dei file
-      LoadCurrDir()
-      ' e aggiorno la lista dei file
-      FileListBox.ItemsSource = m_MainWindow.m_ImportItemList
-   End Sub
-
    Private Function ClearView() As Boolean
       ' Pulisco il DB geometrico locale
       EgtNewFile()
@@ -606,36 +576,6 @@ Public Class ImportPageUC
       End If
    End Sub
 
-   ' metodo utilizzato per definire il colore dei pezzi DXF importati
-   Private Sub ColorRegion(nCtx As Integer)
-
-      ' Leggo dati corrispondenza colore
-      Dim InsertColor As Color3d = CompoColor(m_MainWindow.GetIniFile())
-
-      ' Imposto contesto corrente
-      EgtSetCurrentContext(nCtx)
-      ' Ciclo sui pezzi
-      Dim PartId As Integer = EgtGetFirstPart()
-      While PartId <> GDB_ID.NULL
-         ' Ciclo sui layer delle regioni
-         Dim RegionId As Integer = EgtGetFirstNameInGroup(PartId, NAME_REGION)
-         While RegionId <> GDB_ID.NULL
-            EgtSetColor(RegionId, InsertColor)
-            ' Ciclo sulle regioni
-            Dim EntId As Integer = EgtGetFirstInGroup(RegionId)
-            While EntId <> GDB_ID.NULL
-               If EgtGetType( EntId) = GDB_TY.SRF_FRGN Then EgtSetColor(EntId, InsertColor)
-               EntId = EgtGetNext(EntId)
-            End While
-            RegionId = EgtGetNextName(PartId, NAME_REGION)
-         End While
-         ' passo al pezzo successico
-         PartId = EgtGetNextPart(PartId)
-      End While
-      ' Aggiorno scritte per angoli sui lati
-      WriteSideAngleForNest(nCtx)
-   End Sub
-
    Private Sub UseLayerBtn_Click(sender As Object, e As RoutedEventArgs) Handles UseLayerBtn.Click
       ' Creo i pezzi
       Dim nType As Integer = If(m_nFileType = FT.NGE, FPC_TYPE.NGE, FPC_TYPE.LAYER)
@@ -649,8 +589,6 @@ Public Class ImportPageUC
       If GetPrivateProfileInt(S_COLORTOENGRAVE, K_CTE_ENABLE, 0, m_MainWindow.GetIniFile()) <> 0 Then
          Engrave.ColorToEngrave(ImportScene.GetCtx())
       End If
-      ' gestico il colore degli elementi da importare (devono avere una regione definita!
-      ColorRegion(ImportScene.GetCtx())
       ' Eseguo zoom
       ImportScene.ZoomAll()
       ' disabilito bottoni UseLayer e UseRegion, abilito bottoni Reset e Insert
@@ -681,8 +619,6 @@ Public Class ImportPageUC
       If GetPrivateProfileInt(S_COLORTOENGRAVE, K_CTE_ENABLE, 0, m_MainWindow.GetIniFile()) <> 0 Then
          Engrave.ColorToEngrave(ImportScene.GetCtx())
       End If
-      ' gestico il colore degli elementi da importare (devono avere una regione definita!
-      ColorRegion(ImportScene.GetCtx())
       ' Eseguo zoom
       ImportScene.ZoomAll()
       ' disabilito bottoni UseLayer e UseRegion, abilito bottoni Reset e Insert
@@ -713,8 +649,6 @@ Public Class ImportPageUC
       If GetPrivateProfileInt(S_COLORTOENGRAVE, K_CTE_ENABLE, 0, m_MainWindow.GetIniFile()) <> 0 Then
          Engrave.ColorToEngrave(ImportScene.GetCtx())
       End If
-      ' gestico il colore degli elementi da importare (devono avere una regione definita!
-      ColorRegion(ImportScene.GetCtx())
       ' Eseguo zoom
       ImportScene.ZoomAll()
       ' disabilito bottoni UseLayer e UseRegion, abilito bottoni Reset e Insert
@@ -838,10 +772,6 @@ Public Class ImportPageUC
          EgtErase(EgtGetFirstNameInGroup(PartId, SELECT_REGION_LAYER))
          PartId = EgtGetNextPart(PartId)
       End While
-
-      ' identificativo univoico del gruppo di pezzi, se più di un "Repeat"
-      Dim sGUICode As New List(Of String)
-
       ' Scrivo testi per nesting
       SideAngle.WriteSideAngleForNest(ImportScene.GetCtx())
       ' Imposto riferimento sul centro geometrico di ogni pezzo
@@ -851,54 +781,26 @@ Public Class ImportPageUC
       ' Salvo tutti i pezzi in un file temporaneo
       Dim sTmpFile As String = m_MainWindow.GetTempDir() & "\FlatPart" & ".Nge"
       If Not EgtSaveFile(sTmpFile, NGE.BIN) Then Return
-
-      ' Determino numero ripetizioni
-      Dim nRepeat = 1
-      StringToInt(PartNumTxBx.Text, nRepeat)
-      nRepeat = Math.Min(Math.Max(1, nRepeat), 50)
-      ' creo il riferimento
-      If nRepeat > 1 Then
-         ' per ogni pezze del file DXF creo un gruppo
-         Dim nIdTemp As Integer = EgtGetFirstPart()
-         While nIdTemp <> GDB_ID.NULL
-            Dim sPreGuid As String = CreatePreGuidCode(nIdTemp)
-            sGUICode.Add(sPreGuid & System.Guid.NewGuid.ToString)
-            nIdTemp = EgtGetNextPart(nIdTemp)
-         End While
-      End If
-
       ' Passo al contesto principale
       EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
       ' Recupero flag per inserimento diretto in grezzo (altrimenti in parcheggio)
       Dim bDirect As Boolean = (GetPrivateProfileInt(S_NEST, K_DIRECT, 0, m_MainWindow.GetIniFile()) <> 0)
       ' Elimino eventuali precedenti pezzi vuoti
       EgtEraseEmptyParts()
-
+      ' Determino numero ripetizioni
+      Dim nRepeat = 1
+      StringToInt(PartNumTxBx.Text, nRepeat)
+      nRepeat = Math.Min(Math.Max(1, nRepeat), 50)
       ' Inserisco i pezzi nell'ambiente principale e recupero Id primo pezzo inserito
       Dim nFirstId As Integer = EgtGetLastPart()
       For nInd As Integer = 1 To nRepeat
          Dim nFirst2Id As Integer = EgtGetLastPart()
          EgtInsertFile(sTmpFile)
-
-         Dim FirstOfImport As Integer = EgtGetNextPart(nFirst2Id)
-         If FirstOfImport = GDB_ID.NULL Then FirstOfImport = EgtGetFirstPart()
-         Dim Index As Integer = 1
-         While FirstOfImport <> GDB_ID.NULL And Index <= sGUICode.Count
-            If Not String.IsNullOrEmpty(sGUICode(Index - 1)) Then
-               EgtSetInfo(FirstOfImport, INFO_REFGROUP, sGUICode(Index - 1))
-               Index += 1
-            Else
-               Exit While
-            End If
-            FirstOfImport = EgtGetNextPart(FirstOfImport)
-         End While
-
          nFirst2Id = If(nFirst2Id <> GDB_ID.NULL, EgtGetNextPart(nFirst2Id), EgtGetFirstPart())
          ' Eventuale inserimento pezzi in VeinMatching
          VeinMatching.AddParts(sTmpFile, nFirst2Id)
       Next
       nFirstId = If(nFirstId <> GDB_ID.NULL, EgtGetNextPart(nFirstId), EgtGetFirstPart())
-
       ' Cancello il file
       If My.Computer.FileSystem.FileExists(sTmpFile) Then
          My.Computer.FileSystem.DeleteFile(sTmpFile)
@@ -907,7 +809,7 @@ Public Class ImportPageUC
       Dim dNewArea As Double = 0
       Dim nId As Integer = nFirstId
       While nId <> GDB_ID.NULL
-         dNewArea += GeomCalc.GetPartArea(nId)
+         dNewArea += GeomCalc.GetPartArea( nId)
          ' Passo al pezzo successivo
          nId = EgtGetNextPart(nId)
       End While
@@ -918,7 +820,6 @@ Public Class ImportPageUC
          ' Passo al pezzo successivo
          nId = EgtGetNextPart(nId)
       End While
-
       ' Ciclo sui pezzi inseriti
       nId = nFirstId
       While nId <> GDB_ID.NULL
@@ -931,26 +832,26 @@ Public Class ImportPageUC
          If m_nFileType = FT.DXF Or m_nFileType = FT.NGE Then
             ' Eventuale testo per indicare il sopra
             If TopBtn.IsChecked() Then
-               Utility.AddTopToPartRegion(nRegId)
+               Utility.AddTopToPartRegion( nRegId)
             End If
             ' Se richiesti, inserisco dati Ordine, Distinta, Nome, Origine
             If m_bEnableOrderList Then
                ' Cerco il nome del pezzo
                Dim sName As String = ""
-               EgtGetName(nId, sName)
+               EgtGetName( nId, sName)
                ' Recupero il box del pezzo
-               Dim b3Reg As New BBox3d : EgtGetBBox(nRegId, GDB_BB.IGNORE_TEXT + GDB_BB.IGNORE_DIM, b3Reg)
+               Dim b3Reg As New BBox3d : EgtGetBBox( nRegId, GDB_BB.IGNORE_TEXT + GDB_BB.IGNORE_DIM, b3Reg)
                ' Aggiungo info equivalenti a CSV
                EgtSetInfo(nId, INFO_CSV_PART, sName)
                EgtSetInfo(nId, INFO_CSV_ORD, m_sOrder)
                EgtSetInfo(nId, INFO_CSV_DIST, m_sList)
                EgtSetInfo(nId, INFO_CSV_MAT, m_MainWindow.m_CurrentMachine.CurrMat.sName)
-               EgtSetInfo(nId, INFO_CSV_V1, DoubleToString(b3Reg.DimX(), 1))
-               EgtSetInfo(nId, INFO_CSV_V2, DoubleToString(b3Reg.DimY(), 1))
+               EgtSetInfo(nId, INFO_CSV_V1, DoubleToString( b3Reg.DimX(), 1))
+               EgtSetInfo(nId, INFO_CSV_V2, DoubleToString( b3Reg.DimY(), 1))
             End If
          End If
          ' Imposto colore testi
-         Utility.SetTextColor(nRegId)
+         Utility.SetTextColor( nRegId)
          ' Imposto path di provenienza
          EgtSetInfo(nId, INFO_SOU_PATH, IO.Path.Combine(m_sCurrDir, m_sCurrFile))
          ' Inserisco in parcheggio
@@ -970,7 +871,7 @@ Public Class ImportPageUC
       ' Eventuale aggiornamento VeinMatching
       VeinMatching.ZoomAll()
       ' Aggiorno Aree totale e da lavorare dei pezzi
-      m_MainWindow.m_CurrentProjectPageUC.UpdateTotalArea(dNewArea)
+      m_MainWindow.m_CurrentProjectPageUC.UpdateTotalArea( dNewArea)
       m_MainWindow.m_CurrentProjectPageUC.UpdateToProduceArea()
       m_MainWindow.m_CurrentProjectPageUC.ShowAreas()
       ' Aggiorno ambiente principale

DrawImport/InternalComponentPageUC.xaml.vb

@@ -1,5 +1,4 @@
-Imports System.IO
-Imports EgtUILib
+Imports EgtUILib
 
 Public Class InternalComponentPageUC
 
@@ -18,14 +17,13 @@ Public Class InternalComponentPageUC
       m_bIsFirstPage = True
       LoadPage()
       CurrentBtn = Nothing
-      ' bottone per selezionare la seconda pagina di componenti interni
       Compo9.SetValue(Grid.ColumnProperty, 0)
       Compo9.SetValue(Grid.ColumnSpanProperty, 2)
-      LabelCompo9.Text = EgtMsg(MSG_COMPONENTPAGEUC + 9)                           ' Altri
+      LabelCompo9.Text = EgtMsg(MSG_COMPONENTPAGEUC + 9)
       ImageCompo9.Visibility = Windows.Visibility.Hidden
       LabelCompo9.Visibility = Windows.Visibility.Visible
       ' Se i componenti interni sono più di 8 viene visualizzato il bottone "Altri" altrimenti no
-      Dim nCount As Integer = GetPrivateProfileInt(S_INTCOMPO, K_INT_COUNT, 0, m_MainWindow.GetIniFile())
+      Dim nCount As Integer = GetPrivateProfileInt("InternalCompo", "Count", 0, m_MainWindow.GetIniFile())
       If nCount > 8 Then
          Compo9.Visibility = Windows.Visibility.Visible
       Else
@@ -164,10 +162,10 @@ Public Class InternalComponentPageUC
 
    Private Sub Compo_Click(sender As Object, e As RoutedEventArgs) Handles Compo1.Click, Compo2.Click, Compo3.Click, Compo4.Click, Compo5.Click, Compo6.Click, Compo7.Click, Compo8.Click
       CurrentBtn = e.Source
-      Dim CompoName As String = S_INTCOMPO & GetIndexFromButton(CurrentBtn).ToString
+      Dim CompoName As String = "InternalCompo" & GetIndexFromButton(CurrentBtn).ToString
       m_sCurrCompoFam = CompoName
       ' m_SecondaryComponentPage.m_sCurrCompo = String.Empty
-      Dim nCount As Integer = GetPrivateProfileInt(CompoName, K_CMP_COUNT, 0, m_MainWindow.GetIniFile())
+      Dim nCount As Integer = GetPrivateProfileInt(CompoName, "Count", 0, m_MainWindow.GetIniFile())
       If nCount > 1 Then
          m_MainWindow.m_DrawPageUC.LeftButtonGrd.Children.Remove(Me)
          m_MainWindow.m_DrawPageUC.m_ActiveComponentPage = DrawPageUC.Pages.SecondaryComponent
@@ -253,7 +251,7 @@ Public Class InternalComponentPageUC
    Private Sub LoadPage()
       Dim nDeltaSecondPage As Integer = 8
       ' Leggo numero di componenti presenti
-      Dim nCompoNumber As Integer = GetPrivateProfileInt(S_INTCOMPO, K_INT_COUNT, 0, m_MainWindow.GetIniFile())
+      Dim nCompoNumber As Integer = GetPrivateProfileInt("InternalCompo", "Count", 0, m_MainWindow.GetIniFile())
       ' Calcolo indici a seconda della pagina in cui sono
       If m_bIsFirstPage Then
          ClearButton(nCompoNumber)
@@ -268,7 +266,7 @@ Public Class InternalComponentPageUC
       Dim ThicknessConverter As New ThicknessConverter
 
       ' Assegnazione immagine e testo ai Button
-      For index As Integer = 1 To 8
+      For index = 1 To 8
          Dim CustomThickness As Thickness = ThicknessConverter.ConvertFromString("0")
          Dim nCompoName As Integer
          Dim sCompo As String = ""
@@ -286,23 +284,12 @@ Public Class InternalComponentPageUC
          ' Verifico presenza immagine e la aggiungo
          If sCompoImage.Length <> 0 Then
             Try
-               Dim sPath As String = m_MainWindow.GetResourcesDir() & "\" & sCompoImage
-               If File.Exists(sPath) Then
-                  sCompoImageSource = ImageConverter.ConvertFromString(sPath)
-                  GetImage(index).Height = 65
-                  GetImage(index).Width = 65
-                  GetImage(index).Source = sCompoImageSource
-                  GetLabel(index).SetValue(Grid.ColumnProperty, 1)
-                  GetLabel(index).SetValue(Grid.ColumnSpanProperty, 1)
-               Else
-                  sCompoImage = String.Empty
-                  GetImage(index).Height = 0
-                  GetImage(index).Width = 0
-                  CustomThickness.Right = 0
-                  GetImage(index).Margin = CustomThickness
-                  GetLabel(index).SetValue(Grid.ColumnProperty, 0)
-                  GetLabel(index).SetValue(Grid.ColumnSpanProperty, 2)
-               End If
+               sCompoImageSource = ImageConverter.ConvertFromString(m_MainWindow.GetResourcesDir() & "\" & sCompoImage)
+               GetImage(index).Height = 65
+               GetImage(index).Width = 65
+               GetImage(index).Source = sCompoImageSource
+               GetLabel(index).SetValue(Grid.ColumnProperty, 1)
+               GetLabel(index).SetValue(Grid.ColumnSpanProperty, 1)
             Catch ex As Exception
                EgtOutLog("Error loading image " & sCompoImage)
                sCompoImage = String.Empty
@@ -377,27 +364,7 @@ Public Class InternalComponentPageUC
 
    Private Sub BackBtn_Click(sender As Object, e As RoutedEventArgs) Handles BackBtn.Click
       m_MainWindow.m_DrawPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
-
-      '--------- NUOVA GESTIONE ---------
-      If m_MainWindow.m_DrawPageUC.m_CompoDimension.bEnableAlzFront Then
-         ' rimuovo l'elenco di bottoni per selezionare il tipo di componente interna
-         m_MainWindow.m_DrawPageUC.LeftButtonGrd.Children.Remove(Me)
-         ' inserisco nella Grid VaribalsesGrid lo UeserControl per definire le dimensioni della componente
-         m_MainWindow.m_DrawPageUC.VariablesGrd.Children.Add(m_MainWindow.m_DrawPageUC.m_CompoDimension)
-         ' nascondo la lista dei parametri
-         m_MainWindow.m_DrawPageUC.m_CompoDimension.CollapsedAllParam()
-         ' sto uscendo dalla componente interna (quindi comunico il cambio di componente)
-         m_MainWindow.m_DrawPageUC.m_bInternalCompo = False
-         ' comunico che sto arrivando da una componente interna
-         m_MainWindow.m_DrawPageUC.m_bBackFromInternalCompo = True
-         Return
-      End If
-
-      '--------- VECCHIA GESTIONE --------- 
-      ' torno alla pagina iniziale di selezione del piano (Compo)
       m_MainWindow.m_DrawPageUC.BackBtn_Click(sender, e)
-      'm_MainWindow.m_DrawPageUC.SelectedComponent(m_MainWindow.m_DrawPageUC.m_sMainCompo)
-      m_MainWindow.m_DrawPageUC.m_ActiveComponentPage = DrawPageUC.Pages.CompoDimension
    End Sub
 
 End Class

DrawImport/MainComponentPageUC.xaml.vb

@@ -167,10 +167,10 @@ Public Class MainComponentPageUC
 
    Private Sub Compo_Click(sender As Object, e As RoutedEventArgs) Handles Compo1.Click, Compo2.Click, Compo3.Click, Compo4.Click, Compo5.Click, Compo6.Click, Compo7.Click, Compo8.Click
       CurrentBtn = DirectCast(e.Source, Button)
-      Dim CompoName As String = S_COMPO & GetIndexFromButton(CurrentBtn).ToString
+      Dim CompoName As String = "Compo" & GetIndexFromButton(CurrentBtn).ToString
       m_sCurrCompoFam = CompoName
       m_SecondaryComponentPage.m_sCurrCompo = String.Empty
-      Dim nCount As Integer = GetPrivateProfileInt(CompoName, K_CMP_COUNT, 0, m_MainWindow.GetIniFile())
+      Dim nCount As Integer = GetPrivateProfileInt(CompoName, "Count", 0, m_MainWindow.GetIniFile())
       If nCount > 1 Then
          m_MainWindow.m_DrawPageUC.LeftButtonGrd.Children.Remove(Me)
          m_MainWindow.m_DrawPageUC.m_ActiveComponentPage = DrawPageUC.Pages.SecondaryComponent
@@ -253,7 +253,7 @@ Public Class MainComponentPageUC
    Private Sub LoadPage()
       Dim nDeltaSecondPage As Integer = 8
       ' Leggo numero di componenti presenti
-      Dim nCompoNumber As Integer = GetPrivateProfileInt(S_COMPO, K_CMP_COUNT, 0, m_MainWindow.GetIniFile())
+      Dim nCompoNumber As Integer = GetPrivateProfileInt("Compo", "Count", 0, m_MainWindow.GetIniFile())
       ' Calcolo indici a seconda della pagina in cui sono
       If m_bIsFirstPage Then
          ClearButton(nCompoNumber)
@@ -268,7 +268,7 @@ Public Class MainComponentPageUC
       Dim ThicknessConverter As New ThicknessConverter
 
       'Assegnazione immagine e testo ai Button
-      For index As Integer = 1 To 8
+      For index = 1 To 8
          Dim CustomThickness As New Thickness(0)
          Dim nCompoName As Integer = GetPrivateProfileInt("Compo" & index + nDeltaSecondPage, "Name", 0, m_MainWindow.GetIniFile())
          Dim sCompoImage As String = ""

DrawImport/SecondaryComponentPageUC.xaml.vb

@@ -14,7 +14,6 @@ Public Class SecondaryComponentPageUC
    ' Variabile che contiene il nome del componente selezionato
    Friend m_sCurrCompo As String = String.Empty
 
-   ' dopo aver definito la forma della componente definisco quali parametri usare per la sua definizione
    Private Sub SecondaryComponentPage_Loaded(sender As Object, e As RoutedEventArgs)
 
       m_MainComponentPage = m_MainWindow.m_DrawPageUC.m_MainComponentPage
@@ -26,17 +25,17 @@ Public Class SecondaryComponentPageUC
       Dim ImageConverter As New ImageSourceConverter
       Dim ThicknessConverter As New ThicknessConverter
 
-      m_sMainCompoName = m_MainComponentPage.m_sCurrCompoFam
+      m_sMainCompoName = m_MainComponentPage.m_sCurrCompoFam  '"Compo" & m_MainComponentPage.GetIndexFromButton(CurrentMainBtn)
 
       'Assegnazione immagine e testo ai Button
-      Dim nCount As Integer = GetPrivateProfileInt(m_sMainCompoName, K_CMP_COUNT, 0, m_MainWindow.GetIniFile())
+      Dim nCount As Integer = GetPrivateProfileInt(m_sMainCompoName, "Count", 0, m_MainWindow.GetIniFile())
       ClearButton(nCount)
       For index As Integer = 1 To nCount
          Dim CustomThickness As Thickness = ThicknessConverter.ConvertFromString("0")
-         Dim nCompoName As Integer = GetPrivateProfileInt(m_sMainCompoName, S_EXTCOMPO & index, 0, m_MainWindow.GetIniFile())
+         Dim nCompoName As Integer = GetPrivateProfileInt(m_sMainCompoName, "Compo" & index, 0, m_MainWindow.GetIniFile())
          Dim sCompo As String = ""
          Dim sCompoImage As String = ""
-         m_MainComponentPage.GetPrivateProfileCompo(m_sMainCompoName, S_EXTCOMPO & index, nCompoName, sCompo, sCompoImage, m_MainWindow.GetIniFile())
+         m_MainComponentPage.GetPrivateProfileCompo(m_sMainCompoName, "Compo" & index, nCompoName, sCompo, sCompoImage, m_MainWindow.GetIniFile())
          Dim sCompoImageSource As ImageSource
 
          'verifico presenza immagine e la aggiungo
@@ -220,10 +219,8 @@ Public Class SecondaryComponentPageUC
 
       ' Carico componente
       m_MainWindow.m_DrawPageUC.SelectedComponent(sCompo)
-      m_MainWindow.m_DrawPageUC.m_sMainCompo = sCompo
       m_sCurrCompo = "Compo" & GetButtonNumber(CurrentBtn.Name)
       m_MainWindow.m_DrawPageUC.VariablesGrd.Children.Add(m_MainWindow.m_DrawPageUC.m_CompoDimension)
-
       'm_MainWindow.m_DrawPageUC.DimensionBtn.IsChecked = True
       m_MainWindow.m_DrawPageUC.SideAngleBtn.IsChecked = False
       m_MainWindow.m_DrawPageUC.FiloTopBtn.IsChecked = False

DrawImport/SideAngle.vb

@@ -159,7 +159,7 @@ Module SideAngle
       Return True
    End Function
 
-   Friend Function WriteSideAngleOnLoop(LoopId As Integer, TextLayId As Integer) As Boolean
+   Private Function WriteSideAngleOnLoop(LoopId As Integer, TextLayId As Integer) As Boolean
       ' Verifiche
       If LoopId = GDB_ID.NULL Or TextLayId = GDB_ID.NULL Then Return False
       ' Calcolo dimensione ingombro Loop
@@ -201,7 +201,7 @@ Module SideAngle
    Friend Sub ColorToSideAngle(nCtx As Integer)
       ' Leggo dati corrispondenza colore-angolo
       Dim CurrCSA As New ColorSideAngs
-      CurrCSA.Read(m_MainWindow.GetIniFile)
+      CurrCSA.Read( m_MainWindow.GetIniFile)
       ' Imposto contesto corrente
       EgtSetCurrentContext(nCtx)
       ' Ciclo sui pezzi
@@ -212,27 +212,27 @@ Module SideAngle
          Dim LoopId As Integer = EgtGetFirstNameInGroup(PartId, NAME_OUTLOOP)
          While LoopId <> GDB_ID.NULL
             ' Ciclo sulle curve
-            Dim PrevId As Integer = EgtGetLastInGroup(LoopId)
-            Dim EntId As Integer = EgtGetFirstInGroup(LoopId)
+            Dim PrevId As Integer = EgtGetLastInGroup( LoopId)
+            Dim EntId As Integer = EgtGetFirstInGroup( LoopId)
             While EntId <> GDB_ID.NULL
-               Dim NextId As Integer = EgtGetNext(EntId)
-               If NextId = GDB_ID.NULL Then NextId = EgtGetFirstInGroup(LoopId)
-               If VerifySideAnglePossible(PrevId, EntId, NextId, bOutLoop) Then
+               Dim NextId As Integer = EgtGetNext( EntId)
+               If  NextId = GDB_ID.NULL Then NextId = EgtGetFirstInGroup( LoopId)
+               If VerifySideAnglePossible( PrevId, EntId, NextId, bOutLoop) Then
                   Dim colEnt As Color3d
-                  If EgtGetColor(EntId, colEnt) Then
+                  If EgtGetColor( EntId, colEnt) Then
                      Dim dAng As Double
                      Dim dHeel As Double
-                     If CurrCSA.GetSideAngHeel(colEnt, dAng, dHeel) Then
-                        EgtSetInfo(EntId, INFO_SIDE_ANGLE, dAng)
-                        EgtSetInfo(EntId, INFO_ORIG_SIDE_ANGLE, dAng)
-                        EgtSetInfo(EntId, INFO_HEEL, dHeel)
+                     If CurrCSA.GetSideAngHeel( colEnt, dAng, dHeel) Then
+                        EgtSetInfo( EntId, INFO_SIDE_ANGLE, dAng)
+                        EgtSetInfo( EntId, INFO_ORIG_SIDE_ANGLE, dAng)
+                        EgtSetInfo( EntId, INFO_HEEL, dHeel)
                      End If
                   End If
                End If
                PrevId = EntId
-               EntId = EgtGetNext(EntId)
+               EntId = EgtGetNext( EntId)
             End While
-            If bOutLoop Then
+            If bOutLoop then
                bOutLoop = False
                LoopId = EgtGetFirstNameInGroup(PartId, NAME_INLOOP)
             Else
@@ -371,7 +371,7 @@ Module SideAngle
       End Function
 
       Friend Function GetSideAngHeel( cCol As Color3d, ByRef dAng As Double, ByRef dHeel As Double) As Boolean
-         For Each Ctsa As CTSA In m_ListCtsa
+         For Each Ctsa In m_ListCtsa
             If Ctsa.m_bOk And
                Math.Abs( cCol.R - Ctsa.m_R) < m_nTol And
                Math.Abs( cCol.G - Ctsa.m_G) < m_nTol And

DrawImport/SideAngleUc.xaml

@@ -5,7 +5,7 @@
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
    mc:Ignorable="d" 
-   d:DesignHeight="636.9" d:DesignWidth="255.9">
+   d:DesignHeight="597.1" d:DesignWidth="255.9">
 
    <!-- Definizione della Grid Laterale -->
    <Grid Name="VariablesCompoGrid"  Grid.RowSpan="2">
@@ -28,7 +28,7 @@
          <RowDefinition Height="1*"/>
          <RowDefinition Height="1*"/>
          <RowDefinition Height="0.2*"/>
-         <RowDefinition Height="5*"/>
+         <RowDefinition Height="4*"/>
          <!--<RowDefinition Height="0.5*"/>
          <RowDefinition Height="0.5*"/>
          <RowDefinition Height="0.5*"/>-->
@@ -56,7 +56,7 @@
       <TextBlock Name="Entity1" Grid.Row="1" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A1" Grid.Column="1" Grid.Row="1" Height="30" Width="40" HorizontalAlignment="Right"
          Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A1TxBx" Grid.Column="2" Grid.Row="1" Width="60" IsLength="False"
+      <EgtWPFLib:EgtTextBox Name="A1TxBx" Grid.Column="2" Grid.Row="1" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H1TxBx" Grid.Column="3" Grid.Row="1" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -64,7 +64,7 @@
       <TextBlock Name="Entity2" Grid.Row="2" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A2" Grid.Column="1" Grid.Row="2" Height="30" Width="40" HorizontalAlignment="Right"
          Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A2TxBx" Grid.Column="2" Grid.Row="2" Width="60" IsLength="False"
+      <EgtWPFLib:EgtTextBox Name="A2TxBx" Grid.Column="2" Grid.Row="2" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H2TxBx" Grid.Column="3" Grid.Row="2" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -72,7 +72,7 @@
       <TextBlock Name="Entity3" Grid.Row="3" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A3" Grid.Column="1" Grid.Row="3" Height="30" Width="40" HorizontalAlignment="Right"
          Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A3TxBx" Grid.Column="2" Grid.Row="3" Width="60" IsLength="False"
+      <EgtWPFLib:EgtTextBox Name="A3TxBx" Grid.Column="2" Grid.Row="3" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H3TxBx" Grid.Column="3" Grid.Row="3" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -80,7 +80,7 @@
       <TextBlock Name="Entity4" Grid.Row="4" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A4" Grid.Column="1" Grid.Row="4" Height="30" Width="40" HorizontalAlignment="Right"
          Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A4TxBx" Grid.Column="2" Grid.Row="4" Width="60" IsLength="False"
+      <EgtWPFLib:EgtTextBox Name="A4TxBx" Grid.Column="2" Grid.Row="4" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H4TxBx" Grid.Column="3" Grid.Row="4" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -88,7 +88,7 @@
       <TextBlock Name="Entity5" Grid.Row="5" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A5" Grid.Column="1" Grid.Row="5" Height="30" Width="40" HorizontalAlignment="Right"
          Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A5TxBx" Grid.Column="2" Grid.Row="5" Width="60" IsLength="False"
+      <EgtWPFLib:EgtTextBox Name="A5TxBx" Grid.Column="2" Grid.Row="5" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H5TxBx" Grid.Column="3" Grid.Row="5" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -96,7 +96,7 @@
       <TextBlock Name="Entity6" Grid.Row="6" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A6" Grid.Column="1" Grid.Row="6" Height="30" Width="40" HorizontalAlignment="Right"
          Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A6TxBx" Grid.Column="2" Grid.Row="6" Width="60" IsLength="False"
+      <EgtWPFLib:EgtTextBox Name="A6TxBx" Grid.Column="2" Grid.Row="6" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H6TxBx" Grid.Column="3" Grid.Row="6" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -104,7 +104,7 @@
       <TextBlock Name="Entity7" Grid.Row="7" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A7" Grid.Column="1" Grid.Row="7" Height="30" Width="40" HorizontalAlignment="Right"
          Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A7TxBx" Grid.Column="2" Grid.Row="7" Width="60" IsLength="False"
+      <EgtWPFLib:EgtTextBox Name="A7TxBx" Grid.Column="2" Grid.Row="7" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H7TxBx" Grid.Column="3" Grid.Row="7" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -112,7 +112,7 @@
       <TextBlock Name="Entity8" Grid.Row="8" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A8" Grid.Column="1" Grid.Row="8" Height="30" Width="40" HorizontalAlignment="Right"
          Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A8TxBx" Grid.Column="2" Grid.Row="8" Width="60" IsLength="False"
+      <EgtWPFLib:EgtTextBox Name="A8TxBx" Grid.Column="2" Grid.Row="8" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H8TxBx" Grid.Column="3" Grid.Row="8" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -120,7 +120,7 @@
       <TextBlock Name="Entity9" Grid.Row="9" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A9" Grid.Column="1" Grid.Row="9" Height="30" Width="40" HorizontalAlignment="Right"
          Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A9TxBx" Grid.Column="2" Grid.Row="9" Width="60" IsLength="False"
+      <EgtWPFLib:EgtTextBox Name="A9TxBx" Grid.Column="2" Grid.Row="9" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H9TxBx" Grid.Column="3" Grid.Row="9" Width="60"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
@@ -128,14 +128,14 @@
       <TextBlock Name="Entity10" Grid.Row="10" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
       <CheckBox Name="A10" Grid.Column="1" Grid.Row="10" Height="30" Width="40" HorizontalAlignment="Right"
           Margin="-20,0,0,0"/>
-      <EgtWPFLib:EgtTextBox Name="A10TxBx" Grid.Column="2" Grid.Row="10" Width="60" IsLength="False"
+      <EgtWPFLib:EgtTextBox Name="A10TxBx" Grid.Column="2" Grid.Row="10" Width="60"
                             Margin="0,0,0,-2"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
       <EgtWPFLib:EgtTextBox Name="H10TxBx" Grid.Column="3" Grid.Row="10" Width="60"
                             Margin="0,0,0,-2"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
-      <Grid Grid.Column="0" Grid.Row="12" Grid.ColumnSpan="4" >
+      <Grid Grid.Column="0" Grid.Row="12" Grid.ColumnSpan="4">
           <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="1.5*"/>
                 <ColumnDefinition Width="0.3*"/>
@@ -143,11 +143,10 @@
                 <ColumnDefinition Width="0.6*"/>
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
-                <RowDefinition Height="0.9*"/>
-                <RowDefinition Height="0.9*"/>
-                <RowDefinition Height="0.9*"/>
-                <RowDefinition Height="0.9*"/>
-                <RowDefinition Height="0.9*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
             <TextBlock Name="Parameter1TxBl" Grid.Row="0" Grid.ColumnSpan="2"
@@ -169,7 +168,7 @@
             <UniformGrid Rows="1" Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2" Width="90" >
                 <EgtWPFLib:EgtTextBox Name="Parameter2aTxBx" 
                                       Grid.Column="2" Grid.Row="12"
-                                      Width="40" Height="30" IsLength="False"
+                                      Width="40" Height="30"
                Style="{StaticResource OmagCut_CalculatorTextBox}"/>
                 <EgtWPFLib:EgtTextBox Name="Parameter2bTxBx" 
                                       Grid.Column="3" Grid.Row="12" 
@@ -197,16 +196,6 @@
                                   Margin="0,0,0,-2"
                                   Width="85" Height="30"
                Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-            <TextBlock Name="Parameter5TxBl" Grid.Row="4" Grid.ColumnSpan="2"
-               Text="Angolo"
-               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
-            <EgtWPFLib:EgtTextBox Name="Parameter5TxBx" 
-                                  Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="4" 
-                                  Margin="0,0,0,-2"
-                                  Width="85" Height="30" IsLength="False"
-               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-
         </Grid>
 
         <!--<TextBlock Name="Parameter1TxBl" Grid.Row="11" Text="Offset"

DrawImport/SideAngleUc.xaml.vb

@@ -34,9 +34,7 @@ Public Class SideAngleUC
    Friend m_dDripOffset2 As Double = 0
    Friend m_nEngrNbr2 As Integer = 1
    Friend m_dDripDepth As Double = 10
-   Friend m_dEngraveDepth2 As Double = 15
    Friend m_dDripShort As Double = 0
-   Friend m_dEngraveAngle As Double = 0
 
    Private CurrEntityDrip As DripEntity
 
@@ -77,12 +75,10 @@ Public Class SideAngleUC
 
       ' Inizializzo lati per angoli e per gocciolatoi (ne compilo la lista e aggiungo la scritta nel disegno)
       InitSides()
-      '' Aggiorno testi nel disegno e creo i gocciolatoi
-      'RefreshSideAngleText()
-      ' Aggiorno check e valori
-      RefreshCheckAndValue()
       ' Aggiorno testi nel disegno e creo i gocciolatoi
       RefreshSideAngleText()
+      ' Aggiorno check e valori
+      RefreshCheckAndValue()
 
       ' Gestisco visualizzazione di tutti i parametri
       If m_Mode = ModeOpt.SIDEANGLE Then
@@ -107,9 +103,6 @@ Public Class SideAngleUC
          ' Accorciamento
          Parameter4TxBl.Visibility = Windows.Visibility.Hidden
          Parameter4TxBx.Visibility = Windows.Visibility.Hidden
-         ' Angolo 
-         Parameter5TxBl.Visibility = Windows.Visibility.Hidden
-         Parameter5TxBx.Visibility = Windows.Visibility.Hidden
       Else
          ' se aggiungo gli ENGRAVE e i DRIP
 
@@ -121,12 +114,10 @@ Public Class SideAngleUC
             GetAngleTxBxFromIndex(Index).Visibility = Windows.Visibility.Visible
             GetHeelTxBxFromIndex(Index).Visibility = Windows.Visibility.Visible
          Next
-
          ' Offset
          Parameter1TxBl.Visibility = Windows.Visibility.Visible
          Parameter1TxBx.Visibility = Windows.Visibility.Visible
          Parameter2TxBl.Visibility = Windows.Visibility.Visible
-
          ' Offset2
          If m_Mode <> ModeOpt.ENGRAVE Then
             Parameter2TxBx.Visibility = Windows.Visibility.Visible
@@ -137,33 +128,12 @@ Public Class SideAngleUC
             Parameter2aTxBx.Visibility = Windows.Visibility.Visible
             Parameter2bTxBx.Visibility = Windows.Visibility.Visible
          End If
-
          ' Affondamento
          Parameter3TxBl.Visibility = Windows.Visibility.Visible
          Parameter3TxBx.Visibility = Windows.Visibility.Visible
-
          ' Accorciamento
-         If m_Mode = ModeOpt.ENGRAVE Then
-            ' modifico il nome del messaggio 
-            Parameter4TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 11) & "2"     ' Affondamento2
-            Parameter4TxBl.Visibility = Windows.Visibility.Visible
-            Parameter4TxBx.Visibility = Windows.Visibility.Visible
-         Else
-            Parameter4TxBl.Visibility = Windows.Visibility.Hidden
-            Parameter4TxBx.Visibility = Windows.Visibility.Hidden
-         End If
-
-         ' Angolo
-         If m_Mode = ModeOpt.ENGRAVE Then
-            ' modifico il nome del messaggio 
-            Parameter5TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 9)            ' Angolo
-            Parameter5TxBl.Visibility = Windows.Visibility.Visible
-            Parameter5TxBx.Visibility = Windows.Visibility.Visible
-         Else
-            Parameter5TxBl.Visibility = Windows.Visibility.Hidden
-            Parameter5TxBx.Visibility = Windows.Visibility.Hidden
-         End If
-
+         Parameter4TxBl.Visibility = Windows.Visibility.Hidden
+         Parameter4TxBx.Visibility = Windows.Visibility.Hidden
       End If
 
       ' Gestisco Checkbox e nomi in base al numero di lati inclinabili
@@ -184,14 +154,12 @@ Public Class SideAngleUC
          m_nEngrNbr2 = GetPrivateProfileInt( S_SIDES, K_ENGRAVENUMBER2, 1, m_MainWindow.GetIniFile())
          m_dDripOffset2 = GetPrivateProfileDouble( S_SIDES, K_ENGRAVEOFFSET2, 0, m_MainWindow.GetIniFile())
          m_dDripDepth = GetPrivateProfileDouble( S_SIDES, K_ENGRAVEDEPTH, 10, m_MainWindow.GetIniFile())
-         m_dEngraveDepth2 = GetPrivateProfileDouble(S_SIDES, K_ENGRAVEDEPTH2, 0, m_MainWindow.GetIniFile())
-         m_dEngraveAngle = GetPrivateProfileDouble(S_SIDES, K_ENGRAVEANGLE, 0, m_MainWindow.GetIniFile())
-         Parameter1TxBx.Text = LenToString(m_dDripOffset, 3)
+         m_dDripShort = GetPrivateProfileDouble( S_SIDES, K_ENGRAVESHORT, 0, m_MainWindow.GetIniFile())
+         Parameter1TxBx.Text = LenToString( m_dDripOffset, 3)
          Parameter2aTxBx.Text = m_nEngrNbr2.ToString()
          Parameter2bTxBx.Text = LenToString( m_dDripOffset2, 3)
          Parameter3TxBx.Text = LenToString( m_dDripDepth, 3)
-         Parameter4TxBx.Text = LenToString(m_dEngraveDepth2, 3)
-         Parameter5TxBx.Text = DoubleToString(m_dEngraveAngle, 3)
+         Parameter4TxBx.Text = LenToString( m_dDripShort, 3)
       End If
 
       ' Aggiorno visualizzazione
@@ -211,10 +179,6 @@ Public Class SideAngleUC
          ' Imposto contesto corrente
          EgtSetCurrentContext(m_MainWindow.m_DrawPageUC.DrawScene.GetCtx())
          ' Ricavo nome primo pezzo e lo sistemo
-         If m_Mode = ModeOpt.ENGRAVE And m_MainWindow.m_DrawPageUC.SelectedLayer = GDB_ID.NULL Then
-            PartId = EgtGetFirstPart()
-            m_MainWindow.m_DrawPageUC.SetCurrLayer(EgtGetFirstNameInGroup(PartId, NAME_OUTLOOP))
-         End If
          PartId = If(m_MainWindow.m_DrawPageUC.SelectedLayer <> GDB_ID.NULL, EgtGetFirstPart(), GDB_ID.NULL)
          ' Recupero nome layer con geometria di contorno (esterno o interno) del pezzo
          LoopId = m_MainWindow.m_DrawPageUC.SelectedLayer
@@ -311,8 +275,8 @@ Public Class SideAngleUC
       ' Attualmente il vaore m_nCount è inizializzato ad "1"..
       ' Bottoni Prev Next
       If m_nCount <= MAX_LINES Then
-         PrevBtn.Visibility= Windows.Visibility.Hidden
-         NextBtn.Visibility= Windows.Visibility.Hidden
+         PrevBtn.Visibility = Windows.Visibility.Hidden
+         NextBtn.Visibility = Windows.Visibility.Hidden
       Else
          Grid.SetRow(PrevBtn, MAX_LINES - m_nShow)
          PrevBtn.Visibility = Windows.Visibility.Visible
@@ -519,9 +483,7 @@ Public Class SideAngleUC
          WritePrivateProfileString( S_SIDES, K_ENGRAVENUMBER2, m_nEngrNbr2.ToString(), m_MainWindow.GetIniFile())
          WritePrivateProfileString(S_SIDES, K_ENGRAVEOFFSET2, LenToString(m_dDripOffset2, 3), m_MainWindow.GetIniFile())
          WritePrivateProfileString(S_SIDES, K_ENGRAVEDEPTH, LenToString(m_dDripDepth, 3), m_MainWindow.GetIniFile())
-         WritePrivateProfileString(S_SIDES, K_ENGRAVEDEPTH2, LenToString(m_dEngraveDepth2, 3), m_MainWindow.GetIniFile())
          'WritePrivateProfileString( S_SIDES, K_ENGRAVESHORT, DoubleToString( m_dDripShort, 3), m_MainWindow.GetIniFile())
-         WritePrivateProfileString(S_SIDES, K_ENGRAVEANGLE, LenToString(m_dEngraveAngle, 3), m_MainWindow.GetIniFile())
       End If
 
       EgtDraw()
@@ -535,10 +497,11 @@ Public Class SideAngleUC
       If m_CallingPage = MainWindow.Pages.Draw Then
          ' Imposto contesto corrente
          EgtSetCurrentContext(m_MainWindow.m_DrawPageUC.DrawScene.GetCtx())
+         ' Ricavo nome primo pezzo
          PartId = If(m_MainWindow.m_DrawPageUC.SelectedLayer <> GDB_ID.NULL, EgtGetFirstPart(), GDB_ID.NULL)
          ' Recupero nome layer con geometria di contorno (esterno o interno) del pezzo
          LoopId = m_MainWindow.m_DrawPageUC.SelectedLayer
-         ElseIf m_CallingPage = MainWindow.Pages.Import Then
+      ElseIf m_CallingPage = MainWindow.Pages.Import Then
          ' Imposto contesto corrente
          EgtSetCurrentContext(m_MainWindow.m_ImportPageUC.ImportScene.GetCtx())
          ' Recupero nome pezzo
@@ -565,7 +528,7 @@ Public Class SideAngleUC
       ' Se modalità angoli di inclinazione...
       If m_Mode = ModeOpt.SIDEANGLE Then
          ' Per ogni entità (della lista inizializzata), creo testo con nome e angolo di inclinazione
-         For Each Entity As SideAngleEntity In m_SideAngleEntityList
+         For Each Entity In m_SideAngleEntityList
             Dim sText As String = Entity.sEntityName & " = " & DoubleToString(Entity.dSideAngle, 2) & "°"
             If Entity.dSideHeel > 10 * EPS_SMALL Then sText += "; " & LenToString(Entity.dSideHeel, 2)
             SideAngle.AddTextToLine(sText, Entity.nTextId, Entity.nGeomId, 20, dBBoxRad, True)
@@ -573,7 +536,7 @@ Public Class SideAngleUC
          ' Altrimenti modalità gocciolatoio
       Else
          ' Per ogni entità creo testo con nome
-         For Each Entity As DripEntity In m_DripEntityList
+         For Each Entity In m_DripEntityList
             SideAngle.AddTextToLine(Entity.sEntityName, Entity.nTextId, Entity.nGeomId, 20, dBBoxRad, True)
          Next
          ' Creo le geometrie dei gocciolatoi
@@ -586,7 +549,7 @@ Public Class SideAngleUC
    ' refresh dei checkbox e della caselle di testo per tutte le entità presenti nelle liste SideAngle/DripEntity
    Private Sub RefreshCheckAndValue()
       If m_Mode = ModeOpt.SIDEANGLE Then
-         For nIndex As Integer = 1 To m_nCount
+         For nIndex = 1 To m_nCount
             Dim Entity As SideAngleEntity = m_SideAngleEntityList(nIndex - 1)
             ' Creo testo con angolo di inclinazione e dimensione tallone
             If nIndex < (m_nCurrPage - 1) * MAX_LINES Or nIndex > m_nCurrPage * MAX_LINES Then Continue For
@@ -597,7 +560,7 @@ Public Class SideAngleUC
             GetHeelTxBxFromIndex(nTxBxIndex).Text = LenToString(Entity.dSideHeel, 1)
          Next
       Else
-         For nIndex As Integer = 1 To m_nCount
+         For nIndex = 1 To m_nCount
             Dim Entity As DripEntity = m_DripEntityList(nIndex - 1)
             ' Imposto check box (se sono stati definiti il numero corretto di CheckBox
             If nIndex < ( m_nCurrPage - 1) * MAX_LINES Or nIndex > m_nCurrPage * MAX_LINES Then Continue For
@@ -605,20 +568,8 @@ Public Class SideAngleUC
             ' verifico se l'entità ha un gocciolatoio
             GetChBxFromIndex(nChIndex).IsChecked = Entity.bHaveDrip
             ' aggiorno i valore delle caselle di testo per le entità caricate (Start/End)
-            If m_Mode = ModeOpt.ENGRAVE Then
-               Dim dVal As Double = 0
-               If StringToLen(GetPrivateProfileDouble(S_SIDES, K_ENGRAVESHORT & "A" & nIndex.ToString & "_Start", 0, m_MainWindow.GetIniFile()), dVal) Then
-                  Entity.dShortStart = dVal
-               End If
-               If StringToLen(GetPrivateProfileDouble(S_SIDES, K_ENGRAVESHORT & "A" & nIndex.ToString & "_End", 0, m_MainWindow.GetIniFile()), dVal) Then
-                  Entity.dShortEnd = dVal
-               End If
-            Else
-               'GetAngleTxBxFromIndex(Index).Text = GetPrivateProfileDouble(S_SIDES, K_DRIPSHORT & "A" & nI.ToString & "_Start", 0, m_MainWindow.GetIniFile())
-               'GetHeelTxBxFromIndex(Index).Text = GetPrivateProfileDouble(S_SIDES, K_DRIPSHORT & "A" & nI.ToString & "_End", 0, m_MainWindow.GetIniFile())
-            End If
-            GetAngleTxBxFromIndex(nChIndex).Text = LenToString(Entity.dShortStart, 1)
-            GetHeelTxBxFromIndex(nChIndex).Text = LenToString(Entity.dShortEnd, 1)
+            GetAngleTxBxFromIndex(nChIndex).Text = DoubleToString(Entity.dShortStart, 1)
+            GetHeelTxBxFromIndex(nChIndex).Text = LenToString(Entity.dShortStart, 1)
          Next
       End If
    End Sub
@@ -667,7 +618,7 @@ Public Class SideAngleUC
       SideAngle.AddTextToLine(sEntityName, TextLayer, CurrLine, 20, dBBoxRad, True)
    End Sub
 
-   ' Funzione che crea le geometrie dei gocciolatoi (NON UTILIZZATA)
+   ' Funzione che crea le geometrie dei gocciolatoi
    Friend Sub CreateDripGeomOLD(nPartId As Integer)
       ' Recupero Id layer di contorno esterno
       Dim nOutLoopId = EgtGetFirstNameInGroup(nPartId, NAME_OUTLOOP)
@@ -682,7 +633,7 @@ Public Class SideAngleUC
       End If
       ' Per ogni entità con gocciolatoio, ne inserisco una copia nel layer
       Dim vSelId As New List(Of Integer)
-      For Each Entity As DripEntity In m_DripEntityList
+      For Each Entity In m_DripEntityList
          If Entity.bHaveDrip Then
             Dim nSouId As Integer = EgtGetFirstNameInGroup(nOutLoopId, Entity.sEntityName)
             Dim nNewId As Integer = EgtCopyGlob(nSouId, DripLayer)
@@ -780,22 +731,18 @@ Public Class SideAngleUC
       Dim vJoint As New List(Of Boolean)
       Dim bJointStart As Boolean = False
 
-      For Each Entity As DripEntity In m_DripEntityList
+      For Each Entity In m_DripEntityList
          If Entity.bHaveDrip Then
             vJoint.Add(True)
          Else
             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
 
-      For Each Entity As DripEntity In m_DripEntityList
+      For Each Entity In m_DripEntityList
 
          If Entity.bHaveDrip Then
             Dim nSouId As Integer = EgtGetFirstNameInGroup(nOutLoopId, Entity.sEntityName)
@@ -806,7 +753,7 @@ Public Class SideAngleUC
          End If
 
          ' devo distingure i casi in cui inserisco un valore positivo ed uno negativo!
-         For Each IdCurve As Integer In vTempSelId
+         For Each IdCurve In vTempSelId
 
             ' accorcio entrmabi i lati
             Dim dLen As Double
@@ -862,9 +809,6 @@ Public Class SideAngleUC
       Dim nCrvId = EgtGetFirstInGroup(DripLayer)
       While nCrvId <> GDB_ID.NULL
          EgtOffsetCurve(nCrvId, -m_dDripOffset, OFF_TYPE.EXTEND)
-         If m_Mode = ModeOpt.ENGRAVE Then
-            EgtSetInfo(nCrvId, INFO_DEPTH, m_dDripDepth)
-         End If
          nCrvId = EgtGetNext(nCrvId)
       End While
       ' Eventuali curve aggiuntive con offset2
@@ -875,16 +819,10 @@ Public Class SideAngleUC
             For i As Integer = 1 To m_nEngrNbr2
                Dim nNewId As Integer = EgtCopy(nCrvId, nCrvId, GDB_POS.AFTER)
                EgtOffsetCurve(nNewId, -i * m_dDripOffset2, OFF_TYPE.EXTEND)
-               If m_Mode = ModeOpt.ENGRAVE Then
-                  EgtSetInfo(nNewId, INFO_DEPTH, m_dEngraveDepth2)
-               End If
             Next
             nCrvId = nNextCrvId
          End While
       End If
-
-      Dim ListEngraveSideAng As New List(Of Integer)
-
       If m_Mode = ModeOpt.DRIP Then
          ' Esplodo nelle curve componenti
          nCrvId = EgtGetFirstInGroup(DripLayer)
@@ -904,70 +842,14 @@ Public Class SideAngleUC
          End While
       Else
          ' Assegno colore e attributi
-         Dim nInd As Integer = 0
          nCrvId = EgtGetFirstInGroup(DripLayer)
          While nCrvId <> GDB_ID.NULL
             EgtSetColor(nCrvId, COL_MCH_DRIPCUT())
-            'EgtSetInfo(nCrvId, INFO_DEPTH, m_dDripDepth)
+            EgtSetInfo(nCrvId, INFO_DEPTH, m_dDripDepth)
             EgtSetInfo(nCrvId, INFO_STRICT, If(m_dDripShort > EPS_SMALL, "3", "0"))
-            If nInd = 0 Then
-               ' solo se m_dEngraveAngle > 0
-               If Math.Abs(m_dEngraveAngle) > EPS_ANG_SMALL Then
-                  ' salvo l'Id della curva che deve essere manipolato separatamente
-                  ListEngraveSideAng.Add(nCrvId)
-               Else
-                  EgtRemoveInfo(nCrvId, INFO_SIDE_ANGLE)
-                  EgtModifyCurveThickness(nCrvId, -m_dEngraveDepth2)
-               End If
-            Else
-               If nInd = m_nEngrNbr2 Then
-                  nInd = -1
-               End If
-               EgtModifyCurveThickness(nCrvId, -m_dEngraveDepth2)
-            End If
-            nInd = nInd + 1
-            If nInd > m_nEngrNbr2 Then nInd = 0
             nCrvId = EgtGetNext(nCrvId)
          End While
       End If
-      SplitJointedSideEngrave(ListEngraveSideAng)
-   End Sub
-
-   Private Sub SplitJointedSideEngrave(ListEngraveSideAngId As List(Of Integer))
-      For Each nCrvId As Integer In ListEngraveSideAngId
-         ' eventualmente separo il taglio inclinato
-         Dim dUs, dUe As Double
-         EgtCurveDomain(nCrvId, dUs, dUe)
-         Dim dU As Double = dUs
-         While dU < dUe ' + EPS_ZERO
-            Dim ptCurr As Point3d
-            EgtAtParamPoint(nCrvId, dU + 1, nCrvId, ptCurr)
-            ' separa la curva in questo punto
-            Dim nNewCurvId As Integer = GDB_ID.NULL
-            If dUe > 1 Then
-               nNewCurvId = EgtSplitCurveAtPoint(nCrvId, ptCurr, GDB_RT.LOC)
-            Else
-               nNewCurvId = nCrvId
-            End If
-            EgtSetColor(nCrvId, COL_MCH_ONENGRAVE_ANG())
-            EgtSetInfo(nCrvId, INFO_SIDE_ANGLE, m_dEngraveAngle)
-            ' recupero il vettore di estrusione della curva e la direzione della curva
-            Dim vtAux As Vector3d
-            EgtStartVector(nCrvId, vtAux)
-            Dim vtExtrusion As Vector3d
-            EgtCurveExtrusion(nCrvId, vtExtrusion)
-            ' ruoto il vetottore nella nuova direzione
-            vtExtrusion.Rotate(vtAux, -m_dEngraveAngle)
-            ' assegno il vettore di estrusione nella nuova direzione indicata (segno negativo perchè dentro il pezzo)
-            EgtModifyCurveExtrusion(nCrvId, vtExtrusion)
-            Dim ExtendFactor As Double = New Vector3d(0, 0, 1) * vtExtrusion
-            EgtModifyCurveThickness(nCrvId, -m_dDripDepth / ExtendFactor)
-            If dUe = 1 Then Exit While
-            nCrvId = nNewCurvId
-            ' aggiorno i valori del dominio della curva che rimane
-            EgtCurveDomain(nCrvId, dUs, dUe)
-         End While
-      Next
    End Sub
 
    Private Sub PrevBtn_Click(sender As Object, e As RoutedEventArgs) Handles PrevBtn.Click
@@ -1401,25 +1283,11 @@ Public Class SideAngleUC
    End Sub
 
    Private Sub Parameter4TxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter4TxBx.EgtClosed
-      If m_Mode = ModeOpt.DRIP Then
+      If m_Mode = ModeOpt.DRIP Or m_Mode = ModeOpt.ENGRAVE Then
          ' Recupero il valore
          StringToLen(Parameter4TxBx.Text, m_dDripShort)
          ' Creo le geometrie dei gocciolatoi
          RefreshSideAngleText()
-      ElseIf m_Mode = ModeOpt.ENGRAVE Then
-         ' Recupero il valore
-         StringToLen(Parameter4TxBx.Text, m_dEngraveDepth2)
-         ' Creo le geometrie dei gocciolatoi
-         RefreshSideAngleText()
-      End If
-   End Sub
-
-   Private Sub Parameter5TxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter5TxBx.EgtClosed
-      If m_Mode = ModeOpt.ENGRAVE Then
-         ' Recupero il valore
-         StringToDouble(Parameter5TxBx.Text, m_dEngraveAngle)
-         ' Creo le geometrie dei gocciolatoi
-         RefreshSideAngleText()
       End If
    End Sub
 
@@ -1498,7 +1366,7 @@ Friend Class SideAngleEntity
          Return Nothing
       End If
 
-      For Each Entity As SideAngleEntity In EntityList
+      For Each Entity In EntityList
          If Entity.m_sEntityName = sEntityName Then
             Return Entity
          End If
@@ -1587,7 +1455,7 @@ Friend Class DripEntity
          Return Nothing
       End If
 
-      For Each Entity As DripEntity In EntityList
+      For Each Entity In EntityList
          If Entity.m_sEntityName = sEntityName Then
             Return Entity
          End If

EgtDictionary.xaml

@@ -1,48 +1,16 @@
-<ResourceDictionary x:Class="EgtDictionary"
-                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Project="clr-namespace:OmagCUT"
-                    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                    xmlns:EgtPHOTOLib="clr-namespace:EgtPHOTOLib;assembly=EgtPHOTOLib"
-                    xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-                    xmlns:ControlExtensions="clr-namespace:OmagCUT.ControlExtensions">
+<ResourceDictionary
+   x:Class="EgtDictionary"
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:Project="clr-namespace:OmagCUT"
+   xmlns:ControlExtensions="clr-namespace:OmagCUT.ControlExtensions">
 
-    <EgtWPFLib5:StatusBarVM x:Key="StatusBarVM"/>
-    <EgtWPFLib5:ShowPanelVM x:Key="ShowPanelVM"/>
-    <EgtWPFLib5:ViewPanelVM x:Key="ViewPanelVM"/>
-    <EgtWPFLib5:InstrumentPanelVM x:Key="InstrumentPanelVM"/>
-
-    <EgtPHOTOLib:ProjectSlabVM x:Key="ProjectSlabVM"/>
-    <EgtPHOTOLib:OptionPanelSlabVM x:Key="OptionPanelSlabVM"/>
-    <EgtPHOTOLib:ListPageSlabVM x:Key="ListPageSlabVM"/>
-    <EgtPHOTOLib:DetailPageSlabVM x:Key="DetailPageSlabVM"/>
-    <EgtPHOTOLib:SearchPanelSlabVM x:Key="SearchPanelSlabVM"/>
-    <EgtPHOTOLib:MyInstrumentPanelSlabVM x:Key="MyInstrumentPanelSlabVM"/>
-
-    <!--Colori predefiniti-->
-    <SolidColorBrush x:Key="Omag_Blue" Color="#FF095CA8" />
-    <SolidColorBrush x:Key="Omag_Yellow" Color="#FFFFCE5B" />
-    <SolidColorBrush x:Key="Omag_Red" Color="Red" />
-    <SolidColorBrush x:Key="Omag_Green" Color="LawnGreen" />
-    <SolidColorBrush x:Key="Omag_VeryLightGray" Color="#FFF2F2F2" />
-    <SolidColorBrush x:Key="Omag_LightGray" Color="LightGray" />
-    <SolidColorBrush x:Key="Omag_Gray" Color="#FF9E9E9E" />
-    <SolidColorBrush x:Key="Omag_DarkGray" Color="#FF444444" />
-    <SolidColorBrush x:Key="Omag_White" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="Omag_Black" Color="#FF000000" />
-
-    <SolidColorBrush x:Key="EgaltechBlue1" Color="#FF095CA8" />
-    <SolidColorBrush x:Key="EgaltechWhite" Color="#FFFFFFFF" />
-
-    <!--Template che permette di andare a capo-->
+   <!--Template che permette di andare a capo-->
    <DataTemplate x:Key="Button_DataTemplate_Wrap">
       <TextBlock TextWrapping="Wrap" Text="{Binding}"/>
    </DataTemplate>
 
-    <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-    <!-- Button Style -->
-
+   <!--ButtonBase-->
    <Style TargetType="{x:Type Button}">
       <Setter Property="FocusVisualStyle">
          <Setter.Value>
@@ -103,44 +71,7 @@
       </Setter>
    </Style>
 
-    <!--Template che permette di andare a capo-->
-    <DataTemplate x:Key="WrapButton_DataTemplate">
-        <TextBlock TextWrapping="WrapWithOverflow" Text="{Binding}"/>
-    </DataTemplate>
-
-    <Style x:Key="ToolBar_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Height" Value="30"/>
-        <Setter Property="Width" Value="30"/>
-    </Style>
-    <Style x:Key="ToolBar_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Height" Value="30"/>
-        <Setter Property="Width" Value="80"/>
-    </Style>
-    <Style x:Key="OptionPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Height" Value="60"/>
-        <Setter Property="Width" Value="60"/>
-    </Style>
-    <Style x:Key="OptionPanel_TextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Height" Value="30"/>
-    </Style>
-    <Style x:Key="OptionPanel_TextWrapButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="ContentTemplate" Value="{StaticResource WrapButton_DataTemplate}" />
-        <Setter Property="TextBlock.TextAlignment" Value="Center"/>
-        <Setter Property="Height" Value="45"/>
-    </Style>
-    <Style x:Key="OptionPanel_NestingButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Height" Value="60"/>
-        <Setter Property="Width" Value="60"/>
-    </Style>
-    <Style x:Key="CompoWindow_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Height" Value="40"/>
-    </Style>
-    <Style x:Key="EgtWPFLib5_InputButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Height" Value="30"/>
-        <Setter Property="Width" Value="60"/>
-    </Style>
-
-    <!-- ______________________________________________________________________________________________________________________ -->
+   <!-- ______________________________________________________________________________________________________________________ -->
 
    <!--Template che permette di andare a capo-->
    <DataTemplate x:Key="CheckBox_DataTemplate_Wrap">
@@ -444,59 +375,7 @@
       </Setter>
    </Style>
 
-    <Style x:Key="ToolBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-        <Setter Property="Height" Value="30"/>
-        <Setter Property="Width" Value="30"/>
-    </Style>
-
-    <Style x:Key="ToolBar_TextToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-        <Setter Property="Height" Value="30"/>
-        <Setter Property="Width" Value="70"/>
-    </Style>
-
-    <Style x:Key="OptionPanel_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-        <Setter Property="Height" Value="30"/>
-    </Style>
-
-    <Style x:Key="OptionPanel_NestingToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-        <Setter Property="Height" Value="60"/>
-        <Setter Property="Width" Value="60"/>
-    </Style>
-
-    <Style x:Key="CompoWindow_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-        <Setter Property="Height" Value="40"/>
-    </Style>
-
-    <Style x:Key="CompoWindow_WrapToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
-        <Setter Property="ContentTemplate" Value="{StaticResource WrapButton_DataTemplate}" />
-        <Setter Property="TextBlock.TextAlignment" Value="Center" />
-        <Setter Property="Height" Value="40"/>
-    </Style>
-
-    <Style x:Key="Option_ColorButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-        <Setter Property="Padding" Value="5"/>
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="TextBlock.TextAlignment" Value="Center"/>
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="#FFB8C3CD"/>
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-                <Setter Property="OpacityMask" Value="#33FF0000"/>
-            </Trigger>
-            <Trigger Property="ToggleButton.IsChecked" Value="True">
-                <Setter Property="Background" Value="Transparent"/>
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Background" Value="#FFF4F4F4"/>
-                <Setter Property="BorderBrush" Value="#FFADB2B5"/>
-                <Setter Property="TextElement.Foreground"  Value="#FF838383"/>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <!-- ______________________________________________________________________________________________________________________ -->
+   <!-- ______________________________________________________________________________________________________________________ -->
 
    <!--TreeViewBase-->
    <!--Style e colori della freccia di espansione, necessari per modificare il ContainerItemStyle perchè contiene riferimenti ad essi-->
@@ -552,32 +431,6 @@
       </Setter>
    </Style>
 
-    <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-    <!-- EgtCustomWindow -->
-
-    <Style TargetType="{x:Type EgtWPFLib5:EgtCustomWindow}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
-        <Setter Property="TitleBarHeight" Value="32"/>
-        <Setter Property="TitleBarBrush" Value="{StaticResource Omag_LightGray}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
-    </Style>
-
-    <!-- ______________________________________________________________________________________________________________________________________________ -->
-
-    <!-- EgtFloatingPanel -->
-
-    <Style x:Key="ToolBar_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
-        <Setter Property="Background" Value="{StaticResource Omag_Gray}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
-    </Style>
-
-    <Style x:Key="Option_EgtFloatingPanel" TargetType="{x:Type EgtFloating:EgtFloatingPanel}" BasedOn="{StaticResource {x:Type EgtFloating:EgtFloatingPanel}}">
-        <Setter Property="IsToolBar" Value="False"/>
-        <Setter Property="TitleBarOrientation" Value="Vertical"/>
-        <Setter Property="Background" Value="{StaticResource Omag_Gray}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource Omag_Gray}"/>
-    </Style>
-
-    <!-- ______________________________________________________________________________________________________________________ -->
+   <!-- ______________________________________________________________________________________________________________________ -->
 
 </ResourceDictionary>

Frames/FrameCutPageUC.xaml

@@ -78,10 +78,7 @@
 
          <UniformGrid Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
             <Button Name="SelSectionBtn" 
-                    Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-                <Image Source="{DynamicResource Sezione-corniceImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-            </Button>
-             
+                    Style="{DynamicResource OmagCut_YellowTextButton}"/>
             <Grid>
                <Button Name="SelGuideBtn" 
                        Style="{DynamicResource OmagCut_YellowTextButton}"/>
@@ -115,13 +112,9 @@
 
          <UniformGrid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2" >
             <Button Name="MirrorPartBtn" 
-                    Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-                        <Image Source="{DynamicResource SpecchiaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-            </Button>
+               Style="{DynamicResource OmagCut_YellowTextButton}"/>
             <Button Name="RemovePartBtn" 
-                    Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-                        <Image Source="{DynamicResource Rimuovi_eliminaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-            </Button>
+               Style="{DynamicResource OmagCut_YellowTextButton}"/>
          </UniformGrid>
 
          <!--<TextBlock Name="SawRoughingTxBl" Grid.Row="4" Grid.ColumnSpan="3"

Frames/FrameCutPageUC.xaml.vb

@@ -61,12 +61,12 @@ Public Class FrameCutPageUC
          m_AlongAx.Add(EgtMsg(MSG_FRAMECUTPAGEUC + 13))        'Arco
          m_AlongAx.Add(EgtMsg(MSG_FRAMECUTPAGEUC + 14))        'Guida
       End If
-      SelSectionBtn.ToolTip = EgtMsg(MSG_FRAMECUTPAGEUC + 15)   'Sezione
+      SelSectionBtn.Content = EgtMsg(MSG_FRAMECUTPAGEUC + 15)   'Sezione
       SelGuideBtn.Content = EgtMsg(MSG_FRAMECUTPAGEUC + 16)     'Guida
       ArcRadTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 17)         'Rad
       ArcAngTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 18)         'Ang
-      MirrorPartBtn.ToolTip = EgtMsg(MSG_FRAMECUTPAGEUC + 7)    'Mirror cornice
-      RemovePartBtn.ToolTip = EgtMsg(MSG_FRAMECUTPAGEUC + 3)    'Rimuovi cornice
+      MirrorPartBtn.Content = EgtMsg(MSG_FRAMECUTPAGEUC + 7)    'Mirror cornice
+      RemovePartBtn.Content = EgtMsg(MSG_FRAMECUTPAGEUC + 3)    'Rimuovi cornice
       OffsZTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 8)           'Distanza sopra
       OffsXyTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 9)          'Distanza inizio
       OffsYyTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 22)         'Distanza Y

Frames/FrameMachiningUC.xaml.vb

@@ -147,7 +147,7 @@ Public Class FrameMachiningUC
          If SysNotes <> String.Empty Then
             Dim MachiningMaterials() = SysNotes.Split(";".ToCharArray)
             SysNotes = String.Empty
-            For Each Material As Object In MachiningMaterials
+            For Each Material In MachiningMaterials
                Dim Param() As String = Material.Split(",".ToCharArray)
                If Param(0) = m_CurrMachine.CurrMat.nId.ToString() Then
                   Dim dRawHeight = GetRawHeight()

Machine/AlarmsPageUC.xaml

@@ -20,7 +20,6 @@
          <Grid.RowDefinitions>
             <RowDefinition Height="2*"/>
             <RowDefinition Height="0.5*"/>
-
             <RowDefinition Height="1.5*"/>
             <RowDefinition Height="0.5*"/>
             <RowDefinition Height="1*"/>
@@ -30,221 +29,6 @@
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
 
-         <!--Costruisco le riche per la colonna 3-->
-         <Grid Grid.Column="2" Grid.RowSpan="9">
-            <Grid.RowDefinitions>
-               <!--GruopBox: taglio lama-->
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <!--GruopBoxs: Fresatura/>Foratura/WaterJet-->
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="0.5*"/>
-               <!--GroupBox: vai ad Home-->
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="0.375*"/>
-            </Grid.RowDefinitions>
-
-            <!--Parametri Taglio Lama: 5 Parametri-->
-            <GroupBox Name="SawGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.RowSpan="4">
-               <!--definizione della grigli ainterna-->
-               <Grid>
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="2*"/>
-                     <ColumnDefinition Width="2*"/>
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="0.5*"/>
-                     <RowDefinition Height="0.5*"/>
-                     <RowDefinition Height="0.5*"/>
-                     <RowDefinition Height="0.5*"/>
-                     <RowDefinition Height="0.5*"/>
-                  </Grid.RowDefinitions>
-
-                  <TextBlock Name="CutExtraLenTxBl" Grid.Column="0" Grid.Row="0"
-                                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="CutExtraLenTxBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
-                                   Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                  <TextBlock Name="AngleCutExtraLenTxBl" Grid.Column="0" Grid.Row="1" 
-                                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="AngleCutExtraLenTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0" IsLength="False"
-                                   Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                  <TextBlock Name="ExtArcMinRadTxBl" Grid.Column="0" Grid.Row="2"
-                                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="ExtArcMinRadTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
-                                   Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-
-                  <TextBlock Name="IntArcMaxSideAngTxBl" Grid.Column="0" Grid.Row="3"
-                                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="IntArcMaxSideAngTxBx" Grid.Column="1" Grid.Row="3" Margin="10,0,10,0" IsLength="False"
-                                   Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-
-                  <TextBlock Name="PreCutExitTxBl" Grid.Column="0" Grid.Row="4"
-                                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <CheckBox Name="PreCutExitChBx" Grid.Column="1" Grid.Row="4" Margin="10,0,10,0"
-                                  Style="{StaticResource OmagCut_CheckBox_Single}" 
-                                  HorizontalAlignment="Right"/>
-
-               </Grid>
-
-            </GroupBox>
-
-            <Grid Grid.Column="2" Grid.Row="4" Grid.RowSpan="8">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition />
-                  <ColumnDefinition />
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="*"/>
-                  <RowDefinition Height="*"/>
-                  <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="*"/>
-                  <RowDefinition Height="*"/>
-               </Grid.RowDefinitions>
-
-               <!--Parametri fori: 4 Parametri-->
-               <GroupBox Name="HolesGpBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="3" 
-                              Style="{DynamicResource OmagCut_GroupBox}">
-
-                  <Grid>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="145*"/>
-                        <ColumnDefinition Width="23*"/>
-                        <ColumnDefinition Width="169*"/>
-                     </Grid.ColumnDefinitions>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                     </Grid.RowDefinitions>
-
-                     <TextBlock Name="HolesOffsetTxBl" Grid.Column="0" Grid.Row="0"
-                                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-                     <EgtWPFLib:EgtTextBox Name="HolesOffsetTxBx" Grid.Column="2" Grid.Row="0" Margin="10,0,10,0"
-                                       Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                     <TextBlock Name="HolesOverlapTxBl" Grid.Column="0" Grid.Row="1"
-                                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-                     <EgtWPFLib:EgtTextBox Name="HolesOverlapTxBx" Grid.Column="2" Grid.Row="1" Margin="10,0,10,0"
-                                       Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                     <TextBlock Name="HolesToleranceTxBl" Grid.Column="0" Grid.Row="2"
-                                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-                     <EgtWPFLib:EgtTextBox Name="HolesToleranceTxBx" Grid.Column="2" Grid.Row="2" Margin="10,0,10,0"
-                                       Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                     <TextBlock Name="OneHoleInCornerTxBl" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="3"
-                                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,10,0" />
-                     <CheckBox Name="OneHoleInCornerChBx" Grid.Column="2" Grid.Row="3" Style="{StaticResource OmagCut_CheckBox_Single}"
-                                      HorizontalAlignment="Right" Margin="10,0,10,0"/>
-
-                  </Grid>
-
-               </GroupBox>
-
-               <!--Parametri Fresatura: 3 Parametri-->
-               <GroupBox Name="MillingsParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2" Grid.RowSpan="2">
-                  <Grid Grid.Column="3" Grid.Row="2">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="2*"/>
-                        <ColumnDefinition Width="2*"/>
-                     </Grid.ColumnDefinitions>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                     </Grid.RowDefinitions>
-
-                     <TextBlock Name="CornerCutsTxBl" Grid.Row="0" Grid.ColumnSpan="2"
-                                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-                     <CheckBox Name="CornerCutsChBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
-                                      HorizontalAlignment="Right" Margin="0,0,10,0"/>
-
-                     <TextBlock Name="InternalCutsTxBl" Grid.Row="1" Grid.ColumnSpan="2"
-                                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,0,10" VerticalAlignment="Bottom" />
-                     <CheckBox Name="InternalCutsChBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
-                                      HorizontalAlignment="Right" Margin="0,0,10,0"/>
-
-                     <TextBlock Name="ShortTxBl" Grid.Column="0" Grid.Row="2"
-                                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                     <EgtWPFLib:EgtTextBox Name="ShortTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
-                                       Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-
-                  </Grid>
-
-               </GroupBox>
-
-               <!--Parametri WaterJet: 5 Parametro (se questo GroupBox attivo allora nascondo Fori/Fresatura)-->
-               <GroupBox Name="WjsParamGpBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="4" 
-                              Style="{DynamicResource OmagCut_GroupBox}">
-                  <Grid Grid.Column="3" Grid.Row="2">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="145*"/>
-                        <ColumnDefinition Width="23*"/>
-                        <ColumnDefinition Width="169*"/>
-                     </Grid.ColumnDefinitions>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                        <RowDefinition Height="0.5*"/>
-                     </Grid.RowDefinitions>
-
-                     <TextBlock Name="WjIntCutsTxBl" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3"
-                                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,10,0" />
-                     <CheckBox Name="WjIntCutsChBx" Grid.Column="2" Grid.Row="0" Style="{StaticResource OmagCut_CheckBox_Single}"
-                                      HorizontalAlignment="Right" Margin="10,0,10,0"/>
-
-                     <TextBlock Name="HolesDiameterWJTxBl" Grid.Column="0" Grid.Row="1"
-                                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-                     <EgtWPFLib:EgtTextBox Name="HolesDiameterWJTxBx" Grid.Column="2" Grid.Row="1" Margin="10,0,10,0"
-                                       Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                     <TextBlock Name="HolesOffsetWJTxBl" Grid.Column="0" Grid.Row="2"
-                                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-                     <EgtWPFLib:EgtTextBox Name="HolesOffsetWJTxBx" Grid.Column="2" Grid.Row="2" Margin="10,0,10,0"
-                                       Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                     <TextBlock Name="MinRadiusWJTxBl" Grid.Column="0" Grid.Row="3"
-                                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="2" Margin="10,0,10,0"/>
-                     <EgtWPFLib:EgtTextBox Name="MinRadiusWJTxBx" Grid.Column="2" Grid.Row="3" Margin="10,0,10,0"
-                                       Style="{DynamicResource OmagCut_CalculatorTextBox}" />
-
-                     <TextBlock Name="OneHoleInCornerWJTxBl" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3"
-                                       Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="10,0,10,0" />
-                     <CheckBox Name="OneHoleInCornerWJChBx" Grid.Column="2" Grid.Row="4" Style="{StaticResource OmagCut_CheckBox_Single}"
-                                      HorizontalAlignment="Right" Margin="10,0,10,0"/>
-
-
-                  </Grid>
-               </GroupBox>
-
-            </Grid>
-
-            <!--Parametri Taglio diretto: 1 Parametro-->
-            <GroupBox Name="DirectCutsParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.Row="12" Grid.RowSpan="2">
-               <Grid>
-                  <TextBlock Name="FinalHomeTxBl"
-                                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-                  <CheckBox Name="FinalHomeChBx" Style="{StaticResource OmagCut_CheckBox_Single}"
-                                  HorizontalAlignment="Right" Margin="0,0,10,0"/>
-               </Grid>
-
-            </GroupBox>
-
-         </Grid>
-
          <Grid Grid.RowSpan="3">
             <Grid.RowDefinitions>
                <RowDefinition Height="1.75*"/>
@@ -315,17 +99,6 @@
                      </ComboBox.ItemTemplate>
                   </ComboBox>
 
-                  <TextBlock Name="CurrCupWheelTxBl" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3"
-                     Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
-                     Visibility="Hidden"/>
-                  <ComboBox Name="CurrCupWheelCmBx" Grid.Column="1" Grid.Row="5" Style="{StaticResource OmagCut_ComboBox}" Visibility="Hidden">
-                     <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                           <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                        </DataTemplate>
-                     </ComboBox.ItemTemplate>
-                  </ComboBox>
-
                   <TextBlock Name="CurrWJetTxBl" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3"
                      Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
                      Visibility="Hidden"/>
@@ -346,7 +119,7 @@
 
          </Grid>
 
-         <!--<Grid Grid.Column="2" Grid.Row="2" Grid.RowSpan="6">
+         <Grid Grid.Column="2" Grid.Row="2" Grid.RowSpan="5">
             <Grid.ColumnDefinitions>
                <ColumnDefinition />
                <ColumnDefinition />
@@ -448,7 +221,7 @@
                </Grid>
             </GroupBox>
 
-         </Grid>-->
+         </Grid>
 
          <GroupBox Name="MaterialsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0"
             Grid.Row="3" Grid.ColumnSpan="1" Grid.RowSpan="5">
@@ -497,7 +270,6 @@
                   <RowDefinition Height="0.5*"/>
                   <RowDefinition Height="0.5*"/>
                   <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="0.5*"/>
                </Grid.RowDefinitions>
 
                <TextBlock Name="CurrSawingTxBl" Grid.Column="0" Grid.Row="0"
@@ -505,9 +277,9 @@
                <EgtWPFLib:EgtTextBox Name="CurrSawingTxBx" Grid.Column="1" Grid.Row="0" Margin="10,0,10,0"
                   Style="{DynamicResource OmagCut_FixedTextBox}" />
 
-               <TextBlock Name="CurrDrillingTxBl" Grid.Column="0" Grid.Row="1"
+                  <TextBlock Name="CurrDrillingTxBl" Grid.Column="0" Grid.Row="1"
                Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-               <EgtWPFLib:EgtTextBox Name="CurrDrillingTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
+                  <EgtWPFLib:EgtTextBox Name="CurrDrillingTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
                Style="{DynamicResource OmagCut_FixedTextBox}" />
 
                <TextBlock Name="CurrMillingTxBl" Grid.Column="0" Grid.Row="2"
@@ -515,41 +287,26 @@
                <EgtWPFLib:EgtTextBox Name="CurrMillingTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
                   Style="{DynamicResource OmagCut_FixedTextBox}" />
 
-               <TextBlock Name="CurrPocketingTxBl" Grid.Column="0" Grid.Row="3"
+               <TextBlock Name="CurrWaterJettingTxBl" Grid.Column="0" Grid.Row="3"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-               <EgtWPFLib:EgtTextBox Name="CurrPocketingTxBx" Grid.Column="1" Grid.Row="3" Margin="10,0,10,0"
+               <EgtWPFLib:EgtTextBox Name="CurrWaterJettingTxBx" Grid.Column="1" Grid.Row="3" Margin="10,0,10,0"
                   Style="{DynamicResource OmagCut_FixedTextBox}" />
 
-               <TextBlock Name="CurrWaterJettingTxBl" Grid.Column="0" Grid.Row="4"
+               <TextBlock Name="CurrDripSawingTxBl" Grid.Column="0" Grid.Row="4"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-
-               <Grid Grid.Column="1" Grid.Row="4">
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="5*"/>
-                     <ColumnDefinition Width="1.5*"/>
-                  </Grid.ColumnDefinitions>
-                  <EgtWPFLib:EgtTextBox Name="CurrWaterJettingTxBx" Grid.Column="0" Margin="10,0,5,0"
-                                         Style="{DynamicResource OmagCut_FixedTextBox}" />
-                  <EgtWPFLib:EgtTextBox Name="CurrWaterJettingQualityTxBx" Grid.Column="1" Margin="0,0,10,0"
-                                         Style="{DynamicResource OmagCut_FixedTextBox}" />
-               </Grid>
-
-
-               <TextBlock Name="CurrDripSawingTxBl" Grid.Column="0" Grid.Row="5"
-                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-               <EgtWPFLib:EgtTextBox Name="CurrDripSawingTxBx" Grid.Column="1" Grid.Row="5" Margin="10,0,10,0"
+               <EgtWPFLib:EgtTextBox Name="CurrDripSawingTxBx" Grid.Column="1" Grid.Row="4" Margin="10,0,10,0"
                   Style="{DynamicResource OmagCut_FixedTextBox}" />
 
-               <TextBlock Name="CurrDripDrillingTxBl" Grid.Column="0" Grid.Row="6"
+               <TextBlock Name="CurrDripDrillingTxBl" Grid.Column="0" Grid.Row="5"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-               <EgtWPFLib:EgtTextBox Name="CurrDripDrillingTxBx" Grid.Column="1" Grid.Row="6" Margin="10,0,10,0"
+               <EgtWPFLib:EgtTextBox Name="CurrDripDrillingTxBx" Grid.Column="1" Grid.Row="5" Margin="10,0,10,0"
                   Style="{DynamicResource OmagCut_FixedTextBox}" />
 
             </Grid>
 
          </GroupBox>
 
-         <!--<GroupBox Name="SawGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.RowSpan="2">
+         <GroupBox Name="SawGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.RowSpan="2">
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="2*"/>
@@ -560,7 +317,6 @@
                   <RowDefinition Height="0.5*"/>
                   <RowDefinition Height="0.5*"/>
                   <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="0.5*"/>
                </Grid.RowDefinitions>
 
                <TextBlock Name="CutExtraLenTxBl" Grid.Column="0" Grid.Row="0"
@@ -585,7 +341,7 @@
 
             </Grid>
 
-         </GroupBox>-->
+         </GroupBox>
 
          <Grid Grid.Column="1" Grid.Row="3" Grid.RowSpan="3">
             <Grid.ColumnDefinitions>
@@ -631,7 +387,7 @@
 
          </Grid>
 
-         <!--<GroupBox Name="DirectCutsParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.Row="8">
+         <GroupBox Name="DirectCutsParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.Row="7">
             <Grid>
                <TextBlock Name="FinalHomeTxBl"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
@@ -639,10 +395,10 @@
                   HorizontalAlignment="Right" Margin="0,0,10,0"/>
             </Grid>
 
-         </GroupBox>-->
+         </GroupBox>
 
-         <GroupBox Name="NestingParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="1" Grid.Row="6" Grid.RowSpan="3">
-            <Grid Name="NestingGrid">
+         <GroupBox Name="NestingParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="1" Grid.Row="6" Grid.RowSpan="2">
+            <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="2*"/>
                   <ColumnDefinition Width="2*"/>
@@ -651,7 +407,6 @@
                   <RowDefinition Height="0.5*"/>
                   <RowDefinition Height="0.5*"/>
                   <RowDefinition Height="0.5*"/>
-                  <RowDefinition Height="0.5*"/>
                </Grid.RowDefinitions>
 
                <TextBlock Name="CompleteCutsTxBl" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2"
@@ -659,26 +414,16 @@
                <CheckBox Name="CompleteCutsChBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_CheckBox_Single}"
                   HorizontalAlignment="Right" Margin="0,0,10,0"/>
 
-               <!--Allineato-->
                <TextBlock Name="AlignTxBl" Grid.Row="1" Grid.ColumnSpan="2"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
                <CheckBox Name="AlignChBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
                   HorizontalAlignment="Right" Margin="0,0,10,0"/>
 
-               <!--Ghigliottina-->
-               <TextBlock Name="GhigliottinaTxBl" Grid.Row="2" Grid.ColumnSpan="2"
+               <TextBlock Name="AutomaticTxBl" Grid.Row="2" Grid.ColumnSpan="2"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-               <CheckBox Name="GhigliottinaChBx" Grid.Row="2" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
+               <CheckBox Name="AutomaticChBx" Grid.Row="2" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
                   HorizontalAlignment="Right" Margin="0,0,10,0"/>
 
-               <!--Automatico-->
-               <TextBlock Name="AutomaticTxBl" Grid.Row="3" Grid.ColumnSpan="2"
-                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-               <CheckBox Name="AutomaticChBx" Grid.Row="3" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
-                  HorizontalAlignment="Right" Margin="0,0,10,0"/>
-
-
-
             </Grid>
 
          </GroupBox>
@@ -697,9 +442,9 @@
 
                <Grid Grid.ColumnSpan="2">
                   <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="0.5*"/>
-                     <ColumnDefinition Width="2*"/>
-                     <ColumnDefinition Width="0.5*"/>
+                        <ColumnDefinition Width="0.5*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="0.5*"/>
                   </Grid.ColumnDefinitions>
 
                   <Button Name="BackImageBtn" Grid.Column="1"
@@ -738,13 +483,13 @@
                   Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
                <TextBlock Name="CfrPercTxBl" Grid.Column="0" Grid.Row="1"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-               <EgtWPFLib:EgtTextBox Name="CfrPercTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0" IsLength="False"
+               <EgtWPFLib:EgtTextBox Name="CfrPercTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
                   Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
             </Grid>
 
          </GroupBox>
 
-         <!--Incisioni-->
+          <!--Incisioni--> 
          <GroupBox Name="TopMillGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="3"
             Grid.Row="3" Grid.RowSpan="3">
             <Grid>
@@ -758,17 +503,17 @@
                   <RowDefinition Height="0.5*"/>
                </Grid.RowDefinitions>
 
-               <!--Utilizza fresa-->
+                <!--Utilizza fresa-->
                <TextBlock Name="TmEnableTxBl" Grid.Column="0" Grid.Row="0"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
                <CheckBox Name="TmEnableChBx" Grid.Column="1" Grid.Row="0" Style="{DynamicResource OmagCut_CheckBox_Single}"
                   HorizontalAlignment="Right" Margin="10,0,10,0"/>
-               <!--Affondamento-->
+                <!--Affondamento-->
                <TextBlock Name="TmDepthTxBl" Grid.Column="0" Grid.Row="1"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
                <EgtWPFLib:EgtTextBox Name="TmDepthTxBx" Grid.Column="1" Grid.Row="1" Margin="10,0,10,0"
                   Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-               <!--Larghezza-->
+                <!--Larghezza-->
                <TextBlock Name="TmWidthTxBl" Grid.Column="0" Grid.Row="2"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
                <EgtWPFLib:EgtTextBox Name="TmWidthTxBx" Grid.Column="1" Grid.Row="2" Margin="10,0,10,0"
@@ -808,45 +553,16 @@
 
          </Border>
 
-         <!--Cornici-->
-         <GroupBox Name="FrameGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="3" Grid.Row="8">
-            <Grid >
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-
-               <TextBlock Name="FramePauseTxBl" Grid.Column="0" Grid.Row="0"
-               Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-               <CheckBox Name="FramePauseChBx" Grid.Column="1" Grid.Row="0" Style="{StaticResource OmagCut_CheckBox_Single}"
-               HorizontalAlignment="Right" Margin="0,0,10,0"/>
-            </Grid>
-
-         </GroupBox>
-
-         <Grid Grid.Column="0" Grid.Row="8">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="2.5*"/>
-               <ColumnDefinition Width="2.5*"/>
-               <ColumnDefinition Width="4.5*"/>
-               <ColumnDefinition Width="1.8*"/>
-            </Grid.ColumnDefinitions>
+         <UniformGrid Columns="4" Grid.Row="8">
             <Button x:Name="SawProbingBtn"
-         	         Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+         	   Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
                <Image Source="{DynamicResource SawProbeImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
             </Button>
-            <Button x:Name="ExecLuaBtn" Grid.Column="1"
-         	         Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-               <Image Source="{DynamicResource PlayImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
-            </Button>
 
-            <TextBlock Name="UseLaserOriginTxBl" Grid.Column="2"
-                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-            <CheckBox Name="UseLaserOriginChBx" Style="{DynamicResource OmagCut_CheckBox_Single}" Grid.Column="3"
-                  HorizontalAlignment="Right" Margin="0,0,10,0"/>
-         </Grid>
+         </UniformGrid>
 
       </Grid>
+
    </Border>
 
 </UserControl>

Machine/AlarmsPageUC.xaml.vb

@@ -20,7 +20,6 @@ Public Class AlarmsPageUC
    Private m_SawList As New ObservableCollection(Of String)
    Private m_DrillList As New ObservableCollection(Of String)
    Private m_MillList As New ObservableCollection(Of String)
-   Private m_CupWheelList As New ObservableCollection(Of String)
    Private m_WaterJetList As New ObservableCollection(Of String)
    Private m_AuxToolTypeList As New List(Of StringIdCmBx)
 
@@ -29,37 +28,25 @@ Public Class AlarmsPageUC
 
    Private Sub AlarmsPage_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
 
-      ' Assegno liste a combobox
+      'Assegno liste a combobox
       CurrSawCmBx.ItemsSource = m_SawList
       CurrDrillCmBx.ItemsSource = m_DrillList
       CurrMillCmBx.ItemsSource = m_MillList
-      CurrCupWheelCmBx.ItemsSource = m_CupWheelList
       CurrWJetCmBx.ItemsSource = m_WaterJetList
       AuxiliaryToolCmBx.ItemsSource = m_AuxToolTypeList
 
-      ' Variabile che accorcia il riferimento alla macchina corrente
-      m_CurrentMachine = m_MainWindow.m_CurrentMachine
-
       ' Assegno lista ad elenco materiali
-      MaterialsLstBx.ItemsSource = m_CurrentMachine.Materials
+      MaterialsLstBx.ItemsSource = m_MainWindow.m_CurrentMachine.Materials
 
       ' Se non è impostato il controllo numerico, nascondo il bottone di tastatura lama
       If GetPrivateProfileInt(S_NUMERICALCONTROL, K_TYPE, 0, m_MainWindow.GetMachIniFile()) = 0 Then
          SawProbingBtn.Visibility = Windows.Visibility.Hidden
       End If
 
-      ' Se esiste un file lua valido allora mostro il pulsante per l'esecuzione dello script
-      If Not String.IsNullOrEmpty(GetExecLuaFile()) And
-         ExecLuaBtn.Visibility = Visibility.Visible Then
-      Else
-         ExecLuaBtn.Visibility = Visibility.Hidden
-      End If
-
       ' Imposto i messaggi letti dal file dei messaggi
       CurrSawTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 1)
       AuxiliaryToolTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 2)
       CurrDrillTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 3)
-      CurrCupWheelTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 20)
       CurrMillTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 4)
       CurrWJetTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 0)
       HolesOffsetTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 9)
@@ -77,7 +64,6 @@ Public Class AlarmsPageUC
       HolesGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 17)
       ExtArcMinRadTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 18)
       IntArcMaxSideAngTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 24)
-      PreCutExitTxBl.Text = EgtMsg(91065)                                ' PreTaglio uscite
       MachineParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 19)
       SawGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 25)
       DirectCutsParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 27)         ' Tagli diretti
@@ -91,16 +77,9 @@ Public Class AlarmsPageUC
       TmDepthTxBl.Text = EgtMsg( 91063)                                  ' Profondità
       TmWidthTxBl.Text = EgtMsg( 91064)                                  ' Larghezza
       WJsParamGpBx.Header = EgtMsg( 91058)                               ' Parametri waterjet
-      WjIntCutsTxBl.Text = EgtMsg(90930)                                 ' Sempre sugli interni
-      '-- INIZIO -- nuovi parametri per preforo lavello
-      HolesDiameterWJTxBl.Text = "Diameter"
-      HolesOffsetWJTxBl.Text = "Offset"
-      MinRadiusWJTxBl.Text = "Min Radius"
-      OneHoleInCornerWJTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 26)
-      '--  FINE  -- nuovi parametri per preforo lavello
+      WjIntCutsTxBl.Text = EgtMsg( 90930)                                ' Sempre sugli interni
       NestingParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 31)            ' Nesting
-      AlignTxBl.Text = EgtMsg(90932)                                     ' Allineato
-      GhigliottinaTxBl.Text = EgtMsg(91066)                              ' Ghigliottina
+      AlignTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 32)                     ' Allineato
       AutomaticTxBl.Text = EgtMsg(91059)                                 ' Automatico
       SetUpBtn.Content = EgtMsg(MSG_ALARMSPAGEUC + 33)                   ' Attrezzaggio
       NewMatBtn.Content = EgtMsg(MSG_ALARMSPAGEUC + 34)                  ' Nuovo
@@ -119,33 +98,23 @@ Public Class AlarmsPageUC
       CurrSawingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 2)                ' Taglio lama
       CurrDrillingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 3)              ' Foratura
       CurrMillingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 4)               ' Fresatura
-      CurrPocketingTxBl.Text = EgtMsg(91069)                             ' Svuotatura
       CurrWaterJettingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 7)          ' WaterJet
       CurrDripSawingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 5)            ' DripSawing
       CurrDripDrillingTxBl.Text = EgtMsg(MSG_ALARMS2PAGEUC + 6)          ' DripDrilling
-      FrameGpBx.Header = EgtMsg(91068)                                   ' Cornici
-      FramePauseTxBl.Text = EgtMsg(91067)                                ' Inserisci pausa
-      UseLaserOriginTxBl.Text = EgtMsg(91129)                            ' Usa laser per origine
       AutoRawImageParamGpBx.Visibility = Windows.Visibility.Hidden
    End Sub
 
    Private Sub AlarmsPage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
 
       If m_bFirst Then
-
-         ' in assenza dell'uscita H1 nascondo i parametri lama
-         If EgtGetHeadId("H1") = GDB_ID.NULL Then
-            SawGpBx.Visibility = Visibility.Hidden
-            TopMillGpBx.Visibility = Visibility.Hidden
-            CurrSawTxBl.Visibility = Visibility.Hidden
-            CurrSawCmBx.Visibility = Visibility.Hidden
-         End If
+         ' Variabile che accorcia il riferimento alla macchina corrente
+         m_CurrentMachine = m_MainWindow.m_CurrentMachine
 
          ' Verifico la configurazione della macchina per creare i combobox
          Select Case m_CurrentMachine.MountedToolConfig
             Case CurrentMachine.MountedToolConfigs.SAW
                ' Elimino le righe inutili e riduco il groupbox utensili correnti
-               For Index As Integer = 7 - 1 To 2 Step -1
+               For Index = 7 - 1 To 2 Step -1
                   CurrToolsGrid.RowDefinitions.RemoveAt(Index)
                Next
                Dim EndRow As New RowDefinition
@@ -155,7 +124,7 @@ Public Class AlarmsPageUC
                ' Disattivo il gruppo dei parametri fori
                HolesGpBx.Visibility = Windows.Visibility.Hidden
             Case CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL
-            'Non faccio alcunchè
+               'Non faccio alcunchè
             Case CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER, CurrentMachine.MountedToolConfigs.TOOLCHANGER
                'Da implementare
          End Select
@@ -174,7 +143,7 @@ Public Class AlarmsPageUC
 
          ' Se non previsti tagli waterjet, disabilito relativo box
          If Not m_CurrentMachine.bWaterJetting Then
-            WjsParamGpBx.Visibility = Visibility.Hidden
+            WJsParamGpBx.Visibility = Visibility.Hidden
          End If
 
          ' Abilitazione box per contorni grezzo da foto
@@ -187,7 +156,7 @@ Public Class AlarmsPageUC
          End If
 
          ' Abilitazione Feed ridotta su inizio/fine tagli
-         If m_CurrentMachine.bFsevEnable And EgtGetHeadId("H1") <> GDB_ID.NULL Then
+         If m_CurrentMachine.bFsevEnable Then
             CutFredGpBx.Visibility = Windows.Visibility.Visible
          Else
             CutFredGpBx.Visibility = Windows.Visibility.Hidden
@@ -207,51 +176,33 @@ Public Class AlarmsPageUC
       ' Seleziono lama corrente
       CurrSawCmBx.SelectedItem = m_CurrentMachine.sCurrSaw
 
-      ' nascondo la lista dei materiali solo se macchina WaterJet
-      If m_CurrentMachine.bWaterJet Then
-         MaterialsGpBx.Visibility = Visibility.Hidden
-      End If
-
       ' Verifico la configurazione della macchina per creare i combobox
       Select Case m_CurrentMachine.MountedToolConfig
          Case CurrentMachine.MountedToolConfigs.SAW
-            ' Non compio alcuna azione (non sono previsti utensili ausiliari)
-
+            ' Non compio alcuna azione
          Case CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL
             m_AuxToolTypeList.Clear()
-            ' creo l'elenco degli utensili ausiliri
             If m_CurrentMachine.bDrill Then
                m_AuxToolTypeList.Add(New StringIdCmBx(1, EgtMsg(MSG_ALARMSPAGEUC + 21)))      ' Foretto
             End If
             If m_CurrentMachine.bMill Then
                m_AuxToolTypeList.Add(New StringIdCmBx(2, EgtMsg(MSG_ALARMSPAGEUC + 22)))      ' Fresa
             End If
-            If m_CurrentMachine.bCupWheel Then
-               m_AuxToolTypeList.Add(New StringIdCmBx(3, EgtMsg(MSG_TOOLSDBPAGEUC + 34)))     ' Mola da scasso
-            End If
             If m_CurrentMachine.bWaterJet Then
-               m_AuxToolTypeList.Add(New StringIdCmBx(4, EgtMsg(MSG_TOOLSDBPAGEUC + 35)))     ' WaterJet
+               m_AuxToolTypeList.Add(New StringIdCmBx(3, EgtMsg(MSG_TOOLSDBPAGEUC + 35)))      ' WaterJet
             End If
             ' Aggiungo elemento nessuno in fondo alla lista
             m_AuxToolTypeList.Add(New StringIdCmBx(0, EgtMsg(MSG_ALARMSPAGEUC + 20)))         ' Nessuno
 
-            ' ComboBox per la selezione dell'utensile ausiliario
             AuxiliaryToolTxBl.Visibility = Windows.Visibility.Visible
             AuxiliaryToolCmBx.Visibility = Windows.Visibility.Visible
-            ' Drilling
             CurrDrillTxBl.Visibility = Windows.Visibility.Hidden
             CurrDrillCmBx.Visibility = Windows.Visibility.Hidden
-            ' Milling
             CurrMillTxBl.Visibility = Windows.Visibility.Hidden
             CurrMillCmBx.Visibility = Windows.Visibility.Hidden
-            ' Pocketing
-            CurrCupWheelTxBl.Visibility = Windows.Visibility.Hidden
-            CurrCupWheelCmBx.Visibility = Windows.Visibility.Hidden
-            ' WaterJet
             CurrWJetTxBl.Visibility = Windows.Visibility.Hidden
             CurrWJetCmBx.Visibility = Windows.Visibility.Hidden
 
-            ' verifico quale utensile è attulamente "montato sulla macchina"
             If m_CurrentMachine.sCurrDrill <> String.Empty Then
                CreateToolList(MCH_TF.DRILLBIT, m_DrillList)
                m_DrillList.Add(NO_TOOL)
@@ -260,24 +211,17 @@ Public Class AlarmsPageUC
                CurrDrillTxBl.Visibility = Windows.Visibility.Visible
                CurrDrillCmBx.Visibility = Windows.Visibility.Visible
             ElseIf m_CurrentMachine.sCurrMill <> String.Empty Then
-               CreateToolList(MCH_TF.MILL, MCH_TY.MILL_STD, m_MillList)
+               CreateToolList(MCH_TF.MILL, m_MillList)
                m_MillList.Add(NO_TOOL)
                CurrMillCmBx.SelectedItem = m_CurrentMachine.sCurrMill
                AuxiliaryToolCmBx.SelectedItem = StringIdCmBx.FromIdToStringIdCmBx(2, m_AuxToolTypeList)
                CurrMillTxBl.Visibility = Windows.Visibility.Visible
                CurrMillCmBx.Visibility = Windows.Visibility.Visible
-            ElseIf m_CurrentMachine.sCurrMillNoTip <> String.Empty Then
-               CreateToolList(MCH_TF.MILL, MCH_TY.MILL_NOTIP, m_CupWheelList)
-               m_CupWheelList.Add(NO_TOOL)
-               CurrCupWheelCmBx.SelectedItem = m_CurrentMachine.sCurrMillNoTip
-               AuxiliaryToolCmBx.SelectedItem = StringIdCmBx.FromIdToStringIdCmBx(3, m_AuxToolTypeList)
-               CurrCupWheelTxBl.Visibility = Windows.Visibility.Visible
-               CurrCupWheelCmBx.Visibility = Windows.Visibility.Visible
             ElseIf m_CurrentMachine.sCurrWaterJet <> String.Empty Then
                CreateToolList(MCH_TF.WATERJET, m_WaterJetList)
                m_WaterJetList.Add(NO_TOOL)
                CurrWJetCmBx.SelectedItem = m_CurrentMachine.sCurrWaterJet
-               AuxiliaryToolCmBx.SelectedItem = StringIdCmBx.FromIdToStringIdCmBx(4, m_AuxToolTypeList)
+               AuxiliaryToolCmBx.SelectedItem = StringIdCmBx.FromIdToStringIdCmBx(3, m_AuxToolTypeList)
                CurrWJetTxBl.Visibility = Windows.Visibility.Visible
                CurrWJetCmBx.Visibility = Windows.Visibility.Visible
             Else
@@ -285,13 +229,54 @@ Public Class AlarmsPageUC
             End If
 
          Case CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER, CurrentMachine.MountedToolConfigs.TOOLCHANGER
-            ' attivo il bottone per l'apertura della pagina che mostra la configurazione degli utensili in parcheggio
             SetUpBtn.Visibility = Windows.Visibility.Visible
 
       End Select
 
-      ' aggiorno le TextBlock con le lavorazioni correnti
-      RefreschMachining()
+      ' Verifico la configurazione della macchina per creare i textbox delle lavorazioni
+      CurrSawingTxBl.Visibility = Windows.Visibility.Hidden
+      CurrSawingTxBx.Visibility = Windows.Visibility.Hidden
+      CurrDrillingTxBl.Visibility = Windows.Visibility.Hidden
+      CurrDrillingTxBx.Visibility = Windows.Visibility.Hidden
+      CurrMillingTxBl.Visibility = Windows.Visibility.Hidden
+      CurrMillingTxBx.Visibility = Windows.Visibility.Hidden
+      CurrWaterJettingTxBl.Visibility = Windows.Visibility.Hidden
+      CurrWaterJettingTxBx.Visibility = Windows.Visibility.Hidden
+      CurrDripSawingTxBl.Visibility = Windows.Visibility.Hidden
+      CurrDripSawingTxBx.Visibility = Windows.Visibility.Hidden
+      CurrDripDrillingTxBl.Visibility = Windows.Visibility.Hidden
+      CurrDripDrillingTxBx.Visibility = Windows.Visibility.Hidden
+
+      If m_CurrentMachine.sCurrSawing <> String.Empty Then
+         CurrSawingTxBx.Text = m_CurrentMachine.sCurrSawing
+         CurrSawingTxBl.Visibility = Windows.Visibility.Visible
+         CurrSawingTxBx.Visibility = Windows.Visibility.Visible
+      End If
+      If m_CurrentMachine.sCurrDrilling <> String.Empty Then
+         CurrDrillingTxBx.Text = m_CurrentMachine.sCurrDrilling
+         CurrDrillingTxBl.Visibility = Windows.Visibility.Visible
+         CurrDrillingTxBx.Visibility = Windows.Visibility.Visible
+      End If
+      If m_CurrentMachine.sCurrMilling <> String.Empty Then
+         CurrMillingTxBx.Text = m_CurrentMachine.sCurrMilling
+         CurrMillingTxBl.Visibility = Windows.Visibility.Visible
+         CurrMillingTxBx.Visibility = Windows.Visibility.Visible
+      End If
+      If m_CurrentMachine.sCurrwaterJetting <> String.Empty Then
+         CurrWaterJettingTxBx.Text = m_CurrentMachine.sCurrwaterJetting
+         CurrWaterJettingTxBl.Visibility = Windows.Visibility.Visible
+         CurrWaterJettingTxBx.Visibility = Windows.Visibility.Visible
+      End If
+      If m_CurrentMachine.sCurrDripSawing <> String.Empty Then
+         CurrDripSawingTxBx.Text = m_CurrentMachine.sCurrDripSawing
+         CurrDripSawingTxBl.Visibility = Windows.Visibility.Visible
+         CurrDripSawingTxBx.Visibility = Windows.Visibility.Visible
+      End If
+      If m_CurrentMachine.sCurrDripDrilling <> String.Empty Then
+         CurrDripDrillingTxBx.Text = m_CurrentMachine.sCurrDripDrilling
+         CurrDripDrillingTxBl.Visibility = Windows.Visibility.Visible
+         CurrDripDrillingTxBx.Visibility = Windows.Visibility.Visible
+      End If
 
       ' Leggo offset fori
       Dim dVal As Double
@@ -323,14 +308,6 @@ Public Class AlarmsPageUC
       dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_EXTARCMINRAD, 200, m_MainWindow.GetMachIniFile())
       EgtMdbSetGeneralParam(MCH_GP.EXTSAWARCMINRAD, dVal)
       ExtArcMinRadTxBx.Text = LenToString(dVal, 2)
-      ' Leggo se PreCutExit attivo (per taglio ceramico)
-      Dim nPreCutExit As Integer = GetPrivateProfileInt(S_MACH_NEST, K_MACH_PRECUTEXIT, -1, m_MainWindow.GetMachIniFile())
-      If nPreCutExit = -1 Then
-         PreCutExitTxBl.Visibility = Visibility.Hidden
-         PreCutExitChBx.Visibility = Visibility.Hidden
-      Else
-         PreCutExitChBx.IsChecked = ( nPreCutExit <> 0)
-      End If
       ' Leggo angolo di fianco massimo arco interno
       dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_INTARCMAXSIDEANG, 45, m_MainWindow.GetMachIniFile())
       EgtMdbSetGeneralParam(MCH_GP.INTSAWARCMAXSIDEANG, dVal)
@@ -339,22 +316,12 @@ Public Class AlarmsPageUC
       EgtMdbSave()
       ' Leggo lavorazione angoli con fresa
       CornerCutsChBx.IsChecked =
-         (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0)
+             (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0)
       ' Leggo lavorazione interni con fresa
       InternalCutsChBx.IsChecked =
-         (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0)
+             (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0)
       WjIntCutsChBx.IsChecked =
-         (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0)
-      ' Lavorazione preforo lavello con WaterJet
-      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_HOLES_DIAMITERWJ, 0, m_MainWindow.GetMachIniFile())
-      HolesDiameterWJTxBx.Text = LenToString(dVal, 2)
-      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_HOLES_OFFSETWJ, 0, m_MainWindow.GetMachIniFile())
-      HolesOffsetWJTxBx.Text = LenToString(dVal, 2)
-      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MIN_RADIUSWJ, 0, m_MainWindow.GetMachIniFile())
-      MinRadiusWJTxBx.Text = LenToString(dVal, 2)
-      OneHoleInCornerWJChBx.IsChecked =
-         (GetPrivateProfileInt(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0)
-
+             (GetPrivateProfileInt(S_MACH_NEST, K_MACH_MILLING_ON_SINKS, 0, m_MainWindow.GetMachIniFile()) <> 0)
       ' Leggo accorciamento angoli con fresa
       dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_MILLING_SHORTENING, 0, m_MainWindow.GetMachIniFile())
       ShortTxBx.Text = LenToString(dVal, 2)
@@ -367,29 +334,23 @@ Public Class AlarmsPageUC
       dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_ENGRAVING_WIDTH, 0, m_MainWindow.GetMachIniFile())
       TmWidthTxBx.Text = LenToString(dVal, 2)
       ' Flag per movimento in home alla fine dei tagli diretti
-      FinalHomeChBx.IsChecked = m_CurrentMachine.bDirectCutsFinalHome
+      FinalHomeChBx.IsChecked = m_MainWindow.m_CurrentMachine.bDirectCutsFinalHome
       ' Leggo tagli ridotti per interferenza in nesting
       CompleteCutsChBx.IsChecked =
              (GetPrivateProfileInt(S_MACH_NEST, K_MACH_REDUCEDCUT, 0, m_MainWindow.GetMachIniFile()) = 0)
       ' Flag per nesting allineato
       AlignChBx.IsChecked =
              (GetPrivateProfileInt(S_MACH_NEST, K_MACH_NEST_ALIGNED, 0, m_MainWindow.GetMachIniFile()) <> 0)
-      ' Flag per nesting a ghigliottina
-      GhigliottinaChBx.IsChecked =
-             (GetPrivateProfileInt(S_MACH_NEST, K_MACH_NEST_GHIGLIOTTINA, 0, m_MainWindow.GetMachIniFile()) <> 0)
       ' Flag per nesting automatico
       AutomaticChBx.IsChecked =
-             (GetPrivateProfileInt(S_NEST, K_AUTOMATICOPTIMIZE, 0, m_MainWindow.GetIniFile()) <> 0)
-      AdjustGhigliottinaTextOnAutomaticOrCompleteCuts()
-      ' Flag per inserire la puasa dopo la sgrossatura delle cornici
-      FramePauseChBx.IsChecked =
-         (GetPrivateProfileInt(S_MACH_FRAME, K_MACH_PAUSE, 1, m_MainWindow.GetMachIniFile()) <> 0)
+             (GetPrivateProfileInt(S_MACH_NEST, K_MACH_NEST_AUTOMATIC, 0, m_MainWindow.GetMachIniFile()) <> 0)
+      AdjustAlignTextOnAutomaticOrCompleteCuts()
       ' Aggiorno messaggio sovratavola con numero tavola
       If GetTableCount() > 1 Then
          AdditionalTableTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 36) & " " & GetCurrentTable().ToString()
       End If
       ' Leggo altezza sovratavola
-      dVal = m_CurrentMachine.dAdditionalTable
+      dVal = m_MainWindow.m_CurrentMachine.dAdditionalTable
       AdditionalTableTxBx.Text = LenToString(dVal, 2)
       ' Leggo soglia e tolleranza per contorno grezzo da foto
       ThresholdTxBx.Text = m_MainWindow.m_Camera.Threshold.ToString()
@@ -407,109 +368,18 @@ Public Class AlarmsPageUC
       If nWashing = -1 Then
          WashingGpBx.Visibility = Visibility.Hidden
       Else
-         WashingChBx.IsChecked = (nWashing <> 0)
+         WashingChBx.IsChecked = ( nWashing <> 0)
       End If
       ' Leggo parametri per variazione feed in tagli
       CfrLenTxBx.Text = LenToString(m_CurrentMachine.dFsevLength, 3)
       CfrPercTxBx.Text = DoubleToString(m_CurrentMachine.dFsevPerc, 0)
-
-      ' leggo flag per tavola definita da laser
-      Dim nUseLaserOrigin As Integer = GetPrivateProfileInt(S_TABLE, K_USELASERORIGIN, -1, m_MainWindow.GetMachIniFile())
-      If nUseLaserOrigin = -1 Then
-         UseLaserOriginTxBl.Visibility = Visibility.Hidden
-         UseLaserOriginChBx.Visibility = Visibility.Hidden
-      Else
-         UseLaserOriginTxBl.Visibility = Visibility.Visible
-         UseLaserOriginChBx.IsChecked = (nUseLaserOrigin <> 0)
-      End If
-
    End Sub
 
-   ' aggiorna le text delle lavorazioni (la selezione avviene nella pagina del grezzo o dalla pagina del progetto corrente)
-   Private Sub RefreschMachining()
-      If m_CurrentMachine.sCurrSawing <> String.Empty Then
-         CurrSawingTxBx.Text = m_CurrentMachine.sCurrSawing
-         CurrSawingTxBl.Visibility = Windows.Visibility.Visible
-         CurrSawingTxBx.Visibility = Windows.Visibility.Visible
-      Else
-         CurrSawingTxBl.Visibility = Windows.Visibility.Hidden
-         CurrSawingTxBx.Visibility = Windows.Visibility.Hidden
-      End If
-      If m_CurrentMachine.sCurrDrilling <> String.Empty Then
-         CurrDrillingTxBx.Text = m_CurrentMachine.sCurrDrilling
-         CurrDrillingTxBl.Visibility = Windows.Visibility.Visible
-         CurrDrillingTxBx.Visibility = Windows.Visibility.Visible
-      Else
-         CurrDrillingTxBl.Visibility = Windows.Visibility.Hidden
-         CurrDrillingTxBx.Visibility = Windows.Visibility.Hidden
-      End If
-      If m_CurrentMachine.sCurrMilling <> String.Empty Then
-         CurrMillingTxBx.Text = m_CurrentMachine.sCurrMilling
-         CurrMillingTxBl.Visibility = Windows.Visibility.Visible
-         CurrMillingTxBx.Visibility = Windows.Visibility.Visible
-      Else
-         CurrMillingTxBl.Visibility = Windows.Visibility.Hidden
-         CurrMillingTxBx.Visibility = Windows.Visibility.Hidden
-      End If
-      If m_CurrentMachine.sCurrPocketing <> String.Empty Then
-         CurrPocketingTxBx.Text = m_CurrentMachine.sCurrPocketing
-         CurrPocketingTxBl.Visibility = Windows.Visibility.Visible
-         CurrPocketingTxBx.Visibility = Windows.Visibility.Visible
-      Else
-         CurrPocketingTxBl.Visibility = Windows.Visibility.Hidden
-         CurrPocketingTxBx.Visibility = Windows.Visibility.Hidden
-      End If
-      If m_CurrentMachine.sCurrWaterJetting <> String.Empty Then
-         CurrWaterJettingTxBx.Text = m_CurrentMachine.sCurrWaterJetting
-         CurrWaterJettingTxBl.Visibility = Windows.Visibility.Visible
-         CurrWaterJettingTxBx.Visibility = Windows.Visibility.Visible
-         If m_CurrentMachine.bFromDBWaterJet Then
-            CurrWaterJettingTxBx.SetValue(Grid.ColumnSpanProperty, 1)
-            CurrWaterJettingTxBx.SetValue(MarginProperty, New Thickness(CurrWaterJettingTxBx.Margin.Left,
-                                                                        CurrWaterJettingTxBx.Margin.Top,
-                                                                        5,
-                                                                        CurrWaterJettingTxBx.Margin.Bottom))
-            CurrWaterJettingQualityTxBx.Text = m_CurrentMachine.sCurrWaterJettingQuality
-            CurrWaterJettingQualityTxBx.Visibility = Windows.Visibility.Visible
-         Else
-            CurrWaterJettingTxBx.SetValue(Grid.ColumnSpanProperty, 2)
-            CurrWaterJettingTxBx.SetValue(MarginProperty, New Thickness(CurrWaterJettingTxBx.Margin.Left,
-                                                                        CurrWaterJettingTxBx.Margin.Top,
-                                                                        10,
-                                                                        CurrWaterJettingTxBx.Margin.Bottom))
-            CurrWaterJettingQualityTxBx.Visibility = Windows.Visibility.Collapsed
-         End If
-      Else
-         CurrWaterJettingTxBl.Visibility = Windows.Visibility.Hidden
-         CurrWaterJettingTxBx.Visibility = Windows.Visibility.Hidden
-         CurrWaterJettingQualityTxBx.Visibility = Windows.Visibility.Hidden
-      End If
-      If m_CurrentMachine.sCurrDripSawing <> String.Empty Then
-         CurrDripSawingTxBx.Text = m_CurrentMachine.sCurrDripSawing
-         CurrDripSawingTxBl.Visibility = Windows.Visibility.Visible
-         CurrDripSawingTxBx.Visibility = Windows.Visibility.Visible
-      Else
-         CurrDripSawingTxBl.Visibility = Windows.Visibility.Hidden
-         CurrDripSawingTxBx.Visibility = Windows.Visibility.Hidden
-      End If
-      If m_CurrentMachine.sCurrDripDrilling <> String.Empty Then
-         CurrDripDrillingTxBx.Text = m_CurrentMachine.sCurrDripDrilling
-         CurrDripDrillingTxBl.Visibility = Windows.Visibility.Visible
-         CurrDripDrillingTxBx.Visibility = Windows.Visibility.Visible
-      Else
-         CurrDripDrillingTxBl.Visibility = Windows.Visibility.Hidden
-         CurrDripDrillingTxBx.Visibility = Windows.Visibility.Hidden
-      End If
-   End Sub
-
-   ' questo metodo è utilizzato solo per le macchine con utensile ausiliario (Assenza del bottone Attrezzaggio-> monta un solo utensila per volta
    Private Sub AuxiliaryToolCmBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles AuxiliaryToolCmBx.SelectionChanged
       CurrDrillTxBl.Visibility = Windows.Visibility.Hidden
       CurrDrillCmBx.Visibility = Windows.Visibility.Hidden
       CurrMillTxBl.Visibility = Windows.Visibility.Hidden
       CurrMillCmBx.Visibility = Windows.Visibility.Hidden
-      CurrCupWheelTxBl.Visibility = Windows.Visibility.Hidden
-      CurrCupWheelCmBx.Visibility = Windows.Visibility.Hidden
       CurrWJetTxBl.Visibility = Windows.Visibility.Hidden
       CurrWJetCmBx.Visibility = Windows.Visibility.Hidden
       Dim SelectedItem As StringIdCmBx = AuxiliaryToolCmBx.SelectedItem
@@ -526,15 +396,11 @@ Public Class AlarmsPageUC
                CurrDrillCmBx.SelectedItem = m_CurrentMachine.sCurrDrill
             End If
             m_CurrentMachine.sCurrMill = String.Empty
-            m_CurrentMachine.sCurrMilling = String.Empty
-            m_CurrentMachine.sCurrMillNoTip = String.Empty
-            m_CurrentMachine.sCurrPocketing = String.Empty
             m_CurrentMachine.sCurrWaterJet = String.Empty
-            m_CurrentMachine.sCurrWaterJetting = String.Empty
             CurrDrillTxBl.Visibility = Windows.Visibility.Visible
             CurrDrillCmBx.Visibility = Windows.Visibility.Visible
          Case 2
-            CreateToolList(MCH_TF.MILL, MCH_TY.MILL_STD, m_MillList)
+            CreateToolList(MCH_TF.MILL, m_MillList)
             m_MillList.Add(NO_TOOL)
             If m_CurrentMachine.sCurrMill = String.Empty Then
                CurrMillCmBx.SelectedItem = NO_TOOL
@@ -542,30 +408,10 @@ Public Class AlarmsPageUC
                CurrMillCmBx.SelectedItem = m_CurrentMachine.sCurrMill
             End If
             m_CurrentMachine.sCurrDrill = String.Empty
-            m_CurrentMachine.sCurrDrilling = String.Empty
-            m_CurrentMachine.sCurrMillNoTip = String.Empty
-            m_CurrentMachine.sCurrPocketing = String.Empty
             m_CurrentMachine.sCurrWaterJet = String.Empty
-            m_CurrentMachine.sCurrWaterJetting = String.Empty
             CurrMillTxBl.Visibility = Windows.Visibility.Visible
             CurrMillCmBx.Visibility = Windows.Visibility.Visible
          Case 3
-            CreateToolList(MCH_TF.MILL, MCH_TY.MILL_NOTIP, m_CupWheelList)
-            m_CupWheelList.Add(NO_TOOL)
-            If m_CurrentMachine.sCurrMillNoTip = String.Empty Then
-               CurrCupWheelCmBx.SelectedItem = NO_TOOL
-            Else
-               CurrCupWheelCmBx.SelectedItem = m_CurrentMachine.sCurrMillNoTip
-            End If
-            m_CurrentMachine.sCurrDrill = String.Empty
-            m_CurrentMachine.sCurrDrilling = String.Empty
-            m_CurrentMachine.sCurrMill = String.Empty
-            m_CurrentMachine.sCurrMilling = String.Empty
-            m_CurrentMachine.sCurrWaterJet = String.Empty
-            m_CurrentMachine.sCurrWaterJetting = String.Empty
-            CurrCupWheelTxBl.Visibility = Windows.Visibility.Visible
-            CurrCupWheelCmBx.Visibility = Windows.Visibility.Visible
-         Case 4
             CreateToolList(MCH_TF.WATERJET, m_WaterJetList)
             m_WaterJetList.Add(NO_TOOL)
             If m_CurrentMachine.sCurrWaterJet = String.Empty Then
@@ -574,21 +420,12 @@ Public Class AlarmsPageUC
                CurrWJetCmBx.SelectedItem = m_CurrentMachine.sCurrWaterJet
             End If
             m_CurrentMachine.sCurrDrill = String.Empty
-            m_CurrentMachine.sCurrDrilling = String.Empty
             m_CurrentMachine.sCurrMill = String.Empty
-            m_CurrentMachine.sCurrMilling = String.Empty
-            m_CurrentMachine.sCurrMillNoTip = String.Empty
-            m_CurrentMachine.sCurrPocketing = String.Empty
             CurrWJetTxBl.Visibility = Windows.Visibility.Visible
             CurrWJetCmBx.Visibility = Windows.Visibility.Visible
       End Select
-      ' aggionro l'elenco delle lavoarzioni
-      RefreschMachining()
-
    End Sub
 
-#Region "Selection: SAW, DRILL, MILL, CUPWHEEL, WATERJET"
-   ' -- SAW --
    Private Sub CurrSawCmBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles CurrSawCmBx.SelectionChanged
       If IsNothing(CurrSawCmBx.SelectedItem) Then Return
       ' Assegno
@@ -602,55 +439,23 @@ Public Class AlarmsPageUC
          String.Compare(sMchTool, m_CurrentMachine.sCurrSaw, True) <> 0 Then
          m_CurrentMachine.sCurrSawing = String.Empty
       End If
-
-      'Dim sVal As String = String.Empty
-      'Dim dVal As Double = 0
-      'If m_CurrentMachine.GetUserNote("FsevLength", sVal, m_CurrentMachine.sCurrSawing, false) Then
-      '   StringToDouble(sVal, dVal)
-      '   m_CurrentMachine.SetFsevLength(dVal)
-      'End If
-      'If m_CurrentMachine.GetUserNote("FsevPerc", sVal, m_CurrentMachine.sCurrSawing, false) Then
-      '   StringToDouble(sVal, dVal)
-      '   m_CurrentMachine.SetFsevPerc(dVal)
-      'End If
-
-      Dim sVal As String = String.Empty
-      Dim dVal As Double = 0
-      If m_CurrentMachine.GetUserNote("FsevLength", sVal, m_CurrentMachine.sCurrSaw) Then
-         StringToDouble(sVal, dVal)
-         m_CurrentMachine.SetFsevLength(dVal)
-      End If
-      If m_CurrentMachine.GetUserNote("FsevPerc", sVal, m_CurrentMachine.sCurrSaw) Then
-         StringToDouble(sVal, dVal)
-         m_CurrentMachine.SetFsevPerc(dVal)
-      End If
-
-      ' Leggo parametri per variazione feed in tagli aggiornati in funzione della lama
-      CfrLenTxBx.Text = LenToString(m_CurrentMachine.dFsevLength, 3)
-      CfrPercTxBx.Text = DoubleToString(m_CurrentMachine.dFsevPerc, 0)
-
       ' Aggiorno utensili per lavoro in corso
       m_MainWindow.m_WorkInProgressPageUC.UpdateTools()
-      ' aggiorno la lista delle lavorazioni
-      RefreschMachining()
    End Sub
 
-   ' -- DRILL --
    Private Sub CurrDrillCmBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles CurrDrillCmBx.SelectionChanged
       If IsNothing(CurrDrillCmBx.SelectedItem) Then Return
       ' Rimuovo foretto
       If CurrDrillCmBx.SelectedItem.ToString() = NO_TOOL Then
          m_CurrentMachine.sCurrDrill = String.Empty
          m_CurrentMachine.sCurrDrilling = String.Empty
-         ' Assegno foretto
+      ' Assegno foretto
       Else
          m_CurrentMachine.sCurrDrill = CurrDrillCmBx.SelectedItem.ToString()
          ' Reset fresa, waterjet e relative lavorazioni
          If m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL Then
             m_CurrentMachine.sCurrMill = String.Empty
             m_CurrentMachine.sCurrMilling = String.Empty
-            m_CurrentMachine.sCurrMillNoTip = String.Empty
-            m_CurrentMachine.sCurrPocketing = String.Empty
             m_CurrentMachine.sCurrWaterJet = String.Empty
             m_CurrentMachine.sCurrWaterJetting = String.Empty
          End If
@@ -666,26 +471,21 @@ Public Class AlarmsPageUC
       End If
       ' Aggiorno utensili per lavoro in corso
       m_MainWindow.m_WorkInProgressPageUC.UpdateTools()
-      ' aggiorno la lista delle lavorazioni
-      RefreschMachining()
    End Sub
 
-   ' -- MILL --
    Private Sub CurrMillCmBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles CurrMillCmBx.SelectionChanged
       If IsNothing(CurrMillCmBx.SelectedItem) Then Return
       ' Rimuovo fresa
       If CurrMillCmBx.SelectedItem.ToString() = NO_TOOL Then
          m_CurrentMachine.sCurrMill = String.Empty
          m_CurrentMachine.sCurrMilling = String.Empty
-         ' Assegno fresa
+      ' Assegno fresa
       Else
          m_CurrentMachine.sCurrMill = CurrMillCmBx.SelectedItem.ToString()
          ' Reset foretto, waterjet e relative lavorazioni
          If m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL Then
             m_CurrentMachine.sCurrDrill = String.Empty
             m_CurrentMachine.sCurrDrilling = String.Empty
-            m_CurrentMachine.sCurrMillNoTip = String.Empty
-            m_CurrentMachine.sCurrPocketing = String.Empty
             m_CurrentMachine.sCurrWaterJet = String.Empty
             m_CurrentMachine.sCurrWaterJetting = String.Empty
          End If
@@ -701,53 +501,15 @@ Public Class AlarmsPageUC
       End If
       ' Aggiorno utensili per lavoro in corso
       m_MainWindow.m_WorkInProgressPageUC.UpdateTools()
-      ' aggiorno la lista delle lavorazioni
-      RefreschMachining()
    End Sub
 
-   ' -- CUPWHEEL --
-   Private Sub CurrCupWheelCmBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles CurrCupWheelCmBx.SelectionChanged
-      If IsNothing(CurrCupWheelCmBx.SelectedItem) Then Return
-      ' Rimuovo fresa
-      If CurrCupWheelCmBx.SelectedItem.ToString() = NO_TOOL Then
-         m_CurrentMachine.sCurrMillNoTip = String.Empty
-         m_CurrentMachine.sCurrPocketing = String.Empty
-         ' Assegno fresa
-      Else
-         m_CurrentMachine.sCurrMillNoTip = CurrCupWheelCmBx.SelectedItem.ToString()
-         ' Reset foretto, waterjet e relative lavorazioni
-         If m_CurrentMachine.MountedToolConfig = CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL Then
-            m_CurrentMachine.sCurrDrill = String.Empty
-            m_CurrentMachine.sCurrDrilling = String.Empty
-            m_CurrentMachine.sCurrMill = String.Empty
-            m_CurrentMachine.sCurrMilling = String.Empty
-            m_CurrentMachine.sCurrWaterJet = String.Empty
-            m_CurrentMachine.sCurrWaterJetting = String.Empty
-         End If
-         ' Se nuova fresa incompatibile con fresatura corrente, resetto quest'ultima
-         Dim sMchTuuid As String = String.Empty
-         Dim sMchTool As String = String.Empty
-         If Not EgtMdbSetCurrMachining(m_CurrentMachine.sCurrPocketing) Or
-            Not EgtMdbGetCurrMachiningParam(MCH_MP.TUUID, sMchTuuid) Or
-            Not EgtTdbGetToolFromUUID(sMchTuuid, sMchTool) Or
-            String.Compare(sMchTool, m_CurrentMachine.sCurrMillNoTip, True) <> 0 Then
-            m_CurrentMachine.sCurrPocketing = String.Empty
-         End If
-      End If
-      ' Aggiorno utensili per lavoro in corso
-      m_MainWindow.m_WorkInProgressPageUC.UpdateTools()
-      ' aggiorno la lista delle lavorazioni
-      RefreschMachining()
-   End Sub
-
-   ' -- WATERJET --
    Private Sub CurrWJetCmBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles CurrWJetCmBx.SelectionChanged
       If IsNothing(CurrWJetCmBx.SelectedItem) Then Return
       ' Rimuovo Waterjet
       If CurrWJetCmBx.SelectedItem.ToString() = NO_TOOL Then
          m_CurrentMachine.sCurrWaterJet = String.Empty
          m_CurrentMachine.sCurrWaterJetting = String.Empty
-         ' Assegno Waterjet
+      ' Assegno Waterjet
       Else
          m_CurrentMachine.sCurrWaterJet = CurrWJetCmBx.SelectedItem.ToString()
          ' Reset foretto, fresa e relative lavorazioni
@@ -769,13 +531,9 @@ Public Class AlarmsPageUC
       End If
       ' Aggiorno utensili per lavoro in corso
       m_MainWindow.m_WorkInProgressPageUC.UpdateTools()
-      ' aggiorno la lista delle lavorazioni
-      RefreschMachining()
    End Sub
 
-#End Region    'Selection: SAW, DRILL, MILL, CUPWHEEL, WATERJET
-
-   Public Overloads Sub CreateToolList(ToolType As Integer, ToolList As ObservableCollection(Of String))
+   Private Overloads Sub CreateToolList(ToolType As Integer, ToolList As ObservableCollection(Of String))
       ToolList.Clear()
       Dim ToolName As String = String.Empty
       Dim nType As Integer = MCH_TY.NONE
@@ -790,24 +548,6 @@ Public Class AlarmsPageUC
       End While
    End Sub
 
-   ' definisce l'elenco degli utensili in funzione della famiglia e del tipo (usata per distingure i diversi tipi di frese)
-   Public Overloads Sub CreateToolList(ToolFamily As Integer, ToolType As Integer, ToolList As ObservableCollection(Of String))
-      ToolList.Clear()
-      Dim ToolName As String = String.Empty
-      Dim nType As Integer = ToolType
-      Dim bFound As Boolean = EgtTdbGetFirstTool(ToolType, ToolName, nType)
-      While bFound
-         ' Accetto utensili che non siano da sotto
-         If String.Compare(ToolName, m_CurrentMachine.sCurrDripSaw, True) <> 0 AndAlso
-            String.Compare(ToolName, m_CurrentMachine.sCurrDripDrill, True) <> 0 AndAlso
-            nType = ToolType Then
-            ToolList.Add(ToolName)
-         End If
-         bFound = EgtTdbGetNextTool(ToolType, ToolName, nType)
-      End While
-
-   End Sub
-
    Private Sub SetUpBtn_Click(sender As Object, e As RoutedEventArgs) Handles SetUpBtn.Click
       m_MainWindow.m_MachinePageUC.MachinePageGrid.Children.Remove(Me)
       m_SetUpPage = New SetUpPage
@@ -881,14 +621,6 @@ Public Class AlarmsPageUC
       EgtMdbSave()
    End Sub
 
-   Private Sub PreCutExitChBx_Click(sender As Object, e As RoutedEventArgs) Handles PreCutExitChBx.Click
-      If PreCutExitChBx.IsChecked Then
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_PRECUTEXIT, "1", m_MainWindow.GetMachIniFile())
-      Else
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_PRECUTEXIT, "0", m_MainWindow.GetMachIniFile())
-      End If
-   End Sub
-
    Private Sub CompleteCutsChBx_Click(sender As Object, e As RoutedEventArgs) Handles CompleteCutsChBx.Click
       Dim NestPage As NestPageUC = m_MainWindow.m_CadCutPageUC.m_NestPage
       If CompleteCutsChBx.IsChecked() Then
@@ -911,7 +643,7 @@ Public Class AlarmsPageUC
       Else
          WritePrivateProfileString(S_MACH_NEST, K_MACH_REDUCEDCUT, "1", m_MainWindow.GetMachIniFile())
       End If
-      AdjustGhigliottinaTextOnAutomaticOrCompleteCuts()
+      AdjustAlignTextOnAutomaticOrCompleteCuts()
    End Sub
 
    Private Sub CornerCutsChBx_Click(sender As Object, e As RoutedEventArgs) Handles CornerCutsChBx.Click
@@ -944,42 +676,13 @@ Public Class AlarmsPageUC
       End If
    End Sub
 
-   ' -- INIZIO -- nuovi parametri per prefori WaterJet
-   Private Sub HolesDiameterWJTxBx_Click(sender As Object, e As EventArgs) Handles HolesDiameterWJTxBx.EgtClosed
-      Dim dVal As Double = 0
-      StringToLen(HolesDiameterWJTxBx.Text, dVal)
-      WritePrivateProfileString(S_MACH_NEST, K_HOLES_DIAMITERWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
-   End Sub
-
-   Private Sub HolesOffsetWJTxBx_Click(sender As Object, e As EventArgs) Handles HolesOffsetWJTxBx.EgtClosed
-      Dim dVal As Double = 0
-      StringToLen(HolesOffsetWJTxBx.Text, dVal)
-      WritePrivateProfileString(S_MACH_NEST, K_HOLES_OFFSETWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
-   End Sub
-
-   Private Sub MinRadiusWJTxBx_Click(sender As Object, e As EventArgs) Handles MinRadiusWJTxBx.EgtClosed
-      Dim dVal As Double = 0
-      StringToLen(MinRadiusWJTxBx.Text, dVal)
-      WritePrivateProfileString(S_MACH_NEST, K_MIN_RADIUSWJ, DoubleToString(dVal, 2), m_MainWindow.GetMachIniFile())
-   End Sub
-
-   Private Sub OneHoleInCornerWJChBx_Click(sender As Object, e As EventArgs) Handles OneHoleInCornerWJChBx.Click
-      If OneHoleInCornerWJChBx.IsChecked() Then
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, "1", m_MainWindow.GetMachIniFile())
-      Else
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, "0", m_MainWindow.GetMachIniFile())
-      End If
-   End Sub
-
-   ' --   FINE   -- nuovi parametri per prefori WaterJet
-
    Private Sub TmEnableChBx_Click(sender As Object, e As RoutedEventArgs) Handles TmEnableChBx.Click
       If TmEnableChBx.IsChecked() Then
          WritePrivateProfileString(S_MACH_NEST, K_MACH_ENGRAVING_WITHMILL, "1", m_MainWindow.GetMachIniFile())
       Else
          WritePrivateProfileString(S_MACH_NEST, K_MACH_ENGRAVING_WITHMILL, "0", m_MainWindow.GetMachIniFile())
       End If
-   End Sub
+   End Sub 
 
    Private Sub TmDepthTxBx_EgtClosed(sender As Object, e As EventArgs) Handles TmDepthTxBx.EgtClosed
       Dim dVal As Double = 0
@@ -995,9 +698,9 @@ Public Class AlarmsPageUC
 
    Private Sub FinalHomeChBx_Click(sender As Object, e As RoutedEventArgs) Handles FinalHomeChBx.Click
       If FinalHomeChBx.IsChecked() Then
-         m_CurrentMachine.bDirectCutsFinalHome = True
+         m_MainWindow.m_CurrentMachine.bDirectCutsFinalHome = True
       Else
-         m_CurrentMachine.bDirectCutsFinalHome = False
+         m_MainWindow.m_CurrentMachine.bDirectCutsFinalHome = False
       End If
    End Sub
 
@@ -1009,37 +712,27 @@ Public Class AlarmsPageUC
       End If
    End Sub
 
-   Private Sub GligliottinaChBx_Click(sender As Object, e As RoutedEventArgs) Handles GhigliottinaChBx.Click
-      If GhigliottinaChBx.IsChecked() Then
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_NEST_GHIGLIOTTINA, "1", m_MainWindow.GetMachIniFile())
-      Else
-         WritePrivateProfileString(S_MACH_NEST, K_MACH_NEST_GHIGLIOTTINA, "0", m_MainWindow.GetMachIniFile())
-      End If
-   End Sub
-
    Private Sub AutomaticChBx_Click(sender As Object, e As RoutedEventArgs) Handles AutomaticChBx.Click
       If AutomaticChBx.IsChecked() Then
-         WritePrivateProfileString(S_NEST, K_AUTOMATICOPTIMIZE, "1", m_MainWindow.GetIniFile())
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_NEST_AUTOMATIC, "1", m_MainWindow.GetMachIniFile())
       Else
-         WritePrivateProfileString(S_NEST, K_AUTOMATICOPTIMIZE, "0", m_MainWindow.GetIniFile())
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_NEST_AUTOMATIC, "0", m_MainWindow.GetMachIniFile())
       End If
-      AdjustGhigliottinaTextOnAutomaticOrCompleteCuts()
+      AdjustAlignTextOnAutomaticOrCompleteCuts()
    End Sub
 
-   Private Sub AdjustGhigliottinaTextOnAutomaticOrCompleteCuts()
+   Private Sub AdjustAlignTextOnAutomaticOrCompleteCuts()
       If AutomaticChBx.IsChecked() And Not CompleteCutsChBx.IsChecked() Then
-         GhigliottinaTxBl.Visibility = Visibility.Visible
-         GhigliottinaChBx.Visibility = Visibility.Visible
+         AlignTxBl.Text = EgtMsg( 91060)         ' Allineato e Ghigliottina
       Else
-         GhigliottinaTxBl.Visibility = Visibility.Collapsed
-         GhigliottinaChBx.Visibility = Visibility.Collapsed
+         AlignTxBl.Text = EgtMsg( 90932)         ' Allineato
       End If
    End Sub
 
    Private Sub AdditionalTableTxBx_EgtClosed(sender As Object, e As EventArgs) Handles AdditionalTableTxBx.EgtClosed
       Dim dVal As Double = 0
       StringToLen(AdditionalTableTxBx.Text, dVal)
-      m_CurrentMachine.dAdditionalTable = dVal
+      m_MainWindow.m_CurrentMachine.dAdditionalTable = dVal
    End Sub
 
    Private Sub NewMatBtn_Click(sender As Object, e As RoutedEventArgs) Handles NewMatBtn.Click
@@ -1054,7 +747,7 @@ Public Class AlarmsPageUC
       If Not String.IsNullOrWhiteSpace(MatNameTxBx.Text) Then
          ' Verifico che il nome non sia già utilizzato
          Dim bNameExist As Boolean = False
-         For Each Material As Material In m_CurrentMachine.Materials
+         For Each Material In m_CurrentMachine.Materials
             If Material.sName = MatNameTxBx.Text Then
                bNameExist = True
                Exit For
@@ -1115,14 +808,6 @@ Public Class AlarmsPageUC
       End If
    End Sub
 
-   Private Sub UseLaserOriginChBx_Click() Handles UseLaserOriginChBx.Click
-      If UseLaserOriginChBx.IsChecked() Then
-         WritePrivateProfileString(S_TABLE, K_USELASERORIGIN, "1", m_MainWindow.GetMachIniFile())
-      Else
-         WritePrivateProfileString(S_TABLE, K_USELASERORIGIN, "0", m_MainWindow.GetMachIniFile())
-      End If
-   End Sub
-
    Private Sub WashingChBx_Click(sender As Object, e As RoutedEventArgs) Handles WashingChBx.Click
       If WashingChBx.IsChecked() Then
          WritePrivateProfileString(S_MACH_NEST, K_MACH_WASHING, "1", m_MainWindow.GetMachIniFile())
@@ -1147,25 +832,9 @@ Public Class AlarmsPageUC
       m_CurrentMachine.dFsevPerc = dVal
    End Sub
 
-   Private Sub FramePauseChBx_Click(sender As Object, e As RoutedEventArgs) Handles FramePauseChBx.Click
-      If FramePauseChBx.IsChecked() Then
-         WritePrivateProfileString(S_MACH_FRAME, K_MACH_PAUSE, "1", m_MainWindow.GetMachIniFile())
-      Else
-         WritePrivateProfileString(S_MACH_FRAME, K_MACH_PAUSE, "0", m_MainWindow.GetMachIniFile())
-      End If
-   End Sub
-
    Private Sub SawProbingBtn_Click(sender As Object, e As RoutedEventArgs) Handles SawProbingBtn.Click
-      ' imposto modo automatico
-      Select Case m_MainWindow.m_CNCommunication.m_nNCType
-         Case 1, 2
-            ' in attesa di verifica 
-         Case 3
-            Dim nResult As Short = m_CN.DGeneralFunctions_WriteCncMode(0)
-            EgtOutLog("Impostata modalità automatica: esito " & nResult.ToString)
-      End Select
       ' Recupero file LUA
-      EgtLuaExecFile(m_CurrentMachine.sMachDir() & "\DirectCmd\SawProbing.lua")
+      EgtLuaExecFile(m_MainWindow.m_CurrentMachine.sMachDir() & "\DirectCmd\SawProbing.lua")
       ' Recupero utensile da tastare
       Dim ToolForProbing As ToolPos = ChooseToolForProbing()
       If IsNothing(ToolForProbing) OrElse String.IsNullOrWhiteSpace(ToolForProbing.m_ToolName) Then Return
@@ -1204,7 +873,7 @@ Public Class AlarmsPageUC
       ' Modifico stringa per inserire i newline
       CmdString = CmdString.Replace("<br/>", Environment.NewLine)
       ' Creo file...
-      Dim FilePath As String = m_MainWindow.GetCncDir() & "\SawProbing" & m_CurrentMachine.sIsoFileExt
+      Dim FilePath As String = m_MainWindow.GetCncDir() & "\SawProbing" & m_MainWindow.m_CurrentMachine.sIsoFileExt
       ' ...e ci scrivo
       Dim Writer As New IO.StreamWriter(FilePath, False)
       Writer.Write(CmdString)
@@ -1236,7 +905,7 @@ Public Class AlarmsPageUC
       m_MainWindow.m_CNCommunication.m_CN.n_DReadELS_handle = 0
       ' Definisco flag tastatura
       Dim bProbingOk As Boolean = False
-      For I As Integer = 0 To 120
+      For I = 0 To 120
          ' Devo rileggere la variabile ad ogni ciclo
          m_MainWindow.m_CNCommunication.m_CN.ReadEls_Add_Parameter(ProbingStateNameVar, 3)
          System.Threading.Thread.Sleep(100)
@@ -1278,7 +947,7 @@ Public Class AlarmsPageUC
          Dim SawDiameterNameVar As String = String.Empty
          GetPrivateProfileString(S_MACH_PROBING, K_SAWDIAMETER, "", SawDiameterNameVar, m_MainWindow.GetMachIniFile())
          m_MainWindow.m_CNCommunication.m_CN.n_DReadELS_handle = 0
-         For I As Integer = 0 To 20
+         For I = 0 To 20
             ' Devo rileggere la variabile ad ogni ciclo
             m_MainWindow.m_CNCommunication.m_CN.ReadEls_Add_Parameter(SawDiameterNameVar, 3)
             System.Threading.Thread.Sleep(100)
@@ -1332,9 +1001,9 @@ Public Class AlarmsPageUC
    End Sub
 
    Private Function ChooseToolForProbing() As ToolPos
-      Select Case m_CurrentMachine.MountedToolConfig
+      Select Case m_MainWindow.m_CurrentMachine.MountedToolConfig
          Case CurrentMachine.MountedToolConfigs.SAW
-            Return New ToolPos(m_CurrentMachine.sCurrSaw, "T100", True)
+            Return New ToolPos(m_MainWindow.m_CurrentMachine.sCurrSaw, "T100", True)
          Case CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL, CurrentMachine.MountedToolConfigs.MANUALTOOLCHANGER, CurrentMachine.MountedToolConfigs.TOOLCHANGER
             Dim ChooseTool As New ChooseToolWD(m_MainWindow)
             If ChooseTool.ShowDialog Then
@@ -1380,36 +1049,4 @@ Public Class AlarmsPageUC
 
    End Sub
 
-   Private Sub ExecLuaBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExecLuaBtn.Click
-      Dim sExecFile As String = GetExecLuaFile()
-      ' Eseguo file LUA e recupero risultato
-      Dim nErr As Integer = 999
-      EgtLuaExecFile(sExecFile)
-      EgtLuaGetGlobIntVar("ELS.ERR", nErr)
-      ' Reset lua
-      EgtLuaResetGlobVar("ELS")
-      ' Verifico condizioni di errore
-      If nErr Then
-         ' Errore...
-         EgtOutLog("Error executing file: " & sExecFile & ", ELS.ERR=" & nErr.ToString)
-         ' Error executing script
-         Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", EgtMsg(90259), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
-         Return
-      End If
-   End Sub
-
-   ' Recupero il percorso del file lua da eseguire
-   Private Function GetExecLuaFile() As String
-      Dim sFile As String = String.Empty
-      If GetPrivateProfileString(S_EXECLUA, K_FILESCRIPT_LUA, "", sFile, m_MainWindow.GetMachIniFile()) <> 0 Then
-         ' Sistemo nome file
-         sFile = sFile.Trim()
-         If Not sFile.EndsWith(".lua") Then sFile = sFile & ".lua"
-         ' Creo path
-         Dim sPath As String = m_CurrentMachine.sMachDir() & "\Scripts\" & sFile
-         If File.Exists(sPath) Then Return sPath
-      End If
-      Return String.Empty
-   End Function
-
 End Class

Machine/ChooseToolWD.xaml

@@ -3,11 +3,9 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
     FontFamily="{DynamicResource OmagCut_Font}"
-    Title="OpenFile" Height="682.6" Width="426.6" WindowStyle="None" 
-        ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" 
-        Background="Transparent">
+    Title="OpenFile" Height="682.6" Width="426.6" WindowStyle="None" ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" Background="Transparent">
 
-    <Border Style="{DynamicResource OmagCut_Border}">
+   <Border Style="{DynamicResource OmagCut_Border}">
       <Grid>
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="0.5*"/>

Machine/ChooseToolWD.xaml.vb

@@ -53,7 +53,7 @@ Public Class ChooseToolWD
                m_SetUpToolList.Add(New ToolPos(m_MainWindow.m_CurrentMachine.sCurrSaw, sToolPos, True))
             End If
             ' Recupero tutti gli utensili attrezzati (nel ToolChanger e nel ManualToolChanger)
-            For Each ToolChangerPos As ToolChangerPos In m_MainWindow.m_CurrentMachine.ManualToolChanger
+            For Each ToolChangerPos In m_MainWindow.m_CurrentMachine.ManualToolChanger
                m_SetUpToolList.Add(New ToolPos(ToolChangerPos.sTool, ToolChangerPos.sName, False))
             Next
             Return True
@@ -65,12 +65,12 @@ Public Class ChooseToolWD
                EgtTdbGetCurrToolParam(MCH_TP.TCPOS, sToolPos)
                m_SetUpToolList.Add(New ToolPos(m_MainWindow.m_CurrentMachine.sCurrSaw, sToolPos, True))
             End If
-            For Each ToolChangerPos As ToolChangerPos In m_MainWindow.m_CurrentMachine.ToolChanger
+            For Each ToolChangerPos In m_MainWindow.m_CurrentMachine.ToolChanger
                If Not String.IsNullOrWhiteSpace(ToolChangerPos.sTool) Then
                   m_SetUpToolList.Add(New ToolPos(ToolChangerPos.sTool, ToolChangerPos.sName, False))
                End If
             Next
-            For Each ToolChangerPos As ToolChangerPos In m_MainWindow.m_CurrentMachine.ManualToolChanger
+            For Each ToolChangerPos In m_MainWindow.m_CurrentMachine.ManualToolChanger
                If Not String.IsNullOrWhiteSpace(ToolChangerPos.sTool) Then
                   m_SetUpToolList.Add(New ToolPos(ToolChangerPos.sTool, ToolChangerPos.sName, False))
                End If

Machine/CurrentMachine.vb

@@ -1,5 +1,4 @@
 Imports System.Collections.ObjectModel
-Imports EgtWPFLib5
 Imports EgtUILib
 
 Public Class CurrentMachine
@@ -25,13 +24,7 @@ Public Class CurrentMachine
    ' Ritardo tra reset e invio programma per NUM
    Private m_nResetSendDelay As Integer = 1000
 
-   ' tempo di arresto sospensione dei Thread prima dopo aver lanciato il comando CN
-   Private m_nThreadSleep As Integer = 150
-
    ' Dati su linea di produzione
-   Private m_bDemo As Boolean = False
-   Public nLastProjSentToViewDEMO As Integer = 0
-
    Private m_bProdLine As Boolean = False
    Private m_sVarProg1 As String = "E80021"
    Private m_nProg1 As Integer = 901
@@ -77,9 +70,6 @@ Public Class CurrentMachine
    Private m_bPolishingWheel As Boolean = False
    Private m_bWaterJet As Boolean = False
 
-   ' Abilitazione DB WaterJet
-   Private m_bFromDBWaterJet As Boolean = False
-
    ' Flag per visualizzazione TcPos, Testa/uscita e Note utente
    Private m_nShowToolChanger As Integer = 0                 ' 0=no, 1=tutti utensili, 2=solo lame
    Private m_bShowHeadExit As Boolean = False
@@ -118,7 +108,6 @@ Public Class CurrentMachine
    Private m_sCurrDripSawing As String = String.Empty
    Private m_sCurrDripDrilling As String = String.Empty
    Private m_sCurrWaterJetting As String = String.Empty
-   Private m_sCurrWaterJettingQuality As String = String.Empty
 
    ' Spessore sottopezzo
    Private m_dAdditionalTable As Double = 0
@@ -162,9 +151,6 @@ Public Class CurrentMachine
    ' Lista dei materiali
    Private m_Materials As New ObservableCollection(Of Material)
 
-   ' Lista delle qualità di lavorazioni disponibili nel WaterJet
-   Private m_Qualities As New ObservableCollection(Of String)
-
    ' Massimo id della lista materiali nel file ini
    Private m_MaxIdMat As Integer = 0
 
@@ -230,18 +216,6 @@ Public Class CurrentMachine
       End Get
    End Property
 
-   Friend ReadOnly Property nThreadSleep As Integer
-      Get
-         Return m_nThreadSleep
-      End Get
-   End Property
-
-   Friend ReadOnly Property bDemo As Boolean
-      Get
-         Return m_bDemo
-      End Get
-   End Property
-
    Friend ReadOnly Property bProdLine As Boolean
       Get
          Return m_bProdLine
@@ -439,12 +413,6 @@ Public Class CurrentMachine
       End Get
    End Property
 
-   Friend ReadOnly Property bFromDBWaterJet As Boolean
-      Get
-         Return m_bFromDBWaterJet
-      End Get
-   End Property
-
    Friend ReadOnly Property ShowToolChanger As Integer
       Get
          Return m_nShowToolChanger
@@ -609,18 +577,6 @@ Public Class CurrentMachine
          If WritePrivateProfileString(S_MACH_MACH, K_CURRSAWING, value, sMachIniFile) Then
             m_sCurrSawing = value
             m_MainWindow.m_CurrentProjectPageUC.MachiningTxBx.Text = value
-            '' aggiorno il file ini della macchina con i valori correnti della lavorazione
-            'Dim sVal As String = String.Empty
-            'Dim dVal As Double = m_dFsevLength
-            'If GetUserNote("FsevLength", sVal, m_sCurrSawing, False) Then
-            '   StringToDouble(sVal, dVal)
-            '   SetFsevLength(dVal)
-            'End If
-            'dVal = m_dFsevPerc
-            'If GetUserNote("FsevPerc", sVal, m_sCurrSawing, False) Then
-            '   StringToDouble(sVal, m_dFsevPerc)
-            '   SetFsevPerc(dVal)
-            'End If
          End If
       End Set
    End Property
@@ -735,17 +691,6 @@ Public Class CurrentMachine
       End Set
    End Property
 
-   Friend Property sCurrWaterJettingQuality As String
-      Get
-         Return m_sCurrWaterJettingQuality
-      End Get
-      Set(value As String)
-         If WritePrivateProfileString(S_MACH_MACH, K_CURRWATERJETTINGQUALITY, value, sMachIniFile) Then
-            m_sCurrWaterJettingQuality = value
-         End If
-      End Set
-   End Property
-
    Friend ReadOnly Property WaterJettingActive As Double
       Get
          Return m_bWaterJetting AndAlso Not String.IsNullOrWhiteSpace(m_sCurrWaterJetting)
@@ -764,7 +709,6 @@ Public Class CurrentMachine
          End Select
       End Get
       Set(value As Double)
-         Dim dValue As Double = 0
          Select Case GetCurrentTable()
             Case 3
                If Math.Abs(value - m_dTab3AdditionalTable) > EPS_SMALL And
@@ -773,24 +717,14 @@ Public Class CurrentMachine
                   m_dTab3AdditionalTable = value
                   ' Aggiorno il progetto corrente
                   m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
-                  ' salvo il valore della sovratavola nel progetto
-                  EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB3_ADDITIONALTABLE, dValue)
-                  If Math.Abs(dValue - value) > EPS_SMALL Then
-                     EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB3_ADDITIONALTABLE, value)
-                  End If
                End If
-                  Case 2
+            Case 2
                If Math.Abs(value - m_dTab2AdditionalTable) > EPS_SMALL And
                WritePrivateProfileString(S_TABLE, K_TAB2_ADDITIONALTABLE, DoubleToString(value, 3), sMachIniFile) Then
                   ' Aggiorno il valore corrente
                   m_dTab2AdditionalTable = value
                   ' Aggiorno il progetto corrente
                   m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
-                  ' salvo il valore della sovratavola nel progetto
-                  EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB2_ADDITIONALTABLE, dValue)
-                  If Math.Abs(dValue - value) > EPS_SMALL Then
-                     EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB2_ADDITIONALTABLE, value)
-                  End If
                End If
             Case Else
                If Math.Abs(value - m_dAdditionalTable) > EPS_SMALL And
@@ -799,11 +733,6 @@ Public Class CurrentMachine
                   m_dAdditionalTable = value
                   ' Aggiorno il progetto corrente
                   m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
-                  ' salvo il valore della sovratavola nel progetto
-                  EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_ADDITIONALTABLE, dValue)
-                  If Math.Abs(dValue - value) > EPS_SMALL Then
-                     EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_ADDITIONALTABLE, value)
-                  End If
                End If
          End Select
       End Set
@@ -873,18 +802,9 @@ Public Class CurrentMachine
       Set(value As Double)
          If WritePrivateProfileString(S_NEST, K_MACH_CUTFSEVLEN, DoubleToString(value, 3), sMachIniFile) Then
             m_dFsevLength = value
-            ' salvo il dato nelle UserNote della lavorazione
-            'MdbSetCurrMachiningUserNote("FsevLength", m_dFsevLength.ToString, sCurrSawing, false)
-            ' salvo il dato nelle UserNote dell'utensile
-            TdbSetCurrToolUserNote("FsevLength", m_dFsevLength.ToString, sCurrSaw)
          End If
       End Set
    End Property
-   Friend Sub SetFsevLength(value As Double)
-      If WritePrivateProfileString(S_NEST, K_MACH_CUTFSEVLEN, DoubleToString(value, 3), sMachIniFile) Then
-         m_dFsevLength = value
-      End If
-   End Sub
 
    Friend Property dFsevPerc As Double
       Get
@@ -893,18 +813,9 @@ Public Class CurrentMachine
       Set(value As Double)
          If WritePrivateProfileString(S_NEST, K_MACH_CUTFSEVPERC, DoubleToString(value, 3), sMachIniFile) Then
             m_dFsevPerc = value
-            '' salvo il dato nelle UserNote della lavorazione
-            'MdbSetCurrMachiningUserNote("FsevPerc", m_dFsevPerc.ToString, sCurrSawing)
-            ' salvo il dato nelle UserNote dell'utensile
-            TdbSetCurrToolUserNote("FsevPerc", m_dFsevPerc.ToString, sCurrSaw)
          End If
       End Set
    End Property
-   Friend Sub SetFsevPerc(value As Double)
-      If WritePrivateProfileString(S_NEST, K_MACH_CUTFSEVPERC, DoubleToString(value, 3), sMachIniFile) Then
-         m_dFsevPerc = value
-      End If
-   End Sub
 
    Friend ReadOnly Property ToolChangerNbr As Integer
       Get
@@ -974,14 +885,8 @@ Public Class CurrentMachine
       End Get
    End Property
 
-   Friend ReadOnly Property Qualities As ObservableCollection(Of String)
-      Get
-         Return m_Qualities
-      End Get
-   End Property
-
    Friend Sub AddMaterial(value As Material)
-      For Each Material As Material In Materials
+      For Each Material In Materials
          If Material.nId = value.nId Then
             Exit Sub
          End If
@@ -1005,7 +910,7 @@ Public Class CurrentMachine
          End If
       Next
       Dim TempMat As Material = Nothing
-      For I As Integer = Index To m_MaxIdMat - 1
+      For I = Index To m_MaxIdMat - 1
          GetPrivateProfileMaterial(S_MATERIALS, K_MATERIAL & I + 2, TempMat, sMachIniFile)
          WritePrivateProfileMaterial(S_MATERIALS, K_MATERIAL & I + 1, TempMat, sMachIniFile)
       Next
@@ -1041,7 +946,7 @@ Public Class CurrentMachine
       If SysNotes <> String.Empty Then
          Dim MachiningMaterials() = SysNotes.Split(";".ToCharArray)
          SysNotes = String.Empty
-         For Each Material As Object In MachiningMaterials
+         For Each Material In MachiningMaterials
             Dim Param() As String = Material.Split(",".ToCharArray)
             If Param(0) <> valueId.ToString Then
                SysNotes &= Material & ";"
@@ -1061,11 +966,7 @@ Public Class CurrentMachine
       End Get
       Set(value As Material)
          Dim CurrMatId As String = If(Not IsNothing(value), value.nId.ToString, "")
-         If bWaterJet And bFromDBWaterJet Then
-            WritePrivateProfileString(S_MATERIALS, K_CURRMATERIAL, CurrMatId & If(Not IsNothing(value), "." & value.SubId, ""), sMachIniFile)
-         Else
-            WritePrivateProfileString(S_MATERIALS, K_CURRMATERIAL, CurrMatId, sMachIniFile)
-         End If
+         WritePrivateProfileString(S_MATERIALS, K_CURRMATERIAL, CurrMatId, sMachIniFile)
          m_CurrMat = value
       End Set
    End Property
@@ -1074,7 +975,7 @@ Public Class CurrentMachine
       ' Se stringa vuota
       If String.IsNullOrWhiteSpace(sMatName) Then Return False
       ' Cerco il nome nella lista dei materiali
-      For Index As Integer = 0 To Materials.Count - 1
+      For Index = 0 To Materials.Count - 1
          If String.Compare(Materials(Index).sName, sMatName, True) = 0 Then
             CurrMat = Materials(Index)
          End If
@@ -1116,15 +1017,12 @@ Public Class CurrentMachine
       m_dDeltaC = GetPrivateProfileDouble(S_AXES, K_DELTA_C, 0.0, sMachIniFile)
       ' Leggo ritardo tra reset e send per NUM
       m_nResetSendDelay = GetPrivateProfileInt(S_NCNUM, K_RESETSENDDELAY, 1000, sMachIniFile)
-      ' Leggo ritardo tra reset e send per NUM
-      m_nThreadSleep = GetPrivateProfileInt(S_NCNUM, K_THREADSLEEP, 150, sMachIniFile)
       ' Leggo se linea di produzione e parametri relativi
       m_bProdLine = (GetPrivateProfileInt(S_PRODUCTIONLINE, K_ACTIVE, 0, sMachIniFile) <> 0)
       If m_bProdLine And Not m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.PRODUCTION_LINE) Then
          m_bProdLine = False
          EgtOutLog("Error - Production line requested but not key enabled")
       End If
-      m_bDemo = (GetPrivateProfileInt(S_PRODUCTIONLINE, "Demo", 0, sMachIniFile) <> 0)
       GetPrivateProfileString(S_PRODUCTIONLINE, K_VARPROG1, "", m_sVarProg1, sMachIniFile)
       m_nProg1 = GetPrivateProfileInt(S_PRODUCTIONLINE, K_NAMEPROG1, 0, m_MainWindow.GetMachIniFile())
       GetPrivateProfileString(S_PRODUCTIONLINE, K_VARPROG2, "", m_sVarProg2, sMachIniFile)
@@ -1163,8 +1061,6 @@ Public Class CurrentMachine
       ' waterjet
       m_bWaterJet = (GetPrivateProfileInt(S_TOOLS, K_WATERJET, 0, sMachIniFile) > 0) And
                     m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.ENABLE_WJ)
-      ' Leggo abilitazione DB WaterJet
-      m_bFromDBWaterJet = (GetPrivateProfileInt(S_MATERIALS, K_FROMDBWATERJET, 0, sMachIniFile) > 0)
       ' Leggo abilitazione visualizzazione TcPos, Head/exit e Note utente
       m_nShowToolChanger = GetPrivateProfileInt(S_TOOLS, K_SHOWTOOLCHANGER, 0, sMachIniFile)
       m_bShowHeadExit = (GetPrivateProfileInt(S_TOOLS, K_SHOWHEADEXIT, 0, sMachIniFile) > 0)
@@ -1240,8 +1136,6 @@ Public Class CurrentMachine
       GetPrivateProfileString(S_MACH_MACH, K_CURRDRIPDRILLING, Nothing, m_sCurrDripDrilling, sMachIniFile)
       ' waterjetting
       GetPrivateProfileString(S_MACH_MACH, K_CURRWATERJETTING, Nothing, m_sCurrWaterJetting, sMachIniFile)
-      ' waterjettingquality
-      GetPrivateProfileString(S_MACH_MACH, K_CURRWATERJETTINGQUALITY, Nothing, m_sCurrWaterJettingQuality, sMachIniFile)
 
       ' Leggo numero di portautensili
       m_ToolChangerNbr = GetPrivateProfileInt(S_TOOLCHANGER, K_NUMBER, 0, sMachIniFile)
@@ -1261,7 +1155,7 @@ Public Class CurrentMachine
       m_ManualToolChangerNbr = Math.Min(m_ManualToolChangerNbr, MAX_TCMAN_TOOLS)
 
       ' Leggo da file ini nomi e utensili manuali presenti
-      For Index As Integer = 1 To m_ManualToolChangerNbr
+      For Index = 1 To m_ManualToolChangerNbr
          Dim sName As String = String.Empty
          Dim sTool As String = String.Empty
          GetPrivateProfileString(S_TOOLCHANGER, K_MANUALNAME & Index, Nothing, sName, sMachIniFile)
@@ -1295,7 +1189,6 @@ Public Class CurrentMachine
 
       ' Leggo dati per feed ridotta all'inizio/fine dei tagli
       m_bFsevEnable = (GetPrivateProfileInt(S_NEST, K_MACH_CUTFSEVENABLE, 0, sMachIniFile) <> 0)
-      ' sposto la lettura nel DB delle lavorazioni della lama corrente!
       m_dFsevLength = GetPrivateProfileDouble(S_NEST, K_MACH_CUTFSEVLEN, 0, sMachIniFile)
       m_dFsevPerc = GetPrivateProfileDouble(S_NEST, K_MACH_CUTFSEVPERC, 0, sMachIniFile)
 
@@ -1304,258 +1197,27 @@ Public Class CurrentMachine
       ' Leggo la lista dei materiali
       Dim Material As Material = Nothing
       Dim nIndex As Integer = 1
-
-      If m_bWaterJet And m_bFromDBWaterJet Then
-         LoadWJMaterial(True)
-      Else
-         While (GetPrivateProfileMaterial(S_MATERIALS, K_MATERIAL & nIndex, Material, sMachIniFile))
-            m_Materials.Add(Material)
-            nIndex += 1
-         End While
-      End If
-
+      While (GetPrivateProfileMaterial(S_MATERIALS, K_MATERIAL & nIndex, Material, sMachIniFile))
+         m_Materials.Add(Material)
+         nIndex += 1
+      End While
       ' Salvo massimo indice a cui sono arrivato per usarlo quando devo aggiungere nuovi elementi alla lista
       m_MaxIdMat = nIndex - 1
 
       ' Leggo materiale correntemente attivo
-      Dim sCurrMatId As String = String.Empty
-      EgtUILib.GetPrivateProfileString(S_MATERIALS, K_CURRMATERIAL, "0", sCurrMatId, sMachIniFile)
-      If bWaterJet And bFromDBWaterJet Then
-         Dim sCurrMatIds As String()
-         sCurrMatIds = sCurrMatId.Split("."c)
-         If sCurrMatIds.Length > 1 Then
-            Dim nCurrMatId As Integer
-            Dim nCurrSubMatId As Integer
-            If Not Integer.TryParse(sCurrMatIds(0), nCurrMatId) Then nCurrMatId = 0
-            If Not Integer.TryParse(sCurrMatIds(1), nCurrSubMatId) Then nCurrSubMatId = 0
-            For Each Material In Materials
-               If Material.nId = nCurrMatId AndAlso Material.SubId = nCurrSubMatId Then
-                  m_CurrMat = Material
-                  Exit For
-               End If
-            Next
+      Dim CurrMatId As Integer = GetPrivateProfileInt(S_MATERIALS, K_CURRMATERIAL, 0, sMachIniFile)
+      For Each Material In Materials
+         If Material.nId = CurrMatId Then
+            m_CurrMat = Material
+            Exit For
          End If
-      Else
-         Dim nCurrMatId As Integer
-         If Not Integer.TryParse(sCurrMatId, nCurrMatId) Then nCurrMatId = 0
-         For Each Material In Materials
-            If Material.nId = nCurrMatId Then
-               m_CurrMat = Material
-               Exit For
-            End If
-         Next
-      End If
+      Next
       ' leggo se la macchina ha il tastatore dello spessore tavola
       m_HasRawProbe = (GetPrivateProfileInt(S_MACH_PROBING, K_ENABLERAWPROBE, 1, sMachIniFile) <> 0)
       ' leggo se la macchina ha il lettore di codice a barre della lastra
       m_nEnableBarCodeReader = GetPrivateProfileInt(S_MACH_BARCODEREADER, K_ENABLEBCR, 0, sMachIniFile)
    End Sub
 
-   Public Sub LoadWJMaterial(Optional bIsStart As Boolean = False)
-      Dim TempCurrMat As Material = CurrMat
-      ' Svuoto l'attuale lista di materiali
-      m_Materials.Clear()
-      ' Leggo valori da file Data e li carico nelle proprietà
-      Dim sFilePath As String = sMachDir & "\" &  MACHININGS_DIR & "\" & WATERJETDB_FILE
-      Dim Local_MaterialList = New ObservableCollection(Of EgtWPFLib5.WjMaterial)
-      Local_MaterialList = WaterjetDbWindowVM_OmagCUT.LoadWjMaterials(sFilePath)
-      ' definisco la lista delle qualità (solo se è vuota)
-      If m_Qualities.Count < 1 Then
-         m_Qualities.Add("Q1")
-         m_Qualities.Add("Q2")
-         m_Qualities.Add("Q3")
-         m_Qualities.Add("Q4")
-         m_Qualities.Add("Q5")
-         m_Qualities.Add("QExtra")
-      End If
-      ' inserisco il materiale generico di default -- IN SOSPESO
-      'm_Materials.Add(New Material(0, "***", 0))
-      ' costruiscoi la lista 
-      Dim i As Integer = 0
-      Dim sName As String = String.Empty
-      For i = 0 To Local_MaterialList.Count - 1
-         sName = Local_MaterialList(i).Name
-         Dim j As Integer = 0
-         For j = 0 To Local_MaterialList(i).SubMaterialList.Count - 1
-            m_Materials.Add(New Material(i + 1, sName & "." & Local_MaterialList(i).SubMaterialList(j).Name, j + 1))
-         Next
-      Next
-      If Not bIsStart Then CurrMat = TempCurrMat
-   End Sub
-
-   Public Function GetMaxThicknessCurrMaterial(sCurMat As String) As Double
-      Dim bFound As Boolean = False
-      Dim dMaxThick As Double = 0
-      ' Leggo valori da file Data e li carico nelle proprietà
-      Dim sFilePath As String = sMachDir & "\" & MACHININGS_DIR & "\" & WATERJETDB_FILE
-      Dim Local_MaterialList = New ObservableCollection(Of EgtWPFLib5.WjMaterial)
-      Local_MaterialList = WaterjetDbWindowVM_OmagCUT.LoadWjMaterials(sFilePath)
-      Dim sItems() As String = sCurMat.Split("."c)
-      If sItems.Count > 1 Then
-         Dim sMat As String = sItems(0)
-         Dim sSubMat As String = sItems(1)
-         For Each ItemMat As EgtWPFLib5.WjMaterial In Local_MaterialList
-            If ItemMat.Name = sMat Then
-               For Each ItemSubMat As EgtWPFLib5.WjSubMaterial In ItemMat.SubMaterialList
-                  If ItemSubMat.Name = sSubMat Then
-                     For Each ItemParam As EgtWPFLib5.WjParam In ItemSubMat.ParamList
-                        Dim dParamThick As Double
-                        StringToDouble(ItemParam.Thickness, dParamThick)
-                        If dParamThick > dMaxThick Then
-                           dMaxThick = dParamThick
-                        End If
-                     Next
-                     bFound = True
-                     Exit For
-                  End If
-                  If bFound Then Exit For
-               Next
-            End If
-            If bFound Then Exit For
-         Next
-      End If
-      ' il valore resituito è già nell'unità corrente del programma -> converto il dato in mm
-      Dim dValmm As Double = 0
-      StringToLen(DoubleToString(dMaxThick, 3), dValmm)
-      Return dValmm
-   End Function
-
-#Region "USERNOTE"
-
-   ' recupero le note UserNote associate alla LAVORAZIONE Machining
-   Friend Function MdbGetCurrMachiningUserNote(Machining As String) As String
-      Dim UserNotes As String = String.Empty
-      ' lavorazione corrente
-      Dim CurrMach As String = String.Empty
-      EgtMdbGetCurrMachiningParam(MCH_MP.NAME, CurrMach)
-      ' Imposto utensile lama corrente
-      If Not String.IsNullOrWhiteSpace(Machining) AndAlso EgtMdbSetCurrMachining(Machining) Then
-         ' leggo nel db corrente della lavorazione questa info
-         EgtMdbGetCurrMachiningParam(MCH_MP.USERNOTES, UserNotes)
-         ' reimposto lavorazione corrente
-         EgtMdbSetCurrMachining(CurrMach)
-      End If
-      Return UserNotes
-   End Function
-
-   ' recupero le note UserNote associate all'UTENSILE Tool
-   Friend Function TdbGetCurrToolUserNote(Tool As String) As String
-      Dim UserNotes As String = String.Empty
-      ' lavorazione corrente
-      Dim CurrTool As String = String.Empty
-      EgtTdbGetCurrToolParam(MCH_TP.NAME, CurrTool)
-      ' Imposto utensile lama corrente
-      If Not String.IsNullOrWhiteSpace(Tool) AndAlso EgtTdbSetCurrTool(Tool) Then
-         ' leggo nel db corrente della lavorazione questa info
-         EgtTdbGetCurrToolParam(MCH_TP.USERNOTES, UserNotes)
-         ' reimposto lavorazione corrente
-         EgtTdbSetCurrTool(CurrTool)
-      End If
-      Return UserNotes
-   End Function
-
-   ' imposta il nuovo valore in UserNote della LAVORAZIONE Machining
-   Friend Sub MdbSetCurrMachiningUserNote(sKeyUserNote As String, sValUserNote As String, Machining As String)
-      ' lavorazione corrente
-      Dim CurrMach As String = String.Empty
-      EgtMdbGetCurrMachiningParam(MCH_MP.NAME, CurrMach)
-      ' Imposto utensile lama corrente
-      If Not String.IsNullOrWhiteSpace(Machining) AndAlso EgtMdbSetCurrMachining(Machining) Then
-         Dim UserNotes As String = String.Empty
-         ' salvo nel db corrente della lavorazione questa info → devo gestire l'inserimento: sovrascrivo NON ESEGUE un APPEND delle info
-         EgtMdbSetCurrMachiningParam(MCH_MP.USERNOTES, AssembUserNote(sKeyUserNote, sValUserNote, Machining))
-         EgtMdbSaveCurrMachining()
-         EgtMdbSave()
-         ' reimposto lavorazione corrente
-         EgtMdbSetCurrMachining(CurrMach)
-      End If
-   End Sub
-
-   ' imposta il nuovo valore in UserNote dell'UTENSILE Tool
-   Friend Sub TdbSetCurrToolUserNote(sKeyUserNote As String, sValUserNote As String, Tool As String)
-      ' lavorazione corrente
-      Dim CurrTool As String = String.Empty
-      EgtTdbGetCurrToolParam(MCH_TP.NAME, CurrTool)
-      ' Imposto utensile lama corrente
-      If Not String.IsNullOrWhiteSpace(Tool) AndAlso EgtTdbSetCurrTool(Tool) Then
-         Dim UserNotes As String = String.Empty
-         ' salvo nel db corrente della lavorazione questa info → devo gestire l'inserimento: sovrascrivo NON ESEGUE un APPEND delle info
-         EgtTdbSetCurrToolParam(MCH_TP.USERNOTES, AssembUserNote(sKeyUserNote, sValUserNote, Tool))
-         EgtTdbSaveCurrTool()
-         EgtTdbSave()
-         ' reimposto lavorazione corrente
-         EgtTdbSetCurrTool(Tool)
-      End If
-   End Sub
-
-   ' separa la le note UserNote della LAVORAZIONE
-   Private Function SplitUserNoteMachinig(Machining As String) As String()
-      Dim sUserNotes As String = MdbGetCurrMachiningUserNote(Machining)
-      If String.IsNullOrEmpty(sUserNotes) Then Return Nothing
-      Dim sItems As String() = sUserNotes.Split(";"c)
-      Return sItems
-   End Function
-
-   ' separa la le note UserNote della LAVORAZIONE
-   Private Function SplitUserNoteTool(Tool As String) As String()
-      Dim sUserNotes As String = TdbGetCurrToolUserNote(Tool)
-      If String.IsNullOrEmpty(sUserNotes) Then Return Nothing
-      Dim sItems As String() = sUserNotes.Split(";"c)
-      Return sItems
-   End Function
-
-   ' recupera il valore della associato alla chiave per la lavorazione oppure utensile (bIsToolNote)
-   Friend Function GetUserNote(sKeyUserNote As String, ByRef sValUserNote As String, sName As String, Optional bIsToolNote As Boolean = True) As Boolean
-      Dim sUserNotesList As String() = Nothing
-      If bIsToolNote Then
-         sUserNotesList = SplitUserNoteTool(sName)
-      Else
-         sUserNotesList = SplitUserNoteMachinig(sName)
-      End If
-      If IsNothing(sUserNotesList) Then Return False
-      For Index As Integer = 0 To sUserNotesList.Count - 1
-         Dim sNote As String() = sUserNotesList(Index).Split("="c)
-         If sNote.Count = 2 AndAlso sNote(0).Trim = sKeyUserNote Then
-            sValUserNote = sNote(1).Trim
-         End If
-      Next
-      Return True
-   End Function
-
-   ' ricostruisce la stringa UserNote da salvare
-   Friend Function AssembUserNote(sKeyUserNote As String, sValUserNote As String, sName As String, Optional bIsToolNote As Boolean = True) As String
-      Dim sUserNotes As String = String.Empty
-      Dim sUserNotesList As String() = Nothing
-      If bIsToolNote Then
-         sUserNotesList = SplitUserNoteTool(sName)
-      Else
-         sUserNotesList = SplitUserNoteMachinig(sName)
-      End If
-      Dim bExists As Boolean = False
-      If Not IsNothing(sUserNotesList) Then
-         For Index As Integer = 0 To sUserNotesList.Count - 1
-            Dim sNote As String() = sUserNotesList(Index).Split("="c)
-            If sNote.Count = 2 AndAlso sNote(0).Trim = sKeyUserNote Then
-               sUserNotesList(Index) = sKeyUserNote & "=" & sValUserNote
-               bExists = True
-               Exit For
-            End If
-         Next
-         ' riassemblo la stringa
-         For Each Item As String In sUserNotesList
-            If Not String.IsNullOrWhiteSpace(Item) Then
-               sUserNotes &= Item & ";"
-            End If
-         Next
-      End If
-      If Not bExists Then
-         sUserNotes &= sKeyUserNote & "=" & sValUserNote & ";"
-      End If
-      Return sUserNotes
-   End Function
-
-#End Region    ' USERNOTE
-
    Friend Function IsVacuumMovePossible() As Boolean
       ' Recupero diametro lama corrente
       EgtTdbSetCurrTool(sCurrSaw)
@@ -1650,7 +1312,6 @@ Friend Class Material
 
    Private m_nId As Integer
    Private m_sName As String
-   Private m_SubId As Integer = 0
 
    Public ReadOnly Property nId As Integer
       Get
@@ -1667,18 +1328,9 @@ Friend Class Material
       End Set
    End Property
 
-   Public Property SubId As Integer
-      Get
-         Return m_SubId
-      End Get
-      Set(value As Integer)
-         m_SubId = value
-      End Set
-   End Property
-
    Sub New(sName As String, MaterialList As ObservableCollection(Of Material))
       Dim nMaxId As Integer = 0
-      For Each Material As Material In MaterialList
+      For Each Material In MaterialList
          If Material.nId > nMaxId Then
             nMaxId = Material.nId
          End If
@@ -1692,11 +1344,4 @@ Friend Class Material
       m_sName = sName
    End Sub
 
-   Sub New(nId As Integer, sName As String, nSubId As Integer)
-      m_nId = nId
-      m_sName = sName
-      m_SubId = nSubId
-   End Sub
-
 End Class
-

Machine/ImportExportMachiningWindowWD.xaml

@@ -1,139 +0,0 @@
-<Window  x:Class="ImportExportMachiningWindowWD"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   FontFamily="{DynamicResource OmagCut_Font}"
-   ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
-   Title="SaveNameWD" Height="350" Width="426.5" ShowInTaskbar="False">
-    <!--Definizione della pagina di scelta del nome con cui salvare il progetto-->
-    <Border Style="{DynamicResource OmagCut_Border}">
-
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="7*"/>
-                <RowDefinition Height="2*"/>
-            </Grid.RowDefinitions>
-            
-            <ScrollViewer Grid.Row="0"  Margin="20">
-                <TreeView ItemsSource="{Binding FamilyList}" Background="{DynamicResource OmagCut_TreeViewBackGroundColor}">
-                    <TreeView.Resources>
-                        <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:ImpExpMachiningFamily}" ItemsSource="{Binding MachiningList}">
-            
-                            <Grid Height="20">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="1*"/>
-                                </Grid.ColumnDefinitions>
-            
-                                <Image Grid.Column="0" Source="{Binding PictureString}" Height="20" Width="20" Margin="0,0,5,0" />
-                                <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
-            
-                            </Grid>
-            
-                            <!-- multibinding quando sono attivi.-->
-                            <HierarchicalDataTemplate.ItemContainerStyle>
-                                <Style TargetType="{x:Type TreeViewItem}" >
-                                    <Setter Property="Foreground" Value="{DynamicResource OmagCut_TreeViewTextColor}" />
-                                    <Setter Property="IsSelected" Value="{Binding IsSelected}" />
-                                    <Setter Property="IsExpanded" Value="{Binding IsExpanded}" />
-                                    <Setter Property="Template">
-                                        <Setter.Value>
-                                            <ControlTemplate TargetType="{x:Type TreeViewItem}">
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition MinWidth="19" Width="Auto"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Grid.RowDefinitions>
-                                                        <RowDefinition Height="Auto"/>
-                                                        <RowDefinition/>
-                                                    </Grid.RowDefinitions>
-                                                    <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}"/>
-                                                    <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.Column="1" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                                                        <ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                                    </Border>
-                                                    <ItemsPresenter x:Name="ItemsHost" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="1"/>
-                                                    <Rectangle Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Stretch" VerticalAlignment="Top" Fill="{DynamicResource OmagCut_TreeViewDelimiterColor}" Height="1" />
-                                                </Grid>
-                                                <ControlTemplate.Triggers>
-                                                    <Trigger Property="IsExpanded" Value="false">
-                                                        <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed"/>
-                                                    </Trigger>
-                                                    <Trigger Property="HasItems" Value="false">
-                                                        <Setter Property="Visibility" TargetName="Expander" Value="Hidden"/>
-                                                    </Trigger>
-                                                    <Trigger Property="IsSelected" Value="true">
-                                                        <Setter Property="Background" TargetName="Bd" Value="{DynamicResource OmagCut_TreeViewSelectedItemBackground}" />
-                                                        <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource OmagCut_TreeViewSelectedItemBorder}"/>
-                                                        <Setter Property="BorderThickness" TargetName="Bd" Value="1"/>
-                                                        <!--<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>-->
-                                                    </Trigger>
-                                                    <!--<MultiTrigger>
-                                           <MultiTrigger.Conditions>
-                                              <Condition Property="IsSelected" Value="true"/>
-                                              <Condition Property="IsSelectionActive" Value="false"/>
-                                           </MultiTrigger.Conditions>
-                                           <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
-                                           <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-                                        </MultiTrigger>-->
-                                                    <Trigger Property="IsEnabled" Value="false">
-                                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                                                    </Trigger>
-                                                </ControlTemplate.Triggers>
-                                            </ControlTemplate>
-                                        </Setter.Value>
-                                    </Setter>
-                                </Style>
-                            </HierarchicalDataTemplate.ItemContainerStyle>
-                        </HierarchicalDataTemplate>
-            
-                        <DataTemplate DataType="{x:Type EgtWPFLib5:ImpExpMachiningItem}">
-                            <Grid Height="20">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="1*"/>
-                                </Grid.ColumnDefinitions>
-            
-                                <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
-                                <CheckBox Name="ActiveTxBx" Grid.Column="0" Height="15" Width="15" 
-                                          Margin="-15,0,5,0" VerticalContentAlignment="Center"
-                                          IsChecked="{Binding Active}"
-                                          Visibility="{Binding Path=DataContext.Active_Visibility,
-                                                       RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
-                                <TextBlock Grid.Column="1" Text="{Binding Name}" 
-                                           Style="{StaticResource OmagCut_ListBoxTextBlock}"   />
-            
-                            </Grid>
-                        </DataTemplate>
-            
-                    </TreeView.Resources>
-                </TreeView>
-            </ScrollViewer>
-            
-            <Grid Grid.Column="1" Grid.Row="1">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-            
-                <Button Name="OkBtn" Grid.Row="0"  Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" 
-                            Margin="5,-10,5,15"
-                            Command="{Binding OkCommand}">
-                    <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="ExitBtn" Grid.Row="0" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}" 
-                            Margin="5,-10,5,15"
-                            IsCancel="True">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-            </Grid>
-    </Grid>
-
-    </Border>
-
-</Window>

Machine/ImportExportMachiningWindowWD.xaml.vb

@@ -1,33 +0,0 @@
-Imports EgtWPFLib5
-Public Class ImportExportMachiningWindowWD
-
-   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
-
-   Private WithEvents m_ImportExportMachiningWindowVM As ImportExportMachiningWindowVM
-
-   Private m_OkResult As Boolean = False
-   Public ReadOnly Property OkResult As Boolean
-      Get
-         Return m_OkResult
-      End Get
-   End Property
-
-   Sub New(Owner As Window, ImportExportToolWindowVM As ImportExportMachiningWindowVM)
-      Me.Owner = Owner
-      ' This call is required by the designer.
-      InitializeComponent()
-      Me.DataContext = ImportExportToolWindowVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_ImportExportMachiningWindowVM = ImportExportToolWindowVM
-   End Sub
-   Private Sub OkCloseDialogWD() Handles OkBtn.Click
-      m_OkResult = True
-      Me.Close()
-   End Sub
-
-   Private Sub CancelCloseDialogWD() Handles ExitBtn.Click
-      m_OkResult = False
-      Me.Close()
-   End Sub
-
-End Class

Machine/ImportExportToolWD.xaml

@@ -1,138 +0,0 @@
-<Window x:Class="ImportExportToolWD"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   FontFamily="{DynamicResource OmagCut_Font}"
-   ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
-   Title="SaveNameWD" Height="350" Width="426.5" ShowInTaskbar="False">
-    <!--Definizione della pagina di scelta del nome con cui salvare il progetto-->
-    <Border Style="{DynamicResource OmagCut_Border}">
-
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="7*"/>
-                <RowDefinition Height="2*"/>
-            </Grid.RowDefinitions>
-
-            <ScrollViewer Grid.Row="0" Margin="20">
-                <TreeView ItemsSource="{Binding FamilyList}" Background="{DynamicResource OmagCut_TreeViewBackGroundColor}">
-                    <TreeView.Resources>
-                        <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:ImpExpToolFamily}" ItemsSource="{Binding ToolList}">
-
-                            <Grid Height="20">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="1*"/>
-                                </Grid.ColumnDefinitions>
-
-                                <Image Grid.Column="0" Source="{Binding PictureString}" Height="20" Width="20" Margin="0,0,5,0" />
-                                <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
-
-                            </Grid>
-                            <!-- multibinding quando sono attivi.-->
-                            <HierarchicalDataTemplate.ItemContainerStyle>
-                                <Style TargetType="{x:Type TreeViewItem}" >
-                                    <Setter Property="Foreground" Value="{DynamicResource OmagCut_TreeViewTextColor}" />
-                                    <Setter Property="IsSelected" Value="{Binding IsSelected}" />
-                                    <Setter Property="IsExpanded" Value="{Binding IsExpanded}" />
-                                    <Setter Property="Template">
-                                        <Setter.Value>
-                                            <ControlTemplate TargetType="{x:Type TreeViewItem}">
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition MinWidth="19" Width="Auto"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Grid.RowDefinitions>
-                                                        <RowDefinition Height="Auto"/>
-                                                        <RowDefinition/>
-                                                    </Grid.RowDefinitions>
-                                                    <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}"/>
-                                                    <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.Column="1" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                                                        <ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                                    </Border>
-                                                    <ItemsPresenter x:Name="ItemsHost" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="1"/>
-                                                    <Rectangle Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Stretch" VerticalAlignment="Top" Fill="{DynamicResource OmagCut_TreeViewDelimiterColor}" Height="1" />
-                                                </Grid>
-                                                <ControlTemplate.Triggers>
-                                                    <Trigger Property="IsExpanded" Value="false">
-                                                        <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed"/>
-                                                    </Trigger>
-                                                    <Trigger Property="HasItems" Value="false">
-                                                        <Setter Property="Visibility" TargetName="Expander" Value="Hidden"/>
-                                                    </Trigger>
-                                                    <Trigger Property="IsSelected" Value="true">
-                                                        <Setter Property="Background" TargetName="Bd" Value="{DynamicResource OmagCut_TreeViewSelectedItemBackground}" />
-                                                        <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource OmagCut_TreeViewSelectedItemBorder}"/>
-                                                        <Setter Property="BorderThickness" TargetName="Bd" Value="1"/>
-                                                        <!--<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>-->
-                                                    </Trigger>
-                                                    <!--<MultiTrigger>
-                                       <MultiTrigger.Conditions>
-                                          <Condition Property="IsSelected" Value="true"/>
-                                          <Condition Property="IsSelectionActive" Value="false"/>
-                                       </MultiTrigger.Conditions>
-                                       <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
-                                       <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-                                    </MultiTrigger>-->
-                                                    <Trigger Property="IsEnabled" Value="false">
-                                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                                                    </Trigger>
-                                                </ControlTemplate.Triggers>
-                                            </ControlTemplate>
-                                        </Setter.Value>
-                                    </Setter>
-                                </Style>
-                            </HierarchicalDataTemplate.ItemContainerStyle>
-                        </HierarchicalDataTemplate>
-
-                        <DataTemplate DataType="{x:Type EgtWPFLib5:ImpExpToolItem}">
-                            <Grid Height="20">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="1*"/>
-                                </Grid.ColumnDefinitions>
-                                <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
-                                <CheckBox Name="ActiveTxBx" Grid.Column="0" Height="15" Width="15" 
-                                          Margin="-15,0,5,0" VerticalContentAlignment="Center"
-                                          IsChecked="{Binding Active}"
-                                          Visibility="{Binding Path=DataContext.Active_Visibility,
-                                          RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
-                                <TextBlock Grid.Column="1" Text="{Binding Name}" 
-                                           Style="{StaticResource OmagCut_ListBoxTextBlock}"  />
-
-                            </Grid>
-                        </DataTemplate>
-
-                    </TreeView.Resources>
-                </TreeView>
-            </ScrollViewer>
-
-            <Grid Grid.Column="1" Grid.Row="1">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-
-                <Button Name="OkBtn" Grid.Row="0"  Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" 
-                        Margin="5,-10,5,15"
-                        Command="{Binding OkCommand}">
-                <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="ExitBtn" Grid.Row="0" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}" 
-                        Margin="5,-10,5,15"
-                        IsCancel="True">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-            </Grid>
-                
-        </Grid>
-
-    </Border>
-
-</Window>

Machine/ImportExportToolWD.xaml.vb

@@ -1,38 +0,0 @@
-Imports EgtWPFLib5
-Public Class ImportExportToolWD
-
-   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
-
-   Private WithEvents m_ImportExportToolWindowVM As ImportExportToolWindowVM
-
-   Private m_OkResult As Boolean = False
-   Public ReadOnly Property OkResult As Boolean
-      Get
-         Return m_OkResult
-      End Get
-   End Property
-
-   Sub New(Owner As Window, ImportExportToolWindowVM As ImportExportToolWindowVM)
-      Me.Owner = Owner
-      ' This call is required by the designer.
-      InitializeComponent()
-      Me.DataContext = ImportExportToolWindowVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_ImportExportToolWindowVM = ImportExportToolWindowVM
-   End Sub
-
-   'Private Sub CloseWindow(bDialogResult As Boolean) Handles m_ImportExportToolWindowVM.m_CloseWindow
-   '   Me.DialogResult = bDialogResult
-   'End Sub
-
-   Private Sub OkCloseDialogWD() Handles OkBtn.Click
-      m_OkResult = True
-      Me.Close()
-   End Sub
-
-   Private Sub CancelCloseDialogWD() Handles ExitBtn.Click
-      m_OkResult = False
-      Me.Close()
-   End Sub
-
-End Class

Machine/MachineCNPageUC.xaml

@@ -34,21 +34,16 @@
                   <ColumnDefinition Width="1.5*"/>
                </Grid.ColumnDefinitions>
 
-               <ToggleButton Name="AutoBtn" Grid.Column="0"
-                  Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
-                  Foreground="White"/>
-               <ToggleButton Name="ManualBtn" Grid.Column="1"
-                  Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
-                  Foreground="White"/>
-               <ToggleButton Name="MDIBtn" Grid.Column="2"
-                  Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
-                  Foreground="White"/>
-               <ToggleButton Name="SingleBtn" Grid.Column="3"
-                  Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
-                  Foreground="White"/>
-               <ToggleButton Name="HomeBtn" Grid.Column="4"
-                  Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
-                  Foreground="White"/>
+               <Button Name="AutoBtn" Grid.Column="0"
+                  Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
+               <Button Name="ManualBtn" Grid.Column="1"
+                  Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
+               <Button Name="MDIBtn" Grid.Column="2"
+                  Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
+               <Button Name="SingleBtn" Grid.Column="3"
+                  Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
+               <Button Name="HomeBtn" Grid.Column="4"
+                  Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
 
             </Grid>
 
@@ -120,13 +115,11 @@
                         <ColumnDefinition Width="2*"/>
                     </Grid.ColumnDefinitions>
                     <!--PowerON-->
-                    <ToggleButton Name="PowerONBtn" Grid.Column="0"
-                                  Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
-                                  Foreground="White"/>
+                    <Button Name="PowerONBtn" Grid.Column="0"
+                    Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
                     <!--PowerOFF-->
-                    <ToggleButton Name="PowerOFFBtn" Grid.Column="1"
-                                  Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
-                                  Foreground="White"/>
+                    <Button Name="PowerOFFBtn" Grid.Column="1"
+                    Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
                 </Grid>
             </GroupBox>
 

Machine/MachineCNPageUC.xaml.vb

@@ -8,8 +8,6 @@ Public Class MachineCNPageUC
    Private m_bFirst As Boolean = True
    Private m_ButtonPower As New List(Of MachineButton)
 
-   Private m_nCurrMode As Integer = 0
-
    Private Sub TestingPage_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       StartBtn.Content = EgtMsg(MSG_MACHINECNPAGEUC + 1)
       StopBtn.Content = EgtMsg(MSG_MACHINECNPAGEUC + 2)
@@ -53,20 +51,11 @@ Public Class MachineCNPageUC
          PartProgTransferGpBx.Visibility = Windows.Visibility.Hidden
       End If
 
-      ' gestione visuliazzazione ToggleButton Auto/Sinlge/Mdi/Manula/Home
-      SetCncMode()
-
       '------ NUOVI BOTTONI ----------
       ' Lettura configurazione bottoni (per impostare l'uso del Joystick) da Ini di macchina
       m_ButtonPower.Clear()
       Dim m_nCount As Integer = 1
       Dim bFoundBtn As Boolean = True
-      Dim sTestVal As String = String.Empty
-      ' se non trovo il primo pulsante della lista allora nascondo l'elenco dei pulasnti per accensione
-      If GetPrivateProfileString("MachineButtons", K_BUTTON & "1", "", sTestVal, m_MainWindow.GetMachIniFile()) = 0 Then
-         PowerGpBx.Visibility = Visibility.Collapsed
-         Return
-      End If
       While bFoundBtn
          Dim sNameBtn As String = K_BUTTON & (m_nCount).ToString()
          Dim sMachineButtonType As String = String.Empty
@@ -103,53 +92,6 @@ Public Class MachineCNPageUC
 
    End Sub
 
-   Private Sub SetCncMode()
-      Dim Mode As Integer = m_nCurrMode
-      Select Case Mode
-         Case 0
-            ' Auoto
-            MDIConfirmBtn.IsEnabled = False
-            AutoBtn.IsChecked = True
-            SingleBtn.IsChecked = False
-            MDIBtn.IsChecked = False
-            ManualBtn.IsChecked = False
-            HomeBtn.IsChecked = False
-         Case 1
-            ' Single
-            MDIConfirmBtn.IsEnabled = False
-            AutoBtn.IsChecked = False
-            SingleBtn.IsChecked = True
-            MDIBtn.IsChecked = False
-            ManualBtn.IsChecked = False
-            HomeBtn.IsChecked = False
-         Case 2
-            ' Mdi
-            MDIConfirmBtn.IsEnabled = True
-            AutoBtn.IsChecked = False
-            SingleBtn.IsChecked = False
-            MDIBtn.IsChecked = True
-            ManualBtn.IsChecked = False
-            HomeBtn.IsChecked = False
-         Case 7
-            ' Manual
-            MDIConfirmBtn.IsEnabled = False
-            AutoBtn.IsChecked = False
-            SingleBtn.IsChecked = False
-            MDIBtn.IsChecked = False
-            ManualBtn.IsChecked = True
-            HomeBtn.IsChecked = False
-         Case 8
-            ' Home
-            MDIConfirmBtn.IsEnabled = False
-            AutoBtn.IsChecked = False
-            SingleBtn.IsChecked = False
-            MDIBtn.IsChecked = False
-            ManualBtn.IsChecked = False
-            HomeBtn.IsChecked = True
-      End Select
-
-   End Sub
-
    Private Sub StartBtn_Click(sender As Object, e As RoutedEventArgs) Handles StartBtn.Click
       If m_MainWindow.m_CNCommunication.m_nNCType = 3 AndAlso m_MainWindow.m_CNCommunication.m_CN.m_IsSiemensOne Then
          Dim sDBVarPath As String = ""
@@ -303,36 +245,15 @@ Public Class MachineCNPageUC
    Friend Sub PowerONChanged(bPowerON As Boolean)
       ' devo decodificare il tipo di pulsante, quindi eseguire la conversione...
       Dim PowerONButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonPower
-         If MachineButton.StateFlag.Trim = K_POWERON Then
+      For Each MachineButton In m_ButtonPower
+         If MachineButton.StateFlag = "ZAxes" Then
             PowerONButton = MachineButton
-            Exit For
          End If
       Next
-      If Not IsNothing(PowerONButton) Then
-         PowerONButton.SetIsChecked(bPowerON)
-         PowerONBtn.IsChecked = bPowerON
-      End If
-   End Sub
-
-   Friend Sub PowerOFFChanged(bPowerOFF As Boolean)
-      ' leggo solo una varibile -> quindi quando modifico lo stato di PowerON devo modificare lo stato di PowerOFF
-      Dim PowerOFFButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonPower
-         If MachineButton.StateFlag.Trim = K_POWEROFF Then
-            PowerOFFButton = MachineButton
-            Exit For
-         End If
-      Next
-      If Not IsNothing(PowerOFFButton) Then
-         PowerOFFButton.SetIsChecked(bPowerOFF)
-         PowerOFFBtn.IsChecked = bPowerOFF
-      End If
-   End Sub
-
-   Friend Sub CncModeChange(nMode As Integer)
-      m_nCurrMode = nMode
-      SetCncMode()
+      'If Not IsNothing(PowerONButton) Then
+      '   PowerONButton.SetIsChecked(bZAxes)
+      '   PowerONBtn.IsChecked = bZAxes
+      'End If
    End Sub
 
 End Class

Machine/MachinePageUC.xaml

@@ -24,33 +24,17 @@
                <ColumnDefinition Width="2*"/>
                <ColumnDefinition Width="2*"/>
                <ColumnDefinition Width="2*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="2*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
-                <ToggleButton Name="AlarmsBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource DatiMacchinaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
-                <ToggleButton Name="ToolsDBBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource DB-lavorazioniImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
-                <ToggleButton Name="MachiningDBBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource DB-utensiliImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
-                <ToggleButton Name="PolishingsBtn" Grid.Column="3" Style="{DynamicResource  OmagCut_BlueIconToggleButton}">
-                    <!--<Image Source="{DynamicResource LucidaturaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>-->
-                </ToggleButton>
-                <ToggleButton Name="WaterJetBtn" Grid.Column="4" Style="{DynamicResource  OmagCut_BlueIconToggleButton}">
-                    <!--<Image Source="{DynamicResource WaterJetImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>-->
-                </ToggleButton>
-                <ToggleButton Name="TestingPageBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource MacchinaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-                </ToggleButton>
-                <ToggleButton Name="StatisticsBtn" Grid.Column="6" Style="{DynamicResource OmagCut_YellowToggleButton}">
-                    
-                </ToggleButton>
+            <ToggleButton Name="AlarmsBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+            <ToggleButton Name="ToolsDBBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+            <ToggleButton Name="MachiningDBBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+            <ToggleButton Name="PolishingsBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+            <ToggleButton Name="TestingPageBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+            <ToggleButton Name="StatisticsBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
 
             </Grid>
 

Machine/MachinePageUC.xaml.vb

@@ -10,7 +10,6 @@ Public Class MachinePageUC
    Friend m_ToolsDbPageUC As ToolsDbPageUC
    Friend m_MachiningDbPageUC As MachiningDbPageUC
    Friend m_PolishingsPageUC As PolishingsPageUC
-   Friend m_WaterJetPageUC As WaterJetPageUC
    Friend m_MachineCNPageUC As MachineCNPageUC
    Friend m_StatisticsPageUC As StatisticsPageUC
 
@@ -22,7 +21,6 @@ Public Class MachinePageUC
       ToolsDb
       MachiningDb
       Polishings
-      WaterJet
       MachineCN
       Statistics
    End Enum
@@ -34,7 +32,6 @@ Public Class MachinePageUC
       m_ToolsDbPageUC = New ToolsDbPageUC
       m_MachiningDbPageUC = New MachiningDbPageUC
       m_PolishingsPageUC = New PolishingsPageUC
-      m_WaterJetPageUC = New WaterJetPageUC
       m_MachineCNPageUC = New MachineCNPageUC
       m_StatisticsPageUC = New StatisticsPageUC
 
@@ -43,16 +40,14 @@ Public Class MachinePageUC
       m_ToolsDbPageUC.SetValue(Grid.RowProperty, 1)
       m_MachiningDbPageUC.SetValue(Grid.RowProperty, 1)
       m_PolishingsPageUC.SetValue(Grid.RowProperty, 1)
-      m_WaterJetPageUC.SetValue(Grid.RowProperty, 1)
       m_MachineCNPageUC.SetValue(Grid.RowProperty, 1)
       m_StatisticsPageUC.SetValue(Grid.RowProperty, 1)
 
-      AlarmsBtn.ToolTip = EgtMsg(MSG_MACHINEPAGEUC + 5)
-      ToolsDBBtn.ToolTip = EgtMsg(MSG_MACHINEPAGEUC + 6)
-      MachiningDBBtn.ToolTip = EgtMsg(MSG_MACHINEPAGEUC + 7)
+      AlarmsBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 5)
+      ToolsDBBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 6)
+      MachiningDBBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 7)
       PolishingsBtn.Content = EgtMsg(91090)
-      WaterJetBtn.Content = EgtMsg(91128)
-      TestingPageBtn.ToolTip = EgtMsg(MSG_MACHINEPAGEUC + 8)
+      TestingPageBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 8)
       StatisticsBtn.Content = EgtMsg(90709)
 
       ' Apro pagina dati macchina
@@ -60,14 +55,10 @@ Public Class MachinePageUC
       m_ActiveMachinePage = MachinePages.Alarms
 
       ' Se lucidature non abilitate, disattivo la pagina DB lucidature
-      If Not m_MainWindow.m_CurrentMachine.bPolishing Then
+      If Not m_MainWindow.m_CurrentMachine.bPolishing  Then
          PolishingsBtn.IsEnabled = False
       End If
 
-      If Not m_MainWindow.m_CurrentMachine.bWaterJet Or Not m_MainWindow.m_CurrentMachine.bFromDBWaterJet Then
-         WaterJetBtn.IsEnabled = False
-      End If
-
       ' Se controllo numerico 0, disattivo la pagina macchina
       If GetPrivateProfileInt(S_NUMERICALCONTROL, K_TYPE, 0, m_MainWindow.GetMachIniFile()) = 0 Then
          TestingPageBtn.IsEnabled = False
@@ -143,22 +134,6 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_PolishingsPageUC)
             MachinePageGrid.Children.Add(m_AlarmsPageUC)
             m_ActiveMachinePage = MachinePages.Alarms
-         Case MachinePages.WaterJet
-            ' Verifica ed eventuale salvataggio Db Waterjet
-            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
-            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
-               AlarmsBtn.IsChecked = False
-               WaterJetBtn.IsChecked = True
-               Return
-            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
-               m_WaterJetPageUC.WaterJetPage_Reinitialize()
-            End If
-            ' passo alla pagina Dati Macchina
-            AlarmsBtn.IsChecked = True
-            WaterJetBtn.IsChecked = False
-            MachinePageGrid.Children.Remove(m_WaterJetPageUC)
-            MachinePageGrid.Children.Add(m_AlarmsPageUC)
-            m_ActiveMachinePage = MachinePages.Alarms
          Case MachinePages.MachineCN
             AlarmsBtn.IsChecked = True
             TestingPageBtn.IsChecked = False
@@ -213,22 +188,6 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_PolishingsPageUC)
             MachinePageGrid.Children.Add(m_ToolsDbPageUC)
             m_ActiveMachinePage = MachinePages.ToolsDb
-         Case MachinePages.WaterJet
-            'Verifica ed eventuale salvataggio Db Waterjet
-            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
-            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
-               ToolsDBBtn.IsChecked = False
-               WaterJetBtn.IsChecked = True
-               Return
-            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
-               m_WaterJetPageUC.WaterJetPage_Reinitialize()
-            End If
-            ' passo alla pagina Dati Macchina
-            ToolsDBBtn.IsChecked = True
-            WaterJetBtn.IsChecked = False
-            MachinePageGrid.Children.Remove(m_WaterJetPageUC)
-            MachinePageGrid.Children.Add(m_ToolsDbPageUC)
-            m_ActiveMachinePage = MachinePages.ToolsDb
          Case MachinePages.MachineCN
             ToolsDBBtn.IsChecked = True
             TestingPageBtn.IsChecked = False
@@ -283,22 +242,6 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_PolishingsPageUC)
             MachinePageGrid.Children.Add(m_MachiningDbPageUC)
             m_ActiveMachinePage = MachinePages.MachiningDb
-         Case MachinePages.WaterJet
-            ' Verifica ed eventuale salvataggio Db Waterjet
-            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
-            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
-               MachiningDBBtn.IsChecked = False
-               WaterJetBtn.IsChecked = True
-               Return
-            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
-               m_WaterJetPageUC.WaterJetPage_Reinitialize()
-            End If
-            ' passo alla pagina Dati Macchina
-            MachiningDBBtn.IsChecked = True
-            WaterJetBtn.IsChecked = False
-            MachinePageGrid.Children.Remove(m_WaterJetPageUC)
-            MachinePageGrid.Children.Add(m_MachiningDbPageUC)
-            m_ActiveMachinePage = MachinePages.MachiningDb
          Case MachinePages.MachineCN
             MachiningDBBtn.IsChecked = True
             TestingPageBtn.IsChecked = False
@@ -356,22 +299,6 @@ Public Class MachinePageUC
             m_ActiveMachinePage = MachinePages.Polishings
          Case MachinePages.Polishings
             PolishingsBtn.IsChecked = True
-         Case MachinePages.WaterJet
-            ' Verifica ed eventuale salvataggio Db Waterjet
-            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
-            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
-               PolishingsBtn.IsChecked = False
-               WaterJetBtn.IsChecked = True
-               Return
-            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
-               m_WaterJetPageUC.WaterJetPage_Reinitialize()
-            End If
-            ' passo alla pagina Dati Macchina
-            PolishingsBtn.IsChecked = True
-            WaterJetBtn.IsChecked = False
-            MachinePageGrid.Children.Remove(m_WaterJetPageUC)
-            MachinePageGrid.Children.Add(m_PolishingsPageUC)
-            m_ActiveMachinePage = MachinePages.Polishings
          Case MachinePages.MachineCN
             PolishingsBtn.IsChecked = True
             TestingPageBtn.IsChecked = False
@@ -387,77 +314,6 @@ Public Class MachinePageUC
       End Select
    End Sub
 
-   Private Sub WaterJetBtn_Click(sender As Object, e As RoutedEventArgs) Handles WaterJetBtn.Click
-      Select Case m_ActiveMachinePage
-         Case MachinePages.Alarms
-            AlarmsBtn.IsChecked = False
-            WaterJetBtn.IsChecked = True
-            MachinePageGrid.Children.Remove(m_AlarmsPageUC)
-            MachinePageGrid.Children.Add(m_WaterJetPageUC)
-            m_ActiveMachinePage = MachinePages.WaterJet
-            'DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM).RefreshDImensionPage()
-         Case MachinePages.ToolsDb
-            ' Verifica ed eventuale salvataggio utensile corrente
-            If Not m_ToolsDbPageUC.SaveCurrTool() Then
-               PolishingsBtn.IsChecked = False
-               ToolsDBBtn.IsChecked = True
-               Return
-            End If
-            ' salvo il DB utensili
-            EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
-            EgtTdbSave()
-            ' passo alla pagina WaterJet
-            WaterJetBtn.IsChecked = True
-            ToolsDBBtn.IsChecked = False
-            MachinePageGrid.Children.Remove(m_ToolsDbPageUC)
-            MachinePageGrid.Children.Add(m_WaterJetPageUC)
-            m_ActiveMachinePage = MachinePages.WaterJet
-         Case MachinePages.MachiningDb
-            ' Verifica ed eventuale salvataggio lavorazione corrente
-            If Not m_MachiningDbPageUC.SaveCurrMachining() Then
-               WaterJetBtn.IsChecked = False
-               MachiningDBBtn.IsChecked = True
-               Return
-            End If
-            ' salvo il DB lavorazioni
-            EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
-            EgtMdbSave()
-            ' passo alla pagina WaterJet
-            WaterJetBtn.IsChecked = True
-            MachiningDBBtn.IsChecked = False
-            MachinePageGrid.Children.Remove(m_MachiningDbPageUC)
-            MachinePageGrid.Children.Add(m_WaterJetPageUC)
-            m_ActiveMachinePage = MachinePages.WaterJet
-         Case MachinePages.Polishings
-            ' Verifica ed eventuale salvataggio Lucidatura corrente
-            If Not m_PolishingsPageUC.SaveKit() Then
-               WaterJetBtn.IsChecked = False
-               PolishingsBtn.IsChecked = True
-               Return
-            End If
-            ' passo alla pagina WaterJet
-            WaterJetBtn.IsChecked = True
-            PolishingsBtn.IsChecked = False
-            MachinePageGrid.Children.Remove(m_PolishingsPageUC)
-            MachinePageGrid.Children.Add(m_WaterJetPageUC)
-            m_ActiveMachinePage = MachinePages.WaterJet
-         Case MachinePages.WaterJet
-            WaterJetBtn.IsChecked = True
-         Case MachinePages.MachineCN
-            WaterJetBtn.IsChecked = True
-            TestingPageBtn.IsChecked = False
-            MachinePageGrid.Children.Remove(m_MachineCNPageUC)
-            MachinePageGrid.Children.Add(m_WaterJetPageUC)
-            m_ActiveMachinePage = MachinePages.WaterJet
-         Case MachinePages.Statistics
-            WaterJetBtn.IsChecked = True
-            StatisticsBtn.IsChecked = False
-            MachinePageGrid.Children.Remove(m_StatisticsPageUC)
-            MachinePageGrid.Children.Add(m_WaterJetPageUC)
-            m_ActiveMachinePage = MachinePages.WaterJet
-      End Select
-   End Sub
-
    Private Sub TestingPageBtn_Checked(sender As Object, e As RoutedEventArgs) Handles TestingPageBtn.Checked
       Select Case m_ActiveMachinePage
          Case MachinePages.Alarms
@@ -511,22 +367,6 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_PolishingsPageUC)
             MachinePageGrid.Children.Add(m_MachineCNPageUC)
             m_ActiveMachinePage = MachinePages.MachineCN
-         Case MachinePages.WaterJet
-            ' Verifica ed eventuale salvataggio Db Waterjet
-            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
-            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
-               TestingPageBtn.IsChecked = False
-               WaterJetBtn.IsChecked = True
-               Return
-            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
-               m_WaterJetPageUC.WaterJetPage_Reinitialize()
-            End If
-            ' passo alla pagina Dati Macchina
-            TestingPageBtn.IsChecked = True
-            WaterJetBtn.IsChecked = False
-            MachinePageGrid.Children.Remove(m_WaterJetPageUC)
-            MachinePageGrid.Children.Add(m_MachineCNPageUC)
-            m_ActiveMachinePage = MachinePages.MachineCN
          Case MachinePages.MachineCN
             TestingPageBtn.IsChecked = True
          Case MachinePages.Statistics
@@ -591,22 +431,6 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_PolishingsPageUC)
             MachinePageGrid.Children.Add(m_StatisticsPageUC)
             m_ActiveMachinePage = MachinePages.Statistics
-         Case MachinePages.WaterJet
-            ' Verifica ed eventuale salvataggio Db Waterjet
-            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
-            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
-               StatisticsBtn.IsChecked = False
-               WaterJetBtn.IsChecked = True
-               Return
-            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
-               m_WaterJetPageUC.WaterJetPage_Reinitialize()
-            End If
-            ' passo alla pagina Dati Macchina
-            TestingPageBtn.IsChecked = True
-            WaterJetBtn.IsChecked = False
-            MachinePageGrid.Children.Remove(m_WaterJetPageUC)
-            MachinePageGrid.Children.Add(m_StatisticsPageUC)
-            m_ActiveMachinePage = MachinePages.Statistics
          Case MachinePages.MachineCN
             StatisticsBtn.IsChecked = True
             TestingPageBtn.IsChecked = False
@@ -643,19 +467,6 @@ Public Class MachinePageUC
             MachinePageGrid.Children.Remove(m_PolishingsPageUC)
             MachinePageGrid.Children.Add(m_AlarmsPageUC)
             m_ActiveMachinePage = MachinePages.Alarms
-         Case MachinePages.WaterJet
-            ' Verifica ed eventuale salvataggio Lucidatura corrente
-            'If Not m_PolishingsPageUC.SaveKit() Then
-            '   AlarmsBtn.IsChecked = False
-            '   PolishingsBtn.IsChecked = True
-            '   Return
-            'End If
-            ' passo alla pagina Dati Macchina
-            AlarmsBtn.IsChecked = True
-            WaterJetBtn.IsChecked = False
-            MachinePageGrid.Children.Remove(m_WaterJetPageUC)
-            MachinePageGrid.Children.Add(m_AlarmsPageUC)
-            m_ActiveMachinePage = MachinePages.Alarms
          Case MachinePages.MachineCN
             AlarmsBtn.IsChecked = True
             TestingPageBtn.IsChecked = False

Machine/MachineStatusUC.xaml

@@ -146,7 +146,7 @@
 
          </Grid>
 
-         <Grid Name="B">
+         <Grid>
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="2"/>
                <ColumnDefinition Width="1*"/>
@@ -423,8 +423,8 @@
 
                   <TextBlock Grid.Column="0" Name="ConsumptionNameTxBx" Text="A"
             Style="{StaticResource OmagCut_LowerBarTitleTextBlock}"/>
-                  <TextBlock Grid.Column="1" Name="ConsumptionTxBx" Text="25.00"
-            Style="{StaticResource OmagCut_LowerBarValueTextBlock}" FontSize="22"/>
+                  <TextBlock Grid.Column="1" Name="ConsumptionTxBx" Text="25"
+            Style="{StaticResource OmagCut_LowerBarValueTextBlock}"/>
 
                </Grid>
 

Machine/MachineStatusUC.xaml.vb

@@ -111,26 +111,20 @@ Public Class MachineStatusUC
          ' modifico uniformgrid
          AxisUniformGrid.Columns = 1
          AxisUniformGrid.Rows = m_AxesNumber + 2
-         For Index As Integer = 0 To 12 - 1
+         For Index = 0 To 12 - 1
             Dim HorizontalGrid As Grid = DirectCast(AxisUniformGrid.Children(Index), Grid)
             HorizontalGrid.ColumnDefinitions.Clear()
             HorizontalGrid.RowDefinitions.Clear()
             If Index < m_AxesNumber Then
                HorizontalGrid.Visibility = Windows.Visibility.Visible
             End If
-            If HorizontalGrid.Name = "B" And m_AxesNumber = 4 Then
-               ' se macchina a 4 assi allora nascondo le info dell'asse B
-               HorizontalGrid.Visibility = Windows.Visibility.Collapsed
-               Continue For
-            End If
             Dim BorderRow As New RowDefinition
             BorderRow.Height = New GridLength(2, GridUnitType.Pixel)
             HorizontalGrid.RowDefinitions.Add(BorderRow)
             Dim AxisGrid As New RowDefinition
             AxisGrid.Height = New GridLength(1, GridUnitType.Star)
             HorizontalGrid.RowDefinitions.Add(AxisGrid)
-
-            For Each Children As UIElement In HorizontalGrid.Children
+            For Each Children In HorizontalGrid.Children
                If TypeOf Children Is System.Windows.Controls.Primitives.UniformGrid Then
                   Dim AxisUniformGrid As System.Windows.Controls.Primitives.UniformGrid = DirectCast(Children, System.Windows.Controls.Primitives.UniformGrid)
                   AxisUniformGrid.SetValue(Grid.RowProperty, 1)

Machine/MachiningDbPageUC.xaml

@@ -246,7 +246,7 @@
 
             <TextBlock Name="SideAngleTxBl" Grid.Column="2" Grid.Row="3" Grid.RowSpan="3"
                Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="3" Grid.Row="3" Grid.RowSpan="3" Margin="0,0,15,0" IsLength="False"
+            <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="3" Grid.Row="3" Grid.RowSpan="3" Margin="0,0,15,0"
                Style="{DynamicResource OmagCut_CalculatorTextBox}" />
 
             <TextBlock Name="StepTypeTxBl" Grid.Column="0" Grid.Row="6" Grid.RowSpan="3"
@@ -392,7 +392,7 @@
 
             </Border>
 
-            <Border Name="CurveBrd" Grid.Column="0" Grid.Row="15" Grid.ColumnSpan="4" Grid.RowSpan="3"
+            <Border Name="CurveBrd" Grid.Column="0" Grid.Row="18" Grid.ColumnSpan="4" Grid.RowSpan="3"
                Style="{DynamicResource OmagCut_NoNameGroupBorder}">
 
                <Grid>
@@ -576,7 +576,7 @@
 
                 <TextBlock Name="ForwardAngleTxBl" Grid.Column="0" Grid.Row="6" Grid.RowSpan="3"
                      Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="ForwardAngleTxBx" Grid.Column="1" Grid.Row="6" Grid.RowSpan="3" IsLength="False"
+                <EgtWPFLib:EgtTextBox Name="ForwardAngleTxBx" Grid.Column="1" Grid.Row="6" Grid.RowSpan="3"
                      Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
 
                 <Border Name="LiHoleBrd" Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="4" Grid.RowSpan="6"
@@ -605,12 +605,12 @@
 
                         <TextBlock Name="LpTurnsTxBl" Grid.Column="0" Grid.Row="1" Grid.RowSpan="2" 
                              Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                        <EgtWPFLib:EgtTextBox Name="LpTurnsTxBx" Grid.Column="1" Grid.Row="1" IsLength="False"
+                        <EgtWPFLib:EgtTextBox Name="LpTurnsTxBx" Grid.Column="1" Grid.Row="1"
                              Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
 
                         <TextBlock Name="HpTurnsTxBl" Grid.Column="2" Grid.Row="1"
                              Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                        <EgtWPFLib:EgtTextBox Name="HpTurnsTxBx" Grid.Column="3" Grid.Row="1" IsLength="False"
+                        <EgtWPFLib:EgtTextBox Name="HpTurnsTxBx" Grid.Column="3" Grid.Row="1"
                              Style="{DynamicResource OmagCut_MachLeftCalculatorTextBoxInBorder}" />
 
                     </Grid>
@@ -725,7 +725,7 @@
 
                <TextBlock Name="SpeedTxBl" Grid.Column="0"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-               <EgtWPFLib:EgtTextBox Name="SpeedTxBx" Grid.Column="1" IsLength="False"
+               <EgtWPFLib:EgtTextBox Name="SpeedTxBx" Grid.Column="1"
                   Style="{DynamicResource OmagCut_MachToolCalculatorTextBox}" />
 
             </Grid>
@@ -931,16 +931,14 @@
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="10*"/>
-               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="11*"/>
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
                 <Button Name="NewBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}"/>
                 <Button Name="SaveBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}"/>
                 <Button Name="RemoveBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}" Padding="0"/>
-                <Button Name="ExportBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}"/>
-                <Button Name="ImportBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}" Padding="0"/>
+
             </Grid>
 
       </Grid>

Machine/MachiningDbPageUC.xaml.vb

@@ -3,7 +3,6 @@ Imports System.ComponentModel
 Imports OmagCUT.TreeViewItem
 Imports EgtUILib
 Imports EgtWPFLib
-Imports EgtWPFLib5
 
 Public Class MachiningDbPageUC
 
@@ -79,8 +78,6 @@ Public Class MachiningDbPageUC
       NewBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 16)
       SaveBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 17)
       RemoveBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 18)
-      ExportBtn.Content = "Export"
-      ImportBtn.Content = "Import"
 
       NameTxBl.Text = EgtMsg(MSG_MACHININGSDBPAGEUC + 1)
       DepthTxBl.Text = EgtMsg(MSG_MACHININGSDBPAGEUC + 2)
@@ -230,7 +227,7 @@ Public Class MachiningDbPageUC
    'Funzione che permette l'inizializzazione di albero e parametri all'apertura della pagina ToolsDb
    Private Sub InitializeFirstSelectedItem()
       If MachiningsList.Count > 0 Then
-         For Each MachiningFamily As CathegoryItem In MachiningsList
+         For Each MachiningFamily In MachiningsList
             If MachiningFamily.Items.Count > 0 Then
                MachiningFamily.IsExpanded = True
                MachiningFamily.Items(0).IsSelected = True
@@ -253,7 +250,7 @@ Public Class MachiningDbPageUC
          Dim NewName As String = SelectedCathegory.Name
          EgtMdbGetMachiningNewName(NewName)
          If EgtMdbAddMachining(NewName, SelectedCathegory.nTType) Then
-            For Each MachiningFamily As CathegoryItem In MachiningsList
+            For Each MachiningFamily In MachiningsList
                If MachiningFamily.nTType = SelectedCathegory.nTType Then
                   Dim NewMachiningItem As New CustomItem(NewName, SelectedCathegory.nTType)
                   MachiningFamily.Items.Add(NewMachiningItem)
@@ -273,7 +270,7 @@ Public Class MachiningDbPageUC
          If EgtMdbCopyMachining(SelectedCathegory.Name, NewName) Then
             Dim CurrType As Integer
             EgtMdbGetCurrMachiningParam(MCH_MP.TYPE, CurrType)
-            For Each MachiningFamily As CathegoryItem In MachiningsList
+            For Each MachiningFamily In MachiningsList
                If MachiningFamily.nTType = CurrType Then
                   Dim NewMachiningItem As New CustomItem(NewName, CurrType)
                   MachiningFamily.Items.Add(NewMachiningItem)
@@ -306,7 +303,7 @@ Public Class MachiningDbPageUC
          ' Cancello la lavorazione
          EgtMdbRemoveMachining(SelectedItem.Name)
          ' Rimuovo dall'albero
-         For Each MachiningFamily As CathegoryItem In MachiningsList
+         For Each MachiningFamily In MachiningsList
             If (MachiningFamily.nTType And SelectedItem.nType) <> 0 Then
                MachiningFamily.Items.Remove(SelectedItem)
                If MachiningFamily.Items.Count = 0 Then
@@ -324,193 +321,6 @@ Public Class MachiningDbPageUC
       End If
    End Sub
 
-   Private Sub ExportBtn_Click(Sender As Object, e As RoutedEventArgs) Handles ExportBtn.Click
-      ' contesto corrente
-      EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
-
-      ' creo lista lavorazioni per esportazione
-      Dim MachiningToExportList As New ObservableCollection(Of ImpExpMachiningFamily)
-      Dim Family As CathegoryItem
-      Dim Machining As CustomItem
-      For Each Family In MachiningsList
-         Dim ImpExpMachiningFamily As New ImpExpMachiningFamily(Family.Name, Family.nTType)
-         For Each Machining In Family.Items
-            ImpExpMachiningFamily.MachiningList.Add(New ImpExpMachiningItem(Machining.Name, False))
-         Next
-         MachiningToExportList.Add(ImpExpMachiningFamily)
-      Next
-      Dim ExportWndVM As New ImportExportMachiningWindowVM(MachiningToExportList, true)
-      Dim ExportWnd As New ImportExportMachiningWindowWD(Application.Current.MainWindow, ExportWndVM)
-
-      ExportWnd.ShowDialog()
-   End Sub
-
-   Private Sub ImoportBtn_Click() Handles ImportBtn.Click
-      ' contesto corrente
-      EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
-      ' apro dialogo di scelta file
-      Dim ImportFileDlg As New Microsoft.Win32.OpenFileDialog() With {
-         .Title = EgtMsg(31161) & " " & EgtMsg(31163),
-         .DefaultExt = ".data",
-         .Filter = "Machinings (.data)|*.data",
-         .CheckFileExists = True,
-         .ValidateNames = True
-      }
-      If ImportFileDlg.ShowDialog() <> True Then Return
-      Dim ImportFilePath As String = ImportFileDlg.FileName
-      ' recupero liste utensili da importare
-      Dim ImportFileMachiningNameList As String() = Nothing
-      Dim ImportFileMachiningFamilyList As Integer() = Nothing
-      If Not EgtMdbToBeImported(ImportFilePath, ImportFileMachiningNameList, ImportFileMachiningFamilyList) Then Return
-      ' li inserisco in lista per finestra di scelta
-      Dim MachinigToImportList As New ObservableCollection(Of ImpExpMachiningFamily)
-      ' creo famiglie di utensili in base a quelle trovate in lista importata
-      For MachiningIndex As Integer = 0 To ImportFileMachiningNameList.Count - 1
-         Dim MachiningName As String = ImportFileMachiningNameList(MachiningIndex)
-         Dim MachiningFamily As Integer = ImportFileMachiningFamilyList(MachiningIndex)
-         MachiningFamily = MachiningFamily And
-            (MCH_MY.DRILLING Or
-            MCH_MY.SAWING Or
-            MCH_MY.MILLING Or
-            MCH_MY.POCKETING Or
-            MCH_MY.MORTISING Or
-            MCH_MY.SAWROUGHING Or
-            MCH_MY.SAWFINISHING Or
-            MCH_MY.GENMACHINING Or
-            MCH_MY.CHISELING Or
-            MCH_MY.SURFROUGHING Or
-            MCH_MY.SURFFINISHING Or
-            MCH_MY.WATERJETTING)
-         Dim bFounded As Boolean = False
-         Dim MachinigToImportFamily As ImpExpMachiningFamily
-         For Each MachinigToImportFamily In MachinigToImportList
-            If (MachiningFamily = MachinigToImportFamily.FamilyType) Then
-               MachinigToImportFamily.MachiningList.Add(New ImpExpMachiningItem(MachiningName, AlreadyExist(MachiningName)))
-               bFounded = True
-               Exit For
-            End If
-         Next
-         If Not bFounded Then
-            Dim NewFamily As New ImpExpMachiningFamily(GetMachiningFamilyName(MachiningFamily), MachiningFamily)
-            NewFamily.MachiningList.Add(New ImpExpMachiningItem(MachiningName, AlreadyExist(MachiningName)))
-            MachinigToImportList.Add(NewFamily)
-         End If
-      Next
-      Dim ImportWndVM As New ImportExportMachiningWindowVM(MachinigToImportList, False, ImportFilePath, ImportFileMachiningNameList)
-      Dim ImportWnd As New ImportExportMachiningWindowWD(Application.Current.MainWindow, ImportWndVM)
-
-      ImportWnd.ShowDialog()
-      ' Aggiungo all'albero visualizzato gli utensili appena importati
-      If ImportWnd.OkResult Then
-         LoadImportedMachineMachinings(ImportWndVM.vsImported)
-      End If
-   End Sub
-
-   Private Function AlreadyExist(MachiningName As String) As Boolean
-      Dim MachiningFamily As CathegoryItem
-      For Each MachiningFamily In MachiningsList
-         Dim MachiningItem As CustomItem
-         For Each MachiningItem In MachiningFamily.Items
-            If MachiningName = MachiningItem.Name Then
-               Return True
-            End If
-         Next
-      Next
-      Return False
-   End Function
-
-   Private Function GetMachiningFamilyName(NewMachinigFamily As Integer) As String
-      Dim MachiningFamily As CathegoryItem
-      For Each MachiningFamily In MachiningsList
-         If NewMachinigFamily = MachiningFamily.nTType Then
-            Return MachiningFamily.Name
-         End If
-      Next
-      Return ""
-   End Function
-
-   Private Sub LoadImportedMachineMachinings(vsImportedMachinings As String())
-      ' Leggo tutte le lavorazioni presenti nella Macchina (quindi anche quelli appena importati). 
-      Dim ActiveMachiningsFamilies() As MachiningsType = MyReadMachiningFamilies(m_MainWindow.m_CurrentMachine.sMachIniFile)
-      Dim MachiningsFamilyIndex As Integer = 0
-      Dim MachiningsFamilyItem As MachiningsType
-      For Each MachiningsFamilyItem In ActiveMachiningsFamilies
-         Dim FamilyTreeView As New CathegoryItem(MachiningsFamilyItem.Name, MachiningsFamilyItem.Id)
-         Dim MachiningFamilyItem = MachiningsList.FirstOrDefault(Function(MachiningFamily) MachiningsFamilyItem.Id = MachiningFamily.nTType)
-         If IsNothing(MachiningFamilyItem) Then
-            MachiningsList.Insert(MachiningsFamilyIndex, FamilyTreeView)
-         End If
-         Dim nType As Integer = 0
-         Dim MachiningName As String = String.Empty
-         Dim MachiningIndex As Integer = 0
-         EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
-         Dim bFound As Boolean = EgtMdbGetFirstMachining(MachiningsFamilyItem.Id, MachiningName)
-         While bFound
-            Dim MachiningItem = MachiningsList(MachiningsFamilyIndex).Items.FirstOrDefault(Function(Machining) Machining.Name = MachiningName)
-            Dim bInList As Boolean = vsImportedMachinings.Contains(MachiningName)
-            If bInList Then
-               ' Se una lavorazione è presente nella MachiningsList visualizzata ma nel contempo è nell'array vsImported 
-               ' vuol dire che è stata sovrascritta perciò la rimuovo
-               MachiningsList(MachiningsFamilyIndex).Items.Remove(MachiningsList(MachiningsFamilyIndex).Items.FirstOrDefault(Function(Machining) Machining.Name = MachiningName))
-            End If
-            If bInList OrElse IsNothing(MachiningItem) Then
-               ' recupero tuuid
-               EgtMdbSetCurrMachining(MachiningName)
-               Dim sCurrMachTUUID As String = String.Empty
-               EgtMdbGetCurrMachiningParam(MCH_MP.TUUID, sCurrMachTUUID)
-               ' aggiungo la lavorazione importata
-               MachiningsList(MachiningsFamilyIndex).Items.Insert(MachiningIndex, New CustomItem(MachiningName, MachiningsFamilyItem.Id, ToolDbUtility.IsToolInDb(sCurrMachTUUID)))
-               ' eventualmente evidezio l'ultimo elemento inserito (ERRORE: non espando l'albero)
-               'MachiningsList(MachiningsFamilyIndex).Items(MachiningIndex).IsSelected = True
-            End If
-            MachiningIndex += 1
-            bFound = EgtMdbGetNextMachining(MachiningsFamilyItem.Id, MachiningName)
-         End While
-         MachiningsFamilyIndex += 1
-      Next
-   End Sub
-
-   Public Function MyReadMachiningFamilies(sMachineIniPath As String) As MachiningsType()
-      Dim ActiveMachiningsFamiliesList As New List(Of MachiningsType)
-      ' Se il materiale lavorato è Marmo l'ordine di lettura e inserimento di Foratura e Taglio di lama nelle famiglie di lavorazioni attive è invertito 
-
-      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SAWING, .Name = EgtMsg(31200 + 2)})
-      End If
-      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_DRILLING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.DRILLING, .Name = EgtMsg(31200 + 1)})
-      End If
-
-      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_MILLING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.MILLING, .Name = EgtMsg(31200 + 3)})
-      End If
-      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_POCKETING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.POCKETING, .Name = EgtMsg(31200 + 4)})
-      End If
-      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_MORTISING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.MORTISING, .Name = EgtMsg(31200 + 5)})
-      End If
-      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWROUGHING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SAWROUGHING, .Name = EgtMsg(31200 + 6)})
-      End If
-      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWFINISHING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SAWFINISHING, .Name = EgtMsg(31200 + 7)})
-      End If
-      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_GENMACHINING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.GENMACHINING, .Name = EgtMsg(31200 + 8)})
-      End If
-      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_CHISELING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.CHISELING, .Name = EgtMsg(31200 + 9)})
-      End If
-      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SURFFINISHING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.SURFFINISHING, .Name = EgtMsg(31211)})
-      End If
-      If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_WATERJETTING, 0, sMachineIniPath) <> 0 Then
-         ActiveMachiningsFamiliesList.Add(New MachiningsType With {.Id = MCH_MY.WATERJETTING, .Name = EgtMsg(31210)})
-      End If
-      Return ActiveMachiningsFamiliesList.ToArray
-   End Function
-
    Private Sub InitializeMachiningFamily(bEnabled As Boolean, nFType As Integer, sFName As String)
       If Not bEnabled Then Return
       ' Inserisco categoria ed eventuali elementi
@@ -552,15 +362,12 @@ 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
-            Exit For
-         End If
+         If ToolInt = LInType.Id Then LeadInTypeCmBx.SelectedItem = LInType
       Next
       EgtMdbGetCurrMachiningParam(MCH_MP.EXTLINKTYPE, ToolInt)
       ExtLinkTypeCmBx.SelectedIndex = ToolInt
@@ -650,7 +457,7 @@ Public Class MachiningDbPageUC
          Case MCH_MY.MILLING       'Fresatura
             ToolCmBx.ItemsSource = MillTool
          Case MCH_MY.POCKETING     'Svuotatura
-            ToolCmBx.ItemsSource = PocketTool
+            ToolCmBx.ItemsSource = MillTool
          Case MCH_MY.DRILLING      'Foratura
             ToolCmBx.ItemsSource = DrillTool
          Case MCH_MY.SAWROUGHING   'Sgrossatura con lama
@@ -665,7 +472,7 @@ Public Class MachiningDbPageUC
       EgtMdbGetCurrMachiningParam(MCH_MP.TUUID, sTuuid)
       EgtTdbGetToolFromUUID(sTuuid, ToolString)
       Dim bToolExist As Boolean = False
-      For Each CurrTool As IEnumerable In ToolCmBx.ItemsSource
+      For Each CurrTool In ToolCmBx.ItemsSource
          If CurrTool.ToString() = ToolString Then
             bToolExist = True
             Exit For
@@ -707,43 +514,23 @@ Public Class MachiningDbPageUC
       RadOffsetTxBx.Text = LenToString(ToolDouble, 3)
       ' Lista materiali
       m_MaterialsList.Clear()
-      For Each Material As Material In m_MainWindow.m_CurrentMachine.Materials
-         If m_MainWindow.m_CurrentMachine.bWaterJet And m_MainWindow.m_CurrentMachine.bFromDBWaterJet Then
-            m_MaterialsList.Add(New MachiningMaterial(Material.nId, Material.sName, Material.SubId))
-         Else
-            m_MaterialsList.Add(New MachiningMaterial(Material.nId, Material.sName))
-         End If
+      For Each Material In m_MainWindow.m_CurrentMachine.Materials
+         m_MaterialsList.Add(New MachiningMaterial(Material.nId, Material.sName))
       Next
       EgtMdbGetCurrMachiningParam(MCH_MP.SYSNOTES, ToolString)
       If ToolString <> String.Empty Then
          Dim sItems() = ToolString.Split(";".ToCharArray)
          Dim Index As Integer = 0
-         For Each Material As MachiningMaterial In m_MaterialsList
+         For Each Material In m_MaterialsList
             Dim Param() As String = sItems(Index).Split(",".ToCharArray)
-            Dim SubParam() As String = Param(0).Split(".".ToCharArray)
             Dim nParId As Integer = 0
-            Dim nSubParId As Integer = 0
-            If m_MainWindow.m_CurrentMachine.bWaterJet And m_MainWindow.m_CurrentMachine.bFromDBWaterJet Then
-               If StringToInt(SubParam(0), nParId) AndAlso nParId = Material.nId AndAlso SubParam.Count > 1 AndAlso
-                  StringToInt(SubParam(1), nSubParId) AndAlso nSubParId = Material.nSubId Then
-
-                  StringToDouble(Param(1), Material.dMinThickness)
-                  StringToDouble(Param(2), Material.dMaxThickness)
-                  Material.VerifyIfActive()
-                  Index += 1
-               Else
-                  Material.VerifyIfActive()
-               End If
+            If StringToInt(Param(0), nParId) AndAlso nParId = Material.nId Then
+               StringToDouble(Param(1), Material.dMinThickness)
+               StringToDouble(Param(2), Material.dMaxThickness)
+               Material.VerifyIfActive()
+               Index += 1
             Else
-               If StringToInt(Param(0), nParId) AndAlso nParId = Material.nId Then
-
-                  StringToDouble(Param(1), Material.dMinThickness)
-                  StringToDouble(Param(2), Material.dMaxThickness)
-                  Material.VerifyIfActive()
-                  Index += 1
-               Else
-                  Material.VerifyIfActive()
-               End If
+               Material.VerifyIfActive()
             End If
          Next
       End If
@@ -819,18 +606,6 @@ Public Class MachiningDbPageUC
          nTemp = If(AcrossChBx.IsChecked(), MCH_SAWFIN_SUB.ACROSS, MCH_SAWFIN_SUB.ALONG)
          EgtMdbSetCurrMachiningParam(MCH_MP.SUBTYPE, nTemp)
       End If
-      ' 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)
-         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.99 * dToolDiam)
-         EgtMdbSetCurrMachiningParam( MCH_MP.LIELEV, 2.0)
-      End If
       ' Parametri WaterJetting
       StringToDouble(ForwardAngleTxBx.Text, dTemp)
       EgtMdbSetCurrMachiningParam(MCH_MP.FORWARDANGLE, dTemp)
@@ -896,15 +671,9 @@ Public Class MachiningDbPageUC
       EgtMdbSetCurrMachiningParam(MCH_MP.OFFSR, dTemp)
       ' Scrivo stringa materiali da lista
       Dim sMaterialString As String = String.Empty
-      For Each Material As MachiningMaterial In m_MaterialsList
-         If m_MainWindow.m_CurrentMachine.bWaterJet And m_MainWindow.m_CurrentMachine.bFromDBWaterJet Then
-            If Material.bIsActive Then
-               sMaterialString += Material.nId.ToString & "." & Material.nSubId.ToString & "," & DoubleToString(Material.dMinThickness, 3) & "," & DoubleToString(Material.dMaxThickness, 3) & ";"
-            End If
-         Else
-            If Material.bIsActive Then
-               sMaterialString += Material.nId.ToString & "," & DoubleToString(Material.dMinThickness, 3) & "," & DoubleToString(Material.dMaxThickness, 3) & ";"
-            End If
+      For Each Material In m_MaterialsList
+         If Material.bIsActive Then
+            sMaterialString += Material.nId.ToString & "," & DoubleToString(Material.dMinThickness, 0) & "," & DoubleToString(Material.dMaxThickness, 0) & ";"
          End If
       Next
       EgtMdbSetCurrMachiningParam(MCH_MP.SYSNOTES, sMaterialString)
@@ -924,9 +693,8 @@ Public Class MachiningDbPageUC
       LonOffsetTxBx.Visibility = Windows.Visibility.Visible
       Select Case nMachiningType
          Case MCH_MY.SAWING   'Parametri Taglio
-            ' nascondo il parametro di sbandamento 
-            SideAngleTxBl.Visibility = Windows.Visibility.Hidden
-            SideAngleTxBx.Visibility = Windows.Visibility.Hidden
+            SideAngleTxBl.Visibility = Windows.Visibility.Visible
+            SideAngleTxBx.Visibility = Windows.Visibility.Visible
             InvertTxBl.Visibility = Windows.Visibility.Visible
             InvertChBx.Visibility = Windows.Visibility.Visible
             AcrossTxBl.Visibility = Windows.Visibility.Hidden
@@ -943,58 +711,40 @@ Public Class MachiningDbPageUC
             TypeBrd.Visibility = Windows.Visibility.Visible
             ' Definizione della grid TypeGrd con la giusta altezza e numero di righe
             Dim RowNum As Integer = TypeGrd.RowDefinitions.Count
-            If RowNum > 1 Then
-               For Index As Integer = RowNum - 1 To 1 Step -1
+            If RowNum > 2 Then
+               For Index = RowNum - 1 To 2 Step -1
                   TypeGrd.RowDefinitions.RemoveAt(Index)
                Next
-               LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 0)
-               LeadInTypeCmBx.SetValue(Grid.ColumnProperty, 1)
-
-               LeadOutTypeTxBl.SetValue(Grid.RowProperty, 0)
+               LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 2)
+               LeadInTypeCmBx.SetValue(Grid.ColumnProperty, 3)
+               LeadOutTypeTxBl.SetValue(Grid.RowProperty, 1)
                LeadOutTypeTxBl.SetValue(Grid.ColumnProperty, 2)
-               LeadOutTypeCmBx.SetValue(Grid.RowProperty, 0)
+               LeadOutTypeCmBx.SetValue(Grid.RowProperty, 1)
                LeadOutTypeCmBx.SetValue(Grid.ColumnProperty, 3)
                TypeBrd.SetValue(Grid.RowProperty, 12)
-               TypeBrd.SetValue(Grid.RowSpanProperty, 3)
+               TypeBrd.SetValue(Grid.RowSpanProperty, 6)
             End If
-
             LeadInTypeTxBl.Visibility = Windows.Visibility.Visible
             LeadInTypeCmBx.Visibility = Windows.Visibility.Visible
-
+            ExtLinkTypeTxBl.Visibility = Windows.Visibility.Visible
+            ExtLinkTypeCmBx.Visibility = Windows.Visibility.Visible
             LeadOutTypeTxBl.Visibility = Windows.Visibility.Visible
             LeadOutTypeCmBx.Visibility = Windows.Visibility.Visible
-
-            ExtLinkTypeTxBl.Visibility = Windows.Visibility.Hidden
-            ExtLinkTypeCmBx.Visibility = Windows.Visibility.Hidden
             LeadLinkTypeTxBl.Visibility = Windows.Visibility.Hidden
             LeadLinkTypeCmBx.Visibility = Windows.Visibility.Hidden
-
-            CurveBrd.Visibility = Windows.Visibility.Visible
-
-            'If Not MachParamGrd.Children.Contains(StartPosTxBl) Then
-            If TypeGrd.Children.Contains(StartPosTxBl) Then
-               'MachParamGrd.Children.Remove(StartPosTxBl)
-               'MachParamGrd.Children.Remove(StartPosTxBx)
-               'TypeGrd.Children.Add(StartPosTxBl)
-               'TypeGrd.Children.Add(StartPosTxBx
-               TypeGrd.Children.Remove(StartPosTxBl)
-               TypeGrd.Children.Remove(StartPosTxBx)
-               MachParamGrd.Children.Add(StartPosTxBl)
-               MachParamGrd.Children.Add(StartPosTxBx)
-               StartPosTxBl.SetValue(Grid.ColumnProperty, 2)
-               StartPosTxBl.SetValue(Grid.RowProperty, 3)
-               StartPosTxBx.SetValue(Grid.ColumnProperty, 3)
-               StartPosTxBx.SetValue(Grid.RowProperty, 3)
-               StartPosTxBl.SetValue(Grid.RowSpanProperty, 3)
-               StartPosTxBx.SetValue(Grid.RowSpanProperty, 3)
+            CurveBrd.Visibility = Windows.Visibility.Hidden
+            If MachParamGrd.Children.Contains(StartPosTxBl) Then
+               MachParamGrd.Children.Remove(StartPosTxBl)
+               MachParamGrd.Children.Remove(StartPosTxBx)
+               TypeGrd.Children.Add(StartPosTxBl)
+               TypeGrd.Children.Add(StartPosTxBx)
+               StartPosTxBl.SetValue(Grid.ColumnProperty, 0)
+               StartPosTxBl.SetValue(Grid.RowProperty, 0)
+               StartPosTxBx.SetValue(Grid.ColumnProperty, 1)
+               StartPosTxBx.SetValue(Grid.RowProperty, 0)
+               StartPosTxBl.SetValue(Grid.RowSpanProperty, 1)
+               StartPosTxBx.SetValue(Grid.RowSpanProperty, 1)
                StartPosTxBx.Style = Application.Current.FindResource("OmagCut_MachLeftCalculatorTextBoxInBorder")
-            ElseIf MachParamGrd.Children.Contains(StartPosTxBl) Then
-               StartPosTxBl.SetValue(Grid.ColumnProperty, 2)
-               StartPosTxBl.SetValue(Grid.RowProperty, 3)
-               StartPosTxBx.SetValue(Grid.ColumnProperty, 3)
-               StartPosTxBx.SetValue(Grid.RowProperty, 3)
-               StartPosTxBl.SetValue(Grid.RowSpanProperty, 3)
-               StartPosTxBx.SetValue(Grid.RowSpanProperty, 3)
             End If
             StartPosTxBl.Visibility = Windows.Visibility.Visible
             StartPosTxBx.Visibility = Windows.Visibility.Visible
@@ -1050,7 +800,7 @@ Public Class MachiningDbPageUC
             ' Definizione di una riga della tabella con la giusta altezza
             RowNum = FeedGrd.RowDefinitions.Count
             If RowNum > 4 Then
-               For Index As Integer = RowNum - 1 To 4 Step -1
+               For Index = RowNum - 1 To 4 Step -1
                   FeedGrd.RowDefinitions.RemoveAt(Index)
                Next
             End If
@@ -1059,7 +809,7 @@ Public Class MachiningDbPageUC
             ' Definizione di una riga della tabella Feed
             RowNum = FeedGrd.RowDefinitions.Count
             If RowNum < 6 Then
-               For Index As Integer = RowNum To 5
+               For Index = RowNum To 5
                   Dim Row As New RowDefinition
                   Row.Height = New GridLength(1, GridUnitType.Star)
                   FeedGrd.RowDefinitions.Add(Row)
@@ -1141,26 +891,18 @@ 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
+               For Index = RowNum - 1 To 2 Step -1
                   TypeGrd.RowDefinitions.RemoveAt(Index)
                Next
-            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
@@ -1232,7 +974,7 @@ Public Class MachiningDbPageUC
             ' Definizione di una riga della tabella con la giusta altezza
             RowNum = FeedGrd.RowDefinitions.Count
             If RowNum > 4 Then
-               For Index As Integer = RowNum - 1 To 4 Step -1
+               For Index = RowNum - 1 To 4 Step -1
                   FeedGrd.RowDefinitions.RemoveAt(Index)
                Next
             End If
@@ -1241,7 +983,7 @@ Public Class MachiningDbPageUC
             ' Definizione di una riga della tabella Feed
             RowNum = FeedGrd.RowDefinitions.Count
             If RowNum < 4 Then
-               For Index As Integer = RowNum To 3
+               For Index = RowNum To 3
                   Dim Row As New RowDefinition
                   Row.Height = New GridLength(1, GridUnitType.Star)
                   FeedGrd.RowDefinitions.Add(Row)
@@ -1325,14 +1067,6 @@ Public Class MachiningDbPageUC
                StartPosTxBl.SetValue(Grid.RowSpanProperty, 3)
                StartPosTxBx.SetValue(Grid.RowSpanProperty, 3)
                StartPosTxBx.Style = Application.Current.FindResource("OmagCut_LeftCalculatorTextBoxNoBorder")
-            ElseIf MachParamGrd.Children.Contains(StartPosTxBl) Then
-               StartPosTxBl.SetValue(Grid.ColumnProperty, 0)
-               StartPosTxBl.SetValue(Grid.RowProperty, 6)
-               StartPosTxBx.SetValue(Grid.ColumnProperty, 1)
-               StartPosTxBx.SetValue(Grid.RowProperty, 6)
-               StartPosTxBl.SetValue(Grid.RowSpanProperty, 3)
-               StartPosTxBx.SetValue(Grid.RowSpanProperty, 3)
-               StartPosTxBx.Style = Application.Current.FindResource("OmagCut_LeftCalculatorTextBoxNoBorder")
             End If
             StartPosTxBl.Visibility = Windows.Visibility.Visible
             StartPosTxBx.Visibility = Windows.Visibility.Visible
@@ -1362,7 +1096,7 @@ Public Class MachiningDbPageUC
             ' Definizione di una riga della tabella con la giusta altezza
             Dim RowNum As Integer = FeedGrd.RowDefinitions.Count
             If RowNum > 4 Then
-               For Index As Integer = RowNum - 1 To 4 Step -1
+               For Index = RowNum - 1 To 4 Step -1
                   FeedGrd.RowDefinitions.RemoveAt(Index)
                Next
             End If
@@ -1371,7 +1105,7 @@ Public Class MachiningDbPageUC
             ' Definizione di una riga della tabella Feed
             RowNum = FeedGrd.RowDefinitions.Count
             If RowNum < 4 Then
-               For Index As Integer = RowNum To 3
+               For Index = RowNum To 3
                   Dim Row As New RowDefinition
                   Row.Height = New GridLength(1, GridUnitType.Star)
                   FeedGrd.RowDefinitions.Add(Row)
@@ -1451,7 +1185,7 @@ 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
-               For Index As Integer = RowNum - 1 To 2 Step -1
+               For Index = RowNum - 1 To 2 Step -1
                   TypeGrd.RowDefinitions.RemoveAt(Index)
                Next
                LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 2)
@@ -1519,7 +1253,7 @@ Public Class MachiningDbPageUC
             ' Definizione di una riga della tabella con la giusta altezza
             RowNum = FeedGrd.RowDefinitions.Count
             If RowNum > 4 Then
-               For Index As Integer = RowNum - 1 To 4 Step -1
+               For Index = RowNum - 1 To 4 Step -1
                   FeedGrd.RowDefinitions.RemoveAt(Index)
                Next
             End If
@@ -1528,7 +1262,7 @@ Public Class MachiningDbPageUC
             ' Definizione di una riga della tabella Feed
             RowNum = FeedGrd.RowDefinitions.Count
             If RowNum < 4 Then
-               For Index As Integer = RowNum To 3
+               For Index = RowNum To 3
                   Dim Row As New RowDefinition
                   Row.Height = New GridLength(1, GridUnitType.Star)
                   FeedGrd.RowDefinitions.Add(Row)
@@ -1621,7 +1355,7 @@ 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
-               For Index As Integer = RowNum - 1 To 2 Step -1
+               For Index = RowNum - 1 To 2 Step -1
                   TypeGrd.RowDefinitions.RemoveAt(Index)
                Next
                LeadInTypeTxBl.SetValue(Grid.ColumnProperty, 2)
@@ -1689,7 +1423,7 @@ Public Class MachiningDbPageUC
             ' Definizione di una riga della tabella con la giusta altezza
             RowNum = FeedGrd.RowDefinitions.Count
             If RowNum > 4 Then
-               For Index As Integer = RowNum - 1 To 4 Step -1
+               For Index = RowNum - 1 To 4 Step -1
                   FeedGrd.RowDefinitions.RemoveAt(Index)
                Next
             End If
@@ -1698,7 +1432,7 @@ Public Class MachiningDbPageUC
             ' Definizione di una riga della tabella Feed
             RowNum = FeedGrd.RowDefinitions.Count
             If RowNum < 5 Then
-               For Index As Integer = RowNum To 4
+               For Index = RowNum To 4
                   Dim Row As New RowDefinition
                   Row.Height = New GridLength(1, GridUnitType.Star)
                   FeedGrd.RowDefinitions.Add(Row)
@@ -1727,7 +1461,7 @@ Public Class MachiningDbPageUC
             ' Eliminazione di una riga della tabella Offset
             RowNum = OffsetGrd.RowDefinitions.Count
             If RowNum > 1 Then
-               For Index As Integer = RowNum - 1 To 1 Step -1
+               For Index = RowNum - 1 To 1 Step -1
                   OffsetGrd.RowDefinitions.RemoveAt(Index)
                   OffsetGpBx.SetValue(Grid.RowSpanProperty, 4)
                Next
@@ -1778,34 +1512,27 @@ Public Class MachiningDbPageUC
             StepTypeTxBl.Visibility = Windows.Visibility.Hidden
             StepTypeCmBx.Visibility = Windows.Visibility.Hidden
             SideBrd.SetValue(Grid.RowProperty, 9)
-            SideBrd.Visibility = Windows.Visibility.Hidden
-            WorkSideTxBl.Visibility = Windows.Visibility.Hidden
-            WorkSideCmBx.Visibility = Windows.Visibility.Hidden
+            SideBrd.Visibility = Windows.Visibility.Visible
+            WorkSideTxBl.Visibility = Windows.Visibility.Visible
+            WorkSideCmBx.Visibility = Windows.Visibility.Visible
             HeadSideTxBl.Visibility = Windows.Visibility.Hidden
             HeadSideCmBx.Visibility = Windows.Visibility.Hidden
             TypeBrd.Visibility = Windows.Visibility.Visible
             ' Definizione della grid TypeGrd con la giusta altezza e numero di righe
             Dim RowNum As Integer = TypeGrd.RowDefinitions.Count
             If RowNum > 2 Then
-               For Index As Integer = RowNum - 1 To 2 Step -1
+               For Index = RowNum - 1 To 2 Step -1
                   TypeGrd.RowDefinitions.RemoveAt(Index)
                Next
-            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
@@ -1857,30 +1584,27 @@ Public Class MachiningDbPageUC
             BackwardStepSideAngTxBl.Visibility = Windows.Visibility.Hidden
             BackwardStepSideAngTxBx.Visibility = Windows.Visibility.Hidden
             ForwardSawStepTxBl.Text = EgtMsg(MSG_MACHININGSDBPAGEUC + 15)
-            If DrillStepGrd.Children.Contains(StepTxBx) Then
-               DrillStepGrd.Children.Remove(StepTxBx)
-               SawRouStepGrd.Children.Add(StepTxBx)
-               StepTxBx.SetValue(Grid.ColumnProperty, 1)
-               StepTxBx.SetValue(Grid.RowProperty, 0)
-               StepTxBx.Style = Application.Current.FindResource("OmagCut_CalculatorTextBoxInGroupBox")
-            ElseIf SawStepGrd.Children.Contains(StepTxBx) Then
-               SawStepGrd.Children.Remove(StepTxBx)
-               SawRouStepGrd.Children.Add(StepTxBx)
-               StepTxBx.SetValue(Grid.ColumnProperty, 1)
-               StepTxBx.SetValue(Grid.RowProperty, 0)
-               StepTxBx.Style = Application.Current.FindResource("OmagCut_CalculatorTextBoxInGroupBox")
+            If SawStepGrd.Children.Contains(ArcIntTxBl) Then
+               SawStepGrd.Children.Remove(ArcIntTxBl)
+               SawStepGrd.Children.Remove(ArcIntTxBx)
+               SawStepGrd.Children.Remove(ArcExtTxBl)
+               SawStepGrd.Children.Remove(ArcExtTxBx)
+               SawStepGrd.RowDefinitions.RemoveAt(2)
+            End If
+            If SawStepGrd.Children.Contains(LastSawStepTxBl) Then
+               SawStepGrd.Children.Remove(LastSawStepTxBl)
+               SawStepGrd.Children.Remove(LastSawStepTxBx)
+               SawStepGrd.RowDefinitions.RemoveAt(2)
             End If
             DrillStepBrd.Visibility = Windows.Visibility.Hidden
-            SawStepGpBx.Visibility = Windows.Visibility.Hidden
-            SawRouStepGpBx.Visibility = Windows.Visibility.Visible
-            SawRouStepTxBl.Visibility = Windows.Visibility.Visible
+            SawRouStepGpBx.Visibility = Windows.Visibility.Hidden
             ReturnPosTxBl.Visibility = Windows.Visibility.Hidden
             ReturnPosTxBx.Visibility = Windows.Visibility.Hidden
             OffsetGpBx.Visibility = Windows.Visibility.Hidden
             ' Definizione di una riga della tabella con la giusta altezza
             RowNum = FeedGrd.RowDefinitions.Count
             If RowNum > 4 Then
-               For Index As Integer = RowNum - 1 To 4 Step -1
+               For Index = RowNum - 1 To 4 Step -1
                   FeedGrd.RowDefinitions.RemoveAt(Index)
                Next
             End If
@@ -1889,7 +1613,7 @@ Public Class MachiningDbPageUC
             ' Definizione di una riga della tabella Feed
             RowNum = FeedGrd.RowDefinitions.Count
             If RowNum < 4 Then
-               For Index As Integer = RowNum To 3
+               For Index = RowNum To 3
                   Dim Row As New RowDefinition
                   Row.Height = New GridLength(1, GridUnitType.Star)
                   FeedGrd.RowDefinitions.Add(Row)
@@ -1969,7 +1693,7 @@ Public Class MachiningDbPageUC
             ' Definizione della grid TypeGrd con la giusta altezza e numero di righe
             Dim RowNum As Integer = TypeGrd.RowDefinitions.Count
             If RowNum < 3 Then
-               For Index As Integer = RowNum To 2
+               For Index = RowNum To 2
                   Dim Row As New RowDefinition
                   Row.Height = New GridLength(1, GridUnitType.Star)
                   ' Row.SetValue(Grid.RowSpanProperty, 3)
@@ -2058,7 +1782,7 @@ Public Class MachiningDbPageUC
             ' Definizione di una riga della tabella con la giusta altezza
             RowNum = FeedGrd.RowDefinitions.Count
             If RowNum > 3 Then
-               For Index As Integer = RowNum - 1 To 3 Step -1
+               For Index = RowNum - 1 To 3 Step -1
                   FeedGrd.RowDefinitions.RemoveAt(Index)
                Next
             End If
@@ -2070,7 +1794,7 @@ Public Class MachiningDbPageUC
             ' Eliminazione di una riga della tabella Offset
             RowNum = OffsetGrd.RowDefinitions.Count
             If RowNum > 1 Then
-               For Index As Integer = RowNum - 1 To 1 Step -1
+               For Index = RowNum - 1 To 1 Step -1
                   OffsetGrd.RowDefinitions.RemoveAt(Index)
                   OffsetGpBx.SetValue(Grid.RowSpanProperty, 4)
                Next
@@ -2290,16 +2014,6 @@ Public Class MachiningDbPageUC
 
    Private Sub MaxThicknessTxBx_EgtClosed(sender As Object, e As EventArgs) Handles MaxThicknessTxBx.EgtClosed
       Dim SelectedMaterial As MachiningMaterial = MaterialsList.SelectedItem
-      Dim dMaxThick As Double = 0
-      If m_MainWindow.m_CurrentMachine.bWaterJet And m_MainWindow.m_CurrentMachine.bFromDBWaterJet Then
-         ' solo per water jet controllo lo spessore massimo ammissibile
-         dMaxThick = m_MainWindow.m_CurrentMachine.GetMaxThicknessCurrMaterial(SelectedMaterial.Name)
-         Dim dVal As Double
-         StringToLen(MaxThicknessTxBx.Text, dVal)
-         If dVal > dMaxThick Then
-            MaxThicknessTxBx.Text = LenToString(dMaxThick, 3)
-         End If
-      End If
       StringToLen(MaxThicknessTxBx.Text, SelectedMaterial.dMaxThickness)
       SelectedMaterial.VerifyIfActive()
    End Sub
@@ -2375,6 +2089,7 @@ Public Class MachiningDbPageUC
          Case MCH_MY.POCKETING
             LeadInTypeCmBx.ItemsSource = New ObservableCollection(Of IdNameStruct)(
                                           {New IdNameStruct(MCH_POCK_LI.NONE, EgtMsg(MSG_COMBOBOXPARAM + 42)),
+                                           New IdNameStruct(MCH_POCK_LI.GLIDE, EgtMsg(MSG_COMBOBOXPARAM + 48)),
                                            New IdNameStruct(MCH_POCK_LI.ZIGZAG, EgtMsg(MSG_COMBOBOXPARAM + 38)),
                                            New IdNameStruct(MCH_POCK_LI.HELIX, EgtMsg(MSG_COMBOBOXPARAM + 49))})
             LeadOutTypeCmBx.ItemsSource = New ObservableCollection(Of IdNameStruct)(
@@ -2430,7 +2145,7 @@ Public Structure IdNameStruct
    End Function
 
    Friend Shared Function IndFromId(Id As Integer, List As ObservableCollection(Of IdNameStruct)) As Integer
-      For i As Integer = 0 To List.Count - 1
+      For i = 0 To List.Count - 1
          If List(i).Id = Id Then Return i
       Next
       Return 0
@@ -2446,7 +2161,6 @@ Class MachiningMaterial
    Implements INotifyPropertyChanged
 
    Private m_nId As Integer
-   Private m_nSubId As Integer
    Private m_sName As String
    Private m_dMinThickness As Double
    Private m_dMaxThickness As Double
@@ -2458,12 +2172,6 @@ Class MachiningMaterial
       End Get
    End Property
 
-   Public ReadOnly Property nSubId As Integer
-      Get
-         Return m_nSubId
-      End Get
-   End Property
-
    Public ReadOnly Property Name As String
       Get
          Return m_sName
@@ -2502,15 +2210,6 @@ Class MachiningMaterial
       m_bIsActive = False
    End Sub
 
-   Sub New(nId As Integer, sName As String, nSubId As Integer)
-      m_nId = nId
-      m_nSubId = nSubId
-      m_sName = sName
-      m_dMinThickness = 0
-      m_dMaxThickness = 0
-      m_bIsActive = False
-   End Sub
-
    Public Sub VerifyIfActive()
       Dim bIsActive As Boolean = ( m_dMaxThickness > m_dMinThickness + EPS_SMALL)
       If bIsActive <> m_bIsActive Then

Machine/PolishingsPageUC.xaml

@@ -158,9 +158,6 @@
                                 <ColumnDefinition Width="2*"/>
                                 <ColumnDefinition Width="2*"/>
                                 <ColumnDefinition Width="2*"/>
-                                <ColumnDefinition Width="2*"/>
-                                <ColumnDefinition Width="2*"/>
-                                
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="0.5*"/>
@@ -168,12 +165,10 @@
                                 <RowDefinition Height="1*"/>
                                 <RowDefinition Height="1*"/>
                                 <RowDefinition Height="1*"/>
-                                <RowDefinition Height="1*"/>
                                 <RowDefinition Height="0.5*"/>
 
                             </Grid.RowDefinitions>
 
-                    <!--Decrizione immagini-->        
                     <Border Grid.Row="1" Grid.Column="1" Margin="10">
                         <Image Source="../Resources/Contour.png" Stretch="Uniform"/>
                     </Border>
@@ -183,45 +178,24 @@
                     <Border Grid.Row="3" Grid.Column="1" Margin="10">
                         <Image Source="../Resources/ZigZagY.png" Stretch="Uniform"/>
                     </Border>
-                    <Border Grid.Row="4" Grid.Column="1" Margin="10">
-                        <Image Source="../Resources/Spiral.png" Stretch="Uniform"/>
-                    </Border>
 
-                            <!--Titolazione colonne-->
-                    <TextBlock Name="MotionTxBl" Grid.Row="0" Grid.Column="1" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="5,0" HorizontalAlignment="Center"/>
-                    <TextBlock Name="RepeatTxBl" Grid.Row="0" Grid.Column="2" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="5,0" HorizontalAlignment="Center"/>
-                    <TextBlock Name="StepTxBl" Grid.Row="0" Grid.Column="3" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="5,0" HorizontalAlignment="Center"/>
-                    <TextBlock Name="OffSetTxBl" Grid.Row="0" Grid.Column="4" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="5,0" HorizontalAlignment="Center"/>
-                    <TextBlock Name="RadiusTxBl" Grid.Row="0" Grid.Column="5" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="5,0" HorizontalAlignment="Center"/>
-                    <TextBlock Name="DistanceTxBl" Grid.Row="0" Grid.Column="6" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="5,0" HorizontalAlignment="Center"/>
+                    <TextBlock Name="MotionTxBl" Grid.Row="0" Grid.Column="1" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0" HorizontalAlignment="Center"/>
+                    <TextBlock Name="RepeatTxBl" Grid.Row="0" Grid.Column="2" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0" HorizontalAlignment="Center"/>
+                    <TextBlock Name="StepTxBl" Grid.Row="0" Grid.Column="3" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0" HorizontalAlignment="Center"/>
+                    <TextBlock Name="OffSetTxBl" Grid.Row="0" Grid.Column="4" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Margin="30,0" HorizontalAlignment="Center"/>
 
-                    <!--Contornatura-->
-                    <EgtWPFLib:EgtTextBox Name="ContourTxBx" Grid.Row="1" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
-                    <EgtWPFLib:EgtTextBox Name="OffContourTxBx" Grid.Row="1" Grid.Column="4" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                    <EgtWPFLib:EgtTextBox Name="ContourTxBx" Grid.Row="1" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
+                    <EgtWPFLib:EgtTextBox Name="OffContourTxBx" Grid.Row="1" Grid.Column="4" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
                             
-                    <!--Cammino orizzontale X-->
-                    <EgtWPFLib:EgtTextBox Name="ZigZagXTxBx" Grid.Row="2" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
-                    <EgtWPFLib:EgtTextBox Name="StepXTxBx" Grid.Row="2" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
-                    <EgtWPFLib:EgtTextBox Name="OffZigZagXTxBx" Grid.Row="2" Grid.Column="4" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
-                    <EgtWPFLib:EgtTextBox Name="RadiusXTxBx" Grid.Row="2" Grid.Column="5" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0" Visibility="Collapsed"/>
-                    <EgtWPFLib:EgtTextBox Name="DistanceXTxBx" Grid.Row="2" Grid.Column="6" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0" Visibility="Collapsed"/>
-                            
-                    <!--Cammino verticale Y-->
-                    <EgtWPFLib:EgtTextBox Name="ZigZagYTxBx" Grid.Row="3" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
-                    <EgtWPFLib:EgtTextBox Name="StepYTxBx" Grid.Row="3" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
-                    <EgtWPFLib:EgtTextBox Name="OffZigZagYTxBx" Grid.Row="3" Grid.Column="4" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
-                    <EgtWPFLib:EgtTextBox Name="RadiusYTxBx" Grid.Row="3" Grid.Column="5" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0" Visibility="Collapsed"/>
-                    <EgtWPFLib:EgtTextBox Name="DistanceYTxBx" Grid.Row="3" Grid.Column="6" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0" Visibility="Collapsed"/>
-                            
-                    <!--Cammino a spirale-->
-                    <EgtWPFLib:EgtTextBox Name="SpiralTxBx" Grid.Row="4" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
-                    <EgtWPFLib:EgtTextBox Name="StepSpiralTxBx" Grid.Row="4" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
-                    <EgtWPFLib:EgtTextBox Name="OffSpiralTxBx" Grid.Row="4" Grid.Column="4" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
-                    <EgtWPFLib:EgtTextBox Name="RadiusSpiralTxBx" Grid.Row="4" Grid.Column="5" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
-                    <EgtWPFLib:EgtTextBox Name="DistanceSpiralTxBx" Grid.Row="4" Grid.Column="6" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                    <EgtWPFLib:EgtTextBox Name="ZigZagXTxBx" Grid.Row="2" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
+                    <EgtWPFLib:EgtTextBox Name="StepXTxBx" Grid.Row="2" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
+                    <EgtWPFLib:EgtTextBox Name="OffZigZagXTxBx" Grid.Row="2" Grid.Column="4" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
 
-                            <!--Parametri di lavoro condivisi-->
-                    <GroupBox Name="LiLoGpBx" Grid.Row="5" Grid.Column="1" Grid.RowSpan="2" Grid.ColumnSpan="5" Style="{DynamicResource OmagCut_GroupBox}">
+                    <EgtWPFLib:EgtTextBox Name="ZigZagYTxBx" Grid.Row="3" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
+                    <EgtWPFLib:EgtTextBox Name="StepYTxBx" Grid.Row="3" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
+                    <EgtWPFLib:EgtTextBox Name="OffZigZagYTxBx" Grid.Row="3" Grid.Column="4" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
+                            
+                    <GroupBox Name="LiLoGpBx" Grid.Row="4" Grid.Column="1" Grid.RowSpan="2" Grid.ColumnSpan="3" Style="{DynamicResource OmagCut_GroupBox}">
                         <Grid Name="LiLoGrd">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="2*"/>
@@ -238,11 +212,11 @@
                            </Grid.RowDefinitions>
 
                             <TextBlock Name="LiLenTxBl" Grid.Row="1" Grid.Column="0" Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                            <EgtWPFLib:EgtTextBox Name="LiLenTxBx" Grid.Row="1" Grid.Column="1" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                            <EgtWPFLib:EgtTextBox Name="LiLenTxBx" Grid.Row="1" Grid.Column="1" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
                             <TextBlock Name="LiHeightTxBl" Grid.Row="1" Grid.Column="2" Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                            <EgtWPFLib:EgtTextBox Name="LiHeightTxBx" Grid.Row="1" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                            <EgtWPFLib:EgtTextBox Name="LiHeightTxBx" Grid.Row="1" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
                             <TextBlock Name="LiLoadTxBl" Grid.Row="3" Grid.Column="0" Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                            <EgtWPFLib:EgtTextBox Name="LiLoadTxBx" Grid.Row="3" Grid.Column="1" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                            <EgtWPFLib:EgtTextBox Name="LiLoadTxBx" Grid.Row="3" Grid.Column="1" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="30,0"/>
 
                         </Grid>
                     </GroupBox>

Machine/PolishingsPageUC.xaml.vb

@@ -61,8 +61,6 @@ Public Class PolishingsPageUC
       RepeatTxBl.Text = EgtMsg(91093)             ' Ripetizioni
       StepTxBl.Text = EgtMsg(90787)               ' Passo
       OffSetTxBl.Text = EgtMsg(91089)             ' Offset
-      RadiusTxBl.Text = "Raggio"
-      DistanceTxBl.Text = "Distanza"
       LiLoGpBx.Header = EgtMsg(91094)             ' Attacco/Uscita
       LiLenTxBl.Text = EgtMsg(91097)              ' Lunghezza
       LiHeightTxBl.Text = EgtMsg(91095)           ' Altezza
@@ -115,12 +113,12 @@ Public Class PolishingsPageUC
 
       ' Recupero nome utensile tramite UUID
       Dim ToolString As String = String.Empty
-      For Each KitItem As Kit In m_KitList
-         For Each KitMachItem As KitMach In KitItem.KitMachList
+      For Each KitItem In m_KitList
+         For Each KitMachItem In KitItem.KitMachList
             Dim selToolIndex As Integer = 0
             EgtTdbGetToolFromUUID(KitMachItem.sToolUUID, ToolString)
             Dim bToolExist As Boolean = False
-            For Each CurrTool As String In ToolList
+            For Each CurrTool In ToolList
                If CurrTool.ToString() = ToolString Then
                   bToolExist = True
                   Exit For
@@ -179,7 +177,7 @@ Public Class PolishingsPageUC
       If Not String.IsNullOrWhiteSpace( KitNameTxBx.Text) Then
          ' Verifico che il nome non sia già utilizzato
          Dim bNameExist As Boolean = False
-         For Each Kit As Kit In m_KitList
+         For Each Kit In m_KitList
             If Kit.sName = KitNameTxBx.Text Then
                bNameExist = True
                Exit For
@@ -450,13 +448,11 @@ Public Class PolishingsPageUC
          If Not IsNothing(m_OldItem) Then
             Dim nKitIndex As Integer = m_OldItem.nId
             If nKitIndex <= m_KitList.Count Then
-               For Each KitMachItem As KitMach In m_KitList(nKitIndex - 1).KitMachList
+               For Each KitMachItem In m_KitList(nKitIndex - 1).KitMachList
                   If KitMachItem.m_IsModifiedId OrElse KitMachItem.m_IsModifiedToolUUID OrElse KitMachItem.m_IsModifiedToolName OrElse KitMachItem.m_IsModifiedSelTool OrElse
                      KitMachItem.m_IsModifiedActive OrElse KitMachItem.m_IsModifiedContour OrElse KitMachItem.m_IsModifiedOffCnt OrElse KitMachItem.m_IsModifiedZigZagX OrElse
                      KitMachItem.m_IsModifiedOffZigZagX OrElse KitMachItem.m_IsModifiedZigZagY OrElse KitMachItem.m_IsModifiedStepX OrElse KitMachItem.m_IsModifiedStepY OrElse
-                     KitMachItem.m_IsModifiedOffZigZagY OrElse KitMachItem.m_IsModifiedSpiral OrElse KitMachItem.m_IsModifiedOffSpiral OrElse KitMachItem.m_IsModifiedStepSpiral OrElse
-                     KitMachItem.m_IsModifiedRadiusSpiral OrElse KitMachItem.m_IsModifiedDistanceSpiral OrElse KitMachItem.m_IsModifiedLiLen OrElse KitMachItem.m_IsModifiedLiHeight OrElse
-                     KitMachItem.m_IsModifiedLiLoad Then
+                     KitMachItem.m_IsModifiedOffZigZagY OrElse KitMachItem.m_IsModifiedLiLen OrElse KitMachItem.m_IsModifiedLiHeight OrElse KitMachItem.m_IsModifiedLiLoad Then
                      Return True
                   End If
                Next
@@ -470,7 +466,7 @@ Public Class PolishingsPageUC
       If IsNothing( m_OldItem) Then Return
       Dim nKitIndex As Integer = m_OldItem.nId
       If nKitIndex <= m_KitList.Count Then
-         For Each KitMachItem As KitMach In m_KitList(nKitIndex - 1).KitMachList
+         For Each KitMachItem In m_KitList(nKitIndex - 1).KitMachList
             KitMachItem.m_IsModifiedId = False
             KitMachItem.m_IsModifiedToolUUID = False
             KitMachItem.m_IsModifiedToolName = False
@@ -480,19 +476,10 @@ Public Class PolishingsPageUC
             KitMachItem.m_IsModifiedOffCnt = False
             KitMachItem.m_IsModifiedZigZagX = False
             KitMachItem.m_IsModifiedOffZigZagX = False
-            KitMachItem.m_IsModifiedRadiusX = False
-            KitMachItem.m_IsModifiedDistanceX = False
             KitMachItem.m_IsModifiedZigZagY = False
             KitMachItem.m_IsModifiedOffZigZagY = False
-            KitMachItem.m_IsModifiedRadiusY = False
-            KitMachItem.m_IsModifiedDistanceY = False
-            KitMachItem.m_IsModifiedSpiral = False
-            KitMachItem.m_IsModifiedOffSpiral = False
-            KitMachItem.m_IsModifiedRadiusSpiral = False
-            KitMachItem.m_IsModifiedDistanceSpiral = False
             KitMachItem.m_IsModifiedStepX = False
             KitMachItem.m_IsModifiedStepY = False
-            KitMachItem.m_IsModifiedStepSpiral = False
             KitMachItem.m_IsModifiedLiLen = False
             KitMachItem.m_IsModifiedLiHeight = False
             KitMachItem.m_IsModifiedLiLoad = False
@@ -506,29 +493,20 @@ Public Class PolishingsPageUC
       OffContourTxBx.Text = LenToString(kmShow.dOffsetCnt, 3)
       ZigZagXTxBx.Text = kmShow.nZigZagX.ToString()
       OffZigZagXTxBx.Text = LenToString(kmShow.dOffZigZagX, 3)
-      StepXTxBx.Text = LenToString(kmShow.dStepX, 3)
-      RadiusXTxBx.Text = LenToString(kmShow.dRadiusX, 3)
-      DistanceXTxBx.Text = LenToString(kmShow.dDistanceX, 3)
+      StepXTxBx.Text = LenToString( kmShow.dStepX, 3)
       ZigZagYTxBx.Text = kmShow.nZigZagY.ToString()
       OffZigZagYTxBx.Text = LenToString(kmShow.dOffZigZagY, 3)
-      StepYTxBx.Text = LenToString(kmShow.dStepY, 3)
-      RadiusYTxBx.Text = LenToString(kmShow.dRadiusY, 3)
-      DistanceYTxBx.Text = LenToString(kmShow.dDistanceY, 3)
-      SpiralTxBx.Text = kmShow.nSpiral.ToString()
-      StepSpiralTxBx.Text = LenToString(kmShow.dStepSpiral, 3)
-      OffSpiralTxBx.Text = LenToString(kmShow.dOffSpiral, 3)
-      RadiusSpiralTxBx.Text = LenToString(kmShow.dRadiusSpiral, 3)
-      DistanceSpiralTxBx.Text = LenToString(kmShow.dDistanceSpiral, 3)
-      LiLenTxBx.Text = LenToString(kmShow.dLiLen, 3)
-      LiHeightTxBx.Text = LenToString(kmShow.dLiHeight, 3)
-      LiLoadTxBx.Text = LenToString(kmShow.dLiLoad, 3)
+      StepYTxBx.Text = LenToString( kmShow.dStepY, 3)
+      LiLenTxBx.Text = LenToString( kmShow.dLiLen, 3)
+      LiHeightTxBx.Text = LenToString( kmShow.dLiHeight, 3)
+      LiLoadTxBx.Text = LenToString( kmShow.dLiLoad, 3)
    End Sub
 
    Private Sub KitMachsLstBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles KitMachsLstBx.SelectionChanged
       Dim SelectedKitMach As KitMach = KitMachsLstBx.SelectedItem
       If Not IsNothing(SelectedKitMach) Then
          ' visualizzo i parametri relativi al KitMach selezionato
-         ShowKitMach(SelectedKitMach)
+         ShowKitMach( SelectedKitMach)
       End If
    End Sub
 
@@ -542,16 +520,14 @@ Public Class PolishingsPageUC
    End Sub
 
    Private Sub OffContourTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OffContourTxBx.EgtClosed
-      Dim dTemp As Double = 0
+      Dim nTemp As Integer = 0
       If Not IsNothing(KitMachsLstBx.SelectedItem) Then
-         StringToLen(OffContourTxBx.Text, dTemp)
-         KitMachsLstBx.SelectedItem.dOffsetCnt = dTemp
-         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dOffsetCnt = dTemp
+         nTemp = OffContourTxBx.Text
+         KitMachsLstBx.SelectedItem.dOffsetCnt = nTemp
+         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dOffsetCnt = nTemp
       End If
    End Sub
 
-#Region "ZigZag X"
-
    Private Sub ZigZagXTxBx_EgtClosed(sender As Object, e As EventArgs) Handles ZigZagXTxBx.EgtClosed
       Dim nTemp As Integer = 0
       If Not IsNothing(KitMachsLstBx.SelectedItem) Then
@@ -562,11 +538,11 @@ Public Class PolishingsPageUC
    End Sub
 
    Private Sub OffZigZagXTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OffZigZagXTxBx.EgtClosed
-      Dim dTemp As Double = 0
+      Dim nTemp As Integer = 0
       If Not IsNothing(KitMachsLstBx.SelectedItem) Then
-         StringToLen(OffZigZagXTxBx.Text, dTemp)
-         KitMachsLstBx.SelectedItem.dOffZigZagX = dTemp
-         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dOffZigZagX = dTemp
+         nTemp = OffZigZagXTxBx.Text
+         KitMachsLstBx.SelectedItem.dOffZigZagX = nTemp
+         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dOffZigZagX = nTemp
       End If
    End Sub
 
@@ -579,28 +555,6 @@ Public Class PolishingsPageUC
       End If
    End Sub
 
-   Private Sub RadiusXTxBx_EgtClosed(sender As Object, e As EventArgs) Handles RadiusXTxBx.EgtClosed
-      Dim dTemp As Double = 0
-      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
-         StringToLen(RadiusXTxBx.Text, dTemp)
-         KitMachsLstBx.SelectedItem.dRadiusX = dTemp
-         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dRadiusX = dTemp
-      End If
-   End Sub
-
-   Private Sub DistanceXTxBx_EgtClosed(sender As Object, e As EventArgs) Handles DistanceXTxBx.EgtClosed
-      Dim dTemp As Double = 0
-      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
-         StringToLen(DistanceXTxBx.Text, dTemp)
-         KitMachsLstBx.SelectedItem.dDistanceX = dTemp
-         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dDistanceX = dTemp
-      End If
-   End Sub
-
-#End Region  ' ZigZag X
-
-#Region "ZizZag Y"
-
    Private Sub ZigZagYTxBx_EgtClosed(sender As Object, e As EventArgs) Handles ZigZagYTxBx.EgtClosed
       Dim nTemp As Integer = 0
       If Not IsNothing(KitMachsLstBx.SelectedItem) Then
@@ -611,11 +565,11 @@ Public Class PolishingsPageUC
    End Sub
 
    Private Sub OffZigZagYTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OffZigZagYTxBx.EgtClosed
-      Dim dTemp As Double = 0
+      Dim nTemp As Integer = 0
       If Not IsNothing(KitMachsLstBx.SelectedItem) Then
-         StringToLen(OffZigZagYTxBx.Text, dTemp)
-         KitMachsLstBx.SelectedItem.dOffZigZagY = dTemp
-         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dOffZigZagY = dTemp
+         nTemp = OffZigZagYTxBx.Text
+         KitMachsLstBx.SelectedItem.dOffZigZagY = nTemp
+         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dOffZigZagY = nTemp
       End If
    End Sub
 
@@ -628,75 +582,6 @@ Public Class PolishingsPageUC
       End If
    End Sub
 
-   Private Sub RadiusYTxBx_EgtClosed(sender As Object, e As EventArgs) Handles RadiusYTxBx.EgtClosed
-      Dim dTemp As Double = 0
-      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
-         StringToLen(RadiusYTxBx.Text, dTemp)
-         KitMachsLstBx.SelectedItem.dRadiusY = dTemp
-         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dRadiusY = dTemp
-      End If
-   End Sub
-
-   Private Sub DistanceYTxBx_EgtClosed(sender As Object, e As EventArgs) Handles DistanceYTxBx.EgtClosed
-      Dim dTemp As Double = 0
-      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
-         StringToLen(DistanceYTxBx.Text, dTemp)
-         KitMachsLstBx.SelectedItem.dDistanceY = dTemp
-         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dDistanceY = dTemp
-      End If
-   End Sub
-
-#End Region    ' ZigZagY
-
-#Region "Spirale"
-
-   Private Sub SpiralTxBx_EgtClosed(sender As Object, e As EventArgs) Handles SpiralTxBx.EgtClosed
-      Dim nTemp As Integer = 0
-      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
-         nTemp = SpiralTxBx.Text
-         KitMachsLstBx.SelectedItem.nSpiral = nTemp
-         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).nSpiral = nTemp
-      End If
-   End Sub
-
-   Private Sub OffSpiralTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OffSpiralTxBx.EgtClosed
-      Dim dTemp As Double = 0
-      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
-         StringToLen(OffSpiralTxBx.Text, dTemp)
-         KitMachsLstBx.SelectedItem.dOffSpiral = dTemp
-         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dOffSpiral = dTemp
-      End If
-   End Sub
-
-   Private Sub StepSpiralTxBx_EgtClosed(sender As Object, e As EventArgs) Handles StepSpiralTxBx.EgtClosed
-      Dim dTemp As Double = 0
-      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
-         StringToLen(StepSpiralTxBx.Text, dTemp)
-         KitMachsLstBx.SelectedItem.dStepSpiral = dTemp
-         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dStepSpiral = dTemp
-      End If
-   End Sub
-
-   Private Sub RadiusSpiralTxBx_EgtClosed(sender As Object, e As EventArgs) Handles RadiusSpiralTxBx.EgtClosed
-      Dim dTemp As Double = 0
-      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
-         StringToLen(RadiusSpiralTxBx.Text, dTemp)
-         KitMachsLstBx.SelectedItem.dRadiusSpiral = dTemp
-         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dRadiusSpiral = dTemp
-      End If
-   End Sub
-
-   Private Sub DistanceSpiralTxBx_EgtClosed(sender As Object, e As EventArgs) Handles DistanceSpiralTxBx.EgtClosed
-      Dim dTemp As Double = 0
-      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
-         StringToLen(DistanceSpiralTxBx.Text, dTemp)
-         KitMachsLstBx.SelectedItem.dDistanceSpiral = dTemp
-         m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).dDistanceSpiral = dTemp
-      End If
-   End Sub
-
-#End Region  ' Spirale
-
    Private Sub LiLenTxBx_EgtClosed(sender As Object, e As EventArgs) Handles LiLenTxBx.EgtClosed
       Dim dTemp As Double = 0
       If Not IsNothing(KitMachsLstBx.SelectedItem) Then
@@ -731,11 +616,11 @@ Public Class PolishingsPageUC
    End Sub
 
    Private Sub ToolCmBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs)
-      If Not IsNothing(KitMachsLstBx.SelectedItem) Then
+      If Not IsNothing( KitMachsLstBx.SelectedItem) Then
          m_OldItem.KitMachList(KitMachsLstBx.SelectedItem.nId - 1).SelTool = KitMachsLstBx.SelectedItem.SelTool
-         If KitMachsLstBx.SelectedItem.SelTool >= 0 Then
-            KitMachsLstBx.SelectedItem.sToolName = m_ToolList(KitMachsLstBx.SelectedItem.SelTool)
-            KitMachsLstBx.SelectedItem.sToolUUID = m_ToolUuidList(KitMachsLstBx.SelectedItem.SelTool)
+         If KitMachsLstBx.SelectedItem.SelTool >= 0 then
+            KitMachsLstBx.SelectedItem.sToolName = m_ToolList( KitMachsLstBx.SelectedItem.SelTool)
+            KitMachsLstBx.SelectedItem.sToolUUID = m_ToolUuidList( KitMachsLstBx.SelectedItem.SelTool)
          Else
             KitMachsLstBx.SelectedItem.sToolName = "---"
             KitMachsLstBx.SelectedItem.sToolUUID = "---"
@@ -745,176 +630,143 @@ Public Class PolishingsPageUC
       End If
    End Sub
 
-   Private Function ReadKitName(nKitIndex As Integer) As String
+   Private Function ReadKitName( nKitIndex As Integer) As String
       ' Leggo il nome del kit
       Dim sKey As String = K_KIT & nKitIndex.ToString("D2")
       Dim sName As String = ""
-      GetPrivateProfileString(S_HEADER, sKey, "", sName, m_sKitFile)
+      GetPrivateProfileString( S_HEADER, sKey, "", sName, m_sKitFile)
       Return sName
    End Function
-
-   Private Function ReadKit(nKitIndex As Integer, removeFlag As Boolean, ByRef Kit As Kit) As Boolean
+   
+   Private Function ReadKit( nKitIndex As Integer, removeFlag As Boolean, ByRef Kit As Kit) As Boolean
       ' Leggo il nome del kit
-      Dim sName As String = ReadKitName(nKitIndex)
-      If String.IsNullOrWhiteSpace(sName) Then Return False
+      Dim sName As String = ReadKitName( nKitIndex)
+      If String.IsNullOrWhiteSpace( sName) Then Return False
       ' Creo il kit
-      Kit = New Kit(If(removeFlag, nKitIndex - 1, nKitIndex), sName)
+      Kit = New Kit( If( removeFlag, nKitIndex - 1, nKitIndex), sName)
       ' Leggo le sue lavorazioni
       For nkitMachIndex As Integer = 1 To 100
          Dim kmItem As KitMach = Nothing
-         If ReadKitMach(sName, nkitMachIndex, kmItem) Then
-            Kit.AddKitMach(kmItem)
+         if ReadKitMach( sName, nkitMachIndex, kmItem) Then
+            Kit.AddKitMach( kmItem)
          Else
             Exit For
          End If
       Next
       ' Se non sono state trovate lavorazioni, ne aggiungo una standard
       If Kit.KitMachList.Count() = 0 Then
-         Kit.AddKitMach(New KitMach(1))
+         Kit.AddKitMach( New KitMach( 1))
       End If
       Return True
    End Function
 
-   Private Function ReadKitMach(sKitName As String, nKitMachIndex As Integer, ByRef kmItem As KitMach) As Boolean
+   Private Function ReadKitMach( sKitName As String, nKitMachIndex As Integer, ByRef kmItem As KitMach) As Boolean
       ' Verifico esistenza lavorazione del kit
       Dim sSect As String = S_KIT & "." & sKitName
-      Dim sKeyInd As String = nKitMachIndex.ToString("D2") & "."
+      Dim sKeyInd As String = nkitMachIndex.ToString("D2") & "."
       Dim sName As String = ""
-      If GetPrivateProfileString(sSect, sKeyInd & K_TOOLNAME, "", sName, m_sKitFile) = 0 Then Return False
+      If GetPrivateProfileString( sSect, sKeyInd & K_TOOLNAME, "", sName, m_sKitFile) = 0 Then Return False
       ' Lettura completa
       kmItem = New KitMach
       kmItem.sToolName = sName
-      kmItem.nId = nKitMachIndex
-      GetPrivateProfileString(sSect, sKeyInd & K_TOOL, "", kmItem.sToolUUID, m_sKitFile)
-      kmItem.bActive = (GetPrivateProfileInt(sSect, sKeyInd & K_ACTIVE, 0, m_sKitFile) = 1)
+      kmItem.nId = nkitMachIndex
+      GetPrivateProfileString( sSect, sKeyInd & K_TOOL, "", kmItem.sToolUUID, m_sKitFile)
+      kmItem.bActive = ( GetPrivateProfileInt( sSect, sKeyInd & K_ACTIVE, 0, m_sKitFile) = 1)
       kmItem.nContour = GetPrivateProfileInt(sSect, sKeyInd & K_CONTOUR, 0, m_sKitFile)
-      kmItem.dOffsetCnt = GetPrivateProfileDouble(sSect, sKeyInd & K_OFFSETCNT, 0, m_sKitFile)
+      kmItem.dOffsetCnt = GetPrivateProfileInt(sSect, sKeyInd & K_OFFSETCNT, 0, m_sKitFile)
       kmItem.nZigZagX = GetPrivateProfileInt(sSect, sKeyInd & K_ZIGZAGX, 0, m_sKitFile)
-      kmItem.dOffZigZagX = GetPrivateProfileDouble(sSect, sKeyInd & K_OFFZIGZAGX, 0, m_sKitFile)
+      kmItem.dOffZigZagX = GetPrivateProfileInt(sSect, sKeyInd & K_OFFZIGZAGX, 0, m_sKitFile)
       kmItem.dStepX = GetPrivateProfileDouble(sSect, sKeyInd & K_STEPX, 0, m_sKitFile)
-      kmItem.dRadiusX = GetPrivateProfileDouble(sSect, sKeyInd & K_RADIUSX, 0, m_sKitFile)
-      kmItem.dDistanceX = GetPrivateProfileDouble(sSect, sKeyInd & K_DISTANCEX, 0, m_sKitFile)
       kmItem.nZigZagY = GetPrivateProfileInt(sSect, sKeyInd & K_ZIGZAGY, 0, m_sKitFile)
-      kmItem.dOffZigZagY = GetPrivateProfileDouble(sSect, sKeyInd & K_OFFZIGZAGY, 0, m_sKitFile)
-      kmItem.dStepY = GetPrivateProfileDouble(sSect, sKeyInd & K_STEPY, 0, m_sKitFile)
-      kmItem.dRadiusY = GetPrivateProfileDouble(sSect, sKeyInd & K_RADIUSY, 0, m_sKitFile)
-      kmItem.dDistanceY = GetPrivateProfileDouble(sSect, sKeyInd & K_DISTANCEY, 0, m_sKitFile)
-
-      kmItem.nSpiral = GetPrivateProfileInt(sSect, sKeyInd & K_SPIRAL, 0, m_sKitFile)
-      kmItem.dOffSpiral = GetPrivateProfileDouble(sSect, sKeyInd & K_OFFSPIRAL, 0, m_sKitFile)
-      kmItem.dStepSpiral = GetPrivateProfileDouble(sSect, sKeyInd & K_STEPSPIRAL, 0, m_sKitFile)
-      kmItem.dRadiusSpiral = GetPrivateProfileDouble(sSect, sKeyInd & K_RADIUSSPIRAL, 0, m_sKitFile)
-      kmItem.dDistanceSpiral = GetPrivateProfileDouble(sSect, sKeyInd & K_DISTANCESPIRAL, 0, m_sKitFile)
-
-      kmItem.dLiLen = GetPrivateProfileDouble(sSect, sKeyInd & K_LILEN, 0, m_sKitFile)
-      kmItem.dLiHeight = GetPrivateProfileDouble(sSect, sKeyInd & K_LIHEIGHT, 0, m_sKitFile)
-      kmItem.dLiLoad = GetPrivateProfileDouble(sSect, sKeyInd & K_LILOAD, 0, m_sKitFile)
+      kmItem.dOffZigZagY = GetPrivateProfileInt(sSect, sKeyInd & K_OFFZIGZAGY, 0, m_sKitFile)
+      kmItem.dStepY = GetPrivateProfileDouble( sSect, sKeyInd & K_STEPY, 0, m_sKitFile)
+      kmItem.dLiLen = GetPrivateProfileDouble( sSect, sKeyInd & K_LILEN, 0, m_sKitFile)
+      kmItem.dLiHeight = GetPrivateProfileDouble( sSect, sKeyInd & K_LIHEIGHT, 0, m_sKitFile)
+      kmItem.dLiLoad = GetPrivateProfileDouble( sSect, sKeyInd & K_LILOAD, 0, m_sKitFile)
       Return True
    End Function
 
-   Friend Function WriteKitName(nKitIndex As Integer, sKitName As String) As Boolean
+   Friend Function WriteKitName( nKitIndex As Integer, sKitName As String) As Boolean
       Dim sKey As String = K_KIT & nKitIndex.ToString("D2")
-      Return WritePrivateProfileString(S_HEADER, sKey, sKitName, m_sKitFile)
+      Return WritePrivateProfileString( S_HEADER, sKey, sKitName, m_sKitFile)
    End Function
 
-   Private Function WriteKitMach(nKitIndex As Integer, nKitMachIndex As Integer, kmItem As KitMach) As Boolean
+   Private Function WriteKitMach( nKitIndex As Integer, nKitMachIndex As Integer, kmItem As KitMach) As Boolean
       ' Leggo il nome del kit
-      Dim sKitName As String = ReadKitName(nKitIndex)
-      If String.IsNullOrWhiteSpace(sKitName) Then Return False
+      Dim sKitName As String = ReadKitName( nKitIndex)
+      If String.IsNullOrWhiteSpace( sKitName) Then Return False
       ' Sezione
       Dim sSect As String = S_KIT & "." & sKitName
       ' Indice
       Dim sKeyInd As String = nKitMachIndex.ToString("D2") & "."
       ' Scrivo i dati della lavorazione
-      If Not IsNothing(kmItem) Then
-         WritePrivateProfileString(sSect, sKeyInd & K_TOOL, kmItem.sToolUUID, m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_TOOLNAME, kmItem.sToolName, m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_ACTIVE, If(kmItem.bActive, "1", "0"), m_sKitFile)
+      If Not IsNothing( kmItem) Then
+         WritePrivateProfileString( sSect, sKeyInd & K_TOOL, kmItem.sToolUUID, m_sKitFile)
+         WritePrivateProfileString( sSect, sKeyInd & K_TOOLNAME, kmItem.sToolName, m_sKitFile)
+         WritePrivateProfileString( sSect, sKeyInd & K_ACTIVE, If( kmItem.bActive, "1", "0"), m_sKitFile)
          WritePrivateProfileString(sSect, sKeyInd & K_CONTOUR, kmItem.nContour.ToString(), m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_OFFSETCNT, DoubleToString(kmItem.dOffsetCnt, 3), m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_OFFSETCNT, kmItem.dOffsetCnt.ToString(), m_sKitFile)
          WritePrivateProfileString(sSect, sKeyInd & K_ZIGZAGX, kmItem.nZigZagX.ToString(), m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_OFFZIGZAGX, DoubleToString(kmItem.dOffZigZagX.ToString, 3), m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_STEPX, DoubleToString(kmItem.dStepX, 3), m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_RADIUSX, DoubleToString(kmItem.dRadiusX, 3), m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_DISTANCEX, DoubleToString(kmItem.dDistanceX, 3), m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_OFFZIGZAGX, kmItem.dOffZigZagX.ToString(), m_sKitFile)
+         WritePrivateProfileString( sSect, sKeyInd & K_STEPX, DoubleToString( kmItem.dStepX, 3), m_sKitFile)
          WritePrivateProfileString(sSect, sKeyInd & K_ZIGZAGY, kmItem.nZigZagY.ToString(), m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_OFFZIGZAGY, DoubleToString(kmItem.dOffZigZagY, 3), m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_STEPY, DoubleToString(kmItem.dStepY, 3), m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_RADIUSY, DoubleToString(kmItem.dRadiusY, 3), m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_DISTANCEY, DoubleToString(kmItem.dDistanceY, 3), m_sKitFile)
-
-         WritePrivateProfileString(sSect, sKeyInd & K_SPIRAL, kmItem.nSpiral.ToString(), m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_OFFSPIRAL, DoubleToString(kmItem.dOffSpiral.ToString, 3), m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_STEPSPIRAL, DoubleToString(kmItem.dStepSpiral, 3), m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_RADIUSSPIRAL, DoubleToString(kmItem.dRadiusSpiral, 3), m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_DISTANCESPIRAL, DoubleToString(kmItem.dDistanceSpiral, 3), m_sKitFile)
-
-         WritePrivateProfileString(sSect, sKeyInd & K_LILEN, DoubleToString(kmItem.dLiLen, 3), m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_LIHEIGHT, DoubleToString(kmItem.dLiHeight, 3), m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_LILOAD, DoubleToString(kmItem.dLiLoad, 3), m_sKitFile)
+         WritePrivateProfileString(sSect, sKeyInd & K_OFFZIGZAGY, kmItem.dOffZigZagY.ToString(), m_sKitFile)
+         WritePrivateProfileString( sSect, sKeyInd & K_STEPY, DoubleToString( kmItem.dStepY, 3), m_sKitFile)
+         WritePrivateProfileString( sSect, sKeyInd & K_LILEN, DoubleToString( kmItem.dLiLen, 3), m_sKitFile)
+         WritePrivateProfileString( sSect, sKeyInd & K_LIHEIGHT, DoubleToString( kmItem.dLiHeight, 3), m_sKitFile)
+         WritePrivateProfileString( sSect, sKeyInd & K_LILOAD, DoubleToString( kmItem.dLiLoad, 3), m_sKitFile)
       Else
-         WritePrivateProfileString(sSect, sKeyInd & K_TOOL, Nothing, m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_TOOLNAME, Nothing, m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_ACTIVE, Nothing, m_sKitFile)
+         WritePrivateProfileString( sSect, sKeyInd & K_TOOL, Nothing, m_sKitFile)
+         WritePrivateProfileString( sSect, sKeyInd & K_TOOLNAME, Nothing, m_sKitFile)
+         WritePrivateProfileString( sSect, sKeyInd & K_ACTIVE, Nothing, m_sKitFile)
          WritePrivateProfileString(sSect, sKeyInd & K_CONTOUR, Nothing, m_sKitFile)
          WritePrivateProfileString(sSect, sKeyInd & K_OFFSETCNT, Nothing, m_sKitFile)
          WritePrivateProfileString(sSect, sKeyInd & K_ZIGZAGX, Nothing, m_sKitFile)
          WritePrivateProfileString(sSect, sKeyInd & K_OFFZIGZAGX, Nothing, m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_STEPX, Nothing, m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_RADIUSX, Nothing, m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_DISTANCEX, Nothing, m_sKitFile)
+         WritePrivateProfileString( sSect, sKeyInd & K_STEPX, Nothing, m_sKitFile)
          WritePrivateProfileString(sSect, sKeyInd & K_ZIGZAGY, Nothing, m_sKitFile)
          WritePrivateProfileString(sSect, sKeyInd & K_OFFZIGZAGY, Nothing, m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_STEPY, Nothing, m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_RADIUSY, Nothing, m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_DISTANCEY, Nothing, m_sKitFile)
-
-         WritePrivateProfileString(sSect, sKeyInd & K_SPIRAL, Nothing, m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_OFFSPIRAL, Nothing, m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_STEPSPIRAL, Nothing, m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_RADIUSSPIRAL, Nothing, m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_DISTANCESPIRAL, Nothing, m_sKitFile)
-
-         WritePrivateProfileString(sSect, sKeyInd & K_LILEN, Nothing, m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_LIHEIGHT, Nothing, m_sKitFile)
-         WritePrivateProfileString(sSect, sKeyInd & K_LILOAD, Nothing, m_sKitFile)
+         WritePrivateProfileString( sSect, sKeyInd & K_STEPY, Nothing, m_sKitFile)
+         WritePrivateProfileString( sSect, sKeyInd & K_LILEN, Nothing, m_sKitFile)
+         WritePrivateProfileString( sSect, sKeyInd & K_LIHEIGHT, Nothing, m_sKitFile)
+         WritePrivateProfileString( sSect, sKeyInd & K_LILOAD, Nothing, m_sKitFile)
       End If
       Return True
    End Function
 
-   Private Function EraseKit(nKitIndex As Integer) As Boolean
+   Private Function EraseKit( nKitIndex As Integer) As Boolean
       ' Leggo il nome del kit
-      Dim sKitName As String = ReadKitName(nKitIndex)
-      If String.IsNullOrWhiteSpace(sKitName) Then Return False
+      Dim sKitName As String = ReadKitName( nKitIndex)
+      If String.IsNullOrWhiteSpace( sKitName) Then Return False
       ' Lo elimino dalla lista dei kit scalando tutti di una posizione e eliminando l'ultimo
       Dim nNextKitIndex As Integer = nKitIndex + 1
-      Dim sNextKitName As String = ReadKitName(nNextKitIndex)
-      While Not String.IsNullOrWhiteSpace(sNextKitName)
-         WriteKitName(nNextKitIndex - 1, sNextKitName)
+      Dim sNextKitName As String = ReadKitName( nNextKitIndex) 
+      while Not String.IsNullOrWhiteSpace( sNextKitName)
+         WriteKitName( nNextKitIndex - 1, sNextKitName)
          nNextKitIndex += 1
-         sNextKitName = ReadKitName(nNextKitIndex)
+         sNextKitName = ReadKitName( nNextKitIndex) 
       End While
-      WriteKitName(nNextKitIndex - 1, Nothing)
+      WriteKitName( nNextKitIndex - 1, Nothing)
       ' Sezione
       Dim sSect As String = S_KIT & "." & sKitName
       ' Cancello tutte le lavorazioni del kit
-      WritePrivateProfileString(sSect, Nothing, Nothing, m_sKitFile)
+      WritePrivateProfileString( sSect, Nothing, Nothing, m_sKitFile)
       Return True
    End Function
 
-   Private Function EraseKitMach(nKitIndex As Integer, nKitMachIndex As Integer) As Boolean
+   Private Function EraseKitMach( nKitIndex As Integer, nKitMachIndex As Integer) As Boolean
       ' Leggo il nome del kit
-      Dim sKitName As String = ReadKitName(nKitIndex)
-      If String.IsNullOrWhiteSpace(sKitName) Then Return False
+      Dim sKitName As String = ReadKitName( nKitIndex)
+      If String.IsNullOrWhiteSpace( sKitName) Then Return False
       ' Lo elimino dali KitMach scalando tutti di una posizione e eliminando l'ultimo
       Dim kmCurr As KitMach = Nothing
       Dim nNextKitMachIndex As Integer = nKitMachIndex + 1
-      While ReadKitMach(sKitName, nNextKitMachIndex, kmCurr)
+      While ReadKitMach( sKitName, nNextKitMachIndex, kmCurr)
          kmCurr.nId = nNextKitMachIndex - 1
-         WriteKitMach(nKitIndex, nNextKitMachIndex - 1, kmCurr)
+         WriteKitMach( nKitIndex, nNextKitMachIndex - 1, kmCurr)
          nNextKitMachIndex += 1
       End While
-      WriteKitMach(nKitIndex, nNextKitMachIndex - 1, Nothing)
+      WriteKitMach( nKitIndex, nNextKitMachIndex - 1, Nothing)
       Return True
    End Function
 
@@ -952,7 +804,7 @@ Class Kit
       Get
          Return m_nId
       End Get
-      Set(value As Integer)
+      Set( value As Integer) 
          m_nId = value
       End Set
    End Property
@@ -972,7 +824,7 @@ Class Kit
       End Set
    End Property
 
-   Sub New(nId As Integer, sName As String)
+   Sub New( nId As Integer, sName As String)
       m_nId = nId
       m_sName = sName
 
@@ -980,21 +832,21 @@ Class Kit
 
    End Sub
 
-   Sub New(nId As Integer, sName As String, kitSou As Kit)
+   Sub New( nId As Integer, sName As String, kitSou As Kit)
       m_nId = nId
       m_sName = sName
 
       m_KitMachList = New List(Of KitMach)
 
-      If IsNothing(kitSou) Then Return
+      If IsNothing( kitSou) Then Return
 
       For Each kmItem As KitMach In kitSou.m_KitMachList
-         AddKitMach(kmItem)
+         AddKitMach( kmItem)
       Next
 
    End Sub
 
-   Sub AddKitMach(kitMachItem As KitMach)
+   Sub AddKitMach( kitMachItem As KitMach)
       m_KitMachList.Add(kitMachItem)
    End Sub
 
@@ -1010,29 +862,15 @@ Class KitMach
    Private m_sToolName As String
    Private m_SelTool As Integer
    Friend Shared m_ToolList As List(Of String)
-
    Private m_bActive As Boolean
    Private m_nContour As Integer
    Private m_dOffsetCnt As Double
-
    Private m_nZigZagX As Integer
    Private m_dStepX As Double
    Private m_dOffZigZagX As Double
-   Private m_dRadiusX As Double
-   Private m_dDistanceX As Double
-
    Private m_nZigZagY As Integer
    Private m_dStepY As Double
    Private m_dOffZigZagY As Double
-   Private m_dRadiusY As Double
-   Private m_dDistanceY As Double
-
-   Private m_nSpiral As Integer
-   Private m_dOffSpiral As Double
-   Private m_dStepSpiral As Double
-   Private m_dRadiusSpiral As Double
-   Private m_dDistanceSpiral As Double
-
    Private m_dLiLen As Double
    Private m_dLiHeight As Double
    Private m_dLiLoad As Double
@@ -1073,7 +911,7 @@ Class KitMach
                   m_sToolName = sToolNameDummy
                End If
 
-               For Each sToolUuidItem As String In m_MainWindow.m_MachinePageUC.m_PolishingsPageUC.ToolUuidList
+               For Each sToolUuidItem In m_MainWindow.m_MachinePageUC.m_PolishingsPageUC.ToolUuidList
                   EgtTdbGetToolFromUUID(sToolUuidItem, sToolNameDummy)
                   If sToolNameDummy.Equals(m_sToolName) Then
                      m_sToolUUID = sToolUuidItem
@@ -1120,8 +958,6 @@ Class KitMach
       End Set
    End Property
 
-#Region "Contorno"
-
    Public m_IsModifiedActive As Boolean = False
    Public Property bActive As Boolean
       Get
@@ -1149,11 +985,11 @@ Class KitMach
    End Property
 
    Public m_IsModifiedOffCnt As Boolean = False
-   Public Property dOffsetCnt As Double
+   Public Property dOffsetCnt As Integer
       Get
          Return m_dOffsetCnt
       End Get
-      Set(value As Double)
+      Set(value As Integer)
          If value <> m_dOffsetCnt Then
             m_dOffsetCnt = value
             m_IsModifiedOffCnt = True
@@ -1161,10 +997,6 @@ Class KitMach
       End Set
    End Property
 
-#End Region    ' Contorno
-
-#Region "ZigZag X"
-
    Public m_IsModifiedZigZagX As Boolean = False
    Public Property nZigZagX As Integer
       Get
@@ -1179,11 +1011,11 @@ Class KitMach
    End Property
 
    Public m_IsModifiedOffZigZagX As Boolean = False
-   Public Property dOffZigZagX As Double
+   Public Property dOffZigZagX As Integer
       Get
          Return m_dOffZigZagX
       End Get
-      Set(value As Double)
+      Set(value As Integer)
          If value <> m_dOffZigZagX Then
             m_dOffZigZagX = value
             m_IsModifiedOffZigZagX = True
@@ -1204,36 +1036,6 @@ Class KitMach
       End Set
    End Property
 
-   Public m_IsModifiedRadiusX As Boolean = False
-   Public Property dRadiusX As Double
-      Get
-         Return m_dRadiusX
-      End Get
-      Set(value As Double)
-         If value <> m_dRadiusX Then
-            m_dRadiusX = value
-            m_IsModifiedRadiusX = True
-         End If
-      End Set
-   End Property
-
-   Public m_IsModifiedDistanceX As Boolean = False
-   Public Property dDistanceX As Double
-      Get
-         Return m_dDistanceX
-      End Get
-      Set(value As Double)
-         If value <> m_dDistanceX Then
-            m_dDistanceX = value
-            m_IsModifiedDistanceX = True
-         End If
-      End Set
-   End Property
-
-#End Region    ' ZigZag X
-
-#Region "ZigZag Y"
-
    Public m_IsModifiedZigZagY As Boolean = False
    Public Property nZigZagY As Integer
       Get
@@ -1248,11 +1050,11 @@ Class KitMach
    End Property
 
    Public m_IsModifiedOffZigZagY As Boolean = False
-   Public Property dOffZigZagY As Double
+   Public Property dOffZigZagY As Integer
       Get
          Return m_dOffZigZagY
       End Get
-      Set(value As Double)
+      Set(value As Integer)
          If value <> m_dOffZigZagY Then
             m_dOffZigZagY = value
             m_IsModifiedOffZigZagY = True
@@ -1273,105 +1075,6 @@ Class KitMach
       End Set
    End Property
 
-   Public m_IsModifiedRadiusY As Boolean = False
-   Public Property dRadiusY As Double
-      Get
-         Return m_dRadiusY
-      End Get
-      Set(value As Double)
-         If value <> m_dRadiusY Then
-            m_dRadiusY = value
-            m_IsModifiedRadiusY = True
-         End If
-      End Set
-   End Property
-
-   Public m_IsModifiedDistanceY As Boolean = False
-   Public Property dDistanceY As Double
-      Get
-         Return m_dDistanceY
-      End Get
-      Set(value As Double)
-         If value <> m_dDistanceY Then
-            m_dDistanceY = value
-            m_IsModifiedDistanceY = True
-         End If
-      End Set
-   End Property
-
-#End Region    ' ZigZag Y
-
-#Region "Spirale"
-
-   Public m_IsModifiedSpiral As Boolean = False
-   Public Property nSpiral As Integer
-      Get
-         Return m_nSpiral
-      End Get
-      Set(value As Integer)
-         If value <> m_nSpiral Then
-            m_nSpiral = value
-            m_IsModifiedSpiral = True
-         End If
-      End Set
-   End Property
-
-   Public m_IsModifiedOffSpiral As Boolean = False
-   Public Property dOffSpiral As Double
-      Get
-         Return m_dOffSpiral
-      End Get
-      Set(value As Double)
-         If value <> m_dOffSpiral Then
-            m_dOffSpiral = value
-            m_IsModifiedOffSpiral = True
-         End If
-      End Set
-   End Property
-
-   Public m_IsModifiedStepSpiral As Boolean = False
-   Public Property dStepSpiral As Double
-      Get
-         Return m_dStepSpiral
-      End Get
-      Set(value As Double)
-         If value <> m_dStepSpiral Then
-            m_dStepSpiral = value
-            m_IsModifiedStepSpiral = True
-         End If
-      End Set
-   End Property
-
-   Public m_IsModifiedRadiusSpiral As Boolean = False
-   Public Property dRadiusSpiral As Double
-      Get
-         Return m_dRadiusSpiral
-      End Get
-      Set(value As Double)
-         If value <> m_dRadiusSpiral Then
-            m_dRadiusSpiral = value
-            m_IsModifiedRadiusSpiral = True
-         End If
-      End Set
-   End Property
-
-   Public m_IsModifiedDistanceSpiral As Boolean = False
-   Public Property dDistanceSpiral As Double
-      Get
-         Return m_dDistanceSpiral
-      End Get
-      Set(value As Double)
-         If value <> m_dDistanceSpiral Then
-            m_dDistanceSpiral = value
-            m_IsModifiedDistanceSpiral = True
-         End If
-      End Set
-   End Property
-
-#End Region    ' Spirale
-
-#Region "Parametri lavorazione"
-
    Public m_IsModifiedLiLen As Boolean = False
    Public Property dLiLen As Double
       Get
@@ -1411,8 +1114,6 @@ Class KitMach
       End Set
    End Property
 
-#End Region    ' Parametri lavorazione
-
    Sub New()
       m_nId = 0
       m_SelTool = 0
@@ -1424,24 +1125,15 @@ Class KitMach
       m_nZigZagX = 0
       m_dOffZigZagX = 0
       m_dStepX = 0
-      m_dRadiusX = 0
-      m_dDistanceX = 0
       m_nZigZagY = 0
       m_dOffZigZagY = 0
       m_dStepY = 0
-      m_dRadiusY = 0
-      m_dDistanceY = 0
-      m_nSpiral = 0
-      m_dOffSpiral = 0
-      m_dStepSpiral = 0
-      m_dRadiusSpiral = 0
-      m_dDistanceSpiral = 0
       m_dLiLen = 0
       m_dLiHeight = 0
       m_dLiLoad = 0
    End Sub
 
-   Sub New(nId As Integer)
+   Sub New( nId As Integer)
       m_nId = nId
       m_SelTool = 0
       m_sToolUUID = "---"
@@ -1452,26 +1144,17 @@ Class KitMach
       m_nZigZagX = 0
       m_dOffZigZagX = 0
       m_dStepX = 0
-      m_dRadiusX = 0
-      m_dDistanceX = 0
       m_nZigZagY = 0
       m_dOffZigZagY = 0
       m_dStepY = 0
-      m_dRadiusY = 0
-      m_dDistanceY = 0
-      m_nSpiral = 0
-      m_dOffSpiral = 0
-      m_dStepSpiral = 0
-      m_dRadiusSpiral = 0
-      m_dDistanceSpiral = 0
       m_dLiLen = 0
       m_dLiHeight = 0
       m_dLiLoad = 0
    End Sub
 
-   Sub New(kmSou As KitMach)
+   Sub New( kmSou As KitMach) 
       m_nId = kmSou.nId
-      m_SelTool = kmSou.SelTool
+      m_SelTool = kmSou.selTool
       m_sToolUUID = kmSou.sToolUUID
       m_sToolName = kmSou.sToolName
       m_bActive = kmSou.bActive
@@ -1480,18 +1163,9 @@ Class KitMach
       m_nZigZagX = kmSou.nZigZagX
       m_dOffZigZagX = kmSou.dOffZigZagX
       m_dStepX = kmSou.dStepX
-      m_dRadiusX = kmSou.dRadiusX
-      m_dDistanceX = kmSou.dDistanceX
       m_nZigZagY = kmSou.nZigZagY
       m_dOffZigZagY = kmSou.dOffZigZagY
       m_dStepY = kmSou.dStepY
-      m_dRadiusY = kmSou.dRadiusY
-      m_dDistanceY = kmSou.dDistanceY
-      m_nSpiral = kmSou.nSpiral
-      m_dOffSpiral = kmSou.dOffSpiral
-      m_dStepSpiral = kmSou.dStepSpiral
-      m_dRadiusSpiral = kmSou.dRadiusSpiral
-      m_dDistanceSpiral = kmSou.dDistanceSpiral
       m_dLiLen = kmSou.dLiLen
       m_dLiHeight = kmSou.dLiHeight
       m_dLiLoad = kmSou.m_dLiLoad

Machine/SetUpPage.xaml.vb

@@ -34,8 +34,8 @@ Public Class SetUpPage
             EgtOutLog("TC warning : too many tools (max 12 * 5)")
             ColNum = 12
          End If
-         For Index As Integer = 12 To ColNum + 1 Step -1
-            For Index2 As Integer = Index * 5 To (Index - 1) * 5 + 1 Step -1
+         For Index = 12 To ColNum + 1 Step -1
+            For Index2 = Index * 5 To (Index - 1) * 5 + 1 Step -1
                TlChGrid.Children.Remove(GetTlChPosFromIndex(Index2))
                TlChGrid.Children.Remove(GetTxBxFromIndex(Index2))
             Next
@@ -43,14 +43,14 @@ Public Class SetUpPage
             TlChGrid.ColumnDefinitions.RemoveAt(Index * 2 - 2)
          Next
          ' Modifico il numero di elementi presenti sull'ultima colonna
-         For Index As Integer = ColNum * 5 To m_CurrMachine.ToolChangerNbr + 1 Step -1
+         For Index = ColNum * 5 To m_CurrMachine.ToolChangerNbr + 1 Step -1
             TlChGrid.Children.Remove(GetTlChPosFromIndex(Index))
             TlChGrid.Children.Remove(GetTxBxFromIndex(Index))
          Next
          ' Assegno lunghezza alla scrollviewer
          TlChGrid.Width = m_MainWindow.ActualWidth / 15 * 1.6 * ColNum * 2
          ' Carico i nomi dei portautensili
-         For Index As Integer = 1 To m_CurrMachine.ToolChangerNbr
+         For Index = 1 To m_CurrMachine.ToolChangerNbr
             GetTlChPosFromIndex(Index).PositionNameTxBl.Text = m_CurrMachine.ToolChangerName(Index - 1)
          Next
       Else
@@ -64,8 +64,8 @@ Public Class SetUpPage
             EgtOutLog("ManTC warning : too many tools (max 12 * 5)")
             ManColNum = 12
          End If
-      For Index As Integer = 12 To ManColNum + 1 Step -1
-         For Index2 As Integer = Index * 5 To (Index - 1) * 5 + 1 Step -1
+      For Index = 12 To ManColNum + 1 Step -1
+         For Index2 = Index * 5 To (Index - 1) * 5 + 1 Step -1
             ManTlChGrid.Children.Remove(GetManTlChPosFromIndex(Index2))
             ManTlChGrid.Children.Remove(GetManTxBxFromIndex(Index2))
          Next
@@ -73,14 +73,14 @@ Public Class SetUpPage
          ManTlChGrid.ColumnDefinitions.RemoveAt(Index * 2 - 2)
       Next
       ' Modifico il numero di elementi presenti sull'ultima colonna
-      For Index As Integer = ManColNum * 5 To m_CurrMachine.ManualToolChangerNbr + 1 Step -1
+      For Index = ManColNum * 5 To m_CurrMachine.ManualToolChangerNbr + 1 Step -1
          ManTlChGrid.Children.Remove(GetManTlChPosFromIndex(Index))
          ManTlChGrid.Children.Remove(GetManTxBxFromIndex(Index))
       Next
       ' Assegno lunghezza alla scrollviewer
       ManTlChGrid.Width = m_MainWindow.ActualWidth / 15 * 1.6 * ManColNum * 2
       ' Carico i nomi dei portautensili
-      For Index As Integer = 1 To m_CurrMachine.ManualToolChangerNbr
+      For Index = 1 To m_CurrMachine.ManualToolChangerNbr
          GetManTlChPosFromIndex(Index).PositionNameTxBl.Text = m_CurrMachine.ManualToolChangerName(Index - 1)
       Next
 
@@ -112,10 +112,10 @@ Public Class SetUpPage
       InitializeToolGroup( m_CurrMachine.bPolishingWheel, MCH_TY.MILL_POLISHING, EgtMsg( 90756), m_PolishingsList)
 
       ' Posiziono utensili già posizionati sul portautensili
-      For Each ToolPosition As ToolChangerPos In m_CurrMachine.ToolChanger
+      For Each ToolPosition In m_CurrMachine.ToolChanger
          If ToolPosition.sTool <> String.Empty Then
             If Not IsNothing( m_DrillbitsList) Then
-               For Each Item As CustomItem In m_DrillbitsList.Items
+               For Each Item In m_DrillbitsList.Items
                   If Item.Name = ToolPosition.sTool Then
                      m_SetUpToolsList.Items.Add(Item)
                      m_DrillbitsList.Items.Remove(Item)
@@ -124,7 +124,7 @@ Public Class SetUpPage
                Next
             End If
             If Not IsNothing( m_MillsList) Then
-               For Each Item As CustomItem In m_MillsList.Items
+               For Each Item In m_MillsList.Items
                   If Item.Name = ToolPosition.sTool Then
                      m_SetUpToolsList.Items.Add(Item)
                      m_MillsList.Items.Remove(Item)
@@ -133,7 +133,7 @@ Public Class SetUpPage
                Next
             End If
             If Not IsNothing( m_CupsList) Then
-               For Each Item As CustomItem In m_CupsList.Items
+               For Each Item In m_CupsList.Items
                   If Item.Name = ToolPosition.sTool Then
                      m_SetUpToolsList.Items.Add(Item)
                      m_CupsList.Items.Remove(Item)
@@ -142,7 +142,7 @@ Public Class SetUpPage
                Next
             End If
             If Not IsNothing( m_PolishingsList) Then
-               For Each Item As CustomItem In m_PolishingsList.Items
+               For Each Item In m_PolishingsList.Items
                   If Item.Name = ToolPosition.sTool Then
                      m_SetUpToolsList.Items.Add(Item)
                      m_PolishingsList.Items.Remove(Item)
@@ -156,10 +156,10 @@ Public Class SetUpPage
       Next
 
       ' Posiziono utensili già posizionati sul portautensili manuale
-      For Each ToolPosition As ToolChangerPos In m_CurrMachine.ManualToolChanger
+      For Each ToolPosition In m_CurrMachine.ManualToolChanger
          If ToolPosition.sTool <> String.Empty Then
             If Not IsNothing( m_DrillbitsList) Then
-               For Each Item As CustomItem In m_DrillbitsList.Items
+               For Each Item In m_DrillbitsList.Items
                   If Item.Name = ToolPosition.sTool Then
                      m_SetUpToolsList.Items.Add(Item)
                      m_DrillbitsList.Items.Remove(Item)
@@ -168,7 +168,7 @@ Public Class SetUpPage
                Next
             End If
             If Not IsNothing( m_MillsList) Then
-               For Each Item As CustomItem In m_MillsList.Items
+               For Each Item In m_MillsList.Items
                   If Item.Name = ToolPosition.sTool Then
                      m_SetUpToolsList.Items.Add(Item)
                      m_MillsList.Items.Remove(Item)
@@ -177,7 +177,7 @@ Public Class SetUpPage
                Next
             End If
             If Not IsNothing( m_CupsList) Then
-               For Each Item As CustomItem In m_CupsList.Items
+               For Each Item In m_CupsList.Items
                   If Item.Name = ToolPosition.sTool Then
                      m_SetUpToolsList.Items.Add(Item)
                      m_CupsList.Items.Remove(Item)
@@ -186,7 +186,7 @@ Public Class SetUpPage
                Next
             End If
             If Not IsNothing( m_PolishingsList) Then
-               For Each Item As CustomItem In m_PolishingsList.Items
+               For Each Item In m_PolishingsList.Items
                   If Item.Name = ToolPosition.sTool Then
                      m_SetUpToolsList.Items.Add(Item)
                      m_PolishingsList.Items.Remove(Item)
@@ -784,7 +784,7 @@ Public Class SetUpPage
 
    ' Funzione che rimette un utensile nell'albero
    Private Sub RestoreToolInList(sToolName As String)
-      For Each Tool As CustomItem In m_SetUpToolsList.Items
+      For Each Tool In m_SetUpToolsList.Items
          If Tool.Name = sToolName Then
             If Tool.nType = MCH_TY.DRILL_STD Then
                m_DrillbitsList.Items.Add(Tool)
@@ -1119,7 +1119,7 @@ Public Class SetUpPage
          EgtTdbGetCurrToolParam(MCH_TP.TCPOS, ToolPositionName)
          If String.IsNullOrEmpty(ToolPositionName) Then Return
          ' Cerco il portautensile nella lista degli automatici per vederne lo stato
-         For Each TlChPos As ToolChangerPos In m_CurrMachine.ToolChanger
+         For Each TlChPos In m_CurrMachine.ToolChanger
             If TlChPos.sName = ToolPositionName Then
                ' Se la posizione è libera
                If GetTxBxFromIndex(TlChPos.nPosition).Text = String.Empty Then
@@ -1137,7 +1137,7 @@ Public Class SetUpPage
             End If
          Next
          ' Cerco il portautensile nella lista dei manuali per vederne lo stato
-         For Each ManTlChPos As ToolChangerPos In m_CurrMachine.ManualToolChanger
+         For Each ManTlChPos In m_CurrMachine.ManualToolChanger
             If ManTlChPos.sName = ToolPositionName Then
                ' Se la posizione è libera
                If GetManTxBxFromIndex(ManTlChPos.nPosition).Text = String.Empty Then

Machine/StatisticsPageUC.xaml.vb

@@ -36,7 +36,7 @@ Public Class StatisticsPageUC
       DayTxBl.Text = sDay
       ' Leggo il numero della settimana
       Dim nWeek As Integer = GetPrivateProfileInt(S_STATDATA, K_SD_WEEK, -1, m_MainWindow.GetIniFile())
-      WeekTxBl.Text = (nWeek).ToString()
+      WeekTxBl.Text = ( nWeek + 1).ToString()
 
       ' Leggo area pezzi del giorno
       Dim dDayParts As Double = GetPrivateProfileDouble(S_STATDATA, K_SD_DAYPARTS, 0, m_MainWindow.GetIniFile())

Machine/ToolsDbPageUC.xaml

@@ -281,12 +281,12 @@
                   </Grid.ColumnDefinitions>
 
                   <TextBlock Name="SpeedTxBl" Grid.Column="0" Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="SpeedTxBx" Grid.Column="1" IsLength="False"
+                  <EgtWPFLib:EgtTextBox Name="SpeedTxBx" Grid.Column="1"
                      Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}" />
 
                   <TextBlock Name="MaxSpeedTxBl" Grid.Column="2"
                      Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="MaxSpeedTxBx" Grid.Column="3" IsLength="False"
+                  <EgtWPFLib:EgtTextBox Name="MaxSpeedTxBx" Grid.Column="3"
                      Style="{DynamicResource OmagCut_CalculatorTextBoxInGroupBox}" />
 
                </Grid>
@@ -384,7 +384,7 @@
 
                   <TextBlock Name="MaxAbsorptionTxBl" Grid.Column="0"
                      Style="{DynamicResource OmagCut_ToolsDBTextBlock}" Grid.ColumnSpan="1" ScrollViewer.VerticalScrollBarVisibility="Disabled" TextWrapping="Wrap"/>
-                  <EgtWPFLib:EgtTextBox Name="MaxAbsorptionTxBx" Grid.Column="1" IsLength="False"
+                  <EgtWPFLib:EgtTextBox Name="MaxAbsorptionTxBx" Grid.Column="1" 
                      Style="{DynamicResource OmagCut_LeftCalculatorTextBoxInBorder}" />
 
                   <TextBlock Name="MinFeedTxBl" Grid.Column="2" Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
@@ -434,16 +434,13 @@
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="10*"/>
-               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="11*"/>
                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
 
             <Button Name="NewBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}"/>
             <Button Name="SaveBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}"/>
             <Button Name="RemoveBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}" Padding="0"/>
-            <Button Name="ExportBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}" Padding="0"/>
-            <Button Name="ImportBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowGradientYellowTextButton}" Padding="0"/>
 
             </Grid>
 

Machine/ToolsDbPageUC.xaml.vb

@@ -3,7 +3,6 @@ Imports OmagCUT.TreeViewItem
 Imports System.ComponentModel
 Imports EgtUILib
 Imports EgtWPFLib
-Imports EgtWPFLib5
 
 Public Class ToolsDbPageUC
 
@@ -17,8 +16,6 @@ Public Class ToolsDbPageUC
    Dim ToolsList As New ObservableCollection(Of CathegoryItem)
    ' Proprietà
    Private m_bFirst As Boolean = True
-   ' Flag nuova gestione parametri lama in disegno
-   Private m_bNewSawbladeMaker As Boolean = False
    ' Stringa identificativa variabile geometrica in modifica
    Private m_sCurrVar As String = String.Empty
    ' Parametri dell'utensile corrente
@@ -56,8 +53,6 @@ Public Class ToolsDbPageUC
       NewBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 15)
       SaveBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 17)
       RemoveBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 18)
-      ExportBtn.Content = EgtMsg(91126)
-      ImportBtn.Content = EgtMsg(91127)
 
       NameTxBl.Text = EgtMsg(MSG_TOOLSDBPAGEUC + 1)
       TCPosTxBl.Text = EgtMsg(MSG_TOOLSDBPAGEUC + 2)
@@ -165,20 +160,16 @@ Public Class ToolsDbPageUC
          ToolScene.SetStatusNull()
          ' Inizializzo le famiglie di utensili nell'albero
          EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
-         InitializeToolGroup(m_CurrMachine.bSaw, MCH_TY.SAW_STD, EgtMsg(90751))
-         InitializeToolGroup(m_CurrMachine.bDrill, MCH_TY.DRILL_STD, EgtMsg(90752))
-         InitializeToolGroup(m_CurrMachine.bMill, MCH_TY.MILL_STD, EgtMsg(90753))
-         InitializeToolGroup(m_CurrMachine.bCupWheel, MCH_TY.MILL_NOTIP, EgtMsg(90754))
-         InitializeToolGroup(m_CurrMachine.bPolishingWheel, MCH_TY.MILL_POLISHING, EgtMsg(90756))
-         InitializeToolGroup(m_CurrMachine.bWaterJet, MCH_TY.WATERJET, EgtMsg(90755))
+         InitializeToolGroup(m_CurrMachine.bSaw, MCH_TY.SAW_STD, EgtMsg( 90751))
+         InitializeToolGroup(m_CurrMachine.bDrill, MCH_TY.DRILL_STD, EgtMsg( 90752))
+         InitializeToolGroup(m_CurrMachine.bMill, MCH_TY.MILL_STD, EgtMsg( 90753))
+         InitializeToolGroup(m_CurrMachine.bCupWheel, MCH_TY.MILL_NOTIP, EgtMsg( 90754))
+         InitializeToolGroup(m_CurrMachine.bPolishingWheel, MCH_TY.MILL_POLISHING, EgtMsg( 90756))
+         InitializeToolGroup(m_CurrMachine.bWaterJet, MCH_TY.WATERJET, EgtMsg( 90755))
          ' Sposto tutti i parametri in su di una riga se testa e uscita sono disattivati
          If Not m_CurrMachine.bShowHeadExit Then
             MoveParam()
          End If
-         ' Verifico se macchina con nuovo SawbladeMaker
-         Dim sSawBladeMaker As String = ""
-         GetPrivateProfileString(S_TOOLS, K_SAWBLADEMAKER, "", sSawBladeMaker, m_MainWindow.GetIniFile())
-         m_bNewSawbladeMaker = String.Compare(sSawBladeMaker, "MakeStoneSawBlade.lua", True)
          m_bFirst = False
       Else
          EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
@@ -191,7 +182,7 @@ Public Class ToolsDbPageUC
    'Funzione che permette l'inizializzazione di albero e parametri all'apertura della pagina ToolsDb
    Private Sub InitializeFirstSelectedItem()
       If ToolsList.Count > 0 Then
-         For Each ToolFamily As CathegoryItem In ToolsList
+         For Each ToolFamily In ToolsList
             If ToolFamily.Items.Count > 0 Then
                ToolFamily.IsExpanded = True
                ToolFamily.Items(0).IsSelected = True
@@ -236,7 +227,7 @@ Public Class ToolsDbPageUC
          Dim NewName As String = SelectedCathegory.Name
          EgtTdbGetToolNewName(NewName)
          If EgtTdbAddTool(NewName, SelectedCathegory.nTType) Then
-            For Each ToolFamily As CathegoryItem In ToolsList
+            For Each ToolFamily In ToolsList
                If ToolFamily.nTType = SelectedCathegory.nTType Then
                   Dim NewToolItem As New CustomItem(NewName, SelectedCathegory.nTType)
                   ToolFamily.Items.Add(NewToolItem)
@@ -248,17 +239,17 @@ Public Class ToolsDbPageUC
             Next
             ' Determino il tipo di utensile
             Dim nType As Integer
-            EgtTdbGetCurrToolParam(MCH_TP.TYPE, nType)
+            EgtTdbGetCurrToolParam( MCH_TP.TYPE, nType)
             ' Imposto testa e uscita
             ' Sempre lame su H1.1 e utensili foretto, fresa e mola da scasso su H1.2
-            If (nType And MCH_TF.WATERJET) = 0 Then
+            If ( nType And MCH_TF.WATERJET) = 0 then
                Dim bSaw As Boolean = ((nType And MCH_TF.SAWBLADE) <> 0)
-               EgtTdbSetCurrToolParam(MCH_TP.HEAD, "H1")
-               EgtTdbSetCurrToolParam(MCH_TP.EXIT_, If(bSaw, 1, 2))
-               ' Waterjet sempre su H2.1
+               EgtTdbSetCurrToolParam( MCH_TP.HEAD, "H1")
+               EgtTdbSetCurrToolParam( MCH_TP.EXIT_, If(bSaw, 1, 2))
+            ' Waterjet sempre su H2.1
             Else
-               EgtTdbSetCurrToolParam(MCH_TP.HEAD, "H2")
-               EgtTdbSetCurrToolParam(MCH_TP.EXIT_, 1)
+               EgtTdbSetCurrToolParam( MCH_TP.HEAD, "H2")
+               EgtTdbSetCurrToolParam( MCH_TP.EXIT_, 1)
             End If
             ' Per macchine senza ToolChanger, resetto la posizione su questo
             If m_CurrMachine.ShowToolChanger = 0 Then
@@ -324,10 +315,10 @@ Public Class ToolsDbPageUC
             ' Aggiorno lista utensili
             Dim CurrType As Integer
             EgtTdbGetCurrToolParam(MCH_TP.TYPE, CurrType)
-            For Each ToolFamily As CathegoryItem In ToolsList
+            For Each ToolFamily In ToolsList
                If ToolFamily.nTType = CurrType Then
-                  Dim NewToolItem As New CustomItem(NewName, CurrType)
-                  ToolFamily.Items.Add(NewToolItem)
+                  Dim NewToolItem As New CustomItem( NewName, CurrType)
+                  ToolFamily.Items.Add( NewToolItem)
                   NewToolItem.IsSelected = True
                   GetToolParams()
                   m_OldItem = ToolTreeView.SelectedItem
@@ -363,15 +354,15 @@ Public Class ToolsDbPageUC
          Dim sItems() As String = sUserNotes.Split(";".ToCharArray)
          For i As Integer = 0 To sItems.Count() - 1
             If sItems(i).Contains("CODE=") Then
-               CodeTxBx.Text = sItems(i).Substring(5)
+               CodeTxBx.Text = sItems(i).Substring( 5)
             ElseIf sItems(i).Contains("SUPPL=") Then
-               SupplierTxBx.Text = sItems(i).Substring(6)
+               SupplierTxBx.Text = sItems(i).Substring( 6)
             ElseIf sItems(i).Contains("S/N=") Then
-               SerNbrTxBx.Text = sItems(i).Substring(4)
+               SerNbrTxBx.Text = sItems(i).Substring( 4)
             ElseIf sItems(i).Contains("END=") Then
                EndLifeChBx.IsChecked = True
-               m_sEndLife = sItems(i).Substring(4)
-            ElseIf Not String.IsNullOrWhiteSpace(sItems(i)) Then
+               m_sEndLife = sItems(i).Substring( 4)
+            ElseIf Not String.IsNullOrWhiteSpace(sItems(i))
                sToShow &= sItems(i) & ";"
             End If
          Next
@@ -392,7 +383,7 @@ Public Class ToolsDbPageUC
       sUserNotes &= "SUPPL=" & SupplierTxBx.Text & ";"
       sUserNotes &= "S/N=" & SerNbrTxBx.Text & ";"
       If EndLifeChBx.IsChecked Then
-         If String.IsNullOrWhiteSpace(m_sEndLife) Then
+         If String.IsNullOrWhiteSpace( m_sEndLife) Then
             m_sEndLife = My.Computer.Clock.LocalTime.ToString("dd.MM.yyyy HH:mm:ss")
          End If
          sUserNotes &= "END=" & m_sEndLife & ";"
@@ -468,7 +459,7 @@ Public Class ToolsDbPageUC
          ' Cancello l'utensile
          EgtTdbRemoveTool(SelectedItem.Name)
          ' Rimuovo il nome dell'albero
-         For Each ToolFamily As CathegoryItem In ToolsList
+         For Each ToolFamily In ToolsList
             If (ToolFamily.nTType And SelectedItem.nType) <> 0 Then
                ToolFamily.Items.Remove(SelectedItem)
                If ToolFamily.Items.Count = 0 Then
@@ -488,217 +479,18 @@ Public Class ToolsDbPageUC
       End If
    End Sub
 
-   Private Sub ExportBtn_Click(Sender As Object, e As RoutedEventArgs) Handles ExportBtn.Click
-      ' contesto corrente
-      EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
-
-      ' creo lista utensili per esportazione
-      Dim ToolToExportList = New ObservableCollection(Of ImpExpToolFamily)
-      Dim Family As CathegoryItem
-      Dim Tool As CustomItem
-      For Each Family In ToolsList
-         Dim ImpExpToolFamily As New ImpExpToolFamily(Family.Name, Family.nTType)
-         ImpExpToolFamily.PictureString = "/Resources/ToolsTreeviewImages/Folder.png"
-         For Each Tool In Family.Items
-            Dim CurrTool = New ImpExpToolItem(Tool.Name, False)
-            ImpExpToolFamily.ToolList.Add(CurrTool)
-         Next
-         ToolToExportList.Add(ImpExpToolFamily)
-      Next
-
-      Dim ExportWndVM As New ImportExportToolWindowVM(ToolToExportList, True)
-      Dim ExportWnd As New ImportExportToolWD(Application.Current.MainWindow, ExportWndVM)
-
-      ExportWnd.ShowDialog()
-   End Sub
-
-   Private Sub ImportBtn_Click(Sender As Object, e As RoutedEventArgs) Handles ImportBtn.Click
-      ' contesto corrente
-      EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
-      ' apro dialogo di scelta file
-      Dim ImportFileDlg As New Microsoft.Win32.OpenFileDialog() With {
-         .Title = EgtMsg(31161) & " " & EgtMsg(31163),
-         .DefaultExt = ".data",
-         .Filter = "Tools (.data)|*.data",
-         .CheckFileExists = True,
-         .ValidateNames = True
-      }
-      If ImportFileDlg.ShowDialog() <> True Then Return
-      Dim ImportFilePath As String = ImportFileDlg.FileName
-      ' recupero liste utensili da importare
-      Dim ImportFileToolNameList As String() = Nothing
-      Dim ImportFileToolFamilyList As Integer() = Nothing
-      If Not EgtTdbToBeImported(ImportFilePath, ImportFileToolNameList, ImportFileToolFamilyList) Then Return
-      ' li inserisco in lista per finestra di scelta
-      Dim ToolToImportList As New ObservableCollection(Of ImpExpToolFamily)
-      ' creo famiglie di utensili in base a quelle trovate in lista importata
-      For ToolIndex As Integer = 0 To ImportFileToolNameList.Count - 1
-         Dim ToolName As String = ImportFileToolNameList(ToolIndex)
-         Dim ToolFamily As Integer = ImportFileToolFamilyList(ToolIndex)
-         ToolFamily = ToolFamily And
-            (MCH_TF.DRILLBIT Or
-            MCH_TF.SAWBLADE Or
-            MCH_TF.MILL Or
-            MCH_TF.MORTISE Or
-            MCH_TF.CHISEL Or
-            MCH_TF.WATERJET Or
-            MCH_TF.COMPO)
-         Dim bFounded As Boolean = False
-         Dim ToolToImportFamily As ImpExpToolFamily
-         For Each ToolToImportFamily In ToolToImportList
-            If (ToolFamily = ToolToImportFamily.FamilyType) Then
-               ToolToImportFamily.ToolList.Add(New ImpExpToolItem(ToolName, AlreadyExist(ToolName)))
-               bFounded = True
-               Exit For
-            End If
-         Next
-         If Not bFounded Then
-            Dim NewFamily As New ImpExpToolFamily(GetToolFamilyName(ToolFamily), ToolFamily)
-            NewFamily.ToolList.Add(New ImpExpToolItem(ToolName, AlreadyExist(ToolName)))
-            ToolToImportList.Add(NewFamily)
-         End If
-      Next
-      Dim ImportWndVM As New ImportExportToolWindowVM(ToolToImportList, False, ImportFilePath, ImportFileToolNameList)
-      Dim ImportWnd As New ImportExportToolWD(Application.Current.MainWindow, ImportWndVM)
-
-      ImportWnd.ShowDialog()
-      ' Aggiungo all'albero visualizzato gli utensili appena importati
-      If ImportWnd.OkResult Then
-         LoadImportedMachineTools(ImportWndVM.vsImported)
-      End If
-   End Sub
-
-   Private Function AlreadyExist(ToolName As String) As Boolean
-      Dim ToolFamily As CathegoryItem
-      For Each ToolFamily In ToolsList
-         Dim ToolItem As CustomItem
-         For Each ToolItem In ToolFamily.Items
-            If ToolName = ToolItem.Name Then
-               Return True
-            End If
-         Next
-      Next
-      Return False
-   End Function
-
-   Private Function GetToolFamilyName(NewToolFamily As Integer) As String
-      Dim ToolFamily As CathegoryItem
-      For Each ToolFamily In ToolsList
-         If NewToolFamily = ToolFamily.nTType Then
-            Return ToolFamily.Name
-         End If
-      Next
-      Return ""
-   End Function
-
-   Private Sub LoadImportedMachineTools(vsImportedTools As String())
-      ' Leggo tutti gli utensili presenti nella Macchina (quindi anche quelli appena importati). 
-      Dim ActiveToolsFamilies() As ToolsFamily = MyReadToolFamilies(m_CurrMachine.sMachIniFile)
-      Dim ToolsFamilyIndex As Integer = 0
-      Dim ToolsFamilyItem As ToolsFamily
-      For Each ToolsFamilyItem In ActiveToolsFamilies
-         ' dalla lista che ho ricavato dalla libreria recupero gli utensili associati
-         Dim FamilyTreeView As New CathegoryItem(ToolsFamilyItem.Name, ToolsFamilyItem.Id)
-         Dim ToolFamilyItem = ToolsList.FirstOrDefault(Function(ToolFamily) ToolFamily.nTType = ToolsFamilyItem.Id)
-         If IsNothing(ToolFamilyItem) Then
-            ToolsList.Insert(ToolsFamilyIndex, FamilyTreeView)
-         Else
-            ' ricerco l'indice nella lista Tools
-
-         End If
-         Dim nType As Integer = 0
-         Dim ToolName As String = String.Empty
-         Dim ToolIndex As Integer = 0
-         'EgtSetCurrentContext(ToolScene.GetCtx())
-         EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
-         If EgtTdbGetFirstTool(ToolsFamilyItem.Id, ToolName, nType) Then
-            Dim ToolItem = ToolsList(ToolsFamilyIndex).Items.FirstOrDefault(Function(Tool) Tool.Name = ToolName)
-            If IsNothing(ToolItem) Then
-               ' Se leggo un utensile non presente nella ToolsList visualizzata lo aggiungo ad essa. 
-               Dim NewToolName As New CustomItem(ToolName, nType)
-               ToolsList(ToolsFamilyIndex).Items.Insert(ToolIndex, NewToolName)
-               'NewToolName.IsSelected = True
-            ElseIf vsImportedTools.Contains(ToolName) Then
-               ' Se un utensile è presente nella ToolsList visualizzata ma nel contempo è nell'array vsImported 
-               ' vuol dire che è stato sovrascritto perciò lo rimuovo e lo riaggiungo alla ToolsList.
-               ToolsList(ToolsFamilyIndex).Items.Remove(ToolsList(ToolsFamilyIndex).Items.FirstOrDefault(Function(Tool) Tool.Name = ToolName))
-               Dim NewToolName As New CustomItem(ToolName, nType)
-               ToolsList(ToolsFamilyIndex).Items.Insert(ToolIndex, NewToolName)
-               'NewToolName.IsSelected = True
-            End If
-            ToolIndex += 1
-            While EgtTdbGetNextTool(ToolsFamilyItem.Id, ToolName, nType)
-               ToolItem = ToolsList(ToolsFamilyIndex).Items.FirstOrDefault(Function(Tool) Tool.Name = ToolName)
-               If IsNothing(ToolItem) Then
-                  ' Se leggo un utensile non presente nella ToolsList visualizzata lo aggiungo ad essa. 
-                  Dim NewToolName As New CustomItem(ToolName, nType)
-                  ToolsList(ToolsFamilyIndex).Items.Insert(ToolIndex, NewToolName)
-                  'NewToolName.IsSelected = True
-               ElseIf vsImportedTools.Contains(ToolName) Then
-                  ' Se un utensile è presente nella ToolsList visualizzata ma nel contempo è nell'array vsImported 
-                  ' vuol dire che è stato sovrascritto perciò lo rimuovo e lo riaggiungo alla ToolsList.
-                  ToolsList(ToolsFamilyIndex).Items.Remove(ToolsList(ToolsFamilyIndex).Items.FirstOrDefault(Function(Tool) Tool.Name = ToolName))
-                  Dim NewToolName As New CustomItem(ToolName, nType)
-                  ToolsList(ToolsFamilyIndex).Items.Insert(ToolIndex, NewToolName)
-                  'NewToolName.IsSelected = True
-               End If
-               ToolIndex += 1
-            End While
-         End If
-         ToolsFamilyIndex += 1
-      Next
-
-   End Sub
-
-   Public Function MyReadToolFamilies(sMachineIniPath As String) As ToolsFamily()
-      Dim ActiveToolsFamiliesList As New List(Of ToolsFamily)
-
-      ' Se il materiale lavorato è Marmo l'ordine di lettura e inserimento di Punta e Lama nelle famiglie di utensili attivi è invertito 
-      If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_SAWBLADE, 0, sMachineIniPath) <> 0 Then
-         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.SAWBLADE, EgtMsg(31000 + 2)))
-      End If
-      If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_DRILLBIT, 0, sMachineIniPath) <> 0 Then
-         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.DRILLBIT, EgtMsg(31000 + 1)))
-      End If
-
-
-      If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_MILL, 0, sMachineIniPath) <> 0 Then
-         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MILL, EgtMsg(31000 + 3)))
-      End If
-      If EgtUILib.GetPrivateProfileInt(S_TOOLS, "CupWheel", 0, sMachineIniPath) <> 0 Then
-         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MILL, EgtMsg(90754)))
-      End If
-      If EgtUILib.GetPrivateProfileInt(S_TOOLS, "PolishingWheel", 0, sMachineIniPath) <> 0 Then
-         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MILL, EgtMsg(90756)))
-      End If
-
-      If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_MORTISE, 0, sMachineIniPath) <> 0 Then
-         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.MORTISE, EgtMsg(31000 + 4)))
-      End If
-      If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_CHISEL, 0, sMachineIniPath) <> 0 Then
-         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.CHISEL, EgtMsg(31000 + 9)))
-      End If
-      If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_COMPO, 0, sMachineIniPath) <> 0 Then
-         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.COMPO, EgtMsg(31000 + 5)))
-      End If
-      If EgtUILib.GetPrivateProfileInt(S_TOOLS, K_WATERJET, 0, sMachineIniPath) <> 0 Then
-         ActiveToolsFamiliesList.Add(New ToolsFamily(MCH_TF.WATERJET, EgtMsg(31010)))
-      End If
-      Return ActiveToolsFamiliesList.ToArray
-   End Function
-
    Friend Sub InitializeToolGroup(bEnabled As Boolean, nTType As Integer, sFName As String)
       If Not bEnabled Then Return
       ' Inserisco categoria ed eventuali elementi
-      Dim ToolCathegory As New CathegoryItem(sFName, nTType)
+      Dim ToolCathegory As New CathegoryItem( sFName, nTType)
       Dim nType As Integer = 0
       Dim ToolName As String = String.Empty
-      Dim bFound As Boolean = EgtTdbGetFirstTool(nTType, ToolName, nType)
+      Dim bFound As Boolean = EgtTdbGetFirstTool( nTType, ToolName, nType)
       While bFound
-         If nType = nTType Then ToolCathegory.Items.Add(New CustomItem(ToolName, nType))
-         bFound = EgtTdbGetNextTool(nTType, ToolName, nType)
+         If nType = nTType Then ToolCathegory.Items.Add( New CustomItem( ToolName, nType))
+         bFound = EgtTdbGetNextTool( nTType, ToolName, nType)
       End While
-      ToolsList.Add(ToolCathegory)
+      ToolsList.Add( ToolCathegory)
    End Sub
 
    Private Sub GetToolParams()
@@ -753,7 +545,7 @@ Public Class ToolsDbPageUC
       HeadTxBx.Text = ToolString
       EgtTdbGetCurrToolParam(MCH_TP.EXIT_, ToolInt)
       ExitTxBx.Text = ToolInt.ToString()
-      If Not GetSpecials() Then
+      if Not GetSpecials() Then
          EgtTdbGetCurrToolParam(MCH_TP.USERNOTES, ToolString)
          UserNotesTxBx.Text = ToolString
       End If
@@ -809,7 +601,7 @@ Public Class ToolsDbPageUC
       EgtTdbSetCurrToolParam(MCH_TP.HEAD, HeadTxBx.Text)
       Int32.TryParse(ExitTxBx.Text, nTemp)
       EgtTdbSetCurrToolParam(MCH_TP.EXIT_, nTemp)
-      If Not SetSpecials() Then
+      if Not SetSpecials() Then
          EgtTdbSetCurrToolParam(MCH_TP.USERNOTES, UserNotesTxBx.Text)
       End If
    End Sub
@@ -845,7 +637,7 @@ Public Class ToolsDbPageUC
       Dim bShowUserNotes As Boolean = ((m_nToolType = MCH_TY.SAW_STD And m_CurrMachine.ShowUserNotes <> 0) Or m_CurrMachine.ShowUserNotes = 1)
       UserNotesTxBl.Visibility = If(bShowUserNotes, Windows.Visibility.Visible, Windows.Visibility.Hidden)
       UserNotesTxBx.Visibility = If(bShowUserNotes, Windows.Visibility.Visible, Windows.Visibility.Hidden)
-      Dim bShowSpecials As Boolean = ((m_nToolType = MCH_TY.SAW_STD And m_CurrMachine.ShowSpecials <> 0) Or m_CurrMachine.ShowSpecials = 1)
+      Dim bShowSpecials As Boolean = ((m_nToolType = MCH_TY.SAW_STD And m_CurrMachine.ShowSpecials <> 0) Or m_CurrMachine.ShowSpecials = 1) 
       SerNbrTxBl.Visibility = If(bShowSpecials, Windows.Visibility.Visible, Windows.Visibility.Hidden)
       SerNbrTxBx.Visibility = If(bShowSpecials, Windows.Visibility.Visible, Windows.Visibility.Hidden)
       CodeTxBl.Visibility = If(bShowSpecials, Windows.Visibility.Visible, Windows.Visibility.Hidden)
@@ -916,8 +708,6 @@ Public Class ToolsDbPageUC
       ' Aggiorno visualizzazione
       EgtSetCurrentContext(ToolScene.GetCtx())
       EgtSetView(VT.TOP, False)
-      'EgtSetGenericView(150, -150)
-      'EgtSetView(VT.ISO_SE, False)
       EgtZoom(ZM.ALL)
    End Sub
 
@@ -967,10 +757,6 @@ Public Class ToolsDbPageUC
             nMsg = MSG_TOOLSDBPAGEUC + 23       ' Spessore
          Case MCH_TP.MAXMAT
             nMsg = MSG_TOOLSDBPAGEUC + 24       ' Tagliente
-         Case MCH_TP.CORE
-            nMsg = 90720                        ' Anima
-         Case STEM
-            nMsg = 90719                        ' Lunghezza portautensile
       End Select
       ' Predispongo calcolatrice (converto sempre in UIUnits perchè tutte lunghezze)
       Dim EgtCalculator As New EgtCalculatorWD(m_MainWindow, EgtToUiUnits(dVal), 300, WidthType.PIXEL, 0, 0, EgtMsg(nMsg))
@@ -988,7 +774,7 @@ Public Class ToolsDbPageUC
    Private Sub RecreateToolDraw(ByVal dVal As Double)
       ' Salvo il vecchio valore
       Dim dOldVal As Double
-      GetVariableValue(dOldVal)
+      GetVariableValue( dOldVal)
       ' Aggiorno dati utensile
       SetVariableValue(dVal)
       ' Creo utensile
@@ -1001,20 +787,7 @@ Public Class ToolsDbPageUC
    Private Function GetVariableValue(ByRef dVal As Double) As Boolean
       ' Recupero valore variabile
       EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
-      Dim nVarType As Integer = GetVariableType()
-      If m_nToolType <> MCH_TY.SAW_STD OrElse nVarType <> STEM Then
-         Return EgtTdbGetCurrToolParam(nVarType, dVal)
-      Else
-         Dim dL, dCore, dTh As Double
-         If EgtTdbGetCurrToolParam(MCH_TP.LEN, dL) AndAlso
-            EgtTdbGetCurrToolParam(MCH_TP.CORE, dCore) AndAlso
-            EgtTdbGetCurrToolParam(MCH_TP.THICK, dTh) Then
-            dVal = Math.Max(dL - (dCore + dTh) / 2, 0.0)
-            Return True
-         Else
-            Return False
-         End If
-      End If
+      Return EgtTdbGetCurrToolParam(GetVariableType(), dVal)
    End Function
 
    Private Function SetVariableValue(ByVal dVal As Double) As Boolean
@@ -1028,30 +801,6 @@ Public Class ToolsDbPageUC
                EgtTdbSetCurrToolParam(MCH_TP.TOTLEN, dVal + 1)
             Case MCH_TP.DIAM
                EgtTdbSetCurrToolParam(MCH_TP.TOTDIAM, dVal)
-            Case MCH_TP.THICK
-               If m_bNewSawbladeMaker Then
-                  Dim dTh, dLen As Double
-                  If EgtTdbGetCurrToolParam(MCH_TP.THICK, dTh) AndAlso
-                     EgtTdbGetCurrToolParam(MCH_TP.LEN, dLen) Then
-                     Dim dNewLen As Double = dLen + ((dVal - dTh) / 2)
-                     EgtTdbSetCurrToolParam(MCH_TP.LEN, dNewLen)
-                     EgtTdbSetCurrToolParam(MCH_TP.TOTLEN, dNewLen + 1)
-                  Else
-                     Return False
-                  End If
-               End If
-            Case MCH_TP.CORE
-               If m_bNewSawbladeMaker Then
-                  Dim dCore, dLen As Double
-                  If EgtTdbGetCurrToolParam(MCH_TP.CORE, dCore) AndAlso
-                     EgtTdbGetCurrToolParam(MCH_TP.LEN, dLen) Then
-                     Dim dNewLen As Double = dLen + ((dVal - dCore) / 2)
-                     EgtTdbSetCurrToolParam(MCH_TP.LEN, dNewLen)
-                     EgtTdbSetCurrToolParam(MCH_TP.TOTLEN, dNewLen + 1)
-                  Else
-                     Return False
-                  End If
-               End If
          End Select
       ElseIf m_nToolType = MCH_TY.DRILL_STD Then
          Select Case nType
@@ -1077,19 +826,7 @@ Public Class ToolsDbPageUC
                EgtTdbSetCurrToolParam(MCH_TP.TOTDIAM, dVal)
          End Select
       End If
-      If m_nToolType <> MCH_TY.SAW_STD OrElse nType <> STEM Then
-         Return EgtTdbSetCurrToolParam(nType, dVal)
-      Else
-         Dim dCore, dTh As Double
-         If EgtTdbGetCurrToolParam(MCH_TP.CORE, dCore) AndAlso
-            EgtTdbGetCurrToolParam(MCH_TP.THICK, dTh) Then
-            Dim dL As Double = Math.Max(dVal, 0.0) + ((dCore + dTh) / 2)
-            EgtTdbSetCurrToolParam(MCH_TP.TOTLEN, dL + 1)
-            Return EgtTdbSetCurrToolParam(MCH_TP.LEN, dL)
-         Else
-            Return False
-         End If
-      End If
+      Return EgtTdbSetCurrToolParam(nType, dVal)
    End Function
 
    Private Function GetVariableType() As Integer
@@ -1102,10 +839,6 @@ Public Class ToolsDbPageUC
          nType = MCH_TP.THICK
       ElseIf m_sCurrVar = "MAXMAT" Then
          nType = MCH_TP.MAXMAT
-      ElseIf m_sCurrVar = "CORE" Then
-         nType = MCH_TP.CORE
-      ElseIf m_sCurrVar = "STEM" Then
-         nType = STEM
       End If
       Return nType
    End Function
@@ -1167,13 +900,6 @@ Public Class ToolsDbPageUC
                EgtTdbSetCurrToolParam(MCH_TP.THICK, dToolThick)
                EgtOutLog("ToolThick too small ->" & DoubleToString(dToolThick, 1))
             End If
-            Dim dToolCore As Double
-            EgtTdbGetCurrToolParam(MCH_TP.CORE, dToolCore)
-            If dToolCore < EPS_SMALL Then
-               dToolCore = If(dToolLen >= dToolThick, dToolThick - 1, 2 * dToolLen - dToolThick)
-               EgtTdbSetCurrToolParam(MCH_TP.CORE, dToolCore)
-               EgtOutLog("ToolCore too small ->" & DoubleToString(dToolCore, 1))
-            End If
             Dim dToolMaxMat As Double
             EgtTdbGetCurrToolParam(MCH_TP.MAXMAT, dToolMaxMat)
             If dToolMaxMat < EPS_SMALL Then
@@ -1276,7 +1002,7 @@ Public Class ToolsDbPageUC
    End Function
 
    Private Function CreateToolDraw() As Boolean
-      Dim nErr As Integer = EgtTdbCurrToolDraw(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx(), ToolScene.GetCtx())
+      Dim nErr As Integer = EgtTdbCurrToolDraw( m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx(), ToolScene.GetCtx())
       EgtSetCurrentContext(ToolScene.GetCtx())
       Return (nErr = 0)
    End Function
@@ -1329,4 +1055,4 @@ Public Class ToolsDbPageUC
       End If
    End Sub
 
-End Class
+End Class

Machine/WaterJetPageUC.xaml

@@ -1,273 +0,0 @@
-<UserControl x:Class="WaterJetPageUC"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" 
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-   xmlns:self="clr-namespace:OmagCUT.TreeViewItem"
-   mc:Ignorable="d" 
-   d:DesignHeight="768" d:DesignWidth="1280" Initialized="WaterJetPage_Initialized">
-
-   <!-- Definizione della PolishingsPage -->
-   <Border Style="{DynamicResource OmagCut_PageBorder}">
-
-      <Grid Name="WaterJetPageGrid" >
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="3*"/>
-            <ColumnDefinition Width="8*"/>
-            <ColumnDefinition Width="4*"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="8*"/>
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
-
-         <!--Lista dei materiali-->
-         <GroupBox Name="MaterialGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0"
-                      Header="{Binding Material_Msg}"
-                      Grid.Row="0" BorderThickness="0">
-
-            <Grid>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="7*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-               </Grid.RowDefinitions>
-
-               <!--Lista dei materiali-->
-               <ListBox Name="MaterialsLstBx" 
-                             ItemsSource="{Binding MaterialList}" SelectedItem="{Binding SelMaterial}"
-                             Grid.RowSpan="2">
-                  <ListBox.ItemTemplate>
-                     <DataTemplate>
-                        <TextBlock Text="{Binding Name}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                     </DataTemplate>
-                  </ListBox.ItemTemplate>
-               </ListBox>
-               <!--Campo visualizzato solo per aggiungere un nuovo materiale-->
-               <EgtWPFLib:EgtTextBox Name="NewMaterialNameTxBx" Grid.Row="1" 
-                                          Width="220"
-                                          Text="{Binding sNewMaterial}"
-                                          Visibility="{Binding NewMaterial_Visibility}"
-                                          Style="{DynamicResource OmagCut_KeyboardTextBox}" 
-                                          KeyboardPosition="Top"/>
-               <!--Pulsanti per aggiungere/rimuovere/salvare la lista-->
-               <UniformGrid Grid.Row="2" Columns="3">
-                  <Button Name="NewMaterialBtn" Grid.Column="0"
-                                Content="{Binding New_Msg}"
-                                Command="{Binding NewMaterialCommand}"
-                                Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
-                  <Button Name="DeleteMaterialBtn" Grid.Column="1"
-                                Content="{Binding Delete_Msg}"
-                                Command="{Binding DeleteMaterialCommand}"
-                                Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
-                  <Button Name="ModifyMaterialBtn" Grid.Column="1"
-                                Content="{Binding Modify_Msg}"
-                                Command="{Binding ModifyMaterialCommand}"
-                                Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
-               </UniformGrid>
-
-            </Grid>
-
-         </GroupBox>
-
-         <!--Raggruppo all'interno della stessa cornice le sottocatogorie e i parametri-->
-         <Border Style="{DynamicResource OmagCut_Border}" 
-                    Grid.Column="1" Grid.Row="0" 
-                    Grid.ColumnSpan="2" Grid.RowSpan="1">
-
-            <Grid Name="SubMaterialGrd" Grid.Column="1">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="2*"/>
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-               </Grid.RowDefinitions>
-
-               <!--Sottocategoria dei materiali associata alla lista precedente-->
-               <GroupBox Name="SubMaterialGpBx" Style="{DynamicResource OmagCut_GroupBox}" 
-                              Header="{Binding SubMaterial_Msg}"
-                              Grid.Column="0" Grid.Row="0" 
-                              Grid.ColumnSpan="1" Grid.RowSpan="8" BorderThickness="0">
-
-                  <Grid Grid.Column="1">
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="7*"/>
-                        <RowDefinition Height="1*"/>
-                        <RowDefinition Height="1*"/>
-                     </Grid.RowDefinitions>
-
-                     <!--Lista dei materiali-->
-                     <ListBox Name="SubMaterialsLstBx" ItemsSource="{Binding Path=SelectedItem.SubMaterialList, ElementName=MaterialsLstBx}"
-                                     SelectedItem="{Binding Path=SelectedItem.SelSubMaterial, ElementName=MaterialsLstBx}"
-                                     Grid.RowSpan="2">
-                        <ListBox.ItemTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding Name}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                           </DataTemplate>
-                        </ListBox.ItemTemplate>
-                     </ListBox>
-
-                     <!--Campo visualizzato solo per aggiungere un nuovo materiale-->
-                     <EgtWPFLib:EgtTextBox Name="NewSubMaterialNameTxBx" Grid.Row="1" 
-                                                  Width="220"
-                                                  Text="{Binding sNewSubMaterial}"
-                                                  Visibility="{Binding NewSubMaterial_Visibility}"
-                                                  Style="{DynamicResource OmagCut_KeyboardTextBox}" 
-                                                  KeyboardPosition="Top"/>
-
-                     <!--Pulsanti per aggiungere/rimuovere/salvare la lista-->
-                     <UniformGrid Grid.Row="2" Columns="3">
-                        <Button Name="NewSubMaterialBtn" Grid.Column="0"
-                                        Content="{Binding New_Msg}"
-                                        Command="{Binding NewSubMaterialCommand}"
-                                        Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
-                        <Button Name="RemoveSubMaterialBtn" Grid.Column="1"
-                                        Content="{Binding Delete_Msg}"
-                                        Command="{Binding DeleteSubMaterialCommand}"
-                                        Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
-                        <Button Name="ModifySubMaterialBtn" Grid.Column="1"
-                                        Content="{Binding Modify_Msg}"
-                                        Command="{Binding ModifySubMaterialCommand}"
-                                        Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
-                     </UniformGrid>
-
-                  </Grid>
-
-               </GroupBox>
-
-               <!--Lista dei parametri associata alla sottovcategoria dei materiali-->
-               <GroupBox Name="ParamsGpBx" 
-                              Grid.Column="1" Grid.Row="0" Margin="0,0,0,3"
-                              Grid.ColumnSpan="3" Grid.RowSpan="8" BorderThickness="0">
-
-                  <!--Titolazione delle colonne della tabella-->
-                  <GroupBox.Header >
-                     <Grid Width="700">
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                        </Grid.ColumnDefinitions>
-
-                        <TextBlock Text="{Binding Thickness_Msg}" Grid.Column="0" HorizontalAlignment="Center"
-                                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
-                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
-                        <TextBlock Text="{Binding Q1_Msg}" Grid.Column="1" HorizontalAlignment="Center"
-                                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"
-                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
-                        <TextBlock Text="{Binding Q2_Msg}" Grid.Column="2" HorizontalAlignment="Center"
-                                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
-                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
-                        <TextBlock Text="{Binding Q3_Msg}" Grid.Column="3" HorizontalAlignment="Center"
-                                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
-                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
-                        <TextBlock Text="{Binding Q4_Msg}" Grid.Column="4" HorizontalAlignment="Center"
-                                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
-                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
-                        <TextBlock Text="{Binding Q5_Msg}" Grid.Column="5" HorizontalAlignment="Center"
-                                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
-                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
-                        <TextBlock Text="{Binding QExtra_Msg}" Grid.Column="6" HorizontalAlignment="Center"
-                                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
-                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
-                        <TextBlock Text="{Binding AngComp_Msg}" Grid.Column="7" HorizontalAlignment="Center"
-                                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
-                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
-                     </Grid>
-
-                  </GroupBox.Header>
-
-                  <!--Definizione della Grid dei parametri delle lavorazioni-->
-                  <Grid Grid.Column="2">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="308*"/>
-                        <ColumnDefinition Width="73*"/>
-                     </Grid.ColumnDefinitions>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="7*"/>
-                        <RowDefinition Height="1*"/>
-                        <RowDefinition Height="1*"/>
-                     </Grid.RowDefinitions>
-
-                     <ListBox Name="ParamLstBx"
-                                     ItemsSource="{Binding Path=SelectedItem.ParamList , ElementName=SubMaterialsLstBx}"
-                                     SelectedItem="{Binding Path=SelectedItem.SelWjParam , ElementName=SubMaterialsLstBx}"
-                                     Margin="0,0,0,0"
-                                     Grid.RowSpan="2" Grid.ColumnSpan="2">
-                        <ListBox.ItemTemplate>
-                           <DataTemplate>
-                              <Grid Width="700">
-                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="1*"/>
-                                    <ColumnDefinition Width="1*"/>
-                                    <ColumnDefinition Width="1*"/>
-                                    <ColumnDefinition Width="1*"/>
-                                    <ColumnDefinition Width="1*"/>
-                                    <ColumnDefinition Width="1*"/>
-                                    <ColumnDefinition Width="1*"/>
-                                    <ColumnDefinition Width="1*"/>
-                                 </Grid.ColumnDefinitions>
-
-                                 <EgtWPFLib:EgtTextBox Text="{Binding Thickness}" Grid.Column="0"
-                                                       Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
-                                 <EgtWPFLib:EgtTextBox Text="{Binding Q1}" Grid.Column="1"
-                                                       Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
-                                 <EgtWPFLib:EgtTextBox Text="{Binding Q2}" Grid.Column="2"
-                                                       Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
-                                 <EgtWPFLib:EgtTextBox Text="{Binding Q3}" Grid.Column="3"
-                                                       Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
-                                 <EgtWPFLib:EgtTextBox Text="{Binding Q4}" Grid.Column="4"
-                                                       Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
-                                 <EgtWPFLib:EgtTextBox Text="{Binding Q5}" Grid.Column="5"
-                                                       Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
-                                 <EgtWPFLib:EgtTextBox Text="{Binding QExtra}" Grid.Column="6"
-                                                       Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
-                                 <EgtWPFLib:EgtTextBox Text="{Binding dAngComp}" Grid.Column="7" IsLength="False"
-                                                       Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
-                              </Grid>
-                           </DataTemplate>
-                        </ListBox.ItemTemplate>
-                     </ListBox>
-
-                     <UniformGrid Grid.Row="2" Columns="9" Grid.ColumnSpan="2">
-                        <Button Name="NewParamBtn" Grid.Column="0"
-                                        Command="{Binding NewWjParamCommand}"
-                                        Content="{Binding New_Msg}"
-                                        Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
-                        <Button Name="RemoveParamBtn" Grid.Column="1"
-                                        Command="{Binding DeleteWjParamCommand}"
-                                        Content="{Binding Delete_Msg}"
-                                        Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
-                     </UniformGrid>
-
-                  </Grid>
-
-               </GroupBox>
-
-            </Grid>
-         </Border>
-         <Button Name="SaveKitBtn" Grid.Row="2" Grid.Column="2"
-                    Command="{Binding SaveCommand}"
-                    Content="{Binding Save_Msg}"
-                    Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-      </Grid>
-
-   </Border>
-
-</UserControl>

Machine/WaterJetPageUC.xaml.vb

@@ -1,106 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.ComponentModel
-Imports EgtUILib
-Imports EgtWPFLib
-Imports EgtWPFLib5
-
-Public Class WaterJetPageUC
-
-   ' Riferimento alla MainWindow
-   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
-   Private m_refWaterjetDbWindowVM As WaterjetDbWindowVM_OmagCUT
-   Private m_sOrigNewMaterial As String = String.Empty
-   Private m_sOrigNewSubMaterial As String = String.Empty
-
-   Private Sub WaterJetPage_Initialized(sender As Object, e As EventArgs)
-      m_refWaterjetDbWindowVM = New WaterjetDbWindowVM_OmagCUT(m_MainWindow.m_CurrentMachine.sMachDir)
-      '----------------------------------------------------------------------------------------
-      ' TEMPORANEO - se dati in INCH e richiesta di frazioni eseguo la conversione in frazione!
-      ConvertParamListValueToFracrion()
-      '----------------------------------------------------------------------------------------
-      Me.DataContext = m_refWaterjetDbWindowVM
-      EgtWPFLib.Utility.MainWindow = m_MainWindow
-   End Sub
-
-   Public Sub WaterJetPage_Reinitialize()
-      m_refWaterjetDbWindowVM = New WaterjetDbWindowVM_OmagCUT(m_MainWindow.m_CurrentMachine.sMachDir)
-      '----------------------------------------------------------------------------------------
-      ' TEMPORANEO - se dati in INCH e richiesta di frazioni eseguo la conversione in frazione!
-      ConvertParamListValueToFracrion()
-      '----------------------------------------------------------------------------------------
-      Me.DataContext = m_refWaterjetDbWindowVM
-   End Sub
-
-   Private Sub NewMaterial_EgtOpening(sender As Object, e As EventArgs) Handles NewMaterialNameTxBx.EgtOpening
-      m_sOrigNewMaterial = NewMaterialNameTxBx.Text
-   End Sub
-
-   Private Sub NewSubMaterial_EgtOpening(sender As Object, e As EventArgs) Handles NewSubMaterialNameTxBx.EgtOpening
-      m_sOrigNewSubMaterial = NewSubMaterialNameTxBx.Text
-   End Sub
-
-   Private Sub NewMaterial_EgtClosed(sender As Object, e As EventArgs) Handles NewMaterialNameTxBx.EgtClosed
-      m_refWaterjetDbWindowVM.sNewMaterial = NewMaterialNameTxBx.Text
-      If String.IsNullOrEmpty(m_refWaterjetDbWindowVM.sNewMaterial) OrElse m_refWaterjetDbWindowVM.sNewMaterial = m_sOrigNewMaterial Then
-         m_refWaterjetDbWindowVM.NewMaterial_Visibility = Visibility.Collapsed
-      Else
-         m_refWaterjetDbWindowVM.Done("")
-         NewMaterialNameTxBx.Clear()
-      End If
-   End Sub
-
-   Private Sub NewSubMaterial_EgtClosed(sender As Object, e As EventArgs) Handles NewSubMaterialNameTxBx.EgtClosed
-      m_refWaterjetDbWindowVM.sNewSubMaterial = NewSubMaterialNameTxBx.Text
-      If String.IsNullOrEmpty(m_refWaterjetDbWindowVM.sNewSubMaterial) OrElse m_refWaterjetDbWindowVM.sNewSubMaterial = m_sOrigNewSubMaterial Then
-         m_refWaterjetDbWindowVM.NewSubMaterial_Visibility = Visibility.Collapsed
-      Else
-         m_refWaterjetDbWindowVM.Done("")
-         NewSubMaterialNameTxBx.Clear()
-      End If
-   End Sub
-
-   Private Sub ConvertParamListValueToFracrion()
-      ' TEMPORANEO - se dati in INCH e richiesta di frazioni eseguo la conversione in frazione!
-      Dim Index1 As Integer = 0
-      For Index1 = 0 To m_refWaterjetDbWindowVM.MaterialList.Count - 1
-         Dim Index2 As Integer = 0
-         For Index2 = 0 To m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList.Count - 1
-            Dim Index3 As Integer = 0
-            For Index3 = 0 To m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList.Count - 1
-               Dim dThickness As Double
-               Dim dQ1 As Double
-               Dim dQ2 As Double
-               Dim dQ3 As Double
-               Dim dQ4 As Double
-               Dim dQ5 As Double
-               Dim dQExtra As Double
-               Dim dAngComp As Double
-               StringToLen(m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).Thickness, dThickness)
-               Dim sVal As String = LenToString(dThickness, 3)
-               m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).SetThickness(sVal)
-               StringToLen(m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).Q1, dQ1)
-               sVal = LenToString(dQ1, 3)
-               m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).SetQ1(sVal)
-               StringToLen(m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).Q2, dQ2)
-               sVal = LenToString(dQ2, 3)
-               m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).SetQ2(sVal)
-               StringToLen(m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).Q3, dQ3)
-               sVal = LenToString(dQ3, 3)
-               m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).SetQ3(sVal)
-               StringToLen(m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).Q4, dQ4)
-               sVal = LenToString(dQ4, 3)
-               m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).SetQ4(sVal)
-               StringToLen(m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).Q5, dQ5)
-               sVal = LenToString(dQ5, 3)
-               m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).SetQ5(sVal)
-               StringToLen(m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).QExtra, dQExtra)
-               sVal = LenToString(dQExtra, 3)
-               m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).SetQExtra(sVal)
-               StringToDouble(m_refWaterjetDbWindowVM.MaterialList(Index1).SubMaterialList(Index2).ParamList(Index3).dAngComp, dAngComp)
-            Next
-         Next
-      Next
-   End Sub
-
-End Class
-