- correzione per interrompere nesting in caso di errore

EgtBEAMWALL 2.5b3 :
- ricompilazione con cambio versione.
2023-03-07 10:39:34 +01:00 · 2023-02-28 11:46:13 +01:00 · 2023-01-17 11:35:28 +01:00 · 2023-01-10 16:30:14 +01:00 · 2022-12-23 17:55:30 +01:00 · 2022-12-23 17:55:27 +01:00
85 changed files with 372 additions and 12160 deletions
@@ -632,13 +632,17 @@ Public MustInherit Class MyMachGroupVM
   Public ReadOnly Property DeleteMachGroup_Command As ICommand
      Get
         If m_cmdDeleteMachGroup Is Nothing Then
-            m_cmdDeleteMachGroup = New Command(AddressOf DeleteMachGroup)
+            m_cmdDeleteMachGroup = New Command(AddressOf DeleteMachGroupCmd)
         End If
         Return m_cmdDeleteMachGroup
      End Get
   End Property

-   Public Overridable Sub DeleteMachGroup()
+   Public Sub DeleteMachGroupCmd()
+      DeleteMachGroup()
+   End Sub
+
+   Public Overridable Sub DeleteMachGroup(Optional bMultipleCommand As Boolean = False)
      ' elimino tutte le copie
      Dim nRawPartId As Integer = EgtGetFirstRawPart()
      Dim nBeamId As Integer = EgtGetFirstPartInRawPart(nRawPartId)
@@ -16,7 +16,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Egalware s.r.l.")>
 <Assembly: AssemblyProduct("EgtBEAMWALL.Core")>
-<Assembly: AssemblyCopyright("Copyright ©  2020-2022 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2020-2023 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")>

 <Assembly: ComVisible(False)>
@@ -35,5 +35,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("2.4.11.3")>
-<Assembly: AssemblyFileVersion("2.4.11.3")>
+<Assembly: AssemblyVersion("2.5.2.3")>
+<Assembly: AssemblyFileVersion("2.5.2.3")>
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Egalware s.r.l.")]
 [assembly: AssemblyProduct("EgtBEAMWALL.DataLayer")]
-[assembly: AssemblyCopyright("Copyright ©  2020-2022 by Egalware s.r.l.")]
+[assembly: AssemblyCopyright("Copyright ©  2020-2023 by Egalware s.r.l.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.11.3")]
-[assembly: AssemblyFileVersion("2.4.11.3")]
+[assembly: AssemblyVersion("2.5.2.3")]
+[assembly: AssemblyFileVersion("2.5.2.3")]
@@ -701,6 +701,12 @@ Public Class NUMAxiumPcToolkitComm
                                                    Try
                                                       ISONumVariable.sValue = SentMachGroup.Name
                                                       ISOSentVariable.sValue = 0
+                                                       'Dim TempISOSentVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = ISO_SENT)
+                                                       'While ISOSentVariable.sValue <> "0"
+                                                       '   Threading.Thread.Sleep(100)
+                                                       '   EgtOutLog("Bloccato - Sent(80046): " & TempISOSentVariable.sValue & " Num(80045): " & ISONumVariable.sValue)
+                                                       '   TempISOSentVariable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = ISO_SENT)
+                                                       'End While
                                                       SentMachGroup.SetSentToMachine(True)
                                                    Catch ex As Exception
                                                       EgtOutLog("Error write var after download: " & ex.Message)
@@ -710,6 +716,7 @@ Public Class NUMAxiumPcToolkitComm
                                              nRes = DownLoadFileAsyn(nPortFileTransfer, nFileType, sFilePath, DNC_MODE_ABORT, nIndex)
                                              SendPermissionVariable.sValue = 0
                                              m_BytesTransferedCounter = 0
+                                              Threading.Thread.Sleep(1000)
                                              m_bIsTransferActive = False
                                              Return
                                           End Sub)
@@ -807,6 +807,7 @@ Public Class MachManaging
         Case CommandTypes.READ_TPA
            Tpa.RWVariableManager.RefreshVar(Command.sVariable)
         Case CommandTypes.WRITE
+            'EgtOutLog("Write" & Command.sVariable & " " & Command.sVariables(1) & " " & Command.nVariable)
            WriteVar(Command.sVariable, Command.sVariables(1), Command.nVariable)
         Case CommandTypes.DELETEALARMS
            DeleteAlarms()
@@ -173,35 +173,33 @@ Public Class MachineLogPageVM

 #Region "METHODS"

-   Private Function MachineLogFilter(LogEvent As Object) As Boolean
-      Dim CurrLogEvent As LogEvent = DirectCast(LogEvent, LogEvent)
+   Private Function MachineLogFilter(CurrEvent As Object) As Boolean
+      Dim CurrLogEvent As LogEvent = DirectCast(CurrEvent, LogEvent)
      Dim bOk As Boolean = True
-      Select Case m_SelEntityType
-         Case 0
-            bOk = bOk And True
-         Case 1
-            bOk = bOk And CurrLogEvent.EventType = MachLogTypes.PART_STATUS
-         Case 2
-            bOk = bOk And CurrLogEvent.EventType = MachLogTypes.MACHGROUP_STATUS
-      End Select
-      If CurrLogEvent.EventType = MachLogTypes.PART_STATUS OrElse CurrLogEvent.EventType = MachLogTypes.MACHGROUP_STATUS Then
-         Select Case m_SelPartEventType
-            Case 0
-               bOk = bOk And True
-            Case 1
-               bOk = bOk And CurrLogEvent.nStatus = 1
-            Case 2
-               bOk = bOk And CurrLogEvent.nStatus = 2
-         End Select
-      End If
      ' se livello utente inferiore a 5, mostro solo eventi pezzo e machgroup
      If Map.refMainWindowVM.MainWindowM.nUserLevel < 5 Then
-         bOk = bOk And CurrLogEvent.EventType = MachLogTypes.PART_STATUS OrElse CurrLogEvent.EventType = MachLogTypes.MACHGROUP_STATUS
-      Else
-         If Not CurrLogEvent.EventType = MachLogTypes.PART_STATUS AndAlso Not CurrLogEvent.EventType = MachLogTypes.MACHGROUP_STATUS Then
-            bOk = True
+         If CurrLogEvent.EventType <> LogEvent.MachLogTypes.PART_STATUS AndAlso CurrLogEvent.EventType <> LogEvent.MachLogTypes.MACHGROUP_STATUS Then
+            Return False
         End If
      End If
+      Select Case m_SelEntityType
+         Case 0   ' ""
+            bOk = bOk And True
+         Case 1   ' "Pezzo"
+            bOk = bOk And CurrLogEvent.EventType = LogEvent.MachLogTypes.PART_STATUS
+         Case 2   ' "Barra"
+            bOk = bOk And CurrLogEvent.EventType = LogEvent.MachLogTypes.MACHGROUP_STATUS
+      End Select
+      If CurrLogEvent.EventType = LogEvent.MachLogTypes.PART_STATUS OrElse CurrLogEvent.EventType = LogEvent.MachLogTypes.MACHGROUP_STATUS Then
+         Select Case m_SelPartEventType
+            Case 0   ' ""
+               bOk = bOk And True
+            Case 1   ' "Inizio"
+               bOk = bOk And CurrLogEvent.nStatus = 1
+            Case 2   ' "Fine"
+               bOk = bOk And CurrLogEvent.nStatus = 2
+         End Select
+      End If
      Return bOk
   End Function

@@ -240,8 +240,8 @@ Public Class MainWindowM
      ' Verifico abilitazione nesting automatico
      m_bAutoNestOption = Not String.IsNullOrWhiteSpace(sNestKey)
      ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2411, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2411, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2501, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2501, 1, m_nKeyOptions)
      ' Inizializzazione generale di EgtInterface
      m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
      m_sLogFile = m_sTempDir & "\" & SUPGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())
@@ -30,7 +30,7 @@ Imports System.Windows
 #End if
 <Assembly: AssemblyCompany("Egalware s.r.l.")>
 <Assembly: AssemblyProduct("EgtBEAMWALL.Supervisor")>
-<Assembly: AssemblyCopyright("Copyright ©  2020-2022 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2020-2023 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")>
 <Assembly: ComVisible(false)>

@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("2.4.11.3")>
-<Assembly: AssemblyFileVersion("2.4.11.3")>
+<Assembly: AssemblyVersion("2.5.2.3")>
+<Assembly: AssemblyFileVersion("2.5.2.3")>
@@ -147,12 +147,27 @@ Public Class LogEvent
         Select Case m_EventType
            Case MachLogTypes.PART_STATUS
               m_ProdId = sValues(0)
-               m_MachGroupId = DbControllers.m_MachGroupController.FindByMachGroupId(m_ProdId, sValues(1)).Name
-               m_PartId = DbControllers.m_PartController.FindByPartId(m_ProdId, sValues(2)).PDN
+               Dim MachGroup As DataLayer.DatabaseModels.MachGroupModel = DbControllers.m_MachGroupController.FindByMachGroupId(m_ProdId, sValues(1))
+               If Not IsNothing(MachGroup) Then
+                  m_MachGroupId = MachGroup.Name
+               Else
+                  m_MachGroupId = -1
+               End If
+               Dim Part As DataLayer.DatabaseModels.PartModel = DbControllers.m_PartController.FindByPartId(m_ProdId, sValues(2))
+               If Not IsNothing(Part) Then
+                  m_PartId = Part.PDN
+               Else
+                  m_PartId = -1
+               End If
               m_Status = sValues(3)
            Case MachLogTypes.MACHGROUP_STATUS
               m_ProdId = sValues(0)
-               m_MachGroupId = DbControllers.m_MachGroupController.FindByMachGroupId(m_ProdId, sValues(1)).Name
+               Dim MachGroup As DataLayer.DatabaseModels.MachGroupModel = DbControllers.m_MachGroupController.FindByMachGroupId(m_ProdId, sValues(1))
+               If Not IsNothing(MachGroup) Then
+                  m_MachGroupId = MachGroup.Name
+               Else
+                  m_MachGroupId = -1
+               End If
               m_Status = sValues(2)
            Case MachLogTypes.MACHINE_COMMAND

