Merge branch 'main' of https://gitlab.steamware.net/egalware-cadcam/lua/egwwindowlua
This commit is contained in:
+105
-30
@@ -74,7 +74,7 @@ WinCreate.ImportProfile( sProfilePath)
|
||||
-- local nFrameId = WinCreate.CreateFrame( WIN_FRAME_TYPES.ROUND_ARC, { WindowWidth, WindowHeight}, vFrameJoints, vFrameDims)
|
||||
-- local nFrameId = WinCreate.CreateFrame( WIN_FRAME_TYPES.SEGMENTAL_ARC, { 1500, 1800, 2200}, vFrameJoints, vFrameDims)
|
||||
-- local nFrameId = WinCreate.CreateFrame( WIN_FRAME_TYPES.CHAMFER, { WindowWidth, WindowHeight, WindowHeight + 500}, vFrameJoints, { dFrameDim, dFrameDim, dFrameDim, dFrameDim, dFrameDim})
|
||||
-- local nFrameId = WinCreate.CreateFrame( WIN_FRAME_TYPES.POINTED_ARC, { 1500, 1500, 2400}, vFrameJoints, { dFrameDim, dFrameDim, dFrameDim, dFrameDim, dFrameDim})
|
||||
-- local nFrameId = WinCreate.CreateFrame( WIN_FRAME_TYPES.POINTED_ARC, { 1200, 1500, 2400}, vFrameJoints, { dFrameDim, dFrameDim, dFrameDim, dFrameDim, dFrameDim})
|
||||
-- local nFrameId = WinCreate.CreateFrame( WIN_FRAME_TYPES.TRG, { 1500, 1500, 500}, { FrameJointType, FrameJointType, FrameJointType}, { dFrameDim, dFrameDim, dFrameDim})
|
||||
-- local nFrameId = WinCreate.CreateFrame( WIN_FRAME_TYPES.THREE_CENTER_ARC, { 1500, 1500, 1800, 200}, vFrameJoints, { dFrameDim, dFrameDim, dFrameDim, dFrameDim, dFrameDim, dFrameDim})
|
||||
|
||||
@@ -91,6 +91,7 @@ WinCreate.ImportProfile( sProfilePath)
|
||||
-- { WIN_MEASURE.PROPORTIONAL, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PROPORTIONAL}, { 1, 50, 1}, false)
|
||||
|
||||
|
||||
|
||||
------------------------ Cambi profilo ------------------------
|
||||
|
||||
-- vetro / anta
|
||||
@@ -193,6 +194,79 @@ WinCreate.ImportProfile( sProfilePath)
|
||||
|
||||
|
||||
|
||||
------------------------ Cambi profilo su split ------------------------
|
||||
|
||||
-- sotto: vetro / anta | sopra: vetro
|
||||
-- local vAreas = WinCreate.AddSplits( nFrameId, WIN_SPLITORIENTATION.HORIZONTAL, {WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50}, {})
|
||||
-- local nFill1 = WinCreate.AddFill( vAreas[2], WIN_FILLTYPES.GLASS)
|
||||
-- local vAreas2 = WinCreate.AddSplits( vAreas[1], WIN_SPLITORIENTATION.VERTICAL, {WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50}, {})
|
||||
-- local nFill3 = WinCreate.AddFill( vAreas2[1], WIN_FILLTYPES.GLASS)
|
||||
-- local nSash = WinCreate.AddSash( vAreas2[2], vSashJoints)
|
||||
-- local nFill2 = WinCreate.AddFill( nSash, WIN_FILLTYPES.GLASS)
|
||||
|
||||
-- sotto: vetro / anta / vetro | sopra: anta / vetro
|
||||
-- local vAreas = WinCreate.AddSplits( nFrameId, WIN_SPLITORIENTATION.HORIZONTAL, {WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50})
|
||||
-- local vAreas1 = WinCreate.AddSplits( vAreas[1], WIN_SPLITORIENTATION.VERTICAL, {WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 100/3, 100/3, 100/3})
|
||||
-- local nFill1 = WinCreate.AddFill( vAreas1[1], WIN_FILLTYPES.GLASS)
|
||||
-- local nSash1 = WinCreate.AddSash( vAreas1[2], vSashJoints)
|
||||
-- local nFill2 = WinCreate.AddFill( nSash1, WIN_FILLTYPES.GLASS)
|
||||
-- local nFill3 = WinCreate.AddFill( vAreas1[3], WIN_FILLTYPES.GLASS)
|
||||
-- local vAreas2 = WinCreate.AddSplits( vAreas[2], WIN_SPLITORIENTATION.VERTICAL, {WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50})
|
||||
-- local nSash2 = WinCreate.AddSash( vAreas2[1], vSashJoints)
|
||||
-- local nFill4 = WinCreate.AddFill( nSash2, WIN_FILLTYPES.GLASS)
|
||||
-- local nFill5 = WinCreate.AddFill( vAreas2[2], WIN_FILLTYPES.GLASS)
|
||||
-- -- WinCreate.AddSplits( nFill1, WIN_SPLITORIENTATION.VERTICAL, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 100/3, 100/3, 100/3}, nil, false, false, WIN_MUNTINFILL_SIDES.BOTH)
|
||||
-- -- WinCreate.AddSplits( nFill2, WIN_SPLITORIENTATION.VERTICAL, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 100/3, 100/3, 100/3}, nil, false, false, WIN_MUNTINFILL_SIDES.BOTH)
|
||||
-- -- WinCreate.AddSplits( nFill3, WIN_SPLITORIENTATION.VERTICAL, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 100/3, 100/3, 100/3}, nil, false, false, WIN_MUNTINFILL_SIDES.BOTH)
|
||||
-- -- WinCreate.AddSplits( nFill4, WIN_SPLITORIENTATION.VERTICAL, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 100/3, 100/3, 100/3}, nil, false, false, WIN_MUNTINFILL_SIDES.BOTH)
|
||||
-- -- WinCreate.AddSplits( nFill5, WIN_SPLITORIENTATION.VERTICAL, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 100/3, 100/3, 100/3}, nil, false, false, WIN_MUNTINFILL_SIDES.BOTH)
|
||||
|
||||
-- sotto: vetro / anta / vetro | sopra: vetro / vetro
|
||||
-- local vAreas = WinCreate.AddSplits( nFrameId, WIN_SPLITORIENTATION.HORIZONTAL, {WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 70, 30}, {80})
|
||||
-- local vAreas1 = WinCreate.AddSplits( vAreas[1], WIN_SPLITORIENTATION.VERTICAL, {WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 33.3333, 33.33333, 33.33333}, {80,80})
|
||||
-- local nFill1 = WinCreate.AddFill( vAreas1[1], WIN_FILLTYPES.GLASS)
|
||||
-- local nSash = WinCreate.AddSash( vAreas1[2], vSashJoints)
|
||||
-- local nFill2 = WinCreate.AddFill( nSash, WIN_FILLTYPES.GLASS)
|
||||
-- local nFill3 = WinCreate.AddFill( vAreas1[3], WIN_FILLTYPES.GLASS)
|
||||
-- local vAreas2 = WinCreate.AddSplits( vAreas[2], WIN_SPLITORIENTATION.VERTICAL, {WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50}, {80,80})
|
||||
-- local nFill4 = WinCreate.AddFill( vAreas2[1], WIN_FILLTYPES.GLASS)
|
||||
-- local nFill5 = WinCreate.AddFill( vAreas2[2], WIN_FILLTYPES.GLASS)
|
||||
|
||||
-- sotto: anta-vetro / anta / vetro | sopra: vetro
|
||||
-- local vAreas = WinCreate.AddSplits( nFrameId, WIN_SPLITORIENTATION.HORIZONTAL, {WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 70, 30})
|
||||
-- local vAreas1 = WinCreate.AddSplits( vAreas[1], WIN_SPLITORIENTATION.VERTICAL, {WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 33.3333, 33.33333, 33.33333})
|
||||
-- local vAreas2 = WinCreate.AddSplits( vAreas1[1], WIN_SPLITORIENTATION.HORIZONTAL, {WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50})
|
||||
-- local nFill1 = WinCreate.AddFill( vAreas2[1], WIN_FILLTYPES.GLASS)
|
||||
-- local nSash1 = WinCreate.AddSash( vAreas2[2], vSashJoints)
|
||||
-- local nFill2 = WinCreate.AddFill( nSash1, WIN_FILLTYPES.GLASS)
|
||||
-- local nSash = WinCreate.AddSash( vAreas1[2], vSashJoints)
|
||||
-- local nFill3 = WinCreate.AddFill( nSash, WIN_FILLTYPES.GLASS)
|
||||
-- local nFill4 = WinCreate.AddFill( vAreas1[3], WIN_FILLTYPES.GLASS)
|
||||
-- local nFill5 = WinCreate.AddFill( vAreas[2], WIN_FILLTYPES.GLASS)
|
||||
|
||||
-- sotto: vetro | sopra: anta / vetro - vetro / anta
|
||||
-- local vAreas = WinCreate.AddSplits( nFrameId, WIN_SPLITORIENTATION.HORIZONTAL, {WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 70, 30})
|
||||
-- WinCreate.AddFill( vAreas[1], WIN_FILLTYPES.GLASS)
|
||||
-- local vAreas1 = WinCreate.AddSplits( vAreas[2], WIN_SPLITORIENTATION.VERTICAL, {WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 33.3333, 33.33333, 33.33333}, {80,80})
|
||||
-- local nSash1 = WinCreate.AddSash( vAreas1[1], vSashJoints)
|
||||
-- WinCreate.AddFill( nSash1, WIN_FILLTYPES.GLASS)
|
||||
-- local nSash2 = WinCreate.AddSash( vAreas1[3], vSashJoints)
|
||||
-- WinCreate.AddFill( nSash2, WIN_FILLTYPES.GLASS)
|
||||
-- local vAreas2 = WinCreate.AddSplits( vAreas1[2], WIN_SPLITORIENTATION.HORIZONTAL, {WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50})
|
||||
-- WinCreate.AddFill( vAreas2[2], WIN_FILLTYPES.GLASS)
|
||||
-- WinCreate.AddFill( vAreas2[1], WIN_FILLTYPES.GLASS)
|
||||
|
||||
-- sotto: vetro / anta | sopra: anta / vetro
|
||||
-- local vAreas = WinCreate.AddGridSplits( nFrameId, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50}, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50}, true)
|
||||
-- WinCreate.AddFill( vAreas[1], WIN_FILLTYPES.GLASS)
|
||||
-- local nSash1 = WinCreate.AddSash( vAreas[2], vSashJoints)
|
||||
-- WinCreate.AddFill( nSash1, WIN_FILLTYPES.GLASS)
|
||||
-- local nSash2 = WinCreate.AddSash( vAreas[3], vSashJoints)
|
||||
-- WinCreate.AddFill( nSash2, WIN_FILLTYPES.GLASS)
|
||||
-- WinCreate.AddFill( vAreas[4], WIN_FILLTYPES.GLASS)
|
||||
|
||||
|
||||
|
||||
------------------------ Alzante Scorrevole ------------------------
|
||||
|
||||
-- vFrameDims = { 55, 55, 55, 55}
|
||||
@@ -207,24 +281,24 @@ WinCreate.ImportProfile( sProfilePath)
|
||||
-- local nFill2 = WinCreate.AddFill( vSash[2], WIN_FILLTYPES.GLASS)
|
||||
-- -- WinCreate.AddSplits( nFill1, WIN_SPLITORIENTATION.HORIZONTAL, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50}, nil, false, false, WIN_MUNTINFILL_SIDES.BOTH)
|
||||
-- -- WinCreate.AddSplits( nFill2, WIN_SPLITORIENTATION.HORIZONTAL, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50}, nil, false, false, WIN_MUNTINFILL_SIDES.BOTH)
|
||||
-- local nSashGrpId = EgtGetParent( vSash[1])
|
||||
-- WinCreate.AddHardware( nSashGrpId, '000592', 'Sx')
|
||||
-- -- local nSashGrpId = EgtGetParent( vSash[1])
|
||||
-- -- WinCreate.AddHardware( nSashGrpId, '000592', 'Sx')
|
||||
|
||||
-- anta mobile a dx
|
||||
-- local vSash = WinCreate.AddSashGroup( nFrameId, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50}, bDaylight, { vSashJoints, vSashJoints}, { vSashDims, vSashDims},
|
||||
-- { WIN_SASHTYPES.SLIDE_FIXED, WIN_SASHTYPES.SLIDE_MOVABLE}, { WIN_OPENING_TYPES.FIXED, WIN_OPENING_TYPES.COPLANARSLIDE_LEFT})
|
||||
-- WinCreate.AddFill( vSash[1], WIN_FILLTYPES.GLASS)
|
||||
-- WinCreate.AddFill( vSash[2], WIN_FILLTYPES.GLASS)
|
||||
-- local nSashGrpId = EgtGetParent( vSash[1])
|
||||
-- WinCreate.AddHardware( nSashGrpId, '000592', 'Dx')
|
||||
-- -- local nSashGrpId = EgtGetParent( vSash[1])
|
||||
-- -- WinCreate.AddHardware( nSashGrpId, '000592', 'Dx')
|
||||
|
||||
-- 2 ante mobili, sx davanti
|
||||
-- local vSash = WinCreate.AddSashGroup( nFrameId, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50}, bDaylight, { vSashJoints, vSashJoints}, { vSashDims, vSashDims},
|
||||
-- { WIN_SASHTYPES.SLIDE_MOVABLE, WIN_SASHTYPES.SLIDE_MOVABLE_BACK}, { WIN_OPENING_TYPES.COPLANARSLIDE_RIGHT, WIN_OPENING_TYPES.COPLANARSLIDE_LEFT})
|
||||
-- WinCreate.AddFill( vSash[1], WIN_FILLTYPES.GLASS)
|
||||
-- WinCreate.AddFill( vSash[2], WIN_FILLTYPES.GLASS)
|
||||
-- local nSashGrpId = EgtGetParent( vSash[1])
|
||||
-- WinCreate.AddHardware( nSashGrpId, '000593', 'Sx')
|
||||
-- -- local nSashGrpId = EgtGetParent( vSash[1])
|
||||
-- -- WinCreate.AddHardware( nSashGrpId, '000593', 'Sx')
|
||||
|
||||
-- 2 ante mobili, dx davanti
|
||||
-- local vSash = WinCreate.AddSashGroup( nFrameId, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50}, bDaylight, { vSashJoints, vSashJoints}, { vSashDims, vSashDims},
|
||||
@@ -236,7 +310,7 @@ WinCreate.ImportProfile( sProfilePath)
|
||||
|
||||
-- 4 ante, le centrali sono mobili
|
||||
-- local nFrameId = WinCreate.CreateFrame( WIN_FRAME_TYPES.RECT, { 4500, 2100}, vFrameJoints, vFrameDims)
|
||||
-- -- WinCreate.AddThreshold( nFrameId, 'Threshold')
|
||||
-- WinCreate.AddThreshold( nFrameId, 'Threshold')
|
||||
-- local vSash = WinCreate.AddSashGroup( nFrameId, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 25, 25, 25, 25}, bDaylight,
|
||||
-- { vSashJoints, vSashJoints, vSashJoints, vSashJoints}, { vSashDims, vSashDims, vSashDims, vSashDims},
|
||||
-- { WIN_SASHTYPES.SLIDE_FIXED, WIN_SASHTYPES.SLIDE_MOVABLE, WIN_SASHTYPES.SLIDE_MOVABLE, WIN_SASHTYPES.SLIDE_FIXED},
|
||||
@@ -245,8 +319,8 @@ WinCreate.ImportProfile( sProfilePath)
|
||||
-- WinCreate.AddFill( vSash[2], WIN_FILLTYPES.GLASS)
|
||||
-- WinCreate.AddFill( vSash[3], WIN_FILLTYPES.GLASS)
|
||||
-- WinCreate.AddFill( vSash[4], WIN_FILLTYPES.GLASS)
|
||||
-- local nSashGrpId = EgtGetParent( vSash[1])
|
||||
-- WinCreate.AddHardware( nSashGrpId, '000594', 'Dx')
|
||||
-- -- local nSashGrpId = EgtGetParent( vSash[1])
|
||||
-- -- WinCreate.AddHardware( nSashGrpId, '000594', 'Dx')
|
||||
|
||||
-- 4 ante mobili
|
||||
-- local nFrameId = WinCreate.CreateFrame( WIN_FRAME_TYPES.RECT, { 4500, 2100}, vFrameJoints, vFrameDims)
|
||||
@@ -259,16 +333,16 @@ WinCreate.ImportProfile( sProfilePath)
|
||||
-- local nFill2 = WinCreate.AddFill( vSash[2], WIN_FILLTYPES.GLASS)
|
||||
-- local nFill3 = WinCreate.AddFill( vSash[3], WIN_FILLTYPES.GLASS)
|
||||
-- local nFill4 = WinCreate.AddFill( vSash[4], WIN_FILLTYPES.GLASS)
|
||||
-- -- WinCreate.AddGridSplits( nFill1, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50},
|
||||
-- -- { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 33.333, 33.333, 33.333}, true, nil, nil, WIN_MUNTINFILL_SIDES.BOTH)
|
||||
-- -- WinCreate.AddGridSplits( nFill2, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50},
|
||||
-- -- { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 33.333, 33.333, 33.333}, true, nil, nil, WIN_MUNTINFILL_SIDES.BOTH)
|
||||
-- -- WinCreate.AddGridSplits( nFill3, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50},
|
||||
-- -- { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 33.333, 33.333, 33.333}, true, nil, nil, WIN_MUNTINFILL_SIDES.BOTH)
|
||||
-- -- WinCreate.AddGridSplits( nFill4, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50},
|
||||
-- -- { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 33.333, 33.333, 33.333}, true, nil, nil, WIN_MUNTINFILL_SIDES.BOTH)
|
||||
-- local nSashGrpId = EgtGetParent( vSash[1])
|
||||
-- WinCreate.AddHardware( nSashGrpId, '000595', 'Dx')
|
||||
-- WinCreate.AddGridSplits( nFill1, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50},
|
||||
-- { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 33.333, 33.333, 33.333}, true, nil, nil, WIN_MUNTINFILL_SIDES.BOTH)
|
||||
-- WinCreate.AddGridSplits( nFill2, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50},
|
||||
-- { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 33.333, 33.333, 33.333}, true, nil, nil, WIN_MUNTINFILL_SIDES.BOTH)
|
||||
-- WinCreate.AddGridSplits( nFill3, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50},
|
||||
-- { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 33.333, 33.333, 33.333}, true, nil, nil, WIN_MUNTINFILL_SIDES.BOTH)
|
||||
-- WinCreate.AddGridSplits( nFill4, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50},
|
||||
-- { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 33.333, 33.333, 33.333}, true, nil, nil, WIN_MUNTINFILL_SIDES.BOTH)
|
||||
-- -- local nSashGrpId = EgtGetParent( vSash[1])
|
||||
-- -- WinCreate.AddHardware( nSashGrpId, '000595', 'Dx')
|
||||
|
||||
|
||||
|
||||
@@ -279,9 +353,9 @@ WinCreate.ImportProfile( sProfilePath)
|
||||
-- WinCreate.AddFill( nFrameId, WIN_FILLTYPES.GLASS)
|
||||
|
||||
-- divisione orizzontale / verticale
|
||||
-- WinCreate.AddBottomRail( nFrameId, 2)
|
||||
-- -- local vAreas = WinCreate.AddSplits( nFrameId, WIN_SPLITORIENTATION.HORIZONTAL, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 70, 30}, { 60})
|
||||
-- local vAreas = WinCreate.AddSplits( nFrameId, WIN_SPLITORIENTATION.VERTICAL, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 70, 30}, { 60})
|
||||
-- WinCreate.AddBottomRail( nFrameId, 3, {})
|
||||
-- local vAreas = WinCreate.AddSplits( nFrameId, WIN_SPLITORIENTATION.HORIZONTAL, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 70, 30}, { 70})
|
||||
-- -- local vAreas = WinCreate.AddSplits( nFrameId, WIN_SPLITORIENTATION.VERTICAL, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 70, 30}, { 60})
|
||||
-- WinCreate.AddFill( vAreas[1], WIN_FILLTYPES.GLASS)
|
||||
-- WinCreate.AddFill( vAreas[2], WIN_FILLTYPES.GLASS)
|
||||
|
||||
@@ -296,8 +370,8 @@ WinCreate.ImportProfile( sProfilePath)
|
||||
-- WinCreate.AddFill( vAreas3[2], WIN_FILLTYPES.GLASS)
|
||||
|
||||
-- divisione verticale ed orizzontale (2)
|
||||
-- WinCreate.AddBottomRail( nFrameId, 1)
|
||||
-- local vAreas = WinCreate.AddGridSplits( nFrameId, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50}, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50},
|
||||
-- WinCreate.AddBottomRail( nFrameId, 2)
|
||||
-- local vAreas = WinCreate.AddGridSplits( nFrameId, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50}, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 70, 30},
|
||||
-- true, { 100}, { 60})
|
||||
-- WinCreate.AddFill( vAreas[1], WIN_FILLTYPES.GLASS)
|
||||
-- WinCreate.AddFill( vAreas[2], WIN_FILLTYPES.GLASS)
|
||||
@@ -309,6 +383,7 @@ WinCreate.ImportProfile( sProfilePath)
|
||||
------------------------ Finestre con anta singola ------------------------
|
||||
|
||||
-- standard
|
||||
-- WinCreate.AddThreshold( nFrameId, 'Threshold')
|
||||
-- local nSashId = WinCreate.AddSash( nFrameId, vSashJoints, vSashDims, WIN_OPENING_TYPES.TILTTURN_LEFT)
|
||||
-- WinCreate.AddBottomRail( nSashId, 2, { 90, 60})
|
||||
-- WinCreate.AddFill( nSashId, WIN_FILLTYPES.GLASS)
|
||||
@@ -316,7 +391,7 @@ WinCreate.ImportProfile( sProfilePath)
|
||||
-- divisione orizzontale / verticale
|
||||
-- local nSashId = WinCreate.AddSash( nFrameId, vSashJoints, vSashDims, WIN_OPENING_TYPES.TILTTURN_LEFT)
|
||||
-- WinCreate.AddBottomRail( nSashId, 1, { 100})
|
||||
-- -- local vAreas = WinCreate.AddSplits( nSashId, WIN_SPLITORIENTATION.HORIZONTAL, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50})
|
||||
-- -- local vAreas = WinCreate.AddSplits( nSashId, WIN_SPLITORIENTATION.HORIZONTAL, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 70, 30})
|
||||
-- local vAreas = WinCreate.AddSplits( nSashId, WIN_SPLITORIENTATION.VERTICAL, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 50, 50})
|
||||
-- WinCreate.AddFill( vAreas[1], WIN_FILLTYPES.GLASS)
|
||||
-- WinCreate.AddFill( vAreas[2], WIN_FILLTYPES.GLASS)
|
||||
@@ -350,7 +425,7 @@ WinCreate.ImportProfile( sProfilePath)
|
||||
-- WinCreate.AddFill( nSash2Id, WIN_FILLTYPES.GLASS)
|
||||
|
||||
-- tre ante
|
||||
-- -- local vAreas = WinCreate.AddSplits( nFrameId, WIN_SPLITORIENTATION.VERTICAL, { WIN_MEASURE.ABSOLUTE, WIN_MEASURE.ABSOLUTE, WIN_MEASURE.ABSOLUTE}, { 500, 200, 800}, { 95, 95})
|
||||
-- -- local vAreas = WinCreate.AddSplits( nFrameId, WIN_SPLITORIENTATION.VERTICAL, { WIN_MEASURE.ABSOLUTE, WIN_MEASURE.ABSOLUTE, WIN_MEASURE.PROPORTIONAL}, { 500, 200, 1}, { 95, 95})
|
||||
-- -- local vAreas = WinCreate.AddSplits( nFrameId, WIN_SPLITORIENTATION.VERTICAL, { WIN_MEASURE.PROPORTIONAL, WIN_MEASURE.PROPORTIONAL, WIN_MEASURE.PROPORTIONAL}, { 1, 1, 1}, { 95, 95})
|
||||
-- local vAreas = WinCreate.AddSplits( nFrameId, WIN_SPLITORIENTATION.VERTICAL, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 33.333, 33.333, 33.333}, { 95, 95})
|
||||
-- local nSash1Id = WinCreate.AddSash( vAreas[1], vSashJoints, vSashDims)
|
||||
@@ -415,8 +490,8 @@ WinCreate.ImportProfile( sProfilePath)
|
||||
-- WinCreate.AddFill( vSashes[2], WIN_FILLTYPES.GLASS)
|
||||
|
||||
-- battente / ricevente / ricevente
|
||||
-- local vSashes = WinCreate.AddSashGroup( nFrameId, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 33.333, 33.333, 33.333}, bDaylight,
|
||||
-- { vSashJoints, vSashJoints, vSashJoints}, { vSashDims, vSashDims, vSashDims},
|
||||
-- local vSashes = WinCreate.AddSashGroup( nFrameId, { WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE, WIN_MEASURE.PERCENTAGE}, { 100/3, 100/3, !00/3}, bDaylight,
|
||||
-- { vSashJoints, vSashJoints, vSashJoints}, { vSashDims, vSashDims, vSashDims},
|
||||
-- { WIN_SASHTYPES.ACTIVE, WIN_SASHTYPES.INACTIVE_IN, WIN_SASHTYPES.INACTIVE_OUT},
|
||||
-- { WIN_OPENING_TYPES.TURNONLY_LEFT, WIN_OPENING_TYPES.TURNONLY_RIGHT, WIN_OPENING_TYPES.TURNONLY_RIGHT})
|
||||
-- WinCreate.AddFill( vSashes[1], WIN_FILLTYPES.GLASS)
|
||||
@@ -576,7 +651,7 @@ WinCreate.ImportProfile( sProfilePath)
|
||||
-- local nSashId = WinCreate.AddSash( nFrameId, vSashJoints, vSashDims, WIN_OPENING_TYPES.TILTTURN_LEFT)
|
||||
-- WinCreate.AddFill( nSashId, WIN_FILLTYPES.GLASS)
|
||||
-- WinCreate.AddHardware( nSashId, '000558', 'Sx')
|
||||
-- -- WinCreate.AddHardware( nSashId, '000545', 'Sx') -- aria 4, errato ma crea alcune lavorazioni in più
|
||||
-- WinCreate.AddHardware( nSashId, '000545', 'Sx') -- aria 4, errato ma crea alcune lavorazioni in più
|
||||
-- -- WinCreate.AddHardware( nSashId, '000596', 'Sx') -- arco a tutto sesto
|
||||
-- -- WinCreate.AddHardware( nSashId, '000597', 'Sx') -- arco ribassato
|
||||
-- -- WinCreate.AddHardware( nSashId, '000604', 'Sx') -- trapezio
|
||||
|
||||
@@ -314,6 +314,8 @@ WIN_SASH_REF = 'SashRef'
|
||||
WIN_SASH_DEPTH = 'SashDepth'
|
||||
WIN_RAD_REF = 'RefRad'
|
||||
WIN_EXTRA_DIST = 'ExtraDist'
|
||||
WIN_SASH_DIAM = 'SashDiam'
|
||||
WIN_FILL_DIAM = 'FillDiam'
|
||||
-- per lavorazioni
|
||||
WIN_PRC_OVERMAT_IN = 'OVERMAT_IN'
|
||||
WIN_PRC_OVERMAT_OUT = 'OVERMAT_OUT'
|
||||
@@ -405,10 +407,13 @@ WIN_PRF_CHANGE_TYPES = { -- binario
|
||||
WIN_MIXED_CURVES = 'ProfileChangeCurves'
|
||||
WIN_MIXED_MILLING = 'ProfileChangeMilling'
|
||||
WIN_MIXED_SPLIT_REF = 'MixedSplitRef'
|
||||
WIN_FILL_ON_SPLIT_RIGHT = 'FillOnSplitRight'
|
||||
WIN_MIXED_BISECTOR_REF = 'MixedBisectorRef'
|
||||
WIN_MIXED_SASHFILL = 'SashFill'
|
||||
WIN_MIXED_ONSTART = 'MixedOnStart'
|
||||
WIN_MIXED_START_CHILDREN = 'StartChildrenType'
|
||||
WIN_MIXED_END_CHILDREN = 'EndChildrenType'
|
||||
|
||||
WIN_MIXED_PREV = 'MixedPrev'
|
||||
WIN_MIXED_NEXT = 'MixedNext'
|
||||
|
||||
-- SOLIDI
|
||||
WIN_SOLID = 'Solid'
|
||||
|
||||
+1964
-1386
File diff suppressed because it is too large
Load Diff
@@ -515,7 +515,7 @@ local function CalcSplitDimensions( vMeasureTypes, vValues, dDim, dDimMax)
|
||||
end
|
||||
|
||||
----------------------------------------------------------------------------------
|
||||
local function CalcSplitCurves( nLayerId, b3OutlineLayer, dDimMax, nSplitType, vMeasureTypes, vValues)
|
||||
local function CalcSplitCurves( nLayerId, b3OutlineLayer, dDimMax, dRefCoord, nSplitType, vMeasureTypes, vValues)
|
||||
|
||||
-- calcolo le dimensioni assolute di tutti gli split
|
||||
local dDim = EgtIf( nSplitType == WIN_SPLITORIENTATION.VERTICAL, b3OutlineLayer:getDimX(), b3OutlineLayer:getDimY())
|
||||
@@ -525,12 +525,12 @@ local function CalcSplitCurves( nLayerId, b3OutlineLayer, dDimMax, nSplitType, v
|
||||
local vDimensions = CalcSplitDimensions( vMeasureTypes, vValues, dDim, dDimMax)
|
||||
|
||||
local vSplitCurves = {}
|
||||
local dPosition = 0
|
||||
local dPosition = dRefCoord
|
||||
for i = 1, #vDimensions - 1 do
|
||||
-- calcolo la posizione cumulata
|
||||
dPosition = dPosition + vDimensions[i]
|
||||
-- creo la curva se rientra nelle dimensione limite
|
||||
if dPosition < dDimMax - GEO.EPS_SMALL then
|
||||
if dPosition < dRefCoord + dDimMax - GEO.EPS_SMALL then
|
||||
local nSplitCrv
|
||||
if nSplitType == WIN_SPLITORIENTATION.VERTICAL then
|
||||
-- aree ordinate da sx a dx
|
||||
@@ -586,7 +586,7 @@ function WinCreate.AddSplits( nParentAreaId, nSplitType, vMeasureTypes, vValues,
|
||||
EgtSetName( nSplitLayerId, WIN_BASESPLIT)
|
||||
|
||||
-- creo le curve di split
|
||||
local vSplitCurves = CalcSplitCurves( nSplitLayerId, b3OutlineLayer, nil, nSplitType, vMeasureTypes, vValues)
|
||||
local vSplitCurves = CalcSplitCurves( nSplitLayerId, b3OutlineLayer, nil, 0, nSplitType, vMeasureTypes, vValues)
|
||||
if #vSplitCurves == 0 then
|
||||
-- se non ci sono curve valide cancello tutto ed esco
|
||||
EgtErase( nAreaId)
|
||||
@@ -655,7 +655,7 @@ function WinCreate.AddGridSplits( nParentAreaId, vVertMeasureTypes, vVertValues,
|
||||
EgtSetInfo( nAreaId, WIN_PART_DIM, vMainDim)
|
||||
|
||||
-- calcolo la suddivisione nella direzione principale
|
||||
local vMainSplit = CalcSplitCurves( nSplitLayerId, b3OutlineLayer, nil, nMainSplitOrientation, vMainTypes, vMainValues)
|
||||
local vMainSplit = CalcSplitCurves( nSplitLayerId, b3OutlineLayer, nil, 0, nMainSplitOrientation, vMainTypes, vMainValues)
|
||||
for i = 1, #vMainSplit do
|
||||
EgtSetInfo( vMainSplit[i], WIN_GRIDSPLIT_ORDER, 0)
|
||||
end
|
||||
@@ -664,15 +664,18 @@ function WinCreate.AddGridSplits( nParentAreaId, vVertMeasureTypes, vVertValues,
|
||||
-- calcolo gli split nella direzione secondaria. Per non far sparire split nelle sottoregioni più piccole tengo come misura di riferimento per scalare tutte le dimensioni quella
|
||||
-- della sottoregione più piccola
|
||||
local dMinDim = GEO.INFINITO
|
||||
local dMinCoord = 0
|
||||
for i = 1, #vMainAreas do
|
||||
local nAreaOutlineLayerId = EgtGetFirstNameInGroup( vMainAreas[i], WIN_AREAOUTLINE)
|
||||
local b3Curr = EgtGetBBox( nAreaOutlineLayerId, GDB_BB.STANDARD)
|
||||
local dDim = EgtIf( nOtherSplitOrientation == WIN_SPLITORIENTATION.VERTICAL, b3Curr:getDimX(), b3Curr:getDimY())
|
||||
if dDim < dMinDim - GEO.EPS_SMALL then
|
||||
dMinDim = dDim
|
||||
local ptMin = b3Curr:getMin()
|
||||
dMinCoord = EgtIf( nOtherSplitOrientation == WIN_SPLITORIENTATION.VERTICAL, ptMin:getX(), ptMin:getY())
|
||||
end
|
||||
end
|
||||
local vOtherSplitOrig = CalcSplitCurves( nSplitLayerId, b3OutlineLayer, dMinDim, nOtherSplitOrientation, vOtherTypes, vOtherValues)
|
||||
local vOtherSplitOrig = CalcSplitCurves( nSplitLayerId, b3OutlineLayer, dMinDim, dMinCoord, nOtherSplitOrientation, vOtherTypes, vOtherValues)
|
||||
|
||||
for i = 1, #vMainAreas do
|
||||
|
||||
|
||||
Reference in New Issue
Block a user