Merge commit 'b5aae24151c1b66d808f9b5843c15d757c5d53c0' into feature/DevExpress

-cambio versione
-pulizia codice

EgtBEAMWALL.Core/Themes/Generic.xaml

@@ -302,7 +302,11 @@
 
    <!--#region Colori ComboBox-->
 
-   <SolidColorBrush x:Key="ComboBox.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>
+   <!--<SolidColorBrush x:Key="ComboBox.Static.Background" Color="{StaticResource BeamWall_Glacier_Color}"/>-->
+   <LinearGradientBrush x:Key="ComboBox.Static.Background" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="{StaticResource BeamWall_Gallery_Color}" Offset="0.0"/>
+      <GradientStop Color="{StaticResource BeamWall_Mercury_Color}" Offset="1.0"/>
+   </LinearGradientBrush>
    <SolidColorBrush x:Key="ComboBox.Static.Border" Color="{StaticResource BeamWall_Glacier_Color}"/>
    <SolidColorBrush x:Key="ComboBox.Static.Glyph" Color="{StaticResource BeamWall_White_Color}"/>
    <SolidColorBrush x:Key="ComboBox.Static.Foreground" Color="{StaticResource BeamWall_Corduroy_Color}"/>

EgtBEAMWALL.Optimizer/AddFeatureWnd/AddFeatureWndVM.vb

@@ -106,11 +106,7 @@ Public Class AddFeatureWndVM
                GetMacroListDefault(nGRPFromFileName, nPRCFromFileName, sMacroNameFromFileName, nIdMacroName)
                ' ricavo lista file Macro Custom
                GetMacroListCustom(nGRPFromFileName, nPRCFromFileName, sMacroNameFromFileName, nIdMacroName)
-               If MacroCustomList.Count > 0 Then
-                  MacroList_IsEnabled = True
-               Else
-                  MacroList_IsEnabled = False
-               End If
+               MacroList_IsEnabled = If(MacroCustomList.Count > 0, True, False)
             End If
          End If
          NotifyPropertyChanged(NameOf(nSelPRC))

EgtBEAMWALL.Optimizer/AddPartWnd/AddPartWndVM.vb

@@ -147,7 +147,7 @@ Public Class AddPartWndVM
 
 #Region "COMMANDS"
 
-#Region "Ok"
+#Region "Ok_Command"
 
    Public ReadOnly Property Ok_Command As ICommand
       Get
@@ -169,7 +169,7 @@ Public Class AddPartWndVM
       End If
    End Sub
 
-#End Region ' Ok
+#End Region ' Ok_Command
 
 #End Region    ' COMMANDS
 

EgtBEAMWALL.Optimizer/AddRawPartWnd/AddRawPartWndVM.vb

@@ -143,7 +143,7 @@ Public Class AddRawPartWndVM
 
 #Region "COMMANDS"
 
-#Region "Ok"
+#Region "Ok_Command"
 
    Public ReadOnly Property Ok_Command As ICommand
       Get
@@ -167,7 +167,7 @@ Public Class AddRawPartWndVM
       RaiseEvent m_CloseWindow(True)
    End Sub
 
-#End Region ' Ok
+#End Region ' Ok_Command
 
 #End Region    ' COMMANDS
 

EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb

@@ -829,7 +829,7 @@ Public Class BTLDataWndVM
 
 #Region "COMMANDS"
 
-#Region "Ok"
+#Region "Ok_Command"
 
    Public ReadOnly Property Ok_Command As ICommand
       Get
@@ -856,9 +856,9 @@ Public Class BTLDataWndVM
       RaiseEvent m_CloseWindow(True)
    End Sub
 
-#End Region ' Ok
+#End Region ' Ok_Command
 
-#Region "Cancel"
+#Region "Cancel_Command"
 
    Public ReadOnly Property Cancel_Command As ICommand
       Get
@@ -873,7 +873,7 @@ Public Class BTLDataWndVM
       RaiseEvent m_CloseWindow(False)
    End Sub
 
-#End Region ' Cancel
+#End Region ' Cancel_Command
 
 #End Region    ' COMMANDS
 

EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerV.xaml

@@ -1,4 +1,66 @@
-<Border x:Class="BTLPartManagerV"
+<dxb:PopupMenu x:Class="BTLPartManagerV"
+               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+               xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+               xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
+               xmlns:dxi="http://schemas.devexpress.com/winfx/2008/xaml/core/internal"
+               xmlns:dxt="http://schemas.devexpress.com/winfx/2008/xaml/core/themekeys"
+               DataContext="{StaticResource BTLPartManagerVM}"
+               Background="{StaticResource Border.BTLPartManager.Background}"
+               BorderBrush="{StaticResource Border.BTLPartManager.Border}"
+               BorderThickness="2"
+               CornerRadius="5"
+               Margin="0"
+               Padding="0">
+   
+   <dxb:BarItemMenuHeader ShowContentHeader="False" 
+                          ItemsOrientation="Horizontal"
+                          Margin="0"
+                          Padding="0">
+      <dxb:BarButtonItem Command="{Binding CopyPart_Command}"
+                         ToolTip="{Binding CopyPart_ToolTip}"
+                         IsEnabled="{Binding CopyPart_IsEnabled}"
+                         Glyph="{StaticResource CopyPart_Image}"
+                         Style="{StaticResource DropDownButton_BarButtonItem}">
+         <!--<Image Source="{StaticResource CopyPart_Image}" 
+                  Style="{StaticResource BTLDataWnd_Image}"/>-->
+      </dxb:BarButtonItem>
+      <dxb:BarButtonItem Command="{Binding RemovePart_Command}"
+                         ToolTip="{Binding RemovePart_ToolTip}"
+                         IsEnabled="{Binding RemovePart_IsEnabled}"
+                         Glyph="{StaticResource Remove_Image}"
+                         Style="{StaticResource DropDownButton_BarButtonItem}">
+         <!--<Image Source="{StaticResource Remove_Image}"
+                  Style="{StaticResource BTLDataWnd_Image}"/>-->
+      </dxb:BarButtonItem>
+      <dxb:BarButtonItem ToolTip="{Binding Simulate_ToolTip}"
+                         Command="{Binding Simulate_Command}"
+                         IsEnabled="{Binding Simulate_IsEnabled}"
+                         Glyph="{StaticResource Simulate_Image}"
+                         Style="{StaticResource DropDownButton_BarButtonItem}">
+         <!--<Image Source="{StaticResource Simulate_Image}" 
+                  Style="{StaticResource BTLDataWnd_Image}"/>-->
+      </dxb:BarButtonItem>
+      <dxb:BarButtonItem ToolTip="{Binding Edit_ToolTip}"
+                         Command="{Binding Edit_Command}"
+                         IsEnabled="{Binding Edit_IsEnabled}"
+                         Glyph="{StaticResource Edit_Image}"
+                         Style="{StaticResource DropDownButton_BarButtonItem}">
+         <!--<Image Source="{StaticResource Edit_Image}" 
+                  Style="{StaticResource BTLDataWnd_Image}"/>-->
+      </dxb:BarButtonItem>
+      <dxb:BarButtonItem Command="{Binding ResetCalc_Command}"
+                         ToolTip="{Binding ResetCalc_ToolTip}"
+                         IsEnabled="{Binding CALCPanel_IsEnabled}"
+                         Glyph="{StaticResource ResetCalc_Image}"
+                         Style="{StaticResource DropDownButton_BarButtonItem}">
+         <!--<Image Source="{StaticResource ResetCalc_Image}" 
+                  Style="{StaticResource BTLDataWnd_Image}"/>-->
+      </dxb:BarButtonItem>
+   </dxb:BarItemMenuHeader>
+
+</dxb:PopupMenu>
+<!--<Border x:Class="BTLPartManagerV"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         DataContext="{StaticResource BTLPartManagerVM}"
@@ -6,7 +68,6 @@
 
    <StackPanel Style="{StaticResource PartManager_StackPanel}">
       <Button Command="{Binding CopyPart_Command}"
-              Click="ClosePopUp_Click"
               ToolTip="{Binding CopyPart_ToolTip}"
               IsEnabled="{Binding CopyPart_IsEnabled}"
               Style="{StaticResource LP_Button}">
@@ -14,7 +75,6 @@
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Command="{Binding RemovePart_Command}"
-              Click="ClosePopUp_Click"
               ToolTip="{Binding RemovePart_ToolTip}"
               IsEnabled="{Binding RemovePart_IsEnabled}"
               Style="{StaticResource LP_Button}">
@@ -22,7 +82,6 @@
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button ToolTip="{Binding Simulate_ToolTip}"
-              Click="ClosePopUp_Click"
               Command="{Binding Simulate_Command}"
               IsEnabled="{Binding Simulate_IsEnabled}"
               Style="{StaticResource LP_Button}">
@@ -30,7 +89,6 @@
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button ToolTip="{Binding Edit_ToolTip}"
-              Click="ClosePopUp_Click"
               Command="{Binding Edit_Command}"
               IsEnabled="{Binding Edit_IsEnabled}"
               Style="{StaticResource LP_Button}">
@@ -38,7 +96,6 @@
                 Style="{StaticResource BTLDataWnd_Image}"/>
       </Button>
       <Button Command="{Binding ResetCalc_Command}"
-              Click="ClosePopUp_Click"
               ToolTip="{Binding ResetCalc_ToolTip}"
               IsEnabled="{Binding CALCPanel_IsEnabled}"
               Style="{StaticResource LP_Button}">
@@ -47,4 +104,4 @@
       </Button>
    </StackPanel>
 
-</Border>
+</Border>-->

EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb

@@ -8,8 +8,6 @@ Public Class BTLPartManagerVM
 
 #Region "FIELDS & PROPERTIES"
 
-   Private PADLOCK_IMAGE As String = "pack://application:,,,/Resources/NewPage/padlock.png"
-
    Private m_BTLPartManager_IsEnabled As Boolean = True
    Public ReadOnly Property BTLPartManager_IsEnabled As Boolean
       Get
@@ -178,7 +176,7 @@ Public Class BTLPartManagerVM
 
 #Region "COMMANDS"
 
-#Region "CopyPart"
+#Region "CopyPart_Command"
 
    Public ReadOnly Property CopyPart_Command As ICommand
       Get
@@ -202,9 +200,9 @@ Public Class BTLPartManagerVM
       End If
    End Sub
 
-#End Region    ' CopyPart
+#End Region    ' CopyPart_Command
 
-#Region "RemovePart"
+#Region "RemovePart_Command"
 
    Public ReadOnly Property RemovePart_Command As ICommand
       Get
@@ -288,9 +286,9 @@ Public Class BTLPartManagerVM
       EgtSetCurrentContext(Map.refSceneHostVM.MainScene.GetCtx())
    End Sub
 
-#End Region    ' RemovePart
+#End Region    ' RemovePart_Command
 
-#Region "SimulateCommand"
+#Region "Simulate_Command"
 
    Public ReadOnly Property Simulate_Command As ICommand
       Get
@@ -335,9 +333,9 @@ Public Class BTLPartManagerVM
       Return True
    End Function
 
-#End Region ' SimulateCommand
+#End Region ' Simulate_Command
 
-#Region "Edit"
+#Region "Edit_Command"
 
    Public ReadOnly Property Edit_Command As ICommand
       Get
@@ -371,9 +369,9 @@ Public Class BTLPartManagerVM
       Map.refProjectVM.SetLeftPanel_Opacity(0.2)
    End Sub
 
-#End Region ' Edit
+#End Region ' Edit_Command
 
-#Region "ResetCalc"
+#Region "ResetCalc_Command"
 
    Public ReadOnly Property ResetCalc_Command As ICommand
       Get
@@ -402,7 +400,7 @@ Public Class BTLPartManagerVM
       End If
    End Sub
 
-#End Region    ' ResetCalc
+#End Region    ' ResetCalc_Command
 
 #End Region    ' COMMANDS
 

EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb

@@ -293,6 +293,12 @@ Public Class BTLFeatureVM
       End Set
    End Property
 
+   Public ReadOnly Property sFeature_Name As String
+      Get
+         Return $"[{nSelGRP}-{nPRC:000}] {sName}"
+      End Get
+   End Property
+
 #Region "Messages"
 
    Public ReadOnly Property Edit_ToolTip As String
@@ -481,7 +487,7 @@ Public Class BTLFeatureVM
 
 #Region "COMMANDS"
 
-#Region "DeleteFeature"
+#Region "DeleteFeature_Command"
 
    Public ReadOnly Property DeleteFeature_Command As ICommand
       Get
@@ -496,9 +502,9 @@ Public Class BTLFeatureVM
       Map.refFeatureListManagerVM.RemoveFeature()
    End Sub
 
-#End Region ' DeleteFeature
+#End Region ' DeleteFeature_Command
 
-#Region "Edit"
+#Region "Edit_Command"
 
    Public ReadOnly Property Edit_Command As ICommand
       Get
@@ -514,9 +520,9 @@ Public Class BTLFeatureVM
       Map.refFreeContourManagerVM.Open()
    End Sub
 
-#End Region ' Edit
+#End Region ' Edit_Command
 
-#Region "Save"
+#Region "Save_Command"
 
    Public ReadOnly Property Save_Command As ICommand
       Get
@@ -537,9 +543,9 @@ Public Class BTLFeatureVM
       Map.refFreeContourManagerVM.Close(True)
    End Sub
 
-#End Region ' Save
+#End Region ' Save_Command
 
-#Region "Cancel"
+#Region "Cancel_Command"
 
    Public ReadOnly Property Cancel_Command As ICommand
       Get
@@ -555,9 +561,9 @@ Public Class BTLFeatureVM
       Map.refFreeContourManagerVM.Close(False)
    End Sub
 
-#End Region ' Cancel
+#End Region ' Cancel_Command
 
-#Region "Strategy"
+#Region "Strategy_Command"
 
    Public ReadOnly Property Strategy_Command As ICommand
       Get
@@ -576,9 +582,9 @@ Public Class BTLFeatureVM
       Map.refForcedStrategyPanelVM.Init(BTLFeatureM)
    End Sub
 
-#End Region ' Strategy
+#End Region ' Strategy_Command
 
-#Region "EditFeature"
+#Region "EditFeature_Command"
 
    Public ReadOnly Property EditFeature_Command As ICommand
       Get
@@ -607,7 +613,7 @@ Public Class BTLFeatureVM
       EgtDraw()
    End Sub
 
