Compare commits

...

3 Commits

Author SHA1 Message Date
NicolaP 1c36907b47 Cambio versione 2022-02-17 11:13:09 +01:00
NicolaP d2e45a937e Merge commit '614756e1bb8cb0e583d961478d3c6860779b8d1d' 2022-02-17 11:10:55 +01:00
NicolaP 13f9fc9bd2 Migliorata visualizzazione lavorazioni WaterJet 2022-02-17 11:08:40 +01:00
4 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -71,7 +71,7 @@
<!--Quality-->
<ComboBox ItemsSource="{Binding CurrWaterjettingQualityList}"
SelectedItem="{Binding SelCurrWaterjettingQuality}"
Visibility="{Binding CurrWaterjettingQuality_Visibility}"
Visibility="{Binding CurrWaterjetting_Visibility}"
Margin="5,0,0,5"
Grid.Column="1">
</ComboBox>
+1 -1
View File
@@ -290,7 +290,7 @@ Public Class CurrMachWindowVM
End Set
End Property
Private m_CurrWaterjetting_Visibility As Visibility
Private m_CurrWaterjetting_Visibility As Visibility = Visibility.Collapsed
Public Property CurrWaterjetting_Visibility As Visibility
Get
Return m_CurrWaterjetting_Visibility
+2 -2
View File
@@ -195,8 +195,8 @@ Public Class MainWindowM
' Verifico abilitazione nesting automatico
m_bAutoNestOption = Not String.IsNullOrWhiteSpace( sNestKey)
' Recupero livello e opzioni della chiave
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2401, 1, m_nKeyLevel) And
EgtGetKeyOptions(9423, 2401, 1, m_nKeyOptions)
Dim bKey As Boolean = EgtGetKeyLevel(9423, 2402, 1, m_nKeyLevel) And
EgtGetKeyOptions(9423, 2402, 1, m_nKeyOptions)
' Verifico abilitazione prodotto
Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
' Inizializzazione generale di EgtInterface
+2 -2
View File
@@ -69,6 +69,6 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.4.1.3")>
<Assembly: AssemblyFileVersion("2.4.1.3")>
<Assembly: AssemblyVersion("2.4.2.1")>
<Assembly: AssemblyFileVersion("2.4.2.1")>