Passo alla libreira il nome dello User

- correzione versione.

CompoWindow/CompoWindowVM.vb

@@ -364,6 +364,9 @@ Public Class CompoWindowVM
       ' 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(CompoWindowMap.refCompoSceneHostV.CompoScene.GetCtx())
@@ -513,6 +516,9 @@ Public Class CompoWindowVM
          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
@@ -527,8 +533,15 @@ Public Class CompoWindowVM
                If m_bTrfData Then EgtSetInfo(nId2, "CsvPart", CompoWindowMap.refCompoManagerVM.sTrfOrderCode & "-" & nId2.ToString())
                ' Aggiorno l'area dei nuovi pezzi
                dNewArea += GeomCalc.GetPartArea(nId2)
-               ' Inserisco in parcheggio
+
+               ' assegno l'identificatico del pezzo, se esiste
+               If Not String.IsNullOrEmpty(sGUICode) Then
+                  Dim sPreGuid As String = EstCalc.CreatePreGuidCode(nId2)
+                  EgtSetInfo(nId2, INFO_REFGROUP, sPreGuid & sGUICode)
+               End If
+               ' muovo il pezzo nella prima posizione di parcheggio libera
                EstCalc.StoreOnePart(nId2, True)
+
                ' Aggiungo riferimento e lo inserisco in VeinMatching
                VeinMatching.SetRefOnPart(nId2)
                VeinMatching.AddPart(nId2, True)

Constants/ConstIni.vb

@@ -18,6 +18,7 @@ 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_USERLEVEL As String = "UserLevel"
    Public Const K_MAXINST As String = "MaxInstances"
    Public Const K_INSTANCES As String = "Instances"
@@ -121,7 +122,7 @@ 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_DRAGRETTANGLE As String = "DragRettangle"
+   Public Const K_DRAGRECTANGLE As String = "DragRectangle"
 
    Public Const S_SPLIT As String = "Split"
    Public Const K_MOVE_LEV As String = "MoveLevel"
@@ -133,6 +134,7 @@ Module ConstIni
    Public Const K_CSVCURRDIR As String = "CurrDir"
    Public Const K_CSVLASTFILE As String = "LastFile"
    Public Const K_THICKTOLERANCE As String = "ThickTolerance"
+   Public Const K_FULL As String = "Full"
 
    Public Const S_COLORTOSIDEANG As String = "ColorToSideAng"
    Public Const K_CTSA_ENABLE As String = "Enable"

CsvWindow/CsvWindowV.xaml

@@ -10,6 +10,7 @@
    Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
    WindowStartupLocation="CenterOwner"
    MinWidth="270" MinHeight="250"
+   MaxWidth="500"                         
    ResizeMode="NoResize">
 
    <DockPanel Margin="5,5,5,0">

CsvWindow/CsvWindowVM.vb

@@ -1,4 +1,5 @@
 Imports System.Collections.ObjectModel
+Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -110,6 +111,8 @@ Public Class CsvWindowVM
 #Region "METHODS"
 
    Private Sub ShowTreeView()
+      Dim bFull = OmagOFFICEMap.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.CSV_AUTO) And
+                (GetMainPrivateProfileInt(S_CSV, K_FULL, 1) <> 0)
       ' Path del file Csv
       Dim TempPath As New Text.StringBuilder(260)
       PathCompactPathEx(TempPath, CsvM.CsvPath, 56, 0)
@@ -118,6 +121,7 @@ Public Class CsvWindowVM
       m_CsvTypeList.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 CsvPartType("", 0)
@@ -128,15 +132,29 @@ Public Class CsvWindowVM
          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
-            PartCathegory.Name = If(String.IsNullOrWhiteSpace(sCurrMat), "***", sCurrMat) &
-                                 " - " & LenToString(dCurrTh, 2) &
-                                 " - " & nCatToNest.ToString() & "/" & nCatCount.ToString()
+
+            If 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
             CsvTypeList.Add(PartCathegory)
             sCurrMat = CurrPart.m_sMaterial
             dCurrTh = CurrPart.m_dTh
+            sCurrPath = CurrPart.m_sPath
             PartCathegory = New CsvPartType("", 0)
             nCatToNest = 0
             nCatCount = 0
@@ -150,18 +168,31 @@ Public Class CsvWindowVM
          PartCathegory.CsvPartList.Add(New CsvPartItem(CurrPart.m_sName, i, sCount, sDim, CurrPart.m_bActive))
       Next
       ' Inserisco ultima categoria
-      PartCathegory.Name = If(String.IsNullOrWhiteSpace(sCurrMat), "***", sCurrMat) &
-                           " - " & LenToString(dCurrTh, 2) &
-                           " - " & nCatToNest.ToString() & "/" & nCatCount.ToString()
+      If 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
       CsvTypeList.Add(PartCathegory)
       NotifyPropertyChanged("CsvTypeList")
    End Sub
 
    Private Sub UpdateTreeView()
+      Dim bFull = OmagOFFICEMap.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.CSV_AUTO) And
+                (GetMainPrivateProfileInt(S_CSV, K_FULL, 1) <> 0)
       For Each CatItem As CsvPartType In m_CsvTypeList
          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 CsvPartItem In CatItem.CsvPartList
@@ -171,12 +202,23 @@ Public Class CsvWindowVM
             PrtItem.sText1 = sCount
             sCurrMat = PartData.m_sMaterial
             dCurrTh = PartData.m_dTh
+            sCurrPath = PartData.m_sPath
             nCatToNest += PartData.m_nToNest
             nCatCount += PartData.m_nCount + PartData.m_nAdd
          Next
-         CatItem.Name = If(String.IsNullOrWhiteSpace(sCurrMat), "***", sCurrMat) &
-                        " - " & LenToString(dCurrTh, 2) &
-                        " - " & nCatToNest.ToString() & "/" & nCatCount.ToString()
+         If bFull Then
+            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
 

CurrMachWindow/CurrMachWindowV.xaml

@@ -71,7 +71,7 @@
           <!--Quality-->
           <ComboBox ItemsSource="{Binding CurrWaterjettingQualityList}"
                     SelectedItem="{Binding SelCurrWaterjettingQuality}"
-                    Visibility="{Binding CurrWaterjettingQuality_Visibility}"
+                    Visibility="{Binding CurrWaterjetting_Visibility}"
                     Margin="5,0,0,5"
                     Grid.Column="1">
           </ComboBox>

CurrMachWindow/CurrMachWindowVM.vb

@@ -290,7 +290,7 @@ Public Class CurrMachWindowVM
       End Set
    End Property
 
-   Private m_CurrWaterjetting_Visibility As Visibility
+   Private m_CurrWaterjetting_Visibility As Visibility = Visibility.Collapsed
    Public Property CurrWaterjetting_Visibility As Visibility
       Get
          Return m_CurrWaterjetting_Visibility

DxfImportWindow/DxfImportWindowVM.vb

@@ -710,6 +710,8 @@ Public Class DxfImportWindowVM
          EgtErase(EgtGetFirstNameInGroup(PartId, SELECT_REGION_LAYER))
          PartId = EgtGetNextPart(PartId)
       End While
+      ' identificativo univoico del gruppo di pezzi, se più di un pezzo
+      Dim sGUICode As New List(Of String)
       ' Scrivo testi per nesting
       SideEntityControlVM.WriteSideAngleForNest(DxfImportWindowMap.refDxfImportSceneHostV.ImportDxfScene.GetCtx())
       ' Imposto riferimento sul centro geometrico di ogni pezzo
@@ -732,10 +734,33 @@ Public Class DxfImportWindowVM
       Dim bDirect As Boolean = (GetMainPrivateProfileInt(S_NEST, K_DIRECT, 0) <> 0)
       ' Elimino eventuali precedenti pezzi vuoti
       EgtEraseEmptyParts()
+      ' creo il riferimento
+      If m_PartNum > 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
       ' Inserisco i pezzi nell'ambiente principale e recupero Id primo pezzo inserito
       Dim nFirstId As Integer = EgtGetLastPart()
       For nInd As Integer = 1 To m_PartNum
+         Dim nFirst2Id As Integer = EgtGetLastPart()
          EgtInsertFile(sTmpFile)
+         Dim FirstOfImport As Integer = EgtGetNextPart(nFirst2Id)
+         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())
       Next
       nFirstId = If(nFirstId <> GDB_ID.NULL, EgtGetNextPart(nFirstId), EgtGetFirstPart())
       ' Cancello il file

EgtStoneLib/CamAuto.vb

@@ -95,6 +95,74 @@ 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, "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, "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, "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, "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, "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, "Start")
+         nIdPart = EgtGetNextPartInRawPart(nIdPart)
+      End While
+      Return bOk
+   End Function
+
+   ' verifico che il contorno passato non sia stato separato
+   Friend Function VerifyOutLoopIsClosed(nIdLayerOutLoop As Integer) As Boolean
+      Dim nIdMy As Integer = EgtGetFirstInGroup(nIdLayerOutLoop)
+      While nIdMy <> GDB_ID.NULL
+         Dim nValInfo As Integer = 1
+         If EgtGetInfo(nIdMy, "JoinEntity", nValInfo) Then
+            If nValInfo = 0 Then Return False
+         End If
+         EgtRemoveInfo(nIdMy, "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

EgtStoneLib/ConstMach.vb

@@ -33,6 +33,10 @@ Module ConstMach
    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
@@ -91,6 +95,9 @@ Module ConstMach
    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"
@@ -244,6 +251,12 @@ Module ConstMach
    Public Const SELECT_REGION_LAYER As String = "SelectRegion"
    ' 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_JOINTENTITY 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"

EgtStoneLib/ConstMachIni.vb

@@ -198,6 +198,10 @@
    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 S_MACH_REG As String = "Reg"
    Public Const K_MACH_MAX_ROT_ANG As String = "MaxRotAng"
@@ -260,6 +264,7 @@
    Public Const K_CURROFFICEMATERIAL As String = "CurrOfficeMaterial"
    Public Const K_MATERIAL As String = "Material"
    Public Const K_FROMDBWATERJET As String = "FromDBWaterJet"
+   Public Const K_AVERAGEDENSITY As String = "AverageDensity"
 
    Public Const S_SETUP As String = "SetUp"
    Public Const K_DEFAULT As String = "Default"

EgtStoneLib/CsvM.vb

@@ -12,12 +12,19 @@ Module CsvM
          Return m_sCsvPath
       End Get
    End Property
+   Private m_sFilePath As String = String.Empty
+   Public ReadOnly Property FilePath As String
+      Get
+         Return m_sFilePath
+      End Get
+   End Property
    Private m_CsvPartList As New List(Of CsvPart)
    Public ReadOnly Property CsvPartList As List(Of CsvPart)
       Get
          Return m_CsvPartList
       End Get
    End Property
+
    Private m_bCsvPartListModified As Boolean = False
    Private m_sCompoDir As String = String.Empty
 
@@ -36,12 +43,7 @@ Module CsvM
 
    Public Sub NewCmd()
       ' Salvo lista dei pezzi attuale (se modificata)
-      If Not SaveCsvPartList() Then
-         ' Errore nel salvataggio del file CSV, vuoi continuare lo stesso ? - Errore
-         If MessageBox.Show(EgtMsg(MSG_CSVPAGEUC + 5), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.YesNo, MessageBoxImage.Error) <> MessageBoxResult.Yes Then
-            Return
-         End If
-      End If
+      SaveCsvPartList()
       ' Pulisco path e lista dei pezzi Csv
       m_sCsvPath = String.Empty
       m_CsvPartList.Clear()
@@ -51,25 +53,33 @@ Module CsvM
    End Sub
 
    Public Sub Open()
-      ' Salvo lista dei pezzi attuale (se modificata)
-      If Not SaveCsvPartList() Then
-         ' Errore nel salvataggio del file CSV, vuoi continuare lo stesso ? - Errore
-         If MessageBox.Show(EgtMsg(MSG_CSVPAGEUC + 5), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.YesNo, MessageBoxImage.Error) <> MessageBoxResult.Yes Then
-            Return
-         End If
-      End If
       ' Leggo direttorio corrente dei file CSV
       Dim sCurrDir As String = ""
       GetMainPrivateProfileString(S_CSV, K_CSVCURRDIR, "C:\", sCurrDir)
       ' Apro dialogo scelta file
       Dim CsvFileDlg As New Microsoft.Win32.OpenFileDialog()
       If Directory.Exists(sCurrDir) Then CsvFileDlg.InitialDirectory = sCurrDir
-      CsvFileDlg.Filter = "Csv file (*.csv;*.epl)|*.csv;*.epl"
+      Dim bFull = OmagOFFICEMap.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.CSV_AUTO) And
+                (GetMainPrivateProfileInt(S_CSV, K_FULL, 1) <> 0)
+      Dim sFilterDialog As String = String.Empty
+      Dim sDeniedFiles As List(Of String) = CreateListOfDeniedFiles()
+      If bFull Then
+         sFilterDialog = "Csv file (*.csv;*.epl)|*.csv;*.epl;Merge.epl"
+      Else
+         sFilterDialog = "Csv file (*.csv)|*.csv"
+      End If
+      CsvFileDlg.Filter = sFilterDialog
+
       If Not CsvFileDlg.ShowDialog() Then Return
+
+      ' Salvo lista dei pezzi attuale
+      SaveCsvPartList()
+
       ' Salvo direttorio corrente
       WriteMainPrivateProfileString(S_CSV, K_CSVCURRDIR, Path.GetDirectoryName(CsvFileDlg.FileName))
       ' Apertura file
       Dim sPath = CsvFileDlg.FileName
+      ' se necessario cambio estensione del file
       If String.Compare(Path.GetExtension(sPath), ".CSV", True) = 0 Then
          LoadCsvFile(sPath)
       Else
@@ -77,6 +87,93 @@ Module CsvM
       End If
    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 Function LoadCsvFile(sCsvPath As String) As Boolean
+      Dim bFull = OmagOFFICEMap.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.CSV_AUTO) And
+                (GetMainPrivateProfileInt(S_CSV, K_FULL, 1) <> 0)
+      ' aggiungo i pezzi su una lista temporanea
+      Dim LocalPartList As New List(Of CsvPart)
+      ' Eseguo la lettura del file Csv
+      If Not ReadCsvFile(sCsvPath, LocalPartList) Then
+         'Errore nella lettura del file CSV
+         MessageBox.Show(EgtMsg(91206), "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         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)
+      ' Aggiorno
+      If bFull Then
+         MySaveCsvPartList(LocalPartList)
+         ' Salvo come epl
+         SaveCsvPartList()
+         ' Rinomino file originale
+         Dim sBakPath As String = sCsvPath & ".bak"
+         Dim sBakName As String = Path.GetFileName(sBakPath)
+         ' cancello eventuale vecchio backup
+         If My.Computer.FileSystem.FileExists(sBakPath) Then
+            My.Computer.FileSystem.DeleteFile(sBakPath)
+         End If
+         ' 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)
+      Dim bFull = OmagOFFICEMap.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.CSV_AUTO) And
+                (GetMainPrivateProfileInt(S_CSV, K_FULL, 1) <> 0)
+      ' Se Csv semplificato non va letta
+      If Not bFull Then Return
+
+      ' aggiungo i pezzi su una lista temporanea
+      Dim LocalPartList As New List(Of CsvPart)
+
+      ' Lettura del file
+      If ReadCsvPartList(sFile, 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
+
    Public Sub Insert()
       ' Recupero lo spessore della lastra corrente
       Dim dRawHeight As Double = EstCalc.GetRawHeight()
@@ -88,7 +185,7 @@ Module CsvM
       End If
       ' Recupero la tolleranza sullo spessore
       Dim dToler As Double = GetMainPrivateProfileDouble(S_CSV, K_THICKTOLERANCE, 100 * EPS_SMALL)
-      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()
@@ -174,25 +271,46 @@ Module CsvM
          If Not bMaxDimOnX Then
             Dim dH As Double = Math.Min(0.1 * dDimY, 30)
             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))