-#End Region ' EditFeature
+#End Region ' EditFeature_Command
 
 #End Region    ' COMMANDS
 

EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb

@@ -18,6 +18,7 @@ Public Class BTLPartVM
          Return m_BTLPartM
       End Get
    End Property
+
    Private m_BTLStructureM As BTLStructureM
 
    Public ReadOnly Property nPartId As Integer
@@ -1369,13 +1370,13 @@ Public Class BTLPartVM
 
    Public ReadOnly Property CALC_ROT_Visibility As Visibility
       Get
-         Return If(m_BTLPartM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Collapsed)
+         Return If(m_BTLPartM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Hidden)
       End Get
    End Property
 
    Public ReadOnly Property CALC_FALL_Visibility As Visibility
       Get
-         Return If(m_BTLPartM.nCALC_FALL <> 0, Visibility.Visible, Visibility.Collapsed)
+         Return If(m_BTLPartM.nCALC_FALL <> 0, Visibility.Visible, Visibility.Hidden)
       End Get
    End Property
 
@@ -2227,11 +2228,26 @@ Public Class BTLPartVM
       Return True
    End Function
 
+   Public Sub BackRotation(Optional bUpdateSection As Boolean = False, Optional bRedraw As Boolean = True)
+      ' salvo sezione impostata
+      Dim CurrSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SelSection
+      ' ruoto
+      Rotation(False, Map.refProjectVM.BTLStructureVM.nPROJTYPE, bRedraw)
+      ' imposto lock
+      bLockRotation = True
+      ' se progetto travi e sezione precedente diversa da vuota (tutti i pezzi)
+      If bUpdateSection AndAlso Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM AndAlso CurrSection <> SectionXMaterial.Empty Then
+         ' se esiste, imposto sezione inversa
+         Dim InverseSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x.dH = CurrSection.dW AndAlso x.dW = CurrSection.dH AndAlso x.sMaterial(0) = CurrSection.sMaterial(0))
+         If Not IsNothing(InverseSection) Then Map.refProjectVM.BTLStructureVM.SetSelSection(InverseSection)
+      End If
+   End Sub
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
 
-#Region "Invert"
+#Region "Invert_Command"
 
    Public ReadOnly Property Invert_Command As ICommand
       Get
@@ -2253,41 +2269,9 @@ Public Class BTLPartVM
       NotifyPropertyChanged(NameOf(sINVERTED))
    End Sub
 
-#End Region ' Invert
+#End Region ' Invert_Command
 
-#Region "BackRotation"
-
-   Public ReadOnly Property BackRotation_Command As ICommand
-      Get
-         If m_cmdBackRotation Is Nothing Then
-            m_cmdBackRotation = New Command(AddressOf BackRotationCmd)
-         End If
-         Return m_cmdBackRotation
-      End Get
-   End Property
-
-   Public Sub BackRotationCmd()
-      BackRotation(True)
-   End Sub
-
-   Public Sub BackRotation(Optional bUpdateSection As Boolean = False, Optional bRedraw As Boolean = True)
-      ' salvo sezione impostata
-      Dim CurrSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SelSection
-      ' ruoto
-      Rotation(False, Map.refProjectVM.BTLStructureVM.nPROJTYPE, bRedraw)
-      ' imposto lock
-      bLockRotation = True
-      ' se progetto travi e sezione precedente diversa da vuota (tutti i pezzi)
-      If bUpdateSection AndAlso Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM AndAlso CurrSection <> SectionXMaterial.Empty Then
-         ' se esiste, imposto sezione inversa
-         Dim InverseSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x.dH = CurrSection.dW AndAlso x.dW = CurrSection.dH AndAlso x.sMaterial(0) = CurrSection.sMaterial(0))
-         If Not IsNothing(InverseSection) Then Map.refProjectVM.BTLStructureVM.SetSelSection(InverseSection)
-      End If
-   End Sub
-
-#End Region ' BackRotation
-
-#Region "ForwardRotation"
+#Region "ForwardRotation_Command"
 
    Public ReadOnly Property ForwardRotation_Command As ICommand
       Get
@@ -2316,7 +2300,7 @@ Public Class BTLPartVM
       End If
    End Sub
 
-#End Region ' ForwardRotation
+#End Region ' ForwardRotation_Command
 
    ' Comando inutilizzato ma conservato per eventuale rotazione a causa di importazione con rotazione sbagliata
 #Region "XRotation"
@@ -2359,7 +2343,7 @@ Public Class BTLPartVM
 
 #End Region ' XRotation
 
-#Region "PartColour"
+#Region "PartColour_Command"
 
    Public ReadOnly Property PartColour_Command As ICommand
       Get
@@ -2391,9 +2375,9 @@ Public Class BTLPartVM
       Return True
    End Function
 
-#End Region ' PartColour
+#End Region ' PartColour_Command
 
-#Region "Verify"
+#Region "Verify_Command"
 
    Public ReadOnly Property Verify_Command As ICommand
       Get
@@ -2411,9 +2395,9 @@ Public Class BTLPartVM
       Return
    End Sub
 
-#End Region ' Verify
+#End Region ' Verify_Command
 
-#Region "AddToRawPart"
+#Region "AddToRawPart_Command"
 
    Public ReadOnly Property AddToRawPart_Command As ICommand
       Get
@@ -2708,9 +2692,9 @@ Public Class BTLPartVM
       Return True
    End Function
 
-#End Region    ' AddToRawPart
+#End Region   ' AddToRawPart_Command
 
-#Region "SelectAllFeature"
+#Region "SelectAllFeature_Command"
 
    Public ReadOnly Property SelectAllFeature_Command As ICommand
       Get
@@ -2726,9 +2710,9 @@ Public Class BTLPartVM
       NotifyPropertyChanged(NameOf(bDOALL))
    End Sub
 
-#End Region ' SelectAllFeature
+#End Region ' SelectAllFeature_Command
 
-#Region "DeselectAllFeature"
+#Region "DeselectAllFeature_Command"
 
    Public ReadOnly Property DeselectAllFeature_Command As ICommand
       Get
@@ -2744,9 +2728,9 @@ Public Class BTLPartVM
       NotifyPropertyChanged(NameOf(bDOALL))
    End Sub
 
-#End Region ' DeselectAllFeature
+#End Region ' DeselectAllFeature_Command
 
-#Region "SelectItemFeature"
+#Region "SelectItemFeature_Command"
 
    Public ReadOnly Property SelectItemFeature_Command As ICommand
       Get
@@ -2768,9 +2752,9 @@ Public Class BTLPartVM
       Next
    End Sub
 
-#End Region ' SelectItemFeature
+#End Region ' SelectItemFeature_Command
 
-#Region "DeselectItemFeature"
+#Region "DeselectItemFeature_Command"
 
    Public ReadOnly Property DeselectItemFeature_Command As ICommand
       Get
@@ -2792,7 +2776,7 @@ Public Class BTLPartVM
       Next
    End Sub
 
-#End Region ' DeselectItemFeature
+#End Region ' DeselectItemFeature_Command
 
 #End Region    ' COMMANDS
 

EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb

@@ -1243,7 +1243,7 @@ Public Class BTLStructureVM
 
 #Region "COMMANDS"
 
-#Region "DeletePart"
+#Region "DeletePart_Command"
 
    Public ReadOnly Property DeletePart_Command As ICommand
       Get
@@ -1258,9 +1258,9 @@ Public Class BTLStructureVM
       Map.refBTLPartManagerVM.RemovePartCmd()
    End Sub
 
-#End Region ' DeletePart
+#End Region ' DeletePart_Command
 
-#Region "Data"
+#Region "Data_Command"
 
    Public ReadOnly Property Data_Command As ICommand
       Get
@@ -1276,9 +1276,9 @@ Public Class BTLStructureVM
       BTLDataWnd.ShowDialog()
    End Sub
 
-#End Region ' Data
+#End Region ' Data_Command
 
-#Region "AddPart"
+#Region "AddPart_Command"
 
    Public ReadOnly Property AddPart_Command As ICommand
       Get
@@ -1330,9 +1330,9 @@ Public Class BTLStructureVM
       End If
    End Sub
 
-#End Region    ' AddPart
+#End Region    ' AddPart_Command
 
-#Region "UpdateBTL"
+#Region "UpdateBTL_Command"
 
    Public ReadOnly Property UpdateBTL_Command As ICommand
       Get
@@ -1872,7 +1872,7 @@ Public Class BTLStructureVM
       EgtZoom(ZM.ALL)
    End Sub
 
-#End Region ' UpdateBTL
+#End Region ' UpdateBTL_Command
 
 #End Region    ' Commands
 

EgtBEAMWALL.Optimizer/BlockedWnd/BlockedWndVM.vb

@@ -112,7 +112,7 @@ Public Class BlockedWndVM
 
 #Region "COMMANDS"
 
-#Region "Save"
+#Region "Save_Command"
 
    Public ReadOnly Property Save_Command As ICommand
       Get
@@ -130,9 +130,9 @@ Public Class BlockedWndVM
       DbControllers.m_StatusMapController.UpdateAction("", ProjectManagerVM.CurrProd.nProdId, ProjectManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ViewOptimStoped, "")
    End Sub
 
-#End Region    ' Save
+#End Region    ' Save_Command
 
-#Region "DoNotSave"
+#Region "DoNotSave_Command"
 
    Public ReadOnly Property DoNotSave_Command As ICommand
       Get
@@ -148,7 +148,7 @@ Public Class BlockedWndVM
       DbControllers.m_StatusMapController.UpdateAction("", ProjectManagerVM.CurrProd.nProdId, ProjectManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ViewOptimStoped, "")
    End Sub
 
-#End Region    ' DoNotSave
+#End Region    ' DoNotSave_Command
 
 #End Region    ' COMMANDS
 

EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj

@@ -996,6 +996,9 @@
     <PackageReference Include="BouncyCastle">
       <Version>1.8.5</Version>
     </PackageReference>
+    <PackageReference Include="DevExpress.Wpf">
+      <Version>25.2.5</Version>
+    </PackageReference>
     <PackageReference Include="EgwMultiEngineManager.Core">
       <Version>3.1.1.2</Version>
     </PackageReference>

EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelVM.vb

@@ -145,21 +145,6 @@ Public Class ForcedStrategyPanelVM
          m_StrategyList = New ObservableCollection(Of Strategy)((From JsonAvailableStrategy In JsonAvailableTopology.StrategyList
                                                                  Select JsonAvailableStrategy.Deserialize(ProjectManagerVM.CurrProd.nType, -1)).ToList())
       End If
-      If File.Exists(sAvailableStrategiesFilePath) Then
-         sReadedFile = File.ReadAllText(sAvailableStrategiesFilePath)
-         Dim JsonStrategyFeatureList As List(Of JsonAvailableStrategyFeature) = JsonConvert.DeserializeObject(Of List(Of JsonAvailableStrategyFeature))(sReadedFile)
-         Dim JsonAvailableStrategyFeature As JsonAvailableStrategyFeature = JsonStrategyFeatureList.FirstOrDefault(Function(x) x.nGrp = nGRP AndAlso x.nPrc = nPRC)
-         If IsNothing(JsonAvailableStrategyFeature) Then Return False
-         Dim JsonAvailableTopology As JsonAvailableTopology = JsonAvailableStrategyFeature.TopologyList.FirstOrDefault(Function(x) x.sName = sTopologyName)
-         If IsNothing(JsonAvailableTopology) Then
-            ' ricavo topologia da feature
-            FindTopologyFromFeature(nFeatureId, sTopologyName)
-            JsonAvailableTopology = JsonAvailableStrategyFeature.TopologyList.FirstOrDefault(Function(x) x.sName = sTopologyName)
-         End If
-         If IsNothing(JsonAvailableTopology) Then Return False
-         m_StrategyList = New ObservableCollection(Of Strategy)((From JsonAvailableStrategy In JsonAvailableTopology.StrategyList
-                                                                 Select JsonAvailableStrategy.Deserialize(ProjectManagerVM.CurrProd.nType, -1)).ToList())
-      End If
       ' recupero custom
       Dim nPartId As Integer = EgtGetParent(EgtGetParent(nFeatureId))
       Dim nPartProjId As Integer = 0

EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb

@@ -465,6 +465,7 @@ Public MustInherit Class ProjectParameters
          End Select
       End If
    End Sub
+
 #End Region    ' Methods
 
 End Class

EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb

@@ -1,4 +1,10 @@
-Imports System.Reflection
+Imports System.IO
+Imports System.Reflection
+Imports DevExpress.Data
+Imports DevExpress.Xpf.Bars
+Imports DevExpress.Xpf.Core.Serialization
+Imports DevExpress.Xpf.Grid
+Imports EgtBEAMWALL.Core
 
 Public Class BTLPartListV
 
@@ -8,14 +14,127 @@ Public Class BTLPartListV
    Private m_isDraggingSelectionField As FieldInfo
    Private m_endDraggingMethod As MethodInfo
 
+   Private m_sDataGridLayoutPath As String = ""
+
    Sub New()
       ' This call is required by the designer.
       InitializeComponent()
       ' Add any initialization after the InitializeComponent() call.
-      m_BTLPartListVM = DataContext
       ' Evita il drag sulla selezione multipla
