-aggiornato grafica visualizzazione colonne rotazione, inversione

EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb

@@ -9,7 +9,6 @@
    Public Const S_RAWPARTLIST_BEAM As String = "DG_RawPartList_BEAM"
    Public Const S_RAWPARTLIST_WALL As String = "DG_RawPartList_WALL"
    Public Const S_PARTINRAWPARTLIST_BEAM As String = "DG_PartInRawPartList_BEAM"
-   Public Const S_PARTINRAWPARTLISTONLYPROD_BEAM As String = "DG_PartInRawPartListOnlyProd_BEAM"
    Public Const S_PARTINRAWPARTLIST_WALL As String = "DG_PartInRawPartList_WALL"
    Public Const S_PARAMETERLIST_P As String = "DG_ParameterList_P"
    Public Const S_PARAMETERLIST_Q As String = "DG_ParameterList_Q"

EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListV.xaml

@@ -108,9 +108,11 @@
          </DataGridTextColumn>
          <!--ROT - Rotazione-->
          <DataGridTemplateColumn x:Key="colROT" SortMemberPath="dROT">
-            <DataGridTemplateColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.ROTATION_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
-            </DataGridTemplateColumn.Header>
+            <DataGridTemplateColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding Path=DataContext.ROTATION_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.HeaderTemplate>
             <DataGridTemplateColumn.CellTemplate>
                <DataTemplate>
                   <Grid>
@@ -143,9 +145,11 @@
          </DataGridTemplateColumn>
          <!--INV - Inversione-->
          <DataGridTemplateColumn x:Key="colFLIP">
-            <DataGridTemplateColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.INVERSION_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
-            </DataGridTemplateColumn.Header>
+            <DataGridTemplateColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding Path=DataContext.INVERSION_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.HeaderTemplate>
             <DataGridTemplateColumn.CellTemplate>
                <DataTemplate>
                   <CheckBox IsChecked="{Binding bFLIP, UpdateSourceTrigger=PropertyChanged}"

EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListVM.vb

@@ -142,11 +142,7 @@ Public Class PartInRawPartListVM
    Friend Sub UpdateColumns(nMachType As MachineType)
       If nMachType = MachineType.BEAM Then
          PartInRawPartColumns.Clear()
-         If bOnlyProd Then
-            GetPrivateProfileColumns(S_PARTINRAWPARTLISTONLYPROD_BEAM, PartInRawPartColumns)
-         Else
-            GetPrivateProfileColumns(S_PARTINRAWPARTLIST_BEAM, PartInRawPartColumns)
-         End If
+         GetPrivateProfileColumns(S_PARTINRAWPARTLIST_BEAM, PartInRawPartColumns)
       ElseIf nMachType = MachineType.WALL Then
          PartInRawPartColumns.Clear()
          GetPrivateProfileColumns(S_PARTINRAWPARTLIST_WALL, PartInRawPartColumns)
@@ -159,6 +155,11 @@ Public Class PartInRawPartListVM
       m_colPartInRawPart_PosY = m_PartInRawPartColumns.FirstOrDefault(Function(x) x.Name = COL_POSY)
       ' aggiorno la visibilità delle colonne
       For Each col In PartInRawPartColumns
+         If Not bOnlyProd AndAlso nMachType = MachineType.BEAM AndAlso (col.Name.Equals(COL_ROT) OrElse col.Name.Equals(COL_FLIP) OrElse col.Name.Equals(COL_POSX)) Then
+            col.Visible = False
+         Else
+            col.Visible = True
+         End If
          col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
       Next
    End Sub

EgtBEAMWALL.ViewerOptimizer/ItemParamList/RawPartListV.xaml

@@ -133,10 +133,12 @@
          </DataGridTextColumn>
          <!--PosZ - Posizione in Z-->
          <DataGridTextColumn x:Key="colPOSZ" Binding="{Binding sPosZ}">
-            <DataGridTextColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.PosZ_Msg,
+            <DataGridTextColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding Path=DataContext.PosZ_Msg,
                                          RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"/>
-            </DataGridTextColumn.Header>
+               </DataTemplate>
+            </DataGridTextColumn.HeaderTemplate>
             <DataGridTextColumn.EditingElementStyle>
                <Style TargetType="{x:Type TextBox}">
                   <Setter Property="Foreground" Value="Blue" />