Egalware/icarus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Icarus :

Browse Source 
- correzione per conversioni di stringhe in double e viceversa.
This commit is contained in:
Dario Sassi
2026-03-18 18:16:47 +01:00
parent bd43571e10
commit 6d18e9eba5
7 changed files with 10 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Icarus/CurrMachiningPanel/CurrMachining.vb
+1 -1
View File
@@ -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
Icarus/FilledSolidParamPanel/FilledSolidParamPanelVM.vb
+2 -2
View File
@@ -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))
Icarus/MachiningDb/Machining.vb
+1 -1
View File
@@ -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
Icarus/MaterialDb/Material.vb
+2 -2
View File
@@ -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
Icarus/OptionsWindow/OptionWindowVM.vb
-172
View File
@@ -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
Icarus/RibParamPanel/RibParamPanelVM.vb
+2 -2
View File
@@ -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))
Icarus/ShellNumberParamPanel/ShellNumberParamPanelVM.vb
+2 -2
View File
@@ -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))