diff --git a/Profiles/WinLib/WinCalculate.lua b/Profiles/WinLib/WinCalculate.lua index 7180cf5..b1df20e 100644 --- a/Profiles/WinLib/WinCalculate.lua +++ b/Profiles/WinLib/WinCalculate.lua @@ -1227,11 +1227,13 @@ function WinCalculate.CalcFrameGeo( nPartId, nOutlineId, nOutlineLayerId, bBotto if nProfileType ~= WIN_PRF.SPLIT and StartJointType ~= WIN_JNT.ANGLED and AreSameVectorApprox( EgtEV( nPrevOutlineId), EgtSV( nOutlineId)) then -- imposto giunzione a bisettrice StartJointType = WIN_JNT.ANGLED + EgtSetInfo( nOutlineId, WIN_STARTJOINT, WIN_JNT.ANGLED) -- EgtSetInfo( nOutlineLayerId, WIN_JOINT_TR, 'i') end if nProfileType ~= WIN_PRF.SPLIT and EndJointType ~= WIN_JNT.ANGLED and AreSameVectorApprox( EgtEV( nOutlineId), EgtSV( nNextOutlineId)) then -- imposto giunzione a bisettrice EndJointType = WIN_JNT.ANGLED + EgtSetInfo( nOutlineId, WIN_ENDJOINT, WIN_JNT.ANGLED) -- EgtSetInfo( nOutlineLayerId, WIN_JOINT_TR, 'i') end -- creo lati dell'outline @@ -1717,8 +1719,8 @@ function WinCalculate.MakeSolidByExtrusion(nGeoId, nOutlineId, nMainProfileId, n end elseif StartJointType == WIN_PART_JNT.SHORT then -- recupero profondita' d'inizio e fine - local sStart = EgtIf( sOutlineName == WIN_BOTTOM or sPrevOutlineName == WIN_BOTTOM, WIN_DWL_BOTTOMPARASTART, WIN_DWL_TOPPARASTART) - local sEnd = EgtIf( sOutlineName == WIN_BOTTOM or sPrevOutlineName == WIN_BOTTOM, WIN_DWL_BOTTOMPARAEND, WIN_DWL_TOPPARAEND) + local sStart = EgtIf( sOutlineName == WIN_BOTTOM or sEndOutlineName == WIN_BOTTOM, WIN_DWL_BOTTOMPARASTART, WIN_DWL_TOPPARASTART) + local sEnd = EgtIf( sOutlineName == WIN_BOTTOM or sEndOutlineName == WIN_BOTTOM, WIN_DWL_BOTTOMPARAEND, WIN_DWL_TOPPARAEND) -- ciclo sui fori trovati local nOrigDowelId = EgtGetFirstNameInGroup( nMainProfileId, WIN_DOWEL .. '*') while nOrigDowelId do diff --git a/Profiles/WinOpenProjectFile.lua b/Profiles/WinOpenProjectFile.lua index 737e0b8..298514c 100644 --- a/Profiles/WinOpenProjectFile.lua +++ b/Profiles/WinOpenProjectFile.lua @@ -40,7 +40,8 @@ EgtStartCounter() EgtNewFile() local sOpeneDirPath = 'c:\\EgtData\\Window\\Projects' -local sFileName = 'RoundArc_TripleVerticalSash.jwd' +--local sFileName = 'RoundArc_TripleVerticalSash.jwd' +local sFileName = 'RoundArc_FixedGlass_Vertical&HorizontalSplit.jwd' local sOpenFilePath = sOpeneDirPath .. '\\' .. sFileName if WINDOW and WINDOW.FILE then sOpenFilePath = WINDOW.FILE