diff --git a/EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb b/EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb index f46ca9d7..cffe203e 100644 --- a/EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb +++ b/EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb @@ -13,6 +13,7 @@ Public Class BTLFeatureVM End Get End Property Protected m_BTLPartM As BTLPartM + Protected m_PartM As PartM Public ReadOnly Property nFeatureId As Integer Get @@ -220,6 +221,12 @@ Public Class BTLFeatureVM NotifyPropertyChanged(NameOf(bStrategy_Visibility)) End Sub + Public ReadOnly Property IsEnabled As Boolean + Get + Return m_PartM.nProductionState < ItemState.Assigned + End Get + End Property + #Region "CONSTRUCTOR" Sub New() diff --git a/EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb b/EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb index a7a05599..755bacb7 100644 --- a/EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb +++ b/EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb @@ -483,6 +483,12 @@ Public MustInherit Class PartVM End Get End Property + Public ReadOnly Property ButtonIsEnabled As Boolean + Get + Return m_PartM.nProductionState < ItemState.Assigned + End Get + End Property + #End Region ' Supervisor ' definizione comandi diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb index 8a41e81e..9bc0945e 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 2cc09c79..7e6598e8 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.4.6")] -[assembly: AssemblyFileVersion("3.1.4.6")] +[assembly: AssemblyVersion("3.1.4.7")] +[assembly: AssemblyFileVersion("3.1.4.7")] diff --git a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb index 54f2578d..8862e38c 100644 --- a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb +++ b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb @@ -716,7 +716,6 @@ Public Class BTLDataWndVM Dim AISetupDirPath As String = Map.refMainWindowVM.MainWindowM.GetAISetupDirPath(nType, True) Dim sDefaultConfigFile As String = String.Empty Dim sTmpStrategySetup As String = String.Empty - Dim sInfo As String = String.Empty ' Controllo se presente file default config If IsNothing(m_SelStrategySetup) Then If EgtUILib.GetPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, "", sDefaultConfigFile, Map.refMainWindowVM.MainWindowM.sDefaultConfig) <> 0 Then @@ -736,59 +735,13 @@ Public Class BTLDataWndVM If Not IsNothing(m_SelStrategySetup) Then EgtSetInfo(m_nBTLInfoLayerId, AI_SETUP, m_SelStrategySetup) End If End If - For Each GeneralParameter In GeneralParametersList - Select Case GeneralParameter.GetType() - Case GetType(BooleanGenericParameter) - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, BooleanGenericParameter).bValue) - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, BooleanGenericParameter).bIsBooleanModify) - Case GetType(DoubleGenericParameter) - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, DoubleGenericParameter).sValue) - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, DoubleGenericParameter).bIsDoubleModify) - Case GetType(ComboGenericParameter) - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue) - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, ComboGenericParameter).bIsComboBoxModify) - Case GetType(StringGenericParameter) - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, StringGenericParameter).sValue) - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, StringGenericParameter).bIsStringModify) - Case GetType(ListGenericParameter) - For Each Item As ToolParameter In DirectCast(GeneralParameter, ListGenericParameter).ListValue - If Item.bIsActive Then - sInfo &= Item.sUUID & "," & Item.sName & ";" - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, sInfo) - End If - Next - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, ListGenericParameter).bIsListModify) - End Select - Next + + SetInfoGeneralParameters() End Sub Private Sub SaveInfo() EgtSetInfo(m_nBTLInfoLayerId, AI_SETUP, m_SelStrategySetup) - Dim sInfo As String = String.Empty - For Each GeneralParameter In GeneralParametersList - Select Case GeneralParameter.GetType() - Case GetType(BooleanGenericParameter) - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, BooleanGenericParameter).bValue) - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, BooleanGenericParameter).bIsBooleanModify) - Case GetType(DoubleGenericParameter) - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, DoubleGenericParameter).sValue) - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, DoubleGenericParameter).bIsDoubleModify) - Case GetType(ComboGenericParameter) - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue) - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, ComboGenericParameter).bIsComboBoxModify) - Case GetType(StringGenericParameter) - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, StringGenericParameter).sValue) - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, StringGenericParameter).bIsStringModify) - Case GetType(ListGenericParameter) - For Each Item As ToolParameter In DirectCast(GeneralParameter, ListGenericParameter).ListValue - If Item.bIsActive Then - sInfo &= Item.sUUID & "," & Item.sName & ";" - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, sInfo) - End If - Next - EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, ListGenericParameter).bIsListModify) - End Select - Next + SetInfoGeneralParameters() End Sub Private Sub ReadGeneralConfiguration(sStrategyConfigurationFilePath As String) @@ -843,6 +796,35 @@ Public Class BTLDataWndVM Next End Sub + Private Sub SetInfoGeneralParameters() + Dim sInfo As String = String.Empty + For Each GeneralParameter In m_GeneralParametersList + Select Case GeneralParameter.GetType() + Case GetType(BooleanGenericParameter) + EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, BooleanGenericParameter).bValue) + EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, BooleanGenericParameter).bIsBooleanModify) + Case GetType(DoubleGenericParameter) + EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, DoubleGenericParameter).sValue) + EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, DoubleGenericParameter).bIsDoubleModify) + Case GetType(ComboGenericParameter) + EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue) + EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, ComboGenericParameter).bIsComboBoxModify) + Case GetType(StringGenericParameter) + EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, StringGenericParameter).sValue) + EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, StringGenericParameter).bIsStringModify) + Case GetType(ListGenericParameter) + For Each Item As ToolParameter In DirectCast(GeneralParameter, ListGenericParameter).ListValue + If Item.bIsActive Then + sInfo &= Item.sUUID & "," & Item.sName & ";" + EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, sInfo) + End If + Next + EgtSetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge & "_FORCED", DirectCast(GeneralParameter, ListGenericParameter).bIsListModify) + End Select + Next + NotifyPropertyChanged(NameOf(GeneralParametersList)) + End Sub + #End Region ' METHODS #Region "COMMANDS" diff --git a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb index 592a985b..977e21e5 100644 --- a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb +++ b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb @@ -319,6 +319,7 @@ Public Class BTLFeatureVM m_BTLFeatureM = BTLFeatureM AddHandler m_BTLFeatureM.PBTLParamAdded, AddressOf OnPBTLParamAdded m_BTLPartM = BTLPartM + m_PartM = Nothing CreatePBTLParamVMList() NotifyPropertyChanged(NameOf(Calc_Background)) NotifyPropertyChanged(NameOf(CALC_ROT_Visibility)) @@ -328,9 +329,10 @@ Public Class BTLFeatureVM m_MenuList.Add(New MenuItemVm(Me)) End Sub - Sub New(BTLFeatureM As BTLFeatureM) + Sub New(BTLFeatureM As BTLFeatureM, PartM As PartM) m_BTLFeatureM = BTLFeatureM m_BTLPartM = Nothing + m_PartM = PartM NotifyPropertyChanged(NameOf(Calc_Background)) NotifyPropertyChanged(NameOf(CALC_ROT_Visibility)) NotifyPropertyChanged(NameOf(CALC_ERR_Letter)) diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml index 757e9a97..ce9c9802 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml +++ b/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml @@ -17,6 +17,11 @@ ColumnHeaderStyle="{StaticResource Main_DataGridColumnHeader}" CellStyle="{StaticResource CellDataGrid_CustomHighLight}" Style="{StaticResource Optimizer_DataGrid}"> + + + diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml index dfa222df..fb63b317 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml +++ b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml @@ -196,7 +196,7 @@