@@ -102,7 +102,17 @@ Public Class AddRawPartWndVM
      End Select
      m_DimensionsList = DimensionsList
      If m_DimensionsList.Count > 0 Then
-         SelDimension = m_DimensionsList(0)
+         Dim LastMaterial As SParam = WarehouseHelper.GetLastMaterial(DimensionsList(0).SectXMat)
+         If IsNothing(LastMaterial) Then
+            SelDimension = m_DimensionsList(0)
+         Else
+            Dim TempDimension As SParam = m_DimensionsList.FirstOrDefault(Function(x) x.SectXMat = LastMaterial.SectXMat AndAlso x.dL = LastMaterial.dL AndAlso x.dW = LastMaterial.dW AndAlso x.nQuantity = LastMaterial.nQuantity)
+            If Not IsNothing(TempDimension) Then
+               SelDimension = TempDimension
+            Else
+               SelDimension = m_DimensionsList(0)
+            End If
+         End If
      End If
      ' riduco lista parametri a solo quelli che utilizzati
      m_VariableList_View = CollectionViewSource.GetDefaultView(m_VariableList)
@@ -25,7 +25,7 @@ Public Class BTLFeatureVM
         If value <> -1 Then
            ' verifico se solido attivo
            Dim bShowSolid As Boolean = Map.refShowBeamPanelVM.ShowSolid_IsChecked
-            If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
+            If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, False, False)
            ' aggiorno la feature con nuovo valore
            Dim vPar() As Double = Nothing
            Dim sPar As String = String.Empty
@@ -41,8 +41,8 @@ Public Class BTLFeatureVM
               ResetCalcFeature()
            End If
            NotifyPropertyChanged(NameOf(nSelGRP))
+            If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
            EgtDraw()
-            If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
         End If
      End Set
   End Property
@@ -65,7 +65,7 @@ Public Class BTLFeatureVM
         If value <> -1 Then
            ' verifico se solido attivo
            Dim bShowSolid As Boolean = Map.refShowBeamPanelVM.ShowSolid_IsChecked
-            If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
+            If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, False, False)
            ' se freecontour
            If Me.m_BTLFeatureM.IsFreeContour() Then
               ' cambio faccia alla geometria
@@ -108,8 +108,8 @@ Public Class BTLFeatureVM
               ResetCalcFeature()
            End If
            NotifyPropertyChanged("nSelSIDE")
+            If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
            EgtDraw()
-            If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
         End If
      End Set
   End Property
@@ -135,7 +135,7 @@ Public Class BTLFeatureVM
         If value <> m_BTLFeatureM.bDO Then
            If Map.refMainMenuVM.SelPage = Pages.VIEW Then
               ' verifico se solido attivo
-               If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
+               If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, False, False)
            End If
            If EgtBeamEnableProcess(nFeatureId, value, Not m_bDO_MultipleUpdate) Then
               m_BTLFeatureM.bDO = value
@@ -154,7 +154,7 @@ Public Class BTLFeatureVM
            End If
            If Map.refMainMenuVM.SelPage = Pages.VIEW Then
               ' eventualmente ripristino solido
-               If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
+               If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
            End If
            If Not m_bDO_MultipleUpdate Then EgtDraw()
            ' aggiorno stato abilitazione del bottone modifica free contour
@@ -277,7 +277,7 @@ Public Class BTLParamVM
   Friend Sub UpdateParamValue(dNewValue As Double, sNewValue As String, Optional bDraw As Boolean = True)
      ' verifico se solido attivo
      Dim bShowSolid As Boolean = Map.refShowBeamPanelVM.ShowSolid_IsChecked
-      If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
+      If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, False, False)
      ' Recupero i parametri attuali della feature
      Dim vPar() As Double = Nothing
      Dim sPar As String = String.Empty
@@ -335,7 +335,7 @@ Public Class BTLParamVM
         End If
      End If

-      If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
+      If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
      If bDraw Then EgtDraw()

   End Sub
@@ -118,7 +118,7 @@ Public Class BTLPartVM

      ' verifico se solido attivo
      Dim bShowSolid As Boolean = Map.refShowBeamPanelVM.ShowSolid_IsChecked
-      If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
+      If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, False, False)

      If Not EgtBeamSetPartBox(dBtlL, dBtlH, dBtlW, False) Then Return False

@@ -134,7 +134,7 @@ Public Class BTLPartVM
      ' aggiorno sezioni
      Map.refProjectVM.BTLStructureVM.UpdateSection(Section, OldSection)
      ' eventualmente ripristino solido
-      If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
+      If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
      EgtDraw()

      Return True
@@ -156,7 +156,7 @@ Public Class BTLPartVM
   Public Property sL As String
      Get
         Dim nOrigGroupId As Integer = nPartId
-         If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
+         If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso EgtBeamGetBuildingIsOn() AndAlso Map.refShowBeamPanelVM.bShowAll Then
            nOrigGroupId = GetOrigFrameGroup(nPartId)
         End If
         Dim frBeam As New Frame3d
@@ -214,7 +214,7 @@ Public Class BTLPartVM
   Public Property sW As String
      Get
         Dim nOrigGroupId As Integer = nPartId
-         If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
+         If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso EgtBeamGetBuildingIsOn() AndAlso Map.refShowBeamPanelVM.bShowAll Then
            nOrigGroupId = GetOrigFrameGroup(nPartId)
         End If
         Dim frBeam As New Frame3d
@@ -272,7 +272,7 @@ Public Class BTLPartVM
   Public Property sH As String
      Get
         Dim nOrigGroupId As Integer = nPartId
-         If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
+         If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso EgtBeamGetBuildingIsOn() AndAlso Map.refShowBeamPanelVM.bShowAll Then
            nOrigGroupId = GetOrigFrameGroup(nPartId)
         End If
         Dim frBeam As New Frame3d
@@ -1395,7 +1395,7 @@ Public Class BTLPartVM
   Public ReadOnly Property Section As SectionXMaterial
      Get
         Dim nOrigGroupId As Integer = nPartId
-         If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
+         If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso EgtBeamGetBuildingIsOn() AndAlso Map.refShowBeamPanelVM.bShowAll Then
            nOrigGroupId = GetOrigFrameGroup(nPartId)
         End If
         Dim frBeam As New Frame3d
@@ -243,7 +243,7 @@ Public Class BTLStructureVM
      If Map.refShowBeamPanelVM.ShowSolid_IsChecked Then
         ' tolgo eventuale indicazione solido rimasta da pezzo precedente
         Map.refShowBeamPanelVM.SetShowSolid(False)
-         Map.refProjectVM.BTLStructureVM.ShowSolid(False, BtlPart.nPartId)
+         Map.refProjectVM.BTLStructureVM.ShowSolid(BtlPart.nPartId, False, False)
      End If
      If m_SelBTLPart Is BtlPart Then
         EgtBeamShowFacesName( False)
@@ -1083,7 +1083,7 @@ Public Class BTLStructureVM
      If Not IsNothing(SelBTLPart) Then
         ' se pezzo solido, lo riporto normale
         If Map.refShowBeamPanelVM.ShowSolid_IsChecked Then
-            ShowSolid(False)
+            ShowSolid(GDB_ID.NULL, False, False)
            Map.refShowBeamPanelVM.SetShowSolid(False)
         End If
         ' tolgo pezzo selezionato
@@ -1132,12 +1132,12 @@ Public Class BTLStructureVM
      EgtZoom(ZM.ALL, bRedraw)
   End Sub

-   Friend Sub ShowSolid(Optional bRedraw As Boolean = True, Optional nPartId As Integer = GDB_ID.NULL)
+   Friend Sub ShowSolid(nPartId As Integer, bShow As Boolean, Optional bRedraw As Boolean = True)
      ' se non viene passato, recupero il pezzo del primo oggetto selezionato
-      If nPartId = GDB_ID.NULL Then
-         nPartId = If(Not IsNothing(SelBTLPart), SelBTLPart.nPartId, GDB_ID.NULL)
+      If nPartId = GDB_ID.NULL And Not IsNothing(SelBTLPart) Then
+         nPartId = SelBTLPart.nPartId
      End If
-      If nPartId = GDB_ID.NULL Or Not EgtIsPart(nPartId) Then
+      If Not EgtIsPart(nPartId) Then
         Dim nLayerId As Integer = EgtGetParent(nPartId)
         Dim sLayerName As String = ""
         EgtGetName(nLayerId, sLayerName)
@@ -1151,17 +1151,11 @@ Public Class BTLStructureVM
      ' disabilito impostazione modificato
      Dim DisableMgr As New DisableModifiedMgr

-      Dim nSolId As Integer = EgtBeamGetSolid(nPartId)
-      If nSolId = GDB_ID.NULL OrElse Not EgtExistsInfo(nSolId, "VALID") Then
-         EgtBeamCalcSolid(nPartId)
-         EgtBeamShowSolid(nPartId, True)
-      Else
-         Dim nStat As Integer
-         EgtGetStatus(EgtGetParent(nSolId), nStat)
-         EgtBeamShowSolid(nPartId, (nStat = GDB_ST.OFF))
-      End If
+      If bShow Then EgtBeamCalcSolid(nPartId)

+      EgtBeamShowSolid(nPartId, bShow)
      If bRedraw Then EgtDraw()
+
      ' ripristino precedente impostazione modificato
      DisableMgr.ReEnable()
   End Sub
@@ -35,7 +35,7 @@ Public Class ChangeParameterWndVM
               ParamIndex += 1
            End While
            ' aggiungo bDO come parametro
-            m_ParamList.Add(New Parameters(NewBTLParam, True))
+            m_ParamList.Add(New Parameters(BTLParamM.CreateNewBTLParam(), True))
            ' seleziono parametro vuoto per dargli un valore iniziale ed evitare che visualizzi sia text che check
            m_SelParam = New Parameters(BTLParamM.CreateNewBTLParam())
            NotifyPropertyChanged(NameOf(SelParam))