-      m_isDraggingSelectionField = m_DataGridType.GetField("_isDraggingSelection", BindingFlags.Instance Or BindingFlags.NonPublic)
-      m_endDraggingMethod = m_DataGridType.GetMethod("EndDragging", BindingFlags.Instance Or BindingFlags.NonPublic)
+      'm_isDraggingSelectionField = m_DataGridType.GetField("_isDraggingSelection", BindingFlags.Instance Or BindingFlags.NonPublic)
+      'm_endDraggingMethod = m_DataGridType.GetMethod("EndDragging", BindingFlags.Instance Or BindingFlags.NonPublic)
+
+      m_sDataGridLayoutPath = Path.GetDirectoryName(DataGridColumnsIniFile.m_sDataGridColumnsIniFile) & "\NewDataGridLayoutFile.json"
+
+      For Each Column In BTLPart_GridControl.Columns
+         Column.[AddHandler](DXSerializer.AllowPropertyEvent,
+            New AllowPropertyEventHandler(AddressOf OnAllowProperty))
+      Next
+   End Sub
+
+   ' imposto parametri aggiuntivi da scrivere in Json colonne tabella
+   Private Sub OnAllowProperty(ByVal sender As Object, ByVal e As AllowPropertyEventArgs)
+      If e.DependencyProperty Is GridColumn.AllowResizingProperty Then
+         e.Allow = True
+      End If
+   End Sub
+
+   ' salvataggio del layout colonne
+   Public Sub SaveBTLPartGridControlLayout()
+      BTLPart_GridControl.SaveLayoutToJson(m_sDataGridLayoutPath)
+   End Sub
+
+   Public Sub IsVisibleGroupSummary(bValue As Boolean)
+      If bValue AndAlso BTLPart_GridControl.GroupSummary.Count = 0 Then
+         BTLPart_GridControl.GroupSummary.Clear()
+         Dim PDNGroupSummaryItem As New GridSummaryItem() With {.FieldName = "nPDN",
+                                                                  .DisplayFormat = "{0}",
+                                                                  .SummaryType = SummaryItemType.Count,
+                                                                  .ShowInGroupColumnFooter = "nPDN"}
+         BTLPart_GridControl.GroupSummary.Add(PDNGroupSummaryItem)
+         Dim CNTGroupSummaryItem As New GridSummaryItem() With {.FieldName = "sCNT",
+                                                                  .DisplayFormat = "{0}",
+                                                                  .SummaryType = SummaryItemType.Sum,
+                                                                  .ShowInGroupColumnFooter = "sCNT"}
+         BTLPart_GridControl.GroupSummary.Add(CNTGroupSummaryItem)
+         Dim ADDEDGroupSummaryItem As New GridSummaryItem() With {.FieldName = "sADDED",
+                                                                  .DisplayFormat = "{0}",
+                                                                  .SummaryType = SummaryItemType.Sum,
+                                                                  .ShowInGroupColumnFooter = "sADDED"}
+         BTLPart_GridControl.GroupSummary.Add(ADDEDGroupSummaryItem)
+         Dim INPRODGroupSummaryItem As New GridSummaryItem() With {.FieldName = "nINPROD",
+                                                                  .DisplayFormat = "{0}",
+                                                                  .SummaryType = SummaryItemType.Sum,
+                                                                  .ShowInGroupColumnFooter = "nINPROD"}
+         BTLPart_GridControl.GroupSummary.Add(INPRODGroupSummaryItem)
+         Dim DONEGroupSummaryItem As New GridSummaryItem() With {.FieldName = "nDONE",
+                                                                  .DisplayFormat = "{0}",
+                                                                  .SummaryType = SummaryItemType.Sum,
+                                                                  .ShowInGroupColumnFooter = "nDONE"}
+         BTLPart_GridControl.GroupSummary.Add(DONEGroupSummaryItem)
+      End If
+      BTLPart_TableView.ShowGroupFooters = bValue
+   End Sub
+
+   Public Sub Me_Loaded() Handles Me.Loaded
+      ' imposto DataContext
+      m_BTLPartListVM = DataContext
+      ' imposto riferimento ad action per salvataggio layout tabella
+      m_BTLPartListVM.refSaveBTLPartGridControlLayout = AddressOf SaveBTLPartGridControlLayout
+      ' rispristino layout tabella
+      If Not IsNothing(m_sDataGridLayoutPath) AndAlso File.Exists(m_sDataGridLayoutPath) Then
+         BTLPart_GridControl.RestoreLayoutFromJson(m_sDataGridLayoutPath)
+      End If
+      ' da gestire chiamandolo quando viene aperto un progetto o aggiunto/rimosso un btl, per evitare che ci sia il GroupSummary se c'e' un solo gruppo
+      IsVisibleGroupSummary(False)
+   End Sub
+
+   ' customizzazione ContextMenu del GridControl
+   Private Sub OnShowGridMenu(sender As Object, e As DevExpress.Xpf.Grid.GridMenuEventArgs)
+      If e.MenuType = GridMenuType.Column Then
+         ' rimozione bottoni
+         e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNames.GroupBox})
+         e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNames.GroupColumn})
+         e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNamesBase.ColumnChooser})
+         e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNames.BestFit})
+         e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNames.BestFitColumns})
+         e.Customizations.Add(New RemoveAction() With {.ElementName = DefaultColumnMenuItemNamesBase.FilterEditor})
+
+         Dim info As GridColumnMenuInfo = CType(e.MenuInfo, GridColumnMenuInfo)
+         Dim item As ColumnBase = CType(info.Column, ColumnBase)
+         ' aggiunta separatore
+         Dim separator As BarItemLinkSeparator = New BarItemLinkSeparator()
+         e.Customizations.Add(separator)
+         ' aggiunta bottone AllowResize e Auto Fit
+         Dim AllowResize As BarCheckItem = New BarCheckItem() With {.Content = "Allow Resize", .IsChecked = (BTLPart_TableView.AllowResizing AndAlso (item.AllowResizing = DevExpress.Utils.DefaultBoolean.True OrElse item.AllowResizing = DevExpress.Utils.DefaultBoolean.Default))}
+         AddHandler AllowResize.CheckedChanged, AddressOf AllowResize_CheckedChanged
+         e.Customizations.Add(AllowResize)
+         If item.AllowResizing = DevExpress.Utils.DefaultBoolean.True OrElse item.AllowResizing = DevExpress.Utils.DefaultBoolean.Default Then
+            Dim FixAuto As BarButtonItem = New BarCheckItem() With {.Content = "Auto Fit"}
+            AddHandler FixAuto.ItemClick, AddressOf FixAuto_ItemClick
+            e.Customizations.Add(FixAuto)
+         End If
+      End If
+   End Sub
+
+   ' gestore evento Allow Resize
+   Private Sub AllowResize_CheckedChanged(sender As Object, e As ItemClickEventArgs)
+      Dim info As GridColumnMenuInfo = TryCast(BTLPart_TableView.GridMenu.MenuInfo, GridColumnMenuInfo)
+      Dim item As ColumnBase = CType(info.Column, ColumnBase)
+      If item.AllowResizing = DevExpress.Utils.DefaultBoolean.False Then
+         item.AllowResizing = DevExpress.Utils.DefaultBoolean.True
+      Else
+         item.AllowResizing = DevExpress.Utils.DefaultBoolean.False
+      End If
+   End Sub
+   ' gestore evento Auto Fit
+   Private Sub FixAuto_ItemClick(sender As Object, e As ItemClickEventArgs)
+      Dim info As GridColumnMenuInfo = TryCast(BTLPart_TableView.GridMenu.MenuInfo, GridColumnMenuInfo)
+      Dim item As ColumnBase = CType(info.Column, ColumnBase)
+      item.Width = New GridColumnWidth(1, GridColumnUnitType.Auto)
+      BTLPart_TableView.UpdateLayout()
+      item.Width = item.ActualWidth
+      item.AllowResizing = DevExpress.Utils.DefaultBoolean.False
    End Sub
 
    Public Sub DataGrid_PreviewMouseMove(sender As Object, e As MouseEventArgs)
@@ -115,4 +234,5 @@ Public Class SettingsBtnVerticalOffsetMultiConverter
    Public Function ConvertBack(value As Object, targetTypes() As Type, parameter As Object, culture As Globalization.CultureInfo) As Object() Implements IMultiValueConverter.ConvertBack
       Throw New NotImplementedException()
    End Function
+
 End Class

EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListVM.vb

@@ -9,6 +9,8 @@ Public Class BTLPartListVM
 
 #Region "FIELDS & PROPERTIES"
 
+   Friend refSaveBTLPartGridControlLayout As Action
+
    Private m_colPart_Do As EgwWPFBaseLib.ColumnLayout
    Public ReadOnly Property colPart_Do As EgwWPFBaseLib.ColumnLayout
       Get
@@ -207,6 +209,12 @@ Public Class BTLPartListVM
 
 #End Region    ' Constructor
 
+   Friend Sub Close()
+      If Not IsNothing(refSaveBTLPartGridControlLayout) Then
+         refSaveBTLPartGridControlLayout()
+      End If
+   End Sub
+
 End Class
 
 Class DataGridCellBorderThicknessConverter
@@ -240,7 +248,7 @@ Class ProjIdToBtlFileName
    Implements IValueConverter
 
    Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.Convert
-      If TypeOf value IsNot Integer Then Return ""
+      If TypeOf value IsNot String Then Return ""
       Dim nProjId As Integer = CInt(value)
       Dim ProjModel As EgtBEAMWALL.DataLayer.DatabaseModels.ProjModel = DbControllers.m_ProjController.FindByProjId(nProjId)
       If IsNothing(ProjModel) Then Return ""

EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelV.xaml

@@ -88,9 +88,7 @@
       </TabControl.ItemContainerStyle>
       <TabItem Header="EMPTY"/>
       <TabItem Header="STRATEGIES">
-         <StackPanel>
-            <OPTIMIZER:StrategyManagerV DataContext="{StaticResource StrategyManagerVM}"/>
-         </StackPanel>
+         <OPTIMIZER:StrategyManagerV DataContext="{StaticResource StrategyManagerVM}" Margin="0,0,0,-25"/>
       </TabItem>
       <TabItem Header="PARAMETERS">
          <StackPanel Style="{StaticResource PartManager_StackPanel}">

EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb

@@ -637,7 +637,7 @@ Public Class MainMenuVM
       Dim bEx As Boolean = False
       Try
          Dim sAddressArray As String() = sSupportAddress.Split(CType(",", Char()))
-         Dim SendFeedbackWindow As New EgtWPFLib5.MapiMailMessage("Aedifica Feedback - " & sKey)
+         Dim SendFeedbackWindow As New EgtWPFLib5.MapiMailMessage("AEdifica Feedback - " & sKey)
          SendFeedbackWindow.Recipients.Add(sAddressArray(0))
          For index As Integer = 1 To sAddressArray.Length() - 1
             SendFeedbackWindow.Recipients.Add(sAddressArray(index), EgtWPFLib5.MapiMailMessage.RecipientType.CC)

EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb

@@ -427,6 +427,8 @@ Public Class MainWindowVM
                                                                                                                              {S_FEATUREINPARTINRAWPARTLIST, Map.refFeatureInPartInRawPartListVM.FeatureInPartInRawPartColumns},
                                                                                                                              {S_PARAMETERLIST_P, Map.refPParameterListVM.PParameterListColumns}}
          EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, DataGridColumnDictionary)
+         Map.refPartListVM.Close()
+
       End If
       ' Termino il Model
       m_MainWindowM.Close()

EgtBEAMWALL.Optimizer/Panel/LeftPanelBottomV.xaml

@@ -16,8 +16,7 @@
               Style="{StaticResource Bottom_WrapPanel}">
       <OPTIMIZER:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
       <OPTIMIZER:ShowPanelV DataContext="{StaticResource ShowPanelVM}"/>
-      <OPTIMIZER:ShowBeamPanelV DataContext="{StaticResource ShowBeamPanelVM}"
-                                Visibility="{Binding DataContext.ShowBeamPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelBottomV}}}"/>
+      <OPTIMIZER:ShowBeamPanelV DataContext="{StaticResource ShowBeamPanelVM}"/>
       <OPTIMIZER:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
    </WrapPanel>
 

EgtBEAMWALL.Optimizer/Panel/LeftPanelTopV.xaml

@@ -9,7 +9,6 @@
    </Grid.ColumnDefinitions>
    <OPTIMIZER:LeftPanelV DataContext="{StaticResource LeftPanelVM}"
                          Tag="{Binding DataContext.BTLStructureVM, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelTopV}}}"
-                         Visibility="{Binding DataContext.LeftPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelTopV}}}"
                          IsEnabled="{Binding DataContext.LeftPanel_IsEnabled, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelTopV}}}"
                          Opacity="{Binding DataContext.LeftPanel_Opacity, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:LeftPanelTopV}}}"/>
 

EgtBEAMWALL.Optimizer/Panel/TopPanelV.xaml

@@ -11,8 +11,7 @@
       <ColumnDefinition Width="Auto"/>
    </Grid.ColumnDefinitions>
    <Border Style="{StaticResource TopPanel_Border}">
-      <OPTIMIZER:ProdManagerV DataContext="{DynamicResource ProdManagerVM}"
-                              Visibility="{Binding DataContext.ProdManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:TopPanelV}}}"/>
+      <OPTIMIZER:ProdManagerV DataContext="{DynamicResource ProdManagerVM}"/>
    </Border>
    
    <OPTIMIZER:CalcPanelV Grid.Column="1" 

EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb

@@ -4,7 +4,6 @@ Imports System.IO.Compression
 Imports System.Windows.Threading
 Imports EgtBEAMWALL.Core
 Imports EgtBEAMWALL.DataLayer.DatabaseModels
-Imports EgtBEAMWALL.Optimizer.MainMenuVM
 Imports EgtUILib
 Imports EgtWPFLib5
 Imports Newtonsoft.Json
@@ -993,6 +992,15 @@ Public Class ProdManagerVM
 
       ' Apro finestra parametri generali
       Dim GeneralParametersWndVM As New GeneralParametersWndVM(nType)
+
+      ' Controllo se la cartella AiSetUp è presente
+      GetFirstAiSetUp(nType)
+
+      Dim sDefaultConfigFile As String = String.Empty
+      If EgtUILib.GetPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, "", sDefaultConfigFile, Map.refMainWindowVM.MainWindowM.sDefaultConfig) = 0 Then
+         SetFirstStrategy(GeneralParametersWndVM, sDefaultConfigFile)
+      End If
+
       GeneralParametersWndVM.SetbSaveGeneralParameters(True)
       GeneralParametersWndVM.SaveProjectParameters()
 

EgtBEAMWALL.Optimizer/Project/ProjectVM.vb

@@ -60,32 +60,6 @@ Public Class ProjectVM
    End Property
    Private m_bLockUX As Boolean = False
 
