From f903f8043334ee143b0cb31eeb6bf7e4c51fa85f Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Wed, 18 Feb 2026 12:30:30 +0100 Subject: [PATCH] EgtBEAMWALL 3.1.2.3: -cambio versione -introdotto finestre EgtMessageBox e EgtManageDialog al posto di quello di Windows -spostato immagni in dizionario -aggiunto messaggi --- EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb | 2 +- .../Machine_ConfigurationPageV.xaml | 2 +- .../EgtDataGrid/EgtDataGrid.xaml.vb | 4 +- .../EgtManageFileDialogV.xaml | 29 ++--- .../EgtManageFileDialogV.xaml.vb | 31 +++-- EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb | 4 +- EgtBEAMWALL.Core/My Project/AssemblyInfo.vb | 4 +- EgtBEAMWALL.Core/Themes/Generic.xaml | 13 ++- .../Properties/AssemblyInfo.cs | 4 +- .../AddFeatureWnd/AddFeatureWndVM.vb | 2 +- .../AddPartWnd/AddPartWndVM.vb | 2 +- .../AddRawPartWnd/AddRawPartWndVM.vb | 2 +- .../BTLDataWnd/BTLDataWndV.xaml | 4 +- .../BTLDataWnd/BTLDataWndVM.vb | 2 +- .../BTLPartManager/BTLPartManagerV.xaml | 10 +- .../BTLPartManager/BTLPartManagerVM.vb | 4 +- .../BTLViewModel/BTLParamVM.vb | 8 +- .../BTLViewModel/BTLPartVM.vb | 16 +-- .../BTLViewModel/BTLStructureVM.vb | 30 +++-- .../CALCPanel/CALCPanelVM.vb | 6 +- .../CALCPanel/CalcPanelV.xaml | 2 +- .../ChangeMaterialWnd/ChangeMaterialWndVM.vb | 2 +- .../ChangeParameterWndVM.vb | 2 +- .../ConfigurationPage/ConfigurationPageVM.vb | 38 +++--- .../ConfigurationProgramV.xaml | 4 +- .../FeatureListManagerV.xaml | 6 +- .../FeatureListManagerVM.vb | 2 +- .../FeatureManager/FeatureManagerV.xaml | 2 +- .../ForcedStrategyPanelV.xaml | 4 +- .../FreeContourManagerV.xaml | 20 ++-- .../FreeContourManagerVM.vb | 4 +- .../GeneralParametersStrategyV.xaml | 2 +- .../GeneralParametersWnd.xaml | 2 +- .../ProjectParametersV.xaml | 8 +- .../InstrumentPanel/InstrumentPanelV.xaml | 4 +- .../ItemParamList/BTLPartListV.xaml | 37 +++--- .../FeatureInPartInRawPartListV.xaml | 2 +- .../ItemParamList/PParameterListV.xaml | 4 +- .../ItemParamList/RawPartListV.xaml | 36 +++--- .../LeftPanel/LeftPanelV.xaml | 12 +- .../MachGroupPanel/MyMachGroupVM.vb | 14 +-- .../MachGroupPanel/PartVM.vb | 2 +- .../MachinePanel/MachinePanelV.xaml | 2 +- .../MachinePanel/MachinePanelVM.vb | 8 +- .../MacroFeatureWnd/MacroFeatureWndVM.vb | 2 +- EgtBEAMWALL.Optimizer/MainMenu/MainMenuV.xaml | 2 +- EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb | 8 +- .../MainWindow/MainWindowV.xaml.vb | 2 +- .../MainWindow/MainWindowVM.vb | 8 +- .../MovePartInRawPartWndV.xaml | 4 +- .../MovePartInRawPartWndVM.vb | 4 +- .../MultiCopyRawPartWndVM.vb | 2 +- .../My Project/AssemblyInfo.vb | 4 +- .../NestingRunningWnd/NestingRunningWndVM.vb | 6 +- .../NewOpenProjectFileDialogVM.vb | 4 +- .../OpenProjectFileDialogVM.vb | 4 +- .../OptimizePanel/OptimizePanelV.xaml | 2 +- .../OptimizePanel/OptimizePanelVM.vb | 2 +- .../Panel/RightPanelTopV.xaml | 8 +- EgtBEAMWALL.Optimizer/Panel/TopPanelV.xaml | 2 +- .../ProdManager/ProdManagerV.xaml | 14 +-- .../ProdManager/ProdManagerVM.vb | 100 +++++++++------- EgtBEAMWALL.Optimizer/Project/ProjectV.xaml | 12 +- .../ProjectFileVM/ProdFileVM.vb | 2 +- .../ProjectFileVM/ProjFileVM.vb | 2 +- .../ProjectTypeWnd/ProjectTypeWndVM.vb | 2 +- .../RawPartManager/RawPartManagerV.xaml | 12 +- .../RawPartManager/RawPartManagerVM.vb | 36 +++--- .../SaveAsStrategyWnd/SaveAsStrategyV.xaml | 6 +- .../SaveAsStrategyWnd/SaveAsStrategyVM.vb | 2 +- .../SceneHost/MySceneHostVM.vb | 15 ++- EgtBEAMWALL.Optimizer/SetUp/SetUpVM.vb | 10 +- .../ShowBeamPanel/ShowBeamPanelV.xaml | 6 +- .../ShowPanel/ShowPanelV.xaml | 6 +- .../SplashScreen/SplashScreenV.xaml | 2 +- .../Statistics/OptimizerStatisticsV.xaml | 4 +- .../Statistics/PDFEditorV.xaml | 12 +- .../Statistics/StatisticsV.xaml | 4 +- .../StrategyManager/ParameterStrategyV.xaml | 8 +- .../StrategyManager/StrategyManagerV.xaml | 6 +- .../StrategyManager/StrategyManagerVM.vb | 4 +- .../StrategyManager/StrategyProductionV.xaml | 4 +- .../StrategyManager/StrategyV.xaml | 8 +- .../ToolsDbWindow/MyToolDbWindowVM.vb | 4 +- .../Utility/DbControllers.vb | 2 +- EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml | 110 +++++++++++++++++- EgtBEAMWALL.Optimizer/Utility/MyMachine.vb | 4 +- .../ViewPanel/ViewPanelV.xaml | 14 +-- .../WarehouseWnd/WarehouseWndVM.vb | 24 ++-- .../CALCPanel/CALCPanelVM.vb | 2 +- .../CALCPanel/CalcPanelV.xaml | 2 +- EgtBEAMWALL.Supervisor/Comms/NUMAxiumComm.vb | 4 +- .../Comms/NUMAxiumPcToolkitComm.vb | 4 +- .../Comms/NUMFlexiumComm.vb | 4 +- EgtBEAMWALL.Supervisor/Comms/TPAComm.vb | 4 +- .../ConfigurationPage/ConfigurationPageV.xaml | 2 +- .../ItemParamList/RawPartListV.xaml | 3 +- .../LeftPanel/LeftPanelV.xaml | 16 +-- .../LeftPanel/LeftPanelVM.vb | 16 +-- EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml | 2 +- .../MachGroupPanel/MyMachGroupVM.vb | 8 +- .../MachManagingThread/MachManaging.vb | 2 +- .../MachineLogPage/MachineLogPageV.xaml | 4 +- .../MachinePanel/MachinePanelVM.vb | 8 +- .../MainWindow/MainWindowVM.vb | 3 +- .../My Project/AssemblyInfo.vb | 4 +- .../SceneHost/MySceneHostVM.vb | 21 ++-- .../ShowPanel/ShowPanelV.xaml | 6 +- .../SupervisorManager/SupervisorManagerV.xaml | 4 +- .../SupervisorManager/SupervisorManagerVM.vb | 14 +-- .../Utility/DbControllers.vb | 2 +- .../Utility/Dictionary.xaml | 31 +++++ .../ViewPanel/ViewPanelV.xaml | 14 +-- ExtLibs/EgtWPFLib5.dll | Bin 1083904 -> 1083904 bytes 114 files changed, 613 insertions(+), 464 deletions(-) diff --git a/EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb b/EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb index 4122db7f..1a405f5e 100644 --- a/EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb +++ b/EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb @@ -544,7 +544,7 @@ Public Class BTLFeatureM bOk = True Else ' Impossibile creare una feature con questi valori - ERRORE - MessageBox.Show(EgtMsg(61852), EgtMsg(30007)) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(61852), EgtMsg(30007)) nFeatureId = EgtBeamModifyProcess(Me.nFeatureId, Me.nSelGRP, Me.nPRC, Me.nSelSIDE, "", Me.nPRID, Me.frFRAME, vPar, sPar, vParQ, nCrvId, nCrv2Id) SetFeatureId(nFeatureId) diff --git a/EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml b/EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml index ec293fbb..614f541c 100644 --- a/EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml +++ b/EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml @@ -74,7 +74,7 @@ ToolTip="{Binding SaveToolTip}" Visibility="{Binding Machine_Visibility}" Style="{StaticResource SaveMachinePanel_Button}"> - diff --git a/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb b/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb index 549f52df..96361da2 100644 --- a/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb +++ b/EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb @@ -64,7 +64,7 @@ Public Class EgtDataGrid newItems(index).InitColumn(col) context.Columns.Add(col) Catch ex As Exception - MessageBox.Show(String.Format(EgtMsg(61883), newItems(index).Name, newItems(index).ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) + EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(61883), newItems(index).Name, newItems(index).ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) End Try Next @@ -159,7 +159,7 @@ Public Class EgtDataGrid Me.Columns(e.NewStartingIndex).DisplayIndex = e.NewStartingIndex End If Catch ex As Exception - MessageBox.Show(String.Format(EgtMsg(61883), one.Name, one.ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) + EgtBEAMWALL.Core.EgtMessageBoxV.Show(Application.Current.MainWindow, String.Format(EgtMsg(61883), one.Name, one.ParentDataGridName), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning) End Try Next End If diff --git a/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml b/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml index b5d0693e..5626a54f 100644 --- a/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml +++ b/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml @@ -6,7 +6,7 @@ Title="{Binding sTitle}" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" - Height="500" Width="800" + Height="650" Width="1000" Style="{StaticResource OptimizerWindow.Dialog}"> @@ -24,7 +24,7 @@ - - - - + @@ -283,8 +271,7 @@ ElementStyle="{StaticResource DataGrid_TextBlock}"> - + @@ -293,8 +280,7 @@ ElementStyle="{StaticResource DataGrid_TextBlock}"> - + @@ -303,8 +289,7 @@ ElementStyle="{StaticResource DataGridR_TextBlock}"> - + diff --git a/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb b/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb index 5306d946..0752e741 100644 --- a/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb +++ b/EgtBEAMWALL.Core/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb @@ -1,6 +1,6 @@ -Imports EgtWPFLib5 -Imports System.Windows.Forms -Imports System.Windows.Input +Imports System.Windows.Input +Imports EgtWPFLib5 +Imports System.Windows Public Class EgtManageFileDialogV @@ -8,7 +8,7 @@ Public Class EgtManageFileDialogV Private WithEvents m_EgtManageFileDialogVM As EgtManageFileDialogVM - Private Shadows DialogResult As DialogResult + Private Shadows DialogResult As Boolean ''' ''' Stringa che specifica il titolo da mostrare @@ -31,6 +31,15 @@ Public Class EgtManageFileDialogV End Set End Property + Public Property SelFilter As EgtExstension + Get + Return m_EgtManageFileDialogVM.SelFilter + End Get + Set(value As EgtExstension) + m_EgtManageFileDialogVM.SelFilter = value + End Set + End Property + Public Property InitialDirectory As String Get Return m_EgtManageFileDialogVM.sInitialDirectory @@ -103,31 +112,31 @@ Public Class EgtManageFileDialogV End Set End Property -#End Region ' FIELDS & PROPERTIES +#End Region ' Fields & Properties #Region "CONTRUCTORS" - Sub New(Owner As System.Windows.Window, EgtManageFileDialogVM As EgtManageFileDialogVM) + Sub New(Owner As Window, EgtManageFileDialogVM As EgtManageFileDialogVM) InitializeComponent() Me.DataContext = EgtManageFileDialogVM ' Assegno al riferimento locale al VM il VM preso dal DataContext m_EgtManageFileDialogVM = EgtManageFileDialogVM End Sub -#End Region +#End Region ' Constructor #Region "EVENTS" - Private Sub CloseWindow(DialogResult As DialogResult) Handles m_EgtManageFileDialogVM.OnCloseWindow + Private Sub CloseWindow(DialogResult As Boolean) Handles m_EgtManageFileDialogVM.OnCloseWindow Me.DialogResult = DialogResult Me.Close() End Sub -#End Region +#End Region ' Events #Region "METHODS" - Public Overloads Function ShowDialog() As DialogResult + Public Overloads Function ShowDialog() As Boolean MyBase.ShowDialog() Return Me.DialogResult End Function @@ -136,6 +145,6 @@ Public Class EgtManageFileDialogV m_EgtManageFileDialogVM.MouseDoubleClick() End Sub -#End Region ' METHODS +#End Region ' Methods End Class diff --git a/EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb b/EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb index 0d2e5a59..78682b68 100644 --- a/EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb +++ b/EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb @@ -214,7 +214,7 @@ Public Class NewMachGroupPanelVM Dim m_MessageBoxResult As MessageBoxResult If MachGroupVMList.Count = 1 Then 'chiedo conferma prima di resettare il gruppo di lavorazione - MessageBox.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question) Select Case m_MessageBoxResult Case MessageBoxResult.Yes ' cancello il gruppo corrente e ne creo uno nuovo con lo stesso nome @@ -228,7 +228,7 @@ Public Class NewMachGroupPanelVM End Select Else 'chiedo conferma prima di cancellare il gruppo di lavorazione - MessageBox.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question) + EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(62539), "", MessageBoxButton.YesNo, MessageBoxImage.Question) Select Case m_MessageBoxResult Case MessageBoxResult.Yes ' cancello quello selezionato (ovvero il corrente) diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb index c3bbec85..0dc530bc 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.Core/Themes/Generic.xaml b/EgtBEAMWALL.Core/Themes/Generic.xaml index 79716ad7..ae6ca96a 100644 --- a/EgtBEAMWALL.Core/Themes/Generic.xaml +++ b/EgtBEAMWALL.Core/Themes/Generic.xaml @@ -410,6 +410,15 @@ + + + + + + + + + @@ -2543,6 +2553,7 @@ - + - + - + - +