-pulizia codice

EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb

@@ -33,11 +33,11 @@ Public Class BTLPartManagerVM
       End Get
    End Property
 
-   'Public ReadOnly Property RotatePart_IsEnabled As Boolean
-   '   Get
-   '      Return m_BTLPartManager_IsEnabled AndAlso Not IsNothing(Map.refProjectVM) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.SelBTLParts.Count > 1
-   '   End Get
-   'End Property
+   Public ReadOnly Property RotatePart_IsEnabled As Boolean
+      Get
+         Return m_BTLPartManager_IsEnabled AndAlso Not IsNothing(Map.refProjectVM) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.SelBTLParts.Count > 1
+      End Get
+   End Property
 
    Public ReadOnly Property RemovePart_IsEnabled As Boolean
       Get
@@ -291,120 +291,6 @@ Public Class BTLPartManagerVM
 
 #End Region    ' RemovePart
 
-   '#Region "Invert"
-
-   '   ''' <summary>
-   '   ''' Returns a command that do Exec.
-   '   ''' </summary>
-   '   Public ReadOnly Property Invert_Command As ICommand
-   '      Get
-   '         If m_cmdInvert Is Nothing Then
-   '            m_cmdInvert = New Command(AddressOf Invert)
-   '         End If
-   '         Return m_cmdInvert
-   '      End Get
-   '   End Property
-
-   '   ''' <summary>
-   '   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   '   ''' </summary>
-   '   Public Sub Invert()
-   '      If ((Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE) AndAlso IsNothing(ProjectManagerVM.CurrProj)) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) Then Return
-   '      ' se modalita' assemblato
-   '      Dim bShowBuilding As Boolean = Map.refShowBeamPanelVM.ShowBuilding_IsChecked
-   '      Configuration.AssembledMode(bShowBuilding)
-   '      ' inverto i pezzi selezionati
-   '      For Each Part In Map.refProjectVM.BTLStructureVM.SelBTLParts
-   '         Part.Invert()
-   '      Next
-   '      ' se assemblato lo ripristino
-   '      If bShowBuilding Then Map.refProjectVM.BTLStructureVM.ShowBuilding(True, False)
-   '   End Sub
-
-   '#End Region    ' Invert
-
-   '#Region "BackRotation"
-
-   '   ''' <summary>
-   '   ''' Returns a command that do Exec.
-   '   ''' </summary>
-   '   Public ReadOnly Property BackRotation_Command As ICommand
-   '      Get
-   '         If m_cmdBackRotation Is Nothing Then
-   '            m_cmdBackRotation = New Command(AddressOf BackRotation)
-   '         End If
-   '         Return m_cmdBackRotation
-   '      End Get
-   '   End Property
-
-   '   ''' <summary>
-   '   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   '   ''' </summary>
-   '   Public Sub BackRotation()
-   '      If IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) Then Return
-   '      ' salvo sezione impostata
-   '      Dim CurrSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SelSection
-   '      ' se modalita' assemblato
-   '      Dim bShowBuilding As Boolean = Map.refShowBeamPanelVM.ShowBuilding_IsChecked
-   '      Configuration.AssembledMode(bShowBuilding)
-   '      ' ruoto i pezzi selezionati
-   '      For Each Part In Map.refProjectVM.BTLStructureVM.SelBTLParts
-   '         Part.BackRotation(False, False)
-   '      Next
-   '      ' se assemblato lo ripristino
-   '      If bShowBuilding Then Map.refProjectVM.BTLStructureVM.ShowBuilding(True, False)
-   '      ' se progetto travi e sezione precedente diversa da vuota (tutti i pezzi)
-   '      If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM AndAlso CurrSection <> SectionXMaterial.Empty Then
-   '         ' se esiste, imposto sezione inversa
-   '         Dim InverseSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x.dH = CurrSection.dW AndAlso x.dW = CurrSection.dH AndAlso x.sMaterial(0) = CurrSection.sMaterial(0))
-   '         If Not IsNothing(InverseSection) Then Map.refProjectVM.BTLStructureVM.SetSelSection(InverseSection)
-   '      End If
-   '      EgtDraw()
-   '   End Sub
-
-   '#End Region    ' BackRotation
-
-   '#Region "ForwardRotation"
-
-   '   ''' <summary>
-   '   ''' Returns a command that do Exec.
-   '   ''' </summary>
-   '   Public ReadOnly Property ForwardRotation_Command As ICommand
-   '      Get
-   '         If m_cmdForwardRotation Is Nothing Then
-   '            m_cmdForwardRotation = New Command(AddressOf ForwardRotation)
-   '         End If
-   '         Return m_cmdForwardRotation
-   '      End Get
-   '   End Property
-
-   '   ''' <summary>
-   '   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   '   ''' </summary>
-   '   Public Sub ForwardRotation()
-   '      If IsNothing(ProjectManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) Then Return
-   '      ' salvo sezione impostata
-   '      Dim CurrSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SelSection
-   '      ' se modalita' assemblato
-   '      Dim bShowBuilding As Boolean = Map.refShowBeamPanelVM.ShowBuilding_IsChecked
-   '      Configuration.AssembledMode(bShowBuilding)
-   '      ' ruoto i pezzi selezionati
-   '      For Each Part In Map.refProjectVM.BTLStructureVM.SelBTLParts
-   '         Part.ForwardRotation(False, False)
-   '      Next
-   '      ' se assemblato lo ripristino
-   '      If bShowBuilding Then Map.refProjectVM.BTLStructureVM.ShowBuilding(True, False)
-   '      ' se progetto travi e sezione precedente diversa da vuota (tutti i pezzi)
-   '      If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM AndAlso CurrSection <> SectionXMaterial.Empty Then
-   '         ' se esiste, imposto sezione inversa
-   '         Dim InverseSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x.dH = CurrSection.dW AndAlso x.dW = CurrSection.dH AndAlso x.sMaterial(0) = CurrSection.sMaterial(0))
-   '         If Not IsNothing(InverseSection) Then Map.refProjectVM.BTLStructureVM.SetSelSection(InverseSection)
-   '      End If
-   '      EgtDraw()
-   '   End Sub
-
-   '#End Region    ' ForwardRotation
-
 #Region "SimulateCommand"
 
    ''' <summary>

