diff --git a/Constants/ConstCompo.vb b/Constants/ConstCompo.vb index a47eb07..a63d602 100644 --- a/Constants/ConstCompo.vb +++ b/Constants/ConstCompo.vb @@ -14,6 +14,8 @@ Module ConstCompo ' Sezioni e chiavi standard del file DDF + Public Const S_GENERALINI As String = "General" + Public Const K_MMUNITSINI As String = "MmUnits" Public Const S_PRODUCE As String = "produce" Public Const S_MEASURES As String = "measures" Public Const S_CODE As String = "code" diff --git a/DdfFile.vb b/DdfFile.vb index b3b9bd2..6bd790b 100644 --- a/DdfFile.vb +++ b/DdfFile.vb @@ -409,7 +409,7 @@ Friend Module DdfFile Return Else sVal = Part.Width - ConvertCurrentUnitMeasure(sVal) + ' ConvertCurrentUnitMeasure(sVal) 'Part.SetWidth(sVal) If bIsDDF Then 'DdfFileContent.Add(ConstCompo.DDF_SPACE3 & ConstCompo.K_WIDTH & ": " & DoubleToString(dVal, 5)) @@ -425,7 +425,7 @@ Friend Module DdfFile Return Else sVal = Part.Height - ConvertCurrentUnitMeasure(sVal) + ' ConvertCurrentUnitMeasure(sVal) 'Part.SetHeight(sVal) If bIsDDF Then 'DdfFileContent.Add(ConstCompo.DDF_SPACE3 & ConstCompo.K_HEIGHT & ": " & DoubleToString(dVal, 5)) @@ -442,7 +442,7 @@ Friend Module DdfFile Return Else sVal = Part.Thickness - ConvertCurrentUnitMeasure(sVal) + ' ConvertCurrentUnitMeasure(sVal) 'Part.SetThickness(sVal) If bIsDDF Then 'DdfFileContent.Add(ConstCompo.DDF_SPACE3 & ConstCompo.K_THICKNESS & ": " & DoubleToString(dVal, 5)) @@ -476,7 +476,7 @@ Friend Module DdfFile Return Else sVal = Part.LockEdgeOverMaterial - ConvertCurrentUnitMeasure(sVal) + ' ConvertCurrentUnitMeasure(sVal) If bIsDDF Then 'DdfFileContent.Add(ConstCompo.DDF_SPACE5 & ConstCompo.K_OVERMATERIAL & ": " & DoubleToString(dVal, 5)) DdfFileContent.Add(ConstCompo.DDF_SPACE5 & ConstCompo.K_OVERMATERIAL & ": " & sVal) @@ -508,7 +508,7 @@ Friend Module DdfFile Return Else sVal = Part.TopOverMaterial - ConvertCurrentUnitMeasure(sVal) + ' ConvertCurrentUnitMeasure(sVal) If bIsDDF Then 'DdfFileContent.Add(ConstCompo.DDF_SPACE5 & ConstCompo.K_OVERMATERIAL & ": " & DoubleToString(dVal, 5)) DdfFileContent.Add(ConstCompo.DDF_SPACE5 & ConstCompo.K_OVERMATERIAL & ": " & sVal) @@ -524,7 +524,7 @@ Friend Module DdfFile Return Else sVal = Part.BottomOverMaterial - ConvertCurrentUnitMeasure(sVal) + ' ConvertCurrentUnitMeasure(sVal) If bIsDDF Then 'DdfFileContent.Add(ConstCompo.DDF_SPACE5 & ConstCompo.K_OVERMATERIAL & ": " & DoubleToString(dVal, 5)) DdfFileContent.Add(ConstCompo.DDF_SPACE5 & ConstCompo.K_OVERMATERIAL & ": " & sVal) diff --git a/DoorParameters/Compo.vb b/DoorParameters/Compo.vb index c9a1672..682d3ba 100644 --- a/DoorParameters/Compo.vb +++ b/DoorParameters/Compo.vb @@ -978,18 +978,13 @@ Public Class Compo End If ' recupero il valore di default Dim dHeight As Double = 500 ' Attenzione ai mm - Dim dDefaultValue As Double - If StringToDouble(sItems(2), dDefaultValue) AndAlso dDefaultValue < dHeight Then - 'Dim sDefaultValue As String = DoubleToString(dDefaultValue, 5) - NewCompoParam = New TextBoxParam(sDDFName, sName, Me, Trim(sItems(2)), Nothing, Nothing) - Return True - Else - NewCompoParam = New TextBoxParam(sDDFName, sName, Me, "0.000", Nothing, Nothing) - ' Errore nell'espressione {0}. {1} non associa nulla. - sErrorList = ConcatErrorString(sErrorList, String.Format(EgtMsg(50147), NewCompoParam.Name, sItems(2))) - Return True + If Not ConvertCompoConfig(sItems(2), dHeight) Then + sErrorList = ConcatErrorString(sErrorList, String.Format(EgtMsg(50147), sName, sItems(2))) End If + NewCompoParam = New TextBoxParam(sDDFName, sName, Me, sItems(2), Nothing, Nothing) + Return True + Case INI_TEXTBOX_ONOFF ' NomeDDF e Nome del Text Dim sTextList() As String = sItems(1).Split("/"c) @@ -1015,19 +1010,16 @@ Public Class Compo If sItems.Count > 3 AndAlso StringToDouble(sItems(3), nActibeBox) AndAlso nActibeBox = 0 Then bActiveBox = False End If + ' recupero il valore di default Dim dHeight As Double = 500 ' Attenzione ai mm - Dim dDefaultValue As Double - If StringToDouble(sItems(2), dDefaultValue) AndAlso dDefaultValue < dHeight Then - 'Dim sDefaultValue As String = DoubleToString(dDefaultValue, 5) - NewCompoParam = New TextBoxOnOffParam(sDDFName, sName, Me, Trim(sItems(2)), Nothing, Nothing, "", "", bActiveBox) - Return True - Else - NewCompoParam = New TextBoxOnOffParam(sDDFName, sName, Me, "0.000", Nothing, Nothing, "", "", bActiveBox) - ' Errore nell'espressione {0}. {1} non associa nulla. - sErrorList = ConcatErrorString(sErrorList, String.Format(EgtMsg(50147), NewCompoParam.Name, sItems(2))) - Return True + If Not ConvertCompoConfig(sItems(2), dHeight) Then + sErrorList = ConcatErrorString(sErrorList, String.Format(EgtMsg(50147), sName, sItems(2))) End If + + NewCompoParam = New TextBoxOnOffParam(sDDFName, sName, Me, sItems(2), Nothing, Nothing, "", "", bActiveBox) + Return True + End Select Return False End Function @@ -1227,7 +1219,6 @@ Public Class Compo ' recupero il valore di default Dim dHeight As Double = 500 ' Attenzione ai mm Dim dDefaultValue As Double = 0.0 - Dim sTypeValue As String = String.Empty Dim sValue As String = String.Empty Dim sValueList() As String = sItems(2).Split("/"c) @@ -1717,6 +1708,7 @@ Public Class Compo ReadValue = sValue.Replace(ReadValue & ")", "H") ReadValue = RegexFunction.Brackets(ReadValue) End If + Utility.ConvertCurrentUnitMeasure(ReadValue) TempParam.SetValue(ReadValue) TempParam.SetIsActive(True) Return True @@ -1735,6 +1727,7 @@ Public Class Compo ReadValue = sValue.Replace(ReadValue & ")", "H") ReadValue = RegexFunction.Brackets(ReadValue) End If + Utility.ConvertCurrentUnitMeasure(ReadValue) TempParam.SetValue(ReadValue) Return True ElseIf TypeOf CurrCompoParam Is ComboBoxOnOffParam Then @@ -1747,7 +1740,6 @@ Public Class Compo Exit For End If Next - Return True ElseIf TypeOf CurrCompoParam Is ComboBoxParam Then Dim TempParam As ComboBoxParam = DirectCast(CurrCompoParam, ComboBoxParam) diff --git a/IniFile.vb b/IniFile.vb index 64e74e1..6d74b05 100644 --- a/IniFile.vb +++ b/IniFile.vb @@ -153,6 +153,18 @@ Friend Module IniFile Return IpBoolean End Function + ' restituisce il l'unità di misura della configurazione + Public Function DefaultGetMmUnits(ByVal lpAppName As String, ByVal lpKeyName As String, ByRef IsMM As Boolean) As Boolean + Dim sVal As String = String.Empty + DefaultGetPrivateProfileString(lpAppName, lpKeyName, "", sVal) + If String.Equals(Trim(sVal), "1") Then + IsMM = True + Else + IsMM = False + End If + Return IsMM + End Function + Public Function DefaultGetPrivateProfilesVisibility(ByVal lpAppName As String, ByVal lpKeyName As String, ByRef IpVisibility As Visibility) As Visibility Dim sVal As String = String.Empty DefaultGetPrivateProfileString(lpAppName, lpKeyName, "", sVal) diff --git a/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb index 2e2f1d2..a5116e4 100644 --- a/OptionsWindow/OptionModule.vb +++ b/OptionsWindow/OptionModule.vb @@ -89,6 +89,8 @@ Friend Module OptionModule Friend m_Disposition As New EdgeType(ConstGen.BEVEL_BYSWING, Visibility.Visible) Friend m_sDisposition As String = ConstGen.BEVEL_BYSWING + Friend m_IsMM As Boolean = False + Friend m_ThicknessJamb As String Friend m_WidthJamb As String Friend m_LightUp As String @@ -283,18 +285,25 @@ Friend Module OptionModule If PropertyList.Count > 0 Then LoadPropertiesList(PropertyList, m_PropertListJamb) ' Leggo le dimensioni della porta dal file Default.ini + Dim IsMM As Boolean = False + DefaultGetMmUnits(ConstCompo.S_GENERALINI, ConstCompo.K_MMUNITSINI, IsMM) + m_IsMM = IsMM + Dim Width As String = String.Empty DefaultGetPrivateProfileString(S_SIZE_INI, K_WIDTH_INI, "32", Width) + Utility.ConvertCompoConfig(Width, 500) m_Width = Width Dim dWidth As Double If StringToDouble(m_Width, dWidth) Then EgtLuaSetGlobNumVar("W", dWidth) Dim Height As String = String.Empty DefaultGetPrivateProfileString(S_SIZE_INI, K_HEIGHT_INI, "80", Height) + Utility.ConvertCompoConfig(Height, 500) m_Height = Height Dim dHeight As Double If StringToDouble(m_Height, dHeight) Then EgtLuaSetGlobNumVar("H", dHeight) Dim Thickness As String = String.Empty DefaultGetPrivateProfileString(S_SIZE_INI, K_THICKNESS_INI, "1.75", Thickness) + Utility.ConvertCompoConfig(Thickness, 100) m_Thickness = Thickness Dim dThickness As Double If StringToDouble(m_Thickness, dThickness) Then EgtLuaSetGlobNumVar("T", dThickness) @@ -375,15 +384,19 @@ Friend Module OptionModule ' carico i valori di overmaterial Dim LockEdgeOverMaterial As String = String.Empty DefaultGetPrivateProfileString(S_OVERMATERIAL, K_LOCKEDGEOVERMATERIAL_INI, "", LockEdgeOverMaterial) + Utility.ConvertCompoConfig(LockEdgeOverMaterial, 100) m_LockEdgeOverMaterial = LockEdgeOverMaterial Dim HingeEdgeOverMaterial As String = String.Empty DefaultGetPrivateProfileString(S_OVERMATERIAL, K_HINGEDGEOVERMATERIAL_INI, "", HingeEdgeOverMaterial) + Utility.ConvertCompoConfig(HingeEdgeOverMaterial, 100) m_HingeEdgeOverMaterial = HingeEdgeOverMaterial Dim TopOverMaterial As String = String.Empty DefaultGetPrivateProfileString(S_OVERMATERIAL, K_TOPOVERMATERIAL_INI, "", TopOverMaterial) + Utility.ConvertCompoConfig(TopOverMaterial, 100) m_TopOverMaterial = TopOverMaterial Dim BottomOverMaterial As String = String.Empty DefaultGetPrivateProfileString(S_OVERMATERIAL, K_BOTTOMOVERMATERIAL_INI, "", BottomOverMaterial) + Utility.ConvertCompoConfig(BottomOverMaterial, 100) m_BottomOverMaterial = BottomOverMaterial ' carico l'ordinamento delle componenti DefaultGetPrivateProfileList(S_COMPOORDER, K_COMPOORDER_INI, DdfFile.CompoListOrder) @@ -429,22 +442,28 @@ Friend Module OptionModule Dim ThicknessJamb As String = String.Empty DefaultGetPrivateProfileString(S_SIZEJAMB, K_THICKNESS, "25", ThicknessJamb) + Utility.ConvertCompoConfig(ThicknessJamb, 100) m_ThicknessJamb = ThicknessJamb Dim WidthJamb As String = String.Empty DefaultGetPrivateProfileString(S_SIZEJAMB, K_WIDTH, "25", WidthJamb) + Utility.ConvertCompoConfig(WidthJamb, 100) m_WidthJamb = WidthJamb Dim LightUp As String = String.Empty DefaultGetPrivateProfileString(S_LIGHT, K_LIGHTUP, "25", LightUp) + Utility.ConvertCompoConfig(LightUp, 100) m_LightUp = LightUp Dim LightLock As String = String.Empty DefaultGetPrivateProfileString(S_LIGHT, K_LIGHTLOCK, "25", LightLock) + Utility.ConvertCompoConfig(LightLock, 100) m_LightLock = LightLock Dim LightHinge As String = String.Empty DefaultGetPrivateProfileString(S_LIGHT, K_LIGHTHINGE, "25", LightHinge) + Utility.ConvertCompoConfig(LightHinge, 100) m_LightHinge = LightHinge Dim LightBottom As String = String.Empty DefaultGetPrivateProfileString(S_LIGHT, K_LIGHTBOTTOM, "25", LightBottom) + Utility.ConvertCompoConfig(LightBottom, 100) m_LightBottom = LightBottom DefaultGetPrivateProfileList(S_DOORSNUMBER, K_DOORSLISTNUMBER, m_DoorsListNumber) Dim DoorsNumber As String = String.Empty @@ -452,21 +471,26 @@ Friend Module OptionModule m_DoorsNumber = DoorsNumber Dim ThicknessHead As String = String.Empty DefaultGetPrivateProfileString(S_OVERLAP, K_THICKNESSHEAD, "0", ThicknessHead) + Utility.ConvertCompoConfig(ThicknessHead, 100) m_ThicknessHead = ThicknessHead Dim OverlapHinge As String = String.Empty DefaultGetPrivateProfileString(S_OVERLAP, K_OVERLAPHINGE, "0", OverlapHinge) + Utility.ConvertCompoConfig(OverlapHinge, 100) m_OverlapHinge = OverlapHinge Dim OverlapLock As String = String.Empty DefaultGetPrivateProfileString(S_OVERLAP, K_OVERLAPLOCK, "0", OverlapLock) + Utility.ConvertCompoConfig(OverlapLock, 100) m_OverlapLock = OverlapLock Dim Exterior As Boolean = False DefaultGetPrivateProfilesMachining(S_OVERLAP, K_EXTERIOR, Exterior) m_Exterior = Exterior Dim OverlapTop As String = String.Empty DefaultGetPrivateProfileString(S_OVERLAP, K_OVERLAPTOP, "0", OverlapTop) + Utility.ConvertCompoConfig(OverlapTop, 100) m_OverlapTop = OverlapTop Dim DeltaT As String = String.Empty DefaultGetPrivateProfileString(S_OVERLAP, K_DELTAT, "0", DeltaT) + Utility.ConvertCompoConfig(DeltaT, 100) m_DeltaThickness = DeltaT Dim TotalDim As Boolean = False @@ -474,9 +498,11 @@ Friend Module OptionModule m_TotalDimension = TotalDim Dim TotalH As String = String.Empty DefaultGetPrivateProfileString(S_TOTALDIMENSION, K_TOTALHEIGHT, "82", TotalH) + Utility.ConvertCompoConfig(TotalH, 100) m_TotalHeight = TotalH Dim TotalW As String = String.Empty DefaultGetPrivateProfileString(S_TOTALDIMENSION, K_TOTALWIDTH, "38", TotalW) + Utility.ConvertCompoConfig(TotalW, 100) m_TotalWidth = TotalW Dim TopChk As Boolean = False @@ -536,16 +562,20 @@ Friend Module OptionModule m_BottomMachiningAssembly = BottomMachiningAss ' carico i valori di overmaterial Dim LockEdgeOverMaterialAss As String = String.Empty - DefaultGetPrivateProfileString(S_OVERMATERIALASSEMBLY, K_LOCKEDGEOVERMATERIAL_INI, "", LockEdgeOverMaterialAss) + DefaultGetPrivateProfileString(S_OVERMATERIALASSEMBLY, K_LOCKEDGEOVERMATERIAL_INI, "0", LockEdgeOverMaterialAss) + Utility.ConvertCompoConfig(LockEdgeOverMaterialAss, 100) m_LockEdgeOverMaterialAssembly = LockEdgeOverMaterialAss Dim HingeEdgeOverMaterialAss As String = String.Empty - DefaultGetPrivateProfileString(S_OVERMATERIALASSEMBLY, K_HINGEDGEOVERMATERIAL_INI, "", HingeEdgeOverMaterialAss) + DefaultGetPrivateProfileString(S_OVERMATERIALASSEMBLY, K_HINGEDGEOVERMATERIAL_INI, "0", HingeEdgeOverMaterialAss) + Utility.ConvertCompoConfig(HingeEdgeOverMaterialAss, 100) m_HingeEdgeOverMaterialAssembly = HingeEdgeOverMaterialAss Dim TopOverMaterialAss As String = String.Empty - DefaultGetPrivateProfileString(S_OVERMATERIALASSEMBLY, K_TOPOVERMATERIAL_INI, "", TopOverMaterialAss) + DefaultGetPrivateProfileString(S_OVERMATERIALASSEMBLY, K_TOPOVERMATERIAL_INI, "0", TopOverMaterialAss) + Utility.ConvertCompoConfig(TopOverMaterialAss, 100) m_TopOverMaterialAssembly = TopOverMaterialAss Dim BottomOverMaterialAss As String = String.Empty - DefaultGetPrivateProfileString(S_OVERMATERIALASSEMBLY, K_BOTTOMOVERMATERIAL_INI, "", BottomOverMaterialAss) + DefaultGetPrivateProfileString(S_OVERMATERIALASSEMBLY, K_BOTTOMOVERMATERIAL_INI, "0", BottomOverMaterialAss) + Utility.ConvertCompoConfig(BottomOverMaterialAss, 100) m_BottomOverMaterialAssembly = BottomOverMaterialAss ' Lista messaggi per launcher diff --git a/OptionsWindow/OptionsViewModel.vb b/OptionsWindow/OptionsViewModel.vb index 4196cab..20ccc4c 100644 --- a/OptionsWindow/OptionsViewModel.vb +++ b/OptionsWindow/OptionsViewModel.vb @@ -143,7 +143,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_Width = value - DefaultWritePrivateProfileString(S_SIZE, K_WIDTH_INI, OptionModule.m_Width) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_SIZE, K_WIDTH_INI, value) End Set End Property @@ -153,7 +154,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_Height = value - DefaultWritePrivateProfileString(S_SIZE, K_HEIGHT_INI, OptionModule.m_Height) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_SIZE, K_HEIGHT_INI, value) End Set End Property @@ -163,7 +165,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_Thickness = value - DefaultWritePrivateProfileString(S_SIZE, K_THICKNESS_INI, OptionModule.m_Thickness) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_SIZE, K_THICKNESS_INI, value) End Set End Property @@ -395,7 +398,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_LockEdgeOverMaterial = value - DefaultWritePrivateProfileString(S_OVERMATERIAL, K_LOCKEDGEOVERMATERIAL_INI, OptionModule.m_LockEdgeOverMaterial) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_OVERMATERIAL, K_LOCKEDGEOVERMATERIAL_INI, value) End Set End Property @@ -405,7 +409,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_HingeEdgeOverMaterial = value - DefaultWritePrivateProfileString(S_OVERMATERIAL, K_HINGEDGEOVERMATERIAL_INI, OptionModule.m_HingeEdgeOverMaterial) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_OVERMATERIAL, K_HINGEDGEOVERMATERIAL_INI, value) End Set End Property @@ -415,7 +420,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_TopOverMaterial = value - DefaultWritePrivateProfileString(S_OVERMATERIAL, K_TOPOVERMATERIAL_INI, OptionModule.m_TopOverMaterial) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_OVERMATERIAL, K_TOPOVERMATERIAL_INI, value) End Set End Property @@ -425,7 +431,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_BottomOverMaterial = value - DefaultWritePrivateProfileString(S_OVERMATERIAL, K_BOTTOMOVERMATERIAL_INI, OptionModule.m_BottomOverMaterial) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_OVERMATERIAL, K_BOTTOMOVERMATERIAL_INI, value) End Set End Property @@ -469,7 +476,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_LightUp = value - DefaultWritePrivateProfileString(S_LIGHT, K_LIGHTUP, OptionModule.m_LightUp) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_LIGHT, K_LIGHTUP, value) End Set End Property @@ -479,8 +487,9 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_LightBottom = value + ConvertToCompoConfig(value) ' modifico le dimensioni dei Jambs - DefaultWritePrivateProfileString(S_LIGHT, K_LIGHTBOTTOM, OptionModule.m_LightBottom) + DefaultWritePrivateProfileString(S_LIGHT, K_LIGHTBOTTOM, value) End Set End Property @@ -490,7 +499,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_LightHinge = value - DefaultWritePrivateProfileString(S_LIGHT, K_LIGHTHINGE, OptionModule.m_LightHinge) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_LIGHT, K_LIGHTHINGE, value) End Set End Property @@ -500,7 +510,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_LightLock = value - DefaultWritePrivateProfileString(S_LIGHT, K_LIGHTLOCK, OptionModule.m_LightLock) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_LIGHT, K_LIGHTLOCK, value) End Set End Property @@ -511,7 +522,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_ThicknessHead = value - DefaultWritePrivateProfileString(S_OVERLAP, K_THICKNESSHEAD, OptionModule.m_ThicknessHead) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_OVERLAP, K_THICKNESSHEAD, value) End Set End Property @@ -521,7 +533,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_OverlapHinge = value - DefaultWritePrivateProfileString(S_OVERLAP, K_OVERLAPHINGE, OptionModule.m_OverlapHinge) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_OVERLAP, K_OVERLAPHINGE, value) End Set End Property @@ -531,7 +544,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_OverlapLock = value - DefaultWritePrivateProfileString(S_OVERLAP, K_OVERLAPLOCK, OptionModule.m_OverlapLock) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_OVERLAP, K_OVERLAPLOCK, value) End Set End Property @@ -541,7 +555,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_OverlapTop = value - DefaultWritePrivateProfileString(S_OVERLAP, K_OVERLAPTOP, OptionModule.m_OverlapTop) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_OVERLAP, K_OVERLAPTOP, value) End Set End Property @@ -551,7 +566,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_DeltaThickness = value - DefaultWritePrivateProfileString(S_OVERLAP, K_DELTAT, OptionModule.m_DeltaThickness) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_OVERLAP, K_DELTAT, value) End Set End Property @@ -654,7 +670,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_ThicknessJamb = value - DefaultWritePrivateProfileString(S_SIZEJAMB, K_THICKNESS, OptionModule.m_ThicknessJamb) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_SIZEJAMB, K_THICKNESS, value) End Set End Property @@ -664,7 +681,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_WidthJamb = value - DefaultWritePrivateProfileString(S_SIZEJAMB, K_WIDTH, OptionModule.m_WidthJamb) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_SIZEJAMB, K_WIDTH, value) End Set End Property @@ -756,7 +774,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_LockEdgeOverMaterialAssembly = value - DefaultWritePrivateProfileString(S_OVERMATERIALASSEMBLY, K_LOCKEDGEOVERMATERIAL_INI, OptionModule.m_LockEdgeOverMaterialAssembly) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_OVERMATERIALASSEMBLY, K_LOCKEDGEOVERMATERIAL_INI, value) End Set End Property @@ -780,7 +799,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_HingeEdgeOverMaterialAssembly = value - DefaultWritePrivateProfileString(S_OVERMATERIALASSEMBLY, K_HINGEDGEOVERMATERIAL_INI, OptionModule.m_HingeEdgeOverMaterialAssembly) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_OVERMATERIALASSEMBLY, K_HINGEDGEOVERMATERIAL_INI, value) End Set End Property @@ -804,7 +824,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_TopOverMaterialAssembly = value - DefaultWritePrivateProfileString(S_OVERMATERIALASSEMBLY, K_TOPOVERMATERIAL_INI, OptionModule.m_TopOverMaterialAssembly) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_OVERMATERIALASSEMBLY, K_TOPOVERMATERIAL_INI, value) End Set End Property @@ -828,7 +849,8 @@ Public Class OptionsVM End Get Set(value As String) OptionModule.m_BottomOverMaterialAssembly = value - DefaultWritePrivateProfileString(S_OVERMATERIALASSEMBLY, K_BOTTOMOVERMATERIAL_INI, OptionModule.m_BottomOverMaterialAssembly) + ConvertToCompoConfig(value) + DefaultWritePrivateProfileString(S_OVERMATERIALASSEMBLY, K_BOTTOMOVERMATERIAL_INI, value) End Set End Property diff --git a/Utility.vb b/Utility.vb index d4e7e73..e339780 100644 --- a/Utility.vb +++ b/Utility.vb @@ -267,6 +267,69 @@ Public Module Utility #End Region ' Param lua + ' conevrsione in lettura dei valori delle textbox nel DoorCreator + Friend Function ConvertCompoConfig(ByRef sItems As String, ByRef dControlValue As Double) As Boolean + Dim dDefaultValue As Double = 0 + If OptionModule.m_SelectedMeasureUnit = ConstGen.VAL_INCHES And Not OptionModule.m_IsMM Then + ' Concordi = Inches + If StringToLen(sItems, dDefaultValue) AndAlso dDefaultValue < dControlValue Then + sItems = Trim(sItems) + Return True + End If + ElseIf OptionModule.m_SelectedMeasureUnit = ConstGen.VAL_INCHES And OptionModule.m_IsMM Then + ' Discordi + If StringToLen(sItems, dDefaultValue) AndAlso dDefaultValue < dControlValue Then + MmToInches(sItems) + Return True + End If + ElseIf OptionModule.m_SelectedMeasureUnit = ConstGen.MM And Not OptionModule.m_IsMM Then + ' Discordi + dControlValue = dControlValue * 25.4 + If StringToLen(sItems, dDefaultValue) AndAlso dDefaultValue < dControlValue Then + InchesToMm(sItems) + Return True + End If + ElseIf OptionModule.m_SelectedMeasureUnit = ConstGen.MM And OptionModule.m_IsMM Then + ' Concordi = MM + dControlValue = dControlValue * 25.4 + If StringToLen(sItems, dDefaultValue) AndAlso dDefaultValue < dControlValue Then + sItems = Trim(sItems) + Return True + End If + End If + Return False + End Function + + Friend Function ConvertToCompoConfig(ByRef sItems As String) As Boolean + Dim dDefaultValue As Double = 0 + If OptionModule.m_SelectedMeasureUnit = ConstGen.VAL_INCHES And Not OptionModule.m_IsMM Then + ' Concordi = Inches + If StringToLen(sItems, dDefaultValue) Then + sItems = Trim(sItems) + Return True + End If + ElseIf OptionModule.m_SelectedMeasureUnit = ConstGen.VAL_INCHES And OptionModule.m_IsMM Then + ' Discordi + If StringToLen(sItems, dDefaultValue) Then + InchesToMm(sItems) + Return True + End If + ElseIf OptionModule.m_SelectedMeasureUnit = ConstGen.MM And Not OptionModule.m_IsMM Then + ' Discordi + If StringToLen(sItems, dDefaultValue) Then + MmToInches(sItems) + Return True + End If + ElseIf OptionModule.m_SelectedMeasureUnit = ConstGen.MM And OptionModule.m_IsMM Then + ' Concordi = MM + If StringToLen(sItems, dDefaultValue) Then + sItems = Trim(sItems) + Return True + End If + End If + Return False + End Function + ' Converte il valore Boolean in una stringa ON/OFF (attributo machining) Friend Function ConvertBooleanToOnOff(bValue As Boolean) As String Return If(bValue, DDF_ON, DDF_OFF)