diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 1ac2b82..b0f79fc 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/ToolsDbWindow/ToolDraw.vb b/ToolsDbWindow/ToolDraw.vb index 0afb01f..1060a78 100644 --- a/ToolsDbWindow/ToolDraw.vb +++ b/ToolsDbWindow/ToolDraw.vb @@ -45,6 +45,7 @@ Module ToolDraw EgtLuaSetGlobNumVar("TOOL.CORE", dCore) EgtLuaSetGlobNumVar("TOOL.THICK", dThick) EgtLuaSetGlobNumVar("TOOL.MAXMAT", dMaxMat) + EgtLuaSetGlobNumVar("TOOL.CORNRAD", dCornRad) Case MCH_TY.MILL_STD, MCH_TY.MILL_NOTIP ' imposto dati utensile EgtLuaSetGlobStringVar("TOOL.TOOLHOLDER", sToolHolder) diff --git a/ToolsDbWindow/ToolTreeView.vb b/ToolsDbWindow/ToolTreeView.vb index 1bd58b7..3a6b8d0 100644 --- a/ToolsDbWindow/ToolTreeView.vb +++ b/ToolsDbWindow/ToolTreeView.vb @@ -253,8 +253,14 @@ Public Class ToolTreeViewItem EgtSetCurrentContext(IniFile.m_ProjectSceneContext) EgtTdbGetCurrToolParam(MCH_TP.CORNRAD, DbCornRad) StringToLen(value, dValue) - m_IsModifiedCornRad = Math.Abs(dValue - DbCornRad) > 10 * EPS_ANG_SMALL - m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True) + m_IsModifiedCornRad = Math.Abs(dValue - DbCornRad) > 10 * EPS_SMALL + If Not GetValidationError("CornRad") Then + m_delErrorOnTool(True) + m_delIsEnabledBtns(False, False, True) + Else + m_delErrorOnTool(Not IsValid) + m_delIsEnabledBtns(IsValid And Not IsModified, IsValid, True) + End If If Not m_SuspendToolDrawUpdate Then UpdateSceneToolDraw() End If @@ -280,7 +286,7 @@ Public Class ToolTreeViewItem EgtSetCurrentContext(IniFile.m_ProjectSceneContext) EgtTdbGetCurrToolParam(MCH_TP.DIAM, DbDiam) StringToLen(value, dValue) - m_IsModifiedDiam = Math.Abs(dValue - DbDiam) > 10 * EPS_ANG_SMALL + m_IsModifiedDiam = Math.Abs(dValue - DbDiam) > 10 * EPS_SMALL If Not GetValidationError("Diam") Then m_delErrorOnTool(True) m_delIsEnabledBtns(False, False, True) @@ -713,7 +719,7 @@ Public Class ToolTreeViewItem If Not m_SuspendToolDrawUpdate Then UpdateSceneToolDraw() End If - If Not GetValidationError("Thick") Then + If Not GetValidationError("Thick") Or Not GetValidationError("CornRad") Then m_delErrorOnTool(True) m_delIsEnabledBtns(False, False, True) Else @@ -1313,6 +1319,13 @@ Public Class ToolTreeViewItem End Get End Property + Private m_CornRadError As String + Public ReadOnly Property CornRadErrorMsg As String + Get + Return m_CornRadError + End Get + End Property + Private m_TotLenError As String Public ReadOnly Property TotLenErrorMsg As String Get @@ -1383,6 +1396,8 @@ Public Class ToolTreeViewItem bOk = Me.ValidateSpeed() Case "TotDiam" bOk = Me.ValidateTotDiam() + Case "CornRad" + bOk = Me.ValidateCornRad() Case "Diam" bOk = Me.ValidateDiam() Case "TotLen" @@ -1411,6 +1426,8 @@ Public Class ToolTreeViewItem Return m_SpeedError Case "TotDiam" Return m_TotDiamError + Case "CornRad" + Return m_CornRadError Case "Diam" Return m_DiamError Case "TotLen" @@ -1487,7 +1504,7 @@ Public Class ToolTreeViewItem m_IsModifiedSelectedTcPos = False End Sub - Private Shared ReadOnly ValidatedProperties() As String = {"Draw", "TotDiam", "Diam", "TotLen", "Len", "MaxMat", "Thick", "Speed", "NamePar", "SelectedHead", "SelectedExit"} + Private Shared ReadOnly ValidatedProperties() As String = {"Draw", "TotDiam", "CornRad", "Diam", "TotLen", "Len", "MaxMat", "Thick", "Speed", "NamePar", "SelectedHead", "SelectedExit"} Private Function ValidateName() As Boolean m_NameError = String.Empty @@ -1541,6 +1558,21 @@ Public Class ToolTreeViewItem End If End Function + Private Function ValidateCornRad() As Boolean + m_CornRadError = String.Empty + If Not IsNothing(m_CornRad) And Not IsNothing(m_Thick) Then + Dim dCornRad As Double = 0 + StringToLen(m_CornRad, dCornRad) + Dim dThick As Double = 0 + StringToLen(m_Thick, dThick) + If (m_Type = MCH_TY.SAW_FLAT Or m_Type = MCH_TY.SAW_STD) And dCornRad > 0.5 * dThick Then + m_CornRadError = EgtMsg(MSG_TOOLSERRORS + 42) + End If + End If + NotifyPropertyChanged("CornRadErrorMsg") + Return String.IsNullOrEmpty(m_CornRadError) + End Function + Private Function ValidateDiam() As Boolean m_DiamError = String.Empty If Not IsNothing(m_Diam) Then diff --git a/ToolsDbWindow/ToolsDbV.xaml b/ToolsDbWindow/ToolsDbV.xaml index 29009f0..0356289 100644 --- a/ToolsDbWindow/ToolsDbV.xaml +++ b/ToolsDbWindow/ToolsDbV.xaml @@ -698,15 +698,16 @@ ConverterParameter={StaticResource CornRad}}"/> - + diff --git a/ToolsDbWindow/ToolsDbVM.vb b/ToolsDbWindow/ToolsDbVM.vb index 57d944c..1dd1e3c 100644 --- a/ToolsDbWindow/ToolsDbVM.vb +++ b/ToolsDbWindow/ToolsDbVM.vb @@ -60,6 +60,7 @@ Public Class ToolsDbVM Get If m_bfirst Then SceneHost = New WindowsFormsHost() With {.Child = m_ToolScene} + m_ToolScene.SetViewBackground(New Color3d(154, 168, 184), New Color3d(116, 126, 138)) If Not m_ToolScene.Init() Then EgtOutLog("Error in Tool scene creation") 'Application.Msn.NotifyColleagues(Application.CLOSEAPPLICATION) diff --git a/Utility/TMDbParamVisibility.vb b/Utility/TMDbParamVisibility.vb index 3f376a1..be4ca14 100644 --- a/Utility/TMDbParamVisibility.vb +++ b/Utility/TMDbParamVisibility.vb @@ -89,7 +89,7 @@ Saw_Std(0) = Visibility.Visible ' Corrector Saw_Std(1) = Visibility.Visible ' ExitPar Saw_Std(2) = Visibility.Collapsed ' Coolant - Saw_Std(3) = Visibility.Collapsed ' CornRad + Saw_Std(3) = Visibility.Visible ' CornRad Saw_Std(4) = Visibility.Visible ' Diam Saw_Std(5) = Visibility.Visible ' TotDiam Saw_Std(6) = Visibility.Visible ' Feed @@ -117,7 +117,7 @@ Saw_Flat(0) = Visibility.Visible ' Corrector Saw_Flat(1) = Visibility.Visible ' ExitPar Saw_Flat(2) = Visibility.Collapsed ' Coolant - Saw_Flat(3) = Visibility.Collapsed ' CornRad + Saw_Flat(3) = Visibility.Visible ' CornRad Saw_Flat(4) = Visibility.Visible ' Diam Saw_Flat(5) = Visibility.Visible ' TotDiam Saw_Flat(6) = Visibility.Visible ' Feed