EgtBeamWall 2.4c1 :

- versione 2403
- dopo esecuzione NestProcess.lua si resettano tutte le tabelle lua.

EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb

@@ -397,10 +397,14 @@ Public Class BTLFeatureM
             If Param.bIsP Then
                Param.SetValue(dParamValue)
             Else
-               ' se è un parametro Q verifico nel progetto se sia un valore custom
+               ' recupero info Custom
                Dim nCustom As Integer = 0
                EgtGetInfo(nFeatureId, Param.sName & "A", nCustom)
-               If nCustom = 1 Then
+               '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
                   Param.SetValue(dParamValue)
                   Param.bCustom = True
                   ' altrimenti lo setto al valore di default

EgtBEAMWALL.Core/BTLModel/BTLPartM.vb

@@ -666,7 +666,7 @@ Public Class BTLPartM
    Private m_sCALC_MSG As String
    Public Property sCALC_MSG As String
       Get
-         Return m_sCALC_MSG
+         Return MessageFromLuaMsg(m_sCALC_MSG)
       End Get
       Set(value As String)
          m_sCALC_MSG = value
@@ -703,6 +703,16 @@ 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
@@ -991,6 +1001,16 @@ Public Class BTLPartM
       Return TempList
    End Function
 
+   Private Function MessageFromLuaMsg(LuaMsg As String) As String
+      Dim sSplit() As String = LuaMsg.Split("$$")
+      Dim nMsg As Integer = -1
+      If sSplit.Count > 1 AndAlso Integer.TryParse(sSplit(0), nMsg) Then
+         Return EgtMsg(65000 + nMsg)
+      Else
+         Return LuaMsg
+      End If
+   End Function
+
    'Sub New(ParentStructure As BTLStructureVM, nPartId As Integer)
    '   MyBase.New(ParentStructure, nPartId)
    '   ' leggo info pezzo

EgtBEAMWALL.Core/BTLModel/BTLStructureM.vb

@@ -11,6 +11,13 @@ 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)
@@ -384,7 +391,20 @@ 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)

EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb

@@ -162,7 +162,8 @@ Public Module CalcIntegration
                      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_ProcessEnd(Nothing, New CalcProcessEndEventArgs(vBar(nCurrBar))) 'ProcessResults(vBar(nCurrBar))
+                        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
@@ -177,7 +178,8 @@ Public Module CalcIntegration
                      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_ProcessEnd(Nothing, New CalcProcessEndEventArgs(vBar(vProc(j).nBar))) 'ProcessResults(vBar(nCurrBar))
+                        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
@@ -199,7 +201,8 @@ Public Module CalcIntegration
                      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_ProcessEnd(Nothing, New CalcProcessEndEventArgs(vBar(vProc(j).nBar))) 'ProcessResults(vBar(nCurrBar))
+                        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
@@ -260,6 +263,7 @@ Public Module CalcIntegration
                      Result = CalcEndEventArgs.Results.OK
                   End If
                   RaiseEvent Calc_Ended(Nothing, New CalcEndEventArgs(CmdTypes.EDIT, Result))
+                  Return
                Else
                   ' Dialog con Progress Bar
                   nDoneBar += 1

EgtBEAMWALL.Core/Constants/ConstColumns.vb

@@ -4,6 +4,8 @@
    Public Const COL_VALUE As String = "colVALUE"
    Public Const COL_CUSTOM As String = "colCUSTOM"
    Public Const COL_STARTCUT As String = "colSTARTCUT"
+   Public Const COL_W As String = "colW"
+   Public Const COL_L As String = "colL"
    Public Const COL_ROT As String = "colROT"
    Public Const COL_FLIP As String = "colFLIP"
    Public Const COL_POSX As String = "colPOSX"

EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb

@@ -11,6 +11,7 @@
    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"
@@ -27,4 +28,6 @@
    Public Const S_VARIABLESLIST As String = "DG_VariablesList"
    Public Const S_MDICOMMANDS As String = "DG_MDICommands"
 
+   Public Const K_LOCKTABLE As String = "LockTable"
+
 End Module

EgtBEAMWALL.Core/Constants/ConstIni.vb

@@ -21,7 +21,8 @@ Public Module ConstIni
    'Public Const K_USERLEVEL As String = "UserLevel"
    'Public Const K_MAXINST As String = "MaxInstances"
    Public Const K_MAXCAMINST As String = "MaxCamInstances"
-   'Public Const K_INSTANCES As String = "Instances"
+   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"
@@ -29,11 +30,14 @@ Public Module ConstIni
    '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_WAREHOUSE As String = "Warehouse"
    Public Const K_DBADDRESS As String = "DbAddress"
+   Public Const K_UPDATEBTL As String = "UpdateBtl"
 
    'Public Const S_LANGUAGES As String = "Languages"
    'Public Const K_LANGUAGE As String = "Language"

EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj

@@ -47,9 +47,9 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EgtUILib, Version=2.3.6.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="EgtUILib, Version=2.3.7.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\EgtProg\Dll32\EgtUILib.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\EgtProg\Dll32\EgtUILib.dll</HintPath>
     </Reference>
     <Reference Include="EgtWPFLib5, Version=2.3.4.3, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -59,6 +59,7 @@
     <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" />
@@ -108,6 +109,11 @@
     <Compile Include="BTLModel\BTLPartM.vb" />
     <Compile Include="BTLModel\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="Utility\DimensionsIniFile.vb" />
     <Compile Include="Utility\Enum.vb" />
     <Compile Include="MachGroupPanel\MyMachGroupPanelVM.vb" />
@@ -135,6 +141,7 @@
     <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>
@@ -180,6 +187,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="LoadingWnd\LoadingWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>XamlIntelliSenseFileGenerator</Generator>
+    </Page>
     <Page Include="OpenProjectFileDialog\OpenProjectFileDialogV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml

@@ -2,12 +2,18 @@
           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">
-            <EventSetter Event="SizeChanged" Handler="Cell_SizedChanged" />
-            <EventSetter Event="FrameworkElement.Loaded" Handler="DataGridColumnHeader_Loaded"/>
-        </Style>
-    </DataGrid.ColumnHeaderStyle>
+   <DataGrid.ColumnHeaderStyle>
+      <Style TargetType="DataGridColumnHeader">
+         <Setter Property="HorizontalContentAlignment"
+                 Value="Stretch" />
+         <EventSetter Event="SizeChanged" 
+                      Handler="Cell_SizedChanged" />
+         <EventSetter Event="MouseRightButtonDown" 
+                      Handler="Cell_MouseRightButtonDown" />
+         <EventSetter Event="FrameworkElement.Loaded" 
+                      Handler="DataGridColumnHeader_Loaded"/>
+      </Style>
+   </DataGrid.ColumnHeaderStyle>
 
 </DataGrid>
 

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb

@@ -2,6 +2,7 @@
 Imports System.Collections.Specialized
 Imports System.Windows
 Imports System.Windows.Controls
+Imports System.Windows.Data
 Imports System.Windows.Controls.Primitives
 Imports System.Windows.Input
 Imports System.Windows.Media
@@ -10,6 +11,23 @@ Imports EgtWPFLib5
 
 Public Class EgtDataGrid
 
+   ' vecchio indice da salvare per il Reorder delle colonne
+   Public OldIndex As Integer = 0
+
+   ' variabili e costanti per il Resize delle colonne adiacenti
+   Private Const LEFT As String = "PART_LeftHeaderGripper"
+   Private Const RIGHT As String = "PART_RightHeaderGripper"
+   Private startPoint As Point
+   Private startWidth As Double
+   Private adjacentStartWidth As Double
+   'Private startUnitType As DataGridLengthUnitType
+   'Private adjacentUnitType As DataGridLengthUnitType
+   Private targetColumn As DataGridColumn
+   Private adjacentColumn As DataGridColumn
+
+   ' indice header su cui è aperto il ContextMenu per gestione check/uncheck LockTable
+   Private HeaderDispIndex As Integer = 0
+
    Sub New()
       InitializeComponent()
    End Sub
@@ -119,7 +137,83 @@ Public Class EgtDataGrid
       End If
    End Sub
 
-   Public OldIndex As Integer = 0
+   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()
+      miReorder.Header = NameOf(EgtDataGridColumn.CanUserReorder)
+      miResize.Header = NameOf(EgtDataGridColumn.CanUserResize)
+      miSort.Header = NameOf(EgtDataGridColumn.CanUserSort)
+      miVis.Header = "Columns Visibility"
+      miLock.Header = "Lock Table"
+      miReorder.IsCheckable = True
+      miResize.IsCheckable = True
+      miSort.IsCheckable = True
+      miLock.IsCheckable = True
+      miReorder.StaysOpenOnClick = True
+      miResize.StaysOpenOnClick = True
+      miSort.StaysOpenOnClick = True
+      miLock.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
+      ' 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)
+      ' 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
@@ -139,25 +233,15 @@ Public Class EgtDataGrid
       Next
    End Sub
 
-   Private Const LEFT As String = "PART_LeftHeaderGripper"
-   Private Const RIGHT As String = "PART_RightHeaderGripper"
-   Private startPoint As Point
-   Private startWidth As Double
-   Private adjacentStartWidth As Double
-   'Private startUnitType As DataGridLengthUnitType
-   'Private adjacentUnitType As DataGridLengthUnitType
-   Private targetColumn As DataGridColumn
-   Private adjacentColumn As DataGridColumn
-
    Private Sub DataGridColumnHeader_Loaded(sender As Object, e As RoutedEventArgs)
       Dim header = DirectCast(sender, DataGridColumnHeader)
 
       Dim thumbLeft As Thumb = header.Template.FindName(LEFT, header)
-      thumbLeft.AddHandler(Thumb.DragStartedEvent, CType(AddressOf Thumb_DragStarted, DragStartedEventHandler), True) ' thumbLeft.AddHandler(Thumb.DragStartedEvent, New DragStartedEventHandler(AddressOf Thumb_DragStarted), True)
+      thumbLeft.AddHandler(Thumb.DragStartedEvent, CType(AddressOf Thumb_DragStarted, DragStartedEventHandler), True)
       thumbLeft.AddHandler(Thumb.DragCompletedEvent, CType(AddressOf Thumb_DragCompleted, DragCompletedEventHandler), True)
 
       Dim thumbRight As Thumb = header.Template.FindName(RIGHT, header)
-      thumbRight.AddHandler(Thumb.DragStartedEvent, CType(AddressOf Thumb_DragStarted, DragStartedEventHandler), True) ' thumbRight.AddHandler(Thumb.DragStartedEvent, New DragStartedEventHandler(AddressOf Thumb_DragStarted), True)
+      thumbRight.AddHandler(Thumb.DragStartedEvent, CType(AddressOf Thumb_DragStarted, DragStartedEventHandler), True)
       thumbRight.AddHandler(Thumb.DragCompletedEvent, CType(AddressOf Thumb_DragCompleted, DragCompletedEventHandler), True)
    End Sub
 
@@ -229,6 +313,44 @@ Public Class EgtDataGrid
       Return tObj
    End Function
 
+   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
+
 End Class
 
 Public Class EgtDataGridColumn
@@ -297,6 +419,7 @@ Public Class EgtDataGridColumn
       End Set
    End Property
 
+   Friend OldCanUserReorder As Boolean?
    Private m_CanUserReorder As Boolean
    Public Property CanUserReorder As Boolean
       Get
@@ -312,6 +435,7 @@ Public Class EgtDataGridColumn
       End Set
    End Property
 
+   Friend OldCanUserResize As Boolean?
    Private m_CanUserResize As Boolean
    Public Property CanUserResize As Boolean
       Get

EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb

@@ -0,0 +1,97 @@
+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
+   End Enum
+
+   Dim m_MainWindow As Windows.Window
+   Public Function SetMainWindow(MainWindow As Windows.Window)
+      m_MainWindow = MainWindow
+   End Function
+
+   Private m_bMainWindow_IsActive As Boolean = True
+   Public Function SetMainWindowIsActive(IsActive As Boolean)
+      m_bMainWindow_IsActive = IsActive
+   End Function
+
+   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.CenterScreen
+      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

@@ -0,0 +1,54 @@
+<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" 
+                            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

@@ -0,0 +1,28 @@
+Imports System.Windows
+
+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
+
+End Class

EgtBEAMWALL.Core/LoadingWnd/LoadingWndVM.vb

@@ -0,0 +1,233 @@
+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/MachGroupModel/MyMachGroupM.vb

@@ -213,6 +213,16 @@ Public Class MyMachGroupM
       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

EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb

@@ -49,7 +49,7 @@ Public Class MyMachGroupPanelM
             EgtOutLog("Machine incompatible with beam & wall machining!!")
          Else
             Dim nBTLInfoLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
-            Dim nPROJTYPE As Integer = BWType.NULL 
+            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))
@@ -168,44 +168,157 @@ Public Class MyMachGroupPanelM
 
    ' 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 e FLIP per non perderli
+            ' 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)
-            ' recupero flip e rot dell'originale
-            Dim OrigRot As Integer
-            Dim OrigFlip As Integer
-            Dim DeltaRot As Integer
-            Dim DeltaFlip As Integer
-            EgtGetInfo(nPartId, BTL_PRT_ROTATED, OrigRot)
-            EgtGetInfo(nPartId, BTL_PRT_INVERTED, OrigFlip)
             ' ripristino i valori di ROT e FLIP
             For Duploindex = 0 To DuploArray.Length - 1
-               ' recupero box del pezzo
-               Dim b3Part As New BBox3d
-               EgtGetBBoxGlob(nPartId, GDB_BB.STANDARD, b3Part)
-               ' faccio flip e rotazione rispetto all'originale che ha sovrascritto posizione del duplo
-               DeltaRot = RotArray(Duploindex) - OrigRot
-               EgtRotate(DuploArray(Duploindex), b3Part.Center, -Vector3d.Z_AX, DeltaRot)
-               DeltaFlip = FlipArray(Duploindex) - OrigFlip
-               EgtRotate(DuploArray(Duploindex), b3Part.Center, Vector3d.X_AX, DeltaFlip)
+               ' 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)
@@ -217,6 +330,13 @@ Public Class MyMachGroupPanelM
       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 Sub DeleteDuplo()
       ' reset necessario per poter accedere direttamente al grezzo dalle info pezzo e al MachGroup tramite la gerarchia Db geometrico

EgtBEAMWALL.Core/MachGroupModel/PartM.vb

@@ -203,6 +203,16 @@ Public Class PartM
       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
@@ -292,13 +302,13 @@ Public Class PartM
       End Set
    End Property
 
-   Protected m_bFLIP As Boolean
-   Public Property bFLIP As Boolean
+   Protected m_nFLIP As Integer
+   Public Property nFLIP As Integer
       Get
-         Return m_bFLIP
+         Return m_nFLIP
       End Get
-      Set(value As Boolean)
-         m_bFLIP = value
+      Set(value As Integer)
+         m_nFLIP = value
       End Set
    End Property
 
@@ -456,6 +466,7 @@ Public Class PartM
       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
@@ -490,7 +501,7 @@ Public Class PartM
          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_bFLIP)
+         EgtGetInfo(nPartId, MGR_PRT_FLIP, NewPartM.m_nFLIP)
       End If
       ' leggo volume 
       If Not EgtGetInfo(nPartId, BTL_PRT_VOLUME, NewPartM.dVolume) Then

EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupPanelVM.vb

@@ -113,7 +113,7 @@ Public MustInherit Class MyMachGroupPanelVM
       SelMachGroup.SelPart = Nothing
       ' Imposto vista solo tavola
       EgtSetMachineLook(MCH_LOOK.TAB)
-      Core.ViewPanelVM.BWSetView(VT.TOP, False)
+      Core.ViewPanelVM.BWSetView(If(ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
       EgtZoom(ZM.ALL)
       Return True
    End Function

EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupVM.vb

@@ -235,6 +235,12 @@ Public MustInherit Class MyMachGroupVM
       End Set
    End Property
 
+   Public ReadOnly Property nPartsGlobalState As CalcStates
+      Get
+         Return MyMachGroupM.bCALC_PartsGlobalState
+      End Get
+   End Property
+
    Public Property nCALC_State As CalcStates
       Get
          Return MyMachGroupM.nCALC_State
@@ -431,18 +437,6 @@ Public MustInherit Class MyMachGroupVM
    Public Sub SetSupervisorId(SupervisorId As String)
       m_SupervisorId = SupervisorId
    End Sub
-   Public Sub ResetSupervisorId()
-      ' resetto stato per MachGroup
-      nProduction_State = ItemState.ND
-      m_SupervisorId = ""
-      NotifyPropertyChanged(NameOf(IsReadOnly))
-      NotifyPropertyChanged(NameOf(Background))
-      ' resetto stato per tutti i Part
-      For Each Part In PartVMList
-         Part.nProduction_State = ItemState.ND
-         Part.NotifyPropertyChanged(NameOf(Part.Background))
-      Next
-   End Sub
 
    Private m_cc As StateChangeEventArgs
 
@@ -551,6 +545,8 @@ Public MustInherit Class MyMachGroupVM
    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
@@ -560,6 +556,9 @@ Public MustInherit Class MyMachGroupVM
             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
@@ -567,6 +566,7 @@ Public MustInherit Class MyMachGroupVM
             MyMachGroupM.nCALC_FALL = Part.nCALC_FALL
          End If
       Next
+
       NotifyPropertyChanged(NameOf(Calc_Background))
       NotifyPropertyChanged(NameOf(CALC_FALL_Visibility))
       NotifyPropertyChanged(NameOf(CALC_ROT_Visibility))

EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb

@@ -162,6 +162,18 @@ Public MustInherit Class PartVM
       End Set
    End Property
 
+   Public ReadOnly Property sSTOREY As String
+      Get
+         Return m_PartM.sSTOREY
+      End Get
+   End Property
+
+   Public ReadOnly Property sGROUP As String
+      Get
+         Return m_PartM.sGROUP
+      End Get
+   End Property
+
    Public ReadOnly Property dVolume As Double
       Get
          Return m_PartM.dVolume
@@ -248,12 +260,12 @@ Public MustInherit Class PartVM
       End Get
    End Property
 
-   Public Overridable Property bFLIP As Boolean
+   Public Overridable Property nFLIP As Integer
       Get
-         Return m_PartM.bFLIP
+         Return m_PartM.nFLIP
       End Get
-      Set(value As Boolean)
-         m_PartM.bFLIP = value
+      Set(value As Integer)
+         m_PartM.nFLIP = value
       End Set
    End Property
 

EgtBEAMWALL.Core/My Project/AssemblyInfo.vb

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

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml

@@ -65,7 +65,7 @@
                SelectionMode="Single"
                ScrollViewer.CanContentScroll="True" 
                ScrollViewer.VerticalScrollBarVisibility="Auto"
-               ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+               ScrollViewer.HorizontalScrollBarVisibility="Auto"
                Margin="5"
                BindingColumns="{Binding ProjectColumns}">
          <DataGrid.Resources>

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -267,6 +267,10 @@ Public MustInherit Class OpenProjectFileDialogVM
                                                                         New IdNameStruct(OpenProjFileColumn.BTLFILENAME, BTLFileName_Msg),
                                                                         New IdNameStruct(OpenProjFileColumn.CREATEDATE, CreateDate_Msg)})
       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

EgtBEAMWALL.Core/Utility/Enum.vb

@@ -58,6 +58,9 @@ Public Enum StatusMapOpType
    SupervisorReleaseStop = 11
    ResetPartStart = 12
    ResetPartEnd = 13
+   ChangeProdInSupervisorRequest = 14
+   ChangeProdInProdRequest = 15
+   OpenPageInViewOptimRequest = 16
 End Enum
 
 Public Enum DimensionType

EgtBEAMWALL.Core/Utility/GridDimension.vb

@@ -6,6 +6,8 @@ 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
@@ -43,7 +45,7 @@ Public Class GridDimension
       End Get
       Set(value As GridLength)
          m_GridLen = value
-         DimensionsIniFile.SaveGridDimensions(GridName, GridDimensions)
+         If Not m_SoftwareModActive Then DimensionsIniFile.SaveGridDimensions(GridName, GridDimensions)
       End Set
    End Property
 
@@ -64,4 +66,8 @@ Public Class GridDimension
       m_GridLen = GridLen
    End Sub
 
+   Public Shared Sub SetSoftwareMod(bActive As Boolean)
+      m_SoftwareModActive = bActive
+   End Sub
+
 End Class

EgtBEAMWALL.Core/Utility/ManageWindow.vb

@@ -1,6 +1,6 @@
 Imports System.Runtime.InteropServices
 
-Module ManageWindow
+Public Module ManageWindow
 
 
    <DllImport("user32.dll")>
@@ -41,7 +41,7 @@ Module ManageWindow
       Public rcNormalPosition As System.Drawing.Rectangle
    End Structure
 
-   Friend Sub BringWindowToFront(wdwIntPtr As IntPtr)
+   Public Sub BringWindowToFront(wdwIntPtr As IntPtr)
       'Dim wdwIntPtr As IntPtr = FindWindow(Nothing, "0016 - EgtBEAMWALL")
       Dim placement As Windowplacement = New Windowplacement()
       GetWindowPlacement(wdwIntPtr, placement)

EgtBEAMWALL.Core/ViewPanel/ViewPanelVM.vb

@@ -6,15 +6,35 @@ Public Class 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
+   Private Shared m_nViewDir As VT = VT.ISO_SW
 
    Public Shared 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)
+            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
@@ -70,7 +90,7 @@ Public Class ViewPanelVM
       End Select
    End Function
 
-   Public Shared Sub UpdateMachParam(ViewDir As Integer)
+   Public Shared Sub UpdateMachParam(ViewDir As VT)
       m_nViewDir = ViewDir
    End Sub
 

EgtBEAMWALL.DataLayer/Controllers/MachGroupController.cs

@@ -1,8 +1,7 @@
-using System;
+using EgtBEAMWALL.DataLayer.DatabaseModels;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using EgtBEAMWALL.DataLayer.DatabaseModels;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
 {
@@ -74,69 +73,70 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             // Recupero il PROD
             ProdModel currData = ProdController.man.FindByProdId(ProdId);
             List<PartModel> PartList2Add = new List<PartModel>();
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var convCurrMG = MachGroupController.ConvertFromCore(newMachGroup, currData.ProdDbId);
-
-                convCurrMG.ProdIndex = 1;
-
-                // aggiungo MachGroup
-                dbCtx.MachGroupList.Add(convCurrMG);
-                // Commit changes
-                dbCtx.SaveChanges();
-
-                int MachGroupDbId = MachGroupController.man.FindByMachGroupId(ProdId, newMachGroup.Id).MachGroupDbId;
-                // verifico se uguali o meno...
-                foreach (var currPartM in newMachGroup.PartMList)
+                try
                 {
-                    var currPart = dbCtx
-                      .PartList
-                      .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == newMachGroup.Id && x.PartId == currPartM.nPartId)
-                      .SingleOrDefault();
-                    var convCurrPartM = PartController.ConvertFromCore(currPartM, MachGroupDbId);
-                    if (currPart != null)
+                    var convCurrMG = MachGroupController.ConvertFromCore(newMachGroup, currData.ProdDbId);
+
+                    convCurrMG.ProdIndex = 1;
+
+                    // aggiungo MachGroup
+                    localDbCtx.MachGroupList.Add(convCurrMG);
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+
+                    int MachGroupDbId = MachGroupController.man.FindByMachGroupId(ProdId, newMachGroup.Id).MachGroupDbId;
+                    // verifico se uguali o meno...
+                    foreach (var currPartM in newMachGroup.PartMList)
                     {
-                        // se non identico x equality limitata a ViewOptim...
-                        if (!currPart.ViewOptimEquals(convCurrPartM))
+                        var currPart = localDbCtx
+                                          .PartList
+                                          .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == newMachGroup.Id && x.PartId == currPartM.nPartId)
+                                          .SingleOrDefault();
+                        var convCurrPartM = PartController.ConvertFromCore(currPartM, MachGroupDbId);
+                        if (currPart != null)
                         {
-                            // aggiorno con nuovi valori ricevuti
-                            currPart.H = convCurrPartM.H;
-                            currPart.L = convCurrPartM.L;
-                            currPart.W = convCurrPartM.W;
-                            currPart.Material = convCurrPartM.Material;
-                            currPart.CALC_State = convCurrPartM.CALC_State;
-                            currPart.ROT = convCurrPartM.ROT;
-                            currPart.PDN = convCurrPartM.PDN;
-                            currPart.NAM = convCurrPartM.NAM;
-                            // salvo
-                            dbCtx.SaveChanges();
+                            // se non identico x equality limitata a ViewOptim...
+                            if (!currPart.ViewOptimEquals(convCurrPartM))
+                            {
+                                // aggiorno con nuovi valori ricevuti
+                                currPart.H = convCurrPartM.H;
+                                currPart.L = convCurrPartM.L;
+                                currPart.W = convCurrPartM.W;
+                                currPart.Material = convCurrPartM.Material;
+                                currPart.CALC_State = convCurrPartM.CALC_State;
+                                currPart.ROT = convCurrPartM.ROT;
+                                currPart.PDN = convCurrPartM.PDN;
+                                currPart.NAM = convCurrPartM.NAM;
+                                // salvo
+                                localDbCtx.SaveChanges();
+                            }
+                        }
+                        else
+                        {
+                            PartList2Add.Add(convCurrPartM);
                         }
                     }
-                    else
-                    {
-                        PartList2Add.Add(convCurrPartM);
-                    }
+
+                    // aggiungo PartList
+                    localDbCtx.PartList.AddRange(PartList2Add);
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+
+                    // aggiorno valore isNew a false x PROD
+                    currData.IsNew = false;
+
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, newMachGroup.Id, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupAdd, "");
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on UpdateMachGroup: {exc}");
                 }
-
-                // aggiungo PartList
-                dbCtx.PartList.AddRange(PartList2Add);
-                // Commit changes
-                dbCtx.SaveChanges();
-
-                // aggiorno valore isNew a false x PROD
-                currData.IsNew = false;
-
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                // aggiorno info sullo status
-                StatusMapController.man.UpdateAction("", ProdId, newMachGroup.Id, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupAdd, "");
             }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on UpdateMachGroup: {exc}");
-            }
-
             return currData;
         }
 
@@ -150,19 +150,20 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             MachGroupModel newMachGroup = new MachGroupModel() { MachGroupId = newMachGroupId, Name = Name, State = Core.ItemState.ND };
 
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // Add to database
-                dbCtx.MachGroupList.Add(newMachGroup);
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
+                try
+                {
+                    // Add to database
+                    localDbCtx.MachGroupList.Add(newMachGroup);
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on Create: {exc}");
+                }
             }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on Create: {exc}");
-            }
-
             return newMachGroup;
         }
 
@@ -175,39 +176,40 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Delete(int ProdId, int MachGroupId)
         {
             bool done = false;
-            // inizio eliminando le part
-            var parts2del = dbCtx
-                .PartList
-                .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId)
-                .ToList();
-
-            var MG2Del = dbCtx
-                .MachGroupList
-                .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
-                .SingleOrDefault();
-
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // Remove to database
-                dbCtx.PartList.RemoveRange(parts2del);
-                dbCtx.MachGroupList.Remove(MG2Del);
-                // Commit changes
-                dbCtx.SaveChanges();
+                // inizio eliminando le part
+                var parts2del = localDbCtx
+                                .PartList
+                                .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId)
+                                .ToList();
 
-                // registro modifica StatusMap
-                StatusMapController.man.UpdateAction(MG2Del.SupervisorId, ProdId, MG2Del.MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupRem, "");
+                var MG2Del = localDbCtx
+                                .MachGroupList
+                                .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
+                                .SingleOrDefault();
 
-                ResetController();
-                done = true;
+                try
+                {
+                    // Remove to database
+                    localDbCtx.PartList.RemoveRange(parts2del);
+                    localDbCtx.MachGroupList.Remove(MG2Del);
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+
+                    // registro modifica StatusMap
+                    StatusMapController.man.UpdateAction(MG2Del.SupervisorId, ProdId, MG2Del.MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupRem, "");
+
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on Delete: ProdId: {ProdId} | MachGroupId: {MachGroupId}{Environment.NewLine}{exc}");
+                }
+
+                // se fatto aggiorno info sullo status
+                StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupRem, "");
             }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on Delete: ProdId: {ProdId} | MachGroupId: {MachGroupId}{Environment.NewLine}{exc}");
-            }
-
-            // se fatto aggiorno info sullo status
-            StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupRem, "");
-
             return done;
         }
 
@@ -237,10 +239,14 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public MachGroupModel FindByMachGroupId(int ProdId, int MachGroupId)
         {
-            return dbCtx
+
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                return localDbCtx
                 .MachGroupList
                 .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
                 .SingleOrDefault();
+            }
         }
 
         /// <summary>
@@ -325,6 +331,77 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 .ToList();
         }
 
+        /// <summary>
+        /// Set ProdIndex for MachGroup
+        /// </summary>
+        /// <param name="ProdId"></param>
+        /// <returns></returns>
+        public int GetMinIndex(int ProdId)
+        {
+            int answ = 5000;
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                try
+                {
+                    // aggiorno
+                    var result = localDbCtx
+                                    .MachGroupList
+                                    .Where(x => x.Prod.ProdId == ProdId && x.ProdIndex >= 5000 && x.ProdIndex < 10000)
+                                    .OrderByDescending(x => x.ProdIndex)
+                                    .FirstOrDefault();
+                    if (result != null)
+                    {
+                        answ = result.ProdIndex;
+                    }
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on UpdateOrder: {exc}");
+                }
+            }
+
+            return answ;
+        }
+
+        /// <summary>
+        /// Imposta a RIMOSSA dal supervisore
+        /// </summary>
+        /// <param name="MachGroupId"></param>
+        /// <param name="newState"></param>
+        /// <returns></returns>
+        public bool RemoveFromSupervisor(int ProdId, int MachGroupId)
+        {
+            bool done = false;
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                try
+                {
+                    // aggiorno
+                    var currRecord = localDbCtx
+                                        .MachGroupList
+                                        .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
+                                        .FirstOrDefault();
+                    if (currRecord != null)
+                    {
+                        currRecord.State = Core.ItemState.ND;
+                        currRecord.SupervisorId = "";
+                        currRecord.ProdIndex = 0;
+                    }
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupRemovedFromSupervisor, "");
+
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on RemoveFromSupervisor: {exc}");
+                }
+            }
+            return done;
+        }
+
         /// <summary>
         /// Reinizializzaizone del controller
         /// </summary>
@@ -344,26 +421,27 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool SetNeedRedo(int ProdId, int MachGroupId, Core.ItemState newState, string Value)
         {
             bool done = false;
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // aggiorno
-                dbCtx
-                .MachGroupList
-                .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
-                .FirstOrDefault()
-                .State = newState;
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-                // aggiorno info sullo status
-                StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupNeedRedo, Value);
+                try
+                {
+                    // aggiorno
+                    localDbCtx
+                        .MachGroupList
+                        .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
+                        .FirstOrDefault()
+                        .State = newState;
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupNeedRedo, Value);
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on UpdateStatus: {exc}");
+                }
             }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on UpdateStatus: {exc}");
-            }
-
             return done;
         }
 
@@ -375,25 +453,27 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Update(MachGroupModel updItem)
         {
             bool done = false;
-            var item2update = dbCtx
-                .MachGroupList
-                .Where(x => x.MachGroupDbId == updItem.MachGroupDbId)
-                .SingleOrDefault();
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // update, vers 1...
-                dbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
+                var item2update = localDbCtx
+                                    .MachGroupList
+                                    .Where(x => x.MachGroupDbId == updItem.MachGroupDbId)
+                                    .SingleOrDefault();
+                try
+                {
+                    // update, vers 1...
+                    localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
 
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-                // aggiorno info sullo status
-                StatusMapController.man.UpdateAction("", updItem.Prod.ProdId, updItem.MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on Update: {exc}");
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", updItem.Prod.ProdId, updItem.MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on Update: {exc}");
+                }
             }
             return done;
         }
@@ -408,28 +488,30 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateEnd(int ProdId, int MachGroupId, DateTime DtEnd)
         {
             bool done = false;
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // aggiorno
-                var currRecord = dbCtx
-                .MachGroupList
-                .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
-                .FirstOrDefault();
+                try
+                {
+                    // aggiorno
+                    var currRecord = localDbCtx
+                                        .MachGroupList
+                                        .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
+                                        .FirstOrDefault();
 
-                currRecord.DtEnd = DtEnd;
+                    currRecord.DtEnd = DtEnd;
 
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-                // aggiorno info sullo status
-                StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, DtEnd == DateTime.MinValue ? Core.StatusMapOpType.ResetPartEnd : Core.StatusMapOpType.PartEnd, "");
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, DtEnd == DateTime.MinValue ? Core.StatusMapOpType.ResetPartEnd : Core.StatusMapOpType.PartEnd, "");
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on UpdateStartEnd: {exc}");
+                }
             }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on UpdateStartEnd: {exc}");
-            }
-
             return done;
         }
 
@@ -443,58 +525,27 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateOrder(int ProdId, int MachGroupId, int newProdIndex)
         {
             bool done = false;
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // aggiorno
-                dbCtx
-                .MachGroupList
-                .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
-                .FirstOrDefault()
-                .ProdIndex = newProdIndex;
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-#if false
-                // aggiorno info sullo status
-                StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, ""); 
-#endif
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on UpdateOrder: {exc}");
-            }
-
-            return done;
-        }
-
-        /// <summary>
-        /// Set ProdIndex for MachGroup
-        /// </summary>
-        /// <param name="ProdId"></param>
-        /// <returns></returns>
-        public int GetMinIndex(int ProdId)
-        {
-            int answ=5000;
-            try
-            {
-                // aggiorno
-                var result = dbCtx
-                .MachGroupList
-                .Where(x => x.Prod.ProdId == ProdId && x.ProdIndex >= 5000 && x.ProdIndex < 10000)
-                .OrderByDescending(x => x.ProdIndex)
-                .FirstOrDefault();
-                if (result != null)
+                try
                 {
-                    answ = result.ProdIndex;
+                    // aggiorno
+                    localDbCtx
+                        .MachGroupList
+                        .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
+                        .FirstOrDefault()
+                        .ProdIndex = newProdIndex;
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on UpdateOrder: {exc}");
                 }
             }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on UpdateOrder: {exc}");
-            }
-
-            return answ;
+            return done;
         }
 
         /// <summary>
@@ -508,28 +559,30 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateStart(int ProdId, int MachGroupId, DateTime DtStart)
         {
             bool done = false;
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // aggiorno
-                var currRecord = dbCtx
-                .MachGroupList
-                .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
-                .FirstOrDefault();
+                try
+                {
+                    // aggiorno
+                    var currRecord = localDbCtx
+                                        .MachGroupList
+                                        .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
+                                        .FirstOrDefault();
 
-                currRecord.DtStart = DtStart;
+                    currRecord.DtStart = DtStart;
 
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-                // aggiorno info sullo status
-                StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, DtStart == DateTime.MinValue ? Core.StatusMapOpType.ResetPartStart : Core.StatusMapOpType.PartStart, "");
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, DtStart == DateTime.MinValue ? Core.StatusMapOpType.ResetPartStart : Core.StatusMapOpType.PartStart, "");
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on UpdateStartEnd: {exc}");
+                }
             }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on UpdateStartEnd: {exc}");
-            }
-
             return done;
         }
 
@@ -544,29 +597,30 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateStartEnd(int ProdId, int MachGroupId, DateTime DtStart, DateTime DtEnd)
         {
             bool done = false;
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // aggiorno
-                var currRecord = dbCtx
-                .MachGroupList
-                .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
-                .FirstOrDefault();
+                try
+                {
+                    // aggiorno
+                    var currRecord = localDbCtx
+                                        .MachGroupList
+                                        .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
+                                        .FirstOrDefault();
 
-                currRecord.DtStart = DtStart;
-                currRecord.DtEnd = DtEnd;
+                    currRecord.DtStart = DtStart;
+                    currRecord.DtEnd = DtEnd;
 
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-                // aggiorno info sullo status
-                StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on UpdateStartEnd: {exc}");
+                }
             }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on UpdateStartEnd: {exc}");
-            }
-
             return done;
         }
 
@@ -579,63 +633,28 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateStatus(int ProdId, int MachGroupId, Core.ItemState newState)
         {
             bool done = false;
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // aggiorno
-                dbCtx
-                .MachGroupList
-                .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
-                .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;
-        }
-
-        /// <summary>
-        /// Imposta a RIMOSSA dal supervisore
-        /// </summary>
-        /// <param name="MachGroupId"></param>
-        /// <param name="newState"></param>
-        /// <returns></returns>
-        public bool RemoveFromSupervisor(int ProdId, int MachGroupId)
-        {
-            bool done = false;
-            try
-            {
-                // aggiorno
-                var currRecord = dbCtx
-                .MachGroupList
-                .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
-                .FirstOrDefault();
-                if (currRecord != null)
+                try
                 {
-                    currRecord.State = Core.ItemState.ND;
-                    currRecord.SupervisorId = "";
-                    currRecord.ProdIndex = 0;
-                }
-                // Commit changes
-                dbCtx.SaveChanges();
-                // aggiorno info sullo status
-                StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupRemovedFromSupervisor, "");
-                ResetController();
-                done = true;
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on RemoveFromSupervisor: {exc}");
-            }
+                    // aggiorno
+                    localDbCtx
+                        .MachGroupList
+                        .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
+                        .FirstOrDefault()
+                        .State = newState;
+                    // Commit changes
+                    localDbCtx.SaveChanges();
 
+                    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;
         }
 
@@ -649,29 +668,31 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateSupervisor(int ProdId, int MachGroupId, string SupervisorId)
         {
             bool done = false;
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // aggiorno
-                var currRecord = dbCtx
-                .MachGroupList
-                .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
-                .FirstOrDefault();
+                try
+                {
+                    // aggiorno
+                    var currRecord = localDbCtx
+                                        .MachGroupList
+                                        .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
+                                        .FirstOrDefault();
 
-                currRecord.SupervisorId = SupervisorId;
-                currRecord.State = Core.ItemState.Assigned;
+                    currRecord.SupervisorId = SupervisorId;
+                    currRecord.State = Core.ItemState.Assigned;
 
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-                // aggiorno info sullo status
-                StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupAssignedToSupervisor, "");
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupAssignedToSupervisor, "");
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on UpdateSupervisor: {exc}");
+                }
             }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on UpdateSupervisor: {exc}");
-            }
-
             return done;
         }
 

EgtBEAMWALL.DataLayer/Controllers/PartController .cs

@@ -254,10 +254,15 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public PartModel FindByPartId(int ProdId, int PartId)
         {
-            return dbCtx
-                .PartList
-                .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.PartId == PartId)
-                .SingleOrDefault();
+            PartModel answ = null;
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                answ = localDbCtx
+                        .PartList
+                        .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.PartId == PartId)
+                        .FirstOrDefault();
+            }
+            return answ;
         }
 
         /// <summary>
@@ -277,28 +282,30 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Update(PartModel updItem)
         {
             bool done = false;
-            var item2update = dbCtx
-                .PartList
-                .Where(x => x.PartDbId == updItem.PartDbId)
-                .SingleOrDefault();
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // update, vers 1...
-                dbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
+                var item2update = localDbCtx
+                                    .PartList
+                                    .Where(x => x.PartDbId == updItem.PartDbId)
+                                    .SingleOrDefault();
+                try
+                {
+                    // update, vers 1...
+                    localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
 
-                //// update, vers 2
-                //dbCtx.PartList.Remove(item2del);
-                //dbCtx.PartList.Add(updItem);
+                    //// update, vers 2
+                    //dbCtx.PartList.Remove(item2del);
+                    //dbCtx.PartList.Add(updItem);
 
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-                // aggiorno info sullo status
-                StatusMapController.man.UpdateAction("", updItem.MachGroup.Prod.ProdId, updItem.PartId, Core.StatusMapItemType.Part, Core.StatusMapOpType.MachGroupMod, "");
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", updItem.MachGroup.Prod.ProdId, updItem.PartId, Core.StatusMapItemType.Part, Core.StatusMapOpType.MachGroupMod, "");
+                }
+                catch
+                { }
             }
-            catch
-            { }
             return done;
         }
 
@@ -311,26 +318,27 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateEnd(int ProdId, int MachGroupId, int PartId, DateTime DtEnd)
         {
             bool done = false;
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // 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, PartId, Core.StatusMapItemType.Part, DtEnd == DateTime.MinValue ? Core.StatusMapOpType.ResetPartEnd : Core.StatusMapOpType.PartEnd, "");
+                try
+                {
+                    // aggiorno
+                    localDbCtx
+                        .PartList
+                        .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
+                        .FirstOrDefault()
+                        .DtEnd = DtEnd;
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, PartId, Core.StatusMapItemType.Part, DtEnd == DateTime.MinValue ? Core.StatusMapOpType.ResetPartEnd : Core.StatusMapOpType.PartEnd, "");
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on UpdateStatus: {exc}");
+                }
             }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on UpdateStatus: {exc}");
-            }
-
             return done;
         }
 
@@ -343,24 +351,26 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateStart(int ProdId, int MachGroupId, int PartId, DateTime DtStart)
         {
             bool done = false;
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // 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, PartId, Core.StatusMapItemType.Part, DtStart == DateTime.MinValue ? Core.StatusMapOpType.ResetPartStart : Core.StatusMapOpType.PartStart, "");
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on UpdateStatus: {exc}");
+                try
+                {
+                    // aggiorno
+                    localDbCtx
+                        .PartList
+                        .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
+                        .FirstOrDefault()
+                        .DtStart = DtStart;
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, PartId, Core.StatusMapItemType.Part, DtStart == DateTime.MinValue ? Core.StatusMapOpType.ResetPartStart : Core.StatusMapOpType.PartStart, "");
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on UpdateStatus: {exc}");
+                }
             }
 
             return done;
@@ -375,24 +385,26 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateStatus(int ProdId, int MachGroupId, int PartId, Core.ItemState newState)
         {
             bool done = false;
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // 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, PartId, Core.StatusMapItemType.Part, Core.StatusMapOpType.MachGroupMod, "");
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on UpdateStatus: {exc}");
+                try
+                {
+                    // aggiorno
+                    localDbCtx
+                        .PartList
+                        .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
+                        .FirstOrDefault()
+                        .State = newState;
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, PartId, Core.StatusMapItemType.Part, Core.StatusMapOpType.MachGroupMod, "");
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on UpdateStatus: {exc}");
+                }
             }
 
             return done;

EgtBEAMWALL.DataLayer/Controllers/ProjController.cs

@@ -1,8 +1,8 @@
-using System;
+using EgtBEAMWALL.DataLayer.DatabaseModels;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using EgtBEAMWALL.DataLayer.DatabaseModels;
 using static EgtBEAMWALL.Core.ConstBeam;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
@@ -90,6 +90,32 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
         #region Public Methods
 
+        /// <summary>
+        /// Search for already imported BTL from FileName (only)
+        /// =0 : NOT found
+        /// >0 : ProjId (already rpesent) for overwrite
+        /// </summary>
+        /// <param name="BTLFileName"></param>
+        /// <returns></returns>
+        public int AlreadyImported(string BTLFileName)
+        {
+            int answ = 0;
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                var dbResult = localDbCtx
+                       .ProjList
+                       .Where(x => x.BTLFileName == BTLFileName)
+                       .FirstOrDefault();
+
+                //se avesse trovato-- > riporto id...
+                if (dbResult != null && dbResult.ProjId > 0)
+                {
+                    answ = dbResult.ProjId;
+                }
+            }
+            return answ;
+        }
+
         public bool DeleteProj(int ProjId)
         {
             bool done = false;
@@ -124,6 +150,51 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             dbCtx.Dispose();
         }
 
+        /// <summary>
+        /// Get records filtered by BtlPartName matching regexp BtlFileName[_number]
+        /// </summary>
+        /// <param name="BtlFileName">Base name to search for  (=starts by BtlFileName%)</param>
+        /// <returns></returns>
+        public List<ProjModel> FindByBtlFileName(string BtlFileName)
+        {
+            List<ProjModel> searchResult = new List<ProjModel>();
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // in primi cerco il record "parent" generale, se non ci fosse inutile proseguire...
+                ProjModel parentRec = localDbCtx
+                        .ProjList
+                        .Where(x => x.BTLFileName == BtlFileName)
+                        .FirstOrDefault();
+                if (parentRec != null && parentRec.ProjId > 0)
+                {
+                    // inserisco nei risultati
+                    searchResult.Add(parentRec);
+                    // cerco eventuali dati "child" puliti
+                    var childRec = localDbCtx
+                            .ProjList
+                            .Where(x => x.BTLFileName.StartsWith(BtlFileName+"_"))
+                            .ToList();
+                    // faccio filtro con ricerca regexp x scartare "falsi positivi" come BtlFileName_nonNumero...
+                    if (childRec.Count > 0)
+                    {
+                        // ciclo nei risultati x verificare se si tratti di PURO NUMERO...
+                        foreach (var item in childRec)
+                        {
+                            string maybeNumber = item.BTLFileName.Replace($"{BtlFileName}_", "");
+                            int index = 0;
+                            bool isNumber = int.TryParse(maybeNumber, out index);
+                            if (isNumber)
+                            {
+                                searchResult.Add(item);
+                            }
+                        }
+                    }
+
+                }
+            }
+            return searchResult;
+        }
+
         /// <summary>
         /// Get record by ProjDbId
         /// </summary>
@@ -526,7 +597,41 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public Core.ProjFileM UpdateInfo(int ProjId, string BTLFileName, string ListName, DateTime DtExported, BWType PType, string Machine)
         {
+            // cerco specifico Proj
             var currData = FindByProjId(ProjId);
+
+            // 2022.01.24: verifico UNIVOCITA' nel nome del file: SE fosse duplicato --> nuovo nome, nel formato nomeOriginale_idx, dove idx è il contatore libero successivo
+            var duplicateList = FindByBtlFileName(BTLFileName);
+            // devo verificare SOLO SE la lista non è vuota
+            if (duplicateList != null && duplicateList.Count > 0)
+            {
+                // se ne ho esattamente 1 nel DB allora DEVE essere il record Parent
+                if (duplicateList.Count == 1)
+                {
+                    // verifico se ProjId variato
+                    if (!duplicateList[0].ProjId.Equals(currData.ProjId))
+                    {
+                        // in questo caso ho il PRIMO duplicato
+                        BTLFileName = $"{BTLFileName}_1";
+                    }
+                }
+                // se ne ho + di 1 --> so che il maxId interno avrò il valore ULTIMO x prendere il successivo
+                else
+                {
+                    var lastRec = duplicateList.OrderByDescending(x => x.ProjDbId).FirstOrDefault();
+                    // cerco indice
+                    string maybeNumber = lastRec.BTLFileName.Replace($"{BTLFileName}_", "");
+                    int index = 0;
+                    bool isNumber = int.TryParse(maybeNumber, out index);
+                    // fasccio comunque verifica sia numerico
+                    if (isNumber)
+                    {
+                        // in questo caso ho il l'ULTIMO duplicato e faccio +1
+                        BTLFileName = $"{BTLFileName}_{index + 1}";
+                    }
+                }
+            }
+
             // aggiorno valore BTL
             currData.BTLFileName = BTLFileName;
             currData.DtExported = DtExported;
@@ -559,7 +664,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
             return coreConv(currData);
         }
-      
+
         /// <summary>
         ///  Update record su DB x PType
         /// </summary>
@@ -568,15 +673,15 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public Core.ProjFileM UpdateMachine(int ProjId, String Machine)
         {
-           var currData = FindByProjId(ProjId);
-           // aggiorno valore BTL
-           currData.Machine = Machine;
+            var currData = FindByProjId(ProjId);
+            // aggiorno valore BTL
+            currData.Machine = Machine;
 
-           // Commit changes
-           dbCtx.SaveChanges();
-           ResetController();
+            // Commit changes
+            dbCtx.SaveChanges();
+            ResetController();
 
-           return coreConv(currData);
+            return coreConv(currData);
         }
 
         #endregion Public Methods

EgtBEAMWALL.DataLayer/Controllers/StatusMapController.cs

@@ -1,8 +1,7 @@
-using System;
+using EgtBEAMWALL.DataLayer.DatabaseModels;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using EgtBEAMWALL.DataLayer.DatabaseModels;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
 {
@@ -132,14 +131,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     .ToList();
             }
             return answ;
-#if false
-            // retrieve
-            return dbCtx
-                .StatusMapList
-                .Where(x => x.ItemType == Core.StatusMapItemType.Prod)
-                .OrderByDescending(x => x.Index)
-                .ToList(); 
-#endif
         }
 
         /// <summary>
@@ -162,10 +153,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             bool done = false;
             DateTime adesso = DateTime.Now;
 
-#if false
-            // svuoto dati precedenti IN BLOCCO
-            done = DeleteSession(""); 
-#endif
             // gestione corretta x multi-supervisors
             done = DeleteSession(SupervisorId);
 
@@ -234,7 +221,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 {
                     // aggiorno indice PROD
                     prodData.Index++;
-                    // se session è nulla ma ho un PROD --> calcolo da li la sessione 
+                    // se session è nulla ma ho un PROD --> calcolo da li la sessione
                     if (string.IsNullOrEmpty(Session))
                     {
                         Session = prodData.Session;

EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.1.3")]
-[assembly: AssemblyFileVersion("2.4.1.3")]
+[assembly: AssemblyVersion("2.4.3.1")]
+[assembly: AssemblyFileVersion("2.4.3.1")]

EgtBEAMWALL.Supervisor/Application.xaml.vb

@@ -1,4 +1,6 @@
-Class Application
+Imports EgtUILib
+
+Class Application
 
    ' Application-level events, such as Startup, Exit, and DispatcherUnhandledException
    ' can be handled in this file.
@@ -11,4 +13,9 @@
       Me.MainWindow.Show()
    End Sub
 
+   Public Sub ManageUnhandledException(sender As Object, e As System.Windows.Threading.DispatcherUnhandledExceptionEventArgs) Handles Me.DispatcherUnhandledException
+      EgtOutLog(e.Exception.ToString)
+      e.Handled = True
+   End Sub
+
 End Class

EgtBEAMWALL.Supervisor/AxesPanel/AxesPanelVM.vb

@@ -101,27 +101,35 @@ Public Class Axis
    Public ReadOnly Property sValue As String
       Get
          Dim nDec As Integer = 0
-         Select Case Type
-            Case AxisTypes.LINEAR
-               nDec = -3
-            Case AxisTypes.ROTATIONAL
-               nDec = -4
-            Case Else
-               nDec = 0
-         End Select
+         If CurrentMachine.NCType = NCTypes.TPA Then
+            nDec = -3
+         Else
+            Select Case Type
+               Case AxisTypes.LINEAR
+                  nDec = -3
+               Case AxisTypes.ROTATIONAL
+                  nDec = -4
+               Case Else
+                  nDec = 0
+            End Select
+         End If
          Return DoubleToString(m_dValue, nDec)
       End Get
    End Property
 
    Friend Sub SetValue(value As Double)
-      Select Case Type
-         Case AxisTypes.LINEAR
-            m_dValue = value / 1000
-         Case AxisTypes.ROTATIONAL
-            m_dValue = value / 10000
-         Case Else
-            m_dValue = value
-      End Select
+      If CurrentMachine.NCType = NCTypes.TPA Then
+         m_dValue = value
+      Else
+         Select Case Type
+            Case AxisTypes.LINEAR
+               m_dValue = value / 1000
+            Case AxisTypes.ROTATIONAL
+               m_dValue = value / 10000
+            Case Else
+               m_dValue = value
+         End Select
+      End If
       NotifyPropertyChanged(NameOf(sValue))
    End Sub
 

EgtBEAMWALL.Supervisor/CALCPanel/CALCPanelVM.vb

@@ -21,6 +21,8 @@ Public Class CALCPanelVM
    Private m_cmdVerifyAll As ICommand
    Private m_cmdSimulate As ICommand
 
+   Private m_ProcessResultList As New List(Of Integer)
+
 #Region "Messages"
 
    Public ReadOnly Property Verify_ToolTip As String
@@ -58,6 +60,7 @@ Public Class CALCPanelVM
    End Sub
 
    Private Sub Calc_ProcessResult(sender As Object, e As CalcResultEventArgs)
+      m_ProcessResultList.Add(e.m_Result.nBarId)
       ProcessResults(e.m_Result)
       Dim nRawid As Integer = e.m_Result.nBarId
       If nRawid <= 0 Then Return
@@ -69,15 +72,26 @@ Public Class CALCPanelVM
       If e.End_ <> CalcEndEventArgs.Results.OK Then
          MessageBox.Show("Execution error (all processes are disabled)")
       End If
+      ' ciclo sui pezzi
+      Dim bNotOkFound As Boolean = False
+      Dim MachGroupList As List(Of MachGroupVM) = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Where(Function(x) m_ProcessResultList.Contains(x.Id)).ToList()
+      For Each MachGroup As MyMachGroupVM In MachGroupList
+         ' se trovo pezzo errato, resetto tutti i successivi
+         If Not bNotOkFound AndAlso MachGroup.MyMachGroupM.m_nCALC_GlobalState <> CalcStates.OK AndAlso MachGroup.MyMachGroupM.m_nCALC_GlobalState <> CalcStates.INFO Then
+            bNotOkFound = True
+         End If
+         If bNotOkFound Then MachGroup.ResetProduce()
+      Next
+      m_ProcessResultList = New List(Of Integer)
       Map.refProjectVM.ManageIsEnabled(True)
       Map.refMyStatusBarVM.ResetStopProgress()
    End Sub
 
    Private Sub Calc_ProcessEnded(sender As Object, e As CalcProcessEndEventArgs)
-      Dim nRawid As Integer = e.m_Result.nBarId
-      If nRawid <= 0 Then Return
-      Dim Machgroup As MyMachGroupVM = GetMachgroupVMFromMachgroupId(nRawid)
-      Machgroup.CALCEnd()
+      'Dim nRawid As Integer = e.m_Result.nBarId
+      'If nRawid <= 0 Then Return
+      'Dim Machgroup As MyMachGroupVM = GetMachgroupVMFromMachgroupId(nRawid)
+      'Machgroup.CALCEnd()
    End Sub
 
    Private Shared Sub ProcessResults(Bar As Bar)
@@ -337,8 +351,6 @@ Public Class CALCPanelVM
                Case Core.CalcStates.OK, Core.CalcStates.INFO
                   Bar.nCmdType = CalcIntegration.CmdTypes.GENERATE
                Case Else
-                  Dim sMachGroupFilePath As String = Map.refSupervisorManagerVM.CurrProd.sProdDirPath & "\" & MachGroup.Name.ToString() & ".ori.bwe"
-                  If File.Exists(sMachGroupFilePath) Then File.Delete(sMachGroupFilePath)
                   Bar.nCmdType = CalcIntegration.CmdTypes.CHECKGEN
             End Select
             TempBarList(MachGroupIndex) = Bar

EgtBEAMWALL.Supervisor/Comms/TPAComm.vb

@@ -68,7 +68,7 @@ Public Class TPAComm
    Private m_Proxy_ListInfoEventHandler As New ListInfoEventHandler(AddressOf RemoteObject_ListInfoResponse)
    Private m_Proxy_RPCUpdateEventHandler As New RPCUpdateEventHandler(AddressOf RemoteObject_RPCUpdate)
    Private m_Proxy_VariableCommandExecutedEventHandler As New VariableCommandExecutedEventHandler(AddressOf RemoteObject_VariableCommandExecuted)
-   Private m_Proxy_TickUpdateEventHandler As New TickUpdateEventHandler(AddressOf RemoteObject_TickUpdate)
+   'Private m_Proxy_TickUpdateEventHandler As New TickUpdateEventHandler(AddressOf RemoteObject_TickUpdate)
    Private m_Rem_CommandExecutedEventHandler As CommandExecutedEventHandler
    Private m_Rem_ServerErrorEventHandler As ServerErrorEventHandler
    Private m_Rem_AxesCoordinatesUpdateEventHandler As AxesCoordinatesUpdateEventHandler
@@ -77,7 +77,7 @@ Public Class TPAComm
    Private m_Rem_ListInfoEventHandler As ListInfoEventHandler
    Private m_Rem_RPCUpdateEventHandler As RPCUpdateEventHandler
    Private m_Rem_VariableCommandExecutedEventHandler As VariableCommandExecutedEventHandler
-
+   'Private m_Rem_TickUpdateEventHandler As TickUpdateEventHandler
 
    <SecurityPermission(SecurityAction.Demand)>
    Public Sub New(MachManaging As MachManaging)
@@ -110,7 +110,7 @@ Public Class TPAComm
       AddHandler m_eventProxy.ListInfoResponse, m_Proxy_ListInfoEventHandler
       AddHandler m_eventProxy.RPCUpdate, m_Proxy_RPCUpdateEventHandler
       AddHandler m_eventProxy.VariableCommandExecuted, m_Proxy_VariableCommandExecutedEventHandler
-      AddHandler m_eventProxy.TickUpdate, m_Proxy_TickUpdateEventHandler
+      'AddHandler m_eventProxy.TickUpdate, m_Proxy_TickUpdateEventHandler
 
       _remObject = CType(Activator.GetObject(GetType(ISOCNC.Remoting_Server), serverURI), ISOCNC.Remoting_Server)
       Try
@@ -122,6 +122,7 @@ Public Class TPAComm
          m_Rem_ListInfoEventHandler = New ListInfoEventHandler(AddressOf m_eventProxy.LocallyHandleListInfo)
          m_Rem_RPCUpdateEventHandler = New RPCUpdateEventHandler(AddressOf m_eventProxy.LocallyHandleRPCUpdate)
          m_Rem_VariableCommandExecutedEventHandler = New VariableCommandExecutedEventHandler(AddressOf m_eventProxy.LocallyHandleVariableCommandExecuted)
+         'm_Rem_TickUpdateEventHandler = New TickUpdateEventHandler(AddressOf m_eventProxy.LocallyHandleTickUpdate)
          AddHandler _remObject.CommandExecuted, m_Rem_CommandExecutedEventHandler
          AddHandler _remObject.ServerError, m_Rem_ServerErrorEventHandler
          AddHandler _remObject.AxisCoordinatesUpdate, m_Rem_AxesCoordinatesUpdateEventHandler
@@ -130,6 +131,7 @@ Public Class TPAComm
          AddHandler _remObject.ListInfoResponse, m_Rem_ListInfoEventHandler
          AddHandler _remObject.RPCUpdate, m_Rem_RPCUpdateEventHandler
          AddHandler _remObject.VariableCommandExecuted, m_Rem_VariableCommandExecutedEventHandler
+         'AddHandler _remObject.TickUpdate, m_Rem_TickUpdateEventHandler
       Catch ex As System.Runtime.Remoting.RemotingException
          Dim dR As MessageBoxResult = MessageBox.Show(ex.Message)
       End Try
@@ -154,9 +156,10 @@ Public Class TPAComm
       RemoveHandler m_eventProxy.ListInfoResponse, m_Proxy_ListInfoEventHandler
       RemoveHandler m_eventProxy.RPCUpdate, m_Proxy_RPCUpdateEventHandler
       RemoveHandler m_eventProxy.VariableCommandExecuted, m_Proxy_VariableCommandExecutedEventHandler
-      RemoveHandler m_eventProxy.TickUpdate, m_Proxy_TickUpdateEventHandler
+      'RemoveHandler m_eventProxy.TickUpdate, m_Proxy_TickUpdateEventHandler
    End Sub
 
+
    Private Sub RemoteObject_OpStateUpdate(ByVal newOpState As ISOCNC.Remoting.MachineOperatingState)
       ' resetto stato pending iniziale
       If Map.refMachManaging.StartPending AndAlso newOpState = MachineOperatingState.Pending Then
@@ -239,6 +242,7 @@ Public Class TPAComm
    End Sub
 
    Private Sub RemoteObject_TickUpdate(ByVal newTick As ULong)
+      'EgtUILib.EgtOutLog("Tick: " & newTick)
    End Sub
 
 End Class

EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageV.xaml

@@ -243,7 +243,7 @@
                                        SelectionMode="Single"
                                        ScrollViewer.CanContentScroll="True" 
                                        ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                       ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+                                       ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                        Margin="5"
                                        BindingColumns="{Binding VariablesColumns}">
                                 <DataGrid.Resources>
@@ -289,50 +289,6 @@
                     </Grid>
                 </TabItem.Content>
             </TabItem>
-            <TabItem Header="Colonne tabelle">
-                <TabItem.Content>
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="1*"/>
-                            <ColumnDefinition Width="1*"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="1*"/>
-                        </Grid.RowDefinitions>
-                        <EgtBEAMWALL:DGColumnsListV DataContext="{Binding}" 
-                                         ItemsSource="{Binding DGColumnsList}"
-                                         SelectedItem="{Binding SelDGColumn}"
-                                         Grid.Column="0"
-                                         Margin="5">
-                            <DataGrid.GroupStyle>
-                                <GroupStyle>
-                                    <GroupStyle.ContainerStyle>
-                                        <Style TargetType="{x:Type GroupItem}">
-                                            <Setter Property="Template">
-                                                <Setter.Value>
-                                                    <ControlTemplate TargetType="{x:Type GroupItem}">
-                                                        <Expander IsExpanded="True">
-                                                            <Expander.Background>
-                                                                <SolidColorBrush Color="LightGray"></SolidColorBrush>
-                                                            </Expander.Background>
-                                                            <Expander.Header>
-                                                                <StackPanel Orientation="Horizontal">
-                                                                    <TextBlock Text="{Binding Path=Name}" />
-                                                                </StackPanel>
-                                                            </Expander.Header>
-                                                            <ItemsPresenter />
-                                                        </Expander>
-                                                    </ControlTemplate>
-                                                </Setter.Value>
-                                            </Setter>
-                                        </Style>
-                                    </GroupStyle.ContainerStyle>
-                                </GroupStyle>
-                            </DataGrid.GroupStyle>
-                        </EgtBEAMWALL:DGColumnsListV>
-                    </Grid>
-                </TabItem.Content>
-            </TabItem>
         </TabControl>
     
         <Button Command="{Binding SaveCommand}"

EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb

@@ -55,18 +55,6 @@ Public Class ConfigurationPageVM
       End Set
    End Property
 
-   ' lista delle colonne con le relative proprietà della DataGrid
-   Private m_DGColumnsList_View As CollectionView = Nothing
-   Protected m_DGColumnsList As New ObservableCollection(Of IniDataGridColumn)
-   Public Property DGColumnsList As ObservableCollection(Of IniDataGridColumn)
-      Get
-         Return m_DGColumnsList
-      End Get
-      Set(value As ObservableCollection(Of IniDataGridColumn))
-         m_DGColumnsList = value
-      End Set
-   End Property
-
    Protected m_VariablesColumns As New ObservableCollection(Of EgtDataGridColumn)
    Public Property VariablesColumns As ObservableCollection(Of EgtDataGridColumn)
       Get
@@ -252,11 +240,6 @@ Public Class ConfigurationPageVM
             Exit For
          End If
       Next
-      ' carico la lista delle colonne delle DataGrid in ConfigurationPage
-      LoadConfigDGColumns()
-      ' setto il grouping ad 1 livello per la DataGrid
-      m_DGColumnsList_View = CollectionViewSource.GetDefaultView(m_DGColumnsList)
-      m_DGColumnsList_View.GroupDescriptions.Add(New PropertyGroupDescription(NameOf(IniDataGridColumn.VisParentDataGridName)))
       ' carico la lista delle colonne delle variabili della macchina in ConfigurationPage
       GetPrivateProfileColumns(S_VARIABLESLIST, VariablesColumns)
       ' carico le Variables della macchina
@@ -284,7 +267,6 @@ Public Class ConfigurationPageVM
    ''' </summary>
    Public Sub Save()
       WriteVariables()
-      WriteDataGridColumns()
       WriteMainPrivateProfileString(S_GENERAL, K_MESSAGES, m_SelectedLanguage.Name)
       WriteMainPrivateProfileString(S_SCENE, K_MMUNITS, SelMeasureUnit.ToString())
    End Sub
@@ -330,54 +312,8 @@ Public Class ConfigurationPageVM
 
    ' funzione che verifica la modifica dei valori in Configurazione e ne chiede il salvataggio
    Friend Sub VerifyConfigPageModification()
-      ' verifico se i valori delle colonne DataGrid sono stati modificati 
-      For Each DGColumnItem In DGColumnsList
-         If DGColumnItem.IsModified Then
-            If MessageBox.Show(EgtMsg(61882), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
-               ' scrivo i valori delle colonne DataGrid modificate
-               WriteDataGridColumns()
-            Else
-               ' se da non salvare li resetto ed esco dai For
-               LoadConfigDGColumns()
-               Exit For
-            End If
-         End If
-      Next
-   End Sub
+      ' qui veniva verificata solamente la modifica delle proprietà delle colonne delle EgtDataGrid
 
-   ' funzione che carica la DataGrid di configurazione delle colonne delle EgtDataGrid
-   Public Sub LoadConfigDGColumns()
-      DGColumnsList.Clear()
-      GetPrivateProfileIniColumns(S_OPENPROJFILEDLG_PROD, DGColumnsList)
-      GetPrivateProfileIniColumns(S_RAWPARTLIST_SUPERVISOR, DGColumnsList)
-      GetPrivateProfileIniColumns(S_PARTINRAWPARTLIST_SUPERVISOR, DGColumnsList)
-      GetPrivateProfileIniColumns(S_FEATUREINPARTINRAWPARTLIST_SUPERVISOR, DGColumnsList)
-      GetPrivateProfileIniColumns(S_VARIABLESLIST, DGColumnsList)
-   End Sub
-
-   ' funzione per calcolare e scrivere la stringhe dei parametri delle colonne relative ad una ParentDataGridName nell'INI
-   Public Sub SaveDataGridColumns(ParentDataGridName As String, DGColumnsList As ObservableCollection(Of IniDataGridColumn))
-      For Each ColumnItem In DGColumnsList
-         If ColumnItem.ParentDataGridName = ParentDataGridName Then
-            Dim sColumnParams = String.Empty
-            sColumnParams = ColumnItem.Name & "," & If(ColumnItem.CanUserReorder, 1, 0) & "," & If(ColumnItem.CanUserResize, 1, 0) & "," &
-               If(ColumnItem.CanUserSort, 1, 0) & "," & If(ColumnItem.IsReadOnly, 1, 0) & "," & DoubleToString(ColumnItem.Width.Value, 6) & "," &
-               ColumnItem.Width.UnitType & "," & If(ColumnItem.Visible, 1, 0) & "," & If(ColumnItem.CanUserEditVisible, 1, 0)
-            WriteColumnPrivateProfileParam(ParentDataGridName, ColumnItem.m_DisplayIndex, sColumnParams)
-         End If
-      Next
-   End Sub
-
-   ' funzione che scrive i valori delle proprietà delle colonne customizzate delle EgtDataGrid nell'INI
-   Public Sub WriteDataGridColumns()
-      SaveDataGridColumns(S_OPENPROJFILEDLG_PROD, DGColumnsList)
-      SaveDataGridColumns(S_RAWPARTLIST_SUPERVISOR, DGColumnsList)
-      SaveDataGridColumns(S_PARTINRAWPARTLIST_SUPERVISOR, DGColumnsList)
-      SaveDataGridColumns(S_FEATUREINPARTINRAWPARTLIST_SUPERVISOR, DGColumnsList)
-      SaveDataGridColumns(S_VARIABLESLIST, DGColumnsList)
-      For Each DGColumnItem In DGColumnsList
-         DGColumnItem.IsModifiedReset()
-      Next
    End Sub
 
    ' funzione che legge le variabili della macchina dall'INI
@@ -421,239 +357,6 @@ Public Class ConfigurationPageVM
 
 End Class
 
-Public Class IniDataGridColumn
-
-   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
-
-   ' Nome datagrid di cui fa parte la colonna visualizzato nell'interfaccia
-   Public ReadOnly Property VisParentDataGridName As String
-      Get
-         Return ParentDataGridName.Replace(ParentDataGridName.Substring(0, 3), "").Trim()
-      End Get
-   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
-
-   ' Nome colonna visualizzato nell'interfaccia
-   Public ReadOnly Property VisName As String
-      Get
-         Return Name.Replace(Name.Substring(0, 3), "").Trim()
-      End Get
-   End Property
-
-   Private Property m_Width As DataGridLength
-   Public Property Width As DataGridLength
-      Get
-         Return m_Width
-      End Get
-      Set(value As DataGridLength)
-         m_Width = value
-      End Set
-   End Property
-
-   Private m_IsModifiedDisplayIndex
-   Friend Property m_DisplayIndex As Integer
-   Public Property DisplayIndex As Integer
-      Get
-         Return If(Visible, m_DisplayIndex, -1)
-      End Get
-      Set(value As Integer)
-         m_DisplayIndex = value
-         m_IsModifiedDisplayIndex = (m_Name <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.NAME))
-         ' se DisplayIndex viene settato ad un valore che corrisponde a quello che aveva inizialmente aggiorno gli IsModified
-         ' delle altre proprietà utilizzando il DisplayIndex attuale
-         If Not m_IsModifiedDisplayIndex Then
-            m_IsModifiedIsReadOnly = (m_IsReadOnly <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.ISREADONLY))
-            m_IsModifiedCanUserReorder = (m_CanUserReorder <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.REORDER))
-            m_IsModifiedCanUserResize = (m_CanUserResize <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.RESIZE))
-            m_IsModifiedCanUserSort = (m_CanUserSort <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.SORT))
-            m_IsModifiedVisible = (m_Visible <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.VISIBLE))
-         End If
-      End Set
-   End Property
-
-   Private m_IsModifiedIsReadOnly As Boolean = False
-   Private Property m_IsReadOnly As Boolean = True
-   Public Property IsReadOnly As Boolean
-      Get
-         Return m_IsReadOnly
-      End Get
-      Set(value As Boolean)
-         m_IsReadOnly = value
-         m_IsModifiedIsReadOnly = (m_IsReadOnly <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.ISREADONLY))
-      End Set
-   End Property
-
-   Private m_IsModifiedCanUserReorder As Boolean = False
-   Private m_CanUserReorder As Boolean
-   Public Property CanUserReorder As Boolean
-      Get
-         Return m_CanUserReorder
-      End Get
-      Set(value As Boolean)
-         m_CanUserReorder = value
-         m_IsModifiedCanUserReorder = (m_CanUserReorder <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.REORDER))
-      End Set
-   End Property
-
-   Private m_IsModifiedCanUserResize As Boolean = False
-   Private m_CanUserResize As Boolean
-   Public Property CanUserResize As Boolean
-      Get
-         Return m_CanUserResize
-      End Get
-      Set(value As Boolean)
-         m_CanUserResize = value
-         m_IsModifiedCanUserResize = (m_CanUserResize <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.RESIZE))
-      End Set
-   End Property
-
-   Private m_IsModifiedCanUserSort As Boolean = False
-   Private m_CanUserSort As Boolean
-   Public Property CanUserSort As Boolean
-      Get
-         Return m_CanUserSort
-      End Get
-      Set(value As Boolean)
-         m_CanUserSort = value
-         m_IsModifiedCanUserSort = (m_CanUserSort <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.SORT))
-      End Set
-   End Property
-
-   Private m_IsModifiedVisible As Boolean = False
-   Private m_Visible As Boolean
-   Public Property Visible As Boolean
-      Get
-         Return m_Visible
-      End Get
-      Set(value As Boolean)
-         m_Visible = value
-         ' Utilizzo OldDGIndex e NewDGIndex per muovere la Column tra il gruppo dei Visible (in alto) o il gruppo
-         ' dei non Visible (in basso): in ambo i casi verrà sempre spostata in mezzo ai due raggruppamenti
-         Dim OldDGIndex As Integer = Map.refConfigurationPageVM.DGColumnsList.IndexOf(Me)
-         If value Then
-            Dim NewDGIndex As Integer = Map.refConfigurationPageVM.DGColumnsList.IndexOf(Map.refConfigurationPageVM.DGColumnsList.FirstOrDefault(
-                                                                                         Function(x) x.ParentDataGridName = ParentDataGridName AndAlso
-                                                                                         x.Visible = False))
-            ' se NewDGIndex = -1 (ovvero ho settato l'ultima Column rimasta non Visible a Visible) oppure
-            ' se il nuovo indice è subito dopo il vecchio non la sposto altrimenti viene spostata in maniera sbagliata
-            If NewDGIndex <> -1 AndAlso NewDGIndex <> OldDGIndex + 1 Then Map.refConfigurationPageVM.DGColumnsList.Move(OldDGIndex, NewDGIndex)
-         Else
-            Dim NewDGIndex As Integer = Map.refConfigurationPageVM.DGColumnsList.IndexOf(Map.refConfigurationPageVM.DGColumnsList.FirstOrDefault(
-                                                                                         Function(x) x.ParentDataGridName = ParentDataGridName AndAlso
-                                                                                         x.Visible = False AndAlso
-                                                                                         x.Name <> Name))
-            ' se NewDGIndex = -1 vuol dire che erano tutte settate a Visible perciò devo calcolare l'indice
-            ' dell'ultima Column con quel ParentDataGridName e spostarlo lì
-            If NewDGIndex = -1 Then
-               Dim FirstIndex As Integer = Map.refConfigurationPageVM.DGColumnsList.IndexOf(Map.refConfigurationPageVM.DGColumnsList.FirstOrDefault(
-                                                                                         Function(x) x.ParentDataGridName = ParentDataGridName))
-               Dim LastIndex = FirstIndex
-               While LastIndex < Map.refConfigurationPageVM.DGColumnsList.Count AndAlso Map.refConfigurationPageVM.DGColumnsList(LastIndex).ParentDataGridName = ParentDataGridName
-                  LastIndex += 1
-               End While
-               NewDGIndex = LastIndex
-            End If
-            Map.refConfigurationPageVM.DGColumnsList.Move(OldDGIndex, NewDGIndex - 1)
-         End If
-         ' aggiorno i DisplayIndex di ciascuna Column della ParentDataGridName in questione
-         Dim index = 0
-         For Each DGColumnItem In Map.refConfigurationPageVM.DGColumnsList
-            If DGColumnItem.ParentDataGridName = ParentDataGridName Then
-               DGColumnItem.DisplayIndex = index
-               index += 1
-            End If
-         Next
-         ' uso il Move col medesimo valore per i 2 argomenti per refreshare i DisplayIndex delle Column
-         ' della ParentDataGridName in questione appena riordinate
-         For index = 0 To Map.refConfigurationPageVM.DGColumnsList.Count - 1
-            If Map.refConfigurationPageVM.DGColumnsList(index).ParentDataGridName = ParentDataGridName Then
-               Map.refConfigurationPageVM.DGColumnsList.Move(index, index)
-            End If
-         Next
-         ' setto se il valore è stato modificato, a partire dalla verifica che il Nome e DisplayIndex combacino (altrimenti è per forza modificato)
-         m_IsModifiedVisible = (m_Name <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.NAME)) OrElse
-            (If(m_Visible, 1, 0) <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.VISIBLE))
-      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
-      End Set
-   End Property
-
-   Public ReadOnly Property IsModified() As Boolean
-      Get
-         Return m_IsModifiedDisplayIndex OrElse
-            m_IsModifiedIsReadOnly OrElse
-            m_IsModifiedCanUserReorder OrElse
-            m_IsModifiedCanUserResize OrElse
-            m_IsModifiedCanUserSort OrElse
-            m_IsModifiedVisible
-      End Get
-   End Property
-
-   Public Sub IsModifiedReset()
-      m_IsModifiedDisplayIndex = False
-      m_IsModifiedIsReadOnly = False
-      m_IsModifiedCanUserReorder = False
-      m_IsModifiedCanUserResize = False
-      m_IsModifiedCanUserSort = False
-      m_IsModifiedVisible = False
-   End Sub
-
-   Sub New(sName As String)
-      m_Name = sName
-   End Sub
-
-   Sub New(sParentDG As String, nDisplayIndex As Integer, sName As String, bCanUserReorder As Boolean, bCanUserResize As Boolean, bCanUserSort As Boolean, bIsReadOnly As Boolean, Width As DataGridLength, bVisible As Boolean, bCanUserEditVisible As Boolean)
-      m_ParentDataGridName = sParentDG
-      m_DisplayIndex = nDisplayIndex
-      m_Name = sName
-      m_CanUserReorder = bCanUserReorder
-      m_CanUserResize = bCanUserResize
-      m_CanUserSort = bCanUserSort
-      m_IsReadOnly = bIsReadOnly
-      m_Width = Width
-      m_Visible = bVisible
-      m_CanUserEditVisible = bCanUserEditVisible
-   End Sub
-
-End Class
-
 Public Class ConfigVariable
 
    Private m_sName As String
@@ -712,67 +415,3 @@ End Class
 '   LENGTH = 4
 '   CHECKBOX = 5
 'End Enum
-
-Public Module IniDataGridColumnFunctions
-
-   ' funzione per ottenere dal file INI le colonne da caricare nella DataGrid usata per customizzare le proprietà delle colonne delle EgtDataGrid del programma
-   Public Function GetPrivateProfileIniColumns(ParentDGName As String, ByRef ocColumns As ObservableCollection(Of IniDataGridColumn)) 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
-            StringToDouble(sColumnParams(5), Width)
-            Integer.TryParse(sColumnParams(6), WidthType)
-            Dim bVisible As Boolean = sColumnParams(7).Equals("1")
-            Dim bCanUserEditVisible As Boolean = sColumnParams(8).Equals("1")
-            ocColumns.Add(New IniDataGridColumn(ParentDGName, colIndex, sName, bReorder, bResize, bSort, bIsReadOnly, New DataGridLength(Width, WidthType), bVisible, bCanUserEditVisible))
-         End If
-         colIndex += 1
-      End While
-      Return ocColumns.Count > 0
-   End Function
-
-   ' funzione che ottiene dal file INI la singola proprietà legata ad una specifica colonna
-   Public Function GetPrivateProfileIniColumnProperty(ParentDGName As String, ocColumns As ObservableCollection(Of IniDataGridColumn), DisplayIndex As Integer, PropertyIndex As EgtDGColumnProperty) As String
-      Dim str = String.Empty
-      If EgtUILib.GetPrivateProfileString(ParentDGName, DisplayIndex, String.Empty, str, m_sDataGridColumnsIniFile) > 0 Then
-         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
-            If PropertyIndex > -1 AndAlso PropertyIndex < sColumnParams.Count Then Return sColumnParams(PropertyIndex)
-         End If
-      End If
-      Return ""
-   End Function
-
-   Public Enum EgtDGColumnProperty
-      NAME = 0
-      REORDER = 1
-      RESIZE = 2
-      SORT = 3
-      ISREADONLY = 4
-      WIDTH = 5
-      WIDTHTYPE = 6
-      VISIBLE = 7
-      EDITVISIBLE = 8
-   End Enum
-
-End Module

EgtBEAMWALL.Supervisor/ConfigurationPage/DGColumnsListV.xaml

@@ -1,89 +0,0 @@
-<DataGrid x:Class="DGColumnsListV"
-          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-          xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
-          AutoGenerateColumns="False"
-          CanUserSortColumns="False"
-          CanUserResizeColumns="False"
-          CanUserResizeRows="False"
-          CanUserReorderColumns="False"
-          SelectionMode="Single"
-          ScrollViewer.CanContentScroll="False" 
-          ScrollViewer.VerticalScrollBarVisibility="Auto"
-          ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-          Margin="0,0,0,5">
-
-    <DataGrid.Columns>
-        <!--Indice-->
-        <!--<DataGridTextColumn Binding="{Binding DisplayIndex}"
-                            Width="Auto"
-                            IsReadOnly="True">
-            <DataGridTextColumn.HeaderTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding DataContext.DisplayIndex_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                </DataTemplate>
-            </DataGridTextColumn.HeaderTemplate>
-        </DataGridTextColumn>-->
-        <!--Nome colonna-->
-        <DataGridTextColumn Binding="{Binding VisName}"
-                            Width="Auto"
-                            IsReadOnly="True">
-            <DataGridTextColumn.HeaderTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding DataContext.ColumnName_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                </DataTemplate>
-            </DataGridTextColumn.HeaderTemplate>
-        </DataGridTextColumn>
-        <!--CanUserReorder-->
-        <DataGridCheckBoxColumn Binding="{Binding CanUserReorder, UpdateSourceTrigger=PropertyChanged}"
-                                Width="Auto">
-            <DataGridCheckBoxColumn.HeaderTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding DataContext.CanUserReorder_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                </DataTemplate>
-            </DataGridCheckBoxColumn.HeaderTemplate>
-        </DataGridCheckBoxColumn>
-        <!--CanUserResize-->
-        <DataGridCheckBoxColumn Binding="{Binding CanUserResize, UpdateSourceTrigger=PropertyChanged}"
-                                Width="Auto">
-            <DataGridCheckBoxColumn.HeaderTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding DataContext.CanUserResize_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                </DataTemplate>
-            </DataGridCheckBoxColumn.HeaderTemplate>
-        </DataGridCheckBoxColumn>
-        <!--CanUserSort-->
-        <DataGridCheckBoxColumn Binding="{Binding CanUserSort, UpdateSourceTrigger=PropertyChanged}"
-                                Width="Auto">
-            <DataGridCheckBoxColumn.HeaderTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding DataContext.CanUserSort_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                </DataTemplate>
-            </DataGridCheckBoxColumn.HeaderTemplate>
-        </DataGridCheckBoxColumn>
-        <!--IsReadOnly-->
-        <!--<DataGridCheckBoxColumn Binding="{Binding IsReadOnly, UpdateSourceTrigger=PropertyChanged}"
-                                Width="Auto">
-            <DataGridCheckBoxColumn.HeaderTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding DataContext.IsReadOnly_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                </DataTemplate>
-            </DataGridCheckBoxColumn.HeaderTemplate>
-        </DataGridCheckBoxColumn>-->
-        <!--Visible-->
-        <DataGridCheckBoxColumn Binding="{Binding Visible, UpdateSourceTrigger=PropertyChanged}"
-                                Width="Auto">
-            <DataGridCheckBoxColumn.HeaderTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding DataContext.Visible_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                </DataTemplate>
-            </DataGridCheckBoxColumn.HeaderTemplate>
-            <DataGridCheckBoxColumn.CellStyle>
-                <Style TargetType="DataGridCell">
-                    <Setter Property="IsEnabled" Value="{Binding CanUserEditVisible}" />
-                </Style>
-            </DataGridCheckBoxColumn.CellStyle>
-        </DataGridCheckBoxColumn>
-    </DataGrid.Columns>
-
-</DataGrid>

EgtBEAMWALL.Supervisor/ConfigurationPage/DGColumnsListV.xaml.vb

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

EgtBEAMWALL.Supervisor/Constants/ConstMachMsg.vb

@@ -0,0 +1,7 @@
+Module ConstMachMsg
+
+   Public Const MDI_MSG As String = "MDI"
+   Public Const PLC_MSG As String = "PLC"
+   Public Const CNC_MSG As String = "CNC"
+
+End Module

EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj

@@ -235,6 +235,7 @@
     <Compile Include="CALCPanel\CALCPanelVM.vb" />
     <Compile Include="Comms\NUMFlexiumComm.vb" />
     <Compile Include="Comms\TPAComm.vb" />
+    <Compile Include="Constants\ConstMachMsg.vb" />
     <Compile Include="MDIPage\MDIPageV.xaml.vb">
       <DependentUpon>MDIPageV.xaml</DependentUpon>
     </Compile>
@@ -251,9 +252,6 @@
       <DependentUpon>ConfigurationPageV.xaml</DependentUpon>
     </Compile>
     <Compile Include="ConfigurationPage\ConfigurationPageVM.vb" />
-    <Compile Include="ConfigurationPage\DGColumnsListV.xaml.vb">
-      <DependentUpon>DGColumnsListV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Constants\ConstCommVar.vb" />
     <Compile Include="ItemParamList\FeatureInPartInRawPartListV.xaml.vb">
       <DependentUpon>FeatureInPartInRawPartListV.xaml</DependentUpon>
@@ -365,10 +363,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="ConfigurationPage\DGColumnsListV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="ItemParamList\FeatureInPartInRawPartListV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -509,17 +503,6 @@
     <Resource Include="Resources\EgtBEAMWALL.ico" />
     <Resource Include="Resources\TreeView\Folder.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\ProjectManager\DxfOut.png" />
-    <Resource Include="Resources\ProjectManager\Export.png" />
-    <Resource Include="Resources\ProjectManager\Import.png" />
-    <Resource Include="Resources\ProjectManager\New.png" />
-    <Resource Include="Resources\ProjectManager\Open.png" />
-    <Resource Include="Resources\ProjectManager\Options.png" />
-    <Resource Include="Resources\ProjectManager\Save.png" />
-    <Resource Include="Resources\ProjectManager\SaveAs.png" />
-    <Resource Include="Resources\ProjectManager\Send.png" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\ShowPanel\RenderingHL.png" />
     <Resource Include="Resources\ShowPanel\RenderingSH.png" />
@@ -564,6 +547,12 @@
   <ItemGroup>
     <Resource Include="Resources\MDIPage\Send.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ProjectManager\GoToProd.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ProjectManager\Open.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

EgtBEAMWALL.Supervisor/ItemParamList/FeatureInPartInRawPartListV.xaml

@@ -22,7 +22,7 @@
                                 SelectionMode="Single"
                                 ScrollViewer.CanContentScroll="True" 
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
                                 BindingColumns="{Binding FeatureInPartInRawPartColumns}"
                                 Style="{StaticResource DataGrid_CustomHighLight}">

EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListV.xaml

@@ -15,7 +15,7 @@
                                 SelectionMode="Single"
                                 ScrollViewer.CanContentScroll="True" 
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
                                 BindingColumns="{Binding PartInRawPartColumns}"
                                 Style="{StaticResource DataGrid_CustomHighLight}">
@@ -156,6 +156,18 @@
                                          RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
             </DataGridTextColumn.Header>
          </DataGridTextColumn>
+         <!--GRP - Gruppo-->
+         <DataGridTextColumn x:Key="colGROUP" Binding="{Binding sGROUP}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.GRP_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--STOREY - Sottogruppo-->
+         <DataGridTextColumn x:Key="colSTOREY" Binding="{Binding sSTOREY}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.STOREY_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
 
       </DataGrid.Resources>
       <DataGrid.RowStyle>

EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListVM.vb

@@ -113,6 +113,18 @@ Public Class PartInRawPartListVM
       End Get
    End Property
 
+   Public ReadOnly Property GRP_Msg As String
+      Get
+         Return EgtMsg(61624)
+      End Get
+   End Property
+
+   Public ReadOnly Property STOREY_Msg As String
+      Get
+         Return EgtMsg(61623)
+      End Get
+   End Property
+
 #End Region    ' Messages
 
 #Region "CONSTRUCTOR"
@@ -130,6 +142,10 @@ Public Class PartInRawPartListVM
       m_colPartInRawPart_Flip = m_PartInRawPartColumns.FirstOrDefault(Function(x) x.Name = COL_FLIP)
       m_colPartInRawPart_PosX = m_PartInRawPartColumns.FirstOrDefault(Function(x) x.Name = COL_POSX)
       m_colPartInRawPart_PosY = m_PartInRawPartColumns.FirstOrDefault(Function(x) x.Name = COL_POSY)
+      ' aggiorno la visibilità delle colonne
+      For Each col In PartInRawPartColumns
+         col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
+      Next
       ' nascondo colonna redo
       If Not IsNothing(colPartInRawPart_Redo) Then
          colPartInRawPart_Redo.ColumnVisibility = Visibility.Collapsed
@@ -143,6 +159,10 @@ Public Class PartInRawPartListVM
          If Not IsNothing(m_colPartInRawPart_Offset) Then
             m_colPartInRawPart_Offset.ColumnVisibility = Visibility.Visible
          End If
+         ' aggiorno la visibilità delle colonne
+         For Each col In PartInRawPartColumns
+            col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
+         Next
          If Not IsNothing(m_colPartInRawPart_Rot) Then
             m_colPartInRawPart_Rot.ColumnVisibility = Visibility.Collapsed
          End If
@@ -158,9 +178,6 @@ Public Class PartInRawPartListVM
          'PartInRawPartColumns.Clear()
          'GetPrivateProfileColumns(S_PARTINRAWPARTLIST_BEAM, PartInRawPartColumns)
       ElseIf nMachType = MachineType.WALL Then
-         If Not IsNothing(m_colPartInRawPart_Offset) Then
-            m_colPartInRawPart_Offset.ColumnVisibility = Visibility.Collapsed
-         End If
          If Not IsNothing(m_colPartInRawPart_Rot) Then
             m_colPartInRawPart_Rot.ColumnVisibility = Visibility.Visible
          End If
@@ -173,6 +190,13 @@ Public Class PartInRawPartListVM
          If Not IsNothing(m_colPartInRawPart_PosY) Then
             m_colPartInRawPart_PosY.ColumnVisibility = Visibility.Visible
          End If
+         ' aggiorno la visibilità delle colonne
+         For Each col In PartInRawPartColumns
+            col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
+         Next
+         If Not IsNothing(m_colPartInRawPart_Offset) Then
+            m_colPartInRawPart_Offset.ColumnVisibility = Visibility.Collapsed
+         End If
          '   PartInRawPartColumns.Clear()
          'GetPrivateProfileColumns(S_PARTINRAWPARTLIST_WALL, PartInRawPartColumns)
       End If

EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml

@@ -14,7 +14,7 @@
                                 SelectionMode="Single"
                                 ScrollViewer.CanContentScroll="True" 
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
                                 BindingColumns="{Binding RawPartColumns}"
                                 Style="{StaticResource DataGrid_CustomHighLight}">
@@ -82,7 +82,7 @@
             </DataGridTextColumn.Header>
          </DataGridTextColumn>
          <!--MAT - Materiale-->
-         <DataGridTextColumn x:Key="colMATERIAL" Binding="{Binding dL}">
+         <DataGridTextColumn x:Key="colMATERIAL" Binding="{Binding sMATERIAL}">
             <DataGridTextColumn.Header>
                <TextBlock Text="{Binding Path=DataContext.Material_Msg,
                                          RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"/>

EgtBEAMWALL.Supervisor/ItemParamList/RawPartListVM.vb

@@ -97,7 +97,15 @@ Public Class RawPartListVM
          End If
          'RawPartColumns.Clear()
          'GetPrivateProfileColumns(S_RAWPARTLIST_BEAM, RawPartColumns)
+         ' aggiorno la visibilità delle colonne
+         For Each col In RawPartColumns
+            col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
+         Next
       ElseIf nMachType = MachineType.WALL Then
+         ' aggiorno la visibilità delle colonne
+         For Each col In RawPartColumns
+            col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
+         Next
          If Not IsNothing(m_colRawPart_StartCut) Then
             m_colRawPart_StartCut.ColumnVisibility = Visibility.Collapsed
          End If

EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelV.xaml

@@ -14,14 +14,14 @@
       <RowDefinition Height="Auto"/>
       <RowDefinition Height="{Binding GridDims[1].GridLen, Mode=TwoWay}"/>
    </Grid.RowDefinitions>
-   <GroupBox Header="Channel"
+   <GroupBox Header="{Binding Channel_Msg}"
              Visibility="{Binding Channel_Visibility}">
       <ComboBox ItemsSource="{Binding ChannelList}"
                 SelectedItem="{Binding SelChannel}"
                 DisplayMemberPath="Name"/>
    </GroupBox>
 
-   <GroupBox Grid.Row="1" Header="OPMode"
+   <GroupBox Grid.Row="1" Header="{Binding OPMode_Msg}"
              Visibility="{Binding OPMode_Visibility}">
       <ComboBox ItemsSource="{Binding OPModeList}"
                 SelectedItem="{Binding SelOPMode}"
@@ -45,47 +45,45 @@
       <StackPanel Grid.Row="0"
                Orientation="Horizontal"
                HorizontalAlignment="Right">
-         <Button ToolTip="˄"
-              Command="{Binding MoveUpRawPart_Command}"
-              IsEnabled="{Binding MoveRawPart_IsEnabled}"
-              Style="{StaticResource LeftPanel_Button}">
+         <Button Command="{Binding MoveUpRawPart_Command}"
+                 IsEnabled="{Binding MoveRawPart_IsEnabled}"
+                 Style="{StaticResource LeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/MoveUp.png" Stretch="Uniform"/>
          </Button>
-         <Button ToolTip="˅"
-              Command="{Binding MoveDownRawPart_Command}"
-              IsEnabled="{Binding MoveRawPart_IsEnabled}"
-              Style="{StaticResource LeftPanel_Button}">
+         <Button Command="{Binding MoveDownRawPart_Command}"
+                 IsEnabled="{Binding MoveRawPart_IsEnabled}"
+                 Style="{StaticResource LeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/MoveDown.png" Stretch="Uniform"/>
          </Button>
-         <Button ToolTip="P"
-              Command="{Binding ProduceAll_Command}"
-              IsEnabled="{Binding LeftPanel_IsEnabled}"
-              Style="{StaticResource LeftPanel_Button}">
+         <Button ToolTip="{Binding ProduceAll_ToolTip}"
+                 Command="{Binding ProduceAll_Command}"
+                 IsEnabled="{Binding LeftPanel_IsEnabled}"
+                 Style="{StaticResource LeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/ProduceAll.png" Stretch="Uniform"/>
          </Button>
-         <Button ToolTip="D"
-              Command="{Binding DoneRawPart_Command}"
-              IsEnabled="{Binding DoneRawPart_IsEnabled}"
-              Style="{StaticResource LeftPanel_Button}">
+         <Button ToolTip="{Binding DoneRawPart_ToolTip}"
+                 Command="{Binding DoneRawPart_Command}"
+                 IsEnabled="{Binding DoneRawPart_IsEnabled}"
+                 Style="{StaticResource LeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/DoneRawPart.png" Stretch="Uniform"/>
          </Button>
-         <Button ToolTip="R"
-              Command="{Binding ResetRawPart_Command}"
-              IsEnabled="{Binding ResetRawPart_IsEnabled}"
-              Style="{StaticResource LeftPanel_Button}">
+         <Button ToolTip="{Binding ResetRawPart_ToolTip}"
+                 Command="{Binding ResetRawPart_Command}"
+                 IsEnabled="{Binding ResetRawPart_IsEnabled}"
+                 Style="{StaticResource LeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/ResetRawPart.png" Stretch="Uniform"/>
          </Button>
-         <Button ToolTip="-"
-              Command="{Binding DeleteRawPart_Command}"
-              IsEnabled="{Binding DeleteRawPart_IsEnabled}"
-              Style="{StaticResource LeftPanel_Button}">
+         <Button ToolTip="{Binding DeleteRawPart_ToolTip}"
+                 Command="{Binding DeleteRawPart_Command}"
+                 IsEnabled="{Binding DeleteRawPart_IsEnabled}"
+                 Style="{StaticResource LeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/DeleteRawPart.png" Stretch="Uniform"/>
          </Button>
       </StackPanel>
 
       <EgtBEAMWALL:RawPartListV Grid.Row="1"
-                             DataContext="{StaticResource RawPartListVM}"
-                             Tag="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"/>
+                                DataContext="{StaticResource RawPartListVM}"
+                                Tag="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"/>
    </Grid>
 
    <GridSplitter Height="3" HorizontalAlignment="Stretch" Grid.Row="5" ResizeDirection="Rows" ResizeBehavior="PreviousAndNext"/>
@@ -98,14 +96,14 @@
       <StackPanel Grid.Row="0"
                Orientation="Horizontal"
                HorizontalAlignment="Right">
-         <Button ToolTip="P"
+         <Button ToolTip="{Binding PrintLabel_ToolTip}"
                  Command="{Binding PrintLabel_Command}"
                  IsEnabled="{Binding LeftPanel_IsEnabled}"
                  Visibility="{Binding PrintLabel_Visibility}"
                  Style="{StaticResource LeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/PrintLabel.png" Stretch="Uniform"/>
          </Button>
-         <Button ToolTip="D"
+         <Button ToolTip="{Binding DonePart_ToolTip}"
                  Command="{Binding DonePart_Command}"
                  IsEnabled="{Binding LeftPanel_IsEnabled}"
                  Visibility="{Binding DonePart_Visibility}"

EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb

@@ -98,6 +98,14 @@ Public Class LeftPanelVM
       End Set
    End Property
    Friend Sub SetOPMode(value As OPState)
+      ' se MDI
+      If value.Id = OPModes.Mdi Then
+         ' mostro pagina comandi MDI
+         Map.refProjectVM.SetSelTabPage(ProjectVM.TabPages.MDI)
+      Else
+         ' mostro scena
+         Map.refProjectVM.SetSelTabPage(ProjectVM.TabPages.SCENE)
+      End If
       m_SelOPMode = value
       NotifyPropertyChanged(NameOf(SelOPMode))
    End Sub
@@ -147,7 +155,7 @@ Public Class LeftPanelVM
 
    Public ReadOnly Property MoveRawPart_IsEnabled As Boolean
       Get
-         If IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM) Then
+         If IsNothing(Map.refProjectVM) OrElse IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM) Then
             Return False
          ElseIf m_SelOPState.Id <> OPStates.End AndAlso m_SelOPState.Id <> OPStates.Unspecified Then
             Return False
@@ -164,7 +172,7 @@ Public Class LeftPanelVM
 
    Public ReadOnly Property DoneRawPart_IsEnabled As Boolean
       Get
-         If IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM) Then
+         If IsNothing(Map.refProjectVM) OrElse IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM) Then
             Return False
          ElseIf m_SelOPState.Id <> OPStates.End AndAlso m_SelOPState.Id <> OPStates.Unspecified Then
             Return False
@@ -172,7 +180,7 @@ Public Class LeftPanelVM
             Return False
          ElseIf Not IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM.SelectedMachGroup) Then
             Dim SelMachgroup As MyMachGroupVM = DirectCast(Map.refProjectVM.SupervisorMachGroupPanelVM.SelectedMachGroup, MyMachGroupVM)
-            Return SelMachgroup.nProduction_State <= ItemState.Confirmed
+            Return SelMachgroup.nProduction_State <= ItemState.WIP
          Else
             Return m_LeftPanel_IsEnabled
          End If
@@ -181,7 +189,7 @@ Public Class LeftPanelVM
 
    Public ReadOnly Property ResetRawPart_IsEnabled As Boolean
       Get
-         If IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM) Then
+         If IsNothing(Map.refProjectVM) OrElse IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM) Then
             Return False
          ElseIf m_SelOPState.Id <> OPStates.End AndAlso m_SelOPState.Id <> OPStates.Unspecified Then
             Return False
@@ -198,7 +206,7 @@ Public Class LeftPanelVM
 
    Public ReadOnly Property DeleteRawPart_IsEnabled As Boolean
       Get
-         If IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM) Then
+         If IsNothing(Map.refProjectVM) OrElse IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM) Then
             Return False
          ElseIf m_SelOPState.Id <> OPStates.End AndAlso m_SelOPState.Id <> OPStates.Unspecified Then
             Return False
@@ -234,10 +242,63 @@ Public Class LeftPanelVM
 
    Public ReadOnly Property DonePart_Visibility As Visibility
       Get
+         ' per test -> 'Return Visibility.Visible
          Return If(Not IsNothing(Map.refSupervisorManagerVM.CurrProd) AndAlso Map.refSupervisorManagerVM.CurrProd.nType = BWType.BEAM, Visibility.Visible, Visibility.Collapsed)
       End Get
    End Property
 
+#Region "Messages"
+
+   Public ReadOnly Property Channel_Msg As String
+      Get
+         Return EgtMsg(62501)
+      End Get
+   End Property
+
+   Public ReadOnly Property OPMode_Msg As String
+      Get
+         Return EgtMsg(62502)
+      End Get
+   End Property
+
+   Public ReadOnly Property ProduceAll_ToolTip As String
+      Get
+         Return EgtMsg(62503)
+      End Get
+   End Property
+
+   Public ReadOnly Property DoneRawPart_ToolTip As String
+      Get
+         Return EgtMsg(62504)
+      End Get
+   End Property
+
+   Public ReadOnly Property ResetRawPart_ToolTip As String
+      Get
+         Return EgtMsg(62505)
+      End Get
+   End Property
+
+   Public ReadOnly Property DeleteRawPart_ToolTip As String
+      Get
+         Return EgtMsg(62506)
+      End Get
+   End Property
+
+   Public ReadOnly Property PrintLabel_ToolTip As String
+      Get
+         Return EgtMsg(62507)
+      End Get
+   End Property
+
+   Public ReadOnly Property DonePart_ToolTip As String
+      Get
+         Return EgtMsg(62508)
+      End Get
+   End Property
+
+#End Region    ' Messages
+
    ' Definizione comandi
    Private m_cmdDeleteRawPart As ICommand
    Private m_cmdMoveUpRawPart As ICommand
@@ -349,9 +410,6 @@ Public Class LeftPanelVM
             m_OPModeList = New List(Of OPState) From {
                                                          New OPState("Manual", OPModes.Manual)
             }
-            ' imposto stato manuale
-            Dim ManualMode As OPState = m_OPModeList.FirstOrDefault(Function(x) x.Id = OPModes.Manual)
-            SetOPState(ManualMode)
          Case NCTypes.NUM_FLEXIUM
             m_OPModeList = New List(Of OPState) From {
                                                          New OPState("Auto", OPModes.Auto),
@@ -392,8 +450,9 @@ Public Class LeftPanelVM
    ''' </summary>
    Public Sub ProduceAll()
       If IsNothing(Map.refSupervisorManagerVM.CurrProd) Then Return
-      If IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Count = 0) Then Return
-      If Not Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Any(Function(x As MyMachGroupVM) x.nProduction_State <= 1) Then Return
+      If IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList) OrElse Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Count = 0 Then Return
+      If Not Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Any(Function(x As MyMachGroupVM) x.nProduction_State <= ItemState.Confirmed) Then Return
+      If Not Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Any(Function(x As MyMachGroupVM) x.dtStartTime = DateTime.MinValue) Then Return
       Dim ToDoList As List(Of MachGroupVM) = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Where(Function(x As MyMachGroupVM) x.nProduction_State <= 1 AndAlso Not x.bResetWhileCutting AndAlso x.dtStartTime = DateTime.MinValue AndAlso Not x.bToBeProduced).ToList()
       If Not IsNothing(ToDoList) AndAlso ToDoList.Count > 0 Then
          MyMachGroupVM.Produce(ToDoList)
