diff --git a/Designing/Main.lua b/Designing/Main.lua index 40d21d6..ecba1cc 100644 --- a/Designing/Main.lua +++ b/Designing/Main.lua @@ -67,7 +67,7 @@ local nFrameId = WinCreate.CreateFrame( WIN_FRAME_TYPES.RECT, vFrameJoints, {Win -- local nFrameId = WinCreate.CreateFrame( WIN_FRAME_TYPES.CHAMFER, { FrameJointType, FrameJointType, FrameJointType, FrameJointType, FrameJointType}, {WindowWidth, WindowHeight, WindowHeight + 500}) -- local nFrameId = WinCreate.CreateFrame( WIN_FRAME_TYPES.POINTED_ARC, { FrameJointType, FrameJointType, FrameJointType, FrameJointType, FrameJointType}, {1500, 1500, 2400}) -- local nFrameId = WinCreate.CreateFrame( WIN_FRAME_TYPES.TRG, { FrameJointType, FrameJointType, FrameJointType}, {1500, 1500, 500}) --- local nFrameId = WinCreate.CreateFrame( WIN_FRAME_TYPES.THREE_CENTERED_ARC, { FrameJointType, FrameJointType, WIN_JNT.ANGLED, WIN_JNT.ANGLED, WIN_JNT.ANGLED, WIN_JNT.ANGLED}, {1500, 1500, 1800, 200}) +-- local nFrameId = WinCreate.CreateFrame( WIN_FRAME_TYPES.THREE_CENTER_ARC, { FrameJointType, FrameJointType, WIN_JNT.ANGLED, WIN_JNT.ANGLED, WIN_JNT.ANGLED, WIN_JNT.ANGLED}, {1500, 1500, 1800, 200}) ------------------------ Aggiunta split a griglia ------------------------ diff --git a/Designing/WinConst.lua b/Designing/WinConst.lua index 99b6ec9..6ebd013 100644 --- a/Designing/WinConst.lua +++ b/Designing/WinConst.lua @@ -27,7 +27,7 @@ WIN_FRAME_TYPES = { SEGMENTAL_ARC = 5, POINTED_ARC = 6, TRG = 7, - THREE_CENTERED_ARC = 8, + THREE_CENTER_ARC = 8, } -- forme per anta diff --git a/Designing/WinLib/WinCreate.lua b/Designing/WinLib/WinCreate.lua index b61efcd..a4bae00 100644 --- a/Designing/WinLib/WinCreate.lua +++ b/Designing/WinLib/WinCreate.lua @@ -153,7 +153,7 @@ local function CreateFrameCurves( nLayerId, nType, vDim) EgtSetName( nLeftId, WIN_LEFT) -- arco a 3 centri - elseif nType == WIN_FRAME_TYPES.THREE_CENTERED_ARC then + elseif nType == WIN_FRAME_TYPES.THREE_CENTER_ARC then -- vDim[1] larghezza, vDim[2] altezza dei lati verticali, vDim[3] altezza complessiva, vDim[4] raggio di raccordo local nBottomId = EgtLine( nLayerId, ORIG(), Point3d( vDim[1], 0, 0)) EgtSetName( nBottomId, WIN_BOTTOM) diff --git a/Designing/WinLib/WinManageProject.lua b/Designing/WinLib/WinManageProject.lua index 6f89aa4..9209b3d 100644 --- a/Designing/WinLib/WinManageProject.lua +++ b/Designing/WinLib/WinManageProject.lua @@ -58,6 +58,8 @@ local function GetFrameShape( sShape) return WIN_FRAME_TYPES.SEGMENTAL_ARC elseif sShape == 'DOUBLEARC' then return WIN_FRAME_TYPES.POINTED_ARC + elseif sShape == 'THREECENTERARC' then + return WIN_FRAME_TYPES.THREE_CENTER_ARC elseif sShape == 'TRIANGLE' then return WIN_FRAME_TYPES.TRG end