+            EgtSetColor(nText, New Color3d(0, 0, 0))
          End If
          ' Aggiusto per lavorazioni
          AdjustFlatPart(nId)
          ' Aggiungo info su CSV di origine
-         EgtSetInfo(nId, INFO_CSV_PATH, m_sCsvPath)
+         EgtSetInfo(nId, INFO_CSV_PATH, CurrPart.m_sPath)
          EgtSetInfo(nId, INFO_CSV_PART, CurrPart.m_sName)
          EgtSetInfo(nId, INFO_CSV_ORD, CurrPart.m_sOrd)
          EgtSetInfo(nId, INFO_CSV_DIST, CurrPart.m_sDist)
          EgtSetInfo(nId, INFO_CSV_MAT, CurrPart.m_sMaterial)
          ' Imposto colore testi
-         EstCalc.SetTextColor( nRegId)
+         EstCalc.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 bDirect As Boolean = (GetMainPrivateProfileInt(S_CSV, K_CSVDIRECT, 1) <> 0)
+      Dim bFull = OmagOFFICEMap.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.CSV_AUTO) And
+                (GetMainPrivateProfileInt(S_CSV, K_FULL, 1) <> 0)
+      Dim bDirect As Boolean = bFull And (GetMainPrivateProfileInt(S_CSV, K_CSVDIRECT, 1) <> 0)
       For i As Integer = 1 To InsPartList.Count()
          Dim CurrPart As CsvPart = InsPartList(i - 1)
          While CurrPart.m_nToNest > 0
@@ -229,7 +347,7 @@ Module CsvM
             EgtErase(nId2)
             Return False
          End If
-      ' altrimenti lo metto in parcheggio
+         ' altrimenti lo metto in parcheggio
       Else
          ' Aggiungo riferimento e lo inserisco in VeinMatching
          VeinMatching.SetRefOnPart(nId2)
@@ -270,11 +388,11 @@ Module CsvM
       Dim sName As String = String.Empty
       EgtGetInfo(nId, INFO_CSV_PART, sName)
       ' Verifico che il pezzo appartenga a questo Csv
-      If String.Compare(sCsvPath, m_sCsvPath, True) = 0 Then
+      If SearchCurrCSV(sCsvPath) Then
          ' Cerco il pezzo nella lista dei pezzi
          For i = 1 To m_CsvPartList.Count()
             Dim CurrPart As CsvPart = m_CsvPartList(i - 1)
-            If String.Compare(sName, CurrPart.m_sName, True) = 0 Then
+            If String.Compare(sName, CurrPart.m_sName, True) = 0 And String.Compare(sCsvPath, CurrPart.m_sPath, True) = 0 Then
                ' Se era nel grezzo
                If EgtGetParent(nId) = EstCalc.GetRawId() Then
                   ' Rimuovo le lavorazioni
@@ -282,12 +400,19 @@ Module CsvM
                   ' 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)
                ' Eventuale cancellazione per VM
                VeinMatching.OnRemovePart(nId)
                ' Cancello il pezzo
                EgtErase(nId)
+               ' aggiorno il layer che indica il numero di pezzi in parcheggio (se sRefGroup<>"")
+               EstCalc.CountPartInFamily(sCurrRefGuid)
                ' Aggiorno il contatore
                CurrPart.m_nToNest += 1
+               ' ricreo la lista delle famiglie di pezzi presenti in parcheggio
+               GetFamilyGroupInPark()
                ' Esco
                Return True
             End If
@@ -297,10 +422,19 @@ Module CsvM
       Return False
    End Function
 
-   Private Function LoadCsvFile(sCsvPath As String) As Boolean
+   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
+
+   Private Function ReadCsvFile(sCsvPath As String, ByRef LocalCsvPartList As List(Of CsvPart)) As Boolean
       ' Pulisco path e lista dei pezzi Csv
       m_sCsvPath = String.Empty
-      m_CsvPartList.Clear()
       ' Definizione variabili
       EgtLuaCreateGlobTable("CSV")
       EgtLuaSetGlobStringVar("CSV.FILE", sCsvPath)
@@ -308,7 +442,10 @@ Module CsvM
       Dim nErr As Integer = 999
       Dim sReader As String = String.Empty
       GetMainPrivateProfileString(S_CSV, K_READER, "CsvRead.lua", sReader)
-      If EgtLuaExecFile(OmagOFFICEMap.refMainWindowVM.MainWindowM.sCsvAutoDir & "\" & sReader) AndAlso
+      Dim bFull = OmagOFFICEMap.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.CSV_AUTO) And
+                (GetMainPrivateProfileInt(S_CSV, K_FULL, 1) <> 0)
+      Dim sLuaScript As String = OmagOFFICEMap.refMainWindowVM.MainWindowM.sCsvAutoDir & If(bFull, "\" & sReader, "\CsvSimplRead.lua")
+      If EgtLuaExecFile(sLuaScript) AndAlso
          EgtLuaCallFunction("CSV.Read") Then
          ' Verifica stato di errore
          EgtLuaGetGlobIntVar("CSV.ERR", nErr)
@@ -325,6 +462,7 @@ Module CsvM
       For i As Integer = 1 To nNbr
          Dim OnePart As New CsvPart
          Dim sN As String = i.ToString()
+         OnePart.m_sPath = sCsvPath
          EgtLuaGetGlobStringVar("CSV.NAME" & sN, OnePart.m_sName)
          OnePart.m_bActive = True
          EgtLuaGetGlobStringVar("CSV.ORD" & sN, OnePart.m_sOrd)
@@ -336,63 +474,50 @@ Module CsvM
          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
-         m_CsvPartList.Add(OnePart)
+         LocalCsvPartList.Add(OnePart)
       Next
       EgtLuaResetGlobVar("CSV")
       ' Ordinamento lista dei pezzi (ordine crescente su materiale e spessore)
-      m_CsvPartList.Sort(Function(x, y)
-                            Dim nComp As Integer = String.Compare(x.m_sMaterial, y.m_sMaterial, True)
-                            If nComp = 0 Then
-                               If Math.Abs(x.m_dTh - y.m_dTh) < EPS_SMALL Then
-                                  Return (x.m_nOriInd - y.m_nOriInd)
+      LocalCsvPartList.Sort(Function(x, y)
+                               Dim nComp As Integer = String.Compare(x.m_sMaterial, y.m_sMaterial, True)
+                               If nComp = 0 Then
+                                  If Math.Abs(x.m_dTh - y.m_dTh) < EPS_SMALL Then
+                                     Return (x.m_nOriInd - y.m_nOriInd)
+                                  Else
+                                     Return CInt(Math.Ceiling(x.m_dTh - y.m_dTh))
+                                  End If
                                Else
-                                  Return CInt(Math.Ceiling(x.m_dTh - y.m_dTh))
+                                  Return nComp
                                End If
-                            Else
-                               Return nComp
-                            End If
-                         End Function)
-      ' Salvo come epl
-      m_bCsvPartListModified = True
-      SaveCsvPartList()
-      ' Rinomino file originale
-      Dim sBakPath As String = sCsvPath & ".bak"
-      Dim sBakName As String = Path.GetFileName(sBakPath)
-      ' cancello eventuale vecchio backup
-      If My.Computer.FileSystem.FileExists(sBakPath) Then
-         My.Computer.FileSystem.DeleteFile(sBakPath)
-      End If
-      ' eseguo rinomina
-      My.Computer.FileSystem.RenameFile(sCsvPath, sBakName)
+                            End Function)
       Return True
    End Function
 
-   Public Function SaveCsvPartList() As Boolean
-      ' Se non c'è nulla di attivo, non faccio alcunché
-      If String.IsNullOrEmpty(m_sCsvPath) Then
-         EgtOutLog("CSV List Save Skipped : missing")
-         Return True
-      End If
-      ' Se lista non modificata, non faccio alcunchhé
-      If Not m_bCsvPartListModified Then
-         EgtOutLog("CSV List Save Skipped : not modified")
-         Return True
-      End If
-      ' Path del file
-      Dim sFile As String = Path.ChangeExtension(m_sCsvPath, ".epl")
-      ' Gestione file
+   Public Function WriteCsvPartList(sFile As String, sCsvPath As String, LocalCsvPartList As List(Of CsvPart)) As Boolean
       Try
          ' Apro file
          Dim Writer As New IO.StreamWriter(sFile, False)
          ' Intestazione
          Writer.WriteLine("[General]")
-         Writer.WriteLine("Path=" & m_sCsvPath)
+         Writer.WriteLine("Path=" & sCsvPath)
          ' Ciclo sui pezzi
-         For i As Integer = 1 To m_CsvPartList.Count()
-            Dim CurrPart As CsvPart = m_CsvPartList(i - 1)
+         For i As Integer = 1 To LocalCsvPartList.Count()
+            Dim CurrPart As CsvPart = LocalCsvPartList(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)
@@ -405,7 +530,16 @@ Module CsvM
             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]")
@@ -416,18 +550,80 @@ Module CsvM
          ' Registro in ini path
          WriteMainPrivateProfileString(S_CSV, K_CSVLASTFILE, sFile)
          Return True
-      ' Errore
+         ' Errore
       Catch ex As Exception
          EgtOutLog("CSV List error writing " & sFile)
          Return False
       End Try
    End Function
 
-   Private Function LoadCsvPartList(sFile As String) As Boolean
-      ' Pulisco path e lista dei pezzi Csv
-      m_sCsvPath = String.Empty
-      m_CsvPartList.Clear()
-      ' Gestione file
+   ' 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 Sub SaveCsvPartList()
+      Dim bFull = OmagOFFICEMap.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.CSV_AUTO) And
+                (GetMainPrivateProfileInt(S_CSV, K_FULL, 1) <> 0)
+      ' Se Csv semplificato non va salvata
+      If Not bFull Then Return
+      ' Se non c'è nulla di attivo, non faccio alcunché
+      If String.IsNullOrEmpty(m_sCsvPath) Then
+         EgtOutLog("CSV List missing")
+         Return
+      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
+            WriteMainPrivateProfileString(S_CSV, K_CSVLASTFILE, sFile)
+         End If
+      End If
+   End Sub
+
+   Friend Sub MySaveCsvPartList(ByVal CurrPartList As List(Of CsvPart))
+      Dim bFull = OmagOFFICEMap.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.CSV_AUTO) And
+                (GetMainPrivateProfileInt(S_CSV, K_FULL, 1) <> 0)
+      ' Se Csv semplificato non va salvata
+      If Not 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)
+   End Sub
+
+   Private Function ReadCsvPartList(sFile As String, LocalCsvPartList As List(Of CsvPart)) As Boolean
       Try
          ' Apro file
          Dim Reader As New IO.StreamReader(sFile, False)
@@ -456,7 +652,7 @@ Module CsvM
                ' se esiste pezzo precedente, lo salvo
                If nI > 1 Then
                   ' inserisco in lista
-                  m_CsvPartList.Add(OnePart)
+                  LocalCsvPartList.Add(OnePart)
                End If
                ' predisposizioni per prossimo pezzo
                nI += 1
@@ -466,7 +662,9 @@ Module CsvM
             Else
                Dim sItems() As String = sLine.Split("=".ToCharArray)
                If sItems.Count() >= 2 Then
-                  If sItems(0) = "Nam" Then
+                  If sItems(0) = "Path" Then
+                     OnePart.m_sPath = sItems(1)
+                  ElseIf sItems(0) = "Nam" Then
                      OnePart.m_sName = sItems(1)
                   ElseIf sItems(0) = "Ord" Then
                      OnePart.m_sOrd = sItems(1)
@@ -490,8 +688,26 @@ Module CsvM
                      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
@@ -502,18 +718,37 @@ Module CsvM
          ' Dichiaro lista non modificata
          m_bCsvPartListModified = False
          Return True
-      ' Errore
+         ' Errore
       Catch ex As Exception
          EgtOutLog("Error reading " & sFile)
          Return False
       End Try
    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
