From ad47a070ef512ac668f6125876aa5cc3a4c843cd Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Tue, 22 Apr 2025 08:03:44 +0200 Subject: [PATCH] -pulizia codice --- .../BTLViewModel/BTLFeatureVM.vb | 18 +- .../ItemParamList/OnlyProdBTLPartListV.xaml | 1 - .../OnlyProdBTLPartListV.xaml.vb | 16 +- EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb | 538 +++++++++--------- .../MainWindow/MainWindowVM.vb | 54 +- EgtBEAMWALL.Optimizer/Project/ProjectVM.vb | 186 +++--- 6 files changed, 400 insertions(+), 413 deletions(-) diff --git a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb index e76ba995..d640caa9 100644 --- a/EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb +++ b/EgtBEAMWALL.Optimizer/BTLViewModel/BTLFeatureVM.vb @@ -1,7 +1,6 @@ Imports System.Collections.ObjectModel Imports System.Collections.Specialized Imports System.ComponentModel -Imports System.IO Imports EgtBEAMWALL.Core Imports EgtUILib Imports EgtWPFLib5 @@ -216,10 +215,10 @@ Public Class BTLFeatureVM Set(value As Boolean) Dim bShowSolid As Boolean = Map.refShowBeamPanelVM.ShowSolid_IsChecked If value <> m_BTLFeatureM.bDO Then - If Map.refMainMenuVM.SelPage = Pages.VIEW Then - ' verifico se solido attivo - If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, False, False) - End If + 'If Map.refMainMenuVM.SelPage = Pages.VIEW Then + ' ' verifico se solido attivo + ' If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, False, False) + 'End If If EgtBeamEnableProcess(nFeatureId, value, Not m_bDO_MultipleUpdate) Then m_BTLFeatureM.bDO = value ' setto feature da ricalcolare @@ -234,10 +233,10 @@ Public Class BTLFeatureVM Item.NotifyPropertyChanged(NameOf(Item.sMsg)) Next End If - If Map.refMainMenuVM.SelPage = Pages.VIEW Then - ' eventualmente ripristino solido - If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False) - End If + 'If Map.refMainMenuVM.SelPage = Pages.VIEW Then + ' ' eventualmente ripristino solido + ' If bShowSolid Then Map.refProjectVM.BTLStructureVM.ShowSolid(GDB_ID.NULL, True, False) + 'End If If Not m_bDO_MultipleUpdate Then EgtDraw() ' aggiorno stato abilitazione del bottone modifica free contour Map.refFeatureManagerVM.SetEditIsEnabled() @@ -629,7 +628,6 @@ Public Class BTLFeatureVM #End Region ' Cancel - #End Region ' COMMANDS #Region "EVENTS" diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml index 14e85374..d5117cb5 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml +++ b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml @@ -365,7 +365,6 @@ diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml.vb b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml.vb index faa7a813..60339019 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml.vb +++ b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml.vb @@ -213,13 +213,13 @@ Public Class OnlyProdBTLPartListV }) End Sub - Private Sub ListBox_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs) - If TypeOf sender Is ListBox Then - Dim FeatureList As ListBox = DirectCast(sender, ListBox) - If Not IsNothing(FeatureList) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then - Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM = FeatureList.SelectedItem - End If - End If - End Sub + 'Private Sub ListBox_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs) + ' If TypeOf sender Is ListBox Then + ' Dim FeatureList As ListBox = DirectCast(sender, ListBox) + ' If Not IsNothing(FeatureList) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then + ' Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM = FeatureList.SelectedItem + ' End If + ' End If + 'End Sub End Class diff --git a/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb b/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb index 804229e5..bae30b96 100644 --- a/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb +++ b/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb @@ -267,282 +267,282 @@ Public Class MainMenuVM End Sub Private Function InitVIEW() As Boolean - Map.refProjectVM.SetBottomPanel_Visibility(True) - Map.refProjectVM.SetLeftPanel_Visibility(True) - 'Map.refLeftPanelVM.UpdateView() - If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.UpdateView() - If Not IsNothing(Map.refBTLPartManagerVM) Then Map.refBTLPartManagerVM.UpdateView() - Map.refProjectVM.SetFeatureManager_Visibility(True) - Map.refProjectVM.SetTopPanel_Visibility(False) - Map.refProjectVM.SetShowBeamPanel_Visibility(True) - Map.refProjectVM.SetProjManager_Visibility(True) - Map.refProjectVM.SetProdManager_Visibility(False) - Map.refProjectVM.SetOnlyProdManager_Visibility(False) - Map.refProjectVM.SetOnlyProdLeftPanel_Visibility(False) - Map.refProjectVM.SetOnlyProdOptimizePanel_Visibility(False) - Map.refProjectVM.SetOptimizePanel_Visibility(Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NESTING_AUTO)) - Map.refProjectVM.NotifyAllPanelVisibility() - Map.refCALCPanelVM.SetChooseMachineBtn_Visibility(Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Map.refMachinePanelVM.MachineList.Count > 1 AndAlso GetMainPrivateProfileInt(S_MACH, K_CHANGEMACH, 0) = 1) - Map.refStatisticsTimePanelVM.SetStatisticsTimePanel_Visibility() - If Not IsNothing(Map.refFeatureListVM.colFeature_Do) Then - Map.refFeatureListVM.colFeature_Do.ColumnVisibility = Visibility.Visible - End If - ' aggiorno la visibilità delle colonne - For Each col In Map.refFeatureListVM.FeatureColumns - col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) - Next - For Each col In Map.refPartListVM.PartColumns - col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) - Next - For Each col In Map.refStatisticsVM.StatisticsColumns - col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) - Next - For Each col In Map.refPParameterListVM.PParameterListColumns - col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) - Next - For Each col In Map.refQParameterListVM.QParameterListColumns - col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) - Next - ' imposto dimensioni colonne/righe della Grid - DimensionsIniFile.ReadGridDimensions(ConstDims.PROJECT_VIEW, Map.refProjectVM.GridDims) - DimensionsIniFile.ReadGridDimensions(ConstDims.LEFTPANEL_VIEW, Map.refLeftPanelVM.GridDims) - ' apro progetto proj - If Not IsNothing(ProjectManagerVM.CurrProj) Then - If ProjectManagerVM.CurrProj.bReloadProject OrElse Map.refConfigurationPageVM.QParametersModified Then - LoadingWndHelper.UpdateLoadingWnd(ActiveIds.GOTOPROJ, 2, EgtMsg(63005), 10, 100) ' Loading parts - Map.refProjManagerVM.OpenProject(ProjectManagerVM.CurrProj) - ' aggiorno le colonne in base al tipo progetto - If Not IsNothing(Map.refProjectVM.BTLStructureVM) Then - Map.refRawPartListVM.UpdateColumns(Map.refProjectVM.BTLStructureVM.nPROJTYPE) - Map.refFeatureInPartInRawPartListVM.UpdateColumns(CurrentMachine.nType) - Else - Map.refRawPartListVM.UpdateColumns(BWType.BEAM) - Map.refFeatureInPartInRawPartListVM.UpdateColumns(CurrentMachine.nType) - End If - ' resetto modifica parametri Q default - Map.refConfigurationPageVM.ResetQParametersModified() - DbControllers.m_ProjController.LockByProjId(ProjectManagerVM.CurrProj.nProjId, True, Map.refMainWindowVM.MainWindowM.GetKeyNumber()) - Map.refProjManagerVM.NotifyPropertyChanged(NameOf(Map.refProjManagerVM.MruFileNames)) - Else - LoadingWndHelper.UpdateLoadingWnd(ActiveIds.GOTOPROJ, 2, EgtMsg(63005), 10, 100) ' Loading parts - ' recupero indice di modifica progetto - Dim CommIndex As Integer = -1 - Dim ActiveSessionList As List(Of StatusMapModel) = DbControllers.m_StatusMapController.GetProd(m_SupervisorId) - For Each ActiveSession In ActiveSessionList - If ActiveSession.ItemId = ProjectManagerVM.CurrProj.nProdId Then - CommIndex = ActiveSession.Index - End If - Next - LoadingWndHelper.UpdateLoadingWnd(ActiveIds.GOTOPROD, 3, EgtMsg(63002), 30, 100) ' Loading machining groups - ' verifico se il prod di provenienza ha piu' proj - If Not IsNothing(ProjectManagerVM.CurrProd) AndAlso ProjectManagerVM.CurrProd.nProjIdList.Count > 1 Then - ' se si rigenero BTLStructure - Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(ProjectManagerVM.CurrProj.nProjId)) - ' carico filtri di ricerca - Map.refProjectVM.BTLStructureVM.LoadFilters() - End If - ' fisso indice sessione di comunicazione - If CommIndex > -1 Then - ProjectManagerVM.CurrProj.SetModificationIndex(CommIndex) - End If - ' mostro tutti i pezzi - Map.refShowBeamPanelVM.ShowAll(True) - ProjectManagerVM.CurrProj.SetReloadProject(True) - End If - ' aggiorno titolo - Map.refMainWindowVM.UpdateTitle() - DbControllers.m_ProjController.LockByProjId(ProjectManagerVM.CurrProj.nProjId, True, Map.refMainWindowVM.MainWindowM.GetKeyNumber()) - Else - Map.refSceneHostVM.MainController.NewProject() - Map.refProjectVM.BTLStructureVM = Nothing - Map.refProjectVM.MachGroupPanelVM = Nothing - End If - Map.refMainWindowVM.NotifyPropertyChanged(NameOf(Map.refMainWindowVM.nSelTabPage)) - Map.refMainMenuVM.NotifyPropertyChanged(NameOf(Map.refMainMenuVM.SendFeedbackIsEnabled)) - Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.ChangeParam_Visibility)) - Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.ChangeMaterial_Visibility)) - Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.Statistic_Visibility)) - Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.VisStatistic_Visibility)) - Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.OtStatistic_Visibility)) + 'Map.refProjectVM.SetBottomPanel_Visibility(True) + 'Map.refProjectVM.SetLeftPanel_Visibility(True) + ''Map.refLeftPanelVM.UpdateView() + 'If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.UpdateView() + 'If Not IsNothing(Map.refBTLPartManagerVM) Then Map.refBTLPartManagerVM.UpdateView() + 'Map.refProjectVM.SetFeatureManager_Visibility(True) + 'Map.refProjectVM.SetTopPanel_Visibility(False) + 'Map.refProjectVM.SetShowBeamPanel_Visibility(True) + 'Map.refProjectVM.SetProjManager_Visibility(True) + 'Map.refProjectVM.SetProdManager_Visibility(False) + 'Map.refProjectVM.SetOnlyProdManager_Visibility(False) + 'Map.refProjectVM.SetOnlyProdLeftPanel_Visibility(False) + 'Map.refProjectVM.SetOnlyProdOptimizePanel_Visibility(False) + 'Map.refProjectVM.SetOptimizePanel_Visibility(Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NESTING_AUTO)) + 'Map.refProjectVM.NotifyAllPanelVisibility() + 'Map.refCALCPanelVM.SetChooseMachineBtn_Visibility(Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Map.refMachinePanelVM.MachineList.Count > 1 AndAlso GetMainPrivateProfileInt(S_MACH, K_CHANGEMACH, 0) = 1) + 'Map.refStatisticsTimePanelVM.SetStatisticsTimePanel_Visibility() + 'If Not IsNothing(Map.refFeatureListVM.colFeature_Do) Then + ' Map.refFeatureListVM.colFeature_Do.ColumnVisibility = Visibility.Visible + 'End If + '' aggiorno la visibilità delle colonne + 'For Each col In Map.refFeatureListVM.FeatureColumns + ' col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + 'Next + 'For Each col In Map.refPartListVM.PartColumns + ' col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + 'Next + 'For Each col In Map.refStatisticsVM.StatisticsColumns + ' col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + 'Next + 'For Each col In Map.refPParameterListVM.PParameterListColumns + ' col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + 'Next + 'For Each col In Map.refQParameterListVM.QParameterListColumns + ' col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + 'Next + '' imposto dimensioni colonne/righe della Grid + 'DimensionsIniFile.ReadGridDimensions(ConstDims.PROJECT_VIEW, Map.refProjectVM.GridDims) + 'DimensionsIniFile.ReadGridDimensions(ConstDims.LEFTPANEL_VIEW, Map.refLeftPanelVM.GridDims) + '' apro progetto proj + 'If Not IsNothing(ProjectManagerVM.CurrProj) Then + ' If ProjectManagerVM.CurrProj.bReloadProject OrElse Map.refConfigurationPageVM.QParametersModified Then + ' LoadingWndHelper.UpdateLoadingWnd(ActiveIds.GOTOPROJ, 2, EgtMsg(63005), 10, 100) ' Loading parts + ' Map.refProjManagerVM.OpenProject(ProjectManagerVM.CurrProj) + ' ' aggiorno le colonne in base al tipo progetto + ' If Not IsNothing(Map.refProjectVM.BTLStructureVM) Then + ' Map.refRawPartListVM.UpdateColumns(Map.refProjectVM.BTLStructureVM.nPROJTYPE) + ' Map.refFeatureInPartInRawPartListVM.UpdateColumns(CurrentMachine.nType) + ' Else + ' Map.refRawPartListVM.UpdateColumns(BWType.BEAM) + ' Map.refFeatureInPartInRawPartListVM.UpdateColumns(CurrentMachine.nType) + ' End If + ' ' resetto modifica parametri Q default + ' Map.refConfigurationPageVM.ResetQParametersModified() + ' DbControllers.m_ProjController.LockByProjId(ProjectManagerVM.CurrProj.nProjId, True, Map.refMainWindowVM.MainWindowM.GetKeyNumber()) + ' Map.refProjManagerVM.NotifyPropertyChanged(NameOf(Map.refProjManagerVM.MruFileNames)) + ' Else + ' LoadingWndHelper.UpdateLoadingWnd(ActiveIds.GOTOPROJ, 2, EgtMsg(63005), 10, 100) ' Loading parts + ' ' recupero indice di modifica progetto + ' Dim CommIndex As Integer = -1 + ' Dim ActiveSessionList As List(Of StatusMapModel) = DbControllers.m_StatusMapController.GetProd(m_SupervisorId) + ' For Each ActiveSession In ActiveSessionList + ' If ActiveSession.ItemId = ProjectManagerVM.CurrProj.nProdId Then + ' CommIndex = ActiveSession.Index + ' End If + ' Next + ' LoadingWndHelper.UpdateLoadingWnd(ActiveIds.GOTOPROD, 3, EgtMsg(63002), 30, 100) ' Loading machining groups + ' ' verifico se il prod di provenienza ha piu' proj + ' If Not IsNothing(ProjectManagerVM.CurrProd) AndAlso ProjectManagerVM.CurrProd.nProjIdList.Count > 1 Then + ' ' se si rigenero BTLStructure + ' Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(ProjectManagerVM.CurrProj.nProjId)) + ' ' carico filtri di ricerca + ' Map.refProjectVM.BTLStructureVM.LoadFilters() + ' End If + ' ' fisso indice sessione di comunicazione + ' If CommIndex > -1 Then + ' ProjectManagerVM.CurrProj.SetModificationIndex(CommIndex) + ' End If + ' ' mostro tutti i pezzi + ' Map.refShowBeamPanelVM.ShowAll(True) + ' ProjectManagerVM.CurrProj.SetReloadProject(True) + ' End If + ' ' aggiorno titolo + ' Map.refMainWindowVM.UpdateTitle() + ' DbControllers.m_ProjController.LockByProjId(ProjectManagerVM.CurrProj.nProjId, True, Map.refMainWindowVM.MainWindowM.GetKeyNumber()) + 'Else + ' Map.refSceneHostVM.MainController.NewProject() + ' Map.refProjectVM.BTLStructureVM = Nothing + ' Map.refProjectVM.MachGroupPanelVM = Nothing + 'End If + 'Map.refMainWindowVM.NotifyPropertyChanged(NameOf(Map.refMainWindowVM.nSelTabPage)) + 'Map.refMainMenuVM.NotifyPropertyChanged(NameOf(Map.refMainMenuVM.SendFeedbackIsEnabled)) + 'Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.ChangeParam_Visibility)) + 'Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.ChangeMaterial_Visibility)) + 'Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.Statistic_Visibility)) + 'Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.VisStatistic_Visibility)) + 'Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.OtStatistic_Visibility)) Return True End Function Private Function ExitVIEW(bVerifyModification As Boolean) As Boolean - ' verifico se progetto modificato, e chiedo se salvare - If bVerifyModification Then - If Not ProjFileVM.VerifyProjectModification(ProjectManagerVM.CurrProj, ProjectType.PROJ) Then - Return False - End If - End If - ' resetto eventuale visualizzazione statistiche - Map.refInstrumentPanelVM.ResetStatisticsIsChecked() - Map.refProjectVM.SetBottomPanel_Visibility(False) - Map.refProjectVM.SetLeftPanel_Visibility(True) - Map.refProjectVM.SetFeatureManager_Visibility(False) - Map.refProjectVM.SetTopPanel_Visibility(True) - Map.refProjectVM.SetShowBeamPanel_Visibility(False) - Map.refProjectVM.SetProjManager_Visibility(False) - Map.refProjectVM.SetOnlyProdManager_Visibility(True) - Map.refProjectVM.SetOnlyProdLeftPanel_Visibility(True) - Map.refProjectVM.SetOnlyProdOptimizePanel_Visibility(True) - Map.refProjectVM.SetProdManager_Visibility(True) - Map.refProjectVM.SetOptimizePanel_Visibility(True) - Map.refCALCPanelVM.SetChooseMachine_Visibility(False) + ' ' verifico se progetto modificato, e chiedo se salvare + ' If bVerifyModification Then + ' If Not ProjFileVM.VerifyProjectModification(ProjectManagerVM.CurrProj, ProjectType.PROJ) Then + ' Return False + ' End If + ' End If + ' ' resetto eventuale visualizzazione statistiche + ' Map.refInstrumentPanelVM.ResetStatisticsIsChecked() + ' Map.refProjectVM.SetBottomPanel_Visibility(False) + ' Map.refProjectVM.SetLeftPanel_Visibility(True) + ' Map.refProjectVM.SetFeatureManager_Visibility(False) + ' Map.refProjectVM.SetTopPanel_Visibility(True) + ' Map.refProjectVM.SetShowBeamPanel_Visibility(False) + ' Map.refProjectVM.SetProjManager_Visibility(False) + ' Map.refProjectVM.SetOnlyProdManager_Visibility(True) + ' Map.refProjectVM.SetOnlyProdLeftPanel_Visibility(True) + ' Map.refProjectVM.SetOnlyProdOptimizePanel_Visibility(True) + ' Map.refProjectVM.SetProdManager_Visibility(True) + ' Map.refProjectVM.SetOptimizePanel_Visibility(True) + ' Map.refCALCPanelVM.SetChooseMachine_Visibility(False) Return True End Function Private Function InitMACHINING() As Boolean - ' imposto dimensioni colonne/righe della Grid - DimensionsIniFile.ReadGridDimensions(ConstDims.PROJECT_OPTIMIZER, Map.refProjectVM.GridDims) - DimensionsIniFile.ReadGridDimensions(ConstDims.LEFTPANEL_OPTIMIZER, Map.refLeftPanelVM.GridDims) - ' inizializzo gruppi di lavorazione - If Not IsNothing(ProjectManagerVM.CurrProd) AndAlso Not IsNothing(ProjectManagerVM.CurrProd.nProdId) AndAlso ProjectManagerVM.CurrProd.nProdId > 0 Then - If File.Exists(ProjectManagerVM.CurrProd.sProdPath) Then - ' apro progetto - If ProjectManagerVM.CurrProd.bReloadProject OrElse Map.refConfigurationPageVM.QParametersModified Then - LoadingWndHelper.UpdateLoadingWnd(ActiveIds.GOTOPROD, 2, EgtMsg(63005), 10, 50) ' Loading parts - Map.refProdManagerVM.TempCurrProd = ProjectManagerVM.CurrProd - If Map.refSceneHostVM.MainController.OpenProject(ProjectManagerVM.CurrProd.sProdPath, False) Then - ' aggiorno le colonne in base al tipo progetto - Map.refRawPartListVM.UpdateColumns(Map.refProjectVM.BTLStructureVM.nPROJTYPE) - Map.refFeatureInPartInRawPartListVM.UpdateColumns(CurrentMachine.nType) - ' resetto modifica parametri Q default - Map.refConfigurationPageVM.ResetQParametersModified() - DbControllers.m_ProdController.LockByProdId(ProjectManagerVM.CurrProd.nProdId, True, Map.refMainWindowVM.MainWindowM.GetKeyNumber()) - Map.refProdManagerVM.NotifyPropertyChanged(NameOf(Map.refProdManagerVM.MruFileNames)) - End If - Else - LoadingWndHelper.UpdateLoadingWnd(ActiveIds.GOTOPROD, 2, EgtMsg(63005), 10, 30) ' Loading parts - ' mostro tutti i pezzi - Map.refShowBeamPanelVM.ShowAll(False) - ' verifico se il prod ha piu' proj - If ProjectManagerVM.CurrProd.nProjIdList.Count > 1 Then - ' se si rigenero BTLStructure - Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(0)) - ' carico filtri di ricerca - Map.refProjectVM.BTLStructureVM.LoadFilters() - End If - ' recupero indice di modifica progetto - Dim CommIndex As Integer = -1 - Dim ActiveSessionList As List(Of StatusMapModel) = DbControllers.m_StatusMapController.GetProd(m_SupervisorId) - For Each ActiveSession In ActiveSessionList - If ActiveSession.ItemId = ProjectManagerVM.CurrProd.nProdId Then - CommIndex = ActiveSession.Index - End If - Next - LoadingWndHelper.UpdateLoadingWnd(ActiveIds.GOTOPROD, 3, EgtMsg(63002), 30, 100) ' Loading machining groups - ' carico lista dei MachGroup - Map.refProjectVM.MachGroupPanelVM = New MyMachGroupPanelVM(MyMachGroupPanelM.CreateMyMachGroupPanel(Map.refMachinePanelVM.MachineList.ToList())) - ' fisso indice sessione di comunicazione - If CommIndex > -1 Then - ProjectManagerVM.CurrProd.SetModificationIndex(CommIndex) - End If - ProjectManagerVM.CurrProd.SetReloadProject(True) - End If - ' se Warehouse di tipo Medium e piu' di un progetto collegato - Dim nDefault As Integer = 2 - If GetMainPrivateProfileInt(S_WAREHOUSE, EgtBEAMWALL.Core.ConstIni.K_TYPE, nDefault) = WarehouseType.MEDIUM AndAlso ProjectManagerVM.CurrProd.nProjIdList.Count > 1 Then - ' confronto le Sezioni del BTL importato con quelle in Warehouse - WarehouseWndVM.UpdateSectionXMaterial() - End If - ' aggiorno titolo - Map.refMainWindowVM.UpdateTitle() - DbControllers.m_ProdController.LockByProdId(ProjectManagerVM.CurrProd.nProdId, True, Map.refMainWindowVM.MainWindowM.GetKeyNumber()) - ' controllo se devo lanciare verifica perche' importato - Dim bGetVerifyResult As Boolean = False - Dim bVerifyMach As Boolean = False - Dim nBTLInfoLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO) - While nBTLInfoLayerId <> GDB_ID.NULL - If EgtGetInfo(nBTLInfoLayerId, IMP_VERIFYMACHGROUP, bGetVerifyResult) AndAlso bGetVerifyResult Then - If Not bVerifyMach Then bVerifyMach = True - EgtSetInfo(nBTLInfoLayerId, IMP_VERIFYMACHGROUP, False) - End If - nBTLInfoLayerId = EgtGetNextName(nBTLInfoLayerId, BTLINFO) - End While - If bVerifyMach Then - Map.refCALCPanelVM.VerifyAll() - End If - ' seleziono prima barra - Map.refProjectVM.MachGroupPanelVM.SelFirstMachGroup() - Else - MessageBox.Show(EgtMsg(61871)) - End If - Else - Map.refSceneHostVM.MainController.NewProject() - Map.refProjectVM.BTLStructureVM = Nothing - Map.refProjectVM.MachGroupPanelVM = Nothing - End If - ' aggiorno lista possibili nesting - Map.refOptimizePanelVM.UpdateOriginTypeList(EgtGetFirstNameInGroup(GDB_ID.ROOT, "RawParts") <> GDB_ID.NULL) - ' aggiorno visibilita' degli elementi grafici - Map.refMainWindowVM.NotifyPropertyChanged(NameOf(Map.refMainWindowVM.nSelTabPage)) - Map.refMainMenuVM.NotifyPropertyChanged(NameOf(Map.refMainMenuVM.SendFeedbackIsEnabled)) - Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.ChangeParam_Visibility)) - Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.ChangeMaterial_Visibility)) - Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.Statistic_Visibility)) - Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.VisStatistic_Visibility)) - Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.OtStatistic_Visibility)) - Map.refProjectVM.SetBottomPanel_Visibility(False) - Map.refProjectVM.SetLeftPanel_Visibility(True) - If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.UpdateView() - If Not IsNothing(Map.refBTLPartManagerVM) Then Map.refBTLPartManagerVM.UpdateView() - Map.refProjectVM.SetFeatureManager_Visibility(False) - Map.refProjectVM.SetTopPanel_Visibility(True) - Map.refProjectVM.SetShowBeamPanel_Visibility(False) - Map.refProjectVM.SetProjManager_Visibility(False) - Map.refProjectVM.SetProdManager_Visibility(True) - Map.refProjectVM.SetOnlyProdManager_Visibility(False) - Map.refProjectVM.SetOnlyProdLeftPanel_Visibility(False) - Map.refProjectVM.SetOnlyProdOptimizePanel_Visibility(False) - Map.refProjectVM.NotifyAllPanelVisibility() - Map.refCALCPanelVM.SetChooseMachineBtn_Visibility(False) - Map.refRawPartManagerVM.UpdateMovePartInRawPartVisibility() - Map.refStatisticsTimePanelVM.SetStatisticsTimePanel_Visibility() - ' aggiorno la visibilità delle colonne - For Each col In Map.refFeatureListVM.FeatureColumns - col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) - Next - For Each col In Map.refRawPartListVM.RawPartColumns - col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) - Next - For Each col In Map.refFeatureInPartInRawPartListVM.FeatureInPartInRawPartColumns - col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) - Next - For Each col In Map.refPartInRawPartListVM.PartInRawPartColumns - col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) - Next - For Each col In Map.refStatisticsVM.OptimizerStatisticsColumns - col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) - Next - If Not IsNothing(Map.refFeatureListVM.colFeature_Do) Then - Map.refFeatureListVM.colFeature_Do.ColumnVisibility = Visibility.Collapsed - End If - Map.refProjectVM.SetOptimizePanel_Visibility(True) + ' ' imposto dimensioni colonne/righe della Grid + ' DimensionsIniFile.ReadGridDimensions(ConstDims.PROJECT_OPTIMIZER, Map.refProjectVM.GridDims) + ' DimensionsIniFile.ReadGridDimensions(ConstDims.LEFTPANEL_OPTIMIZER, Map.refLeftPanelVM.GridDims) + ' ' inizializzo gruppi di lavorazione + ' If Not IsNothing(ProjectManagerVM.CurrProd) AndAlso Not IsNothing(ProjectManagerVM.CurrProd.nProdId) AndAlso ProjectManagerVM.CurrProd.nProdId > 0 Then + ' If File.Exists(ProjectManagerVM.CurrProd.sProdPath) Then + ' ' apro progetto + ' If ProjectManagerVM.CurrProd.bReloadProject OrElse Map.refConfigurationPageVM.QParametersModified Then + ' LoadingWndHelper.UpdateLoadingWnd(ActiveIds.GOTOPROD, 2, EgtMsg(63005), 10, 50) ' Loading parts + ' Map.refProdManagerVM.TempCurrProd = ProjectManagerVM.CurrProd + ' If Map.refSceneHostVM.MainController.OpenProject(ProjectManagerVM.CurrProd.sProdPath, False) Then + ' ' aggiorno le colonne in base al tipo progetto + ' Map.refRawPartListVM.UpdateColumns(Map.refProjectVM.BTLStructureVM.nPROJTYPE) + ' Map.refFeatureInPartInRawPartListVM.UpdateColumns(CurrentMachine.nType) + ' ' resetto modifica parametri Q default + ' Map.refConfigurationPageVM.ResetQParametersModified() + ' DbControllers.m_ProdController.LockByProdId(ProjectManagerVM.CurrProd.nProdId, True, Map.refMainWindowVM.MainWindowM.GetKeyNumber()) + ' Map.refProdManagerVM.NotifyPropertyChanged(NameOf(Map.refProdManagerVM.MruFileNames)) + ' End If + ' Else + ' LoadingWndHelper.UpdateLoadingWnd(ActiveIds.GOTOPROD, 2, EgtMsg(63005), 10, 30) ' Loading parts + ' ' mostro tutti i pezzi + ' Map.refShowBeamPanelVM.ShowAll(False) + ' ' verifico se il prod ha piu' proj + ' If ProjectManagerVM.CurrProd.nProjIdList.Count > 1 Then + ' ' se si rigenero BTLStructure + ' Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(0)) + ' ' carico filtri di ricerca + ' Map.refProjectVM.BTLStructureVM.LoadFilters() + ' End If + ' ' recupero indice di modifica progetto + ' Dim CommIndex As Integer = -1 + ' Dim ActiveSessionList As List(Of StatusMapModel) = DbControllers.m_StatusMapController.GetProd(m_SupervisorId) + ' For Each ActiveSession In ActiveSessionList + ' If ActiveSession.ItemId = ProjectManagerVM.CurrProd.nProdId Then + ' CommIndex = ActiveSession.Index + ' End If + ' Next + ' LoadingWndHelper.UpdateLoadingWnd(ActiveIds.GOTOPROD, 3, EgtMsg(63002), 30, 100) ' Loading machining groups + ' ' carico lista dei MachGroup + ' Map.refProjectVM.MachGroupPanelVM = New MyMachGroupPanelVM(MyMachGroupPanelM.CreateMyMachGroupPanel(Map.refMachinePanelVM.MachineList.ToList())) + ' ' fisso indice sessione di comunicazione + ' If CommIndex > -1 Then + ' ProjectManagerVM.CurrProd.SetModificationIndex(CommIndex) + ' End If + ' ProjectManagerVM.CurrProd.SetReloadProject(True) + ' End If + ' ' se Warehouse di tipo Medium e piu' di un progetto collegato + ' Dim nDefault As Integer = 2 + ' If GetMainPrivateProfileInt(S_WAREHOUSE, EgtBEAMWALL.Core.ConstIni.K_TYPE, nDefault) = WarehouseType.MEDIUM AndAlso ProjectManagerVM.CurrProd.nProjIdList.Count > 1 Then + ' ' confronto le Sezioni del BTL importato con quelle in Warehouse + ' WarehouseWndVM.UpdateSectionXMaterial() + ' End If + ' ' aggiorno titolo + ' Map.refMainWindowVM.UpdateTitle() + ' DbControllers.m_ProdController.LockByProdId(ProjectManagerVM.CurrProd.nProdId, True, Map.refMainWindowVM.MainWindowM.GetKeyNumber()) + ' ' controllo se devo lanciare verifica perche' importato + ' Dim bGetVerifyResult As Boolean = False + ' Dim bVerifyMach As Boolean = False + ' Dim nBTLInfoLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO) + ' While nBTLInfoLayerId <> GDB_ID.NULL + ' If EgtGetInfo(nBTLInfoLayerId, IMP_VERIFYMACHGROUP, bGetVerifyResult) AndAlso bGetVerifyResult Then + ' If Not bVerifyMach Then bVerifyMach = True + ' EgtSetInfo(nBTLInfoLayerId, IMP_VERIFYMACHGROUP, False) + ' End If + ' nBTLInfoLayerId = EgtGetNextName(nBTLInfoLayerId, BTLINFO) + ' End While + ' If bVerifyMach Then + ' Map.refCALCPanelVM.VerifyAll() + ' End If + ' ' seleziono prima barra + ' Map.refProjectVM.MachGroupPanelVM.SelFirstMachGroup() + ' Else + ' MessageBox.Show(EgtMsg(61871)) + ' End If + ' Else + ' Map.refSceneHostVM.MainController.NewProject() + ' Map.refProjectVM.BTLStructureVM = Nothing + ' Map.refProjectVM.MachGroupPanelVM = Nothing + ' End If + ' ' aggiorno lista possibili nesting + ' Map.refOptimizePanelVM.UpdateOriginTypeList(EgtGetFirstNameInGroup(GDB_ID.ROOT, "RawParts") <> GDB_ID.NULL) + ' ' aggiorno visibilita' degli elementi grafici + ' Map.refMainWindowVM.NotifyPropertyChanged(NameOf(Map.refMainWindowVM.nSelTabPage)) + ' Map.refMainMenuVM.NotifyPropertyChanged(NameOf(Map.refMainMenuVM.SendFeedbackIsEnabled)) + ' Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.ChangeParam_Visibility)) + ' Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.ChangeMaterial_Visibility)) + ' Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.Statistic_Visibility)) + ' Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.VisStatistic_Visibility)) + ' Map.refInstrumentPanelVM.NotifyPropertyChanged(NameOf(Map.refInstrumentPanelVM.OtStatistic_Visibility)) + ' Map.refProjectVM.SetBottomPanel_Visibility(False) + ' Map.refProjectVM.SetLeftPanel_Visibility(True) + ' If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.UpdateView() + ' If Not IsNothing(Map.refBTLPartManagerVM) Then Map.refBTLPartManagerVM.UpdateView() + ' Map.refProjectVM.SetFeatureManager_Visibility(False) + ' Map.refProjectVM.SetTopPanel_Visibility(True) + ' Map.refProjectVM.SetShowBeamPanel_Visibility(False) + ' Map.refProjectVM.SetProjManager_Visibility(False) + ' Map.refProjectVM.SetProdManager_Visibility(True) + ' Map.refProjectVM.SetOnlyProdManager_Visibility(False) + ' Map.refProjectVM.SetOnlyProdLeftPanel_Visibility(False) + ' Map.refProjectVM.SetOnlyProdOptimizePanel_Visibility(False) + ' Map.refProjectVM.NotifyAllPanelVisibility() + ' Map.refCALCPanelVM.SetChooseMachineBtn_Visibility(False) + ' Map.refRawPartManagerVM.UpdateMovePartInRawPartVisibility() + ' Map.refStatisticsTimePanelVM.SetStatisticsTimePanel_Visibility() + ' ' aggiorno la visibilità delle colonne + ' For Each col In Map.refFeatureListVM.FeatureColumns + ' col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + ' Next + ' For Each col In Map.refRawPartListVM.RawPartColumns + ' col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + ' Next + ' For Each col In Map.refFeatureInPartInRawPartListVM.FeatureInPartInRawPartColumns + ' col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + ' Next + ' For Each col In Map.refPartInRawPartListVM.PartInRawPartColumns + ' col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + ' Next + ' For Each col In Map.refStatisticsVM.OptimizerStatisticsColumns + ' col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + ' Next + ' If Not IsNothing(Map.refFeatureListVM.colFeature_Do) Then + ' Map.refFeatureListVM.colFeature_Do.ColumnVisibility = Visibility.Collapsed + ' End If + ' Map.refProjectVM.SetOptimizePanel_Visibility(True) Return True End Function Private Function ExitMACHINING(bVerifyModification As Boolean) As Boolean - ' verifico se progetto modificato, e chiedo se salvare - If bVerifyModification Then - If ProdFileVM.VerifyProjectModification(ProjectManagerVM.CurrProd) = MessageBoxResult.Cancel Then - Return False - End If - End If - ' resetto eventuale visualizzazione statistiche - Map.refInstrumentPanelVM.ResetStatisticsIsChecked() - Map.refProjectVM.SetBottomPanel_Visibility(True) - Map.refProjectVM.SetLeftPanel_Visibility(False) - Map.refProjectVM.SetFeatureManager_Visibility(True) - Map.refProjectVM.SetTopPanel_Visibility(False) - Map.refProjectVM.SetShowBeamPanel_Visibility(True) - Map.refProjectVM.SetProjManager_Visibility(True) - Map.refProjectVM.SetProdManager_Visibility(False) - Map.refProjectVM.SetOnlyProdManager_Visibility(False) - Map.refProjectVM.SetOnlyProdLeftPanel_Visibility(False) - Map.refProjectVM.SetOnlyProdOptimizePanel_Visibility(False) - Map.refProjectVM.SetOptimizePanel_Visibility(Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NESTING_AUTO)) - Map.refCALCPanelVM.SetChooseMachine_Visibility(False) - EgtResetCurrMachGroup() + ' ' verifico se progetto modificato, e chiedo se salvare + ' If bVerifyModification Then + ' If ProdFileVM.VerifyProjectModification(ProjectManagerVM.CurrProd) = MessageBoxResult.Cancel Then + ' Return False + ' End If + ' End If + ' ' resetto eventuale visualizzazione statistiche + ' Map.refInstrumentPanelVM.ResetStatisticsIsChecked() + ' Map.refProjectVM.SetBottomPanel_Visibility(True) + ' Map.refProjectVM.SetLeftPanel_Visibility(False) + ' Map.refProjectVM.SetFeatureManager_Visibility(True) + ' Map.refProjectVM.SetTopPanel_Visibility(False) + ' Map.refProjectVM.SetShowBeamPanel_Visibility(True) + ' Map.refProjectVM.SetProjManager_Visibility(True) + ' Map.refProjectVM.SetProdManager_Visibility(False) + ' Map.refProjectVM.SetOnlyProdManager_Visibility(False) + ' Map.refProjectVM.SetOnlyProdLeftPanel_Visibility(False) + ' Map.refProjectVM.SetOnlyProdOptimizePanel_Visibility(False) + ' Map.refProjectVM.SetOptimizePanel_Visibility(Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NESTING_AUTO)) + ' Map.refCALCPanelVM.SetChooseMachine_Visibility(False) + ' EgtResetCurrMachGroup() Return True End Function @@ -570,15 +570,11 @@ Public Class MainMenuVM ' aggiorno lista possibili nesting Map.refOptimizePanelVM.UpdateOriginTypeList(EgtGetFirstNameInGroup(GDB_ID.ROOT, "RawParts") <> GDB_ID.NULL) ' aggiorno visibilita' degli elementi grafici - Map.refProjectVM.SetBottomPanel_Visibility(True) - Map.refProjectVM.SetLeftPanel_Visibility(False) Map.refProjectVM.SetFeatureManager_Visibility(True) - Map.refProjectVM.SetTopPanel_Visibility(True) Map.refProjectVM.SetShowBeamPanel_Visibility(True) Map.refProjectVM.SetOnlyProdManager_Visibility(True) Map.refProjectVM.SetOnlyProdLeftPanel_Visibility(True) Map.refProjectVM.SetOnlyProdOptimizePanel_Visibility(True) - Map.refProjectVM.SetOptimizePanel_Visibility(True) Map.refProjectVM.NotifyAllPanelVisibility() Map.refCALCPanelVM.SetChooseMachineBtn_Visibility(Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE AndAlso Map.refMachinePanelVM.MachineList.Count > 1 AndAlso GetMainPrivateProfileInt(S_MACH, K_CHANGEMACH, 0) = 1) Map.refRawPartManagerVM.UpdateMovePartInRawPartVisibility() @@ -690,17 +686,11 @@ Public Class MainMenuVM End If ' resetto eventuale visualizzazione statistiche Map.refInstrumentPanelVM.ResetStatisticsIsChecked() - Map.refProjectVM.SetBottomPanel_Visibility(False) - Map.refProjectVM.SetLeftPanel_Visibility(True) Map.refProjectVM.SetFeatureManager_Visibility(False) - Map.refProjectVM.SetTopPanel_Visibility(False) Map.refProjectVM.SetShowBeamPanel_Visibility(False) - Map.refProjectVM.SetProjManager_Visibility(False) - Map.refProjectVM.SetProdManager_Visibility(False) Map.refProjectVM.SetOnlyProdManager_Visibility(False) Map.refProjectVM.SetOnlyProdLeftPanel_Visibility(False) Map.refProjectVM.SetOnlyProdOptimizePanel_Visibility(False) - Map.refProjectVM.SetOptimizePanel_Visibility(True) Map.refCALCPanelVM.SetChooseMachine_Visibility(False) EgtResetCurrMachGroup() Return True diff --git a/EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb index adbafc23..a4f744eb 100644 --- a/EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb +++ b/EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb @@ -88,33 +88,33 @@ Public Class MainWindowVM Public Sub UpdateTitle() m_Title = "" Select Case Map.refMainMenuVM.SelPage - Case Pages.VIEW - If GetMainPrivateProfileInt(S_GENERAL, K_PROJECTMODE, 0) = 1 Then - If Not IsNothing(ProjectManagerVM.CurrProj) Then - If ProjectManagerVM.CurrProj.bIsNew Then m_Title = "New - " - If Not IsNothing(ProjectManagerVM.CurrProj.nProdId) AndAlso ProjectManagerVM.CurrProj.nProdId > 0 Then - m_Title &= ProjectManagerVM.CurrProj.nProdId.ToString("0000") & " - " - End If - m_Title &= ProjectManagerVM.CurrProj.sBTLFileName - End If - Else - If Not IsNothing(ProjectManagerVM.CurrProj) Then - If ProjectManagerVM.CurrProj.bIsNew Then m_Title = "New - " - m_Title &= ProjectManagerVM.CurrProj.nProjId.ToString("0000") & " - " & ProjectManagerVM.CurrProj.sBTLFileName - End If - End If - Case Pages.MACHINING - If GetMainPrivateProfileInt(S_GENERAL, K_PROJECTMODE, 0) = 1 Then - If Not IsNothing(ProjectManagerVM.CurrProd) Then - If ProjectManagerVM.CurrProd.bIsNew Then m_Title = "New - " - m_Title &= ProjectManagerVM.CurrProd.nProdId.ToString("0000") & " - " & ProjectManagerVM.CurrProd.sName - End If - Else - If Not IsNothing(ProjectManagerVM.CurrProd) Then - If ProjectManagerVM.CurrProd.bIsNew Then m_Title = "New - " - m_Title &= ProjectManagerVM.CurrProd.nProdId.ToString("0000") & " - " & ProjectManagerVM.CurrProd.sBTLFileName - End If - End If + 'Case Pages.VIEW + ' If GetMainPrivateProfileInt(S_GENERAL, K_PROJECTMODE, 0) = 1 Then + ' If Not IsNothing(ProjectManagerVM.CurrProj) Then + ' If ProjectManagerVM.CurrProj.bIsNew Then m_Title = "New - " + ' If Not IsNothing(ProjectManagerVM.CurrProj.nProdId) AndAlso ProjectManagerVM.CurrProj.nProdId > 0 Then + ' m_Title &= ProjectManagerVM.CurrProj.nProdId.ToString("0000") & " - " + ' End If + ' m_Title &= ProjectManagerVM.CurrProj.sBTLFileName + ' End If + ' Else + ' If Not IsNothing(ProjectManagerVM.CurrProj) Then + ' If ProjectManagerVM.CurrProj.bIsNew Then m_Title = "New - " + ' m_Title &= ProjectManagerVM.CurrProj.nProjId.ToString("0000") & " - " & ProjectManagerVM.CurrProj.sBTLFileName + ' End If + ' End If + 'Case Pages.MACHINING + ' If GetMainPrivateProfileInt(S_GENERAL, K_PROJECTMODE, 0) = 1 Then + ' If Not IsNothing(ProjectManagerVM.CurrProd) Then + ' If ProjectManagerVM.CurrProd.bIsNew Then m_Title = "New - " + ' m_Title &= ProjectManagerVM.CurrProd.nProdId.ToString("0000") & " - " & ProjectManagerVM.CurrProd.sName + ' End If + ' Else + ' If Not IsNothing(ProjectManagerVM.CurrProd) Then + ' If ProjectManagerVM.CurrProd.bIsNew Then m_Title = "New - " + ' m_Title &= ProjectManagerVM.CurrProd.nProdId.ToString("0000") & " - " & ProjectManagerVM.CurrProd.sBTLFileName + ' End If + ' End If Case Pages.CONFIG m_Title = "Configuration Page" Case Pages.ONLYPRODPAGE diff --git a/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb b/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb index e818e090..87605192 100644 --- a/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb +++ b/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb @@ -58,51 +58,51 @@ Public Class ProjectVM End Property Private m_bLockUX As Boolean = False - Private m_LeftPanel_Visibility As Boolean = True - Public Property LeftPanel_Visibility As Visibility - Get - Return If(m_LeftPanel_Visibility, Visibility.Visible, Visibility.Collapsed) - End Get - Set(value As Visibility) - m_LeftPanel_Visibility = (value = Visibility.Visible) - End Set - End Property - Friend Sub SetLeftPanel_Visibility(IsVisible As Boolean) - m_LeftPanel_Visibility = IsVisible - End Sub + 'Private m_LeftPanel_Visibility As Boolean = True + 'Public Property LeftPanel_Visibility As Visibility + ' Get + ' Return If(m_LeftPanel_Visibility, Visibility.Visible, Visibility.Collapsed) + ' End Get + ' Set(value As Visibility) + ' m_LeftPanel_Visibility = (value = Visibility.Visible) + ' End Set + 'End Property + 'Friend Sub SetLeftPanel_Visibility(IsVisible As Boolean) + ' m_LeftPanel_Visibility = IsVisible + 'End Sub - Private m_TopPanel_Visibility As Boolean = False - Public Property TopPanel_Visibility As Visibility - Get - Return If(m_TopPanel_Visibility, Visibility.Visible, Visibility.Collapsed) - End Get - Set(value As Visibility) - m_TopPanel_Visibility = (value = Visibility.Visible) - End Set - End Property - Friend Sub SetTopPanel_Visibility(IsVisible As Boolean) - m_TopPanel_Visibility = IsVisible - End Sub + 'Private m_TopPanel_Visibility As Boolean = False + 'Public Property TopPanel_Visibility As Visibility + ' Get + ' Return If(m_TopPanel_Visibility, Visibility.Visible, Visibility.Collapsed) + ' End Get + ' Set(value As Visibility) + ' m_TopPanel_Visibility = (value = Visibility.Visible) + ' End Set + 'End Property + 'Friend Sub SetTopPanel_Visibility(IsVisible As Boolean) + ' m_TopPanel_Visibility = IsVisible + 'End Sub - Private m_BottomPanel_Visibility As Boolean = True - Public Property BottomPanel_Visibility As Visibility - Get - Return If(m_BottomPanel_Visibility, Visibility.Visible, Visibility.Collapsed) - End Get - Set(value As Visibility) - m_BottomPanel_Visibility = (value = Visibility.Visible) - End Set - End Property - Friend Sub SetBottomPanel_Visibility(IsVisible As Boolean) - m_BottomPanel_Visibility = IsVisible - End Sub + 'Private m_BottomPanel_Visibility As Boolean = True + 'Public Property BottomPanel_Visibility As Visibility + ' Get + ' Return If(m_BottomPanel_Visibility, Visibility.Visible, Visibility.Collapsed) + ' End Get + ' Set(value As Visibility) + ' m_BottomPanel_Visibility = (value = Visibility.Visible) + ' End Set + 'End Property + 'Friend Sub SetBottomPanel_Visibility(IsVisible As Boolean) + ' m_BottomPanel_Visibility = IsVisible + 'End Sub - Private m_PartManager_Visibility As Boolean = True - Public ReadOnly Property PartManager_Visibility As Visibility - Get - Return If(Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.SelectionType = BTLStructureVM.SelectionTypes.SELECT_ AndAlso Not Map.refFreeContourManagerVM.bIsActive, Visibility.Visible, Visibility.Collapsed) - End Get - End Property + 'Private m_PartManager_Visibility As Boolean = True + 'Public ReadOnly Property PartManager_Visibility As Visibility + ' Get + ' Return If(Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.SelectionType = BTLStructureVM.SelectionTypes.SELECT_ AndAlso Not Map.refFreeContourManagerVM.bIsActive, Visibility.Visible, Visibility.Collapsed) + ' End Get + 'End Property Private m_FeatureManager_Visibility As Boolean = True Public Property FeatureManager_Visibility As Visibility @@ -130,53 +130,53 @@ Public Class ProjectVM m_ShowBeamPanel_Visibility = IsVisible End Sub - Private m_ProjManager_Visibility As Boolean = True - Public Property ProjManager_Visibility As Visibility - Get - Return If(m_ProjManager_Visibility, Visibility.Visible, Visibility.Collapsed) - End Get - Set(value As Visibility) - m_ProjManager_Visibility = (value = Visibility.Visible) - End Set - End Property - Friend Sub SetProjManager_Visibility(IsVisible As Boolean) - m_ProjManager_Visibility = IsVisible - If Not IsNothing(Map.refProjManagerVM) Then Map.refProjManagerVM.NotifyPropertyChanged(NameOf(Map.refProjManagerVM.GoToProd_Visibility)) - End Sub + 'Private m_ProjManager_Visibility As Boolean = True + 'Public Property ProjManager_Visibility As Visibility + ' Get + ' Return If(m_ProjManager_Visibility, Visibility.Visible, Visibility.Collapsed) + ' End Get + ' Set(value As Visibility) + ' m_ProjManager_Visibility = (value = Visibility.Visible) + ' End Set + 'End Property + 'Friend Sub SetProjManager_Visibility(IsVisible As Boolean) + ' m_ProjManager_Visibility = IsVisible + ' If Not IsNothing(Map.refProjManagerVM) Then Map.refProjManagerVM.NotifyPropertyChanged(NameOf(Map.refProjManagerVM.GoToProd_Visibility)) + 'End Sub - Private m_ProdManager_Visibility As Boolean = True - Public Property ProdManager_Visibility As Visibility - Get - Return If(m_ProdManager_Visibility, Visibility.Visible, Visibility.Collapsed) - End Get - Set(value As Visibility) - m_ProdManager_Visibility = (value = Visibility.Visible) - End Set - End Property - Friend Sub SetProdManager_Visibility(IsVisible As Boolean) - m_ProdManager_Visibility = IsVisible - If Not IsNothing(Map.refProdManagerVM) Then Map.refProdManagerVM.NotifyPropertyChanged(NameOf(Map.refProdManagerVM.GoToProj_Visibility)) - End Sub + 'Private m_ProdManager_Visibility As Boolean = True + 'Public Property ProdManager_Visibility As Visibility + ' Get + ' Return If(m_ProdManager_Visibility, Visibility.Visible, Visibility.Collapsed) + ' End Get + ' Set(value As Visibility) + ' m_ProdManager_Visibility = (value = Visibility.Visible) + ' End Set + 'End Property + 'Friend Sub SetProdManager_Visibility(IsVisible As Boolean) + ' m_ProdManager_Visibility = IsVisible + ' If Not IsNothing(Map.refProdManagerVM) Then Map.refProdManagerVM.NotifyPropertyChanged(NameOf(Map.refProdManagerVM.GoToProj_Visibility)) + 'End Sub - Private m_OptimizePanel_Visibility As Boolean = True - Public Property OptimizePanel_Visibility As Visibility - Get - Return If(m_OptimizePanel_Visibility, Visibility.Visible, Visibility.Collapsed) - End Get - Set(value As Visibility) - m_OptimizePanel_Visibility = (value = Visibility.Visible) - End Set - End Property - Friend Sub SetOptimizePanel_Visibility(IsVisible As Boolean) - m_OptimizePanel_Visibility = IsVisible - NotifyPropertyChanged(NameOf(OptimizePanel_Visibility)) - Map.refOptimizePanelVM.NotifyPropertyChanged(NameOf(Map.refOptimizePanelVM.CalcRotFlip_Visibility)) - Map.refOptimizePanelVM.NotifyPropertyChanged(NameOf(Map.refOptimizePanelVM.Optimize_Visibility)) - Map.refOptimizePanelVM.NotifyPropertyChanged(NameOf(Map.refOptimizePanelVM.OriginType_Visibility)) - Map.refOptimizePanelVM.NotifyPropertyChanged(NameOf(Map.refOptimizePanelVM.ViewPage_Visibility)) - Map.refOptimizePanelVM.NotifyPropertyChanged(NameOf(Map.refOptimizePanelVM.MachiningPage_Visibility)) - Map.refOptimizePanelVM.NotifyPropertyChanged(NameOf(Map.refOptimizePanelVM.NestingOption_Visibility)) - End Sub + 'Private m_OptimizePanel_Visibility As Boolean = True + 'Public Property OptimizePanel_Visibility As Visibility + ' Get + ' Return If(m_OptimizePanel_Visibility, Visibility.Visible, Visibility.Collapsed) + ' End Get + ' Set(value As Visibility) + ' m_OptimizePanel_Visibility = (value = Visibility.Visible) + ' End Set + 'End Property + 'Friend Sub SetOptimizePanel_Visibility(IsVisible As Boolean) + ' m_OptimizePanel_Visibility = IsVisible + ' NotifyPropertyChanged(NameOf(OptimizePanel_Visibility)) + ' Map.refOptimizePanelVM.NotifyPropertyChanged(NameOf(Map.refOptimizePanelVM.CalcRotFlip_Visibility)) + ' Map.refOptimizePanelVM.NotifyPropertyChanged(NameOf(Map.refOptimizePanelVM.Optimize_Visibility)) + ' Map.refOptimizePanelVM.NotifyPropertyChanged(NameOf(Map.refOptimizePanelVM.OriginType_Visibility)) + ' Map.refOptimizePanelVM.NotifyPropertyChanged(NameOf(Map.refOptimizePanelVM.ViewPage_Visibility)) + ' Map.refOptimizePanelVM.NotifyPropertyChanged(NameOf(Map.refOptimizePanelVM.MachiningPage_Visibility)) + ' Map.refOptimizePanelVM.NotifyPropertyChanged(NameOf(Map.refOptimizePanelVM.NestingOption_Visibility)) + 'End Sub Friend Sub NotifyCalcPanel_Visibility() 'Map.refCALCPanelVM.NotifyPropertyChanged(NameOf(Map.refCALCPanelVM.ViewPage_Visibility)) @@ -507,14 +507,14 @@ Public Class ProjectVM End Sub Friend Sub NotifyAllPanelVisibility() - NotifyPropertyChanged(NameOf(LeftPanel_Visibility)) - NotifyPropertyChanged(NameOf(TopPanel_Visibility)) - NotifyPropertyChanged(NameOf(BottomPanel_Visibility)) - NotifyPropertyChanged(NameOf(PartManager_Visibility)) + 'NotifyPropertyChanged(NameOf(LeftPanel_Visibility)) + 'NotifyPropertyChanged(NameOf(TopPanel_Visibility)) + 'NotifyPropertyChanged(NameOf(BottomPanel_Visibility)) + 'NotifyPropertyChanged(NameOf(PartManager_Visibility)) NotifyPropertyChanged(NameOf(FeatureManager_Visibility)) NotifyPropertyChanged(NameOf(ShowBeamPanel_Visibility)) - NotifyPropertyChanged(NameOf(ProjManager_Visibility)) - NotifyPropertyChanged(NameOf(ProdManager_Visibility)) + 'NotifyPropertyChanged(NameOf(ProjManager_Visibility)) + 'NotifyPropertyChanged(NameOf(ProdManager_Visibility)) NotifyCalcPanel_Visibility() End Sub