zcy
/
maxGraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: types of Hierarchical and Swimlane Layout #96

development
Anatoliy Mayorov 2022-10-08 21:43:35 +03:00
parent f84a4a5836
commit 1603729a9b
5 changed files with 115 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/core/src/types.ts
View File

@ -15,6 +15,7 @@ limitations under the License.
*/
import { DIRECTION } from './util/Constants';
import Dictionary from './util/Dictionary';
import type Cell from './view/cell/Cell';
import type CellState from './view/cell/CellState';
import EventSource from './view/event/EventSource';
@ -22,6 +23,7 @@ import type InternalMouseEvent from './view/event/InternalMouseEvent';
import type Shape from './view/geometry/Shape';
import type { Graph } from './view/Graph';
import type ImageBox from './view/image/ImageBox';
import GraphHierarchyNode from './view/layout/datatypes/GraphHierarchyNode';
export type CellMap = {
[id: string]: Cell;
@ -316,3 +318,26 @@ export interface PopupMenuItem extends HTMLElement {
activeRow: PopupMenuItem | null;
eventReceiver: HTMLElement | null;
}
// GraphLayout
export interface GraphLayoutTraverseArgs {
vertex: Cell | null;
directed: boolean | null;
func: Function | null;
edge: Cell | null;
visited: Dictionary<Cell, boolean> | null;
}
export interface HierarchicalGraphLayoutTraverseArgs
extends GraphLayoutTraverseArgs{
allVertices: { [key: string]: Cell } | null,
currentComp: { [key: string]: Cell | null },
hierarchyVertices: GraphHierarchyNode[],
filledVertexSet: { [key: string]: Cell } | null
}
export interface SwimlaneGraphLayoutTraverseArgs
extends HierarchicalGraphLayoutTraverseArgs{
swimlaneIndex: number
}

19
packages/core/src/view/layout/GraphLayout.ts
View File

@ -22,6 +22,7 @@ import Geometry from '../geometry/Geometry';
import Point from '../geometry/Point';
import { Graph } from '../Graph';
import Cell from '../cell/Cell';
import { GraphLayoutTraverseArgs } from '../../types';
/**
* @class GraphLayout
@ -141,13 +142,7 @@ class GraphLayout {
* null for the first step of the traversal.
* @param visited Optional {@link Dictionary} of cell paths for the visited cells.
*/
traverse(
vertex: Cell,
directed?: boolean,
func?: Function,
edge?: Cell,
visited?: Dictionary<Cell, boolean>
): void {
traverse({vertex, directed, func, edge, visited}: GraphLayoutTraverseArgs): void {
if (func != null && vertex != null) {
directed = directed != null ? directed : true;
visited = visited || new Dictionary();
@ -161,12 +156,18 @@ class GraphLayout {
if (edgeCount > 0) {
for (let i = 0; i < edgeCount; i += 1) {
const e = vertex.getEdgeAt(i);
const e: Cell = vertex.getEdgeAt(i);
const isSource = e.getTerminal(true) === vertex;
if (!directed || isSource) {
const next = this.graph.view.getVisibleTerminal(e, !isSource);
this.traverse(<Cell>next, directed, func, e, visited);
this.traverse({
vertex: next,
directed,
func,
edge: e,
visited
});
}
}
}

72
packages/core/src/view/layout/HierarchicalLayout.ts
View File

@ -27,7 +27,7 @@ import MedianHybridCrossingReduction from './hierarchical/MedianHybridCrossingRe
import CoordinateAssignment from './hierarchical/CoordinateAssignment';
import { Graph } from '../../view/Graph';
import Cell from '../../view/cell/Cell';
import GraphHierarchyNode from './datatypes/GraphHierarchyNode';
import { HierarchicalGraphLayoutTraverseArgs } from '../../types';
/**
* A hierarchical layout algorithm.
@ -444,15 +444,17 @@ class HierarchicalLayout extends GraphLayout {
const vertexSet = Object();
hierarchyVertices.push(vertexSet);
this.traverse(
candidateRoots[i],
true,
null,
allVertexSet,
vertexSet,
hierarchyVertices,
filledVertexSet
);
this.traverse({
vertex: candidateRoots[i],
directed: true,
edge: null,
allVertices: allVertexSet,
currentComp: vertexSet,
hierarchyVertices: hierarchyVertices,
filledVertexSet: filledVertexSet,
func: null,
visited: null
});
}
for (let i = 0; i < candidateRoots.length; i += 1) {
@ -477,15 +479,17 @@ class HierarchicalLayout extends GraphLayout {
const vertexSet = Object();
hierarchyVertices.push(vertexSet);
this.traverse(
roots[i],
true,
null,
allVertexSet,
vertexSet,
hierarchyVertices,
null
);
this.traverse({
vertex: roots[i],
directed: true,
edge: null,
allVertices: allVertexSet,
currentComp: vertexSet,
hierarchyVertices: hierarchyVertices,
filledVertexSet: null,
func: null,
visited: null
});
}
}
@ -600,16 +604,14 @@ class HierarchicalLayout extends GraphLayout {
* null for the first step of the traversal.
* @param allVertices Array of cell paths for the visited cells.
*/
// @ts-ignore
traverse(
vertex: Cell,
directed: boolean = false,
edge: Cell | null = null,
allVertices: { [key: string]: Cell } | null = null,
currentComp: { [key: string]: Cell | null },
hierarchyVertices: GraphHierarchyNode[],
filledVertexSet: { [key: string]: Cell } | null = null
) {
traverse({
vertex,
directed,
allVertices,
currentComp,
hierarchyVertices,
filledVertexSet
}: HierarchicalGraphLayoutTraverseArgs) {
if (vertex != null && allVertices != null) {
// Has this vertex been seen before in any traversal
// And if the filled vertex set is populated, only
@ -666,15 +668,17 @@ class HierarchicalLayout extends GraphLayout {
}
if (netCount >= 0) {
currentComp = this.traverse(
<Cell>next,
currentComp = this.traverse({
vertex: next,
directed,
edges[i],
edge: edges[i],
allVertices,
currentComp,
hierarchyVertices,
filledVertexSet
);
filledVertexSet,
func: null,
visited: null
});
}
}
}

80
packages/core/src/view/layout/SwimlaneLayout.ts
View File

@ -29,7 +29,7 @@ import CoordinateAssignment from './hierarchical/CoordinateAssignment';
import { Graph } from '../Graph';
import Cell from '../cell/Cell';
import Geometry from '../../view/geometry/Geometry';
import GraphHierarchyNode from './datatypes/GraphHierarchyNode';
import { SwimlaneGraphLayoutTraverseArgs } from '../../types';
/**
* A hierarchical layout algorithm.
@ -579,16 +579,18 @@ class SwimlaneLayout extends GraphLayout {
const vertexSet = Object();
hierarchyVertices.push(vertexSet);
this.traverse(
candidateRoots[i],
true,
null,
allVertexSet,
vertexSet,
this.traverse({
vertex: candidateRoots[i],
directed: true,
edge: null,
allVertices: allVertexSet,
currentComp: vertexSet,
hierarchyVertices,
filledVertexSet,
laneCounter
);
swimlaneIndex: laneCounter,
func: null,
visited: null
});
}
for (let i = 0; i < candidateRoots.length; i += 1) {
@ -612,16 +614,18 @@ class SwimlaneLayout extends GraphLayout {
for (let i = 0; i < roots.length; i += 1) {
const vertexSet = Object();
hierarchyVertices.push(vertexSet);
this.traverse(
roots[i],
true,
null,
allVertexSet,
vertexSet,
this.traverse({
vertex: roots[i],
directed: true,
edge: null,
allVertices: allVertexSet,
currentComp: vertexSet,
hierarchyVertices,
null,
i
); // CHECK THIS PARAM!! ====================
filledVertexSet: null,
swimlaneIndex: i,
func: null,
visited: null
}); // CHECK THIS PARAM!! ====================
}
}
@ -731,17 +735,15 @@ class SwimlaneLayout extends GraphLayout {
* @param allVertices Array of cell paths for the visited cells.
* @param swimlaneIndex the laid out order index of the swimlane vertex is contained in
*/
// @ts-ignore
traverse(
vertex: Cell | null = null,
directed: boolean,
edge: Cell | null,
allVertices: { [key: string]: Cell } | null = null,
currentComp: { [key: string]: Cell },
hierarchyVertices: GraphHierarchyNode[],
filledVertexSet: { [key: string]: Cell } | null = null,
swimlaneIndex: number
) {
traverse({
vertex,
directed,
allVertices,
currentComp,
hierarchyVertices,
filledVertexSet,
swimlaneIndex
}: SwimlaneGraphLayoutTraverseArgs) {
if (vertex != null && allVertices != null) {
// Has this vertex been seen before in any traversal
// And if the filled vertex set is populated, only
@ -764,7 +766,6 @@ class SwimlaneLayout extends GraphLayout {
}
const edges = this.getEdges(vertex);
const { model } = this.graph;
for (let i = 0; i < edges.length; i += 1) {
let otherVertex = this.getVisibleTerminal(edges[i], true);
@ -775,16 +776,15 @@ class SwimlaneLayout extends GraphLayout {
}
let otherIndex = 0;
const swimlanes = this.swimlanes as Cell[];
// Get the swimlane index of the other terminal
for (otherIndex = 0; otherIndex < swimlanes.length; otherIndex++) {
if (swimlanes[otherIndex].isAncestor(otherVertex)) {
for (otherIndex = 0; otherIndex < this.swimlanes!.length; otherIndex++) {
if (this.swimlanes![otherIndex].isAncestor(otherVertex)) {
break;
}
}
if (otherIndex >= swimlanes.length) {
if (otherIndex >= this.swimlanes!.length) {
continue;
}
@ -795,16 +795,18 @@ class SwimlaneLayout extends GraphLayout {
otherIndex > swimlaneIndex ||
((!directed || isSource) && otherIndex === swimlaneIndex)
) {
currentComp = this.traverse(
<Cell>otherVertex,
currentComp = this.traverse({
vertex: otherVertex,
directed,
edges[i],
edge: edges[i],
allVertices,
currentComp,
hierarchyVertices,
filledVertexSet,
otherIndex
);
swimlaneIndex: otherIndex,
func: null,
visited: null
});
}
}
} else if (currentComp[vertexID] == null) {

4
packages/ts-example/tsconfig.json
View File

@ -13,9 +13,7 @@
"noEmit": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noImplicitReturns": true,
// TODO required because some type definitions in the @maxgraph/core package generate errors: https://github.com/maxGraph/maxGraph/issues/96
"skipLibCheck": true
"noImplicitReturns": true
},
"include": ["src"]
}