From d4adcfc8e18b119d014cd7e0046a3dff1362a5a7 Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Thu, 29 Jan 2026 12:20:11 +0100 Subject: [PATCH 1/2] EgtBEAMWALL 3.1.1.1: -cambiato pulsante per disabilitare assemblato -aggiunto messaggi nelle lingue corrette --- EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb | 4 ++-- .../ExecProcessManager/MyExecProcessManager.vb | 8 ++++---- .../OptimizePanel/OptimizePanelVM.vb | 16 ++++++++-------- .../ProdManager/ProdManagerVM.vb | 13 ++++++++++--- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb b/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb index b7205c85..2195e18a 100644 --- a/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb +++ b/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb @@ -588,7 +588,7 @@ Public Class CALCPanelVM Map.refSceneShowBuldingVM.SceneShowBulding.Enable(False) Map.refSceneBuildingVM.SetViewPanel_IsEnable(False) Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = False - Map.refMyStatusBarVM.SetOutputMessage("Checking in progress...") + Map.refMyStatusBarVM.SetOutputMessage(EgtMsg(62576)) ' Imposto contesto scena principale Dim CurrContext As Integer = EgtGetCurrentContext() Dim MainSceneContext As Integer = Map.refSceneHostVM.MainScene.GetCtx() @@ -640,7 +640,7 @@ Public Class CALCPanelVM Map.refSceneShowBuldingVM.SceneShowBulding.Enable(False) Map.refSceneBuildingVM.SetViewPanel_IsEnable(False) Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = False - Map.refMyStatusBarVM.SetOutputMessage("Checking in progress...") + Map.refMyStatusBarVM.SetOutputMessage(EgtMsg(62576)) ' Imposto contesto scena principale Dim CurrContext As Integer = EgtGetCurrentContext() Dim MainSceneContext As Integer = Map.refSceneHostVM.MainScene.GetCtx() diff --git a/EgtBEAMWALL.Optimizer/ExecProcessManager/MyExecProcessManager.vb b/EgtBEAMWALL.Optimizer/ExecProcessManager/MyExecProcessManager.vb index 13415e52..dbd5c721 100644 --- a/EgtBEAMWALL.Optimizer/ExecProcessManager/MyExecProcessManager.vb +++ b/EgtBEAMWALL.Optimizer/ExecProcessManager/MyExecProcessManager.vb @@ -84,7 +84,7 @@ Module MyExecProcessManager If nProjIndex = -1 Then Map.refMyStatusBarVM.MaximumValue = 1 Map.refMyStatusBarVM.SetLoadingProgress(1) - Map.refMyStatusBarVM.SetOutputMessage("Verification Complete") + Map.refMyStatusBarVM.SetOutputMessage(EgtMsg(62577)) Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True Else Map.refMyStatusBarVM.MaximumValue = Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count - 1 @@ -92,7 +92,7 @@ Module MyExecProcessManager nProjIndex += 1 End If If nProjIndex = Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count - 1 Then - Map.refMyStatusBarVM.SetOutputMessage("Verification Complete") + Map.refMyStatusBarVM.SetOutputMessage(EgtMsg(62577)) Map.refSceneShowBuldingVM.SceneShowBulding.Enable(True) Map.refSceneBuildingVM.SetViewPanel_IsEnable(True) Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True @@ -102,7 +102,7 @@ Module MyExecProcessManager If nProdIndex = -1 Then Map.refMyStatusBarVM.MaximumValue = 1 Map.refMyStatusBarVM.SetLoadingProgress(1) - Map.refMyStatusBarVM.SetOutputMessage("Verification Complete") + Map.refMyStatusBarVM.SetOutputMessage(EgtMsg(62577)) Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True Else Map.refMyStatusBarVM.MaximumValue = Map.refMachGroupPanelVM.MachGroupVMList.Count - 1 @@ -110,7 +110,7 @@ Module MyExecProcessManager nProdIndex += 1 End If If nProdIndex = Map.refMachGroupPanelVM.MachGroupVMList.Count - 1 Then - Map.refMyStatusBarVM.SetOutputMessage("Verification Complete") + Map.refMyStatusBarVM.SetOutputMessage(EgtMsg(62577)) Map.refSceneShowBuldingVM.SceneShowBulding.Enable(True) Map.refSceneBuildingVM.SetViewPanel_IsEnable(True) Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True diff --git a/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelVM.vb b/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelVM.vb index 264ec5a7..ea6bf110 100644 --- a/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelVM.vb +++ b/EgtBEAMWALL.Optimizer/OptimizePanel/OptimizePanelVM.vb @@ -367,10 +367,10 @@ Public Class OptimizePanelVM Friend Sub Optimize() If IsNothing(m_SelPartType) OrElse IsNothing(m_SelOriginType) Then Return If IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.BTLStructureVM.BTLPartVMList) OrElse Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count = 0 Then Return - ' se nessun grezzo, rendo tutti i pezzi visibili - If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count = 0 Then - Map.refProjectVM.BTLStructureVM.ShowAll(False) - End If + '' se nessun grezzo, rendo tutti i pezzi visibili + 'If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count = 0 Then + ' Map.refProjectVM.BTLStructureVM.ShowAll(False) + 'End If ' apro finestra di attesa nesting m_bNestingRunning = True Dim NestingRunningWnd As Object = Nothing @@ -383,10 +383,10 @@ Public Class OptimizePanelVM NestingRunningWnd = New NestingRunningWndV(Application.Current.MainWindow, NestingRunningWndVM) NestingRunningWnd.ShowDialog() m_bNestingRunning = False - ' se nessun grezzo, rimetto tutti i pezzi invisibili - If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count = 0 Then - Map.refProjectVM.BTLStructureVM.HideAll(True) - End If + '' se nessun grezzo, rimetto tutti i pezzi invisibili + 'If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count = 0 Then + ' Map.refProjectVM.BTLStructureVM.HideAll(True) + 'End If ' mostro risultati Dim sResult As String = "" Dim dStartOffset As Double = WarehouseHelper.GetStartOffset() diff --git a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb index 5c775277..d56be9e8 100644 --- a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb +++ b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb @@ -557,7 +557,7 @@ Public Class ProdManagerVM End Function Private Function CreateFirstBTLProj(sImportFilePath As String, nType As BWType, Machine As MyMachine, ByRef nProjId As Integer, ByRef sProjDir As String) As Boolean - 'LoadingWndHelper.OpenLoadingWnd(ActiveIds.IMPORTBTL, 3, EgtMsg(63008), EgtMsg(63009), 50) ' BTL file importing ' Reading BTL file + LoadingWndHelper.OpenLoadingWnd(ActiveIds.IMPORTBTL, 3, EgtMsg(63008), EgtMsg(63009), 50) ' BTL file importing ' Reading BTL file ' copio file BTL Dim sBtlCopyPath As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\" & Path.GetFileName(sImportFilePath) Dim bOk = False @@ -691,6 +691,7 @@ Public Class ProdManagerVM End If SectionXMaterial.SetType(nType) + LoadingWndHelper.UpdateLoadingWnd(ActiveIds.IMPORTBTL, 2, EgtMsg(63005), 50, 70) ' Loading parts ' leggo struttura BTL per liste Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(0)) CopyBuilding() @@ -707,6 +708,7 @@ Public Class ProdManagerVM Wall.Rotation(True, Map.refProjectVM.BTLStructureVM.nPROJTYPE, True, 180, False) Next End If + LoadingWndHelper.CloseLoadingWnd(ActiveIds.IMPORTBTL) Return True End Function @@ -1472,7 +1474,10 @@ Public Class ProdManagerVM End Property Public Sub ImportBTL(Optional sFile As String = "", Optional bWithDlg As Boolean = True) - Map.refShowBeamPanelVM.ShowBuilding_IsChecked = False + 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) If Not CreateNewProd() Then Dim sErrMsg As String = "Errore! Creazione del progetto fallita!" EgtOutLog(sErrMsg) @@ -1589,7 +1594,9 @@ Public Class ProdManagerVM End Property Public Sub ImportProject() - Map.refShowBeamPanelVM.ShowBuilding_IsChecked = False + Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = False + Map.refProjectVM.SetSceneShowBuldingVisibility(Visibility.Collapsed) + Map.refProjectVM.SetManagerTabVisibility(Visibility.Visible) SetOpenImage("pack://application:,,,/Resources/NewPage/down.png") Dim TempCurrProd As ProjectFileVM = CurrProd If ProdFileVM.VerifyProjectModification(TempCurrProd) Then Return From a3fa949b19f1feefb445f4293e80d93603dbb22f Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Thu, 29 Jan 2026 12:24:19 +0100 Subject: [PATCH 2/2] EgtBEAMWALL 3.1.1.1_ -aggiornato messaggi di verifica --- EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb | 4 ++-- .../ExecProcessManager/MyExecProcessManager.vb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb b/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb index 472b41d3..b58f946c 100644 --- a/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb +++ b/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb @@ -660,7 +660,7 @@ Public Class CALCPanelVM Map.refSceneShowBuldingVM.SceneShowBulding.Enable(False) Map.refSceneBuildingVM.SetViewPanel_IsEnable(False) Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = False - Map.refMyStatusBarVM.SetOutputMessage("Verifica in corso...") + Map.refMyStatusBarVM.SetOutputMessage(EgtMsg(62576)) Map.refMyStatusBarVM.MaximumValue = 1 If ProgramPage = ProjectType.PROJ Then If Not Map.refProjectVM.BTLStructureVM.SelBTLPart.bDO Then Return @@ -782,7 +782,7 @@ Public Class CALCPanelVM Map.refSceneShowBuldingVM.SceneShowBulding.Enable(False) Map.refSceneBuildingVM.SetViewPanel_IsEnable(False) Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = False - Map.refMyStatusBarVM.SetOutputMessage("Verifica in corso...") + Map.refMyStatusBarVM.SetOutputMessage(EgtMsg(62576)) If ProgramPage = ProjectType.PROJ Then Map.refMyStatusBarVM.MaximumValue = Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count For PartIndex = 0 To Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count - 1 diff --git a/EgtBEAMWALL.Optimizer/ExecProcessManager/MyExecProcessManager.vb b/EgtBEAMWALL.Optimizer/ExecProcessManager/MyExecProcessManager.vb index 1456ead6..8dd918b7 100644 --- a/EgtBEAMWALL.Optimizer/ExecProcessManager/MyExecProcessManager.vb +++ b/EgtBEAMWALL.Optimizer/ExecProcessManager/MyExecProcessManager.vb @@ -86,7 +86,7 @@ Module MyExecProcessManager Dim nRunningProcesses As Integer = BeamManager.nRunningProcesses Map.refMyStatusBarVM.SetLoadingProgress(Map.refMyStatusBarVM.MaximumValue - nQuestionInQueue - (nRunningProcesses - nFreeOrWaitingAnswerProcesses)) If nQuestionInQueue = 0 AndAlso nFreeOrWaitingAnswerProcesses = nRunningProcesses Then - Map.refMyStatusBarVM.SetOutputMessage("Verifica Completata", 2) + Map.refMyStatusBarVM.SetOutputMessage(EgtMsg(62577), 2) Map.refSceneShowBuldingVM.SceneShowBulding.Enable(True) Map.refSceneBuildingVM.SetViewPanel_IsEnable(True) Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True