Merge branch 'develop' into Testing/NuGetDll

.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

@@ -8,8 +8,8 @@ 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
@@ -90,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
@@ -184,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
@@ -250,15 +240,14 @@ Public Class 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)
@@ -269,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
@@ -299,19 +281,23 @@ 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
 
@@ -320,13 +306,28 @@ Public Class BTLFeatureM
       NewBTLFeature.m_nPRC = nPRC
       NewBTLFeature.m_nSelGRP = nGRP
       NewBTLFeature.m_nSelSIDE = nSIDE
-      NewBTLFeature.m_nPriority = 0
       NewBTLFeature.m_bDO = True
       ' crea parametri per questa feature da file ini
       NewBTLFeature.CreateFeatureParams(NewBTLFeature)
       Return NewBTLFeature
    End Function
 
+   '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
 
 #Region "METHODS"
@@ -387,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
@@ -425,20 +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)
-                        'EgtDuploSetModified(DirectCast(m_ParentPart, BTLPartM).m_nPartId)
-                     End If
-                     ' Ripristino stato segnalazione modifica
-                     DisableMgr.ReEnable()
                      bToRecalc = True
                   End If
                   Param.bCustom = False
@@ -455,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)
@@ -479,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
@@ -490,27 +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
-                  '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)
-      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
@@ -526,26 +486,20 @@ 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
          EgtDuploSetModified(ParentPart.nPartId)
@@ -553,20 +507,19 @@ Public Class BTLFeatureM
       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
@@ -574,30 +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
-
 #End Region    ' METHODS
 
 End Class

EgtBEAMWALL.Core/BTL Model/BTLParamM.vb

@@ -129,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
@@ -146,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
@@ -168,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
@@ -244,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
 
@@ -285,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

EgtBEAMWALL.Core/BTL Model/BTLPartM.vb

@@ -548,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
@@ -577,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
 
@@ -613,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
@@ -633,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
@@ -666,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
@@ -703,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
@@ -797,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
@@ -813,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")
@@ -828,12 +785,12 @@ 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")
@@ -843,36 +800,14 @@ Public Class BTLPartM
                                                                   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)
@@ -883,9 +818,9 @@ Public Class BTLPartM
       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
 
@@ -922,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
@@ -952,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
@@ -1044,15 +969,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)
    '         m_refTransf.ChangeOrigin(ptOri)
    '         m_refTransf.Setup(ptOri, ptOri + vtVersX, ptOri + vtVersY)
    '      End If
@@ -1063,10 +988,10 @@ Public Class BTLPartM
    '   EgtGetInfo(nPartId, BTL_PRT_CAMBER, sValue)
    '   sValArray = sValue.Split(New String() {": ", " P"}, StringSplitOptions.RemoveEmptyEntries)
    '   If sValArray.Count() >= 5 Then
-   '      StringToLenAdv(sValArray(3), m_dCamberLen1)
-   '      StringToLenAdv(sValArray(5), m_dCamberLen2)
-   '      StringToLenAdv(sValArray(7), m_dCamberLen3)
-   '      StringToLenAdv(sValArray(9), m_dCamberCross3)
+   '      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")
@@ -1078,10 +1003,10 @@ Public Class BTLPartM
    '   EgtGetInfo(nPartId, BTL_PRT_PARTOFFSET, sValue)
    '   sValArray = sValue.Split(New String() {": ", " P"}, StringSplitOptions.RemoveEmptyEntries)
    '   If sValArray.Count() >= 5 Then
-   '      StringToLenAdv(sValArray(3), m_dPartOffsetSide1)
-   '      StringToLenAdv(sValArray(5), m_dPartOffsetSide2)
-   '      StringToLenAdv(sValArray(7), m_dPartOffsetSide3)
-   '      StringToLenAdv(sValArray(9), m_dPartOffsetSide4)
+   '      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")
@@ -1105,9 +1030,9 @@ Public Class BTLPartM
    '   m_refGrainDir = New Vector3d
    '   sValArray = sValue.Split(New String() {",", ";"}, StringSplitOptions.RemoveEmptyEntries)
    '   If sValArray.Count() >= 4 Then
-   '      StringToDoubleAdv(sValArray(0), m_refGrainDir.x)
-   '      StringToDoubleAdv(sValArray(1), m_refGrainDir.y)
-   '      StringToDoubleAdv(sValArray(2), m_refGrainDir.z)
+   '      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
 
@@ -1210,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
@@ -1220,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
@@ -1238,8 +1163,16 @@ 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
          EgtDuploSetModified(nPartId)
@@ -1249,7 +1182,7 @@ Public Class BTLPartM
          ' ripristino inversione
          Inversion(SelectedMachineType)
       End If
-      If bRedraw Then EgtDraw()
+      EgtDraw()
       Return bOk
    End Function
 

EgtBEAMWALL.Core/BTL Model/BTLStructureM.vb

@@ -11,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)
@@ -391,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)
@@ -432,8 +412,6 @@ 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()

EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb

@@ -1,269 +0,0 @@
-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
-
-Public Class BTLFeatureVM
-   Inherits VMBase
-
-   Protected WithEvents m_BTLFeatureM As BTLFeatureM
-   Public ReadOnly Property BTLFeatureM As BTLFeatureM
-      Get
-         Return m_BTLFeatureM
-      End Get
-   End Property
-   Protected m_BTLPartM As BTLPartM
-
-   Public ReadOnly Property nFeatureId As Integer
-      Get
-         Return m_BTLFeatureM.nFeatureId
-      End Get
-   End Property
-
-   Public Overridable Property nSelGRP As Integer
-      Get
-         Return m_BTLFeatureM.nSelGRP
-      End Get
-      Set(value As Integer)
-         m_BTLFeatureM.nSelGRP = value
-      End Set
-   End Property
-   Public ReadOnly Property sDescGRP As String
-      Get
-         Dim sDescConstruction As String = String.Empty
-         If CalcBeamPrivateProfileGRP(m_BTLFeatureM.nSelGRP) = 0 Then
-            sDescConstruction = "L"
-         Else
-            sDescConstruction = "T"
-         End If
-         sDescConstruction &= m_BTLFeatureM.nPRC.ToString("000")
-         Return sDescConstruction
-      End Get
-   End Property
-
-   Public Property nPRC As Integer
-      Get
-         Return m_BTLFeatureM.nPRC
-      End Get
-      Set(value As Integer)
-         m_BTLFeatureM.nPRC = value
-      End Set
-   End Property
-
-   ' Lato
-   Public Overridable Property nSelSIDE As Integer
-      Get
-         Return m_BTLFeatureM.nSelSIDE
-      End Get
-      Set(value As Integer)
-         m_BTLFeatureM.nSelSIDE = value
-      End Set
-   End Property
-
-   Public ReadOnly Property sName As String
-      Get
-         Return m_BTLFeatureM.sName
-      End Get
-   End Property
-
-   Public Overridable Property bDO As Boolean
-      Get
-         Return m_BTLFeatureM.bDO
-      End Get
-      Set(value As Boolean)
-         m_BTLFeatureM.bDO = value
-      End Set
-   End Property
-
-   Public Property nPRID As Integer
-      Get
-         Return m_BTLFeatureM.nPRID
-      End Get
-      Set(value As Integer)
-         m_BTLFeatureM.nPRID = value
-      End Set
-   End Property
-
-   Public Property sDES As String
-      Get
-         Return m_BTLFeatureM.sDES
-      End Get
-      Set(value As String)
-         m_BTLFeatureM.sDES = value
-      End Set
-   End Property
-
-   Public Property frFRAME As Frame3d
-      Get
-         Return m_BTLFeatureM.frFRAME
-      End Get
-      Set(value As Frame3d)
-         m_BTLFeatureM.frFRAME = value
-      End Set
-   End Property
-
-   ' proprieta' che mostra la descrizione in interfaccia
-   Public ReadOnly Property sDesc As String
-      Get
-         Return sDescGRP & " [" & nPRID & "] " & sName
-      End Get
-   End Property
-
-   Public ReadOnly Property nState As CalcStates
-      Get
-         Return m_BTLFeatureM.nState
-      End Get
-   End Property
-
-   Public ReadOnly Property nCALC_ERR As Integer
-      Get
-         Return m_BTLFeatureM.nCALC_ERR
-      End Get
-   End Property
-
-   Public ReadOnly Property nCALC_ROT As Integer
-      Get
-         Return m_BTLFeatureM.nCALC_ROT
-      End Get
-   End Property
-
-   Public ReadOnly Property sCALC_MSG As String
-      Get
-         Return m_BTLFeatureM.sCALC_MSG
-      End Get
-   End Property
-
-   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
-      End Get
-   End Property
-
-   Public ReadOnly Property CALC_ROT_Visibility As Visibility
-      Get
-         Return If(m_BTLFeatureM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
-
-   Public ReadOnly Property CALC_ERR_Letter As String
-      Get
-         Select Case m_BTLFeatureM.nState
-            Case CalcStates.COLLISION
-               Return "c"
-            Case CalcStates.ERROR_
-               Return "e"
-            Case CalcStates.WARNING
-               Return "w"
-            Case CalcStates.INFO
-               Return "i"
-            Case Else
-               Return ""
-         End Select
-      End Get
-   End Property
-
-   Public ReadOnly Property CALC_ERR_Foreground As SolidColorBrush
-      Get
-         Select Case m_BTLFeatureM.nState
-            Case CalcStates.ERROR_, CalcStates.COLLISION
-               Return Brushes.Red
-            Case CalcStates.WARNING
-               Return Brushes.Orange
-            Case CalcStates.INFO
-               Return Brushes.Green
-            Case Else
-               Return Brushes.Red
-         End Select
-      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
-
-   Sub New(BTLFeatureM As BTLFeatureM)
-      m_BTLFeatureM = BTLFeatureM
-      m_BTLPartM = Nothing
-      NotifyPropertyChanged(NameOf(Calc_Background))
-      NotifyPropertyChanged(NameOf(CALC_ROT_Visibility))
-      NotifyPropertyChanged(NameOf(CALC_ERR_Letter))
-      NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
-   End Sub
-
-#End Region    ' CONSTRUCTOR
-
-#Region "METHODS"
-
-   ' funzione che seleziona la feature nella geometria
-   Public Sub SelGeomFeature()
-      EgtDeselectAll()
-      SelGeomFeature(nFeatureId)
-   End Sub
-
-   Private Sub SelGeomFeature(nMyFeatureId As Integer)
-      EgtSelectObj(nMyFeatureId)
-      Dim sVal As String = ""
-      If EgtGetInfo(nMyFeatureId, BTL_FTR_ADJID, sVal) Then
-         Dim vAdjId() As String = sVal.Split(","c)
-         For Each sAdjId In vAdjId
-            Dim nAdjId As Integer
-            If Integer.TryParse(sAdjId, nAdjId) Then
-               SelGeomFeature(nMyFeatureId + nAdjId)
-            End If
-         Next
-      End If
-      If EgtGetInfo(nMyFeatureId, BTL_FTR_AUXID, sVal) Then
-         Dim vAuxId() As String = sVal.Split(","c)
-         For Each sAuxId In vAuxId
-            Dim nAuxId As Integer
-            If Integer.TryParse(sAuxId, nAuxId) Then
-               EgtSelectObj(nMyFeatureId + nAuxId)
-            End If
-         Next
-      End If
-   End Sub
-
-#End Region    ' METHODS
-
-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,596 +0,0 @@
-Imports System.IO
-Imports System.Threading
-Imports System.Globalization
-Imports EgtUILib
-Imports EgtWPFLib5
-Imports EgtBEAMWALL.Core.ConstBeam
-Imports EgtBEAMWALL.Core
-
-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))
-                        'RaiseEvent Calc_ProcessEnd(Nothing, New CalcProcessEndEventArgs(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))
-                        'RaiseEvent Calc_ProcessEnd(Nothing, New CalcProcessEndEventArgs(vBar(vProc(j).nBar))) 'ProcessResults(vBar(nCurrBar))
-                     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))
-                        'RaiseEvent Calc_ProcessEnd(Nothing, New CalcProcessEndEventArgs(vBar(vProc(j).nBar))) 'ProcessResults(vBar(nCurrBar))
-                     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
-               '' assegno TASKID alla feature per calcoli
-               'EgtSetInfo(nOutlineId, "TASKID", nOutlineId + nMainOffsId, True)
-               'Else
-               '   ' assegno TASKID alla feature per calcoli
-               '   EgtSetInfo(nOutlineId, "TASKID", nOutlineId, True)
-            End If
-            ' assegno TASKID alla feature per calcoli
-            EgtSetInfo(nOutlineId, "TASKID", nTaskId)
-            ' 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
-               '   ' assegno TASKID alla feature per calcoli
-               '   EgtSetInfo(nFeatureId, "TASKID", nFeatureId + nMainOffsId, True)
-               'Else
-               '   ' assegno TASKID alla feature per calcoli
-               '   EgtSetInfo(nFeatureId, "TASKID", nFeatureId, True)
-            End If
-            ' assegno TASKID alla feature per calcoli
-            EgtSetInfo(nFeatureId, "TASKID", nTaskId)
-            ' 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 piInfo As PatternInfo
-   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
-
-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/Constants/ConstBeam.vb

@@ -1,311 +1,400 @@
 Public Module ConstBeam
 
-   Public Enum BTLParamType As Integer
-      DOUBLE_ = 1
-      STRING_ = 2
-      COMBO = 3
-      LENGTH = 4
-      CHECKBOX = 5
-   End Enum
+    Friend Const BTL_FTR_DES As String = "DES"
 
-   Public Enum BTLPartParam As Integer
-      NULL = 0
-      PDN = 1
-      NAM = 2
-      GRP = 3
-   End Enum
+    Friend Const BTL_FTR_DO As String = "DO"
 
-   Public Enum GRPType As Integer
-      L = 0
-      T = 1
-   End Enum
+    Friend Const BTL_FTR_FRAME As String = "FRAME"
 
-   Enum MachineType As Integer
-      NULL = 0
-      BEAM = 1
-      WALL = 2
-      BOTH = 3
-   End Enum
+    Friend Const BTL_FTR_GRP As String = "GRP"
 
-   Enum CalcStates As Integer
-      NOTCALCULATED = -1
-      OK = 0
-      INFO = 1
-      WARNING = 2
-      ERROR_ = 3
-   End Enum
+    Friend Const BTL_FTR_MAINID As String = "MAINID"
 
-   Public Enum Range As Integer
-      STANDARD = 1
-      EXTENDED = 2
-   End Enum
+    Friend Const BTL_FTR_NAME As String = "NAME"
 
-   Public Enum PartOffset_RefSideFixClamp As Integer
-      INACTIVE = 0
-      REFSIDE1 = 1
-      REFSIDE2 = 2
-      REFSIDE3 = 3
-      REFSIDE4 = 4
-   End Enum
+    Friend Const BTL_FTR_PRC As String = "PRC"
 
-   Public Enum ProcessingQuality As Integer
-      AUTOMATIC = 1
-      VISIBLE = 2
-      FAST = 3
-   End Enum
+    Friend Const BTL_FTR_PRID As String = "PRID"
 
-   Public Enum Recess As Integer
-      AUTOMATIC = 1
-      MANUAL = 2
-   End Enum
+    Friend Const BTL_FTR_SIDE As String = "SIDE"
 
-   Public Enum StoreyType As Integer
-      CEILING = 1
-      ROOF = 2
-      WALL = 3
-   End Enum
+    Friend Const BTL_GEN_ARCHITECT = "ARCHITECT"
 
-   Public Enum AlignmentLocation As Integer
-      INACTIV = 0
-      BR = 1
-      TR = 2
-      BA = 3
-      TA = 4
-      HC = 5
-      VC = 6
-      AC = 7
-   End Enum
+    Friend Const BTL_GEN_COMPUTERNAME = "COMPUTERNAME"
 
-   Public Enum AlignmentEndtype As Integer
-      R = 1
-      A = 2
-      D = 3
-   End Enum
+    Friend Const BTL_GEN_CUSTOMER = "CUSTOMER"
 
-   Public Enum MaterialType As Integer
-      INACTIV = 0
-      BA = 1
-      CL = 2
-      MT = 3
-      ME_ = 4
-      GB = 5
-      GF = 6
-      IN_ = 7
-      SH = 8
-      FB = 9
-      PB = 10
-      PL = 11
-   End Enum
+    Friend Const BTL_GEN_DELIVDATE = "DELIVERYDATE"
 
-   Public Enum MoveDirections As Integer
-      UP = -1
-      DOWN = 1
-   End Enum
+    Friend Const BTL_GEN_EDITOR = "EDITOR"
 
-   Public Const BTLFEATURES_FILE_NAME As String = "BTLFeatures.ini"
+    Friend Const BTL_GEN_EXPDATE = "EXPORTDATE"
 
-   'Public Const S_GENERAL As String = "General"
-   'Public Const K_DEBUG As String = "Debug"
+    Friend Const BTL_GEN_EXPFILE = "EXPORTFILE"
 
-   ' Tipo di progetto
-   Public Enum ProjectType As Integer
-      PROJ = 1
-      PROD = 2
-   End Enum
+    Friend Const BTL_GEN_EXPRELEASE = "EXPORTRELEASE"
+
+    Friend Const BTL_GEN_EXPTIME = "EXPORTTIME"
+
+    Friend Const BTL_GEN_LANGUAGE = "LANGUAGE"
+
+    Friend Const BTL_GEN_LISTNAME = "LISTNAME"
+
+    Friend Const BTL_GEN_PROJGUID = "PROJECTGUID"
+
+    Friend Const BTL_GEN_PROJNAME = "PROJECTNAME"
+
+    ' parametri generici
+    Friend Const BTL_GEN_PROJNUM = "PROJECTNUMBER"
+
+    Friend Const BTL_GEN_PROJPART = "PROJECTPART"
+
+    Friend Const BTL_GEN_PROJTYPE = "PROJECTTYPE"
+
+    Friend Const BTL_GEN_RANGE = "RANGE"
+
+    Friend Const BTL_GEN_SRCFILE = "SOURCEFILE"
+
+    Friend Const BTL_GEN_USER = "USER"
+
+    Friend Const BTL_GEN_USERATTRIBUTE = "USERATTRIBUTE"
+
+    Friend Const BTL_PRT_ADDED As String = "ADDED"
+
+    Friend Const BTL_PRT_ALIGNMENT = "ALIGNMENT"
+
+    Friend Const BTL_PRT_ANNOTATION = "ANNOTATION"
+
+    Friend Const BTL_PRT_ASSEMBLYNUM = "ASSEMBLYNUMBER"
+
+    Friend Const BTL_PRT_CAMBER = "CAMBER"
+
+    Friend Const BTL_PRT_CNT As String = "CNT"
+
+    Friend Const BTL_PRT_COLOUR = "COLOUR"
+
+    'Friend Const BTL_PRT_USERATTRIBUTE = "USERATTRIBUTE"
+    Friend Const BTL_PRT_COMMENT = "COMMENT"
+
+    Friend Const BTL_PRT_DESIGNATION = "DESIGNATION"
+
+    Friend Const BTL_PRT_DO As String = "DO"
+
+    Friend Const BTL_PRT_DONE As String = "DONE"
+
+    Friend Const BTL_PRT_ELEMENTNUM = "ELEMENTNUMBER"
+
+    Friend Const BTL_PRT_ENDOFFSET = "ENDOFFSET"
+
+    Friend Const BTL_PRT_GRAINDIR = "GRAINDIRECTION"
+
+    Friend Const BTL_PRT_GROUP = "GROUP"
+
+    Friend Const BTL_PRT_H As String = "H"
+
+    Friend Const BTL_PRT_INVERTED As String = "INVERTED"
+
+    Friend Const BTL_PRT_L As String = "L"
+
+    Friend Const BTL_PRT_LAYER = "LAYER"
+
+    Friend Const BTL_PRT_MATERIAL As String = "MATERIAL"
+
+    Friend Const BTL_PRT_MATERIALTYPE = "MATERIALTYPE"
+
+    Friend Const BTL_PRT_MODULENUM = "MODULENUMBER"
+
+    Friend Const BTL_PRT_NAM As String = "NAM"
+
+    Friend Const BTL_PRT_ORDERNUM = "ORDERNUMBER"
+
+    Friend Const BTL_PRT_PACKAGE = "PACKAGE"
+
+    Friend Const BTL_PRT_PARTOFFSET = "PARTOFFSET"
+
+    Friend Const BTL_PRT_PDN As String = "PDN"
+
+    Friend Const BTL_PRT_PLANINGLENGTH = "PLANINGLENGTH"
+
+    Friend Const BTL_PRT_PROCESSINGQUALITY = "PROCESSINGQUALITY"
+
+    ' info parametri BTL
+    Friend Const BTL_PRT_PROJ As String = "PROJ"
+
+    Friend Const BTL_PRT_QUALITYGRADE = "QUALITYGRADE"
+
+    Friend Const BTL_PRT_RECESS = "RECESS"
+
+    Friend Const BTL_PRT_REFSIDE = "REFERENCESIDE"
+
+    Friend Const BTL_PRT_ROTATED As String = "ROTATED"
+
+    ' parametri pezzo
+    Friend Const BTL_PRT_SINGLEMEMBERNUM = "SINGLEMEMBERNUMBER"
+
+    Friend Const BTL_PRT_STARTOFFSET = "STARTOFFSET"
+
+    Friend Const BTL_PRT_STOREY = "STOREY"
+
+    Friend Const BTL_PRT_STOREYTYPE = "STOREYTYPE"
+
+    Friend Const BTL_PRT_TIMBERGRADE = "TIMBERGRADE"
+
+    Friend Const BTL_PRT_TRANSFORMATION = "TRANSFORMATION"
+
+    Friend Const BTL_PRT_UID = "UID"
+
+    Friend Const BTL_PRT_W As String = "W"
+
+    Friend Const BTLINFO As String = "BtlInfo"
+
+    ' parametri  errori integration
+    Friend Const DUPLO_TODELETE As String = "DUPLO_TODELETE"
+
+    Friend Const FILENAMESEPARATOR As Char = "^"c
+
+    ' parametri  errori integration
+    Friend Const ITG_CUTID As String = "CUTID"
+
+    ' parametri  errori integration
+    Friend Const ITG_PROD_ERR As String = "PROD_ERR"
+
+    Friend Const ITG_PROD_FALL As String = "PROD_FALL"
+
+    Friend Const ITG_PROD_MSG As String = "PROD_MSG"
+
+    Friend Const ITG_PROD_ROT As String = "PROD_ROT"
+
+    Friend Const ITG_PROD_TIME As String = "PROD_TIME"
+
+    Friend Const ITG_PROJ_ERR As String = "PROJ_ERR"
+
+    Friend Const ITG_PROJ_FALL As String = "PROJ_FALL"
+
+    Friend Const ITG_PROJ_MSG As String = "PROJ_MSG"
+
+    Friend Const ITG_PROJ_ROT As String = "PROJ_ROT"
+
+    Friend Const ITG_PROJ_TIME As String = "PROJ_TIME"
+
+    Friend Const ITG_TASKID As String = "TASKID"
+
+    Friend Const MGR_FTR_DES As String = "DES"
+
+    Friend Const MGR_FTR_DO As String = "DO"
+
+    Friend Const MGR_FTR_FRAME As String = "FRAME"
+
+    Friend Const MGR_FTR_GRP As String = "GRP"
+
+    Friend Const MGR_FTR_NAME As String = "NAME"
+
+    Friend Const MGR_FTR_PRC As String = "PRC"
+
+    Friend Const MGR_FTR_PRID As String = "PRID"
+
+    Friend Const MGR_FTR_SIDE As String = "SIDE"
+
+    Friend Const MGR_PRT_DES As String = "DES"
+
+    Friend Const MGR_PRT_FLIP As String = "FLIP"
+
+    Friend Const MGR_PRT_H As String = "H"
+
+    Friend Const MGR_PRT_L As String = "L"
+
+    Friend Const MGR_PRT_MATERIAL As String = "MATERIAL"
+
+    Friend Const MGR_PRT_PDN As String = "PDN"
+
+    Friend Const MGR_PRT_POSX As String = "POSX"
+
+    Friend Const MGR_PRT_POSY As String = "POSY"
+
+    Friend Const MGR_PRT_ROT As String = "ROT"
+
+    Friend Const MGR_PRT_STARTCUT As String = "STARTCUT"
+
+    Friend Const MGR_PRT_W As String = "W"
+
+    Friend Const MGR_RPT_BARHEIGHT As String = "BARHEIGHT"
+
+    ' parametri creazione barre
+    Friend Const MGR_RPT_BARLEN As String = "BARLEN"
+
+    Friend Const MGR_RPT_BARWIDTH As String = "BARWIDTH"
+
+    Friend Const MGR_RPT_H As String = "H"
+
+    ' parametri machgroup grezzi
+    Friend Const MGR_RPT_ID As String = "ID"
+
+    Friend Const MGR_RPT_L As String = "L"
+
+    Friend Const MGR_RPT_MATERIAL As String = "MATERIAL"
+
+    Friend Const MGR_RPT_PANELHEIGHT As String = "PANELHEIGHT"
+
+    Friend Const MGR_RPT_PANELLEN As String = "PANELLEN"
+
+    Friend Const MGR_RPT_PANELWIDTH As String = "PANELWIDTH"
+
+    Friend Const MGR_RPT_PART As String = "PART"
+
+    Friend Const MGR_RPT_STARTCUT As String = "STARTCUT"
+
+    Friend Const MGR_RPT_USAGE As String = "USAGE"
+
+    Friend Const MGR_RPT_W As String = "W"
+
+    Friend Const MGR_RPT_WASTE As String = "WASTE"
+
+    Friend Const OUTLINE As String = "Outline"
+
+    Friend Const PROCESSINGS As String = "Processings"
+
+    Friend Const PROJ As String = "PROJ"
+
+    ' parametri warehouse
+    Friend Const WRH_BEAM As String = "BEAM"
+
+    Friend Const WRH_CURRENT As String = "Current"
+
+    Friend Const WRH_KERF As String = "Kerf"
+
+    Friend Const WRH_L As String = "L"
+
+    Friend Const WRH_OFFSET As String = "Offset"
+
+    Friend Const WRH_S As String = "S"
+
+    Friend Const WRH_STARTOFFSET As String = "StartOffset"
+
+    Friend Const WRH_WALL As String = "WALL"
+
+    Public Const BTLFEATURES_FILE_NAME As String = "BTLFeatures.ini"
+
+    Public Const BTLFILENAME As String = "BTLFILENAME"
+
+    Public Const EXP_PROD As String = "EXPORTPROD"
+
+    ' parametri import/export
+    Public Const EXP_PROJ As String = "EXPORTPROJ"
+
+    Public Enum AlignmentEndtype As Integer
+        R = 1
+        A = 2
+        D = 3
+    End Enum
+
+    Public Enum AlignmentLocation As Integer
+        INACTIV = 0
+        BR = 1
+        TR = 2
+        BA = 3
+        TA = 4
+        HC = 5
+        VC = 6
+        AC = 7
+    End Enum
+
+    Public Enum BTLParamType As Integer
+        DOUBLE_ = 1
+        STRING_ = 2
+        COMBO = 3
+        LENGTH = 4
+        CHECKBOX = 5
+    End Enum
+
+    Public Enum BTLPartParam As Integer
+        NULL = 0
+        PDN = 1
+        NAM = 2
+        GRP = 3
+    End Enum
 
     ' Tipo di progetto (Beam o Wall)
     Public Enum BWType As Integer
         NULL = 0
         BEAM = 1
         WALL = 2
-   End Enum
+    End Enum
 
-   Public Const PROJ As String = "PROJ"
-   Public Const FILENAMESEPARATOR As Char = "^"c
-   Public Const BTLINFO As String = "BtlInfo"
+    Enum CalcStates As Integer
+        NOTCALCULATED = -1
+        OK = 0
+        WARNING = 1
+        ERROR_ = 2
+    End Enum
 
-   ' layer per assemblato
-   Public Const ASSEBASE As String = "AsseBase"
-   ' info parametri assemblato
-   Public Const BTL_ASSEBASE_N As String = "N"
+    Public Enum GRPType As Integer
+        L = 0
+        T = 1
+    End Enum
 
-   ' 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"
-   ' 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"
-   'Friend Const BTL_PRT_USERATTRIBUTE = "USERATTRIBUTE"
-   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"
+    Enum MachineType As Integer
+        NULL = 0
+        BEAM = 1
+        WALL = 2
+        BOTH = 3
+    End Enum
 
-   ' 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"
+    Public Enum MaterialType As Integer
+        INACTIV = 0
+        BA = 1
+        CL = 2
+        MT = 3
+        ME_ = 4
+        GB = 5
+        GF = 6
+        IN_ = 7
+        SH = 8
+        FB = 9
+        PB = 10
+        PL = 11
+    End Enum
 
-   Public Const PROCESSINGS As String = "Processings"
-   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_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"
+    Public Enum MoveDirections As Integer
+        UP = -1
+        DOWN = 1
+    End Enum
 
-   ' 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"
+    Public Enum PartOffset_RefSideFixClamp As Integer
+        INACTIVE = 0
+        REFSIDE1 = 1
+        REFSIDE2 = 2
+        REFSIDE3 = 3
+        REFSIDE4 = 4
+    End Enum
 
-   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"
+    Public Enum ProcessingQuality As Integer
+        AUTOMATIC = 1
+        VISIBLE = 2
+        FAST = 3
+    End Enum
 
-   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"
+    ' Tipo di progetto
+    Public Enum ProjectType As Integer
+        PROJ = 1
+        PROD = 2
+    End Enum
 
-   ' 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"
+    Public Enum Range As Integer
+        STANDARD = 1
+        EXTENDED = 2
+    End Enum
 
-   ' parametri P per comunicazione con la macchina
-   Public Const MGR_RPT_PRODID As String = "PRODID"
-   Public Const MGR_RPT_PATTID As String = "PATTID"
+    Public Enum Recess As Integer
+        AUTOMATIC = 1
+        MANUAL = 2
+    End Enum
 
-   ' 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"
+    Public Enum StoreyType As Integer
+        CEILING = 1
+        ROOF = 2
+        WALL = 3
+    End Enum
 
-   ' 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"
-
-   ' parametri  errori integration
-   Public 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"
-
-   ' 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
+    'Public Const S_GENERAL As String = "General"
+    'Public Const K_DEBUG As String = "Debug"
+End Module

EgtBEAMWALL.Core/Constants/ConstColumns.vb

@@ -1,27 +1,23 @@
 Public Module ConstColumns
 
-   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_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_POSZ As String = "colPOSZ"
+   Public Const COL_MATERIAL As String = "colMATERIAL"
+   Public Const COL_USAGE As String = "colUSAGE"
+   Public Const COL_WASTE As String = "colWASTE"
+
+   ' 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_SUPERVISORID As String = "colSUPERVISORID"
-   Public Const COL_PRIORITY As String = "colPRIORITY"
-   Public Const COL_NAME As String = "colNAME"
-   Public Const COL_H As String = "colH"
-   Public Const COL_MATERIAL As String = "colMATERIAL"
-   Public Const COL_USAGE As String = "colUSAGE"
-   Public Const COL_WASTE As String = "colWASTE"
-   Public Const COL_ARCHIVED As String = "colARCHIVED"
 
 End Module

EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb

@@ -1,36 +0,0 @@
-Public Module ConstDataGridColumnsIni
-
-   Public Const DATAGRIDCOLUMNS_FILE_NAME As String = "DataGridColumns.ini"
-
-   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_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,13 +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"
-
-End Class

EgtBEAMWALL.Core/Constants/ConstIni.vb

