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

OmagOFFICE :

Browse Source 
- gestione inserimento pezzi in VeinMatching da parametrico e Csv
- correzioni e migliorie a VeinMatching
- correzioni su OpenProject.
This commit is contained in:
Dario Sassi
2017-09-07 18:22:58 +00:00
parent a4f150f105
commit b05bc34ebb
13 changed files with 308 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SideEntityControl/SideEntityControlVM.vb
+17 -20
View File
@@ -69,7 +69,7 @@ Public Class SideEntityControlVM
End Get
Set(value As String)
StringToDouble(value, m_Parameter1)
SideAngleEntity.m_Parameter1 = value
SideAngleEntity.m_Parameter1 = m_Parameter1
If m_Mode = ModeOpt.SIDEANGLE Then
' ciclo sui checkbox calcolati sul numero di lati inclinabili presenti
For Index As Integer = 0 To m_SideEntityList.Count - 1
@@ -93,7 +93,6 @@ Public Class SideEntityControlVM
' Creo le geometrie dei gocciolatoi
RefreshSideAngleText()
End If
End Set
End Property
Private Sub SetParameter1(value As Double)
@@ -103,11 +102,11 @@ Public Class SideEntityControlVM
End Sub
Private m_Parameter2 As Double
Public Property Parameter2 As Double
Public Property Parameter2 As String
Get
Return LenToString(m_Parameter2, -2)
End Get
Set(value As Double)
Set(value As String)
StringToLen(value, m_Parameter2)
End Set
End Property
@@ -117,11 +116,11 @@ Public Class SideEntityControlVM
End Sub
Private m_Parameter3 As Double
Public Property Parameter3 As Double
Public Property Parameter3 As String
Get
Return LenToString(m_Parameter3, -2)
End Get
Set(value As Double)
Set(value As String)
StringToLen(value, m_Parameter3)
End Set
End Property
@@ -229,17 +228,16 @@ Public Class SideEntityControlVM
' Aggiorno valori
If m_Mode = ModeOpt.SIDEANGLE Then
Parameter1Msg = EgtMsg(MSG_IMPORTPAGEUC + 9) ' Angolo
Dim sVal As String = String.Empty
GetMainPrivateProfileString(S_SIDES, K_SIDEANGLE, "45", sVal)
SetParameter1(sVal)
Dim dVal As Double = GetMainPrivateProfileDouble(S_SIDES, K_SIDEANGLE, "45")
SetParameter1(dVal)
Else
Parameter1Msg = EgtMsg(MSG_IMPORTPAGEUC + 10) ' Offset
m_dDripOffset = GetMainPrivateProfileDouble(S_SIDES, K_DRIPOFFSET, 20)
m_dDripDepth = GetMainPrivateProfileDouble(S_SIDES, K_DRIPDEPTH, 10)
m_dDripShort = GetMainPrivateProfileDouble(S_SIDES, K_DRIPSHORT, 0)
SetParameter1(LenToString(m_dDripOffset, 3))
SetParameter2(LenToString(m_dDripDepth, 3))
SetParameter3(LenToString(m_dDripShort, 3))
SetParameter1(m_dDripOffset)
SetParameter2(m_dDripDepth)
SetParameter3(m_dDripShort)
End If
' Nascondo layer delle misure
@@ -654,7 +652,7 @@ Public Class SideEntityControlVM
' Scrivo nuovo angolo nelle info
If dSideAngle <> 0 Then
EgtSetInfo(CurrEntity.nGeomId, INFO_SIDE_ANGLE, dSideAngle)
' Cancello inclinazione nell'apposito campo info
' Cancello inclinazione nell'apposito campo info
Else
EgtRemoveInfo(CurrEntity.nGeomId, INFO_SIDE_ANGLE)
End If
@@ -759,17 +757,16 @@ Public Class SideEntityControlVM
' Aggiorno valori
If m_Mode = ModeOpt.SIDEANGLE Then
Parameter1Msg = EgtMsg(MSG_IMPORTPAGEUC + 9) ' Angolo
Dim sVal As String = String.Empty
GetMainPrivateProfileString(S_SIDES, K_SIDEANGLE, "45", sVal)
SetParameter1(sVal)
Dim dVal As Double = GetMainPrivateProfileDouble(S_SIDES, K_SIDEANGLE, "45")
SetParameter1(dVal)
Else
Parameter1Msg = EgtMsg(MSG_IMPORTPAGEUC + 10) ' Offset
m_dDripOffset = GetMainPrivateProfileDouble(S_SIDES, K_DRIPOFFSET, 20)
m_dDripDepth = GetMainPrivateProfileDouble(S_SIDES, K_DRIPDEPTH, 10)
m_dDripShort = GetMainPrivateProfileDouble(S_SIDES, K_DRIPSHORT, 0)
SetParameter1(LenToString(m_dDripOffset, 3))
SetParameter2(LenToString(m_dDripDepth, 3))
SetParameter3(LenToString(m_dDripShort, 3))
SetParameter1(m_dDripOffset)
SetParameter2(m_dDripDepth)
SetParameter3(m_dDripShort)
End If
End Sub
@@ -793,7 +790,7 @@ Public Class SideEntityControlVM
End If
If m_Mode = ModeOpt.SIDEANGLE Then
WriteMainPrivateProfileString(S_SIDES, K_SIDEANGLE, m_Parameter1)
WriteMainPrivateProfileString(S_SIDES, K_SIDEANGLE, DoubleToString(m_Parameter1, 3))
Else
WriteMainPrivateProfileString(S_SIDES, K_DRIPOFFSET, DoubleToString(m_dDripOffset, 3))
WriteMainPrivateProfileString(S_SIDES, K_DRIPDEPTH, DoubleToString(m_dDripDepth, 3))