Verifica fine-corsa in CheckUpStart

This commit is contained in:
Nicola Pievani
2021-05-27 19:18:49 +02:00
parent 61aee83181
commit 971f9b7b6e
2 changed files with 21 additions and 4 deletions
+1
View File
@@ -168,6 +168,7 @@ Public Class NestPageUC
m_CurrSelectedCurv = nIdMy
EgtSelectObj(nIdSaw)
EgtSelectObj(nIdMy)
EgtDraw()
Exit While
End If
+20 -4
View File
@@ -55,6 +55,16 @@ Public Class DrawPageUC
Private m_sCsvList As String = ""
Private m_sCsvName As String = ""
' Abilito i tagli inclinati solo per macchina a 5 assi
Private m_bEnableSideAngle As Boolean = True
Friend ReadOnly Property bEnableSideAngle As Boolean
Get
Return m_bEnableSideAngle
End Get
End Property
Friend ReadOnly Property sCompoName As String
Get
Return m_sCompoName
@@ -143,7 +153,13 @@ Public Class DrawPageUC
m_bTrfData = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.TRF_IMPORT) And
(GetPrivateProfileInt(S_COMPO, K_TRFDATA, 0, m_MainWindow.GetIniFile()) <> 0)
' Abilitazione CsvData
m_bCsvData = ( Not m_bTrfData And GetPrivateProfileInt(S_COMPO, K_CSVDATA, 0, m_MainWindow.GetIniFile()) <> 0)
m_bCsvData = (Not m_bTrfData And GetPrivateProfileInt(S_COMPO, K_CSVDATA, 0, m_MainWindow.GetIniFile()) <> 0)
' Abilitazione tagli inclinati (solo per macchine a 5 assi)
m_bEnableSideAngle = GetPrivateProfileInt(S_AXES, K_AXESNUM, 5, m_MainWindow.GetMachIniFile()) > 4
If Not m_bEnableSideAngle Then
SideAngleBtn.IsEnabled = False
End If
If m_bTrfData Then
PartNameTxBl.Visibility = Windows.Visibility.Hidden
@@ -997,7 +1013,7 @@ Public Class DrawPageUC
ElseIf m_PrevSideAnglePage = Pages.InternalComponent Then
LeftButtonGrd.Children.Add(m_CompoDimension.m_InternalCompoPage)
End If
SideAngleBtn.IsEnabled = True
SideAngleBtn.IsEnabled = m_bEnableSideAngle
DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw)
MessageGrid.Visibility = Windows.Visibility.Visible
@@ -1055,7 +1071,7 @@ Public Class DrawPageUC
ElseIf m_PrevSideAnglePage = Pages.InternalComponent Then
LeftButtonGrd.Children.Add(m_CompoDimension.m_InternalCompoPage)
End If
SideAngleBtn.IsEnabled = True
SideAngleBtn.IsEnabled = m_bEnableSideAngle
FiloTopBtn.IsEnabled = m_MainWindow.m_CurrentMachine.bMilling
EngraveBtn.IsEnabled = True
MessageGrid.Visibility = Windows.Visibility.Visible
@@ -1107,7 +1123,7 @@ Public Class DrawPageUC
ElseIf m_PrevSideAnglePage = Pages.InternalComponent Then
LeftButtonGrd.Children.Add( m_CompoDimension.m_InternalCompoPage)
End If
SideAngleBtn.IsEnabled = True
SideAngleBtn.IsEnabled = m_bEnableSideAngle
EngraveBtn.IsEnabled = True
DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And
Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw)