diff --git a/Icarus/CurrMachiningPanel/CurrMachining.vb b/Icarus/CurrMachiningPanel/CurrMachining.vb index dec2b12..ac96938 100644 --- a/Icarus/CurrMachiningPanel/CurrMachining.vb +++ b/Icarus/CurrMachiningPanel/CurrMachining.vb @@ -367,7 +367,7 @@ Public Class CurrNumericMachiningParam Public Overrides Property sValue As String Get - Return If(m_bIsLen, LenToString(m_dValue, 1), DoubleToString(m_dValue, 2)) + Return If(m_bIsLen, LenToString(m_dValue, 2), DoubleToString(m_dValue, 2)) End Get Set(value As String) Dim dTempValue As Double = 0 diff --git a/Icarus/FilledSolidParamPanel/FilledSolidParamPanelVM.vb b/Icarus/FilledSolidParamPanel/FilledSolidParamPanelVM.vb index eac4460..62ccbfe 100644 --- a/Icarus/FilledSolidParamPanel/FilledSolidParamPanelVM.vb +++ b/Icarus/FilledSolidParamPanel/FilledSolidParamPanelVM.vb @@ -166,13 +166,13 @@ Public Class FilledSolidNumericMachiningParam Public Overrides Property sValue As String Get - Return If(m_bIsLen, LenToString(m_dValue, 1), m_dValue) + Return If(m_bIsLen, LenToString(m_dValue, 2), DoubleToString(m_dValue, 2)) End Get Set(value As String) If m_bIsLen Then StringToLen(value, m_dValue) Else - m_dValue = value + StringToDouble(value, m_dValue) End If NotifyPropertyChanged(NameOf(sValue)) NotifyPropertyChanged(NameOf(bIsModifiedFromPart)) diff --git a/Icarus/MachiningDb/Machining.vb b/Icarus/MachiningDb/Machining.vb index 5d053c9..202aab1 100644 --- a/Icarus/MachiningDb/Machining.vb +++ b/Icarus/MachiningDb/Machining.vb @@ -893,7 +893,7 @@ Public Class NumericMachiningParam End Property Public Overridable Property sValue As String Get - Return If(m_bIsLen, LenToString(m_dValue, 1), DoubleToString(m_dValue, 2)) + Return If(m_bIsLen, LenToString(m_dValue, 2), DoubleToString(m_dValue, 2)) End Get Set(value As String) Dim dTempValue As Double = 0 diff --git a/Icarus/MaterialDb/Material.vb b/Icarus/MaterialDb/Material.vb index 7dac7dd..915a7fe 100644 --- a/Icarus/MaterialDb/Material.vb +++ b/Icarus/MaterialDb/Material.vb @@ -504,13 +504,13 @@ Public Class NumericMaterialParam Private m_dValue As Double Public Property dValue As String Get - Return If(m_bIsLen, LenToString(m_dValue, 1), m_dValue) + Return If(m_bIsLen, LenToString(m_dValue, 5), DoubleToString(m_dValue, 5)) End Get Set(value As String) If m_bIsLen Then StringToLen(value, m_dValue) Else - m_dValue = value + StringToDouble(value, m_dValue) End If NotifyPropertyChanged(NameOf(dValue)) End Set diff --git a/Icarus/OptionsWindow/OptionWindowVM.vb b/Icarus/OptionsWindow/OptionWindowVM.vb index da34db1..44a69de 100644 --- a/Icarus/OptionsWindow/OptionWindowVM.vb +++ b/Icarus/OptionsWindow/OptionWindowVM.vb @@ -268,152 +268,6 @@ Public Class OptionWindowVM End Set End Property - 'Public Property ImageScaleFactor As String - ' Get - ' Return LenToString(OptionModule.m_dImgScaleFactor, 5) - ' End Get - ' Set(value As String) - ' Dim dVal As Double = 0 - ' If StringToLen(value, dVal) AndAlso dVal > 0 Then - ' OptionModule.m_dImgScaleFactor = dVal - ' WritePrivateProfileString(S_IMPORT, K_IMGSCALE, DoubleToString(OptionModule.m_dImgScaleFactor, 5)) - ' Map.refProjectVM.GetController().SetScaleForImageImport(OptionModule.m_dImgScaleFactor) - ' NotifyPropertyChanged("ImageScaleFactor") - ' End If - ' End Set - 'End Property - - 'Public Property ImageWidth As String - ' Get - ' Return OptionModule.m_nImgWidth.ToString() - ' End Get - ' Set(value As String) - ' Dim nVal As Integer = 0 - ' If Integer.TryParse(value, nVal) AndAlso nVal > 0 Then - ' OptionModule.m_nImgWidth = nVal - ' WritePrivateProfileString(S_EXPORT, K_IMGWIDTH, OptionModule.m_nImgWidth.ToString()) - ' Map.refProjectVM.GetController().SetDefaultForImageExport(OptionModule.m_nImgWidth, OptionModule.m_nImgHeight) - ' End If - ' End Set - 'End Property - - 'Public Property ImageHeight As String - ' Get - ' Return OptionModule.m_nImgHeight.ToString() - ' End Get - ' Set(value As String) - ' Dim nVal As Integer = 0 - ' If Integer.TryParse(value, nVal) AndAlso nVal > 0 Then - ' OptionModule.m_nImgHeight = nVal - ' WritePrivateProfileString(S_EXPORT, K_IMGHEIGHT, OptionModule.m_nImgHeight.ToString()) - ' Map.refProjectVM.GetController().SetDefaultForImageExport(OptionModule.m_nImgWidth, OptionModule.m_nImgHeight) - ' End If - ' End Set - 'End Property - - 'Public Property ExtLineLen As String - ' Get - ' Return LenToString(OptionModule.m_dExtLineLen, 5) - ' End Get - ' Set(value As String) - ' Dim dVal As Double = 0 - ' If StringToLen(value, dVal) AndAlso dVal > 0 Then - ' OptionModule.m_dExtLineLen = dVal - ' EgtSetCurrDimensionStyle(m_dExtLineLen, m_dArrowLen, m_dTextDist, m_nLenIsMM, m_nDecDigit, m_sFont, m_dTextHeight) - ' WritePrivateProfileString(S_DIMENSIONSTYLE, K_EXTLINELEN, DoubleToString(OptionModule.m_dExtLineLen, 5)) - ' End If - ' End Set - 'End Property - - 'Public Property ArrowLen As String - ' Get - ' Return LenToString(OptionModule.m_dArrowLen, 5) - ' End Get - ' Set(value As String) - ' Dim dVal As Double = 0 - ' If StringToLen(value, dVal) AndAlso dVal > 0 Then - ' OptionModule.m_dArrowLen = dVal - ' EgtSetCurrDimensionStyle(m_dExtLineLen, m_dArrowLen, m_dTextDist, m_nLenIsMM, m_nDecDigit, m_sFont, m_dTextHeight) - ' WritePrivateProfileString(S_DIMENSIONSTYLE, K_ARROWLEN, DoubleToString(OptionModule.m_dArrowLen, 5)) - ' End If - ' End Set - 'End Property - - 'Public Property TextDist As String - ' Get - ' Return LenToString(OptionModule.m_dTextDist, 5) - ' End Get - ' Set(value As String) - ' Dim dVal As Double = 0 - ' If StringToLen(value, dVal) AndAlso dVal > 0 Then - ' OptionModule.m_dTextDist = dVal - ' EgtSetCurrDimensionStyle(m_dExtLineLen, m_dArrowLen, m_dTextDist, m_nLenIsMM, m_nDecDigit, m_sFont, m_dTextHeight) - ' WritePrivateProfileString(S_DIMENSIONSTYLE, K_TEXTDIST, DoubleToString(OptionModule.m_dTextDist, 5)) - ' End If - ' End Set - 'End Property - - 'Public Property SelectedUnitMeasure As String - ' Get - ' If OptionModule.m_nLenIsMM = 0 Then - ' Return "inch" - ' ElseIf OptionModule.m_nLenIsMM = 1 Then - ' Return "mm" - ' Else - ' Return EgtMsg(MSG_OPTIONPAGE + 45) - ' End If - ' End Get - ' Set(value As String) - ' Dim nVal As Integer = 2 - ' If value = "inch" Then - ' nVal = 0 - ' ElseIf value = "mm" Then - ' nVal = 1 - ' End If - ' OptionModule.m_nLenIsMM = nVal - ' EgtSetCurrDimensionStyle(m_dExtLineLen, m_dArrowLen, m_dTextDist, m_nLenIsMM, m_nDecDigit, m_sFont, m_dTextHeight) - ' WritePrivateProfileString(S_DIMENSIONSTYLE, K_LENISMM, OptionModule.m_nLenIsMM.ToString()) - ' End Set - 'End Property - - 'Public Property DecDigit As String - ' Get - ' Return OptionModule.m_nDecDigit.ToString() - ' End Get - ' Set(value As String) - ' Dim nVal As Integer = 0 - ' If Integer.TryParse(value, nVal) AndAlso nVal > 0 Then - ' OptionModule.m_nDecDigit = nVal - ' EgtSetCurrDimensionStyle(m_dExtLineLen, m_dArrowLen, m_dTextDist, m_nLenIsMM, m_nDecDigit, m_sFont, m_dTextHeight) - ' WritePrivateProfileString(S_DIMENSIONSTYLE, K_DECDIGIT, OptionModule.m_nDecDigit.ToString()) - ' End If - ' End Set - 'End Property - - 'Public Property SelectedFont As String - ' Get - ' Return m_FontList(m_FontList.IndexOf(OptionModule.m_sFont)) - ' End Get - ' Set(value As String) - ' OptionModule.m_sFont = value - ' EgtSetCurrDimensionStyle(m_dExtLineLen, m_dArrowLen, m_dTextDist, m_nLenIsMM, m_nDecDigit, m_sFont, m_dTextHeight) - ' WritePrivateProfileString(S_DIMENSIONSTYLE, K_DIMFONT, OptionModule.m_sFont) - ' End Set - 'End Property - - 'Public Property TextHeight As String - ' Get - ' Return LenToString(OptionModule.m_dTextHeight, 5) - ' End Get - ' Set(value As String) - ' Dim dVal As Double = 0 - ' If StringToLen(value, dVal) AndAlso dVal > 0 Then - ' OptionModule.m_dTextHeight = dVal - ' EgtSetCurrDimensionStyle(m_dExtLineLen, m_dArrowLen, m_dTextDist, m_nLenIsMM, m_nDecDigit, m_sFont, m_dTextHeight) - ' WritePrivateProfileString(S_DIMENSIONSTYLE, K_TEXTHEIGHT, DoubleToString(OptionModule.m_dTextHeight, 5)) - ' End If - ' End Set - 'End Property Private m_DXFScaleEnable As Boolean = False Public Property DXFScaleEnable As Boolean @@ -498,32 +352,6 @@ Public Class OptionWindowVM End Set End Property - 'Public Property SelectedImageScale As String - ' Get - ' If Math.Abs(OptionModule.m_dImgScaleFactor - ONEMM) < EPS_SMALL * 10 Then - ' Return ScaleImageList(ScaleImageList.IndexOf("mm")) - ' ElseIf Math.Abs(OptionModule.m_dImgScaleFactor - ONEINCH) < EPS_SMALL * 10 Then - ' Return ScaleImageList(ScaleImageList.IndexOf("inch")) - ' Else - ' ImageScaleEnable = True - ' Return ScaleImageList(ScaleImageList.IndexOf(EgtMsg(6546))) - ' ImageScaleEnable = True - ' End If - ' End Get - ' Set(value As String) - ' If value = "mm" Then - ' ImageScaleFactor = LenToString(ONEMM, 3) - ' ImageScaleEnable = False - ' ElseIf value = "inch" Then - ' ImageScaleFactor = LenToString(ONEINCH, 4) - ' ImageScaleEnable = False - ' Else - ' ImageScaleFactor = LenToString(OptionModule.m_dImgScaleFactor, 4) - ' ImageScaleEnable = True - ' End If - ' End Set - 'End Property - ' Definizione comandi Private m_cmdTopSceneBackground As ICommand diff --git a/Icarus/RibParamPanel/RibParamPanelVM.vb b/Icarus/RibParamPanel/RibParamPanelVM.vb index 35ac420..761bea6 100644 --- a/Icarus/RibParamPanel/RibParamPanelVM.vb +++ b/Icarus/RibParamPanel/RibParamPanelVM.vb @@ -197,13 +197,13 @@ Public Class RibNumericMachiningParam Public Overrides Property sValue As String Get - Return If(m_bIsLen, LenToString(m_dValue, 1), m_dValue) + Return If(m_bIsLen, LenToString(m_dValue, 2), DoubleToString(m_dValue, 2)) End Get Set(value As String) If m_bIsLen Then StringToLen(value, m_dValue) Else - m_dValue = value + StringToDouble(value, m_dValue) End If NotifyPropertyChanged(NameOf(sValue)) NotifyPropertyChanged(NameOf(bIsModifiedFromPart)) diff --git a/Icarus/ShellNumberParamPanel/ShellNumberParamPanelVM.vb b/Icarus/ShellNumberParamPanel/ShellNumberParamPanelVM.vb index f516bda..cda5268 100644 --- a/Icarus/ShellNumberParamPanel/ShellNumberParamPanelVM.vb +++ b/Icarus/ShellNumberParamPanel/ShellNumberParamPanelVM.vb @@ -135,13 +135,13 @@ Public Class ShellNumberNumericMachiningParam Public Overrides Property sValue As String Get - Return If(m_bIsLen, LenToString(m_dValue, 1), m_dValue) + Return If(m_bIsLen, LenToString(m_dValue, 2), DoubleToString(m_dValue, 2)) End Get Set(value As String) If m_bIsLen Then StringToLen(value, m_dValue) Else - m_dValue = value + StringToDouble(value, m_dValue) End If NotifyPropertyChanged(NameOf(sValue)) NotifyPropertyChanged(NameOf(bIsModifiedFromPart))