@@ -324,7 +324,7 @@ Public Class FreeContourManagerVM
      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
      ' verifico se solido attivo
      m_bPrevShowSolid = Map.refShowBeamPanelVM.ShowSolid_IsChecked
-      If m_bPrevShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
+      If m_bPrevShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, False, False)
      ' attivo visualizzazione direzione curve
      EgtSetShowCurveDirection(True)
      ' elimino eventuale vecchio layer testi
@@ -367,7 +367,7 @@ Public Class FreeContourManagerVM
               m_SelType = FreeContourTypes.TWO
            End If
         End If
-         ' se nuova senza percorsi
+      ' se nuova senza percorsi
      Else
         ' imposto modalita' un percorso
         m_SelType = FreeContourTypes.ONE
@@ -424,10 +424,12 @@ Public Class FreeContourManagerVM
      NotifyPropertyChanged(NameOf(Line2P_IsEnabled))
      NotifyPropertyChanged(NameOf(TextAngle_Visibility))
      NotifyPropertyChanged(NameOf(PathList_Visibility))
-      ' posiziono la griglia sulla faccia attiva
+      ' posiziono la griglia sul riferimento del contorno libero
      Dim frFace As New Frame3d
      EgtBeamGetSideData(SelFeature.nSelSIDE, frFace)
-      EgtSetGridFrame(frFace)
+      Dim frFrame As Frame3d = SelFeature.BTLFeatureM.frFRAME
+      frFrame.ToGlob( frFace)
+      EgtSetGridFrame(frFrame)
      EgtSetGridShow(True, True)
      Map.refSceneHostVM.MainScene.CPlaneView()
      ' rimetto la selezione scena a null
@@ -442,11 +444,8 @@ Public Class FreeContourManagerVM
   End Sub

   Friend Sub Close(bSave As Boolean)
-      If m_bIsActive Then
-         m_bIsActive = False
-      Else
-         Return
-      End If
+      If not m_bIsActive Then Return
+      m_bIsActive = False
      ' gestisco modifiche ai percorsi
      If bSave Then
         Select Case m_SelType
@@ -459,7 +458,8 @@ Public Class FreeContourManagerVM
               Dim sSideAngInfo As String = ""
               For Index = 0 To SideAngValues.Count - 1
                  If Index > 0 Then sSideAngInfo &= ","
-                  sSideAngInfo &= SideAngValues(Index).dValue
+                  Dim sAng As String = DoubleToString(SideAngValues(Index).dValue, 2)
+                  sSideAngInfo &= sAng
               Next
               EgtSetInfo(m_nNewPathId, "SideAngs", sSideAngInfo)
               EgtSetInfo(nSelFeatureId, "AUXID", (m_nNewPathId - nSelFeatureId).ToString("+#;-#;0"))
@@ -474,7 +474,7 @@ Public Class FreeContourManagerVM
         Dim BTLFeatureM As BTLFeatureM = SelFeature.BTLFeatureM
         BTLFeatureM.CalcParamArray(vPar, sPar, vParQ)
         Dim bOK As Boolean = BTLFeatureM.UpdateParams(BTLFeatureM.nSelGRP, BTLFeatureM.nPRC, BTLFeatureM.nSelSIDE, BTLFeatureM.sDES, BTLFeatureM.nPRID,
-      BTLFeatureM.frFRAME, vPar, sPar, vParQ)
+                                                       BTLFeatureM.frFRAME, vPar, sPar, vParQ)
         If bOK Then
            SelFeature.SelGeomFeature()
            ' rendo non calcolata questa feature
@@ -519,7 +519,8 @@ Public Class FreeContourManagerVM
      ' elimino eventuale layer dei testi angoli
      EgtErase(nSideAngTextLayer)
      nSideAngTextLayer = GDB_ID.NULL
-      ' nascondo la griglia
+      ' riporto griglia globale e la nascondo
+      EgtSetGridFrame( New Frame3d())
      EgtSetGridShow(False, False)
      ' se il progetto non era modificato ed esco senza salvare, resetto lo stato di modificato
      If Not m_bAlreadyModified And Not bSave Then
@@ -539,7 +540,7 @@ Public Class FreeContourManagerVM
      Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
      ' disattivo modifiche su scena
      Map.refSceneHostVM.MainScene.SetStatusNull()
-      If m_bPrevShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
+      If m_bPrevShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
      ' disattivo visualizzazione direzione curve
      EgtSetShowCurveDirection(False)
      ' reimposto filtro selezione
@@ -651,7 +652,8 @@ Public Class FreeContourManagerVM
         If sSideAngSplit.Count - 1 >= Index Then
            StringToDouble(sSideAngSplit(Index), dSideAng)
         End If
-         Dim TextId As Integer = EgtCreateText(nSideAngTextLayer, ptText, dSideAng & "°", 20)
+         Dim sSideAng As String = DoubleToString( dSideAng, 2) & "°"
+         Dim TextId As Integer = EgtCreateText(nSideAngTextLayer, ptText, sSideAng, 20)
         EgtSetInfo(TextId, "SideAng", dSideAng)
         SideAngValues.Add(New SideAngle(TextId, Index, dSideAng))
      Next
@@ -744,7 +746,7 @@ Public Class FreeContourManagerVM
            End If
         ElseIf bChangedStart Then
            ' non faccio nulla perche' gestito sopra
-            ' se apro percorso
+         ' se apro percorso
         ElseIf Not bNewIsClosed AndAlso bOldIsClosed AndAlso Index = NewAngleList.Count Then
            ' cancello il testo del lato rimosso
            nMovedIndex = OldAngleList.FindIndex(Function(x) AreSamePointApprox(x, NewAngleList(CurrIndex - 1)))
@@ -752,7 +754,7 @@ Public Class FreeContourManagerVM
            Dim NewIndex As Integer = (nPointsQty + nOffset) Mod nPointsQty
            EgtErase(SideAngValues(nOffset).nId)
            NewSideAngValues.RemoveAt(NewSideAngValues.Count - 1)
-            ' se chiudo percorso
+         ' se chiudo percorso
         ElseIf bNewIsClosed AndAlso Not bOldIsClosed AndAlso Index = OldAngleList.Count Then
            ' creo il testo del lato aggiunto
            Dim ptText As Point3d
@@ -761,20 +763,21 @@ Public Class FreeContourManagerVM
            ' aggiungo punto e incremento indice di confronto per riallineare successivo
            NewSideAngValues.Add(New SideAngle(TextId, NewSideAngValues.Count - 1, 0))
            '' percorso aperto
-            ' punti coincidono: verifico che i punti coincidano e non siano il centro del percorso simmetrico
+         ' punti coincidono: verifico che i punti coincidano e non siano il centro del percorso simmetrico
         ElseIf Not bNewIsClosed AndAlso nNewIndex <= NewAngleList.Count - 1 AndAlso nOldIndex <= OldAngleList.Count - 1 AndAlso AreSamePointApprox(NewAngleList(nNewIndex), OldAngleList(nOldIndex)) AndAlso
                Not (Index = nPointsQty / 2 AndAlso AreSamePointApprox(NewAngleList(Index - 1), OldAngleList(nPointsQty - Index + 1))) Then
            If Index < nPointsQty AndAlso nOldIndex <= SideAngValues.Count - 1 Then
               NewSideAngValues.Add(New SideAngle(SideAngValues(nOldIndex).nId, NewSideAngValues.Count, SideAngValues(nOldIndex).dValue))
            End If
-            ' punti simmetrici: verifico se sono simmetrici o se coincidono ma i precedenti sono simmetrici
+         ' punti simmetrici: verifico se sono simmetrici o se coincidono ma i precedenti sono simmetrici
         ElseIf Not bNewIsClosed AndAlso Not bOldIsClosed AndAlso NewAngleList.Count = OldAngleList.Count AndAlso (AreSamePointApprox(NewAngleList(Index), OldAngleList(nPointsQty - Index)) OrElse
                (AreSamePointApprox(NewAngleList(nNewIndex), OldAngleList(nOldIndex)) AndAlso AreSamePointApprox(NewAngleList(Index - 1), OldAngleList(nPointsQty - Index + 1)))) Then
            If Index < nPointsQty Then
-               EgtModifyText(SideAngValues(Index).nId, SideAngValues(nPointsQty - 1 - Index).dValue)
+               Dim sText As String = DoubleToString( SideAngValues(nPointsQty - 1 - Index).dValue, 2)
+               EgtModifyText(SideAngValues(Index).nId, sText)
               NewSideAngValues.Add(New SideAngle(SideAngValues(nPointsQty - 1 - Index).nId, NewSideAngValues.Count, SideAngValues(nPointsQty - 1 - Index).dValue))
            End If
-            ' punto spostato: verifico che non coincidano ma che i precedenti o i successivi coincidano
+         ' punto spostato: verifico che non coincidano ma che i precedenti o i successivi coincidano
         ElseIf Not bNewIsClosed AndAlso
                ((Index = nPointsQty AndAlso Index <= OldAngleList.Count - 1 AndAlso Not AreSamePointApprox(NewAngleList(Index), OldAngleList(Index)) AndAlso AreSamePointApprox(NewAngleList(Index - 1), OldAngleList(Index - 1))) OrElse
                 (nOldIndex + 1 <= OldAngleList.Count - 1 AndAlso nNewIndex + 1 <= NewAngleList.Count - 1 AndAlso AreSamePointApprox(NewAngleList(nNewIndex + 1), OldAngleList(nOldIndex + 1)))) Then
@@ -797,20 +800,20 @@ Public Class FreeContourManagerVM
               NewSideAngValues.Add(New SideAngle(SideAngValues(Index).nId, NewSideAngValues.Count, SideAngValues(Index).dValue))
            End If
            '' percorso chiuso