+            CsvPartList.RemoveAt(i)
+         End If
+      Next
+      Return True
+   End Function
+
+   Friend Function RemoveWrongParts(ByRef CsvPartList As List(Of CsvPart)) As Boolean
+      For i As Integer = CsvPartList.Count() - 1 To 0 Step -1
+         If Not CsvPartList(i).m_bIsRect Or CsvPartList(i).m_dDimX < EPS_SMALL Or CsvPartList(i).m_dDimY < EPS_SMALL Then
+            CsvPartList.RemoveAt(i)
+         End If
+      Next
+      Return True
+   End Function
+
 #End Region    ' METHODS
 
 End Module
 
 Public 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
@@ -526,6 +761,18 @@ Public Class CsvPart
    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(IniFile.m_sIniFile)
 End Class

EgtStoneLib/EstCalc.vb

@@ -51,6 +51,68 @@ Module EstCalc
       End If
    End Function
 
+#Region "PreGuidCode"
+
+   ' recupero i primi 5 caratteri della stringa
+   Friend Function GetPreGuidCode(sGuidCode As String) As String
+      If sGuidCode.Count > 5 Then
+         Return sGuidCode(0) & sGuidCode(1) & sGuidCode(2) & sGuidCode(3) & sGuidCode(4)
+      End If
+      Return String.Empty
+   End Function
+
+   ' sostituisce i primi 5 caratteri della stringa con qualle passata
+   Friend Function UppDateGuidCode(ByRef sGuidCode As String, sPreGuidCode As String) As Boolean
+      If sPreGuidCode.Count = 5 Then
+         sGuidCode = sGuidCode.Remove(0, 5)
+         sGuidCode = sPreGuidCode & sGuidCode
+         Return True
+      End If
+      Return False
+   End Function
+
+   ' restituisce 5 caratteri 
+   Friend Function CreatePreGuidCode(nId As Integer) As String
+      ' recupero il frame dell'oggetto
+      Dim frGlobFrame As New Frame3d
+      If Not EgtGetGroupGlobFrame(nId, frGlobFrame) Then
+         Return String.Empty
+      End If
+      ' recupero il suo versore
+      Dim vtX As Vector3d = frGlobFrame.VersX
+      Dim Len As Double
+      Dim AngV As Double
+      Dim AngH As Double
+      vtX.ToSpherical(Len, AngV, AngH)
+      ' costruisco il codice (6 caratteri!) che identifica la posizione del pezzo in parcheggio
+      Dim sPreGuid As String = GetDirectionCode(AngH)
+      Return sPreGuid
+   End Function
+
+   Friend Function GetDirectionCode(dVal As Double) As String
+      Dim bIsNegative As Boolean = False
+      If dVal < 0 Then
+         dVal = dVal + (-1)
+         bIsNegative = True
+      End If
+      Dim sVal As String = DoubleToString(dVal * 1000, 0)
+      Dim nCount As Integer = sVal.Count
+      For Index As Integer = 1 To 4 - nCount
+         sVal = "0" & sVal
+      Next
+      Dim vVal As Char() = {"+"c, "1"c, "0"c, "0"c, "0"c}
+      If bIsNegative Then
+         vVal = {"-"c, sVal(0), sVal(1), sVal(2), sVal(3)}
+      Else
+         vVal = {"+"c, sVal(0), sVal(1), sVal(2), sVal(3)}
+      End If
+      ' ricostruisco la stringa dotata di segno
+      sVal = vVal(0) & vVal(1) & vVal(2) & vVal(3) & vVal(4)
+      Return sVal
+   End Function
+
+#End Region    ' PreGiudCode
+
    '--------------------------------------------------------------------------------------------------
    Private m_nRawId As Integer = GDB_ID.NULL
    Public Function GetRawId() As Integer
@@ -626,6 +688,16 @@ Module EstCalc
       End If
       ' Gestione risultato nesting
       If bFit Then
+         '---------------------- COUNTER PART ----------------------
+         Dim sRefGroup As String = String.Empty
+         If EgtGetInfo(nId, INFO_REFGROUP, sRefGroup) Then
+            ' spengo il layer che contiene il contatore
+            Dim nCounterLayer As Integer = EgtGetFirstNameInGroup(nId, INFO_COUNTERLY)
+            EgtSetStatus(nCounterLayer, GDB_ST.OFF)
+            ' aggiorno il layer che indica il numero di pezzi in parcheggio
+            CountPartInFamily(sRefGroup)
+         End If
+         '---------------------- COUNTER PART ----------------------
          ' Eventuale aggiunta solido per taglio da sotto
          UpdateSolidForDrip(nId)
          Return True
@@ -702,12 +774,198 @@ Module EstCalc
       Return True
    End Function
 
+#Region "Manager Counter Part"
+
+   ' lista delle famiglie di pezzi in parcheggio
+   Public m_ListOfGroupInPark As New List(Of FamilyPart)
+   ' se seleniozato il layer CounterPz
+   Public m_bIsCounterLy As Boolean = False
+   Public m_nCurrNubrOfParts As Integer = 0
+
+   ' creo la lista delle famiglie che popolano il parcheggio
+   Public Sub GetFamilyGroupInPark()
+      m_ListOfGroupInPark.Clear()
+      Dim nIdInPark As Integer = EgtGetFirstPart()
+      While nIdInPark <> GDB_ID.NULL
+         If IsInRaw(nIdInPark) Then
+            nIdInPark = EgtGetNextPart(nIdInPark)
+            Continue While
+         End If
+         Dim sRefGroup As String = String.Empty
+         If EgtGetInfo(nIdInPark, INFO_REFGROUP, sRefGroup) Then
+            Dim bExists As Boolean = False
+            For Each sItem As FamilyPart In m_ListOfGroupInPark
+               If sRefGroup = sItem.sRefGuid Then
+                  bExists = True
+                  Exit For
+               End If
+            Next
+            If Not bExists Then
+               m_ListOfGroupInPark.Add(New FamilyPart(sRefGroup, nIdInPark))
+            End If
+         End If
+         nIdInPark = EgtGetNextPart(nIdInPark)
+      End While
+   End Sub
+
+   Public Sub CountPartInFamily(sRefGuid As String)
+      If String.IsNullOrEmpty(sRefGuid) Then Return
+      Dim nCount As Integer = 0
+      Dim nIdInPark As Integer = EgtGetFirstPart()
+      ' conto il nuero di pezzi del gruppo inidcato
+      While nIdInPark <> GDB_ID.NULL
+         If IsInRaw(nIdInPark) Then
+            nIdInPark = EgtGetNextPart(nIdInPark)
+            Continue While
+         End If
+         Dim sRefGroup As String = String.Empty
+         EgtGetInfo(nIdInPark, INFO_REFGROUP, sRefGroup)
+         If sRefGroup = sRefGuid Then
+            nCount += 1
+         End If
+         nIdInPark = EgtGetNextPart(nIdInPark)
+      End While
+      ' aggiorno il contatore dei pezzi del gruppo
+      nIdInPark = EgtGetFirstPart()
+      While nIdInPark <> GDB_ID.NULL
+         If IsInRaw(nIdInPark) Then
+            nIdInPark = EgtGetNextPart(nIdInPark)
+            Continue While
+         End If
+         Dim sRefGroup As String = String.Empty
+         EgtGetInfo(nIdInPark, INFO_REFGROUP, sRefGroup)
+         If sRefGroup = sRefGuid Then
+            Dim nId As Integer = EgtGetFirstNameInGroup(nIdInPark, INFO_COUNTERLY)
+            If nId <> GDB_ID.NULL Then
+               Dim m_IdCounterTextas As Integer = EgtGetFirstInGroup(nId)
+               EgtModifyText(m_IdCounterTextas, "# " & nCount.ToString)
+            End If
+         End If
+         nIdInPark = EgtGetNextPart(nIdInPark)
+      End While
+   End Sub
+
+   Public Sub SelectPartInFaimily(sRefGuid As String, nNbrOfSelection As Integer)
+      ' aggiorno il contatore dei pezzi del gruppo
+      Dim nIdInPark As Integer = EgtGetFirstPart()
+      Dim nCounter As Integer = 0
+      While nIdInPark <> GDB_ID.NULL And nCounter < nNbrOfSelection
+         If IsInRaw(nIdInPark) Then
+            nIdInPark = EgtGetNextPart(nIdInPark)
+            Continue While
+         End If
+         Dim sRefGroup As String = String.Empty
+         EgtGetInfo(nIdInPark, INFO_REFGROUP, sRefGroup)
+         If sRefGroup = sRefGuid Then
+            EgtSelectObj(nIdInPark)
+            nCounter += 1
+         End If
+         nIdInPark = EgtGetNextPart(nIdInPark)
+      End While
+   End Sub
+
+   Public Sub DeselectPartInFaimily(sRefGuid As String)
+      ' aggiorno il contatore dei pezzi del gruppo
+      Dim nIdInPark As Integer = EgtGetFirstPart()
+      While nIdInPark <> GDB_ID.NULL
+         If IsInRaw(nIdInPark) Then
+            nIdInPark = EgtGetNextPart(nIdInPark)
+            Continue While
+         End If
+         Dim sRefGroup As String = String.Empty
+         EgtGetInfo(nIdInPark, INFO_REFGROUP, sRefGroup)
+         If sRefGroup = sRefGuid Then
+            EgtDeselectObj(nIdInPark)
+         End If
+         nIdInPark = EgtGetNextPart(nIdInPark)
+      End While
+   End Sub
+
+   Public Function ParkInGroupFamily(nId As Integer) As Boolean
+      ' se pezzo appartenente ad un gruppo
+      Dim sRefGroup As String = String.Empty
+      Dim Element As FamilyPart
+      If EgtGetInfo(nId, INFO_REFGROUP, sRefGroup) Then
+         ' verifico se esiste un pezzo dello stesso gruppo in parcheggio
+         Dim nNewLayer As Integer
+         Dim ptMin As Point3d
+         Dim ptMax As Point3d
+         For Each sItem As FamilyPart In m_ListOfGroupInPark
+            If sRefGroup = sItem.sRefGuid Then
+               ' creo un nuovo layer per contenere l'informazione del numero di pezzi da inserire
+               If EgtGetFirstNameInGroup(nId, INFO_COUNTERLY) = GDB_ID.NULL Then
+                  nNewLayer = EgtCreateGroup(nId)
+                  EgtSetName(nNewLayer, INFO_COUNTERLY)
+                  EgtSetColor(nNewLayer, New Color3d(0, 0, 0))
+                  EgtGetBBox(nId, GDB_BB.STANDARD, ptMin, ptMax)
+                  EgtCreateText(nNewLayer, New Point3d((ptMin.x + ptMax.x) / 2, ptMin.y - sItem.nHText - 20, ptMin.z), "# ???", sItem.nHText, GDB_RT.LOC)
+               Else
+                  ' Accendo il layer che contiene il contatore
+                  Dim nCounterLayer As Integer = EgtGetFirstNameInGroup(nId, INFO_COUNTERLY)
+                  EgtSetStatus(nCounterLayer, GDB_ST.ON_)
+               End If
+
+               ' calcolo lo spostamento del pezzo
+               Dim PtMinInRaw As Point3d
+               Dim PtMaxInRaw As Point3d
+               EgtGetBBoxGlob(nId, GDB_BB.STANDARD, PtMinInRaw, PtMaxInRaw)
+               Dim vtMoveToStorage As New Vector3d
+               vtMoveToStorage = sItem.PtStorage() - PtMinInRaw
+               EgtMove(nId, vtMoveToStorage, GDB_RT.GLOB)
+
+               ' aggiorno il layer che indica il numero di pezzi in parcheggio
+               CountPartInFamily(sRefGroup)
+               Return True
+            End If
+         Next
+         ' inserisco il primo pezzo del gruppo nel parcheggio
+         Element = New FamilyPart(sRefGroup, nId)
+         m_ListOfGroupInPark.Add(Element)
+         ' creo un nuovo layer per contenere l'informazione del numero di pezzi da inserire
+         If EgtGetFirstNameInGroup(nId, INFO_COUNTERLY) = GDB_ID.NULL Then
+            nNewLayer = EgtCreateGroup(nId)
+            EgtSetName(nNewLayer, INFO_COUNTERLY)
+            EgtSetColor(nNewLayer, New Color3d(0, 0, 0))
+            EgtGetBBox(nId, GDB_BB.STANDARD, ptMin, ptMax)
+            ' posso migliorarei lposizioanamento in funzione della dimensione della scritta...
+            EgtCreateText(nNewLayer, New Point3d((ptMin.x + ptMax.x) / 2, ptMin.y - Element.nHText - 20, ptMin.z), "# 1", Element.nHText, GDB_RT.LOC)
+         Else
+            ' Accendo il layer che contiene il contatore
+            Dim nCounterLayer As Integer = EgtGetFirstNameInGroup(nId, INFO_COUNTERLY)
+            EgtSetStatus(nCounterLayer, GDB_ST.ON_)
+            ' aggiorno il layer che indica il numero di pezzi in parcheggio
+            CountPartInFamily(sRefGroup)
+         End If
+      End If
+      Return False
+   End Function
+
+   ' verifico se il pezzo ha un gruppo che contiene le informazioni per il taglio
+   Public Function IsInRaw(nIdGroup As Integer) As Boolean
+      ' verifico che il pezzo sia veramente uin parcheggio
+      Dim nPV As Integer = EgtGetFirstNameInGroup(nIdGroup, "PV")
+      If nPV <> GDB_ID.NULL Then
+         ' verifico che non ci siano delle lavorazioni
+         If EgtGetFirstInGroup(nPV) <> GDB_ID.NULL Then
+            Return True
+         End If
+      End If
+      Return False
+   End Function
+#End Region    ' Manager Counter Part
+
    Public Function StoreOnePart(ByVal nId As Integer, Optional ByVal bForced As Boolean = False) As Boolean
       ' Se pezzo in grezzo, metto in parcheggio (sempre possibile)
       If bForced OrElse
          (m_nRawId <> GDB_ID.NULL AndAlso EgtGetParent(nId) = m_nRawId) Then
          ' Ripristino lo stato originale
