diff --git a/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb index 0ace471..7222992 100644 --- a/OptionsWindow/OptionModule.vb +++ b/OptionsWindow/OptionModule.vb @@ -149,7 +149,7 @@ Friend Module OptionModule Temp = GetPrivateProfileInt(S_MACH, K_SELGEOMFIVEAXMILLING, -1) m_SelGeomFiveAxMilling = If(Temp < 0 Or Temp > 3, SceneSelModeOpt.PARTCURVESANDSURFACES, DirectCast(Temp, SceneSelModeOpt)) Temp = GetPrivateProfileInt(S_MACH, K_SELVMILLQUALITY, -1) - m_SelVMillQuality = If(Temp < -2 Or Temp > 2, VMillSelTypeOpt.HIGH, DirectCast(Temp, VMillSelTypeOpt)) + m_SelVMillQuality = If(Temp < -2 Or Temp > 2, VMillSelTypeOpt.HIGHER, DirectCast(Temp, VMillSelTypeOpt)) m_SelGeomWaterJetting = SceneSelModeOpt.PARTCURVES ' Inizializzo variabile che indica posizione nuova operazione di lavorazione m_bNewMachiningIsLastOne = (GetPrivateProfileInt(S_OPTIONS, K_NEWMACHININGISLASTONE, 0) <> 0) diff --git a/OptionsWindow/OptionWindowVM.vb b/OptionsWindow/OptionWindowVM.vb index 93fab31..5c1a47d 100644 --- a/OptionsWindow/OptionWindowVM.vb +++ b/OptionsWindow/OptionWindowVM.vb @@ -20,7 +20,7 @@ Public Class OptionWindowVM End Get End Property - Private m_VMillTypeList As ObservableCollection(Of VMillSelTypeOpt) = New ObservableCollection(Of VMillSelTypeOpt)({VMillSelTypeOpt.POOR, VMillSelTypeOpt.LOW, VMillSelTypeOpt.STANDARD, VMillSelTypeOpt.BETTER, VMillSelTypeOpt.HIGH}) + Private m_VMillTypeList As ObservableCollection(Of VMillSelTypeOpt) = New ObservableCollection(Of VMillSelTypeOpt)({VMillSelTypeOpt.LOWER, VMillSelTypeOpt.LOW, VMillSelTypeOpt.STANDARD, VMillSelTypeOpt.HIGH, VMillSelTypeOpt.HIGHER}) Public ReadOnly Property VMillTypeList As ObservableCollection(Of VMillSelTypeOpt) Get Return m_VMillTypeList @@ -1698,15 +1698,15 @@ Public Class VMillTypeConverter Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.Convert Select Case CInt(value) - Case VMillSelTypeOpt.POOR + Case VMillSelTypeOpt.LOWER Return EgtMsg(31215) Case VMillSelTypeOpt.LOW Return EgtMsg(31216) Case VMillSelTypeOpt.STANDARD Return EgtMsg(31217) - Case VMillSelTypeOpt.BETTER - Return EgtMsg(31218) Case VMillSelTypeOpt.HIGH + Return EgtMsg(31218) + Case VMillSelTypeOpt.HIGHER Return EgtMsg(31219) Case Else Return "" diff --git a/Utility/IniFile.vb b/Utility/IniFile.vb index c88edf1..2a03854 100644 --- a/Utility/IniFile.vb +++ b/Utility/IniFile.vb @@ -35,11 +35,11 @@ Public Module IniFile End Enum Public Enum VMillSelTypeOpt As Integer - POOR = -2 + LOWER = -2 LOW = -1 STANDARD = 0 - BETTER = 1 - HIGH = 2 + HIGH = 1 + HIGHER = 2 End Enum ' MainWindow Page