-            ' punti coincidono:  verifico che i punti coincidano e non siano inizio, fine o centro del percorso simmetrico
+         ' punti coincidono:  verifico che i punti coincidano e non siano inizio, fine o centro del percorso simmetrico
         ElseIf bNewIsClosed AndAlso nNewIndex <= NewAngleList.Count - 1 AndAlso nOldIndex <= OldAngleList.Count - 1 AndAlso AreSamePointApprox(NewAngleList(nNewIndex), OldAngleList(nOldIndex)) AndAlso
                Not ((Index = 0 AndAlso AreSamePointApprox(NewAngleList(Index + 1), OldAngleList(nPointsQty - 1))) OrElse
                     ((Index = nPointsQty / 2 OrElse Index = nPointsQty) AndAlso AreSamePointApprox(NewAngleList(Index - 1), OldAngleList(nPointsQty - Index + 1)))) Then
            If Index < nPointsQty AndAlso nOldIndex < SideAngValues.Count Then
               NewSideAngValues.Add(New SideAngle(SideAngValues(nOldIndex).nId, NewSideAngValues.Count, SideAngValues(nOldIndex).dValue))
            End If
-            ' punti simmetrici: verifico se sono simmetrici o se coincidono ma i precedenti sono simmetrici
+         ' punti simmetrici: verifico se sono simmetrici o se coincidono ma i precedenti sono simmetrici
         ElseIf bNewIsClosed AndAlso bOldIsClosed AndAlso (AreSamePointApprox(NewAngleList(Index), OldAngleList(nPointsQty - Index)) OrElse
                (AreSamePointApprox(NewAngleList(nNewIndex), OldAngleList(nOldIndex)) AndAlso AreSamePointApprox(NewAngleList(Index - 1), OldAngleList(nPointsQty - Index + 1)))) Then
            If Index < nPointsQty Then
               NewSideAngValues.Add(New SideAngle(SideAngValues(nPointsQty - 1 - Index).nId, NewSideAngValues.Count, SideAngValues(nPointsQty - 1 - Index).dValue))
            End If
-            ' punto spostato: verifico che non coincidano ma che i precedenti o i successivi coincidano
+         ' punto spostato: verifico che non coincidano ma che i precedenti o i successivi coincidano
         ElseIf (nOldIndex + 1 <= OldAngleList.Count - 1 AndAlso nNewIndex + 1 <= NewAngleList.Count - 1 AndAlso AreSamePointApprox(NewAngleList(nNewIndex + 1), OldAngleList(nOldIndex + 1))) OrElse
                (bNewIsClosed AndAlso nOldIndex + 1 = OldAngleList.Count AndAlso nNewIndex + 1 = NewAngleList.Count AndAlso AreSamePointApprox(NewAngleList(1), OldAngleList(1))) Then
            ' aggiorno posizione testo precedente
@@ -831,7 +834,7 @@ Public Class FreeContourManagerVM
               EgtMove(SideAngValues(nOldIndex).nId, vtDistance)
               NewSideAngValues.Add(New SideAngle(SideAngValues(nOldIndex).nId, NewSideAngValues.Count, SideAngValues(nOldIndex).dValue))
            End If
-            ' punto aggiunto: Verifico che il punto successivo coincida con il vecchio corrente o che sia stato aggiunto in fondo
+         ' punto aggiunto: Verifico che il punto successivo coincida con il vecchio corrente o che sia stato aggiunto in fondo
         ElseIf (nNewIndex + 1 <= NewAngleList.Count - 1 AndAlso AreSamePointApprox(NewAngleList(nNewIndex + 1), OldAngleList(nOldIndex))) OrElse
                (nOldIndex = OldAngleList.Count AndAlso OldAngleList.Count < NewAngleList.Count) Then
            ' se non e' percorso aperto e primo punto
@@ -853,7 +856,7 @@ Public Class FreeContourManagerVM
            ' aggiungo punto e incremento indice di confronto per riallineare successivo
            NewSideAngValues.Insert(TextIndex, New SideAngle(TextId, TextIndex, 0))
            nOldIndex -= 1
-            ' punto tolto: verifico che il punto coincida con il vecchio successivo o che sia stato tolto in fondo
+         ' punto tolto: verifico che il punto coincida con il vecchio successivo o che sia stato tolto in fondo
         ElseIf (nOldIndex + 1 <= OldAngleList.Count - 1 AndAlso AreSamePointApprox(NewAngleList(nNewIndex), OldAngleList(nOldIndex + 1))) OrElse
             (nNewIndex = NewAngleList.Count AndAlso OldAngleList.Count > NewAngleList.Count) Then
            ' non aggiungo nulla, ma cancello testo
@@ -866,7 +869,7 @@ Public Class FreeContourManagerVM
            EgtAtParamPoint(m_nNewPathId, If(Index = 0, NewAngleList.Count, Index) - 0.5, ptNew)
            Dim vtDistance As Vector3d = ptNew - ptOld
            EgtMove(SideAngValues(If(Index = 0, OldAngleList.Count, Index) - 1).nId, vtDistance)
-            ' spostato o ruotato intero percorso
+         ' spostato o ruotato intero percorso
         Else
            ' aggiorno posizione testo successivo
            Dim ptOld As Point3d
@@ -897,7 +900,8 @@ Public Class FreeContourManagerVM
         Dim dAng As Double
         StringToDouble(Map.refFreeContourInputVM.Text, dAng)
         EgtSetInfo(m_nSelTextId, "SideAng", dAng)
-         EgtModifyText(m_nSelTextId, dAng & "°")
+         Dim sAng As String = DoubleToString( dAng, 2) & "°"
+         EgtModifyText(m_nSelTextId, sAng)
         Dim SideAngValue As SideAngle = SideAngValues.First(Function(x) x.nId = m_nSelTextId)
         SideAngValue.dValue = dAng
      End If
@@ -944,8 +948,9 @@ Public Class FreeContourManagerVM
         Map.refFreeContourInputVM.PrepareInputBox(EgtMsg(62007), EgtMsg(62008), "", False, False)
         Dim dSideAng As Double = 0
         EgtGetInfo(nId, "SideAng", dSideAng)
-         Map.refFreeContourInputVM.SetInputBoxText(dSideAng)
-         ' se sto aprendo percorso chiuso
+         Dim sSideAng As String = DoubleToString( dSideAng, 2)
+         Map.refFreeContourInputVM.SetInputBoxText(sSideAng)
+      ' se sto aprendo percorso chiuso
      ElseIf Map.refFreeContourManagerVM.bIsOpeningCurveCompo Then
         Map.refSceneHostVM.MainController.ExecuteCommand(Controller.CMD.OPENCOMPO)
         m_bIsOpeningCurveCompo = False
@@ -213,49 +213,17 @@ Public Class MyInstrumentPanelVM
                     For Each Param In ParamList.Where(Function(x) x.sName = ChangeParameterWndVM.SelParam.sName)
                        Select Case Param.nType
                           Case BTLParamType.DOUBLE_, BTLParamType.LENGTH
-                              If Param.dValue = ChangeParameterWndVM.SelParam.dActualValue Then
+                              If Math.Abs( Param.dValue - ChangeParameterWndVM.SelParam.dActualValue) < EPS_SMALL Then
                                 Param.UpdateParamValue(ChangeParameterWndVM.SelParam.dNewValue, "")
-                                 '' rinfresco valori parametri feature correntemente selezionata
-                                 'If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) AndAlso
-                                 '   Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM) AndAlso
-                                 '   Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM Is Feature Then
-                                 '   Param.NotifyPropertyChanged("sValue")
-                                 'End If
                              End If
                           Case BTLParamType.STRING_
                              If Param.sValue = ChangeParameterWndVM.SelParam.sActualValue Then
                                 Param.UpdateParamValue(0, ChangeParameterWndVM.SelParam.sNewValue)
-                                 '' rinfresco valori parametri feature correntemente selezionata
-                                 'If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) AndAlso
-                                 '   Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM) AndAlso
-                                 '   Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.nPRC = ChangeParameterWndVM.SelPRC.nPRC AndAlso
-                                 '   Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.nSelGRP = ChangeParameterWndVM.SelPRC.nGRP Then
-                                 '   Param.NotifyPropertyChanged("sValue")
-                                 'End If
                              End If
                        End Select
                     Next
                  End If
               Next
-               '' faccio passare feature
-               'For Each Feature In Part.FeatureList
-               '   If Feature.nPRC = ChangeParameterWndVM.SelPRC.nPRC Then
-               '      For Each Param In Feature.PParamList
-               '         If Param.sName = ChangeParameterWndVM.SelParam.sName Then
-               '            Select Case Param.nType
-               '               Case BTLParamType.DOUBLE_, BTLParamType.LENGTH
-               '                  If Param.dValue = ChangeParameterWndVM.SelParam.dActualValue Then
-               '                     Param.dValue = ChangeParameterWndVM.SelParam.dValue
-               '                  End If
-               '               Case BTLParamType.STRING_
-               '                  If Param.sValue = ChangeParameterWndVM.SelParam.sActualValue Then
-               '                     Param.sValue = ChangeParameterWndVM.SelParam.sValue
-               '                  End If
-               '            End Select
-               '         End If
-               '      Next
-               '   End If
-               'Next
            Next
         End If
         LoadingWndHelper.CloseLoadingWnd(ActiveIds.CHANGEPARAM)
@@ -353,7 +353,11 @@ Public Class LeftPanelVM
               Dim SectionList As List(Of SParam) = WarehouseHelper.GetSectionList()
               Dim SParamlist As List(Of SParam) = SectionList.FindAll(Function(x) x.SectXMat = SelParts(0).Section)
               If bLast Then
-                  If SParamlist.Count > 0 Then
+                  Dim LastMaterial As SParam = WarehouseHelper.GetLastMaterial(SelParts(0).Section)
+                  If Not IsNothing(LastMaterial) Then
+                     dRawL = LastMaterial.dL
+                     dRawW = LastMaterial.dW
+                  ElseIf SParamlist.Count > 0 Then
                     dRawL = SParamlist(0).dL
                     dRawW = SParamlist(0).dW
                  Else
@@ -362,6 +366,11 @@ Public Class LeftPanelVM
                  End If
               Else
                  If SParamlist.Count = 0 Then