-         PreRemoveOnePart( nId)
+         PreRemoveOnePart(nId)
+
+         '---------------------- COUNTER PART ----------------------
+         ' se esiste almento un pezzo del gruppo in parcheggio esco
+         If ParkInGroupFamily(nId) Then Return True
+         '---------------------- COUNTER PART ----------------------
+
          ' Parcheggio
          PackPartInStore(nId)
          ' Aggiusto la posizione in Z
@@ -730,7 +988,8 @@ Module EstCalc
       ' Parcheggio
       Const STORE_LARGH As Double = 6000
       Const STORE_DIST As Double = 200
-      Const STORE_OFFS As Double = 20
+      ' 40 il Font usato per indicare il numero di pezzi in parcheggio "# N"
+      Const STORE_OFFS As Double = 20 + 40 + 20
       Dim dStXmin As Double = b3Tab.Min().x - 0.5 * (STORE_LARGH - b3Tab.DimX())
       Return EgtPackBox(nId, dStXmin, -INFINITO, dStXmin + STORE_LARGH, b3Tab.Min().y - STORE_DIST, STORE_OFFS, False)
    End Function
@@ -831,3 +1090,4 @@ Module EstCalc
    End Function
 
 End Module
+

EgtStoneLib/VacuumCups.vb

@@ -8,7 +8,24 @@ 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"
@@ -48,6 +65,20 @@ Module VacuumCups
       Return m_nVacType
    End Function
 
+   Friend Sub GetWeightInformation(Density As Double, MaxSingle As Double, MaxDouble As Double)
+      m_RawDensity = Density
+      m_MaxWeightSinglePlugger = MaxSingle
+      m_MaxWeightDoublePlugger = MaxDouble
+   End Sub
+
+   Friend Sub GetRotationForExtraStrokeY(Rotate As Boolean)
+      bRotateVacuumNearExtraStrokeY = Rotate
+   End Sub
+
+   Friend Sub GetRotationForExtraStrokeX(Rotate As Boolean)
+      bRotateVacuumNearExtraStrokeX = Rotate
+   End Sub
+
    Friend Function GetVacuumId() As Integer
       Return m_nVacId
    End Function
@@ -64,6 +95,8 @@ 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
@@ -73,7 +106,12 @@ Module VacuumCups
       m_nVacId = EgtCopyGlob(nLayId, m_nTempId)
       If m_nVacId = GDB_ID.NULL Then Return False
       ' Angolo di rotazione preferito
-      EgtGetInfo( m_nVacId, KEY_VACLAY_PREFROT, m_dPreferredRot)
+      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
@@ -160,6 +198,18 @@ 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
@@ -261,6 +311,7 @@ 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
@@ -363,6 +414,26 @@ 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)
@@ -374,11 +445,26 @@ 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
+         If bRotateVacuumNearExtraStrokeX And (Math.Abs(dRotAngDeg - 90) < 45 Or Math.Abs(dRotAngDeg - 270) < 45) Then
+            If frMinRect.Orig().x < b3Tab.Center().x Then
+               dPreferredRot = m_dPrefVertRotXMinus
+            Else
+               dPreferredRot = m_dPrefVertRotXPlus
+            End If
+         ElseIf bRotateVacuumNearExtraStrokeY And (Math.Abs(dRotAngDeg - 90) > 45 Or Math.Abs(dRotAngDeg - 270) > 45) 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
          Dim dAngDelta As Double = If( Math.Abs( b3Vac.DimY() - b3Vac.DimX()) < 10 * EPS_SMALL, 90, 180)
-         While dRotAngDeg - m_dPreferredRot >= dAngDelta / 2 
+         While dRotAngDeg - dPreferredRot >= dAngDelta / 2
             dRotAngDeg -= dAngDelta
          End While
-         While dRotAngDeg - m_dPreferredRot <= -dAngDelta / 2
+         While dRotAngDeg - dPreferredRot <= -dAngDelta / 2
             dRotAngDeg += dAngDelta
          End While
       Else
@@ -430,13 +516,53 @@ 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
 
+   ' 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
@@ -457,6 +583,27 @@ Module VacuumCups
       Return bVacOk
    End Function
 
+   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)

EgtStoneLib/VeinMatchingWindow.xaml.vb

@@ -984,7 +984,8 @@ Friend Module VeinMatching
       ' Esporto il file come immagine
       EgtSetCurrentContext(m_nVeinCtx)
       Dim bOk As Boolean = (EgtGetFileType(sFilePath) = FT.IMG)
-      bOk = bOk AndAlso EgtGetImage(EgtGetShowMode(), New Color3d(255, 255, 255), New Color3d(255, 255, 255),
+      bOk = bOk AndAlso EgtGetImage(DirectCast( EgtGetShowMode(), EgtInterface.SM),
+                                    New Color3d(255, 255, 255), New Color3d(255, 255, 255),
                                     m_nImgWidth, m_nImgHeight, sFilePath)
       ' Ripristino il contesto originale
       EgtSetCurrentContext(nMainCtx)

MainWindow/MainWindowM.vb

@@ -192,11 +192,13 @@ Public Class MainWindowM
       Dim sNestKey As String = ""
       EgtUILib.GetPrivateProfileString( S_LICENCE, K_NESTKEY, "", sNestKey, sLicFile)
       EgtSetNestKey( sNestKey)
+      Dim bNetHwKey As Boolean = ( GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
+      EgtSetNetHwKey( bNetHwKey)
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2401, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2401, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2405, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2405, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
       ' Inizializzazione generale di EgtInterface
@@ -267,10 +269,14 @@ Public Class MainWindowM
       EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString())
       EgtPHOTOLib.MainData.SetConfigDir(m_sConfigDir)
       EgtPHOTOLib.MainData.SetKeyLevel(m_nKeyLevel)
-      EgtPHOTOLib.MainData.SetKeyOptions( CInt( m_nKeyOptions))
+      EgtPHOTOLib.MainData.SetKeyOptions(CInt(m_nKeyOptions))
       EgtPHOTOLib.MainData.SetPhotoDir(m_sPhotoDir)
       EgtPHOTOLib.MainData.SetBackUpDir(m_sBackUpDir)
       EgtPHOTOLib.MainData.SetIsOmagOFFICE(True)
+      EgtPHOTOLib.MainData.SetUser(Environment.MachineName & "\" & Environment.UserName & " (" & nInstance.ToString() & ")")
+      Dim sIdKey As String = String.Empty
+      EgtGetKeyInfo(sIdKey)
+      EgtPHOTOLib.MainData.SetKey(sIdKey)
    End Sub
 
    Private Sub ManageInstance()

My Project/AssemblyInfo.vb

@@ -69,6 +69,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.4.1.3")>
-<Assembly: AssemblyFileVersion("2.4.1.3")>
+<Assembly: AssemblyVersion("2.4.5.4")>
+<Assembly: AssemblyFileVersion("2.4.5.4")>
 

MyMachGroupPanel/MyMachGroupPanelVM.vb

@@ -111,7 +111,7 @@ Public Class MyMachGroupPanelVM
       Dim nTabInd As Integer = 1
       Dim nTabCnt As Integer = CamAuto.GetTableCount()
       If nTabCnt > 1 And nTabCnt <= 3 Then
-         Dim dlg As New SelectTableWindowV(Application.Current.MainWindow, New SelectTableWindowVM(nTabCnt))
+         Dim dlg As New SelectTableWindowV(Application.Current.MainWindow, New SelectTableWindowVM(DirectCast(nTabCnt, SelectTableWindowVM.TableNumOpt)))
          dlg.ShowDialog()
          nTabInd = dlg.m_SelTable
       End If
@@ -248,6 +248,10 @@ Public Class MyMachGroupPanelVM
       ' aggiungo alla lista delle lastre correnti/orig
       Dim sSlabNameDB As String = GetSlabName()
       LoadSlabsList(sSlabNameDB)
+
+      ' imposto la visibilità dei comandi per il waterjet
+      OmagOFFICEMap.refNestingTabVM.Set_WJ_Cmd_Visibility()
+
       Return True
    End Function
 

OmagOFFICE.vbproj

@@ -255,6 +255,10 @@
       <DependentUpon>SplitModeV.xaml</DependentUpon>
     </Compile>
     <Compile Include="OptionPanel\MachiningTab\SplitModeVM.vb" />
+    <Compile Include="OptionPanel\NestingTab\MultiSelectionV.xaml.vb">
+      <DependentUpon>MultiSelectionV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="OptionPanel\NestingTab\MultiSelectionVM.vb" />
     <Compile Include="OptionPanel\NestingTab\NestingTabV.xaml.vb">
       <DependentUpon>NestingTabV.xaml</DependentUpon>
     </Compile>
@@ -437,6 +441,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="OptionPanel\NestingTab\MultiSelectionV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="OptionPanel\NestingTab\NestingTabV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

OptionPanel/MachiningTab/MachiningTabVM.vb

@@ -224,13 +224,17 @@ Public Class MachiningTabVM
    End Property
 
    Public Sub Prev(ByVal param As Object)
+      Dim bOk As Boolean = True
       ' Dichiaro solo visualizzazione
       m_bIsShow = True
       If m_MachiningMode = MachiningModeOpt.SPLIT Then
          OmagOFFICEMap.refSplitModeVM.ExitSplitRaw(False)
       Else
-         OmagOFFICEMap.refMoveRawModeVM.ExitMoveRaw()
+         ' verifico collisione dei pezzi in fase di scarico
+         bOk = OmagOFFICEMap.refMoveRawModeVM.ExitMoveRaw()
       End If
+      ' se trovata interferenza tra grezzi (dopo movimentazione) esco
+      If Not bOk Then Return
       ' Torno alla fase precedente
       EgtSetCurrPhase(EgtGetCurrPhase() - 1)
       ' Si va sempre in Split
@@ -255,19 +259,22 @@ Public Class MachiningTabVM
    End Property
 
    Public Sub NextCmd(ByVal param As Object)
+      Dim bOk As Boolean = True
       If m_MachiningMode = MachiningModeOpt.SPLIT Then
          OmagOFFICEMap.refSplitModeVM.ExitSplitRaw(False)
          MachiningMode = MachiningModeOpt.MOVERAWPART
          AutoVisibility = Visibility.Hidden
-         OmagOFFICEMap.refMoveRawModeVM.InitMoveRaw()
+         bOk = OmagOFFICEMap.refMoveRawModeVM.InitMoveRaw()
       Else
-         OmagOFFICEMap.refMoveRawModeVM.ExitMoveRaw()
+         ' se verificata una interferenza allora esco
+         bOk = OmagOFFICEMap.refMoveRawModeVM.ExitMoveRaw()
+         If Not bOk Then Return
          MachiningMode = MachiningModeOpt.SPLIT
          AutoVisibility = Visibility.Visible
          OmagOFFICEMap.refSplitModeVM.InitSplitRaw()
       End If
-      ' Aggiorno possibilità di uscire
-      ManageExit()
+      ' Se non ci sono interferenze tra i grezzi -> aggiorno possibilità di uscire
+      If bOk Then ManageExit()
    End Sub
 
 #End Region ' NextCommand

OptionPanel/MachiningTab/ModifStartEndCutWindowV.xaml

@@ -4,6 +4,7 @@
    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
    IsMinimizable="False"
    ShowInTaskbar="False"
+   Title="{Binding Title}"
    Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
    Height="200" Width="400"
    WindowStartupLocation="CenterOwner">

OptionPanel/MachiningTab/ModifStartEndCutWindowVM.vb

@@ -3,6 +3,15 @@ Imports EgtUILib
 
 Public Class ModifStartEndCutWindowVM
 
+   Private m_Title As String = String.Empty
+   Public Property Title As String
+      Get
+         Return m_Title
+      End Get
+      Set(value As String)
+         m_Title = value
+      End Set
+   End Property
    Public ReadOnly Property ValueMsg As String
       Get
          Return EgtMsg(MSG_SPLITPAGEUC + 35)

OptionPanel/MachiningTab/ModifStartEndWjWindowV.xaml

@@ -4,6 +4,7 @@
    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
    IsMinimizable="False"
    ShowInTaskbar="False"
+   Title="{Binding Title}"
    Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
    Height="400" Width="400"
    WindowStartupLocation="CenterOwner">

OptionPanel/MachiningTab/ModifStartEndWjWindowVM.vb

@@ -6,6 +6,15 @@ Imports EgtWPFLib5
 Public Class ModifStartEndWjWindowVM
    Inherits VMBase
 
+   Private m_Title As String = String.Empty
+   Public Property Title As String
+      Get
+         Return m_Title
+      End Get
+      Set(value As String)
+         m_Title = value
+      End Set
+   End Property
    Public ReadOnly Property ValueMsg As String
       Get
          Return EgtMsg(MSG_SPLITPAGEUC + 35)

OptionPanel/MachiningTab/MoveRawModeVM.vb

@@ -17,6 +17,7 @@ Public Class MoveRawModeVM
    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
+   Private m_CurrRawOnVacuum As Integer = GDB_ID.NULL       ' identificativo pezzo correntemente attaccato alle ventose
 
    Private m_dMoveStep As Double
    Public Property MoveStep As String
@@ -108,6 +109,17 @@ Public Class MoveRawModeVM
 #Region "METHODS"
 
    Friend Function InitMoveRaw() As Boolean
+      '' verifico che il pezzo sia depositabile
+      'If VerifyCollisionWithOtherRawPart(m_CurrRawOnVacuum) Then
+      '   ' mantengo la selezione del pezzo
+      '   EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL)
+      '   OmagOFFICEMap.refStatusBarVM.SetOutputMessage("Collisione pezzi", 3, MSG_TYPE.ERROR_)
+      '   EgtDraw()
+      '   ' non cambio pagina
+      '   Return False
+      'End If
+      ' resetto l'inidice del pezzo da mnovimentare
+      m_CurrRawOnVacuum = GDB_ID.NULL
       ' Deseleziono tutto
       EgtDeselectAll()
       ' Recupero i tagli allungati prima definiti
@@ -158,14 +170,14 @@ Public Class MoveRawModeVM
                ' 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
@@ -182,7 +194,7 @@ Public Class MoveRawModeVM
       If OmagOFFICEMap.refMachiningTabVM.ByHand Then
          LRArrowVisibility = Visibility.Hidden
          RotationVisibility = Visibility.Hidden
-      ' Altrimenti per movimento con ventose
+         ' Altrimenti per movimento con ventose
       Else
          LRArrowVisibility = Visibility.Visible
          RotationVisibility = If(CurrentMachine.bRawSplMovRotate, Visibility.Visible, Visibility.Hidden)
@@ -195,6 +207,17 @@ Public Class MoveRawModeVM
    End Function
 
    Friend Function ExitMoveRaw() As Boolean
+      ' verifico che il pezzo sia depositabile
+      If VerifyCollisionWithOtherRawPart(m_CurrRawOnVacuum) Then
+         ' mantengo la selezione del pezzo
+         EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL)
+         OmagOFFICEMap.refStatusBarVM.SetOutputMessage("Collisione pezzi", 3, MSG_TYPE.ERROR_)
+         EgtDraw()
+         ' non cambio pagina
+         Return False
+      End If
+      ' resetto l'inidice del pezzo da mnovimentare
+      m_CurrRawOnVacuum = GDB_ID.NULL
       ' Deseleziono tutto
       EgtDeselectAll()
       ' Se movimento con ventose
@@ -249,6 +272,141 @@ Public Class MoveRawModeVM
       NotifyPropertyChanged("MoveStep")
    End Sub
 
+   ' verifica che la posizione di rialascio sia corretta, altrimenti coreggo il vettore di posizione
+   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)
+            OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo, 3, MSG_TYPE.WARNING)       '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)
+            OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo, 3, MSG_TYPE.WARNING)       '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)
+            OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo, 3, MSG_TYPE.WARNING)       '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)
+            OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo, 3, MSG_TYPE.WARNING)       '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
+   ' verifica che la posizione di rialascio sia corretta, altrimenti coreggo l'angolo di posizione
+   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)
+            OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo, 3, MSG_TYPE.WARNING)       '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)
+            OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo, 3, MSG_TYPE.WARNING)       '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
+
+   ' Veririfica che il grezzo non entri in colliosione con altri pezzi 
+   Private Function VerifyCollisionWithOtherRawPart(nIdOnVacumm As Integer) As Boolean
+      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
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
@@ -286,9 +444,15 @@ Public Class MoveRawModeVM
          Else
             If m_bRawWithCups Then
                Dim vtMove As New Vector3d(0, m_dMoveStep, 0)
