diff --git a/SharedFieldsClass.vb b/SharedFieldsClass.vb index 8461b33..6f59078 100644 --- a/SharedFieldsClass.vb +++ b/SharedFieldsClass.vb @@ -160,7 +160,7 @@ Mill_Std(15) = Visibility.Visible ' Speed Mill_Std(16) = Visibility.Visible ' SideAng Mill_Std(17) = Visibility.Visible ' MaxSpeed - Mill_Std(18) = Visibility.Collapsed ' Thick + Mill_Std(18) = Visibility.Visible ' Thick Mill_Std(19) = Visibility.Collapsed ' MaxAbsorption Mill_Std(20) = Visibility.Collapsed ' MinFeed Mill_Std(21) = Visibility.Visible ' Draw @@ -188,7 +188,7 @@ Mill_NoTip(15) = Visibility.Visible ' Speed Mill_NoTip(16) = Visibility.Visible ' SideAng Mill_NoTip(17) = Visibility.Visible ' MaxSpeed - Mill_NoTip(18) = Visibility.Collapsed ' Thick + Mill_NoTip(18) = Visibility.Visible ' Thick Mill_NoTip(19) = Visibility.Collapsed ' MaxAbsorption Mill_NoTip(20) = Visibility.Collapsed ' MinFeed Mill_NoTip(21) = Visibility.Visible ' Draw diff --git a/ToolsDbWindow/ToolTreeView.vb b/ToolsDbWindow/ToolTreeView.vb index 9c2a44f..d1cb61d 100644 --- a/ToolsDbWindow/ToolTreeView.vb +++ b/ToolsDbWindow/ToolTreeView.vb @@ -255,6 +255,9 @@ Public Class ToolTreeViewItem StringToLen(value, dValue) m_IsModifiedCornRad = Math.Abs(dValue - DbCornRad) > 10 * EPS_ANG_SMALL m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewTool), True) + If Not m_SuspendToolDrawUpdate Then + UpdateSceneToolDraw() + End If NotifyPropertyChanged("CornRad") End If End Set @@ -311,6 +314,9 @@ Public Class ToolTreeViewItem EgtTdbGetCurrToolParam(MCH_TP.TOTDIAM, DbTotDiam) StringToLen(value, dValue) m_IsModifiedTotDiam = Math.Abs(dValue - DbTotDiam) > 5 * EPS_SMALL + If Not m_SuspendToolDrawUpdate Then + UpdateSceneToolDraw() + End If If Not GetValidationError("Diam") Or Not GetValidationError("TotDiam") Then m_delErrorOnTool(True) m_delIsEnabledBtns(False, False, True) @@ -648,6 +654,9 @@ Public Class ToolTreeViewItem StringToLen(value, dValue) m_IsModifiedSideAng = Math.Abs(dValue - DbSideAng) > 10 * EPS_ANG_SMALL m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewTool), True) + If Not m_SuspendToolDrawUpdate Then + UpdateSceneToolDraw() + End If NotifyPropertyChanged("SideAng") End If End Set @@ -1309,14 +1318,20 @@ Public Class ToolTreeViewItem Private Function CreateToolDraw(ToolHolder As String) As Boolean Dim dTotLen As Double = 0 Dim dLen As Double = 0 + Dim dTotDiam As Double = 0 Dim dDiam As Double = 0 Dim dThick As Double = 0 Dim dMaxMat As Double = 0 + Dim dSideAng As Double = 0 + Dim dCornRad As Double = 0 StringToLen(m_TotLen, dTotLen) StringToLen(m_Len, dLen) + StringToLen(m_TotDiam, dTotDiam) StringToLen(m_Diam, dDiam) StringToLen(m_Thick, dThick) StringToLen(m_MaxMat, dMaxMat) + StringToDouble(m_SideAng, dSideAng) + StringToLen(m_CornRad, dCornRad) Select Case Type Case MCH_TY.DRILL_STD, MCH_TY.DRILL_LONG, MCH_TY.CHISEL_STD ' imposto dati utensile @@ -1337,9 +1352,14 @@ Public Class ToolTreeViewItem Case MCH_TY.MILL_STD, MCH_TY.MILL_NOTIP ' imposto dati utensile EgtLuaSetGlobStringVar("TOOL.TOOLHOLDER", ToolHolder) + EgtLuaSetGlobNumVar("TOOL.TOTLEN", dTotLen) EgtLuaSetGlobNumVar("TOOL.LEN", dLen) + EgtLuaSetGlobNumVar("TOOL.TOTDIAM", dTotDiam) EgtLuaSetGlobNumVar("TOOL.DIAM", dDiam) EgtLuaSetGlobNumVar("TOOL.MAXMAT", dMaxMat) + EgtLuaSetGlobNumVar("TOOL.HEIGHT", dThick) + EgtLuaSetGlobNumVar("TOOL.SIDEANG", dSideAng) + EgtLuaSetGlobNumVar("TOOL.CORNRAD", dCornRad) Case Else m_nDrawingError = 999 m_Draw = String.Empty