@@ -1,171 +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 S_GENERAL As String = "General"
-   'Public Const K_DEBUG As String = "Debug"
-   'Public Const K_LICENCE As String = "Licence"
-   'Public Const K_USERLEVEL As String = "UserLevel"
-   'Public Const K_MAXINST As String = "MaxInstances"
-   Public Const K_NETKEY As String = "NetKey"
-   Public Const K_MAXCAMINST As String = "MaxCamInstances"
-   Public Const K_VIEWOPTIM_INSTANCES As String = "ViewOptimInstances"
-   Public Const K_SUPERVISOR_INSTANCES As String = "SupervisorInstances"
-   'Public Const K_COMMANDLOG As String = "CommandLog"
-   'Public Const K_MESSAGESDIR As String = "MessagesDir"
-   'Public Const K_MESSAGES As String = "Messages"
-   'Public Const K_WINPLACE As String = "WinPlace"
-   Public Const K_VIEWOPTIMWINPLACE As String = "ViewOptimWinPlace"
-   Public Const K_SUPERVISORWINPLACE As String = "SupervisorWinPlace"
-   'Public Const K_LASTPROJ As String = "LastProj"
-   'Public Const K_AUTOLOADLASTPROJ As String = "AutoLoadLastProj"
-   Public Const K_LASTIMPDIR As String = "LastImpDir"
-   Public Const K_LASTNGEXPDIR As String = "LastNgexpDir"
-   Public Const K_LASTUPDATEDIR As String = "LastUpdateDir"
-   Public Const K_PROJSINDEX As String = "ProjsIndex"
-   Public Const K_PRODSINDEX As String = "ProdsIndex"
-   'Public Const K_SUPPORT As String = "Support"
-   Public Const K_DBADDRESS As String = "DbAddress"
-   Public Const K_DBMASTERKEY As String = "DbMasterKey"
-   Public Const K_SHAREDFOLDER As String = "SharedFolder"
-   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 S_LANGUAGES As String = "Languages"
-   'Public Const K_LANGUAGE As String = "Language"
-
-   'Public Const S_LUA As String = "Lua"
-   'Public Const K_LIBSDIR As String = "LibsDir"
-   'Public Const K_BASELIB As String = "BaseLib"
-
-   'Public Const S_GEOMDB As String = "GeomDB"
-   'Public Const K_DEFAULTFONT As String = "DefaultFont"
-   'Public Const K_NFEFONTDIR As String = "NfeFontDir"
-   'Public Const K_DEFAULTCOLOR As String = "DefaultColor"
-   'Public Const K_SAVETYPE As String = "SaveType"
-
-   'Public Const S_OPENGL As String = "OpenGL"
-   'Public Const K_DOUBLEBUFFER As String = "DoubleBuffer"
-   'Public Const K_COLORBITS As String = "ColorBits"
-   'Public Const K_DEPTHBITS As String = "DepthBits"
-   'Public Const K_DRIVER As String = "Driver"
-
-   'Public Const S_SCENE As String = "Scene"
-   'Public Const K_BACKTOP As String = "BackTop"
-   'Public Const K_BACKBOTTOM As String = "BackBottom"
-   'Public Const K_SHOWGFRAME As String = "ShowGFrame"
-   'Public Const K_MARK As String = "Mark"
-   'Public Const K_SELSURF As String = "SelSurf"
-   'Public Const K_SHOWMODE As String = "ShowMode"
-   Public Const K_SHOWBUILDING As String = "ShowBuilding"
-   'Public Const K_CURVEDIR As String = "CurveDir"
-   'Public Const K_SHOWTRIAADV As String = "ShowTriaAdv"
-   'Public Const K_SHOWZMAP As String = "ShowZmap"
-   'Public Const K_TEXMAXLINPIX As String = "TextureMaxLinPixels"
-   'Public Const K_ZOOMWIN As String = "ZoomWin"
-   'Public Const K_DISTLINE As String = "DistLine"
-   'Public Const K_MMUNITS As String = "MmUnits"
-
-   'Public Const S_GRID As String = "Grid"
-   'Public Const K_SHOWGRID As String = "ShowGrid"
-   'Public Const K_SHOWFRAME As String = "ShowFrame"
-   'Public Const K_SNAPSTEP As String = "SnapStep"
-   'Public Const K_SNAPSTEPINCH As String = "SnapStepInch"
-   'Public Const K_MINLINESSTEP As String = "MinLineSStep"
-   'Public Const K_MAJLINESSTEP As String = "MajLineSStep"
-   'Public Const K_EXTSSTEP As String = "ExtSStep"
-   'Public Const K_MINLNCOLOR As String = "MinLnColor"
-   'Public Const K_MAJLNCOLOR As String = "MajLnColor"
-
-   Public Const S_IMPORT As String = "Import"
-   Public Const K_BTLFLAG As String = "BtlFlag"
-   Public Const K_WALLBTLFLAG As String = "WallBtlFlag"
-   Public Const K_WALLOPPOSITESIDENESTING As String = "WallOppositeSideNesting"
-
-   'Public Const S_MACH As String = "Mach"
-   'Public Const K_MACHINESDIR As String = "MachinesDir"
-   'Public Const K_TOOLMAKERSDIR As String = "ToolMakersDir"
-   'Public Const K_CURRMACH As String = "CurrMach"
-   Public Const K_SUPERVISORMACH As String = "SupervisorMach"
-   Public Const K_PASSWORD As String = "Password"
-   Public Const K_CHANGEMACH As String = "ChangeMach"
-   Public Const K_EXPORTBWE As String = "ExpBwe"
-
-   'Public Const S_SIMUL As String = "Simul"
-   'Public Const K_SLIDERX As String = "SliderX"
-   'Public Const K_SLIDERVAL As String = "SliderVal"
-
-   Public Const S_BEAM As String = "Beam"
-   Public Const 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 S_NEST As String = "Nest"
-   Public Const K_NESTEXEC As String = "NestExec"
-   Public Const K_FLIPROT As String = "FlipRot"
-   Public Const K_SECTIONTIME As String = "SectionTime"
-   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_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"
-
-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,28 +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 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"
-
-End Module

EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj

@@ -10,9 +10,8 @@
     <AssemblyName>EgtBEAMWALL.Core</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <Deterministic>true</Deterministic>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -22,7 +21,6 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DocumentationFile>EgtBEAMWALL.Core.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,7 +30,6 @@
     <OutputPath>bin\Release\</OutputPath>
     <DocumentationFile>EgtBEAMWALL.Core.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <OptionExplicit>On</OptionExplicit>
@@ -47,19 +44,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 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="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -77,58 +73,28 @@
     <Import Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BTLViewModel\BTLFeatureVM.vb" />
-    <Compile Include="CALCPanel\CalcEditEndEventArgs.vb" />
+    <Compile Include="BeamM.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="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="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="NewOpenProjectFileDialog\NewOpenProjectFileDialogV.xaml.vb">
-      <DependentUpon>NewOpenProjectFileDialogV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogVM.vb" />
-    <Compile Include="Utility\DimensionsIniFile.vb" />
-    <Compile Include="Utility\Enum.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="Enum.vb" />
+    <Compile Include="MachLog.vb" />
     <Compile Include="My Project\AssemblyInfo.vb" />
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
       <DependentUpon>Application.myapp</DependentUpon>
-      <DesignTime>True</DesignTime>
     </Compile>
     <Compile Include="My Project\Resources.Designer.vb">
       <AutoGen>True</AutoGen>
@@ -140,31 +106,21 @@
       <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="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="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="MachGroup Model\MyMachGroupPanelM.vb" />
+    <Compile Include="MyMachine.vb" />
+    <Compile Include="PartM.vb" />
+    <Compile Include="ProdFileM.vb" />
+    <Compile Include="ProjectFileM.vb" />
+    <Compile Include="ProjFileM.vb" />
+    <Compile Include="SectionXMaterial.vb" />
     <Compile Include="Utility\BTLIniFile.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\Command.vb" />
+    <Compile Include="Utility\VMBase.vb" />
+    <Compile Include="WallM.vb" />
+    <Compile Include="WallMachGroupM.vb" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="My Project\Resources.resx">
@@ -185,30 +141,8 @@
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <Page Include="EgtDataGrid\EgtDataGrid.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="LoadingWnd\LoadingWndV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
-    <Page Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="OpenProjectFileDialog\OpenProjectFileDialogV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ViewPanel\ViewPanelV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </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/EgtDataGrid/DataGridColumnsIniFile.vb

@@ -1,82 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.Windows.Controls
-Imports System.Windows.Forms
-Imports EgtUILib
-Imports EgtWPFLib5
-
-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
-            ' 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)
-            ocColumns.Add(New EgtDataGridColumn(ParentDGName, sName, bReorder, bResize, bSort, bIsReadOnly, New DataGridLength(Width, WidthType), bVisible, bCanUserEditVisible, nSortDirection))
-         End If
-         colIndex += 1
-      End While
-      Return ocColumns.Count > 0
-   End Function
-
-   Public Function WriteColumnPrivateProfileParam(ParentDataGridName As String, DisplayIndex As String, sColumnParams As String) As Boolean
-      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

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

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb

@@ -1,604 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.Collections.Specialized
-Imports System.ComponentModel
-Imports System.Windows
-Imports System.Windows.Controls
-Imports System.Windows.Data
-Imports System.Windows.Controls.Primitives
-Imports System.Windows.Input
-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
-
-   Public Shadows Property BindingColumns As ObservableCollection(Of EgtDataGridColumn)
-      Get
-         Return CType(MyBase.GetValue(BindingColumnsProperty), ObservableCollection(Of EgtDataGridColumn))
-      End Get
-      Set(value As ObservableCollection(Of EgtDataGridColumn))
-         MyBase.SetValue(BindingColumnsProperty, value)
-      End Set
-   End Property
-
-   Public Shared ReadOnly BindingColumnsProperty As DependencyProperty = DependencyProperty.Register("BindingColumns", GetType(ObservableCollection(Of EgtDataGridColumn)), GetType(EgtDataGrid), New FrameworkPropertyMetadata(New ObservableCollection(Of EgtDataGridColumn), New PropertyChangedCallback(AddressOf OnDataGridColumnsPropertyChanged)) With {.BindsTwoWayByDefault = True})
-
-   Private Shared Sub OnDataGridColumnsPropertyChanged(ByVal source As DependencyObject, ByVal e As DependencyPropertyChangedEventArgs)
-      Dim context = TryCast(source, EgtDataGrid)
-      Dim oldItems = TryCast(e.OldValue, ObservableCollection(Of EgtDataGridColumn))
-
-      If oldItems IsNot Nothing Then
-
-         For index = 0 To oldItems.Count - 1
-            Dim Column As DataGridColumn = context.FindResource(oldItems(index))
-            context.Columns.Remove(Column)
-         Next
-
-         RemoveHandler oldItems.CollectionChanged, AddressOf context.collectionChanged
-      End If
-
-      Dim newItems = TryCast(e.NewValue, ObservableCollection(Of EgtDataGridColumn))
-
-      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
-         Next
-
-         AddHandler newItems.CollectionChanged, AddressOf context.collectionChanged
-      End If
-   End Sub
-
-   Private Sub collectionChanged(ByVal sender As Object, ByVal e As NotifyCollectionChangedEventArgs)
-      Select Case e.Action
-         Case NotifyCollectionChangedAction.Add
-
-            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
-               Next
-            End If
-
-         Case NotifyCollectionChangedAction.Remove
-
-            If e.OldItems IsNot Nothing Then
-
-               For Each one As EgtDataGridColumn In e.OldItems
-                  Dim col As DataGridColumn = CurrDataGrid.FindResource(one.Name)
-                  CurrDataGrid.Columns.Remove(col)
-               Next
-            End If
-
-         Case NotifyCollectionChangedAction.Move
-            'Dim col As DataGridColumn = CurrDataGrid.FindResource(BindingColumns(e.OldStartingIndex))
-            'col.DisplayIndex = e.NewStartingIndex
-            CurrDataGrid.Columns.Move(e.OldStartingIndex, e.NewStartingIndex)
-            CurrDataGrid.Columns(e.NewStartingIndex).DisplayIndex = e.NewStartingIndex
-            'Dim x = CurrDataGrid.Columns(e.OldStartingIndex).DisplayIndex
-         Case NotifyCollectionChangedAction.Reset
-            CurrDataGrid.Columns.Clear()
-
-            If e.NewItems IsNot Nothing Then
-
-               For Each one As DataGridColumn In e.NewItems
-                  Dim col As DataGridColumn = CurrDataGrid.FindResource(one)
-                  CurrDataGrid.Columns.Add(col)
-               Next
-            End If
-         Case NotifyCollectionChangedAction.Replace
-            Dim col As DataGridColumn = CurrDataGrid.FindResource(e.NewItems(0))
-            CurrDataGrid.Columns(e.NewStartingIndex) = col
-      End Select
-   End Sub
-
-   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
-      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
-
-   Private Sub CurrDataGrid_ColumnReordering(sender As Object, e As DataGridColumnEventArgs) Handles CurrDataGrid.ColumnReordering
-      ' conservo il vecchio indice in modo da effettuare lo scambio in BindingColumns una volta riordinate graficamente
-      OldIndex = e.Column.DisplayIndex
-   End Sub
-
-   Private Sub CurrDataGrid_ColumnReordered(sender As Object, e As DataGridColumnEventArgs) Handles CurrDataGrid.ColumnReordered
-      ' scambio le colonne in BindingColumns
-      BindingColumns.Move(OldIndex, e.Column.DisplayIndex)
-      ' scrivo tutte le colonne interessate dallo spostamento
-      ' (se OldIndex > e.Column.DisplayIndex, il ciclo non viene eseguito quindi lo faccio nell'altro senso)
-      For index = OldIndex To e.Column.DisplayIndex
-         BindingColumns(index).SaveDataGridColumn()
-      Next
-      For index = e.Column.DisplayIndex To OldIndex
-         BindingColumns(index).SaveDataGridColumn()
-      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
-
-End Class
-
-Public Class EgtDataGridColumn
-
-   Private m_dgColumn As DataGridColumn
-
-   Private Property m_ParentDataGridName As String
-   Public Property ParentDataGridName As String
-      Get
-         Return m_ParentDataGridName
-      End Get
-      Set(value As String)
-         m_ParentDataGridName = value
-      End Set
-   End Property
-
-   Private Property m_Name As String
-   Public Property Name As String
-      Get
-         Return m_Name
-      End Get
-      Set(value As String)
-         m_Name = value
-      End Set
-   End Property
-
-   Private Property m_Width As DataGridLength
-   Public Property Width As DataGridLength
-      Get
-         Return m_dgColumn.Width
-      End Get
-      Set(value As DataGridLength)
-         If Not IsNothing(m_dgColumn) Then
-            m_dgColumn.Width = value
-         Else
-            m_Width = value
-         End If
-      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
-         Return m_dgColumn.DisplayIndex
-      End Get
-      Set(value As Integer)
-         If Not IsNothing(m_dgColumn) Then
-            m_dgColumn.DisplayIndex = value
-         Else
-            m_DisplayIndex = value
-         End If
-      End Set
-   End Property
-
-   Private Property m_OrigIsReadOnly As Boolean = True
-   Private Property m_IsReadOnly As Boolean = True
-   Public Property IsReadOnly As Boolean
-      Get
-         Return m_dgColumn.IsReadOnly
-      End Get
-      Set(value As Boolean)
-         If Not IsNothing(m_dgColumn) Then
-            m_dgColumn.IsReadOnly = value
-         Else
-            m_IsReadOnly = value
-         End If
-      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
-         Return m_dgColumn.CanUserReorder
-      End Get
-      Set(value As Boolean)
-         If Not IsNothing(m_dgColumn) Then
-            m_dgColumn.CanUserReorder = value
-         Else
-            m_CanUserReorder = value
-         End If
-         SaveDataGridColumn()
-      End Set
-   End Property
-
-   Friend OldCanUserResize As Boolean?
-   Private m_CanUserResize As Boolean
-   Public Property CanUserResize As Boolean
-      Get
-         Return m_dgColumn.CanUserResize
-      End Get
-      Set(value As Boolean)
-         If Not IsNothing(m_dgColumn) Then
-            m_dgColumn.CanUserResize = value
-         Else
-            m_CanUserResize = value
-         End If
-         SaveDataGridColumn()
-      End Set
-   End Property
-
-   Private m_CanUserSort As Boolean
-   Public Property CanUserSort As Boolean
-      Get
-         Return m_dgColumn.CanUserSort
-      End Get
-      Set(value As Boolean)
-         If Not IsNothing(m_dgColumn) Then
-            m_dgColumn.CanUserSort = value
-         Else
-            m_CanUserSort = value
-         End If
-         SaveDataGridColumn()
-      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)
-      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
-   End Sub
-
-   Friend Sub InitColumn(dgColumn As DataGridColumn)
-      m_dgColumn = dgColumn
-      m_dgColumn.CanUserReorder = m_CanUserReorder
-      m_dgColumn.CanUserResize = m_CanUserResize
-      m_dgColumn.CanUserSort = m_CanUserSort
-      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)
-      bOk = WriteColumnPrivateProfileParam(ParentDataGridName, DisplayIndex, sColumnParams)
-      Return bOk
-   End Function
-
-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/Lib/MachGroupPanelM.vb

@@ -119,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
@@ -129,13 +128,6 @@ 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

EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb

@@ -21,7 +21,7 @@ Public Class NewMachGroupPanelVM
       End Get
    End Property
 
-   Protected m_MachGroupVMList As ObservableCollection(Of MachGroupVM)
+   Private m_MachGroupVMList As ObservableCollection(Of MachGroupVM)
    Public Property MachGroupVMList As ObservableCollection(Of MachGroupVM)
       Get
          Return m_MachGroupVMList
@@ -31,7 +31,7 @@ Public Class NewMachGroupPanelVM
       End Set
    End Property
 
-   Protected m_SelectedMachGroup As MachGroupVM
+   Private m_SelectedMachGroup As MachGroupVM
    Public Property SelectedMachGroup As MachGroupVM
       Get
          Return m_SelectedMachGroup
@@ -94,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
@@ -273,7 +275,6 @@ 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

EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb

@@ -1,101 +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 New LoadingWndV(Nothing, m_LoadingWndVM)
-                               ' 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,233 +0,0 @@
-Imports System.Timers
-Imports System.Windows
-Imports System.Windows.Input
-Imports System.Windows.Threading
-Imports EgtBEAMWALL.Core
-Imports EgtUILib
-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()
-      '' chiedo conferma
-      'If MessageBox.Show("Are you sure you want to stop the nesting?", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then Return
-      '' fermo il nesting
-      'Map.refOptimizePanelVM.m_StopNesting = True
-      '' fermo timer e chiudo finestra
-      'CloseNesting()
-   End Sub
-
-#End Region ' Cancel
-
-#End Region    ' COMMANDS
-
-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,547 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
-Imports System.Windows.Input
-Imports System.Windows.Media
-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
-      NewMachGroupM.m_Id = nId
-      NewMachGroupM.m_Name = sName
-      NewMachGroupM.m_Machine = sMachine
-      NewMachGroupM.m_nType = Type
-      If NewMachGroupM.m_nType = MachineType.BEAM Then
-         EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARLEN, NewMachGroupM.m_dL)
-         EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARHEIGHT, NewMachGroupM.m_dH)
-         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
-      NewMachGroupM.m_Id = EgtAddMachGroup(sName, sMachine)
-      If NewMachGroupM.m_Id = GDB_ID.NULL Then Return Nothing
-      NewMachGroupM.m_Name = sName
-      NewMachGroupM.m_Machine = sMachine
-      NewMachGroupM.m_nType = 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,449 +0,0 @@
-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!!")
-         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
-      '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()
-      ' 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
-            ' 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
-                     If EgtExistsInfo(nOutlineId, MGR_FTR_PRID) Then
-                        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 Not EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId) Then
-                              EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
-                              nPRId = nGlobPRId
-                              nGlobPRId += 1
-                           End If
-                           Dim sKey As String = nPRId & "." & nPRC
-                           QArray(Duploindex).Add(sKey, New Dictionary(Of String, String))
-                           For QIndex = 1 To 10
-                              Dim QKey As String = "Q" & QIndex.ToString("D2")
-                              Dim QValue As Integer = 0
-                              If EgtGetInfo(nOutlineId, QKey, QValue) Then
-                                 QArray(Duploindex)(sKey).Add(QKey, QValue)
-                              End If
-                           Next
-                        End If
-                        nOutlineId = EgtGetNext(nOutlineId)
-                     End While
-                  End If
-                  ' ciclo sulle feature
-                  Dim nFeatureLayer As Integer = EgtGetFirstNameInGroup(DuploArray(Duploindex), PROCESSINGS)
-                  If nFeatureLayer <> GDB_ID.NULL Then
-                     Dim nFeatureId As Integer = EgtGetFirstInGroup(nFeatureLayer)
-                     While nFeatureId <> GDB_ID.NULL
-                        ' verifico che sia feature
-                        Dim nPRC As Integer
-                        If EgtGetInfo(nFeatureId, MGR_FTR_PRC, nPRC) Then
-                           nPRId = 0
-                           EgtGetInfo(nFeatureId, MGR_FTR_PRID, nPRId)
-                           Dim sKey As String = nPRId & "." & nPRC
-                           QArray(Duploindex).Add(sKey, New Dictionary(Of String, String))
-                           For QIndex = 1 To 10
-                              Dim QKey As String = "Q" & QIndex.ToString("D2")
-                              Dim QValue As Integer = 0
-                              If EgtGetInfo(nFeatureId, QKey, QValue) Then
-                                 QArray(Duploindex)(sKey).Add(QKey, QValue)
-                              End If
-                           Next
-                        End If
-                        nFeatureId = EgtGetNext(nFeatureId)
-                     End While
-                  End If
-               End If
-            Next
-            ' aggiornamento dei Duplo
-            EgtDuploUpdate(nPartId)
-            ' ripristino i valori di ROT e FLIP
-            For Duploindex = 0 To DuploArray.Length - 1
-               ' ripristino info rot e flip
-               EgtSetInfo(DuploArray(Duploindex), MGR_PRT_ROT, RotArray(Duploindex))
-               EgtSetInfo(DuploArray(Duploindex), MGR_PRT_FLIP, FlipArray(Duploindex))
-               If nBWType = BWType.WALL Then
-                  ' ciclo sugli outline
-                  nOutlineLayer = EgtGetFirstNameInGroup(DuploArray(Duploindex), OUTLINE)
-                  If nOutlineLayer <> GDB_ID.NULL Then
-                     Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutlineLayer)
-                     While nOutlineId <> GDB_ID.NULL
-                        ' verifico che sia feature
-                        Dim nPRC As Integer
-                        If EgtGetInfo(nOutlineId, MGR_FTR_PRC, nPRC) Then
-                           nPRId = 0
-                           EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
-                           Dim sKey As String = nPRId & "." & nPRC
-                           ' ripristino parametri Q
-                           If QArray(Duploindex).ContainsKey(sKey) Then
-                              For Each QPar In QArray(Duploindex)(sKey)
-                                 EgtSetInfo(nOutlineId, QPar.Key, QPar.Value)
-                              Next
-                           End If
-                        End If
-                        nOutlineId = EgtGetNext(nOutlineId)
-                     End While
-                  End If
-                  ' ciclo sulle feature
-                  Dim nFeatureLayer As Integer = EgtGetFirstNameInGroup(DuploArray(Duploindex), PROCESSINGS)
-                  If nFeatureLayer <> GDB_ID.NULL Then
-                     Dim nFeatureId As Integer = EgtGetFirstInGroup(nFeatureLayer)
-                     While nFeatureId <> GDB_ID.NULL
-                        ' verifico che sia feature
-                        Dim nPRC As Integer
-                        If EgtGetInfo(nFeatureId, MGR_FTR_PRC, nPRC) Then
-                           nPRId = 0
-                           EgtGetInfo(nFeatureId, MGR_FTR_PRID, nPRId)
-                           Dim sKey As String = nPRId & "." & nPRC
-                           ' ripristino parametri Q
-                           If QArray(Duploindex).ContainsKey(sKey) Then
-                              For Each QPar In QArray(Duploindex)(sKey)
-                                 EgtSetInfo(nFeatureId, QPar.Key, QPar.Value)
-                              Next
-                           End If
-                        End If
-                        nFeatureId = EgtGetNext(nFeatureId)
-                     End While
-                  End If
-               End If
-            Next
-         End If
-         nPartId = EgtGetNextPart(nPartId)
-      End While
-      If bTotIsModified Then
-         Dim CurrFilePath As String = ""
-         EgtGetCurrFilePath(CurrFilePath)
-         EgtSaveFile(CurrFilePath, NGE.CMPTEXT)
-      End If
-   End Sub
-
-   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)
-
-
-
-                  '' elimino vecchio grezzo ed eseguo script creazione nuovo
-                  'Dim nRawId As Integer = EgtGetFirstRawPart()
-                  'While nRawId <> GDB_ID.NULL
-                  '   EgtRemovePartFromRawPart(EgtGetFirstPartInRawPart(nRawId))
-                  '   EgtRemoveRawPart(nRawId)
-                  '   nRawId = EgtGetFirstRawPart()
-                  'End While
-                  'If Not ExecBeam(Map.refMainWindowVM.MainWindowM.sTempDir, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False) Then Return False
-
-
-
-                  ' lo setto come corrente
-                  EgtSetCurrMachGroup(nMachGroupId)
-                  ' elimino pezzo copia
-                  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
-
-
-
-      'Dim nRawId As Integer = GDB_ID.NULL
-      'If EgtGetInfo(nDuploId, GDB_SI_LIST, nRawId) AndAlso nRawId > 0 Then
-      '   Return nRawId
-      'Else
-      '   Return GDB_ID.NULL
-      'End If
-   End Function
-
-#End Region    ' METHODS
-
-End Class

EgtBEAMWALL.Core/MachGroupModel/PartM.vb

@@ -1,646 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
-Imports System.Windows.Input
-Imports System.Windows.Media
-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
-         'Return m_dPOSY
-      End Get
-      Set(value As Double)
-         m_dPOSY = value
-      End Set
-   End Property
-
-   Protected m_dROT As Double
-   Public Property dROT As Double
-      Get
-         Return m_dROT
-      End Get
-      Set(value As Double)
-         m_dROT = value
-      End Set
-   End Property
-
-   Protected m_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)
-      NewPartM.m_nType = Type
-      NewPartM.m_nRawPartId = nRawPartId
-      ' leggo info pezzo
-      EgtGetInfo(nPartId, BTL_PRT_PROJ, NewPartM.m_nProjId)
-      EgtGetInfo(nPartId, BTL_PRT_PDN, NewPartM.m_nPDN)
-      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)
-      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)
-         EgtGetInfo(nPartId, MGR_PRT_ROT, NewPartM.m_dROT)
-         EgtGetInfo(nPartId, MGR_PRT_FLIP, NewPartM.m_nFLIP)
-      End If
-      ' leggo volume 
-      If Not EgtGetInfo(nPartId, BTL_PRT_VOLUME, NewPartM.dVolume) Then
-         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
-
-#End Region    ' Features
-
-#End Region    ' METHODS
-
-End Class

EgtBEAMWALL.Core/MachGroupPanel/BeamMachGroupVM.vb

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

EgtBEAMWALL.Core/MachGroupPanel/BeamVM.vb

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

EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupPanelVM.vb

@@ -1,210 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.ComponentModel
-Imports System.IO
-Imports EgtBEAMWALL.Core
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public MustInherit Class MyMachGroupPanelVM
-   Inherits NewMachGroupPanelVM
-
-#Region "FIELDS & PROPERTIES"
-
-   Public ReadOnly Property m_MyMachGroupPanelM As MyMachGroupPanelM
-      Get
-         Return m_MachGroupPanelM
-      End Get
-   End Property
-
-   Public ReadOnly Property sTotMachGroups As String
-      Get
-         Return m_MachGroupVMList.Count()
-      End Get
-   End Property
-
-   Public ReadOnly Property sTotVolume As String
-      Get
-         Dim dMMTotVolume As Double = m_MachGroupVMList.Sum(CType(Function(x As MyMachGroupVM) x.dUnitVolume, Func(Of MachGroupVM, Double)))
-         Return If(EgtUiUnitsAreMM(), DoubleToString(dMMTotVolume / 1000000000, 3), DoubleToString(dMMTotVolume * (12 / ONEINCH), 3))
-      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()
-      End Get
-   End Property
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONSTRUCTOR"
-
-   Sub New(MachGroupPanelM As MachGroupPanelM)
-      MyBase.New(MachGroupPanelM)
-      ' Creo riferimento a questa classe in Map
-      CoreMap.SetRefMachGroupPanelVM(Me)
-   End Sub
-
-#End Region    ' CONSTRUCTOR
-
-#Region "METHODS"
-
-   Protected MustOverride Overrides Sub CreateMachGroupVMList()
-
-   Public Overrides Function InitMachGroupList(Optional bUseDefaults As Boolean = False) As Boolean
-      ' Svuoto precedente lista di MachGroup
-      MachGroupVMList.Clear()
-      ' aggiorno copie
-      MyMachGroupPanelM.UpdateDuplo()
-      ' verifico se esistono già gruppi di lavorazione o se devo creare il primo
-      Dim bOk As Boolean = False
-      Dim nId = EgtGetFirstMachGroup()
-      If nId <> GDB_ID.NULL Then
-         bOk = EgtSetCurrMachGroup(nId)
-      End If
-      If Not bOk Then Return True
-      ' carico lista dei gruppi di lavorazione
-      m_MachGroupPanelM.MachGroupMList = MyMachGroupPanelM.LoadMyMachGroups(CoreMap.refMachinePanelVM.MachineList.ToList())
-      ' elimino copie da cancellare
-      MyMachGroupPanelM.DeleteDuplo()
-      If bOk Then SelectedMachGroup = MachGroupVMList(0)
-      EgtZoom(ZM.ALL)
-      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
-         'If Not ExecBeam(Map.refMainWindowVM.MainWindowM.sTempDir, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False) Then Return False
-
-      Next
-   End Sub
-
-   'Public Overrides Sub AddMachGroup()
-   '   Dim MyMachGroupM As MyMachGroupM = m_MyMachGroupPanelM.NewMyMachGroup(CurrentMachine.sMachineName, Map.refProjectVM.BTLStructureVM.nPROJTYPE)
-   '   ' e lo seleziono
-   '   SelectedMachGroup = MachGroupVMList.FirstOrDefault(Function(x) x.MachGroupM Is MyMachGroupM)
-   'End Sub
-
-   Public Overrides Function OnPreSetCurrMachGroup() As Boolean
-      EgtSetCurrentContext(CoreMap.refSceneHostVM.MainScene.GetCtx())
-      Return True
-   End Function
-
-   Public Overrides Function OnPostSetCurrMachGroup() As Boolean
-      ' resetto eventuale selezione pezzo
-      Dim SelMachGroup As MyMachGroupVM = DirectCast(SelectedMachGroup, MyMachGroupVM)
-      SelMachGroup.SelPart = Nothing
-      ' Imposto vista solo tavola
-      EgtSetMachineLook(MCH_LOOK.TAB)
-      Core.ViewPanelVM.BWSetView(If(ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), 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
-         SelectedMachGroup = MachGroupVMList(MachGroupVMList.Count - 1)
-      End If
-   End Sub
-
-   Public Function GetLastMachGroup() As MachGroupVM
-      If Not IsNothing(Me) AndAlso Not IsNothing(MachGroupVMList) AndAlso MachGroupVMList.Count > 0 Then
-         Return MachGroupVMList(MachGroupVMList.Count - 1)
-      End If
-      Return Nothing
-   End Function
-
-   ' 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
-   Public Sub CalcGlobalUpdate()
-      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 OnMachGroupVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
-      Select Case e.PropertyName
-         Case NameOf(sender.nProduction_State)
-            NotifyPropertyChanged(NameOf(sTotTime))
-            NotifyPropertyChanged(NameOf(sRemainingTime))
-      End Select
-   End Sub
-
-#End Region    ' EVENTS
-
-End Class

EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupVM.vb

@@ -1,723 +0,0 @@
-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
-      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
-      End Get
-   End Property
-
-   Public Property dL As Double
-      Get
-         Return MyMachGroupM.dL
-      End Get
-      Set(value As Double)
-         MyMachGroupM.dL = value
-      End Set
-   End Property
-
-   Public Property dW As Double
-      Get
-         Return MyMachGroupM.dW
-      End Get
-      Set(value As Double)
-         MyMachGroupM.dW = value
-      End Set
-   End Property
-
-   Public Property dH As Double
-      Get
-         Return MyMachGroupM.dH
-      End Get
-      Set(value As Double)
-         MyMachGroupM.dH = value
-      End Set
-   End Property
-
-   Public Property dtStartTime As DateTime
-      Get
-         Return MyMachGroupM.dtStartTime
-      End Get
-      Set(value As DateTime)
-         MyMachGroupM.dtStartTime = value
-         NotifyPropertyChanged(NameOf(Production_Background))
-      End Set
-   End Property
-
-   Public Property dtEndTime As DateTime
-      Get
-         Return MyMachGroupM.dtEndTime
-      End Get
-      Set(value As DateTime)
-         MyMachGroupM.dtEndTime = value
-         NotifyPropertyChanged(NameOf(Production_Background))
-      End Set
-   End Property
-
-   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)
-      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)
-      End Get
-   End Property
-
-   Public ReadOnly Property sUsage As String
-      Get
-         Return DoubleToString(dUsage, 3)
-      End Get
-   End Property
-
-   Public ReadOnly Property sWaste As String
-      Get
-         Return LenToString(dWaste, 3)
-      End Get
-   End Property
-
-   Public Property sMATERIAL As String
-      Get
-         Return MyMachGroupM.sMATERIAL
-      End Get
-      Set(value As String)
-         MyMachGroupM.sMATERIAL = value
-      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)
-      Get
-         Return m_PartVMList
-      End Get
-      Set(value As ObservableCollection(Of PartVM))
-         m_PartVMList = value
-      End Set
-   End Property
-
-   Protected m_SelPart As PartVM
-   Public Overridable Property SelPart As PartVM
-      Get
-         Return m_SelPart
-      End Get
-      Set(value As PartVM)
-         m_SelPart = value
-         ' seleziono pezzo
-         EgtDeselectAll()
-         If Not IsNothing(value) Then EgtSelectObj(SelPart.nPartId)
-         EgtDraw()
-         NotifyPropertyChanged(NameOf(SelPart))
-      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
-      End Get
-   End Property
-
-   Public ReadOnly Property nCALC_FALL As Integer
-      Get
-         Return MyMachGroupM.nCALC_FALL
-      End Get
-   End Property
-
-   Public ReadOnly Property sCALC_MSG As String
-      Get
-         Return MyMachGroupM.sCALC_MSG
-      End Get
-   End Property
-
-   Public Property nCALC_ROT As Integer
-      Get
-         Return MyMachGroupM.nCALC_ROT
-      End Get
-      Set(value As Integer)
-         MyMachGroupM.nCALC_ROT = value
-      End Set
-   End Property
-
-   Public Property nCALC_TIME As Integer
-      Get
-         Return MyMachGroupM.nCALC_TIME
-      End Get
-      Set(value As Integer)
-         MyMachGroupM.nCALC_TIME = value
-      End Set
-   End Property
-
-   Public Property nGlobalState As CalcStates
-      Get
-         Return MyMachGroupM.nCALC_GlobalState
-      End Get
-      Set(value As CalcStates)
-         MyMachGroupM.nCALC_GlobalState = value
-      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
-      End Get
-      Set(value As CalcStates)
-         MyMachGroupM.nCALC_State = value
-      End Set
-   End Property
-
-   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
-      End Get
-   End Property
-
-   Public ReadOnly Property CALC_ROT_Visibility As Visibility
-      Get
-         Return If(MyMachGroupM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
-
-   Public ReadOnly Property CALC_FALL_Visibility As Visibility
-      Get
-         Return If(MyMachGroupM.nCALC_FALL <> 0, Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
-
-   Public ReadOnly Property CALC_ERR_Letter As String
-      Get
-         Select Case MyMachGroupM.nCALC_GlobalState
-            Case CalcStates.COLLISION
-               Return "c"
-            Case CalcStates.ERROR_
-               Return "e"
-            Case CalcStates.WARNING
-               Return "w"
-            Case CalcStates.INFO
-               Return "i"
-            Case Else
-               Return ""
-         End Select
-      End Get
-   End Property
-
-   Public ReadOnly Property CALC_ERR_Foreground As SolidColorBrush
-      Get
-         Select Case MyMachGroupM.m_nCALC_GlobalState
-            Case CalcStates.ERROR_, CalcStates.COLLISION
-               Return Brushes.Red
-            Case CalcStates.WARNING
-               Return Brushes.Orange
-            Case CalcStates.INFO
-               Return Brushes.Green
-            Case Else
-               Return Brushes.Red
-         End Select
-      End Get
-   End Property
-
-#End Region    ' Calc
-
-#Region "Supervisor"
-
-   Public Property nProduction_State As ItemState
-      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
-      End Get
-   End Property
-
-   ' indica se il pezzo deve essere tagliato
-   Protected m_bToBeProduced As Boolean = False
-   Public ReadOnly Property bToBeProduced As Boolean
-      Get
-         Return m_bToBeProduced
-      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
-      Get
-         Return m_bToBeProduced AndAlso m_bCNReCalculated
-      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
-
-   Private m_cc As StateChangeEventArgs
-
-   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"
-
-   Sub New(MyMachGroupM As MyMachGroupM)
-      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 Overridable Function Copy() As MyMachGroupVM
-      Return Nothing
-   End Function
-
-   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
-      Return Nothing
-   End Function
-
-#End Region    ' Machgroup
-
-#Region "Calc"
-
-   ' funzione che aggiorna lo stato e gli errori dopo calcolo
-   Public Sub CalcMachGroupUpdate(ERR As Integer, ROT As Integer, MSG As String)
-      EgtSetInfo(Id, ITG_PROD_ERR, ERR, True)
-      EgtSetInfo(Id, ITG_PROD_MSG, MSG, True)
-      EgtSetInfo(Id, ITG_PROD_ROT, ROT, True)
-      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
-      NotifyPropertyChanged(NameOf(Calc_Background))
-   End Sub
-
-   Public Sub ResetCalcMachGroup()
-      EgtRemoveInfo(Id, ITG_PROD_ERR)
-      EgtRemoveInfo(Id, ITG_PROD_MSG)
-      EgtRemoveInfo(Id, ITG_PROD_ROT)
-      MyMachGroupM.nCALC_GlobalState = CalcStates.NOTCALCULATED
-      MyMachGroupM.nCALC_State = CalcStates.NOTCALCULATED
-      MyMachGroupM.nCALC_GlobalERR = 0
-      MyMachGroupM.nCALC_ERR = 0
-      MyMachGroupM.nCALC_ROT = 0
-      MyMachGroupM.nCALC_FALL = 0
-      MyMachGroupM.sCALC_MSG = ""
-      NotifyPropertyChanged(NameOf(Calc_Background))
-      NotifyPropertyChanged(NameOf(CALC_FALL_Visibility))
-      NotifyPropertyChanged(NameOf(CALC_ROT_Visibility))
-      NotifyPropertyChanged(NameOf(CALC_ERR_Letter))
-      NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
-   End Sub
-
-   ' funzione che aggiorna lo stato e gli errori dopo calcolo
-   Public Overridable 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
-            Exit For
-         ElseIf Part.nCALC_GlobalState > MyMachGroupM.nCALC_GlobalState Then
-            MyMachGroupM.nCALC_GlobalState = Part.nCALC_GlobalState
-            MyMachGroupM.nCALC_GlobalERR = Part.nCALC_GlobalERR
-         End If
-         If Part.nCALC_GlobalState > MyMachGroupM.bCALC_PartsGlobalState Then
-            MyMachGroupM.bCALC_PartsGlobalState = Part.nCALC_GlobalState
-         End If
-         If Part.nCALC_ROT <> 0 Then
-            MyMachGroupM.m_nCALC_ROT = Part.nCALC_ROT
-         End If
-         If Part.nCALC_FALL <> 0 Then
-            MyMachGroupM.nCALC_FALL = Part.nCALC_FALL
-         End If
-      Next
-
-      NotifyPropertyChanged(NameOf(Calc_Background))
-      NotifyPropertyChanged(NameOf(CALC_FALL_Visibility))
-      NotifyPropertyChanged(NameOf(CALC_ROT_Visibility))
-      NotifyPropertyChanged(NameOf(CALC_ERR_Letter))
-      NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
-   End Sub
-
-   Public Sub CalcTimeUpdate(TIME As Integer)
-      EgtSetInfo(Id, ITG_PROD_TIME, TIME, True)
-      nCALC_TIME = TIME
-      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()
-
-#End Region    ' Parts
-
-#End Region    ' METHODS
-
-#Region "COMMANDS"
-
-#Region "DeleteMachGroup"
-
-   ' Returns a command that manage the MainWindow_Unloaded command
-   Public ReadOnly Property DeleteMachGroup_Command As ICommand
-      Get
-         If m_cmdDeleteMachGroup Is Nothing Then
-            m_cmdDeleteMachGroup = New Command(AddressOf DeleteMachGroupCmd)
-         End If
-         Return m_cmdDeleteMachGroup
-      End Get
-   End Property
-
-   Public Sub DeleteMachGroupCmd()
-      DeleteMachGroup()
-   End Sub
-
-   Public Overridable Sub DeleteMachGroup(Optional bMultipleCommand As Boolean = False)
-      ' elimino tutte le copie
-      Dim nRawPartId As Integer = EgtGetFirstRawPart()
-      Dim nBeamId As Integer = EgtGetFirstPartInRawPart(nRawPartId)
-      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 ' 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,644 +0,0 @@
-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 PartVM
-   Inherits VMBase
-
-#Region "FIELDS & PROPERTIES"
-
-#Region "General"
-
-   Protected m_PartM As PartM
-   Public ReadOnly Property PartM As PartM
-      Get
-         Return m_PartM
-      End Get
-   End Property
-
-   Protected m_ParentMachGroupVM As MyMachGroupVM
-   Public ReadOnly Property ParentMachGroupVM As MyMachGroupVM
-      Get
-         Return m_ParentMachGroupVM
-      End Get
-   End Property
-
-   ' Id geometrico del pezzo
-   Public ReadOnly Property nPartId As Integer
-      Get
-         Return m_PartM.nPartId
-      End Get
-   End Property
-
-   ' Proj del pezzo
-   Public Property nProjId As Integer
-      Get
-         Return m_PartM.nProjId
-      End Get
-      Set(value As Integer)
-         m_PartM.nProjId = value
-      End Set
-   End Property
-
-   ' Info del pezzo
-   Public ReadOnly Property nPDN As Integer
-      Get
-         Return m_PartM.nPDN
-      End Get
-   End Property
-
-   Public ReadOnly Property sNAM As String
-      Get
-         Return m_PartM.sNAM
-      End Get
-   End Property
-
-   Public ReadOnly Property sL As String
-      Get
-         Return LenToString(m_PartM.dL, 3)
-      End Get
-   End Property
-   Public Property dL As Double
-      Get
-         Return m_PartM.dL
-      End Get
-      Set(value As Double)
-         m_PartM.dL = value
-      End Set
-   End Property
-
-   Public ReadOnly Property sW As String
-      Get
-         Return LenToString(m_PartM.dW, 3)
-      End Get
-   End Property
-   Public Property dW As Double
-      Get
-         Return m_PartM.dW
-      End Get
-      Set(value As Double)
-         m_PartM.dW = value
-      End Set
-   End Property
-
-   Public ReadOnly Property sH As String
-      Get
-         Return LenToString(m_PartM.dH, 3)
-      End Get
-   End Property
-   Public Property dH As Double
-      Get
-         Return m_PartM.dH
-      End Get
-      Set(value As Double)
-         m_PartM.dH = value
-      End Set
-   End Property
-
-   Public Overridable Property sPOSX As String
-      Get
-         Return LenToString(m_PartM.dPOSX, 3)
-      End Get
-      Set(value As String)
-         StringToLenAdv(value, m_PartM.dPOSX, True)
-      End Set
-   End Property
-   Public Property dPOSX As Double
-      Get
-         Return m_PartM.dPOSX
-      End Get
-      Set(value As Double)
-         m_PartM.dPOSX = value
-         NotifyPropertyChanged(NameOf(sPOSX))
-      End Set
-   End Property
-
-   Public Property nCNT As Integer
-      Get
-         Return m_PartM.nCNT
-      End Get
-      Set(value As Integer)
-         m_PartM.nCNT = value
-      End Set
-   End Property
-
-   Public ReadOnly Property sINVERTED As String
-      Get
-         Return m_PartM.nINVERTED & "°"
-      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
-      End Get
-      Set(value As String)
-         m_PartM.sMATERIAL = value
-      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
-      End Get
-   End Property
-
-   Public Property nCALC_GlobalERR As Integer
-      Get
-         Return m_PartM.nCALC_GlobalERR
-      End Get
-      Set(value As Integer)
-         m_PartM.nCALC_GlobalERR = value
-      End Set
-   End Property
-
-   Public Property nCALC_State As CalcStates
-      Get
-         Return m_PartM.nCALC_State
-      End Get
-      Set(value As CalcStates)
-         m_PartM.nCALC_State = value
-      End Set
-   End Property
-
-   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
-      End Get
-   End Property
-
-   Public ReadOnly Property CALC_ROT_Visibility As Visibility
-      Get
-         Return If(m_PartM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
-
-   Public ReadOnly Property CALC_FALL_Visibility As Visibility
-      Get
-         Return If(m_PartM.nCALC_FALL <> 0, Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
-
-   Public ReadOnly Property CALC_ERR_Letter As String
-      Get
-         Select Case m_PartM.nCALC_GlobalState
-            Case CalcStates.COLLISION
-               Return "c"
-            Case CalcStates.ERROR_
-               Return "e"
-            Case CalcStates.WARNING
-               Return "w"
-            Case CalcStates.INFO
-               Return "i"
-            Case Else
-               Return ""
-         End Select
-      End Get
-   End Property
-
-   Public ReadOnly Property CALC_ERR_Foreground 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
-               Return Brushes.Green
-            Case Else
-               Return Brushes.Red
-         End Select
-      End Get
-   End Property
-
-   Public ReadOnly Property nCALC_ERR As Integer
-      Get
-         Return m_PartM.nCALC_ERR
-      End Get
-   End Property
-
-   Public ReadOnly Property sCALC_MSG As String
-      Get
-         Return m_PartM.sCALC_MSG
-      End Get
-   End Property
-
-   Public Property nCALC_ROT As Integer
-      Get
-         Return m_PartM.nCALC_ROT
-      End Get
-      Set(value As Integer)
-         m_PartM.nCALC_ROT = value
-      End Set
-   End Property
-
-   Public Property nCALC_FALL As Integer
-      Get
-         Return m_PartM.nCALC_FALL
-      End Get
-      Set(value As Integer)
-         m_PartM.nCALC_FALL = value
-      End Set
-   End Property
-
-   Public Property nCALC_TIME As Integer
-      Get
-         Return m_PartM.nCALC_TIME
-      End Get
-      Set(value As Integer)
-         m_PartM.nCALC_TIME = value
-      End Set
-   End Property
-
-#End Region    ' Calc
-
-#Region "Supervisor"
-
-   Public Property nProduction_State As ItemState
-      Get
-         Return m_PartM.nProductionState
-      End Get
-      Set(value As ItemState)
-         m_PartM.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
-               Return Brushes.White
-            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 Property dtStartTime As DateTime
-      Get
-         Return m_PartM.dtStartTime
-      End Get
-      Set(value As DateTime)
-         m_PartM.dtStartTime = value
-         NotifyPropertyChanged(NameOf(Production_Background))
-      End Set
-   End Property
-
-   Public Property dtEndTime As DateTime
-      Get
-         Return m_PartM.dtEndTime
-      End Get
-      Set(value As DateTime)
-         m_PartM.dtEndTime = value
-         NotifyPropertyChanged(NameOf(Production_Background))
-      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
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONSTRUCTOR"
-
-   Sub New(PartM As PartM)
-      m_PartM = PartM
-      AddHandler m_PartM.BTLFeatureAdded, AddressOf OnBTLFeatureAdded
-      CreateBTLFeatureVMList()
-   End Sub
-
-   Sub New(PartM As PartM, ParentMachGroupVM As MyMachGroupVM)
-      m_PartM = PartM
-      m_ParentMachGroupVM = ParentMachGroupVM
-      AddHandler m_PartM.BTLFeatureAdded, AddressOf OnBTLFeatureAdded
-      CreateBTLFeatureVMList()
-      ' Aggiorno stato da stati feature
-      CalcGlobalUpdate()
-      NotifyPropertyChanged(NameOf(CALC_FALL_Visibility))
-   End Sub
-
-#End Region    ' CONSTRUCTOR
-
-#Region "METHODS"
-
-#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)
-      EgtSetInfo(nPartId, ITG_PROD_MSG, MSG, True)
-      EgtSetInfo(nPartId, ITG_PROD_ROT, ROT, True)
-      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
-      NotifyPropertyChanged(NameOf(Calc_Background))
-   End Sub
-
-   Public Sub ResetCalcPart()
-      EgtRemoveInfo(nPartId, ITG_PROD_ERR)
-      EgtRemoveInfo(nPartId, ITG_PROD_MSG)
-      EgtRemoveInfo(nPartId, ITG_PROD_ROT)
-      EgtRemoveInfo(nPartId, ITG_PROD_FALL)
-      m_PartM.nCALC_GlobalState = CalcStates.NOTCALCULATED
-      m_PartM.nCALC_State = CalcStates.NOTCALCULATED
-      m_PartM.nCALC_GlobalERR = 0
-      m_PartM.nCALC_ERR = 0
-      m_PartM.nCALC_ROT = 0
-      m_PartM.nCALC_FALL = 0
-      m_PartM.sCALC_MSG = ""
-      NotifyPropertyChanged(NameOf(Calc_Background))
-      NotifyPropertyChanged(NameOf(CALC_FALL_Visibility))
-      NotifyPropertyChanged(NameOf(CALC_ROT_Visibility))
-      NotifyPropertyChanged(NameOf(CALC_ERR_Letter))
-      NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
-      ParentMachGroupVM.ResetCalcMachGroup()
-   End Sub
-
-   Public Sub CalcFallUpdate(FALL As Integer)
-      EgtSetInfo(nPartId, ITG_PROD_FALL, FALL, True)
-      m_PartM.nCALC_FALL = FALL
-      NotifyPropertyChanged(NameOf(nCALC_FALL))
-      NotifyPropertyChanged(NameOf(CALC_FALL_Visibility))
-   End Sub
-
-   ' funzione che aggiorna lo stato e gli errori dopo calcolo
-   Public Sub CalcGlobalUpdate()
-      m_PartM.nCALC_GlobalState = nCALC_State
-      For Each Feature In FeatureVMList
-         If Not Feature.bDO Then Continue For
-         If Feature.nState > m_PartM.nCALC_GlobalState Then
-            m_PartM.nCALC_GlobalState = Feature.nState
-            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))
-      NotifyPropertyChanged(NameOf(CALC_ROT_Visibility))
-      NotifyPropertyChanged(NameOf(CALC_ERR_Letter))
-      NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
-   End Sub
-
-#End Region    ' Calc
-
-#End Region    ' METHODS
-
-#Region "COMMANDS"
-
-#Region "DeletePart"
-
-   ' Returns a command that manage the MainWindow_Unloaded command
-   Public ReadOnly Property DeletePart_Command() As ICommand
-      Get
-         If m_cmdDeletePart Is Nothing Then
-            m_cmdDeletePart = New Command(AddressOf DeletePart)
-         End If
-         Return m_cmdDeletePart
-      End Get
-   End Property
-
-   ' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
-   Public Overridable Sub DeletePart()
-   End Sub
-
-#End Region ' DeletePart
-
-#End Region    ' COMMANDS
-
-#Region "EVENTS"
-
-   Public 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)
-      If Not IsNothing(e.NewItems) AndAlso e.NewItems.Count > 0 Then
-         For Each BTLFeatureVM As BTLFeatureVM In e.NewItems
-            AddHandler BTLFeatureVM.PropertyChanged, AddressOf OnBTLFeatureVMPropertyChanged
-         Next
-      End If
-      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)
-      'Select Case e.PropertyName
-      '   Case NameOf(sender.nSelGRP), NameOf(sender.nSelSIDE)
-      'End Select
-   End Sub
-
-#End Region    ' EVENTS
-
-End Class

EgtBEAMWALL.Core/MachGroupPanel/WallMachGroupVM.vb

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

EgtBEAMWALL.Core/MachGroupPanel/WallVM.vb

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

EgtBEAMWALL.Core/MachLog.vb

@@ -2,19 +2,6 @@
 
 #Region "Private Fields"
 
-   Public Enum MachLogTypes
-      PART_STATUS = 1
-      MACHGROUP_STATUS = 2
-      MACHINE_MODE = 3
-      MACHINE_STATUS = 4
-      MACHINE_COMMAND = 5
-      READ_VAR = 6
-      WRITE_VAR = 7
-      ALARM = 8
-      OPERATOR_MSG = 9
-      PROGRAM_SEND = 10
-   End Enum
-
    Private m_AlarmCode As String
    Private m_AlarmDateTime As DateTime
    Private m_AlarmMessage As String
@@ -24,73 +11,15 @@
    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
 
-   ' variabili del log macchina
-   Public ReadOnly Property EventType As MachLogTypes
-      Get
-         Return m_ResultType
-      End Get
-   End Property
-   Public ReadOnly Property EventDateTime As DateTime
-      Get
-         Return m_AlarmDateTime
-      End Get
-   End Property
-   Public ReadOnly Property EventValue As String
-      Get
-         Return m_VarValue
-      End Get
-   End Property
-
-   Public ReadOnly Property sEventType As String
-      Get
-         Select Case m_ResultType
-            Case MachLogTypes.PART_STATUS
-               Return String.Format("({0}) Stato pezzo", 1)
-            Case MachLogTypes.MACHGROUP_STATUS
-               Return String.Format("({0}) Stato barra", 2)
-            Case MachLogTypes.MACHINE_MODE = 3
-               Return String.Format("({0}) Modalità macchina", 3)
-            Case MachLogTypes.MACHINE_STATUS = 4
-               Return String.Format("({0}) Stato macchina", 4)
-            Case MachLogTypes.MACHINE_COMMAND = 5
-               Return String.Format("({0}) Comando macchina", 5)
-            Case MachLogTypes.READ_VAR = 6
-               Return String.Format("({0}) Lettura variabile", 6)
-            Case MachLogTypes.WRITE_VAR = 7
-               Return String.Format("({0}) Scrittura variabile", 7)
-            Case MachLogTypes.ALARM = 8
-               Return String.Format("({0}) Allarme", 8)
-            Case MachLogTypes.OPERATOR_MSG = 9
-               Return String.Format("({0}) Messaggio opertore", 9)
-            Case MachLogTypes.PROGRAM_SEND = 10
-               Return String.Format("({0}) Invio programma", 10)
-            Case Else
-               Return "Altro"
-         End Select
-      End Get
-   End Property
-   Public ReadOnly Property sEventDateTime As String
-      Get
-         Return m_AlarmDateTime
-      End Get
-   End Property
-   Public ReadOnly Property sEventValue As String
-      Get
-         Return m_VarValue
-      End Get
-   End Property
-
-   Public ReadOnly Property sPROD As String
-      Get
-         Return m_VarValue
-      End Get
-   End Property
-
 #End Region
 
 #Region "Protected Constructors"
@@ -218,7 +147,7 @@
 
    Public Shared Function CreateReadLog(CommandExecutedCorrectly As Boolean, VarAddress As String, VarValue As String)
       Dim NewMachLog As New MachLog
-      NewMachLog.m_CommandType = CommandTypes.READ_TPA
+      NewMachLog.m_CommandType = CommandTypes.READ
       NewMachLog.m_CommandExecutedCorrectly = CommandExecutedCorrectly
       NewMachLog.m_VarAddress = VarAddress
       NewMachLog.m_VarValue = VarValue
@@ -236,20 +165,11 @@
       Return NewMachLog
    End Function
 
-   Public Shared Function CreateMachLog(EventType As MachLogTypes, EventDateTime As DateTime, Value As String, SupervisorID As String)
-      Dim NewMachEvent As New MachLog
-      NewMachEvent.m_ResultType = EventType
-      NewMachEvent.m_AlarmDateTime = EventDateTime
-      NewMachEvent.m_VarValue = Value
-      NewMachEvent.m_VarAddress = SupervisorID
-      Return NewMachEvent
-   End Function
-
 #End Region
 
 #Region "Public Methods"
 
-   Public Shared Function CreateMachLog(AlarmCode As String, AlarmDateTime As Date, AlarmMessage As String, AlarmOperation As Integer, AlarmType As Integer, CommandExecutedCorrectly As Boolean, CommandState As CommandStates, CommandType As LogCommandTypes, Description As String, newOpState As Integer, ResultType As ResultTypes, VarAddress As String, VarValue As String) As MachLog
+   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

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-2023 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.5.8.1")>
-<Assembly: AssemblyFileVersion("2.5.8.1")>
+<Assembly: AssemblyVersion("2.3.6.2")>
+<Assembly: AssemblyFileVersion("2.3.6.2")>

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

@@ -11,7 +11,6 @@
 Option Strict On
 Option Explicit On
 
-Imports System
 
 Namespace My.Resources
     
@@ -22,20 +21,20 @@ Namespace My.Resources
     '''<summary>
     '''  A strongly-typed resource class, for looking up localized strings, etc.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
     Friend Module Resources
-        
+
         Private resourceMan As Global.System.Resources.ResourceManager
-        
+
         Private resourceCulture As Global.System.Globalization.CultureInfo
-        
+
         '''<summary>
         '''  Returns the cached ResourceManager instance used by this class.
         '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
@@ -45,17 +44,17 @@ Namespace My.Resources
                 Return resourceMan
             End Get
         End Property
-        
+
         '''<summary>
         '''  Overrides the current thread's CurrentUICulture property for all
         '''  resource lookups using this strongly typed resource class.
         '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
         Friend Property Culture() As Global.System.Globalization.CultureInfo
             Get
                 Return resourceCulture
             End Get
-            Set
+            Set(ByVal value As Global.System.Globalization.CultureInfo)
                 resourceCulture = value
             End Set
         End Property

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

@@ -13,42 +13,42 @@ 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.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0"), _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
-        
-        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
-        
+
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings)
+
 #Region "My.Settings Auto-Save Functionality"
 #If _MyType = "WindowsForms" Then
-    Private Shared addedHandler As Boolean
+        Private Shared addedHandler As Boolean
 
-    Private Shared addedHandlerLockObject As New Object
+        Private Shared addedHandlerLockObject As New Object
 
-    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
-        If My.Application.SaveMySettingsOnExit Then
-            My.Settings.Save()
-        End If
-    End Sub
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+        Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
+            If My.Application.SaveMySettingsOnExit Then
+                My.Settings.Save()
+            End If
+        End Sub
 #End If
 #End Region
-        
+
         Public Shared ReadOnly Property [Default]() As MySettings
             Get
-                
+
 #If _MyType = "WindowsForms" Then
-               If Not addedHandler Then
-                    SyncLock addedHandlerLockObject
-                        If Not addedHandler Then
-                            AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
-                            addedHandler = True
-                        End If
-                    End SyncLock
-                End If
+                   If Not addedHandler Then
+                        SyncLock addedHandlerLockObject
+                            If Not addedHandler Then
+                                AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
+                                addedHandler = True
+                            End If
+                        End SyncLock
+                    End If
 #End If
                 Return defaultInstance
             End Get

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml

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

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -1,579 +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 EgtBEAMWALL.Core
-Imports EgtBEAMWALL.Core.ConstBeam
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public MustInherit Class OpenProjectFileDialogVM
-   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
-   End Enum
-
-   Public Enum RowQuantities As Integer
-      FIFTY = 0
-      HUNDRED = 1
-      HUNDREDANDFIFTY = 2
-   End Enum
-
-   Friend Event m_CloseWindow(bDialogResult As Boolean)
-
-   Protected m_ProjectColumns As New ObservableCollection(Of EgtDataGridColumn)
-   Public Property ProjectColumns As ObservableCollection(Of EgtDataGridColumn)
-      Get
-         Return m_ProjectColumns
-      End Get
-      Set(value As ObservableCollection(Of EgtDataGridColumn))
-         m_ProjectColumns = 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 ProjectFileVM)
-   Public ReadOnly Property ProjectList As ObservableCollection(Of ProjectFileVM)
-      Get
-         Return m_ProjectList
-      End Get
-   End Property
-
-   Protected m_SelProject As ProjectFileVM
-   Public Property SelProject As ProjectFileVM
-      Get
-         Return m_SelProject
-      End Get
-      Set(value As ProjectFileVM)
-         m_SelProject = value
-      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 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_dtStartDate = DateTime.Today + TimeSpan.FromDays(1)
-                  m_dtEndDate = m_dtStartDate - TimeSpan.FromDays(30.5)
-               Case DayTypes.LAST3MONTHS
-
-               Case DayTypes.LAST6MONTHS
-
-            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
-
-#Region "Messages"
-
-   Public ReadOnly Property Title As String
-      Get
-         Return "Open Project"
-      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 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
-
-#End Region
-
-   ' Definizione comandi
-   Private m_cmdProjectDoubleClick As ICommand
-   Private m_cmdDelete As ICommand
-
-#End Region    ' FIELDS & PROPERTIES
-
-   Sub New()
-      ' 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
-   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(ProjectType As ProjectType)
-      If ProjectType = ProjectType.PROJ Then
-         ' carico le colonne della datagrid
-         GetPrivateProfileColumns(S_OPENPROJFILEDLG_PROJ, ProjectColumns)
-         ' carico campi su cui eseguire il filtro di ricerca
-         m_BTLDateTypeList = New List(Of String)({CreateDate_Msg, ExportDate_Msg})
-         m_SelBTLDateType = BTLDateTypes.CREATEDATE
-         NotifyPropertyChanged(NameOf(BTLDateTypeList))
-         NotifyPropertyChanged(NameOf(SelBTLDateType))
-         m_FilterTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(FilterTypes.NULL, ""),
-                                                                       New IdNameStruct(FilterTypes.ID, Id_Msg),
-                                                                       New IdNameStruct(FilterTypes.BTLFILENAME, BTLFileName_Msg),
-                                                                       New IdNameStruct(FilterTypes.LISTNAME, ListName_Msg),
-                                                                       New IdNameStruct(FilterTypes.MACHINE, Machine_Msg)})
-         m_SelFilterType = m_FilterTypeList.FirstOrDefault(Function(x) x.Id = FilterTypes.NULL)
-         NotifyPropertyChanged(NameOf(SelFilterType))
-      ElseIf ProjectType = ProjectType.PROD Then
-         ' carico le colonne della datagrid
-         GetPrivateProfileColumns(S_OPENPROJFILEDLG_PROD, ProjectColumns)
-         ' 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.ID, Id_Msg),
-                                                                         New IdNameStruct(FilterTypes.BTLFILENAME, BTLFileName_Msg),
-                                                                         New IdNameStruct(FilterTypes.MACHINE, Machine_Msg)})
-         m_SelFilterType = m_FilterTypeList.FirstOrDefault(Function(x) x.Id = FilterTypes.NULL)
-         NotifyPropertyChanged(NameOf(SelFilterType))
-      End If
-      ' setto la visibilità delle colonne delle EgtDataGrid
-      For Each col In ProjectColumns
-         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 String.IsNullOrWhiteSpace(SelProject.sProjDirPath) OrElse Not Directory.Exists(SelProject.sProjDirPath) Then Return False
-         ' verifico se esiste ProdId
-         AllFilesInDir = Directory.EnumerateFiles(SelProject.sProjDirPath)
-      ElseIf m_ProjectType = Core.ConstBeam.ProjectType.PROD Then
-         If String.IsNullOrWhiteSpace(SelProject.sProdDirPath) OrElse Not Directory.Exists(SelProject.sProdDirPath) Then Return False
-         AllFilesInDir = Directory.EnumerateFiles(SelProject.sProdDirPath)
-      Else
-         Return False
-      End If
-      For Each File In AllFilesInDir
-         If Path.GetExtension(File).ToLower() = ".nge" Then
-            Return True
-         End If
-      Next
-      Return False
-   End Function
-
-   Protected Function ProjectFilter(Proj As Object) As Boolean
-      Dim bProjectOk As Boolean = True
-      If m_ProjectType = ProjectType.PROJ Then
-         Dim CurrProj As ProjFileVM = DirectCast(Proj, ProjFileVM)
-         If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
-            (m_SelFilterType.Id = BTLDateTypes.EXPORTDATE AndAlso Not SearchDate.Contains(CurrProj.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.ID AndAlso CurrProj.sProjId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
-      ElseIf m_ProjectType = ProjectType.PROD Then
-         Dim CurrProj As ProdFileVM = DirectCast(Proj, ProdFileVM)
-         If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
-            (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
-         If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
-            (m_SelFilterType.Id = FilterTypes.ID AndAlso CurrProj.sProdId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
-      End If
-      Return bProjectOk
-   End Function
-
-#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()
-      If VerifySelected() Then
-         RaiseEvent m_CloseWindow(True)
-      End If
-   End Sub
-
-#End Region ' ProjectDoubleClick
-
-#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
-
-#End Region    ' Commands
-
-End Class

EgtBEAMWALL.Core/PartM.vb

@@ -0,0 +1,381 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports System.Windows.Input
+Imports System.Windows.Media
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public MustInherit Class PartM
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   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
+         Return m_dPOSX
+      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_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_nCALC_GlobalState As CalcStates = -1
+   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 = -1
+   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 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
+
+   ' 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
+
+   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_nProductionState As Integer = 0
+   Public ReadOnly Property nProductionState As Integer
+      Get
+         Return m_nProductionState
+      End Get
+   End Property
+   Public Sub SetProductionState(nState As CalcStates)
+      m_nProductionState = nState
+   End Sub
+
+   Protected m_nBTLPartId As Integer
+   Public ReadOnly Property nBTLPartId As Integer
+      Get
+         Return m_nBTLPartId
+      End Get
+   End Property
+
+#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
+      Dim c As Integer = EgtGetCurrMachGroup()
+      EgtResetCurrMachGroup()
+      m_nBTLPartId = EgtDuploGetOriginal(nPartId)
+      EgtSetCurrMachGroup(c)
+   End Sub
+
+#End Region    ' CONSTRUCTOR
+
+#Region "METHODS"
+
+   Public Event BTLFeatureAdded As EventHandler(Of BTLFeatureAddedEventArgs)
+
+   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 Shared Sub ReadMachGroupData(NewPart 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(NewPart.nPartId, ITG_PROD_ERR, nErr)
+      EgtGetInfo(NewPart.nPartId, ITG_PROD_ROT, nRot)
+      EgtGetInfo(NewPart.nPartId, ITG_PROD_MSG, sMsg)
+      If Not bCalc Then
+         NewPart.m_nCALC_State = CalcStates.NOTCALCULATED
+         NewPart.m_nCALC_ERR = 0
+         NewPart.m_nCALC_ROT = 0
+         NewPart.m_sCALC_MSG = ""
+      Else
+         NewPart.m_nCALC_ERR = nErr
+         NewPart.m_nCALC_ROT = nRot
+         NewPart.m_sCALC_MSG = sMsg
+         If nErr = 0 Then
+            NewPart.nCALC_State = CalcStates.OK
+         ElseIf nErr = 17 Then
+            NewPart.nCALC_State = CalcStates.WARNING
+         ElseIf nErr > 0 Then
+            NewPart.nCALC_State = CalcStates.ERROR_
+         ElseIf nErr < 0 Then
+            NewPart.nCALC_State = CalcStates.INFO
+         End If
+      End If
+      EgtGetInfo(NewPart.nPartId, ITG_PROD_TIME, NewPart.m_nCALC_TIME)
+   End Sub
+
+#End Region    ' METHODS
+
+End Class

EgtBEAMWALL.Core/ProdFileM.vb

@@ -0,0 +1,56 @@
+Imports System.IO
+Imports EgtUILib
+
+Public Class ProdFileM
+    Inherits ProjectFileM
+
+#Region "Protected Fields"
+
+    Protected m_nProjIdList As List(Of Integer)
+    Protected m_sName As String
+
+#End Region
+
+#Region "Protected Constructors"
+
+    Protected Sub New()
+    End Sub
+
+#End Region
+
+#Region "Public Properties"
+
+    Public ReadOnly Property nProjIdList As List(Of Integer)
+        Get
+            Return m_nProjIdList
+        End Get
+    End Property
+
+    Public ReadOnly Property sName As String
+        Get
+            Return m_sName
+        End Get
+    End Property
+
+#End Region
+
+#Region "Public Methods"
+
+    Public Shared Function CreateNewProdFileM() As ProdFileM
+        Return New ProdFileM
+    End Function
+
+    Public Shared Function CreateProdFileM(nProdId As Integer, nProjIdList As List(Of Integer), dtCreateProjDate As DateTime, sName As String, nType As BWType) As ProdFileM
+        Dim NewProjectFileM As New ProdFileM
+        NewProjectFileM.m_nProdId = nProdId
+        NewProjectFileM.m_nProjIdList = nProjIdList
+        NewProjectFileM.m_dtCreateDate = dtCreateProjDate
+        NewProjectFileM.m_sName = sName
+        NewProjectFileM.m_nType = nType
+
+        Return NewProjectFileM
+    End Function
+
+#End Region
+
+End Class

EgtBEAMWALL.Core/ProjFileM.vb

@@ -0,0 +1,72 @@
+Imports System.IO
+Imports EgtUILib
+
+Public Class ProjFileM
+    Inherits ProjectFileM
+
+#Region "Protected Fields"
+
+    Protected m_dtExportDate As DateTime
+    Protected m_sBTLFileName As String = String.Empty
+
+    Protected m_sListName As String
+
+#End Region
+
+#Region "Protected Constructors"
+
+    Protected Sub New()
+    End Sub
+
+#End Region
+
+#Region "Public Properties"
+
+    Public ReadOnly Property dtExportDate As DateTime
+        Get
+            Return m_dtExportDate
+        End Get
+    End Property
+
+    Public Property sBTLFileName As String
+        Get
+            Return m_sBTLFileName
+        End Get
+        Set(value As String)
+            m_sBTLFileName = value
+        End Set
+    End Property
+
+    Public ReadOnly Property sListName As String
+        Get
+            Return m_sListName
+        End Get
+    End Property
+
+#End Region
+
+#Region "Public Methods"
+
+    Public Shared Function CreateNewProjFileM() As ProjFileM
+        Return New ProjFileM
+    End Function
+
+    Public Shared Function CreateProjFileM(nProjId As Integer, nProdId As Integer, dtCreateProjDate As DateTime,
+                                          dtExportDate As DateTime, sListName As String, sBTLFileName As String, IsNew As Boolean, IsLocked As Boolean, nType As BWType) As ProjFileM
+        Dim NewProjectFileM As New ProjFileM
+        NewProjectFileM.m_nProjId = nProjId
+        NewProjectFileM.m_nProdId = nProdId
+        NewProjectFileM.m_dtCreateDate = dtCreateProjDate
+        NewProjectFileM.m_dtExportDate = dtExportDate
+        NewProjectFileM.m_sListName = sListName
+        NewProjectFileM.m_sBTLFileName = sBTLFileName
+        NewProjectFileM.m_bIsNew = IsNew
+        NewProjectFileM.m_bIsLocked = IsLocked
+        NewProjectFileM.m_nType = nType
+
+        Return NewProjectFileM
+    End Function
+
+#End Region
+
+End Class

EgtBEAMWALL.Core/ProjectFileM.vb

@@ -0,0 +1,87 @@
+Imports System.IO
+Imports EgtUILib
+
+Public Class ProjectFileM
+
+    'Protected m_nProjectType As ProjectType
+    'Public ReadOnly Property nProjectType As ProjectType
+    '   Get
+    '      Return m_nProjectType
+    '   End Get
+    'End Property
+    'Public Sub SetProjectType(nProjectType As ProjectType)
+    '   m_nProjectType = nProjectType
+    'End Sub
+
+#Region "Protected Fields"
+
+    Protected m_bIsLocked As Boolean
+    Protected m_bIsNew As Boolean
+    Protected m_dtCreateDate As DateTime
+    Protected m_nProdId As Integer = 0
+    Protected m_nProjId As Integer = 0
+    Protected m_nType As BWType
+
+#End Region
+
+#Region "Public Properties"
+
+    Public Property bIsLocked As Boolean
+        Get
+            Return m_bIsLocked
+        End Get
+        Set(value As Boolean)
+            m_bIsLocked = value
+        End Set
+    End Property
+
+    Public Property bIsNew As Boolean
+        Get
+            Return m_bIsNew
+        End Get
+        Set(value As Boolean)
+            m_bIsNew = value
+        End Set
+    End Property
+
+    Public ReadOnly Property dtCreateDate As DateTime
+        Get
+            Return m_dtCreateDate
+        End Get
+    End Property
+
+    Public ReadOnly Property nProdId As Integer
+        Get
+            Return m_nProdId
+        End Get
+    End Property
+
+    Public ReadOnly Property nProjId As Integer
+        Get
+            Return m_nProjId
+        End Get
+    End Property
+
+    Public Property nType As BWType
+        Get
+            Return m_nType
+        End Get
+        Set(value As BWType)
+            m_nType = value
+        End Set
+    End Property
+
+#End Region
+
+    'Sub New(nProjectType As ProjectType, nProjId As Integer, nProdId As Integer, sBTLFileName As String)
+    '   m_nProjectType = nProjectType
+    '   If m_nProjectType = ProjectType.PROJ Then
+    '      m_nProjId = nProjId
+    '      m_nProdId = nProdId
+    '      m_BTLFileName = sBTLFileName
+    '   ElseIf m_nProjectType = ProjectType.PROD Then
+    '      m_nProdId = nProdId
+    '   End If
+    'End Sub
+
+End Class

EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb

@@ -1,65 +0,0 @@
-Imports System.IO
-Imports EgtUILib
-
-Public Class ProdFileM
-   Inherits ProjectFileM
-
-   Protected m_nProjIdList As List(Of Integer)
-   Public ReadOnly Property nProjIdList As List(Of Integer)
-      Get
-         Return m_nProjIdList
-      End Get
-   End Property
-   Public Sub SetProjIdList(value As List(Of Integer))
-      m_nProjIdList = value
-   End Sub
-
-   Protected m_sName As String
-   Public Property sName As String
-      Get
-         Return m_sName
-      End Get
-      Set(value As String)
-         m_sName = value
-      End Set
-   End Property
-
-   Protected m_bIsProduced As Boolean
-   Public Property bIsProduced As Boolean
-      Get
-         Return m_bIsProduced
-      End Get
-      Set(value As Boolean)
-         m_bIsProduced = value
-      End Set
-   End Property
-
-#Region "CONSTRUCTORS"
-
-   Protected Sub New()
-   End Sub
-
-   Public Shared Function CreateNewProdFileM() As ProdFileM
-      Return New ProdFileM
-   End Function
-
-   Public Shared Function CreateProdFileM(nProdId As Integer, nProjIdList As List(Of Integer), dtCreateProjDate As DateTime, sName As String, nType As BWType,
-                                          sMachine As String, sLockedBy As String, dtLock As DateTime, bIsActive As Boolean, bIsProduced As Boolean, bIsArchived As Boolean) As ProdFileM
-      Dim NewProjectFileM As New ProdFileM
-      NewProjectFileM.m_nProdId = nProdId
-      NewProjectFileM.m_nProjIdList = nProjIdList
-      NewProjectFileM.m_dtCreateDate = dtCreateProjDate
-      NewProjectFileM.m_sName = sName
-      NewProjectFileM.m_nType = nType
-      NewProjectFileM.m_sMachine = sMachine
-      NewProjectFileM.m_sLockedBy = sLockedBy
-      NewProjectFileM.m_dtLock = dtLock
-      NewProjectFileM.m_bIsActive = bIsActive
-      NewProjectFileM.m_bIsProduced = bIsProduced
-      NewProjectFileM.m_bIsArchived = bIsArchived
-      Return NewProjectFileM
-   End Function
-
-#End Region    ' CONSTRUCTORS
-
-End Class

EgtBEAMWALL.Core/ProjectFileVM/ProjFileM.vb

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

EgtBEAMWALL.Core/ProjectFileVM/ProjectFileM.vb

@@ -1,121 +0,0 @@
-Imports System.IO
-Imports EgtUILib
-
-Public Class ProjectFileM
-
-   'Protected m_nProjectType As ProjectType
-   'Public ReadOnly Property nProjectType As ProjectType
-   '   Get
-   '      Return m_nProjectType
-   '   End Get
-   'End Property
-   'Public Sub SetProjectType(nProjectType As ProjectType)
-   '   m_nProjectType = nProjectType
-   'End Sub
-
-   Protected m_nProjId As Integer = 0
-   Public ReadOnly Property nProjId As Integer
-      Get
-         Return m_nProjId
-      End Get
-   End Property
-
-   Protected m_nProdId As Integer = 0
-   Public ReadOnly Property nProdId As Integer
-      Get
-         Return m_nProdId
-      End Get
-   End Property
-
-   Protected m_dtCreateDate As DateTime
-   Public ReadOnly Property dtCreateDate As DateTime
-      Get
-         Return m_dtCreateDate
-      End Get
-   End Property
-
-   Protected m_bIsNew As Boolean
-   Public Property bIsNew As Boolean
-      Get
-         Return m_bIsNew
-      End Get
-      Set(value As Boolean)
-         m_bIsNew = value
-      End Set
-   End Property
-
-   Protected m_bIsLocked As Boolean
-   Public Property bIsLocked As Boolean
-      Get
-         Return m_bIsLocked
-      End Get
-      Set(value As Boolean)
-         m_bIsLocked = value
-      End Set
-   End Property
-
-   Protected m_nType As BWType
-   Public Property nType As BWType
-      Get
-         Return m_nType
-      End Get
-      Set(value As BWType)
-         m_nType = value
-      End Set
-   End Property
-
-   Protected m_sMachine As String
-   Public Property sMachine As String
-      Get
-         Return m_sMachine
-      End Get
-      Set(value As String)
-         m_sMachine = value
-      End Set
-   End Property
-
-   Protected m_sLockedBy As String
-   Public Property sLockedBy As String
-      Get
-         Return m_sLockedBy
-      End Get
-      Set(value As String)
-         m_sLockedBy = value
-      End Set
-   End Property
-
-   Protected m_dtLock As DateTime
-   Public Property dtLock As DateTime
-      Get
-         Return m_dtLock
-      End Get
-      Set(value As DateTime)
-         m_dtLock = value
-      End Set
-   End Property
-
-   Protected m_bIsActive As Boolean
-   Public Property bIsActive As Boolean
-      Get
-         Return m_bIsActive
-      End Get
-      Set(value As Boolean)
-         m_bIsActive = value
-      End Set
-   End Property
-
-   Protected m_bIsArchived As Boolean
-   Public Property bIsArchived As Boolean
-      Get
-         Return m_bIsArchived
-      End Get
-      Set(value As Boolean)
-         m_bIsArchived = value
-      End Set
-   End Property
-
-#Region "CONSTRUCTORS"
-
-#End Region    ' CONSTRUCTORS
-
-End Class

EgtBEAMWALL.Core/ProjectManager/ProdFileVM.vb

@@ -1,115 +0,0 @@
-Imports System.IO
-Imports EgtBEAMWALL.Core
-Imports EgtUILib
-
-Public Class ProdFileVM
-   Inherits ProjectFileVM
-
-   Public ReadOnly Property ProdFileM As ProdFileM
-      Get
-         Return m_ProjectFileM
-      End Get
-   End Property
-
-   Public ReadOnly Property nProjIdList As List(Of Integer)
-      Get
-         Return ProdFileM.nProjIdList
-      End Get
-   End Property
-
-   Public Overrides ReadOnly Property nProdId As Integer
-      Get
-         Return ProdFileM.nProdId
-      End Get
-   End Property
-
-   Public Overrides ReadOnly Property sProdDirPath As String
-      Get
-         Dim sPath As String = String.Empty
-         If IsNothing(ProdFileM.nProdId) OrElse ProdFileM.nProdId = 0 Then Return String.Empty
-         Return m_sProdsDir & "\" & nProdId.ToString("0000")
-      End Get
-   End Property
-   Public Overrides ReadOnly Property sProdPath As String
-      Get
-         Dim sPath As String = String.Empty
-         If IsNothing(ProdFileM.nProdId) OrElse ProdFileM.nProdId = 0 Then Return String.Empty
-         Return m_sProdsDir & "\" & nProdId.ToString("0000") & "\" & nProdId.ToString("0000") & ".nge"
-      End Get
-   End Property
-
-   Public Overrides Property bIsNew As Boolean
-      Get
-         Return ProdFileM.bIsNew
-      End Get
-      Set(value As Boolean)
-         ProdFileM.bIsNew = value
-      End Set
-   End Property
-
-   Public Property sName As String
-      Get
-         Return ProdFileM.sName
-      End Get
-      Set(value As String)
-         ProdFileM.sName = value
-      End Set
-   End Property
-
-   Private m_sBTLFileName As String
-   Public ReadOnly Property sBTLFileName As String
-      Get
-         Return m_sBTLFileName
-      End Get
-   End Property
-   Protected Sub SetBTLFileName(value As String)
-      m_sBTLFileName = value
-   End Sub
-
-   Public ReadOnly Property bIsProduced As Boolean
-      Get
-         Return ProdFileM.bIsProduced
-      End Get
-   End Property
-
-#Region "CONSTRUCTORS"
-
-   Sub New(ProdFileM As ProdFileM)
-      m_ProjectFileM = ProdFileM
-   End Sub
-
-#End Region    ' CONSTRUCTORS
-
-   Friend Function GetProjPath(nProjId As Integer)
-      Dim sPath As String = String.Empty
-      If nProjId = 0 Then Return String.Empty
-      Return m_sProjsDir & "\" & nProjId.ToString("0000") & "\" & nProjId.ToString("0000") & ".nge"
-   End Function
-
-   ' funzione che restituisce le parti di nome file
-   Friend Shared Function VerifyProjectFile(nProjectType As ProjectType, ProjectFileName As String, ByRef nProjId As Integer, ByRef nProdId As Integer, ByRef sBTLFileName As String) As Boolean
-      If nProjectType = ProjectType.PROJ Then
-         Dim DataFromFileName As String() = ProjectFileName.Split(FILENAMESEPARATOR)
-         If DataFromFileName.Count = 3 Then
-            If Not String.IsNullOrEmpty(DataFromFileName(0)) Then
-               Integer.TryParse(DataFromFileName(0), nProjId)
-            Else Return False
-            End If
-            If Not String.IsNullOrEmpty(DataFromFileName(1)) Then
-               Integer.TryParse(DataFromFileName(1), nProdId)
-            Else
-               nProdId = 0
-            End If
-            If Not String.IsNullOrEmpty(DataFromFileName(2)) Then
-               sBTLFileName = DataFromFileName(2)
-            End If
-            Return True
-         Else Return False
-         End If
-      ElseIf nProjectType = ProjectType.PROD Then
-         Return Integer.TryParse(ProjectFileName, nProdId)
-      Else Return False
-      End If
-   End Function
-
-End Class

EgtBEAMWALL.Core/ProjectManager/ProjFileVM.vb

@@ -1,131 +0,0 @@
-Imports System.IO
-Imports EgtBEAMWALL.Core
-Imports EgtUILib
-
-Public Class ProjFileVM
-   Inherits ProjectFileVM
-
-   Public ReadOnly Property ProjFileM As ProjFileM
-      Get
-         Return m_ProjectFileM
-      End Get
-   End Property
-
-   Public Overrides ReadOnly Property nProjId As Integer
-      Get
-         Return ProjFileM.nProjId
-      End Get
-   End Property
-
-   Public Overrides ReadOnly Property nProdId As Integer
-      Get
-         Return ProjFileM.nProdId
-      End Get
-   End Property
-
-   Public Overrides ReadOnly Property sProjDirPath As String
-      Get
-         If IsNothing(ProjFileM.nProjId) OrElse ProjFileM.nProjId = 0 Then Return String.Empty
-         Return m_sProjsDir & "\" & nProjId.ToString("0000")
-      End Get
-   End Property
-   Public Overrides ReadOnly Property sProjPath As String
-      Get
-         Dim sPath As String = String.Empty
-         If IsNothing(ProjFileM.nProjId) OrElse ProjFileM.nProjId = 0 Then Return String.Empty
-         sPath = m_sProjsDir & "\" & nProjId.ToString("0000") & "\" & nProjId.ToString("0000") & ".nge"
-         Return sPath
-      End Get
-   End Property
-
-   Public Overrides ReadOnly Property sProdDirPath As String
-      Get
-         Dim sPath As String = String.Empty
-         If IsNothing(ProjFileM.nProdId) OrElse ProjFileM.nProdId = 0 Then Return String.Empty
-         Return m_sProdsDir & "\" & nProdId.ToString("0000")
-      End Get
-   End Property
-   Public Overrides ReadOnly Property sProdPath As String
-      Get
-         Dim sPath As String = String.Empty
-         If IsNothing(ProjFileM.nProdId) OrElse ProjFileM.nProdId = 0 Then Return String.Empty
-         Return m_sProdsDir & "\" & nProdId.ToString("0000") & "\" & nProdId.ToString("0000") & ".nge"
-      End Get
-   End Property
-
-   Public Overrides Property bIsNew As Boolean
-      Get
-         Return ProjFileM.bIsNew
-      End Get
-      Set(value As Boolean)
-         ProjFileM.bIsNew = value
-      End Set
-   End Property
-
-   Public ReadOnly Property sBTLFileName As String
-      Get
-         Return ProjFileM.sBTLFileName
-      End Get
-   End Property
-
-   Public ReadOnly Property sDescription As String
-      Get
-         Return ProjFileM.sDescription
-      End Get
-   End Property
-
-   Public ReadOnly Property sListName As String
-      Get
-         Return ProjFileM.sListName
-      End Get
-   End Property
-
-   Public ReadOnly Property dtExportDate As DateTime
-      Get
-         Return ProjFileM.dtExportDate
-      End Get
-   End Property
-
-#Region "CONSTRUCTORS"
-
-   Sub New(ProjectFileM As ProjFileM)
-      m_ProjectFileM = ProjectFileM
-   End Sub
-
-#End Region    ' CONSTRUCTORS
-
-#Region "METHODS"
-
-   Public Sub SetBTLFileName(BTLFileName As String)
-      ProjFileM.sBTLFileName = BTLFileName
-   End Sub
-
-   ' funzione che restituisce le parti di nome file
-   Friend Shared Function VerifyProjectFile(nProjectType As ProjectType, ProjectFileName As String, ByRef nProjId As Integer, ByRef nProdId As Integer, ByRef sBTLFileName As String) As Boolean
-      If nProjectType = ProjectType.PROJ Then
-         Dim DataFromFileName As String() = ProjectFileName.Split(FILENAMESEPARATOR)
-         If DataFromFileName.Count = 3 Then
-            If Not String.IsNullOrEmpty(DataFromFileName(0)) Then
-               Integer.TryParse(DataFromFileName(0), nProjId)
-            Else Return False
-            End If
-            If Not String.IsNullOrEmpty(DataFromFileName(1)) Then
-               Integer.TryParse(DataFromFileName(1), nProdId)
-            Else
-               nProdId = 0
-            End If
-            If Not String.IsNullOrEmpty(DataFromFileName(2)) Then
-               sBTLFileName = DataFromFileName(2)
-            End If
-            Return True
-         Else Return False
-         End If
-      ElseIf nProjectType = ProjectType.PROD Then
-         Return Integer.TryParse(ProjectFileName, nProdId)
-      Else Return False
-      End If
-   End Function
-
-#End Region    ' METHODS
-
-End Class

EgtBEAMWALL.Core/ProjectManager/ProjectFileVM.vb

@@ -1,184 +0,0 @@
-Imports System.IO
-Imports EgtBEAMWALL.Core
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class ProjectFileVM
-   Inherits VMBase
-
-   Protected Shared m_sProjsDir As String
-   Protected Shared m_sProdsDir As String
-
-   Protected m_ProjectFileM As ProjectFileM
-
-   Public Overridable ReadOnly Property nProjId As Integer
-      Get
-         Return m_ProjectFileM.nProjId
-      End Get
-   End Property
-   Public Overridable ReadOnly Property sProjId As String
-      Get
-         Return m_ProjectFileM.nProjId.ToString("0000")
-      End Get
-   End Property
-
-   Public Overridable ReadOnly Property nProdId As Integer
-      Get
-         Return m_ProjectFileM.nProdId
-      End Get
-   End Property
-   Public Overridable ReadOnly Property sProdId As String
-      Get
-         Return m_ProjectFileM.nProdId.ToString("0000")
-      End Get
-   End Property
-
-   Public Overridable ReadOnly Property sProjDirPath As String
-      Get
-         If IsNothing(m_ProjectFileM.nProjId) OrElse m_ProjectFileM.nProjId = 0 Then Return String.Empty
-         Return m_sProjsDir & "\" & nProjId.ToString("0000")
-      End Get
-   End Property
-   Public Overridable ReadOnly Property sProjPath As String
-      Get
-         Dim sPath As String = String.Empty
-         If IsNothing(m_ProjectFileM.nProjId) OrElse m_ProjectFileM.nProjId = 0 Then Return String.Empty
-         sPath = m_sProjsDir & "\" & nProjId.ToString("0000") & "\" & nProjId.ToString("0000") & ".nge"
-         Return sPath
-      End Get
-   End Property
-
-   Public Overridable ReadOnly Property sProdDirPath As String
-      Get
-         Dim sPath As String = String.Empty
-         If IsNothing(m_ProjectFileM.nProdId) OrElse m_ProjectFileM.nProdId = 0 Then Return String.Empty
-         Return m_sProdsDir & "\" & nProdId.ToString("0000")
-      End Get
-   End Property
-   Public Overridable ReadOnly Property sProdPath As String
-      Get
-         Dim sPath As String = String.Empty
-         If IsNothing(m_ProjectFileM.nProdId) OrElse m_ProjectFileM.nProdId = 0 Then Return String.Empty
-         Return m_sProdsDir & "\" & nProdId.ToString("0000") & "\" & nProdId.ToString("0000") & ".nge"
-      End Get
-   End Property
-
-   Public Overridable Property bIsNew As Boolean
-      Get
-         Return m_ProjectFileM.bIsNew
-      End Get
-      Set(value As Boolean)
-         m_ProjectFileM.bIsNew = value
-      End Set
-   End Property
-
-   Public Overridable Property bIsLocked As Boolean
-      Get
-         Return m_ProjectFileM.bIsLocked
-      End Get
-      Set(value As Boolean)
-         m_ProjectFileM.bIsLocked = value
-      End Set
-   End Property
-
-   Public ReadOnly Property dtCreateDate As DateTime
-      Get
-         Return m_ProjectFileM.dtCreateDate
-      End Get
-   End Property
-
-   ' variabile che indica se ricaricare il progetto
-   Protected m_bReloadProject As Boolean = True
-   Public ReadOnly Property bReloadProject As Boolean
-      Get
-         Return m_bReloadProject
-      End Get
-   End Property
-
-   Protected m_nModificationIndex As Integer = Integer.MaxValue - 1000
-   Public ReadOnly Property nModificationIndex As Integer
-      Get
-         Return m_nModificationIndex
-      End Get
-   End Property
-   Public Sub SetModificationIndex(value As String)
-      m_nModificationIndex = value
-   End Sub
-
-   Public ReadOnly Property nType As BWType
-      Get
-         Return m_ProjectFileM.nType
-      End Get
-   End Property
-
-   Public ReadOnly Property sMachine As String
-      Get
-         Return m_ProjectFileM.sMachine
-      End Get
-   End Property
-
-   Public ReadOnly Property bIsActive As Boolean
-      Get
-         Return m_ProjectFileM.bIsActive
-      End Get
-   End Property
-
-   Public ReadOnly Property bIsArchived As Boolean
-      Get
-         Return m_ProjectFileM.bIsArchived
-      End Get
-   End Property
-
-#Region "Messages"
-
-   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 Name_Msg As String
-      Get
-         Return EgtMsg(61808)
-      End Get
-   End Property
-
-#End Region    ' Messages
-
-#Region "CONSTRUCTORS"
-
-#End Region    ' CONSTRUCTORS
-
-   Public Sub SetReloadProject(bValue As Boolean)
-      m_bReloadProject = bValue
-   End Sub
-
-   Public Shared Sub Init(sProjsDir As String, sProdsDir As String)
-      m_sProjsDir = sProjsDir
-      m_sProdsDir = sProdsDir
-   End Sub
-
-   Public Sub SetMachine(sMachine)
-      m_ProjectFileM.sMachine = sMachine
-   End Sub
-
-End Class

EgtBEAMWALL.Core/SectionXMaterial.vb

@@ -5,13 +5,8 @@ Imports EgtWPFLib5
 Public Class SectionXMaterial
    Inherits VMBase
 
-   Private Shared m_nType As BWType
-   Public Shared ReadOnly Property nType As BWType
-      Get
-         Return m_nType
-      End Get
-   End Property
-   Public Shared Sub SetType(nType As BWType)
+   Private Shared m_nType As MachineType
+   Public Shared Sub SetType(nType As MachineType)
       m_nType = nType
    End Sub
 
@@ -82,9 +77,9 @@ Public Class SectionXMaterial
    End Property
 
    Shared Operator =(ByVal S1 As SectionXMaterial, ByVal S2 As SectionXMaterial) As Boolean
-      Return (Math.Abs( S1.m_dH - S2.m_dH) < 100 * EPS_SMALL AndAlso
-              Math.Abs( S1.m_dW - S2.m_dW) < 100 * EPS_SMALL AndAlso
-              Math.Abs( S1.m_dL - S2.m_dL) < 100 * EPS_SMALL AndAlso
+      Return (S1.m_dH < S2.m_dH + 100 * EPS_SMALL AndAlso S1.m_dH > S2.m_dH - 100 * EPS_SMALL AndAlso
+              S1.m_dW < S2.m_dW + 100 * EPS_SMALL AndAlso S1.m_dW > S2.m_dW - 100 * EPS_SMALL AndAlso
+              S1.m_dL < S2.m_dL + 100 * EPS_SMALL AndAlso S1.m_dL > S2.m_dL - 100 * EPS_SMALL AndAlso
               S1.m_Material.Any(Function(x) S2.m_Material.Any(Function(y) y = x)))
    End Operator
 
@@ -100,10 +95,10 @@ Public Class SectionXMaterial
    End Function
 
    Sub New(dW As Double, dH As Double, dL As Double, sMaterial As String)
-      If m_nType = BWType.BEAM Then
+      If m_nType = MachineType.BEAM Then
          m_dW = dW
          m_dH = dH
-      ElseIf m_nType = BWType.WALL Then
+      ElseIf m_nType = MachineType.WALL Then
          m_dH = dH
       Else
          m_dW = dW
@@ -141,16 +136,6 @@ Public Class SectionXMaterial
       End Set
    End Property
 
-   Private m_nQuantity As Integer
-   Public Property nQuantity As Integer
-      Get
-         Return m_nQuantity
-      End Get
-      Set(value As Integer)
-         m_nQuantity = value
-      End Set
-   End Property
-
    Private m_Alias_IsEnabled As Boolean
    Public Property Alias_IsEnabled As Boolean
       Get
@@ -162,12 +147,65 @@ Public Class SectionXMaterial
    End Property
 
    Private m_Alias_IsChecked As Boolean
-   Public Overridable Property Alias_IsChecked As Boolean
+   Public Property Alias_IsChecked As Boolean
       Get
          Return m_Alias_IsChecked
       End Get
       Set(value As Boolean)
          m_Alias_IsChecked = value
+         If value Then
+            NewBeam_Visibility = Visibility.Collapsed
+            NewWall_Visibility = Visibility.Collapsed
+            Alias_Visibility = Visibility.Visible
+         Else
+            If m_nType = MachineType.BEAM Then
+               NewBeam_Visibility = Visibility.Visible
+               NewWall_Visibility = Visibility.Collapsed
+            Else
+               NewBeam_Visibility = Visibility.Collapsed
+               NewWall_Visibility = Visibility.Visible
+            End If
+            Alias_Visibility = Visibility.Collapsed
+         End If
+      End Set
+   End Property
+
+   Private m_NewBeam_Visibility As Visibility
+   Public Property NewBeam_Visibility As Visibility
+      Get
+         Return m_NewBeam_Visibility
+      End Get
+      Set(value As Visibility)
+         If value <> m_NewBeam_Visibility Then
+            m_NewBeam_Visibility = value
+            NotifyPropertyChanged("NewBeam_Visibility")
+         End If
+      End Set
+   End Property
+
+   Private m_NewWall_Visibility As Visibility
+   Public Property NewWall_Visibility As Visibility
+      Get
+         Return m_NewWall_Visibility
+      End Get
+      Set(value As Visibility)
+         If value <> m_NewWall_Visibility Then
+            m_NewWall_Visibility = value
+            NotifyPropertyChanged("NewWall_Visibility")
+         End If
+      End Set
+   End Property
+
+   Private m_Alias_Visibility As Visibility
+   Public Property Alias_Visibility As Visibility
+      Get
+         Return m_Alias_Visibility
+      End Get
+      Set(value As Visibility)
+         If value <> m_Alias_Visibility Then
+            m_Alias_Visibility = value
+            NotifyPropertyChanged("Alias_Visibility")
+         End If
       End Set
    End Property
 
@@ -189,31 +227,6 @@ Public Class SectionXMaterial
       End Get
    End Property
 
-   Public ReadOnly Property Quantity_Msg As String
-      Get
-         Return EgtMsg(61774)
-      End Get
-   End Property
-
-   Sub New(dW As Double, dH As Double, dL As Double, sMaterial As String, nQuantity As Integer)
-      If m_nType = BWType.BEAM Then
-         m_dW = dW
-         m_dH = dH
-      ElseIf m_nType = BWType.WALL Then
-         m_dH = dH
-      Else
-         m_dW = dW
-         m_dH = dH
-         m_dL = dL
-      End If
-      m_Material = New List(Of String)
-      Dim sMaterialArray() As String = Split(sMaterial, ";")
-      For Each sMatItem In sMaterialArray
-         m_Material.Add(sMatItem)
-      Next
-      m_nQuantity = nQuantity
-   End Sub
-
 #End Region ' Import BTL <-> Warehouse
 
 End Class

EgtBEAMWALL.Core/Utility/BTLIniFile.vb

@@ -18,7 +18,6 @@ Imports EgtWPFLib5
 Public Module BTLIniFile
 
    Public m_sBTLIniFile As String
-   Public m_nBTLBWType As BWType
 
    Public Function GetBeamPrivateProfileProcessList(IpGRPType As GRPType, ByRef IpProcessList As ObservableCollection(Of Integer)) As Boolean
       Dim PRCList As New ObservableCollection(Of Integer)
@@ -125,16 +124,9 @@ Public Module BTLIniFile
       Return ""
    End Function
 
-   ' funzione che ottiene il parametro P/Q usando m_nBTLBWType del modulo
    Public Function GetBeamPrivateProfileParam(IpGRP As Integer, IpPRC As Integer, IsP As Boolean, IpFeatureParamIndex As String, IpParentFeature As BTLFeatureM, ByRef IpBTLParam As BTLParamM) As Boolean
       Dim sBTLParam As String = String.Empty
-      Dim sBWQParam As String = String.Empty
-      If m_nBTLBWType = BWType.BEAM Then
-         sBWQParam = "B"
-      ElseIf m_nBTLBWType = BWType.WALL Then
-         sBWQParam = "W"
-      End If
-      If EgtUILib.GetPrivateProfileString(CalcBeamPrivateProfileGRP(IpGRP) & "." & IpPRC, If(IsP, "P", "Q" & sBWQParam) & IpFeatureParamIndex, String.Empty, sBTLParam, m_sBTLIniFile) > 0 Then
+      If EgtUILib.GetPrivateProfileString(CalcBeamPrivateProfileGRP(IpGRP) & "." & IpPRC, If(IsP, "P", "Q") & IpFeatureParamIndex, String.Empty, sBTLParam, m_sBTLIniFile) > 0 Then
          Dim sBTLParamParams() As String = sBTLParam.Split(","c)
          ' verifico numero minimo di parametri
          If sBTLParamParams.Count >= 6 Then
@@ -147,9 +139,9 @@ Public Module BTLIniFile
                Dim dMin As Double
                Dim dMax As Double
                Dim dDefault As Double
-               StringToDoubleAdv(sBTLParamParams(2), dMin)
-               StringToDoubleAdv(sBTLParamParams(3), dMax)
-               StringToDoubleAdv(sBTLParamParams(4), dDefault)
+               StringToDouble(sBTLParamParams(2), dMin)
+               StringToDouble(sBTLParamParams(3), dMax)
+               StringToDouble(sBTLParamParams(4), dDefault)
                Dim ParamType As BTLParamType
                If sBTLParamParams(0) = "d" Then
                   ParamType = BTLParamType.DOUBLE_
@@ -159,7 +151,7 @@ Public Module BTLIniFile
                IpBTLParam = BTLParamM.CreateBTLParam(IpParentFeature, IsP, ParamType, sBTLParamParams(1), dMin, dMax, dDefault, sBTLParamParams(5))
                Return Not IsNothing(IpBTLParam)
             ElseIf sBTLParamParams(0) = "s" Then
-               IpBTLParam = BTLParamM.CreateBTLParam(IpParentFeature, IsP, BTLParamType.STRING_, sBTLParamParams(1), sBTLParamParams(4), sBTLParamParams(5))
+               IpBTLParam = BTLParamM.CreateBTLParam(IpParentFeature, IsP, BTLParamType.STRING_, sBTLParamParams(1), sBTLParamParams(5))
                Return Not IsNothing(IpBTLParam)
             ElseIf sBTLParamParams(0) = "c" Then
                Dim nMin As Integer
@@ -178,57 +170,4 @@ Public Module BTLIniFile
       Return False
    End Function
 
-   ' funzione che ottiene il parametro P/Q usando BTLBWType passato come argomento
-   Public Function GetBeamPrivateProfileParam(IpGRP As Integer, IpPRC As Integer, IsP As Boolean, IpFeatureParamIndex As String, IpParentFeature As BTLFeatureM, ByRef IpBTLParam As BTLParamM, BTLBWType As BWType) As Boolean
-      Dim sBTLParam As String = String.Empty
-      Dim sBWQParam As String = String.Empty
-      If BTLBWType = BWType.BEAM Then
-         sBWQParam = "B"
-      ElseIf BTLBWType = BWType.WALL Then
-         sBWQParam = "W"
-      End If
-      If EgtUILib.GetPrivateProfileString(CalcBeamPrivateProfileGRP(IpGRP) & "." & IpPRC, If(IsP, "P", "Q" & sBWQParam) & IpFeatureParamIndex, String.Empty, sBTLParam, m_sBTLIniFile) > 0 Then
-         Dim sBTLParamParams() As String = sBTLParam.Split(","c)
-         ' verifico numero minimo di parametri
-         If sBTLParamParams.Count >= 6 Then
-            ' cancello spazi
-            For Index = 0 To sBTLParamParams.Count - 1
-               sBTLParamParams(Index) = sBTLParamParams(Index).Trim()
-            Next
-            ' creo parametro
-            If sBTLParamParams(0) = "d" OrElse sBTLParamParams(0) = "l" Then
-               Dim dMin As Double
-               Dim dMax As Double
-               Dim dDefault As Double
-               StringToDoubleAdv(sBTLParamParams(2), dMin)
-               StringToDoubleAdv(sBTLParamParams(3), dMax)
-               StringToDoubleAdv(sBTLParamParams(4), dDefault)
-               Dim ParamType As BTLParamType
-               If sBTLParamParams(0) = "d" Then
-                  ParamType = BTLParamType.DOUBLE_
-               Else
-                  ParamType = BTLParamType.LENGTH
-               End If
-               IpBTLParam = BTLParamM.CreateBTLParam(IpParentFeature, IsP, ParamType, sBTLParamParams(1), dMin, dMax, dDefault, sBTLParamParams(5), sBWQParam)
-               Return Not IsNothing(IpBTLParam)
-            ElseIf sBTLParamParams(0) = "s" Then
-               IpBTLParam = BTLParamM.CreateBTLParam(IpParentFeature, IsP, BTLParamType.STRING_, sBTLParamParams(1), sBTLParamParams(4), sBTLParamParams(5), sBWQParam)
-               Return Not IsNothing(IpBTLParam)
-            ElseIf sBTLParamParams(0) = "c" Then
-               Dim nMin As Integer
-               Dim nMax As Integer
-               Dim nDefault As Integer
-               Integer.TryParse(sBTLParamParams(2), nMin)
-               Integer.TryParse(sBTLParamParams(3), nMax)
-               Integer.TryParse(sBTLParamParams(4), nDefault)
-               ' recupero lista valori
-               Dim ValueList As New List(Of String)
-               IpBTLParam = BTLParamM.CreateBTLParam(IpParentFeature, IsP, BTLParamType.COMBO, sBTLParamParams(1), nMin, nMax, nDefault, sBTLParamParams(5), ValueList, sBWQParam)
-               Return Not IsNothing(IpBTLParam)
-            End If
-         End If
-      End If
-      Return False
-   End Function
-
 End Module

EgtBEAMWALL.Core/Utility/Command.vb

@@ -0,0 +1,70 @@
+Imports System.Windows.Input
+
+''' <summary>
+''' A command whose sole purpose is to 
+''' relay its functionality to other
+''' objects by invoking delegates. The
+''' default return value for the CanExecute
+''' method is 'true'.
+''' </summary>
+Public Class Command
+   Implements ICommand
+
+#Region "Fields"
+
+   Private ReadOnly _execute As Action(Of Object)
+   Private ReadOnly _canExecute As Predicate(Of Object)
+
+#End Region ' Fields
+
+#Region "Constructors"
+
+   ''' <summary>
+   ''' Creates a new command that can always execute.
+   ''' </summary>
+   ''' <param name="execute">The execution logic.</param>
+   Public Sub New(ByVal execute As Action(Of Object))
+      Me.New(execute, Nothing)
+   End Sub
+
+   ''' <summary>
+   ''' Creates a new command.
+   ''' </summary>
+   ''' <param name="execute">The execution logic.</param>
+   ''' <param name="canExecute">The execution status logic.</param>
+   Public Sub New(ByVal execute As Action(Of Object), ByVal canExecute As Predicate(Of Object))
+      If execute Is Nothing Then
+         Throw New ArgumentNullException("execute")
+      End If
+
+      _execute = execute
+      _canExecute = canExecute
+   End Sub
+
+#End Region ' Constructors
+
+#Region "ICommand Members"
+
+   <DebuggerStepThrough> _
+   Public Function CanExecute(ByVal parameter As Object) As Boolean Implements ICommand.CanExecute
+      Return If(_canExecute Is Nothing, True, _canExecute(parameter))
+   End Function
+
+   Public Custom Event CanExecuteChanged As EventHandler Implements ICommand.CanExecuteChanged
+      AddHandler(ByVal value As EventHandler)
+         AddHandler CommandManager.RequerySuggested, value
+      End AddHandler
+      RemoveHandler(ByVal value As EventHandler)
+         RemoveHandler CommandManager.RequerySuggested, value
+      End RemoveHandler
+      RaiseEvent(ByVal sender As System.Object, ByVal e As System.EventArgs)
+      End RaiseEvent
+   End Event
+
+   Public Sub Execute(ByVal parameter As Object) Implements ICommand.Execute
+      _execute(parameter)
+   End Sub
+
+#End Region ' ICommand Members
+
+End Class

EgtBEAMWALL.Core/Utility/CoreMap.vb

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

EgtBEAMWALL.Core/Utility/DimensionsIniFile.vb

@@ -1,62 +0,0 @@
-Imports System.Windows
-Imports System.Windows.Controls
-Imports EgtWPFLib5
-Imports EgtUILib
-Imports System.Collections.ObjectModel
-
-Public Module DimensionsIniFile
-
-   Public m_sDimensionsIniFile As String
-
-   Public Sub ReadGridDimensions(GridName As String, ByRef GridDimsList As ObservableCollection(Of GridDimension))
-      GridDimsList = New ObservableCollection(Of GridDimension)
-      Dim Index As Integer = 0
-      Dim sValue = String.Empty
-      While GetPrivateProfileString(GridName, Index, String.Empty, sValue, m_sDimensionsIniFile) > 0
-         Dim sValueParams() As String = sValue.Split(","c)
-         ' verifico numero minimo di parametri
-         If sValueParams.Count >= 4 Then
-            ' cancello spazi
-            For I = 0 To sValueParams.Count - 1
-               sValueParams(I) = sValueParams(I).Trim()
-            Next
-            ' creo valore
-            Dim nDimIndex As Integer
-            Dim nDimType As DimensionType
-            Dim GridLenValue As Double
-            Dim GridLenType As GridUnitType
-            Integer.TryParse(sValueParams(0), nDimIndex)
-            Integer.TryParse(sValueParams(1), nDimType)
-            StringToDoubleAdv(sValueParams(2), GridLenValue)
-            Integer.TryParse(sValueParams(3), GridLenType)
-            GridDimsList.Add(New GridDimension(GridName, nDimIndex, nDimType, New GridLength(GridLenValue, GridLenType)))
-         End If
-         Index += 1
-      End While
-      For Each GridDimsItem In GridDimsList
-         GridDimsItem.GridDimensions = GridDimsList
-      Next
-   End Sub
-
-   ' funzione per calcolare e scrivere la stringa dei valori delle righe/colonne della Grid nell'INI
-   Public Function SaveGridDimensions(GridName As String, GridDims As ObservableCollection(Of GridDimension)) As Boolean
-      Dim bOk As Boolean
-      Dim Index = 0
-      Dim sValue = String.Empty
-      For Each GridDimsItem In GridDims
-         sValue = GridDimsItem.Index & "," & GridDimsItem.DimType & "," & DoubleToString(GridDimsItem.GridLen.Value, 6) & "," & GridDimsItem.GridLen.GridUnitType
-         bOk = WritePrivateProfileDimension(GridName, Index, sValue)
-         Index += 1
-      Next
-      Return bOk
-   End Function
-
-   Public Function WritePrivateProfileDimension(GridName As String, Index As String, sValue As String) As Boolean
-      Return WritePrivateProfileString(GridName, Index, sValue, m_sDimensionsIniFile)
-   End Function
-
-   Private Function GetGridLengthFromIndexAndType(GridDimsList As List(Of GridDimension), Index As Integer, DimType As DimensionType) As GridDimension
-      Return GridDimsList.FirstOrDefault(Function(x) x.Index = Index And x.DimType = DimType)
-   End Function
-
-End Module

EgtBEAMWALL.Core/Utility/DisableModifiedMgr.vb

@@ -1,16 +0,0 @@
-Imports EgtUILib
-
-Public Class DisableModifiedMgr
-
-   Private m_bOldEnMod As Boolean
-
-   Sub New()
-      m_bOldEnMod = EgtGetEnableModified()
-      If m_bOldEnMod Then EgtDisableModified()
-   End Sub
-
-   Public Sub ReEnable()
-      If m_bOldEnMod Then EgtEnableModified()
-   End Sub
-
-End Class

EgtBEAMWALL.Core/Utility/Enum.vb

@@ -1,71 +0,0 @@
-Public Enum CalcStates As Integer
-   NOTCALCULATED = -1
-   OK = 0
-   INFO = 1
-   WARNING = 2
-   ERROR_ = 3
-   COLLISION = 4
-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
-   Part = 2
-   Comm = 3
-End Enum
-
-Public Enum StatusMapOpType
-   ND = -1
-   Startup = 0
-   PartStart = 1
-   PartEnd = 2
-   MachGroupAdd = 3
-   MachGroupMod = 4
-   MachGroupRem = 5
-   MachGroupNeedRedo = 6
-   MachGroupAssignedToSupervisor = 7
-   MachGroupRemovedFromSupervisor = 8
-   SupervisorStopRequest = 9
-   ViewOptimStoped = 10
-   SupervisorReleaseStop = 11
-   ResetPartStart = 12
-   ResetPartEnd = 13
-   SetPartScrapped = 14
-   ChangeProdInSupervisorRequest = 15
-   ChangeProdInProdRequest = 16
-   OpenPageInViewOptimRequest = 17
-   MachGroupValidationUpdate = 18
-End Enum
-
-Public Enum DimensionType
-   COLUMN = 0
-   ROW = 1
-End Enum

EgtBEAMWALL.Core/Utility/GridDimension.vb

@@ -1,73 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.Windows
-Imports System.Windows.Controls
-Imports EgtWPFLib5
-
-Public Class GridDimension
-   Inherits VMBase
-
-   Private Shared m_SoftwareModActive As Boolean = False
-
-   Private Property m_GridName As String
-   Public Property GridName As String
-      Get
-         Return m_GridName
-      End Get
-      Set(value As String)
-         m_GridName = value
-      End Set
-   End Property
-
-   Private Property m_Index As Integer
-   Public Property Index As Integer
-      Get
-         Return m_Index
-      End Get
-      Set(value As Integer)
-         m_Index = value
-      End Set
-   End Property
-
-   Private Property m_DimType As DimensionType
-   Public Property DimType As DimensionType
-      Get
-         Return m_DimType
-      End Get
-      Set(value As DimensionType)
-         m_DimType = value
-      End Set
-   End Property
-
-   Private Property m_GridLen As GridLength
-   Public Property GridLen As GridLength
-      Get
-         Return m_GridLen
-      End Get
-      Set(value As GridLength)
-         m_GridLen = value
-         If Not m_SoftwareModActive Then DimensionsIniFile.SaveGridDimensions(GridName, GridDimensions)
-      End Set
-   End Property
-
-   Private Property m_GridDimensions As ObservableCollection(Of GridDimension)
-   Public Property GridDimensions As ObservableCollection(Of GridDimension)
-      Get
-         Return m_GridDimensions
-      End Get
-      Set(value As ObservableCollection(Of GridDimension))
-         m_GridDimensions = value
-      End Set
-   End Property
-
-   Sub New(GridName As String, Index As Integer, DimType As DimensionType, GridLen As GridLength)
-      m_GridName = GridName
-      m_Index = Index
-      m_DimType = DimType
-      m_GridLen = GridLen
-   End Sub
-
-   Public Shared Sub SetSoftwareMod(bActive As Boolean)
-      m_SoftwareModActive = bActive
-   End Sub
-
-End Class

EgtBEAMWALL.Core/Utility/LuaExec.vb

@@ -17,7 +17,6 @@ Module LuaExec
       End If
       ' Assegno i dati
       EgtLuaCreateGlobTable("BEAM")
-      EgtLuaSetGlobStringVar("BEAM.BASEDIR", Map.refMainWindowVM.MainWindowM.sBeamRoot)
       EgtLuaSetGlobStringVar("BEAM.FILE", sFile)
       EgtLuaSetGlobStringVar("BEAM.MACHINE", sMachine)
       EgtLuaSetGlobIntVar("BEAM.FLAG", nFlag)
@@ -71,4 +70,52 @@ Module LuaExec
       Return bOk
    End Function
 
+   Friend Function ExecNesting(sFile As String, sMachine As String, PartList As List(Of BTLPartM), dLength As Double, dWidth As Double, dStartOffset As Double, dOffset As Double, dKerf As Double) As Boolean
+      EgtOutLog("-- Start ExecNest --")
+      ' Recupero lo script da eseguire
+      Dim sExecPath As String = ""
+      Dim sExecName As String = ""
+      GetMainPrivateProfileString(S_NEST, K_NESTEXEC, "", sExecName)
+      Dim sRoot As String = ""
+      If Map.refMachinePanelVM.SelectedMachine.nType = MachineType.BEAM Then
+         sRoot = Map.refMainWindowVM.MainWindowM.sBeamRoot
+      ElseIf Map.refMachinePanelVM.SelectedMachine.nType = MachineType.WALL Then
+         sRoot = Map.refMainWindowVM.MainWindowM.sWallRoot
+      End If
+      sExecPath = (sRoot & "\" & sExecName).TrimEnd({"\"c})
+      If Not My.Computer.FileSystem.FileExists(sExecPath) Then
+         EgtOutLog("Not found NestExec script " & sExecPath)
+         Return False
+      End If
+      ' Assegno i dati
+      EgtLuaCreateGlobTable("NEST")
+      EgtLuaSetGlobStringVar("NEST.FILE", sFile)
+      EgtLuaSetGlobStringVar("NEST.MACHINE", sMachine)
+      EgtLuaSetGlobNumVar("NEST.LEN", dLength)
+      EgtLuaSetGlobNumVar("NEST.WIDTH", dWidth)
+      EgtLuaSetGlobNumVar("NEST.STARTOFFSET", dStartOffset)
+      EgtLuaSetGlobNumVar("NEST.OFFSET", dOffset)
+      EgtLuaSetGlobNumVar("NEST.KERF", dKerf)
+      EgtLuaCreateGlobTable("PART")
+      For PartIndex = 0 To PartList.Count - 1
+         EgtLuaSetGlobIntVar("PART." & PartList(PartIndex).nPartId.ToString(), PartList(PartIndex).nCNT - PartList(PartIndex).nINPROD)
+      Next
+      ' Eseguo lo script
+      Dim bOk As Boolean = False
+      If EgtLuaExecFile(sExecPath) Then
+         ' Recupero i risultati
+         Dim nErr As Integer = 999
+         EgtLuaGetGlobIntVar("NEST.ERR", nErr)
+         bOk = (nErr <= 0)
+         If Not bOk Then EgtOutLog("NestExec Err=" & nErr.ToString())
+      Else
+         bOk = False
+         EgtOutLog("Error executing Nest Exec script " & sExecPath)
+      End If
+      ' Cancello tavola globale
+      EgtLuaResetGlobVar("NEST")
+      EgtLuaResetGlobVar("PART")
+      Return bOk
+   End Function
+
 End Module

EgtBEAMWALL.Core/Utility/LuaMsgManager.vb

@@ -1,31 +0,0 @@
-Imports EgtUILib
-
-Public Module LuaMsgManager
-
-   Public Function MessageFromLuaMsg(LuaMsg As String) As String
-      ' verifico se inizia con $$
-      If Not String.IsNullOrWhiteSpace(LuaMsg) AndAlso LuaMsg.Length >= 2 AndAlso LuaMsg.Substring(0, 2) = "$$" Then
-         Dim sMsgArgs() As String = LuaMsg.Substring(2).Split(",")
-         Dim nMsg As Integer = -1
-         If sMsgArgs.Count > 1 AndAlso Integer.TryParse(sMsgArgs(0), nMsg) AndAlso nMsg > 0 Then
-            If sMsgArgs.Count > 1 Then
-               Dim sArgs() As String = sMsgArgs.Skip(1).ToArray()
-               Dim sMsg As String = String.Format(EgtMsg(65000 + nMsg), sArgs)
-               If Not String.IsNullOrWhiteSpace(sMsg) Then
-                  Return sMsg
-               Else
-                  Return EgtMsg(65000 + nMsg)
-               End If
-            Else
-               Return EgtMsg(65000 + nMsg)
-            End If
-         Else
-            Return LuaMsg
-         End If
-      Else
-         Return LuaMsg
-      End If
-      Return ""
-   End Function
-
-End Module

EgtBEAMWALL.Core/Utility/ManageView.vb

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

EgtBEAMWALL.Core/Utility/ManageWindow.vb

@@ -1,57 +0,0 @@
-Imports System.Runtime.InteropServices
-
-Public Module ManageWindow
-
-
-   <DllImport("user32.dll")>
-   Public Function FindWindow(ByVal className As String, ByVal windowTitle As String) As IntPtr
-   End Function
-   <DllImport("user32.dll")>
-   Private Function ShowWindow(ByVal hWnd As IntPtr, ByVal flags As ShowWindowEnum) As Boolean
-   End Function
-   <DllImport("user32.dll")>
-   Private Function SetForegroundWindow(ByVal hwnd As IntPtr) As Integer
-   End Function
-   <DllImport("user32.dll")>
-   Private Function GetWindowPlacement(ByVal hWnd As IntPtr, ByRef lpwndpl As Windowplacement) As Boolean
-   End Function
-
-   Private Enum ShowWindowEnum
-      Hide = 0
-      ShowNormal = 1
-      ShowMinimized = 2
-      ShowMaximized = 3
-      Maximize = 3
-      ShowNormalNoActivate = 4
-      Show = 5
-      Minimize = 6
-      ShowMinNoActivate = 7
-      ShowNoActivate = 8
-      Restore = 9
-      ShowDefault = 10
-      ForceMinimized = 11
-   End Enum
-
-   Private Structure Windowplacement
-      Public length As Integer
-      Public flags As Integer
-      Public showCmd As Integer
-      Public ptMinPosition As System.Drawing.Point
-      Public ptMaxPosition As System.Drawing.Point
-      Public rcNormalPosition As System.Drawing.Rectangle
-   End Structure
-
-   Public Sub BringWindowToFront(wdwIntPtr As IntPtr)
-      'Dim wdwIntPtr As IntPtr = FindWindow(Nothing, "0016 - EgtBEAMWALL")
-      Dim placement As Windowplacement = New Windowplacement()
-      GetWindowPlacement(wdwIntPtr, placement)
-      ' se minimizzata
-      If placement.showCmd = 2 Then
-         ' riporto in vista non minimizzata
-         ShowWindow(wdwIntPtr, ShowWindowEnum.Restore)
-      End If
-      ' porto avanti la finestra rendendola quella attiva
-      SetForegroundWindow(wdwIntPtr)
-   End Sub
-
-End Module

EgtBEAMWALL.Core/Utility/VMBase.vb

@@ -0,0 +1,12 @@
+Imports System.ComponentModel
+
+Public Class VMBase
+   Implements INotifyPropertyChanged
+
+   Public Event PropertyChanged(sender As Object, e As PropertyChangedEventArgs) Implements INotifyPropertyChanged.PropertyChanged
+
+   Public Sub NotifyPropertyChanged(propName As String)
+      RaiseEvent PropertyChanged(Me, New PropertyChangedEventArgs(propName))
+   End Sub
+
+End Class

EgtBEAMWALL.Core/ViewPanel/ViewPanelV.xaml

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

EgtBEAMWALL.Core/ViewPanel/ViewPanelV.xaml.vb

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

EgtBEAMWALL.Core/ViewPanel/ViewPanelVM.vb

@@ -1,265 +0,0 @@
-Imports EgtBEAMWALL.Core.ConstBeam
-Imports EgtUILib
-
-Public Class ViewPanelVM
-   Inherits EgtWPFLib5.ViewPanelVM
-
-   ' Tipo di progetto aperto
-   Private Shared m_Type As BWType
-   Public Shared ReadOnly Property Type As BWType
-      Get
-         Return m_Type
-      End Get
-   End Property
-
-   ' Posizione vista
-   Private Shared m_nViewDir As VT = VT.ISO_SW
-
-   Public Shared Sub BWSetView(nView As VT, Optional bRedraw As Boolean = True)
-      ' condizioni che cambiano la vista del progetto
-      'Select Case m_Type
-      '   Case BWType.BEAM
-      '      Select Case nView
-      '         Case VT.TOP
-      '            EgtSetView(VT.TOP, bRedraw)
-      '         Case VT.FRONT
-      '            EgtSetView(VT.FRONT, bRedraw)
-      '         Case VT.BACK
-      '            EgtSetView(VT.BACK, bRedraw)
-      '         Case VT.RIGHT
-      '            EgtSetView(VT.RIGHT, bRedraw)
-      '         Case VT.LEFT
-      '            EgtSetView(VT.LEFT, bRedraw)
-      '         Case VT.ISO_SW
-      '            EgtSetView(VT.ISO_SW, bRedraw)
-      '         Case Else                                                ' VT.ISO_SW
-      '            EgtSetView(VT.ISO_SW, bRedraw)
-      '      End Select
-      '   Case BWType.WALL
-      Select Case nView
-         Case VT.TOP
-            Select Case m_nViewDir
-               Case VT.ISO_SW, VT.ISO_SE
-                  EgtSetGenericView(0, -90, bRedraw)              ' equivalente a vista TOP
-               Case VT.ISO_NW, VT.ISO_NE
-                  EgtSetGenericView(0, 90, bRedraw)               ' equivalente a vista TOP ruotata di 180 su Z
-            End Select
-         Case VT.FRONT
-            Select Case m_nViewDir
-               Case VT.ISO_SW, VT.ISO_SE
-                  EgtSetGenericView(90, -90, bRedraw)              ' equivalente a vista FRONT
-               Case VT.ISO_NW, VT.ISO_NE
-                  EgtSetGenericView(90, 90, bRedraw)               ' equivalente a vista FRONT ruotata di 180 su Z
-            End Select
-         Case VT.BACK
-            Select Case m_nViewDir
-               Case VT.ISO_SW, VT.ISO_SE
-                  EgtSetGenericView(-90, -90, bRedraw)              ' equivalente a vista BACK
-               Case VT.ISO_NW, VT.ISO_NE
-                  EgtSetGenericView(-90, 90, bRedraw)               ' equivalente a vista BACK ruotata di 180 su Z
-            End Select
-         Case VT.RIGHT
-            Select Case m_nViewDir
-               Case VT.ISO_SW, VT.ISO_SE
-                  EgtSetGenericView(90, 0, bRedraw)                ' equivalente a vista RIGHT
-               Case VT.ISO_NW, VT.ISO_NE
-                  EgtSetGenericView(-90, 0, bRedraw)               ' equivalente a vista RIGHT ruotata di 180 su Z
-            End Select
-         Case VT.LEFT
-            Select Case m_nViewDir
-               Case VT.ISO_SW, VT.ISO_SE
-                  EgtSetGenericView(-90, 0, bRedraw)              ' equivalente a vista LEFT
-               Case VT.ISO_NW, VT.ISO_NE
-                  EgtSetGenericView(90, 0, bRedraw)               ' equivalente a vista LEFT ruotata di 180 su Z
-            End Select
-         Case VT.ISO_SW
-            Select Case m_nViewDir
-               Case VT.ISO_SW, VT.ISO_SE
-                  EgtSetGenericView(60, 225, bRedraw)              ' equivalente a vista ISO_SW
-               Case VT.ISO_NW, VT.ISO_NE
-                  EgtSetGenericView(60, 45, bRedraw)               ' equivalente a vista ISO_SW ruotata di 180 su Z
-            End Select
-         Case Else                                                 ' VT.ISO_SW
-            Select Case m_nViewDir
-               Case VT.ISO_SW, VT.ISO_SE
-                  EgtSetGenericView(60, 225, bRedraw)              ' equivalente a vista ISO_SW
-               Case VT.ISO_NW, VT.ISO_NE
-                  EgtSetGenericView(60, 45, bRedraw)               ' equivalente a vista ISO_SW ruotata di 180 su Z
-            End Select
-      End Select
-      'End Select
-   End Sub
-
-   Public Shared Sub UpdateMachParam(ViewDir As VT)
-      m_nViewDir = ViewDir
-   End Sub
-
-   Public Shared Sub UpdateBWType(Type As BWType)
-      m_Type = Type
-   End Sub
-
-#Region "COMMANDS"
-
-#Region "TopViewCommand"
-
-   ''' <summary>
-   ''' Execute the TopView.  This method is invoked by the TopViewCommand.
-   ''' </summary>
-   Public Overrides Sub TopView(ByVal param As Object)
-      ViewPanelVM.BWSetView(VT.TOP, True)
-   End Sub
-
-#End Region ' TopViewCommand
-
-#Region "FrontViewCommand"
-
-   ''' <summary>
-   ''' Execute the FrontView.  This method is invoked by the FrontViewCommand.
-   ''' </summary>
-   Public Overrides Sub FrontView(ByVal param As Object)
-      ViewPanelVM.BWSetView(VT.FRONT, True)
-   End Sub
-
-#End Region ' FrontViewCommand
-
-#Region "LeftViewCommand"
-
-   ''' <summary>
-   ''' Execute the LeftView.  This method is invoked by the LeftViewCommand.
-   ''' </summary>
-   Public Overrides Sub LeftView(ByVal param As Object)
-      ViewPanelVM.BWSetView(VT.LEFT, True)
-   End Sub
-
-#End Region ' LeftViewCommand
-
-#Region "BackViewCommand"
-
-   ''' <summary>
-   ''' Execute the BackView.  This method is invoked by the BackViewCommand.
-   ''' </summary>
-   Public Overrides Sub BackView(ByVal param As Object)
-      ViewPanelVM.BWSetView(VT.BACK, True)
-   End Sub
-
-#End Region ' BackViewCommand
-
-#Region "RightViewCommand"
-
-   ''' <summary>
-   ''' Execute the RightView.  This method is invoked by the RightViewCommand.
-   ''' </summary>
-   Public Overrides Sub RightView(ByVal param As Object)
-      ViewPanelVM.BWSetView(VT.RIGHT, True)
-   End Sub
-
-#End Region ' RightViewCommand
-
-   '#Region "IsoViewSECommand"
-
-   '   ''' <summary>
-   '   ''' Returns a command that do IsoViewSE.
-   '   ''' </summary>
-   '   Public ReadOnly Property IsoViewSECommand As ICommand
-   '      Get
-   '         If m_cmdIsoViewSE Is Nothing Then
-   '            m_cmdIsoViewSE = New Command(AddressOf IsoViewSE)
-   '         End If
-   '         Return m_cmdIsoViewSE
-   '      End Get
-   '   End Property
-
-   '   ''' <summary>
-   '   ''' Execute the IsoViewSE.  This method is invoked by the IsoViewSECommand.
-   '   ''' </summary>
-   '   Public Sub IsoViewSE(ByVal param As Object)
-   '      LibMap.refSceneHostVM.MainScene.IsoViewSE()
-   '   End Sub
-
-   '#End Region ' IsoViewSECommand
-
-#Region "IsoViewSWCommand"
-
-
-   ''' <summary>
-   ''' Execute the IsoViewSW.  This method is invoked by the IsoViewSWCommand.
-   ''' </summary>
-   Public Overrides Sub IsoViewSW(ByVal param As Object)
-      ViewPanelVM.BWSetView(VT.ISO_SW, True)
-   End Sub
-
-#End Region ' IsoViewSWCommand
-
-   '#Region "IsoViewNECommand"
-
-   '   ''' <summary>
-   '   ''' Returns a command that do IsoViewNE.
-   '   ''' </summary>
-   '   Public ReadOnly Property IsoViewNECommand As ICommand
-   '      Get
-   '         If m_cmdIsoViewNE Is Nothing Then
-   '            m_cmdIsoViewNE = New Command(AddressOf IsoViewNE)
-   '         End If
-   '         Return m_cmdIsoViewNE
-   '      End Get
-   '   End Property
-
-   '   ''' <summary>
-   '   ''' Execute the IsoViewNE.  This method is invoked by the IsoViewNECommand.
-   '   ''' </summary>
-   '   Public Sub IsoViewNE(ByVal param As Object)
-   '      LibMap.refSceneHostVM.MainScene.IsoViewNE()
-   '   End Sub
-
-   '#End Region ' IsoViewNECommand
-
-   '#Region "IsoViewNWCommand"
-
-   '   ''' <summary>
-   '   ''' Returns a command that do IsoViewNW.
-   '   ''' </summary>
-   '   Public ReadOnly Property IsoViewNWCommand As ICommand
-   '      Get
-   '         If m_cmdIsoViewNW Is Nothing Then
-   '            m_cmdIsoViewNW = New Command(AddressOf IsoViewNW)
-   '         End If
-   '         Return m_cmdIsoViewNW
-   '      End Get
-   '   End Property
-
-   '   ''' <summary>
-   '   ''' Execute the IsoViewNW.  This method is invoked by the IsoViewNWCommand.
-   '   ''' </summary>
-   '   Public Sub IsoViewNW(ByVal param As Object)
-   '      LibMap.refSceneHostVM.MainScene.IsoViewNW()
-   '   End Sub
-
-   '#End Region ' IsoViewNWCommand
-
-   '#Region "ViewToCPlaneCommand"
-
-   '   ''' <summary>
-   '   ''' Returns a command that do GetDist.
-   '   ''' </summary>
-   '   Public ReadOnly Property ViewToCPlaneCommand As ICommand
-   '      Get
-   '         If m_cmdViewToCPlane Is Nothing Then
-   '            m_cmdViewToCPlane = New Command(AddressOf ViewToCPlane)
-   '         End If
-   '         Return m_cmdViewToCPlane
-   '      End Get
-   '   End Property
-
-   '   ''' <summary>
-   '   ''' Execute the GetDist.  This method is invoked by the GetDistCommand.
-   '   ''' </summary>
-   '   Public Sub ViewToCPlane(ByVal param As Object)
-   '      LibMap.refSceneHostVM.MainScene.CPlaneView()
-   '   End Sub
-
-   '#End Region ' ViewToCPlaneCommand
-
-#End Region    ' COMMANDS
-
-End Class
-

EgtBEAMWALL.Core/WallMachGroupM.vb

@@ -27,7 +27,7 @@ Public Class WallMachGroupM
       NewMachGroupM.m_Id = nId
       NewMachGroupM.m_Name = sName
       NewMachGroupM.m_Machine = sMachine
-      NewMachGroupM.m_nType = MachineType.WALL
+      NewMachGroupM.SetMachineType(MachineType.WALL)
       NewMachGroupM.m_nRawPartId = EgtGetFirstRawPart()
       EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELLEN, NewMachGroupM.m_dL)
       EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELWIDTH, NewMachGroupM.m_dW)
@@ -48,7 +48,7 @@ Public Class WallMachGroupM
       If NewMachGroupM.m_Id = GDB_ID.NULL Then Return Nothing
       NewMachGroupM.m_Name = sName
       NewMachGroupM.m_Machine = sMachine
-      NewMachGroupM.m_nType = MachineType.WALL
+      NewMachGroupM.SetMachineType(MachineType.WALL)
       NewMachGroupM.m_nRawPartId = EgtGetFirstRawPart()
       EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELLEN, NewMachGroupM.m_dL)
       EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELWIDTH, NewMachGroupM.m_dW)

EgtBEAMWALL.DataLayer/AdminContext.cs

@@ -1,21 +1,26 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using EgtBEAMWALL.DataLayer.Migrations;
-using MySql.Data.EntityFramework;
-using System;
+using System;
+using System.Collections.Generic;
 using System.Data.Entity;
 using System.Data.Entity.Migrations;
+using MySql.Data.Entity;
 using System.Linq;
+using System.Text;
+using EgtBEAMWALL.DataLayer.DatabaseModels;
+using EgtBEAMWALL.DataLayer.Migrations;
 using System.ServiceProcess;
+using System.IO;
+using System.Data.Entity.Infrastructure;
 
 namespace EgtBEAMWALL.DataLayer
 {
     [DbConfigurationType(typeof(MySqlEFConfiguration))]
+    //[DbConfigurationType(typeof(aMySqlConfiguration))]
     public class AdminContext : DbContext
     {
         #region Public Constructors
 
         [Obsolete("This constructor should never be used directly, and is only needed to generate entityframework stuff. Connection string can be adapted as pleased.")]
-        public AdminContext() : base(DbConfig.ADMIN_CONNECTION_STRING)
+        public AdminContext() : base("DefaultConnection")
         {
         }
 
@@ -33,67 +38,5 @@ namespace EgtBEAMWALL.DataLayer
         public DbSet<UserPriv> UserList { get; set; }
 
         #endregion Public Properties
-
-        #region Public Methods
-
-        public bool SetUpDbConnectionAndDbConfig()
-        {
-            try
-            {
-                String serviceName = getDbServiceName();
-                if (serviceName.Equals(""))
-                {
-                    return false;
-                }
-
-                ServiceController service = new ServiceController(serviceName);
-                try
-                {
-                    TimeSpan timeout = TimeSpan.FromSeconds(DbConfig.DATABASE_PROCESS_TIMEOUT);
-                    service.WaitForStatus(ServiceControllerStatus.Running, timeout);
-                }
-                catch (Exception)
-                {
-                    return false;
-                }
-
-                //Database.SetInitializer<DatabaseContext>(null);
-                Database.SetInitializer(new MigrateDatabaseToLatestVersion<DatabaseContext, Configuration>());
-                var migrator = new DbMigrator(new Configuration());
-
-                if (migrator.GetPendingMigrations().Any())
-                {
-                    // Run migrations and seed.
-                    migrator.Update();
-                }
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine(exc.ToString());
-                return false;
-            }
-
-            return true;
-        }
-
-        #endregion Public Methods
-
-        #region Private Methods
-
-        private static string getDbServiceName()
-        {
-            ServiceController[] services = ServiceController.GetServices();
-            var service = services.FirstOrDefault(s => s.ServiceName == "MariaDB");
-            if (service != null)
-                return service.DisplayName;
-
-            service = services.FirstOrDefault(s => s.ServiceName == "MySQL");
-            if (service != null)
-                return service.DisplayName;
-
-            return "";
-        }
-
-        #endregion Private Methods
     }
 }

EgtBEAMWALL.DataLayer/App.config

@@ -1,49 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-   <configSections>
-      <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-      <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-   </configSections>
-   <entityFramework>
-      <!--<defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.EntityFramework" />-->
-      <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
-      <providers>
-         <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.EntityFramework, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
-         </provider>
-      </providers>
-   </entityFramework>
-   <connectionStrings>
-      <add name="DefaultConnection" connectionString="server=localhost;port=3306;User Id=steamware;password=Egalware_24068!;Persist Security Info=True;database=EgtBwDb_000470;SslMode=none" providerName="MySql.Data.MySqlClient" />
-   </connectionStrings>
-   <runtime>
-      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-         <dependentAssembly>
-            <assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-8.0.21.0" newVersion="8.0.21.0" />
-         </dependentAssembly>
-         <dependentAssembly>
-            <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-         </dependentAssembly>
-         <dependentAssembly>
-            <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-3.21.9.0" newVersion="3.21.9.0" />
-         </dependentAssembly>
-         <dependentAssembly>
-            <assemblyIdentity name="K4os.Compression.LZ4.Streams" publicKeyToken="2186fa9121ef231d" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-1.3.5.0" newVersion="1.3.5.0" />
-         </dependentAssembly>
-         <dependentAssembly>
-            <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-1.9.0.0" newVersion="1.9.0.0" />
-         </dependentAssembly>
-         <dependentAssembly>
-            <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
-         </dependentAssembly>
-      </assemblyBinding>
-   </runtime>
-   <startup>
-      <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-   </startup>
+    <configSections>
+        <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+        <section name="entityFramework"
+          type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
+          requirePermission="false" />
+    </configSections>
+    <entityFramework>
+        <defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.Entity.EF6" />
+        <providers>
+            <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+            <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
+        </providers>
+    </entityFramework>
+    <connectionStrings>
+        <add name="DefaultConnection"
+          connectionString="server=localhost;port=3306;User Id=EgtUser;password=viacremasca;Persist Security Info=True;database=EgtBwDb;SslMode=none"
+          providerName="MySql.Data.MySqlClient" />
+    </connectionStrings>
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-6.10.9.0" newVersion="6.10.9.0" />
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    </startup>
 </configuration>

EgtBEAMWALL.DataLayer/Controllers/BTLPartController.cs

@@ -1,17 +1,25 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using NLog;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using EgtBEAMWALL.DataLayer.DatabaseModels;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
 {
     public class BTLPartController : IDisposable
     {
+        #region Private Fields
+
+        private DatabaseContext dbCtx;
+
+        #endregion Private Fields
+
         #region Public Constructors
 
         public BTLPartController()
         {
+            // Initialize database context
+            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         #endregion Public Constructors
@@ -24,7 +32,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <param name="corePart"></param>
         /// <param name="currProjDbId"></param>
         /// <returns></returns>
-        public BTLPartModel ConvertFromCore(Core.BTLPartM corePart, int currProjDbId)
+        public static BTLPartModel ConvertFromCore(Core.BTLPartM corePart, int currProjDbId)
         {
             BTLPartModel answ = new BTLPartModel();
             if (corePart != null)
@@ -97,19 +105,15 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             {
                 try
                 {
-                    using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-                    {
-                        // Add to database
-                        localDbCtx.BTLPartList.AddRange(partData);
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                    }
+                    // Add to database
+                    dbCtx.BTLPartList.AddRange(partData);
+                    // Commit changes
+                    dbCtx.SaveChanges();
+                    ResetController();
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on BTLPart.Create: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on Create: {exc}");
                 }
                 return partData;
             }
@@ -143,19 +147,15 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
             try
             {
-                using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-                {
-                    // Add to database
-                    localDbCtx.BTLPartList.AddRange(partData);
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                }
+                // Add to database
+                dbCtx.BTLPartList.AddRange(partData);
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
             }
             catch (Exception exc)
             {
-                string errMessage = $"EXCEPTION on BTLPart.CreateBaseObj: {Environment.NewLine}{exc}";
-                Console.WriteLine(errMessage);
-                Log.Error(errMessage);
+                Console.WriteLine($"EXCEPTION on CreateBaseObj: {exc}");
             }
 
             return partData;
@@ -169,26 +169,22 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Delete(int PartDbId)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var item2del = localDbCtx
+            var item2del = dbCtx
                 .BTLPartList
                 .Where(x => x.BTLPartDbId == PartDbId)
                 .SingleOrDefault();
-                try
-                {
-                    // Add to database
-                    localDbCtx.BTLPartList.Remove(item2del);
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on BTLPart.Delete: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+            try
+            {
+                // Add to database
+                dbCtx.BTLPartList.Remove(item2del);
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on Delete: {exc}");
             }
             return done;
         }
@@ -201,31 +197,29 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool DeleteByProject(int ProjDbId)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var items2del = localDbCtx
+            var items2del = dbCtx
                 .BTLPartList
                 .Where(x => x.ProjDbId == ProjDbId);
-                try
-                {
-                    // Add to database
-                    localDbCtx.BTLPartList.RemoveRange(items2del);
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on BTLPart.DeleteByProject: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+            try
+            {
+                // Add to database
+                dbCtx.BTLPartList.RemoveRange(items2del);
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on DeleteByProject: {exc}");
             }
             return done;
         }
 
         public void Dispose()
         {
+            // Clear database context
+            dbCtx.Dispose();
         }
 
         /// <summary>
@@ -235,13 +229,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public BTLPartModel FindByDbId(int PartDbId)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
+            return dbCtx
                 .BTLPartList
                 .Where(x => x.BTLPartDbId == PartDbId)
                 .SingleOrDefault();
-            }
         }
 
         /// <summary>
@@ -251,13 +242,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public BTLPartModel FindByPartId(int PartId)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
+            return dbCtx
                 .BTLPartList
                 .Where(x => x.PartId == PartId)
                 .SingleOrDefault();
-            }
         }
 
         /// <summary>
@@ -268,13 +256,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public BTLPartModel FindByPartIdProjDbId(int PartId, int ProjDbId)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
+            return dbCtx
                 .BTLPartList
                 .Where(x => x.PartId == PartId && x.ProjDbId == ProjDbId)
                 .FirstOrDefault();
-            }
         }
 
         /// <summary>
@@ -284,15 +269,12 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public List<BTLPartModel> GetByProjectAsc(int ProjDbId)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                return localDbCtx
+            // retrieve
+            return dbCtx
                 .BTLPartList
                 .Where(x => x.ProjDbId == ProjDbId)
                 .OrderBy(x => x.BTLPartDbId)
                 .ToList();
-            }
         }
 
         /// <summary>
@@ -302,15 +284,12 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public List<BTLPartModel> GetByProjectDesc(int ProjDbId)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                return localDbCtx
+            // retrieve
+            return dbCtx
                 .BTLPartList
                 .Where(x => x.ProjDbId == ProjDbId)
                 .OrderByDescending(x => x.BTLPartDbId)
                 .ToList();
-            }
         }
 
         /// <summary>
@@ -321,22 +300,17 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public List<BTLPartModel> GetPaginatedAsc(int PartDbIdStart, int numRecord)
         {
-            List<BTLPartModel> answ = new List<BTLPartModel>();
             int numEnd = PartDbIdStart - numRecord;
             // check numEnd
             if (numEnd < 0)
                 numEnd = 0;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                answ = localDbCtx
-                        .BTLPartList
-                        .Where(x => x.BTLPartDbId <= PartDbIdStart)
-                        .OrderBy(x => x.BTLPartDbId)
-                        .Take(numRecord)
-                        .ToList();
-            }
-            return answ;
+            // retrieve
+            return dbCtx
+                .BTLPartList
+                .Where(x => x.BTLPartDbId <= PartDbIdStart)
+                .OrderBy(x => x.BTLPartDbId)
+                .Take(numRecord)
+                .ToList();
         }
 
         /// <summary>
@@ -347,22 +321,26 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public List<BTLPartModel> GetPaginatedDesc(int PartDbIdStart, int numRecord)
         {
-            List<BTLPartModel> answ = new List<BTLPartModel>();
             int numEnd = PartDbIdStart - numRecord;
             // check numEnd
             if (numEnd < 0)
                 numEnd = 0;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                answ = localDbCtx
-                        .BTLPartList
-                        .Where(x => x.BTLPartDbId <= PartDbIdStart)
-                        .OrderByDescending(x => x.BTLPartDbId)
-                        .Take(numRecord)
-                        .ToList();
-            }
-            return answ;
+            // retrieve
+            return dbCtx
+                .BTLPartList
+                .Where(x => x.BTLPartDbId <= PartDbIdStart)
+                .OrderByDescending(x => x.BTLPartDbId)
+                .Take(numRecord)
+                .ToList();
+        }
+
+        /// <summary>
+        /// Reinizializzaizone del controller
+        /// </summary>
+        public void ResetController()
+        {
+            // Re-Initialize database context
+            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         /// <summary>
@@ -373,44 +351,32 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Update(BTLPartModel updItem)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var item2update = localDbCtx
+            var item2update = dbCtx
                 .BTLPartList
                 .Where(x => x.BTLPartDbId == updItem.BTLPartDbId)
                 .SingleOrDefault();
-                try
-                {
-                    // update, vers 1...
-                    localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
+            try
+            {
+                // update, vers 1...
+                dbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
 
-                    //// update, vers 2
-                    //localDbCtx.BTLPartList.Remove(item2del);
-                    //localDbCtx.BTLPartList.Add(updItem);
+                //// update, vers 2
+                //dbCtx.BTLPartList.Remove(item2del);
+                //dbCtx.BTLPartList.Add(updItem);
 
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on BTLPart.Update: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                // Commit changes
+                dbCtx.SaveChanges();
+                done = true;
             }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on Update: {exc}");
+            }
+            // reset...
+            ResetController();
             return done;
         }
 
         #endregion Public Methods
-
-        #region Private Fields
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
     }
 }

EgtBEAMWALL.DataLayer/Controllers/DbController.cs

@@ -1,227 +1,97 @@
-using NLog;
-using System;
+using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
+using System.Text;
+using EgtBEAMWALL.DataLayer.DatabaseModels;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
 {
-    public class DbController : IDisposable
-    {
-        #region Public Fields
+   public class DbController : IDisposable
+   {
+      #region Private Fields
 
-        /// <summary>
-        /// Singleton gestione
-        /// </summary>
-        public static DbController man = new DbController();
+      private AdminContext adbCtx;
 
-        #endregion Public Fields
+      #endregion Private Fields
 
-        #region Public Constructors
+      #region Public Fields
 
-        public DbController()
-        {
-            // Initialize database context for ADMIN
-            adbCtx = new AdminContext(DbConfig.ADMIN_CONNECTION_STRING);
-            // DB standard utente
-            dbCtx = new AdminContext(DbConfig.CONNECTION_STRING);
-        }
+      /// <summary>
+      /// Singleton gestione
+      /// </summary>
+      public static DbController man = new DbController();
 
-        #endregion Public Constructors
+      #endregion Public Fields
 
-        #region Public Methods
+      #region Public Constructors
 
-        /// <summary>
-        /// Verifica necessità creazione utente (locale o in rete)
-        /// </summary>
-        /// <param name="username"></param>
-        /// <param name="pwd"></param>
-        /// <param name="isNetwork"></param>
-        /// <returns></returns>
-        public bool checkCreateUser(string username, string pwd, bool isNetwork)
-        {
-            bool answ = false;
-            string domain = isNetwork ? "%" : "localhost";
-            answ = doCheckCreate(username, pwd, answ, domain, false);
-            if (answ)
-            {
-                doGrantPriv(username, domain, "ALL ON *.*");
-            }
-            return answ;
-        }
+      public DbController()
+      {
+         // Initialize database context for ADMIN
+         adbCtx = new AdminContext(DbConfig.ADMIN_CONNECTION_STRING);
+      }
 
-        /// <summary>
-        /// Migrazione esplicita del DB da parte dell'admin controller
-        /// </summary>
-        /// <returns></returns>
-        public bool checkMigrateDb()
-        {
-            return adbCtx.SetUpDbConnectionAndDbConfig();
-        }
+      #endregion Public Constructors
 
-        public void Dispose()
-        {
-            // Clear database context
-            adbCtx.Dispose();
-        }
-
-        /// <summary>
-        /// Verifica esistenza views + utente relativo eventualmente ricreandole + fornendo accesso
-        /// all'utente ReadOnly Essetre
-        /// </summary>
-        /// <param name="dbName"></param>
-        /// <param name="username"></param>
-        /// <param name="pwd"></param>
-        /// <returns></returns>
-        public bool refreshViews(string dbName, string username = "S3_User", string pwd = "S3_P4ssw0rd")
-        {
-            bool answ = false;
-
-            // in primis refresh delle view
-            string sqlCommand = @"CREATE OR REPLACE VIEW v_expProdRaw AS
-                                    SELECT DbId, AlarmDtEvent AS DtEvent, VarValue,
-                                    SUBSTRING_INDEX(VarValue, ';', 1) AS Prod,
-                                    SUBSTRING_INDEX(SUBSTRING_INDEX(VarValue, ';', 2), ';', -1) AS MachGroupId,
-                                    SUBSTRING_INDEX(SUBSTRING_INDEX(VarValue, ';', -2), ';', 1) AS PartId,
-                                    SUBSTRING_INDEX(VarValue, ';', -1) AS Status
-                                    FROM logmachine
-                                    WHERE ResultType = 1
-                                    AND VarAddress = 1;
-
-                                    CREATE OR REPLACE VIEW v_expProd AS
-                                    SELECT vp.DtEvent, vp.Prod, mgl.Name AS mgName, pl.PDN, vp.`Status`
-                                    FROM v_expProdRaw AS vp
-                                    INNER JOIN MachGroupList mgl ON vp.MachGroupId = mgl.Id
-                                    INNER JOIN partlist pl ON vp.PartId = pl.Id;";
-            dbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-            Thread.Sleep(100);
-
-            // ora setup parametri x utente
-            string domain = "%";
-
-            // ora controllo utente con diritti
-            answ = doCheckCreate(username, pwd, answ, domain, true);
-            if (answ)
-            {
-                doGrantPriv(username, domain, "USAGE ON *.*");
-                doGrantPriv(username, domain, $"SELECT ON {dbName}.v_expProd");
-            }
-
-            return answ;
-        }
-
-        /// <summary>
-        /// ATTENZIONE!!!! Procedura di Reset del DB
-        /// </summary>
-        /// <returns></returns>
-        public bool ResetDb()
-        {
-            bool answ = false;
-
-            try
-            {
-                adbCtx
-                    .Database
-                    .SqlQuery<int>("CALL stp_ResetDb()");
-                answ = true;
-
-                adbCtx.SaveChanges();
-            }
-            catch (Exception exc)
-            {
-                string errMessage = $"EXCEPTION on DbController.ResetDb: {Environment.NewLine}{exc}";
-                Console.WriteLine(errMessage);
-                Log.Error(errMessage);
-            }
-
-            return answ;
-        }
-
-        #endregion Public Methods
-
-        #region Private Fields
-
-        private AdminContext adbCtx;
-        private AdminContext dbCtx;
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
-
-        #region Private Methods
-
-        /// <summary>
-        /// Procedura interna effettiva di check utente ed eventuale creazione + grant level
-        /// </summary>
-        /// <param name="username"></param>
-        /// <param name="pwd"></param>
-        /// <param name="answ"></param>
-        /// <param name="domain"></param>
-        /// <param name="force">Force = esegue un drop prima...</param>
-        /// <returns></returns>
-        private bool doCheckCreate(string username, string pwd, bool answ, string domain, bool force)
-        {
-            // ricerca utente...
-            var numUser = adbCtx
-                .UserList
-                .Where(x => x.User == username)
-                .ToList()
-                .Count;
-            if (numUser > 0)
-            {
-                answ = true;
-            }
-            if (!answ)
-            {
-                // creo utente
-                string sqlCommand = $"DROP USER  IF EXISTS {username};";
-                if (force)
-                {
-                    adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-                    Thread.Sleep(100);
-                }
-                sqlCommand = "FLUSH PRIVILEGES;";
-                adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-                Thread.Sleep(100);
-                sqlCommand = $"CREATE USER '{username}'@'{domain}' IDENTIFIED BY '{pwd}';";
-                adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-                Thread.Sleep(100);
-                sqlCommand = "FLUSH PRIVILEGES;";
-                adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-                Thread.Sleep(100);
-                answ = true;
-            }
-
-            return answ;
-        }
-
-        /// <summary>
-        /// Procedura interna effettiva di grant level x utente
-        /// </summary>
-        /// <param name="username"></param>
-        /// <param name="domain"></param>
-        /// <param name="grantLevel"></param>
-        /// <returns></returns>
-        private bool doGrantPriv(string username, string domain, string grantLevel)
-        {
-            bool answ = false;
+      #region Public Methods
 
+      public bool checkCreateUser(string username, string pwd)
+      {
+         bool answ = false;
+         // ricerca utente...
+         var numUser = adbCtx
+             .UserList
+             .Where(x => x.User == username)
+             .ToList()
+             .Count;
+         if (numUser > 0)
+         {
+            answ = true;
+         }
+         if (!answ)
+         {
+            // creo utente
             string sqlCommand = "FLUSH PRIVILEGES;";
+            //string sqlCommand = $"CREATE USER '{username}'@'localhost' IDENTIFIED BY '{pwd}'; GRANT ALL ON *.* TO '{username}'@'localhost'; FLUSH PRIVILEGES;";
+            //string sqlCommand = $"CREATE USER '{username}'@'localhost' IDENTIFIED BY '{pwd}'; GRANT ALL ON *.* TO '{username}'@'localhost'; FLUSH PRIVILEGES;";
             adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-            Thread.Sleep(100);
-            sqlCommand = $"GRANT {grantLevel} TO '{username}'@'{domain}';";
+            sqlCommand = $"CREATE USER '{username}'@'localhost' IDENTIFIED BY '{pwd}';";
+            adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
+            sqlCommand = $"GRANT ALL ON *.* TO '{username}'@'localhost';";
             adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-            Thread.Sleep(100);
             sqlCommand = "FLUSH PRIVILEGES;";
             adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-            Thread.Sleep(100);
+         }
+         return answ;
+      }
+
+      public void Dispose()
+      {
+         // Clear database context
+         adbCtx.Dispose();
+      }
+
+      public bool ResetDb()
+      {
+         bool answ = false;
+
+         try
+         {
+            adbCtx
+                .Database
+                .SqlQuery<int>("CALL stp_ResetDb()");
             answ = true;
 
-            return answ;
-        }
+            adbCtx.SaveChanges();
+         }
+         catch (Exception exc)
+         {
+            Console.WriteLine($"EXCEPTION on ResetDb: {exc}");
+         }
 
-        #endregion Private Methods
-    }
+         return answ;
+      }
+
+      #endregion Public Methods
+   }
 }

EgtBEAMWALL.DataLayer/Controllers/LogMachineController.cs

@@ -1,17 +1,25 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using NLog;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using EgtBEAMWALL.DataLayer.DatabaseModels;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
 {
     public class LogMachineController : IDisposable
     {
+        #region Private Fields
+
+        private DatabaseContext dbCtx;
+
+        #endregion Private Fields
+
         #region Public Constructors
 
         public LogMachineController()
         {
+            // Initialize database context
+            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         #endregion Public Constructors
@@ -23,7 +31,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// </summary>
         /// <param name="coreMacLog"></param>
         /// <returns></returns>
-        public LogMachineModel ConvertFromCore(Core.MachLog coreMacLog)
+        public static LogMachineModel ConvertFromCore(Core.MachLog coreMacLog)
         {
             LogMachineModel answ = new LogMachineModel();
             if (coreMacLog != null)
@@ -53,9 +61,9 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// </summary>
         /// <param name="dbLog"></param>
         /// <returns></returns>
-        public Core.MachLog ConvertToCore(LogMachineModel dbLog)
+        public static Core.MachLog ConvertToCore(LogMachineModel dbLog)
         {
-            var newRecord = Core.MachLog.CreateMachLog(dbLog.AlarmCode, dbLog.AlarmDatetime, dbLog.AlarmMessage, dbLog.AlarmOperation, dbLog.AlarmType, dbLog.CommandExecutedCorrectly, dbLog.CommandState, dbLog.CommandType, dbLog.Description, dbLog.NewOpState, dbLog.ResultType, dbLog.VarAddress, dbLog.VarValue);
+            var newRecord = Core.MachLog.CreateMacLog(dbLog.AlarmCode, dbLog.AlarmDatetime, dbLog.AlarmMessage, dbLog.AlarmOperation, dbLog.AlarmType, dbLog.CommandExecutedCorrectly, dbLog.CommandState, dbLog.CommandType, dbLog.Description, dbLog.NewOpState, dbLog.ResultType, dbLog.VarAddress, dbLog.VarValue);
             return newRecord;
         }
 
@@ -71,19 +79,18 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             {
                 try
                 {
-                    using (var locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+                    using (var currDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
                     {
                         // Add to database
-                        locallocalDbCtx.LogMachineList.Add(newLogMac);
+                        currDbCtx.LogMachineList.Add(newLogMac);
                         // Commit changes
-                        locallocalDbCtx.SaveChanges();
+                        currDbCtx.SaveChanges();
+                        ResetController();
                     }
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on LogMachine.Create: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on Create LogMachine: {exc}");
                 }
             }
             catch
@@ -110,31 +117,29 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool DeleteByKey(int LogDbId)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var items2del = localDbCtx
+            var items2del = dbCtx
                 .LogMachineList
                 .Where(x => x.LogDbId == LogDbId);
-                try
-                {
-                    // Add to database
-                    localDbCtx.LogMachineList.RemoveRange(items2del);
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on LogMachine.DeleteByKey: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+            try
+            {
+                // Add to database
+                dbCtx.LogMachineList.RemoveRange(items2del);
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on DeleteByKey: {exc}");
             }
             return done;
         }
 
         public void Dispose()
         {
+            // Clear database context
+            dbCtx.Dispose();
         }
 
         /// <summary>
@@ -144,13 +149,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public LogMachineModel FindByDbId(int LogDbId)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
+            return dbCtx
                 .LogMachineList
                 .Where(x => x.LogDbId == LogDbId)
                 .SingleOrDefault();
-            }
         }
 
         /// <summary>
@@ -161,41 +163,12 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public List<LogMachineModel> GetAsc(DateTime dtStart, DateTime dtEnd)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                return localDbCtx
+            // retrieve
+            return dbCtx
                 .LogMachineList
                 .Where(x => x.AlarmDatetime >= dtStart && x.AlarmDatetime <= dtEnd)
                 .OrderBy(x => x.AlarmDatetime)
                 .ToList();
-            }
-        }
-
-        /// <summary>
-        /// Get paginated data from DB (ASC ordered) in "core format"
-        /// </summary>
-        /// <param name="dtStart"></param>
-        /// <param name="dtEnd"></param>
-        /// <returns></returns>
-        public List<Core.MachLog> GetCoreAsc(DateTime dtStart, DateTime dtEnd)
-        {
-            var rawData = GetAsc(dtStart, dtEnd);
-            var coreData = rawData.Select(x => ConvertToCore(x)).ToList();
-            return coreData;
-        }
-
-        /// <summary>
-        /// Get paginated data from DB (DESC ordered) in "core format"
-        /// </summary>
-        /// <param name="dtStart"></param>
-        /// <param name="dtEnd"></param>
-        /// <returns></returns>
-        public List<Core.MachLog> GetCoreDesc(DateTime dtStart, DateTime dtEnd)
-        {
-            var rawData = GetDesc(dtStart, dtEnd);
-            var coreData = rawData.Select(x => ConvertToCore(x)).ToList();
-            return coreData;
         }
 
         /// <summary>
@@ -206,15 +179,21 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public List<LogMachineModel> GetDesc(DateTime dtStart, DateTime dtEnd)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                return localDbCtx
+            // retrieve
+            return dbCtx
                 .LogMachineList
                 .Where(x => x.AlarmDatetime >= dtStart && x.AlarmDatetime <= dtEnd)
                 .OrderByDescending(x => x.AlarmDatetime)
                 .ToList();
-            }
+        }
+
+        /// <summary>
+        /// Reinizializzaizone del controller
+        /// </summary>
+        public void ResetController()
+        {
+            // Re-Initialize database context
+            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         /// <summary>
@@ -225,40 +204,27 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Update(LogMachineModel updItem)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var item2update = localDbCtx
+            var item2update = dbCtx
                 .LogMachineList
                 .Where(x => x.LogDbId == updItem.LogDbId)
                 .SingleOrDefault();
-                try
-                {
-                    // update, vers 1...
-                    localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
+            try
+            {
+                // update, vers 1...
+                dbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
 
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on LogMachine.Update: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on Update: {exc}");
             }
             return done;
         }
 
         #endregion Public Methods
-
-        #region Private Fields
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
     }
 }

EgtBEAMWALL.DataLayer/Controllers/LogSupportController.cs

@@ -1,17 +1,25 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using NLog;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using EgtBEAMWALL.DataLayer.DatabaseModels;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
 {
     public class LogSupportController : IDisposable
     {
+        #region Private Fields
+
+        private DatabaseContext dbCtx;
+
+        #endregion Private Fields
+
         #region Public Constructors
 
         public LogSupportController()
         {
+            // Initialize database context
+            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         #endregion Public Constructors
@@ -33,28 +41,24 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Create(DateTime dtCreated, Core.LogSupportLevel level, Core.LogSupportTarget target, string message)
         {
             bool fatto = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            try
             {
                 try
                 {
-                    try
-                    {
-                        LogSupportModel newItem = new LogSupportModel() { DtEvent = dtCreated, Level = level, Target = target, Message = message };
-                        // Add to database
-                        localDbCtx.LogSupportList.Add(newItem);
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                    }
-                    catch (Exception exc)
-                    {
-                        string errMessage = $"EXCEPTION on LogSupport.Create: {Environment.NewLine}{exc}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
+                    LogSupportModel newItem = new LogSupportModel() { DtEvent = dtCreated, Level = level, Target = target, Message = message };
+                    // Add to database
+                    dbCtx.LogSupportList.Add(newItem);
+                    // Commit changes
+                    dbCtx.SaveChanges();
+                    ResetController();
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on Create LogSupport: {exc}");
                 }
-                catch
-                { }
             }
+            catch
+            { }
             return fatto;
         }
 
@@ -66,31 +70,29 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool DeleteByKey(int LogDbId)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            var items2del = dbCtx
+                .LogSupportList
+                .Where(x => x.LogDbId == LogDbId);
+            try
             {
-                var items2del = localDbCtx
-                                    .LogSupportList
-                                    .Where(x => x.LogDbId == LogDbId);
-                try
-                {
-                    // Add to database
-                    localDbCtx.LogSupportList.RemoveRange(items2del);
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on LogSupport.DeleteByKey: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                // Add to database
+                dbCtx.LogSupportList.RemoveRange(items2del);
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on DeleteByKey: {exc}");
             }
             return done;
         }
 
         public void Dispose()
         {
+            // Clear database context
+            dbCtx.Dispose();
         }
 
         /// <summary>
@@ -100,13 +102,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public LogSupportModel FindByDbId(int LogDbId)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
-                        .LogSupportList
-                        .Where(x => x.LogDbId == LogDbId)
-                        .SingleOrDefault();
-            }
+            return dbCtx
+                .LogSupportList
+                .Where(x => x.LogDbId == LogDbId)
+                .SingleOrDefault();
         }
 
         /// <summary>
@@ -118,14 +117,11 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public List<LogSupportModel> GetPaginatedAsc(DateTime dtStart, DateTime dtEnd)
         {
             // retrieve
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
+            return dbCtx
                 .LogSupportList
                 .Where(x => x.DtEvent >= dtStart && x.DtEvent <= dtEnd)
                 .OrderBy(x => x.DtEvent)
                 .ToList();
-            }
         }
 
         /// <summary>
@@ -137,14 +133,20 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public List<LogSupportModel> GetPaginatedDesc(DateTime dtStart, DateTime dtEnd)
         {
             // retrieve
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
+            return dbCtx
                 .LogSupportList
                 .Where(x => x.DtEvent >= dtStart && x.DtEvent <= dtEnd)
                 .OrderByDescending(x => x.DtEvent)
                 .ToList();
-            }
+        }
+
+        /// <summary>
+        /// Reinizializzaizone del controller
+        /// </summary>
+        public void ResetController()
+        {
+            // Re-Initialize database context
+            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         /// <summary>
@@ -155,40 +157,27 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Update(LogSupportModel updItem)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var item2update = localDbCtx
+            var item2update = dbCtx
                 .LogSupportList
                 .Where(x => x.LogDbId == updItem.LogDbId)
                 .SingleOrDefault();
-                try
-                {
-                    // update, vers 1...
-                    localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
+            try
+            {
+                // update, vers 1...
+                dbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
 
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on LogSupport.Update: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on Update: {exc}");
             }
             return done;
         }
 
         #endregion Public Methods
-
-        #region Private Fields
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
     }
 }

EgtBEAMWALL.DataLayer/Controllers/PartController .cs