EgtBEAMWALL.Optimizer/BTLPartManager/OnlyProdBTLPartManagerV.xaml

@@ -5,14 +5,12 @@
             Style="{StaticResource OnlyProdBTLPartManager_StackPanel}">
    
    <Button Command="{Binding CopyPart_Command}"
-           Visibility="{Binding ViewPage_Visibility}"
            ToolTip="{Binding CopyPart_ToolTip}"
            IsEnabled="{Binding CopyPart_IsEnabled}"
            Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/LeftPanel/CopyPart.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding RemovePart_Command}"
-           Visibility="{Binding ViewPage_Visibility}"
            ToolTip="{Binding RemovePart_ToolTip}"
            IsEnabled="{Binding RemovePart_IsEnabled}"
            Style="{StaticResource OnlyProdLeftPanel_Button}">
@@ -27,7 +25,6 @@
    <Button ToolTip="{Binding Edit_ToolTip}"
            Command="{Binding Edit_Command}"
            IsEnabled="{Binding Edit_IsEnabled}"
-           Visibility="{Binding Edit_Visibility}"
            Style="{StaticResource OnlyProdLeftPanel_Button}">
       <Image Source="/Resources/CALCPanel/Edit.png" Stretch="Uniform"/>
    </Button>

EgtBEAMWALL.Optimizer/BTLViewModel/BTLStructureVM.vb

@@ -109,7 +109,6 @@ Public Class BTLStructureVM
       ' aggiornamento grafica
       Configuration.UpdateGraphics()
       If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.FeatureSelectionChanged()
-      Map.refCALCPanelVM.SetIsEnabledForSelPart()
    End Sub
 
    Private m_SelBTLParts As New PartsObservableCollection(Of BTLPartVM)
@@ -148,21 +147,6 @@ Public Class BTLStructureVM
 
    Public Sub SelectBTLPart(BtlPart As BTLPartVM)
       m_SelBTLPart = BtlPart
