diff --git a/CompoDimensionUC.xaml.vb b/CompoDimensionUC.xaml.vb index 0f3d7dd..7ad0fc7 100644 --- a/CompoDimensionUC.xaml.vb +++ b/CompoDimensionUC.xaml.vb @@ -75,7 +75,8 @@ Public Class CompoDimensionUC CancelBtn.Visibility = Windows.Visibility.Visible Else m_DrawPage.SideAngleBtn.IsEnabled = True - m_DrawPage.DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) + m_DrawPage.DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And + Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw) m_DrawPage.BackBtn.Visibility = Windows.Visibility.Visible AddBtn.Visibility = Windows.Visibility.Hidden CancelBtn.Visibility = Windows.Visibility.Hidden diff --git a/CurrentMachine.vb b/CurrentMachine.vb index bb021c0..1797042 100644 --- a/CurrentMachine.vb +++ b/CurrentMachine.vb @@ -972,7 +972,7 @@ Public Class CurrentMachine m_bDirectCutsFinalHome = (GetPrivateProfileInt(S_MACH_DIRECTCUTS, K_FINALHOME, 1, sMachIniFile) <> 0) ' Leggo dati per feed ridotta all'inizio/fine dei tagli - m_bFsevEnable = (GetPrivateProfileInt(S_NEST, K_MACH_CUTFSEVENABLE, 1, sMachIniFile) <> 0) + m_bFsevEnable = (GetPrivateProfileInt(S_NEST, K_MACH_CUTFSEVENABLE, 0, sMachIniFile) <> 0) m_dFsevLength = GetPrivateProfileDouble(S_NEST, K_MACH_CUTFSEVLEN, 0, sMachIniFile) m_dFsevPerc = GetPrivateProfileDouble(S_NEST, K_MACH_CUTFSEVPERC, 0, sMachIniFile) diff --git a/DrawPageUC.xaml.vb b/DrawPageUC.xaml.vb index 290d046..e5d6a55 100644 --- a/DrawPageUC.xaml.vb +++ b/DrawPageUC.xaml.vb @@ -126,7 +126,8 @@ Public Class DrawPageUC TrfDataBtn.Content = EgtMsg(MSG_DRAWPAGEUC + 9) ' Dati Trf ' Abilitazione lavorazioni da sotto da chiave - DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) + DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And + Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw) ' Abilitazione Nome/TrfData m_bTrfData = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.TRF_IMPORT) And @@ -816,7 +817,8 @@ Public Class DrawPageUC ElseIf m_PrevSideAnglePage = Pages.InternalComponent Then LeftButtonGrd.Children.Add(m_CompoDimension.m_InternalCompoPage) End If - DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) + DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And + Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw) MessageGrid.Visibility = Windows.Visibility.Visible BackBtn.Visibility = Windows.Visibility.Visible ' Deseleziono eventuali pezzi rimasti selezionati diff --git a/ImportPageUC.xaml.vb b/ImportPageUC.xaml.vb index 5bd857f..8662dac 100644 --- a/ImportPageUC.xaml.vb +++ b/ImportPageUC.xaml.vb @@ -504,8 +504,10 @@ Public Class ImportPageUC OkBtn.IsEnabled = True ' abilito bottone angoli su lati esterni SideAngleBtn.IsEnabled = True - DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) - DripDrillBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) + DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And + Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw) + DripDrillBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And + Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripDrill) End Sub Private Sub UseClosedCurveBtn_Click(sender As Object, e As RoutedEventArgs) Handles UseClosedCurveBtn.Click @@ -523,8 +525,10 @@ Public Class ImportPageUC OkBtn.IsEnabled = True ' abilito bottone angoli su lati esterni SideAngleBtn.IsEnabled = True - DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) - DripDrillBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) + DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And + Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw) + DripDrillBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And + Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripDrill) End Sub Private Sub UseRegionBtn_Click(sender As Object, e As RoutedEventArgs) Handles UseRegionBtn.Click @@ -542,8 +546,10 @@ Public Class ImportPageUC OkBtn.IsEnabled = True ' abilito bottone angoli su lati esterni SideAngleBtn.IsEnabled = True - DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) - DripDrillBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) + DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And + Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw) + DripDrillBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And + Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripDrill) End Sub Private Function FilterNge(bEraseNames As Boolean) As Boolean @@ -808,8 +814,10 @@ Public Class ImportPageUC m_nSelectedLayer = GDB_ID.NULL EgtDeselectAll() ' Riabilito DripCutBtn, DripDrillBtn e unità di misura - DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) - DripDrillBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) + DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And + Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw) + DripDrillBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And + Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripDrill) mmBtn.IsEnabled = True inchBtn.IsEnabled = True ' Elimino scritte angoli per input e inserisco quelle definitive @@ -850,7 +858,8 @@ Public Class ImportPageUC EgtDeselectAll() ' Riabilito SideAngleBtn, DripDrillBtn e unità di misura SideAngleBtn.IsEnabled = True - DripDrillBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) + DripDrillBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And + Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripDrill) mmBtn.IsEnabled = True inchBtn.IsEnabled = True ' Elimino scritte angoli per input e inserisco quelle definitive @@ -906,7 +915,8 @@ Public Class ImportPageUC End While ' Riabilito SideAngleBtn, DripCutBtn e unità di misura SideAngleBtn.IsEnabled = True - DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) + DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And + Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw) mmBtn.IsEnabled = True inchBtn.IsEnabled = True ' Riabilito bottone reset diff --git a/InternalComponentPageUC.xaml.vb b/InternalComponentPageUC.xaml.vb index abe8b49..92aee45 100644 --- a/InternalComponentPageUC.xaml.vb +++ b/InternalComponentPageUC.xaml.vb @@ -13,7 +13,8 @@ Public Class InternalComponentPageUC m_MainWindow.m_DrawPageUC.m_ActiveComponentPage = DrawPageUC.Pages.InternalComponent ' Abilito bottoni angoli di fianco e lavorazioni da sotto m_MainWindow.m_DrawPageUC.SideAngleBtn.IsEnabled = True - m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) + m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And + Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw) End Sub Private Function GetButton(ByVal nInd As Integer) As Button @@ -118,7 +119,8 @@ Public Class InternalComponentPageUC m_MainWindow.m_DrawPageUC.SideAngleBtn.IsChecked = False m_MainWindow.m_DrawPageUC.DripCutBtn.IsChecked = False m_MainWindow.m_DrawPageUC.SideAngleBtn.IsEnabled = True - m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) + m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And + Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw) m_MainWindow.m_DrawPageUC.MessageGrid.Visibility = Windows.Visibility.Visible m_MainWindow.m_DrawPageUC.BackBtn.Visibility = Windows.Visibility.Visible m_MainWindow.m_DrawPageUC.PartNameGrd.Visibility = Windows.Visibility.Visible @@ -193,9 +195,10 @@ Public Class InternalComponentPageUC m_MainWindow.m_DrawPageUC.m_MainComponentPage.GetPrivateProfileCompo("InternalCompo" & index, "InternalCompo" & index, nCompoName, sCompo, sCompoImage, m_MainWindow.GetIniFile()) Dim sCompoImageSource As ImageSource - ' Se foro da sotto, lo carico solo se abilitato dalla chiave - If String.Compare(sCompo, "IntDownHole.lua", True) = 0 AndAlso Not m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) Then - Continue For + ' Se foro da sotto, lo carico solo se abilitato dalla chiave e dalla macchina + If String.Compare(sCompo, "IntDownHole.lua", True) = 0 AndAlso + (Not m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) Or String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripDrill)) Then + GetButton(index).IsEnabled = False End If ' Verifico presenza immagine e la aggiungo diff --git a/MainComponentPageUC.xaml.vb b/MainComponentPageUC.xaml.vb index 488acb8..6e4412d 100644 --- a/MainComponentPageUC.xaml.vb +++ b/MainComponentPageUC.xaml.vb @@ -188,7 +188,8 @@ Public Class MainComponentPageUC m_MainWindow.m_DrawPageUC.SideAngleBtn.IsChecked = False m_MainWindow.m_DrawPageUC.DripCutBtn.IsChecked = False m_MainWindow.m_DrawPageUC.SideAngleBtn.IsEnabled = True - m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) + m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And + Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw) m_MainWindow.m_DrawPageUC.MessageGrid.Visibility = Windows.Visibility.Visible m_MainWindow.m_DrawPageUC.BackBtn.Visibility = Windows.Visibility.Visible m_MainWindow.m_DrawPageUC.TopGrd.Visibility = diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 7e2fec3..e01dd39 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -62,5 +62,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/SecondaryComponentPageUC.xaml.vb b/SecondaryComponentPageUC.xaml.vb index 774b807..f581743 100644 --- a/SecondaryComponentPageUC.xaml.vb +++ b/SecondaryComponentPageUC.xaml.vb @@ -223,7 +223,8 @@ Public Class SecondaryComponentPageUC m_MainWindow.m_DrawPageUC.SideAngleBtn.IsChecked = False m_MainWindow.m_DrawPageUC.DripCutBtn.IsChecked = False m_MainWindow.m_DrawPageUC.SideAngleBtn.IsEnabled = True - m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) + m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.UNDER_CUT) And + Not String.IsNullOrWhiteSpace(m_MainWindow.m_CurrentMachine.sCurrDripSaw) m_MainWindow.m_DrawPageUC.MessageGrid.Visibility = Windows.Visibility.Visible m_MainWindow.m_DrawPageUC.BackBtn.Visibility = Windows.Visibility.Visible m_MainWindow.m_DrawPageUC.PartNameGrd.Visibility = Windows.Visibility.Visible