Egalware/egtbeamwall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtBEAMWALL 3.1.6.3:

Browse Source 
-aggiunto ordinamento strategie per nIndexInList
-ripristinato valori in tabelle
This commit is contained in:
Demetrio Cassarino
2026-06-19 15:13:25 +02:00
parent 8b69683620
commit fb7a7fcb2a
14 changed files with 61 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Core/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -38,5 +38,5 @@ Imports System.Windows
' 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")>
EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -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")]
EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml.vb
+1
View File
@@ -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
EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb
+1
View File
@@ -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
EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb
-13
View File
@@ -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
EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml
+2
View File
@@ -458,6 +458,7 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.ColumnSpan="2"
Text="&#11119;"
Visibility="{Binding CALC_ROT_Visibility}"
Style="{StaticResource CALC_ROTFeature_TextBlock}"/>
@@ -467,6 +468,7 @@
Style="{StaticResource CALC_ERR_Letter_TextBlock}"/>
</Grid>
<TextBlock Grid.Column="2"
Text="&#9999;"
Visibility="{Binding bStrategy_Visibility}"
Style="{StaticResource bStrategy_TextBlock}"/>
</Grid>
EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
+3 -1
View File
@@ -76,7 +76,8 @@
<RowDefinition Height="1*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<TextBlock Visibility="{Binding CALC_ROT_Visibility}"
<TextBlock Text="&#11119;"
Visibility="{Binding CALC_ROT_Visibility}"
Style="{StaticResource CALC_ROTRawPartList_TextBlock}"/>
<TextBlock Grid.Row="1"
Text="{Binding CALC_ERR_Letter}"
@@ -340,6 +341,7 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.ColumnSpan="2"
Text="&#11119;"
Visibility="{Binding CALC_ROT_Visibility}"
Style="{StaticResource CALC_ROTFeatureRawPartList_TextBlock}"/>
<TextBlock Grid.Column="1"
EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb
+1 -1
View File
@@ -945,7 +945,7 @@ Public Class MyMachGroupVM
Friend Sub Verify()
If ((IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return
Map.refProjectVM.BTLStructureVM.SelBTLPart.SetIsRowEnabled(False)
Map.refMachGroupPanelVM.SelectedMachGroup.SetIsRowEnabled(False)
Map.refCALCPanelVM.Verify(ProjectType.PROD, CalcIntegration.CmdTypes.CHECKGEN)
Return
End Sub
EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb
+6 -2
View File
@@ -40,8 +40,12 @@ Public Class MainMenuVM
End Get
Set(value As Boolean)
If value Then
SelPage = Pages.OPTIMIZERPAGE
SetConfigurationImagePath(CONFIGURATION_IMAGE)
Dim bModify As Boolean = True
If Map.refStrategyManagerVM.bIsModifyStrategy Then bModify = Map.refStrategyManagerVM.SaveCustomConfigJson()
If bModify Then
SelPage = Pages.OPTIMIZERPAGE
SetConfigurationImagePath(CONFIGURATION_IMAGE)
End If
End If
End Set
End Property
EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -67,5 +67,5 @@ Imports System.Windows
' Revision
'
<Assembly: AssemblyVersion("3.1.6.2")>
<Assembly: AssemblyFileVersion("3.1.6.2")>
<Assembly: AssemblyVersion("3.1.6.3")>
<Assembly: AssemblyFileVersion("3.1.6.3")>
EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml.vb
+1
View File
@@ -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
EgtBEAMWALL.Optimizer/Project/ProjectVM.vb
+2
View File
@@ -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
EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb
+36 -11
View File
@@ -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
''' <summary>
''' Funzione che salva il file customconfig se sono presenti modifiche
''' </summary>
Friend Sub SaveCustomConfigJson()
''' </summary>
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
EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -70,5 +70,5 @@ Imports System.Windows
' 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")>