-   Private m_FeatureManager_Visibility As Boolean = True
-   Public Property FeatureManager_Visibility As Visibility
-      Get
-         Return If(m_FeatureManager_Visibility, Visibility.Visible, Visibility.Collapsed)
-      End Get
-      Set(value As Visibility)
-         m_FeatureManager_Visibility = (value = Visibility.Visible)
-      End Set
-   End Property
-   Friend Sub SetFeatureManager_Visibility(IsVisible As Boolean)
-      m_FeatureManager_Visibility = IsVisible
-   End Sub
-
-   Private m_ShowBeamPanel_Visibility As Boolean = True
-   Public Property ShowBeamPanel_Visibility As Visibility
-      Get
-         Return If(m_ShowBeamPanel_Visibility, Visibility.Visible, Visibility.Collapsed)
-      End Get
-      Set(value As Visibility)
-         m_ShowBeamPanel_Visibility = (value = Visibility.Visible)
-      End Set
-   End Property
-   Friend Sub SetShowBeamPanel_Visibility(IsVisible As Boolean)
-      m_ShowBeamPanel_Visibility = IsVisible
-   End Sub
-
    Private m_FreeContourManager_Visibility As Boolean = False
    Public Property FreeContourManager_Visibility As Visibility
       Get
@@ -100,32 +74,6 @@ Public Class ProjectVM
       NotifyPropertyChanged(NameOf(FreeContourManager_Visibility))
    End Sub
 
-   Private m_ProdManager_Visibility As Boolean = True
-   Public Property ProdManager_Visibility As Visibility
-      Get
-         Return If(m_ProdManager_Visibility, Visibility.Visible, Visibility.Collapsed)
-      End Get
-      Set(value As Visibility)
-         m_ProdManager_Visibility = (value = Visibility.Visible)
-      End Set
-   End Property
-   Friend Sub SetProdManager_Visibility(IsVisible As Boolean)
-      m_ProdManager_Visibility = IsVisible
-   End Sub
-
-   Private m_LeftPanel_Visibility As Boolean = True
-   Public Property LeftPanel_Visibility As Visibility
-      Get
-         Return If(m_LeftPanel_Visibility, Visibility.Visible, Visibility.Collapsed)
-      End Get
-      Set(value As Visibility)
-         m_LeftPanel_Visibility = (value = Visibility.Visible)
-      End Set
-   End Property
-   Friend Sub SetLeftPanel_Visibility(IsVisible As Boolean)
-      m_LeftPanel_Visibility = IsVisible
-   End Sub
-
    Private m_LeftPanel_IsEnabled As Boolean = True
    Public Property LeftPanel_IsEnabled As Boolean
       Get
@@ -254,7 +202,7 @@ Public Class ProjectVM
          Return m_FeatureList_Visibility
       End Get
    End Property
-   Sub SetFeatureListVisibility(bVisible As Boolean)
+   Friend Sub SetFeatureListVisibility(bVisible As Boolean)
       m_FeatureList_Visibility = If(bVisible, Visibility.Visible, Visibility.Collapsed)
       NotifyPropertyChanged(NameOf(FeatureList_Visibility))
    End Sub
@@ -265,7 +213,7 @@ Public Class ProjectVM
          Return m_RawPartManagerVisibility
       End Get
    End Property
-   Sub SetRawPartManagerVisibility(bVisible As Boolean)
+   Friend Sub SetRawPartManagerVisibility(bVisible As Boolean)
       m_RawPartManagerVisibility = If(bVisible, Visibility.Visible, Visibility.Collapsed)
       NotifyPropertyChanged(NameOf(RawPartManagerVisibility))
    End Sub
@@ -276,7 +224,7 @@ Public Class ProjectVM
          Return m_StrategyManagerVisibility
       End Get
    End Property
-   Sub SetStrategyManagerVisibility(bVisible As Boolean)
+   Friend Sub SetStrategyManagerVisibility(bVisible As Boolean)
       m_StrategyManagerVisibility = If(bVisible, Visibility.Visible, Visibility.Collapsed)
       NotifyPropertyChanged(NameOf(StrategyManagerVisibility))
    End Sub
@@ -287,7 +235,7 @@ Public Class ProjectVM
          Return m_SceneShowBuldingVisibility
       End Get
    End Property
-   Sub SetSceneShowBuldingVisibility(bVisible As Boolean)
+   Friend Sub SetSceneShowBuldingVisibility(bVisible As Boolean)
       m_SceneShowBuldingVisibility = If(bVisible, Visibility.Visible, Visibility.Collapsed)
       NotifyPropertyChanged(NameOf(SceneShowBuldingVisibility))
    End Sub
@@ -298,7 +246,7 @@ Public Class ProjectVM
          Return m_ManagerTabVisibility
       End Get
    End Property
-   Sub SetManagerTabVisibility(bVisible As Boolean)
+   Friend Sub SetManagerTabVisibility(bVisible As Boolean)
       m_ManagerTabVisibility = If(bVisible, Visibility.Visible, Visibility.Collapsed)
       NotifyPropertyChanged(NameOf(ManagerTabVisibility))
    End Sub
@@ -545,11 +493,6 @@ Public Class ProjectVM
 
    End Sub
 