@@ -422,14 +481,23 @@ Public Class LeftPanelVM
    Public Sub DoneRawPart()
       If IsNothing(Map.refSupervisorManagerVM.CurrProd) Then Return
       If IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM.SelectedMachGroup) Then Return
-      If (Not IsNothing(Map.refMachManaging) AndAlso Map.refMachManaging.bConnected AndAlso m_SelOPState.Id <> OPStates.End) OrElse
-         Map.refSupervisorMachGroupPanelVM.MachGroupVMList.Any(Function(x As MyMachGroupVM) x.bToBeProduced) Then Return
       Dim SelMachGroup As MyMachGroupVM = Map.refProjectVM.SupervisorMachGroupPanelVM.SelectedMachGroup
+      If (Not IsNothing(Map.refMachManaging) AndAlso Map.refMachManaging.bConnected AndAlso m_SelOPState.Id <> OPStates.End) OrElse
+         Map.refSupervisorMachGroupPanelVM.MachGroupVMList.Any(Function(x As MyMachGroupVM) (x.bToBeProduced AndAlso x.Id <> SelMachGroup.Id) OrElse
+                                                                                            (x.nProduction_State = ItemState.WIP AndAlso x.Id <> SelMachGroup.Id) OrElse
+                                                                                            (x.dtStartTime <> DateTime.MinValue AndAlso x.dtEndTime = DateTime.MinValue AndAlso x.Id <> SelMachGroup.Id)) Then Return
       ' scrivo tutti pezzi completati
       For PartIndex = 0 To SelMachGroup.PartVMList.Count - 1
          Dim Part As PartVM = SelMachGroup.PartVMList(PartIndex)
          SetDonePart(SelMachGroup, Part)
       Next
+      ' riseleziono il gruppo
+      Map.refSupervisorMachGroupPanelVM.SelectedMachGroup = SelMachGroup
+      ' aggiorno bottoni
+      NotifyPropertyChanged(NameOf(DeleteRawPart_IsEnabled))
+      NotifyPropertyChanged(NameOf(DoneRawPart_IsEnabled))
+      NotifyPropertyChanged(NameOf(MoveRawPart_IsEnabled))
+      NotifyPropertyChanged(NameOf(ResetRawPart_IsEnabled))
       ' se avanzamento singolo, sblocco produzione di tutti gli altri
       If CurrentMachine.Flow = FlowTypes.ONEBYONE Then
          MyMachGroupVM.UpdateProduceIsEnabledForAll()
@@ -517,32 +585,13 @@ Public Class LeftPanelVM
       DbControllers.m_MachGroupController.UpdateOrder(Map.refSupervisorManagerVM.CurrProd.nProdId, SelMachGroup.Id, SelMachGroup.nProductionIndex)
       Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Move(OldIndex, NewIndex - 1)
 
-
-
-
-      '' scrivo tutti pezzi completati
-      'For PartIndex = 0 To SelMachGroup.PartVMList.Count - 1
-      '   Dim Part As PartVM = SelMachGroup.PartVMList(PartIndex)
-      '   ' reset start, end e stato pezzo
-      '   DbControllers.m_PartController.UpdateStart(Map.refSupervisorManagerVM.CurrProd.nProdId, SelMachGroup.Id, Part.nPartId, DateTime.MinValue)
-      '   DbControllers.m_PartController.UpdateEnd(Map.refSupervisorManagerVM.CurrProd.nProdId, SelMachGroup.Id, Part.nPartId, DateTime.MinValue)
-      '   DbControllers.m_PartController.UpdateStatus(Map.refSupervisorManagerVM.CurrProd.nProdId, SelMachGroup.Id, Part.nPartId, ItemState.ND)
-      '   Part.dtStartTime = DateTime.MinValue
-      '   Part.dtEndTime = DateTime.MinValue
-      '   Part.nProduction_State = ItemState.ND
-
-      '   Part.NotifyPropertyChanged(NameOf(Part.Production_Background))
-      'Next
-      '' reset start, end e stato MachGroup
-      'DbControllers.m_MachGroupController.UpdateStart(Map.refSupervisorManagerVM.CurrProd.nProdId, SelMachGroup.Id, Time)
-      'DbControllers.m_MachGroupController.UpdateEnd(Map.refSupervisorManagerVM.CurrProd.nProdId, SelMachGroup.Id, Time)
-      'DbControllers.m_MachGroupController.UpdateStatus(Map.refSupervisorManagerVM.CurrProd.nProdId, SelMachGroup.Id, ItemState.WIP)
-      'SelMachGroup.dtStartTime = DateTime.MinValue
-      'SelMachGroup.dtEndTime = DateTime.MinValue
-      'SelMachGroup.nProduction_State = ItemState.ND
-      'SelMachGroup.NotifyPropertyChanged(NameOf(SelMachGroup.Production_Background))
-      'SelMachGroup.NotifyPropertyChanged(NameOf(SelMachGroup.Produce_IsEnabled))
-
+      ' riseleziono il gruppo
+      Map.refSupervisorMachGroupPanelVM.SelectedMachGroup = SelMachGroup
+      ' aggiorno bottoni
+      NotifyPropertyChanged(NameOf(DeleteRawPart_IsEnabled))
+      NotifyPropertyChanged(NameOf(DoneRawPart_IsEnabled))
+      NotifyPropertyChanged(NameOf(MoveRawPart_IsEnabled))
+      NotifyPropertyChanged(NameOf(ResetRawPart_IsEnabled))
       ' se avanzamento singolo, sblocco produzione di tutti gli altri
       If CurrentMachine.Flow = FlowTypes.ONEBYONE Then
          MyMachGroupVM.UpdateProduceIsEnabledForAll()
@@ -635,10 +684,15 @@ Public Class LeftPanelVM
          For Each Part In SelMachGroup.PartVMList
             DbControllers.m_PartController.UpdateStatus(Map.refSupervisorManagerVM.CurrProd.nProdId, SelMachGroup.Id, Part.nPartId, ItemState.ND)
          Next
+         Dim nRemovedIndex As Integer = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.IndexOf(SelMachGroup)
          ' se rimozione da Db ok, lo rimuovo da lista
          Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Remove(SelMachGroup)
          If Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Count = 0 Then
+            EgtResetCurrMachGroup()
             ManageBTLParts.HideAll()
+         Else
+            If nRemovedIndex >= Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Count Then nRemovedIndex = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Count - 1
+            Map.refProjectVM.SupervisorMachGroupPanelVM.SelectedMachGroup = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList(nRemovedIndex)
          End If
       End If
    End Sub
@@ -727,6 +781,13 @@ Public Class LeftPanelVM
             MachGroup.nProduction_State = ItemState.Produced
             MachGroup.NotifyPropertyChanged(NameOf(MachGroup.Production_Background))
             MachGroup.NotifyPropertyChanged(NameOf(MachGroup.Produce_IsEnabled))
+            ' reset delle variabili di invio alla macchina
+            MachGroup.ResetProduce()
+            ' aggiorno bottoni
+            NotifyPropertyChanged(NameOf(DeleteRawPart_IsEnabled))
+            NotifyPropertyChanged(NameOf(DoneRawPart_IsEnabled))
+            NotifyPropertyChanged(NameOf(MoveRawPart_IsEnabled))
+            NotifyPropertyChanged(NameOf(ResetRawPart_IsEnabled))
             ' se avanzamento singolo, sblocco produzione di tutti gli altri
             If CurrentMachine.Flow = FlowTypes.ONEBYONE Then
                MyMachGroupVM.UpdateProduceIsEnabledForAll()

EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml

@@ -17,7 +17,7 @@
                                    SelectionMode="Single"
                                    ScrollViewer.CanContentScroll="True" 
                                    ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                   ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+                                   ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                    Margin="0,0,0,5"
                                    BindingColumns="{Binding MDICommandColumns}"
                                    Style="{StaticResource DataGrid_CustomHighLight}">

EgtBEAMWALL.Supervisor/MDIPage/MDIPageVM.vb

@@ -112,7 +112,7 @@ Public Class MDIPageVM
          If MDICommand.Length() >= 2 Then
             Dim nDescription As Integer
             If Integer.TryParse(MDICommand(1), nDescription) Then
-               MDICommand(1) = EgtMsg(nDescription)
+               MDICommand(1) = MachMsg(MsgParagraphs.MDI, nDescription)
             End If
             MDICommandList.Add(New MDICommand(MDICommand(0), MDICommand(1)))
          End If

EgtBEAMWALL.Supervisor/MachCommandMessagePanel/MachCommandMessagePanelVM.vb

@@ -141,6 +141,8 @@ Public Class MachCommandMessagePanelVM
    '   End Get
    'End Property
 
+   Friend bMsgTranslationActive As Boolean = False
+
    Private m_ErrCycle As New List(Of Alarm)
    Private m_ErrCycleCount As Integer = 0
    Public ReadOnly Property sErrCycle As String
@@ -234,6 +236,7 @@ Public Class MachCommandMessagePanelVM
          Return If(CurrentMachine.NCType = NCTypes.TPA, Visibility.Visible, Visibility.Collapsed)
       End Get
    End Property
+
    ' definizione comandi
    Private m_cmdConnect As ICommand
    Private m_cmdDisconnect As ICommand
@@ -518,6 +521,9 @@ Public Class MachCommandMessagePanelVM
                _Connected = True
                NotifyPropertyChanged(NameOf(Connect_Background))
                If ResultType = ResultTypes.EXECUTED Then
+                  ' avvio tick di comunicazione con la macchina
+                  MachineCommThread.StartTick()
+                  ' inizializzo variabili
                   Init()
                End If
             End If
@@ -546,9 +552,9 @@ Public Class MachCommandMessagePanelVM
       Select Case AlarmType
          Case CInt(ISOCNC.Remoting.AlarmType.Cycle)
             If AlarmOperation = CInt(ISOCNC.Remoting.AlarmOperation.Addition) Then
-               m_ErrCycle.Add(Alarm.CreateAlarm(AlarmCode, AlarmMessage))
+               m_Iso.Add(Alarm.CreateAlarm(AlarmCode, AlarmMessage))
             Else
-               m_ErrCycle.RemoveAll(Function(x) x.sCode = AlarmCode)
+               m_Iso.RemoveAll(Function(x) x.sCode = AlarmCode)
                'Dim ToRemove As Alarm = m_ErrCycle.FirstOrDefault(Function(x) x.sCode = AlarmCode)
                'If Not IsNothing(ToRemove) Then
                '   m_ErrCycle.Remove(ToRemove)
@@ -556,9 +562,9 @@ Public Class MachCommandMessagePanelVM
             End If
          Case CInt(ISOCNC.Remoting.AlarmType.ISO)
             If AlarmOperation = CInt(ISOCNC.Remoting.AlarmOperation.Addition) Then
-               m_Iso.Add(Alarm.CreateAlarm(AlarmCode, AlarmMessage))
+               m_ErrSystem.Add(Alarm.CreateAlarm(AlarmCode, AlarmMessage))
             Else
-               m_Iso.RemoveAll(Function(x) x.sCode = AlarmCode)
+               m_ErrSystem.RemoveAll(Function(x) x.sCode = AlarmCode)
                'Dim ToRemove As Alarm = m_Iso.FirstOrDefault(Function(x) x.sCode = AlarmCode)
                'If Not IsNothing(ToRemove) Then
                '   m_Iso.Remove(ToRemove)
@@ -577,9 +583,9 @@ Public Class MachCommandMessagePanelVM
          Case CInt(ISOCNC.Remoting.AlarmType.None)
          Case CInt(ISOCNC.Remoting.AlarmType.System)
             If AlarmOperation = CInt(ISOCNC.Remoting.AlarmOperation.Addition) Then
-               m_ErrSystem.Add(Alarm.CreateAlarm(AlarmCode, AlarmMessage))
+               m_ErrCycle.Add(Alarm.CreateAlarm(AlarmCode, AlarmMessage))
             Else
-               m_ErrSystem.RemoveAll(Function(x) x.sCode = AlarmCode)
+               m_ErrCycle.RemoveAll(Function(x) x.sCode = AlarmCode)
                'Dim ToRemove As Alarm = m_ErrSystem.FirstOrDefault(Function(x) x.sCode = AlarmCode)
                'If Not IsNothing(ToRemove) Then
                '   m_ErrSystem.Remove(ToRemove)
@@ -665,6 +671,13 @@ Public Class MachCommandMessagePanelVM
               NUM_ErrorTypes.PLC_Message_Reaction_Class_6,
               NUM_ErrorTypes.PLC_Message_Reaction_Class_7,
               NUM_ErrorTypes.PLC_Message_Reaction_Class_8
+            Dim sErrorMessage As String = ErrorMessage
+            If bMsgTranslationActive Then
+               Dim sTranslatedMsg = MachMsg(MsgParagraphs.PLC, nErrorNumber)
+               If Not String.IsNullOrWhiteSpace(sTranslatedMsg) Then
+                  sErrorMessage = sTranslatedMsg
+               End If
+            End If
             ErrorNumberMsg = "PLC"
             ErrorTypMsg = "Classe"
             AlarmMessage = If(nErrorIndex <> 0, ErrorIndexMsg & ": " & nErrorIndex & " - ", "") &
@@ -672,7 +685,7 @@ Public Class MachCommandMessagePanelVM
                            If(nErrorExtNumber <> 0, " - " & ErrorExtNumberMsg & ": " & nErrorExtNumber, "") &
                            ErrorTypMsg & ": " & nErrorTyp - 5 &
                            If(nErrorLine <> 0, " - " & ErrorLineMsg & ": " & nErrorLine, "") &
-                           " " & ErrorMessage & If(nErrorAdditional <> 0, " - " & ErrorAdditionalMsg & ": " & nErrorAdditional, "")
+                           " " & sErrorMessage & If(nErrorAdditional <> 0, " - " & ErrorAdditionalMsg & ": " & nErrorAdditional, "")
          Case NUM_ErrorTypes.HMI_Message
          Case NUM_ErrorTypes.RTS_Message
          Case NUM_ErrorTypes.Drive_Warning

EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupPanelVM.vb

@@ -88,7 +88,7 @@ Public Class MyMachGroupPanelVM
       ' Imposto vista solo tavola
       EgtSetMachineLook(MCH_LOOK.TAB)
       Map.refFeatureInPartInRawPartListVM.SetFeatureListVisibility(SelMachGroup.bResetWhileCutting)
-      Core.ViewPanelVM.BWSetView(VT.TOP, False)
+      Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
       EgtZoom(ZM.ALL)
       Return True
    End Function

EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb

@@ -106,6 +106,7 @@ Public Class MyMachGroupVM
          CurrMachGroup.NotifyPropertyChanged(NameOf(CurrMachGroup.Produce_IsEnabled))
       Next
    End Sub
+
 #End Region    ' Machgroup
 
 #Region "Parts"
@@ -123,7 +124,19 @@ Public Class MyMachGroupVM
    End Sub
 
    Public Overrides Sub RefreshPartList()
-
+      If nType = BWType.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)
+            StringToDouble(sSplitInfo(1), MyMachGroupM.dStartCut)
+         Else
+            MyMachGroupM.dStartCut = 0
+         End If
+      End If
    End Sub
 
 #End Region    ' Parts
@@ -133,8 +146,13 @@ Public Class MyMachGroupVM
    Public Overrides Sub CALCEnd()
       ' aggiorno stato per lancio in macchina
       If MyMachGroupM.m_nCALC_GlobalState = Core.CalcStates.OK OrElse MyMachGroupM.m_nCALC_GlobalState = Core.CalcStates.INFO Then
-         m_bCNReCalculated = True
-         NotifyPropertyChanged(NameOf(Production_Background))
+         If m_bToBeProduced AndAlso Not m_bCNReCalculated Then
+            m_bCNReCalculated = True
+            NotifyPropertyChanged(NameOf(Production_Background))
+         End If
+      Else
+         ResetProduce()
+         UpdateProduceIsEnabledForAll()
       End If
    End Sub
 
@@ -271,6 +289,11 @@ Public Class MyMachGroupVM
       For Each MachGroup As MyMachGroupVM In MachGroupList
          ' cerco primo indice di pezzo non in produzione
          Dim NewIndex As Integer = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.IndexOf(Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.FirstOrDefault(Function(x) DirectCast(x, MyMachGroupVM).dtStartTime = DateTime.MinValue AndAlso DirectCast(x, MyMachGroupVM).bToBeProduced = False))
+         ' se pezzo da produrre gia' iniziato
+         If MachGroup.dtStartTime <> DateTime.MinValue Then
+            ' decremento indice di 1
+            NewIndex -= 1
+         End If
          ' segno pezzo da produrre
          MachGroup.m_bToBeProduced = True
          MachGroup.NotifyPropertyChanged(NameOf(MachGroup.Production_Background))
@@ -368,7 +391,7 @@ Public Class MyMachGroupVM
          BeamMachGroup.MyMachGroupM.RefreshGroupData()
          ''' aggiorno dati utilizzo barra
          ''BeamMachGroup.UpdateUsage()
-         Core.ViewPanelVM.BWSetView(VT.TOP, False)
+         Core.ViewPanelVM.BWSetView(VT.ISO_SW, False)
          ' salvo nuovo grezzo nel progetto
          Map.refSupervisorManagerVM.Save()
          ' segno pezzi non completati come scrap

EgtBEAMWALL.Supervisor/MachGroupPanel/PartVM.vb

@@ -32,6 +32,15 @@ Public Class PartVM
       NotifyPropertyChanged(NameOf(bDO))
    End Sub
 
+   Public Property bFLIP As Boolean
+      Get
+         Return m_PartM.nFLIP <> 0
+      End Get
+      Set(value As Boolean)
+         Return
+      End Set
+   End Property
+
 #End Region    ' Supervisor
 
 #End Region    ' FIELDS & PROPERTIES

EgtBEAMWALL.Supervisor/MachGroupPanel/SupervisorMachGroupPanelVM.vb

@@ -12,6 +12,9 @@ Public Class SupervisorMachGroupPanelVM
 
 #Region "FIELDS & PROPERTIES"
 
+   Private m_ReloadProj_Timer As New DispatcherTimer
+   Private m_bReloadProj As Boolean = False
+
    ' lock per aggiunta elemento a lista MachGroup
    Private m_Lock_AddMachGroup As New Object
 
@@ -37,8 +40,8 @@ Public Class SupervisorMachGroupPanelVM
       Map.SetRefSupervisorMachGroupPanelVM(Me)
       BindingOperations.EnableCollectionSynchronization(m_MachGroupVMList, m_Lock_AddMachGroup)
       m_ReloadProj_Timer.Interval = TimeSpan.FromMilliseconds(500)
-      m_ReloadProj_Timer.Start()
       AddHandler m_ReloadProj_Timer.Tick, AddressOf ReloadProject_Tick
+      m_ReloadProj_Timer.Start()
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -56,9 +59,6 @@ Public Class SupervisorMachGroupPanelVM
       MachGroup.NotifyPropertyChanged(NameOf(MachGroup.Produce_IsEnabled))
    End Sub
 
-   Private m_bReloadProj As Boolean = False
-   Private m_ReloadProj_Timer As New DispatcherTimer
-
    Public Sub ReloadProjectFile()
       m_bReloadProj = True
    End Sub

EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb

@@ -403,6 +403,14 @@ Public Class MachManaging
                         Part.NotifyPropertyChanged(NameOf(Part.nProduction_State))
                         ' resetto stato redo
                         Part.bRedo = False
+                        ' se non impostata data start
+                        If Part.dtStartTime = DateTime.MinValue Then
+                           ' scrivo data start su Db pezzo
+                           Dim dtStart As DateTime = Part.dtEndTime - TimeSpan.FromSeconds(60)
+                           DbControllers.m_PartController.UpdateStart(nP_Prod, nP_Machgroup, Part.nPartId, dtStart)
+                           Part.dtStartTime = dtStart
+                        End If
+
                      Next
                   Else
                      ' scrivo data end su Db pezzo
@@ -417,12 +425,6 @@ Public Class MachManaging
                      ' resetto stato redo
                      Part.bRedo = False
                   End If
-                  'Select Case CurrentMachine.NCType
-                  '   Case NCTypes.TPA
-                  '      Tpa.RWVariableManager.WriteVar(P_STATE, 0)
-                  '   Case NCTypes.NUM_FLEXIUM
-                  '      StateVariable.sValue = "0"
-                  'End Select
 
                   ' se tutti i pezzi della barra sono in end
                   If MachGroup.PartVMList.All(Function(x) x.nProduction_State >= 2) Then
@@ -438,15 +440,24 @@ Public Class MachManaging
                      MachGroupVariable.sValue = "0"
                      PartVariable.sValue = "0"
                      StateVariable.sValue = "0"
-                     ' azzero variabile per far ripartire macchina
-                     'Select Case CurrentMachine.NCType
-                     '   'Case NCTypes.TPA
-                     '   '   Tpa.RWVariableManager.WriteVar(P_PROD, 0)
-                     '   '   Tpa.RWVariableManager.WriteVar(P_MACHGROUP, 0)
-                     '   '   Tpa.RWVariableManager.WriteVar(P_PART, 0)
-                     '   '   Tpa.RWVariableManager.WriteVar(P_STATE, 0)
-                     'End Select
 
+                     ' se non impostata data start
+                     If MachGroup.dtStartTime = DateTime.MinValue Then
+                        EgtOutLog("Start date not set on Prod " & nP_Prod & " Machgroup " & nP_Machgroup)
+                        Dim dtStart As DateTime = MachGroup.dtEndTime - TimeSpan.FromSeconds(60)
+                        ' provo a recuperare tempo stimato
+                        If MachGroup.nCALC_TIME > 0 Then
+                           Dim MinPartStart As DateTime = MachGroup.PartVMList.Min(Function(x) x.dtStartTime)
+                           If MinPartStart > DateTime.MinValue Then
+                              dtStart = New DateTime(Math.Min((MachGroup.dtEndTime - TimeSpan.FromSeconds(MachGroup.nCALC_TIME)).Ticks, MinPartStart.Ticks))
+                           Else
+                              dtStart = MachGroup.dtEndTime - TimeSpan.FromSeconds(MachGroup.nCALC_TIME)
+                           End If
+                        End If
+                        ' scrivo data start su Db barra
+                        DbControllers.m_MachGroupController.UpdateStart(nP_Prod, nP_Machgroup, dtStart)
+                        MachGroup.dtStartTime = dtStart
+                     End If
                      ' resetto stati di produzione
                      MachGroup.ResetProduce()
                      ' se partenza pezzi uno a uno
@@ -458,7 +469,7 @@ Public Class MachManaging
                      ' azzero variabile per far ripartire macchina
                      StateVariable.sValue = "0"
                   End If
-                  ' se pezzo = -1 devo dare end a tutti i pezzi del MachGroup
+                  ' se pezzo = -1 stampo etichette di tutti i pezzi del MachGroup
                   If nP_Part = -1 Then
                      For Each Part In MachGroup.PartVMList
                         Map.refLeftPanelVM.PrintLabel(MachGroup, Part)
@@ -605,6 +616,9 @@ Public Class MachManaging
                m_CN = New TPAComm(Me)
                m_bConnected = Tpa.remObject.OnConnect()
                m_ResultCallbackDlg(CommandTypes.CONNECT, CommandStates.OK, ResultTypes.EXECUTED, "")
+               ' imposto stato manuale
+               Dim ManualMode As OPState = Map.refLeftPanelVM.OPModeList.FirstOrDefault(Function(x) x.Id = OPModes.Manual)
+               Map.refLeftPanelVM.SetOPMode(ManualMode)
                ' creo classe di gestione variabili
             Catch ex As Exception
                m_ResultCallbackDlg(CommandTypes.CONNECT, CommandStates.ERROR_, ResultTypes.EXECUTED, "Errore: impossibile connettersi!")

EgtBEAMWALL.Supervisor/MachManagingThread/MachManagingThread.vb

@@ -4,10 +4,14 @@ Class MachineCommThread
 
    ' variabile che ferma il ciclo
    Private Shared m_Stop As Boolean = False
+   Private Shared m_StartTick As Boolean = False
 
    Friend Shared Sub StopThread()
       m_Stop = True
    End Sub
+   Friend Shared Sub StartTick()
+      m_StartTick = True
+   End Sub
 
    ' variabile in cui ci sono stati inizio e fine pezzo
    Private Shared sP1VarName As String = "0.FUNM.E81295"
@@ -37,7 +41,9 @@ Class MachineCommThread
 
       While Not m_Stop
          ' eseguo ciclo principale che tiene vivo il thread
-         m_MachManaging.Timer_Tick()
+         If m_StartTick Then
+            m_MachManaging.Timer_Tick()
+         End If
          Threading.Thread.Sleep(TimeSpan.FromMilliseconds(1000))
       End While
 

EgtBEAMWALL.Supervisor/MainMenu/MainMenuV.xaml

@@ -6,14 +6,22 @@
    
    <!--Barra superiore dei comandi-->
    <UniformGrid Rows="1">
+      <Button Content="{Binding Viewer_Msg}"
+                   Command="{Binding Viewer_Command}"
+                   Style="{StaticResource MainMenu_Button}"/>
+      <Button Content="{Binding Optimizer_Msg}"
+                   Command="{Binding Optimizer_Command}"
+                   Style="{StaticResource MainMenu_Button}"/>
       <RadioButton Content="{Binding Supervisor_Msg}"
                    IsChecked="{Binding Supervisor_IsChecked}"
                    Style="{StaticResource MainMenu_ToggleButton}"/>
       <RadioButton Content="{Binding Inputs_Msg}"
                    IsChecked="{Binding Inputs_IsChecked}"
+                   Visibility="{Binding Inputs_Visibility}"
                    Style="{StaticResource MainMenu_ToggleButton}"/>
       <RadioButton Content="{Binding Outputs_Msg}"
                    IsChecked="{Binding Outputs_IsChecked}"
+                   Visibility="{Binding Outputs_Visibility}"
                    Style="{StaticResource MainMenu_ToggleButton}"/>
       <RadioButton Content="{Binding Configuration_Msg}"
                    IsChecked="{Binding Config_IsChecked}"

EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb

@@ -53,6 +53,20 @@ Public Class MainMenuVM
       End Set
    End Property
 
+   Private m_Inputs_Visibility As Visibility
+   Public ReadOnly Property Inputs_Visibility As Visibility
+      Get
+         Return m_Inputs_Visibility
+      End Get
+   End Property
+
+   Private m_Outputs_Visibility As Visibility
+   Public ReadOnly Property Outputs_Visibility As Visibility
+      Get
+         Return m_Outputs_Visibility
+      End Get
+   End Property
+
    Private m_SelPage As Integer = -1
    Public Property SelPage As Integer
       Get
@@ -106,9 +120,9 @@ Public Class MainMenuVM
 
 #Region "Messages"
 
-   Public ReadOnly Property Supervisor_Msg As String
+   Public ReadOnly Property Viewer_Msg As String
       Get
-         Return EgtMsg(62500)
+         Return EgtMsg(61830)
       End Get
    End Property
 
@@ -118,6 +132,12 @@ Public Class MainMenuVM
       End Get
    End Property
 
+   Public ReadOnly Property Supervisor_Msg As String
+      Get
+         Return EgtMsg(62500)
+      End Get
+   End Property
+
    Public ReadOnly Property Configuration_Msg As String
       Get
          Return EgtMsg(61832)
@@ -138,6 +158,10 @@ Public Class MainMenuVM
 
 #End Region    ' Messages
 
+   ' Definizione comandi
+   Private m_cmdViewer As ICommand
+   Private m_cmdOptimizer As ICommand
+
 #End Region    ' Fields & Properties
 
 #Region "CONSTRUCTOR"
@@ -151,6 +175,13 @@ Public Class MainMenuVM
 
 #Region "METHODS"
 
+   Friend Sub SetInputOutputVisibility()
+      If CurrentMachine.NCType = NCTypes.TPA Then
+         m_Inputs_Visibility = Visibility.Collapsed
+         m_Outputs_Visibility = Visibility.Collapsed
+      End If
+   End Sub
+
    Friend Sub SetMainMenuIsEnabled(bIsEnabled As Boolean)
       m_MainMenu_IsEnabled = bIsEnabled
       NotifyPropertyChanged(NameOf(MainMenu_IsEnabled))
@@ -175,6 +206,10 @@ Public Class MainMenuVM
          Map.refRawPartListVM.UpdateColumns(BWType.BEAM)
          Map.refPartInRawPartListVM.UpdateColumns(BWType.BEAM)
       End If
+      ' aggiorno la visibilità delle colonne
+      For Each col In Map.refFeatureInPartInRawPartListVM.FeatureInPartInRawPartColumns
+         col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
+      Next
       '' apro progetto proj
       'If Not IsNothing(Map.refProjManagerVM.CurrProj) Then
       '   If Map.refProjManagerVM.CurrProj.bReloadProject Then
@@ -232,20 +267,11 @@ Public Class MainMenuVM
 
    Private Function InitCONFIG() As Boolean
       Map.refMainWindowVM.NotifyPropertyChanged(NameOf(Map.refMainWindowVM.nSelTabPage))
-      '' ricarico la lista delle colonne delle DataGrid in ConfigurationPage
-      'If Not IsNothing(Map.refConfigurationPageVM) Then Map.refConfigurationPageVM.LoadConfigDGColumns()
       Return True
    End Function
 
    Private Function ExitCONFIG() As Boolean
       Map.refConfigurationPageVM.VerifyConfigPageModification()
-      ' ricarico le EgtDataGrid del programma con le colonne customizzate
-      Map.refRawPartListVM.RawPartColumns.Clear()
-      Map.refPartInRawPartListVM.PartInRawPartColumns.Clear()
-      Map.refFeatureInPartInRawPartListVM.FeatureInPartInRawPartColumns.Clear()
-      GetPrivateProfileColumns(S_RAWPARTLIST_SUPERVISOR, Map.refRawPartListVM.RawPartColumns)
-      GetPrivateProfileColumns(S_PARTINRAWPARTLIST_SUPERVISOR, Map.refPartInRawPartListVM.PartInRawPartColumns)
-      GetPrivateProfileColumns(S_FEATUREINPARTINRAWPARTLIST_SUPERVISOR, Map.refFeatureInPartInRawPartListVM.FeatureInPartInRawPartColumns)
       Return True
    End Function
 
@@ -281,4 +307,76 @@ Public Class MainMenuVM
 
 #End Region    ' METHODS
 
+#Region "COMMANDS"
+
+#Region "Viewer"
+
+   Public ReadOnly Property Viewer_Command As ICommand
+      Get
+         If m_cmdViewer Is Nothing Then
+            m_cmdViewer = New Command(AddressOf Viewer)
+         End If
+         Return m_cmdViewer
+      End Get
+   End Property
+
+   Public Sub Viewer()
+      Dim sViewerOptimizerName As String = "EgtBEAMWALL.ViewerOptimizerR32"
+      ' recupero processo del supervisore
+      Dim localProc As Process() = Process.GetProcessesByName(sViewerOptimizerName)
+      If localProc.Length > 0 Then
+         For Each p As Process In localProc
+            ' porto in primo piano il ViewerOptimizer
+            BringWindowToFront(p.MainWindowHandle)
+            DbControllers.m_StatusMapController.UpdateAction(DbControllers.m_SupervisorId, Map.refSupervisorManagerVM.CurrProd.nProdId, -Pages.VIEW, StatusMapItemType.Comm, StatusMapOpType.OpenPageInViewOptimRequest, "")
+            Exit For
+         Next
+      Else
+         Dim sViewerOptimizerPath As String = Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory) & "\" & sViewerOptimizerName & ".exe"
+         Try
+            Process.Start(sViewerOptimizerPath, "2 " & Pages.VIEW)
+         Catch ex As Exception
+            EgtOutLog("Error: impossible starting vieweroptimizer from path " & sViewerOptimizerPath)
+         End Try
+      End If
+   End Sub
+
+#End Region ' Viewer
+
+#Region "Optimizer"
+
+   Public ReadOnly Property Optimizer_Command As ICommand
+      Get
+         If m_cmdOptimizer Is Nothing Then
+            m_cmdOptimizer = New Command(AddressOf Optimizer)
+         End If
+         Return m_cmdOptimizer
+      End Get
+   End Property
+
+   Public Sub Optimizer()
+      Dim sViewerOptimizerName As String = "EgtBEAMWALL.ViewerOptimizerR32"
+      ' recupero processo del supervisore
+      Dim localProc As Process() = Process.GetProcessesByName(sViewerOptimizerName)
+      If localProc.Length > 0 Then
+         For Each p As Process In localProc
+            ' porto in primo piano il ViewerOptimizer
+            BringWindowToFront(p.MainWindowHandle)
+            DbControllers.m_StatusMapController.UpdateAction(DbControllers.m_SupervisorId, Map.refSupervisorManagerVM.CurrProd.nProdId, -Pages.MACHINING, StatusMapItemType.Comm, StatusMapOpType.OpenPageInViewOptimRequest, "")
+            Exit For
+         Next
+      Else
+         Dim sViewerOptimizerPath As String = Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory) & "\" & sViewerOptimizerName & ".exe"
+         Try
+            Process.Start(sViewerOptimizerPath, "2 " & Pages.MACHINING)
+         Catch ex As Exception
+            EgtOutLog("Error: impossible starting vieweroptimizer from path " & sViewerOptimizerPath)
+         End Try
+      End If
+   End Sub
+
+#End Region ' Optimizer
+
+#End Region    ' COMMANDS
+
 End Class

EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb

@@ -154,7 +154,7 @@ Public Class MainWindowM
    End Property
 
    Private m_bPrinterLink As Boolean = False
-   Friend ReadOnly Property bPrinterLink As String
+   Friend ReadOnly Property bPrinterLink As Boolean
       Get
          Return m_bPrinterLink
       End Get
@@ -229,8 +229,8 @@ Public Class MainWindowM
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2401, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2401, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2403, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2403, 1, m_nKeyOptions)
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       m_sLogFile = m_sTempDir & "\" & SUPGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())
@@ -299,7 +299,7 @@ Public Class MainWindowM
    Private Sub ManageInstance()
       Dim bCreated As Boolean
       Try
-         m_objMutex = New Mutex(False, "Global\OmagOFFICE", bCreated)
+         m_objMutex = New Mutex(True, "Global\EgtBEAMWALL.Supervisor", bCreated)
       Catch
          bCreated = False
       End Try
@@ -308,20 +308,36 @@ Public Class MainWindowM
          ' Prima istanza
          m_nInstance = 1
          ' Aggiorno stato istanze attive
-         WriteMainPrivateProfileString(S_GENERAL, K_INSTANCES, m_nInstance.ToString())
+         WriteMainPrivateProfileString(S_GENERAL, K_SUPERVISOR_INSTANCES, m_nInstance.ToString())
+         ' Rilascio il possesso del mutex
+         m_objMutex.ReleaseMutex()
       Else
          ' Leggo il massimo numero di istanze ammesse
-         Dim nMaxInst As Integer = GetMaxInstances()
-         ' Cerco il primo indice di istanza libero
-         Dim nTmp As Integer = GetMainPrivateProfileInt(S_GENERAL, K_INSTANCES, 0)
-         m_nInstance = 1
-         Dim nMask As Integer = 1
-         While (nTmp And nMask) <> 0 And m_nInstance < MAX_INST
-            m_nInstance += 1
-            nMask *= 2
-         End While
-         ' Se l'indice supera il massimo
-         If m_nInstance > nMaxInst Then
+         Dim nMaxInst As Integer = GetMainPrivateProfileInt(S_GENERAL, K_MAXINST, 1)
+         nMaxInst = 1                  ' Max(1, Min(nMaxInst, MAX_INST))
+         ' Richiedo il possesso del mutex
+         Dim bOk As Boolean = False
+         If m_objMutex.WaitOne(500) Then
+            ' Cerco il primo indice di istanza libero
+            Dim nTmp As Integer = GetMainPrivateProfileInt(S_GENERAL, K_SUPERVISOR_INSTANCES, 0)
+            m_nInstance = 1
+            Dim nMask As Integer = 1
+            While (nTmp And nMask) <> 0 And m_nInstance <= MAX_INST
+               m_nInstance += 1
+               nMask *= 2
+            End While
+            ' Se nuova istanza nei limiti
+            If m_nInstance <= nMaxInst Then
+               bOk = True
+               ' Aggiorno stato istanze attive
+               nTmp += (1 << (m_nInstance - 1))
+               WriteMainPrivateProfileString(S_GENERAL, K_SUPERVISOR_INSTANCES, nTmp.ToString())
+            End If
+            ' Rilascio il possesso del mutex
+            m_objMutex.ReleaseMutex()
+         End If
+         ' Se non è possibile continuare
+         If Not bOk Then
             ' porto in primo piano la prima istanza
             Dim bFound As Boolean = False
             ' processi del programma a 32 bit
@@ -329,7 +345,7 @@ Public Class MainWindowM
             For Each p As Process In localProc
                If p.Id <> Process.GetCurrentProcess().Id Then
                   bFound = True
-                  ShowWindow(p.MainWindowHandle, 1)
+                  ShowWindow(p.MainWindowHandle, SW.SHOWMAXIMIZED)
                   Exit For
                End If
             Next
@@ -339,17 +355,14 @@ Public Class MainWindowM
                For Each p As Process In localProc
                   If p.Id <> Process.GetCurrentProcess().Id Then
                      bFound = True
-                     ShowWindow(p.MainWindowHandle, SW.RESTORE)
+                     ShowWindow(p.MainWindowHandle, SW.SHOWMAXIMIZED)
                      Exit For
                   End If
                Next
             End If
             ' esco dal programma
-            End
+            Environment.Exit(1)
          End If
-         ' Aggiorno stato istanze attive
-         nTmp += (1 << (m_nInstance - 1))
-         WriteMainPrivateProfileString(S_GENERAL, K_INSTANCES, nTmp.ToString())
       End If
    End Sub
 
@@ -360,18 +373,20 @@ Public Class MainWindowM
    Friend Function GetMaxInstances() As Integer
       ' Leggo il massimo numero di istanze ammesse
       Dim nMaxInst As Integer = GetMainPrivateProfileInt(S_GENERAL, K_MAXINST, 1)
-      Return Max(1, Min(nMaxInst, MAX_INST))
+      Return 1             ' Max(1, Min(nMaxInst, MAX_INST))
    End Function
 
    Friend Sub Close()
       ' Terminazione generale di EgtInterface
       EgtExit()
+      ' Aggiorno istanze usate
+      m_objMutex.WaitOne(1000)
+      Dim nTmp As Integer = GetMainPrivateProfileInt(S_GENERAL, K_SUPERVISOR_INSTANCES, 0)
+      nTmp -= (1 << (m_nInstance - 1))
+      WriteMainPrivateProfileString(S_GENERAL, K_SUPERVISOR_INSTANCES, nTmp.ToString())
+      m_objMutex.ReleaseMutex()
       ' Rilascio mutex
       If Not IsNothing(m_objMutex) Then m_objMutex.Close()
-      ' Aggiorno istanze usate
-      Dim nTmp As Integer = GetMainPrivateProfileInt(S_GENERAL, K_INSTANCES, 0)
-      nTmp -= (1 << (m_nInstance - 1))
-      WriteMainPrivateProfileString(S_GENERAL, K_INSTANCES, nTmp.ToString())
    End Sub
 
 #End Region    ' METHODS

EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb

@@ -101,25 +101,35 @@ Public Class MainWindowVM
       '   apro in modalita' VIEW
       '   Map.refMainMenuVM.SelPage = Pages.VIEW
 
-      ' setto il primo file dalla lista degli MRU come prod corrente da aprire
-      Dim sLastProdPath As String = String.Empty
-      GetMainPrivateProfileString(S_MRUSUPERVISORPRODFILES, K_FILE & "1", String.Empty, sLastProdPath)
-      If Not String.IsNullOrWhiteSpace(sLastProdPath) AndAlso File.Exists(sLastProdPath) Then
-         ' ricavo l'Id e il prod associato per l'apertura di quest'ultimo
-         Dim PdId As Integer = 0
-         Dim sPdId As String = Path.GetFileNameWithoutExtension(sLastProdPath)
-         Integer.TryParse(sPdId, PdId)
-         Map.refSupervisorManagerVM.SetCurrProd(PdId)
-         ' apro prod
-         If Not IsNothing(Map.refSupervisorManagerVM.CurrProd) Then Map.refSupervisorManagerVM.OpenProject(Map.refSupervisorManagerVM.CurrProd)
-      End If
+      ' imposto MainWindow per finestra di Loading
+      LoadingWndHelper.SetMainWindow(Application.Current.MainWindow)
 
+
+      ' leggo riga di comando
+      Dim nCommandType As Integer = 0
+      Dim nPage As Pages = Pages.VIEW
+      Dim nProdId As Integer = 0
+      If ProcessCommandLine(nCommandType, nProdId) AndAlso nCommandType = 1 Then
+         Map.refSupervisorManagerVM.SetCurrProd(nProdId)
+      Else
+         ' setto il primo file dalla lista degli MRU come progetto corrente da aprire
+         Dim sLastProdPath As String = String.Empty
+         GetMainPrivateProfileString(S_MRUSUPERVISORPRODFILES, K_FILE & "1", String.Empty, sLastProdPath)
+         If Not String.IsNullOrWhiteSpace(sLastProdPath) AndAlso File.Exists(sLastProdPath) Then
+            ' ricavo l'Id e il prod associato per l'apertura di quest'ultimo
+            Dim PdId As Integer = 0
+            Dim sPdId As String = Path.GetFileNameWithoutExtension(sLastProdPath)
+            Integer.TryParse(sPdId, PdId)
+            Map.refSupervisorManagerVM.SetCurrProd(PdId)
+         End If
+      End If
+      ' apro prod
+      If Not IsNothing(Map.refSupervisorManagerVM.CurrProd) Then Map.refSupervisorManagerVM.OpenProject(Map.refSupervisorManagerVM.CurrProd)
       ' apro in modalita' SUPERVISOR
       Map.refMainMenuVM.SelPage = Pages.SUPERVISOR
 
       Map.refLeftPanelVM.NotifyPropertyChanged(NameOf(Map.refLeftPanelVM.FeatureList_Visibility))
 
-
       ' inizializzo thread di aggiornamento e comunicazione con DB
       ' creo thread gestione macchina
       m_ViewerOptimizerCommThread = New Thread(Sub()
@@ -128,10 +138,23 @@ Public Class MainWindowVM
       m_ViewerOptimizerCommThread.SetApartmentState(ApartmentState.STA)
       ' avvio thread di gestione della macchina che avvia la connessione
       m_ViewerOptimizerCommThread.Start()
-
-
    End Sub
 
+   Friend Function ProcessCommandLine(ByRef nCommandType As Integer, ByRef nProdId As Integer) As Boolean
+      ' Se non ci sono veri parametri su linea di comando, esco (il primo è sempre il nome del programma)
+      If Environment.GetCommandLineArgs.Count() <= 1 Then Return False
+      ' Recupero primo parametro che dovrebbe essere il tipo di modalita' riga di comando
+      Dim sFile As String = Environment.GetCommandLineArgs(1)
+      If String.IsNullOrWhiteSpace(sFile) OrElse Not Integer.TryParse(sFile, nCommandType) OrElse nCommandType <= 0 Then Return False
+      Select Case nCommandType
+         Case 1         ' apri progetto in supervisore
+            ' recupero secondo parametro
+            Dim sProdId As String = Environment.GetCommandLineArgs(2)
+            If Not Integer.TryParse(sProdId, nProdId) OrElse nProdId <= 0 Then Return False
+            Return True
+      End Select
+   End Function
+
    Friend Sub KeyDown(PressedKey As Key)
       ' Con ESC esco dall'azione corrente
       If PressedKey = Key.Escape Then
@@ -192,12 +215,20 @@ Public Class MainWindowVM
    ''' Execute the Exec.  This method is invoked by the ExecCommand.
    ''' </summary>
    Public Sub CloseApplication()
+      ' se macchina sta funzionando
+      If Not IsNothing(Map.refMachManaging) AndAlso Map.refMachManaging.bConnected AndAlso
+         (Map.refLeftPanelVM.SelOPState.Id <> OPStates.End AndAlso Map.refLeftPanelVM.SelOPState.Id <> OPStates.Unspecified) Then
+         MessageBox.Show("Impossible closing software while machine is working. If you want to close, first press reset and stop the machine!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         Return
+      End If
       ' disconnetto comunicazione con macchina
       MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.DISCONNECT))
       ' termino thread di comunicazione con Db ed altri programmi
       ViewerOptimizerCommThread.StopThread()
       ' Verifico modifica parametri in Configurazione e chiedo il salvataggio
       If Map.refMainMenuVM.SelPage = Pages.CONFIG Then Map.refConfigurationPageVM.VerifyConfigPageModification()
+      ' Termino il Model
+      MainWindowM.Close()
       ' Chiudo la finestra principale del programma
       Application.Current.MainWindow.Close()
    End Sub

EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb

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

EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb

@@ -235,6 +235,7 @@ Public Class MySceneHostVM
    Private Sub OnOpenProject(sender As Object, sFile As String, bOk As Boolean)
       ' Procedo a seconda del risultato
       If bOk Then
+         LoadingWndHelper.UpdateLoadingWnd(ActiveIds.OPENPROD, 2, EgtMsg(63003), 50, 70)           ' Loading machining groups
          ' leggo MachGroup
          Map.refProjectVM.ProdMachGroupPanelVM = New MyMachGroupPanelVM(MyMachGroupPanelM.CreateMyMachGroupPanel(Map.refMachinePanelVM.MachineList.ToList()))
          WriteMainPrivateProfileString(S_GENERAL, K_LASTPROJ, sFile)

EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerV.xaml

@@ -6,7 +6,7 @@
                               IsRightDockable="False"
                               IsEnabled="{Binding SupervisorManager_IsEnabled}"
                               Style="{StaticResource ToolBar_EgtFloatingPanel}">
-         
+
    <!--Barra superiore dei comandi-->
    <Button Command="{Binding OpenCommand}"
            ToolTip="{Binding OpenToolTip}"
@@ -14,49 +14,23 @@
            Tag="{Binding}"
            Style="{StaticResource ToolBar_Button}">
       <Button.ContextMenu>
-          <ContextMenu ItemsSource="{Binding MruFileNames}">
-              <ContextMenu.Resources>
-                  <Style TargetType="{x:Type MenuItem}">
-                      <Setter Property="Command"
+         <ContextMenu ItemsSource="{Binding MruFileNames}">
+            <ContextMenu.Resources>
+               <Style TargetType="{x:Type MenuItem}">
+                  <Setter Property="Command"
                               Value="{Binding PlacementTarget.Tag.OpenMruFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}" />
-                      <Setter Property="CommandParameter" Value="{Binding}" />
-                  </Style>
-              </ContextMenu.Resources>
-          </ContextMenu>
+                  <Setter Property="CommandParameter" Value="{Binding}" />
+               </Style>
+            </ContextMenu.Resources>
+         </ContextMenu>
       </Button.ContextMenu>
       <Image Source="/Resources/ProjectManager/Open.png" Stretch="Uniform"/>
    </Button>
-   <!--<Button Command="{Binding SaveCommand}"
-           ToolTip="{Binding SaveToolTip}"
+   <Button Command="{Binding GoToProd_Command}"
+           ToolTip="{Binding GoToProd_ToolTip}"
            Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ProjectManager/GoToProd.png" Stretch="Uniform"/>
    </Button>
-   --><!--<Button Command="{Binding SaveAsCommand}"
-            ToolTip="{Binding SaveAsToolTip}"
-            Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/SaveAs.png" Stretch="Uniform"/>
-   </Button>--><!--
-   <Button Command="{Binding AddProj_Command}" ToolTip="{Binding AddProjToolTip}"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/Import.png" Stretch="Uniform"/>
-   </Button>
-   <Button Content="&lt;"
-           Command="{Binding GoToProj_Command}" ToolTip="{Binding AddProjToolTip}"
-           Style="{StaticResource ToolBar_Button}"/>-->
 
-   <!--<Button Command="{Binding OptionsCommand}"
-            ToolTip="{Binding OptionsToolTip}"
-            Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/Options.png" Height="22"/>
-   </Button>-->
-   <!--<Button Command="{Binding SendFeedbackCommand}"
-            ToolTip="{Binding SendFeedbackToolTip}"
-            Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/Send.png" Height="22" Margin="3,0,3,0" />
-   </Button>-->
-   <!--<Button Command="{Binding UpdateBTL_Command}" ToolTip="{Binding UpdateBTLToolTip}"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/Import.png" Stretch="Uniform"/>
-   </Button>-->
 
 </EgtFloating:EgtFloatingPanel>

EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb

@@ -1,5 +1,6 @@
 Imports System.Collections.ObjectModel
 Imports System.IO
+Imports System.Windows.Threading
 Imports EgtBEAMWALL.Core
 Imports EgtBEAMWALL.Core.ConstBeam
 Imports EgtBEAMWALL.DataLayer.DatabaseModels
@@ -11,6 +12,10 @@ Public Class SupervisorManagerVM
 
 #Region "FIELDS & PROPERTIES"
 
+   Private m_OpenProj_Timer As New DispatcherTimer
+   Private m_bOpenProj As Boolean = False
+   Private m_nProjIdToOpen As Integer = GDB_ID.NULL
+
    Private m_SupervisorManager_IsEnabled As Boolean = True
    Public ReadOnly Property SupervisorManager_IsEnabled As Boolean
       Get
@@ -70,7 +75,7 @@ Public Class SupervisorManagerVM
    Private m_cmdOpen As ICommand
    Private m_cmdOpenMruFile As ICommand
    'Private m_cmdSave As ICommand
-   'Private m_cmdGoToProj As ICommand
+   Private m_cmdGoToProd As ICommand
 
    '#Region "ToolTip"
 
@@ -97,6 +102,10 @@ Public Class SupervisorManagerVM
       Map.SetRefSupervisorManagerVM(Me)
       ' Impostazioni MruLists
       m_MruFiles.Init(S_MRUSUPERVISORPRODFILES, 8)
+      ' imposto timer di apertura da ottimizzatore
+      m_OpenProj_Timer.Interval = TimeSpan.FromMilliseconds(500)
+      AddHandler m_OpenProj_Timer.Tick, AddressOf OpenProject_Tick
+      m_OpenProj_Timer.Start()
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -129,6 +138,24 @@ Public Class SupervisorManagerVM
       DbControllers.m_ProdController.UpdateMachGroup(CurrProd.nProdId, MyMachGroupList)
    End Sub
 
+   Public Sub OpenProjectFromOptimizer(ProjIdToOpen As Integer)
+      If ProjIdToOpen <> Map.refSupervisorManagerVM.m_CurrProd.nProdId Then
+         m_nProjIdToOpen = ProjIdToOpen
+         m_bOpenProj = True
+      End If
+   End Sub
+
+   Public Sub OpenProject_Tick()
+      If Not m_bOpenProj Then Return
+      m_bOpenProj = False
+      ' recupero progetto da Id 
+      Dim DbProject As ProdFileM
+      DbProject = DbControllers.m_ProdController.FindCoreByProdId(m_nProjIdToOpen)
+      Dim ProjectVM As New ProdFileVM(DbProject)
+      OpenProject(ProjectVM)
+      m_nProjIdToOpen = GDB_ID.NULL
+   End Sub
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
@@ -194,9 +221,12 @@ Public Class SupervisorManagerVM
             m_bLoadingProd = False
             Return
          End If
+         LoadingWndHelper.OpenLoadingWnd(ActiveIds.OPENPROD, 3, EgtMsg(63000), EgtMsg(63001), 50)        'Project opening        'Loading project geometries
          If Map.refSceneHostVM.MainController.OpenProject(sFilePath, False) Then
             m_CurrProd = TempCurrProd
             Map.refMainWindowVM.UpdateTitle()
+            ' inizializzo visibilita' bottone done per i Part
+            Map.refLeftPanelVM.NotifyPropertyChanged(NameOf(Map.refLeftPanelVM.DonePart_Visibility))
             'If Map.refMachGroupPanelVM.InitMachGroupList() Then
             '   m_CurrProd = TempCurrProd
             '   Map.refMainWindowVM.SetTitle(CurrProd.nProdId.ToString("0000") & " - EgtBEAMWALL")
@@ -215,6 +245,7 @@ Public Class SupervisorManagerVM
          Map.refSceneHostVM.MainController.NewProject()
          Map.refMainWindowVM.SetTitle("New - EgtBEAMWALL")
       End If
+      LoadingWndHelper.UpdateLoadingWnd(ActiveIds.OPENPROD, 3, EgtMsg(63004), 70, 100)          ' Loading production data
       Map.refProjectVM.SupervisorMachGroupPanelVM = New SupervisorMachGroupPanelVM(MachGroupPanelM.CreateNewMachGroupPanel())
       ' apro sessione di comunicazione e fisso indice a 0
       DbControllers.m_StatusMapController.StartProd(Map.refSupervisorManagerVM.CurrProd.nProdId, m_SupervisorId)
@@ -257,6 +288,7 @@ Public Class SupervisorManagerVM
       Map.refProjectVM.SupervisorMachGroupPanelVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList))
       m_bLoadingProd = False
       NotifyPropertyChanged(NameOf(MruFileNames))
+      LoadingWndHelper.CloseLoadingWnd(ActiveIds.OPENPROD)
    End Sub
 
 #End Region ' OpenCommand
@@ -292,6 +324,49 @@ Public Class SupervisorManagerVM
 
 #End Region ' OpenMruFileCommand
 
+#Region "GoToProd"
+
+   ''' <summary>
+   ''' Returns a command that do Open.
+   ''' </summary>
+   Public ReadOnly Property GoToProd_Command As ICommand
+      Get
+         If m_cmdGoToProd Is Nothing Then
+            m_cmdGoToProd = New Command(AddressOf GoToProd)
+         End If
+         Return m_cmdGoToProd
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Open.  This method is invoked by the OpenCommand.
+   ''' </summary>
+   Friend Sub GoToProd()
+      If IsNothing(m_CurrProd) Then Return
+      ' apro ottimizzatore
+      Dim sOptimizerName As String = "EgtBEAMWALL.ViewerOptimizerR32"
+      ' recupero processo del supervisore
+      Dim localProc As Process() = Process.GetProcessesByName(sOptimizerName)
+      If localProc.Length > 0 Then
+         For Each p As Process In localProc
+            ' porto in primo piano il Supervisor
+            BringWindowToFront(p.MainWindowHandle)
+            Exit For
+         Next
+      Else
+         Dim sOptimizerPath As String = Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory) & "\" & sOptimizerName & ".exe"
+         Try
+            Process.Start(sOptimizerPath, "1 " & CurrProd.nProdId)
+         Catch ex As Exception
+            EgtOutLog("Error: impossible starting optimizer from path " & sOptimizerPath)
+         End Try
+      End If
+      ' mando richiesta di apertura progetto in ottimizzatore
+      DbControllers.m_StatusMapController.UpdateAction(DbControllers.m_SupervisorId, Map.refSupervisorManagerVM.CurrProd.nProdId, Map.refSupervisorManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ChangeProdInProdRequest, "")
+   End Sub
+
+#End Region ' GoToProd
+
 #End Region    ' Commands
 
 End Class

EgtBEAMWALL.Supervisor/Utility/CurrentMachine.vb

@@ -11,6 +11,12 @@ Public Module CurrentMachine
       CONTINUOUS = 2
    End Enum
 
+   Enum MsgParagraphs As Integer
+      MDI = 1
+      PLC = 2
+      CNC = 3
+   End Enum
+
    ' Nome macchina corrente
    Private m_sMachineName As String = String.Empty
    ' Direttorio macchina corrente
@@ -21,6 +27,9 @@ Public Module CurrentMachine
    Private m_sMachParamIniFile As String = String.Empty
    ' Cartella degli script
    Private m_sMachScriptDir As String = String.Empty
+   ' Ffile dei messaggi macchina
+   Private m_sMachMessagesFile As String = String.Empty
+
    ' Tipo macchina
    Private m_nType As MachineType
 
@@ -101,6 +110,26 @@ Public Module CurrentMachine
       m_sMachDir = sMachinesRootDir & "\" & sMachineName
       ' Impostazione path MachIni file
       m_sMachIniFile = sMachinesRootDir & "\" & sMachineName & "\" & sMachineName & ".ini"
+
+      ' Leggo lingua corrente
+      Dim sLanguage As String = String.Empty
+      GetMainPrivateProfileString(S_GENERAL, K_MESSAGES, "", sLanguage)
+      ' Recupero nome file dei messaggi della lingua corrente
+      Dim sMsgName As String = ".txt"
+      Dim nIndex As Integer = 1
+      While True
+         Dim ReadLanguage As Language = GetPrivateProfileLanguage(S_LANGUAGES, K_LANGUAGE & nIndex, m_sMachIniFile)
+         If IsNothing(ReadLanguage) Then Exit While
+         If String.Compare(ReadLanguage.Name, sLanguage, True) = 0 Then
+            sMsgName = ReadLanguage.FilePath
+            Exit While
+         End If
+         nIndex += 1
+      End While
+      ' Leggo file messaggi
+      m_sMachMessagesFile = m_sMachDir & "\" & "Messages" & "\" & sMsgName
+      ' Leggo attivazione messaggi Cn/Plc
+      Map.refMachCommandMessagePanelVM.bMsgTranslationActive = GetPrivateProfileInt(S_LANGUAGES, K_ENABLE, 0, m_sMachIniFile)
       ' Impostazione tipo macchina
       m_nType = nMachineType
       ' Impostazione path MachParamIni file
@@ -131,6 +160,8 @@ Public Module CurrentMachine
       ' inizializzo assi
       Map.refAxesPanelVM.LoadAxes()
 
+      ' imposto visibilita' input output
+      Map.refMainMenuVM.SetInputOutputVisibility()
       ' leggo parametri macchina da WallData
       If nType = MachineType.WALL Then
          ' Assegno i dati
@@ -172,8 +203,6 @@ Public Module CurrentMachine
       Map.refLeftPanelVM.LoadChannels()
       Map.refLeftPanelVM.LoadOPStates()
       Map.refLeftPanelVM.LoadOPModes()
-      ' inizializzo visibilita' bottone done per i Part
-      Map.refLeftPanelVM.NotifyPropertyChanged(NameOf(Map.refLeftPanelVM.DonePart_Visibility))
    End Sub
 
 #End Region 'Init
@@ -203,6 +232,21 @@ Public Module CurrentMachine
       'End While
    End Sub
 
+   Public Function MachMsg(Paragraph As MsgParagraphs, nId As Integer) As String
+      Dim sMsg As String = ""
+      Dim sPar As String = ""
+      Select Case Paragraph
+         Case MsgParagraphs.MDI
+            sPar = MDI_MSG
+         Case MsgParagraphs.PLC
+            sPar = PLC_MSG
+         Case MsgParagraphs.CNC
+            sPar = CNC_MSG
+      End Select
+      EgtGetStringUtf8FromIni(sPar, nId, nId, sMsg, m_sMachMessagesFile)
+      Return sMsg
+   End Function
+
 #End Region 'Methods
 
 End Module

EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml

@@ -109,6 +109,7 @@
       <Setter Property="VerticalContentAlignment" Value="Center"/>
       <Setter Property="Padding" Value="1"/>
       <Setter Property="Margin" Value="1"/>
+      <Setter Property="ToolTipService.ShowOnDisabled" Value="True"/>
       <Setter Property="Template">
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type Button}">
@@ -204,6 +205,7 @@
       <Setter Property="VerticalContentAlignment" Value="Center"/>
       <Setter Property="Padding" Value="1"/>
       <Setter Property="Margin" Value="1"/>
+      <Setter Property="ToolTipService.ShowOnDisabled" Value="True"/>
       <Setter Property="Template">
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type ToggleButton}">
@@ -274,6 +276,14 @@
       </Style.Triggers>
    </Style>
 
+   <Style x:Key="MainMenu_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Background" Value="{StaticResource Omag_White}"/>
+      <Setter Property="Foreground" Value="{StaticResource Omag_DarkGray}"/>
+      <Setter Property="TextBlock.FontWeight" Value="Normal"/>
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="90"/>
+   </Style>
+
    <Style x:Key="Option_ColorButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Padding" Value="5"/>
       <Setter Property="HorizontalContentAlignment" Value="Center"/>

EgtBEAMWALL.Supervisor/ViewerOptimizerCommThread/ViewerOptimizerComm.vb

@@ -1,15 +1,26 @@
-Imports EgtBEAMWALL.DataLayer.DatabaseModels
+Imports EgtBEAMWALL.Core
+Imports EgtBEAMWALL.DataLayer.DatabaseModels
 
 Public Class ViewerOptimizerComm
 
+   Private m_bTickInExecution As Boolean = False
+
    Sub New()
       ' imposto in Map
       'Map.SetRefMachManaging(Me)
    End Sub
 
    Friend Sub Timer_Tick()
+      If m_bTickInExecution Then
+         EgtUILib.EgtOutLog("Tick gia' in esecuzione!!")
+         Return
+      End If
+      m_bTickInExecution = True
       ' se c'e' un progetto aperto o in caricamento
-      If IsNothing(Map.refSupervisorManagerVM.CurrProd) OrElse Map.refSupervisorManagerVM.bLoadingProd Then Return
+      If IsNothing(Map.refSupervisorManagerVM.CurrProd) OrElse Map.refSupervisorManagerVM.bLoadingProd Then
+         m_bTickInExecution = False
+         Return
+      End If
       ' recupero indice modifica del prod
       Dim nModificationIndex As Integer = 0
       Dim ActiveSessionList As List(Of StatusMapModel) = DbControllers.m_StatusMapController.GetProd()
@@ -29,9 +40,15 @@ Public Class ViewerOptimizerComm
                   Case Core.StatusMapOpType.MachGroupAdd
                      Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupFullList.Add(MachGroupModification.ItemId, {MachGroupModification.Index, MachGroupModification.Index})
                   Case Core.StatusMapOpType.MachGroupMod
-                     Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupFullList(MachGroupModification.ItemId)(0) = MachGroupModification.Index
+                     If Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupFullList.ContainsKey(MachGroupModification.ItemId) Then
+                        Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupFullList(MachGroupModification.ItemId)(0) = MachGroupModification.Index
+                     Else
+                        Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupFullList.Add(MachGroupModification.ItemId, {MachGroupModification.Index, 0})
+                     End If
                   Case Core.StatusMapOpType.MachGroupRem
-                     Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupFullList.Remove(MachGroupModification.ItemId)
+                     If Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupFullList.ContainsKey(MachGroupModification.ItemId) Then
+                        Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupFullList.Remove(MachGroupModification.ItemId)
+                     End If
                   Case Core.StatusMapOpType.MachGroupAssignedToSupervisor
                      Dim MachgroupIndexes As Integer() = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupFullList(MachGroupModification.ItemId)
                      ' se indice di aggiornamento file diverso da indice ultima modifica
@@ -42,22 +59,29 @@ Public Class ViewerOptimizerComm
                         Map.refProjectVM.SupervisorMachGroupPanelVM.ReloadProjectFile()
                      Else
                         Dim ProdMachGroup As MyMachGroupVM = Map.refProjectVM.ProdMachGroupPanelVM.MachGroupVMList.FirstOrDefault(Function(x) x.Id = MachGroupModification.ItemId)
-                        ProdMachGroup.dtStartTime = DateTime.MinValue
-                        ProdMachGroup.dtEndTime = DateTime.MinValue
-                        ProdMachGroup.MyMachGroupM.SetProductionState(Core.ItemState.Assigned)
-                        Dim DBMachGroup As MachGroupModel = DbControllers.m_MachGroupController.FindByMachGroupId(Map.refSupervisorManagerVM.CurrProd.nProdId, ProdMachGroup.Id)
-                        ProdMachGroup.SetProductionIndex(DBMachGroup.ProdIndex)
-                        For Each Part In ProdMachGroup.PartVMList
-                           Part.dtStartTime = DateTime.MinValue
-                           Part.dtEndTime = DateTime.MinValue
-                           Part.nProduction_State = Core.ItemState.Assigned
-                        Next
-                        ' lo aggiungo alla lista di MachGroup
-                        Map.refProjectVM.SupervisorMachGroupPanelVM.AddMachGroupToSupervisor(ProdMachGroup)
+                        If Not IsNothing(ProdMachGroup) Then
+                           ProdMachGroup.dtStartTime = DateTime.MinValue
+                           ProdMachGroup.dtEndTime = DateTime.MinValue
+                           ProdMachGroup.MyMachGroupM.SetProductionState(Core.ItemState.Assigned)
+                           Dim DBMachGroup As MachGroupModel = DbControllers.m_MachGroupController.FindByMachGroupId(Map.refSupervisorManagerVM.CurrProd.nProdId, ProdMachGroup.Id)
+                           If Not IsNothing(DBMachGroup) Then ProdMachGroup.SetProductionIndex(DBMachGroup.ProdIndex)
+                           For Each Part In ProdMachGroup.PartVMList
+                              Part.dtStartTime = DateTime.MinValue
+                              Part.dtEndTime = DateTime.MinValue
+                              Part.nProduction_State = Core.ItemState.Assigned
+                           Next
+                           ' lo aggiungo alla lista di MachGroup
+                           Map.refProjectVM.SupervisorMachGroupPanelVM.AddMachGroupToSupervisor(ProdMachGroup)
+                        End If
                      End If
                End Select
-            ElseIf MachGroupModification.ItemType = Core.StatusMapItemType.Comm AndAlso MachGroupModification.Operation = Core.StatusMapOpType.ViewOptimStoped Then
-               ViewerOptimizerCommThread.SetViewerOptimizerBlocked(True)
+            ElseIf MachGroupModification.ItemType = Core.StatusMapItemType.Comm Then
+               If MachGroupModification.Operation = Core.StatusMapOpType.ViewOptimStoped Then
+                  ViewerOptimizerCommThread.SetViewerOptimizerBlocked(True)
+               ElseIf MachGroupModification.Operation = Core.StatusMapOpType.ChangeProdInSupervisorRequest Then
+                  ' lo apro
+                  Map.refSupervisorManagerVM.OpenProjectFromOptimizer(MachGroupModification.ItemId)
+               End If
             End If
          Next
          ' se devo ricaricare il file
@@ -66,39 +90,11 @@ Public Class ViewerOptimizerComm
             For Each MachGroupModification In Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupFullList.Where(Function(x) x.Value(0) <> x.Value(1))
                MachGroupModification.Value(1) = MachGroupModification.Value(0)
             Next
-
-
-            ' ricarico il progetto
-            'Map.refProjectVM.SupervisorMachGroupPanelVM.ReloadProjectFile()
          End If
-
-
-
          ' aggiorno indice del prod
          Map.refSupervisorManagerVM.CurrProd.SetModificationIndex(nModificationIndex)
       End If
-
-
-
-
-      ' verifico se e' aperto in qualche ottimizzatore
-      'DbControllers.m_ProdController.
-      'Map.refSupervisorManagerVM.CurrProd.bIsLocked
-      ' verifico se la mappa messaggi ha indice maggiore del mio
-
-      ' ricarico il progetto
-
-      ' aggiorno eventuali nuovi machgroup
-
-
-
-
-
-      ' se devo ripartire a meta' di una barra
-
-      ' mando messaggio di blocco dell'ottimizzatore
-
-
+      m_bTickInExecution = False
    End Sub
 
 End Class

EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/AddRawPartWndVM.vb

@@ -91,7 +91,7 @@ Public Class AddRawPartWndVM
       m_nProjectType = ProjectType
       Select Case ProjectType
          Case BWType.BEAM
-            m_VariableList = New ObservableCollection(Of Variable)({New Variable(Variable.VariableType.LENGTH, EgtMsg(61935), dL),                ' lunghezza
+            m_VariableList = New ObservableCollection(Of Variable)({New Variable(Variable.VariableType.LENGTH, EgtMsg(61935), dL + dPosx),        ' lunghezza + ritaglio iniziale
                                                                     New Variable(Variable.VariableType.LENGTH, EgtMsg(61816), dPosx),             ' ritaglio iniziale
                                                                     New Variable(Variable.VariableType.LENGTH, EgtMsg(61937), dOffset)})          ' offset
          Case BWType.WALL

EgtBEAMWALL.ViewerOptimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndV.xaml

@@ -23,7 +23,7 @@
                                SelectionMode="Single"
                                ScrollViewer.CanContentScroll="False" 
                                ScrollViewer.VerticalScrollBarVisibility="Auto"
-                               ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+                               ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                Margin="5"
                                BindingColumns="{Binding SectXMatColumns}">
           <DataGrid.Resources>

EgtBEAMWALL.ViewerOptimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndVM.vb

@@ -247,6 +247,10 @@ Public Class AddSectionXMaterialWndVM
          ' carico le colonne della datagrid
          GetPrivateProfileColumns(S_SECTXMATLIST_WALL, SectXMatColumns)
       End If
+      ' aggiorno la visibilità delle colonne
+      For Each col In SectXMatColumns
+         col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
+      Next
    End Sub
 
 #End Region     ' LoadColumns

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLFeatureVM.vb

@@ -82,6 +82,7 @@ Public Class BTLFeatureVM
    End Property
 
    ' proprieta' che indica se e' attivo l'update del parametro bDO su piu' feature (attiva/disattiva tutti su pezzo, o per tipo con tasto destro)
+   ' necessario per evitare ricalcolo della grafica sulla modifica del parametro per ogni feature
    Private Shared m_bDO_MultipleUpdate As Boolean = False
    Public Shared Property bDO_MultipleUpdate As Boolean
       Get
@@ -221,7 +222,10 @@ Public Class BTLFeatureVM
 
    Sub New(BTLFeatureM As BTLFeatureM)
       m_BTLFeatureM = BTLFeatureM
+      AddHandler m_BTLFeatureM.QBTLParamAdded, AddressOf OnQBTLParamAdded
       m_BTLPartM = Nothing
+      Dim Part As PartM = BTLFeatureM.ParentPart
+      If Part.nType = BWType.WALL Then CreateQBTLParamVMList()
       NotifyPropertyChanged(NameOf(Calc_Background))
       NotifyPropertyChanged(NameOf(CALC_ROT_Visibility))
       NotifyPropertyChanged(NameOf(CALC_ERR_Letter))

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLParamVM.vb

@@ -303,11 +303,11 @@ Public Class BTLParamVM
          Else
             NotifyPropertyChanged(NameOf(sValue))
          End If
-      ' se Q
+         ' se Q
       Else
          For Ind = 0 To vParQ.Length() - 1
-            If vParQ(Ind).StartsWith( m_BTLParamM.sName) Then
-               vParQ(Ind) = m_BTLParamM.sName & ":" & DoubleToString( dNewValue, 3)
+            If vParQ(Ind).StartsWith(m_BTLParamM.sName) Then
+               vParQ(Ind) = m_BTLParamM.sName & ":" & DoubleToString(dNewValue, 3)
             End If
          Next
          Dim bOK As Boolean = m_BTLFeatureM.UpdateParams(m_BTLFeatureM.nSelGRP, m_BTLFeatureM.nPRC, m_BTLFeatureM.nSelSIDE, m_BTLFeatureM.sDES,
@@ -315,9 +315,12 @@ Public Class BTLParamVM
 
          If bOK Then
             m_BTLParamM.bCustom = True
-            ' setto nel progetto il fatto che il parametro attuale è custom o meno
-            EgtSetInfo(m_BTLFeatureM.nFeatureId, m_BTLParamM.sName & "A", If(bCustom, "1", ""))
-            NotifyPropertyChanged(NameOf(bCustom))
+            ' se sono in ottimizzazione 
+            If Map.refMainMenuVM.SelPage = Pages.VIEW Then
+               ' setto nel progetto il fatto che il parametro attuale è custom o meno
+               EgtSetInfo(m_BTLFeatureM.nFeatureId, m_BTLParamM.sName & "A", If(bCustom, "1", ""))
+               NotifyPropertyChanged(NameOf(bCustom))
+            End If
             m_BTLParamM.dValue = dNewValue
             ' modifica provvisoria per mancanza aggiornamento su freecontour
             If m_BTLFeatureM.IsFreeContour Then

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb

@@ -41,7 +41,7 @@ Public Class BTLPartVM
       Set(value As Boolean)
          m_BTLPartM.bDO = value
          EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_DO, If(value, 1, 0))
-         NotifyPropertyChanged("Calc_BorderBrush")
+         NotifyPropertyChanged(NameOf(Calc_BorderBrush))
       End Set
    End Property
 
@@ -66,6 +66,26 @@ Public Class BTLPartVM
          If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM OrElse
             Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL Then
             If dBtlW <> m_BTLPartM.dBtlW OrElse dBtlH <> m_BTLPartM.dBtlH OrElse dBtlL <> m_BTLPartM.dBtlL Then
+               ' se pezzo gia' in produzione
+               Dim DuploList As New List(Of Integer)
+               EgtDuploList(m_BTLPartM.nPartId, DuploList)
+               Dim bDuploInProduction As Boolean = False
+               For Each DuploId In DuploList
+                  Dim nSwapItem As Integer = GDB_ID.NULL
+                  If EgtGetInfo(DuploId, "!LST", nSwapItem) AndAlso nSwapItem > 0 Then
+                     Dim nMachgroupId As Integer = EgtGetParent(EgtGetParent(EgtGetParent(nSwapItem)))
+                     Dim MachGroupModel = DbControllers.m_MachGroupController.FindByMachGroupId(Map.refProjManagerVM.CurrProj.nProdId, nMachgroupId)
+                     If MachGroupModel.State > ItemState.ND Then
+                        bDuploInProduction = True
+                        Exit For
+                     End If
+                  End If
+               Next
+               If bDuploInProduction Then
+                  MessageBox.Show("Impossible change dimension because already in production!", "", MessageBoxButton.OK, MessageBoxImage.Exclamation)
+                  Return False
+               End If
+               ' lo impedisco
                ' avviso che tutti i pezzi verranno tolti dai grezzi e chiedo di confermare
                If MessageBox.Show(String.Format(EgtMsg(61851), nDuploCount), EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Information) = MessageBoxResult.Yes Then
                   MyMachGroupPanelM.DuploSetToDelete(m_BTLPartM.nPartId)
@@ -111,7 +131,7 @@ Public Class BTLPartVM
    Public Property sL As String
       Get
          Dim nOrigGroupId As Integer = nPartId
-         If Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
+         If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
             nOrigGroupId = GetOrigFrameGroup(nPartId)
          End If
          Dim frBeam As New Frame3d
@@ -169,7 +189,7 @@ Public Class BTLPartVM
    Public Property sW As String
       Get
          Dim nOrigGroupId As Integer = nPartId
-         If Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
+         If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
             nOrigGroupId = GetOrigFrameGroup(nPartId)
          End If
          Dim frBeam As New Frame3d
@@ -227,7 +247,7 @@ Public Class BTLPartVM
    Public Property sH As String
       Get
          Dim nOrigGroupId As Integer = nPartId
-         If Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
+         If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
             nOrigGroupId = GetOrigFrameGroup(nPartId)
          End If
          Dim frBeam As New Frame3d
@@ -1257,6 +1277,12 @@ Public Class BTLPartVM
       End Set
    End Property
 
+   Public ReadOnly Property nFeaturesGlobalState As CalcStates
+      Get
+         Return m_BTLPartM.nFeaturesGlobalState
+      End Get
+   End Property
+
    Public Property nState As CalcStates
       Get
          Return m_BTLPartM.nState
@@ -1336,8 +1362,12 @@ Public Class BTLPartVM
 
    Public ReadOnly Property Section As SectionXMaterial
       Get
+         Dim nOrigGroupId As Integer = nPartId
+         If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
+            nOrigGroupId = GetOrigFrameGroup(nPartId)
+         End If
          Dim frBeam As New Frame3d
-         EgtGetGroupGlobFrame(nPartId, frBeam)
+         EgtGetGroupGlobFrame(nOrigGroupId, frBeam)
          Dim dL As Double
          If IsX(frBeam.VersX(), EPS_SMALL) Then
             dL = m_BTLPartM.dBtlL
@@ -1414,7 +1444,7 @@ Public Class BTLPartVM
       End Get
       Set(value As Boolean?)
          If BTLFeatureVMList.Count = 0 Then
-            NotifyPropertyChanged("bDOALL")
+            NotifyPropertyChanged(NameOf(bDOALL))
             Return
          End If
          ' imposto modalita' update multiplo
@@ -1487,6 +1517,7 @@ Public Class BTLPartVM
    Private m_cmdInvert As ICommand
    Private m_cmdBackRotation As ICommand
    Private m_cmdForwardRotation As ICommand
+   Private m_cmdXRotation As ICommand
    Private m_cmdPartColour As ICommand
    Private m_cmdDeletePart As ICommand
 
@@ -1558,7 +1589,7 @@ Public Class BTLPartVM
          For Each BTLParamVM As BTLParamVM In BTLFeatureVM.QBTLParamVMList
             AddHandler BTLParamVM.PropertyChanged, AddressOf OnBTLQParamVMPropertyChanged
          Next
-         AddHandler BTLFeatureVM.PBTLParamVMList.CollectionChanged, AddressOf OnBTLQParamVMListChanged
+         AddHandler BTLFeatureVM.QBTLParamVMList.CollectionChanged, AddressOf OnBTLQParamVMListChanged
       Next
 
       m_BTLFeatureVMList = New ObservableCollection(Of BTLFeatureVM)(all)
@@ -1652,6 +1683,7 @@ Public Class BTLPartVM
    Friend Sub CalcGlobalUpdate(Optional bFeatureFirst As Boolean = False)
       m_BTLPartM.nCALC_GlobalERR = nCALC_ERR
       m_BTLPartM.nGlobalState = nState
+      m_BTLPartM.nFeaturesGlobalState = CalcStates.NOTCALCULATED
       If nState > CalcStates.NOTCALCULATED Then
          For Each Feature In BTLFeatureVMList
             If Not Feature.bDO And Not bFeatureFirst Then Continue For
@@ -1670,6 +1702,9 @@ Public Class BTLPartVM
                m_BTLPartM.nGlobalState = Feature.nState
                m_BTLPartM.nCALC_GlobalERR = Feature.nCALC_ERR
             End If
+            If Feature.nState > m_BTLPartM.nFeaturesGlobalState Then
+               m_BTLPartM.nFeaturesGlobalState = Feature.nState
+            End If
             If Feature.nCALC_ROT <> 0 Then
                m_BTLPartM.m_nCALC_ROT = Feature.nCALC_ROT
             End If
@@ -1792,8 +1827,13 @@ Public Class BTLPartVM
       Dim b3Part As New BBox3d
       EgtGetBBoxGlob(nNewPartId, GDB_BB.STANDARD, b3Part)
       ' ripristino le rotazioni di ROT e FLIP
-      EgtRotate(nNewPartId, b3Part.Center, -Vector3d.Z_AX, nROTATED)
-      EgtRotate(nNewPartId, b3Part.Center, Vector3d.X_AX, nINVERTED)
+      If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
+         EgtRotate(nNewPartId, b3Part.Center, Vector3d.X_AX, nROTATED)
+         EgtRotate(nNewPartId, b3Part.Center, Vector3d.Z_AX, nINVERTED)
+      Else
+         EgtRotate(nNewPartId, b3Part.Center, -Vector3d.Z_AX, nROTATED)
+         EgtRotate(nNewPartId, b3Part.Center, Vector3d.X_AX, nINVERTED)
+      End If
       ' aggiungo pezzo alla lista
       m_BTLStructureM.AddBTLPart(NewPart)
       Return NewPart
@@ -1934,6 +1974,47 @@ Public Class BTLPartVM
 
 #End Region ' ForwardRotation
 
+   ' Comando inutilizzato ma conservato per eventuale rotazione a causa di importazione con rotazione sbagliata
+#Region "XRotation"
+
+   Public ReadOnly Property XRotation_Command As ICommand
+      Get
+         If m_cmdXRotation Is Nothing Then
+            m_cmdXRotation = New Command(AddressOf XRotation)
+         End If
+         Return m_cmdXRotation
+      End Get
+   End Property
+
+   Public Sub XRotation()
+      If Map.refProjectVM.BTLStructureVM.nPROJTYPE <> MachineType.WALL Then Return
+      Dim OldSection As SectionXMaterial = Section
+      ' recupero il box del pezzo
+      Dim nLs As Integer = EgtGetFirstNameInGroup(nPartId, "Box")
+      Dim b3Solid As New BBox3d
+      EgtGetBBoxGlob(nLs, GDB_BB.STANDARD, b3Solid)
+      If b3Solid.IsEmpty() Then
+         EgtOutLog("ERROR: Box non definito per la trave " & sNAM)
+         Return
+      End If
+      Dim vtAxes As Vector3d = Vector3d.X_AX
+      ' eseguo rotazione di 90 gradi 
+      If EgtRotate(nPartId, b3Solid.Center, vtAxes, 90, GDB_RT.GLOB) Then
+         ' imposto modificato per copie
+         EgtDuploSetModified(nPartId)
+      End If
+      ' aggiorno visualizzazione dimensioni
+      NotifyPropertyChanged(NameOf(sW))
+      NotifyPropertyChanged(NameOf(sH))
+      NotifyPropertyChanged(NameOf(sL))
+      ' setto part e tutte le feature da ricalcolare
+      ResetCalcTotalPart()
+      ' aggiorno sezioni
+      Map.refProjectVM.BTLStructureVM.UpdateSection(Section, OldSection)
+   End Sub
+
+#End Region ' XRotation
+
 #Region "PartColour"
 
    Public ReadOnly Property PartColour_Command As ICommand

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb

@@ -67,14 +67,14 @@ Public Class BTLStructureVM
                If Not IsNothing(m_SelBTLPart.SelBTLFeatureVM) Then SelBTLPart.SelBTLFeatureVM = Nothing
                ' aggiorno stato selezionato tutto
                Map.refShowBeamPanelVM.bShowAll = False
-               Core.ViewPanelVM.BWSetView(VT.TOP, False)
+               Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
                EgtZoom(ZM.ALL)
             ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
                ' resetto gruppo di lavorazione corrente
                EgtResetCurrMachGroup()
                ' seleziono pezzo nella scena
                SceneSelPartSelection()
-               Core.ViewPanelVM.BWSetView(VT.TOP, False)
+               Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
                EgtZoom(ZM.ALL)
             End If
          End If
@@ -89,9 +89,8 @@ Public Class BTLStructureVM
 
    ' lista parametri per ricerca testuale
    Private m_SearchParamList As New ObservableCollection(Of IdNameStruct)({New IdNameStruct(BTLPartParam.NULL, ""),
-                                                                           New IdNameStruct(BTLPartParam.PDN, "PDN"),
-                                                                           New IdNameStruct(BTLPartParam.NAM, "Descrizione"),
-                                                                           New IdNameStruct(BTLPartParam.GRP, "Gruppo")})
+                                                                           New IdNameStruct(BTLPartParam.PDN, EgtMsg(61809)),
+                                                                           New IdNameStruct(BTLPartParam.NAM, EgtMsg(61603))})
    Public ReadOnly Property SearchParamList As ObservableCollection(Of IdNameStruct)
       Get
          Return m_SearchParamList
@@ -112,27 +111,53 @@ Public Class BTLStructureVM
       End Set
    End Property
 
-   ' lista dei materiali utilizzati
-   Private m_MaterialList_View As CollectionView = Nothing
-   Private m_MaterialList As New ObservableCollection(Of String)({""})
-   Public Property MaterialList As ObservableCollection(Of String)
+   ' lista dei gruppi
+   Private m_GroupList_View As CollectionView = Nothing
+   Private m_GroupList As New ObservableCollection(Of String)({""})
+   Public Property GroupList As ObservableCollection(Of String)
       Get
-         Return m_MaterialList
+         Return m_GroupList
       End Get
       Set(value As ObservableCollection(Of String))
-         m_MaterialList = value
+         m_GroupList = value
       End Set
    End Property
 
-   Private m_SelMaterial As String = ""
-   Public Property SelMaterial As String
+   Private m_SelGroup As String = ""
+   Public Property SelGroup As String
       Get
-         Return m_SelMaterial
+         Return m_SelGroup
       End Get
       Set(value As String)
-         m_SelMaterial = value
+         m_SelGroup = value
          m_BTLPartVMList_View.Refresh()
          m_SectionList_View.Refresh()
+         m_SubGroupList_View.Refresh()
+      End Set
+   End Property
+
+   ' lista dei SubGroup
+   Private m_SubGroupList_View As CollectionView = Nothing
+   Private m_SubGroupList As New ObservableCollection(Of String)({""})
+   Public Property SubGroupList As ObservableCollection(Of String)
+      Get
+         Return m_SubGroupList
+      End Get
+      Set(value As ObservableCollection(Of String))
+         m_SubGroupList = value
+      End Set
+   End Property
+
+   Private m_SelSubGroup As String = ""
+   Public Property SelSubGroup As String
+      Get
+         Return m_SelSubGroup
+      End Get
+      Set(value As String)
+         m_SelSubGroup = value
+         m_BTLPartVMList_View.Refresh()
+         m_SectionList_View.Refresh()
+         m_GroupList_View.Refresh()
       End Set
    End Property
 
@@ -157,7 +182,8 @@ Public Class BTLStructureVM
          If Not IsNothing(value) Then
             m_SelSection = value
             m_BTLPartVMList_View.Refresh()
-            m_MaterialList_View.Refresh()
+            m_GroupList_View.Refresh()
+            m_SubGroupList_View.Refresh()
          End If
       End Set
    End Property
@@ -170,11 +196,40 @@ Public Class BTLStructureVM
       Set(value As String)
          m_SearchText = value
          m_BTLPartVMList_View.Refresh()
-         m_MaterialList_View.Refresh()
+         m_GroupList_View.Refresh()
          m_SectionList_View.Refresh()
       End Set
    End Property
 
+   Public Property bDOALL As Boolean?
+      Get
+         If BTLPartVMList.Count = 0 Then Return False
+         Dim bTemp As Boolean = BTLPartVMList(0).bDO
+         For FeatureIndex = 1 To BTLPartVMList.Count - 1
+            If BTLPartVMList(FeatureIndex).bDO <> bTemp Then Return Nothing
+         Next
+         Return bTemp
+      End Get
+      Set(value As Boolean?)
+         If BTLPartVMList.Count = 0 Then
+            NotifyPropertyChanged(NameOf(bDOALL))
+            Return
+         End If
+         For PartIndex = 0 To BTLPartVMList.Count - 1
+            Dim Part As BTLPartVM = BTLPartVMList(PartIndex)
+            If (IsNothing(m_SelSection) OrElse m_SelSection.dH = -1 OrElse Part.Section = m_SelSection) AndAlso
+               (SelGroup = "" OrElse Part.sGROUP = SelGroup) AndAlso
+               (SelSubGroup = "" OrElse Part.sSTOREY = SelSubGroup) AndAlso
+               (SelSearchParam.Id = BTLPartParam.NULL OrElse SearchText = String.Empty OrElse (
+               (SelSearchParam.Id = BTLPartParam.PDN AndAlso Part.nPDN.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) >= 0) OrElse
+               (SelSearchParam.Id = BTLPartParam.NAM AndAlso Part.sNAM.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) >= 0))) Then
+               Part.bDO = value
+               Part.NotifyPropertyChanged(NameOf(Part.bDO))
+            End If
+         Next
+      End Set
+   End Property
+
 #Region "Parametri generici"
 
    Public Property sPROJNUM As String
@@ -569,14 +624,20 @@ Public Class BTLStructureVM
       ' creo lista di BTLPartVM
       CreateBTLPartVMList()
       m_BTLPartVMList_View = CollectionViewSource.GetDefaultView(m_BTLPartVMList)
-      m_MaterialList_View = CollectionViewSource.GetDefaultView(m_MaterialList)
+      m_GroupList_View = CollectionViewSource.GetDefaultView(m_GroupList)
+      m_SubGroupList_View = CollectionViewSource.GetDefaultView(m_SubGroupList)
       m_SectionList_View = CollectionViewSource.GetDefaultView(m_SectionList)
       m_BTLPartVMList_View.Filter = AddressOf PartFilter
-      m_MaterialList_View.Filter = AddressOf MaterialFilter
+      m_GroupList_View.Filter = AddressOf GroupFilter
       m_SectionList_View.Filter = AddressOf SectionFilter
       m_Calc_PartEnd.Interval = TimeSpan.FromMilliseconds(500)
       AddHandler m_Calc_PartEnd.Tick, AddressOf Calc_PartEnd_Tick
       m_Calc_PartEnd.Start()
+      ' Aggiorno check DOALL
+      NotifyPropertyChanged(NameOf(bDOALL))
+      If BTLStructureM.nAsseBaseId = GDB_ID.NULL Then
+         Map.refShowBeamPanelVM.SetShowBuilding(False)
+      End If
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -589,19 +650,27 @@ Public Class BTLStructureVM
 
       For Each BTLPartVM As BTLPartVM In all
          AddHandler BTLPartVM.PropertyChanged, AddressOf OnBTLPartVMPropertyChanged
-         ' verifico sezione e materiale per inserirli nei filtri
-         If Not MaterialList.Contains(BTLPartVM.sMATERIAL) Then
-            MaterialList.Add(BTLPartVM.sMATERIAL)
-         End If
-         If Not SectionList.Contains(BTLPartVM.Section) Then
-            SectionList.Add(BTLPartVM.Section)
-         End If
       Next
 
       m_BTLPartVMList = New ObservableCollection(Of BTLPartVM)(all)
       AddHandler m_BTLPartVMList.CollectionChanged, AddressOf OnBTLPartVMListChanged
    End Sub
 
+   Friend Sub LoadFilters()
+      For Each BTLPartVM As BTLPartVM In m_BTLPartVMList
+         ' verifico sezione, gruppo e sottogruppo per inserirli nei filtri
+         If Not SectionList.Contains(BTLPartVM.Section) Then
+            SectionList.Add(BTLPartVM.Section)
+         End If
+         If Not GroupList.Contains(BTLPartVM.sGROUP) Then
+            GroupList.Add(BTLPartVM.sGROUP)
+         End If
+         If Not SubGroupList.Contains(BTLPartVM.sSTOREY) Then
+            SubGroupList.Add(BTLPartVM.sSTOREY)
+         End If
+      Next
+   End Sub
+
    Private Sub Calc_PartEnd_Tick()
       ' se calcolo non in corso (mainmenu e' attivo), esco
       If Map.refMainMenuVM.MainMenu_IsEnabled Then Return
@@ -729,20 +798,12 @@ Public Class BTLStructureVM
          DisableMgr.ReEnable()
          Return
       End If
-      ' recupero il gruppo di assemblaggio
-      Dim AsseBaseId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, ASSEBASE)
-      While AsseBaseId <> GDB_ID.NULL
-         Dim nProj As Integer = 0
-         EgtGetInfo(AsseBaseId, BTL_PRT_PROJ, nProj)
-         If nProj = Map.refProjManagerVM.CurrProj.nProjId Then Exit While
-         AsseBaseId = EgtGetNextName(AsseBaseId, ASSEBASE)
-      End While
-      If AsseBaseId = GDB_ID.NULL Then
+      If Map.refProjectVM.BTLStructureVM.BTLStructureM.nAsseBaseId = GDB_ID.NULL Then
          DisableMgr.ReEnable()
          Return
       End If
       ' recupero il primo oggetto nel gruppo e verifico se devo assemblare o disassemblare
-      Dim AsseId As Integer = EgtGetFirstInGroup(AsseBaseId)
+      Dim AsseId As Integer = EgtGetFirstInGroup(Map.refProjectVM.BTLStructureVM.BTLStructureM.nAsseBaseId)
       If AsseId = GDB_ID.NULL Then
          DisableMgr.ReEnable()
          Return
@@ -882,24 +943,41 @@ Public Class BTLStructureVM
 
    Private Function PartFilter(Part As Object) As Boolean
       Dim CurrBTLPart As BTLPartVM = DirectCast(Part, BTLPartVM)
-      Dim bMaterialOk As Boolean = True
+      Dim bGroupOk As Boolean = True
+      Dim bSubGroupOk As Boolean = True
       Dim bSectionOk As Boolean = True
       Dim bSearchTextOk As Boolean = True
-      If SelMaterial <> "" AndAlso CurrBTLPart.sMATERIAL <> SelMaterial Then bMaterialOk = False
       If SelSection <> SectionXMaterial.Empty AndAlso CurrBTLPart.Section <> SelSection Then bSectionOk = False
-      'If SearchText <> "" AndAlso CurrBTLPart.sNAM.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0 Then bSectionOk = False
+      If SelGroup <> "" AndAlso CurrBTLPart.sGROUP <> SelGroup Then bGroupOk = False
+      If SelSubGroup <> "" AndAlso CurrBTLPart.sSTOREY <> SelSubGroup Then bSubGroupOk = False
       If m_SelSearchParam.Id <> BTLPartParam.NULL AndAlso m_SearchText <> String.Empty AndAlso (
          (m_SelSearchParam.Id = BTLPartParam.PDN AndAlso CurrBTLPart.nPDN.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-         (m_SelSearchParam.Id = BTLPartParam.NAM AndAlso CurrBTLPart.sNAM.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-         (m_SelSearchParam.Id = BTLPartParam.GRP AndAlso (IsNothing(CurrBTLPart.sGROUP) OrElse CurrBTLPart.sGROUP.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase)) < 0)) Then bSectionOk = False
-      Return (bMaterialOk AndAlso bSectionOk)
+         (m_SelSearchParam.Id = BTLPartParam.NAM AndAlso CurrBTLPart.sNAM.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then
+         bSearchTextOk = False
+      End If
+      Return bSectionOk AndAlso bGroupOk AndAlso bSubGroupOk AndAlso bSearchTextOk
    End Function
 
-   Private Function MaterialFilter(Material As Object) As Boolean
-      Dim CurrMaterial As String = DirectCast(Material, String)
+   Private Function GroupFilter(Group As Object) As Boolean
+      Dim CurrGroup As String = DirectCast(Group, String)
       Dim bOk As Boolean = True
-      If SelSection <> SectionXMaterial.Empty AndAlso SearchText <> "" AndAlso CurrMaterial <> "" Then
-         bOk = m_BTLPartVMList.Any(Function(x) x.sMATERIAL = CurrMaterial AndAlso x.Section = SelSection AndAlso Not x.sNAM.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) >= 0)
+      If CurrGroup <> "" AndAlso (SelSection <> SectionXMaterial.Empty OrElse SelSubGroup <> "" OrElse SearchText <> "") Then
+         bOk = m_BTLPartVMList.Any(Function(x) x.sGROUP = CurrGroup AndAlso
+                                               (SelSection = SectionXMaterial.Empty OrElse x.Section = SelSection) AndAlso
+                                               (SelSubGroup = "" OrElse x.sSTOREY = SelSubGroup) AndAlso
+                                               (SearchText = "" OrElse Not x.sNAM.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) >= 0))
+      End If
+      Return bOk
+   End Function
+
+   Private Function SubGroupFilter(SubGroup As Object) As Boolean
+      Dim CurrSubGroup As String = DirectCast(SubGroup, String)
+      Dim bOk As Boolean = True
+      If CurrSubGroup <> "" AndAlso (SelSection <> SectionXMaterial.Empty OrElse SearchText <> "" OrElse SelGroup <> "") Then
+         bOk = m_BTLPartVMList.Any(Function(x) x.sGROUP = CurrSubGroup AndAlso
+                                               (SelSection = SectionXMaterial.Empty OrElse x.Section = SelSection) AndAlso
+                                               (SelGroup = "" OrElse x.sGROUP = SelGroup) AndAlso
+                                               (SearchText = "" OrElse Not x.sNAM.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) >= 0))
       End If
       Return bOk
    End Function
@@ -907,30 +985,33 @@ Public Class BTLStructureVM
    Private Function SectionFilter(Section As Object) As Boolean
       Dim CurrSection As SectionXMaterial = DirectCast(Section, SectionXMaterial)
       Dim bOk As Boolean = True
-      If SelMaterial <> "" AndAlso SearchText <> "" AndAlso CurrSection <> Section.Empty Then
-         bOk = m_BTLPartVMList.Any(Function(x) x.sMATERIAL = SelMaterial AndAlso x.Section = CurrSection AndAlso Not x.sNAM.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) >= 0)
+      If CurrSection <> Section.Empty AndAlso (SelGroup <> "" OrElse SelSubGroup <> "" OrElse SearchText <> "") Then
+         bOk = m_BTLPartVMList.Any(Function(x) x.Section = CurrSection AndAlso
+                                               (SelGroup = "" OrElse x.sGROUP = SelGroup) AndAlso
+                                               (SelSubGroup = "" OrElse x.sSTOREY = SelSubGroup) AndAlso
+                                               (SearchText = "" OrElse Not x.sNAM.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) >= 0))
       End If
       Return bOk
    End Function
 
    Friend Sub UpdateSection(NewPartSection As SectionXMaterial, OldPartSection As SectionXMaterial)
       If IsNothing(BTLPartVMList) Then Return
-      If Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.BEAM Then
-         ' verifico se era unico con vecchia sezione
-         If Not m_BTLPartVMList.Any(Function(x) x.Section = OldPartSection) Then
-            ' nel caso seleziono filtro generico 
-            SelSection = m_SectionList(0)
-            ' e poi lo cerco ed elimino
-            m_SectionList.FirstOrDefault(Function(x) x = OldPartSection)
-            m_SectionList.Remove(m_SectionList.FirstOrDefault(Function(x) x = OldPartSection))
-         End If
-         ' verifico se esiste già nuova sezione
-         If Not m_SectionList.Any(Function(x) x = NewPartSection) Then
-            m_SectionList.Add(NewPartSection)
-         End If
-      ElseIf Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.WALL Then
-         ' se ruoto o inverto parete, la sezione non cambia
+      'If Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.BEAM Then
+      ' verifico se era unico con vecchia sezione
+      If Not m_BTLPartVMList.Any(Function(x) x.Section = OldPartSection) Then
+         ' nel caso seleziono filtro generico 
+         SelSection = m_SectionList(0)
+         ' e poi lo cerco ed elimino
+         m_SectionList.FirstOrDefault(Function(x) x = OldPartSection)
+         m_SectionList.Remove(m_SectionList.FirstOrDefault(Function(x) x = OldPartSection))
       End If
+      ' verifico se esiste già nuova sezione
+      If Not m_SectionList.Any(Function(x) x = NewPartSection) Then
+         m_SectionList.Add(NewPartSection)
+      End If
+      'ElseIf Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.WALL Then
+      '   ' se ruoto o inverto parete, la sezione non cambia
+      'End If
    End Sub
 
    ' funzione che aggiorna totale tempi a fine calcolo
@@ -988,8 +1069,8 @@ Public Class BTLStructureVM
    Private Sub OnBTLPartVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
       Select Case e.PropertyName
          Case NameOf(sender.sMATERIAL)
-            If Not MaterialList.Contains(sender.sMATERIAL) Then
-               MaterialList.Add(sender.sMATERIAL)
+            If Not GroupList.Contains(sender.sMATERIAL) Then
+               GroupList.Add(sender.sMATERIAL)
             End If
          Case NameOf(sender.sW), NameOf(sender.sH), NameOf(sender.sL)
             'If Not SectionList.Contains(sender.Section) Then
@@ -999,6 +1080,8 @@ Public Class BTLStructureVM
             '   UpdateSection(CType(sender, BTLPartVM).BTLPartM)
          Case NameOf(sender.nDONE)
             NotifyPropertyChanged(NameOf(sBTLRemainingTime))
+         Case NameOf(sender.bDOALL)
+            NotifyPropertyChanged(NameOf(bDOALL))
       End Select
    End Sub
 

EgtBEAMWALL.ViewerOptimizer/BeamMachiningsWindow/BeamMachiningsWindowV.xaml

@@ -33,7 +33,7 @@
                 SelectionMode="Single"
                 ScrollViewer.CanContentScroll="True" 
                 ScrollViewer.VerticalScrollBarVisibility="Auto"
-                ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+                ScrollViewer.HorizontalScrollBarVisibility="Auto"
                 Margin="0,0,0,5"
                 BindingColumns="{Binding BeamMachiningsColumns}">
          

EgtBEAMWALL.ViewerOptimizer/BeamMachiningsWindow/BeamMachiningsWindowV.xaml.vb

@@ -1,8 +1,8 @@
 Public Class BeamMachiningsWindowV
 
-   Private WithEvents m_BeamMachiningsWindowVM As BeamMachiningsWindowVM
+   Private WithEvents m_BeamMachiningsWindowVM As MyBeamMachiningsWindowVM
 
-   Sub New(Owner As Window, BeamMachiningsWindowVM As BeamMachiningsWindowVM)
+   Sub New(Owner As Window, BeamMachiningsWindowVM As MyBeamMachiningsWindowVM)
       MyBase.New(Owner)
       ' This call is required by the designer.
       InitializeComponent()

EgtBEAMWALL.ViewerOptimizer/BeamMachiningsWindow/BeamMachiningsWindowVM.vb

@@ -1,548 +0,0 @@
-Imports System.IO
-Imports System.Collections.ObjectModel
-Imports EgtBEAMWALL.Core
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class BeamMachiningsWindowVM
-   Inherits VMBase
-
-#Region "FIELDS & PROPERTIES"
-
-   Private Const MACH_CUT As String = "Cut"
-   Private Const MACH_DRILL As String = "Drill"
-   Private Const MACH_MILLING As String = "Milling"
-   Private Const MACH_POCKETING As String = "Pocketing"
-   Private Const MACH_SAWING As String = "Sawing"
-   Private Const ONCONST As String = "On"
-   Private Const NAME As String = "Name"
-   Private Const TYPE As String = "Type"
-   Private Const DATETIME As String = "%DATE_TIME%"
-   Private Const TABLENAME As String = "%TABLE_NAME%"
-
-   Friend Event m_CloseWindow(bDialogResult As Boolean)
-
-   Private m_BeamMachiningsColumns As New ObservableCollection(Of EgtDataGridColumn)
-   Public Property BeamMachiningsColumns As ObservableCollection(Of EgtDataGridColumn)
-      Get
-         Return m_BeamMachiningsColumns
-      End Get
-      Set(value As ObservableCollection(Of EgtDataGridColumn))
-         m_BeamMachiningsColumns = value
-      End Set
-   End Property
-
-   Private m_MachiningList As New ObservableCollection(Of String)({MACH_CUT, MACH_DRILL, MACH_MILLING, MACH_POCKETING, MACH_SAWING})
-   Public ReadOnly Property MachiningList As ObservableCollection(Of String)
-      Get
-         Return m_MachiningList
-      End Get
-   End Property
-
-   Private m_SelMachining As String
-   Public Property SelMachining As String
-      Get
-         Return m_SelMachining
-      End Get
-      Set(value As String)
-         ' verifico se pagina precedente modificata
-         Dim TableModified As Boolean = False
-         For Each Line In m_TableRowList
-            If Line.IsModified Then
-               TableModified = True
-               Exit For
-            End If
-         Next
-         ' se modificata, chiedo se salvare
-         If TableModified Then
-            ' Salvare le modifiche apportate? - Salva
-            Select Case MessageBox.Show(EgtMsg(9007), EgtMsg(9006), MessageBoxButton.YesNo, MessageBoxImage.Question)
-               Case MessageBoxResult.Yes
-                  Save()
-               Case MessageBoxResult.No
-                  ' non devo fare nulla
-            End Select
-         End If
-         m_SelMachining = value
-         LoadMachiningList()
-         LoadTypeList()
-         ReadTableFile()
-         NotifyPropertyChanged("SelMachining")
-      End Set
-   End Property
-   Private Sub SetSelMachining(value As String)
-      m_SelMachining = value
-      LoadMachiningList()
-      LoadTypeList()
-      ReadTableFile()
-      NotifyPropertyChanged("SelMachining")
-   End Sub
-
-   Private m_TableRowList As ObservableCollection(Of GridLine)
-   Public Property TableRowList As ObservableCollection(Of GridLine)
-      Get
-         Return m_TableRowList
-      End Get
-      Set(value As ObservableCollection(Of GridLine))
-         m_TableRowList = value
-      End Set
-   End Property
-
-   Private m_SelRowIndex As Integer = -1
-   Public Property SelRowIndex As Integer
-      Get
-         Return m_SelRowIndex
-      End Get
-      Set(value As Integer)
-         m_SelRowIndex = value
-      End Set
-   End Property
-
-   Private m_sTitle As String
-   Private m_BaseDir As String
-   Private m_MachTypeFilePath As String
-   Private m_TableTemplateFilePath As String
-   Private m_IsBeam As Boolean = True
-
-#Region "Messages"
-
-   Public ReadOnly Property Title As String
-      Get
-         Return m_sTitle
-      End Get
-   End Property
-
-   Public ReadOnly Property OnHdr As String
-      Get
-         Return EgtMsg( 9001)               'On
-      End Get
-   End Property
-
-   Public ReadOnly Property NameHdr As String
-      Get
-         Return EgtMsg( 9002)               'Nome
-      End Get
-   End Property
-
-   Public ReadOnly Property TypeHdr As String
-      Get
-         Return EgtMsg( 9003)               'Tipo
-      End Get
-   End Property
-
-   Public ReadOnly Property AddRowMsg As String
-      Get
-         Return EgtMsg( 9004)               'Aggiungi
-      End Get
-   End Property
-
-   Public ReadOnly Property DeleteRowMsg As String
-      Get
-         Return EgtMsg( 9005)               'Elimina
-      End Get
-   End Property
-
-   Public ReadOnly Property SaveMsg As String
-      Get
-         Return EgtMsg( 9006)               'Salva
-      End Get
-   End Property
-
-#End Region    ' Messages
-
-   ' Definizione comandi
-   Private m_cmdMoveRowUp As ICommand
-   Private m_cmdMoveRowDown As ICommand
-   Private m_cmdAddRow As ICommand
-   Private m_cmdDeleteRow As ICommand
-   Private m_cmdSave As ICommand
-   Private m_cmdClose As ICommand
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONSTRUCTOR"
-
-   Sub New(sTitle As String, sBaseDir As String, sMachTypePath As String, sTabTemplPath As String, Optional bIsBeam As Boolean = True)
-      ' carico le colonne della datagrid
-      GetPrivateProfileColumns(S_BEAMMACHININGS, BeamMachiningsColumns)
-      ' Titolo del dialogo
-      m_sTitle = sTitle
-      ' Imposto direttorio base e nomi dei file
-      m_BaseDir = sBaseDir
-      m_MachTypeFilePath = sMachTypePath
-      m_TableTemplateFilePath = sTabTemplPath
-      ' Imposto se per travi o pareti
-      m_IsBeam = bIsBeam
-      ' Seleziono la prima lavorazione
-      If m_MachiningList.Count > 0 Then
-         SetSelMachining(m_MachiningList(0))
-      End If
-      NotifyPropertyChanged("MachiningList")
-   End Sub
-
-#End Region    ' CONSTRUCTOR
-
-#Region "METHODS"
-
-   Private Function LoadMachiningList() As Boolean
-      Dim MachiningList As New List(Of String)
-      Select Case SelMachining
-         Case MACH_CUT
-            If m_IsBeam Then
-               LoadMachiningListByType(MachiningList, MCH_MY.MILLING, MCH_TF.SAWBLADE)
-            Else
-               LoadMachiningListByType(MachiningList, MCH_MY.SAWING, 0)
-            End If
-         Case MACH_DRILL
-            LoadMachiningListByType(MachiningList, MCH_MY.DRILLING, 0)
-            LoadMachiningListByType(MachiningList, MCH_MY.POCKETING, 0, False)
-            LoadMachiningListByType(MachiningList, MCH_MY.MILLING, MCH_TF.MILL, False)
-         Case MACH_MILLING
-            LoadMachiningListByType(MachiningList, MCH_MY.MILLING, MCH_TF.MILL)
-         Case MACH_POCKETING
-            LoadMachiningListByType(MachiningList, MCH_MY.POCKETING, 0)
-         Case MACH_SAWING
-            LoadMachiningListByType(MachiningList, MCH_MY.MORTISING, 0)
-      End Select
-      GridLine.SetNamesList(New ObservableCollection(Of String)(MachiningList))
-      Return True
-   End Function
-
-   Private Function LoadTypeList() As Boolean
-      Dim TypeList As New List(Of String)
-      Dim Index As Integer = 1
-      Dim Type As String = ""
-      While EgtUILib.GetPrivateProfileString( SelMachining, Index.ToString, "", Type, m_MachTypeFilePath) > 0
-         TypeList.Add(Type)
-         Index += 1
-      End While
-      GridLine.SetTypeList( New ObservableCollection(Of String)( TypeList))
-      Return True
-   End Function
-
-   Private Function ReadTableFile() As Boolean
-      ' svuoto la lista
-      m_TableRowList = New ObservableCollection(Of GridLine)
-      Dim FilePath As String = m_BaseDir & "\" & SelMachining & "Data.lua"
-      If Not File.Exists(FilePath) Then Return False
-      Dim FileContent As String() = File.ReadAllLines(FilePath)
-      Dim FoundTableName As Boolean = False
-      For LineIndex As Integer = 0 To FileContent.Count - 1
-         If FileContent(LineIndex).Contains(SelMachining & "Data") Then
-            FoundTableName = True
-         End If
-         Dim Open As Integer = CountCharacter(FileContent(LineIndex), "{"c)
-         Dim Close As Integer = CountCharacter(FileContent(LineIndex), "}"c)
-         If Close > Open Then
-            If FoundTableName Then
-               FoundTableName = False
-            End If
-         End If
-         If FoundTableName Then
-            Dim sOn As String = SearchKey(FileContent(LineIndex), ONCONST)
-            Dim sName As String = SearchKey(FileContent(LineIndex), NAME)
-            Dim sType As String = SearchKey(FileContent(LineIndex), TYPE)
-            If Not String.IsNullOrWhiteSpace(sOn) AndAlso Not String.IsNullOrWhiteSpace(sName) AndAlso Not String.IsNullOrWhiteSpace(sType) Then
-               If String.Compare(sOn, "true", True) = 0 Then
-                  TableRowList.Add(New GridLine(True, sName, sType))
-               ElseIf String.Compare(sOn, "false", True) = 0 Then
-                  TableRowList.Add(New GridLine(False, sName, sType))
-               Else
-                  Continue For
-               End If
-            End If
-         End If
-      Next
-      NotifyPropertyChanged("TableRowList")
-      Return True
-   End Function
-
-   Private Function WriteTableFile() As Boolean
-      ' inizio routine di scrittura
-      Dim FileContent As String() = File.ReadAllLines(m_TableTemplateFilePath)
-      Dim NewTableFileContent As New List(Of String)
-      Dim bBeamTable As Boolean = False
-      For LineIndex As Integer = 0 To FileContent.Count - 1
-         Dim sCurrLine As String = FileContent(LineIndex)
-         sCurrLine = sCurrLine.Replace(DATETIME, System.DateTime.Now.ToString("dd/MM/yyyy HH:mm:ss"))
-         sCurrLine = sCurrLine.Replace(TABLENAME, SelMachining & "Data")
-
-         If sCurrLine.Contains(SelMachining & "Data") AndAlso sCurrLine.Contains("=") Then
-            bBeamTable = True
-            NewTableFileContent.Add(sCurrLine)
-            PrintActiveMachiningList(NewTableFileContent)
-         End If
-
-         If Not bBeamTable Then
-            NewTableFileContent.Add(sCurrLine)
-         Else
-            bBeamTable = False
-         End If
-      Next
-      Dim FilePath As String = m_BaseDir & "\" & SelMachining & "Data.lua"
-      File.WriteAllLines(FilePath, NewTableFileContent, Text.Encoding.UTF8)
-      Return True
-   End Function
-
-   Private Sub PrintActiveMachiningList(NewTableFileContent As List(Of String))
-      For Index As Integer = 0 To m_TableRowList.Count - 1
-         If String.IsNullOrEmpty(m_TableRowList(Index).Name) Then Continue For
-         Dim CurrentLine As String = "   { On = " & If(m_TableRowList(Index).OnPar, "true", "false") & ", Name = '" & m_TableRowList(Index).Name & "', Type = '" & m_TableRowList(Index).Type & "'}"
-         If Index < m_TableRowList.Count - 1 Then
-            CurrentLine &= ","
-         End If
-         NewTableFileContent.Add(CurrentLine)
-      Next
-   End Sub
-
-
-#End Region    ' METHODS
-
-#Region "COMMANDS"
-
-#Region "MoveRowUp"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property MoveRowUp_Command As ICommand
-      Get
-         If m_cmdMoveRowUp Is Nothing Then
-            m_cmdMoveRowUp = New Command(AddressOf MoveRowUp)
-         End If
-         Return m_cmdMoveRowUp
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   ''' </summary>
-   Public Sub MoveRowUp()
-      If SelRowIndex > 0 Then
-         m_TableRowList.Move(SelRowIndex, SelRowIndex - 1)
-      End If
-   End Sub
-
-#End Region    ' MoveRowUp
-
-#Region "MoveRowDown"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property MoveRowDown_Command As ICommand
-      Get
-         If m_cmdMoveRowDown Is Nothing Then
-            m_cmdMoveRowDown = New Command(AddressOf MoveRowDown)
-         End If
-         Return m_cmdMoveRowDown
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   ''' </summary>
-   Public Sub MoveRowDown()
-      If SelRowIndex < m_TableRowList.Count - 1 Then
-         m_TableRowList.Move(SelRowIndex, SelRowIndex + 1)
-      End If
-   End Sub
-
-#End Region    ' MoveRowDown
-
-#Region "AddRow"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property AddRow_Command As ICommand
-      Get
-         If m_cmdAddRow Is Nothing Then
-            m_cmdAddRow = New Command(AddressOf AddRow)
-         End If
-         Return m_cmdAddRow
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   ''' </summary>
-   Public Sub AddRow()
-      m_TableRowList.Insert(SelRowIndex + 1, New GridLine(False, "", ""))
-   End Sub
-
-#End Region    ' AddRow
-
-#Region "DeleteRow"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property DeleteRow_Command As ICommand
-      Get
-         If m_cmdDeleteRow Is Nothing Then
-            m_cmdDeleteRow = New Command(AddressOf DeleteRow)
-         End If
-         Return m_cmdDeleteRow
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   ''' </summary>
-   Public Sub DeleteRow()
-      m_TableRowList.RemoveAt(SelRowIndex)
-   End Sub
-
-#End Region    ' DeleteRow
-
-#Region "Save"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property Save_Command As ICommand
-      Get
-         If m_cmdSave Is Nothing Then
-            m_cmdSave = New Command(AddressOf Save)
-         End If
-         Return m_cmdSave
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   ''' </summary>
-   Public Sub Save()
-      ' scrivo il file
-      WriteTableFile()
-      ' resetto le modifiche
-      For Each Line In m_TableRowList
-         Line.ResetIsModified()
-      Next
-   End Sub
-
-#End Region    ' Save
-
-#Region "Close"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property Close_Command As ICommand
-      Get
-         If m_cmdClose Is Nothing Then
-            m_cmdClose = New Command(AddressOf Close)
-         End If
-         Return m_cmdClose
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   ''' </summary>
-   Public Sub Close()
-      ' verifico se pagina precedente modificata
-      Dim TableModified As Boolean = False
-      For Each Line In m_TableRowList
-         If Line.IsModified Then
-            TableModified = True
-            Exit For
-         End If
-      Next
-      ' se modificata, chiedo se salvare
-      If TableModified Then
-         ' Salvare le modifiche apportate? - Salva
-         Select Case MessageBox.Show( EgtMsg( 9007), EgtMsg( 9006), MessageBoxButton.YesNo, MessageBoxImage.Question)
-            Case MessageBoxResult.Yes
-               Save()
-            Case MessageBoxResult.No
-               ' non devo fare nulla
-         End Select
-      End If
-      RaiseEvent m_CloseWindow(True)
-   End Sub
-
-#End Region    ' Close
-
-#End Region    ' COMMANDS
-
-End Class
-
-Public Class GridLine
-   Inherits VMBase
-
-   Friend ReadOnly Property IsModified As Boolean
-      Get
-         Return m_IsOnModified Or m_IsNameModified Or m_IsTypeModified
-      End Get
-   End Property
-   Friend Sub ResetIsModified()
-      m_IsOnModified = False
-      m_IsNameModified = False
-      m_IsTypeModified = False
-   End Sub
-
-   Private m_IsOnModified As Boolean = False
-   Private m_On As Boolean
-   Public Property OnPar As Boolean
-      Get
-         Return m_On
-      End Get
-      Set(value As Boolean)
-         m_On = value
-         m_IsOnModified = True
-      End Set
-   End Property
-
-   Private Shared m_NamesList As ObservableCollection(Of String)
-   Public ReadOnly Property NamesList As ObservableCollection(Of String)
-      Get
-         Return m_NamesList
-      End Get
-   End Property
-   Friend Shared Sub SetNamesList(NamesList As ObservableCollection(Of String))
-      m_NamesList = NamesList
-   End Sub
-
-   Private m_IsNameModified As Boolean = False
-   Private m_Name As String
-   Public Property Name As String
-      Get
-         Return m_Name
-      End Get
-      Set(value As String)
-         m_Name = value
-         m_IsNameModified = True
-      End Set
-   End Property
-
-   Private Shared m_TypeList As ObservableCollection(Of String)
-   Public ReadOnly Property TypeList As ObservableCollection(Of String)
-      Get
-         Return m_TypeList
-      End Get
-   End Property
-   Friend Shared Sub SetTypeList(TypeList As ObservableCollection(Of String))
-      m_TypeList = TypeList
-   End Sub
-
-   Private m_IsTypeModified As Boolean = False
-   Private m_Type As String
-   Public Property Type As String
-      Get
-         Return m_Type
-      End Get
-      Set(value As String)
-         m_Type = value
-         m_IsTypeModified = True
-      End Set
-   End Property
-
-   Sub New(bOnPar As Boolean, sName As String, sType As String)
-      m_On = bOnPar
-      m_Name = sName
-      m_Type = sType
-   End Sub
-
-End Class

EgtBEAMWALL.ViewerOptimizer/BeamMachiningsWindow/MyBeamMachiningsWindowVM.vb

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

EgtBEAMWALL.ViewerOptimizer/BeamMachiningsWindow/TablesUtility.vb

@@ -1,18 +0,0 @@
-Imports System.Text.RegularExpressions
-
-Module TablesUtility
-
-   Friend Function SearchKey(sLine As String, sKey As String) As String
-      Return Regex.Match(sLine, "[,|{|\s]" & sKey & "\s*=\s*['|\""]?(.*?)\s*?[,|}|'|\""]").Groups(1).Value
-   End Function
-
-   Public Function CountCharacter(ByVal sLine As String, ByVal cValue As Char) As Integer
-      Dim nCount As Integer = 0
-      Dim cArray() As Char = sLine.ToCharArray
-      For Index As Integer = 0 To cArray.Count - 1
-         If cArray(Index) = cValue Then nCount += 1
-      Next
-      Return nCount
-   End Function
-
-End Module

EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb

@@ -97,13 +97,13 @@ Public Class CALCPanelVM
 
    Public ReadOnly Property Verify_IsEnabled As Boolean
       Get
-         Return If(Map.refMainMenuVM.SelPage = Pages.VIEW, m_CALCPanel_IsEnabled And Not Map.refShowBeamPanelVM.bShowAll, True)
+         Return If(Map.refMainMenuVM.SelPage = Pages.VIEW, m_CALCPanel_IsEnabled And Not Map.refShowBeamPanelVM.bShowAll, m_CALCPanel_IsEnabled)
       End Get
    End Property
 
    Public ReadOnly Property Simulate_IsEnabled As Boolean
       Get
-         Return If(Map.refMainMenuVM.SelPage = Pages.VIEW, m_CALCPanel_IsEnabled And Not Map.refShowBeamPanelVM.bShowAll, True)
+         Return If(Map.refMainMenuVM.SelPage = Pages.VIEW, m_CALCPanel_IsEnabled And Not Map.refShowBeamPanelVM.bShowAll, m_CALCPanel_IsEnabled)
       End Get
    End Property
 
@@ -182,6 +182,9 @@ Public Class CALCPanelVM
    Friend Sub SetCalcPanelIsEnabled(bIsEnabled As Boolean)
       m_CALCPanel_IsEnabled = bIsEnabled
       NotifyPropertyChanged(NameOf(CALCPanel_IsEnabled))
+      NotifyPropertyChanged(NameOf(Verify_IsEnabled))
+      NotifyPropertyChanged(NameOf(Simulate_IsEnabled))
+      NotifyPropertyChanged(NameOf(Edit_IsEnabled))
    End Sub
 
    Private Sub Calc_ProcessResult(sender As Object, e As CalcResultEventArgs)
@@ -301,11 +304,23 @@ Public Class CALCPanelVM
                ' Inizializzo il pezzo in verifica
                Dim BTLPart As BTLPartVM = GetBTLPartVMFromBTLPartId(Bar.nBarId)
                BTLPart.CalcPartUpdate(0, 0, "")
+               ' Resetto feature in collisione
+               For Each Feature In BTLPart.m_BTLFeatureVMList
+                  If Feature.nState = CalcStates.COLLISION Then
+                     Feature.CalcFeatureUpdate(0, 0, "")
+                  End If
+               Next
             Else
                ' Inizializzo i pezzi del gruppo di lavoro in verifica
                Dim Machgroup As MyMachGroupVM = GetMachgroupVMFromMachgroupId(Bar.nBarId)
-               For Each Part In Machgroup.PartVMList
+               For Each Part As PartVM In Machgroup.PartVMList
                   Part.CalcPartUpdate(0, 0, "")
+                  ' Resetto feature in collisione
+                  For Each Feature As BTLFeatureVM In Part.FeatureVMList
+                     If Feature.nState = CalcStates.COLLISION Then
+                        Feature.CalcFeatureUpdate(0, 0, "")
+                     End If
+                  Next
                Next
                Machgroup.CalcMachGroupUpdate(0, 0, "")
             End If
@@ -483,7 +498,7 @@ Public Class CALCPanelVM
       Next
    End Function
 
-   Private Shared Function GetMachgroupVMFromMachgroupId(nMachGroupId As Integer) As MyMachGroupVM
+   Friend Shared Function GetMachgroupVMFromMachgroupId(nMachGroupId As Integer) As MyMachGroupVM
       Return Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.FirstOrDefault(Function(x) x.Id = nMachGroupId)
    End Function
 
@@ -526,7 +541,7 @@ Public Class CALCPanelVM
             End If
          End If
       Next
-      Map.refCALCPanelVM.SetChooseMachineBtn_Visibility(MachineList.Count > 1)
+      Map.refCALCPanelVM.SetChooseMachineBtn_Visibility(Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso MachineList.Count > 1)
    End Sub
 
    Friend Function IsMachineModified() As Boolean
@@ -604,7 +619,7 @@ Public Class CALCPanelVM
                Case Core.CalcStates.OK, CalcStates.INFO
                   Bar.nCmdType = CalcIntegration.CmdTypes.GENERATE
                Case Else
-                  If Map.refProjectVM.BTLStructureVM.SelBTLPart.nGlobalState = CalcStates.NOTCALCULATED Then
+                  If Map.refProjectVM.BTLStructureVM.SelBTLPart.nGlobalState = CalcStates.NOTCALCULATED OrElse Map.refProjectVM.BTLStructureVM.SelBTLPart.nFeaturesGlobalState > CalcStates.INFO Then
                      Dim sBTLPartFilePath As String = Map.refProjManagerVM.CurrProj.sProjDirPath & "\" & Map.refProjectVM.BTLStructureVM.SelBTLPart.nPDN.ToString() & ".ori.bwe"
                      If File.Exists(sBTLPartFilePath) Then File.Delete(sBTLPartFilePath)
                   End If
@@ -638,7 +653,7 @@ Public Class CALCPanelVM
                Case Core.CalcStates.OK, CalcStates.INFO
                   Bar.nCmdType = CalcIntegration.CmdTypes.GENERATE
                Case Else
-                  If SelMachGroup.nGlobalState = CalcStates.NOTCALCULATED Then
+                  If SelMachGroup.nGlobalState = CalcStates.NOTCALCULATED OrElse (SelMachGroup.nPartsGlobalState > CalcStates.INFO) Then
                      Dim sMachGroupFilePath As String = Map.refProdManagerVM.CurrProd.sProdDirPath & "\" & SelMachGroup.Name.ToString() & ".ori.bwe"
                      If File.Exists(sMachGroupFilePath) Then File.Delete(sMachGroupFilePath)
                   End If
@@ -725,7 +740,7 @@ Public Class CALCPanelVM
                Case Core.CalcStates.OK, CalcStates.INFO
                   Bar.nCmdType = CalcIntegration.CmdTypes.GENERATE
                Case Else
-                  If CurrPart.nGlobalState = CalcStates.NOTCALCULATED Then
+                  If CurrPart.nGlobalState = CalcStates.NOTCALCULATED OrElse CurrPart.nFeaturesGlobalState > CalcStates.INFO Then
                      Dim sBTLPartFilePath As String = Map.refProjManagerVM.CurrProj.sProjDirPath & "\" & CurrPart.nPDN.ToString() & ".ori.bwe"
                      If File.Exists(sBTLPartFilePath) Then File.Delete(sBTLPartFilePath)
                   End If
@@ -756,7 +771,7 @@ Public Class CALCPanelVM
                Case Core.CalcStates.OK, CalcStates.INFO
                   Bar.nCmdType = CalcIntegration.CmdTypes.GENERATE
                Case Else
-                  If CurrMachGroup.nGlobalState = CalcStates.NOTCALCULATED Then
+                  If CurrMachGroup.nGlobalState = CalcStates.NOTCALCULATED OrElse (CurrMachGroup.nPartsGlobalState > CalcStates.INFO) Then
                      Dim sMachGroupFilePath As String = Map.refProdManagerVM.CurrProd.sProdDirPath & "\" & CurrMachGroup.Name.ToString() & ".ori.bwe"
                      If File.Exists(sMachGroupFilePath) Then File.Delete(sMachGroupFilePath)
                   End If
@@ -814,7 +829,7 @@ Public Class CALCPanelVM
             For Each MachGroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
                If MachGroup.nProduction_State >= ItemState.Assigned Then Continue For
                If MachGroup.nGlobalState <> CalcStates.NOTCALCULATED Then
-                  MachGroup.ResetCalcMachGroup()
+                  MachGroup.ResetCalcTotalMachGroup()
                End If
             Next
          Else
@@ -823,7 +838,7 @@ Public Class CALCPanelVM
             ' se barra gia' assegnata a supervisore, esco
             If SelMachGroup.nProduction_State >= ItemState.Assigned Then Return
             If SelMachGroup.nGlobalState <> CalcStates.NOTCALCULATED Then
-               SelMachGroup.ResetCalcMachGroup()
+               SelMachGroup.ResetCalcTotalMachGroup()
             End If
          End If
       End If

EgtBEAMWALL.ViewerOptimizer/CALCPanel/CalcPanelV.xaml

@@ -40,11 +40,10 @@
            Visibility="{Binding ViewPage_Visibility}">
       <Image Source="/Resources/CALCPanel/Edit.png" Stretch="Uniform"/>
    </Button>
-   <Button FontSize="20"
-           FontWeight="Light"
-           ToolTip="{Binding ChooseMachine_ToolTip}"
+   <Button ToolTip="{Binding ChooseMachine_ToolTip}"
            Style="{StaticResource ToolBar_Button}"
            Command="{Binding ChooseMachine_Command}"
+           IsEnabled="{Binding CALCPanel_IsEnabled}"
            Visibility="{Binding ChooseMachineBtn_Visibility}">
       <Image Source="/Resources/CALCPanel/ChooseMachine.png" Stretch="Uniform"/>
    </Button>

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageV.xaml

@@ -215,50 +215,6 @@
                     </Grid>
                 </TabItem.Content>
             </TabItem>
-            <TabItem Header="Colonne tabelle">
-                <TabItem.Content>
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="1*"/>
-                            <ColumnDefinition Width="1*"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="1*"/>
-                        </Grid.RowDefinitions>
-                        <EgtBEAMWALL:DGColumnsListV DataContext="{Binding}" 
-                                         ItemsSource="{Binding DGColumnsList}"
-                                         SelectedItem="{Binding SelDGColumn}"
-                                         Grid.Column="0"
-                                         Margin="5">
-                            <DataGrid.GroupStyle>
-                                <GroupStyle>
-                                    <GroupStyle.ContainerStyle>
-                                        <Style TargetType="{x:Type GroupItem}">
-                                            <Setter Property="Template">
-                                                <Setter.Value>
-                                                    <ControlTemplate TargetType="{x:Type GroupItem}">
-                                                        <Expander IsExpanded="True">
-                                                            <Expander.Background>
-                                                                <SolidColorBrush Color="LightGray"></SolidColorBrush>
-                                                            </Expander.Background>
-                                                            <Expander.Header>
-                                                                <StackPanel Orientation="Horizontal">
-                                                                    <TextBlock Text="{Binding Path=Name}" />
-                                                                </StackPanel>
-                                                            </Expander.Header>
-                                                            <ItemsPresenter />
-                                                        </Expander>
-                                                    </ControlTemplate>
-                                                </Setter.Value>
-                                            </Setter>
-                                        </Style>
-                                    </GroupStyle.ContainerStyle>
-                                </GroupStyle>
-                            </DataGrid.GroupStyle>
-                        </EgtBEAMWALL:DGColumnsListV>
-                    </Grid>
-                </TabItem.Content>
-            </TabItem>
         </TabControl>
     
         <Button Command="{Binding SaveCommand}"

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb

@@ -124,18 +124,6 @@ Public Class ConfigurationPageVM
       End Set
    End Property
 
-   ' lista delle colonne con le relative proprietà della DataGrid
-   Private m_DGColumnsList_View As CollectionView = Nothing
-   Protected m_DGColumnsList As New ObservableCollection(Of IniDataGridColumn)
-   Public Property DGColumnsList As ObservableCollection(Of IniDataGridColumn)
-      Get
-         Return m_DGColumnsList
-      End Get
-      Set(value As ObservableCollection(Of IniDataGridColumn))
-         m_DGColumnsList = value
-      End Set
-   End Property
-
 #Region "Messages"
 
    Public ReadOnly Property L_Msg As String
@@ -315,11 +303,6 @@ Public Class ConfigurationPageVM
       m_QBTLParamVMList_View = CollectionViewSource.GetDefaultView(m_QBTLParamVMList)
       m_QBTLParamVMList_View.GroupDescriptions.Add(New PropertyGroupDescription(NameOf(QBTLParamVM.GroupType)))
       m_QBTLParamVMList_View.GroupDescriptions.Add(New PropertyGroupDescription(NameOf(QBTLParamVM.ghDesc)))
-      ' carico la lista delle colonne delle DataGrid in ConfigurationPage
-      LoadConfigDGColumns()
-      ' setto il grouping ad 1 livello per la DataGrid
-      m_DGColumnsList_View = CollectionViewSource.GetDefaultView(m_DGColumnsList)
-      m_DGColumnsList_View.GroupDescriptions.Add(New PropertyGroupDescription(NameOf(IniDataGridColumn.VisParentDataGridName)))
    End Sub
 
 #End Region ' Constructor
@@ -345,7 +328,6 @@ Public Class ConfigurationPageVM
       WriteMachParams()
       WriteMachParamsLua()
       WriteProcessParams(PRCList.ToList())
-      WriteDataGridColumns()
       WriteMainPrivateProfileString(S_GENERAL, K_MESSAGES, m_SelectedLanguage.Name)
       WriteMainPrivateProfileString(S_SCENE, K_MMUNITS, SelMeasureUnit.ToString())
       WriteMainPrivateProfileString(S_NEST, K_SECTIONTIME, DoubleToString(m_SectionTime, 5))
@@ -468,19 +450,6 @@ Public Class ConfigurationPageVM
          Next
          NotifyPropertyChanged(NameOf(QBTLParamVMList))
       End If
-      ' verifico se i valori delle colonne DataGrid sono stati modificati 
-      For Each DGColumnItem In DGColumnsList
-         If DGColumnItem.IsModified Then
-            If MessageBox.Show(EgtMsg(61882), "", MessageBoxButton.YesNo, MessageBoxImage.Question) = MessageBoxResult.Yes Then
-               ' scrivo i valori delle colonne DataGrid modificate
-               WriteDataGridColumns()
-            Else
-               ' se da non salvare li resetto ed esco dai For
-               LoadConfigDGColumns()
-               Exit For
-            End If
-         End If
-      Next
    End Sub
 
    ' funzione che verifica l'inserimento della password quando si edita un parametro Macchina
@@ -584,67 +553,6 @@ Public Class ConfigurationPageVM
       Next
    End Sub
 
-   ' funzione che carica la DataGrid di configurazione delle colonne delle EgtDataGrid
-   Public Sub LoadConfigDGColumns()
-      DGColumnsList.Clear()
-      GetPrivateProfileIniColumns(S_FEATURELIST, DGColumnsList)
-      GetPrivateProfileIniColumns(S_OPENPROJFILEDLG_PROJ, DGColumnsList)
-      GetPrivateProfileIniColumns(S_OPENPROJFILEDLG_PROD, DGColumnsList)
-      GetPrivateProfileIniColumns(S_RAWPARTLIST_BEAM, DGColumnsList)
-      GetPrivateProfileIniColumns(S_RAWPARTLIST_WALL, DGColumnsList)
-      GetPrivateProfileIniColumns(S_PARTINRAWPARTLIST_BEAM, DGColumnsList)
-      GetPrivateProfileIniColumns(S_PARTINRAWPARTLIST_WALL, DGColumnsList)
-      GetPrivateProfileIniColumns(S_PARTLIST, DGColumnsList)
-      GetPrivateProfileIniColumns(S_FEATUREINPARTINRAWPARTLIST, DGColumnsList)
-      GetPrivateProfileIniColumns(S_STATISTICS, DGColumnsList)
-      GetPrivateProfileIniColumns(S_OPTIMIZERSTATISTICS, DGColumnsList)
-      GetPrivateProfileIniColumns(S_BEAMMACHININGS, DGColumnsList)
-      GetPrivateProfileIniColumns(S_PARAMETERLIST_P, DGColumnsList)
-      GetPrivateProfileIniColumns(S_PARAMETERLIST_Q, DGColumnsList)
-      GetPrivateProfileIniColumns(S_SPARAMLIST_BEAM, DGColumnsList)
-      GetPrivateProfileIniColumns(S_SPARAMLIST_WALL, DGColumnsList)
-      GetPrivateProfileIniColumns(S_SECTXMATLIST_BEAM, DGColumnsList)
-      GetPrivateProfileIniColumns(S_SECTXMATLIST_WALL, DGColumnsList)
-   End Sub
-
-   ' funzione per calcolare e scrivere la stringhe dei parametri delle colonne relative ad una ParentDataGridName nell'INI
-   Public Sub SaveDataGridColumns(ParentDataGridName As String, DGColumnsList As ObservableCollection(Of IniDataGridColumn))
-      For Each ColumnItem In DGColumnsList
-         If ColumnItem.ParentDataGridName = ParentDataGridName Then
-            Dim sColumnParams = String.Empty
-            sColumnParams = ColumnItem.Name & "," & If(ColumnItem.CanUserReorder, 1, 0) & "," & If(ColumnItem.CanUserResize, 1, 0) & "," &
-               If(ColumnItem.CanUserSort, 1, 0) & "," & If(ColumnItem.IsReadOnly, 1, 0) & "," & DoubleToString(ColumnItem.Width.Value, 6) & "," &
-               ColumnItem.Width.UnitType & "," & If(ColumnItem.Visible, 1, 0) & "," & If(ColumnItem.CanUserEditVisible, 1, 0)
-            WriteColumnPrivateProfileParam(ParentDataGridName, ColumnItem.m_DisplayIndex, sColumnParams)
-         End If
-      Next
-   End Sub
-
-   ' funzione che scrive i valori delle proprietà delle colonne customizzate delle EgtDataGrid nell'INI
-   Public Sub WriteDataGridColumns()
-      SaveDataGridColumns(S_FEATURELIST, DGColumnsList)
-      SaveDataGridColumns(S_OPENPROJFILEDLG_PROJ, DGColumnsList)
-      SaveDataGridColumns(S_OPENPROJFILEDLG_PROD, DGColumnsList)
-      SaveDataGridColumns(S_RAWPARTLIST_BEAM, DGColumnsList)
-      SaveDataGridColumns(S_RAWPARTLIST_WALL, DGColumnsList)
-      SaveDataGridColumns(S_PARTINRAWPARTLIST_BEAM, DGColumnsList)
-      SaveDataGridColumns(S_PARTINRAWPARTLIST_WALL, DGColumnsList)
-      SaveDataGridColumns(S_PARTLIST, DGColumnsList)
-      SaveDataGridColumns(S_FEATUREINPARTINRAWPARTLIST, DGColumnsList)
-      SaveDataGridColumns(S_STATISTICS, DGColumnsList)
-      SaveDataGridColumns(S_OPTIMIZERSTATISTICS, DGColumnsList)
-      SaveDataGridColumns(S_BEAMMACHININGS, DGColumnsList)
-      SaveDataGridColumns(S_PARAMETERLIST_P, DGColumnsList)
-      SaveDataGridColumns(S_PARAMETERLIST_Q, DGColumnsList)
-      SaveDataGridColumns(S_SPARAMLIST_BEAM, DGColumnsList)
-      SaveDataGridColumns(S_SPARAMLIST_WALL, DGColumnsList)
-      SaveDataGridColumns(S_SECTXMATLIST_BEAM, DGColumnsList)
-      SaveDataGridColumns(S_SECTXMATLIST_WALL, DGColumnsList)
-      For Each DGColumnItem In DGColumnsList
-         DGColumnItem.IsModifiedReset()
-      Next
-   End Sub
-
 #End Region ' Methods
 
 End Class
@@ -838,239 +746,6 @@ Public Class MachTable
 
 End Class
 
-Public Class IniDataGridColumn
-
-   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
-
-   ' Nome datagrid di cui fa parte la colonna visualizzato nell'interfaccia
-   Public ReadOnly Property VisParentDataGridName As String
-      Get
-         Return ParentDataGridName.Replace(ParentDataGridName.Substring(0, 3), "").Trim()
-      End Get
-   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
-
-   ' Nome colonna visualizzato nell'interfaccia
-   Public ReadOnly Property VisName As String
-      Get
-         Return Name.Replace(Name.Substring(0, 3), "").Trim()
-      End Get
-   End Property
-
-   Private Property m_Width As DataGridLength
-   Public Property Width As DataGridLength
-      Get
-         Return m_Width
-      End Get
-      Set(value As DataGridLength)
-         m_Width = value
-      End Set
-   End Property
-
-   Private m_IsModifiedDisplayIndex
-   Friend Property m_DisplayIndex As Integer
-   Public Property DisplayIndex As Integer
-      Get
-         Return If(Visible, m_DisplayIndex, -1)
-      End Get
-      Set(value As Integer)
-         m_DisplayIndex = value
-         m_IsModifiedDisplayIndex = (m_Name <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.NAME))
-         ' se DisplayIndex viene settato ad un valore che corrisponde a quello che aveva inizialmente aggiorno gli IsModified
-         ' delle altre proprietà utilizzando il DisplayIndex attuale
-         If Not m_IsModifiedDisplayIndex Then
-            m_IsModifiedIsReadOnly = (m_IsReadOnly <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.ISREADONLY))
-            m_IsModifiedCanUserReorder = (m_CanUserReorder <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.REORDER))
-            m_IsModifiedCanUserResize = (m_CanUserResize <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.RESIZE))
-            m_IsModifiedCanUserSort = (m_CanUserSort <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.SORT))
-            m_IsModifiedVisible = (m_Visible <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.VISIBLE))
-         End If
-      End Set
-   End Property
-
-   Private m_IsModifiedIsReadOnly As Boolean = False
-   Private Property m_IsReadOnly As Boolean = True
-   Public Property IsReadOnly As Boolean
-      Get
-         Return m_IsReadOnly
-      End Get
-      Set(value As Boolean)
-         m_IsReadOnly = value
-         m_IsModifiedIsReadOnly = (m_IsReadOnly <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.ISREADONLY))
-      End Set
-   End Property
-
-   Private m_IsModifiedCanUserReorder As Boolean = False
-   Private m_CanUserReorder As Boolean
-   Public Property CanUserReorder As Boolean
-      Get
-         Return m_CanUserReorder
-      End Get
-      Set(value As Boolean)
-         m_CanUserReorder = value
-         m_IsModifiedCanUserReorder = (m_CanUserReorder <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.REORDER))
-      End Set
-   End Property
-
-   Private m_IsModifiedCanUserResize As Boolean = False
-   Private m_CanUserResize As Boolean
-   Public Property CanUserResize As Boolean
-      Get
-         Return m_CanUserResize
-      End Get
-      Set(value As Boolean)
-         m_CanUserResize = value
-         m_IsModifiedCanUserResize = (m_CanUserResize <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.RESIZE))
-      End Set
-   End Property
-
-   Private m_IsModifiedCanUserSort As Boolean = False
-   Private m_CanUserSort As Boolean
-   Public Property CanUserSort As Boolean
-      Get
-         Return m_CanUserSort
-      End Get
-      Set(value As Boolean)
-         m_CanUserSort = value
-         m_IsModifiedCanUserSort = (m_CanUserSort <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.SORT))
-      End Set
-   End Property
-
-   Private m_IsModifiedVisible As Boolean = False
-   Private m_Visible As Boolean
-   Public Property Visible As Boolean
-      Get
-         Return m_Visible
-      End Get
-      Set(value As Boolean)
-         m_Visible = value
-         ' Utilizzo OldDGIndex e NewDGIndex per muovere la Column tra il gruppo dei Visible (in alto) o il gruppo
-         ' dei non Visible (in basso): in ambo i casi verrà sempre spostata in mezzo ai due raggruppamenti
-         Dim OldDGIndex As Integer = Map.refConfigurationPageVM.DGColumnsList.IndexOf(Me)
-         If value Then
-            Dim NewDGIndex As Integer = Map.refConfigurationPageVM.DGColumnsList.IndexOf(Map.refConfigurationPageVM.DGColumnsList.FirstOrDefault(
-                                                                                         Function(x) x.ParentDataGridName = ParentDataGridName AndAlso
-                                                                                         x.Visible = False))
-            ' se NewDGIndex = -1 (ovvero ho settato l'ultima Column rimasta non Visible a Visible) oppure
-            ' se il nuovo indice è subito dopo il vecchio non la sposto altrimenti viene spostata in maniera sbagliata
-            If NewDGIndex <> -1 AndAlso NewDGIndex <> OldDGIndex + 1 Then Map.refConfigurationPageVM.DGColumnsList.Move(OldDGIndex, NewDGIndex)
-         Else
-            Dim NewDGIndex As Integer = Map.refConfigurationPageVM.DGColumnsList.IndexOf(Map.refConfigurationPageVM.DGColumnsList.FirstOrDefault(
-                                                                                         Function(x) x.ParentDataGridName = ParentDataGridName AndAlso
-                                                                                         x.Visible = False AndAlso
-                                                                                         x.Name <> Name))
-            ' se NewDGIndex = -1 vuol dire che erano tutte settate a Visible perciò devo calcolare l'indice
-            ' dell'ultima Column con quel ParentDataGridName e spostarlo lì
-            If NewDGIndex = -1 Then
-               Dim FirstIndex As Integer = Map.refConfigurationPageVM.DGColumnsList.IndexOf(Map.refConfigurationPageVM.DGColumnsList.FirstOrDefault(
-                                                                                         Function(x) x.ParentDataGridName = ParentDataGridName))
-               Dim LastIndex = FirstIndex
-               While LastIndex < Map.refConfigurationPageVM.DGColumnsList.Count AndAlso Map.refConfigurationPageVM.DGColumnsList(LastIndex).ParentDataGridName = ParentDataGridName
-                  LastIndex += 1
-               End While
-               NewDGIndex = LastIndex
-            End If
-            Map.refConfigurationPageVM.DGColumnsList.Move(OldDGIndex, NewDGIndex - 1)
-         End If
-         ' aggiorno i DisplayIndex di ciascuna Column della ParentDataGridName in questione
-         Dim index = 0
-         For Each DGColumnItem In Map.refConfigurationPageVM.DGColumnsList
-            If DGColumnItem.ParentDataGridName = ParentDataGridName Then
-               DGColumnItem.DisplayIndex = index
-               index += 1
-            End If
-         Next
-         ' uso il Move col medesimo valore per i 2 argomenti per refreshare i DisplayIndex delle Column
-         ' della ParentDataGridName in questione appena riordinate
-         For index = 0 To Map.refConfigurationPageVM.DGColumnsList.Count - 1
-            If Map.refConfigurationPageVM.DGColumnsList(index).ParentDataGridName = ParentDataGridName Then
-               Map.refConfigurationPageVM.DGColumnsList.Move(index, index)
-            End If
-         Next
-         ' setto se il valore è stato modificato, a partire dalla verifica che il Nome e DisplayIndex combacino (altrimenti è per forza modificato)
-         m_IsModifiedVisible = (m_Name <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.NAME)) OrElse
-            (If(m_Visible, 1, 0) <>
-            GetPrivateProfileIniColumnProperty(ParentDataGridName, Map.refConfigurationPageVM.DGColumnsList, m_DisplayIndex, EgtDGColumnProperty.VISIBLE))
-      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
-      End Set
-   End Property
-
-   Public ReadOnly Property IsModified() As Boolean
-      Get
-         Return m_IsModifiedDisplayIndex OrElse
-            m_IsModifiedIsReadOnly OrElse
-            m_IsModifiedCanUserReorder OrElse
-            m_IsModifiedCanUserResize OrElse
-            m_IsModifiedCanUserSort OrElse
-            m_IsModifiedVisible
-      End Get
-   End Property
-
-   Public Sub IsModifiedReset()
-      m_IsModifiedDisplayIndex = False
-      m_IsModifiedIsReadOnly = False
-      m_IsModifiedCanUserReorder = False
-      m_IsModifiedCanUserResize = False
-      m_IsModifiedCanUserSort = False
-      m_IsModifiedVisible = False
-   End Sub
-
-   Sub New(sName As String)
-      m_Name = sName
-   End Sub
-
-   Sub New(sParentDG As String, nDisplayIndex As Integer, sName As String, bCanUserReorder As Boolean, bCanUserResize As Boolean, bCanUserSort As Boolean, bIsReadOnly As Boolean, Width As DataGridLength, bVisible As Boolean, bCanUserEditVisible As Boolean)
-      m_ParentDataGridName = sParentDG
-      m_DisplayIndex = nDisplayIndex
-      m_Name = sName
-      m_CanUserReorder = bCanUserReorder
-      m_CanUserResize = bCanUserResize
-      m_CanUserSort = bCanUserSort
-      m_IsReadOnly = bIsReadOnly
-      m_Width = Width
-      m_Visible = bVisible
-      m_CanUserEditVisible = bCanUserEditVisible
-   End Sub
-
-End Class
-
 ' Tipo parametro nel file di configurazione Macchina
 Public Enum MachParamType As Integer
    DOUBLE_ = 1
@@ -1079,68 +754,3 @@ Public Enum MachParamType As Integer
    LENGTH = 4
    CHECKBOX = 5
 End Enum
-
-Public Module IniDataGridColumnFunctions
-
-   ' funzione per ottenere dal file INI le colonne da caricare nella DataGrid usata per customizzare le proprietà delle colonne delle EgtDataGrid del programma
-   Public Function GetPrivateProfileIniColumns(ParentDGName As String, ByRef ocColumns As ObservableCollection(Of IniDataGridColumn)) 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
-            StringToDouble(sColumnParams(5), Width)
-            Integer.TryParse(sColumnParams(6), WidthType)
-            Dim bVisible As Boolean = sColumnParams(7).Equals("1")
-            Dim bCanUserEditVisible As Boolean = sColumnParams(8).Equals("1")
-            ocColumns.Add(New IniDataGridColumn(ParentDGName, colIndex, sName, bReorder, bResize, bSort, bIsReadOnly, New DataGridLength(Width, WidthType), bVisible, bCanUserEditVisible))
-         End If
-         colIndex += 1
-      End While
-      Return ocColumns.Count > 0
-   End Function
-
-   ' funzione che ottiene dal file INI la singola proprietà legata ad una specifica colonna
-   Public Function GetPrivateProfileIniColumnProperty(ParentDGName As String, ocColumns As ObservableCollection(Of IniDataGridColumn), DisplayIndex As Integer, PropertyIndex As EgtDGColumnProperty) As String
-      Dim str = String.Empty
-      If EgtUILib.GetPrivateProfileString(ParentDGName, DisplayIndex, String.Empty, str, m_sDataGridColumnsIniFile) > 0 Then
-         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
-            If PropertyIndex > -1 AndAlso PropertyIndex < sColumnParams.Count Then Return sColumnParams(PropertyIndex)
-         End If
-      End If
-      Return ""
-   End Function
-
-   Public Enum EgtDGColumnProperty
-      NAME = 0
-      REORDER = 1
-      RESIZE = 2
-      SORT = 3
-      ISREADONLY = 4
-      WIDTH = 5
-      WIDTHTYPE = 6
-      VISIBLE = 7
-      EDITVISIBLE = 8
-   End Enum
-
-End Module
-

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/DGColumnsListV.xaml

@@ -1,89 +0,0 @@
-<DataGrid x:Class="DGColumnsListV"
-          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-          xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.ViewerOptimizer"
-          AutoGenerateColumns="False"
-          CanUserSortColumns="False"
-          CanUserResizeColumns="False"
-          CanUserResizeRows="False"
-          CanUserReorderColumns="False"
-          SelectionMode="Single"
-          ScrollViewer.CanContentScroll="False" 
-          ScrollViewer.VerticalScrollBarVisibility="Auto"
-          ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-          Margin="0,0,0,5">
-
-    <DataGrid.Columns>
-        <!--Indice-->
-        <!--<DataGridTextColumn Binding="{Binding DisplayIndex}"
-                            Width="Auto"
-                            IsReadOnly="True">
-            <DataGridTextColumn.HeaderTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding DataContext.DisplayIndex_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                </DataTemplate>
-            </DataGridTextColumn.HeaderTemplate>
-        </DataGridTextColumn>-->
-        <!--Nome colonna-->
-        <DataGridTextColumn Binding="{Binding VisName}"
-                            Width="Auto"
-                            IsReadOnly="True">
-            <DataGridTextColumn.HeaderTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding DataContext.ColumnName_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                </DataTemplate>
-            </DataGridTextColumn.HeaderTemplate>
-        </DataGridTextColumn>
-        <!--CanUserReorder-->
-        <DataGridCheckBoxColumn Binding="{Binding CanUserReorder, UpdateSourceTrigger=PropertyChanged}"
-                                Width="Auto">
-            <DataGridCheckBoxColumn.HeaderTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding DataContext.CanUserReorder_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                </DataTemplate>
-            </DataGridCheckBoxColumn.HeaderTemplate>
-        </DataGridCheckBoxColumn>
-        <!--CanUserResize-->
-        <DataGridCheckBoxColumn Binding="{Binding CanUserResize, UpdateSourceTrigger=PropertyChanged}"
-                                Width="Auto">
-            <DataGridCheckBoxColumn.HeaderTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding DataContext.CanUserResize_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                </DataTemplate>
-            </DataGridCheckBoxColumn.HeaderTemplate>
-        </DataGridCheckBoxColumn>
-        <!--CanUserSort-->
-        <DataGridCheckBoxColumn Binding="{Binding CanUserSort, UpdateSourceTrigger=PropertyChanged}"
-                                Width="Auto">
-            <DataGridCheckBoxColumn.HeaderTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding DataContext.CanUserSort_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                </DataTemplate>
-            </DataGridCheckBoxColumn.HeaderTemplate>
-        </DataGridCheckBoxColumn>
-        <!--IsReadOnly-->
-        <!--<DataGridCheckBoxColumn Binding="{Binding IsReadOnly, UpdateSourceTrigger=PropertyChanged}"
-                                Width="Auto">
-            <DataGridCheckBoxColumn.HeaderTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding DataContext.IsReadOnly_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                </DataTemplate>
-            </DataGridCheckBoxColumn.HeaderTemplate>
-        </DataGridCheckBoxColumn>-->
-        <!--Visible-->
-        <DataGridCheckBoxColumn Binding="{Binding Visible, UpdateSourceTrigger=PropertyChanged}"
-                                Width="Auto">
-            <DataGridCheckBoxColumn.HeaderTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding DataContext.Visible_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                </DataTemplate>
-            </DataGridCheckBoxColumn.HeaderTemplate>
-            <DataGridCheckBoxColumn.CellStyle>
-                <Style TargetType="DataGridCell">
-                    <Setter Property="IsEnabled" Value="{Binding CanUserEditVisible}" />
-                </Style>
-            </DataGridCheckBoxColumn.CellStyle>
-        </DataGridCheckBoxColumn>
-    </DataGrid.Columns>
-
-</DataGrid>

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/DGColumnsListV.xaml.vb

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

EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj

@@ -169,6 +169,7 @@
       <DependentUpon>InputPwdWndV.xaml</DependentUpon>
     </Compile>
     <Compile Include="InputPwdWnd\InputPwdWndVM.vb" />
+    <Compile Include="ItemParamList\DuploQParameterListVM.vb" />
     <Compile Include="MultiCopyRawPartWnd\MultiCopyRawPartWndV.xaml.vb">
       <DependentUpon>MultiCopyRawPartWndV.xaml</DependentUpon>
     </Compile>
@@ -180,8 +181,7 @@
     <Compile Include="BeamMachiningsWindow\BeamMachiningsWindowV.xaml.vb">
       <DependentUpon>BeamMachiningsWindowV.xaml</DependentUpon>
     </Compile>
-    <Compile Include="BeamMachiningsWindow\BeamMachiningsWindowVM.vb" />
-    <Compile Include="BeamMachiningsWindow\TablesUtility.vb" />
+    <Compile Include="BeamMachiningsWindow\MyBeamMachiningsWindowVM.vb" />
     <Compile Include="BlockedWnd\BlockedWndV.xaml.vb">
       <DependentUpon>BlockedWndV.xaml</DependentUpon>
     </Compile>
@@ -209,9 +209,6 @@
       <DependentUpon>CalcPanelV.xaml</DependentUpon>
     </Compile>
     <Compile Include="CALCPanel\CALCPanelVM.vb" />
-    <Compile Include="ConfigurationPage\DGColumnsListV.xaml.vb">
-      <DependentUpon>DGColumnsListV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Constants\ConstWarehouseIni.vb" />
     <Compile Include="FreeContourManager\FreeContourManagerV.xaml.vb">
       <DependentUpon>FreeContourManagerV.xaml</DependentUpon>
@@ -254,8 +251,6 @@
     <Compile Include="Utility\DbControllers.vb" />
     <Compile Include="Utility\DisableModifiedMgr.vb" />
     <Compile Include="Utility\LuaExec.vb" />
-    <Compile Include="Utility\MachineModel.vb" />
-    <Compile Include="Utility\ManageWindow.vb" />
     <Compile Include="Utility\SectionXMaterialToBeAdded.vb" />
     <Compile Include="Utility\TextBlockUtils.vb" />
     <Compile Include="Utility\TreeViewItemBase.vb" />
@@ -405,10 +400,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ConfigurationPage\DGColumnsListV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="FreeContourManager\FreeContourManagerV.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/MyInstrumentPanelVM.vb

@@ -167,6 +167,7 @@ Public Class MyInstrumentPanelVM
       Dim ChangeParameterWndVM As New ChangeParameterWndVM
       Dim ChangeParameterWnd As New ChangeParameterWndV(Application.Current.MainWindow, ChangeParameterWndVM)
       If ChangeParameterWnd.ShowDialog() Then
+         LoadingWndHelper.OpenLoadingWnd(ActiveIds.CHANGEPARAM, 1, EgtMsg(63014), "", 100)       ' Modifying parameters
          ' faccio passare pezzi
          If Not IsNothing(ChangeParameterWndVM.SelParam) Then
             For Each Part In Map.refProjectVM.BTLStructureVM.BTLPartVMList
@@ -228,6 +229,7 @@ Public Class MyInstrumentPanelVM
                'Next
             Next
          End If
+         LoadingWndHelper.CloseLoadingWnd(ActiveIds.CHANGEPARAM)
       End If
    End Sub
 

EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListV.xaml

@@ -95,9 +95,11 @@
             </DataGridTemplateColumn.CellTemplate>
          </DataGridTemplateColumn>
          <!--DO - Abilitazione-->
-         <DataGridCheckBoxColumn x:Key="colDO" Binding="{Binding bDO, UpdateSourceTrigger=PropertyChanged}">
+         <DataGridCheckBoxColumn x:Key="colDO" Binding="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
+                                 MinWidth="28">
             <DataGridCheckBoxColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.DO_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
+               <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"
+                         HorizontalAlignment="Center"/>
             </DataGridCheckBoxColumn.Header>
          </DataGridCheckBoxColumn>
          <!--W - Larghezza-->
@@ -133,13 +135,15 @@
          <!--CNT - Richiesti da BTL-->
          <DataGridTextColumn x:Key="colCNT" Binding="{Binding sCNT}" SortMemberPath="nCNT">
             <DataGridTextColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.CNT_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
+               <TextBlock Text="{Binding Path=DataContext.ShortCNT_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"
+                          ToolTip="{Binding Path=DataContext.CNT_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
             </DataGridTextColumn.Header>
          </DataGridTextColumn>
          <!--ADDED - Aggiunti-->
          <DataGridTextColumn x:Key="colADDED" Binding="{Binding sADDED}" SortMemberPath="nADDED">
             <DataGridTextColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.ADDED_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
+               <TextBlock Text="{Binding Path=DataContext.ShortADDED_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"
+                          ToolTip="{Binding Path=DataContext.ADDED_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
             </DataGridTextColumn.Header>
             <DataGridTextColumn.EditingElementStyle>
                <Style TargetType="{x:Type TextBox}">
@@ -150,13 +154,15 @@
          <!--INPROD - IN OTTIMIZZAZIONE-->
          <DataGridTextColumn x:Key="colINPROD" Binding="{Binding nINPROD}">
             <DataGridTextColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.INPROD_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
+               <TextBlock Text="{Binding Path=DataContext.ShortINPROD_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"
+                          ToolTip="{Binding Path=DataContext.INPROD_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
             </DataGridTextColumn.Header>
          </DataGridTextColumn>
          <!--DONE - PRODOTTI-->
          <DataGridTextColumn x:Key="colDONE" Binding="{Binding nDONE}">
             <DataGridTextColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.DONE_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
+               <TextBlock Text="{Binding Path=DataContext.ShortDONE_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"
+                          ToolTip="{Binding Path=DataContext.DONE_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
             </DataGridTextColumn.Header>
          </DataGridTextColumn>
          <!--TBP - In produzione-->
@@ -186,6 +192,12 @@
                <TextBlock Text="{Binding Path=DataContext.GRP_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
             </DataGridTextColumn.Header>
          </DataGridTextColumn>
+         <!--STOREY - Sottogruppo-->
+         <DataGridTextColumn x:Key="colSTOREY" Binding="{Binding sSTOREY}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.STOREY_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
          <!--UNT - Unit Time-->
          <!--<DataGridTextColumn Binding="{Binding nUNT}"
                                IsReadOnly="True">

EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListVM.vb

@@ -70,26 +70,52 @@ Public Class BTLPartListVM
          Return EgtMsg(61608)
       End Get
    End Property
+   Public ReadOnly Property ShortCNT_Msg As String
+      Get
+         Return EgtMsg(61952)
+      End Get
+   End Property
 
    Public ReadOnly Property ADDED_Msg As String
       Get
          Return EgtMsg(61813)
       End Get
    End Property
+   Public ReadOnly Property ShortADDED_Msg As String
+      Get
+         Return EgtMsg(61953)
+      End Get
+   End Property
    Public ReadOnly Property INPROD_Msg As String
       Get
          Return EgtMsg(61609)
       End Get
    End Property
+   Public ReadOnly Property ShortINPROD_Msg As String
+      Get
+         Return EgtMsg(61954)
+      End Get
+   End Property
    Public ReadOnly Property DONE_Msg As String
       Get
          Return EgtMsg(61814)
       End Get
    End Property
+   Public ReadOnly Property ShortDONE_Msg As String
+      Get
+         Return EgtMsg(61955)
+      End Get
+   End Property
 
    Public ReadOnly Property GRP_Msg As String
       Get
-         Return EgtMsg(61612)
+         Return EgtMsg(61624)
+      End Get
+   End Property
+
+   Public ReadOnly Property STOREY_Msg As String
+      Get
+         Return EgtMsg(61623)
       End Get
    End Property