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

Aggiunto funzionamento BottomRail per Sash

Browse Source
This commit is contained in:
Annamaria Sassi
2025-08-06 19:08:51 +02:00
parent 9bb0299cfa
commit 46ee89fbde
2 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtWindowMaker/ManageWindow/ManageWindowVM.vb
+15 -12
View File
@@ -1753,9 +1753,6 @@ Public Class Frame
For nJointIndex = 0 To m_JointList.Count - 1
Dim tg = EgtLuaSetGlobIntVar("WDG.JOINT" & nJointIndex + 1, m_JointList(nJointIndex).SelJointType)
Next
If m_Shape = Shapes.DOUBLECHAMFER OrElse m_Shape = Shapes.DOUBLEARC Then
Dim tg = EgtLuaSetGlobIntVar("WDG.JOINT5", Joints.ANGLED)
End If
Dim tlt = EgtLuaCallFunction("WinCreate_CreateFrame")
EgtLuaGetGlobIntVar("WDG.AREAID", m_nAreaId)
nAreaId = m_nAreaId
@@ -2236,10 +2233,13 @@ Public Class Sash
If nSashQty = 1 Then
' creo anta
Dim tf = EgtLuaSetGlobIntVar("WDG.AREAID", nAreaId)
Dim tg = EgtLuaSetGlobIntVar("WDG.JOINTBL", m_JointList(0).SelJointType)
Dim th = EgtLuaSetGlobIntVar("WDG.JOINTBR", m_JointList(1).SelJointType)
Dim tj = EgtLuaSetGlobIntVar("WDG.JOINTTR", m_JointList(2).SelJointType)
Dim tkt = EgtLuaSetGlobIntVar("WDG.JOINTTL", m_JointList(3).SelJointType)
For nJointIndex = 0 To m_JointList.Count - 1
Dim tg = EgtLuaSetGlobIntVar("WDG.JOINT" & nJointIndex + 1, m_JointList(nJointIndex).SelJointType)
Next
'Dim tg = EgtLuaSetGlobIntVar("WDG.JOINTBL", m_JointList(0).SelJointType)
'Dim th = EgtLuaSetGlobIntVar("WDG.JOINTBR", m_JointList(1).SelJointType)
'Dim tj = EgtLuaSetGlobIntVar("WDG.JOINTTR", m_JointList(2).SelJointType)
'Dim tkt = EgtLuaSetGlobIntVar("WDG.JOINTTL", m_JointList(3).SelJointType)
Dim tft = EgtLuaSetGlobIntVar("WDG.SASHTYPE", m_SashType)
Dim tfr = EgtLuaSetGlobIntVar("WDG.OPENINGTYPE", m_SashList(0).SelOpeningType.Id)
Dim tlt = EgtLuaCallFunction("WinCreate_AddSash")
@@ -2325,10 +2325,13 @@ Public Class Sash
' creo ante
For nSashIndex = 0 To m_SashList.Count - 1
Dim tf = EgtLuaSetGlobIntVar("WDG.AREAID", Area.AreaList(nSashIndex).nAreaId)
Dim tg = EgtLuaSetGlobIntVar("WDG.JOINTBL", m_JointList(0).SelJointType)
Dim th = EgtLuaSetGlobIntVar("WDG.JOINTBR", m_JointList(1).SelJointType)
Dim tj = EgtLuaSetGlobIntVar("WDG.JOINTTR", m_JointList(2).SelJointType)
Dim tkt = EgtLuaSetGlobIntVar("WDG.JOINTTL", m_JointList(3).SelJointType)
For nJointIndex = 0 To m_JointList.Count - 1
Dim tg = EgtLuaSetGlobIntVar("WDG.JOINT" & nJointIndex + 1, m_JointList(nJointIndex).SelJointType)
Next
'Dim tg = EgtLuaSetGlobIntVar("WDG.JOINTBL", m_JointList(0).SelJointType)
'Dim th = EgtLuaSetGlobIntVar("WDG.JOINTBR", m_JointList(1).SelJointType)
'Dim tj = EgtLuaSetGlobIntVar("WDG.JOINTTR", m_JointList(2).SelJointType)
'Dim tkt = EgtLuaSetGlobIntVar("WDG.JOINTTL", m_JointList(3).SelJointType)
Dim tft = EgtLuaSetGlobIntVar("WDG.SASHTYPE", FinalSashTypeList(nSashIndex))
Dim tfr = EgtLuaSetGlobIntVar("WDG.OPENINGTYPE", m_SashList(nSashIndex).SelOpeningType.Id)
Dim tlt = EgtLuaCallFunction("WinCreate_AddSash")
@@ -2404,7 +2407,7 @@ Public Class Sash
End Function
Friend Overrides Function Serialize() As JsonArea
Dim JsonSash As JsonSash = New JsonSash(m_bIsSashVertical, m_SashType, m_SelHardware.sId)
Dim JsonSash As JsonSash = New JsonSash(m_bIsSashVertical, m_SashType, m_bBottomRail, m_nBottomRailQty, m_SelHardware.sId)
For Each SashDimension In SashList
JsonSash.SashList.Add(SashDimension.Serialize())
Next
EgtWindowMaker/Utility/JsonUtility.vb
+27 -1
View File
@@ -218,6 +218,28 @@ Public Class JsonSash
End Set
End Property
Private m_bBottomRail As Boolean
<JsonProperty>
Public Property BottomRail As Boolean
Get
Return m_bBottomRail
End Get
Set(value As Boolean)
m_bBottomRail = value
End Set
End Property
Private m_nBottomRailQty As Integer = 0
<JsonProperty>
Public Property BottomRailQty As Integer
Get
Return m_nBottomRailQty
End Get
Set(value As Integer)
m_nBottomRailQty = value
End Set
End Property
Private m_Hardware As String
<JsonProperty>
Public Property Hardware As String
@@ -233,10 +255,12 @@ Public Class JsonSash
MyBase.New(AreaTypes.SASH)
End Sub
Sub New(bIsSashVertical As Boolean, SashType As SashTypes, Hardware As String)
Sub New(bIsSashVertical As Boolean, SashType As SashTypes, BottomRail As Boolean, BottomRailQty As Integer, Hardware As String)
MyBase.New(AreaTypes.SASH)
m_bIsSashVertical = bIsSashVertical
m_SashType = SashType
m_bBottomRail = BottomRail
m_nBottomRailQty = BottomRailQty
m_Hardware = Hardware
End Sub
@@ -245,6 +269,8 @@ Public Class JsonSash
Sash.SetAreaType(AreaTypes.SASH)
Sash.SetSashQty(m_SashList.Count)
Sash.SetIsSashVertical(m_bIsSashVertical)
Sash.SetBottomRail(m_bBottomRail)
Sash.SetBottomRailQty(m_nBottomRailQty)
Sash.AppliedDone()
For SashIndex = 0 To m_SashList.Count - 1
Sash.SashList(SashIndex).SetOpeningType(m_SashList(SashIndex).OpeningType)