From 76a67e3279d76d914676fbfd30ce792dc102679e Mon Sep 17 00:00:00 2001 From: cnobre Date: Sun, 2 Apr 2017 10:19:54 -0600 Subject: [PATCH] minor changes. commit to make a branch --- src/app.ts | 4 ++-- src/genealogyTree.ts | 5 ++++- src/tableManager.ts | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/app.ts b/src/app.ts index 61843a8..a25baf3 100644 --- a/src/app.ts +++ b/src/app.ts @@ -53,8 +53,8 @@ export class App { /** ===== PUBLIC CASE ===== */ - // await tableManager.loadData('TenFamiliesDescendAnon', 'TenFamiliesAttrAnon'); - await tableManager.loadData('TwoFamiliesDescendAnon', 'TwoFamiliesAttrAnon'); + await tableManager.loadData('TenFamiliesDescendAnon', 'TenFamiliesAttrAnon'); + // await tableManager.loadData('TwoFamiliesDescendAnon', 'TwoFamiliesAttrAnon'); diff --git a/src/genealogyTree.ts b/src/genealogyTree.ts index 061d39d..7d0f0de 100644 --- a/src/genealogyTree.ts +++ b/src/genealogyTree.ts @@ -658,6 +658,8 @@ class GenealogyTree { edgePathsEnter.attr('opacity', 0); + // edgePaths.attr('opacity',0) + edgePaths .attr('class', 'edges') // .transition(t) @@ -674,7 +676,8 @@ class GenealogyTree { }); edgePaths - .transition(t.transition().duration(1000).ease(easeLinear)) + // .transition(t.transition().duration(1000).ease(easeLinear)) + .transition('t') .attr('opacity', 1) .attr('stroke-width', Config.glyphSize / 5); diff --git a/src/tableManager.ts b/src/tableManager.ts index e06afc9..90a75bd 100644 --- a/src/tableManager.ts +++ b/src/tableManager.ts @@ -145,7 +145,7 @@ export default class TableManager { // ['KindredID','PersonID', 'Asthma', 'Bipolar', 'sex', 'deceased', 'suicide', 'gen', 'Age', 'FirstBMI', 'AgeFirstBMI', 'race', 'cause_death', 'weapon']; //set of default cols to read in, minimizes load time for large files; private defaultCols: String[] = - ['KindredID', 'RelativeID', 'sex', 'deceased', 'suicide', 'Depression', 'Age1D_Depression', 'Nr.Diag_Depression', 'Bipolar', 'Age1D_Bipolar', 'Nr.Diag_Bipolar', 'MaxBMI', 'AgeMaxBMI', 'race','cause_death', 'weapon']; //set of default cols to read in, minimizes load time for large files; + ['KindredID', 'RelativeID', 'sex', 'deceased', 'suicide', 'Depression','Age', 'Age1D_Depression', 'Nr.Diag_Depression', 'Bipolar', 'Age1D_Bipolar', 'Nr.Diag_Bipolar', 'MaxBMI', 'AgeMaxBMI', 'race','cause_death', 'weapon']; //set of default cols to read in, minimizes load time for large files;