From 64d1bc75255e8f80320d124a08667d64855ed3b0 Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Mon, 20 Apr 2026 16:41:46 +0200 Subject: [PATCH 01/12] EgtBEAMWALL 3.1.4.5: -piccola modifica a BTLdataWnd -aggiunto messaggio errrore file defaultconfig --- EgtBEAMWALL.Core/My Project/AssemblyInfo.vb | 4 ++-- .../Properties/AssemblyInfo.cs | 4 ++-- .../BTLDataWnd/BTLDataWndV.xaml | 22 +++++++++++-------- .../BTLDataWnd/BTLDataWndV.xaml.vb | 2 +- .../BTLDataWnd/BTLDataWndVM.vb | 19 +++++++++++++++- .../EgtBEAMWALL.Optimizer.vbproj | 2 +- .../MachGroupPanel/MyMachGroupVM.vb | 2 +- .../My Project/AssemblyInfo.vb | 4 ++-- .../Panel/RightPanelTopV.xaml.vb | 2 +- EgtBEAMWALL.Optimizer/Project/ProjectVM.vb | 2 +- .../RawPartManager/RawPartManagerVM.vb | 2 +- EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml | 10 +++++++++ .../My Project/AssemblyInfo.vb | 4 ++-- 13 files changed, 55 insertions(+), 24 deletions(-) diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb index b429e9dd..19c2e7cf 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 748e5b79..05dff5de 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.4")] -[assembly: AssemblyFileVersion("3.1.4.4")] +[assembly: AssemblyVersion("3.1.4.5")] +[assembly: AssemblyFileVersion("3.1.4.5")] diff --git a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml index 38e1119d..49a0e1dd 100644 --- a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml +++ b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml @@ -18,15 +18,19 @@ - - - - - + + + + + + + + diff --git a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml.vb b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml.vb index 80bd1b8c..60d3f798 100644 --- a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml.vb +++ b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndV.xaml.vb @@ -16,7 +16,7 @@ Private Sub ComboBoxItem_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs) Dim SelStrategy As ComboBoxItem = DirectCast(sender, ComboBoxItem) - If Map.refBTLDataWndVM.SelStrategySetup.Equals(SelStrategy.Content) Then + 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.refBTLDataWndVM.ReadCustomGeneralParameters(SelStrategy.Content) diff --git a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb index ecd8e65b..1bd04dfc 100644 --- a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb +++ b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb @@ -69,6 +69,17 @@ Public Class BTLDataWndVM NotifyPropertyChanged(NameOf(IsBTLDataWnd)) End Sub + Private m_sErrText As String = String.Empty + Public ReadOnly Property ErrText As String + Get + Return m_sErrText + End Get + End Property + Friend Sub SetIErrText(value As String) + m_sErrText = value + NotifyPropertyChanged(NameOf(ErrText)) + End Sub + #Region "Parametri generici" Public m_sPROJNUM As String @@ -613,7 +624,12 @@ Public Class BTLDataWndVM ' Leggo parametri generali Dim sDefaultConfigFile As String = String.Empty If EgtGetInfo(m_nBTLInfoLayerId, AI_SETUP, sDefaultConfigFile) Then - m_SelStrategySetup = sDefaultConfigFile + If m_StrategySetupList.Contains(sDefaultConfigFile) Then + m_SelStrategySetup = sDefaultConfigFile + SetIErrText(String.Empty) + Else + SetIErrText(EgtMsg(62113) & sDefaultConfigFile & EgtMsg(62114)) + End If ElseIf EgtUILib.GetPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, "", sDefaultConfigFile, Map.refMainWindowVM.MainWindowM.sDefaultConfig) <> 0 Then m_SelStrategySetup = sDefaultConfigFile End If @@ -716,6 +732,7 @@ Public Class BTLDataWndVM End Sub Friend Sub ReadCustomGeneralParameters(SelStrategySetup As String) + SetIErrText(String.Empty) Dim sStrategiesDirPath As String = Map.refMainWindowVM.MainWindowM.GetStrategiesDirPath(Map.refStrategyManagerVM.SelStrategyType.Id) Dim sGeneralParametersFilePath As String = sStrategiesDirPath & "\" & GENERALPARAMETERS_FILE & ".json" If File.Exists(sGeneralParametersFilePath) Then diff --git a/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj b/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj index bcbe0ea6..d22af3e3 100644 --- a/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj +++ b/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj @@ -1003,7 +1003,7 @@ 3.1.1.2 - 3.1.3-beta.1 + 3.1.3-beta.6 6.4.4 diff --git a/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb b/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb index 11b618b1..6aab57ea 100644 --- a/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb +++ b/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb @@ -933,7 +933,7 @@ Public Class MyMachGroupVM Friend Sub Verify() If ((IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return - Map.refCALCPanelVM.Verify(ProjectType.PROD, CalcIntegration.CmdTypes.CHECKNOSIM) + Map.refCALCPanelVM.Verify(ProjectType.PROD, CalcIntegration.CmdTypes.CHECKGEN) Return End Sub diff --git a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb index 86f249b5..0a68b49b 100644 --- a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb @@ -67,5 +67,5 @@ Imports System.Windows ' Revision ' - - + + diff --git a/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml.vb b/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml.vb index 34a23a43..61d0cd54 100644 --- a/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml.vb +++ b/EgtBEAMWALL.Optimizer/Panel/RightPanelTopV.xaml.vb @@ -2,7 +2,7 @@ Private Sub ComboBoxItem_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs) Dim SelStrategy As ComboBoxItem = DirectCast(sender, ComboBoxItem) - If Map.refProjectVM.SelStrategySetup.Equals(SelStrategy.Content) Then + 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.refProjectVM.CustomGeneralParameters(SelStrategy.Content) diff --git a/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb b/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb index 954c6884..f36739bb 100644 --- a/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb +++ b/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb @@ -674,7 +674,7 @@ Public Class ProjectVM End If End If Else - SetSelStrategy(sStrategyPartSetup) + SetSelStrategy(sStrategyBTLPartSetup) End If Dim sStrategiesDirPath As String = Map.refMainWindowVM.MainWindowM.GetStrategiesDirPath(nType) diff --git a/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb b/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb index 933646d1..3eb5159e 100644 --- a/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb +++ b/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb @@ -783,7 +783,7 @@ Public Class RawPartManagerVM For PartIndex = 0 To Map.refMachGroupPanelVM.MachGroupVMList.Count - 1 DirectCast(Map.refMachGroupPanelVM.MachGroupVMList(PartIndex), MyMachGroupVM).SetIsRowEnabled(False) Next - Map.refCALCPanelVM.VerifyAll(ProjectType.PROD, CalcIntegration.CmdTypes.CHECKNOSIM) + Map.refCALCPanelVM.VerifyAll(ProjectType.PROD, CalcIntegration.CmdTypes.CHECKGEN) Return End Sub diff --git a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml index d07ec9ea..b018f4f6 100644 --- a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml +++ b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml @@ -532,6 +532,16 @@ + + diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb index 23287628..bff3bc7d 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: ' - - + + From 7b4f8529c353338ecb898b8ee4204c590c508405 Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Tue, 21 Apr 2026 16:55:11 +0200 Subject: [PATCH 02/12] EgtBEAMWALL 3.1.4.6: -cambiato gestione SetVisibility -aggiunto su veriifica singolo pezzo disabilita intera riga --- EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb | 4 +- EgtBEAMWALL.Core/My Project/AssemblyInfo.vb | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../BTLDataWnd/BTLDataWndVM.vb | 12 ++-- .../BTLPartManager/BTLPartManagerVM.vb | 4 +- .../BTLViewModel/BTLFeatureVM.vb | 2 +- .../BTLViewModel/BTLPartVM.vb | 29 ++++----- .../BTLViewModel/BTLStructureVM.vb | 14 ++--- .../CALCPanel/CALCPanelVM.vb | 10 +-- .../ConfigurationPage/ConfigurationPageVM.vb | 42 ++++++------- .../MyExecProcessManager.vb | 2 +- .../FeatureManager/FeatureManagerVM.vb | 4 +- .../ForcedStrategyPanelVM.vb | 10 +-- .../GeneralParametersStrategyVM.vb | 54 ++++++++-------- .../GeneralParametersWndVM.vb | 6 +- .../JsonGeneralParameters.vb | 10 +-- .../JsonGenericParametersHelper.vb | 10 +-- .../ItemParamList/BTLPartListV.xaml | 4 +- .../ItemParamList/PParameterListVM.vb | 8 +-- .../MachGroupPanel/MyMachGroupPanelVM.vb | 8 +-- .../MachGroupPanel/MyMachGroupVM.vb | 11 ++-- .../MachinePanel/MachinePanelVM.vb | 9 +-- EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb | 28 ++++----- .../My Project/AssemblyInfo.vb | 4 +- .../ProdManager/ProdManagerVM.vb | 24 +++---- EgtBEAMWALL.Optimizer/Project/ProjectVM.vb | 58 ++++++++--------- .../SaveAsStrategyWnd/SaveAsStrategyVM.vb | 8 +-- .../ShowBeamPanel/ShowBeamPanelVM.vb | 12 ++-- .../Statistics/PDFEditorVM.vb | 20 +++--- .../JsonAvailableStrategyHelper.vb | 10 +-- .../StrategyManager/StrategyManagerVM.vb | 62 +++++++++---------- EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml | 2 - .../My Project/AssemblyInfo.vb | 4 +- 33 files changed, 248 insertions(+), 245 deletions(-) diff --git a/EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb b/EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb index f0ff93c0..f46ca9d7 100644 --- a/EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb +++ b/EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb @@ -215,8 +215,8 @@ Public Class BTLFeatureVM Return m_bStrategy_Visibility End Get End Property - Public Sub SetbStrategy_Visibility(value As Visibility) - m_bStrategy_Visibility = value + Public Sub SetbStrategy_Visibility(value As Boolean) + m_bStrategy_Visibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(bStrategy_Visibility)) End Sub diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb index 19c2e7cf..8a41e81e 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 05dff5de..2cc09c79 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.5")] -[assembly: AssemblyFileVersion("3.1.4.5")] +[assembly: AssemblyVersion("3.1.4.6")] +[assembly: AssemblyFileVersion("3.1.4.6")] diff --git a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb index 1bd04dfc..f1667a8c 100644 --- a/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb +++ b/EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb @@ -645,12 +645,12 @@ Public Class BTLDataWndVM For Each GenericItem As ProjectParameters In m_GeneralParametersList Select Case GenericItem.sMinUserLevel Case UserLevel.ADVANCED - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, True, False)) Case UserLevel.ADMINISTRATOR - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UnlockAllIsChecked, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UnlockAllIsChecked, True, False)) Case Else If Not Map.refMainMenuVM.UserAdmin_IsChecked Then - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, True, False)) Map.refMainMenuVM.SetUnloackImage(PADLOCK_IMAGE) End If End Select @@ -744,12 +744,12 @@ Public Class BTLDataWndVM For Each GenericItem As ProjectParameters In m_GeneralParametersList Select Case GenericItem.sMinUserLevel Case UserLevel.ADVANCED - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, True, False)) Case UserLevel.ADMINISTRATOR - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UnlockAllIsChecked, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UnlockAllIsChecked, True, False)) Case Else If Not Map.refMainMenuVM.UserAdmin_IsChecked Then - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, True, False)) Map.refMainMenuVM.SetUnloackImage(PADLOCK_IMAGE) End If End Select diff --git a/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb b/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb index 92599236..436aa6a4 100644 --- a/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb +++ b/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb @@ -361,8 +361,8 @@ Public Class BTLPartManagerVM Else Map.refProjectVM.Read(ProjectManagerVM.CurrProd.nType) End If - Map.refProjectVM.SetRawPartManagerVisibility(Visibility.Collapsed) - Map.refProjectVM.SetFeatureListVisibility(Visibility.Collapsed) + Map.refProjectVM.SetRawPartManagerVisibility(False) + Map.refProjectVM.SetFeatureListVisibility(False) Map.refProjectVM.SetSelManagerTab(ProjectVM.StrategyManagerTab.FEATUREMANAGER) ' Disabilito LeftPanel Map.refProjectVM.SetLeftPanel_IsEnabled(False) diff --git a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb index 63b17cdf..592a985b 100644 --- a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb +++ b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb @@ -595,7 +595,7 @@ Public Class BTLFeatureVM If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then Map.refShowBeamPanelVM.ShowBuilding_IsChecked = False End If - Map.refProjectVM.SetRawPartManagerVisibility(Visibility.Collapsed) + Map.refProjectVM.SetRawPartManagerVisibility(False) Map.refProjectVM.SetSelManagerTab(ProjectVM.StrategyManagerTab.FEATUREMANAGERBTL) Map.refProjectVM.SetSelFeatureManagerTab(ProjectVM.FeatureManagerTab.STRATEGYMANAGERBTL) ' Disabilito LeftPanel diff --git a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb index 29cf5b2a..ecd4aa94 100644 --- a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb +++ b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLPartVM.vb @@ -1556,7 +1556,7 @@ Public Class BTLPartVM m_SelBTLFeatureVM.RefreshFCMBtnVisibility() ' Controlo se nPRC è 900 rendo visibile combobox Variant If m_SelBTLFeatureVM.nPRC = 900 Then - Map.refFeatureManagerVM.SetVariant_Visibility(Visibility.Visible) + Map.refFeatureManagerVM.SetVariant_Visibility(True) Dim nVariant As Integer = 0 If Integer.TryParse(m_SelBTLFeatureVM.sDES, nVariant) Then m_SelBTLFeatureVM.nSelVARIANT = nVariant @@ -1569,7 +1569,7 @@ Public Class BTLPartVM Map.refPParameterListVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & m_SelBTLFeatureVM.sDescGRP & ".png") End If Else - Map.refFeatureManagerVM.SetVariant_Visibility(Visibility.Collapsed) + Map.refFeatureManagerVM.SetVariant_Visibility(False) End If End If If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.FeatureSelectionChanged() @@ -1584,11 +1584,11 @@ Public Class BTLPartVM NotifyPropertyChanged(NameOf(SelBTLFeatureVM)) ' se modalità building, la tolgo If Not IsNothing(m_SelBTLFeatureVM) AndAlso Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then - Map.refProjectVM.SetSceneShowBuldingVisibility(Visibility.Collapsed) + Map.refProjectVM.SetSceneShowBuldingVisibility(False) Map.refProjectVM.BTLStructureVM.ShowBuilding(False, False) Map.refShowBeamPanelVM.SetShowBuilding(False) - Map.refProjectVM.SetManagerTabVisibility(Visibility.Visible) - If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.SetFeatureListVisibility(Visibility.Visible) + Map.refProjectVM.SetManagerTabVisibility(True) + If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.SetFeatureListVisibility(True) End If End Set End Property @@ -1606,7 +1606,7 @@ Public Class BTLPartVM m_SelBTLFeatureVM.RefreshFCMBtnVisibility() ' Controlo se nPRC è 900 rendo visibile combobox Variant If m_SelBTLFeatureVM.nPRC = 900 Then - Map.refFeatureManagerVM.SetVariant_Visibility(Visibility.Visible) + Map.refFeatureManagerVM.SetVariant_Visibility(True) Dim nVariant As Integer = 0 If Integer.TryParse(m_SelBTLFeatureVM.sDES, nVariant) Then m_SelBTLFeatureVM.nSelVARIANT = nVariant @@ -1619,7 +1619,7 @@ Public Class BTLPartVM Map.refPParameterListVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & m_SelBTLFeatureVM.sDescGRP & ".png") End If Else - Map.refFeatureManagerVM.SetVariant_Visibility(Visibility.Collapsed) + Map.refFeatureManagerVM.SetVariant_Visibility(False) End If End If If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.FeatureSelectionChanged() @@ -1739,14 +1739,14 @@ Public Class BTLPartVM End Get End Property - Private m_bStrategyModify_Visibility As Visibility = Visibility.Collapsed + Private m_bStrategyModify_Visibility As Visibility = Visibility.Hidden Public ReadOnly Property StrategyModify_Visibility As Visibility Get Return m_bStrategyModify_Visibility End Get End Property - Friend Sub SetStrategyModify_Visibility(value As Visibility) - m_bStrategyModify_Visibility = value + Friend Sub SetStrategyModify_Visibility(value As Boolean) + m_bStrategyModify_Visibility = If(value, Visibility.Visible, Visibility.Hidden) NotifyPropertyChanged(NameOf(StrategyModify_Visibility)) End Sub @@ -1865,7 +1865,7 @@ Public Class BTLPartVM AddHandler m_BTLFeatureVMList.CollectionChanged, AddressOf OnBTLFeatureVMListChanged End Sub - Public Sub Rotation(IsPositive As Boolean, SelectedMachineType As MachineType, Optional bRedraw As Boolean = True, Optional dAng As Double = 90, Optional bVerifyDuplo As Boolean = True, Optional CmdType As CmdTypes = CalcIntegration.CmdTypes.CHECKGEN) + Public Sub Rotation(IsPositive As Boolean, SelectedMachineType As MachineType, Optional bRedraw As Boolean = True, Optional dAng As Double = 90, Optional bVerifyDuplo As Boolean = True, Optional bResetCalc As Boolean = True) Dim OldSection As SectionXMaterial = Section If m_BTLPartM.Rotation(IsPositive, SelectedMachineType, bRedraw, dAng) Then ' aggiorno visualizzazione dimensioni @@ -1873,7 +1873,7 @@ Public Class BTLPartVM NotifyPropertyChanged(NameOf(sH)) NotifyPropertyChanged(NameOf(sL)) ' setto part e tutte le feature da ricalcolare - If CmdType <> CmdTypes.FLIP_ROT Then ResetCalcTotalPart() + If Not bResetCalc Then ResetCalcTotalPart() ' aggiorno sezioni Map.refProjectVM.BTLStructureVM.UpdateSection(Section, OldSection) End If @@ -2286,10 +2286,10 @@ Public Class BTLPartVM ForwardRotation(True) End Sub - Public Sub ForwardRotation(Optional bUpdateSection As Boolean = False, Optional bRedraw As Boolean = True, Optional dAng As Double = 90, Optional CmdType As CmdTypes = CalcIntegration.CmdTypes.CHECKGEN) + Public Sub ForwardRotation(Optional bUpdateSection As Boolean = False, Optional bRedraw As Boolean = True, Optional dAng As Double = 90, Optional bResetCalc As Boolean = True) ' salvo sezione impostata Dim CurrSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SelSection - Rotation(True, Map.refProjectVM.BTLStructureVM.nPROJTYPE, bRedraw, dAng, True, CmdType) + Rotation(True, Map.refProjectVM.BTLStructureVM.nPROJTYPE, bRedraw, dAng, True, bResetCalc) ' imposto lock bLockRotation = True ' se progetto travi e sezione precedente diversa da vuota (tutti i pezzi) @@ -2390,6 +2390,7 @@ Public Class BTLPartVM 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.refCALCPanelVM.Verify(ProjectType.PROJ, CalcIntegration.CmdTypes.CHECKNOSIM) Return End Sub diff --git a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb index 7452b70c..2689e3f9 100644 --- a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb +++ b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb @@ -112,9 +112,9 @@ Public Class BTLStructureVM If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then ShowBuilding(False, False) Map.refShowBeamPanelVM.SetShowBuilding(False) - Map.refProjectVM.SetSceneShowBuldingVisibility(Visibility.Collapsed) - Map.refProjectVM.SetManagerTabVisibility(Visibility.Visible) - If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.SetFeatureListVisibility(Visibility.Visible) + Map.refProjectVM.SetSceneShowBuldingVisibility(False) + Map.refProjectVM.SetManagerTabVisibility(True) + If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.SetFeatureListVisibility(True) End If SceneSelPartSelection() ' seleziono pezzo in Db geometrico @@ -153,8 +153,8 @@ Public Class BTLStructureVM bValue = False EgtGetInfo(FeatureParam.nFeatureId, ConstBeam.STRATEGY & FeatureParam.nFeatureId & "_FORCED", bValue) If bValue Then - SelBTLPart.SetStrategyModify_Visibility(Visibility.Visible) - FeatureParam.SetbStrategy_Visibility(Visibility.Visible) + SelBTLPart.SetStrategyModify_Visibility(True) + FeatureParam.SetbStrategy_Visibility(True) End If For Each StrategySetupParam As StrategySetup In Map.refStrategyManagerVM.StrategySetupList For Each StrategyFeatureParam As StrategyFeature In StrategySetupParam.StrategyFeatureList @@ -163,7 +163,7 @@ Public Class BTLStructureVM For Each Param As StrategyParameter In StrategyParam.ParameterList bValueForced = False EgtGetInfo(FeatureParam.nFeatureId, StrategyParam.sStrategyId & "_" & Param.sNameNge & "_FORCED", bValueForced) - If bValueForced Then FeatureParam.SetbStrategy_Visibility(Visibility.Visible) + If bValueForced Then FeatureParam.SetbStrategy_Visibility(True) Next Next Next @@ -883,7 +883,7 @@ Public Class BTLStructureVM bValueForced = False EgtGetInfo(m_BTLStructureM.nBTLInfoId, GeneralParameter.sNameNge & "_FORCED", bValue) EgtGetInfo(BTLPart.nPartId, GeneralParameter.sNameNge & "_FORCED", bValueForced) - If bValueForced Then BTLPart.SetStrategyModify_Visibility(Visibility.Visible) + If bValueForced Then BTLPart.SetStrategyModify_Visibility(True) Next Next End If diff --git a/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb b/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb index a9f26cbf..54b5bd9f 100644 --- a/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb +++ b/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb @@ -604,7 +604,7 @@ Public Class CALCPanelVM End If End Sub - Private Sub VerifyProdWithEngine(CurrMachGroup As MyMachGroupVM, CmdType As Integer) + Private Sub VerifyProdWithEngine(CurrMachGroup As MyMachGroupVM) ' se e' gia' stato assegnato a supervisor, la salto e vado alla prossima barra If CurrMachGroup.nProduction_State >= ItemState.Assigned Then Return Dim Args As New Dictionary(Of String, String) @@ -626,7 +626,7 @@ Public Class CALCPanelVM Dim sMachGroupFilePath As String = BarPath & "\" & CurrMachGroup.Name.ToString() & ".ori.bwe" If File.Exists(sMachGroupFilePath) Then File.Delete(sMachGroupFilePath) End If - nCmdType = CmdType + nCmdType = CalcIntegration.CmdTypes.CHECKGEN End Select Args.Add("CmdType", nCmdType) Dim ExecEnvironment As EXECENVIRONMENTS = EXECENVIRONMENTS.NULL @@ -678,7 +678,7 @@ Public Class CALCPanelVM ElseIf ProgramPage = ProjectType.PROD Then ' se e' gia' stato assegnato a supervisor, la salto e vado alla prossima barra If Map.refMachGroupPanelVM.SelectedMachGroup.nProduction_State >= ItemState.Assigned Then Return - VerifyProdWithEngine(Map.refMachGroupPanelVM.SelectedMachGroup, CmdType) + VerifyProdWithEngine(Map.refMachGroupPanelVM.SelectedMachGroup) End If End Sub @@ -804,7 +804,7 @@ Public Class CALCPanelVM For PartIndex = 0 To Map.refMachGroupPanelVM.MachGroupVMList.Count - 1 ' se e' gia' stato assegnato a supervisor, la salto e vado alla prossima barra If DirectCast(Map.refMachGroupPanelVM.MachGroupVMList(PartIndex), MyMachGroupVM).nProduction_State >= ItemState.Assigned Then Return - VerifyProdWithEngine(Map.refMachGroupPanelVM.MachGroupVMList(PartIndex), CmdType) + VerifyProdWithEngine(Map.refMachGroupPanelVM.MachGroupVMList(PartIndex)) Next End If End Sub @@ -971,7 +971,7 @@ Public Class CALCPanelVM Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(ProjId)) For Each Part In Map.refProjectVM.BTLStructureVM.BTLPartVMList Part.ResetCalcTotalPart() - Part.SetStrategyModify_Visibility(Visibility.Collapsed) + Part.SetStrategyModify_Visibility(False) For Each Feature As BTLFeatureVM In Part.BTLFeatureVMList Map.refForcedStrategyPanelVM.ResetForcedStrategy(Feature.nFeatureId) Next diff --git a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb index 75b40265..7f652dcf 100644 --- a/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb +++ b/EgtBEAMWALL.Optimizer/ConfigurationPage/ConfigurationPageVM.vb @@ -27,21 +27,21 @@ Public Class ConfigurationPageVM If m_SelConfigSubPage = ConfigSubPages.GENERAL Then ' Controllo se il file CustomConfig Json è stato modificato If Map.refStrategyManagerVM.bIsModifyStrategy Then Map.refStrategyManagerVM.SaveCustomConfigJson() - SetGeneral_Visibility(Visibility.Visible) - SetStrategyManager_Visibility(Visibility.Collapsed) - SetPDFEditor_Visibility(Visibility.Collapsed) + 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(Visibility.Collapsed) - SetStrategyManager_Visibility(Visibility.Collapsed) - SetPDFEditor_Visibility(Visibility.Collapsed) + 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(Visibility.Visible) - SetGeneral_Visibility(Visibility.Collapsed) - SetStrategyManager_Visibility(Visibility.Collapsed) + SetPDFEditor_Visibility(True) + SetGeneral_Visibility(False) + SetStrategyManager_Visibility(False) End If End Set End Property @@ -204,8 +204,8 @@ Public Class ConfigurationPageVM Return m_bGeneral_Visibility End Get End Property - Friend Sub SetGeneral_Visibility(value As Visibility) - m_bGeneral_Visibility = value + Friend Sub SetGeneral_Visibility(value As Boolean) + m_bGeneral_Visibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(General_Visibility)) End Sub @@ -215,8 +215,8 @@ Public Class ConfigurationPageVM Return m_bStrategyManager_Visibility End Get End Property - Friend Sub SetStrategyManager_Visibility(value As Visibility) - m_bStrategyManager_Visibility = value + Friend Sub SetStrategyManager_Visibility(value As Boolean) + m_bStrategyManager_Visibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(StrategyManager_Visibility)) End Sub @@ -226,8 +226,8 @@ Public Class ConfigurationPageVM Return m_bMachine_Visibility End Get End Property - Friend Sub SetMachine_Visibility(value As Visibility) - m_bMachine_Visibility = value + Friend Sub SetMachine_Visibility(value As Boolean) + m_bMachine_Visibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(Machine_Visibility)) End Sub @@ -237,8 +237,8 @@ Public Class ConfigurationPageVM Return m_bPDFEditor_Visibility End Get End Property - Friend Sub SetPDFEditor_Visibility(value As Visibility) - m_bPDFEditor_Visibility = value + Friend Sub SetPDFEditor_Visibility(value As Boolean) + m_bPDFEditor_Visibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(PDFEditor_Visibility)) End Sub @@ -248,8 +248,8 @@ Public Class ConfigurationPageVM Return m_MachineParameter_Visibility End Get End Property - Friend Sub SetMachineParameter_Visibility(value As Visibility) - m_MachineParameter_Visibility = value + Friend Sub SetMachineParameter_Visibility(value As Boolean) + m_MachineParameter_Visibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(MachineParameter_Visibility)) End Sub @@ -614,8 +614,8 @@ Public Class ConfigurationPageVM SelReminder = m_ReminderList.FirstOrDefault(Function(x) x.Id = nDefaultReminderFrequency) Dim nExternalBackupActive As Integer = GetMainPrivateProfileInt(S_BACKUPANDRESTORE, K_EXTERNALBACKUPACTIVE, 0) m_bExternalBackupActive = nExternalBackupActive > 0 - SetMachineParameter_Visibility(Visibility.Collapsed) - SetMachine_Visibility(Visibility.Collapsed) + SetMachineParameter_Visibility(False) + SetMachine_Visibility(False) ' Recupero flag per verificare se fare solo l'importazione del btl o anche la verifica m_bVerifyImportBTL_IsChecked = GetMainPrivateProfileInt(S_GENERAL, K_VERIFYIMPORTBTL, 0) <> 0 '' imposto il tema diff --git a/EgtBEAMWALL.Optimizer/ExecProcessManager/MyExecProcessManager.vb b/EgtBEAMWALL.Optimizer/ExecProcessManager/MyExecProcessManager.vb index 4709627a..41725c71 100644 --- a/EgtBEAMWALL.Optimizer/ExecProcessManager/MyExecProcessManager.vb +++ b/EgtBEAMWALL.Optimizer/ExecProcessManager/MyExecProcessManager.vb @@ -89,7 +89,7 @@ Module MyExecProcessManager If BTLPartItem.IsInverted Then bPreInvert = False BTLPartItem.SetInverted(bPreInvert) End If - If nPreRotate > 0 Then BTLPartItem.ForwardRotation(True, True, dAng, Core.CalcIntegration.CmdTypes.FLIP_ROT) + If nPreRotate > 0 Then BTLPartItem.ForwardRotation(True, True, dAng, False) End If ' Gestione progressbar per verificare l'inizio e la fine della verifica Dim BeamManager As ExecProcessManager = m_ExecProcessManagerList(EXECENVIRONMENTS.BEAM) diff --git a/EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerVM.vb b/EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerVM.vb index 03c21ee8..93954184 100644 --- a/EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerVM.vb +++ b/EgtBEAMWALL.Optimizer/FeatureManager/FeatureManagerVM.vb @@ -23,8 +23,8 @@ Public Class FeatureManagerVM Return m_Variant_Visibility End Get End Property - Public Sub SetVariant_Visibility(value As Visibility) - m_Variant_Visibility = value + Public Sub SetVariant_Visibility(value As Boolean) + m_Variant_Visibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(Variant_Visibility)) End Sub diff --git a/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelVM.vb b/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelVM.vb index 7623740f..af306b02 100644 --- a/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelVM.vb +++ b/EgtBEAMWALL.Optimizer/ForcedStrategyPanel/ForcedStrategyPanelVM.vb @@ -285,15 +285,15 @@ Public Class ForcedStrategyPanelVM m_SelStrategy.SetbIsStrategyModify(False) EgtRemoveInfo(m_CurrentFeature.nFeatureId, ConstBeam.STRATEGY) EgtRemoveInfo(m_CurrentFeature.nFeatureId, ConstBeam.STRATEGY & m_CurrentFeature.nFeatureId & "_FORCED") - Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(Visibility.Collapsed) - Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SetbStrategy_Visibility(Visibility.Collapsed) + Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(False) + Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SetbStrategy_Visibility(False) Else m_SelStrategy.SetbIsStrategyModify(True) - Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(Visibility.Visible) + Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(True) If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM) Then - Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SetbStrategy_Visibility(Visibility.Visible) + Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SetbStrategy_Visibility(True) ElseIf Not IsNothing(Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM) Then - Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.SetbStrategy_Visibility(Visibility.Visible) + Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.SetbStrategy_Visibility(True) End If EgtSetInfo(m_CurrentFeature.nFeatureId, ConstBeam.STRATEGY, SelStrategy.sStrategyId) EgtSetInfo(m_CurrentFeature.nFeatureId, ConstBeam.STRATEGY & m_CurrentFeature.nFeatureId & "_FORCED", SelStrategy.bIsStrategyModify) diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb index 0efc15d3..2949f119 100644 --- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb +++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb @@ -74,12 +74,12 @@ Public Class GeneralParametersStrategyVM For Each GenericItem As ProjectParameters In m_GeneralParametersList Select Case GenericItem.sMinUserLevel Case UserLevel.ADVANCED - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, True, False)) Case UserLevel.ADMINISTRATOR - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UnlockAllIsChecked, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UnlockAllIsChecked, True, False)) Case Else If Not Map.refMainMenuVM.UserAdmin_IsChecked Then - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, True, False)) Map.refMainMenuVM.SetUnloackImage(PADLOCK_IMAGE) End If End Select @@ -438,29 +438,29 @@ Public MustInherit Class ProjectParameters Case GetType(BooleanGenericParameter) DirectCast(DefaultProject, BooleanGenericParameter).SetValue(ProjectParameters.sValue) If m_sMinUserLevel = 1 Then - DirectCast(DefaultProject, BooleanGenericParameter).SetbBooleanVisibility(Visibility.Visible) + DirectCast(DefaultProject, BooleanGenericParameter).SetbBooleanVisibility(True) End If Case GetType(DoubleGenericParameter) DirectCast(DefaultProject, DoubleGenericParameter).SetValue(ProjectParameters.sValue) If m_sMinUserLevel = 1 Then - DirectCast(DefaultProject, DoubleGenericParameter).SetbDoubleVisibility(Visibility.Visible) + DirectCast(DefaultProject, DoubleGenericParameter).SetbDoubleVisibility(True) End If Case GetType(ComboGenericParameter) DirectCast(DefaultProject, ComboGenericParameter).SetSelValue(ProjectParameters.sValue) If m_sMinUserLevel = 1 Then - DirectCast(DefaultProject, ComboGenericParameter).SetbComboBoxVisibility(Visibility.Visible) + DirectCast(DefaultProject, ComboGenericParameter).SetbComboBoxVisibility(True) End If Case GetType(StringGenericParameter) DirectCast(DefaultProject, StringGenericParameter).SetValue(ProjectParameters.sValue) If m_sMinUserLevel = 1 Then - DirectCast(DefaultProject, StringGenericParameter).SetbStringVisibility(Visibility.Visible) + DirectCast(DefaultProject, StringGenericParameter).SetbStringVisibility(True) End If Case GetType(ListGenericParameter) DirectCast(DefaultProject, ListGenericParameter).SetSelValue(ProjectParameters.sValue) DirectCast(DefaultProject, ListGenericParameter).CreateToolsViews() DirectCast(DefaultProject, ListGenericParameter).ToolView() If DefaultProject.sMinUserLevel = 1 Then - DirectCast(DefaultProject, ListGenericParameter).SetbListBoxVisibility(Visibility.Visible) + DirectCast(DefaultProject, ListGenericParameter).SetbListBoxVisibility(True) End If End Select End If @@ -500,8 +500,8 @@ Public Class BooleanGenericParameter Return m_bBooleanVisibility End Get End Property - Friend Sub SetbBooleanVisibility(value As Visibility) - m_bBooleanVisibility = value + Friend Sub SetbBooleanVisibility(value As Boolean) + m_bBooleanVisibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(bBooleanVisibility)) End Sub @@ -514,7 +514,7 @@ Public Class BooleanGenericParameter Friend Sub SetbIsBooleanModify(value As Boolean) m_bIsBooleanModify = value If m_bIsBooleanModify AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) AndAlso Map.refProjectVM.bSaveGeneralParameters Then - Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(Visibility.Visible) + Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(True) End If NotifyPropertyChanged(NameOf(bIsBooleanModify)) End Sub @@ -593,8 +593,8 @@ Public Class DoubleGenericParameter Return m_bDoubleVisibility End Get End Property - Friend Sub SetbDoubleVisibility(value As Visibility) - m_bDoubleVisibility = value + Friend Sub SetbDoubleVisibility(value As Boolean) + m_bDoubleVisibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(bDoubleVisibility)) End Sub @@ -607,7 +607,7 @@ Public Class DoubleGenericParameter Friend Sub SetbIsDoubleModify(value As Boolean) m_bIsDoubleModify = value If m_bIsDoubleModify AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) AndAlso Map.refProjectVM.bSaveGeneralParameters Then - Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(Visibility.Visible) + Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(True) End If NotifyPropertyChanged(NameOf(bIsDoubleModify)) End Sub @@ -669,8 +669,8 @@ Public Class StringGenericParameter Return m_bStringVisibility End Get End Property - Friend Sub SetbStringVisibility(value As Visibility) - m_bStringVisibility = value + Friend Sub SetbStringVisibility(value As Boolean) + m_bStringVisibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(bStringVisibility)) End Sub @@ -683,7 +683,7 @@ Public Class StringGenericParameter Friend Sub SetbIsStringModify(value As Boolean) m_bIsStringModify = value If m_bIsStringModify AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) AndAlso Map.refProjectVM.bSaveGeneralParameters Then - Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(Visibility.Visible) + Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(True) End If NotifyPropertyChanged(NameOf(bIsStringModify)) End Sub @@ -758,8 +758,8 @@ Public Class ComboGenericParameter Return m_bComboBoxVisibility End Get End Property - Friend Sub SetbComboBoxVisibility(value As Visibility) - m_bComboBoxVisibility = value + Friend Sub SetbComboBoxVisibility(value As Boolean) + m_bComboBoxVisibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(bComboBoxVisibility)) End Sub @@ -772,7 +772,7 @@ Public Class ComboGenericParameter Friend Sub SetbIsComboBoxModify(value As Boolean) m_bIsComboBoxModify = value If m_bIsComboBoxModify AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) AndAlso Map.refProjectVM.bSaveGeneralParameters Then - Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(Visibility.Visible) + Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(True) End If NotifyPropertyChanged(NameOf(bIsComboBoxModify)) End Sub @@ -870,8 +870,8 @@ Public Class ListGenericParameter Return m_bAvailableToolListVisibility End Get End Property - Friend Sub SetAvailableToolListVisibility(value As Visibility) - m_bAvailableToolListVisibility = value + Friend Sub SetAvailableToolListVisibility(value As Boolean) + m_bAvailableToolListVisibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(AvailableToolListVisibility)) End Sub @@ -914,8 +914,8 @@ Public Class ListGenericParameter Return m_bListBoxVisibility End Get End Property - Friend Sub SetbListBoxVisibility(value As Visibility) - m_bListBoxVisibility = value + Friend Sub SetbListBoxVisibility(value As Boolean) + m_bListBoxVisibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(bListBoxVisibility)) End Sub @@ -928,7 +928,7 @@ Public Class ListGenericParameter Friend Sub SetbIsListModify(value As Boolean) m_bIsListModify = value If m_bIsListModify AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) AndAlso Map.refProjectVM.bSaveGeneralParameters Then - Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(Visibility.Visible) + Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(True) End If NotifyPropertyChanged(NameOf(bIsListModify)) End Sub @@ -1044,7 +1044,7 @@ Public Class ListGenericParameter End Property Friend Sub OpenToolList() - SetAvailableToolListVisibility(Visibility.Visible) + SetAvailableToolListVisibility(True) SetOpenToolListIsEnable(False) End Sub @@ -1062,7 +1062,7 @@ Public Class ListGenericParameter End Property Friend Sub CloseToolList() - SetAvailableToolListVisibility(Visibility.Collapsed) + SetAvailableToolListVisibility(False) SetOpenToolListIsEnable(True) End Sub diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWndVM.vb b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWndVM.vb index 24e4c765..1e04d546 100644 --- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWndVM.vb +++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWndVM.vb @@ -108,12 +108,12 @@ Public Class GeneralParametersWndVM For Each GenericItem As ProjectParameters In m_GeneralParametersList Select Case GenericItem.sMinUserLevel Case UserLevel.ADVANCED - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, True, False)) Case UserLevel.ADMINISTRATOR - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UnlockAllIsChecked, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UnlockAllIsChecked, True, False)) Case Else If Not Map.refMainMenuVM.UserAdmin_IsChecked Then - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, True, False)) Map.refMainMenuVM.SetUnloackImage(PADLOCK_IMAGE) End If End Select diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonGeneralParameters.vb b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonGeneralParameters.vb index e2b57319..28ba573f 100644 --- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonGeneralParameters.vb +++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonGeneralParameters.vb @@ -156,13 +156,13 @@ Public Class JsonGeneralParameters ProjectParameters = New BooleanGenericParameter() DirectCast(ProjectParameters, BooleanGenericParameter).SetValue(m_sValue) If m_sMinUserLevel = 1 Then - DirectCast(ProjectParameters, BooleanGenericParameter).SetbBooleanVisibility(Visibility.Visible) + DirectCast(ProjectParameters, BooleanGenericParameter).SetbBooleanVisibility(True) End If Case "d" ProjectParameters = New DoubleGenericParameter() DirectCast(ProjectParameters, DoubleGenericParameter).SetValue(m_sValue) If m_sMinUserLevel = 1 Then - DirectCast(ProjectParameters, DoubleGenericParameter).SetbDoubleVisibility(Visibility.Visible) + DirectCast(ProjectParameters, DoubleGenericParameter).SetbDoubleVisibility(True) End If Case "combo" ProjectParameters = New ComboGenericParameter() @@ -171,19 +171,19 @@ Public Class JsonGeneralParameters Next DirectCast(ProjectParameters, ComboGenericParameter).SetSelValue(m_sValue) If m_sMinUserLevel = 1 Then - DirectCast(ProjectParameters, ComboGenericParameter).SetbComboBoxVisibility(Visibility.Visible) + DirectCast(ProjectParameters, ComboGenericParameter).SetbComboBoxVisibility(True) End If Case "tool" 'ProjectParameters = New ListGenericParameter(m_sSubType) 'DirectCast(ProjectParameters, ListGenericParameter).CreateToolsViews() 'If m_sMinUserLevel = 1 Then - ' DirectCast(ProjectParameters, ListGenericParameter).SetbListBoxVisibility(Visibility.Visible) + ' DirectCast(ProjectParameters, ListGenericParameter).SetbListBoxVisibility(True) 'End If Case "s" ProjectParameters = New StringGenericParameter() DirectCast(ProjectParameters, StringGenericParameter).SetValue(m_sValue) If m_sMinUserLevel = 1 Then - DirectCast(ProjectParameters, StringGenericParameter).SetbStringVisibility(Visibility.Visible) + DirectCast(ProjectParameters, StringGenericParameter).SetbStringVisibility(True) End If Case Else EgtOutLog("Tipo: " & m_sType & " non presente") diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonGenericParametersHelper.vb b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonGenericParametersHelper.vb index 0e525d44..526b3420 100644 --- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonGenericParametersHelper.vb +++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/JsonGenericParametersHelper.vb @@ -155,13 +155,13 @@ Public Class JsonProjectParameters ProjectParameters = New BooleanGenericParameter() DirectCast(ProjectParameters, BooleanGenericParameter).SetValue(m_sValue) If m_sMinUserLevel = 1 Then - DirectCast(ProjectParameters, BooleanGenericParameter).SetbBooleanVisibility(Visibility.Visible) + DirectCast(ProjectParameters, BooleanGenericParameter).SetbBooleanVisibility(True) End If Case "d" ProjectParameters = New DoubleGenericParameter() DirectCast(ProjectParameters, DoubleGenericParameter).SetValue(m_sValue) If m_sMinUserLevel = 1 Then - DirectCast(ProjectParameters, DoubleGenericParameter).SetbDoubleVisibility(Visibility.Visible) + DirectCast(ProjectParameters, DoubleGenericParameter).SetbDoubleVisibility(True) End If Case "combo" ProjectParameters = New ComboGenericParameter() @@ -170,19 +170,19 @@ Public Class JsonProjectParameters Next DirectCast(ProjectParameters, ComboGenericParameter).SetSelValue(m_sValue) If m_sMinUserLevel = 1 Then - DirectCast(ProjectParameters, ComboGenericParameter).SetbComboBoxVisibility(Visibility.Visible) + DirectCast(ProjectParameters, ComboGenericParameter).SetbComboBoxVisibility(True) End If Case "tool" 'ProjectParameters = New ListGenericParameter(m_sSubType) 'DirectCast(ProjectParameters, ListGenericParameter).CreateToolsViews() 'If m_sMinUserLevel = 1 Then - ' DirectCast(ProjectParameters, ListGenericParameter).SetbListBoxVisibility(Visibility.Visible) + ' DirectCast(ProjectParameters, ListGenericParameter).SetbListBoxVisibility(True) 'End If Case "s" ProjectParameters = New StringGenericParameter() DirectCast(ProjectParameters, StringGenericParameter).SetValue(m_sValue) If m_sMinUserLevel = 1 Then - DirectCast(ProjectParameters, StringGenericParameter).SetbStringVisibility(Visibility.Visible) + DirectCast(ProjectParameters, StringGenericParameter).SetbStringVisibility(True) End If Case Else EgtOutLog("Tipo: " & m_sType & " non presente") diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml index 935554cc..1583aeca 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml +++ b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml @@ -140,7 +140,8 @@ - diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListVM.vb b/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListVM.vb index 17b33551..70b1cc99 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListVM.vb +++ b/EgtBEAMWALL.Optimizer/ItemParamList/PParameterListVM.vb @@ -144,8 +144,8 @@ Public Class PParameterListVM Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.ResetCalcFeature() Map.refProjectVM.BTLStructureVM.SelBTLPart.ResetCalcPart() Map.refForcedStrategyPanelVM.ForcedStrategy() - Map.refProjectVM.SetRawPartManagerVisibility(Visibility.Visible) - Map.refProjectVM.SetStrategyManagerVisibility(Visibility.Collapsed) + Map.refProjectVM.SetRawPartManagerVisibility(True) + Map.refProjectVM.SetStrategyManagerVisibility(False) Map.refProjectVM.SetSelManagerTab(ProjectVM.StrategyManagerTab.RAWPARTMANAGER) Map.refProjectVM.SetSelFeatureManagerTab(ProjectVM.FeatureManagerTab.FEATURERAWPARTMANAGER) ' Abilito LeftPanel @@ -167,8 +167,8 @@ Public Class PParameterListVM End Property Public Sub Cancel() - Map.refProjectVM.SetRawPartManagerVisibility(Visibility.Visible) - Map.refProjectVM.SetStrategyManagerVisibility(Visibility.Collapsed) + Map.refProjectVM.SetRawPartManagerVisibility(True) + Map.refProjectVM.SetStrategyManagerVisibility(False) Map.refProjectVM.SetSelManagerTab(ProjectVM.StrategyManagerTab.RAWPARTMANAGER) Map.refProjectVM.SetSelFeatureManagerTab(ProjectVM.FeatureManagerTab.FEATURERAWPARTMANAGER) ' Abilito LeftPanel diff --git a/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupPanelVM.vb b/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupPanelVM.vb index 485b80df..9eae0e00 100644 --- a/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupPanelVM.vb +++ b/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupPanelVM.vb @@ -17,12 +17,12 @@ Public Class MyMachGroupPanelVM EgtBeamShowLoadingSide(False, False) ' se modalita' assemblato If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then - Map.refProjectVM.SetSceneShowBuldingVisibility(Visibility.Collapsed) + Map.refProjectVM.SetSceneShowBuldingVisibility(False) ' devo smontarlo prima di calcolare le travi, altrimenti non trova i pezzi Map.refProjectVM.BTLStructureVM.ShowBuilding(False, False) Map.refShowBeamPanelVM.SetShowBuilding(False) - Map.refProjectVM.SetManagerTabVisibility(Visibility.Visible) - If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.SetFeatureListVisibility(Visibility.Visible) + Map.refProjectVM.SetManagerTabVisibility(True) + If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.SetFeatureListVisibility(True) End If If Not IsNothing(Map.refProjectVM.BTLStructureVM) Then For BTLPartIndex = 0 To Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count - 1 @@ -38,7 +38,7 @@ Public Class MyMachGroupPanelVM Map.refProjectVM.SetLastSelGridType(ProjectVM.GridSelTypes.MACHGROUP) End If If IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then - Map.refProjectVM.SetFeatureListVisibility(Visibility.Collapsed) + Map.refProjectVM.SetFeatureListVisibility(False) End If Map.refMyStatusBarVM.SetLoadingProgress(0) Map.refMyStatusBarVM.SetOutputMessage("") diff --git a/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb b/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb index 6aab57ea..f158d3cf 100644 --- a/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb +++ b/EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupVM.vb @@ -52,7 +52,7 @@ Public Class MyMachGroupVM End If Next End If - Map.refProjectVM.SetFeatureListVisibility(Visibility.Collapsed) + Map.refProjectVM.SetFeatureListVisibility(False) End If ' se modalita' assemblato If Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then @@ -63,7 +63,7 @@ Public Class MyMachGroupVM ' seleziono pezzo EgtDeselectAll() If Not IsNothing(value) Then - Map.refProjectVM.SetFeatureListVisibility(Visibility.Visible) + Map.refProjectVM.SetFeatureListVisibility(True) EgtSelectObj(SelPart.nPartId) ' trovo ed evidenzio BTLPart di questo pezzo If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then @@ -80,11 +80,11 @@ Public Class MyMachGroupVM NotifyPropertyChanged(NameOf(SelPart)) ' se modalità building, la tolgo If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then - Map.refProjectVM.SetSceneShowBuldingVisibility(Visibility.Collapsed) + Map.refProjectVM.SetSceneShowBuldingVisibility(False) Map.refProjectVM.BTLStructureVM.ShowBuilding(False, False) Map.refShowBeamPanelVM.SetShowBuilding(False) - Map.refProjectVM.SetManagerTabVisibility(Visibility.Visible) - If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.SetFeatureListVisibility(Visibility.Visible) + Map.refProjectVM.SetManagerTabVisibility(True) + If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.SetFeatureListVisibility(True) End If End Set End Property @@ -933,6 +933,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.refCALCPanelVM.Verify(ProjectType.PROD, CalcIntegration.CmdTypes.CHECKGEN) Return End Sub diff --git a/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelVM.vb b/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelVM.vb index a4ff1c20..3892ee8a 100644 --- a/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelVM.vb +++ b/EgtBEAMWALL.Optimizer/MachinePanel/MachinePanelVM.vb @@ -2,6 +2,7 @@ Imports EgtBEAMWALL.Core Imports EgtUILib Imports EgtWPFLib5 +Imports Google.Protobuf.WellKnownTypes Public Class MachinePanelVM Inherits EgtWPFLib5.MachinePanelVM @@ -76,8 +77,8 @@ Public Class MachinePanelVM Return m_ChooseMachine_Visibility End Get End Property - Friend Sub SetChooseMachine_Visibility(IsVisible As Visibility) - m_ChooseMachine_Visibility = IsVisible + Friend Sub SetChooseMachine_Visibility(IsVisible As Boolean) + m_ChooseMachine_Visibility = If(IsVisible, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(ChooseMachine_Visibility)) End Sub @@ -364,7 +365,7 @@ Public Class MachinePanelVM End Property Friend Sub ChooseMachine() - SetChooseMachine_Visibility(Visibility.Visible) + SetChooseMachine_Visibility(True) End Sub #End Region ' ChooseMachine @@ -382,7 +383,7 @@ Public Class MachinePanelVM Friend Sub Ok() SetSelMachineName(m_SelectedMachine.Name) - SetChooseMachine_Visibility(Visibility.Collapsed) + SetChooseMachine_Visibility(False) End Sub #End Region ' Ok diff --git a/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb b/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb index 684c5b34..f363d5a6 100644 --- a/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb +++ b/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb @@ -375,7 +375,7 @@ Public Class MainMenuVM ''' Funzione che gestisce la visibilità dei parametri in base al livello utente ''' ''' - Friend Sub UserLevelVisibility(Param As StrategyParameter, Visibility As Visibility) + Friend Sub UserLevelVisibility(Param As StrategyParameter, Visibility As Boolean) Select Case Param.GetType() Case GetType(BooleanStrategyParameter) DirectCast(Param, BooleanStrategyParameter).SetbBooleanVisibility(Visibility) @@ -390,7 +390,7 @@ Public Class MainMenuVM End Select End Sub - Friend Sub UserLevelGenericVisibility(Generic As ProjectParameters, Visibility As Visibility) + Friend Sub UserLevelGenericVisibility(Generic As ProjectParameters, Visibility As Boolean) Select Case Generic.GetType() Case GetType(BooleanGenericParameter) DirectCast(Generic, BooleanGenericParameter).SetbBooleanVisibility(Visibility) @@ -412,12 +412,12 @@ Public Class MainMenuVM For Each ParamItem In StrategyItem.ParameterList Select Case ParamItem.sMinUserLevel Case UserLevel.ADVANCED - UserLevelVisibility(ParamItem, If(m_bUserAdmin_IsChecked, Visibility.Visible, Visibility.Collapsed)) + UserLevelVisibility(ParamItem, If(m_bUserAdmin_IsChecked, True, False)) Case UserLevel.ADMINISTRATOR - UserLevelVisibility(ParamItem, If(m_bUnlockAllIsChecked, Visibility.Visible, Visibility.Collapsed)) + UserLevelVisibility(ParamItem, If(m_bUnlockAllIsChecked, True, False)) Case Else If Not m_bUserAdmin_IsChecked Then - UserLevelVisibility(ParamItem, If(ParamItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed)) + UserLevelVisibility(ParamItem, If(ParamItem.sMinUserLevel = UserLevel.USER, True, False)) SetUnloackImage(PADLOCK_IMAGE) End If End Select @@ -428,12 +428,12 @@ Public Class MainMenuVM For Each GenericItem As ProjectParameters In Map.refGeneralParametersStrategyVM.GeneralParametersList Select Case GenericItem.sMinUserLevel Case UserLevel.ADVANCED - UserLevelGenericVisibility(GenericItem, If(m_bUserAdmin_IsChecked, Visibility.Visible, Visibility.Collapsed)) + UserLevelGenericVisibility(GenericItem, If(m_bUserAdmin_IsChecked, True, False)) Case UserLevel.ADMINISTRATOR - UserLevelGenericVisibility(GenericItem, If(m_bUnlockAllIsChecked, Visibility.Visible, Visibility.Collapsed)) + UserLevelGenericVisibility(GenericItem, If(m_bUnlockAllIsChecked, True, False)) Case Else If Not m_bUserAdmin_IsChecked Then - UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed)) + UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, True, False)) SetUnloackImage(PADLOCK_IMAGE) End If End Select @@ -469,7 +469,7 @@ Public Class MainMenuVM For Each ParamItem As StrategyParameter In StrategyItem.ParameterList If ParamItem.sMinUserLevel >= UserLevel.ADVANCED Then ' Rendo visibili i parametri che hanno sMinUserLevel a 10 - UserLevelVisibility(ParamItem, Visibility.Visible) + UserLevelVisibility(ParamItem, True) End If Next Next @@ -478,7 +478,7 @@ Public Class MainMenuVM For Each GenericItem As ProjectParameters In Map.refGeneralParametersStrategyVM.GeneralParametersList If GenericItem.sMinUserLevel >= UserLevel.ADVANCED Then ' Rendo visibili i parametri che hanno sMinUserLevel a 10 - UserLevelGenericVisibility(GenericItem, Visibility.Visible) + UserLevelGenericVisibility(GenericItem, True) End If Next End If @@ -492,8 +492,8 @@ Public Class MainMenuVM For Each StrategyItem As Strategy In StrategyList For Each ParamItem As StrategyParameter In StrategyItem.ParameterList If ParamItem.sMinUserLevel >= UserLevel.ADVANCED Then - ' Rendo visibili i parametri che hanno sMinUserLevel a 10 - UserLevelVisibility(ParamItem, Visibility.Collapsed) + ' Rendo invisibili i parametri che hanno sMinUserLevel a 10 + UserLevelVisibility(ParamItem, False) End If Next Next @@ -501,8 +501,8 @@ Public Class MainMenuVM If Not IsNothing(Map.refGeneralParametersStrategyVM) Then For Each GenericItem As ProjectParameters In Map.refGeneralParametersStrategyVM.GeneralParametersList If GenericItem.sMinUserLevel >= UserLevel.ADVANCED Then - ' Rendo visibili i parametri che hanno sMinUserLevel a 10 - UserLevelGenericVisibility(GenericItem, Visibility.Visible) + ' Rendo invisibili i parametri che hanno sMinUserLevel a 10 + UserLevelGenericVisibility(GenericItem, False) End If Next End If diff --git a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb index 0a68b49b..108e99db 100644 --- a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb @@ -67,5 +67,5 @@ Imports System.Windows ' Revision ' - - + + diff --git a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb index 3409d194..218ad85d 100644 --- a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb +++ b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb @@ -1413,8 +1413,8 @@ Public Class ProdManagerVM bValue = False EgtGetInfo(FeatureParam.nFeatureId, ConstBeam.STRATEGY & FeatureParam.nFeatureId & "_FORCED", bValue) If bValue Then - BTLPartParam.SetStrategyModify_Visibility(Visibility.Visible) - FeatureParam.SetbStrategy_Visibility(Visibility.Visible) + BTLPartParam.SetStrategyModify_Visibility(True) + FeatureParam.SetbStrategy_Visibility(True) End If For Each StrategySetupParam As StrategySetup In Map.refStrategyManagerVM.StrategySetupList For Each StrategyFeatureParam As StrategyFeature In StrategySetupParam.StrategyFeatureList @@ -1423,7 +1423,7 @@ Public Class ProdManagerVM For Each Param As StrategyParameter In StrategyParam.ParameterList bValueForced = False EgtGetInfo(FeatureParam.nFeatureId, StrategyParam.sStrategyId & "_" & Param.sNameNge & "_FORCED", bValueForced) - If bValueForced Then FeatureParam.SetbStrategy_Visibility(Visibility.Visible) + If bValueForced Then FeatureParam.SetbStrategy_Visibility(True) Next Next Next @@ -1452,12 +1452,12 @@ Public Class ProdManagerVM For Each GenericItem As ProjectParameters In Map.refProjectVM.GeneralParametersList Select Case GenericItem.sMinUserLevel Case UserLevel.ADVANCED - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, True, False)) Case UserLevel.ADMINISTRATOR - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UnlockAllIsChecked, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UnlockAllIsChecked, True, False)) Case Else If Not Map.refMainMenuVM.UserAdmin_IsChecked Then - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, True, False)) Map.refMainMenuVM.SetUnloackImage(PADLOCK_IMAGE) End If End Select @@ -1470,7 +1470,7 @@ Public Class ProdManagerVM For Each GeneralParam As ProjectParameters In Map.refProjectVM.GeneralParametersList bValuePart = False EgtGetInfo(PartItem.nPartId, GeneralParam.sNameNge & "_FORCED", bValuePart) - If bValuePart Then PartItem.SetStrategyModify_Visibility(Visibility.Visible) + If bValuePart Then PartItem.SetStrategyModify_Visibility(True) Next Next End Sub @@ -1589,9 +1589,9 @@ Public Class ProdManagerVM ' verifico se progetto modificato, e chiedo se salvare If ProdFileVM.VerifyProjectModification(CurrProd) = MessageBoxResult.Cancel Then Return Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = False - Map.refProjectVM.SetSceneShowBuldingVisibility(Visibility.Collapsed) - Map.refProjectVM.SetManagerTabVisibility(Visibility.Visible) - If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.SetFeatureListVisibility(Visibility.Visible) + Map.refProjectVM.SetSceneShowBuldingVisibility(False) + Map.refProjectVM.SetManagerTabVisibility(True) + If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.SetFeatureListVisibility(True) If Not CreateNewProd() Then EgtOutLog("Errore! Creazione del progetto fallita!") End If @@ -1721,8 +1721,8 @@ Public Class ProdManagerVM Public Sub ImportProject() Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = False - Map.refProjectVM.SetSceneShowBuldingVisibility(Visibility.Collapsed) - Map.refProjectVM.SetManagerTabVisibility(Visibility.Visible) + Map.refProjectVM.SetSceneShowBuldingVisibility(False) + Map.refProjectVM.SetManagerTabVisibility(True) SetOpenImage(DOWN_IMAGE) Dim TempCurrProd As ProjectFileVM = CurrProd If ProdFileVM.VerifyProjectModification(TempCurrProd) Then Return diff --git a/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb b/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb index f36739bb..5dbccc6b 100644 --- a/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb +++ b/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb @@ -254,8 +254,8 @@ Public Class ProjectVM Return m_FeatureList_Visibility End Get End Property - Sub SetFeatureListVisibility(bVisible As Visibility) - m_FeatureList_Visibility = bVisible + Sub SetFeatureListVisibility(bVisible As Boolean) + m_FeatureList_Visibility = If(bVisible, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(FeatureList_Visibility)) End Sub @@ -265,8 +265,8 @@ Public Class ProjectVM Return m_RawPartManagerVisibility End Get End Property - Sub SetRawPartManagerVisibility(bVisible As Visibility) - m_RawPartManagerVisibility = bVisible + Sub SetRawPartManagerVisibility(bVisible As Boolean) + m_RawPartManagerVisibility = If(bVisible, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(RawPartManagerVisibility)) End Sub @@ -276,8 +276,8 @@ Public Class ProjectVM Return m_StrategyManagerVisibility End Get End Property - Sub SetStrategyManagerVisibility(bVisible As Visibility) - m_StrategyManagerVisibility = bVisible + Sub SetStrategyManagerVisibility(bVisible As Boolean) + m_StrategyManagerVisibility = If(bVisible, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(StrategyManagerVisibility)) End Sub @@ -287,8 +287,8 @@ Public Class ProjectVM Return m_SceneShowBuldingVisibility End Get End Property - Sub SetSceneShowBuldingVisibility(bVisible As Visibility) - m_SceneShowBuldingVisibility = bVisible + Sub SetSceneShowBuldingVisibility(bVisible As Boolean) + m_SceneShowBuldingVisibility = If(bVisible, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(SceneShowBuldingVisibility)) End Sub @@ -298,8 +298,8 @@ Public Class ProjectVM Return m_ManagerTabVisibility End Get End Property - Sub SetManagerTabVisibility(bVisible As Visibility) - m_ManagerTabVisibility = bVisible + Sub SetManagerTabVisibility(bVisible As Boolean) + m_ManagerTabVisibility = If(bVisible, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(ManagerTabVisibility)) End Sub @@ -323,10 +323,10 @@ Public Class ProjectVM m_bSaveGeneralParameters = value If m_bSaveGeneralParameters Then SetGeneralParametersIsEnable(True) - Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(Visibility.Visible) + Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(True) Else SetGeneralParametersIsEnable(False) - Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(Visibility.Collapsed) + Map.refProjectVM.BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(False) Dim sStrategiesDirPath As String = Map.refMainWindowVM.MainWindowM.GetStrategiesDirPath(Map.refStrategyManagerVM.SelStrategyType.Id) Dim sGeneralParametersFilePath As String = sStrategiesDirPath & "\" & GENERALPARAMETERS_FILE & ".json" If File.Exists(sGeneralParametersFilePath) Then @@ -589,9 +589,9 @@ Public Class ProjectVM Friend Sub ResetGeneralParameters() Dim sInfo As String = String.Empty For Each PartItem As BTLPartVM In m_BTLStructureVM.BTLPartVMList - PartItem.SetStrategyModify_Visibility(Visibility.Collapsed) + PartItem.SetStrategyModify_Visibility(False) For Each FeatureItem As BTLFeatureVM In PartItem.BTLFeatureVMList - FeatureItem.SetbStrategy_Visibility(Visibility.Collapsed) + FeatureItem.SetbStrategy_Visibility(False) Next For Each GeneralParameter In m_GeneralParametersList Select Case GeneralParameter.GetType() @@ -687,12 +687,12 @@ Public Class ProjectVM For Each GenericItem As ProjectParameters In m_GeneralParametersList Select Case GenericItem.sMinUserLevel Case UserLevel.ADVANCED - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, True, False)) Case UserLevel.ADMINISTRATOR - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UnlockAllIsChecked, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UnlockAllIsChecked, True, False)) Case Else If Not Map.refMainMenuVM.UserAdmin_IsChecked Then - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, True, False)) Map.refMainMenuVM.SetUnloackImage(PADLOCK_IMAGE) End If End Select @@ -785,12 +785,12 @@ Public Class ProjectVM For Each GenericItem As ProjectParameters In m_GeneralParametersList Select Case GenericItem.sMinUserLevel Case UserLevel.ADVANCED - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, True, False)) Case UserLevel.ADMINISTRATOR - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UnlockAllIsChecked, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UnlockAllIsChecked, True, False)) Case Else If Not Map.refMainMenuVM.UserAdmin_IsChecked Then - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, True, False)) Map.refMainMenuVM.SetUnloackImage(PADLOCK_IMAGE) End If End Select @@ -895,12 +895,12 @@ Public Class ProjectVM For Each GenericItem As ProjectParameters In m_GeneralParametersList Select Case GenericItem.sMinUserLevel Case UserLevel.ADVANCED - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UserAdmin_IsChecked, True, False)) Case UserLevel.ADMINISTRATOR - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UnlockAllIsChecked, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(Map.refMainMenuVM.UnlockAllIsChecked, True, False)) Case Else If Not Map.refMainMenuVM.UserAdmin_IsChecked Then - Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, Visibility.Visible, Visibility.Collapsed)) + Map.refMainMenuVM.UserLevelGenericVisibility(GenericItem, If(GenericItem.sMinUserLevel = UserLevel.USER, True, False)) Map.refMainMenuVM.SetUnloackImage(PADLOCK_IMAGE) End If End Select @@ -1059,9 +1059,9 @@ Public Class ProjectVM End Property Public Sub Back() - SetRawPartManagerVisibility(Visibility.Visible) - If Not IsNothing(m_MachGroupPanelVM) Then Map.refProjectVM.SetFeatureListVisibility(Visibility.Visible) - SetStrategyManagerVisibility(Visibility.Collapsed) + SetRawPartManagerVisibility(True) + If Not IsNothing(m_MachGroupPanelVM) Then Map.refProjectVM.SetFeatureListVisibility(True) + SetStrategyManagerVisibility(False) SetSelManagerTab(ProjectVM.StrategyManagerTab.RAWPARTMANAGER) SetSelFeatureManagerTab(ProjectVM.FeatureManagerTab.FEATURERAWPARTMANAGER) ' Abilito LeftPanel @@ -1136,13 +1136,13 @@ Public Class ProjectVM EgtRemoveInfo(m_BTLStructureVM.SelBTLPart.BTLPartM.nPartId, GeneralParameter.sNameNge & "_FORCED") End Select Next - m_BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(Visibility.Collapsed) + m_BTLStructureVM.SelBTLPart.SetStrategyModify_Visibility(False) End If If Not IsNothing(m_BTLStructureVM.SelBTLPart.SelBTLFeatureVM) Then m_BTLStructureVM.SelBTLPart.SelBTLFeatureVM.ResetCalcFeature() Map.refProjectVM.BTLStructureVM.SelBTLPart.ResetCalcPart() If Map.refProdManagerVM.ListProjAsseBase.Count > 0 Then UpdatePart(m_BTLStructureVM.SelBTLPart.nPartId) - SetRawPartManagerVisibility(Visibility.Visible) - SetStrategyManagerVisibility(Visibility.Collapsed) + SetRawPartManagerVisibility(True) + SetStrategyManagerVisibility(False) SetSelManagerTab(ProjectVM.StrategyManagerTab.RAWPARTMANAGER) SetSelFeatureManagerTab(ProjectVM.FeatureManagerTab.FEATURERAWPARTMANAGER) ' Abilito LeftPanel diff --git a/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyVM.vb b/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyVM.vb index 984c4806..e1830e4f 100644 --- a/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyVM.vb +++ b/EgtBEAMWALL.Optimizer/SaveAsStrategyWnd/SaveAsStrategyVM.vb @@ -85,8 +85,8 @@ Public Class SaveAsStrategyVM Return m_bOpen_Visibility End Get End Property - Friend Sub SetbOpen_Visibility(value As Visibility) - m_bOpen_Visibility = value + Friend Sub SetbOpen_Visibility(value As Boolean) + m_bOpen_Visibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(bOpen_Visibility)) End Sub @@ -96,8 +96,8 @@ Public Class SaveAsStrategyVM Return m_bSave_Visibility End Get End Property - Friend Sub SetbSave_Visibility(value As Visibility) - m_bSave_Visibility = value + Friend Sub SetbSave_Visibility(value As Boolean) + m_bSave_Visibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(bSave_Visibility)) End Sub diff --git a/EgtBEAMWALL.Optimizer/ShowBeamPanel/ShowBeamPanelVM.vb b/EgtBEAMWALL.Optimizer/ShowBeamPanel/ShowBeamPanelVM.vb index f7828178..858a6712 100644 --- a/EgtBEAMWALL.Optimizer/ShowBeamPanel/ShowBeamPanelVM.vb +++ b/EgtBEAMWALL.Optimizer/ShowBeamPanel/ShowBeamPanelVM.vb @@ -53,15 +53,15 @@ Public Class ShowBeamPanelVM m_bShowBuilding = value If m_bShowBuilding Then Map.refSceneShowBuldingVM.SceneShowBulding.Enable(True) - Map.refProjectVM.SetSceneShowBuldingVisibility(Visibility.Visible) - Map.refProjectVM.SetManagerTabVisibility(Visibility.Collapsed) - Map.refProjectVM.SetFeatureListVisibility(Visibility.Collapsed) + Map.refProjectVM.SetSceneShowBuldingVisibility(True) + Map.refProjectVM.SetManagerTabVisibility(False) + Map.refProjectVM.SetFeatureListVisibility(False) Map.refOptimizePanelVM.SetOptimizePanelIsEnabled(False) Else EgtSetCurrentContext(Map.refSceneHostVM.MainScene.GetCtx()) - Map.refProjectVM.SetSceneShowBuldingVisibility(Visibility.Collapsed) - Map.refProjectVM.SetManagerTabVisibility(Visibility.Visible) - If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.SetFeatureListVisibility(Visibility.Visible) + Map.refProjectVM.SetSceneShowBuldingVisibility(False) + Map.refProjectVM.SetManagerTabVisibility(True) + If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.SetFeatureListVisibility(False) Map.refOptimizePanelVM.SetOptimizePanelIsEnabled(True) End If NotifyPropertyChanged(NameOf(ShowBuilding_IsChecked)) diff --git a/EgtBEAMWALL.Optimizer/Statistics/PDFEditorVM.vb b/EgtBEAMWALL.Optimizer/Statistics/PDFEditorVM.vb index 37f47be3..7da86f50 100644 --- a/EgtBEAMWALL.Optimizer/Statistics/PDFEditorVM.vb +++ b/EgtBEAMWALL.Optimizer/Statistics/PDFEditorVM.vb @@ -46,8 +46,8 @@ Public Class PDFEditorVM Return m_PdfViewer_Visibility End Get End Property - Friend Sub SetPdfViewer_Visibility(value As Visibility) - m_PdfViewer_Visibility = value + Friend Sub SetPdfViewer_Visibility(value As Boolean) + m_PdfViewer_Visibility = If(value, Visibility.Visible, Visibility.Hidden) NotifyPropertyChanged(NameOf(PdfViewer_Visibility)) End Sub @@ -78,7 +78,7 @@ Public Class PDFEditorVM m_ExpanderList.Add(New ExpanderPDF(ListTypes.PART_TOT)) ' Part Totals m_ExpanderList.Add(New ExpanderPDF(ListTypes.PART)) ' Part List SetWebAddress("") ' Pagina vuota - SetPdfViewer_Visibility(Visibility.Hidden) + SetPdfViewer_Visibility(False) Map.SetRefPDFEditorVM(Me) End Sub @@ -91,7 +91,7 @@ Public Class PDFEditorVM End Function Private Sub SetExpander(ExpanderPDF As ExpanderPDF) - ExpanderPDF.SetExpanderVisibilty(Visibility.Visible) + ExpanderPDF.SetExpanderVisibilty(True) End Sub #End Region ' Methods @@ -121,7 +121,7 @@ Public Class PDFEditorVM If Not IsNothing(sPartList) Then SetExpander(sPartList) SetViewButton(VIEW_BUTTON.PDF) Case VIEW_BUTTON.PDF - SetPdfViewer_Visibility(Visibility.Visible) + SetPdfViewer_Visibility(True) Configuration.CreatePrintPDF(PDFPage.VIEW, True) SetWebAddress(Map.refMainWindowVM.MainWindowM.sTempDir & "\Statistics.pdf") End Select @@ -156,7 +156,7 @@ Public Class PDFEditorVM If Not IsNothing(sRawPartList) Then SetExpander(sRawPartList) SetViewButton(VIEW_BUTTON.PDF) Case VIEW_BUTTON.PDF - SetPdfViewer_Visibility(Visibility.Visible) + SetPdfViewer_Visibility(True) Configuration.CreatePrintPDF(PDFPage.MACHING, True) SetWebAddress(Map.refMainWindowVM.MainWindowM.sTempDir & "\Statistics.pdf") End Select @@ -188,10 +188,10 @@ Public Class PDFEditorVM SetViewButton(VIEW_BUTTON.LIST) For Each Expander As ExpanderPDF In Map.refPDFEditorVM.ExpanderList - Expander.SetExpanderVisibilty(Visibility.Collapsed) + Expander.SetExpanderVisibilty(False) Next - SetPdfViewer_Visibility(Visibility.Hidden) + SetPdfViewer_Visibility(False) SetWebAddress("") End Sub @@ -228,8 +228,8 @@ Public Class ExpanderPDF Return m_ExpanderVisibilty End Get End Property - Friend Sub SetExpanderVisibilty(value As Visibility) - m_ExpanderVisibilty = value + Friend Sub SetExpanderVisibilty(value As Boolean) + m_ExpanderVisibilty = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(ExpanderVisibilty)) End Sub diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/JsonAvailableStrategyHelper.vb b/EgtBEAMWALL.Optimizer/StrategyManager/JsonAvailableStrategyHelper.vb index 7337676a..3bc1f3a0 100644 --- a/EgtBEAMWALL.Optimizer/StrategyManager/JsonAvailableStrategyHelper.vb +++ b/EgtBEAMWALL.Optimizer/StrategyManager/JsonAvailableStrategyHelper.vb @@ -455,13 +455,13 @@ Public Class JsonDefaultStrategyParameter StrategyParameter = New BooleanStrategyParameter() DirectCast(StrategyParameter, BooleanStrategyParameter).SetValue(m_sValue) If m_sMinUserLevel = 1 Then - DirectCast(StrategyParameter, BooleanStrategyParameter).SetbBooleanVisibility(Visibility.Visible) + DirectCast(StrategyParameter, BooleanStrategyParameter).SetbBooleanVisibility(True) End If Case "d" StrategyParameter = New DoubleStrategyParameter() DirectCast(StrategyParameter, DoubleStrategyParameter).SetValue(m_sValue) If m_sMinUserLevel = 1 Then - DirectCast(StrategyParameter, DoubleStrategyParameter).SetbDoubleVisibility(Visibility.Visible) + DirectCast(StrategyParameter, DoubleStrategyParameter).SetbDoubleVisibility(True) End If Case "combo" StrategyParameter = New ComboStrategyParameter() @@ -470,19 +470,19 @@ Public Class JsonDefaultStrategyParameter Next DirectCast(StrategyParameter, ComboStrategyParameter).SetSelValue(m_sValue) If m_sMinUserLevel = 1 Then - DirectCast(StrategyParameter, ComboStrategyParameter).SetbComboBoxVisibility(Visibility.Visible) + DirectCast(StrategyParameter, ComboStrategyParameter).SetbComboBoxVisibility(True) End If Case "tool" StrategyParameter = New ListStrategyParameter(m_sSubType) DirectCast(StrategyParameter, ListStrategyParameter).CreateToolsViews() If m_sMinUserLevel = 1 Then - DirectCast(StrategyParameter, ListStrategyParameter).SetbListBoxVisibility(Visibility.Visible) + DirectCast(StrategyParameter, ListStrategyParameter).SetbListBoxVisibility(True) End If Case "s" StrategyParameter = New StringStrategyParameter() DirectCast(StrategyParameter, StringStrategyParameter).SetValue(m_sValue) If m_sMinUserLevel = 1 Then - DirectCast(StrategyParameter, StringStrategyParameter).SetbStringVisibility(Visibility.Visible) + DirectCast(StrategyParameter, StringStrategyParameter).SetbStringVisibility(True) End If Case Else If Not IsNothing(m_sType) Then EgtOutLog("Tipo: " & m_sType & " non presente") diff --git a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb index 20549bc8..0ca2adeb 100644 --- a/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb +++ b/EgtBEAMWALL.Optimizer/StrategyManager/StrategyManagerVM.vb @@ -408,7 +408,7 @@ Public Class StrategyManagerVM ''' Public Sub OpenFileNameCustomConfig() Dim SaveAsStrategyVM As New SaveAsStrategyVM() - SaveAsStrategyVM.SetbSave_Visibility(Visibility.Visible) + SaveAsStrategyVM.SetbSave_Visibility(True) Dim SaveAsStrategyWnd As New SaveAsStrategyV With { .DataContext = SaveAsStrategyVM, .Owner = Application.Current.MainWindow @@ -435,7 +435,7 @@ Public Class StrategyManagerVM Public Sub NewAiSetup() SetDefaultConfig_IsChecked(False) Dim NewStrategyVM As New SaveAsStrategyVM() - NewStrategyVM.SetbOpen_Visibility(Visibility.Visible) + NewStrategyVM.SetbOpen_Visibility(True) Dim NewStrategyWnd As New SaveAsStrategyV With { .DataContext = NewStrategyVM, .Owner = Application.Current.MainWindow @@ -1150,29 +1150,29 @@ Public Class Strategy Case GetType(BooleanStrategyParameter) DirectCast(DefaultParameter, BooleanStrategyParameter).SetValue(Parameter.sValue) If Parameter.sMinUserLevel = 1 Then - DirectCast(DefaultParameter, BooleanStrategyParameter).SetbBooleanVisibility(Visibility.Visible) + DirectCast(DefaultParameter, BooleanStrategyParameter).SetbBooleanVisibility(True) End If Case GetType(DoubleStrategyParameter) DirectCast(DefaultParameter, DoubleStrategyParameter).SetValue(Parameter.sValue) If Parameter.sMinUserLevel = 1 Then - DirectCast(DefaultParameter, DoubleStrategyParameter).SetbDoubleVisibility(Visibility.Visible) + DirectCast(DefaultParameter, DoubleStrategyParameter).SetbDoubleVisibility(True) End If Case GetType(ComboStrategyParameter) DirectCast(DefaultParameter, ComboStrategyParameter).SetSelValue(Parameter.sValue) If Parameter.sMinUserLevel = 1 Then - DirectCast(DefaultParameter, ComboStrategyParameter).SetbComboBoxVisibility(Visibility.Visible) + DirectCast(DefaultParameter, ComboStrategyParameter).SetbComboBoxVisibility(True) End If Case GetType(StringStrategyParameter) DirectCast(DefaultParameter, StringStrategyParameter).SetValue(Parameter.sValue) If Parameter.sMinUserLevel = 1 Then - DirectCast(DefaultParameter, StringStrategyParameter).SetbStringVisibility(Visibility.Visible) + DirectCast(DefaultParameter, StringStrategyParameter).SetbStringVisibility(True) End If Case GetType(ListStrategyParameter) DirectCast(DefaultParameter, ListStrategyParameter).SetSelValue(Parameter.sValue) DirectCast(DefaultParameter, ListStrategyParameter).CreateToolsViews() DirectCast(DefaultParameter, ListStrategyParameter).ToolView() If Parameter.sMinUserLevel = 1 Then - DirectCast(DefaultParameter, ListStrategyParameter).SetbListBoxVisibility(Visibility.Visible) + DirectCast(DefaultParameter, ListStrategyParameter).SetbListBoxVisibility(True) End If End Select End If @@ -1346,8 +1346,8 @@ Public Class BooleanStrategyParameter Return m_bBooleanVisibility End Get End Property - Friend Sub SetbBooleanVisibility(value As Visibility) - m_bBooleanVisibility = value + Friend Sub SetbBooleanVisibility(value As Boolean) + m_bBooleanVisibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(bBooleanVisibility)) End Sub @@ -1361,9 +1361,9 @@ Public Class BooleanStrategyParameter m_bIsBooleanModify = value If m_bIsBooleanModify Then If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM) Then - Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SetbStrategy_Visibility(Visibility.Visible) + Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SetbStrategy_Visibility(True) ElseIf Not IsNothing(Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM) Then - Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.SetbStrategy_Visibility(Visibility.Visible) + Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.SetbStrategy_Visibility(True) End If End If NotifyPropertyChanged(NameOf(bIsBooleanModify)) @@ -1443,8 +1443,8 @@ Public Class DoubleStrategyParameter Return m_bDoubleVisibility End Get End Property - Friend Sub SetbDoubleVisibility(value As Visibility) - m_bDoubleVisibility = value + Friend Sub SetbDoubleVisibility(value As Boolean) + m_bDoubleVisibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(bDoubleVisibility)) End Sub @@ -1458,9 +1458,9 @@ Public Class DoubleStrategyParameter m_bIsDoubleModify = value If m_bIsDoubleModify Then If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM) Then - Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SetbStrategy_Visibility(Visibility.Visible) + Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SetbStrategy_Visibility(True) ElseIf Not IsNothing(Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM) Then - Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.SetbStrategy_Visibility(Visibility.Visible) + Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.SetbStrategy_Visibility(True) End If End If NotifyPropertyChanged(NameOf(bIsDoubleModify)) @@ -1523,8 +1523,8 @@ Public Class StringStrategyParameter Return m_bStringVisibility End Get End Property - Friend Sub SetbStringVisibility(value As Visibility) - m_bStringVisibility = value + Friend Sub SetbStringVisibility(value As Boolean) + m_bStringVisibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(bStringVisibility)) End Sub @@ -1538,9 +1538,9 @@ Public Class StringStrategyParameter m_bIsStringModify = value If m_bIsStringModify Then If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM) Then - Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SetbStrategy_Visibility(Visibility.Visible) + Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SetbStrategy_Visibility(True) ElseIf Not IsNothing(Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM) Then - Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.SetbStrategy_Visibility(Visibility.Visible) + Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.SetbStrategy_Visibility(True) End If End If NotifyPropertyChanged(NameOf(bIsStringModify)) @@ -1616,8 +1616,8 @@ Public Class ComboStrategyParameter Return m_bComboBoxVisibility End Get End Property - Friend Sub SetbComboBoxVisibility(value As Visibility) - m_bComboBoxVisibility = value + Friend Sub SetbComboBoxVisibility(value As Boolean) + m_bComboBoxVisibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(bComboBoxVisibility)) End Sub @@ -1631,9 +1631,9 @@ Public Class ComboStrategyParameter m_bIsComboBoxModify = value If m_bIsComboBoxModify Then If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM) Then - Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SetbStrategy_Visibility(Visibility.Visible) + Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SetbStrategy_Visibility(True) ElseIf Not IsNothing(Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM) Then - Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.SetbStrategy_Visibility(Visibility.Visible) + Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.SetbStrategy_Visibility(True) End If End If NotifyPropertyChanged(NameOf(bIsComboBoxModify)) @@ -1732,8 +1732,8 @@ Public Class ListStrategyParameter Return m_bAvailableToolListVisibility End Get End Property - Friend Sub SetAvailableToolListVisibility(value As Visibility) - m_bAvailableToolListVisibility = value + Friend Sub SetAvailableToolListVisibility(value As Boolean) + m_bAvailableToolListVisibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(AvailableToolListVisibility)) End Sub @@ -1776,8 +1776,8 @@ Public Class ListStrategyParameter Return m_bListBoxVisibility End Get End Property - Friend Sub SetbListBoxVisibility(value As Visibility) - m_bListBoxVisibility = value + Friend Sub SetbListBoxVisibility(value As Boolean) + m_bListBoxVisibility = If(value, Visibility.Visible, Visibility.Collapsed) NotifyPropertyChanged(NameOf(bListBoxVisibility)) End Sub @@ -1791,9 +1791,9 @@ Public Class ListStrategyParameter m_bIsListModify = value If m_bIsListModify Then If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM) Then - Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SetbStrategy_Visibility(Visibility.Visible) + Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SetbStrategy_Visibility(True) ElseIf Not IsNothing(Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM) Then - Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.SetbStrategy_Visibility(Visibility.Visible) + Map.refProjectVM.MachGroupPanelVM.SelectedMachGroup.SelPart.SelFeatureVM.SetbStrategy_Visibility(True) End If End If NotifyPropertyChanged(NameOf(bIsListModify)) @@ -1910,7 +1910,7 @@ Public Class ListStrategyParameter End Property Friend Sub OpenToolList() - SetAvailableToolListVisibility(Visibility.Visible) + SetAvailableToolListVisibility(True) SetOpenToolListIsEnable(False) End Sub @@ -1928,7 +1928,7 @@ Public Class ListStrategyParameter End Property Friend Sub CloseToolList() - SetAvailableToolListVisibility(Visibility.Collapsed) + SetAvailableToolListVisibility(True) SetOpenToolListIsEnable(True) End Sub diff --git a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml index b018f4f6..b4b4bac8 100644 --- a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml +++ b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml @@ -424,7 +424,6 @@ + + @@ -215,7 +215,6 @@ + @@ -130,15 +121,25 @@ + + + + - + + diff --git a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml index b4b4bac8..166755db 100644 --- a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml +++ b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml @@ -1968,6 +1968,10 @@ + + From 82063e8bc58c50a336d1b84bc97cd27e16b7721e Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Thu, 7 May 2026 11:15:37 +0200 Subject: [PATCH 12/12] =?UTF-8?q?-aggiunto=20controllo=20se=20cartella=20A?= =?UTF-8?q?isetup=20=C3=A8=20presente?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProdManager/ProdManagerVM.vb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb index 3d4ba853..99f58b22 100644 --- a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb +++ b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb @@ -695,6 +695,9 @@ 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) @@ -1433,6 +1436,20 @@ Public Class ProdManagerVM NotifyPropertyChanged(NameOf(Map.refProjectVM.GeneralParametersList)) End Sub + Private Sub GetFirstAiSetUp(nType As BWType) + Dim sAISetUpDir As String = String.Empty + If nType = BWType.BEAM Then + sAISetUpDir = Map.refMainWindowVM.MainWindowM.sMachinesRoot & "\" & CurrentMachine.sMachineName & "\" & BEAM_DIR & "\" & AISETUP_DIR + ElseIf nType = BWType.WALL Then + sAISetUpDir = Map.refMainWindowVM.MainWindowM.sMachinesRoot & "\" & CurrentMachine.sMachineName & "\" & WALL_DIR & "\" & AISETUP_DIR + End If + ' Controllo se la cartella AISetup è presente + If Not Directory.Exists(sAISetUpDir) Then + ' Se non esiste, la crea + Directory.CreateDirectory(sAISetUpDir) + End If + End Sub + ''' ''' Funzione che scrive il file json di default se non è presente un file di configurazione '''