Skip to content

Commit

Permalink
add selectors for stroke of progressive alias paths. Put original pat…
Browse files Browse the repository at this point in the history
…hs collation and render behind ?options=pathsCheck.

draw-map.js: check urlOptions.pathsCheck in pathUpdate{,Flow}().
app.scss : add selectors for g.progress > g.alias, (U_alias added but not used yet).  Add some devel stroke variations to assist with verification when using pathsCheck
draw/block-adj.js : handle axisID===undefined in resetZoom(), which is used by resetZooms to signify all axes.
frontend/app/ :
 7061a23 219162 Jul  2 16:45  components/draw-map.js
 9a7e22e  21068 Jul  2 15:53  components/draw/block-adj.js
 f9c926c  28249 Jul  2 15:17  styles/app.scss
  • Loading branch information
Don-Isdale committed Jul 2, 2019
1 parent 814c932 commit 3424955
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 4 deletions.
4 changes: 3 additions & 1 deletion frontend/app/components/draw-map.js
Original file line number Diff line number Diff line change
Expand Up @@ -4548,14 +4548,16 @@ export default Ember.Component.extend(Ember.Evented, {
* @param t transition, which is likely to be undefined here.
*/
this.pathUpdateFlow = function(t, flow) {
pathUpdate_(t, flow);
if (me.get('urlOptions.pathsCheck'))
pathUpdate_(t, flow);
};
this.on('pathUpdateFlow', this, this.pathUpdateFlow);
}

/** call pathUpdate(t) for each of the enabled flows. */
function pathUpdate(t)
{
if (me.get('urlOptions.pathsCheck'))
d3.keys(flows).forEach(function(flowName) {
let flow = flows[flowName];
if (flow.enabled)
Expand Down
4 changes: 3 additions & 1 deletion frontend/app/components/draw/block-adj.js
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,10 @@ export default Ember.Component.extend(Ember.Evented, AxisEvents, {
console.log("zoomedAxis in ", CompName, axisID_t, blockAdjId, axes);
/* zoomedAxis is specific to an axisID, so respond to that if
* blockAdjId[0] or blockAdjId[1] are on this.axis.
* resetZooms() does resetZoom(undefined) meaning un-zoom all axes, so match
* if axisID is undefined.
*/
if (this.isAdjacentToAxis(axisID))
if (!axisID || this.isAdjacentToAxis(axisID))
{
console.log('zoomedAxis matched', axisID, blockAdjId, axes);
// paths positions are updated by event axisStackChanged() already received.
Expand Down
15 changes: 13 additions & 2 deletions frontend/app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -295,15 +295,17 @@ g.axis-use.hasChart > g.axis-html > .foreignObject {
* https://blog.bugsnag.com/sass-color-palettes
*/
div.drawing-controls.flowButtons .flowButton.alias,
.foreground > g.alias > g > path {
.foreground > g.alias > g > path,
.foreground > g.progress > g.alias > g.blockAdj > g > path {
/* HTML */
border-color : #955;
background-color: #955;
/* SVG */
stroke: #955;
}
div.drawing-controls.flowButtons .flowButton.U_alias,
.foreground > g.U_alias > g > path {
.foreground > g.U_alias > g > path,
.foreground > g.progress > g.U_alias > g.blockAdj > g > path {
border-color : #545;
background-color: #545;
stroke: #545;
Expand All @@ -316,6 +318,15 @@ div.drawing-controls.flowButtons .flowButton.direct,
background-color: #484;
stroke: #484;
}
body.devel .foreground > g > g > path {
stroke-dasharray: 30 50 calc(var(--path-stroke-width)*10);
stroke: rgb(50,50,100);
transform: translate(0px, 5px);
}
body.devel .foreground > g.progress > g > g.blockAdj > g > path {
stroke-dasharray: 10 40;
stroke: rgb(100,50,50);
}

.foreground path {
fill: none;
Expand Down

0 comments on commit 3424955

Please sign in to comment.