SethTrowbridge/pivot-editor
1
1
Fork 0
Code Issues 1 Pull Requests Projects 1 Releases Wiki Activity

Compare commits

base: SethTrowbridge:0c5a1142d39edbb8807c18efec256bb6228974e0
Branches Tags
SethTrowbridge:master
SethTrowbridge:refactor2022/imports
SethTrowbridge:project-file
SethTrowbridge:modifier-form
SethTrowbridge:fix-walk
SethTrowbridge:docs
...
compare: SethTrowbridge:6e1c170ff69c51d86c00a7390b8b7fad9f569c4a
Branches Tags
SethTrowbridge:master
SethTrowbridge:refactor2022/imports
SethTrowbridge:project-file
SethTrowbridge:modifier-form
SethTrowbridge:fix-walk
SethTrowbridge:docs

2 Commits
0c5a1142d3 ... 6e1c170ff6

Author SHA1 Message Date
TreetopFlyer
6e1c170ff6 simplify terminal branch case in pivot routine 2021-05-24 14:26:18 -04:00
TreetopFlyer
1424c18cc4 fix pivot delete disconnect walk 2021-05-24 11:51:07 -04:00
1 changed files with 12 additions and 21 deletions
Show Stats Expand all files Collapse all files

33
index.html
View File

@ -240,29 +240,20 @@ var Pivot =
{ {
// collect modifiers effecting leaves // collect modifiers effecting leaves
let modifiers = []; let modifiers = [];
let check = N.Step(inLeaf, "ModifyAt", false); let collectModifier = n => modifiers.push(n);
if(check) let connectModifiers = n => modifiers.forEach(inModifier => N.Connect(inModifier, n, "ModifyOut", true));
{
modifiers = modifiers.concat(check); N.Walk(collectModifier, inLeaf, "ModifyAt", false);
} N.Walk(collectModifier, inLeaf, "ModifyDown", false);
check = N.Step(inLeaf, "ModifyDown", false);
if(check)
{
modifiers = modifiers.concat(check);
}
if(modifiers.length) if(modifiers.length)
{ {
// apply them to the branch // apply them to the branch
inLastBranch.ID.Walk = N.ID.Walk; inLastBranch.ID.Walk = N.ID.Walk;
modifiers.forEach( inModifier => N.Connect(inModifier, inLastBranch, "ModifyOut") ) connectModifiers(inLastBranch);
// also walk them up and connect, but with "check unique" enabled // also walk them up and connect, but with "check unique" enabled
N.Walk( inNode=> N.Walk(connectModifiers, inLastBranch, "Hierarchy", false);
{
modifiers.forEach( inModifier => N.Connect(inModifier, inNode, "ModifyOut", true) )
}
, inLastBranch, "Hierarchy", false);
} }
// lastly connect the leaf to the branch // lastly connect the leaf to the branch
@ -275,7 +266,7 @@ var Pivot =
{ {
iterator = child => Pivot.Pivot(inRoot, child, inPivotIndicies, inSumIndicies, depth+1); iterator = child => Pivot.Pivot(inRoot, child, inPivotIndicies, inSumIndicies, depth+1);
} }
N.Step(inParent, "Hierarchy").forEach(iterator); N.Walk(iterator, inParent, "Hierarchy");
return inParent; return inParent;
}, },
Create(inPivotIndicies, inSumIndicies) Create(inPivotIndicies, inSumIndicies)
@ -304,13 +295,13 @@ var Pivot =
} }
} }
// disconnect terminal branches // disconnect leaves from terminal branches
N.Walk(()=>{}, inRoot, "Hierarchy", inNode=>{ N.Walk(()=>{}, inRoot, "Hierarchy", true, terminal=>{
N.Disconnect(inNode, null, "Leaf"); N.Disconnect(terminal, null, "Leaf");
}); });
// disconnect from app // disconnect from app
N.Disconnect(null, inRoot, "Pivot") N.Disconnect(null, inRoot, "Pivot");
}, },
Modify(inNode) Modify(inNode)
{ {