-   Friend Sub NotifyAllPanelVisibility()
-      NotifyPropertyChanged(NameOf(FeatureManager_Visibility))
-      NotifyPropertyChanged(NameOf(ShowBeamPanel_Visibility))
-   End Sub
-
    ''' <summary>
    ''' Funzione che permette di eliminare un pezzo modificato e reinserirlo nell'assemblato
    ''' </summary>
@@ -597,31 +540,26 @@ Public Class ProjectVM
          For Each GeneralParameter In m_GeneralParametersList
             Select Case GeneralParameter.GetType()
                Case GetType(BooleanGenericParameter)
-                  SetbSaveGeneralParameters(False)
-                  SetGeneralParametersIsEnable(False)
+                  SetGeneralParameters(False)
                   EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge)
                   EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge & "_FORCED")
                Case GetType(DoubleGenericParameter)
-                  SetbSaveGeneralParameters(False)
-                  SetGeneralParametersIsEnable(False)
+                  SetGeneralParameters(False)
                   EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge)
                   EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge & "_FORCED")
                Case GetType(ComboGenericParameter)
-                  SetbSaveGeneralParameters(False)
-                  SetGeneralParametersIsEnable(False)
+                  SetGeneralParameters(False)
                   EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge)
                   EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge & "_FORCED")
                Case GetType(StringGenericParameter)
-                  SetbSaveGeneralParameters(False)
-                  SetGeneralParametersIsEnable(False)
+                  SetGeneralParameters(False)
                   EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge)
                   EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge & "_FORCED")
                Case GetType(ListGenericParameter)
                   For Each Item As ToolParameter In DirectCast(GeneralParameter, ListGenericParameter).ListValue
                      If Item.bIsActive Then
                         sInfo &= Item.sUUID & "," & Item.sName & ";"
-                        SetbSaveGeneralParameters(False)
-                        SetGeneralParametersIsEnable(False)
+                        SetGeneralParameters(False)
                         EgtRemoveInfo(PartItem.nPartId, GeneralParameter.sNameNge)
                      End If
                   Next
@@ -957,11 +895,12 @@ Public Class ProjectVM
          EgtSetInfo(m_BTLStructureVM.SelBTLPart.BTLPartM.nPartId, AI_SETUP, m_SelStrategySetup)
       End If
    End Sub
+
 #End Region    ' Methods
 
 #Region "COMMAND"
 
-#Region "Ottimization"
+#Region "Optimizer_Command"
 
    Public ReadOnly Property Optimizer_Command As ICommand
       Get
@@ -977,9 +916,9 @@ Public Class ProjectVM
       StatisticWndV.ShowDialog()
    End Sub
 
-#End Region ' Ottimization
+#End Region ' Optimizer_Command
 
-#Region "Parameter"
+#Region "Parameter_Command"
 
    Public ReadOnly Property Parameter_Command As ICommand
       Get
@@ -995,7 +934,7 @@ Public Class ProjectVM
       PartParametersWnd.ShowDialog()
    End Sub
 
-#End Region ' Parameter
+#End Region ' Parameter_Command
 
 #Region "Back_Command"
 

EgtBEAMWALL.Optimizer/Statistics/PDFHelper.vb

@@ -384,7 +384,6 @@ Module PDFHelper
       Dim paragraph As Paragraph = section.AddParagraph(EgtMsg(62590), "Heading2")
       paragraph.Format.SpaceAfter = Unit.FromMillimeter(3.0)
 
-      ' Controllo se bPreview è true mostra il PDF di preview se no il PDF completo
       If bPreview Then
          CreateRawPartPage(section, sMachGroupList, sPDN, sW, sH, sL, sDesc, sMaterial, Nothing, bPreview)
       Else

EgtBEAMWALL.Optimizer/StatisticsWnd/StatisticWndV.xaml.vb

@@ -12,11 +12,7 @@
    End Sub
 
    Private Sub Statistic_TabControl_SelectionChanged(sender As Object, e As SelectionChangedEventArgs)
-      If Statistic_TabControl.SelectedIndex = 0 Then
-         Me.Tag = Map.refProjectVM.BTLStructureVM
-      Else
-         Me.Tag = Map.refProjectVM
-      End If
+      Me.Tag = If(Statistic_TabControl.SelectedIndex = 0, Map.refProjectVM.BTLStructureVM, Map.refProjectVM)
    End Sub
 
    Private Sub CloseWindow(bDialogResult As Boolean) Handles m_StatisticsVM.m_CloseWindow

EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb

@@ -1927,7 +1927,7 @@ Public Class ListStrategyParameter
    End Property
 
    Friend Sub CloseToolList()
-      SetAvailableToolListVisibility(True)
+      SetAvailableToolListVisibility(False)
       SetOpenToolListIsEnable(True)
    End Sub
 

EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml

@@ -3,6 +3,8 @@
                     xmlns:OPTIMIZER="clr-namespace:EgtBEAMWALL.Optimizer"
                     xmlns:EgtBEAMWALLCore="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"
                     xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                    xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
+                    xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
                     xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2">
 
    <!--#region Panel ViewModel-->
@@ -836,6 +838,14 @@
       <Setter Property="Margin" Value="2.5,2.5,2.5,2.5"/>
    </Style>
 
+   <Style x:Key="DropDownButton_BarButtonItem" TargetType="{x:Type dxb:BarButtonItem}">
+      <Setter Property="Background" Value="{StaticResource ButtonBasic.Static.Background}"/>
+      <Setter Property="BorderBrush" Value="{StaticResource ButtonBasic.Static.Border}"/>
+      <Setter Property="BorderThickness" Value="0.5"/>
+      <Setter Property="CornerRadius" Value="3"/>
+      <Setter Property="GlyphSize" Value="Medium"/>
+   </Style>
+
    <Style x:Key="MacroFeaturen_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource ProdManager_Button}">
       <Setter Property="HorizontalAlignment" Value="Right"/>
       <Setter Property="Margin" Value="2.5,2.5,10,2.5"/>
@@ -2047,6 +2057,10 @@
       <Setter Property="Margin" Value="5"/>
    </Style>
 
+   <Style x:Key="TableView_StackPanel" TargetType="{x:Type StackPanel}" BasedOn="{StaticResource PartManager_StackPanel}">
+      <Setter Property="Margin" Value="0,0,5,0"/>
+   </Style>
+
    <!--#endregion PartManager-->
 
    <!--#region OptStatistics-->
@@ -2229,6 +2243,10 @@
       <Setter Property="Margin" Value="5,5,5,0"/>
    </Style>
 
+   <Style x:Key="TableView_Grid" TargetType="{x:Type Grid}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+   </Style>
+
    <!--#endregion Grid-->
 
    <!--#region GridSplitter-->
@@ -2561,7 +2579,7 @@
       <Setter Property="Background" Value="{DynamicResource Border.BTLPartManager.Background}"/>
       <Setter Property="BorderBrush" Value="{DynamicResource Border.BTLPartManager.Border}"/>
       <Setter Property="CornerRadius" Value="5"/>
-      <Setter Property="BorderThickness" Value="2"/>
+      <Setter Property="BorderThickness" Value="0"/>
    </Style>
 
    <Style x:Key="SetUp_Border" TargetType="{x:Type Border}">
@@ -2575,6 +2593,10 @@
       </Style.Triggers>
    </Style>
 
+   <Style x:Key="TableView_Border" TargetType="{x:Type Border}">
+      <Setter Property="Background" Value="{StaticResource Grid.Static.ExpanderDown.Background}"/>
+   </Style>
+   
    <!--#region TopPanel_Border-->
    
    <Style x:Key="TopPanel_Border" TargetType="{x:Type Border}">
@@ -2704,4 +2726,41 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
+   <!--#region DevExpress-->
+
+   <Style x:Key="HeaderStyle" TargetType="{x:Type dxg:BaseGridHeader}">
+      <Setter Property="Background" Value="{StaticResource DataGridColumnHeader.Static.Main.Background}"/>
+      <Setter Property="Foreground" Value="{StaticResource DataGridColumnHeader.Static.Main.Foreground}"/>
+      <Setter Property="FontWeight" Value="Bold"/>
+      <Setter Property="FontSize" Value="15"/>
+      <Setter Property="HorizontalContentAlignment" Value="Center"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <!--<Setter Property="dxg:BaseGridColumnHeader.ShowFilterButtonOnHover" Value="False"/>-->
+   </Style>
+
+   <Style x:Key="HeaderImageStyle" TargetType="{x:Type Image}">
+      <Setter Property="Height" Value="20"/>
+      <Setter Property="Stretch" Value="Uniform"/>
+   </Style>
+
+   <Style x:Key="RowStyle" TargetType="{x:Type dxg:RowControl}">
+      <Setter Property="IsEnabled" Value="{Binding Row.IsRowEnabled}"/>
+      <Style.Triggers>
+         <Trigger Property="SelectionState" Value="Selected">
+            <Setter Property="Background" Value="{StaticResource RowDataGrid.Selected.Background}"/>
+            <Setter Property="Foreground" Value="{StaticResource RowDataGrid.Selected.Foreground}"/>
+            <Setter Property="BorderBrush" Value="{StaticResource RowDataGrid.Selected.Border}"/>
+            <Setter Property="FontWeight" Value="Bold"/>
+         </Trigger>
+         <Trigger Property="dxg:GridViewBase.IsFocusedRow" Value="True">
+            <Setter Property="Background" Value="{StaticResource RowDataGrid.Selected.Background}"/>
+            <Setter Property="Foreground" Value="{StaticResource RowDataGrid.Selected.Foreground}"/>
+            <Setter Property="BorderBrush" Value="{StaticResource RowDataGrid.Selected.Border}"/>
+            <Setter Property="FontWeight" Value="Bold"/>
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+   <!--#endregion DevExpress-->
+   
 </ResourceDictionary>