From 528b3072daa8c9bc5dcbcafa1aae8d22a21e8a7b Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Mon, 3 Nov 2025 15:49:25 +0100 Subject: [PATCH] Optimizer 2.7.10.6 -Sistemato merge errato -Pulizia Core --- .../BeamMachiningsWindowV.xaml | 198 +++++---- .../BeamMachiningsWindowV.xaml.vb | 6 +- .../OnlyProdBeamMachiningsWindowV.xaml | 161 ------- .../OnlyProdBeamMachiningsWindowV.xaml.vb | 18 - .../ConfigurationPage/ConfigurationPageV.xaml | 80 ---- .../ConfigurationPageV.xaml.vb | 3 - .../General_ConfigurationPageV.xaml | 59 +-- .../Machine_ConfigurationPageV.xaml | 31 +- .../OnlyProdGeneral_ConfigurationPageV.xaml | 130 ------ ...OnlyProdGeneral_ConfigurationPageV.xaml.vb | 3 - .../OnlyProdMachine_ConfigurationPageV.xaml | 78 ---- ...OnlyProdMachine_ConfigurationPageV.xaml.vb | 3 - ...OnlyProdQParameter_ConfigurationPageV.xaml | 82 ---- ...yProdQParameter_ConfigurationPageV.xaml.vb | 3 - .../QParameter_ConfigurationPageV.xaml | 80 ---- .../QParameter_ConfigurationPageV.xaml.vb | 3 - EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj | 112 +---- .../EgtColorPicker/EgtColorPickerV.xaml | 318 ++++++------- .../EgtColorPicker/EgtColorPickerV.xaml.vb | 6 +- .../OnlyProdEgtColorPickerV.xaml | 268 ----------- .../OnlyProdEgtColorPickerV.xaml.vb | 69 --- .../EgtManageFileDialogV.xaml | 30 +- .../EgtManageFileDialogV.xaml.vb | 6 +- .../OnlyProdEgtManageFileDialogV.xaml | 416 ------------------ .../OnlyProdEgtManageFileDialogV.xaml.vb | 142 ------ .../EgtMessageBox/EgtMessageBoxV.xaml | 6 +- .../EgtMessageBox/OnlyProdEgtMessageBoxV.xaml | 49 --- .../OnlyProdEgtMessageBoxV.xaml.vb | 110 ----- .../ItemParamList/OnlyProd_QParamListV.xaml | 91 ---- .../OnlyProd_QParamListV.xaml.vb | 3 - .../ItemParamList/QParamListV.xaml | 83 ---- .../ItemParamList/QParamListV.xaml.vb | 3 - .../LoadingWnd/LoadingWndHelper.vb | 2 +- EgtBEAMWALL.Core/LoadingWnd/LoadingWndV.xaml | 5 +- .../LoadingWnd/LoadingWndV.xaml.vb | 4 +- .../LoadingWnd/OnlyProdLoadingWndV.xaml | 55 --- .../LoadingWnd/OnlyProdLoadingWndV.xaml.vb | 36 -- EgtBEAMWALL.Core/MachGroupModel/BeamM.vb | 205 --------- .../MachGroupModel/BeamMachGroupM.vb | 133 ------ EgtBEAMWALL.Core/MachGroupModel/WallM.vb | 110 ----- .../MachGroupModel/WallMachGroupM.vb | 103 ----- .../MachGroupPanel/BeamMachGroupVM.vb | 113 ----- EgtBEAMWALL.Core/MachGroupPanel/BeamVM.vb | 43 -- .../MachGroupPanel/WallMachGroupVM.vb | 78 ---- EgtBEAMWALL.Core/MachGroupPanel/WallVM.vb | 81 ---- .../MachinePanel/MachinePanelV.xaml | 39 +- .../MachinePanel/MachinePanelVM.vb | 357 --------------- .../MachinePanel/OnlyProdMachinePanelV.xaml | 58 --- .../OnlyProdMachinePanelV.xaml.vb | 3 - ...DbWindowV.xaml => MachiningDbWindowV.xaml} | 2 +- ...owV.xaml.vb => MachiningDbWindowV.xaml.vb} | 2 +- .../NewOpenProjectFileDialogV.xaml | 127 +++--- .../NewOpenProjectFileDialogV.xaml.vb | 23 +- .../OnlyProdNewOpenProjectFileDialogV.xaml | 247 ----------- .../OnlyProdNewOpenProjectFileDialogV.xaml.vb | 93 ---- .../OnlyProdOpenProjectFileDialogV.xaml | 198 --------- .../OnlyProdOpenProjectFileDialogV.xaml.vb | 75 ---- .../OpenProjectFileDialogV.xaml | 98 +++-- .../OpenProjectFileDialogV.xaml.vb | 10 +- EgtBEAMWALL.Core/ProjectManager/ProdFile.vb | 69 --- EgtBEAMWALL.Core/Utility/ManageView.vb | 81 ---- .../BTLViewModel/BTLFeatureVM.vb | 4 +- .../BTLViewModel/BTLPartVM.vb | 2 +- .../ConfigurationProgramV.xaml | 2 +- .../ItemParamList/BTLPartListV.xaml | 8 +- .../ItemParamList/RawPartListVM.vb | 4 +- .../LeftPanel/LeftPanelV.xaml | 9 - .../MachinePanel/MachinePanelVM.vb | 4 +- .../My Project/AssemblyInfo.vb | 4 +- .../ProdManager/ProdManagerVM.vb | 9 +- 70 files changed, 536 insertions(+), 4610 deletions(-) delete mode 100644 EgtBEAMWALL.Core/BeamMachiningsWindow/OnlyProdBeamMachiningsWindowV.xaml delete mode 100644 EgtBEAMWALL.Core/BeamMachiningsWindow/OnlyProdBeamMachiningsWindowV.xaml.vb delete mode 100644 EgtBEAMWALL.Core/ConfigurationPage/ConfigurationPageV.xaml delete mode 100644 EgtBEAMWALL.Core/ConfigurationPage/ConfigurationPageV.xaml.vb delete mode 100644 EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml delete mode 100644 EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml.vb delete mode 100644 EgtBEAMWALL.Core/ConfigurationPage/OnlyProdMachine_ConfigurationPageV.xaml delete mode 100644 EgtBEAMWALL.Core/ConfigurationPage/OnlyProdMachine_ConfigurationPageV.xaml.vb delete mode 100644 EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml delete mode 100644 EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml.vb delete mode 100644 EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml delete mode 100644 EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml.vb delete mode 100644 EgtBEAMWALL.Core/EgtColorPicker/OnlyProdEgtColorPickerV.xaml delete mode 100644 EgtBEAMWALL.Core/EgtColorPicker/OnlyProdEgtColorPickerV.xaml.vb delete mode 100644 EgtBEAMWALL.Core/EgtManageFileDialog/OnlyProdEgtManageFileDialogV.xaml delete mode 100644 EgtBEAMWALL.Core/EgtManageFileDialog/OnlyProdEgtManageFileDialogV.xaml.vb delete mode 100644 EgtBEAMWALL.Core/EgtMessageBox/OnlyProdEgtMessageBoxV.xaml delete mode 100644 EgtBEAMWALL.Core/EgtMessageBox/OnlyProdEgtMessageBoxV.xaml.vb delete mode 100644 EgtBEAMWALL.Core/ItemParamList/OnlyProd_QParamListV.xaml delete mode 100644 EgtBEAMWALL.Core/ItemParamList/OnlyProd_QParamListV.xaml.vb delete mode 100644 EgtBEAMWALL.Core/ItemParamList/QParamListV.xaml delete mode 100644 EgtBEAMWALL.Core/ItemParamList/QParamListV.xaml.vb delete mode 100644 EgtBEAMWALL.Core/LoadingWnd/OnlyProdLoadingWndV.xaml delete mode 100644 EgtBEAMWALL.Core/LoadingWnd/OnlyProdLoadingWndV.xaml.vb delete mode 100644 EgtBEAMWALL.Core/MachGroupModel/BeamM.vb delete mode 100644 EgtBEAMWALL.Core/MachGroupModel/BeamMachGroupM.vb delete mode 100644 EgtBEAMWALL.Core/MachGroupModel/WallM.vb delete mode 100644 EgtBEAMWALL.Core/MachGroupModel/WallMachGroupM.vb delete mode 100644 EgtBEAMWALL.Core/MachGroupPanel/BeamMachGroupVM.vb delete mode 100644 EgtBEAMWALL.Core/MachGroupPanel/BeamVM.vb delete mode 100644 EgtBEAMWALL.Core/MachGroupPanel/WallMachGroupVM.vb delete mode 100644 EgtBEAMWALL.Core/MachGroupPanel/WallVM.vb delete mode 100644 EgtBEAMWALL.Core/MachinePanel/MachinePanelVM.vb delete mode 100644 EgtBEAMWALL.Core/MachinePanel/OnlyProdMachinePanelV.xaml delete mode 100644 EgtBEAMWALL.Core/MachinePanel/OnlyProdMachinePanelV.xaml.vb rename EgtBEAMWALL.Core/MachiningDbWindow/{OnlyProdMachiningDbWindowV.xaml => MachiningDbWindowV.xaml} (99%) rename EgtBEAMWALL.Core/MachiningDbWindow/{OnlyProdMachiningDbWindowV.xaml.vb => MachiningDbWindowV.xaml.vb} (96%) delete mode 100644 EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml delete mode 100644 EgtBEAMWALL.Core/NewOpenProjectFileDialog/OnlyProdNewOpenProjectFileDialogV.xaml.vb delete mode 100644 EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml delete mode 100644 EgtBEAMWALL.Core/OpenProjectFileDialog/OnlyProdOpenProjectFileDialogV.xaml.vb delete mode 100644 EgtBEAMWALL.Core/ProjectManager/ProdFile.vb delete mode 100644 EgtBEAMWALL.Core/Utility/ManageView.vb diff --git a/EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml b/EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml index cfa320aa..d366983f 100644 --- a/EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml +++ b/EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml @@ -2,115 +2,122 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5" - xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core" + xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core" Title="{Binding Title}" - Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}" WindowStyle="None" ResizeMode="NoResize" Width="500" Height="450" IsResizable="False" IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" - CloseCommand="{Binding Close_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"> - + CloseCommand="{Binding Close_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" + Style="{StaticResource OnlyProd_EgtCustomWindow}"> + - + + Style="{StaticResource OnlyProdTabControl_OnlyHeaders}"/> - - - - - + - - - - - - - - - + - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -126,30 +133,29 @@ Command="{Binding MoveRowUp_Command}" Grid.Column="0" Margin="0,0,2.5,0" - Style="{StaticResource EgtWPFLib5_InputButton}"/> + Style="{StaticResource OnlyProdEgtWPFLib5_InputButton}"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EgtBEAMWALL.Core/ConfigurationPage/ConfigurationPageV.xaml.vb b/EgtBEAMWALL.Core/ConfigurationPage/ConfigurationPageV.xaml.vb deleted file mode 100644 index 1d11796c..00000000 --- a/EgtBEAMWALL.Core/ConfigurationPage/ConfigurationPageV.xaml.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class ConfigurationPageV - -End Class \ No newline at end of file diff --git a/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml b/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml index 3fe2ca1b..f1fea801 100644 --- a/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml +++ b/EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml @@ -12,52 +12,52 @@ - + + Margin="0,0,0,5" + Foreground="{StaticResource BeamWall_Corduroy}"> + Margin="0,0,0,5" Style="{StaticResource OnlyProd_ComboBox}" /> - + + Margin="0,5,0,0" Style="{StaticResource OnlyProd_ComboBox}" /> + Margin="0,0,0,5" + Foreground="{StaticResource BeamWall_Corduroy}"> - - + + - - + + - + - + @@ -65,8 +65,7 @@ - + @@ -89,10 +88,13 @@ Margin="0,0,2.5,0"/> diff --git a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml b/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml deleted file mode 100644 index 2da3afce..00000000 --- a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdGeneral_ConfigurationPageV.xaml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdMachine_ConfigurationPageV.xaml.vb b/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdMachine_ConfigurationPageV.xaml.vb deleted file mode 100644 index e543003f..00000000 --- a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdMachine_ConfigurationPageV.xaml.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class OnlyProdMachine_ConfigurationPageV - -End Class \ No newline at end of file diff --git a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml b/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml deleted file mode 100644 index 9fb0d98a..00000000 --- a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml.vb b/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml.vb deleted file mode 100644 index c99af9c6..00000000 --- a/EgtBEAMWALL.Core/ConfigurationPage/OnlyProdQParameter_ConfigurationPageV.xaml.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class OnlyProdQParameter_ConfigurationPageV - -End Class \ No newline at end of file diff --git a/EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml b/EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml deleted file mode 100644 index 622874ea..00000000 --- a/EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml.vb b/EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml.vb deleted file mode 100644 index c059e15e..00000000 --- a/EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class QParameter_ConfigurationPageV - -End Class \ No newline at end of file diff --git a/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj b/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj index fdf86dcb..8550c904 100644 --- a/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj +++ b/EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj @@ -116,27 +116,18 @@ + BeamMachiningsWindowV.xaml - - - OnlyProdBeamMachiningsWindowV.xaml - - - OnlyProdMachine_ConfigurationPageV.xaml - - - OnlyProdGeneral_ConfigurationPageV.xaml + + Machine_ConfigurationPageV.xaml General_ConfigurationPageV.xaml - - Machine_ConfigurationPageV.xaml - @@ -148,9 +139,6 @@ EgtColorPickerV.xaml - - OnlyProdEgtColorPickerV.xaml - EgtDataGrid.xaml @@ -164,21 +152,9 @@ EgtManageFileDialogV.xaml - - OnlyProdEgtManageFileDialogV.xaml - EgtMessageBoxV.xaml - - OnlyProdEgtMessageBoxV.xaml - - - OnlyProd_QParamListV.xaml - - - QParamListV.xaml - @@ -190,31 +166,22 @@ + LoadingWndV.xaml - - - OnlyProdLoadingWndV.xaml - - - OnlyProdMachinePanelV.xaml - MachinePanelV.xaml - - OnlyProdMachiningDbWindowV.xaml + + MachiningDbWindowV.xaml + NewOpenProjectFileDialogV.xaml - - - OnlyProdNewOpenProjectFileDialogV.xaml - - - OnlyProdOpenProjectFileDialogV.xaml + + OpenProjectFileDialogV.xaml @@ -248,9 +215,6 @@ - - OpenProjectFileDialogV.xaml - @@ -291,37 +255,21 @@ - MSBuild:Compile - Designer - - Designer MSBuild:Compile - - MSBuild:Compile - Designer - - + MSBuild:Compile Designer + MSBuild:Compile Designer - XamlIntelliSenseFileGenerator - - - Designer - XamlIntelliSenseFileGenerator Designer MSBuild:Compile - - Designer - MSBuild:Compile - MSBuild:Compile Designer @@ -330,61 +278,29 @@ Designer MSBuild:Compile - - Designer - MSBuild:Compile - Designer MSBuild:Compile - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - Designer - XamlIntelliSenseFileGenerator - - Designer MSBuild:Compile - - MSBuild:Compile - Designer - + MSBuild:Compile Designer - XamlIntelliSenseFileGenerator - + Designer MSBuild:Compile - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - Designer MSBuild:Compile - MSBuild:Compile Designer + MSBuild:Compile MSBuild:Compile diff --git a/EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml b/EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml index d3a69a88..1da51c37 100644 --- a/EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml +++ b/EgtBEAMWALL.Core/EgtColorPicker/EgtColorPickerV.xaml @@ -8,66 +8,66 @@ WindowStyle="None" ResizeMode="NoResize" IsMinimizable="False" ShowInTaskbar="False" Width="750" Height="450" - Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"> - + Style="{StaticResource OnlyProd_EgtCustomWindow}"> + - - - - + + + + + + + + + - - - - - - - - - - - + + + + + - - - - - + + + + - - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + - - - - - + + + + - - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + - - - - - - + + + + + - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + - - - - - + + + + - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb index eed41ccd..788ab445 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb +++ b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb @@ -213,8 +213,8 @@ Public Class RawPartListVM ' Aggiungo riferimento a Map Map.SetRefRawPartListVM(Me) - '' carico le colonne della datagrid BEAM - 'EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_RAWPARTLIST_BEAM, RawPartColumns) + ' carico le colonne della datagrid BEAM + EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_RAWPARTLIST_BEAM, RawPartColumns) End Sub #End Region ' CONSTRUCTOR diff --git a/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml b/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml index 13542e1f..694663ca 100644 --- a/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml +++ b/EgtBEAMWALL.Optimizer/LeftPanel/LeftPanelV.xaml @@ -31,7 +31,6 @@ - - Mancano i file di configurazione. - Errore @@ -316,7 +316,7 @@ Public Class MachinePanelVM ' apro finestra di gestione lavorazioni pareti Dim sTitle = EgtMsg(9010) 'Tabelle delle lavorazioni delle pareti Dim WallMchsWinVM As New MyBeamMachiningsWindowVM(sTitle, sBaseDir, sMachTypePath, sTabTemplPath, False) - Dim WallMchsWinV As New OnlyProdBeamMachiningsWindowV(Application.Current.MainWindow, WallMchsWinVM) + Dim WallMchsWinV As New BeamMachiningsWindowV(Application.Current.MainWindow, WallMchsWinVM) WallMchsWinV.ShowDialog() Else ' Impossibile aprire l'Editor delle lavorazioni delle pareti.
Mancano i file di configurazione. - Errore diff --git a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb index b4ac0efe..71f630de 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 18c1691c..88b7159c 100644 --- a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb +++ b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb @@ -857,6 +857,11 @@ Public Class ProdManagerVM Dim nAsseBaseLayer As Integer = EgtGetLastNameInGroup(GDB_ID.ROOT, ASSEBASE) EgtSetInfo(nAsseBaseLayer, BTL_PRT_PROJ, nProjId) + ' Apro finestra parametri generali + Dim GeneralParametersWndVM As New GeneralParametersWndVM() + GeneralParametersWndVM.SetbSaveGeneralParameters(True) + GeneralParametersWndVM.SaveProjectParameters() + ' Controllo se effettuare import + verifica If Map.refConfigurationPageVM.bVerifyImportBTL_IsChecked Then ' Eseguo procedura @@ -1026,7 +1031,7 @@ Public Class ProdManagerVM Dim OpenProdFileDialogVM As NewOpenProjectFileDialogVM = Nothing ' apro dialogo di scelta Prod OpenProdFileDialogVM = New NewOpenProjectFileDialogVM - Dim OpenFile As New OnlyProdNewOpenProjectFileDialogV(Application.Current.MainWindow, OpenProdFileDialogVM) + Dim OpenFile As New NewOpenProjectFileDialogV(Application.Current.MainWindow, OpenProdFileDialogVM) Dim DialogResult As Boolean? = OpenFile.EgtShowDialog(ProjectType.PROD) If IsNothing(DialogResult) OrElse Not DialogResult Then Return True sFilePath = OpenProdFileDialogVM.SelProject.ProdFileVM.sProdPath @@ -1035,7 +1040,7 @@ Public Class ProdManagerVM Dim OpenProjectFileDialogVM As OpenProjectFileDialogVM = Nothing ' apro dialogo di scelta file OpenProjectFileDialogVM = New OpenProjectFileDialogVM - Dim OpenFile As New OnlyProdOpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM) + Dim OpenFile As New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM) Dim DialogResult As Boolean? = OpenFile.EgtShowDialog(ProjectType.PROD) If IsNothing(DialogResult) OrElse Not DialogResult Then Return True sFilePath = OpenProjectFileDialogVM.SelProject.sProdPath