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

fixed modify out issue

Browse Source
This commit is contained in:
TreetopFlyer 2021-05-20 19:27:29 -04:00
parent ae22e995f2
commit a516f7b3d6
2 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
index.html
View File

@ -27,7 +27,7 @@ var N =
let check = N.Step(inNodeMajor, inKey, true); let check = N.Step(inNodeMajor, inKey, true);
if(check) if(check)
{ {
if(check.indexOf(inNodeMinor) < 0) if(check.indexOf(inNodeMinor) !== -1)
{ {
return; return;
} }
@ -251,12 +251,12 @@ var Pivot =
{ {
// 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, "ModifyUp") ) modifiers.forEach( inModifier => N.Connect(inModifier, inLastBranch, "ModifyOut") )
// 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( inNode=>
{ {
modifiers.forEach( inModifier => N.Connect(inModifier, inNode, "ModifyUp", true) ) modifiers.forEach( inModifier => N.Connect(inModifier, inNode, "ModifyOut", true) )
} }
, inLastBranch, "Hierarchy", false); , inLastBranch, "Hierarchy", false);
} }
@ -278,7 +278,13 @@ var Pivot =
{ {
N.ID.Walk++; N.ID.Walk++;
let pivotRoot = N.Create({Label:"Pivot Root", Leaves:Pivot.Leaves}); let names = N.Step(Pivot.Schema, "label");
let label = inPivotIndicies.map( inPivotIndex =>
{
return names[inPivotIndex].Meta.Label;
});
let pivotRoot = N.Create({Label:label.join("|"), Leaves:Pivot.Leaves});
N.Connect(Pivot.Root, pivotRoot, "Pivot"); N.Connect(Pivot.Root, pivotRoot, "Pivot");
return Pivot.Pivot(pivotRoot, pivotRoot, inPivotIndicies, inSumIndicies); return Pivot.Pivot(pivotRoot, pivotRoot, inPivotIndicies, inSumIndicies);
}, },
@ -305,6 +311,8 @@ var Pivot =
Modify(inNode) Modify(inNode)
{ {
let modified = N.Create({Label:"Modifier"}); let modified = N.Create({Label:"Modifier"});
// add the modifier to the appropriate root
N.ID.Walk++; N.ID.Walk++;
if(N.Step(inNode, "Hierarchy").length) if(N.Step(inNode, "Hierarchy").length)
{ {
@ -318,6 +326,7 @@ var Pivot =
N.Connect(Pivot.Root, modified, "Modifier"); N.Connect(Pivot.Root, modified, "Modifier");
} }
// traverse
let leaves = []; let leaves = [];
let gatherUp = n => N.Connect(modified, n, "ModifyUp"); let gatherUp = n => N.Connect(modified, n, "ModifyUp");
let gatherDown = n => let gatherDown = n =>
@ -325,7 +334,11 @@ var Pivot =
N.Connect(modified, n, "ModifyDown"); N.Connect(modified, n, "ModifyDown");
N.Step(n, "Hierarchy").length == 0 ? leaves.push(n) : null; N.Step(n, "Hierarchy").length == 0 ? leaves.push(n) : null;
}; };
let gatherOut = n => N.Connect(modified, n, "ModifyOut"); let gatherOut = n => {
N.Connect(modified, n, "ModifyOut");
};
N.ID.Walk++; N.ID.Walk++;
inNode.ID.Walk = N.ID.Walk; inNode.ID.Walk = N.ID.Walk;
@ -425,7 +438,6 @@ let ElForm = props =>
action action
]) ])
}; };
let ElNode = ({node, depth}) => let ElNode = ({node, depth}) =>
{ {
let nodeBase = css` let nodeBase = css`
@ -509,7 +521,8 @@ let ElNode = ({node, depth}) =>
}; };
let ElPivot = ({pivot}) => let ElPivot = ({pivot}) =>
{ {
return h("div", {style:{display:"inline-block", width:"800px"}}, [ return h("div", {className:css`display:inline-block;`}, [
h("h3", null, pivot.Meta.Label),
h("button", {onClick:e=>{Pivot.Delete(pivot);Render();}}, "delete?"), h("button", {onClick:e=>{Pivot.Delete(pivot);Render();}}, "delete?"),
h(ElModifiers, {node:pivot}), h(ElModifiers, {node:pivot}),
h(ElNode, {node:pivot, depth:0}) h(ElNode, {node:pivot, depth:0})

20
save.json Normal file
View File

@ -0,0 +1,20 @@
[
{
"name":"",
"csv":["data/output/1.csv", "data/output/2.csv"],
"pivots":
[
{
"pivot":[0, 1],
"sum":[3],
"modifications":
[
{
"path":[0, 0],
"modification":[0.2]
}
]
}
]
}
]