+               ' ----------- INIZIO verifica di essere entro i limiti macchina -----------
+               OmagOFFICEMap.refStatusBarVM.ClearOutputMessage()
+               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
                ' Pezzo troppo piccolo : non si può muovere
@@ -320,9 +484,15 @@ Public Class MoveRawModeVM
       While nRawId <> GDB_ID.NULL
          If m_bRawWithCups Then
             Dim vtMove As New Vector3d(-m_dMoveStep, 0, 0)
+            ' ----------- INIZIO verifica di essere entro i limiti macchina -----------
+            OmagOFFICEMap.refStatusBarVM.ClearOutputMessage()
+            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
             ' Pezzo troppo piccolo : non si può muovere
@@ -353,9 +523,15 @@ Public Class MoveRawModeVM
       While nRawId <> GDB_ID.NULL
          If m_bRawWithCups Then
             Dim vtMove As New Vector3d(m_dMoveStep, 0, 0)
+            ' ----------- INIZIO verifica di essere entro i limiti macchina -----------
+            OmagOFFICEMap.refStatusBarVM.ClearOutputMessage()
+            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
             ' Pezzo troppo piccolo : non si può muovere
@@ -403,9 +579,15 @@ Public Class MoveRawModeVM
          Else
             If m_bRawWithCups Then
                Dim vtMove As New Vector3d(0, -m_dMoveStep, 0)
+               ' ----------- INIZIO verifica di essere entro i limiti macchina -----------
+               OmagOFFICEMap.refStatusBarVM.ClearOutputMessage()
+               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
                ' Pezzo troppo piccolo : non si può muovere
@@ -437,12 +619,19 @@ Public Class MoveRawModeVM
       While nRawId <> GDB_ID.NULL
          If m_bRawWithCups Then
             Dim dAng As Double = m_dRotationStep
+            ' ----------- INIZIO verifica di essere entro i limiti macchina -----------
+            ' Recupero il centro del grezzo
+            Dim ptRawCen As Point3d
+            EgtGetRawPartCenter(nRawId, ptRawCen)
+            OmagOFFICEMap.refStatusBarVM.ClearOutputMessage()
+            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)
                EgtRotate(GetVacuumId(), ptRawCen, Vector3d.Z_AX(), dAng, GDB_RT.GLOB)
                AddRawMoveData(nRawId, dAng, m_RawMoveDataList)
+            Else
+               VacuumCups.ptStartPointLift.Rotate(ptRawCen, Vector3d.Z_AX(), dAng)
+               VacuumCups.dDegRotStartAng -= dAng
             End If
          Else
             OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2), 3, MSG_TYPE.WARNING)
@@ -472,12 +661,19 @@ Public Class MoveRawModeVM
       While nRawId <> GDB_ID.NULL
          If m_bRawWithCups Then
             Dim dAng As Double = -m_dRotationStep
+            ' ----------- INIZIO verifica di essere entro i limiti macchina -----------
+            ' Recupero il centro del grezzo
+            Dim ptRawCen As Point3d
+            EgtGetRawPartCenter(nRawId, ptRawCen)
+            OmagOFFICEMap.refStatusBarVM.ClearOutputMessage()
+            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)
                EgtRotate(GetVacuumId(), ptRawCen, Vector3d.Z_AX(), dAng, GDB_RT.GLOB)
                AddRawMoveData(nRawId, dAng, m_RawMoveDataList)
+            Else
+               VacuumCups.ptStartPointLift.Rotate(ptRawCen, Vector3d.Z_AX(), dAng)
+               VacuumCups.dDegRotStartAng -= dAng
             End If
          Else
             OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2), 3, MSG_TYPE.WARNING)
@@ -545,17 +741,49 @@ Public Class MoveRawModeVM
          ' Se trovato il grezzo
          If nParentId = nRawGroupId Then
             Dim nStat As Integer = GDB_ST.ON_
+            ' Se il pezzo corrente è selezionato allora lo disattivo -> deposito del pezzo
             EgtGetStatus(nId, nStat)
             If nStat = GDB_ST.SEL Then
                EgtSetStatus(nId, GDB_ST.ON_)
-               ' Se con ventose, le nascondo
-               If Not OmagOFFICEMap.refMachiningTabVM.ByHand Then EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
+               ' prima di rilasciare il pezzo verifico che non vada in collisione con altri pezzi sulla tavola
+               If VerifyCollisionWithOtherRawPart(nId) Then
+                  ' mantengo la selezione del pezzo
+                  EgtSetStatus(nId, GDB_ST.SEL)
+                  OmagOFFICEMap.refStatusBarVM.SetOutputMessage("Collisione pezzi", 3, MSG_TYPE.ERROR_)
+               Else
+                  ' Se con ventose, le nascondo
+                  If Not OmagOFFICEMap.refMachiningTabVM.ByHand Then EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
+               End If
+
             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)
+                  OmagOFFICEMap.refStatusBarVM.SetOutputMessage("Collisione pezzi", 3, MSG_TYPE.ERROR_)
+                  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
+
                EgtDeselectAll()
                EgtSetStatus(nId, GDB_ST.SEL)
                ' Se con ventose, le posiziono sul grezzo
                If Not OmagOFFICEMap.refMachiningTabVM.ByHand 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, sMachIniFile)
+                  Dim MaxDoublePlugger As Double = 750
+                  MaxDoublePlugger = GetPrivateProfileDouble(S_MACH_RAWMOVE, K_MACH_WEIGHT_DOUBLEPLUGGER, MaxDoublePlugger, sMachIniFile)
+                  Dim AverageDensity As Double = 2700
+                  AverageDensity = GetPrivateProfileDouble(S_MATERIALS, K_AVERAGEDENSITY, AverageDensity, sMachIniFile)
+                  VacuumCups.GetWeightInformation(AverageDensity, MaxSinglePlugger, MaxDoublePlugger)
+                  VacuumCups.GetRotationForExtraStrokeY(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEY, 0, sMachIniFile) <> 0)
+                  VacuumCups.GetRotationForExtraStrokeX(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEX, 0, sMachIniFile) <> 0)
                   If PutVacuumCupsOnRaw(nId, rmData) Then
                      ' Visualizzo le ventose
                      EgtSetStatus(GetVacuumId(), GDB_ST.ON_)
@@ -565,10 +793,19 @@ Public Class MoveRawModeVM
                      ' Reset eventuale messaggio
                      OmagOFFICEMap.refStatusBarVM.ClearOutputMessage()
                   Else
+                     ' Visualizzo le ventose
+                     EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
                      ' Aggiorno i dati
                      m_bRawWithCups = False
-                     ' Messaggio di avvertimento (Pezzo troppo piccolo : non si può muovere)
-                     OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2), 3, MSG_TYPE.WARNING)
+                     If VacuumCups.bOverWeight Then
+                        ' Messaggio di avvertimento (Pezzo troppo piccolo : non si può muovere)
+                        OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(MSG_MOVERAWPAGEUC + 4), 3, MSG_TYPE.WARNING)
+                     ElseIf VacuumCups.bExtraStroke Then
+                        OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(MSG_MOVERAWPAGEUC + 5), 3, MSG_TYPE.WARNING) 'Pezzo oltre le corse : non si può muovere
+                     Else
+                        ' Messaggio di avvertimento (Pezzo troppo piccolo : non si può muovere)
+                        OmagOFFICEMap.refStatusBarVM.SetOutputMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2), 3, MSG_TYPE.WARNING)
+                     End If
                   End If
                End If
             End If
@@ -577,6 +814,15 @@ Public Class MoveRawModeVM
          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)
+         OmagOFFICEMap.refStatusBarVM.SetOutputMessage("Collisione pezzi", 3, MSG_TYPE.ERROR_)
+         EgtDraw()
+      End If
+
    End Sub
 
 #End Region    ' EVENTS

OptionPanel/MachiningTab/SplitModeV.xaml

@@ -29,11 +29,13 @@
          </Grid.ColumnDefinitions>
 
          <Button Grid.Column="1"
+                 IsEnabled="{Binding bEnabledCommandMove}"
                  Style="{StaticResource OptionPanel_Button}"
                  Command="{Binding MoveUpCommand}">
             <Image Source="/Resources/MachiningTab/UpArrow.png"/>
          </Button>
          <Button Grid.Column="2"
+                 IsEnabled="{Binding bEnabledCommandMove}"
                  Style="{StaticResource OptionPanel_Button}"
                  Command="{Binding MoveDownCommand}">
             <Image Source="/Resources/MachiningTab/DownArrow.png"/>

OptionPanel/MachiningTab/SplitModeVM.vb

@@ -42,6 +42,17 @@ Public Class SplitModeVM
       End Get
    End Property
 
+   Private m_bEnabledCommandMove As Boolean = False
+   Public Property bEnabledCommandMove As Boolean
+      Get
+         Return m_bEnabledCommandMove
+      End Get
+      Set(value As Boolean)
+         m_bEnabledCommandMove = value
+         NotifyPropertyChanged("bEnabledCommandMove")
+      End Set
+   End Property
+
    Private m_SplitModeIsEnabled As Boolean
    Public Property SplitModeIsEnabled As Boolean
       Get
@@ -786,6 +797,15 @@ Public Class SplitModeVM
       vtXY.Normalize()
       Dim ptCen As Point3d = Point3d.Media(ptMin, ptMax) + vtXY * If(Not b2ndLav, -0.8, 0.8) * dHtxt
       ptCen.z = ptMax.z + 1
+
+      ' ricavo la posizione del punto (se waterjet separata)
+      If m_MachiningList(nI).m_nType = MCH_OY.WATERJETTING Or m_MachiningList(nI).m_nType = MCH_OY.MILLING Then
+         Dim ptMid As Point3d
+         Dim vVers As Vector3d
+         MidPointOfCurve(m_MachiningList(nI).m_nId, ptMid, vVers)
+         ptCen = ptMid ' + vVers * If(Not b2ndLav, -0.8, 0.8) * dHtxt
+      End If
+
       If bNumber Then
          Dim nNbrId As Integer = EgtCreateTextAdv(m_nNbrGrpId, ptCen, 0, (nI + 1).ToString(), "",
                                                    300, False, dHtxt, dRat, 0, INS_POS.MC)
@@ -840,6 +860,36 @@ Public Class SplitModeVM
       Return EgtGetBBoxGlob(nPvId, GDB_BB.STANDARD, ptMin, ptMax)
    End Function
 
+   Private Function MidPointOfCurve(nOperId As Integer, ByRef ptMid As Point3d, ByRef vVers As Vector3d) As Boolean
+      Dim nPvId As Integer = GDB_ID.NULL
+      EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
+      ' creo un layer ausiliario per creare la curva composita
+      Dim AuxLayer As Integer = EgtCreateGroup(nPvId)
+      ' imposto la lavorazione corrente
+      EgtSetCurrMachining(nOperId)
+      ' recupero tutte le entità della lavorazione corrente
+      Dim nInd As Integer = 0
+      Dim nIdCurr As Integer
+      Dim nSub As Integer
+      Dim CurveCompoList As New List(Of Integer)
+      While EgtGetMachiningGeometry(nInd, nIdCurr, nSub)
+         CurveCompoList.Add(nIdCurr)
+         nInd += 1
+      End While
+      Dim PtNearStart As Point3d
+      Dim nIdCutPath As Integer = EgtCreateCurveCompoByChain(AuxLayer, CurveCompoList.ToArray, PtNearStart, False)
+      Dim dLength As Double = 0
+      EgtCurveLength(nIdCutPath, dLength)
+      Dim dParam As Double = 0
+      EgtCurveParamAtLength(nIdCutPath, dLength / 2, dParam)
+      EgtAtParamPoint(nIdCutPath, dParam, GDB_RT.GLOB, ptMid)
+      EgtAtParamVector(nIdCutPath, dParam, -1, vVers)
+      vVers.Normalize()
+      vVers.Rotate(Vector3d.Z_AX, 90)
+      EgtErase(AuxLayer)
+      Return True
+   End Function
+
    Private Function AddMachiningDirection(ptStart As Point3d, vtDir As Vector3d, dLen As Double, bTwin As Boolean) As Integer
       Dim dArrX As Double = dLen * Math.Cos(30 * Math.PI / 180)
       Dim dArrY As Double = dLen * Math.Sin(30 * Math.PI / 180)
@@ -1054,16 +1104,21 @@ Public Class SplitModeVM
    Public Sub OnOff(ByVal param As Object)
       If m_CurrFirstInd = -1 Then Return
       For Index = m_CurrFirstInd To m_CurrLastInd
-         Dim nI As Integer = m_ItemList(Index).Ind
-         If m_MachiningList(nI).m_bEnabled Then
-            m_MachiningList(nI).m_bEnabled = False
-            m_ItemList(Index).bIsActive = False
-         Else
-            m_MachiningList(nI).m_bEnabled = True
-            m_ItemList(Index).bIsActive = True
+         If m_ItemList(Index).IsSelected Then
+            If Not m_ItemList(Index).IsSelected Then
+               Continue For
+            End If
+            Dim nI As Integer = m_ItemList(Index).Ind
+            If m_MachiningList(nI).m_bEnabled Then
+               m_MachiningList(nI).m_bEnabled = False
+               m_ItemList(Index).bIsActive = False
+            Else
+               m_MachiningList(nI).m_bEnabled = True
+               m_ItemList(Index).bIsActive = True
+            End If
+            ColorMachining(m_MachiningList(nI))
+            ColorNumberArrow(nI)
          End If
-         ColorMachining(m_MachiningList(nI))
-         ColorNumberArrow(nI)
       Next
       EgtDraw()
       ' Imposto flag di modifica
@@ -1156,6 +1211,9 @@ Public Class SplitModeVM
       If m_CurrFirstInd = -1 Then Return
       Dim bGenModif As Boolean = False
       For Index = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          ' Provo ad entrambi gli estremi
          Dim bModif As Boolean = AdjustBothCuts(nI)
@@ -1190,6 +1248,9 @@ Public Class SplitModeVM
       If m_CurrFirstInd = -1 Then Return
       Dim bGenModif As Boolean = False
       For Index = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          ' Eseguo
          If AdjustStartCut(nI) Then
@@ -1218,6 +1279,9 @@ Public Class SplitModeVM
       If m_CurrFirstInd = -1 Then Return
       Dim bGenModif As Boolean = False
       For Index = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          ' Eseguo
          If AdjustEndCut(nI) Then
@@ -1359,6 +1423,9 @@ Public Class SplitModeVM
       If m_CurrFirstInd = -1 Then Return
       Dim bGenModif As Boolean = False
       For Index = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          If m_MachiningList(nI).m_sLay = NAME_OUTLOOP Then
             EgtSetCurrMachining(m_MachiningList(nI).m_nId)
@@ -1496,6 +1563,9 @@ Public Class SplitModeVM
       If m_CurrFirstInd = -1 Then Return
       Dim bGenModif As Boolean = False
       For Index = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          If m_MachiningList(nI).m_sLay = NAME_OUTLOOP Then
             EgtSetCurrMachining(m_MachiningList(nI).m_nId)
@@ -1698,10 +1768,24 @@ Public Class SplitModeVM
    End Property
 
    Public Sub ModifStart(ByVal param As Object)
+      Dim bFirstInd As Boolean = True
+      Dim bFirstMill As Boolean = True
+      Dim bFirstWJ As Boolean = True
+      ' elenco delle variabili : MCH_MY.SAWING/MCH_MY.MILLING
+      Dim dUsal As Double = 0
+      ' elenco delle variabili : MCH_MY.WATERJETTING
+      Dim dWJAddLen As Double = 0
+      Dim bWJLiHole As Boolean = True
+      Dim nWJTangDist As Double = 0
+      Dim nWJPerpDist As Double = 0
+      Dim nWJLeadInType As Integer = 0
       ' Recupero la lavorazione corrente
       If m_CurrFirstInd = -1 Then Return
       Dim bGenModif As Boolean = False
       For Index = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          Dim nOperId As Integer = m_MachiningList(nI).m_nId
          Dim nMachiningType As Integer = EgtGetOperationType(nOperId)
@@ -1710,14 +1794,19 @@ Public Class SplitModeVM
             Dim dOrigUsal As Double = 0
             EgtGetInfo(nOperId, INFO_MCH_USER_SAL, dOrigUsal)
             ' Dialogo richiesta valore
-            Dim ModifStartWindow As New ModifStartEndCutWindowV
-            Dim ModifStartWindowVM As New ModifStartEndCutWindowVM
-            ModifStartWindow.DataContext = ModifStartWindowVM
-            ModifStartWindow.Owner = Application.Current.MainWindow
-            ModifStartWindowVM.SetVal(dOrigUsal)
-            If Not ModifStartWindow.ShowDialog() Then Return
-            ' Modifica della lavorazione
-            Dim dUsal As Double = ModifStartWindowVM.GetVal()
+            If bFirstInd Then
+               Dim ModifStartWindow As New ModifStartEndCutWindowV
+               Dim ModifStartWindowVM As New ModifStartEndCutWindowVM
+               ModifStartWindowVM.Title = "Sawing"
+               ModifStartWindow.DataContext = ModifStartWindowVM
+               ModifStartWindow.Owner = Application.Current.MainWindow
+               ModifStartWindowVM.SetVal(dOrigUsal)
+               If Not ModifStartWindow.ShowDialog() Then Return
+               ' Modifica della lavorazione
+               dUsal = ModifStartWindowVM.GetVal()
+               bFirstInd = False
+            End If
+
             Dim bRepeat As Boolean = False
             Do
                EgtSetCurrMachining(nOperId)
@@ -1739,41 +1828,81 @@ Public Class SplitModeVM
             ColorMachining(m_MachiningList(nI))
             ColorNumberArrow(nI)
             bGenModif = True
-         ' se altrimenti getto d'acqua
-         ElseIf nMachiningType = MCH_MY.WATERJETTING Then
-            ' Recupero i valori attuali della lavorazione
-            Dim dAddLen As Double = 0
-            Dim bLiHole As Boolean = True
-            Dim nTangDist As Double = 0
-            Dim nPerpDist As Double = 0
-            Dim LeadInTypeId As Integer = 0
-            EgtSetCurrMachining(nOperId)
-            EgtGetMachiningParam(MCH_MP.STARTADDLEN, dAddLen)
-            EgtGetMachiningParam(MCH_MP.LIHOLE, bLiHole)
-            EgtGetMachiningParam(MCH_MP.LITANG, nTangDist)
-            EgtGetMachiningParam(MCH_MP.LIPERP, nPerpDist)
-            EgtGetMachiningParam(MCH_MP.LEADINTYPE, LeadInTypeId)
-            ' Dialogo richiesta valori
-            Dim ModifStartWnd As New ModifStartEndWjWindowV
-            Dim ModifStartWndVM As New ModifStartEndWjWindowVM
-            ModifStartWnd.DataContext = ModifStartWndVM
-            ModifStartWnd.Owner = Application.Current.MainWindow
-            ModifStartWndVM.HoleVisibility = Visibility.Visible
-            ModifStartWndVM.LeadInVisibility = Visibility.Visible
-            ModifStartWndVM.LeadOutVisibility = Visibility.Hidden
-            ModifStartWndVM.SetVal(dAddLen)
-            ModifStartWndVM.SetHole(bLiHole)
-            ModifStartWndVM.SetLeadInType(LeadInTypeId)
-            ModifStartWndVM.SetLiTangDist(nTangDist)
-            ModifStartWndVM.SetLiPerpDist(nPerpDist)
-            If Not ModifStartWnd.ShowDialog() Then Return
+
+         ElseIf nMachiningType = MCH_MY.MILLING Then ' And m_MachiningList(nI).m_sLay = NAME_ONPATH
+
+            ' leggo il valore salvato nella geometria
+            Dim dOrigUsal As Double = 0
+            EgtGetInfo(nOperId, INFO_MCH_USER_SAL, dOrigUsal)
+            ' Dialogo richiesta valore
+            If bFirstMill Then
+               Dim ModifStartWindow As New ModifStartEndCutWindowV
+               Dim ModifStartWindowVM As New ModifStartEndCutWindowVM
+               ModifStartWindowVM.Title = "Milling"
+               ModifStartWindow.DataContext = ModifStartWindowVM
+               ModifStartWindow.Owner = Application.Current.MainWindow
+               ModifStartWindowVM.SetVal(dOrigUsal)
+               If Not ModifStartWindow.ShowDialog() Then Return
+               ' Modifica della lavorazione
+               dUsal = ModifStartWindowVM.GetVal()
+               bFirstMill = False
+            End If
             ' Modifica della lavorazione
             EgtSetCurrMachining(nOperId)
-            EgtSetMachiningParam(MCH_MP.LIHOLE, ModifStartWndVM.GetHole())
-            EgtSetMachiningParam(MCH_MP.STARTADDLEN, ModifStartWndVM.GetVal())
-            EgtSetMachiningParam(MCH_MP.LEADINTYPE, ModifStartWndVM.GetLeadInType().Id)
-            EgtSetMachiningParam(MCH_MP.LITANG, ModifStartWndVM.GetLiTangDist())
-            EgtSetMachiningParam(MCH_MP.LIPERP, ModifStartWndVM.GetLiPerpDist())
+            Dim dAddLen As Double = 0
+            EgtGetMachiningParam(MCH_MP.STARTADDLEN, dAddLen)
+            EgtSetMachiningParam(MCH_MP.STARTADDLEN, dAddLen + dUsal - dOrigUsal)
+            EgtSetInfo(nOperId, INFO_MCH_USER_SAL, dUsal)
+            UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
+            bGenModif = True
+
+            ' se altrimenti getto d'acqua
+         ElseIf nMachiningType = MCH_MY.WATERJETTING Then
+            ' Recupero i valori attuali della lavorazione
+            If bFirstWJ Then
+               Dim bOriginalIsLeadIn As Boolean = True
+               Dim dOriginalAddLen As Double = 0
+               Dim bOriginalLiHole As Boolean = True
+               Dim nOriginalTangDist As Double = 0
+               Dim nOriginalPerpDist As Double = 0
+               Dim nOriginalLeadInType As Integer = 0
+               EgtSetCurrMachining(nOperId)
+               EgtGetMachiningParam(MCH_MP.STARTADDLEN, dOriginalAddLen)
+               EgtGetMachiningParam(MCH_MP.LIHOLE, bOriginalLiHole)
+               EgtGetMachiningParam(MCH_MP.LITANG, nOriginalTangDist)
+               EgtGetMachiningParam(MCH_MP.LIPERP, nOriginalPerpDist)
+               EgtGetMachiningParam(MCH_MP.LEADINTYPE, nOriginalLeadInType)
+               ' Dialogo richiesta valori
+               Dim ModifStartWnd As New ModifStartEndWjWindowV
+               Dim ModifStartWndVM As New ModifStartEndWjWindowVM
+               ModifStartWndVM.Title = "Water jetting"
+               ModifStartWnd.DataContext = ModifStartWndVM
+               ModifStartWnd.Owner = Application.Current.MainWindow
+               ModifStartWndVM.HoleVisibility = Visibility.Visible
+               ModifStartWndVM.LeadInVisibility = Visibility.Visible
+               ModifStartWndVM.LeadOutVisibility = Visibility.Hidden
+               ModifStartWndVM.SetVal(dOriginalAddLen)
+               ModifStartWndVM.SetHole(bOriginalLiHole)
+               ModifStartWndVM.SetLeadInType(nOriginalLeadInType)
+               ModifStartWndVM.SetLiTangDist(nOriginalTangDist)
+               ModifStartWndVM.SetLiPerpDist(nOriginalPerpDist)
+               If Not ModifStartWnd.ShowDialog() Then Return
+
+               dWJAddLen = ModifStartWndVM.GetVal()
+               bWJLiHole = ModifStartWndVM.GetHole()
+               nWJTangDist = ModifStartWndVM.GetLiTangDist()
+               nWJPerpDist = ModifStartWndVM.GetLiPerpDist()
+               nWJLeadInType = ModifStartWndVM.GetLeadInType().Id
+               bFirstWJ = False
+            End If
+
+            ' Modifica della lavorazione
+            EgtSetCurrMachining(nOperId)
+            EgtSetMachiningParam(MCH_MP.LIHOLE, bWJLiHole)
+            EgtSetMachiningParam(MCH_MP.STARTADDLEN, dWJAddLen)
+            EgtSetMachiningParam(MCH_MP.LEADINTYPE, nWJLeadInType)
+            EgtSetMachiningParam(MCH_MP.LITANG, nWJTangDist)
+            EgtSetMachiningParam(MCH_MP.LIPERP, nWJPerpDist)
             UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
             ' verifico interferenza
             EgtVerifyMachining(m_MachiningList(nI).m_nId, m_MachiningList(nI).m_nInterf)
@@ -1803,10 +1932,24 @@ Public Class SplitModeVM
    End Property
 
    Public Sub ModifEnd(ByVal param As Object)
