Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/app/demo_page/demo_datasets/edge_marker_styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ export const fakeGraph: GraphSkeleton = {
type: 'execution',
next: [{
edgeOpts: {
// NOTE: fromMarkerStyle = 'arrow' is the same as 'circle'.
fromMarkerStyle: 'arrow',
toMarkerStyle: 'arrow',
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 21 additions & 1 deletion src/app/directed_acyclic_graph_raw.ng.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,31 @@
/>
</marker>
</defs>
<defs *ngIf="getEdgeWidth(e, false) as eWidth">
<marker
[attr.id]="getFromArrowMarkerId(e)"
viewBox="0 0 10 10"
refX="10"
refY="5"
[attr.markerWidth]="eWidth + 7"
[attr.markerHeight]="eWidth + 7"
markerUnits="userSpaceOnUse"
orient="auto-start-reverse"
>
<path
class="arrow"
d="M 0 1 L 10 5 L 0 9 z"
[attr.stroke]="getEdgeColor(e) || '#9ba1a7'"
[attr.fill]="getEdgeColor(e) || '#9ba1a7'"
/>
</marker>
</defs>
<path
class="line"
[attr.d]="buildPath(e)"
[attr.stroke]="getEdgeColor(e)"
[attr.stroke-width]="getEdgeWidth(e)"
[attr.marker-start]="getEdgeMarkerStartId(e)"
[attr.marker-end]="getEdgeMarkerEndId(e)"
/>
</g>
Expand Down Expand Up @@ -71,7 +91,7 @@
<ng-container *ngFor="let e of edges; trackBy: edgeTrack">
<g *ngIf="isDagreInit(e)" class="marker-group fade-in">
<g
*ngIf="(e.fromMarkerStyle || theme.edgeFromMarkerStyle) !== 'hidden'"
*ngIf="(e.fromMarkerStyle || theme.edgeFromMarkerStyle) === 'circle'"
[ngClass]="edgeMarkerClassesFor(e, 'from')">
<circle
r="4"
Expand Down
15 changes: 15 additions & 0 deletions src/app/directed_acyclic_graph_raw.ts
Original file line number Diff line number Diff line change
Expand Up @@ -953,6 +953,21 @@ export class DagRaw implements DoCheck, OnInit, OnDestroy {
return `url(#${this.getArrowMarkerId(edge)})`;
}

getFromArrowMarkerId(edge: DagEdge|undefined): string {
if (!edge || !edge.points) return '';
const [from, to] = [edge.from, edge.to].map(s => s.replace(/[^\w]/g, '-'));
return `${this.path.join('-')}_arrow_${to}_${from}`;
}

getEdgeMarkerStartId(edge: DagEdge|undefined): string|undefined {
const markerStyle = edge?.fromMarkerStyle || this.theme.edgeFromMarkerStyle;
if (!edge || !edge.points || markerStyle === 'circle' ||
markerStyle === 'hidden') {
return undefined;
}
return `url(#${this.getFromArrowMarkerId(edge)})`;
}

getControlPointsForBezierCurve(start: Point, end: Point): Point[] {
if (this.layout.rankDirection === 'LR' ||
this.layout.rankDirection === 'RL') {
Expand Down
2 changes: 2 additions & 0 deletions src/app/node_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,8 @@ export interface DagEdge {
* this edge
*/
weight?: number;
/** The number of ranks to keep between the source and target of the edge. */
minlen?: number;
}

/**
Expand Down
Loading