EgtDOORCreator 1.9g1 :

- ripristino della modalità assemblato
- aggiunta del campo properties nel ddf 
- semplificazione del codice in modalità porta singola/assemblato
This commit is contained in:
Nicola Pievani
2018-07-19 16:44:03 +00:00
parent 70c5223b97
commit eaee74096d
26 changed files with 3026 additions and 1833 deletions
+103
View File
@@ -563,6 +563,85 @@ Public Class OptionsVM
End Set
End Property
Public Property TotalDimension As Boolean
Get
If OptionModule.m_TotalDimension Then
DefaultWritePrivateProfileString(S_TOTALDIMENSION, K_STATIC, "1")
Else
DefaultWritePrivateProfileString(S_TOTALDIMENSION, K_STATIC, "0")
End If
Return OptionModule.m_TotalDimension
End Get
Set(value As Boolean)
OptionModule.m_TotalDimension = value
NotifyPropertyChanged("TotalDimension")
' aggiorno la grafica
If Not IsNothing(Map.refAssemblyPageVM) AndAlso Not IsNothing(Map.refAssemblyPageVM.CurrAssembly) Then
Map.refAssemblyPageVM.CurrAssembly.Dimension = OptionModule.m_TotalDimension
End If
End Set
End Property
Public Property TotalHeight As String
Get
'If Not IsNothing(Map.refAssemblyPageVM) AndAlso Not IsNothing(Map.refAssemblyPageVM.CurrAssembly) Then
' If Not IsNothing(Map.refAssemblyManagerVM.ReserchPartDoor("FL_")) Then
' OptionModule.m_TotalHeight = Map.refAssemblyManagerVM.ReserchPartDoor("FL_").Door.Height
' Else
' TotalDimension = False
' End If
'End If
DefaultWritePrivateProfileString(S_TOTALDIMENSION, K_TOTALHEIGHT, OptionModule.m_TotalHeight)
Return OptionModule.m_TotalHeight
End Get
Set(value As String)
OptionModule.m_TotalHeight = value
NotifyPropertyChanged("TotalHeight")
'If Not IsNothing(Map.refAssemblyPageVM) AndAlso Not IsNothing(Map.refAssemblyPageVM.CurrAssembly) Then
' Map.refAssemblyPageVM.CurrAssembly.SetDimension("Height")
' Map.refSceneManagerVM.RefreshBtn()
'End If
End Set
End Property
Public Property TotalWidth As String
Get
'If Not IsNothing(Map.refAssemblyPageVM) AndAlso Not IsNothing(Map.refAssemblyPageVM.CurrAssembly) Then
' Dim DO_1 As PartDoor = Map.refAssemblyManagerVM.ReserchPartDoor("DO_1")
' Dim DO_2 As PartDoor = Map.refAssemblyManagerVM.ReserchPartDoor("DO_2")
' Dim LL As String = Map.refAssemblyPageVM.CurrAssembly.LightLock
' Dim LH As String = Map.refAssemblyPageVM.CurrAssembly.LightHinge
' Dim JW As String = Map.refAssemblyPageVM.CurrAssembly.Width
' If Not IsNothing(DO_1) Then
' Dim nDO_1Width As Double = 0
' Dim nDO_2Width As Double = 0
' StringToDouble(DO_1.Door.Width, nDO_1Width)
' Dim nJW As Double = 0
' StringToDouble(JW, nJW)
' Dim nLL As Double = 0
' StringToDouble(LL, nLL)
' Dim nLH As Double = 0
' StringToDouble(LH, nLH)
' If Not IsNothing(DO_2) Then
' StringToDouble(DO_2.Door.Width, nDO_2Width)
' OptionModule.m_TotalWidth = DoubleToString(nDO_1Width + nDO_2Width + nLL + nLH * 2 + 2 * nJW, 4)
' Else
' OptionModule.m_TotalWidth = DoubleToString(nDO_1Width + nLL + nLH + 2 * nJW, 4)
' End If
' Else
' TotalDimension = False
' End If
'End If
DefaultWritePrivateProfileString(S_TOTALDIMENSION, K_TOTALWIDTH, OptionModule.m_TotalWidth)
Return OptionModule.m_TotalWidth
End Get
Set(value As String)
OptionModule.m_TotalWidth = value
NotifyPropertyChanged("TotalWidth")
End Set
End Property
Public Property ThicknessJamb As String
Get
Return OptionModule.m_ThicknessJamb
@@ -746,6 +825,7 @@ Public Class OptionsVM
DefaultWritePrivateProfileString(S_OVERMATERIALASSEMBLY, K_BOTTOMOVERMATERIAL_INI, OptionModule.m_BottomOverMaterialAssembly)
End Set
End Property
#End Region ' Machining Assembly
'-------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -943,6 +1023,12 @@ Public Class OptionsVM
End Get
End Property
Public ReadOnly Property MachMsg As String
Get
Return "Mach."
End Get
End Property
' BevelMsg
Public ReadOnly Property BevelMsg As String
Get
@@ -1082,6 +1168,23 @@ Public Class OptionsVM
End Get
End Property
Public ReadOnly Property TotalDimesionMsg As String
Get
Return "Total Dimension"
End Get
End Property
Public ReadOnly Property TotalHeightMsg As String
Get
Return "Height"
End Get
End Property
Public ReadOnly Property TotalWidthMsg As String
Get
Return "Width"
End Get
End Property
#End Region