Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fc-pregmod
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pregmodfan
fc-pregmod
Commits
5ca93f1e
Commit
5ca93f1e
authored
7 years ago
by
sensei
Browse files
Options
Downloads
Patches
Plain Diff
add family tree to starting girls
parent
da54d4f5
No related branches found
No related tags found
1 merge request
!1235
add family tree to starting girls
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/js/familyTree.tw
+4
-1
4 additions, 1 deletion
src/js/familyTree.tw
src/utility/extendedFamilyWidgets.tw
+10
-3
10 additions, 3 deletions
src/utility/extendedFamilyWidgets.tw
with
14 additions
and
4 deletions
src/js/familyTree.tw
+
4
−
1
View file @
5ca93f1e
...
...
@@ -27,7 +27,10 @@ window.renderFamilyTree = function(slaves, filterID) {
var ftreeWidth,ftreeHeight;
var chartWidth, chartHeight;
var margin;
var svg = d3.select('#familyTree').append('svg');
d3.select('#ftree-canvas').remove();
var svg = d3.select('#familyTree')
.append('svg')
.attr('id','ftree-canvas');
var chartLayer = svg.append('g').classed('chartLayer', true);
var range = 100;
...
...
This diff is collapsed.
Click to expand it.
src/utility/extendedFamilyWidgets.tw
+
10
−
3
View file @
5ca93f1e
...
...
@@ -877,7 +877,10 @@
<<replace '#fatherName'>><<parentName "father">><</replace>>
<<replace '#sameMotherNames'>><<listOfSlavesWithSameParent 'mother'>><</replace>>
<<replace '#sameFatherNames'>><<listOfSlavesWithSameParent 'father'>><</replace>>
<<run updateFamilyTree($activeSlave, $slaves, $PC)>>
/* <<run updateFamilyTree($activeSlave, $slaves, $PC)>> */
<<set _tSlaveList = [$activeSlave]>>
<<set _tSlaveList.push.apply(_tSlaveList, $slaves)>>
<<run renderFamilyTree(_tSlaveList, $activeSlave.ID)>>
<</widget>>
/* First parameter is e.g. "father" or "mother" and second parameter is the ID to match */
...
...
@@ -1074,9 +1077,13 @@
<span id="familySummary"><<Family>></span>
<br>
</div>
<div id="graph"></div>
/*
<div id="graph"></div>
<<run updateFamilyTree($activeSlave, $slaves, $PC)>>
<script>updateFamilyTree()</script>
<script>updateFamilyTree()</script>*/
<div id="familyTree"></div>
<<set _tSlaveList = [$activeSlave]>>
<<set _tSlaveList.push.apply(_tSlaveList, $slaves)>>
<<run renderFamilyTree(_tSlaveList, $activeSlave.ID)>>
</div>
<</widget>>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment