Refresh lib

.gitignore

@@ -327,4 +327,3 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 
-.ionide/symbolCache.db

.gitlab-ci.yml

@@ -1,121 +0,0 @@
-variables:
- NUGET_PATH: 'C:\Tools\nuget.exe'
- MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe'
- ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools'
- EXE_RELEASE_FOLDER: 'c:\Projetcs\Compiled\GPW\Release'
- DEPLOY_FOLDER: 'c:\Projects\Deploy\GPW\Builds'
- APP_NAME: 'EgtBEAMWALL'
- APP_NAMEG: 'EgtBEAMWALL'
- NEW_REL: ''
- VERS_RD: 'Release'
- ARCH: 'x86'
- ARCH64: 'x64'
- OUTPUT_DIR: ''
- NET_SHARE: '\\10.74.82.201\Artifacts\EgtProg\EgtBEAMWALL'
- NET_USER: 'steamw\steamware'
- 
-# helper x mount cartella Artifacts su truenas
-.ReplicaCompiled: &ReplicaCompiled
-  - |
-    rm -Recurse Z:\$CI_COMMIT_BRANCH\$env:ARCH\*.*
-    rm -Recurse Z:\$CI_COMMIT_BRANCH\$env:ARCH\*.*
-    ROBOCOPY /E $env:APP_NAME\bin\$env:ARCH\$env:VERS_RD Z:\$CI_COMMIT_BRANCH\$env:ARCH /XF *.xml /XF *.pdb
-    ROBOCOPY /E $env:APP_NAME2\bin\$env:ARCH\$env:VERS_RD Z:\$CI_COMMIT_BRANCH\$env:ARCH /XF *.xml /XF *.pdb
-    SLEEP 2
-    net use Z: /delete
-
-.ReplicaCompileds2: &ReplicaCompileds2
-  - |
-    ROBOCOPY /E $env:APP_NAME\bin\$env:ARCH64\$env:VERS_RD Z:\$CI_COMMIT_BRANCH\$env:ARCH64 /XF *.xml /XF *.pdb
-    ROBOCOPY /E $env:APP_NAME2\bin\$env:ARCH64\$env:VERS_RD Z:\$CI_COMMIT_BRANCH\$env:ARCH64 /XF *.xml /XF *.pdb
-    SLEEP 2
-    net use Z: /delete
-
-.MakeFolderM: &MakeFolderM
-  - |
-    net use Z: /delete
-    new-item c:\EgtProg\EgtBEAMWALL -itemtype directory
-    net use Z: $env:NET_SHARE 
-    
-.nuget-fix: &nuget-fix
-  - |
-    $hasSource = C:\Tools\nuget.exe sources list | find "`"Steamware Nexus`"" /C
-    if ($hasSource -eq 0) {
-        C:\Tools\nuget.exe sources Add -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"$NEXUS_PASSWD`""
-    } else {
-        C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"$NEXUS_PASSWD`""
-    }
-    echo $hasSource
-
-
-# helper creazione hash files
-.hashBuild: &hashBuild
-   - |
-      $Target = "Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip"
-      $MD5 = Get-FileHash $Target -Algorithm MD5
-      $SHA1 = Get-FileHash $Target -Algorithm SHA1
-      New-Item $Target".md5"
-      New-Item $Target".sha1"
-      $MD5.Hash | Set-Content -Path $Target".md5"
-      $SHA1.Hash | Set-Content -Path $Target".sha1"
-
-      echo "Created HASH files for $Target"      
-
-.cleanup-dir: &cleanup-dir
-   - |
-      rm $env:APP_NAME\bin\$env:ARCH\$env:VERS_RD\*.xml
-      rm $env:APP_NAME\bin\$env:ARCH\$env:VERS_RD\*.pdb
-      rm $env:APP_NAME\bin\$env:ARCH64\$env:VERS_RD\*.xml
-      rm $env:APP_NAME\bin\$env:ARCH64\$env:VERS_RD\*.pdb
-
-stages:
- - build
- - deploy
- 
-X86:build:
- stage: build
- tags:
-   - win
- only:
-   - main
-   - master
-   - develop
- variables:
-   APP_NAME: EgtBEAMWALL.Supervisor
-   APP_NAME2: EgtBEAMWALL.ViewerOptimizer
-   VERS_RD: 'Release'
-   ARCH: 'x86'
-   ARCH64: 'x64'
- before_script:
-   - *nuget-fix
-   - '& "$env:NUGET_PATH" restore EgtBEAMWALL.sln -verbosity quiet'
-   - *MakeFolderM
- script:  
-    - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.vbproj" -target:Build /p:Configuration=$env:VERS_RD /p:Platform="$env:ARCH" /p:OutputPath=bin/$env:ARCH/$env:VERS_RD/ /verbosity:minimal /m'
-    - '& "$env:MSBUILD_PATH" "$env:APP_NAME2\$env:APP_NAME2.vbproj" -target:Build /p:Configuration=$env:VERS_RD /p:Platform="$env:ARCH" /p:OutputPath=bin/$env:ARCH/$env:VERS_RD/ /verbosity:minimal /m'
-    - *ReplicaCompiled
-   
-
-X64:build:
- stage: build
- tags:
-   - win
- only:
-   - main
-   - master
-   - develop
- variables:
-   APP_NAME: EgtBEAMWALL.Supervisor
-   APP_NAME2: EgtBEAMWALL.ViewerOptimizer
-   VERS_RD: 'Release'
-   ARCH: 'x86'
-   ARCH64: 'x64'
- before_script:
-   - *nuget-fix
-   - '& "$env:NUGET_PATH" restore EgtBEAMWALL.sln -verbosity quiet'
-   - *MakeFolderM
- script:  
-    - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.vbproj" -target:Build /p:Configuration=$env:VERS_RD /p:Platform="$env:ARCH64" /p:OutputPath=bin/$env:ARCH64/$env:VERS_RD/ /verbosity:minimal /m'
-    - '& "$env:MSBUILD_PATH" "$env:APP_NAME2\$env:APP_NAME2.vbproj" -target:Build /p:Configuration=$env:VERS_RD /p:Platform="$env:ARCH64" /p:OutputPath=bin/$env:ARCH64/$env:VERS_RD/ /verbosity:minimal /m'
-    - *ReplicaCompileds2
-

EgtBEAMWALL.Core/BTL Model/BTLFeatureM.vb

@@ -1,14 +1,15 @@
 Imports System.Collections.ObjectModel
-Imports System.Globalization
 Imports System.Windows
+Imports System.Windows.Input
+Imports System.Windows.Media
 Imports EgtUILib
 Imports EgtWPFLib5
 
 Public Class BTLFeatureM
 
    ' Feature a cui appartiene il parametro
-   Protected m_ParentPart As Object
-   Public ReadOnly Property ParentPart As Object
+   Protected m_ParentPart As BTLPartM
+   Public ReadOnly Property ParentPart As BTLPartM
       Get
          Return m_ParentPart
       End Get
@@ -89,16 +90,6 @@ Public Class BTLFeatureM
       End Set
    End Property
 
-   Protected m_nPriority As Integer = 0
-   Public Overridable Property nPriority As Integer
-      Get
-         Return m_nPriority
-      End Get
-      Set(value As Integer)
-         m_nPriority = value
-      End Set
-   End Property
-
    ' Nome
    Protected m_sName As String
    Public ReadOnly Property sName As String
@@ -130,16 +121,6 @@ Public Class BTLFeatureM
       End Set
    End Property
 
-   Protected m_VARIANTList As New ObservableCollection(Of Integer)()
-   Public Property VARIANTList As ObservableCollection(Of Integer)
-      Get
-         Return m_VARIANTList
-      End Get
-      Set(value As ObservableCollection(Of Integer))
-         m_VARIANTList = value
-      End Set
-   End Property
-
    Protected m_sDES As String = String.Empty
    Public Property sDES As String
       Get
@@ -150,16 +131,6 @@ Public Class BTLFeatureM
       End Set
    End Property
 
-   Public Overridable Property nSelVARIANT As Integer
-      Get
-         Dim nDes As Integer = 0
-         Return If(Integer.TryParse(m_sDES, nDes), nDes, 0)
-      End Get
-      Set(value As Integer)
-         m_sDES = value.ToString()
-      End Set
-   End Property
-
    Protected m_frFRAME As New Frame3d
    Public Property frFRAME As Frame3d
       Get
@@ -203,7 +174,7 @@ Public Class BTLFeatureM
    Protected m_sCALC_MSG As String
    Public Property sCALC_MSG As String
       Get
-         Return MessageFromLuaMsg(m_sCALC_MSG)
+         Return m_sCALC_MSG
       End Get
       Set(value As String)
          m_sCALC_MSG = value
@@ -263,22 +234,20 @@ Public Class BTLFeatureM
 #Region "CONSTRUCTOR"
 
    Protected Sub New()
-      CreateVariantList()
    End Sub
 
    Public Shared Function CreateNewBTLFeature() As BTLFeatureM
       Return New BTLFeatureM
    End Function
 
-   Public Shared Function CreateBTLFeature(ParentPart As Object, nFeatureId As Integer, Optional bIsBTL As Boolean = True) As BTLFeatureM
+   Public Shared Function CreateBTLFeature(ParentPart As BTLPartM, nFeatureId As Integer) As BTLFeatureM
       Dim NewBTLFeature As New BTLFeatureM
       NewBTLFeature.m_ParentPart = ParentPart
       NewBTLFeature.m_nFeatureId = nFeatureId
-      ' leggo gruppo, numero feature, lato e priorità
+      ' leggo gruppo, numero feature e lato
       EgtGetInfo(nFeatureId, BTL_FTR_GRP, NewBTLFeature.m_nSelGRP)
       EgtGetInfo(nFeatureId, BTL_FTR_PRC, NewBTLFeature.m_nPRC)
       EgtGetInfo(nFeatureId, BTL_FTR_SIDE, NewBTLFeature.m_nSelSIDE)
-      EgtGetInfo(nFeatureId, BTL_FTR_PRIORITY, NewBTLFeature.m_nPriority)
       Dim nDO As Integer = 1
       If EgtGetInfo(nFeatureId, BTL_FTR_DO, nDO) Then
          NewBTLFeature.m_bDO = (nDO <> 0)
@@ -289,26 +258,19 @@ Public Class BTLFeatureM
       EgtGetInfo(nFeatureId, BTL_FTR_DES, NewBTLFeature.m_sDES)
       EgtGetInfo(nFeatureId, BTL_FTR_PRID, NewBTLFeature.m_nPRID)
       EgtGetInfo(nFeatureId, BTL_FTR_FRAME, NewBTLFeature.m_frFRAME)
-      ' leggo parametri della feature
-      GetBeamPrivateProfileGRPList(CalcBeamPrivateProfileGRP(NewBTLFeature.m_nSelGRP), NewBTLFeature.m_nPRC, NewBTLFeature.m_GRPList)
-      GetBeamPrivateProfileName(NewBTLFeature.m_nSelGRP, NewBTLFeature.m_nPRC, NewBTLFeature)
-      ' crea parametri per questa feature da file ini
-      NewBTLFeature.CreateFeatureParams(NewBTLFeature)
-      ' leggo parametri delle feature
-      NewBTLFeature.ReadFeatureParams()
       ' leggo calc error
       Dim nErr As Integer = 0
       Dim nRot As Integer = 0
       Dim sMsg As String = ""
       Dim bCalc As Boolean = False
-      If bIsBTL Then
-         bCalc = EgtGetInfo(NewBTLFeature.nFeatureId, ITG_PROJ_ERR, nErr)
-         EgtGetInfo(nFeatureId, ITG_PROJ_ROT, nRot)
-         EgtGetInfo(nFeatureId, ITG_PROJ_MSG, sMsg)
-      Else
+      If IsNothing(ParentPart) Then
          bCalc = EgtGetInfo(NewBTLFeature.nFeatureId, ITG_PROD_ERR, nErr)
          EgtGetInfo(nFeatureId, ITG_PROD_ROT, nRot)
          EgtGetInfo(nFeatureId, ITG_PROD_MSG, sMsg)
+      Else
+         bCalc = EgtGetInfo(NewBTLFeature.nFeatureId, ITG_PROJ_ERR, nErr)
+         EgtGetInfo(nFeatureId, ITG_PROJ_ROT, nRot)
+         EgtGetInfo(nFeatureId, ITG_PROJ_MSG, sMsg)
       End If
       If Not bCalc Then
          NewBTLFeature.m_nState = CalcStates.NOTCALCULATED
@@ -319,45 +281,52 @@ Public Class BTLFeatureM
          NewBTLFeature.m_nCALC_ERR = nErr
          NewBTLFeature.m_nCALC_ROT = nRot
          NewBTLFeature.m_sCALC_MSG = sMsg
-         Select Case nErr
-            Case 0
-               NewBTLFeature.nState = CalcStates.OK
-            Case 22
-               NewBTLFeature.nState = CalcStates.COLLISION
-            Case 17, 19
-               NewBTLFeature.nState = CalcStates.WARNING
-            Case < 0
-               NewBTLFeature.nState = CalcStates.INFO
-            Case > 0
-               NewBTLFeature.nState = CalcStates.ERROR_
-         End Select
+         If nErr = 0 Then
+            NewBTLFeature.nState = CalcStates.OK
+         ElseIf nErr = 17 Then
+            NewBTLFeature.nState = CalcStates.WARNING
+         ElseIf nErr > 0 Then
+            NewBTLFeature.nState = CalcStates.ERROR_
+         ElseIf nErr < 0 Then
+            NewBTLFeature.nState = CalcStates.INFO
+         End If
       End If
+      ' leggo parametri della feature
+      GetBeamPrivateProfileGRPList(CalcBeamPrivateProfileGRP(NewBTLFeature.m_nSelGRP), NewBTLFeature.m_nPRC, NewBTLFeature.m_GRPList)
+      GetBeamPrivateProfileName(NewBTLFeature.m_nSelGRP, NewBTLFeature.m_nPRC, NewBTLFeature)
+      ' crea parametri per questa feature da file ini
+      NewBTLFeature.CreateFeatureParams(NewBTLFeature)
+      ' leggo parametri delle feature
+      NewBTLFeature.ReadFeatureParams()
       Return NewBTLFeature
    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_bDO = True
       ' crea parametri per questa feature da file ini
       NewBTLFeature.CreateFeatureParams(NewBTLFeature)
       Return NewBTLFeature
    End Function
 
-   Private Sub CreateVariantList()
-      Dim sMaxIndex As String = ""
-      Dim nMaxIndex As Integer = 0
-      EgtUILib.GetPrivateProfileString([VARIANT], K_MAXINDEX, "", sMaxIndex, m_sBTLIniFile)
-      Integer.TryParse(sMaxIndex, nMaxIndex)
-      For Index As Integer = 0 To nMaxIndex
-         m_VARIANTList.Add(Index)
-      Next
-   End Sub
+   'Sub New(ParentPart As BTLPartM, nFeatureId As Integer)
+   '   m_ParentPart = ParentPart
+   '   m_nFeatureId = nFeatureId
+   '   m_PParamList = New ObservableCollection(Of BTLParam)
+   '   m_QParamList = New ObservableCollection(Of BTLParam)
+   'End Sub
+
+   'Sub New(nPRC As Integer, nGRP As Integer, nSIDE As Integer)
+   '   m_PParamList = New ObservableCollection(Of BTLParam)
+   '   m_QParamList = New ObservableCollection(Of BTLParam)
+   '   m_nPRC = nPRC
+   '   m_nSelGRP = nGRP
+   '   m_nSelSIDE = nSIDE
+   '   m_bDO = True
+   'End Sub
 
 #End Region    ' CONSTRUCTOR
 
@@ -394,21 +363,15 @@ Public Class BTLFeatureM
       Dim TempList As New List(Of BTLParamM)
       Dim NewBTLParam As BTLParamM = Nothing
       ' leggo tutti i P della feature
-      While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, nSelVARIANT, True, ParamIndex, Me, NewBTLParam)
+      While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, True, ParamIndex, Me, NewBTLParam)
          TempList.Add(NewBTLParam)
          ParamIndex += 1
       End While
-      If TempList.Count <= 0 Then
-         While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, 0, True, ParamIndex, Me, NewBTLParam)
-            TempList.Add(NewBTLParam)
-            ParamIndex += 1
-         End While
-      End If
       NewBTLFeature.PBTLParamMList = TempList
       ' leggo tutti i Q della feature
       ParamIndex = 1
       TempList = New List(Of BTLParamM)
-      While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, nSelVARIANT, False, ParamIndex, Me, NewBTLParam)
+      While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, False, ParamIndex, Me, NewBTLParam)
          TempList.Add(NewBTLParam)
          ParamIndex += 1
       End While
@@ -425,36 +388,17 @@ Public Class BTLFeatureM
       For Each Param As BTLParamM In ParamList
          If Param.nType = BTLParamType.DOUBLE_ Or Param.nType = BTLParamType.LENGTH Then
             Dim dParamValue As Double = 0
-            Dim sReadName As String = Param.sName
-            If IsFreeContour() Then
-               Select Case Param.sName
-                  Case "P05"
-                     sReadName = "DEPTH"
-                  Case "P07"
-                     sReadName = "PCKT"
-                  Case "P13"
-                     sReadName = "CNT_TYPE"
-                  Case "P14"
-                     sReadName = "CNT_DATA"
-                  Case "P15"
-                     sReadName = "CNT_PAR"
-               End Select
-            End If
-            If Not EgtGetInfo(m_nFeatureId, sReadName, dParamValue) Then
+            If Not EgtGetInfo(m_nFeatureId, Param.sName, dParamValue) Then
                dParamValue = 0
             End If
             ' se è un parametro P setto il valore letto nel DB
             If Param.bIsP Then
                Param.SetValue(dParamValue)
             Else
-               ' recupero info Custom
+               ' se è un parametro Q verifico nel progetto se sia un valore custom
                Dim nCustom As Integer = 0
                EgtGetInfo(nFeatureId, Param.sName & "A", nCustom)
-               'se pezzo parent di tipo Part
-               If TypeOf m_ParentPart Is PartM Then
-                  Param.SetValue(dParamValue)
-                  ' se è un parametro Q verifico nel progetto se sia un valore custom
-               ElseIf nCustom = 1 Then
+               If nCustom = 1 Then
                   Param.SetValue(dParamValue)
                   Param.bCustom = True
                   ' altrimenti lo setto al valore di default
@@ -463,19 +407,7 @@ Public Class BTLFeatureM
                   Dim dReadValue As Double = 0
                   EgtGetInfo(m_nFeatureId, Param.sName, dReadValue)
                   If dReadValue <> Param.dDefault Then
-                     ' Disabilito segnalazione modificato
-                     Dim DisableMgr As New DisableModifiedMgr
                      EgtSetInfo(m_nFeatureId, Param.sName, Param.dDefault)
-                     'se pezzo parent di tipo BTL
-                     If TypeOf m_ParentPart Is BTLPartM AndAlso m_bDO Then
-                        Dim BTLPartM As BTLPartM = DirectCast(m_ParentPart, BTLPartM)
-                        EgtRemoveInfo(BTLPartM.m_nPartId, ITG_PROJ_ERR)
-                        EgtRemoveInfo(BTLPartM.m_nPartId, ITG_PROJ_MSG)
-                        EgtRemoveInfo(BTLPartM.m_nPartId, ITG_PROJ_FALL)
-                        EgtRemoveInfo(BTLPartM.m_nPartId, ITG_PROJ_ROT)
-                     End If
-                     ' Ripristino stato segnalazione modifica
-                     DisableMgr.ReEnable()
                      bToRecalc = True
                   End If
                   Param.bCustom = False
@@ -492,20 +424,12 @@ Public Class BTLFeatureM
          End If
       Next
       ' Se necessario ricalcolo, lo eseguo
-      If Not IsFreeContour() And bToRecalc Then
-         ' Disabilito segnalazione modificato
-         Dim DisableMgr As New DisableModifiedMgr
+      If bToRecalc Then
          UpdateParams()
-         ' Ripristino stato segnalazione modifica
-         DisableMgr.ReEnable()
       End If
       Return True
    End Function
 
-   ' funzione che rilegge i parametri Q
-   Public Function ReadQValues()
-      Return ReadFeatureParams(m_QBTLParamMList)
-   End Function
    ' funzione che setta i valori di default a tutti i parametri
    Public Function SetDefaultValues() As Boolean
       Return SetDefaultValues(m_PBTLParamMList) And SetDefaultValues(m_QBTLParamMList)
@@ -516,7 +440,7 @@ Public Class BTLFeatureM
          If Param.nType = BTLParamType.DOUBLE_ Or Param.nType = BTLParamType.LENGTH Then
             Param.SetValue(Param.dDefault)
          ElseIf Param.nType = BTLParamType.STRING_ Then
-            Param.SetValue(Param.sDefault)
+            Param.SetValue("")
          ElseIf Param.nType = BTLParamType.COMBO Then
             Param.nSelValue = Param.dDefault
          End If
@@ -527,24 +451,26 @@ Public Class BTLFeatureM
    ' funzione che calcola array dei valori dei parametri
    Public Function CalcParamArray(ByRef vPar() As Double, ByRef sPar As String, ByRef vParQ() As String) As Boolean
       ' verifico che lista parametri non sia vuota
-      If Not IsNothing(m_PBTLParamMList) AndAlso m_PBTLParamMList.Count > 0 Then
-         ' calcolo lunghezza array Parametri
-         Dim nLastParId As Integer = m_PBTLParamMList(m_PBTLParamMList.Count - 1).nId - 1
-         Dim vTempPar(nLastParId) As Double
-         Dim sTempPar As String = String.Empty
-         ' carico tutti i parametri su array
-         For ParIndex = 0 To m_PBTLParamMList.Count - 1
-            Dim BTLPar As BTLParamM = DirectCast(m_PBTLParamMList(ParIndex), BTLParamM)
-            Select Case BTLPar.nType
-               Case BTLParamType.DOUBLE_, BTLParamType.LENGTH
-                  vTempPar(BTLPar.nId - 1) = BTLPar.dValue
-               Case BTLParamType.STRING_
-                  sTempPar = BTLPar.sValue
-            End Select
-         Next
-         vPar = vTempPar
-         sPar = If(String.IsNullOrEmpty(sTempPar), " ", sTempPar)
-      End If
+      If IsNothing(m_PBTLParamMList) OrElse m_PBTLParamMList.Count = 0 Then Return False
+      ' calcolo lunghezza array Parametri
+      Dim nLastParId As Integer = m_PBTLParamMList(m_PBTLParamMList.Count - 1).nId - 1
+      Dim vTempPar(nLastParId) As Double
+      Dim sTempPar As String = String.Empty
+      ' carico tutti i parametri su array
+      For ParIndex = 0 To m_PBTLParamMList.Count - 1
+         Dim BTLPar As BTLParamM = DirectCast(m_PBTLParamMList(ParIndex), BTLParamM)
+         Select Case BTLPar.nType
+            Case BTLParamType.DOUBLE_, BTLParamType.LENGTH
+               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
+      sPar = If(String.IsNullOrEmpty(sTempPar), " ", sTempPar)
       ' Determino parametri Q
       Dim vTempParQ(m_QBTLParamMList.Count) As String
       For ParQIndex = 0 To m_QBTLParamMList.Count - 1
@@ -560,47 +486,40 @@ Public Class BTLFeatureM
 
    ' funzione che aggiorna parametri della feature
    Public Function UpdateParams(nNewGRP As Integer, nNewPRC As Integer, nNewSIDE As Integer, sNewDesc As String, nNewProcId As Integer,
-                                frNewRef As Frame3d, vNewParP() As Double, sNewPar As String, vNewParQ As String(), Optional bUpdate As Boolean = True) As Boolean
-      ' Recupero parametri originali della feature
-      Dim vPar() As Double = {}
+                                frNewRef As Frame3d, vNewParP() As Double, sNewPar As String, vNewParQ As String()) As Boolean
+      ' aggiorno la feature con nuovo valore
+      Dim vPar() As Double = Nothing
       Dim sPar As String = String.Empty
-      Dim vParQ() As String = {}
+      Dim vParQ() As String = Nothing
       CalcParamArray(vPar, sPar, vParQ)
-      ' recupero eventuali percorsi originali della feature
-      Dim nCrvId As Integer = GDB_ID.NULL
-      Dim nCrv2Id As Integer = GDB_ID.NULL
-      GetFreeContourPaths(nCrvId, nCrv2Id)
-      ' modifica della feature con i nuovi parametri
       Dim nFeatureId As Integer = EgtBeamModifyProcess(Me.nFeatureId, nNewGRP, nNewPRC, nNewSIDE, sNewDesc, nNewProcId,
-                                                       frNewRef, vNewParP, sNewPar, vNewParQ, nCrvId, nCrv2Id, bUpdate)
+                                                       frNewRef, vNewParP, sNewPar, vNewParQ)
       Dim bOk As Boolean = nFeatureId <> GDB_ID.NULL
       If bOk Then
          ' riporto parametri Q custom
          For Each QPar In QBTLParamMList
             If QPar.bCustom Then EgtSetInfo(nFeatureId, QPar.sName & "A", 1)
          Next
-         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
          MessageBox.Show(EgtMsg(61852), EgtMsg(30007))
-         nFeatureId = EgtBeamModifyProcess(Me.nFeatureId, Me.nSelGRP, Me.nPRC, Me.nSelSIDE, "", Me.nPRID,
-                                           Me.frFRAME, vPar, sPar, vParQ, nCrvId, nCrv2Id)
+         nFeatureId = EgtBeamModifyProcess(Me.nFeatureId, Me.nSelGRP, Me.nPRC, Me.nSelSIDE, "", Me.nPRID, New Frame3d(), vPar, sPar, vParQ)
          SetFeatureId(nFeatureId)
          bOk = False
       End If
       Return bOk
    End Function
-   Public Function UpdateParams(Optional bUpdate As Boolean = True) As Boolean
+   Public Function UpdateParams() As Boolean
       ' aggiorno la feature con nuovo valore
-      Dim vPar() As Double = {}
+      Dim vPar() As Double = Nothing
       Dim sPar As String = String.Empty
-      Dim vParQ() As String = {}
+      Dim vParQ() As String = Nothing
       CalcParamArray(vPar, sPar, vParQ)
-      Return UpdateParams(Me.nSelGRP, Me.nPRC, Me.nSelSIDE, Me.sDES, Me.nPRID, Me.frFRAME, vPar, sPar, vParQ, bUpdate)
+      Return UpdateParams(Me.nSelGRP, Me.nPRC, Me.nSelSIDE, Me.sDES, Me.nPRID, Me.frFRAME, vPar, sPar, vParQ)
    End Function
 
    ' funzione che restituisce se la feature è un contorno libero
@@ -608,35 +527,6 @@ Public Class BTLFeatureM
       Return m_nPRC = 250 OrElse m_nPRC = 251 OrElse m_nPRC = 252
    End Function
 
-   ' funzione che restituisce i percorsi associati ai contorni liberi
-   Public Function GetFreeContourPaths(ByRef nCrvId As Integer, ByRef nCrv2Id As Integer) As Boolean
-      ' imposto eventuali percorsi
-      nCrvId = GDB_ID.NULL
-      nCrv2Id = GDB_ID.NULL
-      If IsFreeContour() Then
-         Dim sAuxId As String = ""
-         If EgtGetInfo(nFeatureId, "AUXID", sAuxId) Then
-            Dim sAuxIdSplit() As String = sAuxId.Split(","c)
-            Dim nAuxId As Integer
-            If Integer.TryParse(sAuxIdSplit(0), nAuxId) Then
-               nCrvId = nFeatureId + nAuxId
-               Dim nAux2Id As Integer
-               If sAuxIdSplit.Count > 1 Then
-                  If Integer.TryParse(sAuxIdSplit(1), nAux2Id) Then
-                     nCrv2Id = nFeatureId + nAux2Id
-                  End If
-               End If
-            End If
-         End If
-      End If
-      Return True
-   End Function
-
-   ' funzione che restituisce se la feature è un Variant
-   Public Function IsVariant() As Boolean
-      Return m_nPRC = 900
-   End Function
-
 #End Region    ' METHODS
 
 End Class

EgtBEAMWALL.Core/BTL Model/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
 
@@ -124,16 +129,6 @@ Public Class BTLParamM
       End Set
    End Property
 
-   Protected m_sDefault As String
-   Public Property sDefault As String
-      Get
-         Return m_sDefault
-      End Get
-      Set(value As String)
-         m_sDefault = value
-      End Set
-   End Property
-
    ' tipo della variabile
    Protected m_nType As BTLParamType
    Public ReadOnly Property nType As BTLParamType
@@ -141,9 +136,6 @@ Public Class BTLParamM
          Return m_nType
       End Get
    End Property
-   Public Sub SetType(value As BTLParamType)
-      m_nType = value
-   End Sub
 
    ' Feature a cui appartiene il parametro
    Protected m_ParentFeature As BTLFeatureM
@@ -163,16 +155,6 @@ Public Class BTLParamM
       End Set
    End Property
 
-   Protected m_sBWType As String
-   Public Property sBWType As String
-      Get
-         Return m_sBWType
-      End Get
-      Set(value As String)
-         m_sBWType = value
-      End Set
-   End Property
-
 #Region "MESSAGES"
 
    Public ReadOnly Property Name_Msg As String
@@ -239,33 +221,10 @@ Public Class BTLParamM
       Return NewBTLParam
    End Function
 
-   ' new per double e length (con tipo Beam o Wall)
-   Public Shared Function CreateBTLParam(ParentFeature As BTLFeatureM, IsP As Boolean, nType As BTLParamType, sParamName As String,
-                                         dMin As Double, dMax As Double, dDefault As Double, sDescription As String, sBWType As String) As BTLParamM
-      Dim NewBTLParam As New BTLParamM
-
-      NewBTLParam.StdInit(ParentFeature, IsP, nType, sParamName, sDescription)
-      NewBTLParam.dMin = dMin
-      NewBTLParam.dMax = dMax
-      NewBTLParam.m_dDefault = dDefault
-      NewBTLParam.m_sBWType = sBWType
-      Return NewBTLParam
-   End Function
-
    ' new per stringhe
-   Public Shared Function CreateBTLParam(ParentFeature As BTLFeatureM, IsP As Boolean, nType As BTLParamType, sParamName As String, sDefault As String, sDescription As String)
+   Public Shared Function CreateBTLParam(ParentFeature As BTLFeatureM, IsP As Boolean, nType As BTLParamType, sParamName As String, sDescription As String)
       Dim NewBTLParam As New BTLParamM
       NewBTLParam.StdInit(ParentFeature, IsP, nType, sParamName, sDescription)
-      NewBTLParam.m_sDefault = sDefault
-      Return NewBTLParam
-   End Function
-
-   ' new per stringhe (con tipo Beam o Wall)
-   Public Shared Function CreateBTLParam(ParentFeature As BTLFeatureM, IsP As Boolean, nType As BTLParamType, sParamName As String, sDefault As String, sDescription As String, sBWType As String)
-      Dim NewBTLParam As New BTLParamM
-      NewBTLParam.StdInit(ParentFeature, IsP, nType, sParamName, sDescription)
-      NewBTLParam.m_sDefault = sDefault
-      NewBTLParam.m_sBWType = sBWType
       Return NewBTLParam
    End Function
 
@@ -280,18 +239,6 @@ Public Class BTLParamM
       Return NewBTLParam
    End Function
 
-   ' new per combobox (con tipo Beam o Wall)
-   Public Shared Function CreateBTLParam(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), sBWType As String)
-      Dim NewBTLParam As New BTLParamM
-      NewBTLParam.StdInit(ParentFeature, IsP, nType, sParamName, sDescription)
-      NewBTLParam.dMin = nMin
-      NewBTLParam.dMax = nMax
-      NewBTLParam.m_dDefault = nDefault
-      NewBTLParam.m_ValueList = ValueList
-      NewBTLParam.m_sBWType = sBWType
-      Return NewBTLParam
-   End Function
-
    ' new per parametro vuoto
    Public Shared Function CreateBTLParam(IsP As Boolean, nType As BTLParamType, sParamName As String)
       Dim NewBTLParam As New BTLParamM
@@ -299,6 +246,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/BTL Model/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
@@ -540,17 +548,6 @@ Public Class BTLPartM
 
 #End Region ' Parametri pezzo
 
-   ' volume del pezzo
-   Private m_dVolume As Double
-   Public Property dVolume As Double
-      Get
-         Return m_dVolume
-      End Get
-      Set(value As Double)
-         m_dVolume = value
-      End Set
-   End Property
-
    ' numero di pezzi da fare da BTL
    Public m_nCNT As Integer
    Public Property nCNT As Integer
@@ -569,9 +566,7 @@ Public Class BTLPartM
          Return m_nADDED
       End Get
       Set(value As Integer)
-         If EgtSetInfo(nPartId, BTL_PRT_ADDED, value) Then
-            m_nADDED = value
-         End If
+         m_nADDED = value
       End Set
    End Property
 
@@ -579,7 +574,7 @@ Public Class BTLPartM
    Public ReadOnly Property nINPROD As Integer
       Get
          Dim INPROD As Integer = 0
-         EgtDuploInRawCount(m_nPartId, INPROD)
+         EgtDuploCount(m_nPartId, INPROD)
          Return INPROD
       End Get
    End Property
@@ -605,16 +600,6 @@ Public Class BTLPartM
       End Set
    End Property
 
-   Private m_bLockInversion As Boolean = False
-   Public Property bLockInversion As Boolean
-      Get
-         Return m_bLockInversion
-      End Get
-      Set(value As Boolean)
-         m_bLockInversion = value
-      End Set
-   End Property
-
    Private m_nROTATED As Integer
    Public Property nROTATED As Integer
       Get
@@ -625,16 +610,6 @@ Public Class BTLPartM
       End Set
    End Property
 
-   Private m_bLockRotation As Boolean = False
-   Public Property bLockRotation As Boolean
-      Get
-         Return m_bLockRotation
-      End Get
-      Set(value As Boolean)
-         m_bLockRotation = value
-      End Set
-   End Property
-
    Private m_nCALC_ERR As Integer
    Public Property nCALC_ERR As Integer
       Get
@@ -658,7 +633,7 @@ Public Class BTLPartM
    Private m_sCALC_MSG As String
    Public Property sCALC_MSG As String
       Get
-         Return MessageFromLuaMsg(m_sCALC_MSG)
+         Return m_sCALC_MSG
       End Get
       Set(value As String)
          m_sCALC_MSG = value
@@ -695,16 +670,6 @@ Public Class BTLPartM
       End Set
    End Property
 
-   Private m_nFeaturesGlobalState As CalcStates
-   Public Property nFeaturesGlobalState As CalcStates
-      Get
-         Return m_nFeaturesGlobalState
-      End Get
-      Set(value As CalcStates)
-         m_nFeaturesGlobalState = value
-      End Set
-   End Property
-
    Private m_nCALC_GlobalERR As Integer
    Public Property nCALC_GlobalERR As Integer
       Get
@@ -789,15 +754,15 @@ Public Class BTLPartM
          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)
+            StringToLen(sValArray(0), ptOri.x)
+            StringToLen(sValArray(1), ptOri.y)
+            StringToLen(sValArray(2), ptOri.z)
+            StringToDouble(sValArray(3), vtVersX.x)
+            StringToDouble(sValArray(4), vtVersX.y)
+            StringToDouble(sValArray(5), vtVersX.z)
+            StringToDouble(sValArray(6), vtVersY.x)
+            StringToDouble(sValArray(7), vtVersY.y)
+            StringToDouble(sValArray(8), vtVersY.z)
             NewBTLPart.m_refTransf.ChangeOrigin(ptOri)
             NewBTLPart.m_refTransf.Setup(ptOri, ptOri + vtVersX, ptOri + vtVersY)
          End If
@@ -805,12 +770,12 @@ Public Class BTLPartM
          ind = ind + 1
       End While
       EgtGetInfo(nPartId, BTL_PRT_CAMBER, sValue)
-      sValArray = sValue.Split(New String() {":", "P"}, StringSplitOptions.RemoveEmptyEntries)
-      If sValArray.Count() >= 10 Then
-         StringToLenAdv(sValArray(3), NewBTLPart.m_dCamberLen1)
-         StringToLenAdv(sValArray(5), NewBTLPart.m_dCamberLen2)
-         StringToLenAdv(sValArray(7), NewBTLPart.m_dCamberLen3)
-         StringToLenAdv(sValArray(9), NewBTLPart.m_dCamberCross3)
+      sValArray = sValue.Split(New String() {": ", " P"}, StringSplitOptions.RemoveEmptyEntries)
+      If sValArray.Count() >= 5 Then
+         StringToLen(sValArray(3), NewBTLPart.m_dCamberLen1)
+         StringToLen(sValArray(5), NewBTLPart.m_dCamberLen2)
+         StringToLen(sValArray(7), NewBTLPart.m_dCamberLen3)
+         StringToLen(sValArray(9), NewBTLPart.m_dCamberCross3)
       End If
       Dim pFrom As Integer = sValue.IndexOf("SIDE: ") + "SIDE: ".Length
       Dim pTo As Integer = sValue.LastIndexOf(" P01")
@@ -820,63 +785,42 @@ Public Class BTLPartM
       End If
 
       EgtGetInfo(nPartId, BTL_PRT_PARTOFFSET, sValue)
-      sValArray = sValue.Split(New String() {":", "P"}, StringSplitOptions.RemoveEmptyEntries)
-      If sValArray.Count() >= 10 Then
-         StringToLenAdv(sValArray(3), NewBTLPart.m_dPartOffsetSide1)
-         StringToLenAdv(sValArray(5), NewBTLPart.m_dPartOffsetSide2)
-         StringToLenAdv(sValArray(7), NewBTLPart.m_dPartOffsetSide3)
-         StringToLenAdv(sValArray(9), NewBTLPart.m_dPartOffsetSide4)
+      sValArray = sValue.Split(New String() {": ", " P"}, StringSplitOptions.RemoveEmptyEntries)
+      If sValArray.Count() >= 5 Then
+         StringToLen(sValArray(3), NewBTLPart.m_dPartOffsetSide1)
+         StringToLen(sValArray(5), NewBTLPart.m_dPartOffsetSide2)
+         StringToLen(sValArray(7), NewBTLPart.m_dPartOffsetSide3)
+         StringToLen(sValArray(9), NewBTLPart.m_dPartOffsetSide4)
       End If
       pFrom = sValue.IndexOf("P04: ") + "P04: ".Length
       pTo = sValue.LastIndexOf(" P11")
       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
       EgtGetInfo(nPartId, BTL_PRT_PROCESSINGQUALITY, sValue)
-      For ind = 1 To NewBTLPart.ocPROCESSINGQUALITY.Count
-         Dim sEnumName = [Enum].GetName(GetType(ProcessingQuality), ind)
-         If sEnumName.Equals(sValue) Then
-            EnumIndex = ind
-            Exit For
-         End If
-      Next
-      NewBTLPart.m_SelPROCESSINGQUALITY = EnumIndex - 1
+      NewBTLPart.m_SelPROCESSINGQUALITY = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValue, NewBTLPart.ocPROCESSINGQUALITY),
+                                                                 NewBTLPart.ocPROCESSINGQUALITY)
       EgtGetInfo(nPartId, BTL_PRT_RECESS, sValue)
-      EnumIndex = 0
-      For ind = 1 To NewBTLPart.ocRECESS.Count
-         Dim sEnumName = [Enum].GetName(GetType(Recess), ind)
-         If sEnumName.Equals(sValue) Then
-            EnumIndex = ind
-            Exit For
-         End If
-      Next
-      NewBTLPart.m_SelRECESS = EnumIndex - 1
+      NewBTLPart.m_SelRECESS = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValue, NewBTLPart.ocRECESS), NewBTLPart.ocRECESS)
       EgtGetInfo(nPartId, BTL_PRT_STOREYTYPE, sValue)
-      EnumIndex = 0
-      For ind = 1 To NewBTLPart.ocSTOREYTYPE.Count
-         Dim sEnumName = [Enum].GetName(GetType(StoreyType), ind)
-         If sEnumName.Equals(sValue) Then
-            EnumIndex = ind
-            Exit For
-         End If
-      Next
-      NewBTLPart.m_SelSTOREYTYPE = EnumIndex - 1
+      NewBTLPart.m_SelSTOREYTYPE = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValue, NewBTLPart.ocSTOREYTYPE),
+                                                          NewBTLPart.ocSTOREYTYPE)
       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)
       NewBTLPart.m_refGrainDir = New Vector3d
       sValArray = sValue.Split(New String() {",", ";"}, StringSplitOptions.RemoveEmptyEntries)
       If sValArray.Count() >= 4 Then
-         StringToDoubleAdv(sValArray(0), NewBTLPart.m_refGrainDir.x)
-         StringToDoubleAdv(sValArray(1), NewBTLPart.m_refGrainDir.y)
-         StringToDoubleAdv(sValArray(2), NewBTLPart.m_refGrainDir.z)
+         StringToDouble(sValArray(0), NewBTLPart.m_refGrainDir.x)
+         StringToDouble(sValArray(1), NewBTLPart.m_refGrainDir.y)
+         StringToDouble(sValArray(2), NewBTLPart.m_refGrainDir.z)
          NewBTLPart.m_bGRAINDIRALIGN = (CInt(sValArray(3)) = 1)
       End If
 
@@ -891,16 +835,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
 
@@ -911,13 +857,6 @@ Public Class BTLPartM
          NewBTLPart.m_nINVERTED = 0
       End If
       EgtGetInfo(nPartId, BTL_PRT_MATERIAL, NewBTLPart.m_sMATERIAL)
-      If Not EgtGetInfo(nPartId, LOCK_ROT, NewBTLPart.m_bLockRotation) Then
-         NewBTLPart.m_bLockRotation = False
-      End If
-      If Not EgtGetInfo(nPartId, LOCK_FLIP, NewBTLPart.m_bLockInversion) Then
-         NewBTLPart.m_bLockInversion = False
-      End If
-      EgtGetInfo(nPartId, BTL_PRT_VOLUME, NewBTLPart.m_dVolume)
       ' Leggo outline e features
       NewBTLPart.m_BTLFeatureMList = LoadFeatures(nPartId, NewBTLPart)
       ' leggo calc error
@@ -941,18 +880,15 @@ Public Class BTLPartM
          NewBTLPart.m_nCALC_ROT = nRot
          NewBTLPart.m_nCALC_FALL = nFall
          NewBTLPart.m_sCALC_MSG = sMsg
-         Select Case nErr
-            Case 0
-               NewBTLPart.nState = CalcStates.OK
-            Case 22
-               NewBTLPart.nState = CalcStates.COLLISION
-            Case 17, 19
-               NewBTLPart.nState = CalcStates.WARNING
-            Case < 0
-               NewBTLPart.nState = CalcStates.INFO
-            Case > 0
-               NewBTLPart.nState = CalcStates.ERROR_
-         End Select
+         If nErr = 0 Then
+            NewBTLPart.nState = CalcStates.OK
+         ElseIf nErr = 17 Then
+            NewBTLPart.nState = CalcStates.WARNING
+         ElseIf nErr > 0 Then
+            NewBTLPart.nState = CalcStates.ERROR_
+         ElseIf nErr < 0 Then
+            NewBTLPart.nState = CalcStates.INFO
+         End If
       End If
       EgtGetInfo(nPartId, ITG_PROJ_TIME, NewBTLPart.m_nCALC_TIME)
       Return NewBTLPart
@@ -990,6 +926,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
+   '         StringToLen(sValArray(0), ptOri.x)
+   '         StringToLen(sValArray(1), ptOri.y)
+   '         StringToLen(sValArray(2), ptOri.z)
+   '         StringToDouble(sValArray(3), vtVersX.x)
+   '         StringToDouble(sValArray(4), vtVersX.y)
+   '         StringToDouble(sValArray(5), vtVersX.z)
+   '         StringToDouble(sValArray(6), vtVersY.x)
+   '         StringToDouble(sValArray(7), vtVersY.y)
+   '         StringToDouble(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
+   '      StringToLen(sValArray(3), m_dCamberLen1)
+   '      StringToLen(sValArray(5), m_dCamberLen2)
+   '      StringToLen(sValArray(7), m_dCamberLen3)
+   '      StringToLen(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
+   '      StringToLen(sValArray(3), m_dPartOffsetSide1)
+   '      StringToLen(sValArray(5), m_dPartOffsetSide2)
+   '      StringToLen(sValArray(7), m_dPartOffsetSide3)
+   '      StringToLen(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
+   '      StringToDouble(sValArray(0), m_refGrainDir.x)
+   '      StringToDouble(sValArray(1), m_refGrainDir.y)
+   '      StringToDouble(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"
@@ -1008,7 +1135,7 @@ Public Class BTLPartM
       Return New List(Of BTLFeatureM)(m_BTLFeatureMList)
    End Function
 
-   Public Function Rotation(IsPositive As Boolean, SelectedMachineType As MachineType, Optional bRedraw As Boolean = True, Optional dAng As Double = 90) As Boolean
+   Public Function Rotation(IsPositive As Boolean, SelectedMachineType As MachineType) As Boolean
       ' recupero il box del pezzo
       Dim nLs As Integer = EgtGetFirstNameInGroup(nPartId, "Box")
       Dim b3Solid As New BBox3d
@@ -1018,7 +1145,7 @@ Public Class BTLPartM
          Return False
       End If
       ' eseguo rotazione di 90 gradi attorno asse X
-      Dim dRot = If(IsPositive, 1, -1) * Math.Abs(dAng)
+      Dim dRot = If(IsPositive, 90, -90)
       Dim vtAxes As Vector3d
       ' se travi ruoto attorno all'asse X
       If SelectedMachineType = MachineType.BEAM Then
@@ -1036,18 +1163,26 @@ Public Class BTLPartM
       ' eseguo rotazione
       Dim bOk As Boolean = EgtRotate(nPartId, b3Solid.Center, vtAxes, dRot, GDB_RT.GLOB)
       If bOk Then
-         Dim dNewRotation As Double = (m_nROTATED + dRot) Mod 360
-         m_nROTATED = If(dNewRotation >= 0, dNewRotation, 360 + dNewRotation)
+         Select Case m_nROTATED
+            Case 0
+               m_nROTATED = If(IsPositive, 90, 270)
+            Case 90
+               m_nROTATED = If(IsPositive, 180, 0)
+            Case 180
+               m_nROTATED = If(IsPositive, 270, 90)
+            Case 270
+               m_nROTATED = If(IsPositive, 0, 180)
+         End Select
          EgtSetInfo(nPartId, BTL_PRT_ROTATED, m_nROTATED)
          ' imposto modificato per copie
-         MyMachGroupPanelM.SetDuploModified(nPartId)
+         EgtDuploSetModified(nPartId)
       End If
       ' se era invertito
       If bInverted Then
          ' ripristino inversione
          Inversion(SelectedMachineType)
       End If
-      If bRedraw Then EgtDraw()
+      EgtDraw()
       Return bOk
    End Function
 
@@ -1073,7 +1208,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/BTL Model/BTLStructureM.vb

@@ -1,4 +1,5 @@
-Imports EgtUILib
+Imports System.IO
+Imports EgtUILib
 Imports EgtWPFLib5
 
 Public Class BTLStructureM
@@ -10,13 +11,6 @@ Public Class BTLStructureM
       End Get
    End Property
 
-   Private m_nAsseBaseId As Integer = GDB_ID.NULL
-   Public ReadOnly Property nAsseBaseId As Integer
-      Get
-         Return m_nAsseBaseId
-      End Get
-   End Property
-
    ' pezzi da BTL
    Public m_BTLPartMList As List(Of BTLPartM)
    Public Property BTLPartMList As List(Of BTLPartM)
@@ -174,7 +168,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 +186,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 +245,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
@@ -390,20 +384,7 @@ Public Class BTLStructureM
             End If
             nBTLInfoLayerId = EgtGetNextName(nBTLInfoLayerId, BTLINFO)
          End While
-         ' cerco tra gli AsseBase
-         Dim nAsseBaseLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, ASSEBASE)
-         While nAsseBaseLayerId <> GDB_ID.NULL
-            ' verifico se il layer appartiene al ProjId
-            Dim nAsseBaseLayerProjId As Integer
-            EgtGetInfo(nAsseBaseLayerId, BTL_PRT_PROJ, nAsseBaseLayerProjId)
-            If nAsseBaseLayerProjId = ProjId Then
-               NewBTLStructure.m_nAsseBaseId = nAsseBaseLayerId
-               Exit While
-            End If
-            nAsseBaseLayerId = EgtGetNextName(nAsseBaseLayerId, ASSEBASE)
-         End While
       Else
-         NewBTLStructure.m_nAsseBaseId = EgtGetFirstNameInGroup(GDB_ID.ROOT, ASSEBASE)
          NewBTLStructure.m_nBTLInfoId = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
       End If
       EgtGetInfo(NewBTLStructure.m_nBTLInfoId, BTL_GEN_PROJNUM, NewBTLStructure.m_sPROJNUM)
@@ -431,10 +412,13 @@ Public Class BTLStructureM
       EgtGetInfo(NewBTLStructure.m_nBTLInfoId, BTL_PRT_RECESS, sValue)
       NewBTLStructure.m_SelRECESS = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValue, NewBTLStructure.ocRECESS), NewBTLStructure.ocRECESS)
       EgtGetInfo(NewBTLStructure.m_nBTLInfoId, BTL_GEN_USERATTRIBUTE, NewBTLStructure.m_sUSERATTRIBUTE)
-      ' setto il tipo di progetto (Beam o Wall) nel file ini del BTL
-      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 +461,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/BTL ViewModel/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
 
@@ -60,15 +64,6 @@ Public Class BTLFeatureVM
       End Set
    End Property
 
-   Public Overridable Property nSelVARIANT As Integer
-      Get
-         Return m_BTLFeatureM.nSelVARIANT
-      End Get
-      Set(value As Integer)
-         m_BTLFeatureM.nSelVARIANT = value
-      End Set
-   End Property
-
    Public ReadOnly Property sName As String
       Get
          Return m_BTLFeatureM.sName
@@ -114,7 +109,7 @@ Public Class BTLFeatureVM
    ' proprieta' che mostra la descrizione in interfaccia
    Public ReadOnly Property sDesc As String
       Get
-         Return sDescGRP & " [" & nPRID & "] " & sName
+         Return sDescGRP & " " & sName
       End Get
    End Property
 
@@ -144,19 +139,21 @@ Public Class BTLFeatureVM
 
    Public ReadOnly Property Calc_Background As SolidColorBrush
       Get
-         If Not m_BTLFeatureM.bDO Then Return Brushes.Aqua
-         Select Case m_BTLFeatureM.nState
-            Case CalcStates.ERROR_, CalcStates.COLLISION
-               Return Brushes.Red
-            Case CalcStates.WARNING
-               Return Brushes.Orange
-            Case CalcStates.INFO, CalcStates.OK
-               Return Brushes.Green
-            Case CalcStates.NOTCALCULATED
-               Return Brushes.LightGray
-            Case Else
-               Return Brushes.Red
-         End Select
+         If Not m_BTLFeatureM.bDO Then
+            Return Brushes.Aqua
+         ElseIf m_BTLFeatureM.nState = CalcStates.OK Then
+            Return Brushes.Green
+         ElseIf m_BTLFeatureM.nState = CalcStates.NOTCALCULATED Then
+            Return Brushes.LightGray
+         ElseIf m_BTLFeatureM.nState = CalcStates.INFO Then
+            Return Brushes.Green
+         ElseIf m_BTLFeatureM.nState = CalcStates.WARNING Then
+            Return Brushes.Orange
+         ElseIf m_BTLFeatureM.nState = CalcStates.ERROR_ Then
+            Return Brushes.Red
+         Else
+            Return Brushes.Red
+         End If
       End Get
    End Property
 
@@ -168,14 +165,14 @@ Public Class BTLFeatureVM
 
    Public ReadOnly Property CALC_ERR_Letter As String
       Get
-         Select Case m_BTLFeatureM.nState
-            Case CalcStates.COLLISION
+         Select Case m_BTLFeatureM.nCALC_ERR
+            Case 22
                Return "c"
-            Case CalcStates.ERROR_
+            Case 19, 23, 24, 25
                Return "e"
-            Case CalcStates.WARNING
+            Case 17
                Return "w"
-            Case CalcStates.INFO
+            Case < 0
                Return "i"
             Case Else
                Return ""
@@ -186,7 +183,7 @@ Public Class BTLFeatureVM
    Public ReadOnly Property CALC_ERR_Foreground As SolidColorBrush
       Get
          Select Case m_BTLFeatureM.nState
-            Case CalcStates.ERROR_, CalcStates.COLLISION
+            Case CalcStates.ERROR_
                Return Brushes.Red
             Case CalcStates.WARNING
                Return Brushes.Orange
@@ -198,19 +195,21 @@ Public Class BTLFeatureVM
       End Get
    End Property
 
-   ' variabile che indica se rifare il pezzo
-   Private m_bRedo As Boolean = True
-   Public Property bRedo As Boolean
-      Get
-         Return m_bRedo
-      End Get
-      Set(value As Boolean)
-         m_bRedo = value
-      End Set
-   End Property
-
 #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
 
@@ -232,7 +231,6 @@ Public Class BTLFeatureVM
       EgtDeselectAll()
       SelGeomFeature(nFeatureId)
    End Sub
-
    Private Sub SelGeomFeature(nMyFeatureId As Integer)
       EgtSelectObj(nMyFeatureId)
       Dim sVal As String = ""
@@ -256,9 +254,6 @@ Public Class BTLFeatureVM
       End If
    End Sub
 
-   Public Overridable Sub RefreshFeature()
-   End Sub
-
 #End Region    ' METHODS
 
 End Class

EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml

@@ -1,155 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow 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:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core"
-                            Title="{Binding Title}"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-                            WindowStyle="None" ResizeMode="NoResize"
-                            Width="500" Height="450"
-                            IsResizable="False"
-                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-                            CloseCommand="{Binding Close_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
-
-   <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 TabControl_OnlyHeaders}"/>
-
-      <EgtBEAMWALL: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,0,0,5"
-                               BindingColumns="{Binding BeamMachiningsColumns}">
-         
-         <DataGrid.RowStyle>
-            <Style TargetType="DataGridRow">
-               <Setter Property="Height" Value="25"/>
-               <Setter Property="VerticalContentAlignment" Value="Center"/>
-            </Style>
-         </DataGrid.RowStyle>
-
-         <DataGrid.Resources>
-            <Style x:Key="DataGridCheckBoxColumn_Style"
-                   TargetType="{x:Type DataGridCell}">
-               <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 EgtWPFLib5:EgtCustomWindow}}}"/>
-               </DataGridCheckBoxColumn.Header>
-            </DataGridCheckBoxColumn>
-
-            <!--Colonna Name-->
-            <DataGridTemplateColumn x:Key="colNAME">
-               <DataGridTemplateColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.NameHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
-               </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 EgtWPFLib5:EgtCustomWindow}}}"/>
-               </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>
-         
-      </EgtBEAMWALL:EgtDataGrid>
-      
-      <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_InputButton}"/>
-         <Button Content="\/"
-                 Command="{Binding MoveRowDown_Command}"
-                 Grid.Column="1"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding AddRowMsg}"
-                 Command="{Binding AddRow_Command}"
-                 Grid.Column="2"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding DeleteRowMsg}"
-                 Command="{Binding DeleteRow_Command}"
-                 Grid.Column="3"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding SaveMsg}"
-                 Command="{Binding Save_Command}"
-                 Grid.Column="4"
-                 Margin="2.5,0,0,0"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-
-      </Grid>
-
-   </Grid>
-
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml.vb

@@ -1,20 +0,0 @@
-Imports System.Windows
-
-Public Class BeamMachiningsWindowV
-
-   Private WithEvents m_BeamMachiningsWindowVM As MyBeamMachiningsWindowVM
-
-   Sub New(Owner As Window, BeamMachiningsWindowVM As MyBeamMachiningsWindowVM)
-      MyBase.New(Owner)
-      ' 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/BeamMachiningsWindow/OnlyProdBeamMachiningsWindowV.xaml

@@ -1,166 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdBeamMachiningsWindowV"
-                            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}"
-                            WindowStyle="None" ResizeMode="NoResize"
-                            Width="500" Height="450"
-                            IsResizable="False"
-                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-                            CloseCommand="{Binding Close_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
-                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
-   
-   <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 OnlyProdTabControl_OnlyHeaders}"/>
-
-      <Border Grid.Row="1" Margin="0,1,0,2" Style="{StaticResource OnlyProdPage_Border}">
-
-         <EgtBEAMWALL: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"
-                               ColumnHeaderBackground="{StaticResource BeamWall_Teal}"
-                               ColumnHeaderForeground="{StaticResource BeamWall_White}"
-                               ColumnHeaderHorizontalContentAlignment="Center"
-                               ColumnHeaderFontWeight="Bold"
-                               ColumnHeaderFontSize="15"
-                               ColumnHeaderPadding="0,2,0,2"
-                               CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
-                               Style="{StaticResource DataGrid_OnlyProd}">
-
-            <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 EgtWPFLib5:EgtCustomWindow}}}"/>
-                  </DataGridCheckBoxColumn.Header>
-               </DataGridCheckBoxColumn>
-
-               <!--Colonna Name-->
-               <DataGridTemplateColumn x:Key="colNAME">
-                  <DataGridTemplateColumn.Header>
-                     <TextBlock Text="{Binding Path=DataContext.NameHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
-                  </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 EgtWPFLib5:EgtCustomWindow}}}"/>
-                  </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>
-
-         </EgtBEAMWALL: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 OnlyProdEgtWPFLib5_InputButton}"/>
-         <Button Content="\/"
-                 Command="{Binding MoveRowDown_Command}"
-                 Grid.Column="1"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding AddRowMsg}"
-                 Command="{Binding AddRow_Command}"
-                 Grid.Column="2"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding DeleteRowMsg}"
-                 Command="{Binding DeleteRow_Command}"
-                 Grid.Column="3"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding SaveMsg}"
-                 Command="{Binding Save_Command}"
-                 Grid.Column="4"
-                 Margin="2.5,0,0,0"
-                 Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
-
-      </Grid>
-
-   </Grid>
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/BeamMachiningsWindow/OnlyProdBeamMachiningsWindowV.xaml.vb

@@ -1,18 +0,0 @@
-Public Class OnlyProdBeamMachiningsWindowV
-
-   Private WithEvents m_BeamMachiningsWindowVM As MyBeamMachiningsWindowVM
-
-   Sub New(Owner As System.Windows.Window, BeamMachiningsWindowVM As MyBeamMachiningsWindowVM)
-      MyBase.New(Owner)
-      ' 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/CALCPanel/CalcEditEndEventArgs.vb

@@ -1,24 +0,0 @@
-Public Class CalcEditEndEventArgs
-   Inherits EventArgs
-
-   Public Enum Results As Integer
-      NULL = 0
-      MODIFIED = 1
-      ERROR_ = 2
-   End Enum
-
-   Public m_End As Results
-   Public Property End_ As Results
-      Get
-         Return m_End
-      End Get
-      Private Set(value As Results)
-         m_End = value
-      End Set
-   End Property
-
-   Sub New(Result As Results)
-      m_End = Result
-   End Sub
-
-End Class

EgtBEAMWALL.Core/CALCPanel/CalcEndEventArgs.vb

@@ -1,36 +0,0 @@
-Public Class CalcEndEventArgs
-   Inherits EventArgs
-
-   Public Enum Results As Integer
-      NULL = 0
-      OK = 1
-      ERROR_ = 2
-      EDIT = 3
-   End Enum
-
-   Public m_End As Results
-   Public Property End_ As Results
-      Get
-         Return m_End
-      End Get
-      Private Set(value As Results)
-         m_End = value
-      End Set
-   End Property
-
-   Public m_CmdType As CmdTypes
-   Public Property CmdType As CmdTypes
-      Get
-         Return m_CmdType
-      End Get
-      Private Set(value As CmdTypes)
-         m_CmdType = value
-      End Set
-   End Property
-
-   Sub New(CmdType As CmdTypes, Result As Results)
-      m_CmdType = CmdType
-      m_End = Result
-   End Sub
-
-End Class

EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb

@@ -1,589 +0,0 @@
-Imports System.IO
-Imports System.Threading
-Imports System.Globalization
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Module CalcIntegration
-
-   Private _thread As System.Threading.Thread
-
-   Public Event Calc_Ended As EventHandler(Of CalcEndEventArgs)
-   Public Event Calc_ProcessResult As EventHandler(Of CalcResultEventArgs)
-   Public Event Calc_ProcessEnd As EventHandler(Of CalcProcessEndEventArgs)
-
-   Private m_bIsSupervisor As Boolean = False
-
-   Public Enum CmdTypes As Integer
-      GENERATE = 0
-      MODIFY = 1
-      SIMULATE = 2
-      CHECK = 3
-      CHECKGEN = 4
-      POINT_CLOUD = 5
-      RAWPART = 6
-      EDIT = 7
-   End Enum
-
-   Private Structure MyProc
-      Public bEnable As Boolean
-      Public Proc As Process
-      Public nBar As Integer
-   End Structure
-
-   Private m_MaxCamInstances As Integer = 1
-   Public Sub SetMaxCamInstances(value As Integer)
-      m_MaxCamInstances = value
-   End Sub
-
-   Delegate Sub CallbackDlg(dProgress As Double, sProgress As String, ByRef bCancel As Boolean)
-
-   Public Sub Run(vBar As Bar(), sProjDirPath As String, callback As CallbackDlg, Optional bIsSupervisor As Boolean = False)
-      _thread = New Thread(Sub()
-                              m_bIsSupervisor = bIsSupervisor
-                              DoJob(vBar, sProjDirPath, callback)
-                           End Sub)
-      _thread.Start()
-   End Sub
-
-   Private Sub DoJob(vBar As Bar(), sProjDirPath As String, callback As CallbackDlg)
-      Dim bCancel As Boolean = False
-      callback(0, "Init", bCancel)
-
-      If vBar.Count > 0 AndAlso vBar(0).nCmdType = CmdTypes.SIMULATE Then
-         Dim Bar As Bar = vBar(0)
-         ' verifico se il pezzo e' non calcolato
-         If Bar.nProgramPage = ProjectType.PROJ Then
-            If Bar.nGlobState = CalcStates.NOTCALCULATED Then
-               Bar.sBarPath = CreateNewProjectFromPart(Bar.nBarId, sProjDirPath)
-            Else
-               Dim nPDN As Integer = 0
-               EgtGetInfo(Bar.nBarId, BTL_PRT_PDN, nPDN)
-               Bar.sBarPath = sProjDirPath & "\" & nPDN.ToString() & ".bwe"
-            End If
-         ElseIf Bar.nProgramPage = ProjectType.PROD Then
-            If Bar.nGlobState = CalcStates.NOTCALCULATED Then
-               Bar.sBarPath = CreateNewProjectFromMachGroup(Bar.nBarId, sProjDirPath, Bar.nGlobState)
-            Else
-               Dim sMachGroupName As String = ""
-               EgtGetMachGroupName(Bar.nBarId, sMachGroupName)
-               Bar.sBarPath = sProjDirPath & "\" & sMachGroupName & ".bwe"
-            End If
-         End If
-      ElseIf vBar(0).nCmdType <> CmdTypes.EDIT Then
-         ' creo progetti a seconda del tipo
-         For Each Bar In vBar
-            If Bar.nProgramPage = ProjectType.PROJ Then
-               Bar.sBarPath = CreateNewProjectFromPart(Bar.nBarId, sProjDirPath)
-            ElseIf Bar.nProgramPage = ProjectType.PROD Then
-               Bar.sBarPath = CreateNewProjectFromMachGroup(Bar.nBarId, sProjDirPath, Bar.nGlobState)
-            End If
-         Next
-      End If
-      Dim bIsSimulation As Boolean = False
-      Dim bIsSimulationVerifyed As Boolean = False
-      Dim bIsEdit As Boolean = False
-      Dim LastFileWriteTime As Date
-      ' se sono in simulazione
-      If vBar.Count > 0 AndAlso vBar(0).nCmdType = CmdTypes.SIMULATE Then
-         bIsSimulation = True
-         callback(0, "Simulation opened", bCancel)
-      ElseIf vBar.Count > 0 AndAlso vBar(0).nCmdType = CmdTypes.EDIT Then
-         bIsEdit = True
-         Dim sCurrFilePath As String = ""
-         EgtGetCurrFilePath(sCurrFilePath)
-         vBar(0).sBarPath = sCurrFilePath
-         LastFileWriteTime = File.GetLastWriteTime(sCurrFilePath)
-         callback(0, "Editor opened", bCancel)
-      Else
-         callback(0.1, "", bCancel)
-      End If
-
-      Dim ExePath As String = String.Empty
-      GetMainPrivateProfileString(S_BEAM, K_CALCPATH, "", ExePath)
-      ' Numero di barre 
-      Dim numBars As Integer = vBar.Count
-      If numBars = 0 Then Return
-
-      ' Numero di core logici da utilizzare (minimo tra presenti sul PC e imposti da INI)
-      Dim nMaxThread As Integer = Math.Min(Environment.ProcessorCount, m_MaxCamInstances)
-
-      Array.Resize(Of Bar)(vBar, numBars + nMaxThread - 1)
-
-      ' Frazione di avanzamento del lavoro (in piu)
-      Dim dProgress As Double = 0
-      'indice incremento progress durante calcolo barra
-      Dim nPgsCurrBar As Integer = 0
-      Dim nPgsClock As Integer = 0
-
-
-      ' Lancio in parallelo più processi (senza superare il numero di core logici presenti)
-      Dim vProc As MyProc() = New MyProc(nMaxThread - 1) {}
-      For j As Integer = 0 To nMaxThread - 1
-         vProc(j).nBar = -1
-         vProc(j).bEnable = True
-      Next
-
-      ' Processo i Btl in parallelo
-      Dim nCurrBar As Integer = 0
-      Dim nDoneBar As Integer = 0
-      Dim nShiftBar As Integer = 0
-      Dim nActProc As Integer = 0
-
-      Dim bAllKO As Boolean
-
-      While nCurrBar < numBars + nShiftBar OrElse nActProc > 0
-
-         For j As Integer = 0 To nMaxThread - 1
-            If Not vProc(j).bEnable Then Continue For
-            Dim bDone As Boolean = False
-
-            If vProc(j).nBar = -1 Then
-
-               If nCurrBar < numBars + nShiftBar Then
-
-                  If vBar(nCurrBar).bBarOk Then
-                     vProc(j).Proc = New Process()
-                     vProc(j).Proc.StartInfo.FileName = ExePath
-                     If bIsEdit Then
-                        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
-                     End If
-                     vProc(j).Proc.StartInfo.UseShellExecute = False
-
-                     If vProc(j).Proc.Start() Then
-                        vProc(j).nBar = nCurrBar
-                        nCurrBar += 1
-                        nActProc += 1
-                     End If
-                  Else
-                     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))
-                     End If
-                     bDone = True
-                     nCurrBar += 1
-                  End If
-               End If
-            Else
-
-               If vProc(j).Proc.HasExited Then
-                  ' 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 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))
-                     End If
-                     bDone = True
-                     vProc(j).nBar = -1
-                     nActProc -= 1
-                     ' se superato il numero di processi eseguibili in parallelo
-                  ElseIf vProc(j).Proc.ExitCode = 1 Then
-                     ' aggiungo il pezzo in coda
-                     If numBars + nShiftBar < numBars + nMaxThread Then
-                        vBar(numBars + nShiftBar) = vBar(vProc(j).nBar)
-                        nShiftBar += 1
-                     End If
-                     ' disabilito il processo
-                     vProc(j).bEnable = False
-                     vProc(j).nBar = -1
-                     nActProc -= 1
-                     ' 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 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))
-                     End If
-                     bDone = True
-                     vProc(j).nBar = -1
-                     nActProc -= 1
-                  End If
-               Else
-                  vProc(j).Proc.Refresh()
-               End If
-            End If
-
-            If bDone Then
-               ' se sono in simulazione
-               If bIsSimulation Then
-                  Dim sOriPath As String = Path.ChangeExtension(vBar(0).sBarPath, ".ori.bwe")
-                  ' se file modificato a mano
-                  If File.GetLastWriteTime(sOriPath) < File.GetLastWriteTime(vBar(0).sBarPath) Then
-                     ' aggiorno progetto
-                     If File.Exists(vBar(0).sBarPath) Then File.Copy(vBar(0).sBarPath, sOriPath, True)
-
-                     ' messaggio di lancio verifica
-                     callback(50, "Verifying modifications...", bCancel)
-                     ' lancio verifica
-                     System.Threading.Thread.Sleep(500)
-
-                     Dim Proc As New Process()
-                     Proc.StartInfo.FileName = ExePath
-                     Proc.StartInfo.Arguments = """" & vBar(0).sBarPath & """ " &
-                                                """" & vBar(0).nProjType & """ " &
-                                                """" & vBar(0).nMachineName & """ " & CmdTypes.CHECKGEN
-                     Proc.StartInfo.UseShellExecute = False
-
-                     If Proc.Start() Then
-                        Dim ProgressValue As Integer = 50
-                        While Not Proc.HasExited
-                           Proc.Refresh()
-                           If ProgressValue < 90 Then ProgressValue += 0.001
-                           callback(ProgressValue, "Verifying modifications...", bCancel)
-                           Thread.Sleep(1)
-                        End While
-                        ' se terminato con successo
-                        If Proc.ExitCode = 0 Then
-                           ' salvo il risultato
-                           RaiseEvent Calc_ProcessResult(Nothing, New CalcResultEventArgs(vBar(0)))
-                           Thread.Sleep(500)
-                        End If
-                     End If
-                  End If
-                  ' messaggio di completamento simulazione
-                  callback(0, "Simulation closing", bCancel)
-               ElseIf bIsEdit Then
-                  ' ricarico il progetto
-                  Dim Result As CalcEndEventArgs.Results
-                  If bAllKO Then
-                     Result = CalcEndEventArgs.Results.ERROR_
-                  ElseIf bIsEdit Then
-                     Result = CalcEndEventArgs.Results.EDIT
-                  Else
-                     Result = CalcEndEventArgs.Results.OK
-                  End If
-                  RaiseEvent Calc_Ended(Nothing, New CalcEndEventArgs(CmdTypes.EDIT, Result))
-                  Return
-               Else
-                  ' Dialog con Progress Bar
-                  nDoneBar += 1
-                  dProgress = 1 / numBars * nDoneBar
-                  Dim sProg As String = (dProgress * 100).ToString("F1", CultureInfo.InvariantCulture)
-                  callback(dProgress, " Progress: " & sProg & "% Count: " & nDoneBar & " / " & numBars, bCancel)
-               End If
-               If bCancel Then
-                  ' fine
-                  callback(1, "", bCancel)
-                  ' riabilito interfaccia
-                  RaiseEvent Calc_Ended(Nothing, New CalcEndEventArgs(CmdTypes.CHECKGEN, CalcEndEventArgs.Results.OK))
-                  Return
-               End If
-               nPgsCurrBar = 0
-               nPgsClock = 0
-            Else
-               ' se non sono in simulazione
-               If Not bIsSimulation AndAlso Not bIsEdit Then
-                  ' aggiorno conteggio
-                  If nPgsClock >= 100 AndAlso nPgsCurrBar < 149 Then
-                     nPgsCurrBar += 1
-                     dProgress = 1 / numBars * nDoneBar + 1 / numBars / 150 * nPgsCurrBar
-                     Dim sProg As String = (dProgress * 100).ToString("F1", CultureInfo.InvariantCulture)
-                     callback(dProgress, " Progress: " & sProg & "% Count: " & nDoneBar & " / " & numBars, bCancel)
-                     nPgsClock = 0
-                  End If
-               End If
-            End If
-            nPgsClock += 1
-            Thread.Sleep(1)
-         Next
-
-         ' Verifico che i processi non siano andati tutti in errore
-         bAllKO = True
-
-         For j As Integer = 0 To nMaxThread - 1
-            If vProc(j).bEnable Then bAllKO = False
-         Next
-
-         If bAllKO Then
-            Exit While
-         End If
-
-         Thread.Sleep(10)
-      End While
-
-      Thread.Sleep(300)
-
-      ' se sono in simulazione
-      If bIsSimulation Then
-         callback(1, "Simulation closed", bCancel)
-      Else
-         callback(1, "Done", bCancel)
-      End If
-      ' riabilito interfaccia
-      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
-
-   Private Function CreateNewProjectFromPart(nPartId As Integer, sProjDirPath As String) As String
-
-      ' Aggiorno identificativi per segnalazione errori
-      UpdateCutIdAndTaskId(nPartId)
-
-      ' Disabilito segnalazione modificato
-      Dim DisableMgr As New DisableModifiedMgr
-
-      ' Recupero visibilita' pezzo e lo imposto a visibile
-      Dim nOldPartMode As Integer
-      EgtGetMode(nPartId, nOldPartMode)
-      EgtSetMode(nPartId, GDB_MD.STD)
-
-      ' Salvo pezzo nel suo progetto
-      Dim bOk As Boolean = False
-      Dim nPDN As Integer = 0
-      EgtGetInfo(nPartId, BTL_PRT_PDN, nPDN)
-      Dim sPartFilePath As String = sProjDirPath & "\" & nPDN.ToString() & ".bwe"
-      bOk = EgtSaveObjToFile(nPartId, sPartFilePath, NGE.CMPTEXT)
-
-      ' Ripristino visibilita' pezzo
-      EgtSetMode(nPartId, nOldPartMode)
-
-      ' Ripristino stato segnalazione modifica
-      DisableMgr.ReEnable()
-
-      Return If(bOk, sPartFilePath, String.Empty)
-   End Function
-
-   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
-         If m_bIsSupervisor Then
-            ' Disabilito segnalazione modificato
-            DisableMgr = New DisableModifiedMgr
-         End If
-         ' Aggiorno identificativi per segnalazione errori
-         Dim nOldMachGroup As Integer = EgtGetCurrMachGroup()
-         If nMachGroupId <> nOldMachGroup Then EgtSetCurrMachGroup(nMachGroupId)
-         Dim nRawId As Integer = EgtGetFirstRawPart()
-         While nRawId <> GDB_ID.NULL
-            If EgtVerifyRawPartPhase(nRawId, 1) Then
-               Dim nPartId As Integer = EgtGetFirstPartInRawPart(nRawId)
-               While nPartId <> GDB_ID.NULL
-                  UpdateCutIdAndTaskId(nPartId)
-                  nPartId = EgtGetNextPartInRawPart(nPartId)
-               End While
-            End If
-            nRawId = EgtGetNextRawPart(nRawId)
-         End While
-         If nMachGroupId <> nOldMachGroup Then
-            If nOldMachGroup <> GDB_ID.NULL Then
-               EgtSetCurrMachGroup(nOldMachGroup)
-            Else
-               EgtResetCurrMachGroup()
-            End If
-         End If
-         If m_bIsSupervisor Then
-            ' Ripristino stato segnalazione modifica
-            DisableMgr.ReEnable()
-         End If
-      End If
-
-      ' Salvo gruppo di lavorazione nel suo progetto
-      Dim sMachGroupName As String = ""
-      EgtGetMachGroupName(nMachGroupId, sMachGroupName)
-      Dim sMachGroupFilePath As String = sProjDirPath & "\" & sMachGroupName & ".bwe"
-      If EgtSaveObjToFile(nMachGroupId, sMachGroupFilePath, NGE.CMPTEXT) Then
-         Return sMachGroupFilePath
-      End If
-      Return String.Empty
-   End Function
-
-   Private Function UpdateCutIdAndTaskId(nPartId As Integer) As Boolean
-      ' Assegno Id a CutId per calcoli
-      EgtSetInfo(nPartId, "CUTID", nPartId, True)
-
-      ' Assegno TASKID agli outline per calcoli
-      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) Then
-            ' verifico se ha un principale
-            Dim nMainOffsId As Integer = 0
-            Dim nTaskId As Integer = nOutlineId
-            If EgtGetInfo(nOutlineId, BTL_FTR_MAINID, nMainOffsId) Then
-               nTaskId = nOutlineId + nMainOffsId
-            End If
-            ' assegno TASKID alla feature per calcoli
-            EgtSetInfo(nOutlineId, "TASKID", nTaskId)
-            ' recupero eventuali AuxId
-            Dim sAuxIds As String = ""
-            If EgtGetInfo(nOutlineId, BTL_FTR_AUXID, sAuxIds) Then
-               Dim AuxIdArray() As String = sAuxIds.Split(","c)
-               If AuxIdArray.Count > 0 Then
-                  For Each AuxId In AuxIdArray
-                     AuxId = AuxId.Trim()
-                     AuxId = AuxId.Trim("+"c)
-                     Dim nAuxId As Integer
-                     If Integer.TryParse(AuxId, nAuxId) Then
-                        EgtSetInfo(nOutlineId + nAuxId, "TASKID", nTaskId)
-                     End If
-                  Next
-               End If
-            End If
-         End If
-         nOutlineId = EgtGetNext(nOutlineId)
-      End While
-
-      ' Assegno TASKID alle feature per calcoli
-      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
-            ' verifico se ha un principale
-            Dim nMainOffsId As Integer
-            Dim nTaskId As Integer = nFeatureId
-            If EgtGetInfo(nFeatureId, BTL_FTR_MAINID, nMainOffsId) Then
-               nTaskId = nFeatureId + nMainOffsId
-            End If
-            ' assegno TASKID alla feature per calcoli
-            EgtSetInfo(nFeatureId, "TASKID", nTaskId)
-            ' recupero eventuali AuxId
-            Dim sAuxIds As String = ""
-            If EgtGetInfo(nFeatureId, BTL_FTR_AUXID, sAuxIds) Then
-               Dim AuxIdArray() As String = sAuxIds.Split(","c)
-               For Each AuxId In AuxIdArray
-                  AuxId = AuxId.Trim()
-                  AuxId = AuxId.Trim("+"c)
-                  Dim nAuxId As Integer
-                  If Integer.TryParse(AuxId, nAuxId) Then
-                     EgtSetInfo(nFeatureId + nAuxId, "TASKID", nTaskId)
-                  End If
-               Next
-            End If
-         End If
-         nFeatureId = EgtGetNext(nFeatureId)
-      End While
-      Return True
-   End Function
-
-End Module
-
-Public Class Bar
-   Public nBarState As Integer
-   Public nBarId As Integer
-   Public sBarPath As String
-   Public bBarOk As Boolean
-   Public nCmdType As Integer
-   Public nProgramPage As ProjectType
-   Public nProjType As BWType
-   Public nMachineName As String
-   Public nGlobState As Integer
-End Class
-
-Public Class ProcessResult
-
-   Public Enum ProcessResultTypes As Integer
-      BAR = 1
-      PART = 2
-      TASKID = 3
-      FALL = 4
-      TIME = 5
-   End Enum
-
-   Private m_Type As ProcessResultTypes
-   Public ReadOnly Property Type As ProcessResultTypes
-      Get
-         Return m_Type
-      End Get
-   End Property
-
-   Private m_nCUTID As Integer
-   Public ReadOnly Property nCUTID As Integer
-      Get
-         Return m_nCUTID
-      End Get
-   End Property
-
-   Private m_nTASKID As Integer
-   Public ReadOnly Property nTASKID As Integer
-      Get
-         Return m_nTASKID
-      End Get
-   End Property
-
-   Private m_nERR As Integer
-   Public ReadOnly Property nERR As Integer
-      Get
-         Return m_nERR
-      End Get
-   End Property
-
-   Private m_sMSG As String
-   Public ReadOnly Property sMSG As String
-      Get
-         Return m_sMSG
-      End Get
-   End Property
-
-   Private m_dROT As Double
-   Public ReadOnly Property dROT As Double
-      Get
-         Return m_dROT
-      End Get
-   End Property
-   Public Sub SetROT(value As Double)
-      m_dROT = value
-   End Sub
-
-   Private m_nFALL As Integer
-   Public ReadOnly Property nFALL As Integer
-      Get
-         Return m_nFALL
-      End Get
-   End Property
-
-   Private m_nTIME As Integer
-   Public ReadOnly Property nTIME As Integer
-      Get
-         Return m_nTIME
-      End Get
-   End Property
-
-   Public Shared Function CreateTaskResult(CUTID As Integer, TASKID As Integer, ERR As Integer, MSG As String, ROT As Double) As ProcessResult
-      If CUTID <> 0 Then
-         If TASKID = 0 Then
-            Return New ProcessResult(ProcessResultTypes.PART, CUTID, TASKID, ERR, MSG, ROT, 0, 0)
-         End If
-         Return New ProcessResult(ProcessResultTypes.TASKID, CUTID, TASKID, ERR, MSG, ROT, 0, 0)
-      End If
-      Return New ProcessResult(ProcessResultTypes.BAR, CUTID, TASKID, ERR, MSG, ROT, 0, 0)
-   End Function
-   Public Shared Function CreateFallResult(CUTID As Integer, ERR As Integer, MSG As String, FALL As Integer) As ProcessResult
-      Return New ProcessResult(ProcessResultTypes.FALL, CUTID, 0, ERR, MSG, 0, FALL, 0)
-   End Function
-   Public Shared Function CreateTimeResult(CUTID As Integer, TIME As Integer) As ProcessResult
-      Return New ProcessResult(ProcessResultTypes.TIME, CUTID, 0, 0, "", 0, 0, TIME)
-   End Function
-
-   Protected Sub New(Type As ProcessResultTypes, CUTID As Integer, TASKID As Integer, ERR As Integer, MSG As String, ROT As Double, FALL As Integer, TIME As Integer)
-      m_Type = Type
-      m_nCUTID = CUTID
-      m_nTASKID = TASKID
-      m_nERR = ERR
-      m_sMSG = MSG
-      m_dROT = ROT
-      m_nFALL = FALL
-      m_nTIME = TIME
-   End Sub
-
-   Public Sub ResetTypeFeature()
-      m_Type = ProcessResultTypes.PART
-      m_nTASKID = 0
-   End Sub
-   Public Sub ResetTypePart()
-      m_Type = ProcessResultTypes.BAR
-      m_nCUTID = 0
-   End Sub
-
-End Class

EgtBEAMWALL.Core/CALCPanel/CalcProcessEndEventArgs.vb

@@ -1,18 +0,0 @@
-Public Class CalcProcessEndEventArgs
-   Inherits EventArgs
-
-   Public m_Result As Bar
-   Public Property Result As Bar
-      Get
-         Return m_Result
-      End Get
-      Private Set(value As Bar)
-         m_Result = value
-      End Set
-   End Property
-
-   Sub New(Result As Bar)
-      m_Result = Result
-   End Sub
-
-End Class

EgtBEAMWALL.Core/CALCPanel/CalcResultEventArgs.vb

@@ -1,24 +0,0 @@
-Public Class CalcResultEventArgs
-   Inherits EventArgs
-
-   Public Enum Results As Integer
-      NULL = 0
-      OK = 1
-      ERROR_ = 2
-   End Enum
-
-   Public m_Result As Bar
-   Public Property Result As Bar
-      Get
-         Return m_Result
-      End Get
-      Private Set(value As Bar)
-         m_Result = value
-      End Set
-   End Property
-
-   Sub New(Result As Bar)
-      m_Result = Result
-   End Sub
-
-End Class

EgtBEAMWALL.Core/ConfigurationPage/ConfigurationPageV.xaml

@@ -1,80 +0,0 @@
-<DockPanel x:Class="ConfigurationPageV"
-           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-           xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core">
-
-   <Grid>
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="10*"/>
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="6*"/>
-      </Grid.RowDefinitions>
-      <TabControl Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Grid.ColumnSpan="2"
-                  SelectedIndex="{Binding SelConfigSubPage}">
-         <TabItem>
-            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding General_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <Button Command="{Binding SaveCommand}"
-                          ToolTip="{Binding SaveToolTip}"
-                          Visibility="{Binding General_Visibility}"
-                          Style="{StaticResource OptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-                  </Button>
-               </StackPanel>
-            </TabItem.Header>
-            <TabItem.Content>
-               <EgtBEAMWALL:General_ConfigurationPageV/>
-            </TabItem.Content>
-         </TabItem>
-         <TabItem>
-            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding ParameterQ_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <Button Command="{Binding SaveCommand}"
-                          ToolTip="{Binding SaveToolTip}"
-                          Visibility="{Binding ParameterQ_Visibility}"
-                          Style="{StaticResource OptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-                  </Button>
-               </StackPanel>
-            </TabItem.Header>
-            <TabItem.Content>
-               <EgtBEAMWALL:QParameter_ConfigurationPageV/>
-            </TabItem.Content>
-         </TabItem>
-         <TabItem >
-            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding Machine_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <Button Command="{Binding SaveCommand}"
-                          ToolTip="{Binding SaveToolTip}"
-                          Visibility="{Binding Machine_Visibility}"
-                          Style="{StaticResource OptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-                  </Button>
-               </StackPanel>
-            </TabItem.Header>
-
-            <TabItem.Content>
-               <EgtBEAMWALL:Machine_ConfigurationPageV/>
-            </TabItem.Content>
-         </TabItem>
-      </TabControl>
-
-      <!--<Button Command="{Binding SaveCommand}"
-                ToolTip="{Binding SaveToolTip}"
-                Grid.Row="1" 
-                Grid.Column="1"
-                Style="{StaticResource OptionPanel_Button}">
-         <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-      </Button>-->
-
-   </Grid>
-</DockPanel>

EgtBEAMWALL.Core/ConfigurationPage/ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml

@@ -1,121 +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 Grid.Row="0" Grid.Column="0" Margin="5,5,5,0">
-      <GroupBox Header="{Binding CurrentLanguage_Msg}"
-                Margin="0,0,0,5">
-         <UniformGrid Rows="2" Margin="3,3,3,3">
-            <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" Height="25"
-                      DisplayMemberPath="Name" SelectedItem="{Binding SelectedLanguage}"
-                      Margin="0,0,0,5"
-                      Style="{x:Null}"/>
-            <TextBlock Text="{Binding LanguageAdvert_Msg}" TextWrapping="Wrap"
-                       TextAlignment="Center"/>
-         </UniformGrid>
-      </GroupBox>
-      <UniformGrid Columns="2"
-                   Margin="0,0,0,5">
-         <TextBlock Text="{Binding MMUnits_Msg}" VerticalAlignment="Center"/>
-         <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
-                   SelectedIndex="{Binding SelMeasureUnit}" Height="25"
-                   Margin="0,5,0,0"
-                   Style="{x:Null}"/>
-      </UniformGrid>
-      <GroupBox Header="{Binding Nesting_Msg}"
-                Margin="0,0,0,5">
-         <StackPanel>
-            <UniformGrid Columns="2"
-                         Margin="0,0,0,5">
-               <TextBlock Text="{Binding SectionTime_Msg}"
-                          Grid.Row="0" Grid.Column="0"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding SectionTime, UpdateSourceTrigger=Explicit}"
-                                      Grid.Row="0" Grid.Column="1"/>
-            </UniformGrid>
-            <UniformGrid Columns="2"
-                         Margin="0,0,0,5">
-               <TextBlock Text="{Binding PartTime_Msg}"
-                          Grid.Row="1" Grid.Column="0"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding PartTime, UpdateSourceTrigger=Explicit}"
-                                      Grid.Row="1" Grid.Column="1"/>
-            </UniformGrid>
-         </StackPanel>
-      </GroupBox>
-      <UniformGrid Columns="2"
-                   Margin="0,0,0,5">
-         <TextBlock Text="{Binding PrintLabel_Msg}" VerticalAlignment="Center"/>
-         <CheckBox IsChecked="{Binding bPrintLabel_IsChecked}"
-                   Margin="0,5,0,0"/>
-      </UniformGrid>
-      <GroupBox Header="Backup And Restore">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid Grid.Row="0"
-                  Margin="0,2,0,5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <CheckBox x:Name="ExternalBackup_CheckBox"
-                         IsChecked="{Binding bExternalBackupActive}"
-                         VerticalAlignment="Center"/>
-               <TextBlock Grid.Column="1"
-                          Text="External file path:"
-                          VerticalAlignment="Center"/>
-            </Grid>
-            <Grid Grid.Row="1"
-                  Margin="0,2,0,5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <TextBox Text="{Binding ExternalBackupFolderPath}"
-                        IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                        Margin="0,0,2.5,0"/>
-               <Button Grid.Column="1"
-                       Content="..."
-                       Width="18"
-                       Command="{Binding ChooseExternalBackupFolderPath_Command}"
-                       IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                       Margin="2.5,0,0,0"/>
-            </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="{x:Null}"/>
-            </Grid>
-            <StackPanel Grid.Row="3"
-                        Orientation="Horizontal">
-               <Button Content="Backup"
-                       Command="{Binding Backup_Command}"
-                       Style="{StaticResource ToolBar_TextButton}"/>
-               <Button Content="Restore"
-                       Command="{Binding Restore_Command}"
-                       Style="{StaticResource ToolBar_TextButton}"/>
-            </StackPanel>
-         </Grid>
-      </GroupBox>
-   </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,79 +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:EgtBEAMWALL="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 Grid.Row="0" Grid.Column="0" Orientation="Horizontal">
-      <GroupBox Style="{StaticResource GroupBoxStyle_NoHeader}" Padding="5,10,5,5">
-         <EgtBEAMWALL:MachinePanelV DataContext="{Binding MachinePanelVM}" VerticalAlignment="Center"/>
-      </GroupBox>
-   </StackPanel>
-
-   <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" Visibility="{Binding MachineParameter_Visibility}">
-      <ItemsControl ItemsSource="{Binding ConfigMachTableList}">
-         <ItemsControl.ItemsPanel>
-            <ItemsPanelTemplate>
-               <StackPanel x:Name="GroupStackPanel" Orientation="Horizontal"/>
-            </ItemsPanelTemplate>
-         </ItemsControl.ItemsPanel>
-         <ItemsControl.ItemTemplate>
-            <DataTemplate>
-               <GroupBox Header="{Binding sName}"  Width="Auto" VerticalAlignment="Top" Height="Auto">
-                  <ItemsControl Name="MachParamsItemsControl" ItemsSource="{Binding MachParamList}" Margin="0,5,0,0">
-                     <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                           <WrapPanel Orientation="Vertical"/>
-                        </ItemsPanelTemplate>
-                     </ItemsControl.ItemsPanel>
-                     <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                           <Grid Margin="0,0,5,5">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="*" />
-                              </Grid.ColumnDefinitions>
-                              <TextBlock Text="{Binding sName}"
-                                         ToolTip="{Binding sName}"
-                                         TextWrapping="WrapWithOverflow"
-                                         Width="190"
-                                         Style="{StaticResource MachParamTextBlock}"/>
-                              <EgtWPFLib5:EgtTextBox Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
-                                                     Grid.Column="1"
-                                                     Width="60"/>
-                              <TextBlock Text="{Binding sDescription}"
-                                         ToolTip="{Binding sDescription}"
-                                         TextWrapping="WrapWithOverflow"
-                                         Width="185"
-                                         Style="{StaticResource MachParamTextBlock}"
-                                         Grid.Column="2"/>
-                           </Grid>
-                        </DataTemplate>
-                     </ItemsControl.ItemTemplate>
-                  </ItemsControl>
-               </GroupBox>
-            </DataTemplate>
-         </ItemsControl.ItemTemplate>
-      </ItemsControl>
-   </StackPanel>
-
-   <Button Command="{Binding SaveCommand}"
-           Grid.Column="0"
-           Grid.Row="1"
-           ToolTip="{Binding SaveToolTip}"
-           Visibility="{Binding Machine_Visibility}"
-           Style="{StaticResource MachinePanel_Button}">
-      <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-   </Button>
-
-</Grid>

EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml

@@ -1,124 +0,0 @@
-<Grid x:Class="OnlyProdGeneral_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 Margin="5,5,5,0">
-      <GroupBox Header="{Binding CurrentLanguage_Msg}"
-                Margin="0,0,0,5"
-                Foreground="{StaticResource BeamWall_Corduroy}">
-         <UniformGrid Rows="2" Margin="3,3,3,3">
-            <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" Height="25"
-                      DisplayMemberPath="Name" SelectedItem="{Binding SelectedLanguage}"
-                      Margin="0,0,0,5" Style="{StaticResource OnlyProd_ComboBox}" />
-            <TextBlock Text="{Binding LanguageAdvert_Msg}" TextWrapping="Wrap"
-                       TextAlignment="Center"/>
-         </UniformGrid>
-      </GroupBox>
-      <UniformGrid Columns="2"
-                   Margin="0,0,0,5">
-         <TextBlock Text="{Binding MMUnits_Msg}" VerticalAlignment="Center" Foreground="{StaticResource BeamWall_Corduroy}"/>
-         <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
-                   SelectedIndex="{Binding SelMeasureUnit}" Height="25"
-                   Margin="0,5,0,0" Style="{StaticResource OnlyProd_ComboBox}" />
-      </UniformGrid>
-      <GroupBox Header="{Binding Nesting_Msg}"
-                Margin="0,0,0,5"
-                Foreground="{StaticResource BeamWall_Corduroy}">
-         <StackPanel>
-            <UniformGrid Columns="2"
-                         Margin="0,0,0,5">
-               <TextBlock Text="{Binding SectionTime_Msg}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                      Text="{Binding SectionTime, UpdateSourceTrigger=Explicit}"/>
-            </UniformGrid>
-            <UniformGrid Columns="2"
-                         Margin="0,0,0,5">
-               <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"
-                   Margin="0,0,0,5">
-         <TextBlock Text="{Binding PrintLabel_Msg}" VerticalAlignment="Center" Foreground="{StaticResource BeamWall_Corduroy}"/>
-         <CheckBox IsChecked="{Binding bPrintLabel_IsChecked}"
-                   Margin="0,5,0,0"/>
-      </UniformGrid>
-      <GroupBox Header="Backup And Restore"
-                Foreground="{StaticResource BeamWall_Corduroy}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid Margin="0,2,0,5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <CheckBox x:Name="ExternalBackup_CheckBox"
-                         IsChecked="{Binding bExternalBackupActive}"
-                         VerticalAlignment="Center"/>
-               <TextBlock Grid.Column="1"
-                          Text="External file path:"
-                          VerticalAlignment="Center"/>
-            </Grid>
-            <Grid Grid.Row="1"
-                  Margin="0,2,0,5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <TextBox Text="{Binding ExternalBackupFolderPath}"
-                        IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                        Margin="0,0,2.5,0"/>
-               <Button Grid.Column="1"
-                       Content="..."
-                       Foreground="{StaticResource BeamWall_White}"
-                       Width="20"
-                       Height="20"
-                       Command="{Binding ChooseExternalBackupFolderPath_Command}"
-                       IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                       Margin="2.5,0,0,0"
-                       Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
-            </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}"
-                         Margin="0,0,0,5" Style="{StaticResource OnlyProd_ComboBox}" />
-            </Grid>
-            <StackPanel Grid.Row="3"
-                        Orientation="Horizontal">
-               <Button Content="Backup"
-                       Command="{Binding Backup_Command}"
-                       Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"
-                       Margin="0,0,5,0"/>
-               <Button Content="Restore"
-                       Command="{Binding Restore_Command}"
-                       Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/>
-            </StackPanel>
-         </Grid>
-      </GroupBox>
-   </StackPanel>
-
-</Grid>

EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.Core/ConfigurationPage/OnlyProdMachine_ConfigurationPageV.xaml

@@ -1,78 +0,0 @@
-<Grid x:Class="OnlyProdMachine_ConfigurationPageV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:EgtBEAMWALL="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 GroupBoxStyle_NoHeader}" Padding="5,10,5,5">
-         <EgtBEAMWALL:OnlyProdMachinePanelV DataContext="{Binding MachinePanelVM}" VerticalAlignment="Center"/>
-      </GroupBox>
-   </StackPanel>
-
-   <StackPanel Grid.Row="1" Orientation="Horizontal" Visibility="{Binding MachineParameter_Visibility}">
-      <ItemsControl ItemsSource="{Binding ConfigMachTableList}">
-         <ItemsControl.ItemsPanel>
-            <ItemsPanelTemplate>
-               <StackPanel x:Name="GroupStackPanel" Orientation="Horizontal"/>
-            </ItemsPanelTemplate>
-         </ItemsControl.ItemsPanel>
-         <ItemsControl.ItemTemplate>
-            <DataTemplate>
-               <GroupBox Header="{Binding sName}" Width="Auto" VerticalAlignment="Top" Height="Auto" Foreground="{StaticResource BeamWall_Corduroy}">
-                  <ItemsControl Name="MachParamsItemsControl" ItemsSource="{Binding MachParamList}" Margin="0,5,0,0">
-                     <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                           <WrapPanel Orientation="Vertical"/>
-                        </ItemsPanelTemplate>
-                     </ItemsControl.ItemsPanel>
-                     <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                           <Grid Margin="0,0,5,5">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="*" />
-                              </Grid.ColumnDefinitions>
-                              <TextBlock Text="{Binding sName}"
-                                         ToolTip="{Binding sName}"
-                                         TextWrapping="WrapWithOverflow"
-                                         Width="150"
-                                         Style="{StaticResource MachParamTextBlock}"/>
-                              <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                                     Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
-                                                     Width="60"/>
-                              <TextBlock Grid.Column="2"
-                                         Text="{Binding sDescription}"
-                                         ToolTip="{Binding sDescription}"
-                                         TextWrapping="WrapWithOverflow"
-                                         Width="148"
-                                         Style="{StaticResource MachParamTextBlock}"/>
-                           </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" Stretch="Uniform"/>
-   </Button>
-
-</Grid>

EgtBEAMWALL.Core/ConfigurationPage/OnlyProdMachine_ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml

@@ -1,82 +0,0 @@
-<Grid x:Class="OnlyProdQParameter_ConfigurationPageV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core">
-
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="2*"/>
-      <ColumnDefinition Width="1*"/>
-   </Grid.ColumnDefinitions>
-   <Grid.RowDefinitions>
-      <RowDefinition Height="1*"/>
-   </Grid.RowDefinitions>
-
-   <Border Style="{StaticResource OnlyProdPage_Border}"/>
-
-   <EgtBEAMWALL:OnlyProd_QParamListV DataContext="{Binding}" 
-                                     ItemsSource="{Binding QBTLParamVMList}"
-                                     SelectedItem="{Binding SelQParam}"
-                                     Margin="5">
-      <DataGrid.GroupStyle>
-         <GroupStyle>
-            <GroupStyle.Panel>
-               <ItemsPanelTemplate>
-                  <DataGridRowsPresenter/>
-               </ItemsPanelTemplate>
-            </GroupStyle.Panel>
-            <GroupStyle.HeaderTemplate>
-               <DataTemplate>
-                  <StackPanel>
-                     <TextBlock Text="{Binding Path=Name}"/>
-                  </StackPanel>
-               </DataTemplate>
-            </GroupStyle.HeaderTemplate>
-            <GroupStyle.ContainerStyle>
-               <Style TargetType="{x:Type GroupItem}">
-                  <Setter Property="Template">
-                     <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type GroupItem}">
-                           <Expander IsExpanded="True">
-                              <Expander.Background>
-                                 <SolidColorBrush Color="#FFBABABA"/>
-                              </Expander.Background>
-                              <Expander.Header>
-                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding Path=Name}"/>
-                                 </StackPanel>
-                              </Expander.Header>
-                              <ItemsPresenter />
-                           </Expander>
-                        </ControlTemplate>
-                     </Setter.Value>
-                  </Setter>
-               </Style>
-            </GroupStyle.ContainerStyle>
-         </GroupStyle>
-         <GroupStyle>
-            <GroupStyle.ContainerStyle>
-               <Style TargetType="{x:Type GroupItem}">
-                  <Setter Property="Template">
-                     <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type GroupItem}">
-                           <Expander IsExpanded="True">
-                              <Expander.Background>
-                                 <SolidColorBrush Color="LightGray"/>
-                              </Expander.Background>
-                              <Expander.Header>
-                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding Path=Name}"/>
-                                 </StackPanel>
-                              </Expander.Header>
-                              <ItemsPresenter />
-                           </Expander>
-                        </ControlTemplate>
-                     </Setter.Value>
-                  </Setter>
-               </Style>
-            </GroupStyle.ContainerStyle>
-         </GroupStyle>
-      </DataGrid.GroupStyle>
-   </EgtBEAMWALL:OnlyProd_QParamListV>
-
-</Grid>

EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml

@@ -1,80 +0,0 @@
-<Grid x:Class="QParameter_ConfigurationPageV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core">
-
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="2*"/>
-      <ColumnDefinition Width="1*"/>
-   </Grid.ColumnDefinitions>
-   <Grid.RowDefinitions>
-      <RowDefinition Height="1*"/>
-   </Grid.RowDefinitions>
-   <EgtBEAMWALL:QParamListV DataContext="{Binding}" 
-                            ItemsSource="{Binding QBTLParamVMList}"
-                            SelectedItem="{Binding SelQParam}"
-                            Grid.Column="0"
-                            Margin="5">
-      <DataGrid.GroupStyle>
-         <GroupStyle>
-            <GroupStyle.Panel>
-               <ItemsPanelTemplate>
-                  <DataGridRowsPresenter/>
-               </ItemsPanelTemplate>
-            </GroupStyle.Panel>
-            <GroupStyle.HeaderTemplate>
-               <DataTemplate>
-                  <StackPanel>
-                     <TextBlock Text="{Binding Path=Name}"/>
-                  </StackPanel>
-               </DataTemplate>
-            </GroupStyle.HeaderTemplate>
-            <GroupStyle.ContainerStyle>
-               <Style TargetType="{x:Type GroupItem}">
-                  <Setter Property="Template">
-                     <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type GroupItem}">
-                           <Expander IsExpanded="True" Style="{x:Null}">
-                              <Expander.Background>
-                                 <SolidColorBrush Color="#FFBABABA"></SolidColorBrush>
-                              </Expander.Background>
-                              <Expander.Header>
-                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding Path=Name}" />
-                                 </StackPanel>
-                              </Expander.Header>
-                              <ItemsPresenter />
-                           </Expander>
-                        </ControlTemplate>
-                     </Setter.Value>
-                  </Setter>
-               </Style>
-            </GroupStyle.ContainerStyle>
-         </GroupStyle>
-         <GroupStyle>
-            <GroupStyle.ContainerStyle>
-               <Style TargetType="{x:Type GroupItem}">
-                  <Setter Property="Template">
-                     <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type GroupItem}">
-                           <Expander IsExpanded="True" Style="{x:Null}">
-                              <Expander.Background>
-                                 <SolidColorBrush Color="LightGray"></SolidColorBrush>
-                              </Expander.Background>
-                              <Expander.Header>
-                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding Path=Name}" />
-                                 </StackPanel>
-                              </Expander.Header>
-                              <ItemsPresenter />
-                           </Expander>
-                        </ControlTemplate>
-                     </Setter.Value>
-                  </Setter>
-               </Style>
-            </GroupStyle.ContainerStyle>
-         </GroupStyle>
-      </DataGrid.GroupStyle>
-   </EgtBEAMWALL:QParamListV>
-
-</Grid>

EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml.vb

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

EgtBEAMWALL.Core/Constants/ConstBeam.vb

@@ -30,9 +30,8 @@
    Enum CalcStates As Integer
       NOTCALCULATED = -1
       OK = 0
-      INFO = 1
-      WARNING = 2
-      ERROR_ = 3
+      WARNING = 1
+      ERROR_ = 2
    End Enum
 
    Public Enum Range As Integer
@@ -102,210 +101,182 @@
       DOWN = 1
    End Enum
 
+   ' Tipo di progetto (Beam o Wall)
+    Public Enum BWType As Integer
+        NULL = 0
+        BEAM = 1
+        WALL = 2
+    End Enum
+    
    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
       PROD = 2
    End Enum
 
-    ' Tipo di progetto (Beam o Wall)
-    Public Enum BWType As Integer
-        NULL = 0
-        BEAM = 1
-        WALL = 2
-   End Enum
-
-   Public Const PROJ As String = "PROJ"
-   Public Const FILENAMESEPARATOR As Char = "^"c
-   Public Const BTLINFO As String = "BtlInfo"
-
-   ' layer per assemblato
-   Public Const ASSEBASE As String = "AsseBase"
-   ' info parametri assemblato
-   Public Const BTL_ASSEBASE_N As String = "N"
+   Friend Const PROJ As String = "PROJ"
+   Friend Const FILENAMESEPARATOR As Char = "^"c
+   Friend Const BTLINFO As String = "BtlInfo"
 
    ' info parametri BTL
-   Public Const BTL_PRT_PROJ As String = "PROJ"
-   Public Const BTL_PRT_PDN As String = "PDN"
-   Public Const BTL_PRT_DO As String = "DO"
-   Public Const BTL_PRT_NAM As String = "NAM"
-   Public Const BTL_PRT_L As String = "L"
-   Public Const BTL_PRT_W As String = "W"
-   Public Const BTL_PRT_H As String = "H"
-   Public Const BTL_PRT_CNT As String = "CNT"
-   Public Const BTL_PRT_ADDED As String = "ADDED"
-   Public Const BTL_PRT_DONE As String = "DONE"
-   Public Const BTL_PRT_ROTATED As String = "ROTATED"
-   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"
+   Friend Const BTL_PRT_PROJ As String = "PROJ"
+   Friend Const BTL_PRT_PDN As String = "PDN"
+   Friend Const BTL_PRT_DO As String = "DO"
+   Friend Const BTL_PRT_NAM As String = "NAM"
+   Friend Const BTL_PRT_L As String = "L"
+   Friend Const BTL_PRT_W As String = "W"
+   Friend Const BTL_PRT_H As String = "H"
+   Friend Const BTL_PRT_CNT As String = "CNT"
+   Friend Const BTL_PRT_ADDED As String = "ADDED"
+   Friend Const BTL_PRT_DONE As String = "DONE"
+   Friend Const BTL_PRT_ROTATED As String = "ROTATED"
+   Friend Const BTL_PRT_INVERTED As String = "INVERTED"
+   Friend Const BTL_PRT_MATERIAL As String = "MATERIAL"
    ' parametri pezzo
-   Public Const BTL_PRT_SINGLEMEMBERNUM = "SINGLEMEMBERNUMBER"
-   Public Const BTL_PRT_ASSEMBLYNUM = "ASSEMBLYNUMBER"
-   Public Const BTL_PRT_ORDERNUM = "ORDERNUMBER"
-   Public Const BTL_PRT_DESIGNATION = "DESIGNATION"
-   Public Const BTL_PRT_ANNOTATION = "ANNOTATION"
-   Public Const BTL_PRT_STOREY = "STOREY"
-   Public Const BTL_PRT_GROUP = "GROUP"
-   Public Const BTL_PRT_PACKAGE = "PACKAGE"
-   Public Const BTL_PRT_TIMBERGRADE = "TIMBERGRADE"
-   Public Const BTL_PRT_QUALITYGRADE = "QUALITYGRADE"
-   Public Const BTL_PRT_COLOUR = "COLOUR"
-   Public Const BTL_PRT_PLANINGLENGTH = "PLANINGLENGTH"
-   Public Const BTL_PRT_STARTOFFSET = "STARTOFFSET"
-   Public Const BTL_PRT_ENDOFFSET = "ENDOFFSET"
-   Public Const BTL_PRT_UID = "UID"
-   Public Const BTL_PRT_TRANSFORMATION = "TRANSFORMATION"
-   Public Const BTL_PRT_CAMBER = "CAMBER"
-   Public Const BTL_PRT_PARTOFFSET = "PARTOFFSET"
-   Public Const BTL_PRT_PROCESSINGQUALITY = "PROCESSINGQUALITY"
-   Public Const BTL_PRT_RECESS = "RECESS"
-   Public Const BTL_PRT_STOREYTYPE = "STOREYTYPE"
-   Public Const BTL_PRT_ELEMENTNUM = "ELEMENTNUMBER"
-   Public Const BTL_PRT_LAYER = "LAYER"
-   Public Const BTL_PRT_MODULENUM = "MODULENUMBER"
-   Public Const BTL_PRT_COMMENT = "COMMENT"
-   Public Const BTL_PRT_GRAINDIR = "GRAINDIRECTION"
-   Public Const BTL_PRT_REFSIDE = "REFERENCESIDE"
-   Public Const BTL_PRT_ALIGNMENT = "ALIGNMENT"
-   Public Const BTL_PRT_MATERIALTYPE = "MATERIALTYPE"
-   Public Const BTL_PRT_DESCRIPTION = "NAM"
+   Friend Const BTL_PRT_SINGLEMEMBERNUM = "SINGLEMEMBERNUMBER"
+   Friend Const BTL_PRT_ASSEMBLYNUM = "ASSEMBLYNUMBER"
+   Friend Const BTL_PRT_ORDERNUM = "ORDERNUMBER"
+   Friend Const BTL_PRT_DESIGNATION = "DESIGNATION"
+   Friend Const BTL_PRT_ANNOTATION = "ANNOTATION"
+   Friend Const BTL_PRT_STOREY = "STOREY"
+   Friend Const BTL_PRT_GROUP = "GROUP"
+   Friend Const BTL_PRT_PACKAGE = "PACKAGE"
+   Friend Const BTL_PRT_TIMBERGRADE = "TIMBERGRADE"
+   Friend Const BTL_PRT_QUALITYGRADE = "QUALITYGRADE"
+   Friend Const BTL_PRT_COLOUR = "COLOUR"
+   Friend Const BTL_PRT_PLANINGLENGTH = "PLANINGLENGTH"
+   Friend Const BTL_PRT_STARTOFFSET = "STARTOFFSET"
+   Friend Const BTL_PRT_ENDOFFSET = "ENDOFFSET"
+   Friend Const BTL_PRT_UID = "UID"
+   Friend Const BTL_PRT_TRANSFORMATION = "TRANSFORMATION"
+   Friend Const BTL_PRT_CAMBER = "CAMBER"
+   Friend Const BTL_PRT_PARTOFFSET = "PARTOFFSET"
+   Friend Const BTL_PRT_PROCESSINGQUALITY = "PROCESSINGQUALITY"
+   Friend Const BTL_PRT_RECESS = "RECESS"
+   Friend Const BTL_PRT_STOREYTYPE = "STOREYTYPE"
+   Friend Const BTL_PRT_ELEMENTNUM = "ELEMENTNUMBER"
+   Friend Const BTL_PRT_LAYER = "LAYER"
+   Friend Const BTL_PRT_MODULENUM = "MODULENUMBER"
+   'Friend Const BTL_PRT_USERATTRIBUTE = "USERATTRIBUTE"
+   Friend Const BTL_PRT_COMMENT = "COMMENT"
+   Friend Const BTL_PRT_GRAINDIR = "GRAINDIRECTION"
+   Friend Const BTL_PRT_REFSIDE = "REFERENCESIDE"
+   Friend Const BTL_PRT_ALIGNMENT = "ALIGNMENT"
+   Friend Const BTL_PRT_MATERIALTYPE = "MATERIALTYPE"
 
    ' parametri generici
-   Public Const BTL_GEN_BTLPATH = "BTL"
-   Public Const BTL_GEN_PROJNUM = "PROJECTNUMBER"
-   Public Const BTL_GEN_PROJNAME = "PROJECTNAME"
-   Public Const BTL_GEN_PROJPART = "PROJECTPART"
-   Public Const BTL_GEN_PROJGUID = "PROJECTGUID"
-   Public Const BTL_GEN_PROJTYPE = "PROJECTTYPE"
-   Public Const BTL_GEN_LISTNAME = "LISTNAME"
-   Public Const BTL_GEN_CUSTOMER = "CUSTOMER"
-   Public Const BTL_GEN_ARCHITECT = "ARCHITECT"
-   Public Const BTL_GEN_EDITOR = "EDITOR"
-   Public Const BTL_GEN_DELIVDATE = "DELIVERYDATE"
-   Public Const BTL_GEN_EXPDATE = "EXPORTDATE"
-   Public Const BTL_GEN_EXPTIME = "EXPORTTIME"
-   Public Const BTL_GEN_EXPRELEASE = "EXPORTRELEASE"
-   Public Const BTL_GEN_LANGUAGE = "LANGUAGE"
-   Public Const BTL_GEN_RANGE = "RANGE"
-   Public Const BTL_GEN_COMPUTERNAME = "COMPUTERNAME"
-   Public Const BTL_GEN_USER = "USER"
-   Public Const BTL_GEN_SRCFILE = "SOURCEFILE"
-   Public Const BTL_GEN_EXPFILE = "EXPORTFILE"
-   Public Const BTL_GEN_USERATTRIBUTE = "USERATTRIBUTE"
+   Friend Const BTL_GEN_PROJNUM = "PROJECTNUMBER"
+   Friend Const BTL_GEN_PROJNAME = "PROJECTNAME"
+   Friend Const BTL_GEN_PROJPART = "PROJECTPART"
+   Friend Const BTL_GEN_PROJGUID = "PROJECTGUID"
+   Friend Const BTL_GEN_PROJTYPE = "PROJECTTYPE"
+   Friend Const BTL_GEN_LISTNAME = "LISTNAME"
+   Friend Const BTL_GEN_CUSTOMER = "CUSTOMER"
+   Friend Const BTL_GEN_ARCHITECT = "ARCHITECT"
+   Friend Const BTL_GEN_EDITOR = "EDITOR"
+   Friend Const BTL_GEN_DELIVDATE = "DELIVERYDATE"
+   Friend Const BTL_GEN_EXPDATE = "EXPORTDATE"
+   Friend Const BTL_GEN_EXPTIME = "EXPORTTIME"
+   Friend Const BTL_GEN_EXPRELEASE = "EXPORTRELEASE"
+   Friend Const BTL_GEN_LANGUAGE = "LANGUAGE"
+   Friend Const BTL_GEN_RANGE = "RANGE"
+   Friend Const BTL_GEN_COMPUTERNAME = "COMPUTERNAME"
+   Friend Const BTL_GEN_USER = "USER"
+   Friend Const BTL_GEN_SRCFILE = "SOURCEFILE"
+   Friend Const BTL_GEN_EXPFILE = "EXPORTFILE"
+   Friend Const BTL_GEN_USERATTRIBUTE = "USERATTRIBUTE"
 
-   Public Const PROCESSINGS As String = "Processings"
-   Public Const [VARIANT] As String = "Variant"
-   Public Const OUTLINE As String = "Outline"
-   Public Const BTL_FTR_GRP As String = "GRP"
-   Public Const BTL_FTR_PRC As String = "PRC"
-   Public Const BTL_FTR_DO As String = "DO"
-   Public Const BTL_FTR_SIDE As String = "SIDE"
-   Public Const BTL_FTR_PRIORITY As String = "PRIORITY"
-   Public Const BTL_FTR_VARIANT As String = "VARIANT"
-   Public Const BTL_FTR_NAME As String = "NAME"
-   Public Const BTL_FTR_DES As String = "DES"
-   Public Const BTL_FTR_PRID As String = "PRID"
-   Public Const BTL_FTR_FRAME As String = "FRAME"
-   Public Const BTL_FTR_MAINID As String = "MAINID"
-   Public Const BTL_FTR_ADJID As String = "ADJID"
-   Public Const BTL_FTR_AUXID As String = "AUXID"
+   Friend Const PROCESSINGS As String = "Processings"
+   Friend Const OUTLINE As String = "Outline"
+   Friend Const BTL_FTR_GRP As String = "GRP"
+   Friend Const BTL_FTR_PRC As String = "PRC"
+   Friend Const BTL_FTR_DO As String = "DO"
+   Friend Const BTL_FTR_SIDE As String = "SIDE"
+   Friend Const BTL_FTR_NAME As String = "NAME"
+   Friend Const BTL_FTR_DES As String = "DES"
+   Friend Const BTL_FTR_PRID As String = "PRID"
+   Friend Const BTL_FTR_FRAME As String = "FRAME"
+   Friend Const BTL_FTR_MAINID As String = "MAINID"
+   Friend Const BTL_FTR_ADJID As String = "ADJID"
+   Friend Const BTL_FTR_AUXID As String = "AUXID"
 
    ' parametri machgroup grezzi
-   Public Const MGR_RPT_ID As String = "ID"
-   Public Const MGR_RPT_L As String = "L"
-   Public Const MGR_RPT_W As String = "W"
-   Public Const MGR_RPT_H As String = "H"
-   Public Const MGR_RPT_WASTE As String = "WASTE"
-   Public Const MGR_RPT_USAGE As String = "USAGE"
-   Public Const MGR_RPT_STARTCUT As String = "STARTCUT"
-   Public Const MGR_RPT_MATERIAL As String = "MATERIAL"
+   Friend Const MGR_RPT_ID As String = "ID"
+   Friend Const MGR_RPT_L As String = "L"
+   Friend Const MGR_RPT_W As String = "W"
+   Friend Const MGR_RPT_H As String = "H"
+   Friend Const MGR_RPT_WASTE As String = "WASTE"
+   Friend Const MGR_RPT_USAGE As String = "USAGE"
+   Friend Const MGR_RPT_STARTCUT As String = "STARTCUT"
+   Friend Const MGR_RPT_MATERIAL As String = "MATERIAL"
 
-   Public Const MGR_PRT_PDN As String = "PDN"
-   Public Const MGR_PRT_L As String = "L"
-   Public Const MGR_PRT_W As String = "W"
-   Public Const MGR_PRT_H As String = "H"
-   Public Const MGR_PRT_DES As String = "DES"
-   Public Const MGR_PRT_STARTCUT As String = "STARTCUT"
-   Public Const MGR_PRT_MATERIAL As String = "MATERIAL"
-   Public Const MGR_PRT_DO As String = "DO"
-   Public Const MGR_PRT_ROT As String = "ROT"
-   Public Const MGR_PRT_FLIP As String = "FLIP"
-   Public Const MGR_PRT_POSX As String = "POSX"
-   Public Const MGR_PRT_POSY As String = "POSY"
+   Friend Const MGR_PRT_PDN As String = "PDN"
+   Friend Const MGR_PRT_L As String = "L"
+   Friend Const MGR_PRT_W As String = "W"
+   Friend Const MGR_PRT_H As String = "H"
+   Friend Const MGR_PRT_DES As String = "DES"
+   Friend Const MGR_PRT_STARTCUT As String = "STARTCUT"
+   Friend Const MGR_PRT_MATERIAL As String = "MATERIAL"
+   Friend Const MGR_PRT_ROT As String = "ROT"
+   Friend Const MGR_PRT_FLIP As String = "FLIP"
+   Friend Const MGR_PRT_POSX As String = "POSX"
+   Friend Const MGR_PRT_POSY As String = "POSY"
 
-   Public Const MGR_FTR_GRP As String = "GRP"
-   Public Const MGR_FTR_PRC As String = "PRC"
-   Public Const MGR_FTR_DO As String = "DO"
-   Public Const MGR_FTR_SIDE As String = "SIDE"
-   Public Const MGR_FTR_NAME As String = "NAME"
-   Public Const MGR_FTR_DES As String = "DES"
-   Public Const MGR_FTR_PRID As String = "PRID"
-   Public Const MGR_FTR_FRAME As String = "FRAME"
+   Friend Const MGR_FTR_GRP As String = "GRP"
+   Friend Const MGR_FTR_PRC As String = "PRC"
+   Friend Const MGR_FTR_DO As String = "DO"
+   Friend Const MGR_FTR_SIDE As String = "SIDE"
+   Friend Const MGR_FTR_NAME As String = "NAME"
+   Friend Const MGR_FTR_DES As String = "DES"
+   Friend Const MGR_FTR_PRID As String = "PRID"
+   Friend Const MGR_FTR_FRAME As String = "FRAME"
 
    ' parametri creazione barre
-   Public Const MGR_RPT_BARLEN As String = "BARLEN"
-   Public Const MGR_RPT_BARHEIGHT As String = "BARHEIGHT"
-   Public Const MGR_RPT_BARWIDTH As String = "BARWIDTH"
-   Public Const MGR_RPT_PANELLEN As String = "PANELLEN"
-   Public Const MGR_RPT_PANELWIDTH As String = "PANELWIDTH"
-   Public Const MGR_RPT_PANELHEIGHT As String = "PANELHEIGHT"
-   Public Const MGR_RPT_PANELPOSZ As String = "PANELPOSZ"
-   Public Const MGR_RPT_PART As String = "PART"
-
-   ' parametri P per comunicazione con la macchina
-   Public Const MGR_RPT_PRODID As String = "PRODID"
-   Public Const MGR_RPT_PATTID As String = "PATTID"
+   Friend Const MGR_RPT_BARLEN As String = "BARLEN"
+   Friend Const MGR_RPT_BARHEIGHT As String = "BARHEIGHT"
+   Friend Const MGR_RPT_BARWIDTH As String = "BARWIDTH"
+   Friend Const MGR_RPT_PANELLEN As String = "PANELLEN"
+   Friend Const MGR_RPT_PANELWIDTH As String = "PANELWIDTH"
+   Friend Const MGR_RPT_PANELHEIGHT As String = "PANELHEIGHT"
+   Friend Const MGR_RPT_PART As String = "PART"
 
    ' parametri  errori integration
-   Public Const ITG_CUTID As String = "CUTID"
-   Public Const ITG_TASKID As String = "TASKID"
-   Public Const ITG_PROJ_ERR As String = "PROJ_ERR"
-   Public Const ITG_PROJ_MSG As String = "PROJ_MSG"
-   Public Const ITG_PROJ_ROT As String = "PROJ_ROT"
-   Public Const ITG_PROJ_FALL As String = "PROJ_FALL"
-   Public Const ITG_PROJ_TIME As String = "PROJ_TIME"
+   Friend Const ITG_CUTID As String = "CUTID"
+   Friend Const ITG_TASKID As String = "TASKID"
+   Friend Const ITG_PROJ_ERR As String = "PROJ_ERR"
+   Friend Const ITG_PROJ_MSG As String = "PROJ_MSG"
+   Friend Const ITG_PROJ_ROT As String = "PROJ_ROT"
+   Friend Const ITG_PROJ_FALL As String = "PROJ_FALL"
+   Friend Const ITG_PROJ_TIME As String = "PROJ_TIME"
 
    ' parametri  errori integration
-   Public Const ITG_PROD_ERR As String = "PROD_ERR"
-   Public Const ITG_PROD_MSG As String = "PROD_MSG"
-   Public Const ITG_PROD_ROT As String = "PROD_ROT"
-   Public Const ITG_PROD_FALL As String = "PROD_FALL"
-   Public Const ITG_PROD_TIME As String = "PROD_TIME"
-
-   ' parametri blocco rot e flip
-   Public Const LOCK_ROT As String = "MANUALROT"
-   Public Const LOCK_FLIP As String = "MANUALFLIP"
+   Friend Const ITG_PROD_ERR As String = "PROD_ERR"
+   Friend Const ITG_PROD_MSG As String = "PROD_MSG"
+   Friend Const ITG_PROD_ROT As String = "PROD_ROT"
+   Friend Const ITG_PROD_FALL As String = "PROD_FALL"
+   Friend Const ITG_PROD_TIME As String = "PROD_TIME"
 
    ' parametri  errori integration
-   Public Const DUPLO_TODELETE As String = "DUPLO_TODELETE"
+   Friend Const DUPLO_TODELETE As String = "DUPLO_TODELETE"
 
    ' parametri warehouse
-   Public Const WRH_BEAM As String = "BEAM"
-   Public Const WRH_WALL As String = "WALL"
-   Public Const WRH_CURRENT As String = "Current"
-   Public Const WRH_STARTOFFSET As String = "StartOffset"
-   Public Const WRH_OFFSET As String = "Offset"
-   Public Const WRH_RANGE As String = "Range"
-   Public Const WRH_QUANTITY As String = "Quantity"
-   Public Const WRH_L As String = "L"
-   Public Const WRH_KERF As String = "Kerf"
-   Public Const WRH_S As String = "S"
+   Friend Const WRH_BEAM As String = "BEAM"
+   Friend Const WRH_WALL As String = "WALL"
+   Friend Const WRH_CURRENT As String = "Current"
+   Friend Const WRH_STARTOFFSET As String = "StartOffset"
+   Friend Const WRH_OFFSET As String = "Offset"
+   Friend Const WRH_L As String = "L"
+   Friend Const WRH_KERF As String = "Kerf"
+   Friend Const WRH_S As String = "S"
 
    ' parametri import/export
    Public Const EXP_PROJ As String = "EXPORTPROJ"
    Public Const EXP_PROD As String = "EXPORTPROD"
    Public Const BTLFILENAME As String = "BTLFILENAME"
-   Public Const EXP_PART As String = "ImportExport"
-   Public Const EXP_MACHINE As String = "Machine"
-   ' parametro che indica se il progetto e' stato appena importato e quindi bisogna riverificare i MachGroup
-   Public Const IMP_VERIFYMACHGROUP As String = "VerifyMachGroup"
-
-   ' parametri modifica percorsi free contour
-   Public Const PATH_SIDEANGLAYER As String = "SideAngLayer"
 
 End Module

EgtBEAMWALL.Core/Constants/ConstColumns.vb

@@ -1,40 +1,23 @@
 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"
+   ' RawPartList
    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"
+
+   ' PartInRawPartList
+   Public Const COL_PDN As String = "colPDN"
+   Public Const COL_NAM As String = "colNAM"
    Public Const COL_ROT As String = "colROT"
    Public Const COL_FLIP As String = "colFLIP"
    Public Const COL_POSX As String = "colPOSX"
    Public Const COL_POSY As String = "colPOSY"
    Public Const COL_OFFSET As String = "colOFFSET"
-   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_ARCHIVED As String = "colARCHIVED"
 
 End Module

EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb

@@ -5,33 +5,9 @@
    Public Const S_FEATURELIST As String = "DG_FeatureList"
    Public Const S_OPENPROJFILEDLG_PROJ As String = "DG_OpenProjectFileDialog_PROJ"
    Public Const S_OPENPROJFILEDLG_PROD As String = "DG_OpenProjectFileDialog_PROD"
-   Public Const S_NEWOPENPROJFILEDLG_PROD As String = "DG_NewOpenProjectFileDialog_PROD"
    Public Const S_RAWPARTLIST_BEAM As String = "DG_RawPartList_BEAM"
    Public Const S_RAWPARTLIST_WALL As String = "DG_RawPartList_WALL"
    Public Const S_PARTINRAWPARTLIST_BEAM As String = "DG_PartInRawPartList_BEAM"
    Public Const S_PARTINRAWPARTLIST_WALL As String = "DG_PartInRawPartList_WALL"
-   Public Const S_PARAMETERLIST_P As String = "DG_ParameterList_P"
-   Public Const S_PARAMETERLIST_Q As String = "DG_ParameterList_Q"
-   Public Const S_DUPLOPARAMETERLIST_Q As String = "DG_DuploParameterList_Q"
-   Public Const S_RAWPARTLIST_SUPERVISOR As String = "DG_RawPartList_SUPERVISOR"
-   Public Const S_PARTINRAWPARTLIST_SUPERVISOR As String = "DG_PartInRawPartList_SUPERVISOR"
-   Public Const S_FEATUREINPARTINRAWPARTLIST_SUPERVISOR As String = "DG_FeatureInPartInRawPartList_SUPERVISOR"
-   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"
-   Public Const S_SPARAMLIST_BEAM As String = "DG_SParamList_BEAM"
-   Public Const S_SPARAMLIST_WALL As String = "DG_SParamList_WALL"
-   Public Const S_SECTXMATLIST_BEAM As String = "DG_SectXMatList_BEAM"
-   Public Const S_SECTXMATLIST_WALL As String = "DG_SectXMatList_WALL"
-   Public Const S_VARIABLESLIST As String = "DG_VariablesList"
-   Public Const S_MDICOMMANDS As String = "DG_MDICommands"
-   Public Const S_MACHINELOG As String = "DG_MachineLog"
-   Public Const S_UPDATEBTLPARTLIST As String = "DG_UpdateBTLPartList"
-
-   Public Const K_LOCKTABLE As String = "LockTable"
 
 End Module

EgtBEAMWALL.Core/Constants/ConstDims.vb

@@ -1,14 +0,0 @@
-Public Class ConstDims
-
-   Public Const DIMENSIONS_FILE_NAME As String = "Dimensions.ini"
-
-   Public Const PROJECT_VIEW As String = "Project_View"
-   Public Const PROJECT_OPTIMIZER As String = "Project_Optimizer"
-   Public Const LEFTPANEL_VIEW As String = "LeftPanel_View"
-   Public Const LEFTPANEL_OPTIMIZER As String = "LeftPanel_Optimizer"
-   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/ConstIni.vb

@@ -1,122 +0,0 @@
-'----------------------------------------------------------------------------
-'  EgalTech 2015-2015
-'----------------------------------------------------------------------------
-' File : ConstIni.vb       Data : 12.02.15        Versione : 1.6b3
-' Contenuto : Modulo costanti sezione e chiavi per file Ini.
-'
-'
-'
-' Modifiche : 12.02.15 DS Creazione modulo.
-'
-'
-'----------------------------------------------------------------------------
-
-Public Module ConstIni
-
-   Public Const INI_FILE_NAME As String = "EgtBEAMWALL.ini"
-
-   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_VIEWOPTIMWINPLACE As String = "ViewOptimWinPlace"
-   Public Const K_SUPERVISORWINPLACE As String = "SupervisorWinPlace"
-   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_DBADDRESS As String = "DbAddress"
-   Public Const K_DBMASTERKEY As String = "DbMasterKey"
-   Public Const K_SHAREDFOLDER As String = "SharedFolder"
-   Public Const K_UPDATEBTL As String = "UpdateBtl"
-   Public Const K_DATADIR As String = "DataDir"
-   Public Const K_ENABLEEDIT As String = "EnableEdit"
-   Public Const K_FASTPRODUCE As String = "FastProduce"
-   Public Const K_ADDPROJ As String = "AddProj"
-   Public Const K_PROJECTMODE As String = "ProjectMode"
-
-   Public Const K_SHOWBUILDING As String = "ShowBuilding"
-
-   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_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_BEAM As String = "Beam"
-   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 K_WALLBASEDIR As String = "BaseDir"
-   Public Const K_WALLBWEEXEC As String = "BweExec"
-
-   Public Const S_MACHINELOGFILTER As String = "MachineLogFilters"
-   Public Const K_PARTEVENTTYPE As String = "PartEventType"
-   Public Const K_ENTITYTYPE As String = "EntityType"
-   Public Const K_DAYTYPE As String = "DayType"
-   Public Const K_STARTDATE As String = "StartDate"
-   Public Const K_ENDDATE As String = "EndDate"
-
-   Public Const S_OPENFILEDIALOG As String = "OpenFileDialog"
-   Public Const K_VIEWARCHIVED As String = "ViewArchived"
-
-   Public Const K_NESTEXEC As String = "NestExec"
-   Public Const K_FLIPROT As String = "FlipRot"
-   Public Const K_SECTIONTIME As String = "SectionTime"
-   Public Const K_PARTTIME As String = "PartTime"
-   Public Const K_RAWPARTDEF As String = "RawPartDefinition"
-   Public Const K_MANUALNEST As String = "ManualNest"
-   Public Const K_LDINTERSOTHER As String = "LDIntersOther"
-   Public Const K_MINSCORE As String = "MinScore"
-
-   Public Const S_BEAMWALL As String = "BeamWall"
-   Public Const K_BEAMWALLENABLE As String = "BtlEnable"
-   Public Const K_BEAMWALLBASEDIR As String = "BaseDir"
-   Public Const K_BEAMWALLBUTTON As String = "Button"
-
-   Public Const S_MRUPROJFILES As String = "MruProjFiles"
-   Public Const S_MRUPRODFILES As String = "MruProdFiles"
-   Public Const S_MRUSUPERVISORPRODFILES As String = "MruSupervisorProdFiles"
-
-   Public Const S_PRINTER As String = "Printer"
-   Public Const K_LINK As String = "Link"
-   Public Const K_ENABLE As String = "Enable"
-   Public Const K_ZEBRAUTILITIES As String = "ZebraUtilities"
-   Public Const K_TEMPLATE As String = "Template"
-
-   Public Const S_BEAM_LIST As String = "Beam_List"
-   Public Const S_WALL_LIST As String = "Wall_List"
-
-   Public Const S_WAREHOUSE As String = "Warehouse"
-   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"
-End Module

EgtBEAMWALL.Core/Constants/ConstMachComm.vb

@@ -19,14 +19,10 @@
       SENDPROG = 10
       REMOVEPROG = 11
       REMOVEALLPROG = 12
-      READ_TPA = 13
+      READ = 13
       WRITE = 14
       DELETEALARMS = 15
-      SETOPMODE = 16
-      READ_NUMFLEXIUM = 17
-      STOPREAD_NUMFLEXIUM = 18
-      MDI = 19
-      SETCHANNEL = 20
+      SETOP = 16
    End Enum
 
    Public Enum LogCommandTypes As Integer

EgtBEAMWALL.Core/Constants/ConstMachIni.vb

@@ -1,32 +0,0 @@
-Public Module ConstMachIni
-
-   Public Const MACH_INI_FILE_NAME As String = "MachData.ini"
-   Public Const GETBEAMDATA_FILE_NAME As String = "GetBeamData.lua"
-   Public Const GETWALLDATA_FILE_NAME As String = "GetWallData.lua"
-   Public Const GETTS3DATA_FILE_NAME As String = "GetTs3Data.lua"
-
-   Public Const K_NCTYPE As String = "NCType"
-   Public Const K_CONNECTIONSTRING As String = "ConnectionString"
-   Public Const K_SUPERVISOR As String = "Supervisor"
-   Public Const K_SAVECNCPATH As String = "SaveCncPath"
-   Public Const K_SAVEEXT As String = "SaveExt"
-
-   Public Const S_CHANNELS As String = "Channels"
-
-   ' Variables della macchina corrente
-   Public Const S_MAINVARIABLES As String = "MainVariables"
-   Public Const S_VARIABLES As String = "Variables"
-   Public Const S_INPUTVARIABLES As String = "InputVariables"
-   Public Const S_OUTPUTVARIABLES As String = "OutputVariables"
-   Public Const S_MDI As String = "MDI"
-
-   Public Const K_BEAM As String = "Beam"
-   Public Const K_WALL As String = "Wall"
-   Public Const K_SCRIPT As String = "Scripts"
-   Public Const K_SETUP As String = "Setup"
-   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

@@ -10,7 +10,7 @@
     <AssemblyName>EgtBEAMWALL.Core</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -47,56 +47,18 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EgtUILib">
-      <HintPath>..\ExtLibs\EgtUILib.dll</HintPath>
+    <Reference Include="EgtUILib, Version=2.3.4.3, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\EgtProg\Dll32\EgtUILib.dll</HintPath>
     </Reference>
-    <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="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.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="EgtWPFLib5, Version=2.3.4.3, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\EgtProg\Dll32\EgtWPFLib5.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" />
@@ -116,128 +78,37 @@
     <Import Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BeamMachiningsWindow\BeamMachiningsWindowV.xaml.vb">
-      <DependentUpon>BeamMachiningsWindowV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="BeamMachiningsWindow\MyBeamMachiningsWindowVM.vb" />
-    <Compile Include="BeamMachiningsWindow\OnlyProdBeamMachiningsWindowV.xaml.vb">
-      <DependentUpon>OnlyProdBeamMachiningsWindowV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="BTLViewModel\BTLFeatureVM.vb" />
-    <Compile Include="CALCPanel\CalcEditEndEventArgs.vb" />
-    <Compile Include="ConfigurationPage\OnlyProdMachine_ConfigurationPageV.xaml.vb">
-      <DependentUpon>OnlyProdMachine_ConfigurationPageV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ConfigurationPage\OnlyProdGeneral_ConfigurationPageV.xaml.vb">
-      <DependentUpon>OnlyProdGeneral_ConfigurationPageV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ConfigurationPage\General_ConfigurationPageV.xaml.vb">
-      <DependentUpon>General_ConfigurationPageV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ConfigurationPage\Machine_ConfigurationPageV.xaml.vb">
-      <DependentUpon>Machine_ConfigurationPageV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ConfigurationPage\OnlyProdQParameter_ConfigurationPageV.xaml.vb">
-      <DependentUpon>OnlyProdQParameter_ConfigurationPageV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ConfigurationPage\QParameter_ConfigurationPageV.xaml.vb">
-      <DependentUpon>QParameter_ConfigurationPageV.xaml</DependentUpon>
-    </Compile>
+    <Compile Include="BeamM.vb" />
+    <Compile Include="BTL ViewModel\BTLFeatureVM.vb" />
     <Compile Include="Constants\ConstColumns.vb" />
     <Compile Include="Constants\ConstDataGridColumnsIni.vb" />
-    <Compile Include="Constants\ConstDims.vb" />
-    <Compile Include="Constants\ConstGen.vb" />
-    <Compile Include="Constants\ConstIni.vb" />
     <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="EgtColorPicker\OnlyProdEgtColorPickerV.xaml.vb">
-      <DependentUpon>OnlyProdEgtColorPickerV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="EgtDataGrid\EgtDataGrid.xaml.vb">
       <DependentUpon>EgtDataGrid.xaml</DependentUpon>
     </Compile>
     <Compile Include="EgtDataGrid\DataGridColumnsIniFile.vb" />
-    <Compile Include="CALCPanel\CalcProcessEndEventArgs.vb" />
-    <Compile Include="CALCPanel\CalcResultEventArgs.vb" />
-    <Compile Include="CALCPanel\CalcEndEventArgs.vb" />
-    <Compile Include="CALCPanel\CalcIntegration.vb" />
+    <Compile Include="MachGroup Model\BeamMachGroupM.vb" />
     <Compile Include="DataAccess\PartAddedEventArgs.vb" />
     <Compile Include="DataAccess\BTLParamAddedEventArgs.vb" />
-    <Compile Include="EgtManageFileDialog\EgtManageFileDialogV.xaml.vb">
-      <DependentUpon>EgtManageFileDialogV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="EgtManageFileDialog\OnlyProdEgtManageFileDialogV.xaml.vb">
-      <DependentUpon>OnlyProdEgtManageFileDialogV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="EgtMessageBox\EgtMessageBoxV.xaml.vb">
-      <DependentUpon>EgtMessageBoxV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="EgtMessageBox\OnlyProdEgtMessageBoxV.xaml.vb">
-      <DependentUpon>OnlyProdEgtMessageBoxV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ItemParamList\OnlyProd_QParamListV.xaml.vb">
-      <DependentUpon>OnlyProd_QParamListV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ItemParamList\QParamListV.xaml.vb">
-      <DependentUpon>QParamListV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Lib\MachGroupAddedEventArgs.vb" />
     <Compile Include="Lib\MachGroupVM.vb" />
     <Compile Include="Lib\NewMachGroupPanelVM.vb" />
-    <Compile Include="BTLModel\BTLFeatureM.vb" />
-    <Compile Include="BTLModel\BTLParamM.vb" />
+    <Compile Include="BTL Model\BTLFeatureM.vb" />
+    <Compile Include="BTL Model\BTLParamM.vb" />
     <Compile Include="DataAccess\BTLFeatureAddedEventArgs.vb" />
     <Compile Include="DataAccess\BTLPartAddedEventArgs.vb" />
-    <Compile Include="BTLModel\BTLPartM.vb" />
-    <Compile Include="BTLModel\BTLStructureM.vb" />
+    <Compile Include="BTL Model\BTLPartM.vb" />
+    <Compile Include="BTL Model\BTLStructureM.vb" />
     <Compile Include="Constants\ConstBeam.vb" />
-    <Compile Include="LoadingWnd\LoadingWndHelper.vb" />
-    <Compile Include="LoadingWnd\LoadingWndV.xaml.vb">
-      <DependentUpon>LoadingWndV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="LoadingWnd\LoadingWndVM.vb" />
-    <Compile Include="LoadingWnd\OnlyProdLoadingWndV.xaml.vb">
-      <DependentUpon>OnlyProdLoadingWndV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="MachinePanel\OnlyProdMachinePanelV.xaml.vb">
-      <DependentUpon>OnlyProdMachinePanelV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="MachinePanel\MachinePanelV.xaml.vb">
-      <DependentUpon>MachinePanelV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="MachiningDbWindow\OnlyProdMachiningDbWindowV.xaml.vb">
-      <DependentUpon>OnlyProdMachiningDbWindowV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogV.xaml.vb">
-      <DependentUpon>NewOpenProjectFileDialogV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogVM.vb" />
-    <Compile Include="NewOpenProjectFileDialog\OnlyProdNewOpenProjectFileDialogV.xaml.vb">
-      <DependentUpon>OnlyProdNewOpenProjectFileDialogV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="OpenProjectFileDialog\OnlyProdOpenProjectFileDialogV.xaml.vb">
-      <DependentUpon>OnlyProdOpenProjectFileDialogV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="SetUpWindow\OnlyProdSetUpWindowV.xaml.vb">
-      <DependentUpon>OnlyProdSetUpWindowV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ToolsDbWindow\OnlyProdToolDbWindowV.xaml.vb">
-      <DependentUpon>OnlyProdToolDbWindowV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Utility\Configuration.vb" />
-    <Compile Include="ProjectFileVM\ProdItem.vb" />
-    <Compile Include="Utility\DimensionsIniFile.vb" />
-    <Compile Include="Utility\Enum.vb" />
+    <Compile Include="Enum.vb" />
+    <Compile Include="MachGroupPanel\BeamMachGroupVM.vb" />
+    <Compile Include="MachGroupPanel\BeamVM.vb" />
     <Compile Include="MachGroupPanel\MyMachGroupPanelVM.vb" />
     <Compile Include="MachGroupPanel\MyMachGroupVM.vb" />
     <Compile Include="MachGroupPanel\PartVM.vb" />
-    <Compile Include="Utility\GridDimension.vb" />
-    <Compile Include="Utility\LuaMsgManager.vb" />
-    <Compile Include="Utility\MachLog.vb" />
+    <Compile Include="MachGroupPanel\WallMachGroupVM.vb" />
+    <Compile Include="MachGroupPanel\WallVM.vb" />
+    <Compile Include="MachLog.vb" />
     <Compile Include="My Project\AssemblyInfo.vb" />
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
@@ -254,31 +125,29 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="MachGroupModel\MyMachGroupM.vb" />
+    <Compile Include="MachGroup Model\MyMachGroupM.vb" />
     <Compile Include="Lib\MachGroupM.vb" />
     <Compile Include="Lib\MachGroupPanelM.vb" />
-    <Compile Include="MachGroupModel\MyMachGroupPanelM.vb" />
-    <Compile Include="Utility\ManageWindow.vb" />
-    <Compile Include="Utility\MyMachine.vb" />
+    <Compile Include="MachGroup Model\MyMachGroupPanelM.vb" />
+    <Compile Include="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" />
-    <Compile Include="ProjectFileVM\ProjectFileM.vb" />
+    <Compile Include="PartM.vb" />
+    <Compile Include="ProdFileM.vb" />
+    <Compile Include="ProjectFileM.vb" />
     <Compile Include="ProjectManager\ProdFileVM.vb" />
     <Compile Include="ProjectManager\ProjectFileVM.vb" />
     <Compile Include="ProjectManager\ProjFileVM.vb" />
-    <Compile Include="ProjectFileVM\ProjFileM.vb" />
-    <Compile Include="Utility\SectionXMaterial.vb" />
+    <Compile Include="ProjFileM.vb" />
+    <Compile Include="SectionXMaterial.vb" />
     <Compile Include="Utility\BTLIniFile.vb" />
+    <Compile Include="Utility\Command.vb" />
     <Compile Include="Utility\CoreMap.vb" />
-    <Compile Include="Utility\DisableModifiedMgr.vb" />
-    <Compile Include="ViewPanel\ViewPanelV.xaml.vb">
-      <DependentUpon>ViewPanelV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ViewPanel\ViewPanelVM.vb" />
+    <Compile Include="Utility\VMBase.vb" />
+    <Compile Include="WallM.vb" />
+    <Compile Include="WallMachGroupM.vb" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="My Project\Resources.resx">
@@ -289,7 +158,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="My Project\Application.myapp">
       <Generator>MyApplicationCodeGenerator</Generator>
       <LastGenOutput>Application.Designer.vb</LastGenOutput>
@@ -299,135 +167,19 @@
       <CustomToolNamespace>My</CustomToolNamespace>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="BeamMachiningsWindow\BeamMachiningsWindowV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="BeamMachiningsWindow\OnlyProdBeamMachiningsWindowV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ConfigurationPage\OnlyProdMachine_ConfigurationPageV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ConfigurationPage\OnlyProdGeneral_ConfigurationPageV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ConfigurationPage\General_ConfigurationPageV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
-    <Page Include="ConfigurationPage\Machine_ConfigurationPageV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
-    <Page Include="ConfigurationPage\OnlyProdQParameter_ConfigurationPageV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ConfigurationPage\QParameter_ConfigurationPageV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
-    <Page Include="EgtColorPicker\EgtColorPickerV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="EgtColorPicker\OnlyProdEgtColorPickerV.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="EgtManageFileDialog\OnlyProdEgtManageFileDialogV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="EgtMessageBox\EgtMessageBoxV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="EgtMessageBox\OnlyProdEgtMessageBoxV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ItemParamList\OnlyProd_QParamListV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ItemParamList\QParamListV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="LoadingWnd\LoadingWndV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
-    <Page Include="LoadingWnd\OnlyProdLoadingWndV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="MachinePanel\OnlyProdMachinePanelV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="MachinePanel\MachinePanelV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
-    <Page Include="MachiningDbWindow\OnlyProdMachiningDbWindowV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="NewOpenProjectFileDialog\OnlyProdNewOpenProjectFileDialogV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="OpenProjectFileDialog\OnlyProdOpenProjectFileDialogV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="OpenProjectFileDialog\OpenProjectFileDialogV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="SetUpWindow\OnlyProdSetUpWindowV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ToolsDbWindow\OnlyProdToolDbWindowV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ViewPanel\ViewPanelV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
   </ItemGroup>
-  <ItemGroup>
-    <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>
+    <!-- <PostBuildEvent>copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.Core.dll</PostBuildEvent> -->
   </PropertyGroup>
 </Project>

EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml

@@ -1,268 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow 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"
-                            Title="{Binding sTitle}"
-                            WindowStartupLocation="CenterOwner"
-                            SizeToContent="WidthAndHeight"
-                            WindowStyle="None" ResizeMode="NoResize"
-                            IsMinimizable="False" ShowInTaskbar="False"
-                            Width="750" Height="450"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
-
-   <Grid Margin="5,5,5,0">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Grid Margin="5,5,5,0">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
-         <Grid Margin="5,5,5,0">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-            <TabControl>
-               <TabItem Header="{Binding BasicColor_Msg}">
-                  <Grid HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="1*"/>
-                     </Grid.RowDefinitions>
-                     <ListBox ItemsSource="{Binding BasicColors}"
-                              SelectedItem="{Binding SelColor}"
-                              HorizontalAlignment="Center"
-                              BorderThickness="0">
-                        <ListBox.ItemsPanel>
-                           <ItemsPanelTemplate>
-                              <UniformGrid Columns="13"/>
-                           </ItemsPanelTemplate>
-                        </ListBox.ItemsPanel>
-                        <ListBox.ItemTemplate>
-                           <DataTemplate>
-                              <Rectangle Width="20"
-                                      Height="20"
-                                      Margin="2"
-                                      Stroke="Black" 
-                                      StrokeThickness="0.5"
-                                      Fill="{Binding Fill}"/>
-                           </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="White"/>
-                     </Style>
-                  </TabItem.Resources>
-                  <EgtWPFLib5:EgtHexList ItemsSource="{Binding HexList}"
-                                         SelectedItem="{Binding sHexSelColor}"
-                                         Orientation="Vertical" 
-                                         Margin="2.5"
-                                         RowCount="13" 
-                                         ColumnCount="13"
-                                         Height="300"
-                                         Width="350"
-                                         Style="{StaticResource EgtHexList}">
-                     <EgtWPFLib5:EgtHexList.ItemTemplate>
-                        <DataTemplate/>
-                     </EgtWPFLib5:EgtHexList.ItemTemplate>
-                     <EgtWPFLib5:EgtHexList.ItemContainerStyle>
-                        <Style TargetType="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 HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="1*"/>
-                     </Grid.RowDefinitions>
-                     <ListBox ItemsSource="{Binding BasicColorsTheme}"
-                              SelectedItem="{Binding SelColorTheme}"
-                              BorderThickness="0">
-                        <ListBox.ItemsPanel>
-                           <ItemsPanelTemplate>
-                              <UniformGrid Columns="13"/>
-                           </ItemsPanelTemplate>
-                        </ListBox.ItemsPanel>
-                        <ListBox.ItemTemplate>
-                           <DataTemplate>
-                              <Rectangle Width="20"
-                                         Height="20"
-                                         Margin="2"
-                                         Stroke="Black" 
-                                         StrokeThickness="0.5"
-                                         Fill="{Binding Fill}"/>
-                           </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"
-               Margin="5,0,0,0">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <TextBlock Text="{Binding CustomColor_Msg}"
-                       Margin="5,18,5,10"
-                       Style="{StaticResource DialogWindow_TextBlock}"/>
-            <Grid Grid.Row="1">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto"/>
-                  <RowDefinition Height="1*"/>
-               </Grid.RowDefinitions>
-               <ListBox ItemsSource="{Binding CustomColors}"
-                        SelectedItem="{Binding SelCustomColor}"
-                        HorizontalAlignment="Center"
-                        Background="Transparent"
-                        BorderThickness="0">
-                  <ListBox.ItemsPanel>
-                     <ItemsPanelTemplate>
-                        <UniformGrid Columns="13"/>
-                     </ItemsPanelTemplate>
-                  </ListBox.ItemsPanel>
-                  <ListBox.ItemTemplate>
-                     <DataTemplate>
-                        <Rectangle Width="20"
-                                   Height="20"
-                                   Margin="2"
-                                   Stroke="Black" 
-                                   StrokeThickness="0.5"
-                                   Fill="{Binding Fill}"/>
-                     </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"
-                  Margin="0,20,0,0">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <Grid Margin="0,10,5,0"
-                     HorizontalAlignment="Left">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="1*" />
-                     <RowDefinition Height="Auto" />
-                  </Grid.RowDefinitions>
-                  <Rectangle Width="100" 
-                             Height="70" 
-                             Stroke="Black" 
-                             StrokeThickness="0.5"
-                             Fill="{Binding CurrColor}"/>
-                  <Button x:Name="SaveColor"
-                          Grid.Row="1"
-                          Margin="0,10,0,0"
-                          Content="{Binding AddCColor_Msg}"
-                          Command="{Binding SaveColor_Command}"  
-                          Style="{StaticResource LeftPanel_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}"
-                             Margin="0,10,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-                  <TextBox Grid.Column="1" 
-                           HorizontalAlignment="Right"
-                           Margin="0,5,5,0"
-                           IsReadOnly="False"
-                           Text="{Binding Red, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-                  <TextBlock Grid.Row="1"
-                             Text="{Binding Green_Msg}"
-                             Margin="5,5,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-                  <TextBox Grid.Column="1"
-                           Grid.Row="1"
-                           HorizontalAlignment="Right"
-                           Margin="5,5,5,0"
-                           IsReadOnly="False"
-                           Text="{Binding Green, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-                  <TextBlock Grid.Row="2"
-                             Text="{Binding Blu_Msg}"
-                             Margin="5,5,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-                  <TextBox Grid.Column="1"
-                           Grid.Row="2"
-                           HorizontalAlignment="Right"
-                           Margin="5,5,5,0"
-                           IsReadOnly="False"
-                           Text="{Binding Blue, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-                  <TextBlock Grid.Row="3"
-                             Text="{Binding Hexadecimal_Msg}"
-                             Margin="5,5,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-                  <TextBox Grid.Column="1"
-                           Grid.Row="3"
-                           HorizontalAlignment="Right"
-                           Margin="5,5,5,0"
-                           Text="{Binding Hexadecimal}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-               </Grid>
-            </Grid>
-         </Grid>
-      </Grid>
-      <UniformGrid Grid.Row="2"  
-                   Rows="1"
-                   Margin="10,10,10,0">
-         <Button IsDefault="True"
-                 Content="OK"
-                 Command="{Binding Ok_Command}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
-         <Button Content="Cancel"
-                 Command="{Binding Cancel_Command}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
-      </UniformGrid>
-   </Grid>
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml.vb

@@ -1,69 +0,0 @@
-Imports System.Windows
-Imports System.Windows.Forms
-Imports EgtWPFLib5
-
-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)
-      MyBase.New(Owner)
-      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/EgtColorPicker/OnlyProdEgtColorPickerV.xaml

@@ -1,268 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdEgtColorPickerV"
-                            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"
-                            Title="{Binding sTitle}"
-                            WindowStartupLocation="CenterOwner"
-                            SizeToContent="WidthAndHeight"
-                            WindowStyle="None" ResizeMode="NoResize"
-                            IsMinimizable="False" ShowInTaskbar="False"
-                            Width="750" Height="450"
-                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
-   
-   <Grid Margin="5,5,5,0">
-   <Grid.RowDefinitions>
-      <RowDefinition Height="1*"/>
-      <RowDefinition Height="Auto"/>
-   </Grid.RowDefinitions>
-   <Grid Margin="5,5,5,0">
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="1*"/>
-      </Grid.ColumnDefinitions>
-      <Grid Margin="5,5,5,0">
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
-         <TabControl>
-            <TabItem Header="{Binding BasicColor_Msg}">
-               <Grid HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="1*"/>
-                  </Grid.RowDefinitions>
-                  <ListBox ItemsSource="{Binding BasicColors}"
-                              SelectedItem="{Binding SelColor}"
-                              HorizontalAlignment="Center"
-                              BorderThickness="0">
-                     <ListBox.ItemsPanel>
-                        <ItemsPanelTemplate>
-                           <UniformGrid Columns="13"/>
-                        </ItemsPanelTemplate>
-                     </ListBox.ItemsPanel>
-                     <ListBox.ItemTemplate>
-                        <DataTemplate>
-                           <Rectangle Width="20"
-                                      Height="20"
-                                      Margin="2"
-                                      Stroke="Black" 
-                                      StrokeThickness="0.5"
-                                      Fill="{Binding Fill}"/>
-                        </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="White"/>
-                  </Style>
-               </TabItem.Resources>
-               <EgtWPFLib5:EgtHexList ItemsSource="{Binding HexList}"
-                                         SelectedItem="{Binding sHexSelColor}"
-                                         Orientation="Vertical" 
-                                         Margin="2.5"
-                                         RowCount="13" 
-                                         ColumnCount="13"
-                                         Height="300"
-                                         Width="350"
-                                         Style="{StaticResource EgtHexList}">
-                  <EgtWPFLib5:EgtHexList.ItemTemplate>
-                     <DataTemplate/>
-                  </EgtWPFLib5:EgtHexList.ItemTemplate>
-                  <EgtWPFLib5:EgtHexList.ItemContainerStyle>
-                     <Style TargetType="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 HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto"/>
-                     <RowDefinition Height="1*"/>
-                  </Grid.RowDefinitions>
-                  <ListBox ItemsSource="{Binding BasicColorsTheme}"
-                              SelectedItem="{Binding SelColorTheme}"
-                              BorderThickness="0">
-                     <ListBox.ItemsPanel>
-                        <ItemsPanelTemplate>
-                           <UniformGrid Columns="13"/>
-                        </ItemsPanelTemplate>
-                     </ListBox.ItemsPanel>
-                     <ListBox.ItemTemplate>
-                        <DataTemplate>
-                           <Rectangle Width="20"
-                                         Height="20"
-                                         Margin="2"
-                                         Stroke="Black" 
-                                         StrokeThickness="0.5"
-                                         Fill="{Binding Fill}"/>
-                        </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"
-               Margin="5,0,0,0">
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-         </Grid.RowDefinitions>
-         <TextBlock Text="{Binding CustomColor_Msg}"
-                       Margin="5,18,5,10"
-                       Style="{StaticResource DialogWindow_TextBlock}"/>
-         <Grid Grid.Row="1">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-            <ListBox ItemsSource="{Binding CustomColors}"
-                        SelectedItem="{Binding SelCustomColor}"
-                        HorizontalAlignment="Center"
-                        Background="Transparent"
-                        BorderThickness="0">
-               <ListBox.ItemsPanel>
-                  <ItemsPanelTemplate>
-                     <UniformGrid Columns="13"/>
-                  </ItemsPanelTemplate>
-               </ListBox.ItemsPanel>
-               <ListBox.ItemTemplate>
-                  <DataTemplate>
-                     <Rectangle Width="20"
-                                   Height="20"
-                                   Margin="2"
-                                   Stroke="Black" 
-                                   StrokeThickness="0.5"
-                                   Fill="{Binding Fill}"/>
-                  </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"
-                  Margin="0,20,0,0">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
-            <Grid Margin="0,10,5,0"
-                     HorizontalAlignment="Left">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="1*" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Rectangle Width="100" 
-                             Height="70" 
-                             Stroke="Black" 
-                             StrokeThickness="0.5"
-                             Fill="{Binding CurrColor}"/>
-               <Button x:Name="SaveColor"
-                          Grid.Row="1"
-                          Margin="0,10,0,0"
-                          Content="{Binding AddCColor_Msg}"
-                          Command="{Binding SaveColor_Command}"  
-                          Style="{StaticResource LeftPanel_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}"
-                             Margin="0,10,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-               <TextBox Grid.Column="1" 
-                           HorizontalAlignment="Right"
-                           Margin="0,5,5,0"
-                           IsReadOnly="False"
-                           Text="{Binding Red, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-               <TextBlock Grid.Row="1"
-                             Text="{Binding Green_Msg}"
-                             Margin="5,5,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-               <TextBox Grid.Column="1"
-                           Grid.Row="1"
-                           HorizontalAlignment="Right"
-                           Margin="5,5,5,0"
-                           IsReadOnly="False"
-                           Text="{Binding Green, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-               <TextBlock Grid.Row="2"
-                             Text="{Binding Blu_Msg}"
-                             Margin="5,5,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-               <TextBox Grid.Column="1"
-                           Grid.Row="2"
-                           HorizontalAlignment="Right"
-                           Margin="5,5,5,0"
-                           IsReadOnly="False"
-                           Text="{Binding Blue, UpdateSourceTrigger=PropertyChanged}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-               <TextBlock Grid.Row="3"
-                             Text="{Binding Hexadecimal_Msg}"
-                             Margin="5,5,5,0"
-                             HorizontalAlignment="Right"
-                             Style="{StaticResource DialogWindow_TextBlock}"/>
-               <TextBox Grid.Column="1"
-                           Grid.Row="3"
-                           HorizontalAlignment="Right"
-                           Margin="5,5,5,0"
-                           Text="{Binding Hexadecimal}"
-                           Style="{StaticResource ColorPicker_TextBox}"/>
-            </Grid>
-         </Grid>
-      </Grid>
-   </Grid>
-   <UniformGrid Grid.Row="2"  
-                   Rows="1"
-                   Margin="10,10,10,0">
-      <Button IsDefault="True"
-                 Content="OK"
-                 Command="{Binding Ok_Command}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
-      <Button Content="Cancel"
-                 Command="{Binding Cancel_Command}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
-   </UniformGrid>
-   </Grid>
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/EgtColorPicker/OnlyProdEgtColorPickerV.xaml.vb

@@ -1,69 +0,0 @@
-Imports EgtWPFLib5
-Imports System.Windows
-Imports System.Windows.Forms
-
-Public Class OnlyProdEgtColorPickerV
-
-#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)
-      MyBase.New(Owner)
-      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/DataGridColumnsIniFile.vb

@@ -1,6 +1,5 @@
 Imports System.Collections.ObjectModel
 Imports System.Windows.Controls
-Imports System.Windows.Forms
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -8,14 +7,13 @@ Public Module DataGridColumnsIniFile
 
    Public m_sDataGridColumnsIniFile As String
 
-   ' funzione per ottenere dal file INI le colonne da caricare nelle EgtDataGrid del programma
    Public Function GetPrivateProfileColumns(ParentDGName As String, ByRef ocColumns As ObservableCollection(Of EgtDataGridColumn)) As Boolean
       Dim colIndex As Integer = 0
       Dim str = String.Empty
       While EgtUILib.GetPrivateProfileString(ParentDGName, colIndex, String.Empty, str, m_sDataGridColumnsIniFile) > 0
          Dim sColumnParams() As String = str.Split(","c)
          ' verifico numero minimo di parametri
-         If sColumnParams.Count >= 9 Then
+         If sColumnParams.Count >= 7 Then
             ' cancello spazi
             For index = 0 To sColumnParams.Count - 1
                sColumnParams(index) = sColumnParams(index).Trim()
@@ -28,12 +26,9 @@ Public Module DataGridColumnsIniFile
             Dim bIsReadOnly As Boolean = sColumnParams(4).Equals("1")
             Dim Width As Double
             Dim WidthType As DataGridLengthUnitType
-            StringToDoubleAdv(sColumnParams(5), Width)
+            StringToDouble(sColumnParams(5), Width)
             Integer.TryParse(sColumnParams(6), WidthType)
-            Dim bVisible As Boolean = sColumnParams(7).Equals("1")
-            Dim bCanUserEditVisible As Boolean = sColumnParams(8).Equals("1")
-            Dim nSortDirection As SortOrder = If(sColumnParams.Count >= 10, CInt(sColumnParams(9)), 0)
-            ocColumns.Add(New EgtDataGridColumn(ParentDGName, sName, bReorder, bResize, bSort, bIsReadOnly, New DataGridLength(Width, WidthType), bVisible, bCanUserEditVisible, nSortDirection))
+            ocColumns.Add(New EgtDataGridColumn(ParentDGName, sName, bReorder, bResize, bSort, bIsReadOnly, New DataGridLength(Width, WidthType)))
          End If
          colIndex += 1
       End While
@@ -44,39 +39,4 @@ Public Module DataGridColumnsIniFile
       Return WritePrivateProfileString(ParentDataGridName, DisplayIndex, sColumnParams, m_sDataGridColumnsIniFile)
    End Function
 
-   ' funzione per ottenere dal file INI le colonne da caricare nelle EgtDataGrid del programma
-   Public Function GetPrivateProfileColumn(ParentDGName As String, ByRef Column As EgtDataGridColumn) As Boolean
-      Dim colIndex As Integer = 0
-      Dim str = String.Empty
-      While EgtUILib.GetPrivateProfileString(ParentDGName, colIndex, String.Empty, str, m_sDataGridColumnsIniFile) > 0
-         Dim sColumnParams() As String = str.Split(","c)
-         ' verifico numero minimo di parametri
-         If sColumnParams.Count >= 9 Then
-            If Column.Name = sColumnParams(0) Then
-               ' cancello spazi
-               For index = 0 To sColumnParams.Count - 1
-                  sColumnParams(index) = sColumnParams(index).Trim()
-               Next
-               ' creo colonna
-               Dim sName = sColumnParams(0)
-               Dim bReorder As Boolean = sColumnParams(1).Equals("1")
-               Dim bResize As Boolean = sColumnParams(2).Equals("1")
-               Dim bSort As Boolean = sColumnParams(3).Equals("1")
-               Dim bIsReadOnly As Boolean = sColumnParams(4).Equals("1")
-               Dim Width As Double
-               Dim WidthType As DataGridLengthUnitType
-               StringToDoubleAdv(sColumnParams(5), Width)
-               Integer.TryParse(sColumnParams(6), WidthType)
-               Dim bVisible As Boolean = sColumnParams(7).Equals("1")
-               Dim bCanUserEditVisible As Boolean = sColumnParams(8).Equals("1")
-               Dim nSortDirection As SortOrder = If(sColumnParams.Count >= 10, CInt(sColumnParams(9)), 0)
-               Column = New EgtDataGridColumn(ParentDGName, sName, bReorder, bResize, bSort, bIsReadOnly, New DataGridLength(Width, WidthType), bVisible, bCanUserEditVisible, nSortDirection)
-               Exit While
-            End If
-         End If
-         colIndex += 1
-      End While
-      Return Not IsNothing(Column)
-   End Function
-
 End Module

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml

@@ -2,19 +2,12 @@
           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="{x:Type DataGridColumnHeader}">
-         <EventSetter Event="SizeChanged" Handler="Cell_SizedChanged" />
-         <EventSetter Event="MouseRightButtonDown" Handler="Cell_MouseRightButtonDown" />
-         <!-- Propieta' Header DataGrid -->
-         <Setter Property="Background" Value="{Binding ColumnHeaderBackground, ElementName=CurrDataGrid}" />
-         <Setter Property="Foreground" Value="{Binding ColumnHeaderForeground, ElementName=CurrDataGrid}" />
-         <Setter Property="FontWeight" Value="{Binding ColumnHeaderFontWeight, ElementName=CurrDataGrid}" />
-         <Setter Property="FontSize" Value="{Binding ColumnHeaderFontSize, ElementName=CurrDataGrid}" />
-         <Setter Property="HorizontalContentAlignment" Value="{Binding ColumnHeaderHorizontalContentAlignment, ElementName=CurrDataGrid}" />
-         <Setter Property="Padding" Value="{Binding ColumnHeaderPadding, ElementName=CurrDataGrid}" />
-      </Style>
-   </DataGrid.ColumnHeaderStyle>
+    <DataGrid.ColumnHeaderStyle>
+        <Style TargetType="DataGridColumnHeader">
+            <EventSetter Event="SizeChanged" Handler="Cell_SizedChanged" />
+        </Style>
+    </DataGrid.ColumnHeaderStyle>
+
 </DataGrid>
 
 

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb

@@ -1,28 +1,12 @@
 Imports System.Collections.ObjectModel
 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.Media
 Imports EgtUILib
 Imports EgtWPFLib5
 
 Public Class EgtDataGrid
 
-   Public Event ResetSort()
-
-   ' vecchio indice da salvare per il Reorder delle colonne
-   Public OldIndex As Integer = 0
-   ' indice header su cui è aperto il ContextMenu per gestione check/uncheck LockTable
-   Private HeaderDispIndex As Integer = 0
-   ' somma delle larghezze delle colonne di EgtDataGrid
-   Private columnsWidth As Double = 0
-
-   ' larghezza minima dell'ultima colonna per attivare/disattivare ScrollBar orizzontale
-   Private Const LASTCOLUMN_MINWIDTH As Double = 40
-
    Sub New()
       InitializeComponent()
    End Sub
@@ -44,8 +28,8 @@ Public Class EgtDataGrid
 
       If oldItems IsNot Nothing Then
 
-         For index = 0 To oldItems.Count - 1
-            Dim Column As DataGridColumn = context.FindResource(oldItems(index))
+         For Index = 0 To oldItems.Count - 1
+            Dim Column As DataGridColumn = context.FindResource(oldItems(Index))
             context.Columns.Remove(Column)
          Next
 
@@ -56,14 +40,10 @@ Public Class EgtDataGrid
 
       If newItems IsNot Nothing Then
 
-         For index = 0 To newItems.Count - 1
-            Try
-               Dim col As DataGridColumn = context.FindResource(newItems(index).Name)
-               newItems(index).InitColumn(col)
-               context.Columns.Add(col)
-            Catch ex As Exception
-               MessageBox.Show(String.Format(EgtMsg(61883), newItems(index).Name, newItems(index).ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
-            End Try
+         For Index = 0 To newItems.Count - 1
+            Dim col As DataGridColumn = context.FindResource(newItems(Index).Name)
+            newItems(Index).InitColumn(col)
+            context.Columns.Add(col)
          Next
 
          AddHandler newItems.CollectionChanged, AddressOf context.collectionChanged
@@ -77,16 +57,12 @@ Public Class EgtDataGrid
             If e.NewItems IsNot Nothing Then
 
                For Each one As EgtDataGridColumn In e.NewItems
-                  Try
-                     Dim col As DataGridColumn = CurrDataGrid.FindResource(one.Name)
-                     one.InitColumn(col)
-                     CurrDataGrid.Columns.Insert(e.NewStartingIndex, col)
-                     If col.DisplayIndex <> e.NewStartingIndex Then
-                        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)
-                  End Try
+                  Dim col As DataGridColumn = CurrDataGrid.FindResource(one.Name)
+                  one.InitColumn(col)
+                  CurrDataGrid.Columns.Insert(e.NewStartingIndex, col)
+                  If col.DisplayIndex <> e.NewStartingIndex Then
+                     CurrDataGrid.Columns(e.NewStartingIndex).DisplayIndex = e.NewStartingIndex
+                  End If
                Next
             End If
 
@@ -125,134 +101,11 @@ Public Class EgtDataGrid
    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
-         If Not (e.OriginalSource.Column.Width.IsStar) Then
-            BindingColumns(e.OriginalSource.Column.DisplayIndex).SaveDataGridColumn()
-         End If
+         BindingColumns(e.OriginalSource.Column.DisplayIndex).SaveDataGridColumn()
       End If
    End Sub
 
-   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 CurrDataGrid.ActualWidth - LASTCOLUMN_MINWIDTH > columnsWidth Then
-            ' nascondo la ScrollBar orizzontale e setto lo UnitType dell'ultima colonna visibile a Star
-            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(CurrDataGrid, ScrollBarVisibility.Visible)
-            For Each bc In BindingColumns
-               If bc.Width.IsStar Then
-                  bc.Width = New DataGridLength(bc.ActualWidth, DataGridLengthUnitType.Pixel)
-               End If
-            Next
-         End If
-         ' scrivo nell'INI la Width dell'ultima colonna visibile
-         BindingColumns.Last(Function(x) x.Visible = True).SaveDataGridColumn()
-      End If
-   End Sub
-
-   Public Sub UpdateColumnsWidth()
-      ' ricalcolo la somma delle larghezze delle colonne visibili
-      columnsWidth = 0
-      For Each col In BindingColumns
-         If col.ColumnVisibility = Visibility.Visible Then
-            columnsWidth += col.ActualWidth
-         End If
-      Next
-      ' alla somma calcolata tolgo la larghezza dell'ultima colonna visibile e aggiungo LASTCOLUMN_MINWIDTH
-      ' (in questo modo si attiva/disattiva la ScrollBar orizzontale non appena l'ultima colonna viene ristretta/estesa a LASTCOLUMN_MINWIDTH px)
-      If BindingColumns.Count > 0 AndAlso
-         BindingColumns.Any(Function(x) x.Visible = True) Then
-         columnsWidth = columnsWidth - BindingColumns.Last(Function(x) x.Visible = True).ActualWidth + LASTCOLUMN_MINWIDTH
-      End If
-   End Sub
-
-   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()
-      Dim miReorder As MenuItem = New MenuItem()
-      Dim miResize As MenuItem = New MenuItem()
-      Dim miSort As MenuItem = New MenuItem()
-      Dim sep1 As Separator = New Separator()
-      Dim miVis As MenuItem = New MenuItem()
-      Dim sep2 As Separator = New Separator()
-      Dim miLock As MenuItem = New MenuItem()
-      Dim miResetSort As MenuItem = New MenuItem()
-      miReorder.Header = NameOf(EgtDataGridColumn.CanUserReorder)
-      miResize.Header = NameOf(EgtDataGridColumn.CanUserResize)
-      miSort.Header = NameOf(EgtDataGridColumn.CanUserSort)
-      miVis.Header = "Columns Visibility"
-      miLock.Header = "Lock Table"
-      miResetSort.Header = "Reset Sort"
-      miReorder.IsCheckable = True
-      miResize.IsCheckable = True
-      miSort.IsCheckable = True
-      miLock.IsCheckable = True
-      miResetSort.IsCheckable = False
-      miReorder.StaysOpenOnClick = True
-      miResize.StaysOpenOnClick = True
-      miSort.StaysOpenOnClick = True
-      miLock.StaysOpenOnClick = True
-      miResetSort.StaysOpenOnClick = True
-      ' setto il binding
-      Dim miReorderBinding As Binding = New Binding(NameOf(EgtDataGridColumn.CanUserReorder))
-      Dim miResizeBinding As Binding = New Binding(NameOf(EgtDataGridColumn.CanUserResize))
-      Dim miSortBinding As Binding = New Binding(NameOf(EgtDataGridColumn.CanUserSort))
-      miReorderBinding.Mode = BindingMode.TwoWay
-      miResizeBinding.Mode = BindingMode.TwoWay
-      miSortBinding.Mode = BindingMode.TwoWay
-      miReorder.DataContext = BindingColumns(nDispIndex)
-      miResize.DataContext = BindingColumns(nDispIndex)
-      miSort.DataContext = BindingColumns(nDispIndex)
-      miReorder.SetBinding(MenuItem.IsCheckedProperty, miReorderBinding)
-      miResize.SetBinding(MenuItem.IsCheckedProperty, miResizeBinding)
-      miSort.SetBinding(MenuItem.IsCheckedProperty, miSortBinding)
-      ' setto check e enable associati a LockTable
-      miLock.IsChecked = (GetPrivateProfileInt(BindingColumns(nDispIndex).ParentDataGridName, K_LOCKTABLE, 0, m_sDataGridColumnsIniFile) > 0)
-      miReorder.IsChecked = If(miLock.IsChecked, False, BindingColumns(nDispIndex).CanUserReorder)
-      miResize.IsChecked = If(miLock.IsChecked, False, BindingColumns(nDispIndex).CanUserResize)
-      miReorder.IsEnabled = Not miLock.IsChecked
-      miResize.IsEnabled = Not miLock.IsChecked
-      HeaderDispIndex = nDispIndex
-      AddHandler miLock.Checked, AddressOf miLock_Checked
-      AddHandler miLock.Unchecked, AddressOf miLock_Unchecked
-      AddHandler miResetSort.Click, AddressOf miResetSort_Click
-      ' aggiungo i MenuItem al ContextMenu
-      cm.Items.Add(miReorder)
-      cm.Items.Add(miResize)
-      cm.Items.Add(miSort)
-      cm.Items.Add(sep1)
-      cm.Items.Add(miVis)
-      cm.Items.Add(sep2)
-      cm.Items.Add(miLock)
-      cm.Items.Add(miResetSort)
-      ' creo e aggiungo gli item figli di Columns Visibility
-      For Each Column In BindingColumns
-         Dim mi As MenuItem = New MenuItem()
-         mi.Header = Column.Name
-         mi.IsCheckable = True
-         Dim miBinding As Binding = New Binding(NameOf(EgtDataGridColumn.Visible))
-         miBinding.Mode = BindingMode.TwoWay
-         mi.DataContext = Column
-         mi.SetBinding(MenuItem.IsCheckedProperty, miBinding)
-         mi.StaysOpenOnClick = True
-         mi.IsEnabled = Column.CanUserEditVisible
-         miVis.Items.Add(mi)
-      Next
-      ' disabilito Columns Visibility se tutti i suoi figli sono disabilitati
-      Dim bIsEnabled As Boolean = False
-      For Each visMenuItem In miVis.Items
-         bIsEnabled = visMenuItem.IsEnabled
-      Next
-      cm.Items(4).IsEnabled = bIsEnabled
-
-      cm.PlacementTarget = TryCast(sender, Button)
-      cm.IsOpen = True
-   End Sub
+   Public OldIndex As Integer = 0
 
    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
@@ -272,233 +125,12 @@ Public Class EgtDataGrid
       Next
    End Sub
 
-   Private Sub miLock_Checked(sender As Object, e As RoutedEventArgs)
-      Dim miLock = DirectCast(sender, MenuItem)
-      '  disabilito Reorder e Resize di tutte le colonne salvandone prima il valore
-      For Each Column In BindingColumns
-         Column.OldCanUserReorder = Column.CanUserReorder
-         Column.OldCanUserResize = Column.CanUserResize
-         Column.CanUserReorder = False
-         Column.CanUserResize = False
-      Next
-      ' aggiorno il ContextMenu correntemente aperto
-      Dim miReorder As MenuItem = TryCast(miLock.Parent, ContextMenu).Items(0)
-      Dim miResize As MenuItem = TryCast(miLock.Parent, ContextMenu).Items(1)
-      miReorder.IsChecked = False
-      miResize.IsChecked = False
-      miReorder.IsEnabled = False
-      miResize.IsEnabled = False
-      ' scrivo il valore di LockTable nell'INI
-      WritePrivateProfileString(BindingColumns(HeaderDispIndex).ParentDataGridName, K_LOCKTABLE, 1, m_sDataGridColumnsIniFile)
-   End Sub
-
-   Private Sub miLock_Unchecked(sender As Object, e As RoutedEventArgs)
-      Dim miLock = DirectCast(sender, MenuItem)
-      '  abilito Reorder e Resize di tutte le colonne ripristinando il valore precedente, se presente
-      For Each Column In BindingColumns
-         If Not IsNothing(Column.OldCanUserReorder) Then Column.CanUserReorder = Column.OldCanUserReorder
-         If Not IsNothing(Column.OldCanUserResize) Then Column.CanUserResize = Column.OldCanUserResize
-      Next
-      ' aggiorno il ContextMenu correntemente aperto
-      Dim miReorder As MenuItem = TryCast(miLock.Parent, ContextMenu).Items(0)
-      Dim miResize As MenuItem = TryCast(miLock.Parent, ContextMenu).Items(1)
-      miReorder.IsChecked = If(IsNothing(BindingColumns(HeaderDispIndex).OldCanUserReorder), BindingColumns(HeaderDispIndex).CanUserReorder, BindingColumns(HeaderDispIndex).OldCanUserReorder)
-      miResize.IsChecked = If(IsNothing(BindingColumns(HeaderDispIndex).OldCanUserResize), BindingColumns(HeaderDispIndex).CanUserResize, BindingColumns(HeaderDispIndex).OldCanUserResize)
-      miReorder.IsEnabled = True
-      miResize.IsEnabled = True
-      ' scrivo il valore di LockTable nell'INI
-      WritePrivateProfileString(BindingColumns(HeaderDispIndex).ParentDataGridName, K_LOCKTABLE, 0, m_sDataGridColumnsIniFile)
-   End Sub
-
-   Private Sub miResetSort_Click(sender As Object, e As RoutedEventArgs)
-      ' resetto le SortDirection di tutte le colonne della datagrid
-      ResetSortDirections()
-   End Sub
-
-   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
-            CurrDataGrid.Items.SortDescriptions.Add(New SortDescription(CurrDataGrid.Columns(colIndex).SortMemberPath, col.SortDirection - 1))
-            Exit For
-         End If
-         colIndex += 1
-      Next
-      ' calcolo la somma delle larghezze delle colonne visibili
-      For Each col In BindingColumns
-         If col.ColumnVisibility = Visibility.Visible Then
-            columnsWidth += col.ActualWidth
-         End If
-      Next
-   End Sub
-
-   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)
-      ' ora applico la SortDirection corretta
-      Select Case CurrSortDirection
-         Case ListSortDirection.Ascending
-            BindingColumns(e.Column.DisplayIndex).SortDirection = 2 ' la setto a Descending
-         Case ListSortDirection.Descending
-            BindingColumns(e.Column.DisplayIndex).SortDirection = 1 ' la setto a Ascending
-         Case Else
-            BindingColumns(e.Column.DisplayIndex).SortDirection = 1 ' la setto a Ascending
-      End Select
-   End Sub
-
-   Private Sub ResetSortDirections(Optional bUserClick As Boolean = False)
-      If bUserClick Then
-         ' nel caso di click dell'utente sulla colonna da sortare occorre solamente settare a 0 la SortDirection di tutte le colonne
-         For Each column In BindingColumns
-            column.SortDirection = 0
-         Next
-      Else
-         ' altrimenti (caso ResetSort da ContextMenu) è necessatio un Clear più ampio e anche grafico
-         CurrDataGrid.Items.SortDescriptions.Clear()
-         For Each column In BindingColumns
-            column.SortDirection = 0
-            ' resetto graficamente anche l'header della colonna
-            CurrDataGrid.Columns(column.DisplayIndex).SortDirection = Nothing
-         Next
-         RaiseEvent ResetSort()
-      End If
-   End Sub
-
-#Region "COLUMN HEADER PROPERTY DATAGRID"
-
-#Region "BACKGROUND HEADER"
-
-   Public Shared ReadOnly ColumnHeaderBackgroundProperty As DependencyProperty = DependencyProperty.Register("ColumnHeaderBackground",
-                                                                                                              GetType(Brush),
-                                                                                                              GetType(EgtDataGrid),
-                                                                                                              New FrameworkPropertyMetadata(SystemColors.ControlBrush))
-
-   Public Property ColumnHeaderBackground As Brush
-      Get
-         Return DirectCast(GetValue(ColumnHeaderBackgroundProperty), Brush)
-      End Get
-      Set(value As Brush)
-         SetValue(ColumnHeaderBackgroundProperty, value)
-      End Set
-   End Property
-
-#End Region    ' BackGround Heder
-
-#Region "FOREGROUND HEADER"
-
-   Public Shared ReadOnly ColumnHeaderForegroundProperty As DependencyProperty = DependencyProperty.Register("ColumnHeaderForeground",
-                                                                                                              GetType(Brush),
-                                                                                                              GetType(EgtDataGrid),
-                                                                                                              New FrameworkPropertyMetadata(SystemColors.ControlTextBrush))
-
-   Public Property ColumnHeaderForeground As Brush
-      Get
-         Return DirectCast(GetValue(ColumnHeaderForegroundProperty), Brush)
-      End Get
-      Set(value As Brush)
-         SetValue(ColumnHeaderForegroundProperty, value)
-      End Set
-   End Property
-
-#End Region    ' Foreground Header
-
-#Region "FONTWEIGHT HEADER"
-
-   Public Shared ReadOnly ColumnHeaderFontWeightProperty As DependencyProperty = DependencyProperty.Register("ColumnHeaderFontWeight",
-                                                                                                              GetType(FontWeight),
-                                                                                                              GetType(EgtDataGrid),
-                                                                                                              New FrameworkPropertyMetadata(FontWeights.Normal))
-
-   Public Property ColumnHeaderFontWeight As FontWeight
-      Get
-         Return DirectCast(GetValue(ColumnHeaderFontWeightProperty), FontWeight)
-      End Get
-      Set(value As FontWeight)
-         SetValue(ColumnHeaderFontWeightProperty, value)
-      End Set
-   End Property
-
-#End Region    ' FontWeight Header
-
-#Region "FONTSIZE HEADER"
-
-   Public Shared ReadOnly ColumnHeaderFontSizeProperty As DependencyProperty = DependencyProperty.Register("ColumnHeaderFontSize",
-                                                                                                            GetType(Double),
-                                                                                                            GetType(EgtDataGrid),
-                                                                                                            New FrameworkPropertyMetadata(Convert.ToDouble(12)))
-
-   Public Property ColumnHeaderFontSize As Double
-      Get
-         Return DirectCast(GetValue(ColumnHeaderFontSizeProperty), Double)
-      End Get
-      Set(value As Double)
-         SetValue(ColumnHeaderFontSizeProperty, value)
-      End Set
-   End Property
-
-#End Region    ' FontSize Header
-
-#Region "HORIZONTAKCONTENTALIGNMENT HEADER"
-
-   Public Shared ReadOnly ColumnHeaderHorizontalContentAlignmentProperty As DependencyProperty = DependencyProperty.Register("ColumnHeaderHorizontalContentAlignment",
-                                                                                                                              GetType(HorizontalAlignment),
-                                                                                                                              GetType(EgtDataGrid),
-                                                                                                                              New FrameworkPropertyMetadata(HorizontalAlignment.Stretch))
-
-   Public Property ColumnHeaderHorizontalContentAlignment As HorizontalAlignment
-      Get
-         Return DirectCast(GetValue(ColumnHeaderHorizontalContentAlignmentProperty), HorizontalAlignment)
-      End Get
-      Set(value As HorizontalAlignment)
-         SetValue(ColumnHeaderHorizontalContentAlignmentProperty, value)
-      End Set
-   End Property
-
-#End Region    ' HorizontalContentAlignment Header
-
-#Region "PADDING HEADER"
-
-   Public Shared ReadOnly ColumnHeaderPaddingProperty As DependencyProperty = DependencyProperty.Register("ColumnHeaderPadding",
-                                                                                                           GetType(Thickness),
-                                                                                                           GetType(EgtDataGrid),
-                                                                                                           New FrameworkPropertyMetadata(New Thickness(0)))
-
-   Public Property ColumnHeaderPadding As Thickness
-      Get
-         Return DirectCast(GetValue(ColumnHeaderPaddingProperty), Thickness)
-      End Get
-      Set(value As Thickness)
-         SetValue(ColumnHeaderPaddingProperty, value)
-      End Set
-   End Property
-
-#End Region    ' Padding Header
-
-
-#End Region    ' Column Header Property DataGrid
-
 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
@@ -533,12 +165,6 @@ Public Class EgtDataGridColumn
       End Set
    End Property
 
-   Public ReadOnly Property ActualWidth As Double
-      Get
-         Return m_dgColumn.ActualWidth
-      End Get
-   End Property
-
    Private Property m_DisplayIndex As Integer
    Public Property DisplayIndex As Integer
       Get
@@ -553,7 +179,6 @@ Public Class EgtDataGridColumn
       End Set
    End Property
 
-   Private Property m_OrigIsReadOnly As Boolean = True
    Private Property m_IsReadOnly As Boolean = True
    Public Property IsReadOnly As Boolean
       Get
@@ -565,13 +190,10 @@ Public Class EgtDataGridColumn
          Else
             m_IsReadOnly = value
          End If
+         SaveDataGridColumn()
       End Set
    End Property
-   Public Sub ResetToOrigIsReadOnly()
-      IsReadOnly = m_OrigIsReadOnly
-   End Sub
 
-   Friend OldCanUserReorder As Boolean?
    Private m_CanUserReorder As Boolean
    Public Property CanUserReorder As Boolean
       Get
@@ -587,7 +209,6 @@ Public Class EgtDataGridColumn
       End Set
    End Property
 
-   Friend OldCanUserResize As Boolean?
    Private m_CanUserResize As Boolean
    Public Property CanUserResize As Boolean
       Get
@@ -618,89 +239,18 @@ Public Class EgtDataGridColumn
       End Set
    End Property
 
-   Private m_Visible As Boolean
-   Public Property Visible As Boolean
-      Get
-         Return m_Visible
-      End Get
-      Set(value As Boolean)
-         m_Visible = value
-         ColumnVisibility = If(m_Visible, Visibility.Visible, Visibility.Collapsed)
-         SaveDataGridColumn()
-      End Set
-   End Property
-
-   Private m_ColumnVisibility As Visibility
-   Public Property ColumnVisibility As Visibility
-      Get
-         Return If(m_Visible, Visibility.Visible, Visibility.Collapsed)
-      End Get
-      Set(value As Visibility)
-         m_ColumnVisibility = value
-         If Not IsNothing(m_dgColumn) Then
-            m_dgColumn.Visibility = value
-            ' ricavo la EgtDataGrid a cui appartiene la DataGridColumn
-            Dim propertyInfo As Reflection.PropertyInfo = m_dgColumn.GetType().GetProperty("DataGridOwner",
-                                                                               Reflection.BindingFlags.Instance Or
-                                                                               Reflection.BindingFlags.NonPublic)
-            Dim dg As EgtDataGrid = propertyInfo.GetValue(m_dgColumn, Nothing)
-            ' ogni colonna visibile con UnitType a Star tranne l'ultima verrà settata a Pixel
-            For Each bc In dg.BindingColumns
-               If bc.Width.IsStar And Not bc.Name = dg.BindingColumns.Last(Function(x) x.Visible = True).Name Then
-                  bc.Width = New DataGridLength(bc.ActualWidth, DataGridLengthUnitType.Pixel)
-               End If
-            Next
-         End If
-      End Set
-   End Property
-
-   Private m_CanUserEditVisible As Boolean
-   Public Property CanUserEditVisible As Boolean
-      Get
-         Return m_CanUserEditVisible
-      End Get
-      Set(value As Boolean)
-         m_CanUserEditVisible = value
-         SaveDataGridColumn()
-      End Set
-   End Property
-
-   Private m_SortDirection As Forms.SortOrder = Forms.SortOrder.None
-   Public Property SortDirection As Forms.SortOrder
-      Get
-         Return m_SortDirection 'If(IsNothing(m_dgColumn.SortDirection), 0, m_dgColumn.SortDirection + 1)
-      End Get
-      Set(value As Forms.SortOrder)
-         'If Not IsNothing(m_dgColumn) Then
-         '   If value = 0 Then
-         '      m_dgColumn.SortDirection = Nothing
-         '   Else
-         '      m_dgColumn.SortDirection = value - 1
-         '   End If
-         'Else
-         m_SortDirection = value
-         'End If
-         SaveDataGridColumn()
-      End Set
-   End Property
-
    Sub New(sName As String)
       m_Name = sName
    End Sub
 
-   Sub New(sParentDG As String, sName As String, bCanUserReorder As Boolean, bCanUserResize As Boolean, bCanUserSort As Boolean, bIsReadOnly As Boolean, Width As DataGridLength, bVisible As Boolean, bCanUserEditVisible As Boolean, nSortDirection As Integer)
+   Sub New(sParentDG As String, sName As String, bCanUserReorder As Boolean, bCanUserResize As Boolean, bCanUserSort As Boolean, bIsReadOnly As Boolean, Width As DataGridLength)
       m_ParentDataGridName = sParentDG
       m_Name = sName
       m_CanUserReorder = bCanUserReorder
       m_CanUserResize = bCanUserResize
       m_CanUserSort = bCanUserSort
-      m_OrigIsReadOnly = bIsReadOnly
       m_IsReadOnly = bIsReadOnly
       m_Width = Width
-      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)
@@ -711,19 +261,13 @@ Public Class EgtDataGridColumn
       m_dgColumn.IsReadOnly = m_IsReadOnly
       'm_dgColumn.DisplayIndex = m_DisplayIndex
       m_dgColumn.Width = m_Width
-      m_dgColumn.Visibility = m_ColumnVisibility
-      If CInt(m_SortDirection) > 0 Then
-         m_dgColumn.SortDirection = m_SortDirection - 1 'If(CInt(m_SortDirection) = 0, Nothing, m_SortDirection - 1)
-      Else
-         m_dgColumn.SortDirection = Nothing
-      End If
    End Sub
 
    ' funzione per calcolare e scrivere la stringa dei parametri della colonna nell'INI
    Public Function SaveDataGridColumn() As Boolean
       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)
+      sColumnParams = Name & "," & If(CanUserReorder, 1, 0) & "," & If(CanUserResize, 1, 0) & "," & If(CanUserSort, 1, 0) & "," & If(IsReadOnly, 1, 0) & "," & DoubleToString(Width.Value, 6) & "," & Width.UnitType
       bOk = WriteColumnPrivateProfileParam(ParentDataGridName, DisplayIndex, sColumnParams)
       Return bOk
    End Function

EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml

@@ -1,400 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow 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"
-                            Title="{Binding sTitle}"
-                            WindowStartupLocation="CenterOwner"
-                            WindowStyle="None" ResizeMode="NoResize" 
-                            IsMinimizable="False" ShowInTaskbar="False"
-                            Height="500" Width="800"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
-
-   <Grid Margin="5,5,5,0">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Grid Margin="5,5,5,0">
-         <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"
-                    Margin="5"
-                    Text="{Binding sSelPath}"
-                    HorizontalAlignment="Left"
-                    Style="{StaticResource DialogWindow_TextBlock}"/>
-         <ComboBox Grid.Column="2"
-                   HorizontalAlignment="Right"
-                   IsSynchronizedWithCurrentItem="True"
-                   ItemsSource="{Binding ViewModeList}"
-                   SelectedItem="{Binding SelViewMode}"
-                   Margin="2.5,5,2.5,5"
-                   Style="{StaticResource RightPanel_ComboBox}"/>
-      </Grid>
-      <Grid Grid.Row="1"
-            Margin="5,5,5,0">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="4*"/>
-         </Grid.ColumnDefinitions>
-         <TreeView x:Name="FileTree" 
-                   ItemsSource="{Binding RootList}"                   
-                   Margin="10"
-                   FontSize="15"
-                   BorderBrush="White">
-            <TreeView.Resources>
-               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:EgtFolder}" 
-                                         ItemsSource="{Binding TreeItemList_View}">
-                  <StackPanel Orientation="Horizontal">
-                     <Image Source="{Binding sIconSource}"
-                            Height="15"
-                            Style="{StaticResource Button_Image}"/>
-                     <TextBlock Text="{Binding sName}"
-                                Style="{StaticResource DialogWindow_TextBlock}"/>
-                  </StackPanel>
-               </HierarchicalDataTemplate>
-               <DataTemplate DataType="{x:Type EgtWPFLib5:EgtItem}">
-                  <StackPanel Orientation="Horizontal">
-                     <Image Source="{Binding sIconSource}"
-                            Height="15"
-                            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"
-                     Background="Transparent"
-                     BorderBrush="White"
-                     BorderThickness="0"
-                     SelectedIndex="{Binding nSelTab}">
-            <TabControl.ItemContainerStyle>
-               <Style TargetType="{x:Type TabItem}">
-                  <Setter Property="Visibility" Value="Collapsed"/>
-               </Style>
-            </TabControl.ItemContainerStyle>
-            <TabItem Header="LISTBOX">
-               <ListBox x:Name="FileList" 
-                        Grid.Row="1"
-                        Margin="5,5,5,5"
-                        BorderBrush="White"
-                        IsSynchronizedWithCurrentItem="True"
-                        ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
-                        SelectedItem="{Binding ItemSelected, Mode=TwoWay}">
-                  <ListBox.Resources>
-                     <DataTemplate x:Key="ListTemplateView" 
-                                   DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
-                              Height="20">
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="Auto"/>
-                              <ColumnDefinition Width="Auto"/>
-                           </Grid.ColumnDefinitions>
-                           <Image Source="{Binding sIconSource}"
-                                  Height="15"
-                                  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 Margin="5,5,5,0"
-                              Height="50"
-                              Width="250">
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="Auto"/>
-                              <ColumnDefinition Width="1*"/>
-                           </Grid.ColumnDefinitions>
-                           <Image Source="{Binding sIconSource}"
-                                  Style="{StaticResource Button_Image}"/>
-                           <UniformGrid Grid.Column="1"
-                                        Rows="3"
-                                        Margin="2.5,0,2.5,5">
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding sName}"
-                                         HorizontalAlignment="Left"
-                                         Style="{StaticResource DialogWindow_TextBlock}"/>
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding ghTypeItem}"
-                                         HorizontalAlignment="Left"
-                                         Style="{StaticResource DialogWindow_TextBlock}"/>
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding sDimension}"
-                                         HorizontalAlignment="Left"
-                                         Style="{StaticResource DialogWindow_TextBlock}"/>
-                           </UniformGrid>
-                        </Grid>
-                     </DataTemplate>
-                     <DataTemplate x:Key="ContentTemplateView"
-                                   DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
-                              Height="50">
-                           <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"
-                                           Margin="2.5,0,2.5,5">
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding sName}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding ghTypeItem}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                              </UniformGrid>
-                              <UniformGrid Grid.Column="2"
-                                           Rows="2"
-                                           Margin="2.5,0,2.5,5">
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding sLastModifyDate}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding sDimension}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                              </UniformGrid>
-                           </Grid>
-                           <Border Grid.Row="1"
-                                   BorderThickness="1"
-                                   BorderBrush="LightGray"/>
-                        </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 EgtWPFLib5:EgtCustomWindow}}}" Value="0">
-                                       <Setter Property="ContentTemplate" Value="{StaticResource ListTemplateView}" />
-                                    </DataTrigger>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="1">
-                                       <Setter Property="ContentTemplate" Value="{StaticResource TilesTemplateView}" />
-                                    </DataTrigger>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" 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}">
-                        <Style.Triggers>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
-                                        Value="0">
-                              <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-                              <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
-                              <Setter Property="ItemsPanel">
-                                 <Setter.Value>
-                                    <ItemsPanelTemplate>
-                                       <WrapPanel Orientation="Vertical"/>
-                                    </ItemsPanelTemplate>
-                                 </Setter.Value>
-                              </Setter>
-                           </DataTrigger>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
-                                        Value="1">
-                              <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
-                              <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-                              <Setter Property="ItemsPanel">
-                                 <Setter.Value>
-                                    <ItemsPanelTemplate>
-                                       <WrapPanel Orientation="Horizontal"/>
-                                    </ItemsPanelTemplate>
-                                 </Setter.Value>
-                              </Setter>
-                           </DataTrigger>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
-                                        Value="2">
-                              <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
-                              <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-                              <Setter Property="ItemsPanel">
-                                 <Setter.Value>
-                                    <ItemsPanelTemplate>
-                                       <StackPanel Orientation="Vertical"
-                                                   HorizontalAlignment="Stretch"/>
-                                    </ItemsPanelTemplate>
-                                 </Setter.Value>
-                              </Setter>
-                           </DataTrigger>
-                        </Style.Triggers>
-                     </Style>
-                  </ListBox.Style>
-               </ListBox>
-            </TabItem>
-            <TabItem Header="DATAGRID">
-               <DataGrid AutoGenerateColumns="False"
-                         IsReadOnly="True"
-                         HeadersVisibility="Column"
-                         ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
-                         SelectedItem="{Binding ItemSelected}">
-                  <!--   ColumnHeaderStyle="{StaticResource DataGridColumnHeader}"
-                         RowStyle="{StaticResource RowDataGrid_CustomHighLight}"-->
-                  <DataGrid.Columns>
-                     <DataGridTemplateColumn Width="5*">
-                        <DataGridTemplateColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Name_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTemplateColumn.HeaderTemplate>
-                        <DataGridTemplateColumn.CellTemplate>
-                           <DataTemplate>
-                              <Grid>
-                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="1*"/>
-                                 </Grid.ColumnDefinitions>
-                                 <Image Source="{Binding sIconSource}"
-                                        Margin="2.5,0,2.5,0"
-                                        Style="{StaticResource Button_Image}"/>
-                                 <TextBlock Grid.Column="1"
-                                            Text="{Binding sName}"
-                                            VerticalAlignment="Center"
-                                            Margin="2.5,0,0,0"/>
-                              </Grid>
-                           </DataTemplate>
-                        </DataGridTemplateColumn.CellTemplate>
-                     </DataGridTemplateColumn>
-                     <DataGridTextColumn Binding="{Binding sLastModifyDate}"
-                                         Width="2*">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.LastModify_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Left"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Left"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
-                     </DataGridTextColumn>
-                     <DataGridTextColumn Binding="{Binding ghTypeItem}"
-                                         Width="1*">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Type_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Left"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Left"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
-                     </DataGridTextColumn>
-                     <DataGridTextColumn Binding="{Binding sDimension}"
-                                         Width="1*">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Dimension_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Right"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Right"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
-                     </DataGridTextColumn>
-                  </DataGrid.Columns>
-                  <DataGrid.InputBindings>
-                     <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding DataContext.DoubleClick_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
-                  </DataGrid.InputBindings>
-               </DataGrid>
-            </TabItem>
-         </TabControl>
-      </Grid>
-      <Grid Grid.Row="2" 
-            Margin="5,5,5,0">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <TextBlock Margin="5,5,5,5"
-                    Text="{Binding FileName_Msg}"
-                    HorizontalAlignment="Right"
-                    Style="{StaticResource DialogWindow_TextBlock}"/>
-         <TextBox Grid.Column="1"
-                  Margin="2.5,2.5,2.5,5"
-                  TextAlignment="Left"
-                  HorizontalAlignment="Stretch"
-                  Text="{Binding sSaveFileName, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-                  Style="{StaticResource ParameterList_TextBox}"/>
-         <ComboBox Grid.Column="2"
-                   IsSynchronizedWithCurrentItem="True"
-                   ItemsSource="{Binding FilterList}"
-                   SelectedItem="{Binding SelFilter, Mode=OneWayToSource}"
-                   DisplayMemberPath="sNameExstension"
-                   HorizontalAlignment="Right"
-                   Margin="10,2.5,2.5,5"
-                   Style="{StaticResource RightPanel_ComboBox}"/>
-      </Grid>
-      <UniformGrid Grid.Row="3"  
-                   Rows="1"
-                   Margin="2.5,0,2.5,0">
-         <Button IsDefault="True"
-                 Content="OK"
-                 Command="{Binding Ok_Command}"
-                 HorizontalAlignment="Right"
-                 Margin="15,0,2.5,0"
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
-         <Button Content="Cancel"
-                 Command="{Binding Cancel_Command}"
-                 HorizontalAlignment="Left"
-                 Margin="2.5,0,0,0"
-                 Style="{StaticResource RightPanel_HalfRound_Button}"/>
-      </UniformGrid>
-   </Grid>
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb

@@ -1,142 +0,0 @@
-Imports System.Windows.Forms
-Imports System.Windows.Input
-Imports EgtWPFLib5
-
-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)
-      MyBase.New(Owner)
-      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/EgtManageFileDialog/OnlyProdEgtManageFileDialogV.xaml

@@ -1,416 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdEgtManageFileDialogV"
-                            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"
-                            Title="{Binding sTitle}"
-                            WindowStartupLocation="CenterOwner"
-                            WindowStyle="None" ResizeMode="NoResize" 
-                            IsMinimizable="False" ShowInTaskbar="False"
-                            Height="500" Width="800"
-                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
-   
-   <Grid Margin="5,5,5,0">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Grid Margin="5,5,5,0">
-         <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"
-                    Margin="5"
-                    Text="{Binding sSelPath}"
-                    HorizontalAlignment="Left"
-                    Style="{StaticResource DialogWindow_TextBlock}"/>
-         <ComboBox Grid.Column="2"
-                   HorizontalAlignment="Right"
-                   IsSynchronizedWithCurrentItem="True"
-                   ItemsSource="{Binding ViewModeList}"
-                   SelectedItem="{Binding SelViewMode}"
-                   Margin="2.5,5,2.5,5"
-                   Style="{StaticResource RightPanel_ComboBox}"/>
-      </Grid>
-      <Grid Grid.Row="1"
-            Margin="5,5,5,0">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="4*"/>
-         </Grid.ColumnDefinitions>
-         <TreeView x:Name="FileTree" 
-                   ItemsSource="{Binding RootList}"                   
-                   Margin="10"
-                   FontSize="15"
-                   BorderBrush="White">
-            <TreeView.Resources>
-               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:EgtFolder}" 
-                                         ItemsSource="{Binding TreeItemList_View}">
-                  <StackPanel Orientation="Horizontal">
-                     <Image Source="{Binding sIconSource}"
-                            Height="15"
-                            Style="{StaticResource Button_Image}"/>
-                     <TextBlock Text="{Binding sName}"
-                                Style="{StaticResource DialogWindow_TextBlock}"/>
-                  </StackPanel>
-               </HierarchicalDataTemplate>
-               <DataTemplate DataType="{x:Type EgtWPFLib5:EgtItem}">
-                  <StackPanel Orientation="Horizontal">
-                     <Image Source="{Binding sIconSource}"
-                            Height="15"
-                            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"
-                     Background="Transparent"
-                     BorderBrush="White"
-                     BorderThickness="0"
-                     SelectedIndex="{Binding nSelTab}">
-            <TabControl.ItemContainerStyle>
-               <Style TargetType="{x:Type TabItem}">
-                  <Setter Property="Visibility" Value="Collapsed"/>
-               </Style>
-            </TabControl.ItemContainerStyle>
-            <TabItem Header="LISTBOX">
-               <ListBox x:Name="FileList" 
-                        Grid.Row="1"
-                        Margin="5,5,5,5"
-                        BorderBrush="White"
-                        IsSynchronizedWithCurrentItem="True"
-                        ItemsSource="{Binding SelTreeItem.FolderList, Mode=TwoWay}"
-                        SelectedItem="{Binding ItemSelected, Mode=TwoWay}">
-                  <ListBox.Resources>
-                     <DataTemplate x:Key="ListTemplateView" 
-                                   DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
-                              Height="20">
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="Auto"/>
-                              <ColumnDefinition Width="Auto"/>
-                           </Grid.ColumnDefinitions>
-                           <Image Source="{Binding sIconSource}"
-                                  Height="15"
-                                  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 Margin="5,5,5,0"
-                              Height="50"
-                              Width="250">
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="Auto"/>
-                              <ColumnDefinition Width="1*"/>
-                           </Grid.ColumnDefinitions>
-                           <Image Source="{Binding sIconSource}"
-                                  Style="{StaticResource Button_Image}"/>
-                           <UniformGrid Grid.Column="1"
-                                        Rows="3"
-                                        Margin="2.5,0,2.5,5">
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding sName}"
-                                         HorizontalAlignment="Left"
-                                         Style="{StaticResource DialogWindow_TextBlock}"/>
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding ghTypeItem}"
-                                         HorizontalAlignment="Left"
-                                         Style="{StaticResource DialogWindow_TextBlock}"/>
-                              <TextBlock TextAlignment="Left"
-                                         Text="{Binding sDimension}"
-                                         HorizontalAlignment="Left"
-                                         Style="{StaticResource DialogWindow_TextBlock}"/>
-                           </UniformGrid>
-                        </Grid>
-                     </DataTemplate>
-                     <DataTemplate x:Key="ContentTemplateView"
-                                   DataType="{x:Type EgtWPFLib5:EgtDirectory}">
-                        <Grid Margin="5,5,5,0"
-                              Height="50">
-                           <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"
-                                           Margin="2.5,0,2.5,5">
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding sName}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding ghTypeItem}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                              </UniformGrid>
-                              <UniformGrid Grid.Column="2"
-                                           Rows="2"
-                                           Margin="2.5,0,2.5,5">
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding sLastModifyDate}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                                 <TextBlock TextAlignment="Left"
-                                            HorizontalAlignment="Left"
-                                            Text="{Binding sDimension}"
-                                            Style="{StaticResource DialogWindow_TextBlock}"/>
-                              </UniformGrid>
-                           </Grid>
-                           <Border Grid.Row="1"
-                                   BorderThickness="1"
-                                   BorderBrush="LightGray"/>
-                        </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 EgtWPFLib5:EgtCustomWindow}}}" Value="0">
-                                       <Setter Property="ContentTemplate" Value="{StaticResource ListTemplateView}" />
-                                    </DataTrigger>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" Value="1">
-                                       <Setter Property="ContentTemplate" Value="{StaticResource TilesTemplateView}" />
-                                    </DataTrigger>
-                                    <DataTrigger  Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}" 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}">
-                        <Style.Triggers>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
-                                        Value="0">
-                              <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-                              <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"/>
-                              <Setter Property="ItemsPanel">
-                                 <Setter.Value>
-                                    <ItemsPanelTemplate>
-                                       <WrapPanel Orientation="Vertical"/>
-                                    </ItemsPanelTemplate>
-                                 </Setter.Value>
-                              </Setter>
-                           </DataTrigger>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
-                                        Value="1">
-                              <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
-                              <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-                              <Setter Property="ItemsPanel">
-                                 <Setter.Value>
-                                    <ItemsPanelTemplate>
-                                       <WrapPanel Orientation="Horizontal"/>
-                                    </ItemsPanelTemplate>
-                                 </Setter.Value>
-                              </Setter>
-                           </DataTrigger>
-                           <DataTrigger Binding="{Binding DataContext.nSelTempleteListView, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"
-                                        Value="2">
-                              <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
-                              <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-                              <Setter Property="ItemsPanel">
-                                 <Setter.Value>
-                                    <ItemsPanelTemplate>
-                                       <StackPanel Orientation="Vertical"
-                                                   HorizontalAlignment="Stretch"/>
-                                    </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 DataGrid_OnlyProd}">
-                  <DataGrid.ColumnHeaderStyle>
-                     <Style TargetType="{x:Type DataGridColumnHeader}">
-                        <Setter Property="Background" Value="{StaticResource BeamWall_Teal}"/>
-                        <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-                        <Setter Property="FontWeight" Value="Bold"/>
-                        <Setter Property="FontSize" Value="15"/>
-                        <Setter Property="Padding" Value="1"/>
-                        <Setter Property="BorderBrush" Value="{StaticResource Omag_DarkGray}"/>
-                        <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}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTemplateColumn.HeaderTemplate>
-                        <DataGridTemplateColumn.CellTemplate>
-                           <DataTemplate>
-                              <Grid>
-                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="1*"/>
-                                 </Grid.ColumnDefinitions>
-                                 <Image Source="{Binding sIconSource}"
-                                        Margin="2.5,0,2.5,0"
-                                        Style="{StaticResource Button_Image}"/>
-                                 <TextBlock Grid.Column="1"
-                                            Text="{Binding sName}"
-                                            VerticalAlignment="Center"
-                                            Margin="2.5,0,0,0"/>
-                              </Grid>
-                           </DataTemplate>
-                        </DataGridTemplateColumn.CellTemplate>
-                     </DataGridTemplateColumn>
-                     <DataGridTextColumn Binding="{Binding sLastModifyDate}"
-                                         Width="2*">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.LastModify_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Left"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Left"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
-                     </DataGridTextColumn>
-                     <DataGridTextColumn Binding="{Binding ghTypeItem}"
-                                         Width="1*">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Type_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Left"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Left"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
-                     </DataGridTextColumn>
-                     <DataGridTextColumn Binding="{Binding sDimension}"
-                                         Width="1*">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding DataContext.Dimension_Msg, RelativeSource={RelativeSource AncestorType=DataGrid}}"
-                                         HorizontalAlignment="Left"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                        <DataGridTextColumn.ElementStyle>
-                           <Style TargetType="TextBlock">
-                              <Setter Property="HorizontalAlignment" Value="Right"/>
-                              <Setter Property="VerticalAlignment" Value="Center"/>
-                              <Setter Property="TextAlignment" Value="Right"/>
-                              <Setter Property="Padding" Value="12,6,12,6"/>
-                           </Style>
-                        </DataGridTextColumn.ElementStyle>
-                     </DataGridTextColumn>
-                  </DataGrid.Columns>
-                  <DataGrid.InputBindings>
-                     <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding DataContext.DoubleClick_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
-                  </DataGrid.InputBindings>
-               </DataGrid>
-            </TabItem>
-         </TabControl>
-      </Grid>
-      <Grid Grid.Row="2" 
-            Margin="5,5,5,0">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <TextBlock Margin="5,5,5,5"
-                    Text="{Binding FileName_Msg}"
-                    HorizontalAlignment="Right"
-                    Style="{StaticResource DialogWindow_TextBlock}"/>
-         <TextBox Grid.Column="1"
-                  Margin="2.5,2.5,2.5,5"
-                  TextAlignment="Left"
-                  HorizontalAlignment="Stretch"
-                  Text="{Binding sSaveFileName, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-                  Style="{StaticResource ParameterList_TextBox}"/>
-         <ComboBox Grid.Column="2"
-                   IsSynchronizedWithCurrentItem="True"
-                   ItemsSource="{Binding FilterList}"
-                   SelectedItem="{Binding SelFilter, Mode=OneWayToSource}"
-                   DisplayMemberPath="sNameExstension"
-                   HorizontalAlignment="Right"
-                   Margin="10,2.5,2.5,5"
-                   Style="{StaticResource RightPanel_ComboBox}"/>
-      </Grid>
-      <UniformGrid Grid.Row="3"  
-                   Rows="1"
-                   Margin="2.5,0,2.5,0">
-         <Button IsDefault="True"
-                 Content="OK"
-                 Command="{Binding Ok_Command}"
-                 HorizontalAlignment="Right"
-                 Margin="15,0,2.5,0"
-                 Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
-         <Button Content="Cancel"
-                 Command="{Binding Cancel_Command}"
-                 HorizontalAlignment="Left"
-                 Margin="2.5,0,0,0"
-                 Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
-      </UniformGrid>
-   </Grid>
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/EgtManageFileDialog/OnlyProdEgtManageFileDialogV.xaml.vb

@@ -1,142 +0,0 @@
-Imports EgtWPFLib5
-Imports System.Windows.Forms
-Imports System.Windows.Input
-
-Public Class OnlyProdEgtManageFileDialogV
-
-#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)
-      MyBase.New(Owner)
-      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,49 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow 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"
-                            Title="{Binding sTitle}"
-                            WindowStartupLocation="CenterOwner"
-                            SizeToContent="WidthAndHeight"
-                            WindowStyle="None" ResizeMode="NoResize" 
-                            IsMinimizable="False" ShowInTaskbar="False"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}">
-   
-   <Grid Margin="2.5,2.5,2.5,0">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Grid Margin="20,20,20,20">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
-         <Image Source="{Binding sIconSource}"
-                Margin="0,0,0,0"/>
-         <TextBlock Grid.Column="1"
-                    Text="{Binding sMessage}"
-                    Margin="5,0,5,0"
-                    Style="{StaticResource DialogWindow_TextBlock}"/>
-      </Grid>
-      <ItemsControl Grid.Row="1"
-                    ItemsSource="{Binding ButtonList}"
-                    HorizontalAlignment="Center">
-         <ItemsControl.ItemsPanel>
-            <ItemsPanelTemplate>
-               <UniformGrid Rows="1"/>
-            </ItemsPanelTemplate>
-         </ItemsControl.ItemsPanel>
-         <ItemsControl.ItemTemplate>
-            <DataTemplate>
-               <Button IsDefault="{Binding bIsDefault}"
-                       Content="{Binding sMessage}"
-                       Command="{Binding Command_Command}"
-                       Margin="2.5,0,2.5,0"
-                       Style="{StaticResource RightPanel_HalfRound_Button}"/>
-            </DataTemplate>
-         </ItemsControl.ItemTemplate>
-
-      </ItemsControl>
-   </Grid>
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/EgtMessageBox/EgtMessageBoxV.xaml.vb

@@ -1,110 +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)
-      MyBase.New(Owner)
-      ' 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/EgtMessageBox/OnlyProdEgtMessageBoxV.xaml

@@ -1,49 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdEgtMessageBoxV"
-                            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"
-                            Title="{Binding sTitle}"
-                            SizeToContent="WidthAndHeight"
-                            WindowStartupLocation="CenterOwner"
-                            WindowStyle="None" ResizeMode="NoResize" 
-                            IsMinimizable="False" ShowInTaskbar="False"
-                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
-   
-   <Grid Margin="2.5,2.5,2.5,0">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      <Grid Margin="20,20,20,20">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
-         <Image Source="{Binding sIconSource}"
-                Margin="0,0,0,0"/>
-         <TextBlock Grid.Column="1"
-                    Text="{Binding sMessage}"
-                    Margin="5,0,5,0"
-                    Style="{StaticResource DialogWindow_TextBlock}"/>
-      </Grid>
-      <ItemsControl Grid.Row="1"
-                    ItemsSource="{Binding ButtonList}"
-                    HorizontalAlignment="Center">
-         <ItemsControl.ItemsPanel>
-            <ItemsPanelTemplate>
-               <UniformGrid Rows="1"/>
-            </ItemsPanelTemplate>
-         </ItemsControl.ItemsPanel>
-         <ItemsControl.ItemTemplate>
-            <DataTemplate>
-               <Button IsDefault="{Binding bIsDefault}"
-                       Content="{Binding sMessage}"
-                       Command="{Binding Command_Command}"
-                       Margin="2.5,0,2.5,0"
-                       Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
-            </DataTemplate>
-         </ItemsControl.ItemTemplate>
-
-      </ItemsControl>
-   </Grid>
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/EgtMessageBox/OnlyProdEgtMessageBoxV.xaml.vb

@@ -1,110 +0,0 @@
-Imports EgtWPFLib5
-Imports System.Windows
-
-Public Class OnlyProdEgtMessageBoxV
-
-#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)
-      MyBase.New(Owner)
-      ' 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 OnlyProdEgtMessageBoxV(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 OnlyProdEgtMessageBoxV(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 OnlyProdEgtMessageBoxV(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 OnlyProdEgtMessageBoxV(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 OnlyProdEgtMessageBoxV(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/Enum.vb

@@ -0,0 +1,53 @@
+Public Enum CalcStates As Integer
+   NOTCALCULATED = -1
+   OK = 0
+   INFO = 1
+   WARNING = 2
+   ERROR_ = 3
+End Enum
+
+Public Enum EventType
+    ND = -1
+    Started = 0
+    Ended = 1
+End Enum
+
+Public Enum ItemState As Integer
+
+    ND = -1
+    Assigned = 0
+    Confirmed = 1
+    WIP = 2
+    Produced = 3
+    Scrapped = 4
+End Enum
+
+Public Enum LogSupportLevel
+    ND = -1
+    I = 0
+    E = 1
+End Enum
+
+Public Enum LogSupportTarget
+    ND = -1
+    Supervisor = 0
+    LoadProject = 1
+End Enum
+
+Public Enum StatusMapItemType
+    ND = -1
+    Prod = 0
+    MachGroup = 1
+End Enum
+
+Public Enum StatusMapOpType
+    ND = -1
+    Startup = 0
+    PartStart = 1
+    PartEnd = 2
+    MachGroupAdd = 3
+    MachGroupMod = 4
+    MachGroupRem = 5
+    MachGroupNeedRedo = 6
+
+End Enum

EgtBEAMWALL.Core/ItemParamList/OnlyProd_QParamListV.xaml

@@ -1,91 +0,0 @@
-<DataGrid x:Class="OnlyProd_QParamListV"
-          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-          AutoGenerateColumns="False"
-          CanUserSortColumns="False"
-          CanUserResizeColumns="False"
-          CanUserResizeRows="False"
-          CanUserReorderColumns="False"
-          SelectionMode="Single"
-          ScrollViewer.CanContentScroll="True" 
-          ScrollViewer.VerticalScrollBarVisibility="Auto"
-          ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-          Margin="0,0,0,5"
-          AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
-          AlternationCount="2"
-          Style="{StaticResource DataGrid_OnlyProd}"
-          RowStyle="{StaticResource RowDataGrid_CustomHighLight}"
-          CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
-   <DataGrid.ColumnHeaderStyle>
-      <Style TargetType="{x:Type DataGridColumnHeader}">
-         <Setter Property="Background" Value="{StaticResource BeamWall_Downy}"/>
-         <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-         <Setter Property="HorizontalContentAlignment" Value="Center"/>
-         <Setter Property="FontWeight" Value="Bold"/>
-         <Setter Property="FontSize" Value="15"/>
-      </Style>
-   </DataGrid.ColumnHeaderStyle>
-
-   <DataGrid.Columns>
-      <!--BWType-->
-      <DataGridTextColumn Binding="{Binding sBWType}"
-                          Width="40"
-                          IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Type_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Nome-->
-      <DataGridTextColumn Binding="{Binding sName}"
-                          Width="65"
-                          IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.NAM_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Descrizione-->
-      <DataGridTextColumn Binding="{Binding sDescription}"
-                          Width="1*"
-                          IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Description_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Default-->
-      <DataGridTextColumn Binding="{Binding sDefault}"
-                          Width="65">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Default_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Minimo-->
-      <DataGridTextColumn Binding="{Binding sMin}"
-                          Width="70"
-                          IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Min_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Massimo-->
-      <DataGridTextColumn Binding="{Binding sMax}"
-                          Width="70"
-                          IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Max_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-   </DataGrid.Columns>
-
-</DataGrid>

EgtBEAMWALL.Core/ItemParamList/OnlyProd_QParamListV.xaml.vb

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

EgtBEAMWALL.Core/ItemParamList/QParamListV.xaml

@@ -1,83 +0,0 @@
-<DataGrid x:Class="QParamListV"
-          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-          AutoGenerateColumns="False"
-          CanUserSortColumns="False"
-          CanUserResizeColumns="False"
-          CanUserResizeRows="False"
-          CanUserReorderColumns="False"
-          SelectionMode="Single"
-          ScrollViewer.CanContentScroll="True" 
-          ScrollViewer.VerticalScrollBarVisibility="Auto"
-          ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-          Margin="0,0,0,5">
-   <DataGrid.Columns>
-
-      <!--BWType-->
-      <DataGridTextColumn Binding="{Binding sBWType}"
-                          Width="40"
-                          IsReadOnly="True"
-                          Foreground="{StaticResource BeamWall_Corduroy}">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Type_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Nome-->
-      <DataGridTextColumn Binding="{Binding sName}"
-                          Width="50"
-                          IsReadOnly="True"
-                          Foreground="{StaticResource BeamWall_Corduroy}">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.NAM_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Descrizione-->
-      <DataGridTextColumn Binding="{Binding sDescription}"
-                          Width="1*"
-                          IsReadOnly="True"
-                          Foreground="{StaticResource BeamWall_Corduroy}">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Description_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Default-->
-      <DataGridTextColumn Binding="{Binding sDefault}"
-                          Width="65"
-                          Foreground="{StaticResource BeamWall_Corduroy}">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Default_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Minimo-->
-      <DataGridTextColumn Binding="{Binding sMin}"
-                          Width="65"
-                          IsReadOnly="True"
-                          Foreground="{StaticResource BeamWall_Corduroy}">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Min_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Massimo-->
-      <DataGridTextColumn Binding="{Binding sMax}"
-                          Width="65"
-                          IsReadOnly="True"
-                          Foreground="{StaticResource BeamWall_Corduroy}">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Max_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-   </DataGrid.Columns>
-
-</DataGrid>

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
@@ -118,7 +119,6 @@ Public Class MachGroupPanelM
 #Region "METHODS"
 
    Public Event MachGroupAdded As EventHandler(Of MachGroupAddedEventArgs)
-   Public Event MachGroupRemoved As EventHandler(Of MachGroupAddedEventArgs)
 
    Public Overridable Sub AddMachGroup(MachGroupM As MachGroupM)
       If IsNothing(MachGroupM) Then Return
@@ -128,17 +128,38 @@ Public Class MachGroupPanelM
       End If
    End Sub
 
-   Public Overridable Sub RemoveMachGroup(MachGroupM As MachGroupM)
-      If IsNothing(MachGroupM) Then Return
-      If m_MachGroupMList.Contains(MachGroupM) AndAlso m_MachGroupMList.Remove(MachGroupM) Then
-         RaiseEvent MachGroupRemoved(Me, New MachGroupAddedEventArgs(MachGroupM))
-      End If
-   End Sub
-
    Public Function GetMachGroups() As List(Of MachGroupM)
       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
 
@@ -92,6 +94,8 @@ Public Class NewMachGroupPanelVM
       AddHandler m_MachGroupPanelM.MachGroupAdded, AddressOf OnMachGroupAdded
       If Not MachGroupPanelM.IsMultiMachGroup Then SetMachGroupPanelVisibility(False)
       CreateMachGroupVMList()
+      ' Creo riferimento a questa classe in LibMap
+      '''LibMap.SetRefMachGroupPanelVM(Me)
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -211,11 +215,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 +230,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()
@@ -274,13 +275,13 @@ Public Class NewMachGroupPanelVM
       If Not IsNothing(e.OldItems) AndAlso e.OldItems.Count > 0 Then
          For Each MachGroupVM As MachGroupVM In e.OldItems
             RemoveHandler MachGroupVM.PropertyChanged, AddressOf OnMachGroupVMPropertyChanged
-            m_MachGroupPanelM.MachGroupMList.Remove(MachGroupVM.MachGroupM)
          Next
       End If
    End Sub
 
    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,106 +0,0 @@
-Imports System.Threading
-Imports System.Windows.Threading
-
-Public Module LoadingWndHelper
-
-   Public Enum ActiveIds As Integer
-      OPENPROJ = 1
-      SAVEPROJ = 2
-      IMPORTBTL = 3
-      GOTOPROD = 4
-      OPENPROD = 5
-      SAVEPROD = 6
-      GOTOPROJ = 7
-      EXPORTPROJECT = 8
-      IMPORTPROJECT = 9
-      CHANGEPARAM = 10
-      CREATINGPDF = 11
-      CHANGEMATERIAL = 12
-      BACKUP = 13
-      RESTORE = 14
-   End Enum
-
-   Dim m_MainWindow As Windows.Window
-   Public Sub SetMainWindow(MainWindow As Windows.Window)
-      m_MainWindow = MainWindow
-   End Sub
-
-   Private m_bMainWindow_IsActive As Boolean = True
-   Public Sub SetMainWindowIsActive(IsActive As Boolean)
-      m_bMainWindow_IsActive = IsActive
-   End Sub
-
-   Delegate Sub CallbackLoadingDlg(ByRef CurrStep As Integer, ByRef StepText As String, ByRef nProgress As Integer, ByRef nNextProgress As Integer, ByRef MainWindow_IsActive As Boolean, ByRef bClose As Boolean)
-
-   Private m_thread As Thread
-   Private m_LoadingWndVM As Core.LoadingWndVM
-   Private m_CurrStep As Integer
-   Private m_StepText As String
-   Private m_nProgress As Integer
-   Private m_nNextProgress As Integer
-   Private m_bClose As Boolean
-   Private m_bActiveId As Integer = -1
-
-   Public Function OpenLoadingWnd(Id As Integer, nSteps As Integer, TotText As String, FirstStepText As String, nNextProgress As Integer) As Boolean
-      If m_bActiveId > 0 Then Return False
-      m_bActiveId = Id
-      m_LoadingWndVM = Nothing
-      m_CurrStep = 1
-      m_StepText = FirstStepText
-      m_nProgress = 1
-      m_nNextProgress = nNextProgress
-      m_bClose = False
-      Dim Top As Double = m_MainWindow.Top + (m_MainWindow.Height / 2) - 100
-      Dim Left As Double = m_MainWindow.Left + (m_MainWindow.Width / 2) - 150
-      Dim WindowStartupLocation As Windows.WindowStartupLocation = Windows.WindowStartupLocation.Manual
-      If m_MainWindow.WindowState = Windows.WindowState.Maximized Then
-         WindowStartupLocation = Windows.WindowStartupLocation.CenterOwner
-      End If
-      m_thread = New Thread(Sub()
-                               m_LoadingWndVM = New Core.LoadingWndVM(nSteps, TotText, AddressOf LoadingCallback)
-                               m_LoadingWndVM.UpdateProgress(m_CurrStep, m_StepText, m_nProgress, m_nNextProgress)
-                               Dim LoadingWnd As Object
-                               If bOnlyProd Then
-                                  LoadingWnd = New OnlyProdLoadingWndV(Nothing, m_LoadingWndVM)
-                               Else
-                                  LoadingWnd = New LoadingWndV(Nothing, m_LoadingWndVM)
-                               End If
-                               ' posiziono la finestra
-                               If WindowStartupLocation = Windows.WindowStartupLocation.CenterScreen Then
-                                  LoadingWnd.WindowStartupLocation = Windows.WindowStartupLocation.CenterScreen
-                               Else
-                                  LoadingWnd.Top = Top
-                                  LoadingWnd.Left = Left
-                               End If
-                               LoadingWnd.Show()
-                               Dispatcher.Run()
-                            End Sub)
-      m_thread.SetApartmentState(ApartmentState.STA)
-      m_thread.Start()
-      Return True
-   End Function
-
-   Private Sub LoadingCallback(ByRef CurrStep As Integer, ByRef StepText As String, ByRef nProgress As Integer, ByRef nNextProgress As Integer, ByRef MainWindow_IsActive As Boolean, ByRef bClose As Boolean)
-      CurrStep = m_CurrStep
-      StepText = m_StepText
-      nProgress = m_nProgress
-      nNextProgress = m_nNextProgress
-      m_bMainWindow_IsActive = MainWindow_IsActive
-      bClose = m_bClose
-   End Sub
-
-   Public Sub UpdateLoadingWnd(Id As Integer, CurrStep As Integer, StepText As String, nProgress As Integer, nNextProgress As Integer)
-      If Id <> m_bActiveId Then Return
-      m_CurrStep = CurrStep
-      m_StepText = StepText
-      m_nProgress = nProgress
-      m_nNextProgress = nNextProgress
-   End Sub
-
-   Public Sub CloseLoadingWnd(Id As Integer)
-      If Id <> m_bActiveId Then Return
-      m_bClose = True
-      m_bActiveId = -1
-   End Sub
-
-End Module

EgtBEAMWALL.Core/LoadingWnd/LoadingWndV.xaml

@@ -1,56 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="LoadingWndV"
-                            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="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-                            Height="200" Width="300" 
-                            TitleBarHeight="0"
-                            ResizeMode="NoResize" WindowStyle="None"
-                            IsClosable="False" IsMinimizable="False"
-                            WindowStartupLocation="Manual" ShowInTaskbar="False">
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-      </Grid.RowDefinitions>
-      <TextBlock Grid.Row="1"
-                 Text="{Binding TotText_Msg}"
-                 TextAlignment="Center"/>
-      <TextBlock Grid.Row="2"
-                 Text="{Binding StepText_Msg}"
-                 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 Height="20"/>
-         <ProgressBar Grid.Row="1"
-                   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}"
-                   Height="20"
-                   Margin="40,0,40,0"/>
-      <TextBlock Grid.Row="7"
-                 Text="{Binding TotProgress_Msg}"
-                 TextAlignment="Center"/>
-   </Grid>
-
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/LoadingWnd/LoadingWndV.xaml.vb

@@ -1,36 +0,0 @@
-Imports System.Windows
-Imports System.Windows.Input
-
-Public Class LoadingWndV
-
-   Private WithEvents m_LoadingWndVM As LoadingWndVM
-
-   Sub New(Owner As Window, LoadingWndVM As LoadingWndVM)
-      MyBase.New(Owner)
-      ' This call is required by the designer.
-      InitializeComponent()
-      Me.DataContext = LoadingWndVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_LoadingWndVM = LoadingWndVM
-   End Sub
-
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_LoadingWndVM.m_CloseWindow
-      Me.Close()
-   End Sub
-
-   Private Sub ActivateWindow() Handles m_LoadingWndVM.m_ActivateWindow
-      Me.Activate()
-   End Sub
-
-   Private Sub Me_ContentRendered() Handles Me.ContentRendered
-      m_LoadingWndVM.StartFunction()
-   End Sub
-
-   Private Sub ToolsDbView_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/LoadingWnd/LoadingWndVM.vb

@@ -1,224 +0,0 @@
-Imports System.Windows
-Imports System.Windows.Input
-Imports System.Windows.Threading
-Imports EgtWPFLib5
-
-Public Class LoadingWndVM
-   Inherits VMBase
-
-#Region "FIELDS & PROPERTIES"
-
-   Enum LoadingTypes As Integer
-      NULL = 0
-      OPEN = 1
-      IMPORT = 2
-   End Enum
-
-   Delegate Sub CallbackLoadingDlg(ByRef CurrStep As Integer, ByRef StepText As String, ByRef nProgress As Integer, ByRef nNextProgress As Integer, ByRef MainWindow_IsActive As Boolean, ByRef bClose As Boolean)
-
-   Friend Event m_CloseWindow(bDialogResult As Boolean)
-   Friend Event m_ActivateWindow()
-
-   Private m_CallbackLoading As CallbackLoadingDlg
-   Private m_Waiting_Timer As New DispatcherTimer
-
-   ' numero di passaggi di caricamento
-   Private m_nSteps As Integer
-   ' titolo testo di caricamento
-   Private m_TotText As String
-   ' numero passaggio corrente
-   Private m_CurrStep As Integer
-   ' testo del passaggio corrente
-   Private m_StepText As String
-   ' indice d'inizio di questo passaggio
-   Private m_nStartProgress As Integer
-   ' indice d'inizio del prossimo passaggio
-   Private m_nNextProgress As Integer
-   ' variabile che indica richiesta chiusura della finestra
-   Private m_bClosing As Boolean = False
-   Private m_bMainWindow_IsActive As Boolean = True
-
-   Private m_StepProgress_Value As Double = 0
-   Public Property StepProgress_Value As Double
-      Get
-         Return m_StepProgress_Value
-      End Get
-      Set(value As Double)
-         m_StepProgress_Value = value
-      End Set
-   End Property
-
-   Private m_TotProgress_Value As Double = 0
-   Public Property TotProgress_Value As Double
-      Get
-         Return Math.Floor(m_TotProgress_Value)
-      End Get
-      Set(value As Double)
-         m_TotProgress_Value = value
-      End Set
-   End Property
-
-   Private m_StepText_Visibility As Visibility
-   Public ReadOnly Property StepText_Visibility As Visibility
-      Get
-         Return m_StepText_Visibility
-      End Get
-   End Property
-
-   Private m_StepProgress_Visibility As Visibility
-   Public ReadOnly Property StepProgress_Visibility As Visibility
-      Get
-         Return m_StepProgress_Visibility
-      End Get
-   End Property
-
-#Region "Messages"
-
-   Public ReadOnly Property TotText_Msg As String
-      Get
-         Return If(m_nSteps > 0, m_TotText & " (" & m_CurrStep & "/" & m_nSteps & ")", m_TotText)
-      End Get
-   End Property
-
-   Public ReadOnly Property StepText_Msg As String
-      Get
-         Return m_StepText
-      End Get
-   End Property
-
-   Public ReadOnly Property TotProgress_Msg As String
-      Get
-         Return m_TotProgress_Value.ToString("0.#") & "%"
-      End Get
-   End Property
-
-#End Region    ' Messages
-
-   ' Definizione comandi
-   Private m_cmdCancel As ICommand
-
-#End Region    ' FIELDS & PROPERTIES
-
-   Sub New(Steps As Integer, TotText As String, callback As CallbackLoadingDlg)
-      m_nSteps = Steps
-      m_TotText = TotText
-      m_CallbackLoading = callback
-      m_bClosing = False
-      If Steps = 1 Then
-         m_StepText_Visibility = Visibility.Collapsed
-         m_StepProgress_Visibility = Visibility.Collapsed
-      Else
-         m_StepText_Visibility = Visibility.Visible
-         m_StepProgress_Visibility = Visibility.Visible
-      End If
-      ' imposto contatore
-      m_Waiting_Timer.Interval = TimeSpan.FromMilliseconds(200)
-      AddHandler m_Waiting_Timer.Tick, AddressOf WaitingTimer_Tick
-   End Sub
-
-   Public Sub UpdateProgress(CurrStep As Integer, StepText As String, nStartProgress As Integer, nNextProgress As Integer)
-      m_CurrStep = CurrStep
-      m_StepText = StepText
-      m_StepProgress_Value = nStartProgress
-      m_nNextProgress = nNextProgress
-      NotifyPropertyChanged(NameOf(StepText_Msg))
-      NotifyPropertyChanged(NameOf(TotText_Msg))
-   End Sub
-
-   Public Overridable Sub StartFunction()
-      m_Waiting_Timer.Start()
-   End Sub
-
-   Protected Overridable Sub WaitingTimer_Tick()
-      ' leggo eventuali nuovi valori
-      Dim CurrStep As Integer = 0
-      Dim StepText As String = ""
-      Dim nStartProgress As Integer = 0
-      Dim nNextProgress As Integer = 0
-      Dim bMainWindow_IsActive As Boolean = True
-      Dim bClose As Boolean = False
-      m_CallbackLoading(CurrStep, StepText, nStartProgress, nNextProgress, bMainWindow_IsActive, bClose)
-      If bMainWindow_IsActive <> m_bMainWindow_IsActive Then
-         RaiseEvent m_ActivateWindow()
-      End If
-      If m_bClosing Then
-         Close()
-         Dispatcher.CurrentDispatcher.InvokeShutdown()
-         Return
-      ElseIf bClose Then
-         m_bClosing = True
-         ' mostro completamento caricamento
-         m_CurrStep = m_nSteps
-         m_StepProgress_Value = 100
-         m_TotProgress_Value = 100
-         m_Waiting_Timer.Interval = TimeSpan.FromMilliseconds(1000)
-      Else
-         If m_CurrStep <> CurrStep Then
-            If m_StepProgress_Value < 100 Then
-               m_StepProgress_Value = 100
-            ElseIf m_StepProgress_Value = 100 Then
-               m_StepProgress_Value = 0
-               m_CurrStep = CurrStep
-               m_StepText = StepText
-               m_nStartProgress = nStartProgress
-               m_nNextProgress = nNextProgress
-            End If
-         Else
-            ' incremento Step corrente
-            If m_StepProgress_Value < 80 Then
-               m_StepProgress_Value += 1
-            ElseIf m_StepProgress_Value < 90 Then
-               m_StepProgress_Value += 0.4
-            ElseIf m_StepProgress_Value < 98 Then
-               m_StepProgress_Value += 0.1
-            Else
-               m_StepProgress_Value += 0.01
-            End If
-         End If
-         ' calcolo totale
-         Dim dStepStart As Double = If(m_CurrStep > 1, m_nStartProgress, 0)
-         Dim dStepEnd As Double = m_nNextProgress
-         m_TotProgress_Value = dStepStart + ((dStepEnd - dStepStart) / 100 * m_StepProgress_Value)
-      End If
-      ' aggiorno grafica
-      NotifyPropertyChanged(NameOf(StepText_Msg))
-      NotifyPropertyChanged(NameOf(TotText_Msg))
-      NotifyPropertyChanged(NameOf(StepProgress_Value))
-      NotifyPropertyChanged(NameOf(TotProgress_Value))
-      NotifyPropertyChanged(NameOf(TotProgress_Msg))
-   End Sub
-
-   Public Sub Close()
-      ' fermo timer 
-      m_Waiting_Timer.Stop()
-      ' chiudo finestra
-      RaiseEvent m_CloseWindow(True)
-   End Sub
-
-#Region "COMMANDS"
-
-#Region "Cancel"
-
-   ''' <summary>
-   ''' Returns a command that do Open.
-   ''' </summary>
-   Public ReadOnly Property Cancel_Command As ICommand
-      Get
-         If m_cmdCancel Is Nothing Then
-            m_cmdCancel = New Command(AddressOf Cancel)
-         End If
-         Return m_cmdCancel
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the Open.  This method is invoked by the OpenCommand.
-   ''' </summary>
-   Friend Sub Cancel()
-   End Sub
-
-#End Region ' Cancel
-
-#End Region    ' COMMANDS
-
-End Class

EgtBEAMWALL.Core/LoadingWnd/OnlyProdLoadingWndV.xaml

@@ -1,55 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdLoadingWndV"
-                            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}"
-                            Height="200" Width="300" 
-                            TitleBarHeight="0"
-                            ResizeMode="NoResize" WindowStyle="None"
-                            IsClosable="False" IsMinimizable="False"
-                            WindowStartupLocation="Manual" ShowInTaskbar="False">
-   
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-      </Grid.RowDefinitions>
-      <TextBlock Grid.Row="1"
-                 Text="{Binding TotText_Msg}"
-                 TextAlignment="Center"/>
-      <TextBlock Grid.Row="2"
-                 Text="{Binding StepText_Msg}"
-                 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 Height="20"/>
-         <ProgressBar Grid.Row="1"
-                   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}"
-                   Height="20"
-                   Margin="40,0,40,0"/>
-      <TextBlock Grid.Row="7"
-                 Text="{Binding TotProgress_Msg}"
-                 TextAlignment="Center"/>
-   </Grid>
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/LoadingWnd/OnlyProdLoadingWndV.xaml.vb

@@ -1,36 +0,0 @@
-Imports System.Windows.Input
-Imports System.Windows
-
-Public Class OnlyProdLoadingWndV
-
-   Private WithEvents m_LoadingWndVM As LoadingWndVM
-
-   Sub New(Owner As Window, LoadingWndVM As LoadingWndVM)
-      MyBase.New(Owner)
-      ' This call is required by the designer.
-      InitializeComponent()
-      Me.DataContext = LoadingWndVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_LoadingWndVM = LoadingWndVM
-   End Sub
-
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_LoadingWndVM.m_CloseWindow
-      Me.Close()
-   End Sub
-
-   Private Sub ActivateWindow() Handles m_LoadingWndVM.m_ActivateWindow
-      Me.Activate()
-   End Sub
-
-   Private Sub Me_ContentRendered() Handles Me.ContentRendered
-      m_LoadingWndVM.StartFunction()
-   End Sub
-
-   Private Sub ToolsDbView_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/MachGroup Model/BeamMachGroupM.vb

@@ -30,7 +30,7 @@ Public Class BeamMachGroupM
       NewMachGroupM.m_Id = nId
       NewMachGroupM.m_Name = sName
       NewMachGroupM.m_Machine = sMachine
-      ' NewMachGroupM.SetMachineType(MachineType.BEAM)
+      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)
@@ -51,7 +51,7 @@ Public Class BeamMachGroupM
       If NewMachGroupM.m_Id = GDB_ID.NULL Then Return Nothing
       NewMachGroupM.m_Name = sName
       NewMachGroupM.m_Machine = sMachine
-      'NewMachGroupM.SetMachineType(MachineType.BEAM)
+      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)
@@ -72,7 +72,7 @@ Public Class BeamMachGroupM
       NewMachGroupM.m_Id = nId
       NewMachGroupM.m_Name = sName
       NewMachGroupM.m_Machine = sMachine
-      'NewMachGroupM.SetMachineType(MachineType.BEAM)
+      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)

EgtBEAMWALL.Core/MachGroup Model/MyMachGroupM.vb

@@ -0,0 +1,332 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports System.Windows.Input
+Imports System.Windows.Media
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public MustInherit Class MyMachGroupM
+   Inherits MachGroupM
+
+   Protected m_nMachineType As MachineType
+   Public ReadOnly Property nMachineType As MachineType
+      Get
+         Return m_nMachineType
+      End Get
+   End Property
+   Public Sub SetMachineType(nMachineType As MachineType)
+      m_nMachineType = nMachineType
+   End Sub
+
+   Protected m_dL As Double
+   Public Property dL As Double
+      Get
+         Return m_dL
+      End Get
+      Set(value As Double)
+         m_dL = value
+      End Set
+   End Property
+
+   Protected m_dW As Double
+   Public Property dW As Double
+      Get
+         Return m_dW
+      End Get
+      Set(value As Double)
+         m_dW = value
+      End Set
+   End Property
+
+   Protected m_dH As Double
+   Public Property dH As Double
+      Get
+         Return m_dH
+      End Get
+      Set(value As Double)
+         m_dH = value
+      End Set
+   End Property
+
+   Protected m_dtStartTime As DateTime
+   Public Property dtStartTime As DateTime
+      Get
+         Return m_dtStartTime
+      End Get
+      Set(value As DateTime)
+         m_dtStartTime = value
+      End Set
+   End Property
+
+   Protected m_dtEndTime As DateTime
+   Public Property dtEndTime As DateTime
+      Get
+         Return m_dtEndTime
+      End Get
+      Set(value As DateTime)
+         m_dtEndTime = value
+      End Set
+   End Property
+
+   Protected m_dMatForPart As Double = 0
+   Public ReadOnly Property dMatForPart As Double
+      Get
+         Return m_dMatForPart
+      End Get
+   End Property
+   
+   Protected m_nProdIndex As Integer = 0
+   Public Property nProdIndex As Integer
+      Get
+         Return m_nProdIndex
+      End Get
+      Set
+         m_nProdIndex = value
+      End Set
+   End Property
+
+   Public Sub SetMatForPart(dMatForPart As Double)
+      m_dMatForPart = dMatForPart
+   End Sub
+
+   Protected m_dTotMat As Double = 0
+   Public ReadOnly Property dTotMat As Double
+      Get
+         Return m_dTotMat
+      End Get
+   End Property
+   Public Sub SetTotMat(TotMat As Double)
+      m_dTotMat = TotMat
+   End Sub
+
+   Protected m_sMATERIAL As String
+   Public Property sMATERIAL As String
+      Get
+         Return m_sMATERIAL
+      End Get
+      Set(value As String)
+         m_sMATERIAL = value
+      End Set
+   End Property
+
+   ' lista dei pezzi che sono nel grezzo
+   Protected m_PartMList As New List(Of PartM)
+   Public Property PartMList As List(Of PartM)
+      Get
+         Return m_PartMList
+      End Get
+      Set(value As List(Of PartM))
+         m_PartMList = value
+      End Set
+   End Property
+
+   Private m_nCALC_ERR As Integer
+   Public Property nCALC_ERR As Integer
+      Get
+         Return m_nCALC_ERR
+      End Get
+      Set(value As Integer)
+         m_nCALC_ERR = value
+      End Set
+   End Property
+
+   Private m_nCALC_FALL As Integer
+   Public Property nCALC_FALL As Integer
+      Get
+         Return m_nCALC_FALL
+      End Get
+      Set(value As Integer)
+         m_nCALC_FALL = value
+      End Set
+   End Property
+
+   Private m_sCALC_MSG As String
+   Public Property sCALC_MSG As String
+      Get
+         Return m_sCALC_MSG
+      End Get
+      Set(value As String)
+         m_sCALC_MSG = value
+      End Set
+   End Property
+
+   Public m_nCALC_ROT As Integer
+   Public Property nCALC_ROT As Integer
+      Get
+         Return m_nCALC_ROT
+      End Get
+      Set(value As Integer)
+         m_nCALC_ROT = value
+      End Set
+   End Property
+
+   Public m_nCALC_TIME As Integer
+   Public Property nCALC_TIME As Integer
+      Get
+         Return m_nCALC_TIME
+      End Get
+      Set(value As Integer)
+         m_nCALC_TIME = value
+      End Set
+   End Property
+
+   Public m_nCALC_GlobalState As CalcStates = CalcStates.NOTCALCULATED
+   Public Property nCALC_GlobalState As CalcStates
+      Get
+         Return m_nCALC_GlobalState
+      End Get
+      Set(value As CalcStates)
+         m_nCALC_GlobalState = value
+      End Set
+   End Property
+
+   Private m_nCALC_GlobalERR As Integer
+   Public Property nCALC_GlobalERR As Integer
+      Get
+         Return m_nCALC_GlobalERR
+      End Get
+      Set(value As Integer)
+         m_nCALC_GlobalERR = value
+      End Set
+   End Property
+
+   Public m_nCALC_State As CalcStates = CalcStates.NOTCALCULATED
+   Public Property nCALC_State As CalcStates
+      Get
+         Return m_nCALC_State
+      End Get
+      Set(value As CalcStates)
+         m_nCALC_State = value
+      End Set
+   End Property
+
+   Protected m_sSupervisorId As String
+   Public Property sSupervisorId As String
+      Get
+         Return m_sSupervisorId
+      End Get
+      Set(value As String)
+         m_sSupervisorId = value
+      End Set
+   End Property
+
+   Protected m_nPriorityIndex As Integer
+   Public Property nPriorityIndex As Integer
+      Get
+         Return m_nPriorityIndex
+      End Get
+      Set(value As Integer)
+         m_nPriorityIndex = value
+      End Set
+   End Property
+
+   Protected m_nProductionState As Integer = 0
+   Public ReadOnly Property nProductionState As Integer
+      Get
+         Return m_nProductionState
+      End Get
+   End Property
+   Public Sub SetState(nState As CalcStates)
+      m_nProductionState = nState
+   End Sub
+
+#Region "CONSTRUCTOR"
+
+   'Sub New(nId As Integer, sName As String, sMachine As String)
+   '   MyBase.New(nId, sName, sMachine)
+   '   'aggiorno lista pezzi
+   '   RefreshPartList()
+   'End Sub
+
+#End Region    ' CONSTRUCTOR
+
+#Region "METHODS"
+
+   Public Event PartAdded As EventHandler(Of PartAddedEventArgs)
+   Public Event PartRemoved As EventHandler(Of PartAddedEventArgs)
+
+   Public Sub AddPart(PartM As PartM)
+      If IsNothing(PartM) Then Return
+      If Not m_PartMList.Contains(PartM) Then
+         m_PartMList.Add(PartM)
+         RaiseEvent PartAdded(Me, New PartAddedEventArgs(PartM))
+      End If
+   End Sub
+
+   Public Sub RemovePart(PartM As PartM)
+      If IsNothing(PartM) Then Return
+      If m_PartMList.Contains(PartM) AndAlso m_PartMList.Remove(PartM) Then
+         RaiseEvent PartRemoved(Me, New PartAddedEventArgs(PartM))
+      End If
+   End Sub
+
+   Public Sub RemoveAllParts()
+      If IsNothing(m_PartMList) Then Return
+      For PartIndex = m_PartMList.Count - 1 To 0 Step -1
+         Dim PartM As PartM = m_PartMList(PartIndex)
+         If m_PartMList.Remove(PartM) Then
+            RaiseEvent PartRemoved(Me, New PartAddedEventArgs(PartM))
+         End If
+      Next
+   End Sub
+
+   Public Function GetParts() As List(Of PartM)
+      Return New List(Of PartM)(m_PartMList)
+   End Function
+
+   Public Shared Sub ReadMachGroupData(NewMachgroup As MyMachGroupM)
+      ' leggo materiale
+      EgtGetInfo(NewMachgroup.Id, MGR_RPT_MATERIAL, NewMachgroup.sMATERIAL)
+      ' 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(NewMachgroup.Id, ITG_PROD_ERR, nErr)
+      EgtGetInfo(NewMachgroup.Id, ITG_PROD_ROT, nRot)
+      EgtGetInfo(NewMachgroup.Id, ITG_PROD_MSG, sMsg)
+      If Not bCalc Then
+         NewMachgroup.m_nCALC_State = CalcStates.NOTCALCULATED
+         NewMachgroup.m_nCALC_ERR = 0
+         NewMachgroup.m_nCALC_ROT = 0
+         NewMachgroup.m_sCALC_MSG = ""
+      Else
+         NewMachgroup.m_nCALC_ERR = nErr
+         NewMachgroup.m_nCALC_ROT = nRot
+         NewMachgroup.m_sCALC_MSG = sMsg
+         If nErr = 0 Then
+            NewMachgroup.nCALC_State = CalcStates.OK
+         ElseIf nErr = 17 Then
+            NewMachgroup.nCALC_State = CalcStates.WARNING
+         ElseIf nErr > 0 Then
+            NewMachgroup.nCALC_State = CalcStates.ERROR_
+         ElseIf nErr < 0 Then
+            NewMachgroup.nCALC_State = CalcStates.INFO
+         End If
+      End If
+      EgtGetInfo(NewMachgroup.Id, ITG_PROD_TIME, NewMachgroup.m_nCALC_TIME)
+
+   End Sub
+
+#End Region    ' METHODS
+
+   Public MustOverride Sub RefreshPartList()
+
+   Public MustOverride Sub RefreshGroupData()
+
+   Public Overridable Sub DeleteMachGroup()
+      ' elimino tutte le copie
+      Dim nRawPartId As Integer = EgtGetFirstRawPart()
+      Dim nBeamId As Integer = EgtGetFirstPartInRawPart(nRawPartId)
+      While nRawPartId <> GDB_ID.NULL
+         EgtRemovePartFromRawPart(nBeamId)
+         EgtErase(nBeamId)
+         nRawPartId = EgtGetNextRawPart(nRawPartId)
+         nBeamId = EgtGetFirstPartInRawPart(nRawPartId)
+      End While
+      ' elimino MachGroup
+      EgtRemoveMachGroup(Me.Id)
+   End Sub
+
+End Class

EgtBEAMWALL.Core/MachGroup Model/MyMachGroupPanelM.vb

@@ -0,0 +1,221 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public Class MyMachGroupPanelM
+   Inherits MachGroupPanelM
+
+#Region "FIELDS & PROPERTIES"
+
+#End Region    ' FIELDS & PROPERTIES
+
+#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
+      NewMyMachGroupPanelM.m_DefaultMachine = ""
+      ' aggiorno copie
+      UpdateDuplo()
+      ' recupero i MachGroup
+      NewMyMachGroupPanelM.m_MachGroupMList = LoadMyMachGroups(MachineList)
+      Return NewMyMachGroupPanelM
+   End Function
+
+#End Region    ' CONSTRUCTOR
+
+#Region "METHODS"
+
+   Public Shared Function LoadMyMachGroups(MachineList As List(Of Machine)) As List(Of MachGroupM)
+      Dim TempList As New List(Of MachGroupM)
+      ' Carico i gruppi di lavorazione nella lista
+      Dim nId = EgtGetFirstMachGroup()
+      While nId <> GDB_ID.NULL
+         EgtSetCurrMachGroup(nId)
+         Dim sName As String = String.Empty
+         Dim sMachine As String = String.Empty
+         EgtGetMachGroupName(nId, sName)
+         EgtGetMachGroupMachineName(nId, sMachine)
+         ' cerco la macchina tra quelle presenti
+         Dim UsedMachine As MyMachine = Nothing
+         Dim bOk As Boolean = Machine.SearchMachine(sMachine, MachineList, UsedMachine)
+         If Not bOk OrElse UsedMachine.nType = MachineType.NULL Then
+            EgtOutLog("Machine incompatible with beam & wall machining!!")
+         ElseIf UsedMachine.nType = MachineType.BEAM Then
+            TempList.Add(BeamMachGroupM.CreateBeamMachGroup(nId, sName, sMachine))
+         ElseIf UsedMachine.nType = MachineType.WALL Then
+            TempList.Add(WallMachGroupM.CreateWallMachGroup(nId, sName, sMachine))
+         End If
+         nId = EgtGetNextMachGroup(nId)
+      End While
+      EgtResetCurrMachGroup()
+      Return TempList
+   End Function
+
+   ' funzione che aggiunge 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)
+      ' Carico i gruppi di lavorazione nella lista
+      Dim nId = EgtGetFirstMachGroup()
+      While nId <> GDB_ID.NULL
+         Dim UpdateUI As Integer = 0
+         If EgtGetInfo(nId, "UPDATEUI", UpdateUI) AndAlso UpdateUI = 1 Then
+            EgtSetCurrMachGroup(nId)
+            Dim sName As String = String.Empty
+            Dim sMachine As String = String.Empty
+            EgtGetMachGroupName(nId, sName)
+            EgtGetMachGroupMachineName(nId, sMachine)
+            ' cerco la macchina tra quelle presenti
+            Dim UsedMachine As MyMachine = Nothing
+            Dim bOk As Boolean = Machine.SearchMachine(sMachine, MachineList, UsedMachine)
+            If Not bOk OrElse UsedMachine.nType = MachineType.NULL Then
+               EgtOutLog("Machine incompatible with beam & wall machining!!")
+            ElseIf UsedMachine.nType = MachineType.BEAM Then
+               TempList.Add(BeamMachGroupM.CreateBeamMachGroup(nId, sName, sMachine))
+            ElseIf UsedMachine.nType = MachineType.WALL Then
+               TempList.Add(WallMachGroupM.CreateWallMachGroup(nId, sName, sMachine))
+            End If
+            ' rimuovo info
+            EgtRemoveInfo(nId, "UPDATEUI")
+         End If
+         nId = EgtGetNextMachGroup(nId)
+      End While
+      EgtResetCurrMachGroup()
+      Return TempList
+   End Function
+
+   Public Function NewMyMachGroup(sMachName As String, nMachineType As MachineType) As MachGroupM
+      ' Sistemazioni preliminari
+      OnPreNewMachGroup()
+      ' Se non ci sono macchine disponibili esco con errore
+      If m_MachineList.Count <= 0 Then Return Nothing
+      ' Creo il nuovo gruppo di lavorazione con i dati ottenuti a seconda del caso in cui mi trovo
+      Dim MachGroupM As MachGroupM
+      If nMachineType = MachineType.NULL Then
+         EgtOutLog("Machine incompatible with beam & wall machining!!")
+         Return Nothing
+      ElseIf nMachineType = MachineType.BEAM Then
+         MachGroupM = BeamMachGroupM.CreateBeamMachGroup(NewMachGroupID(), sMachName)
+      ElseIf nMachineType = MachineType.WALL Then
+         MachGroupM = WallMachGroupM.CreateWallMachGroup(NewMachGroupID(), sMachName)
+      End If
+      If IsNothing(MachGroupM) Then Return Nothing
+      AddMachGroup(MachGroupM)
+      ' Sistemazioni finali
+      m_DefaultMachine = sMachName
+      OnPostNewMachGroup()
+      Return MachGroupM
+   End Function
+
+   Public Overrides Function OnPreNewMachGroup() As Boolean
+      'EgtSetCurrentContext(Map.refSceneHostVM.MainScene.GetCtx())
+      Return True
+   End Function
+
+   ' NB: Anche se ho già aggiunto il nuovo gruppo di lavorazione, non l'ho ancora reso corrente (viene fatto dopo), quindi
+   ' non posso usare CurrentMachine perchè è ancora impostata quella precedente!!!
+   Public Overrides Function OnPostNewMachGroup() As Boolean
+      ' Salvo macchina del gruppo come nuovo default
+      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
+
+   Public Overrides Function OnPreRemoveCurrMachGroup() As Boolean
+      'EgtSetCurrentContext(Map.refSceneHostVM.MainScene.GetCtx())
+      Return True
+   End Function
+
+   Public Function NewMachGroupID() As Integer
+      Dim nTemp As Integer = 0
+      If Not IsNothing(MachGroupMList) AndAlso MachGroupMList.Count > 0 Then Return MachGroupMList.Select(Of Integer)(Function(x) If(Integer.TryParse(x.Name, nTemp), nTemp, 0)).Max() + 1
+      Return 1
+   End Function
+
+   ' funzione che fa l'update di tutte le copie dei pezzi modificati
+   Public Shared Sub UpdateDuplo()
+      Dim nPartId As Integer = EgtGetFirstPart()
+      While nPartId <> GDB_ID.NULL
+         Dim bIsModified As Boolean = False
+         If EgtDuploGetModified(nPartId, bIsModified) AndAlso bIsModified Then
+            EgtDuploUpdate(nPartId)
+         End If
+         nPartId = EgtGetNextPart(nPartId)
+      End While
+   End Sub
+
+   ' funzione che cancella tutti i pezzi segnati da eliminare
+   Public Shared Sub DeleteDuplo()
+      ' reset necessario per poter accedere direttamente al grezzo dalle info pezzo e al MachGroup tramite la gerarchia Db geometrico
+      EgtResetCurrMachGroup()
+      Dim nPartId As Integer = EgtGetFirstPart()
+      While nPartId <> GDB_ID.NULL
+         Dim bIsToDelete As Boolean = False
+         If DuploGetToDelete(nPartId, bIsToDelete) AndAlso bIsToDelete Then
+            ' verifico se ci sono copie
+            Dim nDuploCount As Integer = 0
+            EgtDuploCount(nPartId, nDuploCount)
+            Dim DuploList As New List(Of Integer)
+            If nDuploCount > 0 AndAlso EgtDuploList(nPartId, DuploList) Then
+               ' cancello tutti i pezzi copia nelle barre
+               For Each nDuploId In DuploList
+                  ' recupero grezzo cui appartiene
+                  Dim nRawPartId As Integer
+                  EgtGetInfo(nDuploId, "!LST", nRawPartId)
+                  ' recupero gruppo di lavorazione 
+                  Dim nMachGroupId As Integer = EgtGetParent(EgtGetParent(EgtGetParent(nRawPartId)))
+                  ' lo setto come corrente
+                  EgtSetCurrMachGroup(nMachGroupId)
+                  ' elimino pezzo copia
+                  EgtRemovePartFromRawPart(nDuploId)
+                  EgtErase(nDuploId)
+                  '' recupero gruppo di lavorazione e trave dell'interfaccia
+                  'Dim BeamMachGroup As BeamMachGroupM = MachGroupMList.FirstOrDefault(Function(x) x.Id = nMachGroupId)
+                  'Dim Beam As BeamM = BeamMachGroup.PartMList.FirstOrDefault(Function(x) x.nPartId = nDuploId)
+                  'EgtSetCurrMachGroup(BeamMachGroup.Id)
+                  '''Beam.DeletePart()
+               Next
+            End If
+            DuploResetToDelete(nPartId)
+         End If
+         nPartId = EgtGetNextPart(nPartId)
+      End While
+      EgtResetCurrMachGroup()
+   End Sub
+
+   Friend Shared Function DuploGetToDelete(nSouId As Integer, ByRef bToDelete As Boolean) As Boolean
+      If IsNothing(nSouId) Then Return False
+      Return EgtGetInfo(nSouId, DUPLO_TODELETE, bToDelete)
+   End Function
+
+   Public Shared Function DuploSetToDelete(nSouId As Integer) As Boolean
+      If IsNothing(nSouId) Then Return False
+      Return EgtSetInfo(nSouId, DUPLO_TODELETE, True)
+   End Function
+
+   Private Shared Function DuploResetToDelete(nSouId As Integer) As Boolean
+      If IsNothing(nSouId) Then Return False
+      Return EgtSetInfo(nSouId, DUPLO_TODELETE, "")
+   End Function
+
+#End Region    ' METHODS
+
+End Class

EgtBEAMWALL.Core/MachGroupModel/MyMachGroupM.vb

@@ -1,545 +0,0 @@
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class MyMachGroupM
-   Inherits MachGroupM
-
-#Region "FIELDS & PROPERTIES"
-
-#Region "General"
-
-   Public Event PartAdded As EventHandler(Of PartAddedEventArgs)
-   Public Event PartRemoved As EventHandler(Of PartAddedEventArgs)
-
-   Protected m_nType As BWType
-   Public ReadOnly Property nType As BWType
-      Get
-         Return m_nType
-      End Get
-   End Property
-
-   Protected m_dL As Double
-   Public Property dL As Double
-      Get
-         Return m_dL
-      End Get
-      Set(value As Double)
-         m_dL = value
-      End Set
-   End Property
-
-   Protected m_dW As Double
-   Public Property dW As Double
-      Get
-         Return m_dW
-      End Get
-      Set(value As Double)
-         m_dW = value
-      End Set
-   End Property
-
-   Protected m_dH As Double
-   Public Property dH As Double
-      Get
-         Return m_dH
-      End Get
-      Set(value As Double)
-         m_dH = value
-      End Set
-   End Property
-
-   Protected m_dtStartTime As DateTime
-   Public Property dtStartTime As DateTime
-      Get
-         Return m_dtStartTime
-      End Get
-      Set(value As DateTime)
-         m_dtStartTime = value
-      End Set
-   End Property
-
-   Protected m_dtEndTime As DateTime
-   Public Property dtEndTime As DateTime
-      Get
-         Return m_dtEndTime
-      End Get
-      Set(value As DateTime)
-         m_dtEndTime = value
-      End Set
-   End Property
-
-   Protected m_dMatForPart As Double = 0
-   Public ReadOnly Property dMatForPart As Double
-      Get
-         Return m_dMatForPart
-      End Get
-   End Property
-
-   Protected m_nProdIndex As Integer = 0
-   Public Property nProdIndex As Integer
-      Get
-         Return m_nProdIndex
-      End Get
-      Set
-         m_nProdIndex = Value
-      End Set
-   End Property
-
-   Public Sub SetMatForPart(dMatForPart As Double)
-      m_dMatForPart = dMatForPart
-   End Sub
-
-   Protected m_dTotMat As Double = 0
-   Public ReadOnly Property dTotMat As Double
-      Get
-         Return m_dTotMat
-      End Get
-   End Property
-   Public Sub SetTotMat(TotMat As Double)
-      m_dTotMat = TotMat
-   End Sub
-
-   Protected m_sMATERIAL As String
-   Public Property sMATERIAL As String
-      Get
-         Return m_sMATERIAL
-      End Get
-      Set(value As String)
-         m_sMATERIAL = value
-      End Set
-   End Property
-
-   ' lista dei pezzi che sono nel grezzo
-   Protected m_PartMList As New List(Of PartM)
-   Public Property PartMList As List(Of PartM)
-      Get
-         Return m_PartMList
-      End Get
-      Set(value As List(Of PartM))
-         m_PartMList = value
-      End Set
-   End Property
-
-#End Region    ' General
-
-#Region "Beam"
-
-   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
-
-#End Region    ' Beam
-
-#Region "Wall"
-
-   Protected m_nRawPartId As Integer = GDB_ID.NULL
-   Public ReadOnly Property nRawPartId As Integer
-      Get
-         Return m_nRawPartId
-      End Get
-   End Property
-
-   Protected m_dPosZ As Double = 0
-   Public Property dPosZ As Double
-      Get
-         Return m_dPosZ
-      End Get
-      Set(value As Double)
-         m_dPosZ = value
-      End Set
-   End Property
-
-#End Region    ' Wall
-
-#Region "Calc"
-
-   Private m_nCALC_ERR As Integer
-   Public Property nCALC_ERR As Integer
-      Get
-         Return m_nCALC_ERR
-      End Get
-      Set(value As Integer)
-         m_nCALC_ERR = value
-      End Set
-   End Property
-
-   Private m_nCALC_FALL As Integer
-   Public Property nCALC_FALL As Integer
-      Get
-         Return m_nCALC_FALL
-      End Get
-      Set(value As Integer)
-         m_nCALC_FALL = value
-      End Set
-   End Property
-
-   Private m_sCALC_MSG As String
-   Public Property sCALC_MSG As String
-      Get
-         Return MessageFromLuaMsg(m_sCALC_MSG)
-      End Get
-      Set(value As String)
-         m_sCALC_MSG = value
-      End Set
-   End Property
-
-   Public m_nCALC_ROT As Integer
-   Public Property nCALC_ROT As Integer
-      Get
-         Return m_nCALC_ROT
-      End Get
-      Set(value As Integer)
-         m_nCALC_ROT = value
-      End Set
-   End Property
-
-   Public m_nCALC_TIME As Integer
-   Public Property nCALC_TIME As Integer
-      Get
-         Return m_nCALC_TIME
-      End Get
-      Set(value As Integer)
-         m_nCALC_TIME = value
-      End Set
-   End Property
-
-   Public m_nCALC_GlobalState As CalcStates = CalcStates.NOTCALCULATED
-   Public Property nCALC_GlobalState As CalcStates
-      Get
-         Return m_nCALC_GlobalState
-      End Get
-      Set(value As CalcStates)
-         m_nCALC_GlobalState = value
-      End Set
-   End Property
-
-   Private m_bCALC_PartsGlobalState As CalcStates
-   Public Property bCALC_PartsGlobalState As CalcStates
-      Get
-         Return m_bCALC_PartsGlobalState
-      End Get
-      Set(value As CalcStates)
-         m_bCALC_PartsGlobalState = value
-      End Set
-   End Property
-
-   Private m_nCALC_GlobalERR As Integer
-   Public Property nCALC_GlobalERR As Integer
-      Get
-         Return m_nCALC_GlobalERR
-      End Get
-      Set(value As Integer)
-         m_nCALC_GlobalERR = value
-      End Set
-   End Property
-
-   Public m_nCALC_State As CalcStates = CalcStates.NOTCALCULATED
-   Public Property nCALC_State As CalcStates
-      Get
-         Return m_nCALC_State
-      End Get
-      Set(value As CalcStates)
-         m_nCALC_State = value
-      End Set
-   End Property
-
-#End Region    ' Calc
-
-#Region "Supervisor"
-
-   Protected m_sSupervisorId As String
-   Public Property sSupervisorId As String
-      Get
-         Return m_sSupervisorId
-      End Get
-      Set(value As String)
-         m_sSupervisorId = value
-      End Set
-   End Property
-
-   Protected m_nPriorityIndex As Integer
-   Public Property nPriorityIndex As Integer
-      Get
-         Return m_nPriorityIndex
-      End Get
-      Set(value As Integer)
-         m_nPriorityIndex = value
-      End Set
-   End Property
-
-   Protected m_nProductionState As ItemState = ItemState.ND
-   Public ReadOnly Property nProductionState As ItemState
-      Get
-         Return m_nProductionState
-      End Get
-   End Property
-   Public Sub SetProductionState(nState As ItemState)
-      m_nProductionState = nState
-   End Sub
-
-#End Region    ' Supervisor
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONSTRUCTOR"
-
-   Protected Sub New()
-   End Sub
-
-   Public Overloads Shared Function CreateNewMachGroup() As MyMachGroupM
-      Return New 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
-      }
-      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)
-         EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARWIDTH, NewMachGroupM.m_dW)
-         NewMachGroupM.m_PartMList = LoadParts(NewMachGroupM)
-         For Each Part In NewMachGroupM.m_PartMList
-            Part.UpdateOffset()
-            NewMachGroupM.m_dTotMat += Part.dL + Part.dOffset
-            NewMachGroupM.m_dMatForPart += Part.dL
-         Next
-      Else
-         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)
-         EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELPOSZ, NewMachGroupM.m_dPosZ)
-         NewMachGroupM.m_dTotMat = NewMachGroupM.m_dL * NewMachGroupM.m_dW * NewMachGroupM.m_dH
-         NewMachGroupM.m_PartMList = LoadParts(NewMachGroupM)
-         For Each Part In NewMachGroupM.m_PartMList
-            NewMachGroupM.m_dMatForPart += Part.dVolume
-         Next
-      End If
-      ReadMachGroupData(NewMachGroupM)
-      Return NewMachGroupM
-   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)
-      }
-      If NewMachGroupM.m_Id = GDB_ID.NULL Then Return Nothing
-      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)
-         EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARWIDTH, NewMachGroupM.m_dW)
-         NewMachGroupM.m_dTotMat = NewMachGroupM.m_dL
-         NewMachGroupM.m_PartMList = LoadParts(NewMachGroupM)
-         For Each Part In NewMachGroupM.m_PartMList
-            Part.UpdateOffset()
-            NewMachGroupM.m_dMatForPart += Part.dL + Part.dOffset
-         Next
-      Else
-         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)
-         EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELPOSZ, NewMachGroupM.m_dPosZ)
-         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.dVolume
-         Next
-      End If
-      ReadMachGroupData(NewMachGroupM)
-      Return NewMachGroupM
-   End Function
-
-#End Region    ' CONSTRUCTOR
-
-#Region "METHODS"
-
-#Region "Machgroup"
-
-   Public Shared Sub ReadMachGroupData(NewMachgroup As MyMachGroupM)
-      ' leggo materiale
-      EgtGetInfo(NewMachgroup.Id, MGR_RPT_MATERIAL, NewMachgroup.sMATERIAL)
-      ' 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(NewMachgroup.Id, ITG_PROD_ERR, nErr)
-      EgtGetInfo(NewMachgroup.Id, ITG_PROD_ROT, nRot)
-      EgtGetInfo(NewMachgroup.Id, ITG_PROD_FALL, nFall)
-      EgtGetInfo(NewMachgroup.Id, ITG_PROD_MSG, sMsg)
-      If Not bCalc Then
-         NewMachgroup.m_nCALC_State = CalcStates.NOTCALCULATED
-         NewMachgroup.m_nCALC_ERR = 0
-         NewMachgroup.m_nCALC_ROT = 0
-         NewMachgroup.m_nCALC_FALL = 0
-         NewMachgroup.m_sCALC_MSG = ""
-      Else
-         NewMachgroup.m_nCALC_ERR = nErr
-         NewMachgroup.m_nCALC_ROT = nRot
-         NewMachgroup.m_nCALC_FALL = nFall
-         NewMachgroup.m_sCALC_MSG = sMsg
-         Select Case nErr
-            Case 0
-               NewMachgroup.nCALC_State = CalcStates.OK
-            Case 22
-               NewMachgroup.nCALC_State = CalcStates.COLLISION
-            Case 17, 19
-               NewMachgroup.nCALC_State = CalcStates.WARNING
-            Case < 0
-               NewMachgroup.nCALC_State = CalcStates.INFO
-            Case > 0
-               NewMachgroup.nCALC_State = CalcStates.ERROR_
-         End Select
-      End If
-      EgtGetInfo(NewMachgroup.Id, ITG_PROD_TIME, NewMachgroup.m_nCALC_TIME)
-   End Sub
-
-   Public Overridable Sub RefreshPartList()
-      If m_nType = MachineType.BEAM Then
-         ' 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)
-            StringToDoubleAdv(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 PartM = PartM.CreatePart(BWType.BEAM, Me, nPartId, nRawPartId)
-               AddPart(NewBeam)
-               NewBeam.UpdateOffset()
-            End If
-            nRawPartId = EgtGetNextRawPart(nRawPartId)
-         End While
-      Else
-         ' 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 PartM = PartM.CreatePart(BWType.WALL, Me, nWallId, m_nRawPartId)
-               AddPart(NewWall)
-            End If
-            nWallId = EgtGetNextPartInRawPart(nWallId)
-         End While
-      End If
-   End Sub
-
-   Public Overridable Sub RefreshGroupData()
-      If m_nType = MachineType.BEAM Then
-         EgtGetInfo(Id, MGR_RPT_BARLEN, dL)
-         EgtGetInfo(Id, MGR_RPT_BARHEIGHT, dH)
-         EgtGetInfo(Id, MGR_RPT_BARWIDTH, dW)
-         EgtGetInfo(Id, MGR_RPT_MATERIAL, sMATERIAL)
-      Else
-         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 If
-   End Sub
-
-   Public Overridable Sub DeleteMachGroup()
-      ' elimino tutte le copie
-      Dim nRawPartId As Integer = EgtGetFirstRawPart()
-      Dim nBeamId As Integer = EgtGetFirstPartInRawPart(nRawPartId)
-      While nRawPartId <> GDB_ID.NULL
-         EgtRemovePartFromRawPart(nBeamId)
-         EgtErase(nBeamId)
-         nRawPartId = EgtGetNextRawPart(nRawPartId)
-         nBeamId = EgtGetFirstPartInRawPart(nRawPartId)
-      End While
-      ' elimino MachGroup
-      EgtRemoveMachGroup(Me.Id)
-   End Sub
-
-#End Region    ' Machgroup
-
-#Region "Parts"
-
-   Private Shared Function LoadParts(NewMachGroupM As MyMachGroupM) As List(Of PartM)
-      Dim TempList As New List(Of PartM)
-      If NewMachGroupM.m_nType = MachineType.BEAM Then
-         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 PartM = PartM.CreatePart(BWType.BEAM, NewMachGroupM, nPartId, nRawPartId)
-               TempList.Add(NewBeam)
-            End If
-            nRawPartId = EgtGetNextRawPart(nRawPartId)
-         End While
-      Else
-         Dim nWallId As Integer = EgtGetFirstPartInRawPart(NewMachGroupM.m_nRawPartId)
-         While nWallId <> GDB_ID.NULL
-            If nWallId <> GDB_ID.NULL Then
-               Dim NewWall As PartM = PartM.CreatePart(BWType.WALL, NewMachGroupM, nWallId, NewMachGroupM.m_nRawPartId)
-               TempList.Add(NewWall)
-            End If
-            nWallId = EgtGetNextPartInRawPart(nWallId)
-         End While
-      End If
-      Return TempList
-   End Function
-
-   Public Sub AddPart(PartM As PartM)
-      If IsNothing(PartM) Then Return
-      If Not m_PartMList.Contains(PartM) Then
-         m_PartMList.Add(PartM)
-         RaiseEvent PartAdded(Me, New PartAddedEventArgs(PartM))
-      End If
-   End Sub
-
-   Public Sub RemovePart(PartM As PartM)
-      If IsNothing(PartM) Then Return
-      If m_PartMList.Contains(PartM) AndAlso m_PartMList.Remove(PartM) Then
-         RaiseEvent PartRemoved(Me, New PartAddedEventArgs(PartM))
-      End If
-   End Sub
-
-   Public Sub RemoveAllParts()
-      If IsNothing(m_PartMList) Then Return
-      For PartIndex = m_PartMList.Count - 1 To 0 Step -1
-         Dim PartM As PartM = m_PartMList(PartIndex)
-         If m_PartMList.Remove(PartM) Then
-            RaiseEvent PartRemoved(Me, New PartAddedEventArgs(PartM))
-         End If
-      Next
-   End Sub
-
-   Public Function GetParts() As List(Of PartM)
-      Return New List(Of PartM)(m_PartMList)
-   End Function
-
-#End Region    ' Parts
-
-#End Region    ' METHODS
-
-End Class

EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb

@@ -1,459 +0,0 @@
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class MyMachGroupPanelM
-   Inherits MachGroupPanelM
-
-#Region "FIELDS & PROPERTIES"
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONSTRUCTOR"
-
-   Public Shared Function CreateMyMachGroupPanel(MachineList As List(Of Machine)) As MachGroupPanelM
-      ' Assegno nome base
-      ' Recupero lista macchine
-      ' Assegno macchina di default
-      Dim NewMyMachGroupPanelM As New MyMachGroupPanelM With {
-         .m_IsMultiMachGroup = False,
-         .m_BaseName = "",
-         .m_MachineList = MachineList,
-         .m_DefaultMachine = ""
-      }
-      ' aggiorno copie
-      UpdateAllDuplo()
-      ' recupero i MachGroup
-      NewMyMachGroupPanelM.m_MachGroupMList = LoadMyMachGroups(MachineList)
-      Return NewMyMachGroupPanelM
-   End Function
-
-#End Region    ' CONSTRUCTOR
-
-#Region "METHODS"
-
-   Public Shared Function LoadMyMachGroups(MachineList As List(Of Machine)) As List(Of MachGroupM)
-      Dim TempList As New List(Of MachGroupM)
-      ' Carico i gruppi di lavorazione nella lista
-      Dim nId = EgtGetFirstMachGroup()
-      While nId <> GDB_ID.NULL
-         EgtSetCurrMachGroup(nId)
-         Dim sName As String = String.Empty
-         Dim sMachine As String = String.Empty
-         EgtGetMachGroupName(nId, sName)
-         EgtGetMachGroupMachineName(nId, sMachine)
-         ' cerco la macchina tra quelle presenti
-         Dim UsedMachine As MyMachine = Nothing
-         Dim bOk As Boolean = Machine.SearchMachine(sMachine, MachineList, UsedMachine)
-         If Not bOk OrElse UsedMachine.nType = MachineType.NULL Then
-            EgtOutLog("Machine incompatible with beam & wall machining!!")
-         Else
-            Dim nBTLInfoLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
-            Dim nPROJTYPE As Integer = BWType.NULL
-            EgtGetInfo(nBTLInfoLayerId, BTL_GEN_PROJTYPE, nPROJTYPE)
-            If nPROJTYPE = BWType.BEAM Or nPROJTYPE = BWType.WALL Then
-               TempList.Add(MyMachGroupM.CreateMyMachGroup(nPROJTYPE, nId, sName, sMachine))
-            Else
-               EgtOutLog("Machine of beam & wall type, but project type not found!!")
-            End If
-         End If
-         nId = EgtGetNextMachGroup(nId)
-      End While
-      EgtResetCurrMachGroup()
-      Return TempList
-   End Function
-
-   ' funzione che restituisce il gruppo di lavorazione dato l'Id geometrico
-   Public Shared Function LoadMyMachGroupFromId(nId As Integer, MachineList As List(Of Machine)) As MachGroupM
-      If nId <= 0 Then Return Nothing
-      If Not EgtSetCurrMachGroup(nId) Then Return Nothing
-      Dim sName As String = String.Empty
-      Dim sMachine As String = String.Empty
-      EgtGetMachGroupName(nId, sName)
-      EgtGetMachGroupMachineName(nId, sMachine)
-      ' cerco la macchina tra quelle presenti
-      Dim UsedMachine As MyMachine = Nothing
-      Dim bOk As Boolean = Machine.SearchMachine(sMachine, MachineList, UsedMachine)
-      If Not bOk OrElse UsedMachine.nType = MachineType.NULL Then
-         EgtOutLog("Machine incompatible with beam & wall machining!!")
-      Else
-         Dim nBTLInfoLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
-         Dim nPROJTYPE As Integer = BWType.NULL
-         EgtGetInfo(nBTLInfoLayerId, BTL_GEN_PROJTYPE, nPROJTYPE)
-         If nPROJTYPE = BWType.BEAM Or nPROJTYPE = BWType.WALL Then
-            Return MyMachGroupM.CreateMyMachGroup(nPROJTYPE, nId, sName, sMachine)
-         Else
-            EgtOutLog("Machine of beam & wall type, but project type not found!!")
-         End If
-      End If
-      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)
-      ' Carico i gruppi di lavorazione nella lista
-      Dim nId = EgtGetFirstMachGroup()
-      While nId <> GDB_ID.NULL
-         Dim UpdateUI As Integer = 0
-         If EgtGetInfo(nId, "UPDATEUI", UpdateUI) AndAlso UpdateUI = 1 Then
-            TempList.Add(LoadMyMachGroupFromId(nId, MachineList))
-            ' rimuovo info
-            EgtRemoveInfo(nId, "UPDATEUI")
-         End If
-         nId = EgtGetNextMachGroup(nId)
-      End While
-      EgtResetCurrMachGroup()
-      Return TempList
-   End Function
-
-   Public Function NewMyMachGroup(sMachName As String, nMachineType As MachineType) As MachGroupM
-      ' Sistemazioni preliminari
-      OnPreNewMachGroup()
-      ' Se non ci sono macchine disponibili esco con errore
-      If m_MachineList.Count <= 0 Then Return Nothing
-      ' Creo il nuovo gruppo di lavorazione con i dati ottenuti a seconda del caso in cui mi trovo
-      Dim MachGroupM As MachGroupM
-      If nMachineType = MachineType.NULL Then
-         EgtOutLog("Machine incompatible with beam & wall machining!!")
-         Return Nothing
-      Else
-         MachGroupM = MyMachGroupM.CreateMyMachGroup(nMachineType, NewMachGroupID(), sMachName)
-      End If
-      If IsNothing(MachGroupM) Then Return Nothing
-      AddMachGroup(MachGroupM)
-      ' Sistemazioni finali
-      m_DefaultMachine = sMachName
-      OnPostNewMachGroup()
-      Return MachGroupM
-   End Function
-
-   Public Overrides Function OnPreNewMachGroup() As Boolean
-      Return True
-   End Function
-
-   ' NB: Anche se ho già aggiunto il nuovo gruppo di lavorazione, non l'ho ancora reso corrente (viene fatto dopo), quindi
-   ' non posso usare CurrentMachine perchè è ancora impostata quella precedente!!!
-   Public Overrides Function OnPostNewMachGroup() As Boolean
-      ' Salvo macchina del gruppo come nuovo default
-      Dim sCurrMachName As String = String.Empty
-      EgtGetCurrMachineName(sCurrMachName)
-      WriteMainPrivateProfileString(S_MACH, K_CURRMACH, sCurrMachName)
-      Return True
-   End Function
-
-   Public Overrides Function OnPreRemoveCurrMachGroup() As Boolean
-      'EgtSetCurrentContext(Map.refSceneHostVM.MainScene.GetCtx())
-      Return True
-   End Function
-
-   Public Function NewMachGroupID() As Integer
-      Dim nTemp As Integer = 0
-      If Not IsNothing(MachGroupMList) AndAlso MachGroupMList.Count > 0 Then Return MachGroupMList.Select(Of Integer)(Function(x) If(Integer.TryParse(x.Name, nTemp), nTemp, 0)).Max() + 1
-      Return 1
-   End Function
-
-   ' funzione che fa l'update di tutte le copie dei pezzi modificati
-   Public Shared Sub UpdateAllDuplo()
-      ' 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 nPartId As Integer = EgtGetFirstPart()
-      While nPartId <> GDB_ID.NULL
-         Dim bIsModified As Boolean = False
-         If EgtDuploGetModified(nPartId, bIsModified) AndAlso bIsModified Then
-            UpdateDuplo(nPartId)
-         End If
-         nPartId = EgtGetNextPart(nPartId)
-      End While
-      If bTotIsModified Then
-         Dim CurrFilePath As String = ""
-         EgtGetCurrFilePath(CurrFilePath)
-         EgtSaveFile(CurrFilePath, NGE.CMPTEXT)
-      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)
-      If Configuration.bOnlyProd 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
-      Else
-         EgtDuploSetModified(nPartId)
-      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
-      Friend nPRC As Integer
-      Friend nPRID As Integer
-   End Class
-
-   ' funzione che cancella tutti i pezzi segnati da eliminare
-   Public Shared Function DeleteDuplo() As List(Of Integer)
-      Dim ToRedrawMachGroupList As New List(Of Integer)
-      ' reset necessario per poter accedere direttamente al grezzo dalle info pezzo e al MachGroup tramite la gerarchia Db geometrico
-      EgtResetCurrMachGroup()
-      Dim nPartId As Integer = EgtGetFirstPart()
-      While nPartId <> GDB_ID.NULL
-         Dim bIsToDelete As Boolean = False
-         If DuploGetToDelete(nPartId, bIsToDelete) AndAlso bIsToDelete Then
-            ' verifico se ci sono copie
-            Dim nDuploCount As Integer = 0
-            EgtDuploCount(nPartId, nDuploCount)
-            Dim DuploList As New List(Of Integer)
-            If nDuploCount > 0 AndAlso EgtDuploList(nPartId, DuploList) Then
-               ' cancello tutti i pezzi copia nelle barre
-               For Each nDuploId In DuploList
-                  ' recupero grezzo cui appartiene
-                  Dim nRawPartId As Integer = DuploGetRawPart(nDuploId)
-                  ' recupero gruppo di lavorazione 
-                  Dim nMachGroupId As Integer = EgtGetParent(EgtGetParent(EgtGetParent(nRawPartId)))
-
-                  ' elimino eventuali successive info pezzi di troppo
-                  Dim nIndex As Integer = 0
-                  Dim sTemp As String = ""
-                  While EgtGetInfo(nMachGroupId, MGR_RPT_PART & nIndex, sTemp)
-                     Dim PartData() As String = sTemp.Split(","c)
-                     If PartData(0) <> nDuploId Then
-                        EgtSetInfo(nMachGroupId, MGR_RPT_PART & nIndex, sTemp)
-                        nIndex += 1
-                     End If
-                  End While
-                  ToRedrawMachGroupList.Add(nMachGroupId)
-                  ' lo setto come corrente
-                  EgtSetCurrMachGroup(nMachGroupId)
-                  ' elimino pezzo copia
-                  EgtRemovePartFromRawPart(nDuploId)
-                  EgtErase(nDuploId)
-               Next
-            End If
-            DuploResetToDelete(nPartId)
-         End If
-         nPartId = EgtGetNextPart(nPartId)
-      End While
-      EgtResetCurrMachGroup()
-      Return ToRedrawMachGroupList
-   End Function
-
-   Friend Shared Function DuploGetToDelete(nSouId As Integer, ByRef bToDelete As Boolean) As Boolean
-      If IsNothing(nSouId) Then Return False
-      Return EgtGetInfo(nSouId, DUPLO_TODELETE, bToDelete)
-   End Function
-
-   Public Shared Function DuploSetToDelete(nSouId As Integer) As Boolean
-      If IsNothing(nSouId) Then Return False
-      Return EgtSetInfo(nSouId, DUPLO_TODELETE, True)
-   End Function
-
-   Private Shared Function DuploResetToDelete(nSouId As Integer) As Boolean
-      If IsNothing(nSouId) Then Return False
-      Return EgtSetInfo(nSouId, DUPLO_TODELETE, "")
-   End Function
-
-   ' funzione che restituisce il pezzo di origine di un Duplo
-   ' sostituisce EgtDuploGetOriginal che funziona solo all'interno del MachGroup del Duplo
-   Public Shared Function DuploGetOriginal(nDuploId As Integer) As Integer
-      Dim nOrigId As Integer = GDB_ID.NULL
-      If EgtGetInfo(nDuploId, GDB_SI_DUPSOU, nOrigId) AndAlso nOrigId > 0 Then
-         Return nOrigId
-      Else
-         Return GDB_ID.NULL
-      End If
-   End Function
-
-   Public Shared Function DuploGetRawPart(nDuploId As Integer) As Integer
-      Dim nSwapItem As Integer = GDB_ID.NULL
-      Dim sSwapItem As String = String.Empty
-      EgtGetInfo(nDuploId, "!LST", sSwapItem)
-      Dim LSTValues() As String = sSwapItem.Split(","c)
-      If Not IsNothing(LSTValues(LSTValues.Count - 1)) AndAlso Integer.TryParse(LSTValues(LSTValues.Count - 1), nSwapItem) AndAlso nSwapItem > 0 Then
-         Return EgtGetParent(nSwapItem)
-      End If
-      Return GDB_ID.NULL
-   End Function
-
-#End Region    ' METHODS
-
-End Class

EgtBEAMWALL.Core/MachGroupModel/PartM.vb

@@ -1,646 +0,0 @@
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class PartM
-   Inherits VMBase
-
-#Region "FIELDS & PROPERTIES"
-
-#Region "General"
-
-   Public Event BTLFeatureAdded As EventHandler(Of BTLFeatureAddedEventArgs)
-
-   Protected m_nType As BWType
-   Public ReadOnly Property nType As BWType
-      Get
-         Return m_nType
-      End Get
-   End Property
-
-   Protected m_ParentMachGroup As MyMachGroupM
-   Public ReadOnly Property ParentMachGroup As MyMachGroupM
-      Get
-         Return m_ParentMachGroup
-      End Get
-   End Property
-
-   ' Id geometrico del pezzo
-   Protected m_nPartId As Integer
-   Public ReadOnly Property nPartId As Integer
-      Get
-         Return m_nPartId
-      End Get
-   End Property
-   Friend Sub SetPartId(nPartId As Integer)
-      m_nPartId = nPartId
-   End Sub
-
-   ' Proj del pezzo
-   Protected m_nProjId As Integer = 0
-   Public Property nProjId As Integer
-      Get
-         Return m_nProjId
-      End Get
-      Set(value As Integer)
-         m_nProjId = value
-      End Set
-   End Property
-
-   ' Info del pezzo
-   Protected m_nPDN As Integer
-   Public ReadOnly Property nPDN As Integer
-      Get
-         Return m_nPDN
-      End Get
-   End Property
-
-   Protected m_sNAM As String
-   Public ReadOnly Property sNAM As String
-      Get
-         Return m_sNAM
-      End Get
-   End Property
-
-   Protected m_dBtlL As Double
-   Public ReadOnly Property dBtlL As String
-      Get
-         Return m_dBtlL
-      End Get
-   End Property
-   Public Property dL As Double
-      Get
-         Dim frBeam As New Frame3d
-         EgtGetGroupGlobFrame(nPartId, frBeam)
-         If IsX(frBeam.VersX(), EPS_SMALL) Then
-            Return m_dBtlL
-         ElseIf IsX(frBeam.VersY(), EPS_SMALL) Then
-            Return m_dBtlH
-         Else
-            Return m_dBtlW
-         End If
-      End Get
-      Set(value As Double)
-         m_dBtlL = value
-      End Set
-   End Property
-
-   Protected m_dBtlW As Double
-   Public ReadOnly Property dBtlW As String
-      Get
-         Return m_dBtlW
-      End Get
-   End Property
-   Public Property dW As Double
-      Get
-         Dim frBeam As New Frame3d
-         EgtGetGroupGlobFrame(nPartId, frBeam)
-         If IsY(frBeam.VersX()) Then
-            Return m_dBtlL
-         ElseIf IsY(frBeam.VersY()) Then
-            Return m_dBtlH
-         Else
-            Return m_dBtlW
-         End If
-      End Get
-      Set(value As Double)
-         m_dBtlW = value
-      End Set
-   End Property
-
-   Protected m_dBtlH As Double
-   Public ReadOnly Property dBtlH As String
-      Get
-         Return m_dBtlH
-      End Get
-   End Property
-   Public Property dH As Double
-      Get
-         Dim frBeam As New Frame3d
-         EgtGetGroupGlobFrame(nPartId, frBeam)
-         If IsZ(frBeam.VersX()) Then
-            Return m_dBtlL
-         ElseIf IsZ(frBeam.VersY()) Then
-            Return m_dBtlH
-         Else
-            Return m_dBtlW
-         End If
-         Return m_dBtlH
-      End Get
-      Set(value As Double)
-         m_dBtlH = value
-      End Set
-   End Property
-
-   Protected m_dPOSX As Double
-   Public Property dPOSX As Double
-      Get
-         If nType = BWType.WALL Then
-            ' verifico che sia attivo MachGroup di questo pezzo
-            If EgtGetCurrMachGroup() = ParentMachGroup.Id Then
-               ' recupero box pezzo
-               Dim b3Part As New BBox3d
-               EgtGetBBoxGlob(nPartId, GDB_BB.ONLY_VISIBLE + GDB_BB.IGNORE_TEXT + GDB_BB.IGNORE_DIM, b3Part)
-               ' recupero layer del box
-               Dim nBoxLayerId As Integer = EgtGetFirstNameInGroup(nPartId, "Box")
-               ' recupero box del layer box
-               Dim b3Box As New BBox3d
-               EgtGetBBoxGlob(nBoxLayerId, GDB_BB.STANDARD, b3Box)
-               ' recupero origine grezzo
-               Dim nrawPartId As Integer = EgtGetRawPartFromPart(nPartId)
-               Dim b3Raw As New BBox3d
-               EgtGetRawPartBBox(nrawPartId, b3Raw)
-               ' calcolo distanza tra origine pezzo e tavolo
-               Dim vtPartRef As New Vector3d(b3Box.Min() - b3Raw.Min())
-               m_dPOSX = vtPartRef.x
-               Return vtPartRef.x
-               ' altrimenti restituisco valore salvato (per quando viene clickato un BTLPart)
-            Else
-               Return m_dPOSX
-            End If
-         Else     ' nType = BWType.BEAM
-            Return m_dPOSX
-         End If
-      End Get
-      Set(value As Double)
-         m_dPOSX = value
-      End Set
-   End Property
-
-   Protected m_nCNT As Integer
-   Public Property nCNT As Integer
-      Get
-         Return m_nCNT
-      End Get
-      Set(value As Integer)
-         m_nCNT = value
-      End Set
-   End Property
-
-   Protected m_nINVERTED As Integer
-   Public ReadOnly Property nINVERTED As Integer
-      Get
-         Return m_nINVERTED
-      End Get
-   End Property
-   Public Sub SetInverted(nInverted As Integer)
-      m_nINVERTED = nInverted
-   End Sub
-
-   Protected m_nROTATED As Integer
-   Public ReadOnly Property nROTATED As Integer
-      Get
-         Return m_nROTATED
-      End Get
-   End Property
-   Public Sub SetRotated(nRotated As Integer)
-      m_nROTATED = nRotated
-   End Sub
-
-   Protected m_sMATERIAL As String
-   Public Property sMATERIAL As String
-      Get
-         Return m_sMATERIAL
-      End Get
-      Set(value As String)
-         m_sMATERIAL = value
-      End Set
-   End Property
-
-   Public m_sSTOREY As String
-   Public Property sSTOREY As String
-      Get
-         Return m_sSTOREY
-      End Get
-      Set(value As String)
-         m_sSTOREY = value
-      End Set
-   End Property
-
-   Public m_sGROUP As String
-   Public Property sGROUP As String
-      Get
-         Return m_sGROUP
-      End Get
-      Set(value As String)
-         m_sGROUP = value
-      End Set
-   End Property
-
-   Protected m_nBTLPartId As Integer
-   Public ReadOnly Property nBTLPartId As Integer
-      Get
-         Return m_nBTLPartId
-      End Get
-   End Property
-
-   ' lista delle feature del pezzo
-   Protected m_FeatureMList As List(Of BTLFeatureM)
-   Public Property FeatureMList As List(Of BTLFeatureM)
-      Get
-         Return m_FeatureMList
-      End Get
-      Set(value As List(Of BTLFeatureM))
-         m_FeatureMList = value
-      End Set
-   End Property
-
-#End Region    ' General
-
-#Region "Beam"
-
-   ' Id del grezzo
-   Protected m_nRawPartId As Integer = GDB_ID.NULL
-   Public ReadOnly Property nRawPartId As Integer
-      Get
-         Return m_nRawPartId
-      End Get
-   End Property
-
-   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
-
-#End Region    ' Beam
-
-#Region "Wall"
-
-   Protected m_dPOSY As Double
-   Public Property dPOSY As Double
-      Get
-         ' verifico che sia attivo MachGroup di questo pezzo
-         If EgtGetCurrMachGroup() = ParentMachGroup.Id Then
-            ' recupero box pezzo
-            Dim b3Part As New BBox3d
-            EgtGetBBoxGlob(nPartId, GDB_BB.ONLY_VISIBLE + GDB_BB.IGNORE_TEXT + GDB_BB.IGNORE_DIM, b3Part)
-            ' recupero layer del box
-            Dim nBoxLayerId As Integer = EgtGetFirstNameInGroup(nPartId, "Box")
-            ' recupero box del layer box
-            Dim b3Box As New BBox3d
-            EgtGetBBoxGlob(nBoxLayerId, GDB_BB.STANDARD, b3Box)
-            ' recupero origine grezzo
-            Dim nrawPartId As Integer = EgtGetRawPartFromPart(nPartId)
-            Dim b3Raw As New BBox3d
-            EgtGetRawPartBBox(nrawPartId, b3Raw)
-            ' calcolo distanza tra origine pezzo e tavolo
-            Dim vtPartRef As New Vector3d(b3Box.Min() - b3Raw.Min())
-            m_dPOSY = vtPartRef.y
-            Return vtPartRef.y
-            ' altrimenti restituisco valore salvato (per quando viene clickato un BTLPart)
-         Else
-            Return m_dPOSY
-         End If
-      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_nFLIP As Integer
-   Public Property nFLIP As Integer
-      Get
-         Return m_nFLIP
-      End Get
-      Set(value As Integer)
-         m_nFLIP = value
-      End Set
-   End Property
-
-   Protected m_dVolume As Double
-   Public Property dVolume As Double
-      Get
-         Return m_dVolume
-      End Get
-      Set(value As Double)
-         m_dVolume = value
-      End Set
-   End Property
-
-#End Region    ' Wall
-
-#Region "Calc"
-
-   Protected m_nCALC_GlobalState As CalcStates = CalcStates.NOTCALCULATED
-   Public Property nCALC_GlobalState As CalcStates
-      Get
-         Return m_nCALC_GlobalState
-      End Get
-      Set(value As CalcStates)
-         m_nCALC_GlobalState = value
-      End Set
-   End Property
-
-   Private m_nCALC_GlobalERR As Integer
-   Public Property nCALC_GlobalERR As Integer
-      Get
-         Return m_nCALC_GlobalERR
-      End Get
-      Set(value As Integer)
-         m_nCALC_GlobalERR = value
-      End Set
-   End Property
-
-   Protected m_nCALC_State As CalcStates = CalcStates.NOTCALCULATED
-   Public Property nCALC_State As CalcStates
-      Get
-         Return m_nCALC_State
-      End Get
-      Set(value As CalcStates)
-         m_nCALC_State = value
-      End Set
-   End Property
-
-   Protected m_nCALC_ERR As Integer
-   Public Property nCALC_ERR As Integer
-      Get
-         Return m_nCALC_ERR
-      End Get
-      Set(value As Integer)
-         m_nCALC_ERR = value
-      End Set
-   End Property
-
-   Protected m_sCALC_MSG As String = String.Empty
-   Public Property sCALC_MSG As String
-      Get
-         Return MessageFromLuaMsg(m_sCALC_MSG)
-      End Get
-      Set(value As String)
-         m_sCALC_MSG = value
-      End Set
-   End Property
-
-   Protected m_nCALC_ROT As Integer
-   Public Property nCALC_ROT As Integer
-      Get
-         Return m_nCALC_ROT
-      End Get
-      Set(value As Integer)
-         m_nCALC_ROT = value
-      End Set
-   End Property
-
-   Protected m_nCALC_FALL As Integer
-   Public Property nCALC_FALL As Integer
-      Get
-         Return m_nCALC_FALL
-      End Get
-      Set(value As Integer)
-         m_nCALC_FALL = value
-      End Set
-   End Property
-
-   Protected m_nCALC_TIME As Integer
-   Public Property nCALC_TIME As Integer
-      Get
-         Return m_nCALC_TIME
-      End Get
-      Set(value As Integer)
-         m_nCALC_TIME = value
-      End Set
-   End Property
-
-#End Region    ' Calc
-
-#Region "Supervisor"
-
-   Protected m_nProductionState As ItemState = ItemState.ND
-   Public ReadOnly Property nProductionState As ItemState
-      Get
-         Return m_nProductionState
-      End Get
-   End Property
-   Public Sub SetProductionState(nState As CalcStates)
-      m_nProductionState = nState
-   End Sub
-
-   Protected m_dtStartTime As DateTime
-   Public Property dtStartTime As DateTime
-      Get
-         Return m_dtStartTime
-      End Get
-      Set(value As DateTime)
-         m_dtStartTime = value
-      End Set
-   End Property
-
-   Protected m_dtEndTime As DateTime
-   Public Property dtEndTime As DateTime
-      Get
-         Return m_dtEndTime
-      End Get
-      Set(value As DateTime)
-         m_dtEndTime = value
-      End Set
-   End Property
-
-#End Region    ' Supervisor
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONSTRUCTOR"
-
-   Sub New(nParentMachGroup As MyMachGroupM, nPartId As Integer)
-      m_ParentMachGroup = nParentMachGroup
-      SetPartId(nPartId)
-      ' imposto BtlPart da cui deriva questo Duplo
-      m_nBTLPartId = MyMachGroupPanelM.DuploGetOriginal(nPartId)
-   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
-      }
-      ' leggo info pezzo
-      EgtGetInfo(nPartId, BTL_PRT_PROJ, NewPartM.m_nProjId)
-      EgtGetInfo(nPartId, BTL_PRT_PDN, NewPartM.m_nPDN)
-      EgtGetInfo(nPartId, BTL_PRT_NAM, NewPartM.m_sNAM)
-      EgtGetInfo(nPartId, BTL_PRT_L, NewPartM.m_dBtlL)
-      EgtGetInfo(nPartId, BTL_PRT_W, NewPartM.m_dBtlW)
-      EgtGetInfo(nPartId, BTL_PRT_H, NewPartM.m_dBtlH)
-      EgtGetInfo(nPartId, BTL_PRT_CNT, NewPartM.m_nCNT)
-      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
-      End If
-      NewPartM.SetRotated(nTemp)
-      If Not EgtGetInfo(nPartId, BTL_PRT_INVERTED, nTemp) Then
-         nTemp = 0
-      End If
-      NewPartM.SetInverted(nTemp)
-      If NewPartM.m_nType = BWType.BEAM Then
-         ' leggo PosX
-         Dim sInfo As String = ""
-         Dim Index = 1
-         Dim sSplitInfo() As String = Nothing
-         Dim bFound As Boolean = False
-         While EgtGetInfo(NewPartM.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
-            StringToDoubleAdv(sSplitInfo(1), NewPartM.m_dPOSX)
-         End If
-      Else
-         ' leggo PosX, PosY, Rot e Flip
-         EgtGetInfo(nPartId, MGR_PRT_POSX, NewPartM.m_dPOSX)
-         EgtGetInfo(nPartId, MGR_PRT_POSY, NewPartM.m_dPOSY)
-      End If
-      ' leggo volume 
-      If Not EgtGetInfo(nPartId, BTL_PRT_VOLUME, NewPartM.dVolume) Then
-         Dim nOrigId As Integer = EgtDuploGetOriginal(nPartId)
-         EgtGetInfo(nOrigId, BTL_PRT_VOLUME, NewPartM.dVolume)
-      End If
-      ' leggo feature
-      NewPartM.m_FeatureMList = LoadBTLFeatures(NewPartM, nPartId)
-      ReadMachGroupData(NewPartM)
-      Return NewPartM
-   End Function
-
-#End Region    ' CONSTRUCTOR
-
-#Region "METHODS"
-
-#Region "Part"
-
-   Public Shared Sub ReadMachGroupData(NewPartM As PartM)
-      ' 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(NewPartM.nPartId, ITG_PROD_ERR, nErr)
-      EgtGetInfo(NewPartM.nPartId, ITG_PROD_ROT, nRot)
-      EgtGetInfo(NewPartM.nPartId, ITG_PROD_FALL, nFall)
-      EgtGetInfo(NewPartM.nPartId, ITG_PROD_MSG, sMsg)
-      If Not bCalc Then
-         NewPartM.m_nCALC_State = CalcStates.NOTCALCULATED
-         NewPartM.m_nCALC_ERR = -1
-         NewPartM.m_nCALC_ROT = 0
-         NewPartM.m_nCALC_FALL = 0
-         NewPartM.m_sCALC_MSG = ""
-      Else
-         NewPartM.m_nCALC_ERR = nErr
-         NewPartM.m_nCALC_ROT = nRot
-         NewPartM.m_nCALC_FALL = nFall
-         NewPartM.m_sCALC_MSG = sMsg
-         Select Case nErr
-            Case 0
-               NewPartM.nCALC_State = CalcStates.OK
-            Case 22
-               NewPartM.nCALC_State = CalcStates.COLLISION
-            Case 17, 19
-               NewPartM.nCALC_State = CalcStates.WARNING
-            Case < 0
-               NewPartM.nCALC_State = CalcStates.INFO
-            Case > 0
-               NewPartM.nCALC_State = CalcStates.ERROR_
-         End Select
-      End If
-      EgtGetInfo(NewPartM.nPartId, ITG_PROD_TIME, NewPartM.m_nCALC_TIME)
-   End Sub
-
-   Public Sub ReadVolume()
-      ' leggo volume 
-      If Not EgtGetInfo(nPartId, BTL_PRT_VOLUME, dVolume) Then
-         Dim nOrigId As Integer = EgtDuploGetOriginal(nPartId)
-         EgtGetInfo(nOrigId, BTL_PRT_VOLUME, dVolume)
-      End If
-   End Sub
-
-#End Region    ' Part
-
-#Region "Beam"
-
-   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 Region    ' Beam
-
-#Region "Features"
-
-   Public Shared Function LoadBTLFeatures(NewPartM As PartM, 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(NewPartM, nOutlineId, False))
-         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(NewPartM, nFeatureId, False))
-         End If
-         nFeatureId = EgtGetNext(nFeatureId)
-      End While
-      Return TempList
-   End Function
-
-   Public Sub AddBTLFeature(BTLFeatureM As BTLFeatureM)
-      If IsNothing(BTLFeatureM) Then Return
-      If Not m_FeatureMList.Contains(BTLFeatureM) Then
-         m_FeatureMList.Add(BTLFeatureM)
-         RaiseEvent BTLFeatureAdded(Me, New BTLFeatureAddedEventArgs(BTLFeatureM))
-      End If
-   End Sub
-
-   Public Function GetBTLFeatures() As List(Of BTLFeatureM)
-      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
-
-End Class

EgtBEAMWALL.Core/MachGroupPanel/BeamMachGroupVM.vb

@@ -6,7 +6,7 @@ Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
 
-Public MustInherit Class BeamMachGroupVM
+Public Class BeamMachGroupVM
    Inherits MyMachGroupVM
 
    Public ReadOnly Property m_BeamMachGroupM As BeamMachGroupM
@@ -58,7 +58,17 @@ Public MustInherit Class BeamMachGroupVM
 
 #Region "METHODS"
 
-   Protected MustOverride Sub CreateBeamVMList()
+   Private Sub CreateBeamVMList()
+      Dim all As List(Of BeamVM) = (From BeamM In m_BeamMachGroupM.GetParts()
+                                    Select New BeamVM(BeamM, Me)).ToList()
+
+      For Each BeamVM As BeamVM In all
+         AddHandler BeamVM.PropertyChanged, AddressOf OnBeamVMPropertyChanged
+      Next
+
+      m_PartVMList = New ObservableCollection(Of PartVM)(all)
+      AddHandler m_PartVMList.CollectionChanged, AddressOf OnBeamVMListChanged
+   End Sub
 
    Public Overrides Sub RefreshPartList()
    End Sub
@@ -74,13 +84,16 @@ Public MustInherit Class BeamMachGroupVM
 
 #Region "EVENTS"
 
-   Protected MustOverride Sub OnBeamAdded(sender As Object, e As PartAddedEventArgs)
+   Private Sub OnBeamAdded(sender As Object, e As PartAddedEventArgs)
+      Dim BeamVM As BeamVM = New BeamVM(e.NewPart, Me)
+      PartVMList.Add(BeamVM)
+   End Sub
    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)
+   Private 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
@@ -102,7 +115,7 @@ Public MustInherit Class BeamMachGroupVM
       End If
    End Sub
 
-   Protected Overridable Sub OnBeamVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
+   Private Sub OnBeamVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
       'Select Case e.PropertyName
       '   Case NameOf(sender.nSelGRP), NameOf(sender.nSelSIDE)
       'End Select

EgtBEAMWALL.Core/MachGroupPanel/BeamVM.vb

@@ -4,7 +4,7 @@ Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
 
-Public MustInherit Class BeamVM
+Public Class BeamVM
    Inherits PartVM
 
    Public ReadOnly Property m_BeamM As BeamM
@@ -30,6 +30,10 @@ Public MustInherit Class BeamVM
 
 #Region "CONSTRUCTOR"
 
+   Sub New(BeamM As BeamM)
+      MyBase.New(BeamM)
+   End Sub
+
    Sub New(BeamM As BeamM, ParentMachGroupVM As BeamMachGroupVM)
       MyBase.New(BeamM, ParentMachGroupVM)
    End Sub

EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupPanelVM.vb

@@ -1,8 +1,11 @@
-Imports System.ComponentModel
+Imports System.Collections.ObjectModel
+Imports System.ComponentModel
+Imports System.IO
+Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
 
-Public MustInherit Class MyMachGroupPanelVM
+Public Class MyMachGroupPanelVM
    Inherits NewMachGroupPanelVM
 
 #Region "FIELDS & PROPERTIES"
@@ -26,45 +29,9 @@ Public MustInherit Class MyMachGroupPanelVM
       End Get
    End Property
 
-   Public ReadOnly Property sTotEstimatedTime As String
-      Get
-         Return TimeSpan.FromSeconds(m_MachGroupVMList.Sum(CType(Function(x As MyMachGroupVM) x.nCALC_TIME, Func(Of MachGroupVM, Double)))).ToString()
-      End Get
-   End Property
-
-   Public ReadOnly Property dTotTime As String
-      Get
-         Return m_MachGroupVMList.Sum(CType(Function(x As MyMachGroupVM) If(x.nProduction_State >= ItemState.Produced AndAlso Not IsNothing(x.dtEndTime) AndAlso x.dtEndTime <> DateTime.MinValue, (x.dtEndTime - x.dtStartTime).TotalSeconds(), x.nCALC_TIME), Func(Of MachGroupVM, Double)))
-      End Get
-   End Property
-
    Public ReadOnly Property sTotTime As String
       Get
-         Return TimeSpan.FromSeconds(dTotTime).ToString()
-      End Get
-   End Property
-
-   Public ReadOnly Property dDoneTime As String
-      Get
-         Return m_MachGroupVMList.Sum(CType(Function(x As MyMachGroupVM) If(x.nProduction_State >= ItemState.Produced AndAlso Not IsNothing(x.dtEndTime) AndAlso x.dtEndTime <> DateTime.MinValue, (x.dtEndTime - x.dtStartTime).TotalSeconds(), 0), Func(Of MachGroupVM, Double)))
-      End Get
-   End Property
-
-   Public ReadOnly Property sDoneTime As String
-      Get
-         Return TimeSpan.FromSeconds(dDoneTime).ToString()
-      End Get
-   End Property
-
-   Public ReadOnly Property dRemainingTime As String
-      Get
-         Return m_MachGroupVMList.Sum(CType(Function(x As MyMachGroupVM) If(x.nProduction_State < ItemState.Produced, x.nCALC_TIME, 0), Func(Of MachGroupVM, Double)))
-      End Get
-   End Property
-
-   Public ReadOnly Property sRemainingTime As String
-      Get
-         Return TimeSpan.FromSeconds(dRemainingTime).ToString()
+         Return TimeSpan.FromSeconds(m_MachGroupVMList.Sum(CType(Function(x As MyMachGroupVM) x.nCALC_TIME, Func(Of MachGroupVM, Double)))).ToString()
       End Get
    End Property
 
@@ -82,13 +49,29 @@ Public MustInherit Class MyMachGroupPanelVM
 
 #Region "METHODS"
 
-   Protected MustOverride Overrides Sub CreateMachGroupVMList()
+   Protected Overrides Sub CreateMachGroupVMList()
+      Dim all As New List(Of MachGroupVM)
+      For Each MachGroupM In m_MachGroupPanelM.GetMachGroups()
+         If DirectCast(MachGroupM, MyMachGroupM).nMachineType = MachineType.BEAM Then
+            all.Add(New BeamMachGroupVM(MachGroupM))
+         Else
+            all.Add(New WallMachGroupVM(MachGroupM))
+         End If
+      Next
+
+      For Each MachGroupvM As MachGroupVM In all
+         AddHandler MachGroupvM.PropertyChanged, AddressOf OnMachGroupVMPropertyChanged
+      Next
+
+      MachGroupVMList = New ObservableCollection(Of MachGroupVM)(all)
+      AddHandler MachGroupVMList.CollectionChanged, AddressOf OnMachGroupVMListChanged
+   End Sub
 
    Public Overrides Function InitMachGroupList(Optional bUseDefaults As Boolean = False) As Boolean
       ' 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()
@@ -105,18 +88,11 @@ Public MustInherit Class MyMachGroupPanelVM
       Return True
    End Function
 
-   Private Sub RedrawModifiedMachGroup(RedrawList As List(Of Integer))
-      For Each nMachGroupId In RedrawList
-         EgtSetCurrMachGroup(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
-      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())
@@ -125,15 +101,37 @@ Public MustInherit Class MyMachGroupPanelVM
 
    Public Overrides Function OnPostSetCurrMachGroup() As Boolean
       ' resetto eventuale selezione pezzo
-      Dim SelMachGroup As MyMachGroupVM = DirectCast(SelectedMachGroup, MyMachGroupVM)
-      SelMachGroup.SelPart = Nothing
+      DirectCast(SelectedMachGroup, MyMachGroupVM).SelPart = Nothing
       ' Imposto vista solo tavola
       EgtSetMachineLook(MCH_LOOK.TAB)
-      Core.ViewPanelVM.BWSetView(If(ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
+      Dim View As VT
+      For Each Mach As MyMachine In CoreMap.refMachinePanelVM.MachineList
+         If Mach.Name = SelectedMachGroup.Machine Then
+            If Mach.nType = Core.ConstBeam.MachineType.BEAM Then
+               View = VT.ISO_SW
+            Else
+               View = VT.TOP
+            End If
+            Exit For
+         End If
+      Next
+      EgtSetView(View, False)
       EgtZoom(ZM.ALL)
       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
@@ -151,7 +149,6 @@ Public MustInherit Class MyMachGroupPanelVM
    ' funzione che aggiorna totale tempi a fine calcolo
    Public Sub CalcGlobalTime()
       NotifyPropertyChanged(NameOf(sTotTime))
-      NotifyPropertyChanged(NameOf(sRemainingTime))
    End Sub
 
    ' funzione che aggiorna numero gruppi di lavorazione e volume totale
@@ -159,26 +156,29 @@ Public MustInherit Class MyMachGroupPanelVM
       NotifyPropertyChanged(NameOf(sTotMachGroups))
       NotifyPropertyChanged(NameOf(sTotVolume))
       NotifyPropertyChanged(NameOf(sTotTime))
-      NotifyPropertyChanged(NameOf(sRemainingTime))
-   End Sub
-
-   Public Shared Sub DuploRemoveProjCalc(nPartDuploId As Integer)
-      EgtSetInfo(nPartDuploId, ITG_PROJ_ERR, "")
-      EgtSetInfo(nPartDuploId, ITG_PROJ_MSG, "")
-      EgtSetInfo(nPartDuploId, ITG_PROJ_ROT, "")
-      EgtSetInfo(nPartDuploId, ITG_PROJ_FALL, "")
-      EgtSetInfo(nPartDuploId, ITG_PROJ_TIME, "")
    End Sub
 
 #End Region    ' METHODS
 
 #Region "EVENTS"
 
+   Protected Overrides Sub OnMachGroupAdded(sender As Object, e As MachGroupAddedEventArgs)
+      Dim MachGroupVM As MachGroupVM = Nothing
+      Select Case DirectCast(e.NewMachGroupM, MyMachGroupM).nMachineType
+         Case Core.ConstBeam.MachineType.BEAM
+            MachGroupVM = New BeamMachGroupVM(e.NewMachGroupM)
+         Case Core.ConstBeam.MachineType.WALL
+            MachGroupVM = New WallMachGroupVM(e.NewMachGroupM)
+         Case Core.ConstBeam.MachineType.NULL
+            Return
+      End Select
+      MachGroupVMList.Add(MachGroupVM)
+      NotifyPropertyChanged(NameOf(MachGroupVMList))
+   End Sub
+
    Protected Overrides Sub OnMachGroupVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
       Select Case e.PropertyName
-         Case NameOf(sender.nProduction_State)
-            NotifyPropertyChanged(NameOf(sTotTime))
-            NotifyPropertyChanged(NameOf(sRemainingTime))
+         'Case nameof(sender.sMATERIAL)
       End Select
    End Sub
 

EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupVM.vb

@@ -1,36 +1,24 @@
 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
 
 Public MustInherit Class MyMachGroupVM
    Inherits MachGroupVM
 
-#Region "FIELDS & PROPERTIES"
-
-#Region "General"
-
    Public ReadOnly Property MyMachGroupM As MyMachGroupM
       Get
          Return m_MachGroupM
       End Get
    End Property
 
-   Public ReadOnly Property nType As BWType
+   Public ReadOnly Property nMachineType As MachineType
       Get
-         Return MyMachGroupM.nType
-      End Get
-   End Property
-
-   Public ReadOnly Property nName As Integer
-      Get
-         Dim nIntName As Integer = 0
-         Integer.TryParse(MyMachGroupM.Name, nIntName)
-         Return nIntName
+         Return MyMachGroupM.nMachineType
       End Get
    End Property
 
@@ -83,13 +71,13 @@ Public MustInherit Class MyMachGroupVM
 
    Public ReadOnly Property dUsage As Double
       Get
-         Return If(MyMachGroupM.dMatForPart > 0 AndAlso MyMachGroupM.dTotMat > 0, If(nType = BWType.WALL, MyMachGroupM.dMatForPart / MyMachGroupM.dTotMat * 100, MyMachGroupM.dMatForPart / MyMachGroupM.dL * 100), 0)
+         Return If(MyMachGroupM.dMatForPart > 0 AndAlso MyMachGroupM.dTotMat > 0, MyMachGroupM.dMatForPart / MyMachGroupM.dTotMat * 100, 0)
       End Get
    End Property
 
    Public ReadOnly Property dWaste As Double
       Get
-         Return If(MyMachGroupM.dMatForPart > 0 AndAlso MyMachGroupM.dTotMat > 0, If(nType = BWType.WALL, (MyMachGroupM.dTotMat - MyMachGroupM.dMatForPart) / 1000000000, MyMachGroupM.dL - MyMachGroupM.dTotMat), 0)
+         Return If(MyMachGroupM.dMatForPart > 0 AndAlso MyMachGroupM.dTotMat > 0, (MyMachGroupM.dTotMat - MyMachGroupM.dMatForPart) / MyMachGroupM.dTotMat * 100, 0)
       End Get
    End Property
 
@@ -101,7 +89,7 @@ Public MustInherit Class MyMachGroupVM
 
    Public ReadOnly Property sWaste As String
       Get
-         Return LenToString(dWaste, 3)
+         Return DoubleToString(dWaste, 3)
       End Get
    End Property
 
@@ -114,24 +102,6 @@ Public MustInherit Class MyMachGroupVM
       End Set
    End Property
 
-   Public ReadOnly Property sUnitTime As String
-      Get
-         Return TimeSpan.FromSeconds(nCALC_TIME).ToString()
-      End Get
-   End Property
-
-   Public ReadOnly Property dUnitVolume As Double
-      Get
-         Return dL * dW * dH
-      End Get
-   End Property
-
-   Public ReadOnly Property Section As SectionXMaterial
-      Get
-         Return New SectionXMaterial(dW, dH, dL, MyMachGroupM.sMATERIAL)
-      End Get
-   End Property
-
    ' lista dei pezzi che sono nel grezzo
    Protected m_PartVMList As New ObservableCollection(Of PartVM)
    Public Property PartVMList As ObservableCollection(Of PartVM)
@@ -158,36 +128,6 @@ Public MustInherit Class MyMachGroupVM
       End Set
    End Property
 
-#End Region    ' General
-
-#Region "Beam"
-
-   Public Overridable Property sStartCut As String
-      Get
-         Return LenToString(MyMachGroupM.dStartCut, 3)
-      End Get
-      Set(value As String)
-         StringToLenAdv(value, MyMachGroupM.dStartCut, True)
-      End Set
-   End Property
-   Public Property dStartCut As Double
-      Get
-         Return MyMachGroupM.dStartCut
-      End Get
-      Set(value As Double)
-         MyMachGroupM.dStartCut = value
-         NotifyPropertyChanged(NameOf(sStartCut))
-      End Set
-   End Property
-
-#End Region    ' Beam
-
-#Region "Wall"
-
-#End Region    ' Wall
-
-#Region "Calc"
-
    Public ReadOnly Property nCALC_ERR As Integer
       Get
          Return MyMachGroupM.nCALC_ERR
@@ -233,12 +173,6 @@ Public MustInherit Class MyMachGroupVM
       End Set
    End Property
 
-   Public ReadOnly Property nPartsGlobalState As CalcStates
-      Get
-         Return MyMachGroupM.bCALC_PartsGlobalState
-      End Get
-   End Property
-
    Public Property nCALC_State As CalcStates
       Get
          Return MyMachGroupM.nCALC_State
@@ -250,18 +184,37 @@ Public MustInherit Class MyMachGroupVM
 
    Public ReadOnly Property Calc_Background As SolidColorBrush
       Get
-         Select Case MyMachGroupM.nCALC_GlobalState
-            Case CalcStates.ERROR_, CalcStates.COLLISION
-               Return Brushes.Red
-            Case CalcStates.WARNING
-               Return Brushes.Orange
-            Case CalcStates.INFO, CalcStates.OK
-               Return Brushes.Green
-            Case CalcStates.NOTCALCULATED
-               Return Brushes.LightGray
-            Case Else
-               Return Brushes.Red
-         End Select
+         If MyMachGroupM.nCALC_GlobalState = CalcStates.OK Then
+            Return Brushes.Green
+         ElseIf MyMachGroupM.nCALC_GlobalState = CalcStates.NOTCALCULATED Then
+            Return Brushes.LightGray
+         ElseIf MyMachGroupM.nCALC_GlobalState = CalcStates.INFO Then
+            Return Brushes.Green
+         ElseIf MyMachGroupM.nCALC_GlobalState = CalcStates.WARNING Then
+            Return Brushes.Gold
+         ElseIf MyMachGroupM.nCALC_GlobalState = CalcStates.ERROR_ Then
+            Return Brushes.Red
+         Else
+            Return Brushes.Red
+         End If
+      End Get
+   End Property
+
+   Public ReadOnly Property nProduction_State As Integer
+      Get
+         Return MyMachGroupM.nProductionState
+      End Get
+   End Property
+
+   Public Overridable ReadOnly Property Production_Background As SolidColorBrush
+      Get
+         If dtEndTime <> DateTime.MinValue Then          ' barra finita
+            Return Brushes.LightGray
+         ElseIf dtStartTime <> DateTime.MinValue Then    ' barra iniziata
+            Return Brushes.Green
+         Else                                            ' barra in coda
+            Return Brushes.White
+         End If
       End Get
    End Property
 
@@ -279,14 +232,14 @@ Public MustInherit Class MyMachGroupVM
 
    Public ReadOnly Property CALC_ERR_Letter As String
       Get
-         Select Case MyMachGroupM.nCALC_GlobalState
-            Case CalcStates.COLLISION
+         Select Case MyMachGroupM.nCALC_GlobalERR
+            Case 22
                Return "c"
-            Case CalcStates.ERROR_
+            Case 19, 23, 24, 25
                Return "e"
-            Case CalcStates.WARNING
+            Case 17
                Return "w"
-            Case CalcStates.INFO
+            Case < 0
                Return "i"
             Case Else
                Return ""
@@ -297,7 +250,7 @@ Public MustInherit Class MyMachGroupVM
    Public ReadOnly Property CALC_ERR_Foreground As SolidColorBrush
       Get
          Select Case MyMachGroupM.m_nCALC_GlobalState
-            Case CalcStates.ERROR_, CalcStates.COLLISION
+            Case CalcStates.ERROR_
                Return Brushes.Red
             Case CalcStates.WARNING
                Return Brushes.Orange
@@ -309,146 +262,26 @@ Public MustInherit Class MyMachGroupVM
       End Get
    End Property
 
-#End Region    ' Calc
-
-#Region "Supervisor"
-
-   Public Property nProduction_State As ItemState
+   Public ReadOnly Property sUnitTime As String
       Get
-         Return MyMachGroupM.nProductionState
-      End Get
-      Set(value As ItemState)
-         MyMachGroupM.SetProductionState(value)
-      End Set
-   End Property
-
-   Public ReadOnly Property Production_Background As SolidColorBrush
-      Get
-         Select Case nProduction_State
-            Case ItemState.ND
-               Return Brushes.White
-            Case ItemState.Assigned, ItemState.Confirmed
-               If m_bToBeProduced Then                     ' barra in attesa
-                  If m_bCNReCalculated Then
-                     Return Brushes.Orange
-                  Else                                     ' barra in check calc
-                     Return Brushes.Purple
-                  End If
-               Else                                        ' barra in coda
-                  Return Brushes.White
-               End If
-            Case ItemState.WIP
-               Return Brushes.Green
-            Case ItemState.Produced
-               Return Brushes.Yellow
-            Case Else         ' ItemState.Scrapped
-               Return Brushes.Aqua
-         End Select
+         Return TimeSpan.FromSeconds(nCALC_TIME).ToString()
       End Get
    End Property
 
-   ' indica se il pezzo deve essere tagliato
-   Protected m_bToBeProduced As Boolean = False
-   Public ReadOnly Property bToBeProduced As Boolean
+   Public ReadOnly Property dUnitVolume As Double
       Get
-         Return m_bToBeProduced
+         Return dL * dW * dH
       End Get
    End Property
 
-   ' indica se il pezzo e' gia' stato ricalcolato e quindi pronto a partire
-   Protected m_bCNReCalculated As Boolean = False
-   Public ReadOnly Property bReadyForMachining As Boolean
+   Public ReadOnly Property Section As SectionXMaterial
       Get
-         Return m_bToBeProduced AndAlso m_bCNReCalculated
+         Return New SectionXMaterial(dW, dH, dL, MyMachGroupM.sMATERIAL)
       End Get
    End Property
 
-   Protected m_bSendingToMachine As Boolean = False
-   Public ReadOnly Property bSendingToMachine As Boolean
-      Get
-         Return m_bSendingToMachine
-      End Get
-   End Property
-   Public Sub SetSendingToMachine(value As Boolean)
-      m_bSendingToMachine = value
-   End Sub
-
-   ' indica se il pezzo e' stato mandato alla macchina
-   Protected m_bSentToMachine As Boolean = False
-   Public ReadOnly Property bSentToMachine As Boolean
-      Get
-         Return m_bSentToMachine
-      End Get
-   End Property
-   Public Sub SetSentToMachine(value As Boolean)
-      m_bSentToMachine = value
-      m_bSendingToMachine = False
-   End Sub
-
-   ' indica se la macchina e' stata interrotta durante la lavorazione
-   Protected m_bResetWhileCutting As Boolean = False
-   Public ReadOnly Property bResetWhileCutting As Boolean
-      Get
-         Return m_bResetWhileCutting
-      End Get
-   End Property
-   Public Sub SetResetWhileCutting(value As Boolean)
-      m_bResetWhileCutting = value
-   End Sub
-
-   Public ReadOnly Property Background As SolidColorBrush
-      Get
-         Select Case nProduction_State
-            Case ItemState.ND
-               Return Brushes.White
-            Case ItemState.Assigned
-               Return Brushes.LightGray
-            Case ItemState.Confirmed
-               Return Brushes.LightGray
-            Case ItemState.WIP
-               Return Brushes.Green
-            Case ItemState.Produced
-               Return Brushes.Yellow
-            Case Else         ' ItemState.Scrapped
-               Return Brushes.Aqua
-         End Select
-      End Get
-   End Property
-
-   Public Overridable ReadOnly Property Produce_IsEnabled As Boolean
-      Get
-         Select Case nProduction_State
-            Case ItemState.Assigned, ItemState.Confirmed
-               Return Not m_bToBeProduced
-            Case Else
-               Return False
-         End Select
-      End Get
-   End Property
-
-   Private m_SupervisorId As String = ""
-   Public ReadOnly Property SupervisorId As String
-      Get
-         Return m_SupervisorId
-      End Get
-   End Property
-   Public Sub SetSupervisorId(SupervisorId As String)
-      m_SupervisorId = SupervisorId
-   End Sub
-
-   Public ReadOnly Property IsReadOnly As Boolean
-      Get
-         Return String.IsNullOrEmpty(m_SupervisorId)
-      End Get
-   End Property
-
-#End Region    ' Supervisor
-
    ' definizione comandi
    Private m_cmdDeleteMachGroup As ICommand
-   Private m_cmdProduceMachGroup As ICommand
-
-#End Region    ' FIELDS & PROPERTIES
 
 #Region "CONSTRUCTORS"
 
@@ -456,53 +289,21 @@ Public MustInherit Class MyMachGroupVM
       MyBase.New(MyMachGroupM)
       'aggiorno lista pezzi
       RefreshPartList()
-      AddHandler MyMachGroupM.PartAdded, AddressOf OnPartAdded
-      AddHandler MyMachGroupM.PartRemoved, AddressOf OnPartRemoved
-      CreatePartVMList()
-      ' Aggiorno stato da stati feature
-      CalcGlobalUpdate()
-      NotifyPropertyChanged(NameOf(CALC_FALL_Visibility))
    End Sub
 
 #End Region    ' CONSTRUCTORS
 
 #Region "METHODS"
 
-#Region "Machgroup"
-
-   Public MustOverride Sub RefreshGroupData()
-
-   Public Sub UpdateUsage()
-      If nType = BWType.BEAM Then
-         MyMachGroupM.SetMatForPart(0)
-         Dim dPartLength As Double
-         Dim dPartOffsetLength As Double
-         For Each Part In PartVMList
-            dPartOffsetLength += Part.dL + Part.dOffset
-            dPartLength += Part.dL
-         Next
-         MyMachGroupM.SetTotMat(dPartOffsetLength)
-         MyMachGroupM.SetMatForPart(dPartLength)
-      Else
-         MyMachGroupM.SetTotMat(dL * dH * dW)
-         MyMachGroupM.SetMatForPart(0)
-         Dim dPartVolume As Double
-         For Each Part In PartVMList
-            dPartVolume += Part.dVolume
-         Next
-         MyMachGroupM.SetMatForPart(dPartVolume)
-      End If
-      NotifyPropertyChanged(NameOf(sUsage))
-      NotifyPropertyChanged(NameOf(sWaste))
-   End Sub
-
-   Public Overridable Function CnFilePath() As String
+   Public Overridable Function Copy() As MyMachGroupVM
       Return Nothing
    End Function
 
-#End Region    ' Machgroup
+#End Region    ' METHODS
 
-#Region "Calc"
+   Public MustOverride Sub RefreshPartList()
+
+   Public MustOverride Sub RefreshGroupData()
 
    ' funzione che aggiorna lo stato e gli errori dopo calcolo
    Public Sub CalcMachGroupUpdate(ERR As Integer, ROT As Integer, MSG As String)
@@ -512,18 +313,15 @@ Public MustInherit Class MyMachGroupVM
       MyMachGroupM.nCALC_ERR = ERR
       MyMachGroupM.nCALC_ROT = ROT
       MyMachGroupM.sCALC_MSG = MSG
-      Select Case ERR
-         Case 0
-            nCALC_State = CalcStates.OK
-         Case 22
-            nCALC_State = CalcStates.COLLISION
-         Case 17, 19
-            nCALC_State = CalcStates.WARNING
-         Case < 0
-            nCALC_State = CalcStates.INFO
-         Case > 0
-            nCALC_State = CalcStates.ERROR_
-      End Select
+      If ERR = 0 Then
+         nCALC_State = CalcStates.OK
+      ElseIf ERR = 17 Then
+         nCALC_State = CalcStates.WARNING
+      ElseIf ERR > 0 Then
+         nCALC_State = CalcStates.ERROR_
+      ElseIf ERR < 0 Then
+         nCALC_State = CalcStates.INFO
+      End If
       NotifyPropertyChanged(NameOf(Calc_Background))
    End Sub
 
@@ -546,22 +344,28 @@ Public MustInherit Class MyMachGroupVM
    End Sub
 
    ' funzione che aggiorna lo stato e gli errori dopo calcolo
-   Public Overridable Sub CalcGlobalUpdate()
+   Public Sub CalcGlobalUpdate()
       MyMachGroupM.nCALC_GlobalERR = nCALC_ERR
       MyMachGroupM.nCALC_GlobalState = nCALC_State
-      ' stato globale dei pezzi
-      MyMachGroupM.bCALC_PartsGlobalState = CalcStates.NOTCALCULATED
       For Each Part In MyMachGroupM.PartMList
-         If Part.nCALC_GlobalState = CalcStates.NOTCALCULATED And nCALC_State < CalcStates.ERROR_ Then
-            MyMachGroupM.nCALC_GlobalState = Part.nCALC_GlobalState
-            MyMachGroupM.nCALC_GlobalERR = Part.nCALC_GlobalERR
+         If Part.nCALC_GlobalState = CalcStates.NOTCALCULATED Then
+            MyMachGroupM.nCALC_GlobalState = CalcStates.NOTCALCULATED
             Exit For
-         ElseIf Part.nCALC_GlobalState > MyMachGroupM.nCALC_GlobalState Then
-            MyMachGroupM.nCALC_GlobalState = Part.nCALC_GlobalState
-            MyMachGroupM.nCALC_GlobalERR = Part.nCALC_GlobalERR
+         ElseIf Part.nCALC_GlobalState = CalcStates.OK AndAlso MyMachGroupM.m_nCALC_GlobalState = Core.CalcStates.NOTCALCULATED Then
+            MyMachGroupM.nCALC_GlobalState = CalcStates.OK
+         ElseIf Part.nCALC_GlobalState = CalcStates.INFO And (MyMachGroupM.nCALC_GlobalState = CalcStates.OK Or MyMachGroupM.nCALC_GlobalState = CalcStates.NOTCALCULATED) Then
+            MyMachGroupM.nCALC_GlobalState = CalcStates.INFO
+         ElseIf Part.nCALC_GlobalState = CalcStates.WARNING And (MyMachGroupM.nCALC_GlobalState = CalcStates.OK Or MyMachGroupM.nCALC_GlobalState = CalcStates.INFO Or MyMachGroupM.nCALC_GlobalState = CalcStates.NOTCALCULATED) Then
+            MyMachGroupM.nCALC_GlobalState = CalcStates.WARNING
+         ElseIf Part.nCALC_GlobalState = CalcStates.ERROR_ And (MyMachGroupM.nCALC_GlobalState = CalcStates.OK Or MyMachGroupM.nCALC_GlobalState = CalcStates.INFO Or MyMachGroupM.nCALC_GlobalState = CalcStates.WARNING Or MyMachGroupM.nCALC_GlobalState = CalcStates.NOTCALCULATED) Then
+            MyMachGroupM.nCALC_GlobalState = CalcStates.ERROR_
          End If
-         If Part.nCALC_GlobalState > MyMachGroupM.bCALC_PartsGlobalState Then
-            MyMachGroupM.bCALC_PartsGlobalState = Part.nCALC_GlobalState
+         If Part.nCALC_GlobalERR = 22 Then
+            MyMachGroupM.nCALC_GlobalERR = 22
+         ElseIf Part.nCALC_GlobalERR > 0 And MyMachGroupM.nCALC_GlobalERR <= 0 Then
+            MyMachGroupM.nCALC_GlobalERR = Part.nCALC_GlobalERR
+         ElseIf Part.nCALC_GlobalERR < 0 And MyMachGroupM.nCALC_GlobalERR = 0 Then
+            MyMachGroupM.nCALC_GlobalERR = Part.nCALC_GlobalERR
          End If
          If Part.nCALC_ROT <> 0 Then
             MyMachGroupM.m_nCALC_ROT = Part.nCALC_ROT
@@ -570,7 +374,6 @@ Public MustInherit Class MyMachGroupVM
             MyMachGroupM.nCALC_FALL = Part.nCALC_FALL
          End If
       Next
-
       NotifyPropertyChanged(NameOf(Calc_Background))
       NotifyPropertyChanged(NameOf(CALC_FALL_Visibility))
       NotifyPropertyChanged(NameOf(CALC_ROT_Visibility))
@@ -584,42 +387,6 @@ Public MustInherit Class MyMachGroupVM
       NotifyPropertyChanged(NameOf(sUnitTime))
    End Sub
 
-   Public Overridable Sub CALCEnd()
-   End Sub
-
-#End Region    ' Calc
-
-#Region "Supervisor"
-
-   Public Sub SentToSupervisor()
-      MyMachGroupM.SetProductionState(ItemState.Assigned)
-      NotifyPropertyChanged(NameOf(Background))
-   End Sub
-
-   Public Sub ResetProduce()
-      m_bCNReCalculated = False
-      m_bToBeProduced = False
-      m_bSendingToMachine = False
-      m_bSentToMachine = False
-      NotifyPropertyChanged(NameOf(Production_Background))
-   End Sub
-
-#End Region    ' Supervisor
-
-#Region "Parts"
-
-   Protected MustOverride Sub CreatePartVMList()
-
-   Public MustOverride Sub RefreshPartList()
-
-   Public Overridable Sub RefreshMachGroup()
-
-   End Sub
-
-#End Region    ' Parts
-
-#End Region    ' METHODS
-
 #Region "COMMANDS"
 
 #Region "DeleteMachGroup"
@@ -628,17 +395,13 @@ Public MustInherit Class MyMachGroupVM
    Public ReadOnly Property DeleteMachGroup_Command As ICommand
       Get
          If m_cmdDeleteMachGroup Is Nothing Then
-            m_cmdDeleteMachGroup = New Command(AddressOf DeleteMachGroupCmd)
+            m_cmdDeleteMachGroup = New Command(AddressOf DeleteMachGroup)
          End If
          Return m_cmdDeleteMachGroup
       End Get
    End Property
 
-   Public Sub DeleteMachGroupCmd()
-      DeleteMachGroup()
-   End Sub
-
-   Public Overridable Sub DeleteMachGroup(Optional bMultipleCommand As Boolean = False)
+   Public Overridable Sub DeleteMachGroup()
       ' elimino tutte le copie
       Dim nRawPartId As Integer = EgtGetFirstRawPart()
       Dim nBeamId As Integer = EgtGetFirstPartInRawPart(nRawPartId)
@@ -654,66 +417,6 @@ Public MustInherit Class MyMachGroupVM
 
 #End Region ' DeleteMachGroup
 
-#Region "ProduceMachGroup"
-
-   ' Returns a command that manage the MainWindow_Unloaded command
-   Public ReadOnly Property ProduceMachGroup_Command As ICommand
-      Get
-         If m_cmdProduceMachGroup Is Nothing Then
-            m_cmdProduceMachGroup = New Command(AddressOf ProduceMachGroup)
-         End If
-         Return m_cmdProduceMachGroup
-      End Get
-   End Property
-
-   ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
-   Public Overridable Sub ProduceMachGroup()
-   End Sub
-
-#End Region ' ProduceMachGroup
-
 #End Region    ' COMMANDS
 
-#Region "EVENTS"
-
-   Protected MustOverride Sub OnPartAdded(sender As Object, e As PartAddedEventArgs)
-
-   Private Sub OnPartRemoved(sender As Object, e As PartAddedEventArgs)
-      Dim PartVM As PartVM = PartVMList.FirstOrDefault(Function(x) x.PartM Is e.m_NewPart)
-      If Not IsNothing(PartVM) Then PartVMList.Remove(PartVM)
-   End Sub
-
-   Protected Sub OnPartVMListChanged(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 PartVM As PartVM In e.NewItems
-               AddHandler PartVM.PropertyChanged, AddressOf OnPartVMPropertyChanged
-            Next
-         End If
-      End If
-      If e.Action = NotifyCollectionChangedAction.Remove Then
-         If Not IsNothing(e.OldItems) AndAlso e.OldItems.Count > 0 Then
-            For Each PartVM As PartVM In e.OldItems
-               RemoveHandler PartVM.PropertyChanged, AddressOf OnPartVMPropertyChanged
-               MyMachGroupM.PartMList.Remove(PartVM.PartM)
-            Next
-         End If
-      End If
-      If e.Action = NotifyCollectionChangedAction.Move Then
-         Dim ItemVM As PartVM = e.OldItems(0)
-         MyMachGroupM.PartMList.RemoveAt(e.OldStartingIndex)
-         MyMachGroupM.PartMList.Insert(e.NewStartingIndex, ItemVM.PartM)
-      End If
-   End Sub
-
-   Protected Overridable Sub OnPartVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
-      Select Case e.PropertyName
-         Case NameOf(sender.sPOSX), NameOf(sender.sPOSY), NameOf(sender.bFLIP), NameOf(sender.sROT)
-            ' setto pezzo da ricalcolare
-            ResetCalcMachGroup()
-      End Select
-   End Sub
-
-#End Region    ' EVENTS
-
 End Class

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
 
@@ -12,8 +14,6 @@ Public MustInherit Class PartVM
 
 #Region "FIELDS & PROPERTIES"
 
-#Region "General"
-
    Protected m_PartM As PartM
    Public ReadOnly Property PartM As PartM
       Get
@@ -105,7 +105,7 @@ Public MustInherit Class PartVM
          Return LenToString(m_PartM.dPOSX, 3)
       End Get
       Set(value As String)
-         StringToLenAdv(value, m_PartM.dPOSX, True)
+         StringToLen(value, m_PartM.dPOSX)
       End Set
    End Property
    Public Property dPOSX As Double
@@ -133,24 +133,12 @@ Public MustInherit Class PartVM
       End Get
    End Property
 
-   Public ReadOnly Property nINVERTED As Integer
-      Get
-         Return m_PartM.nINVERTED
-      End Get
-   End Property
-
    Public ReadOnly Property sROTATED As String
       Get
          Return m_PartM.nROTATED & "°"
       End Get
    End Property
 
-   Public ReadOnly Property nROTATED As Integer
-      Get
-         Return m_PartM.nROTATED
-      End Get
-   End Property
-
    Public Property sMATERIAL As String
       Get
          Return m_PartM.sMATERIAL
@@ -160,117 +148,6 @@ Public MustInherit Class PartVM
       End Set
    End Property
 
-   Public ReadOnly Property sSTOREY As String
-      Get
-         Return m_PartM.sSTOREY
-      End Get
-   End Property
-
-   Public ReadOnly Property sGROUP As String
-      Get
-         Return m_PartM.sGROUP
-      End Get
-   End Property
-
-   Public ReadOnly Property dVolume As Double
-      Get
-         Return m_PartM.dVolume
-      End Get
-   End Property
-
-   ' lista delle feature del pezzo
-   Protected m_FeatureVMList As ObservableCollection(Of BTLFeatureVM)
-   Public Property FeatureVMList As ObservableCollection(Of BTLFeatureVM)
-      Get
-         Return m_FeatureVMList
-      End Get
-      Set(value As ObservableCollection(Of BTLFeatureVM))
-         m_FeatureVMList = value
-      End Set
-   End Property
-
-   Protected m_SelFeatureVM As BTLFeatureVM
-   Public Property SelFeatureVM As BTLFeatureVM
-      Get
-         Return m_SelFeatureVM
-      End Get
-      Set(value As BTLFeatureVM)
-         m_SelFeatureVM = value
-         If Not IsNothing(m_SelFeatureVM) Then
-            DirectCast(m_SelFeatureVM, BTLFeatureVM).SelGeomFeature()
-         Else
-            EgtDeselectAll()
-         End If
-         EgtDraw()
-         NotifyPropertyChanged(NameOf(SelFeatureVM))
-      End Set
-   End Property
-
-#End Region    ' General
-
-#Region "Beam"
-
-   Public Overridable Property sOffset As String
-      Get
-         Return LenToString(m_PartM.dOffset, 3)
-      End Get
-      Set(value As String)
-         StringToLenAdv(value, m_PartM.dOffset, True)
-      End Set
-   End Property
-   Public ReadOnly Property dOffset As Double
-      Get
-         Return m_PartM.dOffset
-      End Get
-   End Property
-
-#End Region    ' Beam
-
-#Region "Wall"
-
-   Public Overridable Property sPOSY As String
-      Get
-         Return LenToString(m_PartM.dPOSY, 3)
-      End Get
-      Set(value As String)
-         StringToLenAdv(value, m_PartM.dPOSY, True)
-      End Set
-   End Property
-
-   Public ReadOnly Property dPOSY As Double
-      Get
-         Return m_PartM.dPOSY
-      End Get
-   End Property
-
-   Public Property sROT As String
-      Get
-         Return LenToString(m_PartM.dROT, 3) & "°"
-      End Get
-      Set(value As String)
-         StringToLenAdv(value, m_PartM.dROT, True)
-      End Set
-   End Property
-
-   Public ReadOnly Property dROT As Double
-      Get
-         Return m_PartM.dROT
-      End Get
-   End Property
-
-   Public Overridable Property nFLIP As Integer
-      Get
-         Return m_PartM.nFLIP
-      End Get
-      Set(value As Integer)
-         m_PartM.nFLIP = value
-      End Set
-   End Property
-
-#End Region    ' Wall
-
-#Region "Calc"
-
    Public ReadOnly Property nGlobalState As CalcStates
       Get
          Return m_PartM.nCALC_GlobalState
@@ -297,18 +174,40 @@ Public MustInherit Class PartVM
 
    Public ReadOnly Property Calc_Background As SolidColorBrush
       Get
-         Select Case m_PartM.nCALC_GlobalState
-            Case CalcStates.ERROR_, CalcStates.COLLISION
-               Return Brushes.Red
-            Case CalcStates.WARNING
-               Return Brushes.Orange
-            Case CalcStates.INFO, CalcStates.OK
-               Return Brushes.Green
-            Case CalcStates.NOTCALCULATED
-               Return Brushes.LightGray
-            Case Else
-               Return Brushes.Red
-         End Select
+         If m_PartM.nCALC_GlobalState = CalcStates.OK Then
+            Return Brushes.Green
+         ElseIf m_PartM.nCALC_GlobalState = CalcStates.NOTCALCULATED Then
+            Return Brushes.LightGray
+         ElseIf m_PartM.nCALC_GlobalState = CalcStates.INFO Then
+            Return Brushes.Green
+         ElseIf m_PartM.nCALC_GlobalState = CalcStates.WARNING Then
+            Return Brushes.Orange
+         ElseIf m_PartM.nCALC_GlobalState = CalcStates.ERROR_ Then
+            Return Brushes.Red
+         Else
+            Return Brushes.Red
+         End If
+      End Get
+   End Property
+
+   Public Property nProduction_State As CalcStates
+      Get
+         Return m_PartM.nProductionState
+      End Get
+      Set(value As CalcStates)
+         m_PartM.SetProductionState(value)
+      End Set
+   End Property
+
+   Public ReadOnly Property Production_Background As SolidColorBrush
+      Get
+         If dtEndTime <> DateTime.MinValue Then          ' barra finita
+            Return Brushes.LightGray
+         ElseIf dtStartTime <> DateTime.MinValue Then    ' barra iniziata
+            Return Brushes.Green
+         Else                                            ' barra in coda
+            Return Brushes.White
+         End If
       End Get
    End Property
 
@@ -326,14 +225,14 @@ Public MustInherit Class PartVM
 
    Public ReadOnly Property CALC_ERR_Letter As String
       Get
-         Select Case m_PartM.nCALC_GlobalState
-            Case CalcStates.COLLISION
+         Select Case m_PartM.nCALC_GlobalERR
+            Case 22
                Return "c"
-            Case CalcStates.ERROR_
+            Case 19, 23, 24, 25
                Return "e"
-            Case CalcStates.WARNING
+            Case 17
                Return "w"
-            Case CalcStates.INFO
+            Case < 0
                Return "i"
             Case Else
                Return ""
@@ -344,7 +243,7 @@ Public MustInherit Class PartVM
    Public ReadOnly Property CALC_ERR_Foreground As SolidColorBrush
       Get
          Select Case m_PartM.nCALC_GlobalState
-            Case CalcStates.ERROR_, CalcStates.COLLISION
+            Case CalcStates.ERROR_
                Return Brushes.Red
             Case CalcStates.WARNING
                Return Brushes.Orange
@@ -395,34 +294,32 @@ Public MustInherit Class PartVM
       End Set
    End Property
 
-#End Region    ' Calc
-
-#Region "Supervisor"
-
-   Public Property nProduction_State As ItemState
+   ' lista delle feature del pezzo
+   Protected m_FeatureVMList As ObservableCollection(Of BTLFeatureVM)
+   Public Property FeatureVMList As ObservableCollection(Of BTLFeatureVM)
       Get
-         Return m_PartM.nProductionState
+         Return m_FeatureVMList
       End Get
-      Set(value As ItemState)
-         m_PartM.SetProductionState(value)
+      Set(value As ObservableCollection(Of BTLFeatureVM))
+         m_FeatureVMList = value
       End Set
    End Property
 
-   Public ReadOnly Property Production_Background As SolidColorBrush
+   Protected m_SelFeatureVM As BTLFeatureVM
+   Public Property SelFeatureVM As BTLFeatureVM
       Get
-         Select Case nProduction_State
-            Case ItemState.ND
-               Return Brushes.White
-            Case ItemState.Assigned, ItemState.Confirmed
-               Return Brushes.White
-            Case ItemState.WIP
-               Return Brushes.Green
-            Case ItemState.Produced
-               Return Brushes.Yellow
-            Case Else         ' ItemState.Scrapped
-               Return Brushes.Aqua
-         End Select
+         Return m_SelFeatureVM
       End Get
+      Set(value As BTLFeatureVM)
+         m_SelFeatureVM = value
+         If Not IsNothing(m_SelFeatureVM) Then
+            DirectCast(m_SelFeatureVM, BTLFeatureVM).SelGeomFeature()
+         Else
+            EgtDeselectAll()
+         End If
+         EgtDraw()
+         NotifyPropertyChanged(NameOf(SelFeatureVM))
+      End Set
    End Property
 
    Public Property dtStartTime As DateTime
@@ -445,41 +342,6 @@ Public MustInherit Class PartVM
       End Set
    End Property
 
-   ' variabile che indica se rifare il pezzo
-   Private m_bRedo As Boolean = True
-   Public Property bRedo As Boolean
-      Get
-         Return m_bRedo
-      End Get
-      Set(value As Boolean)
-         For Each Feature In FeatureVMList
-            Feature.bRedo = value
-         Next
-         m_bRedo = value
-      End Set
-   End Property
-
-   Public ReadOnly Property Background As SolidColorBrush
-      Get
-         Select Case nProduction_State
-            Case ItemState.ND
-               Return Brushes.White
-            Case ItemState.Assigned
-               Return Brushes.LightGray
-            Case ItemState.Confirmed
-               Return Brushes.LightGray
-            Case ItemState.WIP
-               Return Brushes.Green
-            Case ItemState.Produced
-               Return Brushes.Yellow
-            Case Else         ' ItemState.Scrapped
-               Return Brushes.Aqua
-         End Select
-      End Get
-   End Property
-
-#End Region    ' Supervisor
-
    ' definizione comandi
    Private m_cmdDeletePart As ICommand
 
@@ -505,20 +367,18 @@ Public MustInherit Class PartVM
 
 #End Region    ' CONSTRUCTOR
 
-#Region "METHODS"
+   Private Sub CreateBTLFeatureVMList()
+      Dim all As List(Of BTLFeatureVM) = (From BTLFeatureM In m_PartM.GetBTLFeatures()
+                                          Select New BTLFeatureVM(BTLFeatureM)).ToList()
 
-   Public Overridable Sub RefreshPart()
+      For Each BTLFeatureVM As BTLFeatureVM In all
+         AddHandler BTLFeatureVM.PropertyChanged, AddressOf OnBTLFeatureVMPropertyChanged
+      Next
 
+      m_FeatureVMList = New ObservableCollection(Of BTLFeatureVM)(all)
+      AddHandler m_FeatureVMList.CollectionChanged, AddressOf OnBTLFeatureVMListChanged
    End Sub
 
-#Region "Feature"
-
-   Protected MustOverride Sub CreateBTLFeatureVMList()
-
-#End Region    ' Feature
-
-#Region "Calc"
-
    ' funzione che aggiorna lo stato e gli errori dopo calcolo
    Public Sub CalcPartUpdate(ERR As Integer, ROT As Integer, MSG As String)
       EgtSetInfo(nPartId, ITG_PROD_ERR, ERR, True)
@@ -527,18 +387,15 @@ Public MustInherit Class PartVM
       m_PartM.nCALC_ERR = ERR
       m_PartM.nCALC_ROT = ROT
       m_PartM.sCALC_MSG = MSG
-      Select Case ERR
-         Case 0
-            nCALC_State = CalcStates.OK
-         Case 22
-            nCALC_State = CalcStates.COLLISION
-         Case 17, 19
-            nCALC_State = CalcStates.WARNING
-         Case < 0
-            nCALC_State = CalcStates.INFO
-         Case > 0
-            nCALC_State = CalcStates.ERROR_
-      End Select
+      If ERR = 0 Then
+         nCALC_State = CalcStates.OK
+      ElseIf ERR = 17 Then
+         nCALC_State = CalcStates.WARNING
+      ElseIf ERR > 0 Then
+         nCALC_State = CalcStates.ERROR_
+      ElseIf ERR < 0 Then
+         nCALC_State = CalcStates.INFO
+      End If
       NotifyPropertyChanged(NameOf(Calc_Background))
    End Sub
 
@@ -564,9 +421,8 @@ Public MustInherit Class PartVM
 
    Public Sub CalcFallUpdate(FALL As Integer)
       EgtSetInfo(nPartId, ITG_PROD_FALL, FALL, True)
-      m_PartM.nCALC_FALL = FALL
+      m_PartM.nCALC_FALL = 0
       NotifyPropertyChanged(NameOf(nCALC_FALL))
-      NotifyPropertyChanged(NameOf(CALC_FALL_Visibility))
    End Sub
 
    ' funzione che aggiorna lo stato e gli errori dopo calcolo
@@ -574,18 +430,22 @@ Public MustInherit Class PartVM
       m_PartM.nCALC_GlobalState = nCALC_State
       For Each Feature In FeatureVMList
          If Not Feature.bDO Then
-            If Feature.nState = CalcStates.COLLISION AndAlso Feature.nState > m_PartM.nCALC_GlobalState Then
-               m_PartM.nCALC_GlobalState = Feature.nState
-               m_PartM.nCALC_GlobalERR = Feature.nCALC_ERR
-            End If
-            Continue For
+         ElseIf Feature.nState = CalcStates.NOTCALCULATED Then
+            m_PartM.nCALC_GlobalState = CalcStates.NOTCALCULATED
+            Exit For
+         ElseIf Feature.nState = CalcStates.INFO And m_PartM.nCALC_GlobalState = CalcStates.OK Then
+            m_PartM.nCALC_GlobalState = CalcStates.INFO
+         ElseIf Feature.nState = CalcStates.WARNING And (m_PartM.nCALC_GlobalState = CalcStates.OK Or m_PartM.nCALC_GlobalState = CalcStates.INFO) Then
+            m_PartM.nCALC_GlobalState = CalcStates.WARNING
+         ElseIf Feature.nState = CalcStates.ERROR_ And (m_PartM.nCALC_GlobalState = CalcStates.OK Or m_PartM.nCALC_GlobalState = CalcStates.INFO Or m_PartM.nCALC_GlobalState = CalcStates.WARNING) Then
+            m_PartM.nCALC_GlobalState = CalcStates.ERROR_
          End If
-         If Feature.nState > m_PartM.nCALC_GlobalState Then
-            m_PartM.nCALC_GlobalState = Feature.nState
+         If Feature.nCALC_ERR = 22 Then
+            m_PartM.nCALC_GlobalERR = 22
+         ElseIf Feature.nCALC_ERR > 0 And m_PartM.nCALC_GlobalERR <= 0 Then
+            m_PartM.nCALC_GlobalERR = Feature.nCALC_ERR
+         ElseIf Feature.nCALC_ERR < 0 And m_PartM.nCALC_GlobalERR = 0 Then
             m_PartM.nCALC_GlobalERR = Feature.nCALC_ERR
-         End If
-         If Feature.nCALC_ROT <> 0 Then
-            m_PartM.nCALC_ROT = Feature.nCALC_ROT
          End If
       Next
       NotifyPropertyChanged(NameOf(Calc_Background))
@@ -594,10 +454,6 @@ Public MustInherit Class PartVM
       NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
    End Sub
 
-#End Region    ' Calc
-
-#End Region    ' METHODS
-
 #Region "COMMANDS"
 
 #Region "DeletePart"
@@ -622,12 +478,12 @@ Public MustInherit Class PartVM
 
 #Region "EVENTS"
 
-   Public Sub OnBTLFeatureAdded(sender As Object, e As BTLFeatureAddedEventArgs)
+   Private Sub OnBTLFeatureAdded(sender As Object, e As BTLFeatureAddedEventArgs)
       Dim BTLFeatureVM As BTLFeatureVM = New BTLFeatureVM(e.NewBTLFeature)
       FeatureVMList.Add(BTLFeatureVM)
    End Sub
 
-   Protected Sub OnBTLFeatureVMListChanged(sender As Object, e As NotifyCollectionChangedEventArgs)
+   Private Sub OnBTLFeatureVMListChanged(sender As Object, e As NotifyCollectionChangedEventArgs)
       If Not IsNothing(e.NewItems) AndAlso e.NewItems.Count > 0 Then
          For Each BTLFeatureVM As BTLFeatureVM In e.NewItems
             AddHandler BTLFeatureVM.PropertyChanged, AddressOf OnBTLFeatureVMPropertyChanged
@@ -636,14 +492,16 @@ Public MustInherit Class PartVM
       If Not IsNothing(e.OldItems) AndAlso e.OldItems.Count > 0 Then
          For Each BTLFeatureVM As BTLFeatureVM In e.OldItems
             RemoveHandler BTLFeatureVM.PropertyChanged, AddressOf OnBTLFeatureVMPropertyChanged
-            'm_PartM.FeatureMList.Remove(BTLFeatureVM.BTLFeatureM)
          Next
       End If
    End Sub
 
-   Protected Overridable Sub OnBTLFeatureVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
+   Private 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
+#End Region
 
 End Class

EgtBEAMWALL.Core/MachGroupPanel/WallMachGroupVM.vb

@@ -6,7 +6,7 @@ Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
 
-Public MustInherit Class WallMachGroupVM
+Public Class WallMachGroupVM
    Inherits MyMachGroupVM
 
    Public ReadOnly Property m_WallMachGroupM As WallMachGroupM
@@ -31,7 +31,17 @@ Public MustInherit Class WallMachGroupVM
 
 #Region "METHODS"
 
-   Protected MustOverride Sub CreateWallVMList()
+   Private Sub CreateWallVMList()
+      Dim all As List(Of WallVM) = (From WallM In m_WallMachGroupM.GetParts()
+                                    Select New WallVM(WallM, Me)).ToList()
+
+      For Each WallVM As WallVM In all
+         AddHandler WallVM.PropertyChanged, AddressOf OnWallVMPropertyChanged
+      Next
+
+      m_PartVMList = New ObservableCollection(Of PartVM)(all)
+      AddHandler m_PartVMList.CollectionChanged, AddressOf OnWallVMListChanged
+   End Sub
 
 #End Region    ' METHODS
 
@@ -47,14 +57,16 @@ Public MustInherit Class WallMachGroupVM
 
 #Region "EVENTS"
 
-   Protected MustOverride Sub OnWallAdded(sender As Object, e As PartAddedEventArgs)
-
+   Private Sub OnWallAdded(sender As Object, e As PartAddedEventArgs)
+      Dim WallVM As WallVM = New WallVM(e.NewPart, Me)
+      PartVMList.Add(WallVM)
+   End Sub
    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)
+   Private 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
@@ -67,7 +79,7 @@ Public MustInherit Class WallMachGroupVM
       End If
    End Sub
 
-   Protected Sub OnWallVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
+   Private Sub OnWallVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
       'Select Case e.PropertyName
       '   Case NameOf(sender.nSelGRP), NameOf(sender.nSelSIDE)
       'End Select

EgtBEAMWALL.Core/MachGroupPanel/WallVM.vb

@@ -5,7 +5,7 @@ Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
 
-Public MustInherit Class WallVM
+Public Class WallVM
    Inherits PartVM
 
    Public ReadOnly Property m_WallM As WallM
@@ -32,12 +32,6 @@ Public MustInherit Class WallVM
       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) & "°"
@@ -47,12 +41,6 @@ Public MustInherit Class WallVM
       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

EgtBEAMWALL.Core/MachLog.vb

@@ -0,0 +1,194 @@
+Public Class MachLog
+
+#Region "Private Fields"
+
+   Private m_AlarmCode As String
+   Private m_AlarmDateTime As DateTime
+   Private m_AlarmMessage As String
+   Private m_AlarmOperation As Integer
+   Private m_AlarmType As Integer
+   Private m_CommandExecutedCorrectly As Boolean
+   Private m_CommandState As CommandStates
+   Private m_CommandType As LogCommandTypes
+   Private m_Description As String
+
+   Private m_newOpState As Integer
+
+   Private m_ResultType As ResultTypes
+
+   Private m_VarAddress As String
+
+   Private m_VarValue As String
+
+#End Region
+
+#Region "Protected Constructors"
+
+   Protected Sub New()
+      m_AlarmCode = ""
+      m_AlarmDateTime = DateTime.MinValue
+      m_AlarmMessage = ""
+      m_AlarmOperation = 0
+      m_AlarmType = 0
+      m_CommandExecutedCorrectly = False
+      m_CommandState = CommandStates.NULL
+      m_CommandType = LogCommandTypes.NULL
+      m_Description = ""
+      m_newOpState = 0
+      m_ResultType = ResultTypes.NULL
+      m_VarAddress = ""
+      m_VarValue = ""
+   End Sub
+
+#End Region
+
+#Region "Public Properties"
+
+   Public ReadOnly Property AlarmCode As String
+      Get
+         Return m_AlarmCode
+      End Get
+   End Property
+
+   Public ReadOnly Property AlarmDateTime As Date
+      Get
+         Return m_AlarmDateTime
+      End Get
+   End Property
+
+   Public ReadOnly Property AlarmMessage As String
+      Get
+         Return m_AlarmMessage
+      End Get
+   End Property
+
+   Public ReadOnly Property AlarmOperation As Integer
+      Get
+         Return m_AlarmOperation
+      End Get
+   End Property
+
+   Public ReadOnly Property AlarmType As Integer
+      Get
+         Return m_AlarmType
+      End Get
+   End Property
+
+   Public ReadOnly Property CommandExecutedCorrectly As Boolean
+      Get
+         Return m_CommandExecutedCorrectly
+      End Get
+   End Property
+
+   Public ReadOnly Property CommandState As CommandStates
+      Get
+         Return m_CommandState
+      End Get
+   End Property
+
+   Public ReadOnly Property CommandType As LogCommandTypes
+      Get
+         Return m_CommandType
+      End Get
+   End Property
+
+   Public ReadOnly Property Description As String
+      Get
+         Return m_Description
+      End Get
+   End Property
+
+   Public ReadOnly Property newOpState As Integer
+      Get
+         Return m_newOpState
+      End Get
+   End Property
+
+   Public ReadOnly Property ResultType As ResultTypes
+      Get
+         Return m_ResultType
+      End Get
+   End Property
+
+   Public ReadOnly Property VarAddress As String
+      Get
+         Return m_VarAddress
+      End Get
+   End Property
+
+   Public ReadOnly Property VarValue As String
+      Get
+         Return m_VarValue
+      End Get
+   End Property
+
+#End Region
+
+#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
+      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
+      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
+      NewMachLog.m_CommandType = CommandTypes.READ
+      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
+      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
+
+#End Region
+
+#Region "Public Methods"
+
+   Public Shared Function CreateMacLog(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
+      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
+
+#End Region
+
+End Class

EgtBEAMWALL.Core/MachinePanel/MachinePanelV.xaml

@@ -1,49 +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 Margin="0,0,5,0">
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="1*"/>
-      </Grid.ColumnDefinitions>
-      <TextBlock Grid.Row="0" Grid.Column="0" Text="Macchina corrente" VerticalAlignment="Center"  Margin="0,0,5,0"/>
-      <!--Combobox per selezionare la macchina corrente-->
-      <ComboBox ItemsSource="{Binding Path=MachineList}" DisplayMemberPath="Name"
-                SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
-                Height="22" Width="150"
-                Grid.Row="0" Grid.Column="1"/>
-   </Grid>
-   <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center">
-      <Button Command="{Binding ToolDbCommand}" ToolTip="{Binding ToolDBToolTip}"
-              Style="{StaticResource ToolBar_TextButton}" Content="{Binding ToolDBMsg}"/>
-      <Button Command="{Binding MachDbCommand}" ToolTip="{Binding MachiningDbToolTip}"
-              Style="{StaticResource ToolBar_TextButton}" Margin="5,0,0,0" Content="{Binding MachiningDbMsg}"/>
-      <Button Command="{Binding SetUpCommand}" ToolTip="{Binding SetUpToolTip}"
-              Style="{StaticResource ToolBar_TextButton}" Margin="5,0,0,0" Content="{Binding SetUpMsg}"
-              Visibility="{Binding SetUp_Visibility}"/>
-      <Button ToolTip="{Binding BeamTable_ToolTip}"
-              Style="{StaticResource ToolBar_Button}" Margin="5,0,0,0"
-              Command="{Binding BeamTable_Command}"
-              Visibility="{Binding BeamTable_Visibility}">
-         <Image Source="/Resources/Configuration/MachiningsTable.png" Stretch="Uniform"/>
-      </Button>
-      <Button ToolTip="{Binding WallTable_ToolTip}"
-              Style="{StaticResource ToolBar_Button}" Margin="5,0,0,0"
-              Command="{Binding WallTable_Command}"
-              Visibility="{Binding WallTable_Visibility}">
-         <Image Source="/Resources/Configuration/MachiningsTable.png" Stretch="Uniform"/>
-      </Button>
-      <Button Content="{Binding ParameterMachineMsg}"
-              ToolTip="{Binding ParameterMachineMsg}"
-              Command="{Binding ParameterMachine_Command}"
-              Height="30" Width="120" Margin="5,0,0,0" />
-   </StackPanel>
-
-</Grid>

EgtBEAMWALL.Core/MachinePanel/MachinePanelV.xaml.vb

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

EgtBEAMWALL.Core/MachinePanel/MachinePanelVM.vb

@@ -1,357 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
-Imports EgtBEAMWALL.Core
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class MachinePanelVM
-   Inherits EgtWPFLib5.MachinePanelVM
-
-#Region "FIELDS & PROPERTIES"
-
-   ' Radice del direttorio delle macchine
-   Private m_sMachinesRoot As String
-
-   ' Macchina correntemente selezionata e quindi attiva
-   Private m_SelectedMachine As Machine = Nothing
-   Public Overrides Property SelectedMachine As Machine
-      Get
-         Return m_SelectedMachine
-      End Get
-      Set(value As Machine)
-         If value IsNot m_SelectedMachine Then
-            ' imposto macchina in DbGeometrico
-            If Not IsNothing(value) AndAlso EgtSetCurrMachine(value.Name) Then
-               m_SelectedMachine = value
-            End If
-            ' Salvo impostazione macchina corrente
-            SaveCurrentMachine()
-            NotifyPropertyChanged(NameOf(SelectedMachine))
-            ' inizializzo la macchina selezionata come macchina corrente
-            Dim nMachType As MachineType = DirectCast(m_SelectedMachine, MyMachine).nType
-            SectionXMaterial.SetType(nMachType)
-            If Not IsNothing(value) Then
-               InitCurrentMachine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, value.Name, nMachType)
-            Else
-               InitCurrentMachine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, m_SelectedMachine.Name, nMachType)
-            End If
-            ' mostro bottone tabella beam o wall a seconda del tipo
-            m_BeamTable_Visibility = If(nMachType = MachineType.BEAM OrElse nMachType = MachineType.BOTH, Visibility.Visible, Visibility.Collapsed)
-            m_WallTable_Visibility = If(nMachType = MachineType.WALL OrElse nMachType = MachineType.BOTH, Visibility.Visible, Visibility.Collapsed)
-            NotifyPropertyChanged(NameOf(BeamTable_Visibility))
-            NotifyPropertyChanged(NameOf(WallTable_Visibility))
-            ' carico i Parametri Q da mostrare (Beam, Wall o entrambi) in base al tipo di macchina selezionata
-            If Not IsNothing(Map.refConfigurationPageVM) Then
-               ' carico i parametri Q dei Process letti dall'ini
-               Map.refConfigurationPageVM.GetQParamsList()
-               ' carico la lista di tutti i parametri Q ciclando su ogni Process di PRCList
-               If Not IsNothing(Map.refConfigurationPageVM.QBTLParamVMList) Then
-                  Map.refConfigurationPageVM.QBTLParamVMList.Clear()
-               End If
-               For Each PRCItem In Map.refConfigurationPageVM.PRCList
-                  For Each QBTLParam In PRCItem.QBTLParamVMList
-                     Map.refConfigurationPageVM.QBTLParamVMList.Add(QBTLParam)
-                  Next
-               Next
-               NotifyPropertyChanged(NameOf(Map.refConfigurationPageVM.QBTLParamVMList))
-            End If
-            ' aggiorno nome macchina in statusbar
-            Map.refMyStatusBarVM.RefreshMachName()
-         End If
-      End Set
-   End Property
-
-   Private m_MachPanel_IsEnabled As Boolean = True
-   Public Property MachPanel_IsEnabled As Boolean
-      Get
-         Return m_MachPanel_IsEnabled
-      End Get
-      Set(value As Boolean)
-         m_MachPanel_IsEnabled = value
-         NotifyPropertyChanged("MachPanel_IsEnabled")
-      End Set
-   End Property
-
-   Private m_BeamTable_Visibility As Visibility
-   Public ReadOnly Property BeamTable_Visibility As Visibility
-      Get
-         Return m_BeamTable_Visibility
-      End Get
-   End Property
-
-   Private m_WallTable_Visibility As Visibility
-   Public ReadOnly Property WallTable_Visibility As Visibility
-      Get
-         Return m_WallTable_Visibility
-      End Get
-   End Property
-
-   Public ReadOnly Property SetUp_Visibility As Visibility
-      Get
-         Return If(Map.refMainWindowVM.MainWindowM.bModifySetup, Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
-
-
-#Region "Messages"
-
-   Public ReadOnly Property ToolDBMsg As String
-      Get
-         Return EgtMsg(MSG_MACHINEPAGEUC + 6)
-      End Get
-   End Property
-   Public ReadOnly Property MachiningDbMsg As String
-      Get
-         Return EgtMsg(MSG_MACHINEPAGEUC + 7)
-      End Get
-   End Property
-   Public ReadOnly Property SetUpMsg As String
-      Get
-         Return EgtMsg(MSG_ALARMSPAGEUC + 33)
-      End Get
-   End Property
-
-#End Region    ' Messages
-
-#Region "ToolTip"
-
-   Public ReadOnly Property ToolDBToolTip As String
-      Get
-         Return EgtMsg(5003)
-      End Get
-   End Property
-   Public ReadOnly Property MachiningDbToolTip As String
-      Get
-         Return EgtMsg(5004)
-      End Get
-   End Property
-   Public ReadOnly Property SetUpToolTip As String
-      Get
-         Return EgtMsg(31501)
-      End Get
-   End Property
-
-#End Region   ' ToolTip
-
-   ' Definizione comandi
-   Private m_cmdBeamTable As ICommand
-   Private m_cmdWallTable As ICommand
-
-#End Region    'FIELDS & PROPERTIES
-
-#Region "CONSTRUCTOR"
-
-   Sub New()
-      ' Creo riferimento a questa classe in Map
-      Map.SetRefMachinePanelVM(Me)
-      ' recupero cartella radice delle macchine
-      m_sMachinesRoot = Map.refMainWindowVM.MainWindowM.sMachinesRoot
-      ' Carica macchine da cartella delle macchine
-      MyMachine.MachineListInit(m_sMachinesRoot, MachineList)
-   End Sub
-
-#End Region    ' CONSTRUCTOR
-
-#Region "METHODS"
-
-   Friend Sub LoadCurrentMachine()
-      If MachineList.Count = 0 Then Return
-      Dim CurrMachine As Machine = Nothing
-      Dim CurrMachineName As String = String.Empty
-      GetMainPrivateProfileString(S_MACH, K_CURRMACH, String.Empty, CurrMachineName)
-      Dim bFound As Boolean = False
-      If Not String.IsNullOrEmpty(CurrMachineName) Then
-         For Each Mach In MachineList
-            If Mach.Name = CurrMachineName Then
-               bFound = True
-               CurrMachine = Mach
-               Exit For
-            End If
-         Next
-      End If
-      If Not bFound And MachineList.Count > 0 Then
-         CurrMachine = MachineList(0)
-      End If
-      If Not IsNothing(CurrMachine) Then
-         If EgtSetCurrMachine(CurrMachine.Name) Then
-            SelectedMachine = CurrMachine
-         End If
-      End If
-   End Sub
-
-   Friend Sub SaveCurrentMachine()
-      If IsNothing(m_SelectedMachine) Then Return
-      WriteMainPrivateProfileString(S_MACH, K_CURRMACH, SelectedMachine.Name)
-   End Sub
-
-   Friend Sub UpdateCurrentMachine()
-      'EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
-      Dim sMachName As String = String.Empty
-      If EgtGetCurrMachineName(sMachName) Then
-         For Each Mach In MachineList
-            If Mach.Name = sMachName Then
-               SelectedMachine = Mach
-               Exit For
-            End If
-         Next
-      End If
-   End Sub
-
-   Friend Function BeamMachDb() As Boolean
-      ' Assegno le path
-      Dim sBaseDir As String = m_sMachinesRoot & "\" & m_SelectedMachine.Name & "\" & "Beam"
-      ' verifico se ci sono i file ini
-      Dim sMachTypePath As String = sBaseDir & "\MachiningTypes.ini"
-      Dim sTabTemplPath As String = sBaseDir & "\BeamTableTemplate.ini"
-      If File.Exists(sMachTypePath) AndAlso File.Exists(sTabTemplPath) Then
-         ' apro finestra di gestione lavorazioni travi
-         Dim sTitle = EgtMsg(9000)               'Tabelle delle lavorazioni delle travi
-         Dim BeamMchsWinVM As New MyBeamMachiningsWindowVM(sTitle, sBaseDir, sMachTypePath, sTabTemplPath)
-         Dim BeamMchsWinV As New BeamMachiningsWindowV(Application.Current.MainWindow, BeamMchsWinVM)
-         BeamMchsWinV.ShowDialog()
-      Else
-         ' Impossibile aprire l'Editor delle lavorazioni delle travi.<br/>Mancano i file di configurazione. - Errore
-         MessageBox.Show(EgtMsg(9009), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
-      End If
-      Return True
-   End Function
-
-   Friend Function WallMachDb() As Boolean
-      ' Assegno le path
-      Dim sBaseDir As String = m_sMachinesRoot & "\" & m_SelectedMachine.Name & "\" & "Wall"
-      ' verifico se ci sono i file ini
-      Dim sMachTypePath As String = sBaseDir & "\MachiningTypes.ini"
-      Dim sTabTemplPath As String = sBaseDir & "\WallTableTemplate.ini"
-      If File.Exists(sMachTypePath) AndAlso File.Exists(sTabTemplPath) Then
-         ' apro finestra di gestione lavorazioni pareti
-         Dim sTitle = EgtMsg(9010)               'Tabelle delle lavorazioni delle pareti
-         Dim WallMchsWinVM As New MyBeamMachiningsWindowVM(sTitle, sBaseDir, sMachTypePath, sTabTemplPath, False)
-         Dim WallMchsWinV As New BeamMachiningsWindowV(Application.Current.MainWindow, WallMchsWinVM)
-         WallMchsWinV.ShowDialog()
-      Else
-         ' Impossibile aprire l'Editor delle lavorazioni delle pareti.<br/>Mancano i file di configurazione. - Errore
-         MessageBox.Show(EgtMsg(9011), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
-      End If
-      Return True
-   End Function
-
-   Public Overrides Sub ToolDb(ByVal param As Object)
-      If Not VerifyMachinesDir(m_sMachinesRoot) Then Return
-      ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
-      If Not EgtTdbReload() Then
-         EgtOutLog("Impossible reloading tool Db")
-         MessageBox.Show(EgtMsg(MSG_TOOLDBERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         Return
-      End If
-
-      Dim ToolDbWindowVM As New MyToolDbWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachIniFile, Map.refSceneHostVM.MainScene.GetCtx(), "Beam")
-      Dim ToolDbWindowV As New ToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
-      If ToolDbWindowVM.MatType <> 0 Then
-         ToolDbWindowV.Height = 640
-         ToolDbWindowV.Width = 1024
-         ToolDbWindowV.ShowDialog()
-      Else
-         Exit Sub
-      End If
-
-   End Sub
-
-   Public Overrides Sub MachDb(ByVal param As Object)
-      If Not VerifyMachinesDir(m_sMachinesRoot) Then Return
-      ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
-      If Not EgtMdbReload() Then
-         EgtOutLog("Impossible reloading machining Db")
-         MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 8), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         Return
-      End If
-      Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(CurrentMachine.sMachIniFile, Map.refSceneHostVM.MainScene.GetCtx(), "Stone")
-      Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
-
-      If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
-         MachDbWindowV.Height = 768
-         MachDbWindowV.Width = 1024
-         MachDbWindowV.ShowDialog()
-      Else
-         Exit Sub
-      End If
-
-   End Sub
-
-   Public Overrides Sub SetUp(ByVal param As Object)
-      ' verifico che il file di configurazione attrezzaggio (lua) della macchina esista
-      If Not File.Exists(CurrentMachine.sMachDir & "\Scripts\" & SETUP_LUA) Then
-         EgtOutLog("SetUp error: SetUp configuration file doesn't exist ")
-         MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         Return
-      End If
-      ' carico Lua che contiene le funzioni per ottenere le posizioni valide dell'utensile selezionato,
-      ' e testa e uscita dell'utensile attrezzato
-      EgtLuaExecFile(CurrentMachine.sMachDir & "\Scripts\" & SETUP_LUA)
-      ' verifico che le teste riportate in configurazione esistano
-      Dim Index As Integer = 1
-      Dim nErr As Integer = 0
-      While nErr = 0
-         Dim sHead As String = String.Empty
-         nErr = 999
-         EgtLuaSetGlobIntVar("STU.INDEX", Index)
-         EgtLuaCallFunction("STU.GetTcPosHeadGroupFromPos")
-         ' Leggo variabili
-         EgtLuaGetGlobStringVar("STU.HEAD", sHead)
-         EgtLuaGetGlobIntVar("STU.ERR", nErr)
-         If nErr = 0 Then
-            If EgtGetHeadExitCount(sHead) = 0 Then
-               MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-               Return
-            End If
-         End If
-         Index += 1
-      End While
-      ' Reset lua
-      EgtLuaResetGlobVar("STU")
-
-      Dim SetUpWindow As New SetUpWindowV(Application.Current.MainWindow, New SetUpWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachineName))
-      SetUpWindow.Height = 614
-      SetUpWindow.Width = 1024
-      SetUpWindow.ShowDialog()
-
-   End Sub
-
-#End Region
-
-#Region "COMMANDS"
-
-#Region "BeamTable"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property BeamTable_Command As ICommand
-      Get
-         If m_cmdBeamTable Is Nothing Then
-            m_cmdBeamTable = New Command(AddressOf BeamMachDb)
-         End If
-         Return m_cmdBeamTable
-      End Get
-   End Property
-
-#End Region    ' BeamTable
-
-#Region "WallTable"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property WallTable_Command As ICommand
-      Get
-         If m_cmdWallTable Is Nothing Then
-            m_cmdWallTable = New Command(AddressOf WallMachDb)
-         End If
-         Return m_cmdWallTable
-      End Get
-   End Property
-
-#End Region    ' WallTable
-
-#End Region    ' COMMANDS
-
-End Class

EgtBEAMWALL.Core/MachinePanel/OnlyProdMachinePanelV.xaml

@@ -1,58 +0,0 @@
-<Grid x:Class="OnlyProdMachinePanelV"
-      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 Margin="0,0,5,0">
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="1*"/>
-      </Grid.ColumnDefinitions>
-      <TextBlock Text="Macchina corrente" 
-                 VerticalAlignment="Center"  
-                 Margin="0,0,5,0"
-                 Foreground="{StaticResource BeamWall_Corduroy}"/>
-      <!--Combobox per selezionare la macchina corrente-->
-      <ComboBox Grid.Column="1"
-                ItemsSource="{Binding Path=MachineList}" DisplayMemberPath="Name"
-                SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
-                Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
-   </Grid>
-   <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center">
-      <Button Content="{Binding ToolDBMsg}"
-              ToolTip="{Binding ToolDBToolTip}"
-              Command="{Binding ToolDbCommand}"
-              Style="{StaticResource GeneralConfigurationToolBar_TextButton}"/>
-      <Button Content="{Binding MachiningDbMsg}"
-              Command="{Binding MachDbCommand}" 
-              ToolTip="{Binding MachiningDbToolTip}"
-              Style="{StaticResource GeneralConfigurationToolBar_TextButton}" Width="100"/>
-      <Button Content="{Binding SetUpMsg}"
-              Command="{Binding SetUpCommand}" 
-              ToolTip="{Binding SetUpToolTip}"
-              Style="{StaticResource GeneralConfigurationToolBar_TextButton}"
-              Visibility="{Binding SetUp_Visibility}"/>
-      <Button ToolTip="{Binding BeamTable_ToolTip}"
-              Command="{Binding BeamTable_Command}"
-              Visibility="{Binding BeamTable_Visibility}"
-              Style="{StaticResource ToolBarWarehouse_Button}">
-         <Image Source="/Resources/Configuration/MachiningsTable.png" Stretch="Uniform"/>
-      </Button>
-      <Button ToolTip="{Binding WallTable_ToolTip}"
-              Command="{Binding WallTable_Command}"
-              Visibility="{Binding WallTable_Visibility}"
-              Style="{StaticResource ToolBarWarehouse_Button}">
-         <Image Source="/Resources/Configuration/MachiningsTable.png" Stretch="Uniform"/>
-      </Button>
-      <Button Content="{Binding ParameterMachineMsg}"
-              ToolTip="{Binding ParameterMachineMsg}"
-              Command="{Binding ParameterMachine_Command}"
-              Style="{StaticResource MachineToolBar_ParameterMachineButton}" Width="140"/>
-   </StackPanel>
-
-</Grid>

EgtBEAMWALL.Core/MachinePanel/OnlyProdMachinePanelV.xaml.vb

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

EgtBEAMWALL.Core/MachiningDbWindow/OnlyProdMachiningDbWindowV.xaml

@@ -1,128 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdMachiningDbWindowV"
-                            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"
-                            Title="{Binding Title}"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
-                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-                            CloseCommand="{Binding CloseMachiningsDbCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
-                            CloseCommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                            Style="{StaticResource OnlyProd_EgtCustomWindow}">
-
-   <EgtWPFLib5:EgtCustomWindow.InputBindings>
-      <KeyBinding Key="Escape" Command="{Binding ReloadMachiningCommand}"
-                  CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"/>
-   </EgtWPFLib5:EgtCustomWindow.InputBindings>
-
-   <EgtWPFLib5:EgtCustomWindow.Resources>
-      <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
-      <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
-   </EgtWPFLib5:EgtCustomWindow.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 Grid.Row="0" Columns="3">
-            <Button Content="{Binding NewMsg}" Command="{Binding NewCommand}"
-                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                    IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}" Height="30"
-                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
-            <Button Content="{Binding SaveMsg}" Command="{Binding SaveCommand}"
-                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                    IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}" Height="30"
-                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
-            <Button Content="{Binding RemoveMsg}" Command="{Binding RemoveCommand}"
-                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-                    IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}" Height="30"
-                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
-         </UniformGrid>
-
-         <TreeView Name="MachiningsTreeView" Grid.Row="1"
-                   ItemsSource="{Binding Path=MachiningsList}">
-            <TreeView.Style>
-               <Style TargetType="{x:Type TreeView}">
-                  <Setter Property="Background">
-                     <Setter.Value>
-                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.35,0">
-                           <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="0"/>
-                           <GradientStop Color="{StaticResource BeamWall_Concrete_Color}" Offset="0.45"/>
-                           <GradientStop Color="{StaticResource BeamWall_White_Color}" Offset="1"/>
-                        </LinearGradientBrush>
-                     </Setter.Value>
-                  </Setter>
-               </Style>
-            </TreeView.Style>
-
-            <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 Height="20">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="Auto"/>
-                     </Grid.ColumnDefinitions>
-
-                     <Image Grid.Column="0" Source="{Binding PictureString}" Height="20" Width="20" Margin="0,0,5,0" />
-                     <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
-                     <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding FamilyColor}" />
-
-                  </Grid>
-
-               </HierarchicalDataTemplate>
-
-               <DataTemplate DataType="{x:Type EgtWPFLib5:MachiningTreeViewItem}">
-                  <Grid Height="20">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="Auto"/>
-                     </Grid.ColumnDefinitions>
-
-                     <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
-                     <TextBlock Grid.Column="1" Text="{Binding NamePar}" FontSize="15" Margin="0,-2,5,0" VerticalAlignment="Center" />
-                     <Ellipse Grid.Column="2" Height="10" Width="10" Fill="{Binding ToolColor}" />
-
-                  </Grid>
-               </DataTemplate>
-            </TreeView.Resources>
-
-         </TreeView>
-
-         <UniformGrid Grid.Row="2" Columns="3">
-            <Button Content="{Binding ImportMsg}" Command="{Binding ImportCommand}" Height="30"
-                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
-            <Button Content="{Binding ExportMsg}" Command="{Binding ExportCommand}" Height="30"
-                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
-            <Button Content="{Binding ResetMsg}" Command="{Binding ReloadMachiningCommand}" 
-                    CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}" Height="30"
-                    Style="{StaticResource OnlyRightPanel_HalfRound_Button}"/>
-         </UniformGrid>
-
-      </Grid>
-
-      <ContentControl Content="{Binding Path=ParamPageV}" Grid.Column="1" Grid.ColumnSpan="2"/>
-
-   </Grid>
-
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/MachiningDbWindow/OnlyProdMachiningDbWindowV.xaml.vb

@@ -1,30 +0,0 @@
-Imports EgtWPFLib5
-Imports System.Windows.Input
-
-Public Class OnlyProdMachiningDbWindowV
-
-   Private WithEvents m_MachiningDbWindowVM As MachiningDbWindowVM
-
-   Sub New(Owner As System.Windows.Window, MachiningDbWindowVM As MachiningDbWindowVM)
-      MyBase.New(Owner)
-      ' 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

@@ -14,9 +14,9 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyTitle("EgtBEAMWALL.Core Release AnyCPU")>
 #End If
 <Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("Egalware s.r.l.")>
+<Assembly: AssemblyCompany("EgalWare s.r.l.")>
 <Assembly: AssemblyProduct("EgtBEAMWALL.Core")>
-<Assembly: AssemblyCopyright("Copyright ©  2020-2025 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2021 by EgalWare s.r.l.")>
 <Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
@@ -35,5 +35,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.7.1.1")>
-<Assembly: AssemblyFileVersion("2.7.1.1")>
+<Assembly: AssemblyVersion("2.3.6.2")>
+<Assembly: AssemblyFileVersion("2.3.6.2")>

EgtBEAMWALL.Core/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml

@@ -1,250 +0,0 @@
-<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}}">
-
-   <EgtWPFLib5:EgtCustomWindow.Resources>
-      <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
-   </EgtWPFLib5:EgtCustomWindow.Resources>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="5*"/>
-         <RowDefinition Height="1*"/>
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="{Binding Filters_Msg}"
-                Margin="5"
-                Visibility="{Binding Filters_Visibility}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <ComboBox ItemsSource="{Binding BTLDateTypeList}"
-                         SelectedIndex="{Binding SelBTLDateType}"
-                         Width="105"
-                         Margin="5"
-                         Style="{StaticResource FeatureComboBox}"/>
-               <StackPanel Grid.Column="1" Orientation="Horizontal">
-                  <ComboBox ItemsSource="{Binding DayTypeList}"
-                            SelectedIndex="{Binding SelDayType}"
-                            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}"
-                                 Style="{StaticResource Filter_DatePicker}"/>
-                     <TextBlock Text="{Binding To_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"/>
-                     <DatePicker SelectedDate="{Binding dtEndDate}"
-                                 Style="{StaticResource Filter_DatePicker}"/>
-                  </StackPanel>
-               </StackPanel>
-               <CheckBox Grid.Column="2"
-                         IsChecked="{Binding bViewArchived}"
-                         Content="{Binding ViewArchived_Msg}"
-                         VerticalAlignment="Center"/>
-            </Grid>
-            <Grid Grid.Row="1">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <ComboBox ItemsSource="{Binding FilterTypeList}"
-                         SelectedItem="{Binding SelFilterType}"
-                         Width="105"
-                         Margin="5"
-                         Style="{StaticResource FeatureComboBox}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                      Text="{Binding SearchText}"
-                                      Margin="5"
-                                      Visibility="{Binding SearchText_Visibility}"/>
-               <StackPanel Grid.Column="2" 
-                           Orientation="Horizontal">
-                  <TextBlock Text="{Binding Rows_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <ComboBox ItemsSource="{Binding RowQuantityList}"
-                            SelectedIndex="{Binding SelRowQuantity}"
-                            Style="{StaticResource FeatureComboBox}"/>
-               </StackPanel>
-            </Grid>
-         </Grid>
-      </GroupBox>
-
-      <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"
-                               ColumnHeaderBackground="{x:Null}"
-                               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 EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
-                  </DataTemplate>
-               </DataGridTextColumn.HeaderTemplate>
-            </DataGridTextColumn>
-            <!--Name-->
-            <DataGridTextColumn x:Key="colNAME" Binding="{Binding sName}">
-               <DataGridTextColumn.Header>
-                  <Grid>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="Auto"/>
-                     </Grid.ColumnDefinitions>
-                     <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
-                     <ToggleButton Grid.Column="1"
-                                   Margin="5,0,0,0"
-                                   IsChecked="{Binding Path=DataContext.bIsEditNameActive,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
-                                   Style="{StaticResource OldToolBar_SmallToggleButton}">
-                        <Image Source="\Resources\CalcPanel\Edit.png"
-                               Style="{StaticResource LockImage}"/>
-                     </ToggleButton>
-                  </Grid>
-               </DataGridTextColumn.Header>
-            </DataGridTextColumn>
-            <!-- Creation date -->
-            <DataGridTextColumn x:Key="colCRTDATE" Binding="{Binding dtCreateDate}">
-               <DataGridTextColumn.Header>
-                  <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 EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
-               </DataGridTextColumn.Header>
-            </DataGridTextColumn>
-            <!-- Archived -->
-            <DataGridTemplateColumn x:Key="colARCHIVED">
-               <DataGridTemplateColumn.CellTemplate>
-                  <DataTemplate>
-                     <Image Source="\Resources\OpenProjectFileDialog\Archived.png"
-                            Visibility="{Binding Archived_Visibility}"
-                            Height="15"
-                            Width="15"
-                            Stretch="UniformToFill"/>
-                  </DataTemplate>
-               </DataGridTemplateColumn.CellTemplate>
-               <DataGridTemplateColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.Archived_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
-               </DataGridTemplateColumn.Header>
-            </DataGridTemplateColumn>
-         </DataGrid.Resources>
-         <DataGrid.RowStyle>
-            <Style TargetType="DataGridRow">
-               <Setter Property="FontWeight" Value="DemiBold"/>
-               <Setter Property="VerticalContentAlignment" Value="Center"/>
-               <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
-            </Style>
-         </DataGrid.RowStyle>
-         <DataGrid.RowDetailsTemplate>
-            <DataTemplate>
-               <ItemsControl ItemsSource="{Binding ProjFileList}"
-                             BorderThickness="0"
-                             Margin="0,-1,0,0"
-                             Padding="0">
-                  <ItemsControl.ItemTemplate>
-                     <DataTemplate>
-                        <Grid TextBlock.FontSize="12"
-                              TextBlock.FontWeight="Normal">
-                           <Grid.ColumnDefinitions>
-                              <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.Row="0"
-                                 Grid.ColumnSpan="2"
-                                 Background="Gray"
-                                 Margin="40,0,40,0"/>
-                           <Grid Grid.Column="1"
-                                 Grid.Row="1"
-                                 Margin="2">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="1*"/>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="1*"/>
-                              </Grid.ColumnDefinitions>
-                              <Grid.RowDefinitions>
-                                 <RowDefinition Height="1*"/>
-                                 <RowDefinition Height="1*"/>
-                              </Grid.RowDefinitions>
-                              <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 EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
-                                         Style="{StaticResource OpenWnd_TextBlock}"/>
-                              <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 EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
-                                         Style="{StaticResource OpenWnd_TextBlock}"/>
-                              <TextBlock Grid.Column="3"
-                                         Text="{Binding dtExportDate}"/>
-                           </Grid>
-                        </Grid>
-                     </DataTemplate>
-                  </ItemsControl.ItemTemplate>
-               </ItemsControl>
-            </DataTemplate>
-         </DataGrid.RowDetailsTemplate>
-      </EgtBEAMWALL:EgtDataGrid>
-
-      <UniformGrid Columns="4" Grid.Row="2" Margin="0,0,0,5">
-         <Button IsDefault="True" Name="OpenBtn"
-                 Content="{Binding Open_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding Archive_Msg}"
-                 Command="{Binding Archive_Command}"
-                 IsEnabled="{Binding bArchived_IsEnabled}"
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding Delete_Msg}"
-                 Command="{Binding Delete_Command}"
-                 IsEnabled="{Binding bDelete_IsEnabled}"
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
-         <Button Command="{Binding Cancel_Command}"
-                 Content="{Binding Cancel_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
-      </UniformGrid>
-
-   </Grid>
-
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml.vb

@@ -1,86 +0,0 @@
-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
-
-   Private WithEvents m_OpenProjFileDialogVM As NewOpenProjectFileDialogVM
-
-#Region "CONSTRUCTOR"
-
-   Sub New(Owner As Window, OpenProjFileDialogVM As NewOpenProjectFileDialogVM)
-      ' Funzione che interpreta l'xaml
-      InitializeComponent()
-      Me.Owner = Owner
-      Me.DataContext = OpenProjFileDialogVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_OpenProjFileDialogVM = OpenProjFileDialogVM
-      AddHandler Me.Loaded, AddressOf OpenProjectFileDialog_Loaded
-      AddHandler Me.Closing, AddressOf OpenProjectFileDialog_Closing
-   End Sub
-
-#End Region    ' CONSTRUCTOR
-
-#Region "METHODS"
-
-   Public Function EgtShowDialog(ProjectType As ProjectType) As Boolean?
-      m_OpenProjFileDialogVM.Init(ProjectType)
-      ' mostro la finestra di dialogo
-      Return Me.ShowDialog()
-   End Function
-   Public Function EgtShowDialog(ProjectType As ProjectType, ProjectList As List(Of ProjectFileVM)) As Boolean?
-      m_OpenProjFileDialogVM.Init(ProjectType, ProjectList)
-      ' mostro la finestra di dialogo
-      Return Me.ShowDialog()
-   End Function
-
-   Public Function EgtShowDialog(ProjectType As ProjectType, GoToProd As Boolean) As Boolean?
-      m_OpenProjFileDialogVM.Init(ProjectType, Nothing, GoToProd)
-      ' mostro la finestra di dialogo
-      Return Me.ShowDialog()
-   End Function
-
-   Private Sub OpenProjectFileDialog_Loaded(sender As Object, e As RoutedEventArgs)
-      ' Carico e imposto posizione finestra
-      WinPosFromIniToWindow(S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE, Me)
-   End Sub
-
-   Private Sub OpenProjectFileDialog_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs)
-      If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
-         e.Cancel = True
-         Return
-      End If
-      ' Salvo posizione finestra (se non minimizzata)
-      WinPosFromWindowToIni(Me, S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE)
-   End Sub
-
-#End Region    ' METHODS
-
-#Region "EVENTS"
-
-   Private Sub ProjectList_MouseDoubleClick(sender As Object, e As MouseButtonEventArgs)
-      m_OpenProjFileDialogVM.ProjDoubleClick()
-   End Sub
-
-#End Region    ' EVENTS
-
-   Private Sub OpenBtn_Click(sender As Object, e As RoutedEventArgs) Handles OpenBtn.Click
-      DialogResult = m_OpenProjFileDialogVM.VerifySelected()
-   End Sub
-
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_OpenProjFileDialogVM.m_CloseWindow
-      Me.DialogResult = bDialogResult
-   End Sub
-
-   Private Sub MainDataGrid_CellEditEnding(sender As Object, e As DataGridCellEditEndingEventArgs)
-      'm_OpenProjFileDialogVM.SetIsEditNameActive(False)
-   End Sub
-
-End Class

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb

@@ -1,754 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
-Imports System.Windows
-Imports System.Windows.Controls
-Imports System.Windows.Data
-Imports System.Windows.Input
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public MustInherit Class NewOpenProjectFileDialogVM
-   Inherits VMBase
-
-#Region "FIELDS & PROPERTIES"
-
-   Public Enum BTLDateTypes As Integer
-      CREATEDATE = 0
-      EXPORTDATE = 1
-   End Enum
-
-   Private Enum FilterTypes As Integer
-      NULL = 0
-      ID = 1
-      BTLFILENAME = 2
-      LISTNAME = 3
-      MACHINE = 4
-   End Enum
-
-   Public Enum DayTypes As Integer
-      LASTMONTH = 0
-      LAST3MONTHS = 1
-      LAST6MONTHS = 2
-      PERIOD = 3
-      ALWAYS = 4
-   End Enum
-
-   Public Enum RowQuantities As Integer
-      FIFTY = 0
-      HUNDRED = 1
-      HUNDREDANDFIFTY = 2
-   End Enum
-
-   Friend Event m_CloseWindow(bDialogResult As Boolean)
-
-   Protected m_ProdColumns As New ObservableCollection(Of EgtDataGridColumn)
-   Public Property ProdColumns As ObservableCollection(Of EgtDataGridColumn)
-      Get
-         Return m_ProdColumns
-      End Get
-      Set(value As ObservableCollection(Of EgtDataGridColumn))
-         m_ProdColumns = value
-      End Set
-   End Property
-
-   Private m_colProdFile_Name As EgtDataGridColumn
-   Public ReadOnly Property colProdFile_Name As EgtDataGridColumn
-      Get
-         Return m_colProdFile_Name
-      End Get
-   End Property
-
-   Private m_colArchived_Name As EgtDataGridColumn
-   Public ReadOnly Property colArchived_Name As EgtDataGridColumn
-      Get
-         Return m_colArchived_Name
-      End Get
-   End Property
-
-   Protected m_ProjColumns As New ObservableCollection(Of EgtDataGridColumn)
-   Public Property ProjColumns As ObservableCollection(Of EgtDataGridColumn)
-      Get
-         Return m_ProjColumns
-      End Get
-      Set(value As ObservableCollection(Of EgtDataGridColumn))
-         m_ProjColumns = value
-      End Set
-   End Property
-
-   Protected m_ProjectType As ProjectType
-
-   Protected m_sFilter As String
-   Public Property Filter As String
-      Get
-         Return m_sFilter
-      End Get
-      Set(value As String)
-         m_sFilter = value
-      End Set
-   End Property
-
-   Protected m_sFileNameFilter As Predicate(Of String)
-   Public Property FileNameFilter As Predicate(Of String)
-      Get
-         Return m_sFileNameFilter
-      End Get
-      Set(value As Predicate(Of String))
-         m_sFileNameFilter = value
-      End Set
-   End Property
-
-   Protected m_sExtensions As New List(Of String)
-   Public ReadOnly Property Extensions As List(Of String)
-      Get
-         Return m_sExtensions
-      End Get
-   End Property
-
-   Public m_ProjectList_View As CollectionView = Nothing
-   Protected m_ProjectList As New ObservableCollection(Of ProdItem)
-   Public ReadOnly Property ProjectList As ObservableCollection(Of ProdItem)
-      Get
-         Return m_ProjectList
-      End Get
-   End Property
-
-   Private m_nSelProjIndex As Integer
-   Public ReadOnly Property nSelProjIndex As Integer
-      Get
-         Return m_nSelProjIndex
-      End Get
-   End Property
-
-   Protected m_SelProject As ProdItem
-   Public Property SelProject As ProdItem
-      Get
-         Return m_SelProject
-      End Get
-      Set(value As ProdItem)
-         m_SelProject = value
-         ' verifico se abilitare il bottone Delete
-         If IsNothing(m_SelProject) Then
-            SetDeleteIsEnabled(False)
-            SetArchivedIsEnabled(False)
-         ElseIf IsNothing(m_SelProject.ProdFileVM) Then
-            SetDeleteIsEnabled(True)
-            SetArchivedIsEnabled(False)
-         Else
-            SetDeleteIsEnabled(Not SelProject.ProdFileVM.bIsProduced)
-            SetArchivedIsEnabled(True)
-         End If
-         NotifyPropertyChanged(NameOf(Archive_Msg))
-      End Set
-   End Property
-
-   Protected m_FileName As String
-   Public Property FileName As String
-      Get
-         Return m_FileName
-      End Get
-      Set(value As String)
-         m_FileName = value
-      End Set
-   End Property
-
-   Private m_bFixedProjectList As Boolean
-   Public ReadOnly Property bFixedProjectList As Boolean
-      Get
-         Return m_bFixedProjectList
-      End Get
-   End Property
-   Public Sub SetFixedProjectList(bValue As Boolean)
-      m_bFixedProjectList = bValue
-      NotifyPropertyChanged(NameOf(Filters_Visibility))
-   End Sub
-
-   Public ReadOnly Property Filters_Visibility As Visibility
-      Get
-         Return If(m_bFixedProjectList, Visibility.Collapsed, Visibility.Visible)
-      End Get
-   End Property
-
-   Protected m_BTLDateTypeList As New List(Of String)
-   Public ReadOnly Property BTLDateTypeList As List(Of String)
-      Get
-         Return m_BTLDateTypeList
-      End Get
-   End Property
-
-   Protected m_SelBTLDateType As BTLDateTypes = Nothing
-   Public Property SelBTLDateType As Integer
-      Get
-         Return m_SelBTLDateType
-      End Get
-      Set(value As Integer)
-         ' aggiorno lista da Db
-         RefreshProjectList()
-         m_ProjectList_View.Refresh()
-      End Set
-   End Property
-
-   Private m_DayTypeList As New List(Of String)({EgtMsg(62532), EgtMsg(62533), EgtMsg(62534), EgtMsg(62531)})
-   Public Overridable ReadOnly Property DayTypeList As List(Of String)
-      Get
-         Return m_DayTypeList
-      End Get
-   End Property
-
-   Protected m_SelDayType As DayTypes = DayTypes.LASTMONTH
-   Public Property SelDayType As Integer
-      Get
-         Return m_SelDayType
-      End Get
-      Set(value As Integer)
-         Dim PrevSelDayType As DayTypes = m_SelDayType
-         m_SelDayType = value
-         WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_DAYTYPE, Convert.ToInt32(m_SelDayType))
-         m_Date_Visibility = If(m_SelDayType = DayTypes.PERIOD, Visibility.Visible, Visibility.Collapsed)
-         If m_SelDayType = DayTypes.PERIOD Then
-            Select Case PrevSelDayType
-               Case DayTypes.LASTMONTH
-                  m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-                  m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5)
-               Case DayTypes.LAST3MONTHS
-                  m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-                  m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 3)
-               Case DayTypes.LAST6MONTHS
-                  m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-                  m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 6)
-               Case DayTypes.ALWAYS
-                  m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-                  m_dtStartDate = New DateTime(2020, 1, 1)
-            End Select
-            NotifyPropertyChanged(NameOf(dtStartDate))
-            NotifyPropertyChanged(NameOf(dtEndDate))
-         End If
-         NotifyPropertyChanged(NameOf(Date_Visibility))
-         ' aggiorno lista da Db
-         RefreshProjectList()
-         m_ProjectList_View.Refresh()
-      End Set
-   End Property
-
-   Private m_dtStartDate As DateTime = DateTime.Today
-   Public Property dtStartDate As DateTime
-      Get
-         Return m_dtStartDate
-      End Get
-      Set(value As DateTime)
-         m_dtStartDate = value
-         Dim lStartDate As Long = m_dtStartDate.ToFileTimeUtc()
-         WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_STARTDATE, lStartDate.ToString())
-         ' aggiorno lista da Db
-         RefreshProjectList()
-         m_ProjectList_View.Refresh()
-      End Set
-   End Property
-
-   Private m_dtEndDate As DateTime = DateTime.Today
-   Public Property dtEndDate As DateTime
-      Get
-         Return m_dtEndDate
-      End Get
-      Set(value As DateTime)
-         m_dtEndDate = value
-         Dim lEndDate As Long = m_dtEndDate.ToFileTimeUtc()
-         WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_ENDDATE, lEndDate.ToString())
-         ' aggiorno lista da Db
-         RefreshProjectList()
-         m_ProjectList_View.Refresh()
-      End Set
-   End Property
-
-   Private m_Date_Visibility As Visibility = Visibility.Collapsed
-   Public ReadOnly Property Date_Visibility As Visibility
-      Get
-         Return m_Date_Visibility
-      End Get
-   End Property
-
-   Private m_RowQuantityList As New List(Of String)({50, 100, 150})
-   Public ReadOnly Property RowQuantityList As List(Of String)
-      Get
-         Return m_RowQuantityList
-      End Get
-   End Property
-
-   Private m_SelRowQuantity As RowQuantities
-   Public Property SelRowQuantity As Integer
-      Get
-         Return m_SelRowQuantity
-      End Get
-      Set(value As Integer)
-         m_SelRowQuantity = value
-         RefreshProjectList()
-         m_ProjectList_View.Refresh()
-      End Set
-   End Property
-
-   ' lista campi per ricerca testuale e con datepicker
-   Protected m_FilterTypeList As New ObservableCollection(Of IdNameStruct)
-   Public ReadOnly Property FilterTypeList As ObservableCollection(Of IdNameStruct)
-      Get
-         Return m_FilterTypeList
-      End Get
-   End Property
-
-   Protected m_SelFilterType As IdNameStruct = Nothing
-   Public Property SelFilterType As IdNameStruct
-      Get
-         Return m_SelFilterType
-      End Get
-      Set(value As IdNameStruct)
-         ' resetto il contenuto della barra di ricerca testuale
-         m_SearchText = ""
-         NotifyPropertyChanged(NameOf(SearchText))
-         ' resetto le selezioni sul calendario
-         If Not IsNothing(SearchDate) Then SearchDate.Clear()
-         ' setto il Tipo Filtro a NULL e refresho la lista dei progetti (in modo da averli visibili tutti)
-         m_SelFilterType = m_FilterTypeList(0)
-         m_ProjectList_View.Refresh()
-         ' ora setto il valore scelto come Tipo Filtro
-         m_SelFilterType = value
-         Select Case m_SelFilterType.Id
-            Case FilterTypes.ID, FilterTypes.BTLFILENAME, FilterTypes.LISTNAME, FilterTypes.MACHINE
-               SearchText_Visibility = Visibility.Visible
-               SearchDate_Visibility = Visibility.Collapsed
-            Case BTLDateTypes.EXPORTDATE, BTLDateTypes.CREATEDATE
-               SearchText_Visibility = Visibility.Collapsed
-               SearchDate_Visibility = Visibility.Visible
-            Case Else
-               SearchText_Visibility = Visibility.Collapsed
-               SearchDate_Visibility = Visibility.Collapsed
-         End Select
-      End Set
-   End Property
-
-   Protected m_SearchText As String = ""
-   Public Property SearchText As String
-      Get
-         Return m_SearchText
-      End Get
-      Set(value As String)
-         m_SearchText = value
-         m_ProjectList_View.Refresh()
-      End Set
-   End Property
-
-   Friend m_SearchDate As SelectedDatesCollection = Nothing
-   Public ReadOnly Property SearchDate As SelectedDatesCollection
-      Get
-         Return m_SearchDate
-      End Get
-   End Property
-
-   Protected m_SearchText_Visibility As Visibility = Visibility.Collapsed
-   Public Property SearchText_Visibility As Visibility
-      Get
-         Return m_SearchText_Visibility
-      End Get
-      Set(value As Visibility)
-         m_SearchText_Visibility = value
-         NotifyPropertyChanged(NameOf(SearchText_Visibility))
-      End Set
-   End Property
-
-   Protected m_SearchDate_Visibility As Visibility = Visibility.Collapsed
-   Public Property SearchDate_Visibility As Visibility
-      Get
-         Return m_SearchDate_Visibility
-      End Get
-      Set(value As Visibility)
-         m_SearchDate_Visibility = value
-         NotifyPropertyChanged(NameOf(SearchDate_Visibility))
-      End Set
-   End Property
-
-   Public Property bIsEditNameActive As Boolean
-      Get
-         Return Not m_colProdFile_Name.IsReadOnly
-      End Get
-      Set(value As Boolean)
-         If Not IsNothing(m_colProdFile_Name) Then
-            m_colProdFile_Name.IsReadOnly = Not value
-         End If
-      End Set
-   End Property
-   Public Sub SetIsEditNameActive(value As Boolean)
-      If Not IsNothing(m_colProdFile_Name) Then
-         m_colProdFile_Name.IsReadOnly = Not value
-      End If
-      NotifyPropertyChanged(NameOf(bIsEditNameActive))
-   End Sub
-
-   Private m_bViewArchived As Boolean
-   Public Property bViewArchived As Boolean
-      Get
-         Return m_bViewArchived
-      End Get
-      Set(value As Boolean)
-         m_bViewArchived = value
-         WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_VIEWARCHIVED, If(bViewArchived, 1, 0))
-         If Not IsNothing( m_colArchived_Name) Then
-             m_colArchived_Name.Visible = value
-             RefreshProjectList()
-         End If
-      End Set
-   End Property
-
-   Private m_bArchived_IsEnabled As Boolean
-   Public ReadOnly Property bArchived_IsEnabled As Boolean
-      Get
-         Return m_bArchived_IsEnabled
-      End Get
-   End Property
-   Public Sub SetArchivedIsEnabled(bValue As Boolean)
-      m_bArchived_IsEnabled = bValue
-      NotifyPropertyChanged(NameOf(bArchived_IsEnabled))
-   End Sub
-
-   Private m_bDelete_IsEnabled As Boolean
-   Public ReadOnly Property bDelete_IsEnabled As Boolean
-      Get
-         Return m_bDelete_IsEnabled
-      End Get
-   End Property
-   Public Sub SetDeleteIsEnabled(bValue As Boolean)
-      m_bDelete_IsEnabled = bValue
-      NotifyPropertyChanged(NameOf(bDelete_IsEnabled))
-   End Sub
-
-   Protected m_ChangeOpenedProjectOnCancel As Boolean = False
-
-#Region "Messages"
-
-   Public ReadOnly Property Title As String
-      Get
-         Return EgtMsg(61986)
-      End Get
-   End Property
-
-   Public ReadOnly Property Filters_Msg As String
-      Get
-         Return EgtMsg(61985)
-      End Get
-   End Property
-
-   Public ReadOnly Property FilterType_Msg As String
-      Get
-         Return EgtMsg(61836)
-      End Get
-   End Property
-   Public ReadOnly Property Search_Msg As String
-      Get
-         Return EgtMsg(61837)
-      End Get
-   End Property
-
-   Public ReadOnly Property Id_Msg As String
-      Get
-         Return EgtMsg(61815)
-      End Get
-   End Property
-   Public ReadOnly Property BTLFileName_Msg As String
-      Get
-         Return EgtMsg(61819)
-      End Get
-   End Property
-   Public ReadOnly Property ListName_Msg As String
-      Get
-         Return EgtMsg(61820)
-      End Get
-   End Property
-   Public ReadOnly Property ExportDate_Msg As String
-      Get
-         Return EgtMsg(61821)
-      End Get
-   End Property
-   Public ReadOnly Property CreateDate_Msg As String
-      Get
-         Return EgtMsg(61822)
-      End Get
-   End Property
-   Public ReadOnly Property Machine_Msg As String
-      Get
-         Return EgtMsg(61886)
-      End Get
-   End Property
-   Public ReadOnly Property Name_Msg As String
-      Get
-         Return EgtMsg(61808)
-      End Get
-   End Property
-
-   Public ReadOnly Property Open_Msg As String
-      Get
-         Return EgtMsg(30006)
-      End Get
-   End Property
-
-   Public ReadOnly Property Archived_Msg As String
-      Get
-         Return EgtMsg(61983)
-      End Get
-   End Property
-
-   Public ReadOnly Property Archive_Msg As String
-      Get
-         If Not IsNothing(m_SelProject) AndAlso m_SelProject.bIsArchived Then
-            Return EgtMsg(61984)
-         Else
-            Return EgtMsg(61981)
-         End If
-      End Get
-   End Property
-   Public ReadOnly Property Delete_Msg As String
-      Get
-         Return EgtMsg(61823)
-      End Get
-   End Property
-   Public ReadOnly Property Cancel_Msg As String
-      Get
-         Return EgtMsg(30002)
-      End Get
-   End Property
-
-   Public ReadOnly Property From_Msg As String
-      Get
-         Return EgtMsg(62523)
-      End Get
-   End Property
-
-   Public ReadOnly Property To_Msg As String
-      Get
-         Return EgtMsg(62524)
-      End Get
-   End Property
-
-   Public ReadOnly Property ViewArchived_Msg As String
-      Get
-         Return EgtMsg(61982)
-      End Get
-   End Property
-
-   Public ReadOnly Property Rows_Msg As String
-      Get
-         Return EgtMsg(61995)
-      End Get
-   End Property
-
-#End Region
-
-   ' Definizione comandi
-   Private m_cmdProjectDoubleClick As ICommand
-   Private m_cmdDelete As ICommand
-   Private m_cmdArchive As ICommand
-   Private m_cmdCancel As ICommand
-
-#End Region    ' FIELDS & PROPERTIES
-
-   Sub New()
-      ' assegno delegato a elementi lista
-      ProdItem.m_delIsModifiedSetUp = AddressOf SetIsEditNameActive
-      ' carico colonne
-      LoadColumns()
-      m_colProdFile_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_NAME)
-      m_colArchived_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_ARCHIVED)
-      ' leggo valori per filtri
-      m_SelDayType = GetMainPrivateProfileInt(S_OPENFILEDIALOG, K_DAYTYPE, 0)
-      Select Case m_SelDayType
-         Case DayTypes.LASTMONTH
-            m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5)
-         Case DayTypes.LAST3MONTHS
-            m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 3)
-         Case DayTypes.LAST6MONTHS
-            m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 6)
-         Case DayTypes.PERIOD
-            Dim sStartDate As String = "0"
-            Dim lStartDate As Long = 0
-            GetMainPrivateProfileString(S_OPENFILEDIALOG, K_STARTDATE, 0, sStartDate)
-            Long.TryParse(sStartDate, lStartDate)
-            m_dtStartDate = If(lStartDate > 0, DateTime.FromFileTimeUtc(lStartDate), DateTime.Today)
-            Dim sEndDate As String = "0"
-            Dim lEndDate As Long = 0
-            GetMainPrivateProfileString(S_OPENFILEDIALOG, K_ENDDATE, 0, sEndDate)
-            Long.TryParse(sEndDate, lEndDate)
-            m_dtEndDate = If(lEndDate > 0, DateTime.FromFileTimeUtc(lEndDate), DateTime.Today)
-            m_Date_Visibility = Visibility.Visible
-      End Select
-      m_bViewArchived = GetMainPrivateProfileInt(S_OPENFILEDIALOG, K_VIEWARCHIVED, 0) <> 0
-   End Sub
-
-#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(Optional GoToProd As Boolean = False)
-   End Sub
-
-   Protected Sub LoadColumns()
-      ' carico le colonne della datagrid
-      GetPrivateProfileColumns(S_NEWOPENPROJFILEDLG_PROD, ProdColumns)
-      ' carico campi su cui eseguire il filtro di ricerca
-      m_BTLDateTypeList = New List(Of String)({CreateDate_Msg})
-      m_SelBTLDateType = BTLDateTypes.CREATEDATE
-      NotifyPropertyChanged(NameOf(BTLDateTypeList))
-      NotifyPropertyChanged(NameOf(SelBTLDateType))
-      m_FilterTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(FilterTypes.NULL, ""),
-                                                                    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))
-      'End If
-      ' setto la visibilità delle colonne delle EgtDataGrid
-      For Each col In ProjColumns
-         col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
-      Next
-      For Each col In ProdColumns
-         col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
-      Next
-   End Sub
-
-   Friend Function VerifySelected() As Boolean
-      If IsNothing(SelProject) Then Return False
-      Dim AllFilesInDir As IEnumerable(Of String) = Nothing
-      If m_ProjectType = Core.ConstBeam.ProjectType.PROJ Then
-         If Not IsNothing(SelProject.ProdFileVM) Then
-            If String.IsNullOrWhiteSpace(SelProject.ProdFileVM.sProdDirPath) OrElse Not Directory.Exists(SelProject.ProdFileVM.sProdDirPath) Then Return False
-            AllFilesInDir = Directory.EnumerateFiles(SelProject.ProdFileVM.sProdDirPath)
-         ElseIf SelProject.ProjFileList.Count > 0 Then
-            If String.IsNullOrWhiteSpace(SelProject.ProjFileList(0).sProjDirPath) OrElse Not Directory.Exists(SelProject.ProjFileList(0).sProjDirPath) Then Return False
-            AllFilesInDir = Directory.EnumerateFiles(SelProject.ProjFileList(0).sProjDirPath)
-         Else Return False
-         End If
-      ElseIf m_ProjectType = Core.ConstBeam.ProjectType.PROD Then
-         If String.IsNullOrWhiteSpace(SelProject.ProdFileVM.sProdDirPath) OrElse Not Directory.Exists(SelProject.ProdFileVM.sProdDirPath) Then Return False
-         AllFilesInDir = Directory.EnumerateFiles(SelProject.ProdFileVM.sProdDirPath)
-      Else
-         Return False
-      End If
-      Return AllFilesInDir.Any(Function(x) Path.GetExtension(x).ToLower() = ".nge")
-   End Function
-
-   Protected Function ProjectFilter(Proj As Object) As Boolean
-      Dim bProjectOk As Boolean = True
-      'If TypeOf Proj Is ProjFileVM Then
-      Dim CurrProj As ProdItem = DirectCast(Proj, ProdItem)
-      If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
-         (m_SelFilterType.Id = BTLDateTypes.EXPORTDATE AndAlso Not CurrProj.ProjFileList.Any(Function(x) SearchDate.Contains(DirectCast(x, ProjFileVM).dtExportDate.Date))) OrElse
-         (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.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
-      Return bProjectOk
-   End Function
-
-   Protected Sub CloseWindow(bDialogResult As Boolean)
-      RaiseEvent m_CloseWindow(bDialogResult)
-   End Sub
-
-#End Region    ' METHODS
-
-#Region "COMMANDS"
-
-#Region "ProjectDoubleClick"
-
-   ''' <summary>
-   ''' Returns a command that do New.
-   ''' </summary>
-   Public ReadOnly Property ProjectDoubleClick_Command As ICommand
-      Get
-         If m_cmdProjectDoubleClick Is Nothing Then
-            m_cmdProjectDoubleClick = New Command(AddressOf ProjDoubleClick)
-         End If
-         Return m_cmdProjectDoubleClick
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the New.  This method is invoked by the NewCommand.
-   ''' </summary>
-   Friend Sub ProjDoubleClick()
-      ' verifico se non e' attivo edit del nome
-      If bIsEditNameActive Then Return
-      ' verifico validita' selezionato
-      If VerifySelected() Then
-         RaiseEvent m_CloseWindow(True)
-      End If
-   End Sub
-
-#End Region ' ProjectDoubleClick
-
-#Region "Archive"
-
-   ''' <summary>
-   ''' Returns a command that do New.
-   ''' </summary>
-   Public ReadOnly Property Archive_Command As ICommand
-      Get
-         If m_cmdArchive Is Nothing Then
-            m_cmdArchive = New Command(AddressOf Archive)
-         End If
-         Return m_cmdArchive
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the New.  This method is invoked by the NewCommand.
-   ''' </summary>
-   Public Overridable Sub Archive()
-   End Sub
-
-#End Region ' Archive
-
-#Region "Delete"
-
-   ''' <summary>
-   ''' Returns a command that do New.
-   ''' </summary>
-   Public ReadOnly Property Delete_Command As ICommand
-      Get
-         If m_cmdDelete Is Nothing Then
-            m_cmdDelete = New Command(AddressOf Delete)
-         End If
-         Return m_cmdDelete
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the New.  This method is invoked by the NewCommand.
-   ''' </summary>
-   Public Overridable Sub Delete()
-   End Sub
-
-#End Region ' Delete
-
-#Region "Cancel"
-
-   ''' <summary>
-   ''' Returns a command that do New.
-   ''' </summary>
-   Public ReadOnly Property Cancel_Command As ICommand
-      Get
-         If m_cmdCancel Is Nothing Then
-            m_cmdCancel = New Command(AddressOf Cancel)
-         End If
-         Return m_cmdCancel
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the New.  This method is invoked by the NewCommand.
-   ''' </summary>
-   Public Overridable Sub Cancel()
-   End Sub
-
-#End Region ' Cancel
-
-#End Region    ' Commands
-
-End Class
-

EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml

@@ -1,252 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdNewOpenProjectFileDialogV"
-                            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="{StaticResource OnlyProd_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}}">
-
-   <EgtWPFLib5:EgtCustomWindow.Resources>
-      <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
-   </EgtWPFLib5:EgtCustomWindow.Resources>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="5*"/>
-         <RowDefinition Height="1*"/>
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="{Binding Filters_Msg}"
-                Visibility="{Binding Filters_Visibility}"
-                Margin="5">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <ComboBox ItemsSource="{Binding BTLDateTypeList}"
-                         SelectedIndex="{Binding SelBTLDateType}"
-                         Style="{StaticResource BTLDateTypeList_ComboBox}"/>
-               <StackPanel Grid.Column="1" 
-                           Orientation="Horizontal">
-                  <ComboBox ItemsSource="{Binding DayTypeList}"
-                            SelectedIndex="{Binding SelDayType}"
-                            Style="{StaticResource DayTypeList_ComboBox}"/>
-                  <StackPanel Orientation="Horizontal" 
-                              Visibility="{Binding Date_Visibility}">
-                     <TextBlock Text="{Binding From_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"
-                                Foreground="{StaticResource BeamWall_Corduroy}"/>
-                     <DatePicker SelectedDate="{Binding dtStartDate}"
-                                 Style="{StaticResource Filter_DatePicker}"
-                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
-                     <TextBlock Text="{Binding To_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"
-                                Foreground="{StaticResource BeamWall_Corduroy}"/>
-                     <DatePicker SelectedDate="{Binding dtEndDate}"
-                                 Style="{StaticResource Filter_DatePicker}"
-                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
-                  </StackPanel>
-               </StackPanel>
-               <CheckBox Grid.Column="2"
-                         IsChecked="{Binding bViewArchived}"
-                         Content="{Binding ViewArchived_Msg}"
-                         VerticalAlignment="Center"/>
-            </Grid>
-            <Grid Grid.Row="1">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <ComboBox ItemsSource="{Binding FilterTypeList}"
-                         SelectedItem="{Binding SelFilterType}"
-                         Width="105"
-                         Margin="5"
-                         Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                      Text="{Binding SearchText}"
-                                      Visibility="{Binding SearchText_Visibility}"
-                                      Style="{StaticResource NewSearchText_TextBox}"/>
-               <StackPanel Grid.Column="2" 
-                           Orientation="Horizontal">
-                  <TextBlock Text="{Binding Rows_Msg}"
-                             Style="{StaticResource OptionTextBlock}"
-                             Foreground="{StaticResource BeamWall_Corduroy}"/>
-                  <ComboBox ItemsSource="{Binding RowQuantityList}"
-                            SelectedIndex="{Binding SelRowQuantity}"
-                            Style="{StaticResource OnyProd_FeatureComboBox}"/>
-               </StackPanel>
-            </Grid>
-         </Grid>
-      </GroupBox>
-
-      <Border Grid.Row="1" Style="{StaticResource OnlyProdPage_Border}" Margin="1"/>
-
-      <EgtBEAMWALL: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"
-                               ColumnHeaderBackground="{StaticResource BeamWall_Teal}"
-                               ColumnHeaderForeground="{StaticResource BeamWall_White}"
-                               ColumnHeaderHorizontalContentAlignment="Center"
-                               ColumnHeaderFontWeight="Bold"
-                               ColumnHeaderFontSize="15"
-                               ColumnHeaderPadding="0,2,0,2"
-                               Style="{StaticResource DataGrid_OnlyProd}"
-                               CellStyle="{StaticResource CellDataGrid_CustomHighLight}">
-         <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 EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
-                  </DataTemplate>
-               </DataGridTextColumn.HeaderTemplate>
-            </DataGridTextColumn>
-            <!--Name-->
-            <DataGridTextColumn x:Key="colNAME" Binding="{Binding sName}">
-               <DataGridTextColumn.Header>
-                  <Grid>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="Auto"/>
-                     </Grid.ColumnDefinitions>
-                     <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
-                     <ToggleButton Grid.Column="1"
-                                   IsChecked="{Binding Path=DataContext.bIsEditNameActive,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"
-                                   Style="{StaticResource ToolBar_SmallToggleButton}">
-                        <Image Source="\Resources\CalcPanel\Edit.png"
-                               Style="{StaticResource LockImage}"/>
-                     </ToggleButton>
-                  </Grid>
-               </DataGridTextColumn.Header>
-            </DataGridTextColumn>
-            <!-- Creation date -->
-            <DataGridTextColumn x:Key="colCRTDATE" Binding="{Binding dtCreateDate}">
-               <DataGridTextColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.CreateDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
-               </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 EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
-               </DataGridTextColumn.Header>
-            </DataGridTextColumn>
-            <!-- Archived -->
-            <DataGridTemplateColumn x:Key="colARCHIVED">
-               <DataGridTemplateColumn.CellTemplate>
-                  <DataTemplate>
-                     <Image Source="\Resources\OpenProjectFileDialog\Archived.png"
-                            Visibility="{Binding Archived_Visibility}"
-                            Style="{StaticResource Archived_Image}"/>
-                  </DataTemplate>
-               </DataGridTemplateColumn.CellTemplate>
-               <DataGridTemplateColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.Archived_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
-               </DataGridTemplateColumn.Header>
-            </DataGridTemplateColumn>
-         </DataGrid.Resources>
-         <DataGrid.RowStyle>
-            <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
-               <Setter Property="FontWeight" Value="DemiBold"/>
-               <Setter Property="VerticalContentAlignment" Value="Center"/>
-               <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
-            </Style>
-         </DataGrid.RowStyle>
-         <DataGrid.RowDetailsTemplate>
-            <DataTemplate>
-               <ItemsControl ItemsSource="{Binding ProjFileList}"
-                             Style="{StaticResource ProjFileList_ItemsControl}">
-                  <ItemsControl.ItemTemplate>
-                     <DataTemplate>
-                        <Grid Style="{StaticResource ProjFileList_Grid}">
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="{Binding Path=DataContext.ProdColumns[0].ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"/>
-                              <ColumnDefinition Width="1*"/>
-                           </Grid.ColumnDefinitions>
-                           <Grid.RowDefinitions>
-                              <RowDefinition Height="1"/>
-                              <RowDefinition Height="1*"/>
-                           </Grid.RowDefinitions>
-                           <Grid Grid.Row="0"
-                                 Grid.ColumnSpan="2"
-                                 Style="{StaticResource Gray_Grid}"/>
-                           <Grid Grid.Column="1"
-                                 Grid.Row="1"
-                                 Margin="2">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="1*"/>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="1*"/>
-                              </Grid.ColumnDefinitions>
-                              <Grid.RowDefinitions>
-                                 <RowDefinition Height="1*"/>
-                                 <RowDefinition Height="1*"/>
-                              </Grid.RowDefinitions>
-                              <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"
-                                         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 EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"
-                                         Style="{StaticResource OpenWnd_TextBlock}"/>
-                              <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 EgtBEAMWALL:OnlyProdNewOpenProjectFileDialogV}}}"
-                                         Style="{StaticResource OpenWnd_TextBlock}"/>
-                              <TextBlock Grid.Column="3"
-                                         Text="{Binding dtExportDate}"/>
-                           </Grid>
-                        </Grid>
-                     </DataTemplate>
-                  </ItemsControl.ItemTemplate>
-               </ItemsControl>
-            </DataTemplate>
-         </DataGrid.RowDetailsTemplate>
-      </EgtBEAMWALL:EgtDataGrid>
-
-      <UniformGrid Columns="4" Grid.Row="2" 
-                   Margin="0,0,0,5">
-         <Button IsDefault="True" Name="OpenBtn"
-                 Content="{Binding Open_Msg}" 
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding Archive_Msg}"
-                 Command="{Binding Archive_Command}"
-                 IsEnabled="{Binding bArchived_IsEnabled}"
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding Delete_Msg}"
-                 Command="{Binding Delete_Command}"
-                 IsEnabled="{Binding bDelete_IsEnabled}"
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
-         <Button Command="{Binding Cancel_Command}"
-                 Content="{Binding Cancel_Msg}" 
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
-      </UniformGrid>
-
-   </Grid>
-
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml.vb

@@ -1,93 +0,0 @@
-Imports System.Windows
-Imports System.Windows.Controls
-Imports System.Windows.Input
-Imports EgtWPFLib5
-
-Public Class OnlyProdNewOpenProjectFileDialogV
-
-   Private WithEvents m_OpenProjFileDialogVM As NewOpenProjectFileDialogVM
-
-#Region "CONSTRUCTOR"
-
-   Sub New(Owner As Window, OpenProjFileDialogVM As NewOpenProjectFileDialogVM)
-      ' Funzione che interpreta l'xaml
-      InitializeComponent()
-      Me.Owner = Owner
-      Me.DataContext = OpenProjFileDialogVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_OpenProjFileDialogVM = OpenProjFileDialogVM
-      AddHandler Me.Loaded, AddressOf OpenProjectFileDialog_Loaded
-      AddHandler Me.Closing, AddressOf OpenProjectFileDialog_Closing
-   End Sub
-
-#End Region    ' CONSTRUCTOR
-
-#Region "METHODS"
-
-   Public Function EgtShowDialog(ProjectType As ProjectType) As Boolean?
-      m_OpenProjFileDialogVM.Init(ProjectType)
-      ' mostro la finestra di dialogo
-      Return Me.ShowDialog()
-   End Function
-   Public Function EgtShowDialog(ProjectType As ProjectType, ProjectList As List(Of ProjectFileVM)) As Boolean?
-      m_OpenProjFileDialogVM.Init(ProjectType, ProjectList)
-      ' mostro la finestra di dialogo
-      Return Me.ShowDialog()
-   End Function
-
-   Public Function EgtShowDialog(ProjectType As ProjectType, GoToProd As Boolean) As Boolean?
-      m_OpenProjFileDialogVM.Init(ProjectType, Nothing, GoToProd)
-      ' mostro la finestra di dialogo
-      Return Me.ShowDialog()
-   End Function
-
-   Private Sub OpenProjectFileDialog_Loaded(sender As Object, e As RoutedEventArgs)
-      ' Carico e imposto posizione finestra
-      WinPosFromIniToWindow(S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE, Me)
-   End Sub
-
-   Private Sub OpenProjectFileDialog_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs)
-      If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
-         e.Cancel = True
-         Return
-      End If
-      ' Salvo posizione finestra (se non minimizzata)
-      WinPosFromWindowToIni(Me, S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE)
-   End Sub
-
-#End Region    ' METHODS
-
-#Region "EVENTS"
-
-   Private Sub ProjectList_MouseDoubleClick(sender As Object, e As MouseButtonEventArgs)
-      m_OpenProjFileDialogVM.ProjDoubleClick()
-   End Sub
-
-#End Region    ' EVENTS
-
-   Private Sub OpenBtn_Click(sender As Object, e As RoutedEventArgs) Handles OpenBtn.Click
-      DialogResult = m_OpenProjFileDialogVM.VerifySelected()
-   End Sub
-
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_OpenProjFileDialogVM.m_CloseWindow
-      Me.DialogResult = bDialogResult
-   End Sub
-
-   Private Sub MainDataGrid_CellEditEnding(sender As Object, e As DataGridCellEditEndingEventArgs)
-      '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

EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml

@@ -1,203 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="OnlyProdOpenProjectFileDialogV"
-                            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="{StaticResource OnlyProd_EgtCustomWindow}"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
-                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-                            MinHeight="500" MinWidth="500"
-                            DataContext="{Binding RelativeSource={RelativeSource Self}}">
-
-   <EgtWPFLib5:EgtCustomWindow.Resources>
-      <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
-   </EgtWPFLib5:EgtCustomWindow.Resources>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="5*"/>
-         <RowDefinition Height="1*"/>
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Filters"
-                Margin="5"
-                Visibility="{Binding Filters_Visibility}"
-                BorderBrush="{StaticResource BeamWall_RegentStBlue}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <ComboBox ItemsSource="{Binding BTLDateTypeList}"
-                         SelectedIndex="{Binding SelBTLDateType}"
-                         Width="105"
-                         Margin="5"
-                         Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
-               <StackPanel Grid.Column="1" Orientation="Horizontal">
-                  <ComboBox ItemsSource="{Binding DayTypeList}"
-                            SelectedIndex="{Binding SelDayType}"
-                            Width="105"
-                            Margin="0,0,2.5,0"
-                            Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
-                  <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
-                     <TextBlock Text="{Binding From_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"
-                                Foreground="{StaticResource BeamWall_Corduroy}"/>
-                     <DatePicker SelectedDate="{Binding dtStartDate}"
-                                 Style="{StaticResource Filter_DatePicker}"
-                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
-                     <TextBlock Text="{Binding To_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"
-                                Foreground="{StaticResource BeamWall_Corduroy}"/>
-                     <DatePicker SelectedDate="{Binding dtEndDate}"
-                                 Style="{StaticResource Filter_DatePicker}"
-                                 CalendarStyle="{StaticResource Filter_Calendar}"/>
-                  </StackPanel>
-               </StackPanel>
-            </Grid>
-            <Grid Grid.Row="1">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <ComboBox ItemsSource="{Binding FilterTypeList}"
-                         SelectedItem="{Binding SelFilterType}"
-                         Width="105"
-                         Margin="5"
-                         Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                      Text="{Binding SearchText}"
-                                      Margin="5"
-                                      Visibility="{Binding SearchText_Visibility}"
-                                      Style="{StaticResource NewSearchText_TextBox}"/>
-               <StackPanel Grid.Column="2" 
-                           Orientation="Horizontal">
-                  <TextBlock Text="Rows"
-                             Style="{StaticResource OptionTextBlock}"
-                             Foreground="{StaticResource BeamWall_Corduroy}"/>
-                  <ComboBox ItemsSource="{Binding RowQuantityList}"
-                            SelectedIndex="{Binding SelRowQuantity}"
-                            Width="55"
-                            Style="{StaticResource OnlyProdCalcPanel_ComboBox}"/>
-               </StackPanel>
-            </Grid>
-         </Grid>
-      </GroupBox>
-
-      <Border Grid.Row="1" Style="{StaticResource OnlyProdPage_Border}" Margin="1"/>
-      
-      <EgtBEAMWALL:EgtDataGrid Grid.Row="1"
-                               ItemsSource="{Binding ProjectList}" 
-                               SelectedItem="{Binding SelProject}"
-                               SelectionMode="Single"
-                               Margin="5"
-                               BindingColumns="{Binding ProjectColumns}"
-                               AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
-                               AlternationCount="2"
-                               ColumnHeaderBackground="{StaticResource BeamWall_Teal}"
-                               ColumnHeaderForeground="{StaticResource BeamWall_White}"
-                               ColumnHeaderHorizontalContentAlignment="Center"
-                               ColumnHeaderFontWeight="Bold"
-                               ColumnHeaderFontSize="15"
-                               ColumnHeaderPadding="0,2,0,2"
-                               Style="{StaticResource DataGrid_OnlyProd}"
-                               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>
-         <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 EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
-                  </DataTemplate>
-               </DataGridTextColumn.HeaderTemplate>
-            </DataGridTextColumn>
-            <!-- ProdId -->
-            <DataGridTextColumn x:Key="colPRODID" Binding="{Binding sProdId}">
-               <DataGridTextColumn.HeaderTemplate>
-                  <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
-                  </DataTemplate>
-               </DataGridTextColumn.HeaderTemplate>
-            </DataGridTextColumn>
-            <!-- Project Name -->
-            <DataGridTextColumn x:Key="colPROJNAME" Binding="{Binding sDescription}">
-               <DataGridTextColumn.HeaderTemplate>
-                  <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
-                  </DataTemplate>
-               </DataGridTextColumn.HeaderTemplate>
-            </DataGridTextColumn>
-            <!-- BTL FileName -->
-            <DataGridTextColumn x:Key="colBTLNAME" Binding="{Binding sBTLFileName}">
-               <DataGridTextColumn.HeaderTemplate>
-                  <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
-                  </DataTemplate>
-               </DataGridTextColumn.HeaderTemplate>
-            </DataGridTextColumn>
-            <!-- ListName -->
-            <DataGridTextColumn x:Key="colLISTNAME" Binding="{Binding sListName}">
-               <DataGridTextColumn.HeaderTemplate>
-                  <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.ListName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
-                  </DataTemplate>
-               </DataGridTextColumn.HeaderTemplate>
-            </DataGridTextColumn>
-            <!-- Exported date -->
-            <DataGridTextColumn x:Key="colEXPDATE" Binding="{Binding dtExportDate}">
-               <DataGridTextColumn.HeaderTemplate>
-                  <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.ExportDate_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
-                  </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 EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
-               </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 EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
-               </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 EgtBEAMWALL:OnlyProdOpenProjectFileDialogV}}}"/>
-               </DataGridTextColumn.Header>
-            </DataGridTextColumn>
-         </DataGrid.Resources>
-      </EgtBEAMWALL:EgtDataGrid>
-
-      <UniformGrid Columns="3" Grid.Row="2" Margin="0,0,0,5">
-         <Button IsDefault="True" Name="OpenBtn"
-                 Content="{Binding Open_Msg}" 
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding Delete_Msg}"
-                 Command="{Binding Delete_Command}"
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
-         <Button IsCancel="True"
-                 Content="{Binding Cancel_Msg}" 
-                 Style="{DynamicResource OnlyProdEgtWPFLib5_InputButton}"/>
-      </UniformGrid>
-
-   </Grid>
-
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml

@@ -5,9 +5,9 @@
                             xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core"
                             Title="{Binding Title}"
                             Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
                             IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-                            MinHeight="500" MinWidth="500"
+                            Height="500" Width="500" Topmost="True"
                             DataContext="{Binding RelativeSource={RelativeSource Self}}">
 
    <EgtWPFLib5:EgtCustomWindow.Resources>
@@ -21,82 +21,53 @@
          <RowDefinition Height="1*"/>
       </Grid.RowDefinitions>
 
-      <GroupBox Header="Filters"
-                Margin="5"
-                Visibility="{Binding Filters_Visibility}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <ComboBox ItemsSource="{Binding BTLDateTypeList}"
-                         SelectedIndex="{Binding SelBTLDateType}"
-                         Width="105"
-                         Margin="5"
-                         Style="{StaticResource FeatureComboBox}"/>
-               <StackPanel Grid.Column="1" Orientation="Horizontal">
-                  <ComboBox ItemsSource="{Binding DayTypeList}"
-                            SelectedIndex="{Binding SelDayType}"
-                            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}"
-                                 Style="{StaticResource Filter_DatePicker}"/>
-                     <TextBlock Text="{Binding To_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"/>
-                     <DatePicker SelectedDate="{Binding dtEndDate}"
-                                 Style="{StaticResource Filter_DatePicker}"/>
-                  </StackPanel>
-               </StackPanel>
-            </Grid>
-            <Grid Grid.Row="1">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <ComboBox ItemsSource="{Binding FilterTypeList}"
-                         SelectedItem="{Binding SelFilterType}"
-                         Width="105"
-                         Margin="5"
-                         Style="{StaticResource FeatureComboBox}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                      Text="{Binding SearchText}"
-                                      Margin="5"
-                                      Visibility="{Binding SearchText_Visibility}"/>
-               <StackPanel Grid.Column="2" 
-                           Orientation="Horizontal">
-                  <TextBlock Text="Rows"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <ComboBox ItemsSource="{Binding RowQuantityList}"
-                            SelectedIndex="{Binding SelRowQuantity}"
-                            Style="{StaticResource FeatureComboBox}"/>
-               </StackPanel>
-            </Grid>
-         </Grid>
-      </GroupBox>
+        <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>
 
-      <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"
-                               ColumnHeaderBackground="{x:Null}"
-                               Margin="5"
-                               BindingColumns="{Binding ProjectColumns}">
+                <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="Hidden"
+               Margin="5"
+               BindingColumns="{Binding ProjectColumns}">
          <DataGrid.Resources>
             <!-- ProjId -->
             <DataGridTextColumn x:Key="colPROJID" Binding="{Binding sProjId}">
@@ -114,14 +85,6 @@
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
-            <!-- Project Name -->
-            <DataGridTextColumn x:Key="colPROJNAME" Binding="{Binding sDescription}">
-               <DataGridTextColumn.HeaderTemplate>
-                  <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
-                  </DataTemplate>
-               </DataGridTextColumn.HeaderTemplate>
-            </DataGridTextColumn>
             <!-- BTL FileName -->
             <DataGridTextColumn x:Key="colBTLNAME" Binding="{Binding sBTLFileName}">
                <DataGridTextColumn.HeaderTemplate>
@@ -152,27 +115,76 @@
                   <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 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 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>
+         <!--<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>
 
+      <!--<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}"/>