diff --git a/MachiningDbPageUC.xaml b/MachiningDbPageUC.xaml
index 7897bd1..3c7d51e 100644
--- a/MachiningDbPageUC.xaml
+++ b/MachiningDbPageUC.xaml
@@ -685,6 +685,11 @@
+
+
+
diff --git a/MachiningDbPageUC.xaml.vb b/MachiningDbPageUC.xaml.vb
index 5a0844f..8128029 100644
--- a/MachiningDbPageUC.xaml.vb
+++ b/MachiningDbPageUC.xaml.vb
@@ -108,11 +108,12 @@ Public Class MachiningDbPageUC
ToolTxBl.Text = EgtMsg(MSG_MACHININGSDBPAGEUC + 24)
SpeedTxBl.Text = EgtMsg(MSG_TOOLSDBPAGEUC + 5)
FeedGpBx.Header = EgtMsg(MSG_TOOLSDBPAGEUC + 8)
- FeedTxBl.Text = EgtMsg(MSG_TOOLSDBPAGEUC + 9)
+ FeedTxBl.Text = EgtMsg(MSG_OMAGCUT + 864)
TipFeedTxBl.Text = EgtMsg(MSG_TOOLSDBPAGEUC + 10)
StartFeedTxBl.Text = EgtMsg(MSG_TOOLSDBPAGEUC + 11)
EndFeedTxBl.Text = EgtMsg(MSG_TOOLSDBPAGEUC + 12)
VertFeedTxBl.Text = EgtMsg(MSG_MACHININGSDBPAGEUC + 30)
+ BackFeedTxBl.Text = EgtMsg(MSG_OMAGCUT + 865)
OffsetGpBx.Header = EgtMsg(MSG_TOOLSDBPAGEUC + 15)
LonOffsetTxBl.Text = EgtMsg(MSG_TOOLSDBPAGEUC + 16)
RadOffsetTxBl.Text = EgtMsg(MSG_TOOLSDBPAGEUC + 17)
@@ -195,20 +196,6 @@ Public Class MachiningDbPageUC
End If
End Sub
- 'Private Sub MoveParam()
- ' SpeedBrd.SetValue(Grid.RowProperty, 1)
- ' FeedBrd.SetValue(Grid.RowProperty, 2)
- ' CoolantTxBl.SetValue(Grid.RowProperty, 4)
- ' CoolantCmBx.SetValue(Grid.RowProperty, 4)
- ' CorrTxBl.SetValue(Grid.RowProperty, 4)
- ' CorrTxBx.SetValue(Grid.RowProperty, 4)
- ' OffsetBrd.SetValue(Grid.RowProperty, 5)
- ' AbsorptionBrd.SetValue(Grid.RowProperty, 6)
- ' MaxMatTxBl.SetValue(Grid.RowProperty, 7)
- ' MaxMatTxBx.SetValue(Grid.RowProperty, 7)
-
- 'End Sub
-
Private Sub NewBtn_Click(sender As Object, e As RoutedEventArgs) Handles NewBtn.Click
EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
If TypeOf MachiningTreeView.SelectedItem Is CathegoryItem Then
@@ -422,6 +409,8 @@ Public Class MachiningDbPageUC
TipFeedTxBx.Text = LenToString(ToolDouble, 3)
EgtMdbGetCurrMachiningParam(MCH_MP.VERTFEED, ToolDouble)
VertFeedTxBx.Text = LenToString(ToolDouble, 3)
+ EgtMdbGetCurrMachiningParam(MCH_MP.BACKFEED, ToolDouble)
+ BackFeedTxBx.Text = LenToString(ToolDouble, 3)
' Sovramateriale
EgtMdbGetCurrMachiningParam(MCH_MP.OFFSL, ToolDouble)
LonOffsetTxBx.Text = LenToString(ToolDouble, 3)
@@ -527,6 +516,8 @@ Public Class MachiningDbPageUC
EgtMdbSetCurrMachiningParam(MCH_MP.TIPFEED, dTemp)
StringToLen(VertFeedTxBx.Text, dTemp)
EgtMdbSetCurrMachiningParam(MCH_MP.VERTFEED, dTemp)
+ StringToLen(BackFeedTxBx.Text, dTemp)
+ EgtMdbSetCurrMachiningParam(MCH_MP.BACKFEED, dTemp)
' Sovramateriale
StringToLen(LonOffsetTxBx.Text, dTemp)
EgtMdbSetCurrMachiningParam(MCH_MP.OFFSL, dTemp)
@@ -641,8 +632,21 @@ Public Class MachiningDbPageUC
Next
End If
FeedGpBx.SetValue(Grid.RowSpanProperty, 12)
+ ' Definizione di una riga della tabella Feed
+ RowNum = FeedGrd.RowDefinitions.Count
+ If RowNum < 5 Then
+ Dim Row As New RowDefinition
+ Row.Height = New GridLength(1, GridUnitType.Star)
+ FeedGrd.RowDefinitions.Add(Row)
+ FeedGpBx.SetValue(Grid.RowSpanProperty, 14)
+ BackFeedTxBl.SetValue(Grid.RowProperty, 4)
+ BackFeedTxBx.SetValue(Grid.ColumnProperty, 1)
+ BackFeedTxBx.SetValue(Grid.RowProperty, 4)
+ End If
VertFeedTxBl.Visibility = Windows.Visibility.Hidden
VertFeedTxBx.Visibility = Windows.Visibility.Hidden
+ BackFeedTxBl.Visibility = Windows.Visibility.Visible
+ BackFeedTxBx.Visibility = Windows.Visibility.Visible
Case MCH_MY.MILLING 'Parametri Fresatura
SideAngleTxBl.Visibility = Windows.Visibility.Hidden
SideAngleTxBx.Visibility = Windows.Visibility.Hidden
@@ -731,6 +735,8 @@ Public Class MachiningDbPageUC
FeedGpBx.SetValue(Grid.RowSpanProperty, 12)
VertFeedTxBl.Visibility = Windows.Visibility.Hidden
VertFeedTxBx.Visibility = Windows.Visibility.Hidden
+ BackFeedTxBl.Visibility = Windows.Visibility.Hidden
+ BackFeedTxBx.Visibility = Windows.Visibility.Hidden
Case MCH_MY.DRILLING 'Parametri Foratura
SideAngleTxBl.Visibility = Windows.Visibility.Hidden
SideAngleTxBx.Visibility = Windows.Visibility.Hidden
@@ -791,6 +797,8 @@ Public Class MachiningDbPageUC
FeedGpBx.SetValue(Grid.RowSpanProperty, 12)
VertFeedTxBl.Visibility = Windows.Visibility.Hidden
VertFeedTxBx.Visibility = Windows.Visibility.Hidden
+ BackFeedTxBl.Visibility = Windows.Visibility.Hidden
+ BackFeedTxBx.Visibility = Windows.Visibility.Hidden
Case MCH_MY.SAWROUGHING 'Parametri Sgrossatura con lama
SideAngleTxBl.Visibility = Windows.Visibility.Hidden
SideAngleTxBx.Visibility = Windows.Visibility.Hidden
@@ -870,6 +878,8 @@ Public Class MachiningDbPageUC
FeedGpBx.SetValue(Grid.RowSpanProperty, 12)
VertFeedTxBl.Visibility = Windows.Visibility.Hidden
VertFeedTxBx.Visibility = Windows.Visibility.Hidden
+ BackFeedTxBl.Visibility = Windows.Visibility.Hidden
+ BackFeedTxBx.Visibility = Windows.Visibility.Hidden
'Spostamento gruppo sovramateriale
OffsetGpBx.SetValue(Grid.RowProperty, 18)
' Definizione di una riga della tabella Offset
@@ -965,6 +975,8 @@ Public Class MachiningDbPageUC
End If
VertFeedTxBl.Visibility = Windows.Visibility.Visible
VertFeedTxBx.Visibility = Windows.Visibility.Visible
+ BackFeedTxBl.Visibility = Windows.Visibility.Hidden
+ BackFeedTxBx.Visibility = Windows.Visibility.Hidden
'Spostamento gruppo sovramateriale
OffsetGpBx.SetValue(Grid.RowProperty, 20)
' Eliminazione di una riga della tabella Offset
diff --git a/ProjectMgrUC.xaml.vb b/ProjectMgrUC.xaml.vb
index 67510ea..ad0a766 100644
--- a/ProjectMgrUC.xaml.vb
+++ b/ProjectMgrUC.xaml.vb
@@ -296,7 +296,9 @@ Public Class ProjectMgrUC
Select Case AskNcRestart.m_nPressedBtn
Case 1 ' YES
Case 2 ' NO
+ EgtEnableModified()
m_CurrProjPage.ResetProjectNcRestart()
+ EgtDisableModified()
Case Else ' CANCEL
Return
End Select