From 475b6fc6fc09225c107d44e26281bbbb5bfa12fd Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Wed, 20 Jul 2016 17:32:09 +0000 Subject: [PATCH] OmagCUT : - Introduzione fresa in Db Lavorazioni. --- MachiningDbPageUC.xaml.vb | 93 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 1 deletion(-) diff --git a/MachiningDbPageUC.xaml.vb b/MachiningDbPageUC.xaml.vb index eef8f87..58a093b 100644 --- a/MachiningDbPageUC.xaml.vb +++ b/MachiningDbPageUC.xaml.vb @@ -33,6 +33,7 @@ Public Class MachiningDbPageUC Dim RouFinStepType() As String Dim SawTool As New ObservableCollection(Of String) Dim DrillTool As New ObservableCollection(Of String) + Dim MillTool As New ObservableCollection(Of String) 'Variabile che conserva la lavorazione precedentemente selezionata, usata nel caso si selezioni annulla quando si cambia lavorazione selezionata Private m_OldItem As Object @@ -134,7 +135,7 @@ Public Class MachiningDbPageUC Dim CurrMachine As CurrentMachine = m_MainWindow.m_CurrentMachine InitializeMachiningFamily(CurrMachine.bSawing, MCH_MY.SAWING, EgtMsg(MSG_MACHININGSDBPAGEUC + 31)) InitializeMachiningFamily(CurrMachine.bDrilling, MCH_MY.DRILLING, EgtMsg(MSG_MACHININGSDBPAGEUC + 32)) - 'InitializeMachiningFamily(K_MILLING, MCH_MY.MILLING, EgtMsg(MSG_MACHININGSDBPAGEUC + 33)) + InitializeMachiningFamily(CurrMachine.bMilling, MCH_MY.MILLING, EgtMsg(MSG_MACHININGSDBPAGEUC + 33)) InitializeMachiningFamily(CurrMachine.bSawRoughing, MCH_MY.SAWROUGHING, EgtMsg(MSG_MACHININGSDBPAGEUC + 34)) InitializeMachiningFamily(CurrMachine.bSawFinishing, MCH_MY.SAWFINISHING, EgtMsg(MSG_MACHININGSDBPAGEUC + 35)) m_bFirst = False @@ -162,6 +163,13 @@ Public Class MachiningDbPageUC DrillTool.Add(sToolName) End While End If + MillTool.Clear() + If EgtTdbGetFirstTool(MCH_TF.MILL, sToolName, nType) Then + DrillTool.Add(sToolName) + While EgtTdbGetNextTool(MCH_TF.MILL, sToolName, nType) + DrillTool.Add(sToolName) + End While + End If End Sub @@ -538,6 +546,8 @@ Public Class MachiningDbPageUC SideBrd.Visibility = Windows.Visibility.Visible WorkSideTxBl.Visibility = Windows.Visibility.Visible WorkSideCmBx.Visibility = Windows.Visibility.Visible + HeadSideTxBl.Visibility = Windows.Visibility.Visible + HeadSideCmBx.Visibility = Windows.Visibility.Visible TypeBrd.Visibility = Windows.Visibility.Visible LeadInTypeTxBl.Visibility = Windows.Visibility.Visible LeadInTypeCmBx.Visibility = Windows.Visibility.Visible @@ -579,6 +589,83 @@ Public Class MachiningDbPageUC DrillStepBrd.Visibility = Windows.Visibility.Hidden SawRouStepGpBx.Visibility = Windows.Visibility.Hidden SawStepGpBx.Visibility = Windows.Visibility.Visible + ArcIntTxBl.Visibility = Windows.Visibility.Visible + ArcIntTxBx.Visibility = Windows.Visibility.Visible + ArcExtTxBl.Visibility = Windows.Visibility.Visible + ArcExtTxBx.Visibility = Windows.Visibility.Visible + ReturnPosTxBl.Visibility = Windows.Visibility.Hidden + ReturnPosTxBx.Visibility = Windows.Visibility.Hidden + OffsetGpBx.Visibility = Windows.Visibility.Hidden + ' Definizione di una riga della tabella con la giusta altezza + Dim RowNum As Integer = FeedGrd.RowDefinitions.Count + If RowNum > 4 Then + For Index = RowNum - 1 To 4 Step -1 + FeedGrd.RowDefinitions.RemoveAt(Index) + Next + End If + FeedGpBx.SetValue(Grid.RowSpanProperty, 12) + VertFeedTxBl.Visibility = Windows.Visibility.Hidden + VertFeedTxBx.Visibility = Windows.Visibility.Hidden + Case MCH_MY.MILLING 'Parametri Fresatura + SideAngleTxBl.Visibility = Windows.Visibility.Hidden + SideAngleTxBx.Visibility = Windows.Visibility.Hidden + InvertTxBl.Visibility = Windows.Visibility.Hidden + InvertChBx.Visibility = Windows.Visibility.Hidden + AcrossTxBl.Visibility = Windows.Visibility.Hidden + AcrossChBx.Visibility = Windows.Visibility.Hidden + StepTypeTxBl.Visibility = Windows.Visibility.Hidden + StepTypeCmBx.Visibility = Windows.Visibility.Hidden + SideBrd.Visibility = Windows.Visibility.Visible + WorkSideTxBl.Visibility = Windows.Visibility.Visible + WorkSideCmBx.Visibility = Windows.Visibility.Visible + HeadSideTxBl.Visibility = Windows.Visibility.Hidden + HeadSideCmBx.Visibility = Windows.Visibility.Hidden + TypeBrd.Visibility = Windows.Visibility.Visible + LeadInTypeTxBl.Visibility = Windows.Visibility.Visible + LeadInTypeCmBx.Visibility = Windows.Visibility.Visible + ExtLinkTypeTxBl.Visibility = Windows.Visibility.Hidden + ExtLinkTypeCmBx.Visibility = Windows.Visibility.Hidden + LeadOutTypeTxBl.Visibility = Windows.Visibility.Visible + LeadOutTypeCmBx.Visibility = Windows.Visibility.Visible + LeadLinkTypeTxBl.Visibility = Windows.Visibility.Hidden + LeadLinkTypeCmBx.Visibility = Windows.Visibility.Hidden + CurveBrd.Visibility = Windows.Visibility.Hidden + If MachParamGrd.Children.Contains(StartPosTxBl) Then + MachParamGrd.Children.Remove(StartPosTxBl) + MachParamGrd.Children.Remove(StartPosTxBx) + TypeGrd.Children.Add(StartPosTxBl) + TypeGrd.Children.Add(StartPosTxBx) + StartPosTxBl.SetValue(Grid.ColumnProperty, 0) + StartPosTxBl.SetValue(Grid.RowProperty, 0) + StartPosTxBx.SetValue(Grid.ColumnProperty, 1) + StartPosTxBx.SetValue(Grid.RowProperty, 0) + StartPosTxBl.SetValue(Grid.RowSpanProperty, 1) + StartPosTxBx.SetValue(Grid.RowSpanProperty, 1) + End If + StartPosTxBl.Visibility = Windows.Visibility.Visible + StartPosTxBx.Visibility = Windows.Visibility.Visible + LowLenGpBx.Visibility = Windows.Visibility.Hidden + ThrouAddLenTxBl.Visibility = Windows.Visibility.Hidden + ThrouAddLenTxBx.Visibility = Windows.Visibility.Hidden + If DrillStepGrd.Children.Contains(StepTxBx) Then + DrillStepGrd.Children.Remove(StepTxBx) + SawStepGrd.Children.Add(StepTxBx) + StepTxBx.SetValue(Grid.ColumnProperty, 1) + StepTxBx.SetValue(Grid.RowProperty, 0) + ElseIf SawRouStepGrd.Children.Contains(StepTxBx) Then + SawRouStepGrd.Children.Remove(StepTxBx) + SawStepGrd.Children.Add(StepTxBx) + StepTxBx.SetValue(Grid.ColumnProperty, 1) + StepTxBx.SetValue(Grid.RowProperty, 0) + End If + StepTxBx.Visibility = Windows.Visibility.Visible + SawStepGpBx.Visibility = Windows.Visibility.Visible + ArcIntTxBl.Visibility = Windows.Visibility.Hidden + ArcIntTxBx.Visibility = Windows.Visibility.Hidden + ArcExtTxBl.Visibility = Windows.Visibility.Hidden + ArcExtTxBx.Visibility = Windows.Visibility.Hidden + DrillStepBrd.Visibility = Windows.Visibility.Hidden + SawRouStepGpBx.Visibility = Windows.Visibility.Hidden ReturnPosTxBl.Visibility = Windows.Visibility.Hidden ReturnPosTxBx.Visibility = Windows.Visibility.Hidden OffsetGpBx.Visibility = Windows.Visibility.Hidden @@ -662,6 +749,8 @@ Public Class MachiningDbPageUC SideBrd.Visibility = Windows.Visibility.Visible WorkSideTxBl.Visibility = Windows.Visibility.Hidden WorkSideCmBx.Visibility = Windows.Visibility.Hidden + HeadSideTxBl.Visibility = Windows.Visibility.Visible + HeadSideCmBx.Visibility = Windows.Visibility.Visible TypeBrd.Visibility = Windows.Visibility.Visible LeadInTypeTxBl.Visibility = Windows.Visibility.Hidden LeadInTypeCmBx.Visibility = Windows.Visibility.Hidden @@ -749,6 +838,8 @@ Public Class MachiningDbPageUC SideBrd.Visibility = Windows.Visibility.Visible WorkSideTxBl.Visibility = Windows.Visibility.Hidden WorkSideCmBx.Visibility = Windows.Visibility.Hidden + HeadSideTxBl.Visibility = Windows.Visibility.Visible + HeadSideCmBx.Visibility = Windows.Visibility.Visible TypeBrd.Visibility = Windows.Visibility.Visible LeadInTypeTxBl.Visibility = Windows.Visibility.Hidden LeadInTypeCmBx.Visibility = Windows.Visibility.Hidden