From f00a559ddc36e8ec0b96063fbe7df9f532a21fc6 Mon Sep 17 00:00:00 2001 From: David Lipowicz Date: Wed, 17 Jun 2015 15:20:38 -0700 Subject: [PATCH 1/5] Adding in a few missing definitions for Dagre. --- dagre/dagre.d.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dagre/dagre.d.ts b/dagre/dagre.d.ts index ce389f2d7..75d7e389a 100644 --- a/dagre/dagre.d.ts +++ b/dagre/dagre.d.ts @@ -10,20 +10,24 @@ declare module Dagre{ interface Graph { new (): Graph; - edges(): string[]; - edge(id: string): any; + edges(): Edge[]; + edge(id: any): any; nodes(): string[]; - node(id: string): any; + node(id: any): any; setDefaultEdgeLabel(callback: () => void): Graph; setEdge(sourceId: string, targetId: string): Graph; setGraph(options: { [key: string]: any }): Graph; setNode(id: string, node: { [key: string]: any }): Graph; } + interface Edge { + v: string; + w: string; + } + interface GraphLib { Graph: Graph; } } -declare var dagre: Dagre.DagreFactory; - +declare var dagre: Dagre.DagreFactory; \ No newline at end of file From b0dcd5ebfbb5441252cb27439e441b07567c4710 Mon Sep 17 00:00:00 2001 From: David Lipowicz Date: Wed, 17 Jun 2015 15:20:56 -0700 Subject: [PATCH 2/5] Adding in some missing definitions for SigmaJs. --- sigmajs/sigmajs.d.ts | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/sigmajs/sigmajs.d.ts b/sigmajs/sigmajs.d.ts index 62bee1980..985686ad4 100644 --- a/sigmajs/sigmajs.d.ts +++ b/sigmajs/sigmajs.d.ts @@ -15,10 +15,17 @@ declare module SigmaJs{ graphPosition(x: number, y:number): {x: number; y: number}; ratio: number; readPrefix: string; + settings(setting: string) : any; x: number; y: number; } + interface Canvas { + edges: {[renderType: string]: Function}; + labels: {[renderType: string]: Function}; + nodes: {[renderType: string]: Function}; + } + interface Classes { configurable: Configurable; graph: Graph; @@ -39,6 +46,7 @@ declare module SigmaJs{ } interface Edge { + [key : string] : any; color?: string; id: string; size?: number; @@ -74,6 +82,11 @@ declare module SigmaJs{ nodes(ids: string[]): Node[]; } + interface GraphData { + edges: Edge[]; + nodes: Node[]; + } + interface Image { clip?: number; scale?: number; @@ -87,6 +100,7 @@ declare module SigmaJs{ } interface Node { + [key : string] : any; color?: string; id: string; image?: any; @@ -149,7 +163,7 @@ declare module SigmaJs{ interface SigmaConfigs { container?: Element; - graph?: Graph; + graph?: GraphData; id?: string; renderers?: Renderer[]; settings?: { [index: string]: any }; @@ -160,10 +174,12 @@ declare module SigmaJs{ new(container: string): Sigma; new(container: Element): Sigma; new(configuration: SigmaConfigs): Sigma; + canvas: Canvas; classes:Classes; misc: Miscellaneous; parsers: Parsers; plugins: Plugins; + svg: SVG; } interface Settings { @@ -269,8 +285,19 @@ declare module SigmaJs{ // Animation settings animationsTime?: number; } + + interface SVG { + edges: {[renderType: string]: SVGObject}; + labels: {[renderType: string]: SVGObject}; + nodes: {[renderType: string]: SVGObject}; + } + + interface SVGObject { + create: (object: T, ...a:any[]) => Element; + update: (object: T, ...a:any[]) => void; + } } declare var sigma: SigmaJs.SigmaFactory; declare var CustomShapes: SigmaJs.CustomShapes; -declare var ShapeLibrary: SigmaJs.CustomShapes; +declare var ShapeLibrary: SigmaJs.CustomShapes; \ No newline at end of file From 35de88ab7d506af1fea5d02b69fbb69d8523153d Mon Sep 17 00:00:00 2001 From: David Lipowicz Date: Wed, 17 Jun 2015 16:33:12 -0700 Subject: [PATCH 3/5] Added a SigmaJs test. --- sigmajs/sigmajs-tests.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sigmajs/sigmajs-tests.ts b/sigmajs/sigmajs-tests.ts index 10c6ce029..f28a9395b 100644 --- a/sigmajs/sigmajs-tests.ts +++ b/sigmajs/sigmajs-tests.ts @@ -23,6 +23,10 @@ module SigmaJsTests { s.refresh(); }); + sigma.canvas.edges['def'] = function() {}; + sigma.svg.nodes['def'] = {create: (obj: SigmaJs.Node) => { return new Element(); }, + update: (obj: SigmaJs.Node) => { return; }}; + var N = 100; var E = 500; // Generate a random graph: From f7803b5aac1e082f2555dac477016629cc394693 Mon Sep 17 00:00:00 2001 From: David Lipowicz Date: Tue, 23 Jun 2015 14:30:08 -0700 Subject: [PATCH 4/5] Made a few small changes to address merge feedback. --- sigmajs/sigmajs.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sigmajs/sigmajs.d.ts b/sigmajs/sigmajs.d.ts index 985686ad4..fbc9bf45d 100644 --- a/sigmajs/sigmajs.d.ts +++ b/sigmajs/sigmajs.d.ts @@ -21,9 +21,9 @@ declare module SigmaJs{ } interface Canvas { - edges: {[renderType: string]: Function}; - labels: {[renderType: string]: Function}; - nodes: {[renderType: string]: Function}; + edges: {[renderType: string]: (edge: Edge, source: Node, target: Node, ...a:any[]) => void}; + labels: {[renderType: string]: (node: Node, ...a:any[]) => void}; + nodes: {[renderType: string]: (node: Node, ...a:any[]) => void}; } interface Classes { From 04d87e516d72859ecc5b8e30d502d13d1b6bd295 Mon Sep 17 00:00:00 2001 From: David Lipowicz Date: Thu, 25 Jun 2015 17:20:58 -0700 Subject: [PATCH 5/5] Added new lines to the end of the files. --- dagre/dagre.d.ts | 2 +- sigmajs/sigmajs.d.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dagre/dagre.d.ts b/dagre/dagre.d.ts index 75d7e389a..fb5bd95d9 100644 --- a/dagre/dagre.d.ts +++ b/dagre/dagre.d.ts @@ -30,4 +30,4 @@ declare module Dagre{ } } -declare var dagre: Dagre.DagreFactory; \ No newline at end of file +declare var dagre: Dagre.DagreFactory; diff --git a/sigmajs/sigmajs.d.ts b/sigmajs/sigmajs.d.ts index fbc9bf45d..d1c19730c 100644 --- a/sigmajs/sigmajs.d.ts +++ b/sigmajs/sigmajs.d.ts @@ -300,4 +300,4 @@ declare module SigmaJs{ declare var sigma: SigmaJs.SigmaFactory; declare var CustomShapes: SigmaJs.CustomShapes; -declare var ShapeLibrary: SigmaJs.CustomShapes; \ No newline at end of file +declare var ShapeLibrary: SigmaJs.CustomShapes;