+      Dim bFirstInd As Boolean = True
+      Dim bFirstMill As Boolean = True
+      Dim bFirstWJ As Boolean = True
+      ' elenco delle variabili : MCH_MY.SAWING/MCH_MY.MILLING
+      Dim dUeal As Double = 0
+      ' elenco delle variabili : MCH_MY.WATERJETTING
+      Dim dWJAddLen As Double = 0
+      Dim nWJTangDist As Double = 0
+      Dim nWJPerpDist As Double = 0
+      Dim nWJLeadInType As Integer = 0
+
       ' Recupero la lavorazione corrente
       If m_CurrFirstInd = -1 Then Return
       Dim bGenModif As Boolean = False
       For Index = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          Dim nOperId As Integer = m_MachiningList(nI).m_nId
          Dim nMachiningType As Integer = EgtGetOperationType(nOperId)
@@ -1815,14 +1958,18 @@ Public Class SplitModeVM
             Dim dOrigUeal As Double = 0
             EgtGetInfo(nOperId, INFO_MCH_USER_EAL, dOrigUeal)
             ' Dialogo richiesta valore
-            Dim ModifStartWindow As New ModifStartEndCutWindowV
-            Dim ModifStartWindowVM As New ModifStartEndCutWindowVM
-            ModifStartWindow.DataContext = ModifStartWindowVM
-            ModifStartWindow.Owner = Application.Current.MainWindow
-            ModifStartWindowVM.SetVal(dOrigUeal)
-            If Not ModifStartWindow.ShowDialog() Then Return
-            ' Modifica della lavorazione
-            Dim dUeal As Double = ModifStartWindowVM.GetVal()
+            If bFirstInd Then
+               Dim ModifStartWindow As New ModifStartEndCutWindowV
+               Dim ModifStartWindowVM As New ModifStartEndCutWindowVM
+               ModifStartWindowVM.Title = "Sawing"
+               ModifStartWindow.DataContext = ModifStartWindowVM
+               ModifStartWindow.Owner = Application.Current.MainWindow
+               ModifStartWindowVM.SetVal(dOrigUeal)
+               If Not ModifStartWindow.ShowDialog() Then Return
+               ' Modifica della lavorazione
+               dUeal = ModifStartWindowVM.GetVal()
+               bFirstInd = False
+            End If
             Dim bRepeat As Boolean = False
             Do
                EgtSetCurrMachining(nOperId)
@@ -1846,37 +1993,75 @@ Public Class SplitModeVM
             ColorMachining(m_MachiningList(nI))
             ColorNumberArrow(nI)
             bGenModif = True
+
+         ElseIf nMachiningType = MCH_MY.MILLING Then ' And m_MachiningList(nI).m_sLay = NAME_ONPATH
+
+            Dim dOrigUeal As Double = 0
+            EgtGetInfo(nOperId, INFO_MCH_USER_EAL, dOrigUeal)
+            ' ------------------ INIZIO PREPARAZIONE TASTIERINO VIRTUALE ------------------
+            If bFirstMill Then
+               Dim ModifStartWindow As New ModifStartEndCutWindowV
+               Dim ModifStartWindowVM As New ModifStartEndCutWindowVM
+               ModifStartWindowVM.Title = "Milling"
+               ModifStartWindow.DataContext = ModifStartWindowVM
+               ModifStartWindow.Owner = Application.Current.MainWindow
+               ModifStartWindowVM.SetVal(dOrigUeal)
+               If Not ModifStartWindow.ShowDialog() Then Return
+               ' Modifica della lavorazione
+               dUeal = ModifStartWindowVM.GetVal()
+               bFirstMill = False
+            End If
+            ' ------------------ FINE PREPARAZIONE TASTIERINO VIRTUALE ------------------
+            ' Modifica della lavorazione
+            EgtSetCurrMachining(nOperId)
+            Dim dAddLen As Double = 0
+            EgtGetMachiningParam(MCH_MP.ENDADDLEN, dAddLen)
+            EgtSetMachiningParam(MCH_MP.ENDADDLEN, dAddLen + dUeal - dOrigUeal)
+            EgtSetInfo(nOperId, INFO_MCH_USER_EAL, dUeal)
+            UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
+            bGenModif = True
+
             ' se altrimenti getto d'acqua
          ElseIf nMachiningType = MCH_MY.WATERJETTING Then
             ' Recupero i valori attuali della lavorazione
-            Dim dAddLen As Double = 0
-            Dim nTangDist As Double = 0
-            Dim nPerpDist As Double = 0
-            Dim LeadOutTypeId As Integer = 0
-            EgtSetCurrMachining(nOperId)
-            EgtGetMachiningParam(MCH_MP.ENDADDLEN, dAddLen)
-            EgtGetMachiningParam(MCH_MP.LOTANG, nTangDist)
-            EgtGetMachiningParam(MCH_MP.LOPERP, nPerpDist)
-            EgtGetMachiningParam(MCH_MP.LEADOUTTYPE, LeadOutTypeId)
-            ' Dialogo richiesta valori
-            Dim ModifStartWnd As New ModifStartEndWjWindowV()
-            Dim ModifStartWndVM As New ModifStartEndWjWindowVM
-            ModifStartWnd.DataContext = ModifStartWndVM
-            ModifStartWnd.Owner = Application.Current.MainWindow
-            ModifStartWndVM.HoleVisibility = Visibility.Hidden
-            ModifStartWndVM.LeadInVisibility = Visibility.Hidden
-            ModifStartWndVM.LeadOutVisibility = Visibility.Visible
-            ModifStartWndVM.SetVal(dAddLen)
-            ModifStartWndVM.SetLeadOutType(LeadOutTypeId)
-            ModifStartWndVM.SetLoTangDist(nTangDist)
-            ModifStartWndVM.SetLoPerpDist(nPerpDist)
-            If Not ModifStartWnd.ShowDialog() Then Return
+            If bFirstWJ Then
+               Dim dAddLen As Double = 0
+               Dim nTangDist As Double = 0
+               Dim nPerpDist As Double = 0
+               Dim LeadOutTypeId As Integer = 0
+               EgtSetCurrMachining(nOperId)
+               EgtGetMachiningParam(MCH_MP.ENDADDLEN, dAddLen)
+               EgtGetMachiningParam(MCH_MP.LOTANG, nTangDist)
+               EgtGetMachiningParam(MCH_MP.LOPERP, nPerpDist)
+               EgtGetMachiningParam(MCH_MP.LEADOUTTYPE, LeadOutTypeId)
+               ' Dialogo richiesta valori
+               Dim ModifStartWnd As New ModifStartEndWjWindowV()
+               Dim ModifStartWndVM As New ModifStartEndWjWindowVM
+               ModifStartWndVM.Title = "Water jetting"
+               ModifStartWnd.DataContext = ModifStartWndVM
+               ModifStartWnd.Owner = Application.Current.MainWindow
+               ModifStartWndVM.HoleVisibility = Visibility.Hidden
+               ModifStartWndVM.LeadInVisibility = Visibility.Hidden
+               ModifStartWndVM.LeadOutVisibility = Visibility.Visible
+               ModifStartWndVM.SetVal(dAddLen)
+               ModifStartWndVM.SetLeadOutType(LeadOutTypeId)
+               ModifStartWndVM.SetLoTangDist(nTangDist)
+               ModifStartWndVM.SetLoPerpDist(nPerpDist)
+               If Not ModifStartWnd.ShowDialog() Then Return
+
+               dWJAddLen = ModifStartWndVM.GetVal()
+               nWJTangDist = ModifStartWndVM.GetLoTangDist()
+               nWJPerpDist = ModifStartWndVM.GetLoPerpDist()
+               nWJLeadInType = ModifStartWndVM.GetLeadOutType().Id
+
+               bFirstWJ = False
+            End If
             ' Modifica della lavorazione
             EgtSetCurrMachining(nOperId)
-            EgtSetMachiningParam(MCH_MP.ENDADDLEN, ModifStartWndVM.GetVal())
-            EgtSetMachiningParam(MCH_MP.LEADOUTTYPE, ModifStartWndVM.GetLeadOutType().Id)
-            EgtSetMachiningParam(MCH_MP.LOTANG, ModifStartWndVM.GetLoTangDist())
-            EgtSetMachiningParam(MCH_MP.LOPERP, ModifStartWndVM.GetLoPerpDist())
+            EgtSetMachiningParam(MCH_MP.ENDADDLEN, dWJAddLen)
+            EgtSetMachiningParam(MCH_MP.LEADOUTTYPE, nWJLeadInType)
+            EgtSetMachiningParam(MCH_MP.LOTANG, nWJTangDist)
+            EgtSetMachiningParam(MCH_MP.LOPERP, nWJPerpDist)
             UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
             ' verifico interferenza
             EgtVerifyMachining(m_MachiningList(nI).m_nId, m_MachiningList(nI).m_nInterf)
@@ -1908,6 +2093,9 @@ Public Class SplitModeVM
    Public Sub Pause(ByVal param As Object)
       If m_CurrFirstInd = -1 Then Return
       For Index = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          Dim nOperId As Integer = m_MachiningList(nI).m_nId
          If GetPause(nOperId) Then
@@ -1940,6 +2128,9 @@ Public Class SplitModeVM
    Public Sub Invert(ByVal param As Object)
       If m_CurrFirstInd = -1 Then Return
       For Index = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          ' Si possono invertire solo i tagli di lama
          If m_MachiningList(nI).m_nType <> MCH_OY.SAWING Then Continue For
@@ -2252,29 +2443,34 @@ Public Class SplitModeVM
                ' ------------------------ verifico che le lavorazioni siano dello stesso tipo ------------------------
                OmagOFFICEMap.refSplitModeVM.VerifyHomogenousMachining(ItemList)
                ' -----------------------------------------------------------------------------------------------------
+               ' riordino l'elenco delle lavorazioni
+               ItemList.Sort(Function(x, y) Comparer(Of Integer).Default.Compare(OmagOFFICEMap.refSplitModeVM.m_ItemList.IndexOf(x), OmagOFFICEMap.refSplitModeVM.m_ItemList.IndexOf(y)))
+               ' ------------------------ verifico che le lavorazioni siano contigue ---------------------------------
+               OmagOFFICEMap.refSplitModeVM.bEnabledCommandMove = VerifyContinuity(ItemList)
+               ' -----------------------------------------------------------------------------------------------------
+
+               'If Not My.Computer.Keyboard.ShiftKeyDown And (My.Computer.Keyboard.CtrlKeyDown And value) Then
+               '   ' verifico che siano contigui
+               '   Dim bContigus As Boolean = False
+               '   Dim LastSel As NameIdLsBxItem = OmagOFFICEMap.refSplitModeVM.m_SelectedItemsList(OmagOFFICEMap.refSplitModeVM.m_SelectedItemsList.Count - 1)
+               '   If OmagOFFICEMap.refSplitModeVM.m_SelectedItemsList.Count = 1 Then
+               '      bContigus = True
+               '   Else
+               '      For Each Item In ItemList
+               '         If Item.Ind = LastSel.Ind + 1 Or Item.Ind = LastSel.Ind - 1 Then
+               '            bContigus = True
+               '         End If
+               '      Next
+               '   End If
+               '   ' se non contiguo, elimino dai selezionati il primo(che è l'ultimo ad essere stato selezionato)
+               '   If Not bContigus Then
+               '      ItemList.Remove(LastSel)
+               '      OmagOFFICEMap.refSplitModeVM.m_SelectedItemsList.RemoveAt(OmagOFFICEMap.refSplitModeVM.m_SelectedItemsList.Count - 1)
+               '      OmagOFFICEMap.refSplitModeVM.ItemList(LastSel.Ind).IsSelected = Not value 'm_IsSelected = Not value
+               '      ' disabilito il pulsanti per spostare le lavorazioni
+               '   End If
+               'End If
 
-               ItemList.Sort(Function(x, y) Comparer(Of Integer).Default.Compare(OmagOFFICEMap.refSplitModeVM.m_ItemList.IndexOf(x),
-                                                                              OmagOFFICEMap.refSplitModeVM.m_ItemList.IndexOf(y)))
-               If Not My.Computer.Keyboard.ShiftKeyDown And (My.Computer.Keyboard.CtrlKeyDown And value) Then
-                  ' verifico che siano contigui
-                  Dim bContigus As Boolean = False
-                  Dim LastSel As NameIdLsBxItem = OmagOFFICEMap.refSplitModeVM.m_SelectedItemsList(OmagOFFICEMap.refSplitModeVM.m_SelectedItemsList.Count - 1)
-                  If OmagOFFICEMap.refSplitModeVM.m_SelectedItemsList.Count = 1 Then
-                     bContigus = True
-                  Else
-                     For Each Item In ItemList
-                        If Item.Ind = LastSel.Ind + 1 Or Item.Ind = LastSel.Ind - 1 Then
-                           bContigus = True
-                        End If
-                     Next
-                  End If
-                  ' se non contiguo, elimino dai selezionati il primo(che è l'ultimo ad essere stato selezionato)
-                  If Not bContigus Then
-                     ItemList.Remove(LastSel)
-                     OmagOFFICEMap.refSplitModeVM.m_SelectedItemsList.RemoveAt(OmagOFFICEMap.refSplitModeVM.m_SelectedItemsList.Count - 1)
-                     OmagOFFICEMap.refSplitModeVM.ItemList(LastSel.Ind).IsSelected = Not value 'm_IsSelected = Not value
-                  End If
-               End If
                ' resetto marcatura lavorazioni
                If OmagOFFICEMap.refSplitModeVM.m_CurrFirstInd > -1 Then
                   For Index = OmagOFFICEMap.refSplitModeVM.m_CurrFirstInd To OmagOFFICEMap.refSplitModeVM.m_CurrLastInd
@@ -2298,6 +2494,20 @@ Public Class SplitModeVM
          End Set
       End Property
 