-      'm_SelBTLPart.SetIsSettingBtnOpen(False)
-      'If Map.refMainMenuVM.SelPage = Pages.VIEW Then
-      'ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
-      '   '' resetto gruppo di lavorazione corrente
-      '   'EgtResetCurrMachGroup()
-      '   'EgtBeamShowFacesName(False)
-      '   'EgtBeamShowLoadingSide(False, False)
-      '   '' trovo ed evidenzio MachGroup e Duplo di questo pezzo
-      '   'Configuration.SetSearchPiece(BtlPart.nPartId)
-      '   '' seleziono pezzo nella scena
-      '   'SceneSelPartSelection()
-      '   'Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
-      '   'EgtZoom(ZM.ALL)
-      'ElseIf Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
-      'End If
       If Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
          ' resetto gruppo di lavorazione corrente
          EgtResetCurrMachGroup()
@@ -293,49 +277,6 @@ Public Class BTLStructureVM
          BtlPart.SetOpenFeatureList(False)
       End If
    End Sub
-   'Private Sub HighlightBTLPart(BtlPart As BTLPartVM)
-   '   EgtSetMark(BtlPart.nPartId)
-   '   ' se modalità building
-   '   If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
-   '      ' evidenzio anche copie
-   '      Dim nNextPartId As Integer = EgtGetNext(BtlPart.nPartId)
-   '      While nNextPartId <> GDB_ID.NULL
-   '         Dim nOrigId As Integer = GDB_ID.NULL
-   '         If EgtGetInfo(nNextPartId, "!COP", nOrigId) AndAlso nOrigId <> GDB_ID.NULL AndAlso nOrigId = BtlPart.nPartId Then
-   '            EgtSetMark(nNextPartId)
-   '         Else
-   '            Exit While
-   '         End If
-   '         nNextPartId = EgtGetNext(nNextPartId)
-   '      End While
-   '   End If
-   '   If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
-   '      ' trovo ed evidenzio MachGroup e Duplo di questo pezzo
-   '      Configuration.SetSearchPiece(BtlPart.nPartId)
-   '   End If
-   '   EgtDraw()
-   'End Sub
-   'Private Sub DeHighlightBTLPart(BtlPart As BTLPartVM, Optional bDraw As Boolean = True)
-   '   EgtResetMark(BtlPart.nPartId)
-   '   ' se modalità building
-   '   If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
-   '      ' deevidenzio anche copie
-   '      Dim nNextPartId As Integer = EgtGetNext(BtlPart.nPartId)
-   '      While nNextPartId <> GDB_ID.NULL
-   '         Dim nOrigId As Integer = GDB_ID.NULL
-   '         If EgtGetInfo(nNextPartId, "!COP", nOrigId) AndAlso nOrigId <> GDB_ID.NULL AndAlso nOrigId = BtlPart.nPartId Then
-   '            EgtResetMark(nNextPartId)
-   '         Else
-   '            Exit While
-   '         End If
-   '         nNextPartId = EgtGetNext(nNextPartId)
-   '      End While
-   '   End If
-   '   ' deevidenzio MachGroup e Duplo di questo pezzo
-   '   Configuration.ResetSearchPiece(BtlPart.nPartId)
-   '   ' seleziono pagina BottomPanel
-   '   If bDraw Then EgtDraw()
-   'End Sub
 
    Private m_SelBTLPart As BTLPartVM = Nothing
    Public Property SelBTLPart As BTLPartVM
@@ -343,52 +284,7 @@ Public Class BTLStructureVM
          Return m_SelBTLPart
       End Get
       Set(value As BTLPartVM)
-         'If Map.refMainMenuVM.SelPage = Pages.MACHINING Or (Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE And Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP) AndAlso
-         '   Not IsNothing(value) Then
-         '   ' resetto gruppo di lavorazione corrente
-         '   EgtResetCurrMachGroup()
-         '   If value IsNot m_SelBTLPart Then
-         '      If m_SelBTLPart.bOpenFeatureList Then
-         '         m_SelBTLPart.SetOpenFeatureList(False)
-         '      End If
-         '      value.SetOpenFeatureList(True)
-         '   Else
-         '      m_SelBTLPart.SetOpenFeatureList(m_SelBTLPart.bOpenFeatureList)
-         '   End If
-         'End If
-         'If Not IsNothing(m_SelBTLPart) Then
-         '   ' se necessario tolgo solido dal precedentemente selezionato
-         '   Configuration.DeselectSolid()
-         '   ' disabilito eventuale feature selezionata 
-         '   If Not IsNothing(m_SelBTLPart.m_SelBTLFeatureVM) Then m_SelBTLPart.SelBTLFeatureVM = Nothing
-         'End If
          m_SelBTLPart = value
-         '' se seleziono un pezzo
-         'If Not IsNothing(m_SelBTLPart) Then
-         '   If Map.refMainMenuVM.SelPage = Pages.VIEW OrElse Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
-         '      ' se modalità building, la tolgo
-         '      If Map.refShowBeamPanelVM.ShowBuilding_IsChecked Then
-         '         ShowBuilding(False, False)
-         '      End If
-         '      ' seleziono pezzo nella scena
-         '      SceneSelPartSelection()
-         '      ' seleziono pezzo in Db geometrico
-         '      EgtBeamSetPart(m_SelBTLPart.nPartId)
-         '      ' deseleziono le feature
-         '      If Not IsNothing(m_SelBTLPart.SelBTLFeatureVM) Then SelBTLPart.SelBTLFeatureVM = Nothing
-         '      ' aggiorno stato selezionato tutto
-         '      Map.refShowBeamPanelVM.bShowAll = False
-         '      Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
-         '      EgtZoom(ZM.ALL)
-         '   ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
-         '      ' trovo ed evidenzio MachGroup e Duplo di questo pezzo
-         '      Configuration.SetSearchPiece(m_SelBTLPart.nPartId)
-         '      ' seleziono pezzo nella scena
-         '      SceneSelPartSelection()
-         '      Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
-         '      EgtZoom(ZM.ALL)
-         '   End If
-         'End If
          NotifyPropertyChanged(NameOf(SelBTLPart))
       End Set
    End Property

EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb

@@ -110,75 +110,12 @@ Public Class CALCPanelVM
       End Set
    End Property
 
-   'Public ReadOnly Property ViewPage_Visibility As Visibility
-   '   Get
-   '      Return If(Map.refMainMenuVM.SelPage = Pages.VIEW, Visibility.Visible, Visibility.Collapsed)
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property Edit_Visibility As Visibility
-   '   Get
-   '      Return If(Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso GetMainPrivateProfileInt(S_GENERAL, K_ENABLEEDIT, 0) = 1, Visibility.Visible, Visibility.Collapsed)
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property Verify_IsEnabled As Boolean
-   '   Get
-   '      Return If(Map.refMainMenuVM.SelPage = Pages.VIEW,
-   '                m_CALCPanel_IsEnabled AndAlso Not Map.refShowBeamPanelVM.bShowAll AndAlso
-   '                Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Not Map.refProjectVM.BTLStructureVM.SelBTLPartsCnt > 1,
-   '                m_CALCPanel_IsEnabled)
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property Simulate_IsEnabled As Boolean
-   '   Get
-   '      Return If(Map.refMainMenuVM.SelPage = Pages.VIEW,
-   '                m_CALCPanel_IsEnabled And Not Map.refShowBeamPanelVM.bShowAll AndAlso
-   '                Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Not Map.refProjectVM.BTLStructureVM.SelBTLPartsCnt > 1,
-   '                m_CALCPanel_IsEnabled)
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property Edit_IsEnabled As Boolean
-   '   Get
-   '      Return If(Map.refMainMenuVM.SelPage = Pages.VIEW,
-   '                m_CALCPanel_IsEnabled And Not Map.refShowBeamPanelVM.bShowAll AndAlso
-   '                Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Not Map.refProjectVM.BTLStructureVM.SelBTLPartsCnt > 1,
-   '                True)
-   '   End Get
-   'End Property
-
    ' Definizione comandi
    Private m_cmdChooseMachine As ICommand
    Private m_cmdOk As ICommand
 
 #Region "Messages"
 
