diff --git a/LuaLibs/BeamExec.lua b/LuaLibs/BeamExec.lua index 3259c07..bd24d0a 100644 --- a/LuaLibs/BeamExec.lua +++ b/LuaLibs/BeamExec.lua @@ -716,6 +716,7 @@ local function AreDrillingsMirrored( Proc, ProcMirror, Part) if AreOppositeVectorApprox( vtExtr, vtExtrMirror) then -- fori lungo Y -- per macchine tipo PF il foro principale è sul lato back, per macchine tipo PF1250 è sul lato front + -- TODO eliminare i riferimenti a DOWN_HEAD e TWO_EQUAL_HEADS e sostituirli con check iniziale sulla disponibilità di teste? if ( BeamData.TWO_EQUAL_HEADS and AreSameVectorApprox( vtExtr, Y_AX())) or ( BeamData.DOWN_HEAD and AreOppositeVectorApprox( vtExtr, Y_AX())) then nDouble = 2 @@ -792,6 +793,7 @@ local function GetFeatureInfoAndDependency( vProcSingleRot, Part) Proc.bPassedByHole = true end -- verifiche per specchiature + -- TODO eliminare i riferimenti a DOWN_HEAD e TWO_EQUAL_HEADS e sostituirli con check iniziale sulla disponibilità di teste? if BeamData.DOWN_HEAD or BeamData.TWO_EQUAL_HEADS then -- forature if BeamData.DOUBLE_HEAD_DRILLING and ID.IsDrill( Proc) and ID.IsDrill( ProcB) and not Proc.Mirror then diff --git a/LuaLibs/DiceCut.lua b/LuaLibs/DiceCut.lua index 7b0bde2..00e9457 100644 --- a/LuaLibs/DiceCut.lua +++ b/LuaLibs/DiceCut.lua @@ -450,6 +450,7 @@ function DiceCut.GetDice( Part, Face1, Face2, OptionalParameters) -- TODO parte sotto da aggiungere???? se sì va passata anche la dimensione cubetto ridotta dOffsetOrthogonalReduced -- se non c'è testa da sotto e normali senza componenti in Y con faccia quasi verticale e trave non alta, uso per offset i limiti dei tagli di testa e coda + -- TODO eliminare i riferimenti a DOWN_HEAD e TWO_EQUAL_HEADS e sostituirli con check iniziale sulla disponibilità di teste? -- if not BD.TURN and not BD.DOWN_HEAD and abs( vtNPlanes:getY()) < 0.1 and vtNPlanes:getZ() < 0.7071 and ( not vtNBond or abs( vtNBond:getY()) < 0.1) and BBoxRawPart:getDimZ() < BD.MIN_DIM_HBEAM then -- dOffsetOrthogonal = dOffsetOrthogonalReduced -- end diff --git a/LuaLibs/FaceData.lua b/LuaLibs/FaceData.lua index 56e969f..aeae3be 100644 --- a/LuaLibs/FaceData.lua +++ b/LuaLibs/FaceData.lua @@ -426,6 +426,8 @@ local function GetBottomFaces( Proc) CurrentEdge.dElevation = BottomFaces[1].Edges[i].dElevation CurrentEdge.bIsStartOpen = BottomFaces[1].Edges[i].bIsStartOpen CurrentEdge.bIsEndOpen = BottomFaces[1].Edges[i].bIsEndOpen + CurrentEdge.ptStart = BottomFaces[1].Edges[i].ptStart + CurrentEdge.ptEnd = BottomFaces[1].Edges[i].ptEnd if nFirstLongEdgeIndex then if i == nFirstLongEdgeIndex then @@ -521,6 +523,8 @@ local function GetLongFaces( Proc, MainFaces) CurrentEdge.dElevation = LongFaces[i].Edges[j].dElevation CurrentEdge.bIsStartOpen = LongFaces[i].Edges[j].bIsStartOpen CurrentEdge.bIsEndOpen = LongFaces[i].Edges[j].bIsEndOpen + CurrentEdge.ptStart = LongFaces[i].Edges[j].ptStart + CurrentEdge.ptEnd = LongFaces[i].Edges[j].ptEnd if Proc.Topology.sFamily == 'Tunnel' then if CurrentEdge.idAdjacentFace > -1 then @@ -617,6 +621,8 @@ local function GetSideFaces( Proc, MainFaces) CurrentEdge.dElevation = SideFaces[i].Edges[j].dElevation CurrentEdge.bIsStartOpen = SideFaces[i].Edges[j].bIsStartOpen CurrentEdge.bIsEndOpen = SideFaces[i].Edges[j].bIsEndOpen + CurrentEdge.ptStart = SideFaces[i].Edges[j].ptStart + CurrentEdge.ptEnd = SideFaces[i].Edges[j].ptEnd if Proc.Topology.sFamily == 'Tunnel' then if CurrentEdge.idAdjacentFace > -1 then diff --git a/LuaLibs/FeatureLib.lua b/LuaLibs/FeatureLib.lua index 28a9c4c..2c6886c 100644 --- a/LuaLibs/FeatureLib.lua +++ b/LuaLibs/FeatureLib.lua @@ -323,7 +323,7 @@ function FeatureLib.GetAdditionalInfo( Proc, Part) elseif ID.IsRidgeLap( Proc) then Proc.AdjacencyMatrix = FaceData.GetAdjacencyMatrix( Proc) Proc.Faces = FaceData.GetFacesInfo( Proc, Part) - elseif ID.IsMarking( Proc) then + elseif ID.IsMarking( Proc) or ID.IsText( Proc) then Proc.FeatureInfo = FeatureLib.GetMarkTextData( Proc) elseif ID.IsHipValleyRafterNotch( Proc) then Proc.AdjacencyMatrix = FaceData.GetAdjacencyMatrix( Proc)