diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb index 3a6f6d5a..c42f229d 100644 --- a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb @@ -38,5 +38,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs index f8a2648d..feba8b6d 100644 --- a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs +++ b/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("3.1.6.2")] -[assembly: AssemblyFileVersion("3.1.6.2")] +[assembly: AssemblyVersion("3.1.6.3")] +[assembly: AssemblyFileVersion("3.1.6.3")] diff --git a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml.vb b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml.vb index 133addef..83c9149a 100644 --- a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml.vb +++ b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml.vb @@ -20,6 +20,7 @@ If Not IsNothing(Map.refBTLDataWndVM.SelStrategySetup) AndAlso Map.refBTLDataWndVM.SelStrategySetup.Equals(SelStrategy.Content) Then Map.refStrategyManagerVM.SelStrategySetup.sName = SelStrategy.Content Map.refStrategyManagerVM.SelStrategySetup.Read() + Map.refStrategyManagerVM.OrderStrategyList(Map.refStrategyManagerVM.SelStrategySetup.StrategyFeatureList) Map.refBTLDataWndVM.ReadCustomGeneralParameters(SelStrategy.Content) Map.refBTLDataWndVM.SelStrategySetup = SelStrategy.Content End If diff --git a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb index 81013789..2a325287 100644 --- a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb +++ b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb @@ -33,6 +33,7 @@ Public Class BTLDataWndVM If m_SelStrategySetup <> value Then Map.refStrategyManagerVM.SelStrategySetup.sName = value Map.refStrategyManagerVM.SelStrategySetup.Read() + Map.refStrategyManagerVM.OrderStrategyList(Map.refStrategyManagerVM.SelStrategySetup.StrategyFeatureList) ReadCustomGeneralParameters(value) End If m_SelStrategySetup = value diff --git a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb index cd2d6253..acb1ce37 100644 --- a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb +++ b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb @@ -1,7 +1,6 @@ Imports System.Collections.ObjectModel Imports System.IO Imports System.IO.Compression -Imports System.Reflection Imports EgtBEAMWALL.Core Imports EgtUILib Imports EgtWPFLib5 @@ -25,22 +24,10 @@ Public Class ConfigurationPageVM Set(value As Integer) m_SelConfigSubPage = value If m_SelConfigSubPage = ConfigSubPages.GENERAL Then - ' Controllo se il file CustomConfig Json è stato modificato - If Map.refStrategyManagerVM.bIsModifyStrategy Then Map.refStrategyManagerVM.SaveCustomConfigJson() SetGeneral_Visibility(True) - SetStrategyManager_Visibility(False) - SetPDFEditor_Visibility(False) - ElseIf m_SelConfigSubPage = ConfigSubPages.MACHINE Then - ' Controllo se il file CustomConfig Json è stato modificato - If Map.refStrategyManagerVM.bIsModifyStrategy Then Map.refStrategyManagerVM.SaveCustomConfigJson() - SetGeneral_Visibility(False) - SetStrategyManager_Visibility(False) SetPDFEditor_Visibility(False) ElseIf m_SelConfigSubPage = ConfigSubPages.PDFEDITOR Then - ' Controllo se il file CustomConfig Json è stato modificato - If Map.refStrategyManagerVM.bIsModifyStrategy Then Map.refStrategyManagerVM.SaveCustomConfigJson() SetPDFEditor_Visibility(True) - SetGeneral_Visibility(False) SetStrategyManager_Visibility(False) End If End Set diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml index 48d73bdb..00e8b407 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml +++ b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml @@ -458,6 +458,7 @@ @@ -467,6 +468,7 @@ Style="{StaticResource CALC_ERR_Letter_TextBlock}"/> diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml index fb63b317..0cfeed91 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml +++ b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml @@ -76,7 +76,8 @@ - - + + diff --git a/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml.vb b/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml.vb index 61d0cd54..6c8c7e51 100644 --- a/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml.vb +++ b/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml.vb @@ -5,6 +5,7 @@ If Not IsNothing(Map.refProjectVM.SelStrategySetup) AndAlso Map.refProjectVM.SelStrategySetup.Equals(SelStrategy.Content) Then Map.refStrategyManagerVM.SelStrategySetup.sName = SelStrategy.Content Map.refStrategyManagerVM.SelStrategySetup.Read() + Map.refStrategyManagerVM.OrderStrategyList(Map.refStrategyManagerVM.SelStrategySetup.StrategyFeatureList) Map.refProjectVM.CustomGeneralParameters(SelStrategy.Content) Map.refProjectVM.SelStrategySetup = SelStrategy.Content End If diff --git a/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb b/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb index b3acb6b3..f20b598f 100644 --- a/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb +++ b/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb @@ -371,6 +371,7 @@ Public Class ProjectVM If Not IsNothing(value) Then Map.refStrategyManagerVM.SelStrategySetup.sName = value Map.refStrategyManagerVM.SelStrategySetup.Read() + Map.refStrategyManagerVM.OrderStrategyList(Map.refStrategyManagerVM.SelStrategySetup.StrategyFeatureList) CustomGeneralParameters(value) End If m_SelStrategySetup = value @@ -380,6 +381,7 @@ Public Class ProjectVM Friend Sub SetSelStrategy(value As String) m_SelStrategySetup = value Map.refStrategyManagerVM.SelStrategySetup.Read() + Map.refStrategyManagerVM.OrderStrategyList(Map.refStrategyManagerVM.SelStrategySetup.StrategyFeatureList) Map.refSceneHostVM.SaveProject() NotifyPropertyChanged(NameOf(SelStrategySetup)) End Sub diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb index 76806935..0e483706 100644 --- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb +++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb @@ -66,8 +66,9 @@ Public Class StrategyManagerVM End If End If m_SelStrategySetup.Read() - End If - SetSaveImage(MODIFY_IMAGE) + OrderStrategyList(m_SelStrategySetup.StrategyFeatureList) + End If + SetSaveImage(MODIFY_IMAGE) NotifyPropertyChanged(NameOf(SelStrategySetup)) End Set End Property @@ -77,6 +78,7 @@ Public Class StrategyManagerVM ' Scrivo file defaultconfig nell'ini EgtUILib.WritePrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, m_SelStrategySetup.sName, Map.refMainWindowVM.MainWindowM.sDefaultConfig) m_SelStrategySetup.Read() + OrderStrategyList(m_SelStrategySetup.StrategyFeatureList) End If NotifyPropertyChanged(NameOf(SelStrategySetup)) End Sub @@ -270,15 +272,26 @@ Public Class StrategyManagerVM ''' ''' Funzione che salva il file customconfig se sono presenti modifiche - ''' - Friend Sub SaveCustomConfigJson() + ''' + Friend Function SaveCustomConfigJson() As Boolean ' Controlla se il file JSON è stato modificato - If Not m_bIsModifyStrategy Then Return - ' Chiede conferma per il salvataggio - If EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62580), EgtMsg(15003), MessageBoxButton.YesNo, MessageBoxImage.Information) = MessageBoxResult.Yes Then - m_SelStrategySetup.Write(Map.refGeneralParametersStrategyVM.GeneralParametersList, False) - End If - End Sub + If Not m_bIsModifyStrategy Then Return False + ' Chiedo conferma per il salvataggio + Select Case EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62580), EgtMsg(15003), MessageBoxButton.YesNoCancel, MessageBoxImage.Information) + Case MessageBoxResult.Yes + If IsNothing(Map.refGeneralParametersStrategyVM) Then + Dim GeneralParametersVM As New GeneralParametersStrategyVM() + Map.refGeneralParametersStrategyVM.GeneralParametersList = GeneralParametersVM.GeneralParametersList + End If + m_SelStrategySetup.Write(Map.refGeneralParametersStrategyVM.GeneralParametersList, False) + SetbIsModifyStrategy(False) + Case MessageBoxResult.No + Update() + Case MessageBoxResult.Cancel + Return False + End Select + Return True + End Function Friend Sub Update() m_StrategySetupList.Clear() @@ -331,6 +344,18 @@ Public Class StrategyManagerVM End If End Sub + Friend Sub OrderStrategyList(StrategyFeatureList As ObservableCollection(Of StrategyFeature)) + For Each StrategySetupItem As StrategyFeature In StrategyFeatureList + For Each StrategyFeatureItem As Topology In StrategySetupItem.TopologyList + Dim OrderStrategyList As List(Of Strategy) = StrategyFeatureItem.StrategyList.OrderBy(Function(s) s.nIndexInList).ToList() + StrategyFeatureItem.StrategyList.Clear() + For Each OrderStrategyItem As Strategy In OrderStrategyList + StrategyFeatureItem.StrategyList.Add(OrderStrategyItem) + Next + Next + Next + End Sub + #End Region ' Methods #Region "COMMANDS" @@ -1030,7 +1055,7 @@ Public Class Topology Friend Function Serialize() As JsonTopology Dim JsonTopology As New JsonTopology(m_sName) Dim mOrderStrategyList As IOrderedEnumerable(Of Strategy) = m_StrategyList.OrderBy(Function(s) s.nIndexInList) - For Each Strategy In mOrderStrategyList + For Each Strategy As Strategy In mOrderStrategyList JsonTopology.StrategyList.Add(Strategy.Serialize()) Next Return JsonTopology diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb index e29976d3..3bb553a5 100644 --- a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + +