- Aggiunto messaggio se cartella Variant non trovata.

- Aggiornati controlli versione a 2.7d1

EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb

@@ -1,5 +1,8 @@
 Imports System.Collections.ObjectModel
+Imports System.Globalization
 Imports System.Windows
+Imports System.Windows.Input
+Imports System.Windows.Media
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -335,14 +338,13 @@ Public Class BTLFeatureM
    End Function
 
    Public Shared Function CreateBTLFeature(nPRC As Integer, nGRP As Integer, nSIDE As Integer) As BTLFeatureM
-      Dim NewBTLFeature As New BTLFeatureM With {
-         .m_nPRC = nPRC,
-         .m_nSelGRP = nGRP,
-         .m_nSelSIDE = nSIDE,
-         .m_nPriority = 0,
-         .m_bDO = True,
-         .nSelVARIANT = 0
-      }
+      Dim NewBTLFeature As New BTLFeatureM
+      NewBTLFeature.m_nPRC = nPRC
+      NewBTLFeature.m_nSelGRP = nGRP
+      NewBTLFeature.m_nSelSIDE = nSIDE
+      NewBTLFeature.m_nPriority = 0
+      NewBTLFeature.m_bDO = True
+      NewBTLFeature.nSelVARIANT = 0
       ' crea parametri per questa feature da file ini
       NewBTLFeature.CreateFeatureParams(NewBTLFeature)
       Return NewBTLFeature
@@ -472,6 +474,7 @@ Public Class BTLFeatureM
                         EgtRemoveInfo(BTLPartM.m_nPartId, ITG_PROJ_MSG)
                         EgtRemoveInfo(BTLPartM.m_nPartId, ITG_PROJ_FALL)
                         EgtRemoveInfo(BTLPartM.m_nPartId, ITG_PROJ_ROT)
+                        'EgtDuploSetModified(DirectCast(m_ParentPart, BTLPartM).m_nPartId)
                      End If
                      ' Ripristino stato segnalazione modifica
                      DisableMgr.ReEnable()
@@ -539,6 +542,9 @@ Public Class BTLFeatureM
                   vTempPar(BTLPar.nId - 1) = BTLPar.dValue
                Case BTLParamType.STRING_
                   sTempPar = BTLPar.sValue
+                  'Case BTLParamType.COMBO
+                  '   Dim cBTLPar As BTLParamCombo = DirectCast(ParentFeature.PParamList(ParIndex), BTLParamCombo)
+                  '   vPar(ParIndex) = cBTLPar.
             End Select
          Next
          vPar = vTempPar
@@ -581,7 +587,7 @@ Public Class BTLFeatureM
          EgtSetInfo(nFeatureId, BTL_FTR_PRIORITY, nPriority)
          SetFeatureId(nFeatureId)
          ' imposto modificato per copie
-         MyMachGroupPanelM.SetDuploModified(ParentPart.nPartId)
+         EgtDuploSetModified(ParentPart.nPartId)
          bOk = True
       Else
          ' Impossibile creare una feature con questi valori - ERRORE

EgtBEAMWALL.Core/BTLModel/BTLParamM.vb

@@ -1,4 +1,9 @@
-Imports EgtUILib
+Imports System.Collections.ObjectModel
+Imports System.Windows
+Imports System.Windows.Input
+Imports System.Windows.Media
+Imports EgtUILib
+Imports EgtWPFLib5
 
 Public Class BTLParamM
 
@@ -299,6 +304,33 @@ Public Class BTLParamM
       Return NewBTLParam
    End Function
 
+   '' new per double e length
+   'Sub New(ParentFeature As BTLFeatureM, IsP As Boolean, nType As BTLParamType, sParamName As String, dMin As Double, dMax As Double, dDefault As Double, sDescription As String)
+   '   StdInit(ParentFeature, IsP, nType, sParamName, sDescription)
+   '   m_dMin = dMin
+   '   m_dMax = dMax
+   '   m_dDefault = dDefault
+   'End Sub
+
+   '' new per stringhe
+   'Sub New(ParentFeature As BTLFeatureM, IsP As Boolean, nType As BTLParamType, sParamName As String, sDescription As String)
+   '   StdInit(ParentFeature, IsP, nType, sParamName, sDescription)
+   'End Sub
+
+   '' new per combobox
+   'Sub New(ParentFeature As BTLFeatureM, IsP As Boolean, nType As BTLParamType, sParamName As String, nMin As Integer, nMax As Integer, nDefault As Integer, sDescription As String, ValueList As List(Of String))
+   '   StdInit(ParentFeature, IsP, nType, sParamName, sDescription)
+   '   m_dMin = nMin
+   '   m_dMax = nMax
+   '   m_dDefault = nDefault
+   '   m_ValueList = ValueList
+   'End Sub
+
+   '' new per parametro vuoto
+   'Sub New(IsP As Boolean, nType As BTLParamType, sParamName As String)
+   '   StdInit(Nothing, IsP, nType, sParamName, "")
+   'End Sub
+
 #End Region    ' CONSTRUCTOR
 
 #Region "METHODS"

EgtBEAMWALL.Core/BTLModel/BTLPartM.vb

@@ -4,6 +4,14 @@ Imports EgtWPFLib5
 
 Public Class BTLPartM
 
+   '' Feature a cui appartiene il parametro
+   'Public m_BTLStructureM As BTLStructureM
+   'Public ReadOnly Property BTLStructureM As BTLStructureM
+   '   Get
+   '      Return m_BTLStructureM
+   '   End Get
+   'End Property
+
    ' Id geometrico del pezzo
    Public m_nPartId As Integer
    Public ReadOnly Property nPartId As Integer
@@ -18,17 +26,6 @@ Public Class BTLPartM
    End Property
 
    ' Info del pezzo
-
-   Public m_nPROJ As Integer
-   Public Property nPROJ As Integer
-      Get
-         Return m_nPROJ
-      End Get
-      Set(value As Integer)
-         m_nPROJ = value
-      End Set
-   End Property
-
    Public m_nPDN As Integer
    Public Property nPDN As Integer
       Get
@@ -763,7 +760,6 @@ Public Class BTLPartM
       Dim sValArray() As String
       Dim sValue As String = String.Empty
       Dim nValue As Integer = 0
-      EgtGetInfo(nPartId, BTL_PRT_PROJ, NewBTLPart.m_nPROJ)
       EgtGetInfo(nPartId, BTL_PRT_PDN, NewBTLPart.m_nPDN)
       Dim nDO As Integer = 1
       If EgtGetInfo(nPartId, BTL_PRT_DO, nDO) Then
@@ -844,7 +840,7 @@ Public Class BTLPartM
       If pTo >= 0 Then
          NewBTLPart.m_SelREFSIDEFIXCLAMP = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValue.Substring(pFrom, pTo - pFrom),
                                                                                           NewBTLPart.ocREFSIDEFIXCLAMP),
-                                                                                          NewBTLPart.ocREFSIDEFIXCLAMP)
+                                                                  NewBTLPart.ocREFSIDEFIXCLAMP)
       End If
 
       Dim EnumIndex As Integer = 0
@@ -880,6 +876,7 @@ Public Class BTLPartM
       EgtGetInfo(nPartId, BTL_PRT_ELEMENTNUM, NewBTLPart.m_sELEMENTNUM)
       EgtGetInfo(nPartId, BTL_PRT_LAYER, NewBTLPart.m_nLAYER)
       EgtGetInfo(nPartId, BTL_PRT_MODULENUM, NewBTLPart.m_sMODULENUM)
+      'EgtGetInfo(nPartId, BTL_PRT_USERATTRIBUTE, m_sUSERATTRIBUTE)
       EgtGetInfo(nPartId, BTL_PRT_COMMENT, NewBTLPart.m_sCOMMENT)
 
       EgtGetInfo(nPartId, BTL_PRT_GRAINDIR, sValue)
@@ -903,16 +900,18 @@ Public Class BTLPartM
       sValArray = sValue.Split({":"}, StringSplitOptions.RemoveEmptyEntries)
       If sValArray.Count() >= 2 Then
          NewBTLPart.m_SelALIGNLOCATION = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValArray(0), NewBTLPart.ocALIGNLOCATION),
-                                                                                                      NewBTLPart.ocALIGNLOCATION)
-         NewBTLPart.m_SelALIGNENDTYPE = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValArray(1).Trim(), NewBTLPart.ocALIGNENDTYPE),
-                                                                                                            NewBTLPart.ocALIGNENDTYPE)
+                                                                NewBTLPart.ocALIGNLOCATION)
+         NewBTLPart.m_SelALIGNENDTYPE = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValArray(1).Trim(),
+                                                                                       NewBTLPart.ocALIGNENDTYPE),
+                                                               NewBTLPart.ocALIGNENDTYPE)
       End If
 
       EgtGetInfo(nPartId, BTL_PRT_MATERIALTYPE, sValue)
       sValArray = sValue.Split({":"}, StringSplitOptions.RemoveEmptyEntries)
       If sValArray.Count() >= 1 Then
-         NewBTLPart.m_SelMATERIALTYPEGRP = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValArray(0), NewBTLPart.ocMATERIALTYPEGRP),
-                                                                                                        NewBTLPart.ocMATERIALTYPEGRP)
+         NewBTLPart.m_SelMATERIALTYPEGRP = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValArray(0),
+                                                                                          NewBTLPart.ocMATERIALTYPEGRP),
+                                                                  NewBTLPart.ocMATERIALTYPEGRP)
          If sValArray.Count() >= 2 Then NewBTLPart.m_sMATERIALTYPESPEC = sValArray(1).Trim()
       End If
 
@@ -1002,6 +1001,197 @@ Public Class BTLPartM
       Return TempList
    End Function
 
+   'Sub New(ParentStructure As BTLStructureVM, nPartId As Integer)
+   '   MyBase.New(ParentStructure, nPartId)
+   '   ' leggo info pezzo
+   '   Dim sValArray() As String
+   '   Dim sValue As String = String.Empty
+   '   Dim nValue As Integer = 0
+   '   EgtGetInfo(nPartId, BTL_PRT_PDN, nPDN)
+   '   Dim nDO As Integer = 1
+   '   If EgtGetInfo(nPartId, BTL_PRT_DO, nDO) Then
+   '      m_bDO = (nDO <> 0)
+   '   Else
+   '      m_bDO = True
+   '   End If
+   '   EgtGetInfo(nPartId, BTL_PRT_NAM, m_sNAM)
+   '   EgtGetInfo(nPartId, BTL_PRT_L, m_dL)
+   '   EgtGetInfo(nPartId, BTL_PRT_W, m_dW)
+   '   EgtGetInfo(nPartId, BTL_PRT_H, m_dH)
+   '   EgtGetInfo(nPartId, BTL_PRT_CNT, m_nCNT)
+   '   EgtGetInfo(nPartId, BTL_PRT_ASSEMBLYNUM, m_sASSEMBLYNUM)
+   '   EgtGetInfo(nPartId, BTL_PRT_ORDERNUM, m_nORDERNUM)
+   '   EgtGetInfo(nPartId, BTL_PRT_DESIGNATION, m_sDESIGN)
+   '   EgtGetInfo(nPartId, BTL_PRT_ANNOTATION, m_sANNOT)
+   '   EgtGetInfo(nPartId, BTL_PRT_STOREY, m_sSTOREY)
+   '   EgtGetInfo(nPartId, BTL_PRT_GROUP, m_sGROUP)
+   '   EgtGetInfo(nPartId, BTL_PRT_PACKAGE, m_sPACKAGE)
+   '   EgtGetInfo(nPartId, BTL_PRT_TIMBERGRADE, m_sTIMBERGRADE)
+   '   EgtGetInfo(nPartId, BTL_PRT_QUALITYGRADE, m_sQUALITYGRADE)
+   '   EgtGetInfo(nPartId, BTL_PRT_COLOUR, sValue)
+   '   m_colCOLOR.FromString(sValue)
+   '   EgtGetInfo(nPartId, BTL_PRT_PLANINGLENGTH, m_dPLANINGLEN)
+   '   EgtGetInfo(nPartId, BTL_PRT_STARTOFFSET, m_dSTARTOFFSET)
+   '   EgtGetInfo(nPartId, BTL_PRT_ENDOFFSET, m_dENDOFFSET)
+
+   '   Dim ind As Integer = 1
+   '   While EgtGetInfo(nPartId, BTL_PRT_UID & ind, nValue)
+   '      ocUID.Add(nValue)
+   '      EgtGetInfo(nPartId, BTL_PRT_TRANSFORMATION & ind, sValue)
+   '      m_refTransf = New Frame3d
+   '      Dim ptOri As New Point3d
+   '      Dim vtVersX As New Vector3d
+   '      Dim vtVersY As New Vector3d
+   '      sValArray = sValue.Split({","}, StringSplitOptions.RemoveEmptyEntries)
+   '      If sValArray.Count() >= 9 Then
+   '         StringToLenAdv(sValArray(0), ptOri.x)
+   '         StringToLenAdv(sValArray(1), ptOri.y)
+   '         StringToLenAdv(sValArray(2), ptOri.z)
+   '         StringToDoubleAdv(sValArray(3), vtVersX.x)
+   '         StringToDoubleAdv(sValArray(4), vtVersX.y)
+   '         StringToDoubleAdv(sValArray(5), vtVersX.z)
+   '         StringToDoubleAdv(sValArray(6), vtVersY.x)
+   '         StringToDoubleAdv(sValArray(7), vtVersY.y)
+   '         StringToDoubleAdv(sValArray(8), vtVersY.z)
+   '         m_refTransf.ChangeOrigin(ptOri)
+   '         m_refTransf.Setup(ptOri, ptOri + vtVersX, ptOri + vtVersY)
+   '      End If
+   '      refTransfList.Add(m_refTransf)
+   '      ind = ind + 1
+   '   End While
+
+   '   EgtGetInfo(nPartId, BTL_PRT_CAMBER, sValue)
+   '   sValArray = sValue.Split(New String() {": ", " P"}, StringSplitOptions.RemoveEmptyEntries)
+   '   If sValArray.Count() >= 5 Then
+   '      StringToLenAdv(sValArray(3), m_dCamberLen1)
+   '      StringToLenAdv(sValArray(5), m_dCamberLen2)
+   '      StringToLenAdv(sValArray(7), m_dCamberLen3)
+   '      StringToLenAdv(sValArray(9), m_dCamberCross3)
+   '   End If
+   '   Dim pFrom As Integer = sValue.IndexOf("SIDE: ") + "SIDE: ".Length
+   '   Dim pTo As Integer = sValue.LastIndexOf(" P01")
+   '   If pTo >= 0 Then
+   '      nValue = CInt(sValue.Substring(pFrom, pTo - pFrom))
+   '      m_SelCAMBERSIDE = ocCAMBERSIDE.IndexOf(CInt(sValue.Substring(pFrom, pTo - pFrom)))
+   '   End If
+
+   '   EgtGetInfo(nPartId, BTL_PRT_PARTOFFSET, sValue)
+   '   sValArray = sValue.Split(New String() {": ", " P"}, StringSplitOptions.RemoveEmptyEntries)
+   '   If sValArray.Count() >= 5 Then
+   '      StringToLenAdv(sValArray(3), m_dPartOffsetSide1)
+   '      StringToLenAdv(sValArray(5), m_dPartOffsetSide2)
+   '      StringToLenAdv(sValArray(7), m_dPartOffsetSide3)
+   '      StringToLenAdv(sValArray(9), m_dPartOffsetSide4)
+   '   End If
+   '   pFrom = sValue.IndexOf("P04: ") + "P04: ".Length
+   '   pTo = sValue.LastIndexOf(" P11")
+   '   If pTo >= 0 Then
+   '      m_SelREFSIDEFIXCLAMP = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValue.Substring(pFrom, pTo - pFrom), ocREFSIDEFIXCLAMP), ocREFSIDEFIXCLAMP)
+   '   End If
+
+   '   EgtGetInfo(nPartId, BTL_PRT_PROCESSINGQUALITY, sValue)
+   '   m_SelPROCESSINGQUALITY = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValue, ocPROCESSINGQUALITY), ocPROCESSINGQUALITY)
+   '   EgtGetInfo(nPartId, BTL_PRT_RECESS, sValue)
+   '   m_SelRECESS = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValue, ocRECESS), ocRECESS)
+   '   EgtGetInfo(nPartId, BTL_PRT_STOREYTYPE, sValue)
+   '   m_SelSTOREYTYPE = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValue, ocSTOREYTYPE), ocSTOREYTYPE)
+   '   EgtGetInfo(nPartId, BTL_PRT_ELEMENTNUM, m_sELEMENTNUM)
+   '   EgtGetInfo(nPartId, BTL_PRT_LAYER, m_nLAYER)
+   '   EgtGetInfo(nPartId, BTL_PRT_MODULENUM, m_sMODULENUM)
+   '   'EgtGetInfo(nPartId, BTL_PRT_USERATTRIBUTE, m_sUSERATTRIBUTE)
+   '   EgtGetInfo(nPartId, BTL_PRT_COMMENT, m_sCOMMENT)
+
+   '   EgtGetInfo(nPartId, BTL_PRT_GRAINDIR, sValue)
+   '   m_refGrainDir = New Vector3d
+   '   sValArray = sValue.Split(New String() {",", ";"}, StringSplitOptions.RemoveEmptyEntries)
+   '   If sValArray.Count() >= 4 Then
+   '      StringToDoubleAdv(sValArray(0), m_refGrainDir.x)
+   '      StringToDoubleAdv(sValArray(1), m_refGrainDir.y)
+   '      StringToDoubleAdv(sValArray(2), m_refGrainDir.z)
+   '      m_bGRAINDIRALIGN = (CInt(sValArray(3)) = 1)
+   '   End If
+
+   '   EgtGetInfo(nPartId, BTL_PRT_REFSIDE, sValue)
+   '   sValArray = sValue.Split({";"}, StringSplitOptions.RemoveEmptyEntries)
+   '   If sValArray.Count() >= 2 Then
+   '      m_SelREFSIDE = ocREFSIDE.IndexOf(CInt(sValArray(0)))
+   '      m_bREFSIDEALIGN = (CInt(sValArray(1)) = 1)
+   '   End If
+
+   '   EgtGetInfo(nPartId, BTL_PRT_ALIGNMENT, sValue)
+   '   sValArray = sValue.Split({":"}, StringSplitOptions.RemoveEmptyEntries)
+   '   If sValArray.Count() >= 2 Then
+   '      m_SelALIGNLOCATION = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValArray(0), ocALIGNLOCATION), ocALIGNLOCATION)
+   '      m_SelALIGNENDTYPE = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValArray(1).Trim(), ocALIGNENDTYPE), ocALIGNENDTYPE)
+   '   End If
+
+   '   EgtGetInfo(nPartId, BTL_PRT_MATERIALTYPE, sValue)
+   '   sValArray = sValue.Split({":"}, StringSplitOptions.RemoveEmptyEntries)
+   '   If sValArray.Count() >= 1 Then
+   '      m_SelMATERIALTYPEGRP = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValArray(0), ocMATERIALTYPEGRP), ocMATERIALTYPEGRP)
+   '      If sValArray.Count() >= 2 Then m_sMATERIALTYPESPEC = sValArray(1).Trim()
+   '   End If
+
+   '   If Not EgtGetInfo(nPartId, BTL_PRT_ROTATED, m_nROTATED) Then
+   '      m_nROTATED = 0
+   '   End If
+   '   If Not EgtGetInfo(nPartId, BTL_PRT_INVERTED, m_nINVERTED) Then
+   '      m_nINVERTED = 0
+   '   End If
+   '   If EgtGetInfo(nPartId, BTL_PRT_MATERIAL, m_sMATERIAL) Then
+   '      If Not ParentStructure.MaterialList.Contains(m_sMATERIAL) Then
+   '         ParentStructure.MaterialList.Add(m_sMATERIAL)
+   '      End If
+   '   End If
+   '   If Not ParentStructure.SectionList.Contains(Section) Then
+   '      ParentStructure.SectionList.Add(Section)
+   '   End If
+   '   ' Leggo outline
+   '   Dim nOutlineLayerId As Integer = EgtGetFirstNameInGroup(nPartId, OUTLINE)
+   '   Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutlineLayerId)
+   '   While nOutlineId <> GDB_ID.NULL
+   '      ' verifico che sia una feature
+   '      Dim nGRP As Integer
+   '      If EgtGetInfo(nOutlineId, BTL_FTR_GRP, nGRP) Then
+   '         ' creo la feature
+   '         m_FeatureList.Add(New BTLFeatureVM(Me, nOutlineId))
+   '      End If
+   '      nOutlineId = EgtGetNext(nOutlineId)
+   '   End While
+   '   ' Leggo feature
+   '   Dim nProcessingId As Integer = EgtGetFirstNameInGroup(nPartId, PROCESSINGS)
+   '   Dim nFeatureId As Integer = EgtGetFirstInGroup(nProcessingId)
+   '   While nFeatureId <> GDB_ID.NULL
+   '      ' verifico che sia una feature
+   '      Dim nGRP As Integer
+   '      If EgtGetInfo(nFeatureId, BTL_FTR_GRP, nGRP) Then
+   '         ' creo la feature
+   '         m_FeatureList.Add(New BTLFeatureVM(Me, nFeatureId))
+   '      End If
+   '      nFeatureId = EgtGetNext(nFeatureId)
+   '   End While
+   '   ' Aggiorno check DOALL
+   '   NotifyPropertyChanged("bDOALL")
+   '   ' leggo calc error
+   '   Dim nErr As Integer = 0
+   '   Dim nRot As Integer = 0
+   '   Dim nFall As Integer = 0
+   '   Dim sMsg As String = ""
+   '   Dim bCalc As Boolean = False
+   '   bCalc = EgtGetInfo(nPartId, ITG_PROJ_ERR, nErr)
+   '   EgtGetInfo(nPartId, ITG_PROJ_ROT, nRot)
+   '   EgtGetInfo(nPartId, ITG_PROJ_FALL, sMsg)
+   '   EgtGetInfo(nPartId, ITG_PROJ_MSG, sMsg)
+   '   CalcPartUpdate(bCalc, nErr, nRot, nFall, sMsg)
+   '   CalcFeatureUpdate()
+   'End Sub
+
+   'Sub New(ParentStructure As BTLStructure, nPartId As Integer)
+   '   m_BTLStructureM = ParentStructure
+   '   Me.SetPartId = nPartId
+   '   m_FeatureList = New ObservableCollection(Of BTLFeature)
+   'End Sub
+
 #End Region    ' CONSTRUCTOR
 
 #Region "METHODS"
@@ -1052,7 +1242,7 @@ Public Class BTLPartM
          m_nROTATED = If(dNewRotation >= 0, dNewRotation, 360 + dNewRotation)
          EgtSetInfo(nPartId, BTL_PRT_ROTATED, m_nROTATED)
          ' imposto modificato per copie
-         MyMachGroupPanelM.SetDuploModified(nPartId)
+         EgtDuploSetModified(nPartId)
       End If
       ' se era invertito
       If bInverted Then
@@ -1085,7 +1275,7 @@ Public Class BTLPartM
          m_nINVERTED = If(m_nINVERTED = 0, 180, 0)
          EgtSetInfo(nPartId, BTL_PRT_INVERTED, m_nINVERTED)
          ' imposto modificato per copie
-         MyMachGroupPanelM.SetDuploModified(nPartId)
+         EgtDuploSetModified(nPartId)
       End If
    End Sub
 

EgtBEAMWALL.Core/BTLModel/BTLStructureM.vb

@@ -1,4 +1,5 @@
-Imports EgtUILib
+Imports System.IO
+Imports EgtUILib
 Imports EgtWPFLib5
 
 Public Class BTLStructureM
@@ -174,7 +175,7 @@ Public Class BTLStructureM
    End Property
 
    Public m_ocRANGE As New List(Of Object)({New IdNameStruct(Range.STANDARD, EgtMsg(61710)),
-                                            New IdNameStruct(Range.EXTENDED, EgtMsg(61711))})
+                                                               New IdNameStruct(Range.EXTENDED, EgtMsg(61711))})
    Public ReadOnly Property ocRANGE As List(Of Object)
       Get
          Return m_ocRANGE
@@ -192,8 +193,8 @@ Public Class BTLStructureM
    End Property
 
    Public m_ocPROCESSINGQUALITY As New List(Of Object)({New IdNameStruct(ProcessingQuality.AUTOMATIC, EgtMsg(61658)),
-                                                        New IdNameStruct(ProcessingQuality.VISIBLE, EgtMsg(61659)),
-                                                        New IdNameStruct(ProcessingQuality.FAST, EgtMsg(61660))})
+                                                                          New IdNameStruct(ProcessingQuality.VISIBLE, EgtMsg(61659)),
+                                                                          New IdNameStruct(ProcessingQuality.FAST, EgtMsg(61660))})
    Public ReadOnly Property ocPROCESSINGQUALITY As List(Of Object)
       Get
          Return m_ocPROCESSINGQUALITY
@@ -251,7 +252,7 @@ Public Class BTLStructureM
    End Property
 
    Public m_ocRECESS As New List(Of Object)({New IdNameStruct(Recess.AUTOMATIC, EgtMsg(61658)),
-                                             New IdNameStruct(Recess.MANUAL, EgtMsg(61661))})
+                                                                New IdNameStruct(Recess.MANUAL, EgtMsg(61661))})
    Public ReadOnly Property ocRECESS As List(Of Object)
       Get
          Return m_ocRECESS
@@ -435,6 +436,11 @@ Public Class BTLStructureM
       If NewBTLStructure.m_nPROJTYPE <> BWType.NULL Then BTLIniFile.m_nBTLBWType = NewBTLStructure.m_nPROJTYPE
       ' recupero i part
       NewBTLStructure.m_BTLPartMList = LoadParts(ProjId)
+      'Dim nPartId As Integer = EgtGetFirstPart()
+      'While nPartId <> GDB_ID.NULL
+      '   NewBTLStructure.m_BTLPartMList.Add(BTLPartM.CreateBTLPart(nPartId))
+      '   nPartId = EgtGetNextPart(nPartId)
+      'End While
       Return NewBTLStructure
    End Function
 
@@ -477,6 +483,7 @@ Public Class BTLStructureM
       If IsNothing(BTLPartM) Then Return
       If Not m_BTLPartMList.Contains(BTLPartM) Then Return
       m_BTLPartMList.Remove(BTLPartM)
+      'RaiseEvent BTLPartAdded(Me, New BTLPartAddedEventArgs(BTLPartM))
    End Sub
 
    Public Function GetBTLParts() As List(Of BTLPartM)

EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb

@@ -1,5 +1,9 @@
-Imports System.Windows
+Imports System.Collections.ObjectModel
+Imports System.Collections.Specialized
+Imports System.ComponentModel
+Imports System.Windows
 Imports System.Windows.Media
+Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -211,6 +215,19 @@ Public Class BTLFeatureVM
 
 #Region "CONSTRUCTOR"
 
+   'Sub New(BTLFeatureM As BTLFeatureM, BTLPartM As BTLPartM)
+   '   m_BTLFeatureM = BTLFeatureM
+   '   AddHandler m_BTLFeatureM.PBTLParamAdded, AddressOf OnPBTLParamAdded
+   '   AddHandler m_BTLFeatureM.QBTLParamAdded, AddressOf OnQBTLParamAdded
+   '   m_BTLPartM = BTLPartM
+   '   CreatePBTLParamVMList()
+   '   CreateQBTLParamVMList()
+   '   NotifyPropertyChanged(NameOf(Calc_Background))
+   '   NotifyPropertyChanged(NameOf(CALC_ROT_Visibility))
+   '   NotifyPropertyChanged(NameOf(CALC_ERR_Letter))
+   '   NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
+   'End Sub
+
    Sub New()
    End Sub
 
@@ -229,6 +246,7 @@ Public Class BTLFeatureVM
 
    ' funzione che seleziona la feature nella geometria
    Public Sub SelGeomFeature()
+      EgtDeselectAll()
       SelGeomFeature(nFeatureId)
    End Sub
 
@@ -255,37 +273,6 @@ Public Class BTLFeatureVM
       End If
    End Sub
 
-   ' funzione che seleziona la feature nella geometria
-   Public Sub DeselGeomFeature()
-      DeselGeomFeature(nFeatureId)
-   End Sub
-
-   Private Sub DeselGeomFeature(nMyFeatureId As Integer)
-      EgtDeselectObj(nMyFeatureId)
-      Dim sVal As String = ""
-      If EgtGetInfo(nMyFeatureId, BTL_FTR_ADJID, sVal) Then
-         Dim vAdjId() As String = sVal.Split(","c)
-         For Each sAdjId In vAdjId
-            Dim nAdjId As Integer
-            If Integer.TryParse(sAdjId, nAdjId) Then
-               DeselGeomFeature(nMyFeatureId + nAdjId)
-            End If
-         Next
-      End If
-      If EgtGetInfo(nMyFeatureId, BTL_FTR_AUXID, sVal) Then
-         Dim vAuxId() As String = sVal.Split(","c)
-         For Each sAuxId In vAuxId
-            Dim nAuxId As Integer
-            If Integer.TryParse(sAuxId, nAuxId) Then
-               EgtDeselectObj(nMyFeatureId + nAuxId)
-            End If
-         Next
-      End If
-   End Sub
-
-   Public Overridable Sub RefreshFeature()
-   End Sub
-
 #End Region    ' METHODS
 
 End Class

EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml

@@ -1,160 +0,0 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="BeamMachiningsWindowV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                                 WindowStyle="None"
-                                 Width="500" Height="450"
-                                 WindowStartupLocation="CenterOwner" 
-                                 ShowInTaskbar="False"
-                                 Title="{Binding Title}"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
-   
-   <Grid Margin="5,5,5,0">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-
-      <TabControl ItemsSource="{Binding MachiningList}"
-                  SelectedItem="{Binding SelMachining}"
-                  IsSynchronizedWithCurrentItem="True"
-                  Margin="5,0,5,0"
-                  Style="{StaticResource OnlyHeaders_TabControl}"/>
-
-      <Border Grid.Row="1" Margin="0,1,0,2" Style="{StaticResource Optimizer_Border}">
-
-         <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
-                                      ItemsSource="{Binding TableRowList}"
-                                      SelectedIndex="{Binding SelRowIndex}"
-                                      AutoGenerateColumns="False"
-                                      CanUserResizeRows="False"
-                                      SelectionMode="Single"
-                                      ScrollViewer.CanContentScroll="True" 
-                                      ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                      ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                                      Margin="0.5,0.5,0.5,5"
-                                      BindingColumns="{Binding BeamMachiningsColumns}"
-                                      AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
-                                      AlternationCount="2"
-                                      ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
-                                      CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
-                                      Style="{StaticResource Optimizer_DataGrid}">
-
-            <DataGrid.RowStyle>
-               <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
-                  <Setter Property="Height" Value="25"/>
-                  <Setter Property="VerticalContentAlignment" Value="Center"/>
-               </Style>
-            </DataGrid.RowStyle>
-
-            <DataGrid.Resources>
-               <Style x:Key="DataGridCheckBoxColumn_Style"
-                   TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource CellDataGrid_CustomHighLight}">
-                  <Setter Property="Template">
-                     <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type DataGridCell}">
-                           <Grid Background="{TemplateBinding Background}">
-                              <ContentPresenter VerticalAlignment="Center" />
-                           </Grid>
-                        </ControlTemplate>
-                     </Setter.Value>
-                  </Setter>
-               </Style>
-
-               <!--Colonna On-->
-               <DataGridCheckBoxColumn x:Key="colON" Binding="{Binding OnPar, UpdateSourceTrigger=PropertyChanged}"
-                                       CellStyle="{StaticResource DataGridCheckBoxColumn_Style}">
-                  <DataGridCheckBoxColumn.Header>
-                     <TextBlock Text="{Binding Path=DataContext.OnHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"/>
-                  </DataGridCheckBoxColumn.Header>
-               </DataGridCheckBoxColumn>
-
-               <!--Colonna Name-->
-               <DataGridTemplateColumn x:Key="colNAME">
-                  <DataGridTemplateColumn.Header>
-                     <TextBlock Text="{Binding Path=DataContext.NameHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"/>
-                  </DataGridTemplateColumn.Header>
-                  <DataGridTemplateColumn.CellEditingTemplate>
-                     <DataTemplate>
-                        <ComboBox IsEditable="False" 
-                                  SelectedItem="{Binding Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                  ItemsSource="{Binding Path=NamesList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
-                     </DataTemplate>
-                  </DataGridTemplateColumn.CellEditingTemplate>
-                  <DataGridTemplateColumn.CellTemplate>
-                     <DataTemplate>
-                        <TextBlock Text="{Binding Path=Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                   VerticalAlignment="Center"
-                                   Margin="5,0,0,0"/>
-                     </DataTemplate>
-                  </DataGridTemplateColumn.CellTemplate>
-               </DataGridTemplateColumn>
-
-               <!--Colonna Style-->
-               <DataGridTemplateColumn x:Key="colTYPE">
-                  <DataGridTemplateColumn.Header>
-                     <TextBlock Text="{Binding Path=DataContext.TypeHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"/>
-                  </DataGridTemplateColumn.Header>
-                  <DataGridTemplateColumn.CellEditingTemplate>
-                     <DataTemplate>
-                        <ComboBox IsEditable="False" 
-                                  SelectedItem="{Binding Type,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                  ItemsSource="{Binding Path=TypeList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
-                     </DataTemplate>
-                  </DataGridTemplateColumn.CellEditingTemplate>
-                  <DataGridTemplateColumn.CellTemplate>
-                     <DataTemplate>
-                        <TextBlock Text="{Binding Path=Type,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                   VerticalAlignment="Center"
-                                   Margin="5,0,0,0"/>
-                     </DataTemplate>
-                  </DataGridTemplateColumn.CellTemplate>
-               </DataGridTemplateColumn>
-
-            </DataGrid.Resources>
-
-         </EgtBEAMWALLCORE:EgtDataGrid>
-      </Border>
-      <Grid Grid.Row="2"
-            Margin="0,0,0,5"
-            HorizontalAlignment="Center">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-
-         <Button Content="/\"
-                 Command="{Binding MoveRowUp_Command}"
-                 Grid.Column="0"
-                 Margin="0,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
-         <Button Content="\/"
-                 Command="{Binding MoveRowDown_Command}"
-                 Grid.Column="1"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
-         <Button Content="{Binding AddRowMsg}"
-                 Command="{Binding AddRow_Command}"
-                 Grid.Column="2"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
-         <Button Content="{Binding DeleteRowMsg}"
-                 Command="{Binding DeleteRow_Command}"
-                 Grid.Column="3"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
-         <Button Content="{Binding SaveMsg}"
-                 Command="{Binding Save_Command}"
-                 Grid.Column="4"
-                 Margin="2.5,0,0,0"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
-
-      </Grid>
-
-   </Grid>
-</EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml.vb

@@ -1,17 +0,0 @@
-Public Class BeamMachiningsWindowV
-
-   Private WithEvents m_BeamMachiningsWindowVM As MyBeamMachiningsWindowVM
-
-   Sub New(Owner As System.Windows.Window, BeamMachiningsWindowVM As MyBeamMachiningsWindowVM)
-      ' This call is required by the designer.
-      InitializeComponent()
-      Me.DataContext = BeamMachiningsWindowVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_BeamMachiningsWindowVM = BeamMachiningsWindowVM
-   End Sub
-
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_BeamMachiningsWindowVM.m_CloseWindow
-      Me.DialogResult = bDialogResult
-   End Sub
-
-End Class

EgtBEAMWALL.Core/BeamMachiningsWindow/MyBeamMachiningsWindowVM.vb

@@ -1,35 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports EgtWPFLib5
-
-Public Class MyBeamMachiningsWindowVM
-   Inherits BeamMachiningsWindowVM
-
-#Region "FIELDS & PROPERTIES"
-
-   Private m_BeamMachiningsColumns As New ObservableCollection(Of EgtDataGridColumn)
-   Public Property BeamMachiningsColumns As ObservableCollection(Of EgtDataGridColumn)
-      Get
-         Return m_BeamMachiningsColumns
-      End Get
-      Set(value As ObservableCollection(Of EgtDataGridColumn))
-         m_BeamMachiningsColumns = value
-      End Set
-   End Property
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONSTRUCTOR"
-
-   Sub New(sTitle As String, sBaseDir As String, sMachTypePath As String, sTabTemplPath As String, Optional bIsBeam As Boolean = True)
-      MyBase.New(sTitle, sBaseDir, sMachTypePath, sTabTemplPath, bIsBeam)
-      ' carico le colonne della datagrid
-      GetPrivateProfileColumns(S_BEAMMACHININGS, BeamMachiningsColumns)
-      ' aggiorno la visibilità delle colonne
-      For Each col In BeamMachiningsColumns
-         col.ColumnVisibility = If(col.Visible, Windows.Visibility.Visible, Windows.Visibility.Collapsed)
-      Next
-   End Sub
-
-#End Region    ' CONSTRUCTOR
-
-End Class

EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb

@@ -3,6 +3,8 @@ Imports System.Threading
 Imports System.Globalization
 Imports EgtUILib
 Imports EgtWPFLib5
+Imports EgtBEAMWALL.Core.ConstBeam
+Imports EgtBEAMWALL.Core
 
 Public Module CalcIntegration
 
@@ -23,10 +25,6 @@ Public Module CalcIntegration
       POINT_CLOUD = 5
       RAWPART = 6
       EDIT = 7
-      CHECKNOSIM = 8
-      TOPOLOGY = 9
-      OPENTOOLDB = 11 ' Non utilizzato
-      OPENMACHINIGDB = 12 ' Non utilizzato
    End Enum
 
    Private Structure MyProc
@@ -153,8 +151,8 @@ Public Module CalcIntegration
                         vProc(j).Proc.StartInfo.Arguments = """" & vBar(nCurrBar).sBarPath & """"
                      Else
                         vProc(j).Proc.StartInfo.Arguments = """" & vBar(nCurrBar).sBarPath & """ " &
-                                                            """" & vBar(nCurrBar).nProjType & """ " &
-                                                            """" & vBar(nCurrBar).nMachineName & """ " & vBar(nCurrBar).nCmdType
+                                                         """" & vBar(nCurrBar).nProjType & """ " &
+                                                         """" & vBar(nCurrBar).nMachineName & """ " & vBar(nCurrBar).nCmdType
                      End If
                      vProc(j).Proc.StartInfo.UseShellExecute = False
 
@@ -164,10 +162,11 @@ Public Module CalcIntegration
                         nActProc += 1
                      End If
                   Else
-                     If vBar(nCurrBar).nCmdType = CmdTypes.CHECK OrElse vBar(nCurrBar).nCmdType = CmdTypes.CHECKGEN OrElse vBar(nCurrBar).nCmdType = CmdTypes.CHECKNOSIM Then
+                     If vBar(nCurrBar).nCmdType = CmdTypes.CHECK OrElse vBar(nCurrBar).nCmdType = CmdTypes.CHECKGEN Then
                         RaiseEvent Calc_ProcessResult(Nothing, New CalcResultEventArgs(vBar(nCurrBar))) 'ProcessResults(vBar(nCurrBar))
                      ElseIf vBar(nCurrBar).nCmdType = CmdTypes.GENERATE Then
                         RaiseEvent Calc_ProcessResult(Nothing, New CalcResultEventArgs(vBar(nCurrBar))) 'ProcessResults(vBar(nCurrBar))
+                        'RaiseEvent Calc_ProcessEnd(Nothing, New CalcProcessEndEventArgs(vBar(nCurrBar))) 'ProcessResults(vBar(nCurrBar))
                      End If
                      bDone = True
                      nCurrBar += 1
@@ -179,10 +178,11 @@ Public Module CalcIntegration
                   ' se terminato con successo
                   If vProc(j).Proc.ExitCode = 0 Then
                      ' salvo il risultato
-                     If vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECK OrElse vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECKGEN OrElse vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECKNOSIM Then
+                     If vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECK OrElse vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECKGEN Then
                         RaiseEvent Calc_ProcessResult(Nothing, New CalcResultEventArgs(vBar(vProc(j).nBar))) ' ProcessResults(vBar(vProc(j).nBar))
                      ElseIf vBar(vProc(j).nBar).nCmdType = CmdTypes.GENERATE Then
                         RaiseEvent Calc_ProcessResult(Nothing, New CalcResultEventArgs(vBar(vProc(j).nBar))) ' ProcessResults(vBar(vProc(j).nBar))
+                        'RaiseEvent Calc_ProcessEnd(Nothing, New CalcProcessEndEventArgs(vBar(vProc(j).nBar))) 'ProcessResults(vBar(nCurrBar))
                      End If
                      bDone = True
                      vProc(j).nBar = -1
@@ -201,10 +201,11 @@ Public Module CalcIntegration
                      ' altrimenti (errore generico di esecuzione)
                   Else
                      ' salvo il risultato
-                     If vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECK OrElse vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECKGEN OrElse vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECKNOSIM Then
+                     If vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECK OrElse vBar(vProc(j).nBar).nCmdType = CmdTypes.CHECKGEN Then
                         RaiseEvent Calc_ProcessResult(Nothing, New CalcResultEventArgs(vBar(vProc(j).nBar))) ' ProcessResults(vBar(vProc(j).nBar))
                      ElseIf vBar(vProc(j).nBar).nCmdType = CmdTypes.GENERATE Then
                         RaiseEvent Calc_ProcessResult(Nothing, New CalcResultEventArgs(vBar(vProc(j).nBar))) ' ProcessResults(vBar(vProc(j).nBar))
+                        'RaiseEvent Calc_ProcessEnd(Nothing, New CalcProcessEndEventArgs(vBar(vProc(j).nBar))) 'ProcessResults(vBar(nCurrBar))
                      End If
                      bDone = True
                      vProc(j).nBar = -1
@@ -232,8 +233,8 @@ Public Module CalcIntegration
                      Dim Proc As New Process()
                      Proc.StartInfo.FileName = ExePath
                      Proc.StartInfo.Arguments = """" & vBar(0).sBarPath & """ " &
-                                                """" & vBar(0).nProjType & """ " &
-                                                """" & vBar(0).nMachineName & """ " & CmdTypes.CHECKGEN
+                                                      """" & vBar(0).nProjType & """ " &
+                                                      """" & vBar(0).nMachineName & """ " & CmdTypes.CHECKGEN
                      Proc.StartInfo.UseShellExecute = False
 
                      If Proc.Start() Then
@@ -325,7 +326,8 @@ Public Module CalcIntegration
       RaiseEvent Calc_Ended(Nothing, New CalcEndEventArgs(If(bIsSimulation And Not bIsSimulationVerifyed, CmdTypes.SIMULATE, CmdTypes.CHECKGEN), If(bAllKO, CalcEndEventArgs.Results.ERROR_, CalcEndEventArgs.Results.OK)))
    End Sub
 
-   Public Function CreateNewProjectFromPart(nPartId As Integer, sProjDirPath As String) As String
+   Private Function CreateNewProjectFromPart(nPartId As Integer, sProjDirPath As String) As String
+
       ' Aggiorno identificativi per segnalazione errori
       UpdateCutIdAndTaskId(nPartId)
 
@@ -342,7 +344,7 @@ Public Module CalcIntegration
       Dim nPDN As Integer = 0
       EgtGetInfo(nPartId, BTL_PRT_PDN, nPDN)
       Dim sPartFilePath As String = sProjDirPath & "\" & nPDN.ToString() & ".bwe"
-      bOk = EgtSaveObjToFile({nPartId, EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO), EgtGetFirstNameInGroup(GDB_ID.ROOT, PROJECTINFO)}, sPartFilePath, NGE.CMPTEXT)
+      bOk = EgtSaveObjToFile(nPartId, sPartFilePath, NGE.CMPTEXT)
 
       ' Ripristino visibilita' pezzo
       EgtSetMode(nPartId, nOldPartMode)
@@ -353,7 +355,7 @@ Public Module CalcIntegration
       Return If(bOk, sPartFilePath, String.Empty)
    End Function
 
-   Public Function CreateNewProjectFromMachGroup(nMachGroupId As Integer, sProjDirPath As String, nGlobState As Integer) As String
+   Private Function CreateNewProjectFromMachGroup(nMachGroupId As Integer, sProjDirPath As String, nGlobState As Integer) As String
       ' aggiorno cutid e taskid solo fuori dal supervisore o se pezzo ricalcolato
       If Not m_bIsSupervisor OrElse nGlobState = CalcStates.NOTCALCULATED Then
          Dim DisableMgr As DisableModifiedMgr = Nothing
@@ -392,12 +394,9 @@ Public Module CalcIntegration
       Dim sMachGroupName As String = ""
       EgtGetMachGroupName(nMachGroupId, sMachGroupName)
       Dim sMachGroupFilePath As String = sProjDirPath & "\" & sMachGroupName & ".bwe"
-      If EgtSaveMachGroupToFile(nMachGroupId, {EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO), EgtGetFirstNameInGroup(GDB_ID.ROOT, PROJECTINFO)}, sMachGroupFilePath, NGE.CMPTEXT) Then
+      If EgtSaveObjToFile(nMachGroupId, sMachGroupFilePath, NGE.CMPTEXT) Then
          Return sMachGroupFilePath
       End If
-      'If EgtSaveObjToFile(nMachGroupId, sMachGroupFilePath, NGE.CMPTEXT) Then
-      '   Return sMachGroupFilePath
-      'End If
       Return String.Empty
    End Function
 
@@ -417,6 +416,11 @@ Public Module CalcIntegration
             Dim nTaskId As Integer = nOutlineId
             If EgtGetInfo(nOutlineId, BTL_FTR_MAINID, nMainOffsId) Then
                nTaskId = nOutlineId + nMainOffsId
+               '' assegno TASKID alla feature per calcoli
+               'EgtSetInfo(nOutlineId, "TASKID", nOutlineId + nMainOffsId, True)
+               'Else
+               '   ' assegno TASKID alla feature per calcoli
+               '   EgtSetInfo(nOutlineId, "TASKID", nOutlineId, True)
             End If
             ' assegno TASKID alla feature per calcoli
             EgtSetInfo(nOutlineId, "TASKID", nTaskId)
@@ -451,6 +455,11 @@ Public Module CalcIntegration
             Dim nTaskId As Integer = nFeatureId
             If EgtGetInfo(nFeatureId, BTL_FTR_MAINID, nMainOffsId) Then
                nTaskId = nFeatureId + nMainOffsId
+               '   ' assegno TASKID alla feature per calcoli
+               '   EgtSetInfo(nFeatureId, "TASKID", nFeatureId + nMainOffsId, True)
+               'Else
+               '   ' assegno TASKID alla feature per calcoli
+               '   EgtSetInfo(nFeatureId, "TASKID", nFeatureId, True)
             End If
             ' assegno TASKID alla feature per calcoli
             EgtSetInfo(nFeatureId, "TASKID", nTaskId)
@@ -476,6 +485,7 @@ Public Module CalcIntegration
 End Module
 
 Public Class Bar
+   'Public piInfo As PatternInfo
    Public nBarState As Integer
    Public nBarId As Integer
    Public sBarPath As String

EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml

@@ -1,129 +0,0 @@
-<Grid x:Class="General_ConfigurationPageV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
-
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
-   </Grid.ColumnDefinitions>
-   <Grid.RowDefinitions>
-      <RowDefinition Height="1*"/>
-      <RowDefinition Height="1*"/>
-   </Grid.RowDefinitions>
-   <StackPanel Style="{StaticResource List_StackPanel}">
-      <GroupBox Header="{Binding CurrentLanguage_Msg}"
-                Style="{StaticResource Warehouse_GroupBox}">
-         <UniformGrid Rows="2"
-                      Style="{StaticResource General_UniformGrid}">
-            <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" 
-                      SelectedItem="{Binding SelectedLanguage}"
-                      DisplayMemberPath="Name" 
-                      Style="{StaticResource General_ComboBox}"/>
-            <TextBlock Text="{Binding LanguageAdvert_Msg}" 
-                       Style="{StaticResource General_TextBlock}"/>
-         </UniformGrid>
-      </GroupBox>
-      <UniformGrid Columns="2"
-                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
-         <TextBlock Text="{Binding MMUnits_Msg}" 
-                    Style="{StaticResource MMUnits_TextBlock}"/>
-         <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
-                   SelectedIndex="{Binding SelMeasureUnit}" 
-                   Style="{StaticResource UnitMeasureList_ComboBox}"/>
-      </UniformGrid>
-      <GroupBox Header="{Binding Nesting_Msg}"
-                Style="{StaticResource Warehouse_GroupBox}">
-         <StackPanel>
-            <UniformGrid Columns="2"
-                         Style="{StaticResource AddRawPartWnd_UniformGrid}">
-               <TextBlock Text="{Binding SectionTime_Msg}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                      Text="{Binding SectionTime, UpdateSourceTrigger=Explicit}"/>
-            </UniformGrid>
-            <UniformGrid Columns="2"
-                         Style="{StaticResource AddRawPartWnd_UniformGrid}">
-               <TextBlock Grid.Row="1" Text="{Binding PartTime_Msg}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Row="1" 
-                                      Grid.Column="1"
-                                      Text="{Binding PartTime, UpdateSourceTrigger=Explicit}"/>
-            </UniformGrid>
-         </StackPanel>
-      </GroupBox>
-      <UniformGrid Columns="2"
-                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
-         <TextBlock Text="{Binding PrintLabel_Msg}"
-                    Style="{StaticResource MMUnits_TextBlock}"/>
-         <CheckBox IsChecked="{Binding bPrintLabel_IsChecked}"
-                   Style="{StaticResource General_CheckBox}"/>
-      </UniformGrid>
-      <GroupBox Header="Backup And Restore"
-                Style="{StaticResource Optimizer_GroupBox}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid Style="{StaticResource General_Grid}">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <CheckBox x:Name="ExternalBackup_CheckBox"
-                         IsChecked="{Binding bExternalBackupActive}"
-                         Style="{StaticResource PParameters_CheckBox}"/>
-               <TextBlock Grid.Column="1"
-                          Text="External file path:"
-                          Style="{StaticResource Ext_TextBlock}"/>
-            </Grid>
-            <Grid Grid.Row="1"
-                  Style="{StaticResource General_Grid}">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <TextBox Text="{Binding ExternalBackupFolderPath}"
-                        IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                        Style="{StaticResource General_TextBox}"/>
-               <Button Grid.Column="1"
-                       Content="..."
-                       Foreground="{StaticResource BeamWall_White}"
-                       Command="{Binding ChooseExternalBackupFolderPath_Command}"
-                       IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                       Style="{StaticResource General_Button}"/>
-            </Grid>
-            <Grid Grid.Row="2">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="Reminder Frequency"/>
-               <ComboBox Grid.Column="1"
-                         ItemsSource="{Binding ReminderList}"
-                         SelectedItem="{Binding SelReminder}"
-                         Style="{StaticResource GeneralConfiguration_ComboBox}" />
-            </Grid>
-            <StackPanel Grid.Row="3"
-                        Style="{StaticResource PartManager_StackPanel}">
-               <Button Content="Backup"
-                       Command="{Binding Backup_Command}"
-                       Style="{StaticResource MovePartInRawPartWnd_Button}"/>
-               <Button Content="Restore"
-                       Command="{Binding Restore_Command}"
-                       Style="{StaticResource EgtWPFLib5_Button}"/>
-            </StackPanel>
-         </Grid>
-      </GroupBox>
-      <UniformGrid Columns="2"
-                   Style="{StaticResource GeneralConfiguration_UniformGrid}">
-         <TextBlock Text="Importa BTL con verifica" 
-                    Style="{StaticResource MMUnits_TextBlock}"/>
-         <CheckBox IsChecked="{Binding bVerifyImportBTL_IsChecked}"
-                   Style="{StaticResource General_CheckBox}"/>
-      </UniformGrid>
-   </StackPanel>
-
-</Grid>

EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml.vb

@@ -1,3 +0,0 @@
-Public Class General_ConfigurationPageV
-
-End Class

EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml

@@ -1,81 +0,0 @@
-<Grid x:Class="Machine_ConfigurationPageV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-      xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
-
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="Auto"/>
-      <ColumnDefinition Width="1*"/>
-   </Grid.ColumnDefinitions>
-   <Grid.RowDefinitions>
-      <RowDefinition Height="Auto"/>
-      <RowDefinition Height="10*"/>
-   </Grid.RowDefinitions>
-
-   <StackPanel Orientation="Horizontal">
-      <GroupBox Style="{StaticResource MachineConfiguration_GroupBox}">
-         <EgtBEAMWALLCORE:MachinePanelV DataContext="{Binding MachinePanelVM}" VerticalAlignment="Center"/>
-      </GroupBox>
-   </StackPanel>
-
-   <StackPanel Grid.Row="1"
-               Visibility="{Binding MachineParameter_Visibility}"
-               Style="{StaticResource PartManager_StackPanel}">
-      <ItemsControl ItemsSource="{Binding ConfigMachTableList}">
-         <ItemsControl.ItemsPanel>
-            <ItemsPanelTemplate>
-               <StackPanel x:Name="GroupStackPanel"
-                           Style="{StaticResource PartManager_StackPanel}"/>
-            </ItemsPanelTemplate>
-         </ItemsControl.ItemsPanel>
-         <ItemsControl.ItemTemplate>
-            <DataTemplate>
-               <GroupBox Header="{Binding sName}" 
-                         Style="{StaticResource MachineParam_GroupBox}">
-                  <ItemsControl Name="MachParamsItemsControl" 
-                                ItemsSource="{Binding MachParamList}" 
-                                Style="{StaticResource MachinePanel_ItemsControl}">
-                     <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                           <WrapPanel Style="{StaticResource Project_WrapPanel}"/>
-                        </ItemsPanelTemplate>
-                     </ItemsControl.ItemsPanel>
-                     <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                           <Grid Style="{StaticResource MachParam_Grid}">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="*" />
-                              </Grid.ColumnDefinitions>
-                              <TextBlock Text="{Binding sName}"
-                                         ToolTip="{Binding sName}"
-                                         Style="{StaticResource MachinePanel_TextBlock}"/>
-                              <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                                     Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
-                                                     Style="{StaticResource MachineConfiguration_TextBox}"/>
-                              <TextBlock Grid.Column="2"
-                                         Text="{Binding sDescription}"
-                                         ToolTip="{Binding sDescription}"
-                                         Style="{StaticResource Description_TextBlock}"/>
-                           </Grid>
-                        </DataTemplate>
-                     </ItemsControl.ItemTemplate>
-                  </ItemsControl>
-               </GroupBox>
-            </DataTemplate>
-         </ItemsControl.ItemTemplate>
-      </ItemsControl>
-   </StackPanel>
-
-   <Button Grid.Row="1"
-           Command="{Binding SaveCommand}"
-           ToolTip="{Binding SaveToolTip}"
-           Visibility="{Binding Machine_Visibility}"
-           Style="{StaticResource SaveMachinePanel_Button}">
-      <Image Source="/Resources/ProjectManager/Save.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
-   </Button>
-
-</Grid>

EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml.vb

@@ -1,3 +0,0 @@
-Public Class Machine_ConfigurationPageV
-
-End Class

EgtBEAMWALL.Core/Constants/ConstBeam.vb

@@ -104,6 +104,9 @@
 
    Public Const BTLFEATURES_FILE_NAME As String = "BTLFeatures.ini"
 
+   'Public Const S_GENERAL As String = "General"
+   'Public Const K_DEBUG As String = "Debug"
+
    ' Tipo di progetto
    Public Enum ProjectType As Integer
       PROJ = 1
@@ -120,7 +123,6 @@
    Public Const PROJ As String = "PROJ"
    Public Const FILENAMESEPARATOR As Char = "^"c
    Public Const BTLINFO As String = "BtlInfo"
-   Public Const PROJECTINFO As String = "ProjectInfo"
 
    ' layer per assemblato
    Public Const ASSEBASE As String = "AsseBase"
@@ -142,8 +144,6 @@
    Public Const BTL_PRT_INVERTED As String = "INVERTED"
    Public Const BTL_PRT_MATERIAL As String = "MATERIAL"
    Public Const BTL_PRT_VOLUME As String = "VOLUME"
-   Public Const BTL_PRT_ROT As String = "ROT"
-   Public Const BTL_PRT_FLIP As String = "FLIP"
    ' parametri pezzo
    Public Const BTL_PRT_SINGLEMEMBERNUM = "SINGLEMEMBERNUMBER"
    Public Const BTL_PRT_ASSEMBLYNUM = "ASSEMBLYNUMBER"
@@ -169,6 +169,7 @@
    Public Const BTL_PRT_ELEMENTNUM = "ELEMENTNUMBER"
    Public Const BTL_PRT_LAYER = "LAYER"
    Public Const BTL_PRT_MODULENUM = "MODULENUMBER"
+   'Friend Const BTL_PRT_USERATTRIBUTE = "USERATTRIBUTE"
    Public Const BTL_PRT_COMMENT = "COMMENT"
    Public Const BTL_PRT_GRAINDIR = "GRAINDIRECTION"
    Public Const BTL_PRT_REFSIDE = "REFERENCESIDE"

EgtBEAMWALL.Core/Constants/ConstColumns.vb

@@ -1,27 +1,11 @@
 Public Module ConstColumns
 
-   Public Const COL_ID As String = "colID"
    Public Const COL_DO As String = "colDO"
    Public Const COL_VALUE As String = "colVALUE"
    Public Const COL_CUSTOM As String = "colCUSTOM"
-   Public Const COL_NAME As String = "colNAME"
-   Public Const COL_CALC As String = "colCALC"
-   Public Const COL_PDN As String = "colPDN"
    Public Const COL_STARTCUT As String = "colSTARTCUT"
    Public Const COL_W As String = "colW"
-   Public Const COL_H As String = "colH"
    Public Const COL_L As String = "colL"
-   Public Const COL_CNT As String = "colCNT"
-   Public Const COL_ADDED As String = "colADDED"
-   Public Const COL_INPROD As String = "colINPROD"
-   Public Const COL_DONE As String = "colDONE"
-   Public Const COL_MATERIAL As String = "colMATERIAL"
-   Public Const COL_UNITVOLUME As String = "colUNITVOLUME"
-   Public Const COL_TOTVOLUME As String = "colTOTVOLUME"
-   Public Const COL_UNITTIME As String = "colUNITTIME"
-   Public Const COL_TOTTIME As String = "colTOTTIME"
-   Public Const COL_USAGE As String = "colUSAGE"
-   Public Const COL_WASTE As String = "colWASTE"
    Public Const COL_POSZ As String = "colPOSZ"
    Public Const COL_ROT As String = "colROT"
    Public Const COL_FLIP As String = "colFLIP"
@@ -31,10 +15,13 @@
    Public Const COL_REDO As String = "colREDO"
    Public Const COL_TYPE As String = "colTYPE"
    Public Const COL_DESCRIPTION As String = "colDESCRIPTION"
-   Public Const COL_DESC As String = "colDESC"
    Public Const COL_SUPERVISORID As String = "colSUPERVISORID"
    Public Const COL_PRIORITY As String = "colPRIORITY"
-   Public Const COL_QTY As String = "colQTY"
+   Public Const COL_NAME As String = "colNAME"
+   Public Const COL_H As String = "colH"
+   Public Const COL_MATERIAL As String = "colMATERIAL"
+   Public Const COL_USAGE As String = "colUSAGE"
+   Public Const COL_WASTE As String = "colWASTE"
    Public Const COL_ARCHIVED As String = "colARCHIVED"
 
 End Module

EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb

@@ -1,7 +1,6 @@
 Public Module ConstDataGridColumnsIni
 
    Public Const DATAGRIDCOLUMNS_FILE_NAME As String = "DataGridColumns.ini"
-   Public Const OPTIMIZERDATAGRIDCOLUMNS_FILE_NAME As String = "OPTIMIZERDataGridColumns.ini"
 
    Public Const S_FEATURELIST As String = "DG_FeatureList"
    Public Const S_OPENPROJFILEDLG_PROJ As String = "DG_OpenProjectFileDialog_PROJ"
@@ -20,7 +19,6 @@
    Public Const S_PARTLIST As String = "DG_PartList"
    Public Const S_FEATUREINPARTINRAWPARTLIST As String = "DG_FeatureInPartInRawPartList"
    Public Const S_STATISTICS As String = "DG_Statistics"
-   Public Const S_STATISTICS_PART As String = "DG_Statistics_PART"
    Public Const S_OPTIMIZERSTATISTICS As String = "DG_OptimizerStatistics"
    Public Const S_RAWPARTSTATISTICS As String = "DG_RawPartStatistics"
    Public Const S_BEAMMACHININGS As String = "DG_BeamMachinings"

EgtBEAMWALL.Core/Constants/ConstDims.vb

@@ -9,6 +9,5 @@
    Public Const TOPPANEL_OPTIMIZER As String = "TopPanel_Optimizer"
    Public Const LEFTPANEL_SUPERVISOR As String = "LeftPanel_Supervisor"
    Public Const PROJECT_SUPERVISOR As String = "Project_Supervisor"
-   Public Const PROJECT_ONLYPROD As String = "Project_OnlyProd"
 
 End Class

EgtBEAMWALL.Core/Constants/ConstGen.vb

@@ -14,9 +14,9 @@
 Public Module ConstGen
 
    ' File con direttorio radice dei dati
-   Public Const DAT_FILE_NAME As String = "DataRoot.Ini"
-   Public Const S_DATA As String = "Data"
-   Public Const K_DATAROOT As String = "DataRoot"
+   'Public Const DAT_FILE_NAME As String = "DataRoot.Ini"
+   'Public Const S_DATA As String = "Data"
+   'Public Const K_DATAROOT As String = "DataRoot"
 
    ' File con dati di licenza
    Public Const LIC_FILE_NAME As String = "EgtBEAMWALL.lic"
@@ -28,15 +28,12 @@ Public Module ConstGen
 
    ' Pagine del programma
    Public Enum Pages As Integer
-      EMPTY = -1
       VIEW = 0
       MACHINING = 1
       SUPERVISOR = 2
       CONFIG = 3
       INPUTS = 4
       OUTPUTS = 5
-      OPTIMIZERPAGE = 6
-      CONFIGPROGRAM = 7
    End Enum
 
    ' Abilitazioni licenza
@@ -49,19 +46,12 @@ Public Module ConstGen
       ANY_DB = 32
    End Enum
 
-   ' Selezione Tab Prod / Proj
-   Public Enum ProdProj As Integer
-      NULL = 0
-      PROJ = 1
-      PROD = 2
-   End Enum
-
    ' File di log generale
-   Public Const VWOPTGENLOG_FILE_NAME As String = "EgtBEAMWALL.OptimizerLog#.txt"
+   Public Const VWOPTGENLOG_FILE_NAME As String = "EgtBEAMWALL.ViewerOptimizerLog#.txt"
    Public Const SUPGENLOG_FILE_NAME As String = "EgtBEAMWALL.SupervisorLog#.txt"
 
    ' Sottodirettorio di configurazione
-   Public Const CONF_DIR As String = "Config"
+   'Public Const CONF_DIR As String = "Config"
    ' Sottodirettorio delle risorse
    Public Const RES_DIR As String = "Resources"
    ' Sottodirettorio temporaneo
@@ -71,43 +61,24 @@ Public Module ConstGen
    ' Sottodirettorio per Csv automatico
    Public Const PRODS_DIR As String = "Prods"
    ' Sottodirettorio per Macro
-   Public Const MACRODEFAULT_DIR As String = "MacroDefault"
-   ' Sottodirettorio per MacroCustom
-   Public Const MACROCUSTOM_DIR As String = "MacroCustom"
+   Public Const MACRO_DIR As String = "Macro"
    ' Sottodirettorio per Magazzino
    Public Const WAREHOUSE_DIR As String = "Warehouse"
    ' Sottodirettorio per lavorazioni travi
    Public Const BEAM_DIR As String = "Beam"
-   ' Sottodirettorio per lavorazioni travi nuovo
-   Public Const BEAMNEW_DIR As String = "BeamNew"
    ' Sottodirettorio per lavorazioni pareti
    Public Const WALL_DIR As String = "Wall"
-   ' Sottodirettorio per lavorazioni pareti nuovo
-   Public Const WALLNEW_DIR As String = "WallNew"
    ' Sottodirettorio di default per il salvataggio con nome
    Public Const SAVE_DFL_NAMEDIR As String = "MyProjects"
    ' Sottodirettorio di default per le macchine
-   Public Const MACHINES_DFL_DIR As String = "Machines"
+   'Public Const MACHINES_DFL_DIR As String = "Machines"
    ' Sottodirettorio di default per toolmakers
    Public Const TOOLMAKERS_DFL_DIR As String = "ToolMakers"
-   ' Sottodirettorio di immagini
-   Public Const IMAGE_DIR As String = "Image"
    ' Nome file Lua con le funzioni di attrezzaggio
    Public Const SETUP_LUA As String = "SetUp.lua"
    ' Nome eseguibile per stampa
    Public Const ZEBRAPRINTER_EXE As String = "ZebraPrinterUtilitiesD32.exe"
    ' Sottodirettorio di default per macro
    Public Const MACRO_DFL_DIR As String = "Macro"
-   ' Sottodirettorio per setup strategie
-   Public Const AISETUP_DIR As String = "AISetup"
-   ' Sottodirettorio per automatismo strategie
-   Public Const STRATEGIES_DIR As String = "Strategies"
-   ' Sottodirettorio per automatismo strategie standard
-   Public Const STANDARD_DIR As String = "Standard"
-   ' File contenente lista strategie per feature/topologia
-   Public Const AVAILABLESTRATEGYLIST_FILE As String = "AvailableStrategyList"
-   ' File contente tutte le feature 
-   Public Const CUSTOMERCONFIG_FILE As String = "CustomerConfig"
-   ' File contenente i parametri generali
-   Public Const GENERALPARAMETERS_FILE As String = "GeneralParameters"
+
 End Module

EgtBEAMWALL.Core/Constants/ConstIni.vb

@@ -15,17 +15,29 @@ Public Module ConstIni
 
    Public Const INI_FILE_NAME As String = "EgtBEAMWALL.ini"
 
+   'Public Const S_GENERAL As String = "General"
+   'Public Const K_DEBUG As String = "Debug"
+   'Public Const K_LICENCE As String = "Licence"
+   'Public Const K_USERLEVEL As String = "UserLevel"
+   'Public Const K_MAXINST As String = "MaxInstances"
    Public Const K_NETKEY As String = "NetKey"
    Public Const K_MAXCAMINST As String = "MaxCamInstances"
    Public Const K_VIEWOPTIM_INSTANCES As String = "ViewOptimInstances"
    Public Const K_SUPERVISOR_INSTANCES As String = "SupervisorInstances"
+   'Public Const K_COMMANDLOG As String = "CommandLog"
+   'Public Const K_MESSAGESDIR As String = "MessagesDir"
+   'Public Const K_MESSAGES As String = "Messages"
+   'Public Const K_WINPLACE As String = "WinPlace"
    Public Const K_VIEWOPTIMWINPLACE As String = "ViewOptimWinPlace"
    Public Const K_SUPERVISORWINPLACE As String = "SupervisorWinPlace"
+   'Public Const K_LASTPROJ As String = "LastProj"
+   'Public Const K_AUTOLOADLASTPROJ As String = "AutoLoadLastProj"
    Public Const K_LASTIMPDIR As String = "LastImpDir"
    Public Const K_LASTNGEXPDIR As String = "LastNgexpDir"
    Public Const K_LASTUPDATEDIR As String = "LastUpdateDir"
    Public Const K_PROJSINDEX As String = "ProjsIndex"
    Public Const K_PRODSINDEX As String = "ProdsIndex"
+   'Public Const K_SUPPORT As String = "Support"
    Public Const K_DBADDRESS As String = "DbAddress"
    Public Const K_DBMASTERKEY As String = "DbMasterKey"
    Public Const K_SHAREDFOLDER As String = "SharedFolder"
@@ -35,38 +47,81 @@ Public Module ConstIni
    Public Const K_FASTPRODUCE As String = "FastProduce"
    Public Const K_ADDPROJ As String = "AddProj"
    Public Const K_PROJECTMODE As String = "ProjectMode"
-   Public Const K_CAMEXEPATH As String = "CAMExePath"
-   Public Const K_PIPELUADIR As String = "PipeLuaDir"
 
+   'Public Const S_LANGUAGES As String = "Languages"
+   'Public Const K_LANGUAGE As String = "Language"
+
+   'Public Const S_LUA As String = "Lua"
+   'Public Const K_LIBSDIR As String = "LibsDir"
+   'Public Const K_BASELIB As String = "BaseLib"
+
+   'Public Const S_GEOMDB As String = "GeomDB"
+   'Public Const K_DEFAULTFONT As String = "DefaultFont"
+   'Public Const K_NFEFONTDIR As String = "NfeFontDir"
+   'Public Const K_DEFAULTCOLOR As String = "DefaultColor"
+   'Public Const K_SAVETYPE As String = "SaveType"
+
+   'Public Const S_OPENGL As String = "OpenGL"
+   'Public Const K_DOUBLEBUFFER As String = "DoubleBuffer"
+   'Public Const K_COLORBITS As String = "ColorBits"
+   'Public Const K_DEPTHBITS As String = "DepthBits"
+   'Public Const K_DRIVER As String = "Driver"
+
+   'Public Const S_SCENE As String = "Scene"
+   'Public Const K_BACKTOP As String = "BackTop"
+   'Public Const K_BACKBOTTOM As String = "BackBottom"
+   'Public Const K_SHOWGFRAME As String = "ShowGFrame"
+   'Public Const K_MARK As String = "Mark"
+   'Public Const K_SELSURF As String = "SelSurf"
+   'Public Const K_SHOWMODE As String = "ShowMode"
    Public Const K_SHOWBUILDING As String = "ShowBuilding"
+   'Public Const K_CURVEDIR As String = "CurveDir"
+   'Public Const K_SHOWTRIAADV As String = "ShowTriaAdv"
+   'Public Const K_SHOWZMAP As String = "ShowZmap"
+   'Public Const K_TEXMAXLINPIX As String = "TextureMaxLinPixels"
+   'Public Const K_ZOOMWIN As String = "ZoomWin"
+   'Public Const K_DISTLINE As String = "DistLine"
+   'Public Const K_MMUNITS As String = "MmUnits"
+
+   'Public Const S_GRID As String = "Grid"
+   'Public Const K_SHOWGRID As String = "ShowGrid"
+   'Public Const K_SHOWFRAME As String = "ShowFrame"
+   'Public Const K_SNAPSTEP As String = "SnapStep"
+   'Public Const K_SNAPSTEPINCH As String = "SnapStepInch"
+   'Public Const K_MINLINESSTEP As String = "MinLineSStep"
+   'Public Const K_MAJLINESSTEP As String = "MajLineSStep"
+   'Public Const K_EXTSSTEP As String = "ExtSStep"
+   'Public Const K_MINLNCOLOR As String = "MinLnColor"
+   'Public Const K_MAJLNCOLOR As String = "MajLnColor"
 
    Public Const S_IMPORT As String = "Import"
    Public Const K_BTLFLAG As String = "BtlFlag"
    Public Const K_WALLBTLFLAG As String = "WallBtlFlag"
-   Public Const K_BTLAUXDIR As String = "BtlAuxDir"
    Public Const K_WALLOPPOSITESIDENESTING As String = "WallOppositeSideNesting"
+   Public Const K_BTLAUXDIR As String = "BtlAuxDir"
 
+   'Public Const S_MACH As String = "Mach"
+   'Public Const K_MACHINESDIR As String = "MachinesDir"
+   'Public Const K_TOOLMAKERSDIR As String = "ToolMakersDir"
+   'Public Const K_CURRMACH As String = "CurrMach"
    Public Const K_SUPERVISORMACH As String = "SupervisorMach"
    Public Const K_PASSWORD As String = "Password"
    Public Const K_CHANGEMACH As String = "ChangeMach"
    Public Const K_EXPORTBWE As String = "ExpBwe"
 
+   'Public Const S_SIMUL As String = "Simul"
+   'Public Const K_SLIDERX As String = "SliderX"
+   'Public Const K_SLIDERVAL As String = "SliderVal"
+
    Public Const S_BEAM As String = "Beam"
-   Public Const S_BEAMNEW As String = "BeamNew"
    Public Const K_CALCPATH As String = "CalcPath"
    Public Const K_BEAMBASEDIR As String = "BaseDir"
    Public Const K_BEAMBWEEXEC As String = "BweExec"
 
    Public Const S_WALL As String = "Wall"
-   Public Const S_WALLNEW As String = "WallNew"
    Public Const K_WALLBASEDIR As String = "BaseDir"
    Public Const K_WALLBWEEXEC As String = "BweExec"
 
-   Public Const S_EXECGROUP As String = "ExecGroup"
-   Public Const K_ENVIRONMENT As String = "Environment"
-   Public Const K_PIPELUAFILE As String = "PipeLuaFile"
-   Public Const K_MAXCAMINSTANCES As String = "MaxCAMInstances"
-
    Public Const S_MACHINELOGFILTER As String = "MachineLogFilters"
    Public Const K_PARTEVENTTYPE As String = "PartEventType"
    Public Const K_ENTITYTYPE As String = "EntityType"
@@ -77,6 +132,7 @@ Public Module ConstIni
    Public Const S_OPENFILEDIALOG As String = "OpenFileDialog"
    Public Const K_VIEWARCHIVED As String = "ViewArchived"
 
+   'Public Const S_NEST As String = "Nest"
    Public Const K_NESTEXEC As String = "NestExec"
    Public Const K_FLIPROT As String = "FlipRot"
    Public Const K_SECTIONTIME As String = "SectionTime"
@@ -108,30 +164,12 @@ Public Module ConstIni
    Public Const K_TYPE As String = "Type"
    Public Const K_DEFAULTQUANTITY As String = "DefaultQuantity"
 
-   Public Const S_SECTION As String = "Section_Checked"
-   Public Const S_IMAGE As String = "Image_Checked"
-
-   Public Const S_PDFEDITOR As String = "PDFEditor"
-   
    Public Const S_BACKUPANDRESTORE As String = "Backup&Restore"
    Public Const K_EXTERNALBACKUPACTIVE As String = "ExternalBackupActive"
    Public Const K_EXTERNALFILEPATH As String = "ExternalFilePath"
    Public Const K_REMINDERFREQUENCY As String = "ReminderFrequency"
 
-   Public Const K_ONLYPROD As String = "OnlyProd"
-   Public Const K_MODIFYSETUP As String = "ModifySetup"
-   Public Const K_MACHCONFIG As String = "MachConfig"
-
    Public Const S_SPECIAL As String = "Special"
    Public Const K_SPECIALENABLE As String = "SpecialEnable"
 
-   ' Server Address
-   Public Const K_SERVERADDRESS As String = "ServerAddressRelease"
-   Public Const K_BEAMWALL As String = "EgtBeamWall"
-
-   Public Const S_STRATEGY As String = "Strategy"
-   Public Const K_PARAMPASSWORD As String = "ParamPassword"
-   Public Const K_DEFAULTCONFIG As String = "DefaultConfiguration"
-
-   Public Const K_VERIFYIMPORTBTL As String = "VerifyImportBTL"
 End Module

EgtBEAMWALL.Core/Constants/ConstMachIni.vb

@@ -27,6 +27,5 @@
    Public Const K_FLOW As String = "Flow"
 
    Public Const TS3DATA_FILE As String = "Ts3Data.lua"
-   Public Const EBWDATA_FILE As String = "EbwData.lua"
 
 End Module

EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj

@@ -53,53 +53,11 @@
     <Reference Include="EgtWPFLib5">
       <HintPath>..\ExtLibs\EgtWPFLib5.dll</HintPath>
     </Reference>
-    <Reference Include="EgwProxy.LiMan, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\EgwProxy.LiMan.1.0.2408.718\lib\EgwProxy.LiMan.dll</HintPath>
-    </Reference>
-    <Reference Include="EgwWPFBaseLib, Version=2.7.11.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\EgwWPFBaseLib.2.7.11-beta.4\lib\EgwWPFBaseLib.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="RestSharp, Version=111.2.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestSharp.111.2.0\lib\net471\RestSharp.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
-    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Text.Json, Version=8.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.8.0.3\lib\net462\System.Text.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
@@ -121,12 +79,6 @@
   <ItemGroup>
     <Compile Include="BTLViewModel\BTLFeatureVM.vb" />
     <Compile Include="CALCPanel\CalcEditEndEventArgs.vb" />
-    <Compile Include="ConfigurationPage\Machine_ConfigurationPageV.xaml.vb">
-      <DependentUpon>Machine_ConfigurationPageV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ConfigurationPage\General_ConfigurationPageV.xaml.vb">
-      <DependentUpon>General_ConfigurationPageV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Constants\ConstColumns.vb" />
     <Compile Include="Constants\ConstDataGridColumnsIni.vb" />
     <Compile Include="Constants\ConstDims.vb" />
@@ -135,9 +87,6 @@
     <Compile Include="Constants\ConstMachComm.vb" />
     <Compile Include="Constants\ConstMachIni.vb" />
     <Compile Include="Constants\ConstMsg.vb" />
-    <Compile Include="EgtColorPicker\EgtColorPickerV.xaml.vb">
-      <DependentUpon>EgtColorPickerV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="EgtDataGrid\EgtDataGrid.xaml.vb">
       <DependentUpon>EgtDataGrid.xaml</DependentUpon>
     </Compile>
@@ -148,12 +97,6 @@
     <Compile Include="CALCPanel\CalcIntegration.vb" />
     <Compile Include="DataAccess\PartAddedEventArgs.vb" />
     <Compile Include="DataAccess\BTLParamAddedEventArgs.vb" />
-    <Compile Include="EgtManageFileDialog\EgtManageFileDialogV.xaml.vb">
-      <DependentUpon>EgtManageFileDialogV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="EgtMessageBox\EgtMessageBoxV.xaml.vb">
-      <DependentUpon>EgtMessageBoxV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Lib\MachGroupAddedEventArgs.vb" />
     <Compile Include="Lib\MachGroupVM.vb" />
     <Compile Include="Lib\NewMachGroupPanelVM.vb" />
@@ -165,29 +108,14 @@
     <Compile Include="BTLModel\BTLStructureM.vb" />
     <Compile Include="Constants\ConstBeam.vb" />
     <Compile Include="LoadingWnd\LoadingWndHelper.vb" />
-    <Compile Include="LoadingWnd\LoadingWndVM.vb" />
     <Compile Include="LoadingWnd\LoadingWndV.xaml.vb">
       <DependentUpon>LoadingWndV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="MachinePanel\MachinePanelV.xaml.vb">
-      <DependentUpon>MachinePanelV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="MachiningDbWindow\MachiningDbWindowV.xaml.vb">
-      <DependentUpon>MachiningDbWindowV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogVM.vb" />
+    <Compile Include="LoadingWnd\LoadingWndVM.vb" />
     <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogV.xaml.vb">
       <DependentUpon>NewOpenProjectFileDialogV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="OpenProjectFileDialog\OpenProjectFileDialogV.xaml.vb">
-      <DependentUpon>OpenProjectFileDialogV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="OptmizerWindow\OptimizerWindow.vb" />
-    <Compile Include="TitleBar\TitleBarV.xaml.vb">
-      <DependentUpon>TitleBarV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Utility\Configuration.vb" />
-    <Compile Include="ProjectFileVM\ProdItem.vb" />
+    <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogVM.vb" />
     <Compile Include="Utility\DimensionsIniFile.vb" />
     <Compile Include="Utility\Enum.vb" />
     <Compile Include="MachGroupPanel\MyMachGroupPanelVM.vb" />
@@ -218,6 +146,9 @@
     <Compile Include="MachGroupModel\MyMachGroupPanelM.vb" />
     <Compile Include="Utility\ManageWindow.vb" />
     <Compile Include="Utility\MyMachine.vb" />
+    <Compile Include="OpenProjectFileDialog\OpenProjectFileDialogV.xaml.vb">
+      <DependentUpon>OpenProjectFileDialogV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="OpenProjectFileDialog\OpenProjectFileDialogVM.vb" />
     <Compile Include="MachGroupModel\PartM.vb" />
     <Compile Include="ProjectFileVM\ProdFileM.vb" />
@@ -244,7 +175,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="My Project\Application.myapp">
       <Generator>MyApplicationCodeGenerator</Generator>
       <LastGenOutput>Application.Designer.vb</LastGenOutput>
@@ -254,76 +184,29 @@
       <CustomToolNamespace>My</CustomToolNamespace>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="ConfigurationPage\Machine_ConfigurationPageV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ConfigurationPage\General_ConfigurationPageV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="EgtColorPicker\EgtColorPickerV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="EgtDataGrid\EgtDataGrid.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="EgtManageFileDialog\EgtManageFileDialogV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="EgtMessageBox\EgtMessageBoxV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="LoadingWnd\LoadingWndV.xaml">
       <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="MachinePanel\MachinePanelV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="MachiningDbWindow\MachiningDbWindowV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
+      <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
     <Page Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogV.xaml">
-      <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </Page>
     <Page Include="OpenProjectFileDialog\OpenProjectFileDialogV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="TitleBar\TitleBarV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="ViewPanel\ViewPanelV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\EgalwareLogo.ico" />
-    <Content Include="Resources\PartManager\Locked.old.png" />
-    <Content Include="Resources\PartManager\Unlocked.old.png" />
-    <Content Include="Resources\ProjectManager\Save.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{94E38DFF-614B-4CBD-B67C-F211BB35CE8B}" />
-  </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.Core.dll</PostBuildEvent>

EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml

@@ -1,218 +0,0 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="EgtColorPickerV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                                 Title="{Binding sTitle}"
-                                 WindowStartupLocation="CenterOwner"
-                                 SizeToContent="WidthAndHeight"
-                                 ShowInTaskbar="False"
-                                 Width="750" Height="450"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
-
-   <Grid Style="{StaticResource AddRawPartWnd_Grid}">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Grid Style="{StaticResource AddRawPartWnd_Grid}">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
-         <Grid Style="{StaticResource AddRawPartWnd_Grid}">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-            <TabControl>
-               <TabItem Header="{Binding BasicColor_Msg}">
-                  <Grid Style="{StaticResource EgtColorPicker_Grid}">
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="1*"/>
-                     </Grid.RowDefinitions>
-                     <ListBox ItemsSource="{Binding BasicColors}"
-                              SelectedItem="{Binding SelColor}"
-                              Style="{StaticResource EgtColorPicker_ListBox}">
-                        <ListBox.ItemsPanel>
-                           <ItemsPanelTemplate>
-                              <UniformGrid Columns="13"/>
-                           </ItemsPanelTemplate>
-                        </ListBox.ItemsPanel>
-                        <ListBox.ItemTemplate>
-                           <DataTemplate>
-                              <Rectangle Fill="{Binding Fill}"
-                                         Style="{StaticResource EgtColorPicker_Rectangle}"/>
-                           </DataTemplate>
-                        </ListBox.ItemTemplate>
-                        <ListBox.ItemContainerStyle>
-                           <Style TargetType="ListBoxItem">
-                              <Setter Property="Margin" Value="0"/>
-                              <Setter Property="Padding" Value="0"/>
-                           </Style>
-                        </ListBox.ItemContainerStyle>
-                     </ListBox>
-                  </Grid>
-               </TabItem>
-               <TabItem Header="{Binding ColorPicker_Msg}">
-                  <TabItem.Resources>
-                     <Style TargetType="{x:Type EgtWPFLib5:EgtHexItem}" BasedOn="{StaticResource EgtHexItem}">
-                        <Setter Property="BorderThickness" Value="1.5"/>
-                        <Setter Property="BorderBrush" Value="{StaticResource BeamWall_White}"/>
-                     </Style>
-                  </TabItem.Resources>
-                  <EgtWPFLib5:EgtHexList ItemsSource="{Binding HexList}"
-                                         SelectedItem="{Binding sHexSelColor}"
-                                         Style="{StaticResource EgtHexList}">
-                     <EgtWPFLib5:EgtHexList.ItemTemplate>
-                        <DataTemplate/>
-                     </EgtWPFLib5:EgtHexList.ItemTemplate>
-                     <EgtWPFLib5:EgtHexList.ItemContainerStyle>
-                        <Style TargetType="{x:Type EgtWPFLib5:EgtHexItem}" BasedOn="{StaticResource EgtHexItem}">
-                           <Setter Property="Grid.Row" Value="{Binding nRow}"/>
-                           <Setter Property="Grid.Column" Value="{Binding nColumn}"/>
-                           <Setter Property="Background" Value="{Binding Background}"/>
-                        </Style>
-                     </EgtWPFLib5:EgtHexList.ItemContainerStyle>
-                  </EgtWPFLib5:EgtHexList>
-               </TabItem>
-               <TabItem Header="{Binding ColorPickerTheme_Msg}">
-                  <Grid Style="{StaticResource EgtColorPicker_Grid}">
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="1*"/>
-                     </Grid.RowDefinitions>
-                     <ListBox ItemsSource="{Binding BasicColorsTheme}"
-                              SelectedItem="{Binding SelColorTheme}"
-                              Style="{StaticResource BasicColor_ListBox}">
-                        <ListBox.ItemsPanel>
-                           <ItemsPanelTemplate>
-                              <UniformGrid Columns="13"/>
-                           </ItemsPanelTemplate>
-                        </ListBox.ItemsPanel>
-                        <ListBox.ItemTemplate>
-                           <DataTemplate>
-                              <Rectangle Fill="{Binding Fill}"
-                                         Style="{StaticResource EgtColorPicker_Rectangle}"/>
-                           </DataTemplate>
-                        </ListBox.ItemTemplate>
-                        <ListBox.ItemContainerStyle>
-                           <Style TargetType="ListBoxItem">
-                              <Setter Property="Margin" Value="0"/>
-                              <Setter Property="Padding" Value="0"/>
-                           </Style>
-                        </ListBox.ItemContainerStyle>
-                     </ListBox>
-                  </Grid>
-               </TabItem>
-            </TabControl>
-         </Grid>
-         <Grid Grid.Column="1"
-               Style="{StaticResource CustomerColor_Grid}">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <TextBlock Text="{Binding CustomColor_Msg}"
-                       Style="{StaticResource EgtColorPicker_TextBlock}"/>
-            <Grid Grid.Row="1">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto"/>
-                  <RowDefinition Height="1*"/>
-               </Grid.RowDefinitions>
-               <ListBox ItemsSource="{Binding CustomColors}"
-                        SelectedItem="{Binding SelCustomColor}"
-                        Style="{StaticResource CustomerColor_ListBox}">
-                  <ListBox.ItemsPanel>
-                     <ItemsPanelTemplate>
-                        <UniformGrid Columns="13"/>
-                     </ItemsPanelTemplate>
-                  </ListBox.ItemsPanel>
-                  <ListBox.ItemTemplate>
-                     <DataTemplate>
-                        <Rectangle Fill="{Binding Fill}"
-                                   Style="{StaticResource EgtColorPicker_Rectangle}"/>
-                     </DataTemplate>
-                  </ListBox.ItemTemplate>
-                  <ListBox.ItemContainerStyle>
-                     <Style TargetType="ListBoxItem">
-                        <Setter Property="Margin" Value="0"/>
-                        <Setter Property="Padding" Value="0"/>
-                     </Style>
-                  </ListBox.ItemContainerStyle>
-               </ListBox>
-            </Grid>
-            <Grid Grid.Row="2"
-                  Style="{StaticResource CurrColor_Grid}">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <Grid Style="{StaticResource AddColor_Grid}">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="1*"/>
-                     <RowDefinition Height="Auto"/>
-                  </Grid.RowDefinitions>
-                  <Rectangle Fill="{Binding CurrColor}"
-                             Style="{StaticResource CurrColor_Rectangle}"/>
-                  <Button Grid.Row="1"
-                          x:Name="SaveColor"                          
-                          Content="{Binding AddCColor_Msg}"
-                          Command="{Binding SaveColor_Command}"  
-                          Style="{StaticResource EgtColorPicker_TextButton}"/>
-               </Grid>
-               <Grid Grid.Column="1">
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="1*"/>
-                     <ColumnDefinition Width="1*"/>
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="1*"/>
-                     <RowDefinition Height="1*"/>
-                     <RowDefinition Height="1*"/>
-                     <RowDefinition Height="1*"/>
-                  </Grid.RowDefinitions>
-                  <TextBlock Text="{Binding Red_Msg}"
-                             Style="{StaticResource RedColor_TextBlock}"/>
-                  <TextBox Grid.Column="1" 
-                           Text="{Binding Red, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource RedColor_TextBox}"/>
-                  <TextBlock Grid.Row="1"
-                             Text="{Binding Green_Msg}"
-                             Style="{StaticResource GreenColor_TextBlock}"/>
-                  <TextBox Grid.Column="1"
-                           Grid.Row="1"
-                           Text="{Binding Green, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource GreenColor_TextBox}"/>
-                  <TextBlock Grid.Row="2"
-                             Text="{Binding Blu_Msg}"
-                             Style="{StaticResource GreenColor_TextBlock}"/>
-                  <TextBox Grid.Row="2"
-                           Grid.Column="1"
-                           Text="{Binding Blue, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource GreenColor_TextBox}"/>
-                  <TextBlock Grid.Row="3"
-                             Text="{Binding Hexadecimal_Msg}"
-                             Style="{StaticResource GreenColor_TextBlock}"/>
-                  <TextBox Grid.Row="3"
-                           Grid.Column="1"                           
-                           Text="{Binding Hexadecimal}"
-                           Style="{StaticResource GreenColor_TextBox}"/>
-               </Grid>
-            </Grid>
-         </Grid>
-      </Grid>
-      <UniformGrid Grid.Row="2"  
-                   Rows="1"
-                   Style="{StaticResource EgtColorPicker_UniformGrid}">
-         <Button IsDefault="True"
-                 Content="OK"
-                 Command="{Binding Ok_Command}"
-                 Style="{StaticResource EgtColorPicker_HalfRound_Button}"/>
-         <Button Content="Cancel"
-                 Command="{Binding Cancel_Command}"
-                 Style="{StaticResource EgtColorPicker_HalfRound_Button}"/>
-      </UniformGrid>
-   </Grid>
-</EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml.vb

@@ -1,68 +0,0 @@
-Imports EgtWPFLib5
-Imports System.Windows
-Imports System.Windows.Forms
-
-Public Class EgtColorPickerV
-
-#Region "FIELDS & PROPERTIES"
-
-   Private WithEvents m_EgtColorPickerVM As EgtColorPickerVM
-
-   Private Shadows DialogResult As DialogResult
-
-   Public Property CustomColors As Integer()
-      Get
-         Return m_EgtColorPickerVM.GetCustomColors()
-      End Get
-      Set(value As Integer())
-         m_EgtColorPickerVM.SetCustomColors(value)
-      End Set
-   End Property
-
-   Public Property Color As System.Drawing.Color
-      Get
-         Return System.Drawing.Color.FromArgb(255, m_EgtColorPickerVM.Red, m_EgtColorPickerVM.Green, m_EgtColorPickerVM.Blue)
-      End Get
-      Set(value As System.Drawing.Color)
-         m_EgtColorPickerVM.Red = value.R
-         m_EgtColorPickerVM.Green = value.G
-         m_EgtColorPickerVM.Blue = value.B
-      End Set
-   End Property
-
-#End Region    ' Fields & Properties
-
-#Region "CONTRUCTORS"
-
-   Sub New(Owner As Window, EtgColorPickerVM As EgtColorPickerVM)
-      InitializeComponent()
-      Me.DataContext = EtgColorPickerVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_EgtColorPickerVM = EtgColorPickerVM
-   End Sub
-
-#End Region    ' Constructors
-
-#Region "EVENTS"
-
-   Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtColorPickerVM.m_CloseWindow
-      Me.DialogResult = DialogResult
-      Me.Close()
-   End Sub
-
-#End Region     ' Events
-
-#Region "METHODS"
-
-   ''' <summary>
-   ''' Apre una finestra EgtColorPicker
-   ''' </summary>
-   ''' <returns></returns>
-   Public Overloads Function ShowDialog() As DialogResult
-      MyBase.ShowDialog()
-      Return Me.DialogResult
-   End Function
-
-#End Region    ' Methods
-
-End Class

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml

@@ -1,6 +1,18 @@
 <DataGrid x:Class="EgtDataGrid"
+          x:Name="CurrDataGrid"
           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+   <DataGrid.ColumnHeaderStyle>
+      <Style TargetType="DataGridColumnHeader">
+         <Setter Property="HorizontalContentAlignment"
+                 Value="Stretch" />
+         <EventSetter Event="SizeChanged" 
+                      Handler="Cell_SizedChanged" />
+         <EventSetter Event="MouseRightButtonDown" 
+                      Handler="Cell_MouseRightButtonDown" />
+      </Style>
+   </DataGrid.ColumnHeaderStyle>
+
 </DataGrid>
 
 

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb

@@ -3,10 +3,10 @@ Imports System.Collections.Specialized
 Imports System.ComponentModel
 Imports System.Windows
 Imports System.Windows.Controls
-Imports System.Windows.Controls.Primitives
 Imports System.Windows.Data
+Imports System.Windows.Controls.Primitives
+Imports System.Windows.Input
 Imports System.Windows.Media
-Imports System.Windows.Threading
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -26,7 +26,6 @@ Public Class EgtDataGrid
 
    Sub New()
       InitializeComponent()
-      AddHandler Columns.CollectionChanged, AddressOf Columns_CollectionChanged
    End Sub
 
    Public Shadows Property BindingColumns As ObservableCollection(Of EgtDataGridColumn)
@@ -72,78 +71,6 @@ Public Class EgtDataGrid
       End If
    End Sub
 
-   Private Sub Columns_CollectionChanged(sender As Object, e As NotifyCollectionChangedEventArgs)
-      If e.Action = NotifyCollectionChangedAction.Add Then
-         For Each newColumn As DataGridColumn In e.NewItems
-            Dispatcher.BeginInvoke(New Action(Sub()
-                                                 HookHeaderForColumn(newColumn)
-                                              End Sub), DispatcherPriority.Loaded)
-         Next
-      ElseIf e.Action = NotifyCollectionChangedAction.Remove Then
-         For Each removedColumn As DataGridColumn In e.OldItems
-            Dispatcher.BeginInvoke(New Action(Sub()
-                                                 UnhookHeaderForColumn(removedColumn)
-                                              End Sub), DispatcherPriority.Loaded)
-         Next
-      End If
-   End Sub
-
-   Private Sub HookHeaderForColumn(ByVal column As DataGridColumn)
-      Dim headersPresenter = FindVisualChild(Of DataGridColumnHeadersPresenter)(Me)
-      If headersPresenter Is Nothing Then Return
-
-      For Each header In FindVisualChildren(Of DataGridColumnHeader)(headersPresenter)
-
-         If header.Column Is column Then
-            AddHandler header.SizeChanged, AddressOf ColumnHeader_SizeChanged
-            AddHandler header.MouseRightButtonDown, AddressOf ColumnHeader_MouseRightButtonDown
-            Exit For
-         End If
-      Next
-   End Sub
-
-   Private Sub UnhookHeaderForColumn(ByVal column As DataGridColumn)
-      Dim headersPresenter = FindVisualChild(Of DataGridColumnHeadersPresenter)(Me)
-      If headersPresenter Is Nothing Then Return
-
-      For Each header In FindVisualChildren(Of DataGridColumnHeader)(headersPresenter)
-
-         If header.Column Is column Then
-            RemoveHandler header.SizeChanged, AddressOf ColumnHeader_SizeChanged
-            RemoveHandler header.MouseRightButtonDown, AddressOf ColumnHeader_MouseRightButtonDown
-            Exit For
-         End If
-      Next
-   End Sub
-
-   Private Function FindVisualChild(Of T As DependencyObject)(ByVal parent As DependencyObject) As T
-      Dim tChild As T = Nothing
-
-      For i As Integer = 0 To VisualTreeHelper.GetChildrenCount(parent) - 1
-         Dim child = VisualTreeHelper.GetChild(parent, i)
-         tChild = TryCast(child, T)
-         If tChild IsNot Nothing Then Return tChild
-         Dim result = FindVisualChild(Of T)(child)
-         If result IsNot Nothing Then Return result
-      Next
-
-      Return Nothing
-   End Function
-
-   Private Iterator Function FindVisualChildren(Of T As DependencyObject)(ByVal parent As DependencyObject) As IEnumerable(Of T)
-      Dim tChild As T = Nothing
-
-      For i As Integer = 0 To VisualTreeHelper.GetChildrenCount(parent) - 1
-         Dim child = VisualTreeHelper.GetChild(parent, i)
-         tChild = TryCast(child, T)
-         If tChild IsNot Nothing Then Yield tChild
-
-         For Each descendant In FindVisualChildren(Of T)(child)
-            Yield descendant
-         Next
-      Next
-   End Function
-
    Private Sub collectionChanged(ByVal sender As Object, ByVal e As NotifyCollectionChangedEventArgs)
       Select Case e.Action
          Case NotifyCollectionChangedAction.Add
@@ -152,11 +79,11 @@ Public Class EgtDataGrid
 
                For Each one As EgtDataGridColumn In e.NewItems
                   Try
-                     Dim col As DataGridColumn = Me.FindResource(one.Name)
+                     Dim col As DataGridColumn = CurrDataGrid.FindResource(one.Name)
                      one.InitColumn(col)
-                     Me.Columns.Insert(e.NewStartingIndex, col)
+                     CurrDataGrid.Columns.Insert(e.NewStartingIndex, col)
                      If col.DisplayIndex <> e.NewStartingIndex Then
-                        Me.Columns(e.NewStartingIndex).DisplayIndex = e.NewStartingIndex
+                        CurrDataGrid.Columns(e.NewStartingIndex).DisplayIndex = e.NewStartingIndex
                      End If
                   Catch ex As Exception
                      MessageBox.Show(String.Format(EgtMsg(61883), one.Name, one.ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
@@ -169,34 +96,34 @@ Public Class EgtDataGrid
             If e.OldItems IsNot Nothing Then
 
                For Each one As EgtDataGridColumn In e.OldItems
-                  Dim col As DataGridColumn = Me.FindResource(one.Name)
-                  Me.Columns.Remove(col)
+                  Dim col As DataGridColumn = CurrDataGrid.FindResource(one.Name)
+                  CurrDataGrid.Columns.Remove(col)
                Next
             End If
 
          Case NotifyCollectionChangedAction.Move
-            'Dim col As DataGridColumn = Me.FindResource(BindingColumns(e.OldStartingIndex))
+            'Dim col As DataGridColumn = CurrDataGrid.FindResource(BindingColumns(e.OldStartingIndex))
             'col.DisplayIndex = e.NewStartingIndex
-            Me.Columns.Move(e.OldStartingIndex, e.NewStartingIndex)
-            Me.Columns(e.NewStartingIndex).DisplayIndex = e.NewStartingIndex
-            'Dim x = Me.Columns(e.OldStartingIndex).DisplayIndex
+            CurrDataGrid.Columns.Move(e.OldStartingIndex, e.NewStartingIndex)
+            CurrDataGrid.Columns(e.NewStartingIndex).DisplayIndex = e.NewStartingIndex
+            'Dim x = CurrDataGrid.Columns(e.OldStartingIndex).DisplayIndex
          Case NotifyCollectionChangedAction.Reset
-            Me.Columns.Clear()
+            CurrDataGrid.Columns.Clear()
 
             If e.NewItems IsNot Nothing Then
 
                For Each one As DataGridColumn In e.NewItems
-                  Dim col As DataGridColumn = Me.FindResource(one)
-                  Me.Columns.Add(col)
+                  Dim col As DataGridColumn = CurrDataGrid.FindResource(one)
+                  CurrDataGrid.Columns.Add(col)
                Next
             End If
          Case NotifyCollectionChangedAction.Replace
-            Dim col As DataGridColumn = Me.FindResource(e.NewItems(0))
-            Me.Columns(e.NewStartingIndex) = col
+            Dim col As DataGridColumn = CurrDataGrid.FindResource(e.NewItems(0))
+            CurrDataGrid.Columns(e.NewStartingIndex) = col
       End Select
    End Sub
 
-   Private Sub ColumnHeader_SizeChanged(sender As Object, e As SizeChangedEventArgs)
+   Private Sub Cell_SizedChanged(sender As Object, e As SizeChangedEventArgs)
       ' ad ogni ridimensionamento della cella del ColumnHeader salvo le nuove dimensioni nell'ini
       If Not IsNothing(e.OriginalSource.Column) AndAlso Not IsNothing(BindingColumns(e.OriginalSource.Column.DisplayIndex)) Then
          ' se la colonna corrente è Star ed è preceduta da una colonna Pixel non scrivo le modifiche
@@ -206,17 +133,17 @@ Public Class EgtDataGrid
       End If
    End Sub
 
-   Private Sub DataGrid_SizedChanged(sender As Object, e As SizeChangedEventArgs) Handles Me.SizeChanged
+   Private Sub DataGrid_SizedChanged(sender As Object, e As SizeChangedEventArgs) Handles CurrDataGrid.SizeChanged
       ' confronto la larghezza effettiva della EgtDataGrid con la somma delle larghezze delle colonne
       UpdateColumnsWidth()
       If BindingColumns.Count > 0 Then
-         If Me.ActualWidth - LASTCOLUMN_MINWIDTH > columnsWidth Then
+         If CurrDataGrid.ActualWidth - LASTCOLUMN_MINWIDTH > columnsWidth Then
             ' nascondo la ScrollBar orizzontale e setto lo UnitType dell'ultima colonna visibile a Star
-            ScrollViewer.SetHorizontalScrollBarVisibility(Me, ScrollBarVisibility.Hidden)
+            ScrollViewer.SetHorizontalScrollBarVisibility(CurrDataGrid, ScrollBarVisibility.Hidden)
             BindingColumns.Last(Function(x) x.Visible = True).Width = New DataGridLength(1, DataGridLengthUnitType.Star)
          Else
             ' mostro la ScrollBar orizzontale e se UnitType delle colonne è Star lo setto a Pixel
-            ScrollViewer.SetHorizontalScrollBarVisibility(Me, ScrollBarVisibility.Visible)
+            ScrollViewer.SetHorizontalScrollBarVisibility(CurrDataGrid, ScrollBarVisibility.Visible)
             For Each bc In BindingColumns
                If bc.Width.IsStar Then
                   bc.Width = New DataGridLength(bc.ActualWidth, DataGridLengthUnitType.Pixel)
@@ -244,7 +171,7 @@ Public Class EgtDataGrid
       End If
    End Sub
 
-   Private Sub ColumnHeader_MouseRightButtonDown(sender As Object, e As RoutedEventArgs)
+   Private Sub Cell_MouseRightButtonDown(sender As Object, e As RoutedEventArgs)
       Dim nDispIndex As Integer = sender.DisplayIndex
       ' creo il ContextMenu con gli item checkabili
       Dim cm As ContextMenu = New ContextMenu()
@@ -328,12 +255,12 @@ Public Class EgtDataGrid
       cm.IsOpen = True
    End Sub
 
-   Private Sub CurrDataGrid_ColumnReordering(sender As Object, e As DataGridColumnEventArgs) Handles Me.ColumnReordering
+   Private Sub CurrDataGrid_ColumnReordering(sender As Object, e As DataGridColumnEventArgs) Handles CurrDataGrid.ColumnReordering
       ' conservo il vecchio indice in modo da effettuare lo scambio in BindingColumns una volta riordinate graficamente
       OldIndex = e.Column.DisplayIndex
    End Sub
 
-   Private Sub CurrDataGrid_ColumnReordered(sender As Object, e As DataGridColumnEventArgs) Handles Me.ColumnReordered
+   Private Sub CurrDataGrid_ColumnReordered(sender As Object, e As DataGridColumnEventArgs) Handles CurrDataGrid.ColumnReordered
       ' scambio le colonne in BindingColumns
       BindingColumns.Move(OldIndex, e.Column.DisplayIndex)
       ' scrivo tutte le colonne interessate dallo spostamento
@@ -389,12 +316,12 @@ Public Class EgtDataGrid
       ResetSortDirections()
    End Sub
 
-   Private Sub CurrDataGrid_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+   Private Sub CurrDataGrid_Loaded(sender As Object, e As RoutedEventArgs) Handles CurrDataGrid.Loaded
       ' setto la SortDirection, se attiva, sulla colonna su cui è attiva
       Dim colIndex As Integer = 0
       For Each col In BindingColumns
          If col.SortDirection > 0 Then
-            Me.Items.SortDescriptions.Add(New SortDescription(Me.Columns(colIndex).SortMemberPath, col.SortDirection - 1))
+            CurrDataGrid.Items.SortDescriptions.Add(New SortDescription(CurrDataGrid.Columns(colIndex).SortMemberPath, col.SortDirection - 1))
             Exit For
          End If
          colIndex += 1
@@ -407,7 +334,7 @@ Public Class EgtDataGrid
       Next
    End Sub
 
-   Private Sub CurrDataGrid_Sorting(sender As Object, e As DataGridSortingEventArgs) Handles Me.Sorting
+   Private Sub CurrDataGrid_Sorting(sender As Object, e As DataGridSortingEventArgs) Handles CurrDataGrid.Sorting
       ' salvo la SortDirection corrente della colonna prima di resettarla per tutte le colonne
       Dim CurrSortDirection As ListSortDirection? = e.Column.SortDirection
       ResetSortDirections(True)
@@ -430,11 +357,11 @@ Public Class EgtDataGrid
          Next
       Else
          ' altrimenti (caso ResetSort da ContextMenu) è necessatio un Clear più ampio e anche grafico
-         Me.Items.SortDescriptions.Clear()
+         CurrDataGrid.Items.SortDescriptions.Clear()
          For Each column In BindingColumns
             column.SortDirection = 0
             ' resetto graficamente anche l'header della colonna
-            Me.Columns(column.DisplayIndex).SortDirection = Nothing
+            CurrDataGrid.Columns(column.DisplayIndex).SortDirection = Nothing
          Next
          RaiseEvent ResetSort()
       End If
@@ -443,23 +370,9 @@ Public Class EgtDataGrid
 End Class
 
 Public Class EgtDataGridColumn
-   Inherits VMBase
 
    Private m_dgColumn As DataGridColumn
 
-   'Check Box per le singole colonne
-   Private m_bIsCheched As Boolean
-   Public Property bIsChecked As Boolean
-      Get
-         Return m_bIsCheched
-      End Get
-      Set(value As Boolean)
-         m_bIsCheched = value
-         NotifyPropertyChanged(NameOf(bIsChecked))
-         WriteMainPrivateProfileString(S_PDFEDITOR, m_Name, If(m_bIsCheched, 1, 0))
-      End Set
-   End Property
-
    Private Property m_ParentDataGridName As String
    Public Property ParentDataGridName As String
       Get
@@ -483,11 +396,7 @@ Public Class EgtDataGridColumn
    Private Property m_Width As DataGridLength
    Public Property Width As DataGridLength
       Get
-         If Not IsNothing(m_dgColumn) Then
-            Return m_dgColumn.Width
-         Else
-            Return m_Width
-         End If
+         Return m_dgColumn.Width
       End Get
       Set(value As DataGridLength)
          If Not IsNothing(m_dgColumn) Then
@@ -504,14 +413,10 @@ Public Class EgtDataGridColumn
       End Get
    End Property
 
-   Private Property m_DisplayIndex As Integer = -1
+   Private Property m_DisplayIndex As Integer
    Public Property DisplayIndex As Integer
       Get
-         If Not IsNothing(m_dgColumn) Then
-            Return m_dgColumn.DisplayIndex
-         Else
-            Return m_DisplayIndex
-         End If
+         Return m_dgColumn.DisplayIndex
       End Get
       Set(value As Integer)
          If Not IsNothing(m_dgColumn) Then
@@ -526,11 +431,7 @@ Public Class EgtDataGridColumn
    Private Property m_IsReadOnly As Boolean = True
    Public Property IsReadOnly As Boolean
       Get
-         If Not IsNothing(m_dgColumn) Then
-            Return m_dgColumn.IsReadOnly
-         Else
-            Return m_IsReadOnly
-         End If
+         Return m_dgColumn.IsReadOnly
       End Get
       Set(value As Boolean)
          If Not IsNothing(m_dgColumn) Then
@@ -548,11 +449,7 @@ Public Class EgtDataGridColumn
    Private m_CanUserReorder As Boolean
    Public Property CanUserReorder As Boolean
       Get
-         If Not IsNothing(m_dgColumn) Then
-            Return m_dgColumn.CanUserReorder
-         Else
-            Return m_CanUserReorder
-         End If
+         Return m_dgColumn.CanUserReorder
       End Get
       Set(value As Boolean)
          If Not IsNothing(m_dgColumn) Then
@@ -568,11 +465,7 @@ Public Class EgtDataGridColumn
    Private m_CanUserResize As Boolean
    Public Property CanUserResize As Boolean
       Get
-         If Not IsNothing(m_dgColumn) Then
-            Return m_dgColumn.CanUserResize
-         Else
-            Return m_CanUserResize
-         End If
+         Return m_dgColumn.CanUserResize
       End Get
       Set(value As Boolean)
          If Not IsNothing(m_dgColumn) Then
@@ -587,11 +480,7 @@ Public Class EgtDataGridColumn
    Private m_CanUserSort As Boolean
    Public Property CanUserSort As Boolean
       Get
-         If Not IsNothing(m_dgColumn) Then
-            Return m_dgColumn.CanUserSort
-         Else
-            Return m_CanUserSort
-         End If
+         Return m_dgColumn.CanUserSort
       End Get
       Set(value As Boolean)
          If Not IsNothing(m_dgColumn) Then
@@ -685,7 +574,6 @@ Public Class EgtDataGridColumn
       m_Visible = bVisible
       m_CanUserEditVisible = bCanUserEditVisible
       m_SortDirection = nSortDirection
-      m_bIsCheched = GetMainPrivateProfileInt(S_PDFEDITOR, m_Name, 0) <> 0
    End Sub
 
    Friend Sub InitColumn(dgColumn As DataGridColumn)
@@ -706,7 +594,6 @@ Public Class EgtDataGridColumn
 
    ' funzione per calcolare e scrivere la stringa dei parametri della colonna nell'INI
    Public Function SaveDataGridColumn() As Boolean
-      If DisplayIndex = -1 Then Return False
       Dim bOk As Boolean
       Dim sColumnParams = String.Empty
       sColumnParams = Name & "," & If(CanUserReorder, 1, 0) & "," & If(CanUserResize, 1, 0) & "," & If(CanUserSort, 1, 0) & "," & If(m_OrigIsReadOnly, 1, 0) & "," & DoubleToString(Width.Value, 6) & "," & Width.UnitType & "," & If(Visible, 1, 0) & "," & If(CanUserEditVisible, 1, 0) & "," & CInt(SortDirection)

EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml

@@ -1,349 +0,0 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="EgtManageFileDialogV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                                 Title="{Binding sTitle}"
-                                 WindowStartupLocation="CenterOwner"
-                                 ShowInTaskbar="False"
-                                 Height="500" Width="800"
-                                 Style="{StaticResource OptimizerWindow.Dialog}">
-
-   <Grid Style="{StaticResource AddRawPartWnd_Grid}">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Grid Style="{StaticResource AddRawPartWnd_Grid}">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <Button Command="{Binding GoBack_Command}"
-                 Style="{StaticResource RightPanel_Button}">
-            <Image Source="\Resources\EgtDialog\Restore.png"
-                   Style="{StaticResource Button_Image}"/>
-         </Button>
-         <TextBlock Grid.Column="1"
-                    Text="{Binding sSelPath}"
-                    Style="{StaticResource EgtManageDialog_TextBlock}"/>
-         <ComboBox Grid.Column="2"
-                   ItemsSource="{Binding ViewModeList}"
-                   SelectedItem="{Binding SelViewMode}"
-                   Style="{StaticResource EgtManageDialog_ComboBox}"/>
-      </Grid>
-      <Grid Grid.Row="1"
-            Style="{StaticResource AddRawPartWnd_Grid}">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="4*"/>
-         </Grid.ColumnDefinitions>
-         <TreeView x:Name="FileTree" 
-                   ItemsSource="{Binding RootList}"                   
-                   Style="{StaticResource EgtManageDialog_TreeView}">
-            <TreeView.Resources>
-               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:EgtFolder}" 
-                                         ItemsSource="{Binding TreeItemList_View}">
-                  <StackPanel Style="{StaticResource PartManager_StackPanel}">
-                     <Image Source="{Binding sIconSource}"
-                            Style="{StaticResource Button_Image}"/>
-                     <TextBlock Text="{Binding sName}"
-                                Style="{StaticResource DialogWindow_TextBlock}"/>
-                  </StackPanel>
-               </HierarchicalDataTemplate>
-               <DataTemplate DataType="{x:Type EgtWPFLib5:EgtItem}">
-                  <StackPanel Style="{StaticResource PartManager_StackPanel}">
-                     <Image Source="{Binding sIconSource}"
-                            Style="{StaticResource Button_Image}"/>
-                     <TextBlock Text="{Binding sName}"
-                                Style="{StaticResource DialogWindow_TextBlock}"/>
-                  </StackPanel>
-               </DataTemplate>
-            </TreeView.Resources>
-            <TreeView.ItemContainerStyle>
-               <Style TargetType="{x:Type TreeViewItem}">
-                  <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
-                  <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
-               </Style>
-            </TreeView.ItemContainerStyle>
-         </TreeView>
-         <TabControl Grid.Column="1"
-                     SelectedIndex="{Binding nSelTab}"
-                     Style="{StaticResource EgtManageDialog_TabControl}">
-            <TabControl.ItemContainerStyle>
-               <Style TargetType="{x:Type TabItem}">
-                  <Setter Property="Visibility" Value="Collapsed"/>
-               </Style>
-            </TabControl.ItemContainerStyle>
-            <TabItem Header="LISTBOX">
-               <ListBox Grid.Row="1"
-                        x:Name="FileList"                         
-                        ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
-                        SelectedItem="{Binding ItemSelected, Mode=TwoWay}">
-                  <ListBox.Resources>
-                     <DataTemplate x:Key="ListTemplateView" 
-                                   DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Style="{StaticResource EgtManageDialog_Grid}">
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="Auto"/>
-                              <ColumnDefinition Width="Auto"/>
-                           </Grid.ColumnDefinitions>
-                           <Image Source="{Binding sIconSource}"
-                                  Style="{StaticResource Button_Image}"/>
-                           <TextBlock Grid.Column="1"
-                                      Text="{Binding sName}"
-                                      Style="{StaticResource DialogWindow_TextBlock}"/>
-                        </Grid>
-                     </DataTemplate>
-                     <DataTemplate x:Key="TilesTemplateView"
-                                   DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Style="{StaticResource EgtDirectory_Grid}">
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="Auto"/>
-                              <ColumnDefinition Width="1*"/>
-                           </Grid.ColumnDefinitions>
-                           <Image Source="{Binding sIconSource}"
-                                  Style="{StaticResource Button_Image}"/>
-                           <UniformGrid Grid.Column="1"
-                                        Rows="3"
-                                        Style="{StaticResource EgtManageDialog_UniformGrid}">
-                              <TextBlock Text="{Binding sName}"
-                                         Style="{StaticResource Info_TextBlock}"/>
-                              <TextBlock Text="{Binding ghTypeItem}"
-                                         Style="{StaticResource Info_TextBlock}"/>
-                              <TextBlock Text="{Binding sDimension}"
-                                         Style="{StaticResource Info_TextBlock}"/>
-                           </UniformGrid>
-                        </Grid>
-                     </DataTemplate>
-                     <DataTemplate x:Key="ContentTemplateView"
-                                   DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Style="{StaticResource ContentTemplate_Grid}">
-                           <Grid.RowDefinitions>
-                              <RowDefinition Height="1*"/>
-                              <RowDefinition Height="Auto"/>
-                           </Grid.RowDefinitions>
-                           <Grid>
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="1*"/>
-                                 <ColumnDefinition Width="1*"/>
-                              </Grid.ColumnDefinitions>
-                              <Image Source="{Binding sIconSource}"
-                                     Style="{StaticResource Button_Image}"/>
-                              <UniformGrid Grid.Column="1"
-                                           Rows="2"
-                                           Style="{StaticResource EgtManageDialog_UniformGrid}">
-                                 <TextBlock Text="{Binding sName}"
-                                            Style="{StaticResource Info_TextBlock}"/>
-                                 <TextBlock Text="{Binding ghTypeItem}"
-                                            Style="{StaticResource Info_TextBlock}"/>
-                              </UniformGrid>
-                              <UniformGrid Grid.Column="2"
-                                           Rows="2"
-                                           Style="{StaticResource EgtManageDialog_UniformGrid}">
-                                 <TextBlock Text="{Binding sLastModifyDate}"
-                                            Style="{StaticResource Info_TextBlock}"/>
-                                 <TextBlock Text="{Binding sDimension}"
-                                            Style="{StaticResource Info_TextBlock}"/>
-                              </UniformGrid>
-                           </Grid>
-                           <Border Grid.Row="1"
-                                   Style="{StaticResource EgtManageDialog_Border}"/>
-                        </Grid>
-                     </DataTemplate>
-                  </ListBox.Resources>
-                  <ListBox.ItemTemplate>
-                     <DataTemplate DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <ContentControl Content="{Binding}">
-                           <ContentControl.Style>
-                              <Style TargetType="{x:Type ContentControl}">
-                                 <Style.Triggers>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}" Value="0">
-                                       <Setter Property="ContentTemplate" Value="{StaticResource ListTemplateView}" />
-                                    </DataTrigger>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}" Value="1">
-                                       <Setter Property="ContentTemplate" Value="{StaticResource TilesTemplateView}" />
-                                    </DataTrigger>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}" Value="2">
-                                       <Setter Property="ContentTemplate" Value="{StaticResource ContentTemplateView}" />
-                                    </DataTrigger>
-                                 </Style.Triggers>
-                              </Style>
-                           </ContentControl.Style>
-                        </ContentControl>
-                     </DataTemplate>
-                  </ListBox.ItemTemplate>
-                  <ListBox.ItemContainerStyle>
-                     <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-                        <EventSetter Event="MouseDoubleClick" Handler="ListBoxItem_MouseDoubleClick"/>
-                     </Style>
-                  </ListBox.ItemContainerStyle>
-                  <ListBox.Style>
-                     <Style TargetType="{x:Type ListBox}">
-                        <Setter Property="BorderBrush" Value="{StaticResource BeamWall_White}"/>
-                        <Setter Property="IsSynchronizedWithCurrentItem" Value="True"/>
-                        <Setter Property="Margin" Value="5"/>
-                        <Style.Triggers>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"
-                                        Value="0">
-                              <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-                              <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
-                              <Setter Property="ItemsPanel">
-                                 <Setter.Value>
-                                    <ItemsPanelTemplate>
-                                       <WrapPanel Style="{StaticResource Project_WrapPanel}"/>
-                                    </ItemsPanelTemplate>
-                                 </Setter.Value>
-                              </Setter>
-                           </DataTrigger>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"
-                                        Value="1">
-                              <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
-                              <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-                              <Setter Property="ItemsPanel">
-                                 <Setter.Value>
-                                    <ItemsPanelTemplate>
-                                       <WrapPanel Style="{StaticResource ProjectH_WrapPanel}"/>
-                                    </ItemsPanelTemplate>
-                                 </Setter.Value>
-                              </Setter>
-                           </DataTrigger>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"
-                                        Value="2">
-                              <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
-                              <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-                              <Setter Property="ItemsPanel">
-                                 <Setter.Value>
-                                    <ItemsPanelTemplate>
-                                       <StackPanel Style="{StaticResource EgtManageDialog_StackPanel}"/>
-                                    </ItemsPanelTemplate>
-                                 </Setter.Value>
-                              </Setter>
-                           </DataTrigger>
-                        </Style.Triggers>
-                     </Style>
-                  </ListBox.Style>
-               </ListBox>
-            </TabItem>
-            <TabItem Header="DATAGRID">
-               <DataGrid AutoGenerateColumns="False"
-                         IsReadOnly="True"
-                         HeadersVisibility="Column"
-                         AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
-                         AlternationCount="2"
-                         SelectionMode="Single"
-                         ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
-                         SelectedItem="{Binding ItemSelected}"
-                         RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
-                         CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
-                         Style="{StaticResource Optimizer_DataGrid}">
-                  <DataGrid.ColumnHeaderStyle>
-                     <Style TargetType="{x:Type DataGridColumnHeader}">
-                        <Setter Property="Background" Value="{StaticResource BeamWall_Teal}"/>
-                        <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-                        <Setter Property="BorderBrush" Value="{StaticResource BeamWall_Gray}"/>
-                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-                        <Setter Property="FontWeight" Value="Bold"/>
-                        <Setter Property="FontSize" Value="15"/>
-                        <Setter Property="Padding" Value="1"/>
-                        <Setter Property="BorderThickness" Value="0,0,1,1"/>
-                     </Style>
-                  </DataGrid.ColumnHeaderStyle>
-                  <DataGrid.Columns>
-                     <DataGridTemplateColumn Width="5*">
-                        <DataGridTemplateColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Name_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         Style="{StaticResource Name_TextBlock}"/>
-                           </DataTemplate>
-                        </DataGridTemplateColumn.HeaderTemplate>
-                        <DataGridTemplateColumn.CellTemplate>
-                           <DataTemplate>
-                              <Grid>
-                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="1*"/>
-                                 </Grid.ColumnDefinitions>
-                                 <Image Source="{Binding sIconSource}"
-                                        Style="{StaticResource Source_Image}"/>
-                                 <TextBlock Grid.Column="1"
-                                            Text="{Binding sName}"
-                                            Style="{StaticResource NameImage_TextBlock}"/>
-                              </Grid>
-                           </DataTemplate>
-                        </DataGridTemplateColumn.CellTemplate>
-                     </DataGridTemplateColumn>
-                     <DataGridTextColumn Binding="{Binding sLastModifyDate}"
-                                         Width="2*"
-                                         ElementStyle="{StaticResource DataGrid_TextBlock}">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.LastModify_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         Style="{StaticResource Name_TextBlock}"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                     </DataGridTextColumn>
-                     <DataGridTextColumn Binding="{Binding ghTypeItem}"
-                                         Width="1*"
-                                         ElementStyle="{StaticResource DataGrid_TextBlock}">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Type_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         Style="{StaticResource Name_TextBlock}"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                     </DataGridTextColumn>
-                     <DataGridTextColumn Binding="{Binding sDimension}"
-                                         Width="1*"
-                                         ElementStyle="{StaticResource DataGridR_TextBlock}">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Dimension_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         Style="{StaticResource Name_TextBlock}"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                     </DataGridTextColumn>
-                  </DataGrid.Columns>
-                  <DataGrid.InputBindings>
-                     <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding DataContext.DoubleClick_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OptimizerWindow}}}"/>
-                  </DataGrid.InputBindings>
-               </DataGrid>
-            </TabItem>
-         </TabControl>
-      </Grid>
-      <Grid Grid.Row="2" 
-            Style="{StaticResource AddRawPartWnd_Grid}">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <TextBlock Text="{Binding FileName_Msg}"
-                    Style="{StaticResource FileName_TextBlock}"/>
-         <TextBox Grid.Column="1"
-                  Text="{Binding sSaveFileName, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-                  Style="{StaticResource SaveFileName_TextBox}"/>
-         <ComboBox Grid.Column="2"
-                   ItemsSource="{Binding FilterList}"
-                   SelectedItem="{Binding SelFilter, Mode=OneWayToSource}"
-                   DisplayMemberPath="sNameExstension"
-                   Style="{StaticResource FilterList_ComboBox}"/>
-      </Grid>
-      <UniformGrid Grid.Row="3"  
-                   Rows="1"
-                   Style="{StaticResource Command_UniformGrid}">
-         <Button IsDefault="True"
-                 Content="OK"
-                 Command="{Binding Ok_Command}"
-                 Style="{StaticResource EgtManageDialogOK_HalfRound_Button}"/>
-         <Button Content="Cancel"
-                 Command="{Binding Cancel_Command}"
-                 Style="{StaticResource EgtManageDialogCancel_HalfRound_Button}"/>
-      </UniformGrid>
-   </Grid>
-</EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb

@@ -1,141 +0,0 @@
-Imports EgtWPFLib5
-Imports System.Windows.Forms
-Imports System.Windows.Input
-
-Public Class EgtManageFileDialogV
-
-#Region "FIELDS & PROPERTIES"
-
-   Private WithEvents m_EgtManageFileDialogVM As EgtManageFileDialogVM
-
-   Private Shadows DialogResult As DialogResult
-
-   ''' <summary>
-   ''' Stringa che specifica il titolo da mostrare
-   ''' </summary>
-   Public Overloads Property Title As String
-      Get
-         Return m_EgtManageFileDialogVM.sTitle
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sTitle = value
-      End Set
-   End Property
-
-   Public Property Filter As String
-      Get
-         Return m_EgtManageFileDialogVM.sFilter
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sFilter = value
-      End Set
-   End Property
-
-   Public Property InitialDirectory As String
-      Get
-         Return m_EgtManageFileDialogVM.sInitialDirectory
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sInitialDirectory = value
-      End Set
-   End Property
-
-   Public Property SafeFileName As String
-      Get
-         Return m_EgtManageFileDialogVM.sSaveFileName
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sSaveFileName = value
-      End Set
-   End Property
-
-   Public Property FileName As String
-      Get
-         Return m_EgtManageFileDialogVM.sFileName
-      End Get
-      Set(value As String)
-         m_EgtManageFileDialogVM.sFileName = value
-      End Set
-   End Property
-
-   Public Property FilterIndex As Integer
-      Get
-         Return m_EgtManageFileDialogVM.nFilterIndex
-      End Get
-      Set(value As Integer)
-         m_EgtManageFileDialogVM.nFilterIndex = value
-      End Set
-   End Property
-
-   Public Property Mode As Integer
-      Get
-         Return m_EgtManageFileDialogVM.nMode
-      End Get
-      Set(value As Integer)
-         m_EgtManageFileDialogVM.nMode = value
-      End Set
-   End Property
-
-   Public Property CheckFileExists As Boolean
-      Get
-         Return m_EgtManageFileDialogVM.bCheckFileExists
-      End Get
-      Set(value As Boolean)
-         m_EgtManageFileDialogVM.bCheckFileExists = value
-      End Set
-   End Property
-
-   Public Property ValidateNames As Boolean
-      Get
-         Return m_EgtManageFileDialogVM.bValidateNames
-      End Get
-      Set(value As Boolean)
-         m_EgtManageFileDialogVM.bValidateNames = value
-      End Set
-   End Property
-
-   Public Property OverwritePrompt As Boolean
-      Get
-         Return m_EgtManageFileDialogVM.bOverwritePrompt
-      End Get
-      Set(value As Boolean)
-         m_EgtManageFileDialogVM.bOverwritePrompt = value
-      End Set
-   End Property
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONTRUCTORS"
-
-   Sub New(Owner As System.Windows.Window, EgtManageFileDialogVM As EgtManageFileDialogVM)
-      InitializeComponent()
-      Me.DataContext = EgtManageFileDialogVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_EgtManageFileDialogVM = EgtManageFileDialogVM
-   End Sub
-
-#End Region
-
-#Region "EVENTS"
-
-   Private Sub CloseWindow(DialogResult As DialogResult) Handles m_EgtManageFileDialogVM.m_CloseWindow
-      Me.DialogResult = DialogResult
-      Me.Close()
-   End Sub
-
-#End Region
-
-#Region "METHODS"
-
-   Public Overloads Function ShowDialog() As DialogResult
-      MyBase.ShowDialog()
-      Return Me.DialogResult
-   End Function
-
-   Private Sub ListBoxItem_MouseDoubleClick(sender As Object, e As MouseButtonEventArgs)
-      m_EgtManageFileDialogVM.MouseDoubleClick()
-   End Sub
-
-#End Region    '  METHODS
-
-End Class

EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml

@@ -1,45 +0,0 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="EgtMessageBoxV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                                 Title="{Binding sTitle}"
-                                 SizeToContent="WidthAndHeight"
-                                 WindowStartupLocation="CenterOwner"
-                                 ShowInTaskbar="False"
-                                 Style="{StaticResource OptimizerWindow.Dialog}">
-
-   <Grid Style="{StaticResource EgtMessageBox_Grid}">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Grid Style="{StaticResource MessageBox_Grid}">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
-         <Image Source="{Binding sIconSource}"/>
-         <TextBlock Grid.Column="1"
-                    Text="{Binding sMessage}"
-                    Style="{StaticResource EgtMessageBox_TextBlock}"/>
-      </Grid>
-      <ItemsControl Grid.Row="1"
-                    ItemsSource="{Binding ButtonList}"
-                    Style="{StaticResource EgtMessageBox_ItemsControl}">
-         <ItemsControl.ItemsPanel>
-            <ItemsPanelTemplate>
-               <UniformGrid Rows="1"/>
-            </ItemsPanelTemplate>
-         </ItemsControl.ItemsPanel>
-         <ItemsControl.ItemTemplate>
-            <DataTemplate>
-               <Button IsDefault="{Binding bIsDefault}"
-                       Content="{Binding sMessage}"
-                       Command="{Binding Command_Command}"
-                       Style="{StaticResource EgtColorPicker_HalfRound_Button}"/>
-            </DataTemplate>
-         </ItemsControl.ItemTemplate>
-      </ItemsControl>
-   </Grid>
-</EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml.vb

@@ -1,109 +0,0 @@
-Imports EgtWPFLib5
-Imports System.Windows
-
-Public Class EgtMessageBoxV
-
-#Region "FIELDS & PROPERTIES"
-
-   Private WithEvents m_EgtMessageBoxVM As EgtMessageBoxVM
-
-   Private Shadows DialogResult As MessageBoxResult
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONTRUCTORS"
-
-   Sub New(Owner As Window, EgtMessageBoxVM As EgtMessageBoxVM)
-      ' This call is required by the designer.
-      InitializeComponent()
-      Me.DataContext = EgtMessageBoxVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_EgtMessageBoxVM = EgtMessageBoxVM
-   End Sub
-
-#End Region
-
-#Region "METHODS"
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String) As MessageBoxResult
-      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String) As MessageBoxResult
-      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
-   ''' <param name="Button">Valore che specifica quali bottoni mostrare</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String, Button As MessageBoxButton) As MessageBoxResult
-      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption, Button))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
-   ''' <param name="Button">Valore che specifica quali bottoni mostrare</param>
-   ''' <param name="Icon">Valore che specifica quale icona mostrare</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String, Button As MessageBoxButton, Icon As MessageBoxImage) As MessageBoxResult
-      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption, Button, Icon))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-   ''' <summary>
-   ''' Apre una EgtMessageBox con un titolo ed un messaggio che ritorna un risultato
-   ''' </summary>
-   ''' <param name="Owner">Finestra di appartenenza</param>
-   ''' <param name="sMessageBoxText">Stringa che specifica il messaggio da mostrare</param>
-   ''' <param name="sCaption">Stringa che specifica il titolo da mostrare</param>
-   ''' <param name="Button">Valore che specifica quali bottoni mostrare</param>
-   ''' <param name="Icon">Valore che specifica quale icona mostrare</param>
-   ''' <param name="DefaultResult">Valore che specifica il bottone di default</param>
-   ''' <returns>Valore che specifica quale bottone e' stato premuto dall'utente</returns>
-   Public Overloads Shared Function Show(Owner As Window, sMessageBoxText As String, sCaption As String, Button As MessageBoxButton, Icon As MessageBoxImage, DefaultResult As MessageBoxResult) As MessageBoxResult
-      Dim NewMessagebox As New EgtMessageBoxV(Owner, New EgtMessageBoxVM(sMessageBoxText, sCaption, Button, Icon, DefaultResult))
-      NewMessagebox.ShowDialog()
-      Return NewMessagebox.DialogResult
-   End Function
-
-#End Region    ' METHODS
-
-#Region "EVENTS"
-
-   Private Sub CloseWindow(DialogResult As MessageBoxResult) Handles m_EgtMessageBoxVM.m_CloseWindow
-      Me.DialogResult = DialogResult
-      Me.Close()
-   End Sub
-
-#End Region
-
-End Class

EgtBEAMWALL.Core/Lib/MachGroupM.vb

@@ -1,4 +1,8 @@
-Imports EgtUILib
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports System.Windows
+Imports EgtUILib
+Imports EgtWPFLib5
 
 Public Class MachGroupM
 
@@ -43,19 +47,17 @@ Public Class MachGroupM
    End Function
 
    Public Shared Function CreateMachGroup(nId As Integer, sName As String, sMachine As String) As MachGroupM
-      Dim NewMachGroupM As New MachGroupM With {
-         .m_Id = nId,
-         .m_Name = sName,
-         .m_Machine = sMachine
-      }
+      Dim NewMachGroupM As New MachGroupM
+      NewMachGroupM.m_Id = nId
+      NewMachGroupM.m_Name = sName
+      NewMachGroupM.m_Machine = sMachine
       Return NewMachGroupM
    End Function
 
    Public Shared Function CreateMachGroup(sName As String, sMachine As String) As MachGroupM
+      Dim NewMachGroupM As New MachGroupM
       ' Creo il nuovo gruppo di lavorazione con i dati ottenuti a seconda del caso in cui mi trovo
-      Dim NewMachGroupM As New MachGroupM With {
-         .m_Id = EgtAddMachGroup(sName, sMachine)
-      }
+      NewMachGroupM.m_Id = EgtAddMachGroup(sName, sMachine)
       If NewMachGroupM.m_Id = GDB_ID.NULL Then Return Nothing
       NewMachGroupM.m_Name = sName
       NewMachGroupM.m_Machine = sMachine

EgtBEAMWALL.Core/Lib/MachGroupPanelM.vb

@@ -1,4 +1,6 @@
-Imports System.Windows
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports System.Windows
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -83,17 +85,16 @@ Public Class MachGroupPanelM
    Public Shared Function CreateMachGroupPanel(IsMultiMachGroup As Boolean,
                                                MachineList As List(Of Machine), DefaultMachine As String,
                                                Optional sBaseName As String = "MachGroup_1") As MachGroupPanelM
+      Dim NewMachGroupPanelM As New MachGroupPanelM
+      NewMachGroupPanelM.m_IsMultiMachGroup = IsMultiMachGroup
       ' Assegno nome base
+      NewMachGroupPanelM.m_BaseName = sBaseName
       ' Recupero lista macchine
+      NewMachGroupPanelM.m_MachineList = MachineList
       ' Assegno macchina di default
+      NewMachGroupPanelM.m_DefaultMachine = DefaultMachine
       ' recupero i MachGroup
-      Dim NewMachGroupPanelM As New MachGroupPanelM With {
-         .m_IsMultiMachGroup = IsMultiMachGroup,
-         .m_BaseName = sBaseName,
-         .m_MachineList = MachineList,
-         .m_DefaultMachine = DefaultMachine,
-         .m_MachGroupMList = LoadMachGroups()
-      }
+      NewMachGroupPanelM.m_MachGroupMList = LoadMachGroups()
 
       Return NewMachGroupPanelM
    End Function
@@ -139,6 +140,34 @@ Public Class MachGroupPanelM
       Return New List(Of MachGroupM)(m_MachGroupMList)
    End Function
 
+   'Public Function InitMachGroupPanel(IsMultiMachGroup As Boolean,
+   '                               MachineList As List(Of Machine), DefaultMachine As String,
+   '                               Optional sBaseName As String = "MachGroup_1") As Boolean
+   '   m_IsMultiMachGroup = IsMultiMachGroup
+   '   ' se è a gruppo singolo, nascondo il panel
+   '   If Not m_IsMultiMachGroup Then SetMachGroupPanelVisibility(False)
+   '   ' Assegno nome base
+   '   m_BaseName = sBaseName
+   '   ' Recupero lista macchine
+   '   m_MachineList = MachineList
+   '   ' Assegno macchina di default
+   '   m_DefaultMachine = DefaultMachine
+   '   Return MachineList.Count > 0
+   'End Function
+
+   'Public Overridable Sub LoadMachGroupList()
+   '   ' Carico i gruppi di lavorazione nella lista
+   '   Dim nId = EgtGetFirstMachGroup()
+   '   While nId <> GDB_ID.NULL
+   '      Dim sName As String = String.Empty
+   '      Dim sMachine As String = String.Empty
+   '      EgtGetMachGroupName(nId, sName)
+   '      EgtGetMachGroupMachineName(nId, sMachine)
+   '      MachGroupMList.Add(New MachGroup(nId, sName, sMachine))
+   '      nId = EgtGetNextMachGroup(nId)
+   '   End While
+   'End Sub
+
    Public Overridable Function NewMachGroup() As MachGroupM
       ' Sistemazioni preliminari
       OnPreNewMachGroup()

EgtBEAMWALL.Core/Lib/MachGroupVM.vb

@@ -1,4 +1,8 @@
-Imports EgtWPFLib5
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports System.Windows
+Imports EgtUILib
+Imports EgtWPFLib5
 
 Public Class MachGroupVM
    Inherits VMBase

EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb

@@ -1,8 +1,10 @@
 Imports System.Collections.ObjectModel
 Imports System.Collections.Specialized
 Imports System.ComponentModel
+Imports System.IO
 Imports System.Windows
 Imports System.Windows.Input
+Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -211,11 +213,9 @@ Public Class NewMachGroupPanelVM
    Public Overridable Sub RemoveMachGroup()
       ' Calcolo indice del gruppo da cancellare
       Dim nSelectedMachGroupIndex As Integer = MachGroupVMList.IndexOf(SelectedMachGroup)
-      Dim m_MessageBoxResult As MessageBoxResult
       If MachGroupVMList.Count = 1 Then
          'chiedo conferma prima di resettare il gruppo di lavorazione
-         MessageBox.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
-         Select Case m_MessageBoxResult
+         Select Case MessageBox.Show("Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
             Case MessageBoxResult.Yes
                ' cancello il gruppo corrente e ne creo uno nuovo con lo stesso nome
                m_MachGroupPanelM.OnPreRemoveCurrMachGroup()
@@ -228,8 +228,7 @@ Public Class NewMachGroupPanelVM
          End Select
       Else
          'chiedo conferma prima di cancellare il gruppo di lavorazione
-         MessageBox.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question)
-         Select Case m_MessageBoxResult
+         Select Case MessageBox.Show("Eliminare?", "", MessageBoxButton.YesNo, MessageBoxImage.Question)
             Case MessageBoxResult.Yes
                ' cancello quello selezionato (ovvero il corrente)
                m_MachGroupPanelM.OnPreRemoveCurrMachGroup()
@@ -281,6 +280,7 @@ Public Class NewMachGroupPanelVM
 
    Protected Overridable Sub OnMachGroupVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
       Select Case e.PropertyName
+         'Case nameof(sender.sMATERIAL)
       End Select
    End Sub
 

EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb

@@ -1,5 +1,4 @@
 Imports System.Threading
-Imports System.Threading.Tasks
 Imports System.Windows.Threading
 
 Public Module LoadingWndHelper

EgtBEAMWALL.Core/LoadingWnd/LoadingWndV.xaml

@@ -2,7 +2,7 @@
                             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            Style="{StaticResource OnlyProd_EgtCustomWindow}"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
                             Height="200" Width="300" 
                             TitleBarHeight="0"
                             ResizeMode="NoResize" WindowStyle="None"
@@ -23,27 +23,34 @@
       </Grid.RowDefinitions>
       <TextBlock Grid.Row="1"
                  Text="{Binding TotText_Msg}"
-                 Style="{StaticResource MessageBox_TextBlock}"/>
+                 TextAlignment="Center"/>
       <TextBlock Grid.Row="2"
                  Text="{Binding StepText_Msg}"
-                 Visibility="{Binding StepText_Visibility}"
-                 Style="{StaticResource MessageBox_TextBlock}"/>
+                 TextAlignment="Center"
+                 Visibility="{Binding StepText_Visibility}"/>
       <Grid Grid.Row="3"
             Visibility="{Binding StepProgress_Visibility}">
          <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
             <RowDefinition Height="1*"/>
          </Grid.RowDefinitions>
-         <Grid Style="{StaticResource EgtManageDialog_Grid}"/>
+         <Grid Height="20"/>
          <ProgressBar Grid.Row="1"
-                      Value="{Binding StepProgress_Value}"
-                      Style="{StaticResource NestingRunningWndV_ProgressBar}"/>
+                   Minimum="0"
+                   Maximum="100"
+                   Value="{Binding StepProgress_Value}"
+                   Height="20"
+                   Margin="40,0,40,0"/>
       </Grid>
       <ProgressBar Grid.Row="5"
+                   Minimum="0"
+                   Maximum="100"
                    Value="{Binding TotProgress_Value}"
-                   Style="{StaticResource NestingRunningWndV_ProgressBar}"/>
+                   Height="20"
+                   Margin="40,0,40,0"/>
       <TextBlock Grid.Row="7"
                  Text="{Binding TotProgress_Msg}"
-                 Style="{StaticResource MessageBox_TextBlock}"/>
+                 TextAlignment="Center"/>
    </Grid>
+
 </EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/LoadingWnd/LoadingWndV.xaml.vb

@@ -1,5 +1,5 @@
-Imports System.Windows.Input
-Imports System.Windows
+Imports System.Windows
+Imports System.Windows.Input
 
 Public Class LoadingWndV
 

EgtBEAMWALL.Core/LoadingWnd/LoadingWndVM.vb

@@ -1,6 +1,9 @@
-Imports System.Windows
+Imports System.Timers
+Imports System.Windows
 Imports System.Windows.Input
 Imports System.Windows.Threading
+Imports EgtBEAMWALL.Core
+Imports EgtUILib
 Imports EgtWPFLib5
 
 Public Class LoadingWndVM
@@ -215,6 +218,12 @@ Public Class LoadingWndVM
    ''' Execute the Open.  This method is invoked by the OpenCommand.
    ''' </summary>
    Friend Sub Cancel()
+      '' chiedo conferma
+      'If MessageBox.Show("Are you sure you want to stop the nesting?", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then Return
+      '' fermo il nesting
+      'Map.refOptimizePanelVM.m_StopNesting = True
+      '' fermo timer e chiudo finestra
+      'CloseNesting()
    End Sub
 
 #End Region ' Cancel

EgtBEAMWALL.Core/MachGroupModel/BeamM.vb

@@ -0,0 +1,205 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public Class BeamM
+   Inherits PartM
+
+   Protected m_dOffset As Double
+   Public Property dOffset As Double
+      Get
+         Return m_dOffset
+      End Get
+      Set(value As Double)
+         m_dOffset = value
+      End Set
+   End Property
+
+   ' Id del grezzo
+   Protected m_nRawPartId As Integer = GDB_ID.NULL
+
+   '#Region "CONSTRUCTOR"
+
+   '   Sub New(nParentMachGroup As MyMachGroupM, nPartId As Integer, nRawPartId As Integer)
+   '      MyBase.New(nParentMachGroup, nPartId)
+   '      m_nRawPartId = nRawPartId
+   '   End Sub
+
+   '#End Region    ' CONSTRUCTOR
+
+#Region "CONSTRUCTORS"
+
+   Protected Sub New(nParentMachGroup As MyMachGroupM, nPartId As Integer)
+      MyBase.New(nParentMachGroup, nPartId)
+   End Sub
+
+   'Public Shared Function CreateNewBeam() As BeamM
+   '   Return New BeamM
+   'End Function
+
+   Public Shared Function CreateBeam(nParentMachGroup As MyMachGroupM, nPartId As Integer, nRawPartId As Integer) As BeamM
+      Dim NewBeamM As New BeamM(nParentMachGroup, nPartId)
+      NewBeamM.m_nRawPartId = nRawPartId
+      ' leggo info pezzo
+      EgtGetInfo(nPartId, BTL_PRT_PROJ, NewBeamM.m_nProjId)
+      EgtGetInfo(nPartId, BTL_PRT_PDN, NewBeamM.m_nPDN)
+      EgtGetInfo(nPartId, BTL_PRT_NAM, NewBeamM.m_sNAM)
+      EgtGetInfo(nPartId, BTL_PRT_L, NewBeamM.m_dBtlL)
+      EgtGetInfo(nPartId, BTL_PRT_W, NewBeamM.m_dBtlW)
+      EgtGetInfo(nPartId, BTL_PRT_H, NewBeamM.m_dBtlH)
+      EgtGetInfo(nPartId, BTL_PRT_CNT, NewBeamM.m_nCNT)
+      EgtGetInfo(nPartId, BTL_PRT_GROUP, NewBeamM.m_sGROUP)
+      EgtGetInfo(nPartId, BTL_PRT_MATERIAL, NewBeamM.m_sMATERIAL)
+      Dim nTemp As Integer = 0
+      If Not EgtGetInfo(nPartId, BTL_PRT_ROTATED, nTemp) Then
+         nTemp = 0
+      End If
+      NewBeamM.SetRotated(nTemp)
+      If Not EgtGetInfo(nPartId, BTL_PRT_INVERTED, nTemp) Then
+         nTemp = 0
+      End If
+      NewBeamM.SetInverted(nTemp)
+      ' leggo PosX
+      Dim sInfo As String = ""
+      Dim Index = 1
+      Dim sSplitInfo() As String = Nothing
+      Dim bFound As Boolean = False
+      While EgtGetInfo(NewBeamM.m_ParentMachGroup.Id, MGR_RPT_PART & Index, sInfo)
+         If Not String.IsNullOrWhiteSpace(sInfo) Then
+            sSplitInfo = sInfo.Split(","c)
+            If sSplitInfo(0) = nPartId Then
+               bFound = True
+               Exit While
+            End If
+         End If
+         Index += 1
+      End While
+      If bFound Then
+         StringToDouble(sSplitInfo(1), NewBeamM.m_dPOSX)
+      End If
+      ' leggo feature
+      NewBeamM.m_FeatureMList = LoadBTLFeatures(nPartId)
+      ' leggo calc error
+      Dim nErr As Integer = 0
+      Dim nRot As Integer = 0
+      Dim nFall As Integer = 0
+      Dim sMsg As String = ""
+      Dim bCalc As Boolean = False
+      bCalc = EgtGetInfo(nPartId, ITG_PROD_ERR, nErr)
+      EgtGetInfo(nPartId, ITG_PROD_ROT, nRot)
+      EgtGetInfo(nPartId, ITG_PROD_FALL, nFall)
+      EgtGetInfo(nPartId, ITG_PROD_MSG, sMsg)
+      If Not bCalc Then
+         NewBeamM.m_nCALC_State = CalcStates.NOTCALCULATED
+         NewBeamM.m_nCALC_ERR = -1
+         NewBeamM.m_nCALC_ROT = 0
+         NewBeamM.m_nCALC_FALL = 0
+         NewBeamM.m_sCALC_MSG = ""
+      Else
+         NewBeamM.m_nCALC_ERR = nErr
+         NewBeamM.m_nCALC_ROT = nRot
+         NewBeamM.m_nCALC_FALL = nFall
+         NewBeamM.m_sCALC_MSG = sMsg
+         If nErr = 0 Then
+            NewBeamM.m_nCALC_State = CalcStates.OK
+         ElseIf nErr > 1 Then
+            NewBeamM.m_nCALC_State = CalcStates.ERROR_
+         ElseIf nErr < 1 Then
+            NewBeamM.m_nCALC_State = CalcStates.NOTCALCULATED
+         End If
+      End If
+      EgtGetInfo(nPartId, ITG_PROD_TIME, NewBeamM.m_nCALC_TIME)
+      ReadMachGroupData(NewBeamM)
+      Return NewBeamM
+   End Function
+
+#End Region    ' CONSTRUCTORS
+
+#Region "X DataLayer"
+
+   Public Shared Function CreateBeamDL(nParentMachGroup As MyMachGroupM, nPartId As Integer, nRawPartId As Integer) As BeamM
+      Dim NewBeamM As New BeamM(nParentMachGroup, nPartId)
+      NewBeamM.m_nRawPartId = nRawPartId
+      '' leggo info pezzo
+      'EgtGetInfo(nPartId, BTL_PRT_PROJ, NewBeamM.nProjId)
+      'EgtGetInfo(nPartId, BTL_PRT_PDN, NewBeamM.nPDN)
+      'EgtGetInfo(nPartId, BTL_PRT_NAM, NewBeamM.sNAM)
+      'EgtGetInfo(nPartId, BTL_PRT_L, NewBeamM.dL)
+      'EgtGetInfo(nPartId, BTL_PRT_W, NewBeamM.dW)
+      'EgtGetInfo(nPartId, BTL_PRT_H, NewBeamM.dH)
+      'EgtGetInfo(nPartId, BTL_PRT_CNT, NewBeamM.nCNT)
+      'Dim nTemp As Integer = 0
+      'If Not EgtGetInfo(nPartId, BTL_PRT_ROTATED, nTemp) Then
+      '   nTemp = 0
+      'End If
+      'NewBeamM.SetRotated(nTemp)
+      'If Not EgtGetInfo(nPartId, BTL_PRT_INVERTED, nTemp) Then
+      '   nTemp = 0
+      'End If
+      'NewBeamM.SetInverted(nTemp)
+      '' leggo PosX
+      'Dim sInfo As String = ""
+      'Dim Index = 1
+      'Dim sSplitInfo() As String
+      'Dim bFound As Boolean = False
+      'While EgtGetInfo(NewBeamM.m_ParentMachGroup.Id, MGR_RPT_PART & Index, sInfo)
+      '   If Not String.IsNullOrWhiteSpace(sInfo) Then
+      '      sSplitInfo = sInfo.Split(","c)
+      '      If sSplitInfo(0) = nPartId Then
+      '         bFound = True
+      '         Exit While
+      '      End If
+      '   End If
+      '   Index += 1
+      'End While
+      'If bFound Then
+      '   StringToDouble(sSplitInfo(1), NewBeamM.dPOSX)
+      'End If
+      '' leggo feature
+      'NewBeamM.m_FeatureMList = LoadBTLFeatures(nPartId)
+      Return NewBeamM
+   End Function
+
+#End Region
+
+   Private Shared Function LoadBTLFeatures(nPartId As Integer) As List(Of BTLFeatureM)
+      Dim TempList As New List(Of BTLFeatureM)
+      ' Aggiungo outline
+      Dim nOutLayerId As Integer = EgtGetFirstNameInGroup(nPartId, OUTLINE)
+      Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutLayerId)
+      While nOutlineId <> GDB_ID.NULL
+         ' verifico che sia una feature
+         Dim nGRP As Integer
+         If EgtGetInfo(nOutlineId, BTL_FTR_GRP, nGRP) AndAlso Not EgtExistsInfo(nOutlineId, BTL_FTR_MAINID) Then
+            ' creo la feature
+            TempList.Add(BTLFeatureM.CreateBTLFeature(Nothing, nOutlineId))
+         End If
+         nOutlineId = EgtGetNext(nOutlineId)
+      End While
+      ' Aggiungo feature
+      Dim nProcessingId As Integer = EgtGetFirstNameInGroup(nPartId, PROCESSINGS)
+      Dim nFeatureId As Integer = EgtGetFirstInGroup(nProcessingId)
+      While nFeatureId <> GDB_ID.NULL
+         ' verifico che sia una feature
+         Dim nGRP As Integer
+         If EgtGetInfo(nFeatureId, BTL_FTR_GRP, nGRP) AndAlso Not EgtExistsInfo(nFeatureId, BTL_FTR_MAINID) Then
+            ' creo la feature
+            TempList.Add(BTLFeatureM.CreateBTLFeature(Nothing, nFeatureId))
+         End If
+         nFeatureId = EgtGetNext(nFeatureId)
+      End While
+      Return TempList
+   End Function
+
+   Public Sub UpdateOffset()
+      ' calcolo offset
+      Dim nBeamIndex As Integer = ParentMachGroup.PartMList.IndexOf(Me)
+      If nBeamIndex > 0 Then
+         m_dOffset = dPOSX - (ParentMachGroup.PartMList(nBeamIndex - 1).dPOSX + ParentMachGroup.PartMList(nBeamIndex - 1).dL)
+      Else
+         m_dOffset = dPOSX
+      End If
+   End Sub
+
+End Class

EgtBEAMWALL.Core/MachGroupModel/BeamMachGroupM.vb

@@ -0,0 +1,133 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public Class BeamMachGroupM
+   Inherits MyMachGroupM
+
+   Protected m_dStartCut As Double
+   Public Property dStartCut As Double
+      Get
+         Return m_dStartCut
+      End Get
+      Set(value As Double)
+         m_dStartCut = value
+      End Set
+   End Property
+
+#Region "CONSTRUCTORS"
+
+   Protected Sub New()
+   End Sub
+
+   Public Shared Function CreateNewBeamMachGroup() As MachGroupM
+      Return New MachGroupM
+   End Function
+
+   Public Shared Function CreateBeamMachGroup(nId As Integer, sName As String, sMachine As String) As MachGroupM
+      Dim NewMachGroupM As New BeamMachGroupM
+      NewMachGroupM.m_Id = nId
+      NewMachGroupM.m_Name = sName
+      NewMachGroupM.m_Machine = sMachine
+      ' NewMachGroupM.SetMachineType(MachineType.BEAM)
+      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARLEN, NewMachGroupM.m_dL)
+      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARHEIGHT, NewMachGroupM.m_dH)
+      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARWIDTH, NewMachGroupM.m_dW)
+      NewMachGroupM.m_dTotMat = NewMachGroupM.m_dL
+      NewMachGroupM.m_PartMList = LoadParts(NewMachGroupM)
+      For Each Part As BeamM In NewMachGroupM.m_PartMList
+         Part.UpdateOffset()
+         NewMachGroupM.m_dMatForPart += Part.dL
+      Next
+      ReadMachGroupData(NewMachGroupM)
+      Return NewMachGroupM
+   End Function
+
+   Public Shared Function CreateBeamMachGroup(sName As String, sMachine As String) As MachGroupM
+      Dim NewMachGroupM As New BeamMachGroupM
+      ' Creo il nuovo gruppo di lavorazione con i dati ottenuti a seconda del caso in cui mi trovo
+      NewMachGroupM.m_Id = EgtAddMachGroup(sName, sMachine)
+      If NewMachGroupM.m_Id = GDB_ID.NULL Then Return Nothing
+      NewMachGroupM.m_Name = sName
+      NewMachGroupM.m_Machine = sMachine
+      'NewMachGroupM.SetMachineType(MachineType.BEAM)
+      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARLEN, NewMachGroupM.m_dL)
+      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARHEIGHT, NewMachGroupM.m_dH)
+      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARWIDTH, NewMachGroupM.m_dW)
+      NewMachGroupM.m_dTotMat = NewMachGroupM.m_dL
+      For Each Part In NewMachGroupM.m_PartMList
+         NewMachGroupM.m_dMatForPart += Part.dL
+      Next
+      ReadMachGroupData(NewMachGroupM)
+      Return NewMachGroupM
+   End Function
+
+#End Region    ' CONSTRUCTORS
+
+#Region "X DataLayer"
+
+   Public Shared Function CreateBeamMachGroupDL(nId As Integer, sName As String, sMachine As String, PartMList As List(Of PartM)) As MachGroupM
+      Dim NewMachGroupM As New BeamMachGroupM
+      NewMachGroupM.m_Id = nId
+      NewMachGroupM.m_Name = sName
+      NewMachGroupM.m_Machine = sMachine
+      'NewMachGroupM.SetMachineType(MachineType.BEAM)
+      'EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARLEN, NewMachGroupM.m_dL)
+      'EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARHEIGHT, NewMachGroupM.m_dH)
+      'EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARWIDTH, NewMachGroupM.m_dW)
+      'NewMachGroupM.m_dTotMat = NewMachGroupM.m_dL
+      NewMachGroupM.m_PartMList = PartMList
+      Return NewMachGroupM
+   End Function
+
+#End Region
+
+   Private Shared Function LoadParts(NewBeamMachGroupM As BeamMachGroupM) As List(Of PartM)
+      Dim TempList As New List(Of PartM)
+      Dim nRawPartId As Integer = EgtGetFirstRawPart()
+      While nRawPartId <> GDB_ID.NULL
+         Dim nPartId As Integer = EgtGetFirstPartInRawPart(nRawPartId)
+         If nPartId <> GDB_ID.NULL Then
+            Dim NewBeam As BeamM = BeamM.CreateBeam(NewBeamMachGroupM, nPartId, nRawPartId)
+            TempList.Add(NewBeam)
+         End If
+         nRawPartId = EgtGetNextRawPart(nRawPartId)
+      End While
+      Return TempList
+   End Function
+
+   Public Overrides Sub RefreshPartList()
+      ' leggo StartCut da posizione primo pezzo
+      Dim sInfo As String = ""
+      Dim sSplitInfo() As String
+      Dim bFound As Boolean = False
+      EgtGetInfo(Id, MGR_RPT_PART & 1, sInfo)
+      If Not String.IsNullOrWhiteSpace(sInfo) Then
+         sSplitInfo = sInfo.Split(","c)
+         StringToDouble(sSplitInfo(1), m_dStartCut)
+      Else
+         m_dStartCut = 0
+      End If
+      ' aggiorno lista pezzi
+      RemoveAllParts()
+      Dim nRawPartId As Integer = EgtGetFirstRawPart()
+      While nRawPartId <> GDB_ID.NULL
+         Dim nPartId As Integer = EgtGetFirstPartInRawPart(nRawPartId)
+         If nPartId <> GDB_ID.NULL Then
+            Dim NewBeam As BeamM = BeamM.CreateBeam(Me, nPartId, nRawPartId)
+            AddPart(NewBeam)
+            NewBeam.UpdateOffset()
+         End If
+         nRawPartId = EgtGetNextRawPart(nRawPartId)
+      End While
+   End Sub
+
+   Public Overrides Sub RefreshGroupData()
+      EgtGetInfo(Id, MGR_RPT_BARLEN, dL)
+      EgtGetInfo(Id, MGR_RPT_BARHEIGHT, dH)
+      EgtGetInfo(Id, MGR_RPT_BARWIDTH, dW)
+      EgtGetInfo(Id, MGR_RPT_MATERIAL, sMATERIAL)
+   End Sub
+
+End Class

EgtBEAMWALL.Core/MachGroupModel/MyMachGroupM.vb

@@ -1,4 +1,8 @@
-Imports EgtUILib
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports System.Windows.Input
+Imports System.Windows.Media
+Imports EgtUILib
 Imports EgtWPFLib5
 
 Public Class MyMachGroupM
@@ -297,12 +301,11 @@ Public Class MyMachGroupM
    End Function
 
    Public Overloads Shared Function CreateMyMachGroup(Type As BWType, nId As Integer, sName As String, sMachine As String) As MachGroupM
-      Dim NewMachGroupM As New MyMachGroupM With {
-         .m_Id = nId,
-         .m_Name = sName,
-         .m_Machine = sMachine,
-         .m_nType = Type
-      }
+      Dim NewMachGroupM As New MyMachGroupM
+      NewMachGroupM.m_Id = nId
+      NewMachGroupM.m_Name = sName
+      NewMachGroupM.m_Machine = sMachine
+      NewMachGroupM.m_nType = Type
       If NewMachGroupM.m_nType = MachineType.BEAM Then
          EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARLEN, NewMachGroupM.m_dL)
          EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARHEIGHT, NewMachGroupM.m_dH)
@@ -330,9 +333,8 @@ Public Class MyMachGroupM
    End Function
 
    Public Overloads Shared Function CreateMyMachGroup(Type As BWType, sName As String, sMachine As String) As MachGroupM
-      Dim NewMachGroupM As New MyMachGroupM With {
-         .m_Id = EgtAddMachGroup(sName, sMachine)
-      }
+      Dim NewMachGroupM As New MyMachGroupM
+      NewMachGroupM.m_Id = EgtAddMachGroup(sName, sMachine)
       If NewMachGroupM.m_Id = GDB_ID.NULL Then Return Nothing
       NewMachGroupM.m_Name = sName
       NewMachGroupM.m_Machine = sMachine

EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb

@@ -1,4 +1,6 @@
-Imports EgtUILib
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtUILib
 Imports EgtWPFLib5
 
 Public Class MyMachGroupPanelM
@@ -11,17 +13,16 @@ Public Class MyMachGroupPanelM
 #Region "CONSTRUCTOR"
 
    Public Shared Function CreateMyMachGroupPanel(MachineList As List(Of Machine)) As MachGroupPanelM
+      Dim NewMyMachGroupPanelM As New MyMachGroupPanelM
+      NewMyMachGroupPanelM.m_IsMultiMachGroup = False
       ' Assegno nome base
+      NewMyMachGroupPanelM.m_BaseName = ""
       ' Recupero lista macchine
+      NewMyMachGroupPanelM.m_MachineList = MachineList
       ' Assegno macchina di default
-      Dim NewMyMachGroupPanelM As New MyMachGroupPanelM With {
-         .m_IsMultiMachGroup = False,
-         .m_BaseName = "",
-         .m_MachineList = MachineList,
-         .m_DefaultMachine = ""
-      }
+      NewMyMachGroupPanelM.m_DefaultMachine = ""
       ' aggiorno copie
-      UpdateAllDuplo()
+      UpdateDuplo()
       ' recupero i MachGroup
       NewMyMachGroupPanelM.m_MachGroupMList = LoadMyMachGroups(MachineList)
       Return NewMyMachGroupPanelM
@@ -88,6 +89,7 @@ Public Class MyMachGroupPanelM
       Return Nothing
    End Function
 
+
    ' funzione che restituisce solo i gruppi di lavorazione creati nel nesting 
    Public Shared Function UpdateFromNestingMyMachGroups(MachineList As List(Of Machine)) As List(Of MachGroupM)
       Dim TempList As New List(Of MachGroupM)
@@ -128,6 +130,7 @@ Public Class MyMachGroupPanelM
    End Function
 
    Public Overrides Function OnPreNewMachGroup() As Boolean
+      'EgtSetCurrentContext(Map.refSceneHostVM.MainScene.GetCtx())
       Return True
    End Function
 
@@ -138,6 +141,17 @@ Public Class MyMachGroupPanelM
       Dim sCurrMachName As String = String.Empty
       EgtGetCurrMachineName(sCurrMachName)
       WriteMainPrivateProfileString(S_MACH, K_CURRMACH, sCurrMachName)
+      '' leggo nome attrezzaggio di default
+      'Dim sDefaultSetUpName As String = String.Empty
+      'Dim sMachineIniPath As String = Map.refMainWindowVM.MainWindowM.sMachinesRoot & "\" & sCurrMachName & "\" & sCurrMachName & ".ini"
+      'EgtUILib.GetPrivateProfileString(S_SETUP, K_DEFAULT, "", sDefaultSetUpName, sMachineIniPath)
+      '' se è attiva l'opzione, rendo corrente l'attrezzaggio di default
+      'If Not String.IsNullOrEmpty(sDefaultSetUpName) Then
+      '   If Not EgtImportSetup(sDefaultSetUpName) Then
+      '      EgtOutLog("Error loading default setup " & sDefaultSetUpName)
+      '      MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 9) & " " & sDefaultSetUpName, EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Exclamation)
+      '   End If
+      'End If
       Return True
    End Function
 
@@ -153,7 +167,7 @@ Public Class MyMachGroupPanelM
    End Function
 
    ' funzione che fa l'update di tutte le copie dei pezzi modificati
-   Public Shared Sub UpdateAllDuplo()
+   Public Shared Sub UpdateDuplo()
       ' verifico tipo di progetto
       Dim nBtlInfoId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
       Dim nBWType As Integer = 0
@@ -164,7 +178,161 @@ Public Class MyMachGroupPanelM
       While nPartId <> GDB_ID.NULL
          Dim bIsModified As Boolean = False
          If EgtDuploGetModified(nPartId, bIsModified) AndAlso bIsModified Then
-            UpdateDuplo(nPartId)
+            ' verifico se c'é PRID sugli outline
+            Dim nPRId As Integer = 1
+            Dim nOutlineLayer As Integer = EgtGetFirstNameInGroup(nPartId, OUTLINE)
+            If nOutlineLayer <> GDB_ID.NULL Then
+               Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutlineLayer)
+               While nOutlineId <> GDB_ID.NULL
+                  ' verifico che sia feature
+                  If EgtExistsInfo(nOutlineId, MGR_FTR_PRC) Then
+                     Dim nCurrPrId As Integer = GDB_ID.NULL
+                     If EgtGetInfo(nOutlineId, MGR_FTR_PRID, nCurrPrId) AndAlso nCurrPrId <> GDB_ID.NULL Then
+                        If nCurrPrId < nPRId Then
+                           EgtSetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
+                           nPRId += 1
+                        End If
+                        nPRId = Math.Max(nPRId - 1, nCurrPrId) + 1
+                        nOutlineId = EgtGetNext(nOutlineId)
+                        Continue While
+                     Else
+                        EgtSetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
+                        nPRId += 1
+                     End If
+                  End If
+                  nOutlineId = EgtGetNext(nOutlineId)
+               End While
+            End If
+            bTotIsModified = True
+            Dim DuploList As New List(Of Integer)
+            EgtDuploList(nPartId, DuploList)
+            Dim DuploArray() As Integer
+            Dim RotArray(DuploList.Count) As Integer
+            Dim FlipArray(DuploList.Count) As Integer
+            Dim QArray(DuploList.Count) As Dictionary(Of String, Dictionary(Of String, String))
+            DuploArray = DuploList.ToArray()
+            ' recupero ROT (gradi) e FLIP (0/1) per non perderli
+            For Duploindex = 0 To DuploArray.Length - 1
+               RotArray(Duploindex) = 0
+               EgtGetInfo(DuploArray(Duploindex), MGR_PRT_ROT, RotArray(Duploindex))
+               FlipArray(Duploindex) = 0
+               EgtGetInfo(DuploArray(Duploindex), MGR_PRT_FLIP, FlipArray(Duploindex))
+               If FlipArray(Duploindex) <> 0 Then FlipArray(Duploindex) = 180
+               If nBWType = BWType.WALL Then
+                  ' salvo parametri Q
+                  QArray(Duploindex) = New Dictionary(Of String, Dictionary(Of String, String))
+                  ' ciclo sugli outline
+                  nOutlineLayer = EgtGetFirstNameInGroup(DuploArray(Duploindex), OUTLINE)
+                  If nOutlineLayer <> GDB_ID.NULL Then
+                     Dim nGlobPRId As Integer = 1
+                     Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutlineLayer)
+                     While nOutlineId <> GDB_ID.NULL
+                        ' verifico che sia feature
+                        Dim nPRC As Integer
+                        If EgtGetInfo(nOutlineId, MGR_FTR_PRC, nPRC) Then
+                           nPRId = 0
+                           If EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId) Then
+                              If nPRId < nGlobPRId Then
+                                 EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
+                                 nPRId = nGlobPRId
+                                 nGlobPRId += 1
+                              End If
+                              nGlobPRId = Math.Max(nGlobPRId - 1, nPRId) + 1
+                           Else
+                              EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
+                              nPRId = nGlobPRId
+                              nGlobPRId += 1
+                           End If
+                           Dim sKey As String = nPRId & "." & nPRC
+                           QArray(Duploindex).Add(sKey, New Dictionary(Of String, String))
+                           For QIndex = 1 To 10
+                              Dim QKey As String = "Q" & QIndex.ToString("D2")
+                              Dim QValue As Integer = 0
+                              If EgtGetInfo(nOutlineId, QKey, QValue) Then
+                                 QArray(Duploindex)(sKey).Add(QKey, QValue)
+                              End If
+                           Next
+                        End If
+                        nOutlineId = EgtGetNext(nOutlineId)
+                     End While
+                  End If
+                  ' ciclo sulle feature
+                  Dim nFeatureLayer As Integer = EgtGetFirstNameInGroup(DuploArray(Duploindex), PROCESSINGS)
+                  If nFeatureLayer <> GDB_ID.NULL Then
+                     Dim nFeatureId As Integer = EgtGetFirstInGroup(nFeatureLayer)
+                     While nFeatureId <> GDB_ID.NULL
+                        ' verifico che sia feature
+                        Dim nPRC As Integer
+                        If EgtGetInfo(nFeatureId, MGR_FTR_PRC, nPRC) Then
+                           nPRId = 0
+                           EgtGetInfo(nFeatureId, MGR_FTR_PRID, nPRId)
+                           Dim sKey As String = nPRId & "." & nPRC
+                           QArray(Duploindex).Add(sKey, New Dictionary(Of String, String))
+                           For QIndex = 1 To 10
+                              Dim QKey As String = "Q" & QIndex.ToString("D2")
+                              Dim QValue As Integer = 0
+                              If EgtGetInfo(nFeatureId, QKey, QValue) Then
+                                 QArray(Duploindex)(sKey).Add(QKey, QValue)
+                              End If
+                           Next
+                        End If
+                        nFeatureId = EgtGetNext(nFeatureId)
+                     End While
+                  End If
+               End If
+            Next
+            ' aggiornamento dei Duplo
+            EgtDuploUpdate(nPartId)
+            ' ripristino i valori di ROT e FLIP
+            For Duploindex = 0 To DuploArray.Length - 1
+               ' ripristino info rot e flip
+               EgtSetInfo(DuploArray(Duploindex), MGR_PRT_ROT, RotArray(Duploindex))
+               EgtSetInfo(DuploArray(Duploindex), MGR_PRT_FLIP, FlipArray(Duploindex))
+               If nBWType = BWType.WALL Then
+                  ' ciclo sugli outline
+                  nOutlineLayer = EgtGetFirstNameInGroup(DuploArray(Duploindex), OUTLINE)
+                  If nOutlineLayer <> GDB_ID.NULL Then
+                     Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutlineLayer)
+                     While nOutlineId <> GDB_ID.NULL
+                        ' verifico che sia feature
+                        Dim nPRC As Integer
+                        If EgtGetInfo(nOutlineId, MGR_FTR_PRC, nPRC) Then
+                           nPRId = 0
+                           EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
+                           Dim sKey As String = nPRId & "." & nPRC
+                           ' ripristino parametri Q
+                           If QArray(Duploindex).ContainsKey(sKey) Then
+                              For Each QPar In QArray(Duploindex)(sKey)
+                                 EgtSetInfo(nOutlineId, QPar.Key, QPar.Value)
+                              Next
+                           End If
+                        End If
+                        nOutlineId = EgtGetNext(nOutlineId)
+                     End While
+                  End If
+                  ' ciclo sulle feature
+                  Dim nFeatureLayer As Integer = EgtGetFirstNameInGroup(DuploArray(Duploindex), PROCESSINGS)
+                  If nFeatureLayer <> GDB_ID.NULL Then
+                     Dim nFeatureId As Integer = EgtGetFirstInGroup(nFeatureLayer)
+                     While nFeatureId <> GDB_ID.NULL
+                        ' verifico che sia feature
+                        Dim nPRC As Integer
+                        If EgtGetInfo(nFeatureId, MGR_FTR_PRC, nPRC) Then
+                           nPRId = 0
+                           EgtGetInfo(nFeatureId, MGR_FTR_PRID, nPRId)
+                           Dim sKey As String = nPRId & "." & nPRC
+                           ' ripristino parametri Q
+                           If QArray(Duploindex).ContainsKey(sKey) Then
+                              For Each QPar In QArray(Duploindex)(sKey)
+                                 EgtSetInfo(nFeatureId, QPar.Key, QPar.Value)
+                              Next
+                           End If
+                        End If
+                        nFeatureId = EgtGetNext(nFeatureId)
+                     End While
+                  End If
+               End If
+            Next
          End If
          nPartId = EgtGetNextPart(nPartId)
       End While
@@ -175,193 +343,6 @@ Public Class MyMachGroupPanelM
       End If
    End Sub
 
-   Public Shared Sub UpdateDuplo(nPartId As Integer)
-      ' verifico tipo di progetto
-      Dim nBtlInfoId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
-      Dim nBWType As Integer = 0
-      EgtGetInfo(nBtlInfoId, BTL_GEN_PROJTYPE, nBWType)
-      ' ciclo sui pezzi
-      Dim bTotIsModified As Boolean = False
-      Dim bIsModified As Boolean = False
-      ' verifico se c'é PRID sugli outline
-      Dim nPRId As Integer = 1
-      Dim nOutlineLayer As Integer = EgtGetFirstNameInGroup(nPartId, OUTLINE)
-      If nOutlineLayer <> GDB_ID.NULL Then
-         Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutlineLayer)
-         While nOutlineId <> GDB_ID.NULL
-            ' verifico che sia feature
-            If EgtExistsInfo(nOutlineId, MGR_FTR_PRC) Then
-               Dim nCurrPrId As Integer = GDB_ID.NULL
-               If EgtGetInfo(nOutlineId, MGR_FTR_PRID, nCurrPrId) AndAlso nCurrPrId <> GDB_ID.NULL Then
-                  If nCurrPrId < nPRId Then
-                     EgtSetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
-                     nPRId += 1
-                  End If
-                  nPRId = Math.Max(nPRId - 1, nCurrPrId) + 1
-                  nOutlineId = EgtGetNext(nOutlineId)
-                  Continue While
-               Else
-                  EgtSetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
-                  nPRId += 1
-               End If
-            End If
-            nOutlineId = EgtGetNext(nOutlineId)
-         End While
-      End If
-      bTotIsModified = True
-      Dim DuploList As New List(Of Integer)
-      EgtDuploList(nPartId, DuploList)
-      Dim DuploArray() As Integer
-      Dim RotArray(DuploList.Count) As Integer
-      Dim FlipArray(DuploList.Count) As Integer
-      Dim QArray(DuploList.Count) As Dictionary(Of String, Dictionary(Of String, String))
-      DuploArray = DuploList.ToArray()
-      ' recupero ROT (gradi) e FLIP (0/1) per non perderli
-      For Duploindex = 0 To DuploArray.Length - 1
-         RotArray(Duploindex) = 0
-         EgtGetInfo(DuploArray(Duploindex), MGR_PRT_ROT, RotArray(Duploindex))
-         FlipArray(Duploindex) = 0
-         EgtGetInfo(DuploArray(Duploindex), MGR_PRT_FLIP, FlipArray(Duploindex))
-         If FlipArray(Duploindex) <> 0 Then FlipArray(Duploindex) = 180
-         If nBWType = BWType.WALL Then
-            ' salvo parametri Q
-            QArray(Duploindex) = New Dictionary(Of String, Dictionary(Of String, String))
-            ' ciclo sugli outline
-            nOutlineLayer = EgtGetFirstNameInGroup(DuploArray(Duploindex), OUTLINE)
-            If nOutlineLayer <> GDB_ID.NULL Then
-               Dim nGlobPRId As Integer = 1
-               Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutlineLayer)
-               While nOutlineId <> GDB_ID.NULL
-                  ' verifico che sia feature
-                  Dim nPRC As Integer
-                  If EgtGetInfo(nOutlineId, MGR_FTR_PRC, nPRC) Then
-                     nPRId = 0
-                     If EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId) Then
-                        If nPRId < nGlobPRId Then
-                           EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
-                           nPRId = nGlobPRId
-                           nGlobPRId += 1
-                        End If
-                        nGlobPRId = Math.Max(nGlobPRId - 1, nPRId) + 1
-                     Else
-                        EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
-                        nPRId = nGlobPRId
-                        nGlobPRId += 1
-                     End If
-                     Dim sKey As String = nPRId & "." & nPRC
-                     QArray(Duploindex).Add(sKey, New Dictionary(Of String, String))
-                     For QIndex = 1 To 10
-                        Dim QKey As String = "Q" & QIndex.ToString("D2")
-                        Dim QValue As Integer = 0
-                        If EgtGetInfo(nOutlineId, QKey, QValue) Then
-                           QArray(Duploindex)(sKey).Add(QKey, QValue)
-                        End If
-                     Next
-                  End If
-                  nOutlineId = EgtGetNext(nOutlineId)
-               End While
-            End If
-            ' ciclo sulle feature
-            Dim nFeatureLayer As Integer = EgtGetFirstNameInGroup(DuploArray(Duploindex), PROCESSINGS)
-            If nFeatureLayer <> GDB_ID.NULL Then
-               Dim nFeatureId As Integer = EgtGetFirstInGroup(nFeatureLayer)
-               While nFeatureId <> GDB_ID.NULL
-                  ' verifico che sia feature
-                  Dim nPRC As Integer
-                  If EgtGetInfo(nFeatureId, MGR_FTR_PRC, nPRC) Then
-                     nPRId = 0
-                     EgtGetInfo(nFeatureId, MGR_FTR_PRID, nPRId)
-                     Dim sKey As String = nPRId & "." & nPRC
-                     QArray(Duploindex).Add(sKey, New Dictionary(Of String, String))
-                     For QIndex = 1 To 10
-                        Dim QKey As String = "Q" & QIndex.ToString("D2")
-                        Dim QValue As Integer = 0
-                        If EgtGetInfo(nFeatureId, QKey, QValue) Then
-                           QArray(Duploindex)(sKey).Add(QKey, QValue)
-                        End If
-                     Next
-                  End If
-                  nFeatureId = EgtGetNext(nFeatureId)
-               End While
-            End If
-         End If
-      Next
-      ' aggiornamento dei Duplo
-      EgtDuploUpdate(nPartId)
-      ' ripristino i valori di ROT e FLIP
-      For Duploindex = 0 To DuploArray.Length - 1
-         ' ripristino info rot e flip
-         EgtSetInfo(DuploArray(Duploindex), MGR_PRT_ROT, RotArray(Duploindex))
-         EgtSetInfo(DuploArray(Duploindex), MGR_PRT_FLIP, FlipArray(Duploindex))
-         If nBWType = BWType.WALL Then
-            ' ciclo sugli outline
-            nOutlineLayer = EgtGetFirstNameInGroup(DuploArray(Duploindex), OUTLINE)
-            If nOutlineLayer <> GDB_ID.NULL Then
-               Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutlineLayer)
-               While nOutlineId <> GDB_ID.NULL
-                  ' verifico che sia feature
-                  Dim nPRC As Integer
-                  If EgtGetInfo(nOutlineId, MGR_FTR_PRC, nPRC) Then
-                     nPRId = 0
-                     EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
-                     Dim sKey As String = nPRId & "." & nPRC
-                     ' ripristino parametri Q
-                     If QArray(Duploindex).ContainsKey(sKey) Then
-                        For Each QPar In QArray(Duploindex)(sKey)
-                           EgtSetInfo(nOutlineId, QPar.Key, QPar.Value)
-                        Next
-                     End If
-                  End If
-                  nOutlineId = EgtGetNext(nOutlineId)
-               End While
-            End If
-            ' ciclo sulle feature
-            Dim nFeatureLayer As Integer = EgtGetFirstNameInGroup(DuploArray(Duploindex), PROCESSINGS)
-            If nFeatureLayer <> GDB_ID.NULL Then
-               Dim nFeatureId As Integer = EgtGetFirstInGroup(nFeatureLayer)
-               While nFeatureId <> GDB_ID.NULL
-                  ' verifico che sia feature
-                  Dim nPRC As Integer
-                  If EgtGetInfo(nFeatureId, MGR_FTR_PRC, nPRC) Then
-                     nPRId = 0
-                     EgtGetInfo(nFeatureId, MGR_FTR_PRID, nPRId)
-                     Dim sKey As String = nPRId & "." & nPRC
-                     ' ripristino parametri Q
-                     If QArray(Duploindex).ContainsKey(sKey) Then
-                        For Each QPar In QArray(Duploindex)(sKey)
-                           EgtSetInfo(nFeatureId, QPar.Key, QPar.Value)
-                        Next
-                     End If
-                  End If
-                  nFeatureId = EgtGetNext(nFeatureId)
-               End While
-            End If
-         End If
-      Next
-   End Sub
-
-   Public Shared Sub SetDuploModified(nPartId As Integer)
-      Dim nDuploCount As Integer = 0
-      EgtDuploCount(nPartId, nDuploCount)
-      If nDuploCount > 0 Then
-         ' segno modificato e aggiorno duplo
-         EgtDuploSetModified(nPartId)
-         UpdateDuplo(nPartId)
-         ' aggiorno grafica duplo
-         Dim DuploIdList As New List(Of Integer)
-         EgtDuploList(nPartId, DuploIdList)
-         Dim DuploList As List(Of MachGroupVM) = CoreMap.refMachGroupPanelVM.MachGroupVMList.Where(Function(x) tt(x, DuploIdList)).ToList()
-         For Each CurrMachGroup As MyMachGroupVM In DuploList
-            CurrMachGroup.RefreshMachGroup()
-         Next
-      End If
-   End Sub
-
-   Private Shared Function tt(x As MachGroupVM, DuploIdList As List(Of Integer)) As Boolean
-      Dim TempMyMachGroupVM As MyMachGroupVM = DirectCast(x, MyMachGroupVM)
-      Return TempMyMachGroupVM.PartVMList.Any(Function(y) DuploIdList.Contains(y.nPartId))
-   End Function
-
    Class DuploFeature
       ' Id geometrico della feature
       Friend nFeatureId As Integer
@@ -401,6 +382,20 @@ Public Class MyMachGroupPanelM
                      End If
                   End While
                   ToRedrawMachGroupList.Add(nMachGroupId)
+
+
+
+                  '' elimino vecchio grezzo ed eseguo script creazione nuovo
+                  'Dim nRawId As Integer = EgtGetFirstRawPart()
+                  'While nRawId <> GDB_ID.NULL
+                  '   EgtRemovePartFromRawPart(EgtGetFirstPartInRawPart(nRawId))
+                  '   EgtRemoveRawPart(nRawId)
+                  '   nRawId = EgtGetFirstRawPart()
+                  'End While
+                  'If Not ExecBeam(Map.refMainWindowVM.MainWindowM.sTempDir, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False) Then Return False
+
+
+
                   ' lo setto come corrente
                   EgtSetCurrMachGroup(nMachGroupId)
                   ' elimino pezzo copia
@@ -451,6 +446,15 @@ Public Class MyMachGroupPanelM
          Return EgtGetParent(nSwapItem)
       End If
       Return GDB_ID.NULL
+
+
+
+      'Dim nRawId As Integer = GDB_ID.NULL
+      'If EgtGetInfo(nDuploId, GDB_SI_LIST, nRawId) AndAlso nRawId > 0 Then
+      '   Return nRawId
+      'Else
+      '   Return GDB_ID.NULL
+      'End If
    End Function
 
 #End Region    ' METHODS

EgtBEAMWALL.Core/MachGroupModel/PartM.vb

@@ -1,4 +1,8 @@
-Imports EgtUILib
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports System.Windows.Input
+Imports System.Windows.Media
+Imports EgtUILib
 Imports EgtWPFLib5
 
 Public Class PartM
@@ -295,6 +299,7 @@ Public Class PartM
          Else
             Return m_dPOSY
          End If
+         'Return m_dPOSY
       End Get
       Set(value As Double)
          m_dPOSY = value
@@ -463,10 +468,9 @@ Public Class PartM
    End Sub
 
    Public Shared Function CreatePart(Type As BWType, nParentMachGroup As MyMachGroupM, nPartId As Integer, nRawPartId As Integer) As PartM
-      Dim NewPartM As New PartM(nParentMachGroup, nPartId) With {
-         .m_nType = Type,
-         .m_nRawPartId = nRawPartId
-      }
+      Dim NewPartM As New PartM(nParentMachGroup, nPartId)
+      NewPartM.m_nType = Type
+      NewPartM.m_nRawPartId = nRawPartId
       ' leggo info pezzo
       EgtGetInfo(nPartId, BTL_PRT_PROJ, NewPartM.m_nProjId)
       EgtGetInfo(nPartId, BTL_PRT_PDN, NewPartM.m_nPDN)
@@ -478,8 +482,6 @@ Public Class PartM
       EgtGetInfo(nPartId, BTL_PRT_GROUP, NewPartM.m_sGROUP)
       EgtGetInfo(nPartId, BTL_PRT_STOREY, NewPartM.m_sSTOREY)
       EgtGetInfo(nPartId, BTL_PRT_MATERIAL, NewPartM.m_sMATERIAL)
-      EgtGetInfo(nPartId, MGR_PRT_ROT, NewPartM.m_dROT)
-      EgtGetInfo(nPartId, MGR_PRT_FLIP, NewPartM.m_nFLIP)
       Dim nTemp As Integer = 0
       If Not EgtGetInfo(nPartId, BTL_PRT_ROTATED, nTemp) Then
          nTemp = 0
@@ -512,6 +514,8 @@ Public Class PartM
          ' leggo PosX, PosY, Rot e Flip
          EgtGetInfo(nPartId, MGR_PRT_POSX, NewPartM.m_dPOSX)
          EgtGetInfo(nPartId, MGR_PRT_POSY, NewPartM.m_dPOSY)
+         EgtGetInfo(nPartId, MGR_PRT_ROT, NewPartM.m_dROT)
+         EgtGetInfo(nPartId, MGR_PRT_FLIP, NewPartM.m_nFLIP)
       End If
       ' leggo volume 
       If Not EgtGetInfo(nPartId, BTL_PRT_VOLUME, NewPartM.dVolume) Then
@@ -635,10 +639,6 @@ Public Class PartM
       Return New List(Of BTLFeatureM)(m_FeatureMList)
    End Function
 
-   Public Sub RefreshBTLFeatures()
-      m_FeatureMList = LoadBTLFeatures(Me, nPartId)
-   End Sub
-
 #End Region    ' Features
 
 #End Region    ' METHODS

EgtBEAMWALL.Core/MachGroupModel/WallM.vb

@@ -0,0 +1,110 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public Class WallM
+   Inherits PartM
+
+   Protected m_dPOSY As Double
+   Public Property dPOSY As Double
+      Get
+         Return m_dPOSY
+      End Get
+      Set(value As Double)
+         m_dPOSY = value
+      End Set
+   End Property
+
+   Protected m_dROT As Double
+   Public Property dROT As Double
+      Get
+         Return m_dROT
+      End Get
+      Set(value As Double)
+         m_dROT = value
+      End Set
+   End Property
+
+   Protected m_bFLIP As Boolean
+   Public Property bFLIP As Boolean
+      Get
+         Return m_bFLIP
+      End Get
+      Set(value As Boolean)
+         m_bFLIP = value
+      End Set
+   End Property
+
+#Region "CONSTRUCTOR"
+
+   Protected Sub New(nParentMachGroup As MyMachGroupM, nPartId As Integer)
+      MyBase.New(nParentMachGroup, nPartId)
+   End Sub
+
+   Public Shared Function CreateWall(nParentMachGroup As MyMachGroupM, nPartId As Integer, nRawPartId As Integer) As WallM
+      Dim NewWallM As New WallM(nParentMachGroup, nPartId)
+      ' leggo info pezzo
+      EgtGetInfo(nPartId, BTL_PRT_PROJ, NewWallM.m_nProjId)
+      EgtGetInfo(nPartId, BTL_PRT_PDN, NewWallM.m_nPDN)
+      EgtGetInfo(nPartId, BTL_PRT_NAM, NewWallM.m_sNAM)
+      EgtGetInfo(nPartId, BTL_PRT_L, NewWallM.m_dBtlL)
+      EgtGetInfo(nPartId, BTL_PRT_W, NewWallM.m_dBtlW)
+      EgtGetInfo(nPartId, BTL_PRT_H, NewWallM.m_dBtlH)
+      EgtGetInfo(nPartId, BTL_PRT_CNT, NewWallM.m_nCNT)
+      Dim nTemp As Integer = 0
+      If Not EgtGetInfo(nPartId, BTL_PRT_ROTATED, nTemp) Then
+         nTemp = 0
+      End If
+      NewWallM.SetRotated(nTemp)
+      If Not EgtGetInfo(nPartId, BTL_PRT_INVERTED, nTemp) Then
+         nTemp = 0
+      End If
+      NewWallM.SetInverted(nTemp)
+      ' leggo PosX, PosY, Rot e Flip
+      EgtGetInfo(nPartId, MGR_PRT_POSX, NewWallM.m_dPOSX)
+      EgtGetInfo(nPartId, MGR_PRT_POSY, NewWallM.m_dPOSY)
+      EgtGetInfo(nPartId, MGR_PRT_ROT, NewWallM.m_dROT)
+      EgtGetInfo(nPartId, MGR_PRT_FLIP, NewWallM.m_bFLIP)
+      ' leggo feature
+      NewWallM.m_FeatureMList = LoadBTLFeatures(nPartId)
+      ReadMachGroupData(NewWallM)
+      Return NewWallM
+   End Function
+
+#End Region    ' CONSTRUCTOR
+
+#Region "METHODS"
+
+   Private Shared Function LoadBTLFeatures(nPartId As Integer) As List(Of BTLFeatureM)
+      Dim TempList As New List(Of BTLFeatureM)
+      ' Aggiungo outline
+      Dim nOutLayerId As Integer = EgtGetFirstNameInGroup(nPartId, OUTLINE)
+      Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutLayerId)
+      While nOutlineId <> GDB_ID.NULL
+         ' verifico che sia una feature
+         Dim nGRP As Integer
+         If EgtGetInfo(nOutlineId, BTL_FTR_GRP, nGRP) AndAlso Not EgtExistsInfo(nOutlineId, BTL_FTR_MAINID) Then
+            ' creo la feature
+            TempList.Add(BTLFeatureM.CreateBTLFeature(Nothing, nOutlineId))
+         End If
+         nOutlineId = EgtGetNext(nOutlineId)
+      End While
+      ' Aggiungo feature
+      Dim nProcessingId As Integer = EgtGetFirstNameInGroup(nPartId, PROCESSINGS)
+      Dim nFeatureId As Integer = EgtGetFirstInGroup(nProcessingId)
+      While nFeatureId <> GDB_ID.NULL
+         ' verifico che sia una feature
+         Dim nGRP As Integer
+         If EgtGetInfo(nFeatureId, BTL_FTR_GRP, nGRP) AndAlso Not EgtExistsInfo(nFeatureId, BTL_FTR_MAINID) Then
+            ' creo la feature
+            TempList.Add(BTLFeatureM.CreateBTLFeature(Nothing, nFeatureId))
+         End If
+         nFeatureId = EgtGetNext(nFeatureId)
+      End While
+      Return TempList
+   End Function
+
+#End Region    ' METHODS
+
+End Class

EgtBEAMWALL.Core/MachGroupModel/WallMachGroupM.vb

@@ -0,0 +1,103 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public Class WallMachGroupM
+   Inherits MyMachGroupM
+
+   Protected m_nRawPartId As Integer = GDB_ID.NULL
+   Public ReadOnly Property nRawPartId As Integer
+      Get
+         Return m_nRawPartId
+      End Get
+   End Property
+
+#Region "CONSTRUCTORS"
+
+   Protected Sub New()
+   End Sub
+
+   Public Shared Function CreateNewWallMachGroup() As MachGroupM
+      Return New MachGroupM
+   End Function
+
+   Public Shared Function CreateWallMachGroup(nId As Integer, sName As String, sMachine As String) As MachGroupM
+      Dim NewMachGroupM As New WallMachGroupM
+      NewMachGroupM.m_Id = nId
+      NewMachGroupM.m_Name = sName
+      NewMachGroupM.m_Machine = sMachine
+      NewMachGroupM.m_nType = MachineType.WALL
+      NewMachGroupM.m_nRawPartId = EgtGetFirstRawPart()
+      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELLEN, NewMachGroupM.m_dL)
+      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELWIDTH, NewMachGroupM.m_dW)
+      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELHEIGHT, NewMachGroupM.m_dH)
+      NewMachGroupM.m_dTotMat = NewMachGroupM.m_dL * NewMachGroupM.m_dW
+      NewMachGroupM.m_PartMList = LoadParts(NewMachGroupM)
+      For Each Part In NewMachGroupM.m_PartMList
+         NewMachGroupM.m_dMatForPart += (Part.dL * Part.dW)
+      Next
+      ReadMachGroupData(NewMachGroupM)
+      Return NewMachGroupM
+   End Function
+
+   Public Shared Function CreateWallMachGroup(sName As String, sMachine As String) As MachGroupM
+      Dim NewMachGroupM As New WallMachGroupM
+      ' Creo il nuovo gruppo di lavorazione con i dati ottenuti a seconda del caso in cui mi trovo
+      NewMachGroupM.m_Id = EgtAddMachGroup(sName, sMachine)
+      If NewMachGroupM.m_Id = GDB_ID.NULL Then Return Nothing
+      NewMachGroupM.m_Name = sName
+      NewMachGroupM.m_Machine = sMachine
+      NewMachGroupM.m_nType = MachineType.WALL
+      NewMachGroupM.m_nRawPartId = EgtGetFirstRawPart()
+      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELLEN, NewMachGroupM.m_dL)
+      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELWIDTH, NewMachGroupM.m_dW)
+      EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELHEIGHT, NewMachGroupM.m_dH)
+      NewMachGroupM.m_dTotMat = NewMachGroupM.m_dL * NewMachGroupM.m_dW
+      For Each Part In NewMachGroupM.m_PartMList
+         NewMachGroupM.m_dMatForPart += (Part.dL * Part.dW)
+      Next
+      ReadMachGroupData(NewMachGroupM)
+      Return NewMachGroupM
+   End Function
+
+#End Region    ' CONSTRUCTORS
+
+   Private Shared Function LoadParts(NewWallMachGroupM As WallMachGroupM) As List(Of PartM)
+      Dim TempList As New List(Of PartM)
+      Dim nWallId As Integer = EgtGetFirstPartInRawPart(NewWallMachGroupM.m_nRawPartId)
+      While nWallId <> GDB_ID.NULL
+         If nWallId <> GDB_ID.NULL Then
+            Dim NewWall As WallM = WallM.CreateWall(NewWallMachGroupM, nWallId, NewWallMachGroupM.m_nRawPartId)
+            TempList.Add(NewWall)
+         End If
+         nWallId = EgtGetNextPartInRawPart(nWallId)
+      End While
+      Return TempList
+   End Function
+
+   Public Overrides Sub RefreshPartList()
+      ' aggiorno lista pezzi
+      RemoveAllParts()
+      Dim nRawPartId As Integer = EgtGetFirstRawPart()
+      If nRawPartId <> GDB_ID.NULL Then
+         Me.m_nRawPartId = nRawPartId
+      End If
+      Dim nWallId As Integer = EgtGetFirstPartInRawPart(m_nRawPartId)
+      While nWallId <> GDB_ID.NULL
+         If nWallId <> GDB_ID.NULL Then
+            Dim NewWall As WallM = WallM.CreateWall(Me, nWallId, m_nRawPartId)
+            AddPart(NewWall)
+         End If
+         nWallId = EgtGetNextPartInRawPart(nWallId)
+      End While
+   End Sub
+
+   Public Overrides Sub RefreshGroupData()
+      EgtGetInfo(Id, MGR_RPT_PANELLEN, dL)
+      EgtGetInfo(Id, MGR_RPT_PANELWIDTH, dW)
+      EgtGetInfo(Id, MGR_RPT_PANELHEIGHT, dH)
+      EgtGetInfo(Id, MGR_RPT_MATERIAL, sMATERIAL)
+   End Sub
+
+End Class

EgtBEAMWALL.Core/MachGroupPanel/BeamMachGroupVM.vb

@@ -0,0 +1,113 @@
+Imports System.Collections.ObjectModel
+Imports System.Collections.Specialized
+Imports System.ComponentModel
+Imports System.IO
+Imports EgtBEAMWALL.Core
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public MustInherit Class BeamMachGroupVM
+   Inherits MyMachGroupVM
+
+   Public ReadOnly Property m_BeamMachGroupM As BeamMachGroupM
+      Get
+         Return m_MachGroupM
+      End Get
+   End Property
+
+   Public Overridable Property sStartCut As String
+      Get
+         Return LenToString(m_BeamMachGroupM.dStartCut, 3)
+      End Get
+      Set(value As String)
+         StringToLen(value, m_BeamMachGroupM.dStartCut)
+      End Set
+   End Property
+   Public Property dStartCut As Double
+      Get
+         Return m_BeamMachGroupM.dStartCut
+      End Get
+      Set(value As Double)
+         m_BeamMachGroupM.dStartCut = value
+         NotifyPropertyChanged(NameOf(sStartCut))
+      End Set
+   End Property
+
+   Public Property SelBeam As BeamVM
+      Get
+         Return m_SelPart
+      End Get
+      Set(value As BeamVM)
+         m_SelPart = value
+      End Set
+   End Property
+
+#Region "CONSTRUCTORS"
+
+   Sub New(BeamMachGroupM As BeamMachGroupM)
+      MyBase.New(BeamMachGroupM)
+      AddHandler m_BeamMachGroupM.PartAdded, AddressOf OnBeamAdded
+      AddHandler m_BeamMachGroupM.PartRemoved, AddressOf OnBeamRemoved
+      CreateBeamVMList()
+      ' Aggiorno stato da stati feature
+      CalcGlobalUpdate()
+      NotifyPropertyChanged(NameOf(CALC_FALL_Visibility))
+   End Sub
+
+#End Region    ' CONSTRUCTORS
+
+#Region "METHODS"
+
+   Protected MustOverride Sub CreateBeamVMList()
+
+   Public Overrides Sub RefreshPartList()
+   End Sub
+
+   Public Overrides Sub RefreshGroupData()
+   End Sub
+
+#End Region    ' METHODS
+
+#Region "COMMANDS"
+
+#End Region    ' COMMANDS
+
+#Region "EVENTS"
+
+   Protected MustOverride Sub OnBeamAdded(sender As Object, e As PartAddedEventArgs)
+   Private Sub OnBeamRemoved(sender As Object, e As PartAddedEventArgs)
+      Dim BeamVM As BeamVM = PartVMList.FirstOrDefault(Function(x) x.PartM Is e.m_NewPart)
+      If Not IsNothing(BeamVM) Then PartVMList.Remove(BeamVM)
+   End Sub
+
+   Protected Sub OnBeamVMListChanged(sender As Object, e As NotifyCollectionChangedEventArgs)
+      If e.Action = NotifyCollectionChangedAction.Add Then
+         If Not IsNothing(e.NewItems) AndAlso e.NewItems.Count > 0 Then
+            For Each BeamVM As BeamVM In e.NewItems
+               AddHandler BeamVM.PropertyChanged, AddressOf OnBeamVMPropertyChanged
+            Next
+         End If
+      End If
+      If e.Action = NotifyCollectionChangedAction.Remove Then
+         If Not IsNothing(e.OldItems) AndAlso e.OldItems.Count > 0 Then
+            For Each BeamVM As BeamVM In e.OldItems
+               RemoveHandler BeamVM.PropertyChanged, AddressOf OnBeamVMPropertyChanged
+            Next
+         End If
+      End If
+      If e.Action = NotifyCollectionChangedAction.Move Then
+         Dim ItemVM As PartVM = e.OldItems(0)
+         m_BeamMachGroupM.PartMList.RemoveAt(e.OldStartingIndex)
+         m_BeamMachGroupM.PartMList.Insert(e.NewStartingIndex, ItemVM.PartM)
+      End If
+   End Sub
+
+   Protected Overridable Sub OnBeamVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
+      'Select Case e.PropertyName
+      '   Case NameOf(sender.nSelGRP), NameOf(sender.nSelSIDE)
+      'End Select
+   End Sub
+
+#End Region
+
+End Class

EgtBEAMWALL.Core/MachGroupPanel/BeamVM.vb

@@ -0,0 +1,43 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtBEAMWALL.Core
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public MustInherit Class BeamVM
+   Inherits PartVM
+
+   Public ReadOnly Property m_BeamM As BeamM
+      Get
+         Return m_PartM
+      End Get
+   End Property
+
+   Public Overridable Property sOffset As String
+      Get
+         Return LenToString(m_BeamM.dOffset, 3)
+      End Get
+      Set(value As String)
+         StringToLen(value, m_BeamM.dOffset)
+      End Set
+   End Property
+   Public ReadOnly Property dOffset As Double
+      Get
+         Return m_BeamM.dOffset
+      End Get
+   End Property
+
+
+#Region "CONSTRUCTOR"
+
+   Sub New(BeamM As BeamM, ParentMachGroupVM As BeamMachGroupVM)
+      MyBase.New(BeamM, ParentMachGroupVM)
+   End Sub
+
+#End Region    ' CONSTRUCTOR
+
+#Region "METHODS"
+
+#End Region    ' METHODS
+
+End Class

EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupPanelVM.vb

@@ -1,4 +1,7 @@
-Imports System.ComponentModel
+Imports System.Collections.ObjectModel
+Imports System.ComponentModel
+Imports System.IO
+Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -88,7 +91,7 @@ Public MustInherit Class MyMachGroupPanelVM
       ' Svuoto precedente lista di MachGroup
       MachGroupVMList.Clear()
       ' aggiorno copie
-      MyMachGroupPanelM.UpdateAllDuplo()
+      MyMachGroupPanelM.UpdateDuplo()
       ' verifico se esistono già gruppi di lavorazione o se devo creare il primo
       Dim bOk As Boolean = False
       Dim nId = EgtGetFirstMachGroup()
@@ -115,9 +118,17 @@ Public MustInherit Class MyMachGroupPanelVM
             EgtRemoveRawPart(nRawId)
             nRawId = EgtGetFirstRawPart()
          End While
+         'If Not ExecBeam(Map.refMainWindowVM.MainWindowM.sTempDir, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False) Then Return False
+
       Next
    End Sub
 
+   'Public Overrides Sub AddMachGroup()
+   '   Dim MyMachGroupM As MyMachGroupM = m_MyMachGroupPanelM.NewMyMachGroup(CurrentMachine.sMachineName, Map.refProjectVM.BTLStructureVM.nPROJTYPE)
+   '   ' e lo seleziono
+   '   SelectedMachGroup = MachGroupVMList.FirstOrDefault(Function(x) x.MachGroupM Is MyMachGroupM)
+   'End Sub
+
    Public Overrides Function OnPreSetCurrMachGroup() As Boolean
       EgtSetCurrentContext(CoreMap.refSceneHostVM.MainScene.GetCtx())
       Return True
@@ -134,6 +145,18 @@ Public MustInherit Class MyMachGroupPanelVM
       Return True
    End Function
 
+   ' funzione che seleziona primo gruppo
+   'Friend Sub SelFirstMachGroup()
+   '   If Not IsNothing(Me) AndAlso Not IsNothing(MachGroupVMList) AndAlso MachGroupVMList.Count > 0 Then
+   '      SelectedMachGroup = MachGroupVMList(0)
+   '   Else
+   '      SelectedMachGroup = Nothing
+   '      EgtResetCurrMachGroup()
+   '      ' nascondo tutti i pezzi
+   '      Map.refProjectVM.BTLStructureVM.HideAll()
+   '   End If
+   'End Sub
+
    ' funzione che seleziona ultimo gruppo
    Public Sub SelLastMachGroup()
       If Not IsNothing(Me) AndAlso Not IsNothing(MachGroupVMList) AndAlso MachGroupVMList.Count > 0 Then

EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupVM.vb

@@ -1,9 +1,11 @@
 Imports System.Collections.ObjectModel
 Imports System.Collections.Specialized
 Imports System.ComponentModel
+Imports System.IO
 Imports System.Windows
 Imports System.Windows.Input
 Imports System.Windows.Media
+Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -436,6 +438,8 @@ Public MustInherit Class MyMachGroupVM
       m_SupervisorId = SupervisorId
    End Sub
 
+   Private m_cc As StateChangeEventArgs
+
    Public ReadOnly Property IsReadOnly As Boolean
       Get
          Return String.IsNullOrEmpty(m_SupervisorId)
@@ -472,6 +476,10 @@ Public MustInherit Class MyMachGroupVM
 
    Public MustOverride Sub RefreshGroupData()
 
+   Public Overridable Function Copy() As MyMachGroupVM
+      Return Nothing
+   End Function
+
    Public Sub UpdateUsage()
       If nType = BWType.BEAM Then
          MyMachGroupM.SetMatForPart(0)
@@ -612,10 +620,6 @@ Public MustInherit Class MyMachGroupVM
 
    Public MustOverride Sub RefreshPartList()
 
-   Public Overridable Sub RefreshMachGroup()
-
-   End Sub
-
 #End Region    ' Parts
 
 #End Region    ' METHODS

EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb

@@ -1,9 +1,11 @@
 Imports System.Collections.ObjectModel
 Imports System.Collections.Specialized
 Imports System.ComponentModel
+Imports System.IO
 Imports System.Windows
 Imports System.Windows.Input
 Imports System.Windows.Media
+Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -507,10 +509,6 @@ Public MustInherit Class PartVM
 
 #Region "METHODS"
 
-   Public Overridable Sub RefreshPart()
-
-   End Sub
-
 #Region "Feature"
 
    Protected MustOverride Sub CreateBTLFeatureVMList()
@@ -642,6 +640,9 @@ Public MustInherit Class PartVM
    End Sub
 
    Protected Overridable Sub OnBTLFeatureVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
+      'Select Case e.PropertyName
+      '   Case NameOf(sender.nSelGRP), NameOf(sender.nSelSIDE)
+      'End Select
    End Sub
 
 #End Region    ' EVENTS

EgtBEAMWALL.Core/MachGroupPanel/WallMachGroupVM.vb

@@ -0,0 +1,78 @@
+Imports System.Collections.ObjectModel
+Imports System.Collections.Specialized
+Imports System.ComponentModel
+Imports System.IO
+Imports EgtBEAMWALL.Core
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public MustInherit Class WallMachGroupVM
+   Inherits MyMachGroupVM
+
+   Public ReadOnly Property m_WallMachGroupM As WallMachGroupM
+      Get
+         Return m_MachGroupM
+      End Get
+   End Property
+
+#Region "CONSTRUCTORS"
+
+   Sub New(WallMachGroupM As WallMachGroupM)
+      MyBase.New(WallMachGroupM)
+      AddHandler m_WallMachGroupM.PartAdded, AddressOf OnWallAdded
+      AddHandler m_WallMachGroupM.PartRemoved, AddressOf OnWallRemoved
+      CreateWallVMList()
+      ' Aggiorno stato da stati feature
+      CalcGlobalUpdate()
+      NotifyPropertyChanged(NameOf(CALC_FALL_Visibility))
+   End Sub
+
+#End Region    ' CONSTRUCTORS
+
+#Region "METHODS"
+
+   Protected MustOverride Sub CreateWallVMList()
+
+#End Region    ' METHODS
+
+   Public Overrides Sub RefreshPartList()
+   End Sub
+
+   Public Overrides Sub RefreshGroupData()
+   End Sub
+
+#Region "COMMANDS"
+
+#End Region    ' COMMANDS
+
+#Region "EVENTS"
+
+   Protected MustOverride Sub OnWallAdded(sender As Object, e As PartAddedEventArgs)
+
+   Private Sub OnWallRemoved(sender As Object, e As PartAddedEventArgs)
+      Dim WallVM As WallVM = PartVMList.FirstOrDefault(Function(x) x.PartM Is e.m_NewPart)
+      If Not IsNothing(WallVM) Then PartVMList.Remove(WallVM)
+   End Sub
+
+   Protected Sub OnWallVMListChanged(sender As Object, e As NotifyCollectionChangedEventArgs)
+      If Not IsNothing(e.NewItems) AndAlso e.NewItems.Count > 0 Then
+         For Each WallVM As WallVM In e.NewItems
+            AddHandler WallVM.PropertyChanged, AddressOf OnWallVMPropertyChanged
+         Next
+      End If
+      If Not IsNothing(e.OldItems) AndAlso e.OldItems.Count > 0 Then
+         For Each WallVM As WallVM In e.OldItems
+            RemoveHandler WallVM.PropertyChanged, AddressOf OnWallVMPropertyChanged
+         Next
+      End If
+   End Sub
+
+   Protected Sub OnWallVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
+      'Select Case e.PropertyName
+      '   Case NameOf(sender.nSelGRP), NameOf(sender.nSelSIDE)
+      'End Select
+   End Sub
+
+#End Region
+
+End Class

EgtBEAMWALL.Core/MachGroupPanel/WallVM.vb

@@ -0,0 +1,81 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports System.Windows.Input
+Imports EgtBEAMWALL.Core
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public MustInherit Class WallVM
+   Inherits PartVM
+
+   Public ReadOnly Property m_WallM As WallM
+      Get
+         Return m_PartM
+      End Get
+   End Property
+
+   Public Overrides Property sPOSX As String
+      Get
+         Return LenToString(m_WallM.dPOSX, 3)
+      End Get
+      Set(value As String)
+         StringToLen(value, m_WallM.dPOSX)
+      End Set
+   End Property
+
+   Public Overridable Property sPOSY As String
+      Get
+         Return LenToString(m_WallM.dPOSY, 3)
+      End Get
+      Set(value As String)
+         StringToLen(value, m_WallM.dPOSY)
+      End Set
+   End Property
+
+   Public ReadOnly Property dPOSY As Double
+      Get
+         Return m_WallM.dPOSY
+      End Get
+   End Property
+
+   Public Property sROT As String
+      Get
+         Return LenToString(m_WallM.dROT, 3) & "°"
+      End Get
+      Set(value As String)
+         StringToLen(value, m_WallM.dROT)
+      End Set
+   End Property
+
+   Public ReadOnly Property dROT As Double
+      Get
+         Return m_WallM.dROT
+      End Get
+   End Property
+
+   Public Overridable Property bFLIP As Boolean
+      Get
+         Return m_WallM.bFLIP
+      End Get
+      Set(value As Boolean)
+         m_WallM.bFLIP = value
+      End Set
+   End Property
+
+#Region "CONSTRUCTOR"
+
+   Sub New(WallM As WallM, ParentMachGroupVM As WallMachGroupVM)
+      MyBase.New(WallM, ParentMachGroupVM)
+   End Sub
+
+#End Region    ' CONSTRUCTOR
+
+#Region "METHODS"
+
+#End Region    ' METHODS
+
+#Region "COMMANDS"
+
+#End Region    ' COMMANDS
+
+End Class

EgtBEAMWALL.Core/MachinePanel/MachinePanelV.xaml

@@ -1,41 +0,0 @@
-<Grid x:Class="MachinePanelV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      IsEnabled="{Binding MachPanel_IsEnabled}">
-
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
-   </Grid.ColumnDefinitions>
-
-   <Grid Style="{StaticResource CalcPanel_Grid}">
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="1*"/>
-      </Grid.ColumnDefinitions>
-      <TextBlock Text="Macchina corrente" 
-                 Style="{StaticResource CurrMach_TextBlock}"/>
-      <!--Combobox per selezionare la macchina corrente-->
-      <ComboBox Grid.Column="1"
-                ItemsSource="{Binding Path=MachineList}" DisplayMemberPath="Name"
-                SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
-                Style="{StaticResource CalcPanel_ComboBox}"/>
-   </Grid>
-   <StackPanel Grid.Column="1" 
-               Style="{StaticResource MachinePanel_StackPanel}">
-      <Button Content="{Binding ToolDBMsg}"
-              ToolTip="{Binding ToolDBToolTip}"
-              Command="{Binding ToolDbCommand}"
-              Style="{StaticResource GeneralConfiguration_Button}"/>
-      <Button Content="{Binding SetUpMsg}"
-              Command="{Binding SetUpCommand}" 
-              ToolTip="{Binding SetUpToolTip}"
-              Style="{StaticResource GeneralConfiguration_Button}"
-              Visibility="{Binding SetUp_Visibility}"/>
-      <Button Content="{Binding ParameterMachineMsg}"
-              ToolTip="{Binding ParameterMachineMsg}"
-              Command="{Binding ParameterMachine_Command}"
-              Style="{StaticResource ParameterMachine_Button}"/>
-   </StackPanel>
-
-</Grid>

EgtBEAMWALL.Core/MachiningDbWindow/MachiningDbWindowV.xaml

@@ -1,124 +0,0 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="MachiningDbWindowV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                                 Title="{Binding Title}"
-                                 TitleBarHeight="30"
-                                 WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
-
-   <EgtBEAMWALLCORE:OptimizerWindow.InputBindings>
-      <KeyBinding Key="Escape" Command="{Binding ReloadMachiningCommand}"
-                  CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"/>
-   </EgtBEAMWALLCORE:OptimizerWindow.InputBindings>
-
-   <EgtBEAMWALLCORE:OptimizerWindow.Resources>
-      <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
-      <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
-   </EgtBEAMWALLCORE:OptimizerWindow.Resources>
-
-   <Grid>
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="0.75*"/>
-         <ColumnDefinition Width="2*"/>
-         <ColumnDefinition Width="1*"/>
-      </Grid.ColumnDefinitions>
-
-      <Grid>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="10*"/>
-            <RowDefinition Height="Auto"/>
-         </Grid.RowDefinitions>
-
-         <UniformGrid Columns="3">
-            <Button Content="{Binding NewMsg}"
-                    Command="{Binding NewCommand}"
-                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                    IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"
-                    Style="{StaticResource MachiningDB_Button}"/>
-            <Button Content="{Binding SaveMsg}" 
-                    Command="{Binding SaveCommand}"
-                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                    IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"
-                    Style="{StaticResource MachiningDB_Button}"/>
-            <Button Content="{Binding RemoveMsg}" 
-                    Command="{Binding RemoveCommand}"
-                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                    IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"
-                    Style="{StaticResource MachiningDB_Button}"/>
-         </UniformGrid>
-
-         <TreeView Grid.Row="1"
-                   Name="MachiningsTreeView"
-                   ItemsSource="{Binding Path=MachiningsList}"
-                   Style="{StaticResource MachiningDB_TreeView}">
-            <TreeView.ItemContainerStyle>
-               <Style TargetType="{x:Type TreeViewItem}">
-                  <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
-                  <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
-                  <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
-               </Style>
-            </TreeView.ItemContainerStyle>
-            <TreeView.Resources>
-               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyMachiningTreeViewItem}" 
-                                         ItemsSource="{Binding Items}">
-                  <Grid Style="{StaticResource MachiningDB_Grid}">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="Auto"/>
-                     </Grid.ColumnDefinitions>
-                     <Image Source="{Binding PictureString}" 
-                            Style="{StaticResource MachiningDB_Image}"/>
-                     <TextBlock Grid.Column="1" 
-                                Text="{Binding Name}" 
-                                Style="{StaticResource MachiningDB_TextBlock}"/>
-                     <Ellipse Grid.Column="2" 
-                              Fill="{Binding FamilyColor}"
-                              Style="{StaticResource SetUp_Ellipse}"/>
-                  </Grid>
-               </HierarchicalDataTemplate>
-               <DataTemplate DataType="{x:Type EgtWPFLib5:MachiningTreeViewItem}">
-                  <Grid Style="{StaticResource MachiningDB_Grid}">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="Auto"/>
-                     </Grid.ColumnDefinitions>
-                     <TextBlock Grid.Column="1" 
-                                Text="{Binding NamePar}" 
-                                Style="{StaticResource MachiningDB_TextBlock}"/>
-                     <Ellipse Grid.Column="2" 
-                              Fill="{Binding ToolColor}"
-                              Style="{StaticResource SetUp_Ellipse}"/>
-                  </Grid>
-               </DataTemplate>
-            </TreeView.Resources>
-         </TreeView>
-
-         <UniformGrid Grid.Row="2" 
-                      Columns="3">
-            <Button Content="{Binding ImportMsg}" 
-                    Command="{Binding ImportCommand}"
-                    Style="{StaticResource MachiningDB_Button}"/>
-            <Button Content="{Binding ExportMsg}" 
-                    Command="{Binding ExportCommand}"
-                    Style="{StaticResource MachiningDB_Button}"/>
-            <Button Content="{Binding ResetMsg}" 
-                    Command="{Binding ReloadMachiningCommand}" 
-                    CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"
-                    Style="{StaticResource MachiningDB_Button}"/>
-         </UniformGrid>
-
-      </Grid>
-
-      <ContentControl Grid.Column="1" 
-                      Grid.ColumnSpan="2"
-                      Content="{Binding Path=ParamPageV}"/>
-
-   </Grid>
-
-</EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Core/MachiningDbWindow/MachiningDbWindowV.xaml.vb

@@ -1,29 +0,0 @@
-Imports EgtWPFLib5
-Imports System.Windows.Input
-
-Public Class MachiningDbWindowV
-
-   Private WithEvents m_MachiningDbWindowVM As MachiningDbWindowVM
-
-   Sub New(Owner As System.Windows.Window, MachiningDbWindowVM As MachiningDbWindowVM)
-      ' This call is required by the designer.
-      InitializeComponent()
-      Me.DataContext = MachiningDbWindowVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_MachiningDbWindowVM = MachiningDbWindowVM
-   End Sub
-
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_MachiningDbWindowVM.m_CloseWindow
-      Me.DataContext = Nothing
-      Me.DialogResult = bDialogResult
-      Me.Close()
-   End Sub
-
-   Private Sub MachiningDb_Closing(sender As Object, e As ComponentModel.CancelEventArgs) Handles Me.Closing
-      If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
-         e.Cancel = True
-         Return
-      End If
-   End Sub
-
-End Class

EgtBEAMWALL.Core/My Project/AssemblyInfo.vb

@@ -1,7 +1,6 @@
 Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
-Imports System.Windows
 
 ' General Information about an assembly is controlled through the following
 ' set of attributes. Change these attribute values to modify the information
@@ -25,8 +24,6 @@ Imports System.Windows
 'The following GUID is for the ID of the typelib if this project is exposed to COM
 <Assembly: Guid("632ea0b1-10e2-4f07-8b1b-d9371ef8392e")>
 
-<Assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)>
-
 ' Version information for an assembly consists of the following four values:
 '
 '      Major Version
@@ -38,5 +35,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.7.11.10")>
-<Assembly: AssemblyFileVersion("2.7.11.10")>
+<Assembly: AssemblyVersion("2.7.4.1")>
+<Assembly: AssemblyFileVersion("2.7.4.1")>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml

@@ -1,18 +1,19 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="NewOpenProjectFileDialogV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                                 Title="{Binding Title}"
-                                 ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
-                                  WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-                                 MinHeight="500" MinWidth="500"
-                                 DataContext="{Binding RelativeSource={RelativeSource Self}}"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
+<EgtWPFLib5:EgtCustomWindow x:Class="NewOpenProjectFileDialogV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core"
+                            Title="{Binding Title}"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
+                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                            IsClosable="False"
+                            MinHeight="500" MinWidth="500"
+                            DataContext="{Binding RelativeSource={RelativeSource Self}}">
 
-   <EgtBEAMWALLCORE:OptimizerWindow.Resources>
+   <EgtWPFLib5:EgtCustomWindow.Resources>
       <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
-   </EgtBEAMWALLCORE:OptimizerWindow.Resources>
+   </EgtWPFLib5:EgtCustomWindow.Resources>
 
    <Grid>
       <Grid.RowDefinitions>
@@ -22,8 +23,8 @@
       </Grid.RowDefinitions>
 
       <GroupBox Header="{Binding Filters_Msg}"
-                Visibility="{Binding Filters_Visibility}"
-                Style="{StaticResource NewOpenProjectFile_GroupBox}">
+                Margin="5"
+                Visibility="{Binding Filters_Visibility}">
          <Grid>
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
@@ -37,30 +38,30 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding BTLDateTypeList}"
                          SelectedIndex="{Binding SelBTLDateType}"
-                         Style="{StaticResource BTLDateTypeList_ComboBox}"/>
-               <StackPanel Grid.Column="1" 
-                           Style="{StaticResource PartManager_StackPanel}">
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource FeatureComboBox}"/>
+               <StackPanel Grid.Column="1" Orientation="Horizontal">
                   <ComboBox ItemsSource="{Binding DayTypeList}"
                             SelectedIndex="{Binding SelDayType}"
-                            Style="{StaticResource DayTypeList_ComboBox}"/>
-                  <StackPanel Visibility="{Binding Date_Visibility}"
-                              Style="{StaticResource PartManager_StackPanel}">
+                            Width="105"
+                            Margin="0,0,2.5,0"
+                            Style="{StaticResource PartParam_ComboBox}"/>
+                  <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
                      <TextBlock Text="{Binding From_Msg}"
                                 Style="{StaticResource Filter_TextBlock}"/>
-                     <DatePicker SelectedDate="{Binding dtStartDate}"                                 
-                                 CalendarStyle="{StaticResource Filter_Calendar}"
+                     <DatePicker SelectedDate="{Binding dtStartDate}"
                                  Style="{StaticResource Filter_DatePicker}"/>
                      <TextBlock Text="{Binding To_Msg}"
                                 Style="{StaticResource Filter_TextBlock}"/>
-                     <DatePicker SelectedDate="{Binding dtEndDate}"                                 
-                                 CalendarStyle="{StaticResource Filter_Calendar}"
+                     <DatePicker SelectedDate="{Binding dtEndDate}"
                                  Style="{StaticResource Filter_DatePicker}"/>
                   </StackPanel>
                </StackPanel>
                <CheckBox Grid.Column="2"
                          IsChecked="{Binding bViewArchived}"
                          Content="{Binding ViewArchived_Msg}"
-                         Style="{StaticResource PParameters_CheckBox}"/>
+                         VerticalAlignment="Center"/>
             </Grid>
             <Grid Grid.Row="1">
                <Grid.ColumnDefinitions>
@@ -70,46 +71,46 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding FilterTypeList}"
                          SelectedItem="{Binding SelFilterType}"
-                         Style="{StaticResource NewOpenProjectFile_ComboBox}"/>
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource FeatureComboBox}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SearchText}"
-                                      Visibility="{Binding SearchText_Visibility}"
-                                      Style="{StaticResource NewSearchText_TextBox}"/>
+                                      Margin="5"
+                                      Visibility="{Binding SearchText_Visibility}"/>
                <StackPanel Grid.Column="2" 
-                           Style="{StaticResource PartManager_StackPanel}">
+                           Orientation="Horizontal">
                   <TextBlock Text="{Binding Rows_Msg}"
-                             Style="{StaticResource Option_TextBlock}"/>
+                             Style="{StaticResource OptionTextBlock}"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
                             SelectedIndex="{Binding SelRowQuantity}"
-                            Style="{StaticResource OpenProjectFileDialog_ComboBox}"/>
+                            Style="{StaticResource FeatureComboBox}"/>
                </StackPanel>
             </Grid>
          </Grid>
       </GroupBox>
 
-      <Border Grid.Row="1" 
-              Style="{StaticResource NewOpenProjectFileDialog_Border}"/>
-
-      <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
-                                   x:Name="MainDataGrid"
-                                   ItemsSource="{Binding ProjectList}" 
-                                   SelectedItem="{Binding SelProject}"
-                                   SelectionMode="Single"
-                                   Margin="5"
-                                   BindingColumns="{Binding ProdColumns}"
-                                   RowDetailsVisibilityMode="Visible"
-                                   CellEditEnding="MainDataGrid_CellEditEnding"
-                                   AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
-                                   AlternationCount="2"
-                                   ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
-                                   Style="{StaticResource Optimizer_DataGrid}"
-                                   CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
+      <EgtBEAMWALL:EgtDataGrid x:Name="MainDataGrid"
+                               Grid.Row="1"
+                               ItemsSource="{Binding ProjectList}" 
+                               SelectedItem="{Binding SelProject}"
+                               CanUserAddRows="False"
+                               AutoGenerateColumns="False"
+                               CanUserResizeRows="False"
+                               SelectionMode="Single"
+                               ScrollViewer.CanContentScroll="True" 
+                               ScrollViewer.VerticalScrollBarVisibility="Auto"
+                               ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                               Margin="5"
+                               RowDetailsVisibilityMode="Visible"
+                               CellEditEnding="MainDataGrid_CellEditEnding"
+                               BindingColumns="{Binding ProdColumns}">
          <DataGrid.Resources>
             <!-- ProdId -->
             <DataGridTextColumn x:Key="colPRODID" Binding="{Binding sProdId}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
@@ -121,12 +122,13 @@
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="Auto"/>
                      </Grid.ColumnDefinitions>
-                     <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
                      <ToggleButton Grid.Column="1"
-                                   IsChecked="{Binding Path=DataContext.bIsEditNameActive,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
-                                   Style="{StaticResource Small_ToggleButton}">
+                                   Margin="5,0,0,0"
+                                   IsChecked="{Binding Path=DataContext.bIsEditNameActive,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
+                                   Style="{StaticResource ToolBar_SmallToggleButton}">
                         <Image Source="\Resources\CalcPanel\Edit.png"
-                               Style="{StaticResource Lock_Image}"/>
+                               Style="{StaticResource LockImage}"/>
                      </ToggleButton>
                   </Grid>
                </DataGridTextColumn.Header>
@@ -134,13 +136,13 @@
             <!-- Creation date -->
             <DataGridTextColumn x:Key="colCRTDATE" Binding="{Binding dtCreateDate}">
                <DataGridTextColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.CreateDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"/>
+                  <TextBlock Text="{Binding Path=DataContext.CreateDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
             <!-- Machine -->
             <DataGridTextColumn x:Key="colMACHINE" Binding="{Binding sMachine}">
                <DataGridTextColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.Machine_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"/>
+                  <TextBlock Text="{Binding Path=DataContext.Machine_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
             <!-- Archived -->
@@ -149,16 +151,18 @@
                   <DataTemplate>
                      <Image Source="\Resources\OpenProjectFileDialog\Archived.png"
                             Visibility="{Binding Archived_Visibility}"
-                            Style="{StaticResource Archived_Image}"/>
+                            Height="15"
+                            Width="15"
+                            Stretch="UniformToFill"/>
                   </DataTemplate>
                </DataGridTemplateColumn.CellTemplate>
                <DataGridTemplateColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.Archived_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"/>
+                  <TextBlock Text="{Binding Path=DataContext.Archived_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
                </DataGridTemplateColumn.Header>
             </DataGridTemplateColumn>
          </DataGrid.Resources>
          <DataGrid.RowStyle>
-            <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
+            <Style TargetType="DataGridRow">
                <Setter Property="FontWeight" Value="DemiBold"/>
                <Setter Property="VerticalContentAlignment" Value="Center"/>
                <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
@@ -167,23 +171,28 @@
          <DataGrid.RowDetailsTemplate>
             <DataTemplate>
                <ItemsControl ItemsSource="{Binding ProjFileList}"
-                             Style="{StaticResource ProjFileList_ItemsControl}">
+                             BorderThickness="0"
+                             Margin="0,-1,0,0"
+                             Padding="0">
                   <ItemsControl.ItemTemplate>
                      <DataTemplate>
-                        <Grid Style="{StaticResource ProjFileList_Grid}">
+                        <Grid TextBlock.FontSize="12"
+                              TextBlock.FontWeight="Normal">
                            <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="{Binding Path=DataContext.ProdColumns[0].ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"/>
+                              <ColumnDefinition Width="{Binding Path=DataContext.ProdColumns[0].ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
                               <ColumnDefinition Width="1*"/>
                            </Grid.ColumnDefinitions>
                            <Grid.RowDefinitions>
                               <RowDefinition Height="1"/>
                               <RowDefinition Height="1*"/>
                            </Grid.RowDefinitions>
-                           <Grid Grid.ColumnSpan="2"
-                                 Style="{StaticResource Gray_Grid}"/>
+                           <Grid Grid.Row="0"
+                                 Grid.ColumnSpan="2"
+                                 Background="Gray"
+                                 Margin="40,0,40,0"/>
                            <Grid Grid.Column="1"
                                  Grid.Row="1"
-                                 Style="{StaticResource NewOpenProjectFile_Grid}">
+                                 Margin="2">
                               <Grid.ColumnDefinitions>
                                  <ColumnDefinition Width="Auto"/>
                                  <ColumnDefinition Width="1*"/>
@@ -194,18 +203,18 @@
                                  <RowDefinition Height="1*"/>
                                  <RowDefinition Height="1*"/>
                               </Grid.RowDefinitions>
-                              <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
+                              <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
                                          Style="{StaticResource OpenWnd_TextBlock}"/>
                               <TextBlock Grid.Column="1"
                                          Text="{Binding sBTLFileName}"/>
                               <TextBlock Grid.Row="1"
-                                         Text="{Binding Path=DataContext.ListName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
+                                         Text="{Binding Path=DataContext.ListName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
                                          Style="{StaticResource OpenWnd_TextBlock}"/>
-                              <TextBlock Grid.Row="1"
-                                         Grid.Column="1"                                         
+                              <TextBlock Grid.Column="1"
+                                         Grid.Row="1"
                                          Text="{Binding sListName}"/>
                               <TextBlock Grid.Column="2"
-                                         Text="{Binding Path=DataContext.ExportDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:NewOpenProjectFileDialogV}}}"
+                                         Text="{Binding Path=DataContext.ExportDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
                                          Style="{StaticResource OpenWnd_TextBlock}"/>
                               <TextBlock Grid.Column="3"
                                          Text="{Binding dtExportDate}"/>
@@ -216,28 +225,25 @@
                </ItemsControl>
             </DataTemplate>
          </DataGrid.RowDetailsTemplate>
-      </EgtBEAMWALLCORE:EgtDataGrid>
+      </EgtBEAMWALL:EgtDataGrid>
 
-      <UniformGrid Grid.Row="2"
-                   Columns="4" 
-                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
-         <Button Name="OpenBtn"
-                 IsDefault="True"
+      <UniformGrid Columns="4" Grid.Row="2" Margin="0,0,0,5">
+         <Button IsDefault="True" Name="OpenBtn"
                  Content="{Binding Open_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Archive_Msg}"
                  Command="{Binding Archive_Command}"
                  IsEnabled="{Binding bArchived_IsEnabled}"
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Delete_Msg}"
                  Command="{Binding Delete_Command}"
                  IsEnabled="{Binding bDelete_IsEnabled}"
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
          <Button Command="{Binding Cancel_Command}"
                  Content="{Binding Cancel_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
       </UniformGrid>
 
    </Grid>
 
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml.vb

@@ -1,7 +1,13 @@
-Imports System.Windows
+Imports System.ComponentModel
+Imports System.IO
+Imports System.Windows
 Imports System.Windows.Controls
 Imports System.Windows.Input
+Imports EgtBEAMWALL.Core.ConstBeam
+Imports EgtUILib
 Imports EgtWPFLib5
+Imports EgtBEAMWALL
+Imports System.Windows.Media
 
 Public Class NewOpenProjectFileDialogV
 
@@ -77,17 +83,4 @@ Public Class NewOpenProjectFileDialogV
       'm_OpenProjFileDialogVM.SetIsEditNameActive(False)
    End Sub
 
-   Public Shared ReadOnly IsSelectedProperty As DependencyProperty = DependencyProperty.Register("IsSelected",
-                                                                                                  GetType(Boolean),
-                                                                                                  GetType(ItemsControl))
-
-   Public Property IsSelected As Boolean
-      Get
-         Return DirectCast(GetValue(IsSelectedProperty), Boolean)
-      End Get
-      Set(value As Boolean)
-         SetValue(IsSelectedProperty, value)
-      End Set
-   End Property
-
-End Class
+End Class

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb

@@ -4,6 +4,8 @@ Imports System.Windows
 Imports System.Windows.Controls
 Imports System.Windows.Data
 Imports System.Windows.Input
+Imports EgtBEAMWALL.Core
+Imports EgtBEAMWALL.Core.ConstBeam
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -588,6 +590,22 @@ Public MustInherit Class NewOpenProjectFileDialogVM
    End Sub
 
    Protected Sub LoadColumns()
+      'If ProjectType = ProjectType.PROJ Then
+      ' carico le colonne della datagrid
+      ' GetPrivateProfileColumns(S_OPENPROJFILEDLG_PROJ, ProjColumns)
+      '   ' carico campi su cui eseguire il filtro di ricerca
+      '   m_BTLDateTypeList = New List(Of String)({CreateDate_Msg, ExportDate_Msg})
+      '   m_SelBTLDateType = BTLDateTypes.CREATEDATE
+      '   NotifyPropertyChanged(NameOf(BTLDateTypeList))
+      '   NotifyPropertyChanged(NameOf(SelBTLDateType))
+      '   m_FilterTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(FilterTypes.NULL, ""),
+      '                                                                 New IdNameStruct(FilterTypes.ID, Id_Msg),
+      '                                                                 New IdNameStruct(FilterTypes.BTLFILENAME, BTLFileName_Msg),
+      '                                                                 New IdNameStruct(FilterTypes.LISTNAME, ListName_Msg),
+      '                                                                 New IdNameStruct(FilterTypes.MACHINE, Machine_Msg)})
+      '   m_SelFilterType = m_FilterTypeList.FirstOrDefault(Function(x) x.Id = FilterTypes.NULL)
+      '   NotifyPropertyChanged(NameOf(SelFilterType))
+      'ElseIf ProjectType = ProjectType.PROD Then
       ' carico le colonne della datagrid
       GetPrivateProfileColumns(S_NEWOPENPROJFILEDLG_PROD, ProdColumns)
       ' carico campi su cui eseguire il filtro di ricerca
@@ -643,6 +661,15 @@ Public MustInherit Class NewOpenProjectFileDialogVM
          (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
          (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
          (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
+      'ElseIf TypeOf Proj Is ProdFileVM Then
+      '   Dim CurrProj As ProdFileVM = DirectCast(Proj, ProdFileVM)
+      '   If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
+      '      (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
+      '   If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
+      '      (m_SelFilterType.Id = FilterTypes.ID AndAlso CurrProj.sProdId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
+      '      (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
+      '      (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
+      'End If
       Return bProjectOk
    End Function
 
@@ -752,3 +779,94 @@ Public MustInherit Class NewOpenProjectFileDialogVM
 
 End Class
 
+Public Class ProdItem
+   Inherits VMBase
+
+   Public Shared m_delIsModifiedSetUp As Action(Of Boolean)
+
+   Protected m_ProdFileVM As ProdFileVM
+   Public ReadOnly Property ProdFileVM As ProdFileVM
+      Get
+         Return m_ProdFileVM
+      End Get
+   End Property
+
+   Private m_ProjFileList As New List(Of ProjectFileVM)
+   Public ReadOnly Property ProjFileList As List(Of ProjectFileVM)
+      Get
+         Return m_ProjFileList
+      End Get
+   End Property
+
+   Public ReadOnly Property sProdId As String
+      Get
+         Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sProdId, "")
+      End Get
+   End Property
+
+   Public Overridable Property sName As String
+      Get
+         Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sName, "")
+      End Get
+      Set(value As String)
+         If Not IsNothing(m_ProdFileVM) Then
+            m_ProdFileVM.sName = value
+         End If
+      End Set
+   End Property
+
+   Public ReadOnly Property dtCreateDate As Date
+      Get
+         Return If(Not IsNothing(m_ProdFileVM), {m_ProdFileVM.dtCreateDate, m_ProjFileList.Min(Function(x) x.dtCreateDate)}.Min(), m_ProjFileList.Min(Function(x) x.dtCreateDate))
+      End Get
+   End Property
+   Public ReadOnly Property sCreateDate As String
+      Get
+         Return dtCreateDate.ToString()
+      End Get
+   End Property
+
+   Public ReadOnly Property sMachine As String
+      Get
+         If Not IsNothing(m_ProdFileVM) Then
+            Return m_ProdFileVM.sMachine
+         ElseIf Not IsNothing(m_ProjFileList(0)) Then
+            Return m_ProjFileList(0).sMachine
+         Else Return ""
+         End If
+      End Get
+   End Property
+
+   Public ReadOnly Property bIsArchived As Boolean
+      Get
+         If Not IsNothing(m_ProdFileVM) Then
+            Return m_ProdFileVM.bIsArchived
+         ElseIf Not IsNothing(m_ProjFileList(0)) Then
+            Return m_ProjFileList(0).bIsArchived
+         Else
+            Return True
+         End If
+      End Get
+   End Property
+
+   Public ReadOnly Property Archived_Visibility As Visibility
+      Get
+         Return If(bIsArchived, Visibility.Visible, Visibility.Collapsed)
+      End Get
+   End Property
+
+   Sub New(ProdFileVM As ProdFileVM, ProjFileVM As ProjFileVM)
+      m_ProdFileVM = ProdFileVM
+      m_ProjFileList.Add(ProjFileVM)
+   End Sub
+
+   Sub New(ProjFileVM As ProjFileVM)
+      m_ProjFileList = New List(Of ProjectFileVM)({ProjFileVM})
+   End Sub
+
+   Sub New(ProdFileVM As ProjectFileVM, ProjFileVMList As List(Of ProjectFileVM))
+      m_ProdFileVM = ProdFileVM
+      m_ProjFileList = ProjFileVMList
+   End Sub
+
+End Class

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml

@@ -1,18 +1,18 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="OpenProjectFileDialogV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core"
-                                 Title="{Binding Title}"
-                                 ResizeMode="NoResize" TitleBarHeight="30"
-                                 WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-                                 MinHeight="500" MinWidth="500"
-                                 DataContext="{Binding RelativeSource={RelativeSource Self}}"
-                                 Style="{StaticResource OptimizerWindow.Dialog}">
+<EgtWPFLib5:EgtCustomWindow x:Class="OpenProjectFileDialogV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core"
+                            Title="{Binding Title}"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
+                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                            MinHeight="500" MinWidth="500"
+                            DataContext="{Binding RelativeSource={RelativeSource Self}}">
 
-   <EgtBEAMWALLCORE:OptimizerWindow.Resources>
+   <EgtWPFLib5:EgtCustomWindow.Resources>
       <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
-   </EgtBEAMWALLCORE:OptimizerWindow.Resources>
+   </EgtWPFLib5:EgtCustomWindow.Resources>
 
    <Grid>
       <Grid.RowDefinitions>
@@ -22,8 +22,8 @@
       </Grid.RowDefinitions>
 
       <GroupBox Header="Filters"
-                Visibility="{Binding Filters_Visibility}"
-                Style="{StaticResource OpenProjectFile_GroupBox}">
+                Margin="5"
+                Visibility="{Binding Filters_Visibility}">
          <Grid>
             <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
@@ -36,23 +36,23 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding BTLDateTypeList}"
                          SelectedIndex="{Binding SelBTLDateType}"
-                         Style="{StaticResource NewOpenProjectFile_ComboBox}"/>
-               <StackPanel Grid.Column="1" 
-                           Style="{StaticResource PartManager_StackPanel}">
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource FeatureComboBox}"/>
+               <StackPanel Grid.Column="1" Orientation="Horizontal">
                   <ComboBox ItemsSource="{Binding DayTypeList}"
                             SelectedIndex="{Binding SelDayType}"
-                            Style="{StaticResource OpenProjectFile_ComboBox}"/>
-                  <StackPanel Visibility="{Binding Date_Visibility}"
-                              Style="{StaticResource PartManager_StackPanel}">
+                            Width="105"
+                            Margin="0,0,2.5,0"
+                            Style="{StaticResource PartParam_ComboBox}"/>
+                  <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
                      <TextBlock Text="{Binding From_Msg}"
                                 Style="{StaticResource Filter_TextBlock}"/>
-                     <DatePicker SelectedDate="{Binding dtStartDate}"                                 
-                                 CalendarStyle="{StaticResource Filter_Calendar}"
+                     <DatePicker SelectedDate="{Binding dtStartDate}"
                                  Style="{StaticResource Filter_DatePicker}"/>
                      <TextBlock Text="{Binding To_Msg}"
                                 Style="{StaticResource Filter_TextBlock}"/>
-                     <DatePicker SelectedDate="{Binding dtEndDate}"                                 
-                                 CalendarStyle="{StaticResource Filter_Calendar}"
+                     <DatePicker SelectedDate="{Binding dtEndDate}"
                                  Style="{StaticResource Filter_DatePicker}"/>
                   </StackPanel>
                </StackPanel>
@@ -65,49 +65,79 @@
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding FilterTypeList}"
                          SelectedItem="{Binding SelFilterType}"
-                         Style="{StaticResource NewOpenProjectFile_ComboBox}"/>
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource FeatureComboBox}"/>
                <EgtWPFLib5:EgtTextBox Grid.Column="1"
                                       Text="{Binding SearchText}"
-                                      Visibility="{Binding SearchText_Visibility}"
-                                      Style="{StaticResource NewSearchText_TextBox}"/>
+                                      Margin="5"
+                                      Visibility="{Binding SearchText_Visibility}"/>
                <StackPanel Grid.Column="2" 
-                           Style="{StaticResource PartManager_StackPanel}">
+                           Orientation="Horizontal">
                   <TextBlock Text="Rows"
-                             Style="{StaticResource Option_TextBlock}"/>
+                             Style="{StaticResource OptionTextBlock}"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
                             SelectedIndex="{Binding SelRowQuantity}"
-                            Style="{StaticResource RowQTY_ComboBox}"/>
+                            Style="{StaticResource FeatureComboBox}"/>
                </StackPanel>
             </Grid>
          </Grid>
       </GroupBox>
 
-      <Border Grid.Row="1" 
-              Style="{StaticResource NewOpenProjectFileDialog_Border}"/>
 
-      <EgtBEAMWALLCORE:EgtDataGrid Grid.Row="1"
-                                   ItemsSource="{Binding ProjectList}" 
-                                   SelectedItem="{Binding SelProject}"
-                                   SelectionMode="Single"
-                                   Margin="5"
-                                   BindingColumns="{Binding ProjectColumns}"
-                                   AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
-                                   AlternationCount="2"
-                                   ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
-                                   Style="{StaticResource Optimizer_DataGrid}"
-                                   CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
-         <DataGrid.RowStyle>
-            <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
-               <Setter Property="IsEnabled" Value="{Binding bIsEnabled}"/>
-               <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
-            </Style>
-         </DataGrid.RowStyle>
+      <!--<StackPanel>
+         <Grid Grid.Row="0" Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*" />
+               <RowDefinition Height="1*" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*" />
+               <ColumnDefinition Width="1*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="{Binding FilterType_Msg}"
+                           Grid.Row="0" Grid.Column="0"
+                           Style="{StaticResource OptionTextBlock}"/>
+            <ComboBox ItemsSource="{Binding SearchColumnList}"
+                          SelectedItem="{Binding SelSearchColumn}"
+                          Width="Auto"
+                          Margin="5"
+                          Grid.Row="0" Grid.Column="1"
+                          Style="{StaticResource FeatureComboBox}"/>
+            <TextBlock Text="{Binding Search_Msg}"
+                           Margin="0,5,0,0"
+                           Grid.Row="1" Grid.Column="0"
+                           Style="{StaticResource OptionTextBlock}"/>
+            <EgtWPFLib5:EgtTextBox Text="{Binding SearchText}"
+                                       Margin="5"
+                                       Grid.Row="1" Grid.Column="1"
+                                       Visibility="{Binding SearchText_Visibility}"/>
+            <Calendar SelectedDatesChanged="Calendar_SelectedDatesChanged"
+                          SelectionMode="MultipleRange" 
+                          Grid.Row="1" Grid.Column="1"
+                          Visibility="{Binding SearchDate_Visibility}"/>
+         </Grid>
+      </StackPanel>-->
+
+      <EgtBEAMWALL:EgtDataGrid Grid.Row="1"
+               ItemsSource="{Binding ProjectList}" 
+               SelectedItem="{Binding SelProject}"
+               CanUserAddRows="False"
+               AutoGenerateColumns="False"
+               CanUserResizeRows="False"
+               SelectionMode="Single"
+               ScrollViewer.CanContentScroll="True" 
+               ScrollViewer.VerticalScrollBarVisibility="Auto"
+               ScrollViewer.HorizontalScrollBarVisibility="Auto"
+               Margin="5"
+               BindingColumns="{Binding ProjectColumns}">
          <DataGrid.Resources>
             <!-- ProjId -->
             <DataGridTextColumn x:Key="colPROJID" Binding="{Binding sProjId}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
@@ -115,7 +145,7 @@
             <DataGridTextColumn x:Key="colPRODID" Binding="{Binding sProdId}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
@@ -123,7 +153,7 @@
             <DataGridTextColumn x:Key="colPROJNAME" Binding="{Binding sDescription}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
@@ -131,7 +161,7 @@
             <DataGridTextColumn x:Key="colBTLNAME" Binding="{Binding sBTLFileName}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
@@ -139,7 +169,7 @@
             <DataGridTextColumn x:Key="colLISTNAME" Binding="{Binding sListName}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.ListName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.ListName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
@@ -147,46 +177,104 @@
             <DataGridTextColumn x:Key="colEXPDATE" Binding="{Binding dtExportDate}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.ExportDate_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
+                     <TextBlock Text="{Binding Path=DataContext.ExportDate_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
             <!-- Creation date -->
             <DataGridTextColumn x:Key="colCRTDATE" Binding="{Binding dtCreateDate}">
                <DataGridTextColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.CreateDate_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
+                  <TextBlock Text="{Binding Path=DataContext.CreateDate_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
             <!-- Machine -->
             <DataGridTextColumn x:Key="colMACHINE" Binding="{Binding sMachine}">
                <DataGridTextColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.Machine_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
+                  <TextBlock Text="{Binding Path=DataContext.Machine_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
             <!-- Name (per Prod) -->
             <DataGridTextColumn x:Key="colNAME" Binding="{Binding sName}">
                <DataGridTextColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALLCORE:OpenProjectFileDialogV}}}"/>
+                  <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
+            <!-- Delete -->
+            <!--
+            <DataGridTemplateColumn x:Key="colDELETE"
+                             Width="Auto"
+                             IsReadOnly="True">
+               <DataGridTemplateColumn.CellTemplate>
+                  <DataTemplate>
+                     <Button Content="X"
+                             Command="{Binding Delete_Command}"/>
+                  </DataTemplate>
+               </DataGridTemplateColumn.CellTemplate>
+            </DataGridTemplateColumn>-->
          </DataGrid.Resources>
-      </EgtBEAMWALLCORE:EgtDataGrid>
+         <!--<ListBox.ItemTemplate>
+            <DataTemplate>
+               <TextBlock Text="{Binding OpenFileName}"
+                          Padding="4,1,4,1">
+                  <TextBlock.InputBindings>
+                     <MouseBinding MouseAction="LeftDoubleClick"
+                                  Command="{Binding DataContext.ProjectDoubleClick_Command, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"
+                                  CommandParameter="{Binding nProjId}" />
+                  </TextBlock.InputBindings>
+               </TextBlock>
+            </DataTemplate>
+         </ListBox.ItemTemplate>-->
+         <DataGrid.RowStyle>
+            <Style TargetType="DataGridRow">
+               <Setter Property="IsEnabled" Value="{Binding bIsEnabled}"/>
+               <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
+            </Style>
+         </DataGrid.RowStyle>
+      </EgtBEAMWALL:EgtDataGrid>
 
-      <UniformGrid Grid.Row="2"
-                   Columns="3"  
-                   Style="{StaticResource AddRawPartWnd_UniformGrid}">
-         <Button Name="OpenBtn"
-                 IsDefault="True"
-                 Content="{Binding Open_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+      <!--<ListBox Grid.Row="0"
+               ItemsSource="{Binding ProjectList}" 
+               SelectedItem="{Binding SelProject}"
+               Margin="5">
+         -->
+      <!--<ListBox.ItemTemplate>
+            <DataTemplate>
+               <TextBlock Text="{Binding ProjFileName}"/>
+            </DataTemplate>
+         </ListBox.ItemTemplate>-->
+      <!--
+         <ListBox.ItemContainerStyle>
+            <Style TargetType="ListBoxItem">
+               <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+               <Setter Property="Padding" Value="0"></Setter>
+            </Style>
+         </ListBox.ItemContainerStyle>
+         <ListBox.ItemTemplate>
+            <DataTemplate>
+               <TextBlock Text="{Binding OpenFileName}"
+                          Padding="4,1,4,1">
+                  <TextBlock.InputBindings>
+                     <MouseBinding MouseAction="LeftDoubleClick"
+                                  Command="{Binding DataContext.ProjectDoubleClick_Command, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"
+                                  CommandParameter="{Binding nProjId}" />
+                  </TextBlock.InputBindings>
+               </TextBlock>
+            </DataTemplate>
+         </ListBox.ItemTemplate>
+      </ListBox>-->
+
+
+      <UniformGrid Columns="3" Grid.Row="2" Margin="0,0,0,5">
+         <Button IsDefault="True" Name="OpenBtn"
+                 Content="{Binding Open_Msg}" Style="{DynamicResource EgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Delete_Msg}"
                  Command="{Binding Delete_Command}"
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
          <Button IsCancel="True"
                  Content="{Binding Cancel_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_Button}"/>
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
       </UniformGrid>
 
    </Grid>
 
-</EgtBEAMWALLCORE:OptimizerWindow>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml.vb

@@ -1,6 +1,12 @@
-Imports System.Windows
+Imports System.ComponentModel
+Imports System.IO
+Imports System.Windows
+Imports System.Windows.Controls
 Imports System.Windows.Input
+Imports EgtBEAMWALL.Core.ConstBeam
+Imports EgtUILib
 Imports EgtWPFLib5
+Imports EgtBEAMWALL
 
 Public Class OpenProjectFileDialogV
 
@@ -72,4 +78,4 @@ Public Class OpenProjectFileDialogV
       Me.DialogResult = bDialogResult
    End Sub
 
-End Class
+End Class

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -4,6 +4,8 @@ Imports System.Windows
 Imports System.Windows.Controls
 Imports System.Windows.Data
 Imports System.Windows.Input
+Imports EgtBEAMWALL.Core
+Imports EgtBEAMWALL.Core.ConstBeam
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -40,8 +42,6 @@ Public MustInherit Class OpenProjectFileDialogVM
 
    Friend Event m_CloseWindow(bDialogResult As Boolean)
 
-   Protected m_GoToProd As Boolean = False
-
    Protected m_ProjectColumns As New ObservableCollection(Of EgtDataGridColumn)
    Public Property ProjectColumns As ObservableCollection(Of EgtDataGridColumn)
       Get
@@ -438,7 +438,7 @@ Public MustInherit Class OpenProjectFileDialogVM
 #Region "METHODS"
 
    Public MustOverride Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean?
-   Public Overridable Sub RefreshProjectList()
+   Public Overridable Sub RefreshProjectList(Optional GoToProd As Boolean = False)
    End Sub
 
    Protected Sub LoadColumns(ProjectType As ProjectType)
@@ -466,9 +466,9 @@ Public MustInherit Class OpenProjectFileDialogVM
          NotifyPropertyChanged(NameOf(BTLDateTypeList))
          NotifyPropertyChanged(NameOf(SelBTLDateType))
          m_FilterTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(FilterTypes.NULL, ""),
-                                                                       New IdNameStruct(FilterTypes.ID, Id_Msg),
-                                                                       New IdNameStruct(FilterTypes.BTLFILENAME, BTLFileName_Msg),
-                                                                       New IdNameStruct(FilterTypes.MACHINE, Machine_Msg)})
+                                                                         New IdNameStruct(FilterTypes.ID, Id_Msg),
+                                                                         New IdNameStruct(FilterTypes.BTLFILENAME, BTLFileName_Msg),
+                                                                         New IdNameStruct(FilterTypes.MACHINE, Machine_Msg)})
          m_SelFilterType = m_FilterTypeList.FirstOrDefault(Function(x) x.Id = FilterTypes.NULL)
          NotifyPropertyChanged(NameOf(SelFilterType))
       End If

EgtBEAMWALL.Core/OptmizerWindow/OptimizerWindow.vb

@@ -1,10 +0,0 @@
-Imports System.Windows
-
-Public Class OptimizerWindow
-   Inherits EgwWPFBaseLib.EgtWindow
-
-   Shared Sub New()
-      DefaultStyleKeyProperty.OverrideMetadata(GetType(OptimizerWindow), New FrameworkPropertyMetadata(GetType(OptimizerWindow)))
-   End Sub
-
-End Class

EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb

@@ -1,4 +1,7 @@
-Public Class ProdFileM
+Imports System.IO
+Imports EgtUILib
+
+Public Class ProdFileM
    Inherits ProjectFileM
 
    Protected m_nProjIdList As List(Of Integer)
@@ -11,13 +14,6 @@
       m_nProjIdList = value
    End Sub
 
-   Protected m_ProjMList As List(Of ProjFileM)
-   Public ReadOnly Property ProjMList As List(Of ProjFileM)
-      Get
-         Return m_ProjMList
-      End Get
-   End Property
-
    Protected m_sName As String
    Public Property sName As String
       Get
@@ -49,38 +45,18 @@
 
    Public Shared Function CreateProdFileM(nProdId As Integer, nProjIdList As List(Of Integer), dtCreateProjDate As DateTime, sName As String, nType As BWType,
                                           sMachine As String, sLockedBy As String, dtLock As DateTime, bIsActive As Boolean, bIsProduced As Boolean, bIsArchived As Boolean) As ProdFileM
-      Dim NewProjectFileM As New ProdFileM With {
-         .m_nProdId = nProdId,
-         .m_nProjIdList = nProjIdList,
-         .m_dtCreateDate = dtCreateProjDate,
-         .m_sName = sName,
-         .m_nType = nType,
-         .m_sMachine = sMachine,
-         .m_sLockedBy = sLockedBy,
-         .m_dtLock = dtLock,
-         .m_bIsActive = bIsActive,
-         .m_bIsProduced = bIsProduced,
-         .m_bIsArchived = bIsArchived
-      }
-      Return NewProjectFileM
-   End Function
-
-   Public Shared Function CreateProdFileM(nProdId As Integer, nProjIdList As List(Of Integer), dtCreateProjDate As DateTime, sName As String, nType As BWType,
-                                          sMachine As String, sLockedBy As String, dtLock As DateTime, bIsActive As Boolean, bIsProduced As Boolean, bIsArchived As Boolean, ProjMList As List(Of ProjFileM)) As ProdFileM
-      Dim NewProjectFileM As New ProdFileM With {
-         .m_nProdId = nProdId,
-         .m_nProjIdList = nProjIdList,
-         .m_dtCreateDate = dtCreateProjDate,
-         .m_sName = sName,
-         .m_nType = nType,
-         .m_sMachine = sMachine,
-         .m_sLockedBy = sLockedBy,
-         .m_dtLock = dtLock,
-         .m_bIsActive = bIsActive,
-         .m_bIsProduced = bIsProduced,
-         .m_bIsArchived = bIsArchived,
-         .m_ProjMList = ProjMList
-      }
+      Dim NewProjectFileM As New ProdFileM
+      NewProjectFileM.m_nProdId = nProdId
+      NewProjectFileM.m_nProjIdList = nProjIdList
+      NewProjectFileM.m_dtCreateDate = dtCreateProjDate
+      NewProjectFileM.m_sName = sName
+      NewProjectFileM.m_nType = nType
+      NewProjectFileM.m_sMachine = sMachine
+      NewProjectFileM.m_sLockedBy = sLockedBy
+      NewProjectFileM.m_dtLock = dtLock
+      NewProjectFileM.m_bIsActive = bIsActive
+      NewProjectFileM.m_bIsProduced = bIsProduced
+      NewProjectFileM.m_bIsArchived = bIsArchived
       Return NewProjectFileM
    End Function
 

EgtBEAMWALL.Core/ProjectFileVM/ProdItem.vb

@@ -1,118 +0,0 @@
-Imports EgtWPFLib5
-Imports System.Windows
-
-Public Class ProdItem
-    Inherits VMBase
-
-   Public Shared m_delUpdateNameInDb As Action(Of Integer, String)
-   Public Shared m_delIsModifiedSetUp As Action(Of Boolean)
-
-   Protected m_ProdFileVM As ProdFileVM
-    Public ReadOnly Property ProdFileVM As ProdFileVM
-        Get
-            Return m_ProdFileVM
-        End Get
-    End Property
-
-    Private m_ProjFileList As New List(Of ProjectFileVM)
-    Public ReadOnly Property ProjFileList As List(Of ProjectFileVM)
-        Get
-            Return m_ProjFileList
-        End Get
-    End Property
-
-    Public ReadOnly Property sProdId As String
-        Get
-            Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sProdId, "")
-        End Get
-    End Property
-
-    Public Overridable Property sName As String
-        Get
-            Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sName, "")
-        End Get
-        Set(value As String)
-         If Not IsNothing(m_ProdFileVM) Then
-            m_delUpdateNameInDb(m_ProdFileVM.nProdId, value)
-            m_ProdFileVM.sName = value
-            m_delIsModifiedSetUp(False)
-         End If
-      End Set
-    End Property
-
-    Public ReadOnly Property dtCreateDate As Date
-        Get
-            Return If(Not IsNothing(m_ProdFileVM), {m_ProdFileVM.dtCreateDate, m_ProjFileList.Min(Function(x) x.dtCreateDate)}.Min(), m_ProjFileList.Min(Function(x) x.dtCreateDate))
-        End Get
-    End Property
-    Public ReadOnly Property sCreateDate As String
-        Get
-            Return dtCreateDate.ToString()
-        End Get
-    End Property
-
-    Public ReadOnly Property sMachine As String
-        Get
-            If Not IsNothing(m_ProdFileVM) Then
-                Return m_ProdFileVM.sMachine
-            ElseIf Not IsNothing(m_ProjFileList(0)) Then
-                Return m_ProjFileList(0).sMachine
-            Else Return ""
-            End If
-        End Get
-    End Property
-
-    Public ReadOnly Property bIsArchived As Boolean
-        Get
-            If Not IsNothing(m_ProdFileVM) Then
-                Return m_ProdFileVM.bIsArchived
-            ElseIf Not IsNothing(m_ProjFileList(0)) Then
-                Return m_ProjFileList(0).bIsArchived
-            Else
-                Return True
-            End If
-        End Get
-    End Property
-
-    Public ReadOnly Property Archived_Visibility As Visibility
-        Get
-            Return If(bIsArchived, Visibility.Visible, Visibility.Collapsed)
-        End Get
-    End Property
-
-    Sub New(ProdFileVM As ProdFileVM, ProjFileVM As ProjFileVM)
-        m_ProdFileVM = ProdFileVM
-        m_ProjFileList.Add(ProjFileVM)
-    End Sub
-
-    Sub New(ProjFileVM As ProjFileVM)
-        m_ProjFileList = New List(Of ProjectFileVM)({ProjFileVM})
-    End Sub
-
-    Sub New(ProdFileVM As ProjectFileVM, ProjFileVMList As List(Of ProjectFileVM))
-        m_ProdFileVM = ProdFileVM
-        m_ProjFileList = ProjFileVMList
-    End Sub
-
-
-   Public Shared Function CreateProdItem(nProdId As Integer, nProjIdList As List(Of Integer), dtCreateProjDate As DateTime, sName As String, nType As BWType,
-                                           sMachine As String, sLockedBy As String, dtLock As DateTime, bIsActive As Boolean, bIsProduced As Boolean, bIsArchived As Boolean, ProjMList As List(Of ProjFileM)) As ProdItem
-
-
-      Dim NewProdFileM = ProdFileM.CreateProdFileM(nProdId, nProjIdList, dtCreateProjDate, sName, nType, sMachine, sLockedBy, dtLock, bIsActive, bIsProduced, bIsArchived)
-      Dim NewProdFileVM = New ProdFileVM(NewProdFileM)
-      Dim NewProjFileVM As IEnumerable(Of ProjectFileVM)
-      NewProjFileVM = ProjMList.Select(Of ProjFileVM)(Function(j) New ProjFileVM(j)).ToList
-      Dim NewProdItem = New ProdItem(NewProdFileVM, NewProjFileVM.ToList)
-
-      Return NewProdItem
-   End Function
-
-   Public Shared Function CreateProdItem(ProjFileM As ProjFileM) As ProdItem
-
-      Dim NewProdItem = New ProdItem(New ProjFileVM(ProjFileM))
-
-      Return NewProdItem
-   End Function
-
-End Class

EgtBEAMWALL.Core/ProjectFileVM/ProjFileM.vb

@@ -1,4 +1,7 @@
-Public Class ProjFileM
+Imports System.IO
+Imports EgtUILib
+
+Public Class ProjFileM
    Inherits ProjectFileM
 
    Protected m_dtExportDate As DateTime
@@ -16,28 +19,28 @@
    End Property
 
    Protected m_sBTLFileName As String = String.Empty
-   Public Property sBTLFileName As String
-      Get
-         Return m_sBTLFileName
-      End Get
-      Set(value As String)
-         m_sBTLFileName = value
-      End Set
-   End Property
+    Public Property sBTLFileName As String
+        Get
+            Return m_sBTLFileName
+        End Get
+        Set(value As String)
+            m_sBTLFileName = value
+        End Set
+    End Property
 
-   Protected m_sDescription As String = String.Empty
-   Public Property sDescription As String
-      Get
-         Return m_sDescription
-      End Get
-      Set(value As String)
-         m_sDescription = value
-      End Set
-   End Property
+    Protected m_sDescription As String = String.Empty
+    Public Property sDescription As String
+        Get
+            Return m_sDescription
+        End Get
+        Set(value As String)
+            m_sDescription = value
+        End Set
+    End Property
 
 #Region "CONSTRUCTORS"
 
-   Protected Sub New()
+    Protected Sub New()
    End Sub
 
    Public Shared Function CreateNewProjFileM() As ProjFileM
@@ -45,21 +48,20 @@
    End Function
 
    Public Shared Function CreateProjFileM(nProjId As Integer, nProdId As Integer, dtCreateProjDate As DateTime, dtExportDate As DateTime, sListName As String, sBTLFileName As String, sDescription As String, IsNew As Boolean, IsLocked As Boolean, nType As BWType, sMachine As String, bIsActive As Boolean, bIsArchived As Boolean) As ProjFileM
-      Dim NewProjectFileM As New ProjFileM With {
-         .m_nProjId = nProjId,
-         .m_nProdId = nProdId,
-         .m_dtCreateDate = dtCreateProjDate,
-         .m_dtExportDate = dtExportDate,
-         .m_sListName = sListName,
-         .m_sBTLFileName = sBTLFileName,
-         .m_sDescription = sDescription,
-         .m_bIsNew = IsNew,
-         .m_bIsLocked = IsLocked,
-         .m_nType = nType,
-         .m_sMachine = sMachine,
-         .m_bIsActive = bIsActive,
-         .m_bIsArchived = bIsArchived
-      }
+      Dim NewProjectFileM As New ProjFileM
+      NewProjectFileM.m_nProjId = nProjId
+      NewProjectFileM.m_nProdId = nProdId
+      NewProjectFileM.m_dtCreateDate = dtCreateProjDate
+      NewProjectFileM.m_dtExportDate = dtExportDate
+      NewProjectFileM.m_sListName = sListName
+      NewProjectFileM.m_sBTLFileName = sBTLFileName
+      NewProjectFileM.m_sDescription = sDescription
+      NewProjectFileM.m_bIsNew = IsNew
+      NewProjectFileM.m_bIsLocked = IsLocked
+      NewProjectFileM.m_nType = nType
+      NewProjectFileM.m_sMachine = sMachine
+      NewProjectFileM.m_bIsActive = bIsActive
+      NewProjectFileM.m_bIsArchived = bIsArchived
       Return NewProjectFileM
    End Function
 

EgtBEAMWALL.Core/ProjectFileVM/ProjectFileM.vb

@@ -1,4 +1,17 @@
-Public Class ProjectFileM
+Imports System.IO
+Imports EgtUILib
+
+Public Class ProjectFileM
+
+   'Protected m_nProjectType As ProjectType
+   'Public ReadOnly Property nProjectType As ProjectType
+   '   Get
+   '      Return m_nProjectType
+   '   End Get
+   'End Property
+   'Public Sub SetProjectType(nProjectType As ProjectType)
+   '   m_nProjectType = nProjectType
+   'End Sub
 
    Protected m_nProjId As Integer = 0
    Public ReadOnly Property nProjId As Integer

EgtBEAMWALL.Core/ProjectManager/ProdFile.vb

@@ -0,0 +1,69 @@
+Imports System.IO
+
+Public Class ProdFile
+
+   'Private m_nProjId As Integer = 0
+   'Public ReadOnly Property nProjId As Integer
+   '   Get
+   '      Return m_nProjId
+   '   End Get
+   'End Property
+
+   'Friend ReadOnly Property sProjPath As String
+   '   Get
+   '      Dim sPath As String = String.Empty
+   '      If IsNothing(m_nProjId) OrElse m_nProjId = 0 Then Return String.Empty
+   '      sPath = refMainWindowVM.MainWindowM.sProjsDir & "\" & nProjId.ToString("0000") & "\" & nProjId.ToString("0000") & FILENAMESEPARATOR
+   '      If Not IsNothing(m_nProdId) AndAlso m_nProdId > 0 Then
+   '         sPath &= nProjId.ToString("0000")
+   '      End If
+   '      sPath &= FILENAMESEPARATOR & BTLFileName & ".nge"
+   '      Return sPath
+   '   End Get
+   'End Property
+
+   Private m_nProdId As Integer = 0
+   Public ReadOnly Property nProdId As Integer
+      Get
+         Return m_nProdId
+      End Get
+   End Property
+   Friend ReadOnly Property sProdPath As String
+      Get
+         Dim sPath As String = String.Empty
+         If IsNothing(m_nProdId) OrElse m_nProdId = 0 Then Return String.Empty
+         Return refMainWindowVM.MainWindowM.sProdsDir & "\" & nProdId.ToString("0000") & "\" & nProdId.ToString("0000") & ".nge"
+      End Get
+   End Property
+
+   'Private m_BTLFileName As String = String.Empty
+   'Public ReadOnly Property BTLFileName As String
+   '   Get
+   '      Return m_BTLFileName
+   '   End Get
+   'End Property
+
+   Private m_NewProd As Boolean
+   Friend Property NewProd As Boolean
+      Get
+         Return m_NewProd
+      End Get
+      Set(value As Boolean)
+         m_NewProd = value
+      End Set
+   End Property
+   Public ReadOnly Property ProjectFileName As String
+      Get
+         Return m_nProdId.ToString("0000")
+      End Get
+   End Property
+
+   Sub New(ProdFileName As String)
+      Integer.TryParse(Path.GetFileNameWithoutExtension(ProdFileName), m_nProdId)
+   End Sub
+
+   Friend Sub SetProdId(nProdId As Integer)
+      m_nProdId = nProdId
+   End Sub
+
+End Class

EgtBEAMWALL.Core/ProjectManager/ProjFileVM.vb

@@ -1,4 +1,8 @@
-Public Class ProjFileVM
+Imports System.IO
+Imports EgtBEAMWALL.Core
+Imports EgtUILib
+
+Public Class ProjFileVM
    Inherits ProjectFileVM
 
    Public ReadOnly Property ProjFileM As ProjFileM

EgtBEAMWALL.Core/ProjectManager/ProjectFileVM.vb

@@ -1,4 +1,6 @@
-Imports EgtUILib
+Imports System.IO
+Imports EgtBEAMWALL.Core
+Imports EgtUILib
 Imports EgtWPFLib5
 
 Public Class ProjectFileVM

EgtBEAMWALL.Core/TitleBar/TitleBarV.xaml

@@ -1,20 +0,0 @@
-<Grid x:Class="TitleBar"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="Auto" />
-      <ColumnDefinition Width="Auto" />
-      <ColumnDefinition Width="*" />
-      <ColumnDefinition Width="Auto" />
-      <ColumnDefinition Width="Auto" />
-      <ColumnDefinition Width="Auto" />
-   </Grid.ColumnDefinitions>
-   <Border Grid.ColumnSpan="6"
-           Style="{StaticResource TitleBar_Border}"/>
-   <Image MinWidth="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
-		    Source="/Resources/EgalwareLogo.ico"/>
-   <ContentControl Grid.Column="1"/>
-   <TextBlock Grid.Column="2"
-		        Text="{Binding sTitle}"
-              Style="{StaticResource TitleBar_TextBlock}"/>
-</Grid>

EgtBEAMWALL.Core/TitleBar/TitleBarV.xaml.vb

@@ -1,41 +0,0 @@
-Imports System.Windows
-
-Public Class TitleBar
-
-   ' Proprietà che permette di attivare e disattivare lo spostamento della finestra
-   Public Shared ReadOnly TitleProperty As DependencyProperty = DependencyProperty.Register("Title", GetType(String), GetType(TitleBar), New PropertyMetadata(""))
-   Public Property Title() As Boolean
-      Get
-         Return CBool(GetValue(TitleProperty))
-      End Get
-      Set(ByVal value As Boolean)
-         SetValue(TitleProperty, value)
-      End Set
-   End Property
-
-   ' Proprietà che permette di attivare e disattivare lo spostamento della finestra
-   Public Shared ReadOnly IsMinimizableProperty As DependencyProperty = DependencyProperty.Register("IsMinimizable", GetType(Boolean), GetType(TitleBar), New PropertyMetadata(True))
-   Public Property IsMinimizable() As Boolean
-      Get
-         Return CBool(GetValue(IsMinimizableProperty))
-      End Get
-      Set(ByVal value As Boolean)
-         SetValue(IsMinimizableProperty, value)
-      End Set
-   End Property
-
-   ' Proprietà che permette di attivare e disattivare il bottone di chiusura della finestra
-   Public Shared ReadOnly IsClosableProperty As DependencyProperty = DependencyProperty.Register("IsClosable", GetType(Boolean), GetType(TitleBar), New PropertyMetadata(True))
-   Public Property IsClosable() As Boolean
-      Get
-         Return CBool(GetValue(IsClosableProperty))
-      End Get
-      Set(ByVal value As Boolean)
-         SetValue(IsClosableProperty, value)
-         If Not value Then
-            IsMinimizable = False
-         End If
-      End Set
-   End Property
-
-End Class

EgtBEAMWALL.Core/Utility/BTLIniFile.vb

@@ -68,6 +68,23 @@ Public Module BTLIniFile
       Return IpGRPList.Count > 0
    End Function
 
+   'Public Function GetBeamPrivateProfileVerifyGRP(IpAppName As String, IpGPRtoVerify As String) As Boolean
+   '   ' ciclo sui tipi di gruppo
+   '   Dim sBTLGroup As String = String.Empty
+   '   If EgtUILib.GetPrivateProfileString(IpAppName, BTL_FTR_GRP, String.Empty, sBTLGroup, m_sBTLIniFile) > 0 Then
+   '      Dim sBTLGroups() As String = sBTLGroup.Split(","c)
+   '      ' verifico numero minimo di parametri
+   '      If sBTLGroups.Count >= 0 Then
+   '         ' cancello spazi
+   '         For Index = 0 To sBTLGroups.Count - 1
+   '            sBTLGroups(Index) = sBTLGroups(Index).Trim()
+   '         Next
+   '      End If
+   '      Return sBTLGroups.Contains(IpGPRtoVerify)
+   '   End If
+   '   Return False
+   'End Function
+
    Public Function CalcBeamPrivateProfileGRP(nGRP As Integer) As Integer
       If nGRP = 1 Or nGRP = 2 Then
          Return 1

EgtBEAMWALL.Core/Utility/Configuration.vb

@@ -1,35 +0,0 @@
-Imports EgtWPFLib5
-Imports EgwProxy.LiMan
-
-Public Module Configuration
-
-   ' Test per comunicazione
-   Public m_commLib As DataSyncro
-
-   ''' <summary>
-   ''' Flag per visualizzare il pulsante Db Attrezzaggi
-   ''' </summary>
-   Private m_bModifySetup As Boolean
-   Public ReadOnly Property bModifySetup As Boolean
-      Get
-         Return m_bModifySetup
-      End Get
-   End Property
-   Public Sub SetModifySetup(value As Boolean)
-      m_bModifySetup = value
-   End Sub
-
-   ''' <summary>
-   ''' Flag per salvare correttamente i dati nel file lua corretto
-   ''' </summary>
-   Private m_bMachConfig As Boolean
-   Public ReadOnly Property bMachConfig As Boolean
-      Get
-         Return m_bMachConfig
-      End Get
-   End Property
-   Public Sub SetMachConfig(value As Boolean)
-      m_bMachConfig = value
-   End Sub
-
-End Module

EgtBEAMWALL.Core/Utility/CoreMap.vb

@@ -2,53 +2,326 @@
 
 Public Module CoreMap
 
+   'Private m_refMainWindowVM As MainWindowVM
+   'Private m_refMyStatusBarVM As MyStatusBarVM
+   'Private m_refProjManagerVM As ProjManagerVM
+   'Private m_refProdManagerVM As ProdManagerVM
+   'Private m_refProjectVM As ProjectVM
+   'Private m_refMainMenuVM As MainMenuVM
    Private m_refMachinePanelVM As MachinePanelVM
    Private m_refMyMachGroupPanelVM As MyMachGroupPanelVM
+   'Private m_refLeftPanelVM As LeftPanelVM
+   'Private m_refBottomPanelVM As BottomPanelVM
+   'Private m_refShowBeamPanelVM As ShowBeamPanelVM
+   'Private m_refConfigurationPageVM As ConfigurationPageVM
+   'Private m_refRawPartListVM As RawPartListVM
+   'Private m_refPartInRawPartListVM As PartInRawPartListVM
+   'Private m_refWarehouseWndVM As WarehouseWndVM
+   'Private m_refFeatureListVM As FeatureListVM
+   'Private m_refFreeContourManagerVM As FreeContourManagerVM
+   'Private m_refFreeContourInputVM As FreeContourInputVM
+   'Private m_refPartManagerVM As PartManagerVM
+   'Private m_refInstrumentPanelVM As InstrumentPanelVM
+   'Private m_refTopPanelVM As TopPanelVM
+   'Private m_refOptimizePanelVM As OptimizePanelVM
+   'Private m_refOpenProjectFileDialogVM As OpenProjectFileDialogVM
 
 #Region "Get"
 
+   'Public ReadOnly Property refMainWindowVM As MainWindowVM
+   '   Get
+   '      Return m_refMainWindowVM
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property refMyStatusBarVM As MyStatusBarVM
+   '   Get
+   '      Return LibMap.refStatusBarVM
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property refProjManagerVM As ProjManagerVM
+   '   Get
+   '      Return m_refProjManagerVM
+   '   End Get
+   'End Property
+   'Public ReadOnly Property refProdManagerVM As ProdManagerVM
+   '   Get
+   '      Return m_refProdManagerVM
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property refProjectVM As ProjectVM
+   '   Get
+   '      Return m_refProjectVM
+   '   End Get
+   'End Property
+
    Public ReadOnly Property refSceneHostVM As SceneHostVM
       Get
          Return LibMap.refSceneHostVM
       End Get
    End Property
 
+   'Public ReadOnly Property refShowPanelVM As ShowPanelVM
+   '   Get
+   '      Return LibMap.refShowPanelVM
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property refMainMenuVM As MainMenuVM
+   '   Get
+   '      Return m_refMainMenuVM
+   '   End Get
+   'End Property
+
    Public ReadOnly Property refMachinePanelVM As MachinePanelVM
       Get
          Return m_refMachinePanelVM
       End Get
    End Property
 
+   'Public ReadOnly Property refLeftPanelVM As LeftPanelVM
+   '   Get
+   '      Return m_refLeftPanelVM
+   '   End Get
+   'End Property
+
    Public ReadOnly Property refMachGroupPanelVM As MyMachGroupPanelVM
       Get
          Return m_refMyMachGroupPanelVM
       End Get
    End Property
 
+   'Public ReadOnly Property refBottomPanelVM As BottomPanelVM
+   '   Get
+   '      Return m_refBottomPanelVM
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property refShowBeamPanelVM As ShowBeamPanelVM
+   '   Get
+   '      Return m_refShowBeamPanelVM
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property refConfigurationPageVM As ConfigurationPageVM
+   '   Get
+   '      Return m_refConfigurationPageVM
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property refRawPartListVM As RawPartListVM
+   '   Get
+   '      Return m_refRawPartListVM
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property refPartInRawPartListVM As PartInRawPartListVM
+   '   Get
+   '      Return m_refPartInRawPartListVM
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property refWarehouseWndVM As WarehouseWndVM
+   '   Get
+   '      Return m_refWarehouseWndVM
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property refFeatureListVM As FeatureListVM
+   '   Get
+   '      Return m_refFeatureListVM
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property refFreeContourManagerVM As FreeContourManagerVM
+   '   Get
+   '      Return m_refFreeContourManagerVM
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property refFreeContourInputVM As FreeContourInputVM
+   '   Get
+   '      Return m_refFreeContourInputVM
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property refPartManagerVM As PartManagerVM
+   '   Get
+   '      Return m_refPartManagerVM
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property refInstrumentPanelVM As MyInstrumentPanelVM
+   '   Get
+   '      Return m_refInstrumentPanelVM
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property refTopPanelVM As TopPanelVM
+   '   Get
+   '      Return m_refTopPanelVM
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property refOptimizePanelVM As OptimizePanelVM
+   '   Get
+   '      Return m_refOptimizePanelVM
+   '   End Get
+   'End Property
+
+   'Public ReadOnly Property refOpenProjectFileDialogVM As OpenProjectFileDialogVM
+   '   Get
+   '      Return m_refOpenProjectFileDialogVM
+   '   End Get
+   'End Property
+
 #End Region    ' Get
 
 #Region "Set"
 
+   'Friend Function SetRefMyStatusBarVM(MyStatusBarVM As MyStatusBarVM) As Boolean
+   '   LibMap.SetRefStatusBarVM(MyStatusBarVM)
+   '   Return Not IsNothing(LibMap.refStatusBarVM)
+   'End Function
+
+   'Friend Function SetRefProjManagerVM(ProjManagerVM As ProjManagerVM) As Boolean
+   '   m_refProjManagerVM = ProjManagerVM
+   '   Return Not IsNothing(m_refProjManagerVM)
+   'End Function
+
+   'Friend Function SetRefProdManagerVM(ProdManagerVM As ProdManagerVM) As Boolean
+   '   m_refProdManagerVM = ProdManagerVM
+   '   Return Not IsNothing(m_refProdManagerVM)
+   'End Function
+
+   'Friend Function SetRefProjectVM(ProjectVM As ProjectVM) As Boolean
+   '   m_refProjectVM = ProjectVM
+   '   Return Not IsNothing(m_refProjectVM)
+   'End Function
+
+   'Friend Function SetRefMainMenuVM(MainMenuVM As MainMenuVM) As Boolean
+   '   m_refMainMenuVM = MainMenuVM
+   '   Return Not IsNothing(m_refMainMenuVM)
+   'End Function
+
    Public Function SetRefSceneHostVM(SceneHostVM As SceneHostVM) As Boolean
       LibMap.SetRefSceneHostVM(SceneHostVM)
       Return Not IsNothing(LibMap.refSceneHostVM)
    End Function
 
+   'Friend Function SetRefShowPanelVM(ShowPanelVM As ShowPanelVM) As Boolean
+   '   LibMap.SetRefShowPanelVM(ShowPanelVM)
+   '   Return Not IsNothing(LibMap.refShowPanelVM)
+   'End Function
+
    Public Function SetRefMachinePanelVM(MachinePanelVM As MachinePanelVM) As Boolean
       m_refMachinePanelVM = MachinePanelVM
       Return Not IsNothing(m_refMachinePanelVM)
    End Function
 
+   'Friend Function SetRefLeftPanelVM(LeftPanelVM As LeftPanelVM) As Boolean
+   '   m_refLeftPanelVM = LeftPanelVM
+   '   Return Not IsNothing(m_refLeftPanelVM)
+   'End Function
+
    Public Function SetRefMachGroupPanelVM(MachGroupPanelVM As MyMachGroupPanelVM) As Boolean
       m_refMyMachGroupPanelVM = MachGroupPanelVM
       Return Not IsNothing(m_refMyMachGroupPanelVM)
    End Function
 
+   'Friend Function SetRefBottomPanelVM(BottomPanelVM As BottomPanelVM) As Boolean
+   '   m_refBottomPanelVM = BottomPanelVM
+   '   Return Not IsNothing(m_refBottomPanelVM)
+   'End Function
+
+   'Friend Function SetRefShowBeamPanelVM(ShowBeamPanelVM As ShowBeamPanelVM) As Boolean
+   '   m_refShowBeamPanelVM = ShowBeamPanelVM
+   '   Return Not IsNothing(m_refShowBeamPanelVM)
+   'End Function
+
+   'Friend Function SetRefConfigurationPageVM(ConfigurationPageVM As ConfigurationPageVM) As Boolean
+   '   m_refConfigurationPageVM = ConfigurationPageVM
+   '   Return Not IsNothing(m_refConfigurationPageVM)
+   'End Function
+
+   'Friend Function SetRefRawPartListVM(RawPartListVM As RawPartListVM) As Boolean
+   '   m_refRawPartListVM = RawPartListVM
+   '   Return Not IsNothing(m_refRawPartListVM)
+   'End Function
+
+   'Friend Function SetRefPartInRawPartListVM(PartInRawPartListVM As PartInRawPartListVM) As Boolean
+   '   m_refPartInRawPartListVM = PartInRawPartListVM
+   '   Return Not IsNothing(m_refPartInRawPartListVM)
+   'End Function
+
+   'Friend Function SetRefWarehouseWndVM(WarehouseWndVM As WarehouseWndVM) As Boolean
+   '   m_refWarehouseWndVM = WarehouseWndVM
+   '   Return Not IsNothing(m_refWarehouseWndVM)
+   'End Function
+
+   'Friend Function SetRefFeatureListVM(FeatureListVM As FeatureListVM) As Boolean
+   '   m_refFeatureListVM = FeatureListVM
+   '   Return Not IsNothing(m_refFeatureListVM)
+   'End Function
+
+   'Friend Function SetRefFreeContourManagerVM(FreeContourManagerVM As FreeContourManagerVM) As Boolean
+   '   m_refFreeContourManagerVM = FreeContourManagerVM
+   '   Return Not IsNothing(m_refFreeContourManagerVM)
+   'End Function
+
+   'Friend Function SetRefFreeContourInputVM(FreeContourInputVM As FreeContourInputVM) As Boolean
+   '   m_refFreeContourInputVM = FreeContourInputVM
+   '   Return Not IsNothing(m_refFreeContourInputVM)
+   'End Function
+
+   'Friend Function SetRefPartManagerVM(PartManagerVM As PartManagerVM) As Boolean
+   '   m_refPartManagerVM = PartManagerVM
+   '   Return Not IsNothing(m_refPartManagerVM)
+   'End Function
+
+   'Friend Function SetRefInstrumentPanelVM(InstrumentPanelVM As InstrumentPanelVM) As Boolean
+   '   m_refInstrumentPanelVM = InstrumentPanelVM
+   '   Return Not IsNothing(m_refInstrumentPanelVM)
+   'End Function
+
+   'Friend Function SetRefTopPanelVM(TopPanelVM As TopPanelVM) As Boolean
+   '   m_refTopPanelVM = TopPanelVM
+   '   Return Not IsNothing(m_refTopPanelVM)
+   'End Function
+
+   'Friend Function SetRefOptimizePanelVM(OptimizePanelVM As OptimizePanelVM) As Boolean
+   '   m_refOptimizePanelVM = OptimizePanelVM
+   '   Return Not IsNothing(m_refOptimizePanelVM)
+   'End Function
+
+   'Friend Function SetRefOpenProjectFileDialogVM(OpenProjectFileDialogVM As OpenProjectFileDialogVM) As Boolean
+   '   m_refOpenProjectFileDialogVM = OpenProjectFileDialogVM
+   '   Return Not IsNothing(m_refOpenProjectFileDialogVM)
+   'End Function
+
 #End Region    ' Set
 
 #Region "Init"
 
+   'Friend Function BeginInit(MainWindowVM As MainWindowVM) As Boolean
+   '   m_refMainWindowVM = MainWindowVM
+   '   Return Not IsNothing(m_refMainWindowVM)
+   'End Function
    Friend Function EndInit() As Boolean
+      'Return Not IsNothing(m_refMainWindowVM) AndAlso Not IsNothing(m_refMainMenuVM) AndAlso
+      '       Not IsNothing(LibMap.refStatusBarVM) AndAlso Not IsNothing(m_refProjManagerVM) AndAlso
+      '       Not IsNothing(m_refProdManagerVM) AndAlso Not IsNothing(m_refConfigurationPageVM) AndAlso
+      '       Not IsNothing(LibMap.refSceneHostVM) AndAlso Not IsNothing(LibMap.refShowPanelVM) AndAlso
+      '       Not IsNothing(m_refMachinePanelVM) AndAlso Not IsNothing(LibMap.refMachGroupPanelVM) AndAlso
+      '       Not IsNothing(m_refRawPartListVM) AndAlso Not IsNothing(m_refWarehouseWndVM) AndAlso
+      '       Not IsNothing(m_refFeatureListVM) AndAlso Not IsNothing(m_refPartInRawPartListVM) AndAlso
+      '       Not IsNothing(m_refFreeContourManagerVM) AndAlso Not IsNothing(m_refFreeContourInputVM) AndAlso
+      '       Not IsNothing(m_refInstrumentPanelVM) AndAlso Not IsNothing(m_refTopPanelVM) AndAlso
+      '       Not IsNothing(m_refPartManagerVM) AndAlso Not IsNothing(m_refOptimizePanelVM) AndAlso
+      '       Not IsNothing(m_refShowBeamPanelVM) AndAlso Not IsNothing(m_refOpenProjectFileDialogVM) AndAlso
+      '       LibMap.EndInit()
       Return Not IsNothing(m_refMachinePanelVM) AndAlso Not IsNothing(LibMap.refMachGroupPanelVM)
    End Function
 

EgtBEAMWALL.Core/Utility/DimensionsIniFile.vb

@@ -1,4 +1,5 @@
 Imports System.Windows
+Imports System.Windows.Controls
 Imports EgtWPFLib5
 Imports EgtUILib
 Imports System.Collections.ObjectModel

EgtBEAMWALL.Core/Utility/Enum.vb

@@ -63,7 +63,6 @@ Public Enum StatusMapOpType
    ChangeProdInProdRequest = 16
    OpenPageInViewOptimRequest = 17
    MachGroupValidationUpdate = 18
-   ChangeProdInOptimizerRequest = 19
 End Enum
 
 Public Enum DimensionType

EgtBEAMWALL.Core/Utility/GridDimension.vb

@@ -1,5 +1,6 @@
 Imports System.Collections.ObjectModel
 Imports System.Windows
+Imports System.Windows.Controls
 Imports EgtWPFLib5
 
 Public Class GridDimension

EgtBEAMWALL.Core/Utility/MachLog.vb

@@ -198,55 +198,50 @@
 #Region "Internal Methods"
 
    Public Shared Function CreateAlarmLog(AlarmOperation As Integer, AlarmType As Integer, AlarmMessage As String, AlarmCode As String, AlarmDateTime As String)
-      Dim NewMachLog As New MachLog With {
-         .m_CommandType = LogCommandTypes.ALARM,
-         .m_AlarmOperation = AlarmOperation,
-         .m_AlarmType = AlarmType,
-         .m_AlarmMessage = AlarmMessage,
-         .m_AlarmCode = AlarmCode
-      }
+      Dim NewMachLog As New MachLog
+      NewMachLog.m_CommandType = LogCommandTypes.ALARM
+      NewMachLog.m_AlarmOperation = AlarmOperation
+      NewMachLog.m_AlarmType = AlarmType
+      NewMachLog.m_AlarmMessage = AlarmMessage
+      NewMachLog.m_AlarmCode = AlarmCode
       DateTime.TryParse(AlarmDateTime, NewMachLog.m_AlarmDateTime)
       Return NewMachLog
    End Function
 
    Public Shared Function CreateOPStateLog(newOpState As Integer)
-      Dim NewMachLog As New MachLog With {
-         .m_CommandType = LogCommandTypes.NEWOP,
-         .m_newOpState = newOpState,
-         .m_AlarmDateTime = DateTime.Now()
-      }
+      Dim NewMachLog As New MachLog
+      NewMachLog.m_CommandType = LogCommandTypes.NEWOP
+      NewMachLog.m_newOpState = newOpState
+      NewMachLog.m_AlarmDateTime = DateTime.Now()
       Return NewMachLog
    End Function
 
    Public Shared Function CreateReadLog(CommandExecutedCorrectly As Boolean, VarAddress As String, VarValue As String)
-      Dim NewMachLog As New MachLog With {
-         .m_CommandType = CommandTypes.READ_TPA,
-         .m_CommandExecutedCorrectly = CommandExecutedCorrectly,
-         .m_VarAddress = VarAddress,
-         .m_VarValue = VarValue,
-         .m_AlarmDateTime = DateTime.Now()
-      }
+      Dim NewMachLog As New MachLog
+      NewMachLog.m_CommandType = CommandTypes.READ_TPA
+      NewMachLog.m_CommandExecutedCorrectly = CommandExecutedCorrectly
+      NewMachLog.m_VarAddress = VarAddress
+      NewMachLog.m_VarValue = VarValue
+      NewMachLog.m_AlarmDateTime = DateTime.Now()
       Return NewMachLog
    End Function
 
    Public Shared Function CreateResultLog(CommandType As LogCommandTypes, CommandState As CommandStates, ResultType As ResultTypes, Description As String)
-      Dim NewMachLog As New MachLog With {
-         .m_CommandType = CommandType,
-         .m_CommandState = CommandState,
-         .m_ResultType = ResultType,
-         .m_Description = Description,
-         .m_AlarmDateTime = DateTime.Now()
-      }
+      Dim NewMachLog As New MachLog
+      NewMachLog.m_CommandType = CommandType
+      NewMachLog.m_CommandState = CommandState
+      NewMachLog.m_ResultType = ResultType
+      NewMachLog.m_Description = Description
+      NewMachLog.m_AlarmDateTime = DateTime.Now()
       Return NewMachLog
    End Function
 
    Public Shared Function CreateMachLog(EventType As MachLogTypes, EventDateTime As DateTime, Value As String, SupervisorID As String)
-      Dim NewMachEvent As New MachLog With {
-         .m_ResultType = EventType,
-         .m_AlarmDateTime = EventDateTime,
-         .m_VarValue = Value,
-         .m_VarAddress = SupervisorID
-      }
+      Dim NewMachEvent As New MachLog
+      NewMachEvent.m_ResultType = EventType
+      NewMachEvent.m_AlarmDateTime = EventDateTime
+      NewMachEvent.m_VarValue = Value
+      NewMachEvent.m_VarAddress = SupervisorID
       Return NewMachEvent
    End Function
 
@@ -255,21 +250,21 @@
 #Region "Public Methods"
 
    Public Shared Function CreateMachLog(AlarmCode As String, AlarmDateTime As Date, AlarmMessage As String, AlarmOperation As Integer, AlarmType As Integer, CommandExecutedCorrectly As Boolean, CommandState As CommandStates, CommandType As LogCommandTypes, Description As String, newOpState As Integer, ResultType As ResultTypes, VarAddress As String, VarValue As String) As MachLog
-      Dim NewMachLog As New MachLog With {
-         .m_AlarmCode = AlarmCode,
-         .m_AlarmDateTime = AlarmDateTime,
-         .m_AlarmMessage = AlarmMessage,
-         .m_AlarmOperation = AlarmOperation,
-         .m_AlarmType = AlarmType,
-         .m_CommandExecutedCorrectly = CommandExecutedCorrectly,
-         .m_CommandState = CommandState,
-         .m_CommandType = CommandType,
-         .m_Description = Description,
-         .m_newOpState = newOpState,
-         .m_ResultType = ResultType,
-         .m_VarAddress = VarAddress,
-         .m_VarValue = VarValue
-      }
+
+      Dim NewMachLog As New MachLog
+      NewMachLog.m_AlarmCode = AlarmCode
+      NewMachLog.m_AlarmDateTime = AlarmDateTime
+      NewMachLog.m_AlarmMessage = AlarmMessage
+      NewMachLog.m_AlarmOperation = AlarmOperation
+      NewMachLog.m_AlarmType = AlarmType
+      NewMachLog.m_CommandExecutedCorrectly = CommandExecutedCorrectly
+      NewMachLog.m_CommandState = CommandState
+      NewMachLog.m_CommandType = CommandType
+      NewMachLog.m_Description = Description
+      NewMachLog.m_newOpState = newOpState
+      NewMachLog.m_ResultType = ResultType
+      NewMachLog.m_VarAddress = VarAddress
+      NewMachLog.m_VarValue = VarValue
 
       Return NewMachLog
    End Function

EgtBEAMWALL.Core/Utility/ManageView.vb

@@ -0,0 +1,81 @@
+Imports EgtUILib
+
+Public Module ManageView
+
+   ' Tipo di progetto aperto
+   Private m_Type As BWType
+
+   ' Per macchine pareti:
+   ' Posizione vista
+   Private m_nViewDir As VT
+
+   Public Function BWSetView(nView As VT, Optional bRedraw As Boolean = True)
+      ' condizioni che cambiano la vista del progetto
+      Select Case m_Type
+         Case BWType.BEAM
+            EgtSetView(VT.ISO_SW, bRedraw)
+         Case BWType.WALL
+            Select Case nView
+               Case VT.TOP
+                  Select Case m_nViewDir
+                     Case VT.ISO_SW, VT.ISO_SE
+                        EgtSetGenericView(0, -90, bRedraw)              ' equivalente a vista TOP
+                     Case VT.ISO_NW, VT.ISO_NE
+                        EgtSetGenericView(0, 90, bRedraw)               ' equivalente a vista TOP ruotata di 180 su Z
+                  End Select
+               Case VT.FRONT
+                  Select Case m_nViewDir
+                     Case VT.ISO_SW, VT.ISO_SE
+                        EgtSetGenericView(90, -90, bRedraw)              ' equivalente a vista FRONT
+                     Case VT.ISO_NW, VT.ISO_NE
+                        EgtSetGenericView(90, 90, bRedraw)               ' equivalente a vista FRONT ruotata di 180 su Z
+                  End Select
+               Case VT.BACK
+                  Select Case m_nViewDir
+                     Case VT.ISO_SW, VT.ISO_SE
+                        EgtSetGenericView(-90, -90, bRedraw)              ' equivalente a vista BACK
+                     Case VT.ISO_NW, VT.ISO_NE
+                        EgtSetGenericView(-90, 90, bRedraw)               ' equivalente a vista BACK ruotata di 180 su Z
+                  End Select
+               Case VT.RIGHT
+                  Select Case m_nViewDir
+                     Case VT.ISO_SW, VT.ISO_SE
+                        EgtSetGenericView(90, 0, bRedraw)              ' equivalente a vista RIGHT
+                     Case VT.ISO_NW, VT.ISO_NE
+                        EgtSetGenericView(-90, 0, bRedraw)               ' equivalente a vista RIGHT ruotata di 180 su Z
+                  End Select
+               Case VT.LEFT
+                  Select Case m_nViewDir
+                     Case VT.ISO_SW, VT.ISO_SE
+                        EgtSetGenericView(-90, 0, bRedraw)              ' equivalente a vista RIGHT
+                     Case VT.ISO_NW, VT.ISO_NE
+                        EgtSetGenericView(90, 0, bRedraw)               ' equivalente a vista RIGHT ruotata di 180 su Z
+                  End Select
+               Case VT.ISO_SW
+                  Select Case m_nViewDir
+                     Case VT.ISO_SW, VT.ISO_SE
+                        EgtSetGenericView(60, 225, bRedraw)              ' equivalente a vista ISO_SW
+                     Case VT.ISO_NW, VT.ISO_NE
+                        EgtSetGenericView(60, 45, bRedraw)               ' equivalente a vista ISO_SW ruotata di 180 su Z
+                  End Select
+               Case Else                                                ' VT.ISO_SW
+                  Select Case m_nViewDir
+                     Case VT.ISO_SW, VT.ISO_SE
+                        EgtSetGenericView(60, 225, bRedraw)              ' equivalente a vista ISO_SW
+                     Case VT.ISO_NW, VT.ISO_NE
+                        EgtSetGenericView(60, 45, bRedraw)               ' equivalente a vista ISO_SW ruotata di 180 su Z
+                  End Select
+            End Select
+      End Select
+
+   End Function
+
+   Public Sub UpdateMachParam(ViewDir As Integer)
+      m_nViewDir = ViewDir
+   End Sub
+
+   Public Sub UpdateBWType(Type As BWType)
+      m_Type = Type
+   End Sub
+
+End Module

EgtBEAMWALL.Core/Utility/MyMachine.vb

@@ -45,4 +45,4 @@ Public Class MyMachine
       Return True
    End Function
 
-End Class
+End Class

EgtBEAMWALL.Core/Utility/SectionXMaterial.vb

@@ -1,4 +1,5 @@
-Imports EgtUILib
+Imports System.Windows
+Imports EgtUILib
 Imports EgtWPFLib5
 
 Public Class SectionXMaterial

EgtBEAMWALL.Core/ViewPanel/ViewPanelV.xaml

@@ -1,49 +1,44 @@
-<StackPanel x:Class="ViewPanelV"
-            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            Style="{StaticResource BTLPartManager_StackPanel}">
+<EgtFloating:EgtFloatingPanel x:Class="ViewPanelV"
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+   IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
+   IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
 
    <Button ToolTip="{Binding ZoomAllToolTip}"
-           Style="{StaticResource Mach_Button}"
+           Style="{StaticResource ToolBar_Button}"
            Command="{Binding ZoomAllCommand}">
-      <Image Source="/Resources/ViewPanel/ZoomAll.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/ViewPanel/ZoomAll.png" Stretch="Uniform"/>
    </Button>
    <Button ToolTip="{Binding LookFromTopToolTip}"
-           Style="{StaticResource Mach_Button}"
+           Style="{StaticResource ToolBar_Button}"
            Command="{Binding TopViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromTOP.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/ViewPanel/LookFromTOP.png" Stretch="Uniform"/>
    </Button>
    <Button ToolTip="{Binding LookFromFrontToolTip}"
-           Style="{StaticResource Mach_Button}"
+           Style="{StaticResource ToolBar_Button}"
            Command="{Binding FrontViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromFRONT.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/ViewPanel/LookFromFRONT.png" Stretch="Uniform"/>
    </Button>
    <Button ToolTip="{Binding LookFromRightToolTip}"
-           Style="{StaticResource Mach_Button}"
+           Style="{StaticResource ToolBar_Button}"
            Command="{Binding RightViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromRIGHT.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/ViewPanel/LookFromRIGHT.png" Stretch="Uniform"/>
    </Button>
    <Button ToolTip="{Binding LookFromBackToolTip}"
-           Style="{StaticResource Mach_Button}"
+           Style="{StaticResource ToolBar_Button}"
            Command="{Binding BackViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromBACK.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/ViewPanel/LookFromBACK.png" Stretch="Uniform"/>
    </Button>
    <Button ToolTip="{Binding LookFromLeftToolTip}"
-           Style="{StaticResource Mach_Button}"
+           Style="{StaticResource ToolBar_Button}"
            Command="{Binding LeftViewCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromLEFT.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/ViewPanel/LookFromLEFT.png" Stretch="Uniform"/>
    </Button>
    <Button ToolTip="{Binding LookFromIso_SWToolTip}"
-           Style="{StaticResource Mach_Button}"
+           Style="{StaticResource ToolBar_Button}"
            Command="{Binding IsoViewSWCommand}">
-      <Image Source="/Resources/ViewPanel/LookFromISO_SW.png"
-             Style="{StaticResource BTLDataWnd_Image}"/>
+      <Image Source="/Resources/ViewPanel/LookFromISO_SW.png" Stretch="Uniform"/>
    </Button>
 
-</StackPanel>
+</EgtFloating:EgtFloatingPanel>

EgtBEAMWALL.Core/ViewPanel/ViewPanelVM.vb

@@ -1,4 +1,5 @@
-Imports EgtUILib
+Imports EgtBEAMWALL.Core.ConstBeam
+Imports EgtUILib
 
 Public Class ViewPanelVM
    Inherits EgtWPFLib5.ViewPanelVM
@@ -15,6 +16,26 @@ Public Class ViewPanelVM
    Private Shared m_nViewDir As VT = VT.ISO_SW
 
    Public Shared Sub BWSetView(nView As VT, Optional bRedraw As Boolean = True)
+      ' condizioni che cambiano la vista del progetto
+      'Select Case m_Type
+      '   Case BWType.BEAM
+      '      Select Case nView
+      '         Case VT.TOP
+      '            EgtSetView(VT.TOP, bRedraw)
+      '         Case VT.FRONT
+      '            EgtSetView(VT.FRONT, bRedraw)
+      '         Case VT.BACK
+      '            EgtSetView(VT.BACK, bRedraw)
+      '         Case VT.RIGHT
+      '            EgtSetView(VT.RIGHT, bRedraw)
+      '         Case VT.LEFT
+      '            EgtSetView(VT.LEFT, bRedraw)
+      '         Case VT.ISO_SW
+      '            EgtSetView(VT.ISO_SW, bRedraw)
+      '         Case Else                                                ' VT.ISO_SW
+      '            EgtSetView(VT.ISO_SW, bRedraw)
+      '      End Select
+      '   Case BWType.WALL
       Select Case nView
          Case VT.TOP
             Select Case m_nViewDir
@@ -134,8 +155,32 @@ Public Class ViewPanelVM
 
 #End Region ' RightViewCommand
 
+   '#Region "IsoViewSECommand"
+
+   '   ''' <summary>
+   '   ''' Returns a command that do IsoViewSE.
+   '   ''' </summary>
+   '   Public ReadOnly Property IsoViewSECommand As ICommand
+   '      Get
+   '         If m_cmdIsoViewSE Is Nothing Then
+   '            m_cmdIsoViewSE = New Command(AddressOf IsoViewSE)
+   '         End If
+   '         Return m_cmdIsoViewSE
+   '      End Get
+   '   End Property
+
+   '   ''' <summary>
+   '   ''' Execute the IsoViewSE.  This method is invoked by the IsoViewSECommand.
+   '   ''' </summary>
+   '   Public Sub IsoViewSE(ByVal param As Object)
+   '      LibMap.refSceneHostVM.MainScene.IsoViewSE()
+   '   End Sub
+
+   '#End Region ' IsoViewSECommand
+
 #Region "IsoViewSWCommand"
 
+
    ''' <summary>
    ''' Execute the IsoViewSW.  This method is invoked by the IsoViewSWCommand.
    ''' </summary>
@@ -145,6 +190,75 @@ Public Class ViewPanelVM
 
 #End Region ' IsoViewSWCommand
 
+   '#Region "IsoViewNECommand"
+
+   '   ''' <summary>
+   '   ''' Returns a command that do IsoViewNE.
+   '   ''' </summary>
+   '   Public ReadOnly Property IsoViewNECommand As ICommand
+   '      Get
+   '         If m_cmdIsoViewNE Is Nothing Then
+   '            m_cmdIsoViewNE = New Command(AddressOf IsoViewNE)
+   '         End If
+   '         Return m_cmdIsoViewNE
+   '      End Get
+   '   End Property
+
+   '   ''' <summary>
+   '   ''' Execute the IsoViewNE.  This method is invoked by the IsoViewNECommand.
+   '   ''' </summary>
+   '   Public Sub IsoViewNE(ByVal param As Object)
+   '      LibMap.refSceneHostVM.MainScene.IsoViewNE()
+   '   End Sub
+
+   '#End Region ' IsoViewNECommand
+
+   '#Region "IsoViewNWCommand"
+
+   '   ''' <summary>
+   '   ''' Returns a command that do IsoViewNW.
+   '   ''' </summary>
+   '   Public ReadOnly Property IsoViewNWCommand As ICommand
+   '      Get
+   '         If m_cmdIsoViewNW Is Nothing Then
+   '            m_cmdIsoViewNW = New Command(AddressOf IsoViewNW)
+   '         End If
+   '         Return m_cmdIsoViewNW
+   '      End Get
+   '   End Property
+
+   '   ''' <summary>
+   '   ''' Execute the IsoViewNW.  This method is invoked by the IsoViewNWCommand.
+   '   ''' </summary>
+   '   Public Sub IsoViewNW(ByVal param As Object)
+   '      LibMap.refSceneHostVM.MainScene.IsoViewNW()
+   '   End Sub
+
+   '#End Region ' IsoViewNWCommand
+
+   '#Region "ViewToCPlaneCommand"
+
+   '   ''' <summary>
+   '   ''' Returns a command that do GetDist.
+   '   ''' </summary>
+   '   Public ReadOnly Property ViewToCPlaneCommand As ICommand
+   '      Get
+   '         If m_cmdViewToCPlane Is Nothing Then
+   '            m_cmdViewToCPlane = New Command(AddressOf ViewToCPlane)
+   '         End If
+   '         Return m_cmdViewToCPlane
+   '      End Get
+   '   End Property
+
+   '   ''' <summary>
+   '   ''' Execute the GetDist.  This method is invoked by the GetDistCommand.
+   '   ''' </summary>
+   '   Public Sub ViewToCPlane(ByVal param As Object)
+   '      LibMap.refSceneHostVM.MainScene.CPlaneView()
+   '   End Sub
+
+   '#End Region ' ViewToCPlaneCommand
+
 #End Region    ' COMMANDS
 
 End Class

EgtBEAMWALL.Core/app.config

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

EgtBEAMWALL.Core/packages.config

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="EgwProxy.LiMan" version="1.0.2408.718" targetFramework="net472" />
-  <package id="EgwWPFBaseLib" version="2.7.11-beta.4" targetFramework="net472" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="13.0.4" targetFramework="net472" />
-  <package id="RestSharp" version="111.2.0" targetFramework="net472" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
-  <package id="System.Memory" version="4.5.5" targetFramework="net472" />
-  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
-  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net472" />
-  <package id="System.Text.Json" version="8.0.3" targetFramework="net472" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
-</packages>

EgtBEAMWALL.DataLayer/Controllers/ProdController.cs

@@ -2,7 +2,6 @@
 using NLog;
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
 using System.Linq;
 using static EgtBEAMWALL.Core.ConstBeam;
 
@@ -209,11 +208,11 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <summary>
         /// Elenco prod
         /// </summary>
-        /// <param name="NumRecord">Num max record da recuperare</param>
+        /// <param name="numRecord">Num max record da recuperare</param>
         /// <param name="OnlyActive">Solo con ALMENO 1 PROJ attivo (senza cancellazione logica)</param>
         /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
         /// <returns></returns>
-        public List<Core.ProdFileM> GetLastDesc(int NumRecord, bool OnlyActive, bool ShowArchived = false)
+        public List<Core.ProdFileM> GetLastDesc(int numRecord, bool OnlyActive, bool ShowArchived = false)
         {
             List<Core.ProdFileM> result = new List<Core.ProdFileM>();
             //List<ProdModel> dbResult = GetLastDbModelDesc(numRecord);
@@ -221,9 +220,9 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 // se numRecord = 0 --> passo tutti
-                if (NumRecord == 0)
+                if (numRecord == 0)
                 {
-                    NumRecord = localDbCtx.ProdList.Count();
+                    numRecord = localDbCtx.ProdList.Count();
                 }
                 // retrieve
                 dbResult = localDbCtx
@@ -236,7 +235,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                         (p, e) => p)
                     .Distinct()
                     .OrderByDescending(x => x.ProdId)
-                    .Take(NumRecord)
+                    .Take(numRecord)
                     .ToList();
             }
 
@@ -248,13 +247,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <summary>
         /// Elenco prod
         /// </summary>
-        /// <param name="DtStart">Inizio periodo estrazione</param>
-        /// <param name="DtEnd">Fine periodo estrazione</param>
-        /// <param name="NumRecord">Num max record da recuperare</param>
+        /// <param name="dtStart">Inizio periodo estrazione</param>
+        /// <param name="dtEnd">Fine periodo estrazione</param>
+        /// <param name="numRecord">Num max record da recuperare</param>
         /// <param name="OnlyActive">Solo con ALMENO 1 PROJ attivo (senza cancellazione logica)</param>
         /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
         /// <returns></returns>
-        public List<Core.ProdFileM> GetLastDesc(DateTime DtStart, DateTime DtEnd, int NumRecord, bool OnlyActive, bool ShowArchived = false)
+        public List<Core.ProdFileM> GetLastDesc(DateTime dtStart, DateTime dtEnd, int numRecord, bool OnlyActive, bool ShowArchived = false)
         {
             List<Core.ProdFileM> result = new List<Core.ProdFileM>();
             //List<ProdModel> dbResult = GetLastDbModelDesc(numRecord);
@@ -262,14 +261,14 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 // se numRecord = 0 --> passo tutti
-                if (NumRecord == 0)
+                if (numRecord == 0)
                 {
-                    NumRecord = localDbCtx.ProdList.Count();
+                    numRecord = localDbCtx.ProdList.Count();
                 }
                 // retrieve
                 dbResult = localDbCtx
                     .ProdList
-                    .Where(x => x.DtCreated >= DtStart && x.DtCreated <= DtEnd && (!x.IsArchived || ShowArchived))
+                    .Where(x => x.DtCreated >= dtStart && x.DtCreated <= dtEnd && (!x.IsArchived || ShowArchived))
                     // condizione join sui PROJ
                     .Join(localDbCtx.ProjList.Where(x => x.IsActive || !OnlyActive),
                         p => p.ProdDbId,
@@ -277,7 +276,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                         (p, e) => p)
                     .Distinct()
                     .OrderByDescending(x => x.ProdId)
-                    .Take(NumRecord)
+                    .Take(numRecord)
                     .ToList();
             }
 
@@ -286,183 +285,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return result;
         }
 
-        /// <summary>
-        /// Elenco prod
-        /// </summary>
-        /// <param name="NumRecord">Num max record da recuperare</param>
-        /// <param name="OnlyActive">Solo con ALMENO 1 PROJ attivo (senza cancellazione logica)</param>
-        /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
-        /// <returns></returns>
-        public List<Core.ProdItem> GetLastDescFull(int NumRecord, bool OnlyActive, bool ShowArchived = false)
-        {
-            List<Core.ProdItem> result = new List<Core.ProdItem>();
-            // elenco prod completi
-            List<ProdModel> dbResultProd = new List<ProdModel>();
-            // elenco proj "orfani"
-            List<ProjModel> dbResultProj = new List<ProjModel>();
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // se numRecord = 0 --> passo tutti
-                if (NumRecord == 0)
-                {
-                    NumRecord = localDbCtx.ProdList.Count();
-                }
-                // recupero PROD + proj relativi
-                dbResultProd = localDbCtx
-                            .ProdList
-                            .Where(x => (!x.IsArchived || ShowArchived))
-                            //.Include(j => j.)
-                            // condizione join sui PROJ
-                            .Join(localDbCtx.ProjList.Where(x => x.IsActive || !OnlyActive),
-                                p => p.ProdDbId,
-                                e => e.ProdDbId,
-                                (p, e) => p)
-                            .Distinct()
-                            .Include(j => j.ProjListNav)
-                            .OrderByDescending(x => x.ProdId)
-                            .Take(NumRecord)
-                            .ToList();
-
-                // recupero i proj "orfani"
-                dbResultProj = localDbCtx
-                            .ProjList
-                            .Where(x => (x.IsActive || !OnlyActive) && x.Prod == null)
-                            .OrderByDescending(x => x.ProjId)
-                            .Take(NumRecord)
-                            .ToList();
-            }
-
-            // conversione
-            result = dbResultProd.Select(x => coreItemConv(x)).ToList();
-            var resProj = dbResultProj.Select(x => coreItemConv(x)).ToList();
-            // sommo i risultati
-            result.AddRange(resProj);
-            return result;
-        }
-
-        /// <summary>
-        /// Elenco prod
-        /// </summary>
-        /// <param name="DtStart">Inizio periodo estrazione</param>
-        /// <param name="DtEnd">Fine periodo estrazione</param>
-        /// <param name="NumRecord">Num max record da recuperare</param>
-        /// <param name="OnlyActive">Solo con ALMENO 1 PROJ attivo (senza cancellazione logica)</param>
-        /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
-        /// <returns></returns>
-        public List<Core.ProdItem> GetLastDescFull(DateTime DtStart, DateTime DtEnd, int NumRecord, bool OnlyActive, bool ShowArchived = false)
-        {
-            List<Core.ProdItem> result = new List<Core.ProdItem>();
-            // elenco prod completi
-            List<ProdModel> dbResultProd = new List<ProdModel>();
-            // elenco proj "orfani"
-            List<ProjModel> dbResultProj = new List<ProjModel>();
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // se numRecord = 0 --> passo tutti
-                if (NumRecord == 0)
-                {
-                    NumRecord = localDbCtx.ProdList.Count();
-                }
-                // retrieve
-                dbResultProd = localDbCtx
-                            .ProdList
-                            .Where(x => x.DtCreated >= DtStart && x.DtCreated <= DtEnd && (!x.IsArchived || ShowArchived))
-                            // condizione join sui PROJ
-                            .Join(localDbCtx.ProjList.Where(x => x.IsActive || !OnlyActive),
-                                p => p.ProdDbId,
-                                e => e.ProdDbId,
-                                (p, e) => p)
-                            .Distinct()
-                            .Include(j => j.ProjListNav)
-                            .OrderByDescending(x => x.ProdId)
-                            .Take(NumRecord)
-                            .ToList();
-
-                // recupero i proj "orfani"
-                dbResultProj = localDbCtx
-                            .ProjList
-                            .Where(x => (x.IsActive || !OnlyActive) && x.Prod == null && (x.DtCreated >= DtStart && x.DtCreated <= DtEnd))
-                            .OrderByDescending(x => x.ProjId)
-                            .Take(NumRecord)
-                            .ToList();
-            }
-            // conversione
-            result = dbResultProd.Select(x => coreItemConv(x)).ToList();
-            var resProj = dbResultProj.Select(x => coreItemConv(x)).ToList();
-            // sommo i risultati
-            result.AddRange(resProj);
-            return result;
-        }
-
-        /// <summary>
-        /// Elenco prod
-        /// </summary>
-        /// <param name="DtStart">Inizio periodo estrazione</param>
-        /// <param name="DtEnd">Fine periodo estrazione</param>
-        /// <param name="DtIsCreation">Ture: usa data creazione / False: usa data export</param>
-        /// <param name="NumRecord">Num max record da recuperare</param>
-        /// <param name="OnlyActive">Solo con ALMENO 1 PROJ attivo (senza cancellazione logica)</param>
-        /// <param name="Machine">Nome Macchina (default vuoto = non usato)</param>
-        /// <param name="BtlFileName">Nome file BTL  (default vuoto = non usato)</param>
-        /// <param name="ListName">Nome List  (default vuoto = non usato)</param>
-        /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
-        /// <returns></returns>
-        public List<Core.ProdItem> GetLastDescFull(DateTime DtStart, DateTime DtEnd, bool DtIsCreation, int NumRecord, bool OnlyActive, string Machine = "", string BtlFileName = "", string ListName = "", bool ShowArchived = false)
-        {
-            List<Core.ProdItem> result = new List<Core.ProdItem>();
-            List<ProdModel> dbResultProd = new List<ProdModel>();
-            // elenco proj "orfani"
-            List<ProjModel> dbResultProj = new List<ProjModel>();
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // se numRecord = 0 --> passo tutti
-                if (NumRecord == 0)
-                {
-                    NumRecord = localDbCtx.ProdList.Count();
-                }
-                // retrieve
-                dbResultProd = localDbCtx
-                            .ProdList
-                            .Where(x =>  (!x.IsArchived || ShowArchived))
-                            // condizione join sui PROJ
-                            .Join(localDbCtx.ProjList.Where(x => 
-                                    (x.IsActive || !OnlyActive)
-                                    && (string.IsNullOrEmpty(Machine) || x.Machine.ToLower().Contains(Machine.ToLower()))
-                                    && (string.IsNullOrEmpty(BtlFileName) || x.BTLFileName.ToLower().Contains( BtlFileName.ToLower()))
-                                    && (string.IsNullOrEmpty(ListName) || x.ListName.ToLower().Contains(ListName.ToLower()))
-                                    && ((DtIsCreation && (x.DtCreated >= DtStart && x.DtCreated <= DtEnd)) || (!DtIsCreation && (x.DtExported >= DtStart && x.DtExported <= DtEnd))) 
-                                    ),
-                                p => p.ProdDbId,
-                                e => e.ProdDbId,
-                                (p, e) => p)
-                            .Distinct()
-                            .Include(j => j.ProjListNav)
-                            .OrderByDescending(x => x.ProdId)
-                            .Take(NumRecord)
-                            .ToList();
-
-                // recupero i proj "orfani"
-                dbResultProj = localDbCtx
-                            .ProjList
-                            .Where(x => 
-                            (x.IsActive || !OnlyActive) 
-                            && x.Prod == null
-                            && (string.IsNullOrEmpty(Machine) || x.Machine.ToLower().Contains(Machine.ToLower()))
-                            && (string.IsNullOrEmpty(BtlFileName) || x.BTLFileName.ToLower().Contains(BtlFileName.ToLower()))
-                            && (string.IsNullOrEmpty(ListName) || x.ListName.ToLower().Contains(ListName.ToLower()))
-                            && ((DtIsCreation && (x.DtCreated >= DtStart && x.DtCreated <= DtEnd)) || (!DtIsCreation && (x.DtExported >= DtStart && x.DtExported <= DtEnd))))
-                            .OrderByDescending(x => x.ProjId)
-                            .Take(NumRecord)
-                            .ToList();
-            }
-            // conversione
-            result = dbResultProd.Select(x => coreItemConv(x)).ToList();
-            var resProj = dbResultProj.Select(x => coreItemConv(x)).ToList();
-            // sommo i risultati
-            result.AddRange(resProj);
-            return result;
-        }
-
         /// <summary>
         /// Fornisce nuovo indice VUOTO da usare (allocando sul DB)
         /// </summary>
@@ -1088,29 +910,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         protected Core.ProdFileM coreConv(ProdModel currProd)
         {
             Core.ProdFileM answ = Core.ProdFileM.CreateProdFileM(currProd.ProdId, ProjIdByProd(currProd.ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate, currProd.IsActive, currProd.IsProduced, currProd.IsArchived);
-            //Core.ProdFileM answ = Core.ProdFileM.CreateProdFileM(currProd.ProdId, ProjIdByProd(currProd.ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate, currProd.IsActive, currProd.IsProduced, currProd.IsArchived, currProd.ProjListNav.Select(j => Core.ProjFileM.CreateProjFileM(j.ProjId, currProd.ProdId, j.DtCreated, j.DtExported, j.ListName, j.BTLFileName, j.ProjDescription, j.IsNew, j.Locked, j.PType, j.Machine, j.IsActive, j.IsActive)).ToList());
-            return answ;
-        }
-
-        /// <summary>
-        /// Helper conversione modelli verso prodItem
-        /// </summary>
-        /// <param name="currProd"></param>
-        /// <returns></returns>
-        protected Core.ProdItem coreItemConv(ProdModel currProd)
-        {
-            Core.ProdItem answ = Core.ProdItem.CreateProdItem(currProd.ProdId, ProjIdByProd(currProd.ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate, currProd.IsActive, currProd.IsProduced, currProd.IsArchived, currProd.ProjListNav.Select(j => Core.ProjFileM.CreateProjFileM(j.ProjId, currProd.ProdId, j.DtCreated, j.DtExported, j.ListName, j.BTLFileName, j.ProjDescription, j.IsNew, j.Locked, j.PType, j.Machine, j.IsActive, j.IsActive)).ToList());
-            return answ;
-        }
-
-        /// <summary>
-        /// Helper conversione modelli verso prodItem da singolo proj
-        /// </summary>
-        /// <param name="currProd"></param>
-        /// <returns></returns>
-        protected Core.ProdItem coreItemConv(ProjModel currProj)
-        {
-            Core.ProdItem answ = Core.ProdItem.CreateProdItem(Core.ProjFileM.CreateProjFileM(currProj.ProjId, 0, currProj.DtCreated, currProj.DtExported, currProj.ListName, currProj.BTLFileName, currProj.ProjDescription, currProj.IsNew, currProj.Locked, currProj.PType, currProj.Machine, currProj.IsActive, currProj.IsActive));
             return answ;
         }
 

EgtBEAMWALL.DataLayer/Controllers/ProjController.cs

@@ -33,8 +33,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 var dbResult = localDbCtx
                        .ProjList
                        .Where(x => x.BTLFileName == BTLFileName)
-                       //valutare se usare solo attivi...
-                       //.Where(x => x.BTLFileName == BTLFileName && x.IsActive == true)
                        .FirstOrDefault();
 
                 //se avesse trovato-- > riporto id...
@@ -583,7 +581,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// Update record su DB x elenco BTLParts
         /// </summary>
         /// <param name="ProjId"></param>
-        /// <param name="BtlPartList"></param>
+        /// <param name="newBTLFileName"></param>
         /// <returns></returns>
         public ProjModel UpdateBtlParts(int ProjId, List<Core.BTLPartM> BtlPartList)
         {

EgtBEAMWALL.DataLayer/DatabaseModels/ProdModel.cs

@@ -19,11 +19,6 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
     {
         #region Public Properties
 
-        public ProdModel()
-        {
-            ProjListNav = new HashSet<ProjModel>();
-        }
-
         /// <summary>
         /// Chiave univoca DB
         /// </summary>
@@ -103,11 +98,6 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         [Column("IsArchived")]
         public bool IsArchived { get; set; } = false;
 
-        /// <summary>
-        /// Collezione oggetti Proj associati (almeno 1 by design)
-        /// </summary>
-        public virtual ICollection<ProjModel> ProjListNav { get; set; }
-
         #endregion Public Properties
     }
 }

EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj

@@ -71,7 +71,7 @@
       <HintPath>..\packages\MySql.Data.EntityFramework.8.0.21\lib\net452\MySql.Data.EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.5.0.1\lib\net46\NLog.dll</HintPath>

EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs

@@ -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.7.1.1")]
-[assembly: AssemblyFileVersion("2.7.1.1")]
+[assembly: AssemblyVersion("2.7.4.1")]
+[assembly: AssemblyFileVersion("2.7.4.1")]

EgtBEAMWALL.DataLayer/packages.config

@@ -9,7 +9,7 @@
   <package id="K4os.Hash.xxHash" version="1.0.8" targetFramework="net472" />
   <package id="MySql.Data" version="8.0.21" targetFramework="net472" />
   <package id="MySql.Data.EntityFramework" version="8.0.21" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="13.0.4" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
   <package id="NLog" version="5.0.1" targetFramework="net472" />
   <package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net472" />
   <package id="SSH.NET" version="2016.1.0" targetFramework="net472" />

EgtBEAMWALL.Optimizer/AboutBoxWindow/AboutBoxV.xaml

@@ -1,52 +0,0 @@
-<Window x:Class="AboutBoxV"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="AboutBox" Height="400" Width="360" WindowStyle="None" ResizeMode="NoResize"
-        ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
-
-   <Border BorderThickness="2" BorderBrush="LightBlue">
-      <Grid >
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.5*"/>
-            <ColumnDefinition Width="5*"/>
-            <ColumnDefinition Width="0.5*"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="1.75*"/>
-            <RowDefinition Height="0.15*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="2.5*"/>
-            <RowDefinition Height="0.35*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.35*"/>
-         </Grid.RowDefinitions>
-
-         <Grid Grid.Column="1" Grid.Row="1">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="3*"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Border Name="LogoBrd" Grid.Column="1" Background="White">
-               <Image Source="/Resources/AboutBox/EgalwareLogo.png" Stretch="Uniform"/>
-            </Border>
-         </Grid>
-         <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
-                    VerticalAlignment="Center" FontSize="18" />
-         <TextBlock Name="VersionLbl" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center"
-                    VerticalAlignment="Center" FontSize="18"/>
-         <TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Center"
-                    VerticalAlignment="Center" FontSize="12" />
-         <TextBox Name="InfoLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Stretch"
-                  VerticalAlignment="Stretch" FontSize="12" IsReadOnly="True" TextWrapping="Wrap"/>
-         <Button Name="ExitBtn" Grid.Column="1" Grid.Row="8" IsCancel="True"
-                 Margin="100,0"/>
-
-      </Grid>
-
-   </Border>
-
-</Window>

EgtBEAMWALL.Optimizer/AboutBoxWindow/AboutBoxV.xaml.vb

@@ -1,40 +0,0 @@
-Imports EgtUILib
-Imports EgtBEAMWALL.Core
-
-Public Class AboutBoxV
-
-   Private Sub AboutBoxWD_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
-      DescriptionLbl.Text = My.Application.Info.Description.ToString()
-      VersionLbl.Text = "Version : " & My.Application.Info.Version.Major.ToString() &
-                                 "." & My.Application.Info.Version.Minor.ToString() &
-                                 (ChrW(97 - 1 + My.Application.Info.Version.Build)).ToString() &
-                                 My.Application.Info.Version.Revision.ToString()
-      CopyrightLbl.Text = My.Application.Info.Copyright.ToString()
-      Dim sInfo As String = String.Empty
-      Dim sKey As String = String.Empty
-      EgtGetKeyInfo(sKey)
-      Dim sKlev As String = Map.refMainWindowVM.MainWindowM.nKeyLevel.ToString()
-      Dim sOpts As String = Map.refMainWindowVM.MainWindowM.nKeyOptions.ToString()
-      Dim sLeftDays As String = ""
-      Dim nLeftDays As Integer 
-      if EgtGetKeyLeftDays( nLeftDays) AndAlso nLeftDays < 500 Then sLeftDays= " (" & nLeftDays.ToString() & ")"
-      sInfo = If( EgtIsDebug(), "*** Debug Libraries ***" & Environment.NewLine, "") 
-      sInfo &= "User " & Environment.MachineName & "\" & Environment.UserName &
-                       " (" & Map.refMainWindowVM.MainWindowM.nInstance.ToString() & ")" & Environment.NewLine
-      sInfo &= sKey & " - " & sKlev & " - " & sOpts & sLeftDays & Environment.NewLine
-      sInfo &= "DataRoot " & Map.refMainWindowVM.MainWindowM.sDataRoot & Environment.NewLine
-      sInfo &= "MachinesRoot " & Map.refMainWindowVM.MainWindowM.sMachinesRoot & Environment.NewLine
-      Dim sOpSys As String = String.Empty
-      EgtGetOsInfo( sOpSys)
-      sInfo &= sOpSys & Environment.NewLine
-      Dim sCPU As String = String.Empty
-      EgtGetCpuInfo( sCPU)
-      sInfo &= sCPU & Environment.NewLine
-      Dim sScene As String = String.Empty
-      EgtGetSceneInfo(sScene)
-      sInfo &= sScene
-      InfoLbl.Text = sInfo
-      ExitBtn.Content = EgtMsg(10104)          'Ok
-   End Sub
-
-End Class

EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml

@@ -1,109 +0,0 @@
-<EgtBEAMWALLCORE:OptimizerWindow x:Class="AddFeatureWndV"
-                                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                                 xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
-                                 SizeToContent="WidthAndHeight"
-                                 WindowStartupLocation="CenterOwner"
-                                 Title="AddProcess"
-                                 Style="{StaticResource OptimizerWindow.Dialog.NoClose}">
-
-   <Grid Margin="5">
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="Auto"/>
-         <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="Auto"/>
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Border Style="{StaticResource AddFeatureWnd_Border}">
-      <TextBlock Text="{Binding Process_Msg}"
-                 Style="{StaticResource List_TextBlock}"/>
-      </Border>
-      <Border Grid.Row="1" 
-              Style="{StaticResource PRCList_Border}">
-         <ListBox Grid.Row="1"
-                  ItemsSource="{Binding PRCListView}"
-                  SelectedItem="{Binding nSelPRC}"
-                  Style="{StaticResource NewAddFeature_ListBox}"
-                  ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}">
-            <ListBox.ItemTemplate>
-               <DataTemplate>
-                  <TextBlock Text="{Binding ghDesc}"
-                             ToolTip="{Binding ghDesc}"
-                             Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"
-                             Style="{StaticResource PRCList_TextBlock}"/>
-               </DataTemplate>
-            </ListBox.ItemTemplate>
-         </ListBox>
-      </Border>
-      <Border Grid.Column="1"
-              Style="{StaticResource Custom_Border}">
-         <TextBlock Grid.Column="1"
-                    Text="{Binding Custom_Msg}"
-                    Style="{StaticResource List_TextBlock}"/>
-      </Border>
-      <Border Grid.Row="1" 
-              Grid.Column="1" 
-              Style="{StaticResource MacroCustomList_Border}">
-         <ListBox ItemsSource="{Binding MacroCustomList}"
-                  SelectedIndex="{Binding nSelMacroCustom}"
-                  Style="{StaticResource MacroCustom_ListBox}">
-            <ListBox.ItemsPanel>
-               <ItemsPanelTemplate>
-                  <WrapPanel Style="{StaticResource MacroCustom_WrapPanel}"/>
-               </ItemsPanelTemplate>
-            </ListBox.ItemsPanel>
-            <ListBox.ItemTemplate>
-               <DataTemplate>
-                  <Grid>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="1*"/>
-                     </Grid.RowDefinitions>
-                     <TextBlock Text="{Binding sMacroName}"
-                                Style="{StaticResource Macro_TextBlock}"/>
-                     <Image Grid.Row="1" 
-                            Source="{Binding sMacroDrawPath}"
-                            Style="{StaticResource Macro_Image}"/>
-                  </Grid>
-               </DataTemplate>
-            </ListBox.ItemTemplate>
-         </ListBox>
-      </Border>
-      <Border Grid.Column="2" 
-              Style="{StaticResource Default_Border}">
-         <TextBlock Text="{Binding Default_Msg}"
-                    Style="{StaticResource List_TextBlock}"/>
-      </Border>
-      <Border Grid.Row="1" 
-              Grid.Column="2" 
-              Style="{StaticResource MacroDefaultList_Border}">
-         <ListBox ItemsSource="{Binding MacroDefaultList}"
-                  SelectedIndex="{Binding nSelMacroDefault}"
-                  Style="{StaticResource MacroDefault_ListBox}"
-                  ItemContainerStyle="{StaticResource AlternationIndex_ListBoxItem}">
-            <ListBox.ItemTemplate>
-               <DataTemplate>
-                  <TextBlock Text="{Binding sMacroName}"
-                             Style="{StaticResource MacroDefault_TextBlock}"/>
-               </DataTemplate>
-            </ListBox.ItemTemplate>
-         </ListBox>
-      </Border>
-      <UniformGrid Columns="2"
-                   Grid.Row="2"
-                   Grid.ColumnSpan="3"
-                   Style="{StaticResource AddFeatureWnd_UniformGrid}">
-         <Button Content="{Binding OK_Msg}"
-                 Command="{Binding Ok_Command}"
-                 IsDefault="True"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
-         <Button Content="{Binding Cancel_Msg}"
-                 IsCancel="True"
-                 Style="{StaticResource EgtWPFLib5_Button}"/>
-      </UniformGrid>
-   </Grid>
-</EgtBEAMWALLCORE:OptimizerWindow>

EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndV.xaml.vb

@@ -1,17 +0,0 @@
-Public Class AddFeatureWndV
-
-   Private WithEvents m_AddFeatureWndVM As AddFeatureWndVM
-
-   Sub New(Owner As Window, AddFeatureWndVM As AddFeatureWndVM)
-      ' La chiamata è richiesta dalla finestra di progettazione.
-      InitializeComponent()
-      Me.DataContext = AddFeatureWndVM
-      ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
-      m_AddFeatureWndVM = AddFeatureWndVM
-   End Sub
-
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_AddFeatureWndVM.m_CloseWindow
-      Me.DialogResult = bDialogResult
-   End Sub
-
-End Class