@@ -1,19 +1,105 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using NLog;
-using System;
+using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using EgtBEAMWALL.DataLayer.DatabaseModels;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
 {
     public class PartController : IDisposable
     {
+        #region Private Fields
+
+        private DatabaseContext dbCtx;
+
+        #endregion Private Fields
+
+        #region Public Fields
+
+        public static PartController man = new PartController();
+
+        #endregion Public Fields
+
         #region Public Constructors
 
         public PartController()
-        { }
+        {
+            // Initialize database context
+            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
+        }
 
         #endregion Public Constructors
 
+        #region Protected Methods
+
+        /// <summary>
+        /// Get BtlPartDBId by ProjId + PDN
+        /// </summary>
+        /// <param name="ProjId"></param>
+        /// <param name="PDN"></param>
+        /// <returns></returns>
+        protected int FindBtlPart(int ProjId, int PDN)
+        {
+            int BtlPartDbId = 0;
+
+#if false
+            var currProj = dbCtx
+                    .ProjList
+                    .Where(x => x.ProjId == ProjId)
+                    .FirstOrDefault();
+
+            if (currProj != null)
+            {
+                var btlPart = dbCtx
+                    .BTLPartList
+                    .Where(x => x.ProjDbId == currProj.ProjDbId && x.PDN == PDN)
+                    .SingleOrDefault();
+
+                if (btlPart != null)
+                {
+                    BtlPartDbId = btlPart.BTLPartDbId;
+                }
+            }
+#endif
+
+            var btlPart = dbCtx
+                .BTLPartList
+                .Where(x => x.Project.ProjId == ProjId && x.PDN == PDN)
+                .SingleOrDefault();
+
+            if (btlPart != null)
+            {
+                BtlPartDbId = btlPart.BTLPartDbId;
+            }
+
+            return BtlPartDbId;
+        }
+
+        /// <summary>
+        /// Get BtlPartDBId by ProjId + BtlPartId
+        /// </summary>
+        /// <param name="ProjId"></param>
+        /// <param name="BtlPartId"></param>
+        /// <returns></returns>
+        protected int FindBtlPartByBPI(int ProjId, int BtlPartId)
+        {
+            int BtlPartDbId = 0;
+
+            var btlPart = dbCtx
+                .BTLPartList
+                .Where(x => x.Project.ProjId == ProjId && x.PartId == BtlPartId)
+                .SingleOrDefault();
+
+            if (btlPart != null)
+            {
+                BtlPartDbId = btlPart.BTLPartDbId;
+            }
+
+            return BtlPartDbId;
+        }
+
+        #endregion Protected Methods
+
         #region Public Methods
 
         /// <summary>
@@ -22,19 +108,19 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <param name="corePart"></param>
         /// <param name="currMachGroupDbId"></param>
         /// <returns></returns>
-        public PartModel ConvertFromCore(Core.PartM corePart, int currMachGroupDbId)
+        public static PartModel ConvertFromCore(Core.PartM corePart, int currMachGroupDbId)
         {
             PartModel answ = new PartModel();
             if (corePart != null)
             {
-                int BTLPartId = FindBtlPartByBPI(corePart.nProjId, corePart.nBTLPartId);
+                int BTLPartId = man.FindBtlPartByBPI(corePart.nProjId, corePart.nBTLPartId);
                 answ = new PartModel()
                 {
                     PartId = corePart.nPartId,
                     PDN = corePart.nPDN,
                     BTLPartDbId = BTLPartId,
                     MachGroupDbId = currMachGroupDbId,
-                    State = corePart.nProductionState,
+                    State = Core.ItemState.Assigned,
                     NAM = corePart.sNAM,
                     W = corePart.dW,
                     L = corePart.dL,
@@ -65,39 +151,24 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Delete(int ProdId, int MachGroupId, int PartId)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            var item2del = dbCtx
+                .PartList
+                .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
+                .SingleOrDefault();
+            try
             {
-                var myStatusMapCtrl = new StatusMapController();
-                var item2del = localDbCtx
-                                .PartList
-                                .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
-                                .SingleOrDefault();
-
-                if (item2del != null)
-                {
-                    try
-                    {
-                        // Remove from database
-                        localDbCtx.PartList.Remove(item2del);
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        done = true;
-                        // aggiorno info sullo status
-                        myStatusMapCtrl.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
-                    }
-                    catch (Exception exc)
-                    {
-                        string errMessage = $"EXCEPTION on Part.Delete: ProdId: {ProdId} | MachGroupId: {MachGroupId} | PartId: {PartId}{Environment.NewLine}{exc}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
-                }
-                else
-                {
-                    string errMessage = $"ERROR on Part.Delete (01): req item was not found | ProdId {ProdId} | MachGroupId {MachGroupId} | PartId {PartId}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                // Remove from database
+                dbCtx.PartList.Remove(item2del);
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+                // aggiorno info sullo status
+                StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on Delete: ProdId: {ProdId} | MachGroupId: {MachGroupId} | PartId: {PartId}{Environment.NewLine}{exc}");
             }
             return done;
         }
@@ -110,36 +181,22 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Delete(int PartDbId)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            var item2del = dbCtx
+                .PartList
+                .Where(x => x.PartDbId == PartDbId)
+                .SingleOrDefault();
+            try
             {
-                var item2del = localDbCtx
-                                .PartList
-                                .Where(x => x.PartDbId == PartDbId)
-                                .SingleOrDefault();
-
-                if (item2del != null)
-                {
-                    try
-                    {
-                        // Add to database
-                        localDbCtx.PartList.Remove(item2del);
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        done = true;
-                    }
-                    catch (Exception exc)
-                    {
-                        string errMessage = $"EXCEPTION on Part.Delete: {Environment.NewLine}{exc}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
-                }
-                else
-                {
-                    string errMessage = $"ERROR on Part.Delete (02): req item was not found | PartDbId {PartDbId}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                // Add to database
+                dbCtx.PartList.Remove(item2del);
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on Delete: {exc}");
             }
             return done;
         }
@@ -152,31 +209,29 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool DeleteByMachGroup(int MachGroupDbId)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            var items2del = dbCtx
+                .PartList
+                .Where(x => x.MachGroupDbId == MachGroupDbId);
+            try
             {
-                var items2del = localDbCtx
-                                .PartList
-                                .Where(x => x.MachGroupDbId == MachGroupDbId);
-                try
-                {
-                    // Add to database
-                    localDbCtx.PartList.RemoveRange(items2del);
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on Part.DeleteByMachGroup: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                // Add to database
+                dbCtx.PartList.RemoveRange(items2del);
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on DeleteByMachGroup: {exc}");
             }
             return done;
         }
 
         public void Dispose()
         {
+            // Clear database context
+            dbCtx.Dispose();
         }
 
         /// <summary>
@@ -186,13 +241,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public PartModel FindByDbId(int PartDbId)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
-                        .PartList
-                        .Where(x => x.PartDbId == PartDbId)
-                        .SingleOrDefault();
-            }
+            return dbCtx
+                .PartList
+                .Where(x => x.PartDbId == PartDbId)
+                .SingleOrDefault();
         }
 
         /// <summary>
@@ -200,17 +252,21 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// </summary>
         /// <param name="PartId"></param>
         /// <returns></returns>
-        public PartModel FindByPartId(int ProdId, int PartId)
+        public PartModel FindByPartId(int PartId)
         {
-            PartModel answ = null;
-            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                answ = locallocalDbCtx
-                        .PartList
-                        .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.PartId == PartId)
-                        .FirstOrDefault();
-            }
-            return answ;
+            return dbCtx
+                .PartList
+                .Where(x => x.PartId == PartId)
+                .SingleOrDefault();
+        }
+
+        /// <summary>
+        /// Reinizializzaizone del controller
+        /// </summary>
+        public void ResetController()
+        {
+            // Re-Initialize database context
+            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         /// <summary>
@@ -221,44 +277,28 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Update(PartModel updItem)
         {
             bool done = false;
-            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            var item2update = dbCtx
+                .PartList
+                .Where(x => x.PartDbId == updItem.PartDbId)
+                .SingleOrDefault();
+            try
             {
-                var myStatusMapCtrl = new StatusMapController();
-                var item2upd = locallocalDbCtx
-                                    .PartList
-                                    .Where(x => x.PartDbId == updItem.PartDbId)
-                                    .SingleOrDefault();
-                if (item2upd != null)
-                {
-                    try
-                    {
-                        // update, vers 1...
-                        locallocalDbCtx.Entry(item2upd).CurrentValues.SetValues(updItem);
+                // update, vers 1...
+                dbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
 
-                        //// update, vers 2
-                        //localDbCtx.PartList.Remove(item2del);
-                        //localDbCtx.PartList.Add(updItem);
+                //// update, vers 2
+                //dbCtx.PartList.Remove(item2del);
+                //dbCtx.PartList.Add(updItem);
 
-                        // Commit changes
-                        locallocalDbCtx.SaveChanges();
-                        done = true;
-                        // aggiorno info sullo status
-                        myStatusMapCtrl.UpdateAction("", updItem.MachGroup.Prod.ProdId, updItem.PartId, Core.StatusMapItemType.Part, Core.StatusMapOpType.MachGroupMod, "");
-                    }
-                    catch (Exception exc)
-                    {
-                        string errMessage = $"EXCEPTION on Part.Update: {Environment.NewLine}{exc}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
-                }
-                else
-                {
-                    string errMessage = $"ERROR on Part.Update (01): req item was not found | PartId {updItem.PartId} | PartDbId {updItem.PartDbId} | BTLPartDbId {updItem.BTLPartDbId}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+                // aggiorno info sullo status
+                StatusMapController.man.UpdateAction("", updItem.MachGroup.Prod.ProdId, updItem.MachGroup.MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
             }
+            catch
+            { }
             return done;
         }
 
@@ -271,40 +311,26 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateEnd(int ProdId, int MachGroupId, int PartId, DateTime DtEnd)
         {
             bool done = false;
-            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            try
             {
-                var myStatusMapCtrl = new StatusMapController();
-                try
-                {
-                    // aggiorno
-                    var item2upd = locallocalDbCtx
-                        .PartList
-                        .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
-                        .FirstOrDefault();
-
-                    if (item2upd != null)
-                    {
-                        item2upd.DtEnd = DtEnd;
-                        // Commit changes
-                        locallocalDbCtx.SaveChanges();
-                        done = true;
-                        // aggiorno info sullo status
-                        myStatusMapCtrl.UpdateAction("", ProdId, PartId, Core.StatusMapItemType.Part, DtEnd == DateTime.MinValue ? Core.StatusMapOpType.ResetPartEnd : Core.StatusMapOpType.PartEnd, "");
-                    }
-                    else
-                    {
-                        string errMessage = $"ERROR on Part.UpdateEnd: req item was not found | ProdId {ProdId} | MachGroupId {MachGroupId} | PartId {PartId} | DtEnd {DtEnd}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on Part.UpdateEnd: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                // aggiorno
+                dbCtx
+                .PartList
+                .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
+                .FirstOrDefault()
+                .DtEnd = DtEnd;
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+                // aggiorno info sullo status
+                StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.PartEnd, "");
             }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on UpdateStatus: {exc}");
+            }
+
             return done;
         }
 
@@ -317,38 +343,24 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateStart(int ProdId, int MachGroupId, int PartId, DateTime DtStart)
         {
             bool done = false;
-            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            try
             {
-                var myStatusMapCtrl = new StatusMapController();
-                try
-                {
-                    // aggiorno
-                    var item2upd = locallocalDbCtx
-                        .PartList
-                        .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
-                        .FirstOrDefault();
-                    if (item2upd != null)
-                    {
-                        item2upd.DtStart = DtStart;
-                        // Commit changes
-                        locallocalDbCtx.SaveChanges();
-                        done = true;
-                        // aggiorno info sullo status
-                        myStatusMapCtrl.UpdateAction("", ProdId, PartId, Core.StatusMapItemType.Part, DtStart == DateTime.MinValue ? Core.StatusMapOpType.ResetPartStart : Core.StatusMapOpType.PartStart, "");
-                    }
-                    else
-                    {
-                        string errMessage = $"ERROR on Part.UpdateStart: req item was not found | ProdId {ProdId} | MachGroupId {MachGroupId} | PartId {PartId} | DtStart {DtStart}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on Part.UpdateStart: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                // aggiorno
+                dbCtx
+                .PartList
+                .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
+                .FirstOrDefault()
+                .DtStart = DtStart;
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+                // aggiorno info sullo status
+                StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.PartStart, "");
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on UpdateStatus: {exc}");
             }
 
             return done;
@@ -363,106 +375,29 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateStatus(int ProdId, int MachGroupId, int PartId, Core.ItemState newState)
         {
             bool done = false;
-            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            try
             {
-                var myStatusMapCtrl = new StatusMapController();
-                try
-                {
-                    // aggiorno
-                    var item2upd = locallocalDbCtx
-                        .PartList
-                        .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
-                        .FirstOrDefault();
-                    if (item2upd != null)
-                    {
-                        item2upd.State = newState;
-                        // Commit changes
-                        locallocalDbCtx.SaveChanges();
-                        done = true;
-                        // aggiorno info sullo status
-                        myStatusMapCtrl.UpdateAction("", ProdId, PartId, Core.StatusMapItemType.Part, newState == Core.ItemState.Scrapped ? Core.StatusMapOpType.SetPartScrapped : Core.StatusMapOpType.MachGroupMod, "");
-                    }
-                    else
-                    {
-                        string errMessage = $"ERROR on Part.UpdateStart: req item was not found | ProdId {ProdId} | MachGroupId {MachGroupId} | PartId {PartId} | newState {newState}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on Part.UpdateStatus: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                // aggiorno
+                dbCtx
+                .PartList
+                .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
+                .FirstOrDefault()
+                .State = newState;
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+                // aggiorno info sullo status
+                StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on UpdateStatus: {exc}");
             }
 
             return done;
         }
 
         #endregion Public Methods
-
-        #region Protected Methods
-
-        /// <summary>
-        /// Get BtlPartDBId by ProjId + PDN
-        /// </summary>
-        /// <param name="ProjId"></param>
-        /// <param name="PDN"></param>
-        /// <returns></returns>
-        protected int FindBtlPart(int ProjId, int PDN)
-        {
-            int BtlPartDbId = 0;
-
-            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var btlPart = locallocalDbCtx
-                                .BTLPartList
-                                .Where(x => x.Project.ProjId == ProjId && x.PDN == PDN)
-                                .SingleOrDefault();
-
-                if (btlPart != null)
-                {
-                    BtlPartDbId = btlPart.BTLPartDbId;
-                }
-            }
-            return BtlPartDbId;
-        }
-
-        /// <summary>
-        /// Get BtlPartDBId by ProjId + BtlPartId
-        /// </summary>
-        /// <param name="ProjId"></param>
-        /// <param name="BtlPartId"></param>
-        /// <returns></returns>
-        protected int FindBtlPartByBPI(int ProjId, int BtlPartId)
-        {
-            int BtlPartDbId = 0;
-
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var btlPart = localDbCtx
-                .BTLPartList
-                .Where(x => x.Project.ProjId == ProjId && x.PartId == BtlPartId)
-                .SingleOrDefault();
-
-                if (btlPart != null)
-                {
-                    BtlPartDbId = btlPart.BTLPartDbId;
-                }
-            }
-            return BtlPartDbId;
-        }
-
-        #endregion Protected Methods
-
-        #region Private Fields
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
     }
 }

EgtBEAMWALL.DataLayer/Controllers/StatusMapController.cs

@@ -1,17 +1,34 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using NLog;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using EgtBEAMWALL.DataLayer.DatabaseModels;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
 {
     public class StatusMapController : IDisposable
     {
+        #region Private Fields
+
+        private DatabaseContext dbCtx;
+
+        #endregion Private Fields
+
+        #region Public Fields
+
+        /// <summary>
+        /// Oggetto statico per gestione chiamate da altre classi
+        /// </summary>
+        public static StatusMapController man = new StatusMapController();
+
+        #endregion Public Fields
+
         #region Public Constructors
 
         public StatusMapController()
         {
+            // Initialize database context
+            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         #endregion Public Constructors
@@ -21,7 +38,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <summary>
         /// Elimina i dati di una sessione (SupervisorId) precedente
         /// </summary>
-        /// <param name="Session">Se vuoto --&gt; tutti</param>
+        /// <param name="Session">Se vuoto --> tutti</param>
         /// <returns></returns>
         public bool DeleteSession(string Session)
         {
@@ -29,42 +46,41 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             DateTime adesso = DateTime.Now;
             List<StatusMapModel> SM2Del = new List<StatusMapModel>();
 
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            // svuoto la tab mappa precedente (da rivalutare in futuro)
+            if (string.IsNullOrEmpty(Session))
             {
-                // svuoto la tab mappa precedente (da rivalutare in futuro)
-                if (string.IsNullOrEmpty(Session))
-                {
-                    SM2Del = localDbCtx
-                         .StatusMapList
-                         .ToList();
-                }
-                else
-                {
-                    SM2Del = localDbCtx
-                        .StatusMapList
-                        .Where(x => x.Session == Session)
-                        .ToList();
-                }
-                try
-                {
-                    // Remove to database
-                    localDbCtx.StatusMapList.RemoveRange(SM2Del);
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on StatusMap.DeleteSession: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                SM2Del = dbCtx
+                     .StatusMapList
+                     .ToList();
             }
+            else
+            {
+                SM2Del = dbCtx
+                    .StatusMapList
+                    .Where(x => x.Session == Session)
+                    .ToList();
+            }
+            try
+            {
+                // Remove to database
+                dbCtx.StatusMapList.RemoveRange(SM2Del);
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on DeleteSession: {exc}");
+            }
+
             return done;
         }
 
         public void Dispose()
         {
+            // Clear database context
+            dbCtx.Dispose();
         }
 
         /// <summary>
@@ -72,78 +88,52 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// </summary>
         /// <param name="Session"></param>
         /// <returns></returns>
-        public List<StatusMapModel> GetBySession(string Session)
+        public List<StatusMapModel> GetBySession(string Session = "")
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                return localDbCtx
+            // retrieve
+            return dbCtx
                 .StatusMapList
                 .Where(x => x.Session == Session)
                 .OrderByDescending(x => x.Index)
                 .ToList();
-            }
         }
 
         /// <summary>
-        /// Get data for session where Index &gt; minIndex ordered by index DESC
+        /// Get data for session where Index > minIndex ordered by index DESC
         /// </summary>
-        /// <param name="Session"></param>
         /// <param name="minIndex"></param>
         /// <returns></returns>
-        public List<StatusMapModel> GetFrom(string Session, int minIndex = 0)
+        public List<StatusMapModel> GetFrom(int minIndex = 0)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                return localDbCtx
+            // retrieve
+            return dbCtx
                 .StatusMapList
-                .Where(x => x.Session == Session && x.Index >= minIndex)
-                .OrderBy(x => x.Index)
+                .Where(x => x.Index >= minIndex)
+                .OrderByDescending(x => x.Index)
                 .ToList();
-            }
         }
 
         /// <summary>
-        /// Get PROD (all)
+        /// Get PROD data for session
         /// </summary>
-        /// <param name="Session"></param>
         /// <returns></returns>
         public List<StatusMapModel> GetProd()
         {
-            List<StatusMapModel> answ = new List<StatusMapModel>();
-            // Initialize database context
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                answ = localDbCtx
-                    .StatusMapList
-                    .Where(x => x.ItemType == Core.StatusMapItemType.Prod)
-                    .OrderByDescending(x => x.Index)
-                    .ToList();
-            }
-            return answ;
+            // retrieve
+            return dbCtx
+                .StatusMapList
+                .Where(x => x.ItemType == Core.StatusMapItemType.Prod)
+                .OrderByDescending(x => x.Index)
+                .ToList();
         }
 
         /// <summary>
-        /// Get PROD for session
+        /// Reinizializzaizone del controller
         /// </summary>
-        /// <param name="Session"></param>
-        /// <returns></returns>
-        public List<StatusMapModel> GetProd(string Session)
+        public void ResetController()
         {
-            List<StatusMapModel> answ = new List<StatusMapModel>();
-            // Initialize database context
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                answ = localDbCtx
-                    .StatusMapList
-                    .Where(x => x.Session == Session && x.ItemType == Core.StatusMapItemType.Prod)
-                    .OrderByDescending(x => x.Index)
-                    .ToList();
-            }
-            return answ;
+            // Re-Initialize database context
+            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         /// <summary>
@@ -157,8 +147,8 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             bool done = false;
             DateTime adesso = DateTime.Now;
 
-            // gestione corretta x multi-supervisors
-            done = DeleteSession(SupervisorId);
+            // svuoto dati precedenti
+            done = DeleteSession("");
 
             // se ho fatto inserisco nuovo
             if (done)
@@ -167,56 +157,23 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 done = false;
                 // inserisco dato prod
                 StatusMapModel prodSMRecord = new StatusMapModel() { Session = SupervisorId, Index = 0, ItemId = ProdId, ItemType = Core.StatusMapItemType.Prod, Operation = Core.StatusMapOpType.Startup, DtEvent = adesso, Val = "" };
-                // Initialize database context
-                using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-                {
-                    // per prima cosa indico come prodotto il PROD...
-                    var currProdData = localDbCtx
-                              .ProdList
-                              .Where(x => x.ProdId == ProdId)
-                              .SingleOrDefault();
-                    if (currProdData != null)
-                    {
-                        try
-                        {
-                            // aggiorno valore descrizione
-                            currProdData.IsProduced = true;
-                            // Commit changes
-                            localDbCtx.SaveChanges();
-                            done = true;
-                        }
-                        catch (Exception exc)
-                        {
-                            string errMessage = $"EXCEPTION on Prod.UpdateProduced:{Environment.NewLine}{exc}";
-                            Console.WriteLine(errMessage);
-                            Log.Error(errMessage);
-                        }
-                    }
-                    else
-                    {
-                        string errMessage = $"ERROR on Prod.UpdateProduced: req item was not found | ProdId {ProdId} | IsProduced: true";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
-                    // resetto done
-                    done = false;
-                    // aggiungo in StatusMap
-                    localDbCtx.StatusMapList.Add(prodSMRecord);
+                // aggiungo
+                dbCtx.StatusMapList.Add(prodSMRecord);
 
-                    // recupero MachGroup da PROD
-                    var MGList = localDbCtx
-                                    .MachGroupList
-                                    .Where(x => x.Prod.ProdId == ProdId)
-                                    .ToList();
+                // recupero MachGroup da PROD
+                var MGList = dbCtx
+                    .MachGroupList
+                    .Where(x => x.Prod.ProdId == ProdId)
+                    .ToList();
 
-                    var mgSMRecords = MGList.Select(x => new StatusMapModel() { Session = SupervisorId, Index = 0, ItemId = x.MachGroupId, ItemType = Core.StatusMapItemType.MachGroup, Operation = Core.StatusMapOpType.Startup, DtEvent = adesso, Val = "" }).ToList();
-                    // aggiungo
-                    localDbCtx.StatusMapList.AddRange(mgSMRecords);
+                var mgSMRecords = MGList.Select(x => new StatusMapModel() { Session = SupervisorId, Index = 0, ItemId = x.MachGroupId, ItemType = Core.StatusMapItemType.MachGroup, Operation = Core.StatusMapOpType.Startup, DtEvent = adesso, Val = "" }).ToList();
+                // aggiungo
+                dbCtx.StatusMapList.AddRange(mgSMRecords);
 
-                    // salvo
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
+                // salvo
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
             }
             return done;
         }
@@ -231,70 +188,57 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <param name="Operation"></param>
         /// <param name="Value"></param>
         /// <returns></returns>
-        public bool UpdateAction(string Session, int ProdId, int ItemId, Core.StatusMapItemType ItemType, Core.StatusMapOpType Operation, string Value)
+        public bool UpdateAction(String Session, int ProdId, int ItemId, Core.StatusMapItemType ItemType, Core.StatusMapOpType Operation, string Value)
         {
             bool fatto = false;
             // Recupero il record PROD (che è ultimo indice)
             StatusMapModel prodData = new StatusMapModel();
-            // Initialize database context
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            // se è un prod --> vado x ID
+            if (Session == "")
             {
-                // se è un prod --> vado x ID
-                if (Session == "")
+                prodData = dbCtx
+                    .StatusMapList
+                    .Where(x => x.ItemType == Core.StatusMapItemType.Prod && x.ItemId == ProdId)
+                    .SingleOrDefault();
+            }
+            else
+            {
+                prodData = dbCtx
+                    .StatusMapList
+                    .Where(x => x.ItemType == Core.StatusMapItemType.Prod && x.Session == Session)
+                    .SingleOrDefault();
+            }
+            // se ho trovato
+            if (prodData != null)
+            {
+                try
                 {
-                    prodData = localDbCtx
-                        .StatusMapList
-                        .Where(x => x.ItemType == Core.StatusMapItemType.Prod && x.ItemId == ProdId)
-                        .FirstOrDefault();
-                }
-                else
-                {
-                    prodData = localDbCtx
-                        .StatusMapList
-                        .Where(x => x.ItemType == Core.StatusMapItemType.Prod && x.Session == Session)
-                        .FirstOrDefault();
-                }
-                // se ho trovato
-                if (prodData != null)
-                {
-                    try
-                    {
-                        // aggiorno indice PROD
-                        prodData.Index++;
-                        // se session è nulla ma ho un PROD --> calcolo da li la sessione
-                        if (string.IsNullOrEmpty(Session))
-                        {
-                            Session = prodData.Session;
-                        }
-                        // creo un nuovo record
-                        DateTime adesso = DateTime.Now;
-                        var newRec = new StatusMapModel() { Session = Session, Index = prodData.Index, ItemId = ItemId, ItemType = ItemType, Operation = Operation, DtEvent = adesso, Val = Value };
-                        localDbCtx.StatusMapList.Add(newRec);
+                    // aggiorno indice PROD
+                    prodData.Index++;
+                    // recupero record richiesto
+                    var currRecor = dbCtx
+                    .StatusMapList
+                    .Where(x => x.ItemType == ItemType && x.ItemId == ItemId && x.Session == Session)
+                    .SingleOrDefault();
 
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        fatto = true;
-                    }
-                    catch (Exception exc)
-                    {
-                        string errMessage = $"EXCEPTION on StatusMap.UpdateAction: {Environment.NewLine}{exc}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
+                    // aggiorno
+                    currRecor.Index = prodData.Index;
+                    currRecor.Operation = Operation;
+                    currRecor.Val = Value;
+
+                    // Commit changes
+                    dbCtx.SaveChanges();
+                    ResetController();
+                    fatto = true;
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on UpdateAction: {exc}");
                 }
             }
             return fatto;
         }
 
         #endregion Public Methods
-
-        #region Private Fields
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
     }
 }

EgtBEAMWALL.DataLayer/DatabaseContext.Views.cs

@@ -11,7 +11,7 @@ using System.Data.Entity.Infrastructure.MappingViews;
 
 [assembly: DbMappingViewCacheTypeAttribute(
     typeof(EgtBEAMWALL.DataLayer.DatabaseContext),
-    typeof(Edm_EntityMappingGeneratedViews.ViewsForBaseEntitySets47a6a51e27ee277e915fd1421f83fa2aae50563a874ec88b922716849579f599))]
+    typeof(Edm_EntityMappingGeneratedViews.ViewsForBaseEntitySets2a70b5e578abdbcbb91ea4a5002c25750fd61f2b76495520401ff22a445540d2))]
 
 namespace Edm_EntityMappingGeneratedViews
 {
@@ -23,14 +23,14 @@ namespace Edm_EntityMappingGeneratedViews
     /// Implements a mapping view cache.
     /// </summary>
     [GeneratedCode("Entity Framework 6 Power Tools", "0.9.2.0")]
-    internal sealed class ViewsForBaseEntitySets47a6a51e27ee277e915fd1421f83fa2aae50563a874ec88b922716849579f599 : DbMappingViewCache
+    internal sealed class ViewsForBaseEntitySets2a70b5e578abdbcbb91ea4a5002c25750fd61f2b76495520401ff22a445540d2 : DbMappingViewCache
     {
         /// <summary>
         /// Gets a hash value computed over the mapping closure.
         /// </summary>
         public override string MappingHashValue
         {
-            get { return "47a6a51e27ee277e915fd1421f83fa2aae50563a874ec88b922716849579f599"; }
+            get { return "2a70b5e578abdbcbb91ea4a5002c25750fd61f2b76495520401ff22a445540d2"; }
         }
 
         /// <summary>
@@ -166,7 +166,7 @@ namespace Edm_EntityMappingGeneratedViews
         {
             return new DbMappingView(@"
     SELECT VALUE -- Constructing ProjModel
-        [CodeFirstDatabaseSchema.ProjModel](T1.ProjModel_ProjDbId, T1.ProjModel_BTLFileName, T1.ProjModel_DtCreated, T1.ProjModel_DtExported, T1.ProjModel_IsNew, T1.ProjModel_ListName, T1.ProjModel_Lock, T1.ProjModel_ProdDbId, T1.ProjModel_Id, T1.ProjModel_PType)
+        [CodeFirstDatabaseSchema.ProjModel](T1.ProjModel_ProjDbId, T1.ProjModel_BTLFileName, T1.ProjModel_DtCreated, T1.ProjModel_DtExported, T1.ProjModel_IsNew, T1.ProjModel_ListName, T1.ProjModel_Lock, T1.ProjModel_ProdDbId, T1.ProjModel_Id)
     FROM (
         SELECT 
             T.ProjDbId AS ProjModel_ProjDbId, 
@@ -178,7 +178,6 @@ namespace Edm_EntityMappingGeneratedViews
             T.Locked AS ProjModel_Lock, 
             T.ProdDbId AS ProjModel_ProdDbId, 
             T.ProjId AS ProjModel_Id, 
-            CAST(T.PType AS [Edm.Int32]) AS ProjModel_PType, 
             True AS _from0
         FROM DatabaseContext.ProjList AS T
     ) AS T1");
@@ -192,7 +191,7 @@ namespace Edm_EntityMappingGeneratedViews
         {
             return new DbMappingView(@"
     SELECT VALUE -- Constructing ProdModel
-        [CodeFirstDatabaseSchema.ProdModel](T1.ProdModel_ProdDbId, T1.ProdModel_Description, T1.ProdModel_DtCreated, T1.ProdModel_IsNew, T1.ProdModel_Lock, T1.ProdModel_Id, T1.ProdModel_PType)
+        [CodeFirstDatabaseSchema.ProdModel](T1.ProdModel_ProdDbId, T1.ProdModel_Description, T1.ProdModel_DtCreated, T1.ProdModel_IsNew, T1.ProdModel_Lock, T1.ProdModel_Id)
     FROM (
         SELECT 
             T.ProdDbId AS ProdModel_ProdDbId, 
@@ -201,7 +200,6 @@ namespace Edm_EntityMappingGeneratedViews
             T.IsNew AS ProdModel_IsNew, 
             T.Locked AS ProdModel_Lock, 
             T.ProdId AS ProdModel_Id, 
-            CAST(T.PType AS [Edm.Int32]) AS ProdModel_PType, 
             True AS _from0
         FROM DatabaseContext.ProdList AS T
     ) AS T1");
@@ -306,7 +304,7 @@ namespace Edm_EntityMappingGeneratedViews
         {
             return new DbMappingView(@"
     SELECT VALUE -- Constructing ProjList
-        [EgtBEAMWALL.DataLayer.ProjModel](T1.ProjModel_ProjDbId, T1.ProjModel_BTLFileName, T1.ProjModel_DtCreated, T1.ProjModel_DtExported, T1.ProjModel_IsNew, T1.ProjModel_ListName, T1.ProjModel_Locked, T1.ProjModel_ProdDbId, T1.ProjModel_ProjId, T1.ProjModel_PType)
+        [EgtBEAMWALL.DataLayer.ProjModel](T1.ProjModel_ProjDbId, T1.ProjModel_BTLFileName, T1.ProjModel_DtCreated, T1.ProjModel_DtExported, T1.ProjModel_IsNew, T1.ProjModel_ListName, T1.ProjModel_Locked, T1.ProjModel_ProdDbId, T1.ProjModel_ProjId)
     FROM (
         SELECT 
             T.ProjDbId AS ProjModel_ProjDbId, 
@@ -318,7 +316,6 @@ namespace Edm_EntityMappingGeneratedViews
             T.Lock AS ProjModel_Locked, 
             T.ProdDbId AS ProjModel_ProdDbId, 
             T.Id AS ProjModel_ProjId, 
-            CAST(T.PType AS [EgtBEAMWALL.DataLayer.BWType]) AS ProjModel_PType, 
             True AS _from0
         FROM CodeFirstDatabase.ProjModel AS T
     ) AS T1");
@@ -332,7 +329,7 @@ namespace Edm_EntityMappingGeneratedViews
         {
             return new DbMappingView(@"
     SELECT VALUE -- Constructing ProdList
-        [EgtBEAMWALL.DataLayer.ProdModel](T1.ProdModel_ProdDbId, T1.ProdModel_Description, T1.ProdModel_DtCreated, T1.ProdModel_IsNew, T1.ProdModel_Locked, T1.ProdModel_ProdId, T1.ProdModel_PType)
+        [EgtBEAMWALL.DataLayer.ProdModel](T1.ProdModel_ProdDbId, T1.ProdModel_Description, T1.ProdModel_DtCreated, T1.ProdModel_IsNew, T1.ProdModel_Locked, T1.ProdModel_ProdId)
     FROM (
         SELECT 
             T.ProdDbId AS ProdModel_ProdDbId, 
@@ -341,7 +338,6 @@ namespace Edm_EntityMappingGeneratedViews
             T.IsNew AS ProdModel_IsNew, 
             T.Lock AS ProdModel_Locked, 
             T.Id AS ProdModel_ProdId, 
-            CAST(T.PType AS [EgtBEAMWALL.DataLayer.BWType]) AS ProdModel_PType, 
             True AS _from0
         FROM CodeFirstDatabase.ProdModel AS T
     ) AS T1");

EgtBEAMWALL.DataLayer/DatabaseContext.cs

@@ -1,9 +1,15 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using MySql.Data.EntityFramework;
-using System;
+using System;
+using System.Collections.Generic;
 using System.Data.Entity;
-using System.Data.Entity.Infrastructure;
+using System.Data.Entity.Migrations;
+using MySql.Data.Entity;
+using System.Linq;
+using System.Text;
+using EgtBEAMWALL.DataLayer.DatabaseModels;
+using EgtBEAMWALL.DataLayer.Migrations;
+using System.ServiceProcess;
 using System.IO;
+using System.Data.Entity.Infrastructure;
 
 namespace EgtBEAMWALL.DataLayer
 {
@@ -22,18 +28,21 @@ namespace EgtBEAMWALL.DataLayer
     }
 
     [DbConfigurationType(typeof(MySqlEFConfiguration))]
+    //[DbConfigurationType(typeof(aMySqlConfiguration))]
     public class DatabaseContext : DbContext
     {
         #region Public Constructors
 
         [Obsolete("This constructor should never be used directly, and is only needed to generate entityframework stuff. Connection string can be adapted as pleased.")]
-        public DatabaseContext() : base(DbConfig.CONNECTION_STRING)
+        public DatabaseContext() : base("DefaultConnection")
         {
         }
 
         public DatabaseContext(string connectionString) : base(connectionString)
         {
             Database.CreateIfNotExists();
+            //Database.SetInitializer(new MigrateDatabaseToLatestVersion<StratonLocalizerDatabase, Migrations.Configuration>());
+            Database.Initialize(false);
         }
 
         #endregion Public Constructors
@@ -82,6 +91,31 @@ namespace EgtBEAMWALL.DataLayer
 
         #endregion Public Properties
 
+#if false
+      /// <summary>
+      /// Db data mode
+      /// </summary>
+      public static bool AdvDataModel { get; set; } = false;
+#endif
+
+        #region Private Methods
+
+        private static string getDbServiceName()
+        {
+            ServiceController[] services = ServiceController.GetServices();
+            var service = services.FirstOrDefault(s => s.ServiceName == "MariaDB");
+            if (service != null)
+                return service.DisplayName;
+
+            service = services.FirstOrDefault(s => s.ServiceName == "MySQL");
+            if (service != null)
+                return service.DisplayName;
+
+            return "";
+        }
+
+        #endregion Private Methods
+
         #region Public Methods
 
         public static DatabaseContext Create()
@@ -89,6 +123,44 @@ namespace EgtBEAMWALL.DataLayer
             return new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
+        public static bool SetUpDbConnectionAndDbConfig()
+        {
+            try
+            {
+                String serviceName = getDbServiceName();
+                if (serviceName.Equals(""))
+                {
+                    return false;
+                }
+
+                ServiceController service = new ServiceController(serviceName);
+                try
+                {
+                    TimeSpan timeout = TimeSpan.FromSeconds(DbConfig.DATABASE_PROCESS_TIMEOUT);
+                    service.WaitForStatus(ServiceControllerStatus.Running, timeout);
+                }
+                catch (Exception ex)
+                {
+                    return false;
+                }
+
+                System.Data.Entity.Database.SetInitializer<DatabaseContext>(null);
+                var migrator = new DbMigrator(new Configuration());
+
+                if (migrator.GetPendingMigrations().Any())
+                {
+                    // Run migrations and seed.
+                    migrator.Update();
+                }
+            }
+            catch (Exception ex)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
         #endregion Public Methods
     }
 }

EgtBEAMWALL.DataLayer/DatabaseModels/LogMachineModel.cs

@@ -98,5 +98,12 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
 
         #endregion Public Properties
 
+#if false
+        /// <summary>
+        /// MachineId del BTL
+        /// </summary>
+        [Column("MachineId")]
+        public string MachineId { get; set; } = "";
+#endif
     }
 }

EgtBEAMWALL.DataLayer/DatabaseModels/PartModel.cs

@@ -97,8 +97,6 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
             if (!(obj is PartModel item))
                 return false;
 
-            if (BTLPartDbId != item.BTLPartDbId)
-                return false;
             if (H != item.H)
                 return false;
             if (L != item.L)

EgtBEAMWALL.DataLayer/DatabaseModels/ProdModel.cs

@@ -4,13 +4,9 @@ using System.Linq;
 using System.Text;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using static EgtBEAMWALL.Core.ConstBeam;
 
 namespace EgtBEAMWALL.DataLayer.DatabaseModels
 {
-    // <Auto-Generated>
-    // This is here so CodeMaid doesn't reorganize this document
-    // </Auto-Generated>
     /// <summary>
     /// Tabella deiu raggruppamenti PROJ in forma di PROD
     /// </summary>
@@ -19,19 +15,12 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
     {
         #region Public Properties
 
-        /// <summary>
-        /// Chiave univoca DB
-        /// </summary>
-        [Key, Column("ProdDbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public int ProdDbId { get; set; }
-
         [Column("Description")]
         public string Description { get; set; } = "";
 
         /// <summary>
         /// Data Creazione
         /// </summary>
-        [Index]
         [Column("DtCreated")]
         public DateTime DtCreated { get; set; }
 
@@ -42,62 +31,23 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         public bool IsNew { get; set; } = true;
 
         /// <summary>
-        /// Stato locked, quando aperto da un dispositivo in rete
+        /// Stato locked (quando aperto da un dispositivo in rete)
         /// </summary>
         [Column("Lock")]
         public bool Locked { get; set; } = false;
 
         /// <summary>
-        ///  Chiave univoca per EgtBM
+        /// Chiave univoca DB
+        /// </summary>
+        [Key, Column("ProdDbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int ProdDbId { get; set; }
+
+        /// <summary>
+        ///  chiave univoca per EgtBM
         /// </summary>
         [Column("Id")]
-        [Index]
         public int ProdId { get; set; }
 
-        /// <summary>
-        /// Tipologia del progetto (Travi, Pareti, ...)
-        /// </summary>
-        public BWType PType { get; set; } = BWType.NULL;
-
-        /// <summary>
-        /// Macchina
-        /// </summary>
-        [Column("Machine")]
-        public string Machine { get; set; } = "";
-
-        /// <summary>
-        /// ID utente che ha bloccato (NumKey), quando aperto da un dispositivo in rete
-        /// </summary>
-        [Column("LockedBy")]
-        public string LockedBy { get; set; } = "";
-
-        /// <summary>
-        /// DataOra ultima operazione di Lock (o di rimozione di lock), quando aperto da un dispositivo in rete
-        /// </summary>
-        [Column("LockDate")]
-        public DateTime LockDate { get; set; } = DateTime.MinValue;
-
-        /// <summary>
-        /// Record attivo (se false == cancellazione logica)
-        /// </summary>
-        [Index]
-        [Column("IsActive")]
-        public bool IsActive { get; set; } = true;
-
-        /// <summary>
-        /// Stato Prodotto = inviato ALMENO UNA VOLTA al supervisore --> NON eliminabile se non in modo logico
-        /// </summary>
-        [Index]
-        [Column("IsProduced")]
-        public bool IsProduced { get; set; } = false;
-
-        /// <summary>
-        /// Stato Archiviato = NON visualizzabile normalmente, già prodotto
-        /// </summary>
-        [Index]
-        [Column("IsArchived")]
-        public bool IsArchived { get; set; } = false;
-
         #endregion Public Properties
     }
 }

EgtBEAMWALL.DataLayer/DatabaseModels/ProjModel.cs

@@ -1,13 +1,13 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using static EgtBEAMWALL.Core.ConstBeam;
 
 namespace EgtBEAMWALL.DataLayer.DatabaseModels
 {
-    // <Auto-Generated>
-    // This is here so CodeMaid doesn't reorganize this document
-    // </Auto-Generated>
     /// <summary>
     /// Tabella dei PROJ caricati dal BTL
     /// </summary>
@@ -16,9 +16,6 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
     {
         #region Public Properties
 
-        [Key, Column("ProjDbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public int ProjDbId { get; set; }
-
         [Column("BTLFileName")]
         public string BTLFileName { get; set; } = "";
 
@@ -26,20 +23,17 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         /// Data Creazione
         /// </summary>
         [Column("DtCreated")]
-        [Index]
         public DateTime DtCreated { get; set; }
 
         /// <summary>
         /// Data Esportazione
         /// </summary>
         [Column("DtExported")]
-        [Index]
         public DateTime DtExported { get; set; }
 
         /// <summary>
         /// Stato NEW = creato ma NON salvato
         /// </summary>
-        [Index]
         [Column("IsNew")]
         public bool IsNew { get; set; } = true;
 
@@ -55,14 +49,16 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         [Column("Lock")]
         public bool Locked { get; set; } = false;
 
+        [ForeignKey("ProdDbId")]
+        public virtual ProdModel Prod { get; set; }
+
         [Column("ProdDbId")]
         public int? ProdDbId { get; set; }
 
-        /// <summary>
-        /// ID da modello ext
-        /// </summary>
+        [Key, Column("ProjDbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int ProjDbId { get; set; }
+
         [Column("Id")]
-        [Index]
         public int ProjId { get; set; }
 
         /// <summary>
@@ -70,47 +66,6 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         /// </summary>
         public BWType PType { get; set; } = BWType.NULL;
 
-        /// <summary>
-        /// Macchina
-        /// </summary>
-        [Column("Machine")]
-        public string Machine { get; set; } = "";
-
-        /// <summary>
-        /// ID utente che ha bloccato (NumKey), quando aperto da un dispositivo in rete
-        /// </summary>
-        [Column("LockedBy")]
-        public string LockedBy { get; set; } = "";
-
-        /// <summary>
-        /// DataOra ultima operazione di Lock (o di rimozione di lock), quando aperto da un
-        /// dispositivo in rete
-        /// </summary>
-        [Column("LockDate")]
-        public DateTime LockDate { get; set; } = DateTime.MinValue;
-
-        /// <summary>
-        /// Record attivo (se false == cancellazione logica)
-        /// </summary>
-        [Index]
-        [Column("IsActive")]
-        public bool IsActive { get; set; } = true;
-        /// <summary>
-        /// Descrizione progetto (copiata da BTLFileName inizialmente)
-        /// </summary>
-        [Column("ProjDescription")]
-        public string ProjDescription { get; set; } = "";
-
-        /// <summary>
-        /// Stato Archiviato = NON visualizzabile normalmente, già prodotto
-        /// </summary>
-        [Index]
-        [Column("IsArchived")]
-        public bool IsArchived { get; set; } = false;
-
-        [ForeignKey("ProdDbId")]
-        public virtual ProdModel Prod { get; set; }
-
         #endregion Public Properties
     }
 }

EgtBEAMWALL.DataLayer/DbConfig.cs

@@ -1,10 +1,7 @@
-using Ionic.Zip;
-using System;
-using System.Diagnostics;
-using System.IO;
+using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Xml.Linq;
+using System.Text;
 
 namespace EgtBEAMWALL.DataLayer
 {
@@ -21,7 +18,6 @@ namespace EgtBEAMWALL.DataLayer
         public static string DATABASE_SERV = "127.0.0.1";
 
         public static string DATABASE_USER = "EgtUser";
-        public static string ZIP_PWD = "viacremasca-viacremasca-viacremasca-viacremasca";
 
         #endregion Public Fields
 
@@ -33,7 +29,7 @@ namespace EgtBEAMWALL.DataLayer
         public static string ADMIN_CONNECTION_STRING { get; set; } = "";
 
         /// <summary>
-        /// DB Connection string, per effettuare migration riportare valore connessione admin cablato (server=localhost;port=3306;database=EgtBwDb_000102;)
+        /// DB Connection string
         /// </summary>
         public static string CONNECTION_STRING { get; set; } = "";
 
@@ -41,237 +37,23 @@ namespace EgtBEAMWALL.DataLayer
 
         #region Public Methods
 
-        /// <summary>
-        /// Effettua migrazione esplicita del DB
-        /// </summary>
-        /// <returns></returns>
-        public static bool CheckMigrateDb()
+        public static void InitDb(string server, string nKey, string sKey)
         {
-            // esecuzione script di migrations del DB
-            return Controllers.DbController.man.checkMigrateDb();
-        }
-
-        /// <summary>
-        /// Effettua verifica presenza utente
-        /// </summary>
-        /// <param name="nKey"></param>
-        /// <param name="sKey"></param>
-        /// <param name="isNetwork"></param>
-        /// <returns></returns>
-        public static bool CheckUser(string nKey, string sKey, bool isNetwork)
-        {
-            // esecuzione script di install locale
-            return Controllers.DbController.man.checkCreateUser(DATABASE_USER, DATABASE_PWD, isNetwork);
-        }
-
-        /// <summary>
-        /// Effettua verifica presenza view prod + relativo utente
-        /// </summary>
-        /// <param name="nKey"></param>
-        /// <param name="sKey"></param>
-        /// <param name="isNetwork"></param>
-        /// <returns></returns>
-        public static bool CheckViews(string nKey, string sKey)
-        {
-            // esecuzione script di install locale
-            return Controllers.DbController.man.refreshViews(DATABASE_NAME);
-        }
-
-        /// <summary>
-        /// Effettua DUMP del DB dato utente admin + percorso salvataggio (zip cifrato)
-        /// </summary>
-        /// <param name="zipFilePath">Percorso di salvataggio del dump (*.zip)</param>
-        /// <param name="dbName">Nome del DB da processare (se vuoto quello di default calcolato)</param>
-        /// <param name="mysqlDumpPath">Nome o Percorso Eseguibile mysqldump (opzionale)</param>
-        /// <param name="exportOpt">Opzioni in fase di export (default: --skip-extended-insert)</param>
-        /// <returns></returns>
-        public static bool DataBaseDumpToFile(string zipFilePath, string dbName = "", string mysqlDumpPath = "mysqldump", string exportOpt = "--skip-extended-insert")
-        {
-            bool fatto = false;
-            // fix path eseguibile
-            if (string.IsNullOrEmpty(mysqlDumpPath))
-            {
-                mysqlDumpPath = "mysqldump";
-            }
-            if (string.IsNullOrEmpty(dbName))
-            {
-                dbName = DATABASE_NAME;
-            }
-            // verifica zip finale
-            if (!zipFilePath.EndsWith(".zip"))
-            {
-                zipFilePath = $"{zipFilePath}.zip";
-            }
-            // creo nome file per export sql (temporaneo)
-            string tempSqlPath = zipFilePath.Replace(".zip", ".sql");
-            // esecuzione script x dump del DB
-            string dirPath = Path.GetDirectoryName(zipFilePath);
-            if (!Directory.Exists(dirPath))
-            {
-                Directory.CreateDirectory(dirPath);
-            }
-            // se ci fosse già file elimino (sql/zip)
-            if (File.Exists(tempSqlPath))
-            {
-                File.Delete(tempSqlPath);
-            }
-            if (File.Exists(zipFilePath))
-            {
-                File.Delete(zipFilePath);
-            }
-            // creazione SQL, tramite  script esterno... importante parametro "--skip-extended-insert" altrimenti problemi con restore (anche se + verboso e lento in backup...)
-            string callScript = $"\"{mysqlDumpPath}\" -u{DATABASE_USER}  -p{DATABASE_PWD} {dbName} {exportOpt} > {tempSqlPath}";
-            ExecuteCommand(callScript);
-            // compressione con pwd!
-            using (ZipFile zip = new ZipFile())
-            {
-                // aggiungo pwd
-                zip.Password = ZIP_PWD;
-                // inserisco file
-                zip.AddFile(tempSqlPath, "");
-                zip.Save(zipFilePath);
-                fatto = true;
-            }
-            // elimino file sql temporaneo...
-            if (File.Exists(tempSqlPath))
-            {
-                File.Delete(tempSqlPath);
-            }
-            return fatto;
-        }
-
-        /// <summary>
-        /// Effettua restore come overwrite del DB di DEFAULT... irreversibile
-        /// </summary>
-        /// <param name="zipFilePath">Percorso di lettura del dump cifrato (*.zip)</param>
-        /// <param name="dbName">Nome del DB da processare (se vuoto quello di default calcolato)</param>
-        /// <param name="tempFolder">Percorso cartella temp x esecuzione</param>
-        /// <param name="mysqlPath">Nome o Percorso Eseguibile mysql (opzionale)</param>
-        /// <param name="importOpt">Opzioni in fase di import (default: --force)</param>
-        /// <returns></returns>
-        public static bool DataBaseRestoreFromFile(string zipFilePath, string dbName = "", string tempFolder="", string mysqlPath = "mysql", string importOpt = "--force")
-        {
-            bool fatto = false;
-            // fix path eseguibile
-            if (string.IsNullOrEmpty(mysqlPath))
-            {
-                mysqlPath = "mysql";
-            }
-            if (string.IsNullOrEmpty(dbName))
-            {
-                dbName = DATABASE_NAME;
-            }
-            if (string.IsNullOrEmpty(tempFolder))
-            {
-                tempFolder = "C:\\Temp";
-            }
-            // verifica zip finale
-            if (!zipFilePath.EndsWith(".zip"))
-            {
-                zipFilePath = $"{zipFilePath}.zip";
-            }
-            // elimino eventuale temp folder precedente...
-            if (Directory.Exists(tempFolder))
-            {
-                Directory.Delete(tempFolder, true);
-            }
-            Directory.CreateDirectory(tempFolder);
-            // scompatto file zip --> sql
-            using (ZipFile zip = ZipFile.Read(zipFilePath))
-            {
-                zip.Password = ZIP_PWD;
-                zip.ExtractAll(tempFolder, ExtractExistingFileAction.OverwriteSilently);
-            }
-            // verifico che ci sia 1 file sql...
-            var sqlFiles = Directory.GetFiles(tempFolder, "*.sql");
-            if (sqlFiles != null && sqlFiles.Length == 1)
-            {
-                // verifico nome file per export sql (temporaneo)
-                string tempSqlPath = sqlFiles.FirstOrDefault();
-                // chiamo script esterno...
-                string callScript = $"\"{mysqlPath}\" -u{DATABASE_USER}  -p{DATABASE_PWD} {importOpt} {dbName} < {tempSqlPath}";
-                ExecuteCommand(callScript);
-                // elimino il file sql importato...
-                File.Delete(tempSqlPath);
-                // elimino temp folder...
-                Directory.Delete(tempFolder, true);
-                fatto = true;
-            }
-            return fatto;
-        }
-
-        /// <summary>
-        /// Esecuzione di un comando esterno
-        /// </summary>
-        /// <param name="command"></param>
-        public static void ExecuteCommand(string command)
-        {
-            int exitCode;
-            ProcessStartInfo processInfo;
-            Process process;
-
-            processInfo = new ProcessStartInfo("cmd.exe", "/c " + command);
-            processInfo.CreateNoWindow = true;
-            processInfo.UseShellExecute = false;
-            // *** Redirect the output ***
-            processInfo.RedirectStandardError = true;
-            processInfo.RedirectStandardOutput = true;
-
-            process = Process.Start(processInfo);
-            process.WaitForExit();
-
-            // *** Read the streams ***
-            // Warning: This approach can lead to deadlocks, see Edit #2
-            string output = process.StandardOutput.ReadToEnd();
-            string error = process.StandardError.ReadToEnd();
-
-            exitCode = process.ExitCode;
-
-            Console.WriteLine("output>>" + (String.IsNullOrEmpty(output) ? "(none)" : output));
-            Console.WriteLine("error>>" + (String.IsNullOrEmpty(error) ? "(none)" : error));
-            Console.WriteLine("ExitCode: " + exitCode.ToString(), "ExecuteCommand");
-            process.Close();
-        }
-
-        /// <summary>
-        /// Metodo di init standard per DB in rete con Master_Key
-        /// </summary>
-        /// <param name="server">Indirizzo del server (tipicamente indirizzo di rete)</param>
-        /// <param name="nKey">Numero chiave</param>
-        /// <param name="sKey">Codice/pwd associato a chiave</param>
-        /// <param name="masterKey">Numero di chiave master con cui è creato il DB</param>
-        public static void InitDb(string server, string nKey, string sKey, string masterKey = "")
-        {
-            // se nulla metto amster come nKey...
-            masterKey = string.IsNullOrEmpty(masterKey) ? nKey : masterKey;
             DATABASE_SERV = server;
-            DATABASE_NAME = $"EgtBwDb_{masterKey}";
+            DATABASE_NAME = $"EgtBwDb_{nKey}";
             DATABASE_USER = $"user_{nKey}";
             DATABASE_PWD = $"pwd_{sKey}";
-            ZIP_PWD = $"{DATABASE_USER}:{DATABASE_PWD}:{DATABASE_USER}:{DATABASE_PWD}";
-            CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database={DATABASE_NAME};uid={DATABASE_USER};pwd={DATABASE_PWD};SslMode=None";
+            CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database={DATABASE_NAME};uid={DATABASE_USER};pwd={DATABASE_PWD};sslmode=None";
             // stringa admin con utente root egalware...
-            ADMIN_CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database=mysql;uid=root;pwd=Egalware_24068!;SslMode=none;CHARSET=utf8";
+            ADMIN_CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database=mysql;uid=root;pwd=Egalware_24068!;sslmode=None";
         }
 
-        /// <summary>
-        /// Aggiorna conf NLog x target DIR
-        /// </summary>
-        /// <param name="logDir"></param>
-        public static void SetupLogDir(string logDir)
-        {
-            string appDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            string filePath = Path.Combine(appDir, "NLog.config");
-            // leggo il file NLog
-            string rawData = File.ReadAllText(filePath);
+      public static bool CheckUser(string nKey, string sKey)
+      {
+         // esecuzione script di install locale
+         return Controllers.DbController.man.checkCreateUser(DATABASE_USER, DATABASE_PWD);
+      }
 
-            // sostituzione livello minimo da selezione
-            rawData = rawData.Replace("${basedir}", logDir);
-
-            // ri-scrivo file NLog
-            File.WriteAllText(filePath, rawData);
-        }
-
-        #endregion Public Methods
-    }
+      #endregion Public Methods
+   }
 }

EgtBEAMWALL.DataLayer/DbManager.cs

@@ -9,6 +9,7 @@ namespace EgtBEAMWALL.DataLayer
     {
         #region Public Fields
 
+        public static DbManager obj = new DbManager();
         public Controllers.BTLPartController BtlPartCtr = new Controllers.BTLPartController();
         public Controllers.LogMachineController LogMacCtr = new Controllers.LogMachineController();
         public Controllers.LogSupportController LogSupCtr = new Controllers.LogSupportController();