Merge branch 'feature/NewGraphicsProgram' of https://gitlab.steamware.net/egalware-cadcam/interfacce/egtbeamwall into feature/NewGraphicsProgram

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.StartLoading("Verifica in corso...", False)
+      Map.refMyStatusBarVM.StartLoading(EgtMsg(62576), False)
       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.StartLoading("Verifica in corso...", False)
+      Map.refMyStatusBarVM.StartLoading(EgtMsg(62576), False)
       If ProgramPage = ProjectType.PROJ Then
          Map.refMyStatusBarVM.MaximumValue = Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count
          For PartIndex = 0 To Map.refProjectVM.BTLStructureVM.BTLPartVMList.Count - 1

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.EndLoading("Verifica Completata", 2)
+         Map.refMyStatusBarVM.EndLoading(EgtMsg(62577), 2)
          Map.refSceneShowBuldingVM.SceneShowBulding.Enable(True)
          Map.refSceneBuildingVM.SetViewPanel_IsEnable(True)
          Map.refShowBeamPanelVM.ShowBuilding_IsEnabled = True

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()

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