pierre/GeneIT
1
0
Fork 0
Code Issues Pull Requests 6 Packages Projects Releases Wiki Activity

Ready to draw filiation links

Browse Source
This commit is contained in:
Pierre HUBERT 2023-08-26 13:56:29 +02:00
parent 1c15fd17db
commit 474a614130
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
geneit_app/src/widgets/simple_family_tree/SimpleFamilyTree.tsx
View File

@ -162,8 +162,27 @@ function NodeArea(p: {
let beginingOfSecondCardX =
parent_x_offset + memberCardWidth(p.node.member) + SPOUSE_SPACING;
let beginSecondFaceX =
p.node.spouse &&
beginingOfSecondCardX +
(memberCardWidth(p.node.spouse.member) - FACE_WIDTH) / 2;
let middleParentFaceY = p.y + Math.floor(FACE_HEIGHT / 2);
// Compute point for link between children and parent
let childrenLinkX: number;
let childrenLinkY: number;
if (p.node.spouse) {
childrenLinkX = Math.floor((endFirstFaceX + beginSecondFaceX!) / 2);
childrenLinkY = middleParentFaceY;
} else {
childrenLinkX =
parent_x_offset + Math.floor(memberCardWidth(p.node.member) / 2);
childrenLinkY = p.y + CARD_HEIGHT;
}
return (
<>
<MemberCard x={parent_x_offset} y={p.y} member={p.node.member} />
@ -175,9 +194,7 @@ function NodeArea(p: {
className="link"
fill="none"
stroke="#000"
d={`M${endFirstFaceX} ${middleParentFaceY} H ${
beginingOfSecondCardX + memberCardWidth(p.node.spouse.member) / 2
}`}
d={`M${endFirstFaceX} ${middleParentFaceY} H ${beginSecondFaceX}`}
></path>
<MemberCard
@ -199,6 +216,8 @@ function NodeArea(p: {
downXOffset += n.width + SIBLINGS_SPACING;
return el;
})}
{/*<circle cx={childrenLinkX} cy={childrenLinkY} r="2" fill="red" />*/}
</>
);
}