+                     ' se pareti aumento dimensioni del kerf
+                     If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL Then
+                        dRawW += (2 * dKerf)
+                        dRawL += (2 * dKerf)
+                     End If
                     ' apro finestra con solo edit
                     If AddRawPartWnd(AddRawPartWndVM.EditTypes.ONLY_TEXT, SParamlist, dRawW, dRawL, dStartOffset, dOffset, dKerf) Then
                        WarehouseHelper.SetOffset(Map.refProjectVM.BTLStructureVM.nPROJTYPE, dOffset)
@@ -543,7 +552,7 @@ Public Class LeftPanelVM
            dOffset = AddRawPartWndVM.VariableList(3).dValue
      End Select
      ' verifico se il materiale esiste in magazzino o devo aggiungerlo
-      Dim CurrSParam As SParam
+      Dim CurrSParam As SParam = Nothing
      Select Case EditType
         Case AddRawPartWndVM.EditTypes.ONLY_TEXT
            ' lo aggiungo a lista materiali in magazzino
@@ -563,7 +572,7 @@ Public Class LeftPanelVM
            End If
      End Select
      ' imposto il materiale selezionato come ultimo utilizzato
-
+      SetLastMaterial(CurrSParam.SectXMat, CurrSParam)
      Return True
   End Function

@@ -576,25 +585,21 @@ Public Class LeftPanelVM
         Dim sL As String = String.Empty
         sL = LenToString(CurrSParam.dL, 3)
         ' ricavo l'indice del SecionXMaterial dalla Beam_List
-         Dim SectXMatIndex As Integer = 1
-         Dim sSxMValue As String = ""
-         While EgtUILib.GetPrivateProfileString(S_BEAM_LIST, SectXMatIndex, String.Empty, sSxMValue, sWarehousePath)
-            If sSxMValue = CurrSParam.sValue Then
-               ' se l'ho trovato esco dal while, il SectXMatIndex è l'indice che cercavamo
-               Exit While
-            End If
-            SectXMatIndex += 1
-         End While
+         Dim SectXMatIndex As Integer = GetSectIndexFromSection(MachineType.BEAM, CurrSParam.SectXMat)
         ' ricavo nuovo indice materiale
         Dim ParamIndex As Integer = 1
         Dim sParam As String = ""
         While GetPrivateProfileString(S_BEAM, K_L & ParamIndex, "", sParam, sWarehousePath) > 0
            ParamIndex += 1
         End While
-         ' lo aggiungo in warehouse
-         WritePrivateProfileString(S_BEAM, K_L & ParamIndex,
+         If SectXMatIndex > 0 Then
+            ' lo aggiungo in warehouse
+            WritePrivateProfileString(S_BEAM, K_L & ParamIndex,
                                            SectXMatIndex & "," & sL & "," & CurrSParam.nQuantity & "," & If(CurrSParam.bActive, 1, 0),
                                            sWarehousePath)
+         Else
+            EgtOutLog("Error in material creation, section not found!")
+         End If
         Return CurrSParam
      ElseIf Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.WALL Then
         ' creo sParam
@@ -616,7 +621,7 @@ Public Class LeftPanelVM
         ' ricavo nuovo indice materiale
         Dim ParamIndex As Integer = 1
         Dim sParam As String = ""
-         While GetPrivateProfileString(S_WALL, K_S & ParamIndex, "", sParam, sWarehousePath) = 0
+         While GetPrivateProfileString(S_WALL, K_S & ParamIndex, "", sParam, sWarehousePath) > 0
            ParamIndex += 1
         End While
         ' lo aggiungo in warehouse
@@ -625,6 +630,8 @@ Public Class LeftPanelVM
                                            sWarehousePath)
         Return CurrSParam
      End If
+
+      Return Nothing
   End Function

   Private Function VerifyPartCount(SelParts As List(Of BTLPartVM)) As Boolean
@@ -1131,9 +1138,18 @@ Public Class LeftPanelVM
   ''' </summary>
   Public Sub Invert()
      If IsNothing(Map.refProjManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) Then Return
+      ' se modalita' assemblato
+      Dim bShowBuilding As Boolean = Map.refShowBeamPanelVM.ShowBuilding_IsChecked
+      If bShowBuilding AndAlso Map.refShowBeamPanelVM.bShowAll Then
+         ' devo smontarlo prima di ruotare le travi
+         Map.refProjectVM.BTLStructureVM.ShowBuilding(False, False)
+      End If
+      ' inverto i pezzi selezionati
      For Each Part In Map.refProjectVM.BTLStructureVM.SelBTLParts
         Part.Invert()
      Next
+      ' se assemblato lo ripristino
+      If bShowBuilding Then Map.refProjectVM.BTLStructureVM.ShowBuilding(True, False)
   End Sub

 #End Region    ' BackRotation
@@ -288,13 +288,13 @@ Public Class MyMachGroupVM
         Dim dValue As Double
         If StringToLen(value, dValue) Then
            Dim nRawPartId As Integer = EgtGetFirstRawPart()
-            If dValue <> MyMachGroupM.dPosZ Then
+            If Math.Abs( dValue - MyMachGroupM.dPosZ) > EPS_SMALL Then
               Select Case nType
                  Case BWType.BEAM
                     ' non utilizzato
                  Case BWType.WALL
                     ' se operazione di spostamento in z ha successo
-                     If True Then
+                     If dValue >= 0 AndAlso EgtMoveRawPart( nRawPartId, New Vector3d(0, 0, dValue - MyMachGroupM.dPosZ)) Then
                        EgtSetInfo(Id, MGR_RPT_PANELPOSZ, dValue)
                        EgtDraw()
                        MyMachGroupM.dPosZ = dValue
@@ -810,7 +810,7 @@ Public Class MyMachGroupVM
 #Region "DeleteMachGroup"

   ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
-   Public Overrides Sub DeleteMachGroup()
+   Public Overrides Sub DeleteMachGroup(Optional bMultipleCommand As Boolean = False)
      If EgtSetCurrMachGroup(Me.Id) Then
         ' elimino tutte le copie
         Dim nRawPartId As Integer = EgtGetFirstRawPart()
@@ -839,25 +839,28 @@ Public Class MyMachGroupVM
         ' elimino MachGroup
         EgtRemoveMachGroup(Me.Id)
      End If
-      ' rimuovo dalla lista grezzi
-      Dim Index As Integer = Map.refMachGroupPanelVM.MachGroupVMList.IndexOf(Me)
-      If Index = 0 Then
-         If Map.refMachGroupPanelVM.MachGroupVMList.Count > 1 Then
-            Map.refMachGroupPanelVM.SelectedMachGroup = Map.refMachGroupPanelVM.MachGroupVMList(1)
+      ' cambio pezzo selezionato
+      If bMultipleCommand Then
+         Dim Index As Integer = Map.refMachGroupPanelVM.MachGroupVMList.IndexOf(Me)
+         If Index = 0 Then
+            If Map.refMachGroupPanelVM.MachGroupVMList.Count > 1 Then
+               Map.refMachGroupPanelVM.SelectedMachGroup = Map.refMachGroupPanelVM.MachGroupVMList(1)
+            Else
+               Map.refMachGroupPanelVM.SelectedMachGroup = Nothing
+               EgtDraw()
+            End If
+         ElseIf Index = Map.refMachGroupPanelVM.MachGroupVMList.Count - 1 Then
+            If Map.refMachGroupPanelVM.MachGroupVMList.Count > 1 Then
+               Map.refMachGroupPanelVM.SelectedMachGroup = Map.refMachGroupPanelVM.MachGroupVMList(Map.refMachGroupPanelVM.MachGroupVMList.Count - 2)
+            Else
+               Map.refMachGroupPanelVM.SelectedMachGroup = Nothing
+               EgtDraw()
+            End If
         Else
-            Map.refMachGroupPanelVM.SelectedMachGroup = Nothing
-            EgtDraw()
+            Map.refMachGroupPanelVM.SelectedMachGroup = Map.refMachGroupPanelVM.MachGroupVMList(Index - 1)
         End If
-      ElseIf Index = Map.refMachGroupPanelVM.MachGroupVMList.Count - 1 Then
-         If Map.refMachGroupPanelVM.MachGroupVMList.Count > 1 Then
-            Map.refMachGroupPanelVM.SelectedMachGroup = Map.refMachGroupPanelVM.MachGroupVMList(Map.refMachGroupPanelVM.MachGroupVMList.Count - 2)
-         Else
-            Map.refMachGroupPanelVM.SelectedMachGroup = Nothing
-            EgtDraw()
-         End If
-      Else
-         Map.refMachGroupPanelVM.SelectedMachGroup = Map.refMachGroupPanelVM.MachGroupVMList(Index - 1)
      End If
+      ' rimuovo dalla lista grezzi
      Map.refMachGroupPanelVM.MachGroupVMList.Remove(Me)
   End Sub

@@ -227,8 +227,8 @@ Public Class MainWindowM
      ' Verifico abilitazione nesting automatico
      m_bAutoNestOption = Not String.IsNullOrWhiteSpace(sNestKey)
      ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2411, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2411, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2501, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2501, 1, m_nKeyOptions)
      ' Inizializzazione generale di EgtInterface
      m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
      m_sLogFile = m_sTempDir & "\" & VWOPTGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())
@@ -30,7 +30,7 @@ Imports System.Windows
 #End If
 <Assembly: AssemblyCompany("Egalware s.r.l.")>
 <Assembly: AssemblyProduct("EgtBEAMWALL.ViewerOptimizer")>
-<Assembly: AssemblyCopyright("Copyright ©  2020-2022 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2020-2023 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")>
 <Assembly: ComVisible(false)>

@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("2.4.11.3")>
-<Assembly: AssemblyFileVersion("2.4.11.3")>
+<Assembly: AssemblyVersion("2.5.2.3")>
+<Assembly: AssemblyFileVersion("2.5.2.3")>
@@ -499,7 +499,7 @@ Public Class NestingRunningWndVM
            If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count = 0 Then
               Map.refProjectVM.BTLStructureVM.HideAll(True)
            End If
-            Return
+            Exit While
         End If

         ' passo al prossimo RawPart
@@ -532,10 +532,10 @@ Public Class ProjManagerVM
         ' verifico se assemblato e lo annullo per salvataggio
         bShowBuilding = Map.refShowBeamPanelVM.ShowBuilding_IsChecked
         If bShowBuilding Then Map.refProjectVM.BTLStructureVM.ShowBuilding(False, False)
-         ' se vista singolo pezzo
+      ' se vista singolo pezzo
      Else
         bShowSolid = Map.refShowBeamPanelVM.ShowSolid_IsChecked
-         If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
+         If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, False, False)
      End If
      ' imposto ProjId di caricamento
      m_nLoadingProjId = CurrProj.nProjId
@@ -551,7 +551,7 @@ Public Class ProjManagerVM
      End If
      ' se assemblato lo ripristino
      If bShowBuilding Then Map.refProjectVM.BTLStructureVM.ShowBuilding(True, False)
-      If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
+      If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
      ' verifico se Reset Macchina modificato e nel caso aggiorno DB e CurrProj
      If Map.refCALCPanelVM.IsMachineModified() Then
         DbControllers.m_ProjController.UpdateMachine(Map.refProjManagerVM.CurrProj.nProjId, Map.refCALCPanelVM.SelectedMachine.Name)
@@ -831,7 +831,7 @@ Public Class ProjManagerVM
         ' se vista singolo pezzo
      Else
         bShowSolid = Map.refShowBeamPanelVM.ShowSolid_IsChecked
-         If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
+         If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, False, False)
         ' se pezzo selezionato lo segno e metto vista tutti
         nSelPartId = Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId
         Map.refProjectVM.BTLStructureVM.ShowAll(False)
@@ -857,7 +857,7 @@ Public Class ProjManagerVM
               Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.BTLPartVMList.FirstOrDefault(Function(x) x.nPartId = nSelPartId)
               If Not IsNothing(SelPart) Then
                  SelPart.IsSelected = True
-                  If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
+                  If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
               End If
            End If
            EgtZoom(ZM.ALL)
@@ -974,7 +974,7 @@ Public Class ProjManagerVM
                           Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.BTLPartVMList.FirstOrDefault(Function(x) x.nPartId = nSelPartId)
                           If Not IsNothing(SelPart) Then
                              SelPart.IsSelected = True
-                              If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
+                              If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
                           End If
                        End If
                        EgtZoom(ZM.ALL)
@@ -1089,7 +1089,7 @@ Public Class ProjManagerVM
                  Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.BTLPartVMList.FirstOrDefault(Function(x) x.nPartId = nSelPartId)
                  If Not IsNothing(SelPart) Then
                     SelPart.IsSelected = True
-                     If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
+                     If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
                  End If
               End If
               EgtZoom(ZM.ALL)
@@ -1296,7 +1296,7 @@ Public Class ProjManagerVM
         Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.BTLPartVMList.FirstOrDefault(Function(x) x.nPartId = nSelPartId)
         If Not IsNothing(SelPart) Then
            SelPart.IsSelected = True
-            If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(False)
+            If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False)
         End If
      End If
      EgtZoom(ZM.ALL)
@@ -285,8 +285,10 @@ Public Class MySceneHostVM
      Select Case Map.refMainMenuVM.SelPage
         Case Pages.VIEW
            If Not IsNothing(Map.refProjectVM.BTLStructureVM) Then
-               If Map.refFreeContourManagerVM.bIsActive AndAlso Map.refFreeContourManagerVM.SelType = FreeContourManagerVM.FreeContourTypes.ONEWITHANGLES Then
-                  ' passo testo selezionato
+               If Map.refFreeContourManagerVM.bIsActive AndAlso
+                  ( Map.refFreeContourManagerVM.SelType = FreeContourManagerVM.FreeContourTypes.ONEWITHANGLES Or
+                    Map.refFreeContourManagerVM.bIsOpeningCurveCompo) Then
+                  ' passo entità selezionata
                  Map.refFreeContourManagerVM.OnMouseSelectedObj(EgtGetFirstSelectedObj(), True)
               ElseIf Map.refShowBeamPanelVM.bShowAll Then
                  View_Part_OnMouseDownScene(sender, e)
@@ -34,7 +34,7 @@ Public Class ShowBeamPanelVM
      End Get
      Set(value As Boolean)
         m_bShowSolid = value
-         If Not IsNothing(Map.refProjectVM.BTLStructureVM) Then Map.refProjectVM.BTLStructureVM.ShowSolid()
+         If Not IsNothing(Map.refProjectVM.BTLStructureVM) Then Map.refProjectVM.BTLStructureVM.ShowSolid( GDB_ID.NULL, m_bShowSolid)
      End Set
   End Property
   Friend Sub SetShowSolid(bValue As Boolean)
@@ -387,14 +387,14 @@ Public Class TopPanelVM

   Public Sub RemoveRawPart(Optional bAll As Boolean = False)
      If IsNothing(Map.refProdManagerVM.CurrProd) Then Return
-      ' se premuto shift
+      ' se tutti
      If bAll Then
         ' cancello tutti
         For Index = Map.refMachGroupPanelVM.MachGroupVMList.Count - 1 To 0 Step -1
            Dim CurrMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.MachGroupVMList(Index)
            ' se barra gia' assegnata a supervisore, esco
            If CurrMachGroup.nProduction_State >= ItemState.Assigned Then Continue For
-            CurrMachGroup.DeleteMachGroup()
+            CurrMachGroup.DeleteMachGroup(True)
         Next
      Else
         Dim SelMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup
@@ -403,6 +403,7 @@ Public Class TopPanelVM
         If SelMachGroup.nProduction_State >= ItemState.Assigned Then Return
         SelMachGroup.DeleteMachGroup()
      End If
+      EgtDraw()
      ' se nessun grezzo, rimetto tutti i pezzi invisibili
      If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count = 0 Then
         Map.refProjectVM.BTLStructureVM.HideAll(True)
@@ -99,8 +99,6 @@ Module LuaExec
      EgtLuaSetGlobStringVar("NEST.BASEDIR", sRoot)
      EgtLuaSetGlobStringVar("NEST.FILE", sFile)
      EgtLuaSetGlobStringVar("NEST.MACHINE", sMachine)
-      'EgtLuaSetGlobNumVar("NEST.LEN", dLength)
-      'EgtLuaSetGlobNumVar("NEST.WIDTH", dWidth)
      EgtLuaSetGlobNumVar("NEST.STARTOFFSET", dStartOffset)
      EgtLuaSetGlobNumVar("NEST.OFFSET", dOffset)
      EgtLuaSetGlobNumVar("NEST.KERF", dKerf)
@@ -119,7 +117,6 @@ Module LuaExec
      End Select
      EgtLuaSetGlobNumVar("NEST.CORNER", nNestCorner)
      EgtLuaSetGlobStringVar("NEST.MATERIAL", PartList(0).sMATERIAL)
-      'EgtLuaSetGlobNumVar("NEST.QTY", nQty)
      EgtLuaSetGlobNumVar("NEST.TIME", nNestTime)
      EgtLuaSetGlobNumVar("NEST.PRODID", Map.refProdManagerVM.CurrProd.nProdId)
      EgtLuaCreateGlobTable("PART")
@@ -128,19 +125,19 @@ Module LuaExec
      Next
      EgtLuaCreateGlobTable("LEN")
      For SectionIndex = 0 To SectionList.Count - 1
-         EgtLuaSetGlobNumVar("LEN." & SectionIndex + 1, SectionList(SectionIndex).dL)
+         EgtLuaSetGlobNumVar("LEN." & (SectionIndex + 1).ToString(), SectionList(SectionIndex).dL)
      Next
      EgtLuaCreateGlobTable("WIDTH")
      For SectionIndex = 0 To SectionList.Count - 1
-         EgtLuaSetGlobNumVar("WIDTH." & SectionIndex + 1, SectionList(SectionIndex).dW)
+         EgtLuaSetGlobNumVar("WIDTH." & (SectionIndex + 1).ToString(), SectionList(SectionIndex).dW)
      Next
      EgtLuaCreateGlobTable("QTY")
      For SectionIndex = 0 To SectionList.Count - 1
-         EgtLuaSetGlobNumVar("QTY." & SectionIndex + 1, SectionList(SectionIndex).nQuantity)
+         EgtLuaSetGlobNumVar("QTY." & (SectionIndex + 1).ToString(), SectionList(SectionIndex).nQuantity)
      Next
      EgtLuaCreateGlobTable("MATERIAL")
      For SectionIndex = 0 To SectionList.Count - 1
-         EgtLuaSetGlobStringVar("MATERIAL." & SectionIndex + 1, SectionList(SectionIndex).SectXMat.sSectionXMaterial)
+         EgtLuaSetGlobStringVar("MATERIAL." & (SectionIndex + 1).ToString(), SectionList(SectionIndex).SectXMat.sSectionXMaterial)
      Next
      ' Eseguo lo script
      Dim bOk As Boolean = False
@@ -252,83 +252,122 @@ Module WarehouseHelper

   Friend Function GetLastMaterial(SectXMat As SectionXMaterial) As SParam
      Dim sWarehousePath As String = Map.refMainWindowVM.MainWindowM.sWarehouseDir & "\" & WH_MEDIUM_INI_FILE_NAME
-      'If Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.BEAM Then
-      '   Dim ParamIndex As Integer = 1
-      '   Dim sSxMValue As String = ""
-      '   While EgtUILib.GetPrivateProfileString(S_BEAM_LIST, ParamIndex, String.Empty, sSxMValue, sWarehousePath) > 0
-      '      Dim sSectXMatValues() As String = sSxMValue.Split(","c)
-      '      ' creo parametro
-      '      Dim dW As Double = 0
-      '      Dim dH As Double = 0
-      '      Dim sMaterial As String = sSectXMatValues(2)
-      '      StringToLen(sSectXMatValues(0), dW)
-      '      StringToLen(sSectXMatValues(1), dH)
-      '      If SectXMat.dW = dW AndAlso SectXMat.dH = dH AndAlso SectXMat.sMaterial(0) = sMaterial Then
-      '         If sSectXMatValues.Length <= 3 Then Return Nothing
-      '         Dim sValue As String = ""
-      '         If EgtUILib.GetPrivateProfileString(S_BEAM, "L" & sSectXMatValues(3), String.Empty, sValue, sWarehousePath) Then
+      If Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.BEAM Then
+         Dim ParamIndex As Integer = 1
+         Dim sSxMValue As String = ""
+         While EgtUILib.GetPrivateProfileString(S_BEAM_LIST, ParamIndex, String.Empty, sSxMValue, sWarehousePath) > 0
+            Dim sSectXMatValues() As String = sSxMValue.Split(","c)
+            ' creo parametro
+            Dim dW As Double = 0
+            Dim dH As Double = 0
+            Dim sMaterial As String = sSectXMatValues(2)
+            StringToLen(sSectXMatValues(0), dW)
+            StringToLen(sSectXMatValues(1), dH)
+            If SectXMat.dW = dW AndAlso SectXMat.dH = dH AndAlso SectXMat.sMaterial(0) = sMaterial Then
+               If sSectXMatValues.Length <= 3 Then Return Nothing
+               Dim sValue As String = ""
+               If EgtUILib.GetPrivateProfileString(S_BEAM, "L" & sSectXMatValues(3), String.Empty, sValue, sWarehousePath) Then
+                  Dim sParamValues() As String = sValue.Split(","c)
+                  ' verifico numero minimo di parametri
+                  If sParamValues.Count < 2 Then Return Nothing
+                  ' cancello spazi
+                  For Index = 0 To sParamValues.Count - 1
+                     sParamValues(Index) = sParamValues(Index).Trim()
+                  Next
+                  Dim dL As Double = 0
+                  Dim nQty As Integer = 0
+                  Dim nActive As Integer = 1
+                  StringToLen(sParamValues(1), dL)
+                  If sParamValues.Count >= 3 Then Integer.TryParse(sParamValues(2), nQty)
+                  If sParamValues.Count >= 4 Then Integer.TryParse(sParamValues(3), nActive)
+                  Return New SParam(New SectionXMaterial(dW, dH, dL, sSectXMatValues(2)), dL, nQty, nActive > 0)
+               End If
+            End If
+            ParamIndex += 1
+         End While
+      End If

-      '         End If
-      '      End If
-      '   End While
+      Return Nothing
+   End Function

+   Friend Sub SetLastMaterial(SectXMat As SectionXMaterial, SParam As SParam)
+      Dim sWarehousePath As String = Map.refMainWindowVM.MainWindowM.sWarehouseDir & "\" & WH_MEDIUM_INI_FILE_NAME
+      If Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.BEAM Then
+         ' cerco sezione 
+         Dim SectIndex As Integer = 1
+         Dim sSxMValue As String = ""
+         While EgtUILib.GetPrivateProfileString(S_BEAM_LIST, SectIndex, String.Empty, sSxMValue, sWarehousePath) > 0
+            Dim sSectXMatValues() As String = sSxMValue.Split(","c)
+            ' creo parametro
+            Dim dW As Double = 0
+            Dim dH As Double = 0
+            Dim sMaterial As String = sSectXMatValues(2)
+            StringToLen(sSectXMatValues(0), dW)
+            StringToLen(sSectXMatValues(1), dH)
+            If SectXMat.dW = dW AndAlso SectXMat.dH = dH AndAlso SectXMat.sMaterial(0) = sMaterial Then
+               ' recupero indice di SParam
+               Dim SParamIndex As Integer = 1
+               Dim sValue As String = ""
+               While EgtUILib.GetPrivateProfileString(S_BEAM, "L" & SParamIndex, String.Empty, sValue, sWarehousePath)
+                  Dim sParamValues() As String = sValue.Split(","c)
+                  ' verifico numero minimo di parametri
+                  If sParamValues.Count < 2 Then Return
+                  ' cancello spazi
+                  For Index = 0 To sParamValues.Count - 1
+                     sParamValues(Index) = sParamValues(Index).Trim()
+                  Next
+                  Dim dL As Double = 0
+                  Dim nSectIndex As Integer = sParamValues(0)
+                  Dim nQty As Integer = 0
+                  Dim nActive As Integer = 1
+                  StringToLen(sParamValues(1), dL)
+                  If sParamValues.Count >= 3 Then Integer.TryParse(sParamValues(2), nQty)
+                  If sParamValues.Count >= 4 Then Integer.TryParse(sParamValues(3), nActive)
+                  Dim bActive As Boolean = nActive = 1
+                  If dL = SParam.dL AndAlso nQty = SParam.nQuantity AndAlso bActive = SParam.bActive Then
+                     ' scrivo indice ultimo materiale
+                     EgtUILib.WritePrivateProfileString(S_BEAM_LIST, SectIndex, LenToString(dW, 3) & "," &
+                                                                LenToString(dH, 3) & "," &
+                                                                sMaterial & "," &
+                                                                SParamIndex, sWarehousePath)
+                  End If
+                  SParamIndex += 1
+               End While
+            End If
+            SectIndex += 1
+         End While
+      End If
+   End Sub

-
-
-      '   If EgtUILib.GetPrivateProfileString(S_BEAM, "L" & ParamIndex, String.Empty, sValue, sWarehousePath) Then
-      '      Dim sParamValues() As String = sValue.Split(","c)
-      '      ' verifico numero minimo di parametri
-      '      If sParamValues.Count < 2 Then Return Nothing
-      '      ' cancello spazi
-      '      For Index = 0 To sParamValues.Count - 1
-      '         sParamValues(Index) = sParamValues(Index).Trim()
-      '      Next
-      '      ' ricavo SectionXMaterial tramite Beam_List
-      '      If EgtUILib.GetPrivateProfileString(S_BEAM_LIST, sParamValues(0), String.Empty, sSxMValue, sWarehousePath) Then
-      '         Dim sSectXMatValues() As String = sSxMValue.Split(","c)
-      '         ' creo parametro
-      '         Dim dW As Double = 0
-      '         Dim dH As Double = 0
-      '         Dim dL As Double = 0
-      '         Dim nQty As Integer = 0
-      '         Dim nActive As Integer = 1
-      '         StringToLen(sSectXMatValues(0), dW)
-      '         StringToLen(sSectXMatValues(1), dH)
-      '         StringToLen(sParamValues(1), dL)
-      '         If sParamValues.Count >= 3 Then Integer.TryParse(sParamValues(2), nQty)
-      '         If sParamValues.Count >= 4 Then Integer.TryParse(sParamValues(3), nActive)
-      '         Return New SParam(New SectionXMaterial(dW, dH, dL, sSectXMatValues(2)), dL, nQty, nActive > 0)
-      '      End If
-      '   End If
-      'ElseIf Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.WALL Then
-      '   If EgtUILib.GetPrivateProfileString(S_WALL, "S" & ParamIndex, String.Empty, sValue, sWarehousePath) Then
-      '      Dim sParamValues() As String = sValue.Split(","c)
-      '      ' verifico numero minimo di parametri
-      '      If sParamValues.Count >= 3 Then
-      '         ' cancello spazi
-      '         For Index = 0 To sParamValues.Count - 1
-      '            sParamValues(Index) = sParamValues(Index).Trim()
-      '         Next
-      '         ' ricavo SectionXMaterial tramite Wall_List
-      '         If EgtUILib.GetPrivateProfileString(S_WALL_LIST, sParamValues(0), String.Empty, sSxMValue, sWarehousePath) Then
-      '            Dim sSectXMatValues() As String = sSxMValue.Split(","c)
-      '            ' creo parametro
-      '            Dim dH As Double = 0
-      '            Dim dW As Double = 0
-      '            Dim dL As Double = 0
-      '            Dim nQty As Integer = 0
-      '            Dim nActive As Integer = 1
-      '            StringToLen(sSectXMatValues(0), dH)
-      '            StringToLen(sParamValues(1), dW)
-      '            StringToLen(sParamValues(2), dL)
-      '            If sParamValues.Count >= 4 Then Integer.TryParse(sParamValues(3), nQty)
-      '            If sParamValues.Count >= 5 Then Integer.TryParse(sParamValues(4), nActive)
-      '            Return New SParam(New SectionXMaterial(dW, dH, dL, sSectXMatValues(1)), dW, dL, nQty, nActive > 0)
-      '         End If
-      '      End If
-      '   End If
-      'End If
-
+   Friend Function GetSectIndexFromSection(Type As BWType, Section As SectionXMaterial) As Integer
+      Dim nIndex As Integer = 1
+      Dim sSectionData As String = ""
+      While GetPrivateProfileString(If(Type = BWType.BEAM, S_BEAM_LIST, S_WALL_LIST), nIndex, "", sSectionData, GetWarehouseIniPath()) > 0
+         If String.IsNullOrWhiteSpace(sSectionData) Then Continue While
+         Dim sSectionValues() As String = sSectionData.Split(","c)
+         Select Case Type
+            Case BWType.BEAM
+               Dim dW As Double = 0
+               Dim dH As Double = 0
+               Dim sMaterial As String = sSectionValues(2)
+               StringToLen(sSectionValues(0), dW)
+               StringToLen(sSectionValues(1), dH)
+               If Section.dW = dW AndAlso Section.dH = dH AndAlso Section.sMaterial(0) = sMaterial Then
+                  ' se l'ho trovato esco dal while, il SectXMatIndex è l'indice che cercavamo
+                  Return nIndex
+               End If
+            Case BWType.WALL
+               Dim dH As Double = 0
+               Dim sMaterial As String = sSectionValues(1)
+               StringToLen(sSectionValues(0), dH)
+               If Section.dH = dH AndAlso Section.sMaterial(0) = sMaterial Then
+                  ' se l'ho trovato esco dal while, il SectXMatIndex è l'indice che cercavamo
+                  Return nIndex
+               End If
+         End Select
+         nIndex += 1
+      End While
+      Return -1
   End Function

 End Module
@@ -518,7 +518,10 @@ Public Class WarehouseWndVM
               SParamList = New ObservableCollection(Of SParam)
               SectionXMaterialList = New ObservableCollection(Of SectionXMaterial)(GetSectionXMaterialsFromWarehouse())
               While EgtUILib.GetPrivateProfileString(S_BEAM, "L" & ParamIndex, String.Empty, sValue, sWarehousePath)
-                  SParamList.Add(GetSParamFromWarehouse(ParamIndex))
+                  Dim SParam = GetSParamFromWarehouse(ParamIndex)
+                  If Not IsNothing(SParam) Then
+                     SParamList.Add(SParam)
+                  End If
                  ParamIndex += 1
               End While

@@ -679,21 +682,32 @@ Public Class WarehouseWndVM
                  Dim sL As String = String.Empty
                  sL = LenToString(SParamList(ParamIndex - 1).dL, 3)

-                  ' ricavo l'indice del SecionXMaterial dalla Beam_List
-                  Dim SectXMatIndex As Integer = 1
-                  Dim sSxMValue As String = ""
-                  While EgtUILib.GetPrivateProfileString(S_BEAM_LIST, SectXMatIndex, String.Empty, sSxMValue, sWarehousePath)
-                     If sSxMValue = SParamList(ParamIndex - 1).sValue Then
-                        ' se l'ho trovato esco dal while, il SectXMatIndex è l'indice che cercavamo
-                        Exit While
-                     End If
-                     SectXMatIndex += 1
-                  End While

-                  WritePrivateProfileString(S_BEAM, K_L & ParamIndex,
+                  ' ricavo l'indice del SecionXMaterial dalla Beam_List
+                  Dim SectXMatIndex As Integer = GetSectIndexFromSection(MachineType.BEAM, SParamList(ParamIndex - 1).SectXMat)
+                  'Dim sSxMValue As String = ""
+                  'While EgtUILib.GetPrivateProfileString(S_BEAM_LIST, SectXMatIndex, String.Empty, sSxMValue, sWarehousePath)
+                  '   Dim sSectXMatValues() As String = sSxMValue.Split(","c)
+                  '   ' creo parametro
+                  '   Dim dW As Double = 0
+                  '   Dim dH As Double = 0
+                  '   Dim sMaterial As String = sSectXMatValues(2)
+                  '   StringToLen(sSectXMatValues(0), dW)
+                  '   StringToLen(sSectXMatValues(1), dH)
+                  '   If SParamList(ParamIndex - 1).SectXMat.dW = dW AndAlso SParamList(ParamIndex - 1).SectXMat.dH = dH AndAlso SParamList(ParamIndex - 1).SectXMat.sMaterial(0) = sMaterial Then
+                  '      ' se l'ho trovato esco dal while, il SectXMatIndex è l'indice che cercavamo
+                  '      Exit While
+                  '   End If
+                  '   SectXMatIndex += 1
+                  'End While
+                  If SectXMatIndex > 0 Then
+                     WritePrivateProfileString(S_BEAM, K_L & ParamIndex,
                                            SectXMatIndex & "," & sL & "," & SParamList(ParamIndex - 1).nQuantity & "," & If(SParamList(ParamIndex - 1).bActive, 1, 0),
                                            sWarehousePath)
-                  ParamIndex += 1
+                     ParamIndex += 1
+                  Else
+                     EgtOutLog("Error in material creation, section not found!")
+                  End If
               Next
               ' Se ci sono parametri da rimuovere li rimuovo
               For Index = ParamIndex To ParamIndex + m_RemovedParamsCount
@@ -735,20 +749,23 @@ Public Class WarehouseWndVM
                  sL = LenToString(SParamList(ParamIndex - 1).dL, 3)

                  ' ricavo l'indice del SecionXMaterial dalla Wall_List
-                  Dim SectXMatIndex As Integer = 1
-                  Dim sSxMValue As String = ""
-                  While EgtUILib.GetPrivateProfileString(S_WALL_LIST, SectXMatIndex, String.Empty, sSxMValue, sWarehousePath)
-                     If sSxMValue = SParamList(ParamIndex - 1).sValue Then
-                        ' se l'ho trovato esco dal while, il SectXMatIndex è l'indice che cercavamo
-                        Exit While
-                     End If
-                     SectXMatIndex += 1
-                  End While
-
-                  WritePrivateProfileString(S_WALL, K_S & ParamIndex,
+                  Dim SectXMatIndex As Integer = GetSectIndexFromSection(MachineType.WALL, SParamList(ParamIndex - 1).SectXMat)
+                  'Dim sSxMValue As String = ""
+                  'While EgtUILib.GetPrivateProfileString(S_WALL_LIST, SectXMatIndex, String.Empty, sSxMValue, sWarehousePath)
+                  '   If sSxMValue = SParamList(ParamIndex - 1).sValue Then
+                  '      ' se l'ho trovato esco dal while, il SectXMatIndex è l'indice che cercavamo
+                  '      Exit While
+                  '   End If
+                  '   SectXMatIndex += 1
+                  'End While
+                  If SectXMatIndex > 0 Then
+                     WritePrivateProfileString(S_WALL, K_S & ParamIndex,
                                            SectXMatIndex & "," & sW & "," & sL & "," & SParamList(ParamIndex - 1).nQuantity & "," & If(SParamList(ParamIndex - 1).bActive, 1, 0),
                                            sWarehousePath)
-                  ParamIndex += 1
+                     ParamIndex += 1
+                  Else
+                     EgtOutLog("Error in material creation, section not found!")
+                  End If
               Next
               ' Se ci sono parametri da rimuovere li rimuovo
               For Index = ParamIndex To ParamIndex + m_RemovedParamsCount
@@ -1098,7 +1115,9 @@ Public Class WarehouseWndVM
            ' creo parametro
            Dim dH As Double = 0
            StringToLen(sSectXMatValues(0), dH)
-            SectXMatList.Add(New SectionXMaterial(0, dH, 0, sSectXMatValues(1)))
+            If Not SectXMatList.Any(Function(x) x.dH = dH AndAlso x.sMaterial(0) = sSectXMatValues(1)) Then
+               SectXMatList.Add(New SectionXMaterial(0, dH, 0, sSectXMatValues(1)))
+            End If
            sSectXMatIndex += 1
         End While
      End If
Author	SHA1	Message	Date
Emmanuele Sassi	785792d63b	- correzione per interrompere nesting in caso di errore	2023-03-07 10:39:34 +01:00
DarioS	5874a39b25	EgtBEAMWALL 2.5b3 : - ricompilazione con cambio versione.	2023-02-28 11:46:13 +01:00
DarioS	43f3f2f6d8	EgtBeamWall 2.5a2 : - ricompilazione e alcune migliorie.	2023-01-17 11:35:28 +01:00
Emmanuele Sassi	79a883a303	EgtBEAMWALL 2.5a1 : - correzione errore su salvataggio materiale in warehouse - su creazione RawPart pareti senza misure aggiungo kerf a dimensioni pezzo	2023-01-10 16:30:14 +01:00
Emmanuele Sassi	e3f88296e5	Merge branch 'master' of https://gitlab.steamware.net/egaltech/egtbeamwall	2022-12-23 17:55:30 +01:00
Emmanuele Sassi	e207ed7ece	- correzioni al warehouse con last material	2022-12-23 17:55:27 +01:00
DarioS	e97175765b	EgtBEAMWALL : - correzioni per modifica angoli di Contorni Liberi e similia.	2022-12-23 17:42:35 +01:00
DarioS	6a0ebb9fee	EgtBEAMWALL : - completamento gestione PosZ di pannello in Ottimizzazione di Wall.	2022-12-22 16:25:59 +01:00
Emmanuele Sassi	0a698dae34	Merge branch 'AddBeamPosZ'	2022-12-22 15:34:19 +01:00
DarioS	b74c052dd1	EgtBeamWall : - modifiche e correzioni per gestione Solidi.	2022-12-20 16:46:18 +01:00
Emmanuele Sassi	b7d62ace2c	- correzione al funzionamento magazzino	2022-12-17 12:20:36 +01:00
Emmanuele Sassi	3febbbbcbf	EgtBEAMWALL 2.4l2 : - correzione precedente tentativo miglioramento comunicazione axium - correzioni log macchina - correzione inversione multipezzo in assemblato - aggiornamento icone	2022-12-15 09:17:35 +01:00
Emmanuele Sassi	31874a8b92	- correzione non riconoscimento sezione su nuova lunghezza barra	2022-12-07 11:00:15 +01:00
Emmanuele Sassi	c75d9d6bc2	Merge branch 'RawPartLastCreation'	2022-12-07 10:26:03 +01:00
Emmanuele Sassi	96dd92c3d3	- aggiunta pausa di rilettura variabile programma inviato su cn Axium	2022-12-07 09:45:31 +01:00
Emmanuele Sassi	ebc41183bc	- correzione lettura dimensioni se bottone assemblato premuto ma progetto in stato non assemblato per esecuzione calcoli	2022-12-07 09:44:45 +01:00
Emmanuele Sassi	feb7982bef	- Modifica icone	2022-12-07 09:43:18 +01:00
Emmanuele Sassi	f241b72453	- Aggiunta gestione ultimo grezzo utilizzato - Migliorata gestione bottone cancella tutti	2022-12-06 18:30:20 +01:00
DarioS	2b306763c6	EgtBEAMWALL 2.4l1 : - mpostazione eventuale Cplane proprio di FreeContour quando si entra in Modifica - all'uscita dalla Modifica di FreeContour ora si imposta Cplane globale.	2022-12-04 16:47:09 +01:00
DarioS	f1b0a28e71	EgtBEAMWALL : - corretto cambio ultimo parametro geometrico di feature (il tipo veniva sovrascritto dal booleano bDo).	2022-11-25 15:42:52 +01:00