Optimizer 2..7.11.4

-rimesso stili eliminati in dizionario -aggiornato datagrid in updatewnd
2025-11-07 09:50:14 +01:00
parent 97d8b2d7a9
commit 3138f9b93b
6 changed files with 128 additions and 26 deletions
@@ -67,5 +67,5 @@ Imports System.Windows
 '      Revision
 '

-<Assembly: AssemblyVersion("2.7.11.3")>
-<Assembly: AssemblyFileVersion("2.7.11.3")>
+<Assembly: AssemblyVersion("2.7.11.4")>
+<Assembly: AssemblyFileVersion("2.7.11.4")>
@@ -440,6 +440,9 @@ Public Class StrategyManagerVM
   ''' Funzione che salva il file json CustomerConfig
   ''' </summary>
   Public Sub Save()
+      If IsNothing(m_SelStrategySetup) Then
+         OpenFileNameCustomConfig()
+      End If
      m_SelStrategySetup.Write()
      SetbIsModifyStrategy(False)
   End Sub
@@ -4,6 +4,7 @@
                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
                            xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
                            xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
+                            xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib"
                            WindowStyle="None" ResizeMode="NoResize"
                            SizeToContent="WidthAndHeight"
                            WindowStartupLocation="CenterOwner"
@@ -19,24 +20,24 @@
                 Width="400"
                 Margin="5"/>

-      <EgtBEAMWALLCORE:EgtDataGrid Width="400" MaxHeight="600"
-                                   ItemsSource="{Binding BTLPartList}" 
-                                   SelectedItem="{Binding SelBTLPart}"
-                                   AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
-                                   AlternationCount="2"
-                                   ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
-                                   CanUserAddRows="False"
-                                   AutoGenerateColumns="False"
-                                   CanUserResizeRows="False"
-                                   SelectionMode="Single"
-                                   ScrollViewer.CanContentScroll="False" 
-                                   ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                   ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                                   Margin="5"
-                                   BindingColumns="{Binding UpdateBTLColumns}"
-                                   Style="{StaticResource DataGrid_OnlyProd}"
-                                   CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
-                                   RowStyle="{StaticResource RowDataGrid_CustomHighLight}">
+      <EgwWPFBaseLib:EgwDataGrid Width="400" MaxHeight="600"
+                                ItemsSource="{Binding BTLPartList}" 
+                                SelectedItem="{Binding SelBTLPart}"
+                                AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
+                                AlternationCount="2"
+                                ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}"
+                                CanUserAddRows="False"
+                                AutoGenerateColumns="False"
+                                CanUserResizeRows="False"
+                                SelectionMode="Single"
+                                ScrollViewer.CanContentScroll="False" 
+                                ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                Margin="5"
+                                ColumnLayouts="{Binding UpdateBTLColumns}"
+                                Style="{StaticResource DataGrid_OnlyProd}"
+                                CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
+                                RowStyle="{StaticResource RowDataGrid_CustomHighLight}">
         <DataGrid.Resources>
            <!-- PDN -->
            <DataGridTextColumn x:Key="colPDN" Binding="{Binding nPDN}">
@@ -82,7 +83,7 @@
               </DataGridTemplateColumn.CellTemplate>
            </DataGridTemplateColumn>
         </DataGrid.Resources>
-      </EgtBEAMWALLCORE:EgtDataGrid>
+      </EgwWPFBaseLib:EgwDataGrid>

      <Grid Grid.Row="2" Margin="0,0,0,5">
         <Grid.ColumnDefinitions>
@@ -1,4 +1,7 @@
-Public Class UpdateBTLWndV
+Imports EgtBEAMWALL.Core
+Imports System.IO
+
+Public Class UpdateBTLWndV

   Private WithEvents m_UpdateBTLWndVM As UpdateBTLWndVM

@@ -12,6 +15,7 @@
   End Sub

   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_UpdateBTLWndVM.m_CloseWindow
+      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_UPDATEBTLPARTLIST, m_UpdateBTLWndVM.UpdateBTLColumns)
      Me.DialogResult = bDialogResult
   End Sub

@@ -2,6 +2,7 @@
 Imports EgtUILib
 Imports EgtWPFLib5
 Imports EgtBEAMWALL.Core
+Imports System.IO

 Public Class UpdateBTLWndVM
   Inherits VMBase
@@ -10,12 +11,12 @@ Public Class UpdateBTLWndVM

   Friend Event m_CloseWindow(bDialogResult As Boolean)

-   Protected m_UpdateBTLColumns As New ObservableCollection(Of EgtDataGridColumn)
-   Public Property UpdateBTLColumns As ObservableCollection(Of EgtDataGridColumn)
+   Protected m_UpdateBTLColumns As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)
+   Public Property UpdateBTLColumns As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)
      Get
         Return m_UpdateBTLColumns
      End Get
-      Set(value As ObservableCollection(Of EgtDataGridColumn))
+      Set(value As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout))
         m_UpdateBTLColumns = value
      End Set
   End Property
@@ -95,7 +96,7 @@ Public Class UpdateBTLWndVM

   Sub New(InputBTLPartList As List(Of BTLPartToUpdate))
      ' carico le colonne della datagrid
-      GetPrivateProfileColumns(S_UPDATEBTLPARTLIST, UpdateBTLColumns)
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_UPDATEBTLPARTLIST, UpdateBTLColumns)
      ' carica la lista dei Part importati
      BTLPartList = New ObservableCollection(Of BTLPartToUpdate)(InputBTLPartList)
   End Sub
@@ -116,6 +117,7 @@ Public Class UpdateBTLWndVM
   End Property

   Public Sub Ok()
+      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_UPDATEBTLPARTLIST, UpdateBTLColumns)
      RaiseEvent m_CloseWindow(True)
   End Sub

@@ -2470,6 +2470,42 @@
      <Setter Property="Margin" Value="2,-2,2,-2"/>
   </Style>

+   <Style x:Key="LeftPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="30"/>
+      <Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
+   </Style>
+
+   <Style x:Key="Close_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="40"/>
+      <Setter Property="Width" Value="50"/>
+      <Setter Property="Margin" Value="2.5,-2,2.5,2.5"/>
+   </Style>
+
+   <Style x:Key="PDFPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="40"/>
+      <Setter Property="Width" Value="120"/>
+      <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+      <!--<Setter Property="Background" Value="{StaticResource Button.Static.Background}"/>-->
+      <!--<Setter Property="BorderBrush" Value="{StaticResource Button.Static.Border}"/>-->
+      <!--<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>-->
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="Padding" Value="1"/>
+      <Setter Property="Margin" Value="0,0,0,5"/>
+   </Style>
+
+   <Style x:Key="EgtWPFLib5_InputButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="80"/>
+   </Style>
+
+   <Style x:Key="ToolBar_SmallButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="20"/>
+      <Setter Property="Width" Value="20"/>
+   </Style>
+   
   <!--#endregion Button Style-->

   <!--#region ToggleButton Style-->
@@ -2868,6 +2904,12 @@
      <Setter Property="HorizontalAlignment" Value="Center"/>
   </Style>

+   <Style x:Key="OptionCheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="HorizontalAlignment" Value="Right"/>
+      <Setter Property="Margin" Value="10,5,10,0"/>
+   </Style>
+   
   <!--#endregion CheckBox-->

   <!--#region TabControl-->
@@ -2943,6 +2985,17 @@
      <Setter Property="Stretch" Value="UniformToFill"/>
   </Style>

+   <Style x:Key="LockImage" TargetType="{x:Type Image}">
+      <Setter Property="Source" Value="/Resources/PartManager/Locked.png" />
+      <Setter Property="Height" Value="15"/>
+      <Setter Property="Stretch" Value="Uniform"/>
+      <Style.Triggers>
+         <DataTrigger Binding="{Binding IsEnabled,RelativeSource={RelativeSource self}}" Value="False">
+            <Setter Property="Source" Value="/Resources/PartManager/Unlocked.png"/>
+         </DataTrigger>
+      </Style.Triggers>
+   </Style>
+   
   <!--#endregion Image-->

   <!--#region DataGridRow/DataGridCell-->
@@ -3089,6 +3142,18 @@
      <Setter Property="Orientation" Value="Horizontal"/>
      <Setter Property="Margin" Value="5,5,5,0"/>
   </Style>
+
+   <Style x:Key="StackPanel" TargetType="{x:Type StackPanel}">
+      <Setter Property="Orientation" Value="Vertical"/>
+      <Setter Property="Margin" Value="0"/>
+   </Style>
+
+   <Style x:Key="StackPanel_Button" TargetType="{x:Type StackPanel}">
+      <Setter Property="Orientation" Value="Vertical"/>
+      <Setter Property="Margin" Value="2.5,0,0,0"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="HorizontalAlignment" Value="Right"/>
+   </Style>
   
   <!--#endregion StackPanel-->

@@ -3324,6 +3389,15 @@
      </Style.Resources>
   </Style>

+   <Style x:Key="ListBox_PDF" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="Padding" Value="0"/>
+      <Setter Property="Margin" Value="0"/>
+      <Setter Property="VerticalContentAlignment" Value="Top"/>
+      <Setter Property="HorizontalContentAlignment" Value="Left"/>
+      <Setter Property="Background" Value="Transparent"/>
+   </Style>
+   
   <!--#endregion ListBox-->

   <!--#region WrapPanel-->
@@ -3428,6 +3502,24 @@
   </Style>
   
   <!--#endregion GroupBox-->
+
+   <!--#region Expander-->
+
+   <Style x:Key="Expander_PDF" TargetType="{x:Type Expander}" BasedOn="{StaticResource {x:Type Expander}}">
+      <Setter Property="IsExpanded" Value="True"/>
+      <Setter Property="VerticalContentAlignment" Value="Top"/>
+      <Setter Property="HorizontalContentAlignment" Value="Left"/>
+      <Setter Property="Margin" Value="2.5"/>
+   </Style>
+
+   <Style x:Key="Expander_PDFBase" TargetType="{x:Type Expander}" BasedOn="{x:Null}">
+      <Setter Property="IsExpanded" Value="True"/>
+      <Setter Property="VerticalContentAlignment" Value="Top"/>
+      <Setter Property="HorizontalContentAlignment" Value="Left"/>
+      <Setter Property="Margin" Value="2.5"/>
+   </Style>
+
+   <!--#endregion Expander-->
   
   <!--#endregion GRAFICA NUOVA PAGINA-->