-   'Public ReadOnly Property Verify_ToolTip As String
-   '   Get
-   '      Return EgtMsg(61901)
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property VerifyAll_ToolTip As String
-   '   Get
-   '      Return EgtMsg(61928)
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property Simulate_ToolTip As String
-   '   Get
-   '      Return EgtMsg(61902)
-   '   End Get
-   'End Property
-
-   'Public ReadOnly Property Edit_ToolTip As String
-   '   Get
-   '      Return EgtMsg(61939)
-   '   End Get
-   'End Property
-
    Public ReadOnly Property ResetCalc_ToolTip As String
       Get
          Return EgtMsg(61940)
@@ -210,28 +147,6 @@ Public Class CALCPanelVM
 
 #Region "METHODS"
 
-   Friend Sub SetCalcPanelIsEnabled(bIsEnabled As Boolean)
-      'm_CALCPanel_IsEnabled = bIsEnabled
-      'm_VerifyAll_IsEnabled = bIsEnabled
-      'NotifyPropertyChanged(NameOf(CALCPanel_IsEnabled))
-      'NotifyPropertyChanged(NameOf(VerifyAll_IsEnabled))
-      'NotifyPropertyChanged(NameOf(Verify_IsEnabled))
-      'NotifyPropertyChanged(NameOf(Simulate_IsEnabled))
-      'NotifyPropertyChanged(NameOf(Edit_IsEnabled))
-   End Sub
-   Friend Sub SetIsEnabledForSelPart()
-      'NotifyPropertyChanged(NameOf(Verify_IsEnabled))
-      'm_VerifyAll_IsEnabled = False
-      'NotifyPropertyChanged(NameOf(VerifyAll_IsEnabled))
-      'NotifyPropertyChanged(NameOf(Simulate_IsEnabled))
-      'NotifyPropertyChanged(NameOf(Edit_IsEnabled))
-   End Sub
-   Friend Sub SetVerifyIsEnabled(bIsEnabled As Boolean)
-      'm_CALCPanel_IsEnabled = bIsEnabled
-      'NotifyPropertyChanged(NameOf(CALCPanel_IsEnabled))
-      'NotifyPropertyChanged(NameOf(Verify_IsEnabled))
-   End Sub
-
    Private Sub Calc_ProcessResult(sender As Object, e As CalcResultEventArgs)
       ProcessResults(e.m_Result)
    End Sub

EgtBEAMWALL.Optimizer/MachGroupPanel/MyMachGroupPanelVM.vb

@@ -34,14 +34,9 @@ Public Class MyMachGroupPanelVM
             EgtSetCurrMachGroup(value.Id)
             OnPostSetCurrMachGroup()
             Map.refStatisticsTimePanelVM.SetMachiningPage_Visibility(Visibility.Visible)
+            Map.refStatisticsTimePanelVM.SetViewPage_Visibility(Visibility.Collapsed)
          End If
          NotifyPropertyChanged(NameOf(SelectedMachGroup))
-         ' se MachGroup gia' mandato in produzione,disabilito pulsanti verify e reset
-         If Not IsNothing(SelectedMachGroup) AndAlso SelectedMachGroup.nProduction_State >= ItemState.Assigned Then
-            Map.refCALCPanelVM.SetVerifyIsEnabled(False)
-         Else
-            Map.refCALCPanelVM.SetCalcPanelIsEnabled(True)
-         End If
       End Set
    End Property
 

EgtBEAMWALL.Optimizer/Project/ProjectVM.vb

@@ -327,7 +327,6 @@ Public Class ProjectVM
 
    Friend Sub ManageIsEnabled(bIsEnabled As Boolean)
       Map.refInstrumentPanelVM.SetInstrumentPanelIsEnabled(bIsEnabled)
-      Map.refCALCPanelVM.SetCalcPanelIsEnabled(bIsEnabled)
       Map.refMainMenuVM.SetMainMenuIsEnabled(bIsEnabled)
       If Not IsNothing(Map.refPartManagerVM) Then Map.refPartManagerVM.SetPartManagerIsEnabled(bIsEnabled)
       Map.refLeftPanelVM.SetLeftPanelIsEnabled(bIsEnabled)