EgtCAM5 1.9l3 :

- aggiunta gestione lame con raggio corner.
This commit is contained in:
Dario Sassi
2018-12-22 12:18:11 +00:00
parent 71880e8da2
commit 7872c90d2e
6 changed files with 49 additions and 14 deletions
+37 -5
View File
@@ -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