+      Public Function VerifyContinuity(ItemList As List(Of NameIdLsBxItem)) As Boolean
+         If ItemList.Count < 2 Then Return True
+         Dim bContigus As Boolean = False
+         For Index As Integer = 0 To ItemList.Count - 2
+            If ItemList(Index).Ind = ItemList(Index + 1).Ind + 1 Or ItemList(Index).Ind = ItemList(Index + 1).Ind - 1 Then
+               bContigus = True
+            Else
+               bContigus = False
+               Exit For
+            End If
+         Next
+         Return bContigus
+      End Function
+
       Public Property Type As Integer
          Get
             Return m_nType

OptionPanel/NestingTab/MultiSelectionV.xaml

@@ -0,0 +1,41 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="MultiSelectionV"
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:OmagOFFICE="clr-namespace:OmagOFFICE"
+   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+   Title="{Binding TitleMsg}"
+   IsMinimizable="False"
+   IsClosable="False"
+   ShowInTaskbar="False"
+   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+   WindowStartupLocation="CenterOwner"
+   Width="270" Height="150"
+   ResizeMode="NoResize">
+
+    <DockPanel Margin="5,5,5,0">
+
+        <UniformGrid Columns="2" 
+                     DockPanel.Dock="Top"
+                     Margin="0,15,0,15">
+            <TextBlock Text="{Binding SelectionMsg}"/>
+            <TextBox Text="{Binding nNbrOfParts}"/>
+        </UniformGrid>
+
+        <UniformGrid Columns="4"
+                   DockPanel.Dock="Bottom"
+                   Margin="25,0,25,5">
+            <Button Command="{Binding OkCommand}"
+                    Style="{StaticResource OptionPanel_TextButton}"
+                    Content="{Binding OkMsg}">
+            </Button>
+            <ToggleButton Visibility="Hidden" />
+            <ToggleButton Visibility="Hidden" />
+            <Button Command="{Binding CancelCommand}"
+                    Style="{StaticResource OptionPanel_TextButton}"
+                    Content="{Binding CancelMsg}">
+            </Button>
+        </UniformGrid>
+
+    </DockPanel>
+
+    </EgtWPFLib5:EgtCustomWindow>

OptionPanel/NestingTab/MultiSelectionV.xaml.vb

@@ -0,0 +1,15 @@
+Public Class MultiSelectionV
+
+   Private WithEvents m_MultiSelectionVM As MultiSelectionVM
+
+   Sub New(Owner As Window, MultiSelVM As MultiSelectionVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = MultiSelVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_MultiSelectionVM = MultiSelVM
+      Me.Show()
+   End Sub
+
+End Class

OptionPanel/NestingTab/MultiSelectionVM.vb

@@ -0,0 +1,97 @@
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public Class MultiSelectionVM
+   Inherits VMBase
+
+   Private m_sRefGuidOfPart As String = String.Empty
+
+   Public ReadOnly Property TitleMsg As String
+      Get
+         Return "Multiple selection"
+      End Get
+   End Property
+   Public ReadOnly Property SelectionMsg As String
+      Get
+         Return "Number of Parts"
+      End Get
+   End Property
+
+   Public ReadOnly Property OkMsg As String
+      Get
+         Return "Ok"
+      End Get
+   End Property
+
+   Public ReadOnly Property CancelMsg As String
+      Get
+         Return "Cancel"
+      End Get
+   End Property
+
+   Private m_MultiSelectionV As MultiSelectionV
+   Public Sub SetMultiSelectionV(MultiSel As MultiSelectionV)
+      m_MultiSelectionV = MultiSel
+   End Sub
+
+   Private m_nNbrOfParts As Integer
+   Public Property nNbrOfParts As String
+      Get
+         Return m_nNbrOfParts.ToString
+      End Get
+      Set(value As String)
+         Dim nVal As Integer = 0
+         StringToInt(value, nVal)
+         m_nNbrOfParts = nVal
+         NotifyPropertyChanged("nNbrOfParts")
+      End Set
+   End Property
+
+   Private m_cmdOk As ICommand
+   Private m_cmdCancel As ICommand
+
+   Public ReadOnly Property OkCommand As ICommand
+      Get
+         If m_cmdOk Is Nothing Then
+            m_cmdOk = New Command(AddressOf OkCmd)
+         End If
+         Return m_cmdOk
+      End Get
+   End Property
+
+   Public Sub OkCmd(ByVal param As Object)
+      ' il numero di elementi indicato è corretto
+      ' deseleziono il pezzo corrente
+      DeselectPartInFaimily(m_sRefGuidOfPart)
+      Select Case m_nNbrOfParts
+         Case 0    ' Annulla
+            ' continuo senza eseguire niente
+         Case Else
+            ' seleziono il numero di pezzi indicati
+            SelectPartInFaimily(m_sRefGuidOfPart, m_nNbrOfParts)
+      End Select
+      ' chiudo la finestra
+      m_MultiSelectionV.Close()
+      EgtDraw()
+   End Sub
+
+   Public ReadOnly Property CancelCommand As ICommand
+      Get
+         If m_cmdCancel Is Nothing Then
+            m_cmdCancel = New Command(AddressOf CancelCmd)
+         End If
+         Return m_cmdCancel
+      End Get
+   End Property
+
+   Public Sub CancelCmd(ByVal param As Object)
+      ' chiudo la fiestra senza eseguire niente
+      m_MultiSelectionV.Close()
+      EgtDraw()
+   End Sub
+
+   Sub New(CurrNumberOfParts As Integer, sRefGuid As String)
+      m_nNbrOfParts = CurrNumberOfParts
+      m_sRefGuidOfPart = sRefGuid
+   End Sub
+End Class

OptionPanel/NestingTab/NestingTabV.xaml

@@ -137,34 +137,49 @@
 
    </Border>
 
-   <UniformGrid Grid.Column="0" Columns="2" Margin="0,0,0,5">
-      <Button Content="{Binding InsertPartMsg}"
-              Style="{StaticResource OptionPanel_TextButton}"
-              Command="{Binding InsertPartCommand}"
-              Margin="0,0,2.5,0"/>
-      <Button Content="{Binding StorePartMsg}"
-              Style="{StaticResource OptionPanel_TextButton}"
-              Command="{Binding StorePartCommand}"
-              Margin="2.5,0,0,0"/>
+    <UniformGrid Grid.Column="0" Columns="2" Margin="0,0,0,5">
+        <Button Content="{Binding InsertPartMsg}"
+                Style="{StaticResource OptionPanel_TextButton}"
+                Command="{Binding InsertPartCommand}"
+                Margin="0,0,2.5,0"/>
+        <Button Content="{Binding StorePartMsg}" Grid.Column="1"
+                Style="{StaticResource OptionPanel_TextButton}"
+                Command="{Binding StorePartCommand}"
+                Margin="2.5,0,0,0"/>
+        <!--<ToggleButton Content="{Binding StartCurvWJMsg}" Grid.Column="2"
+                Visibility="{Binding StartCurvWJ_Visibility}"         
+                Style="{StaticResource OptionPanel_ToggleButton}"
+                IsChecked="{Binding bStartCurvWJ}"
+                Margin="2.5,0,2.5,0"/>-->
    </UniformGrid>
 
-    <Grid Margin="0,0,-2.5,5">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-        </Grid.ColumnDefinitions>
+    <UniformGrid Grid.Column="0" Columns="{Binding CountColumn}"  Margin="0,0,0,5">
         <Button Content="{Binding RemovePartMsg}"
-                Grid.ColumnSpan="{Binding DragRettangle_Cl_Span}"
                 Style="{StaticResource OptionPanel_TextButton}"
                 Command="{Binding RemovePartCommand}"
                 Margin="0,0,2.5,0"/>
-        <ToggleButton Content="{Binding DragRettangleMsg}" Grid.Column="1"
-                Visibility="{Binding DragRettangle_Visibility}"         
+        <ToggleButton Content="{Binding DragRectangleMsg}" Grid.Column="1"
+                Visibility="{Binding DragRectangle_Visibility}"         
                 Style="{StaticResource OptionPanel_ToggleButton}"
-                IsChecked="{Binding bDragRettangle}"
+                IsChecked="{Binding bDragRectangle}"
                 Margin="2.5,0,2.5,0"/>
-    </Grid>
+        <!--<ToggleButton Content="{Binding SplitCurvWJMsg}" Grid.Column="2"
+                Visibility="{Binding SplitCurvWJ_Visibility}"         
+                Style="{StaticResource OptionPanel_ToggleButton}"
+                IsChecked="{Binding bSplitCurvWJ}"
+                Margin="2.5,0,2.5,0"/>-->
+    </UniformGrid>
 
+    <UniformGrid Grid.Column="0" Columns="2" Margin="0,0,0,5" Visibility="{Binding WJ_Cmd_Visibility}">
+        <ToggleButton Content="{Binding SplitCurvWJMsg}" Grid.Column="2"        
+                Style="{StaticResource OptionPanel_ToggleButton}"
+                IsChecked="{Binding bSplitCurvWJ}"
+                Margin="2.5,0,2.5,0"/>
+        <ToggleButton Content="{Binding StartCurvWJMsg}" Grid.Column="2"         
+                Style="{StaticResource OptionPanel_ToggleButton}"
+                IsChecked="{Binding bStartCurvWJ}"
+                Margin="2.5,0,2.5,0"/>
+    </UniformGrid>
    
    <UniformGrid Columns="2" Margin="0,0,0,5">
       <Button Content="{Binding SelectAllMsg}"

OptionPanel/RawPartTab/RawPartTabVM.vb

@@ -1,4 +1,6 @@
-Imports System.IO
+Imports System.Threading
+Imports System.Windows.Threading
+Imports System.IO
 Imports System.Collections.ObjectModel
 Imports EgtWPFLib5
 Imports EgtPHOTOLib
@@ -7,6 +9,10 @@ Imports EgtUILib
 Public Class RawPartTabVM
    Inherits VMBase
 
+   ' Timer
+   Private m_TimerIsBusy As Boolean = False
+   Private m_RefreshTimer As New DispatcherTimer
+
    Friend OmagPhoto As OmagPhotoV
 
    Private m_OmagPhotoVM As OmagPhotoVM
@@ -1678,8 +1684,11 @@ Public Class RawPartTabVM
    End Sub
 
    Private Sub AdjustRawPartOnExit()
-      ' Se non c'è il grezzo, esco
-      If EstCalc.GetRawId() = GDB_ID.NULL Then Return
+      ' Se non c'è il grezzo, esco dopo aver nascosto eventuale foto
+      If EstCalc.GetRawId() = GDB_ID.NULL Then
+         ShowPhoto(False)
+         Return
+      End If
       ' Disabilito impostazione modificato
       Dim bOldEnMod = EgtGetEnableModified()
       If bOldEnMod Then EgtDisableModified()
@@ -2031,11 +2040,17 @@ Public Class RawPartTabVM
          ' inserisco in elenco solo i materiali della macchina corrente
          AddHandler PhotoMap.refOptionPanelVM.SlabIsSelectedOFFICE, AddressOf OmagOFFICEMap.refRawPartTabVM.ClosePhotoWnd
 
-         ' Dim OmagPhotoWnd As New OmagPhotoV(Application.Current.MainWindow(), New OmagPhotoVM)
-         'OmagPhotoWnd.ShowDialog()
+         ' lancio il timer di aggiornamento dell'interfaccia, per la gestione di due OmagPHOTO che accedono allo stesso SQL
+         AddHandler m_RefreshTimer.Tick, AddressOf RefreshTimer_Tick
+         m_RefreshTimer.Interval = TimeSpan.FromMilliseconds(2000)
+         m_RefreshTimer.Start()
+
+         ' apro la finestra per accedere al DB delle lastre
          Me.OmagPhoto = New OmagPhotoV
          OmagPhoto.ShowDialog()
 
+         m_RefreshTimer.Stop()
+
          EgtSetCurrentContext(EgtPHOTOLib.MainData.PreviousContext)
          EgtSetCurrentContext(OmagOFFICEMap.refSceneHostVM.MainScene.GetCtx())
 
@@ -2153,6 +2168,17 @@ Public Class RawPartTabVM
       EgtDraw()
    End Sub
 
+   ' per la gestione di due OmagPHOTO che accedono allo stesso SQL
+   Private Sub RefreshTimer_Tick()
+      If Not m_TimerIsBusy And PhotoMap.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.LIST Then
+         m_TimerIsBusy = True
+         m_RefreshTimer.Stop()
+         EgtPHOTOLib.PhotoMap.refListPageVM.RefreshLisPage()
+         m_TimerIsBusy = False
+         m_RefreshTimer.Start()
+      End If
+   End Sub
+
 #End Region ' PhotoCommand
 
 #Region "ConfirmPhotoCommand"

OptionWindow/OptionWindowVM.vb

@@ -71,7 +71,7 @@ Public Class OptionWindowVM
             OmagOFFICEMap.refRawPartTabVM.Refresh(PrevMeasureUnit)
             OmagOFFICEMap.refNestingTabVM.Refresh(PrevMeasureUnit)
             OmagOFFICEMap.refMoveRawModeVM.Refresh(PrevMeasureUnit)
-            OmagOFFICEMap.refSimulTabVM.MySimul.Refresh(PrevMeasureUnit)
+            If Not IsNothing(OmagOFFICEMap.refSimulTabVM.MySimul) Then OmagOFFICEMap.refSimulTabVM.MySimul.Refresh(PrevMeasureUnit)
          End If
       End Set
    End Property

TopCommandBar/TopCommandBarVM.vb

@@ -128,9 +128,9 @@ Public Class TopCommandBarVM
    ''' <summary>
    ''' Execute the New.  This method is invoked by the NewCommand.
    ''' </summary>
-   Friend Sub NewCmd(Optional bUseDefaults As Boolean = False)
+   Friend Sub NewCmd()
       OmagOFFICEMap.refSceneHostVM.NewProject()
-      OmagOFFICEMap.refMachGroupPanelVM.InitMachGroupList(bUseDefaults)
+      OmagOFFICEMap.refMachGroupPanelVM.InitMachGroupList(False)
    End Sub
 
 #End Region ' NewCommand