Browse Source

Removed appending data to Graph

css_transitions
josdejong 11 years ago
parent
commit
c68456d0ca
4 changed files with 18 additions and 329 deletions
  1. +8
    -133
      docs/graph.html
  2. +3
    -96
      src/graph/graph.js
  3. +3
    -96
      vis.js
  4. +4
    -4
      vis.min.js

+ 8
- 133
docs/graph.html View File

@ -43,7 +43,6 @@
<li><a href="#Loading">Loading</a></li> <li><a href="#Loading">Loading</a></li>
<li><a href="#Data_Format">Data Format</a></li> <li><a href="#Data_Format">Data Format</a></li>
<li><a href="#Data_Import">Data Import</a></li> <li><a href="#Data_Import">Data Import</a></li>
<li><a href="#Dynamic_Data">Dynamic Data</a></li>
<li><a href="#Configuration_Options">Configuration Options</a></li> <li><a href="#Configuration_Options">Configuration Options</a></li>
<li><a href="#Methods">Methods</a></li> <li><a href="#Methods">Methods</a></li>
<li><a href="#Events">Events</a></li> <li><a href="#Events">Events</a></li>
@ -1215,106 +1214,6 @@ var nodes = [
</table> </table>
<h2><a name="Dynamic_Data"></a>Dynamic Data</h2>
<p>
The Graph is normally rendered using the method <code>setData</code>.
The graph can handle dynamic data in two ways:
</p>
<ul>
<li>
<b>Animation</b>
A set with historical data can be animated over time.
</li>
<li>
<b>Changeset</b>
A drawn Graph can be updated by appending a changeset to the Graph.
</li>
</ul>
<h3><a name="Animation"></a>Animation</h3>
<p>
Historical data can be animated over time.
To create an animation, the data sets with nodes, edges, and
packages must have a property <code>timestamp</code>,
and has a property <code>action</code> describing the
<a href="#Changeset">change</a> (create, update, or delete).
The Graph will automatically create an animation which runs from
the earliest to the latest encountered timestamp.
When the Graph is rendered at a certain timestamp,
all elements with a timestamp older than the current time will be rendered,
and all elements without a timestamp.
</p>
<p>
The animation state and speed can be manipulated using methods
<code>animationSetAcceleration</code>,
<code>animationSetDuration</code>,
<code>animationSetFramerate</code>,
<code>animationStart</code>,
and <code>animationStop</code>.
</p>
<p>
The following package table shows how to change the state of a package over time:
</p>
<pre class="prettyprint lang-js">
var packageTable = new google.visualization.DataTable();
packageTable.addColumn('number', 'id');
packageTable.addColumn('number', 'from');
packageTable.addColumn('number', 'to');
packageTable.addColumn('string', 'action');
packageTable.addColumn('string', 'title');
packageTable.addColumn('number', 'progress');
packageTable.addColumn('datetime', 'timestamp');
// package with id 7 moved over time from node 1 to node 2
// id, from, to, action, title, progress, timestamp
packageTable.addRow([7, 1, 2, 'create', 'Copy data [0%]', 0.00, new Date(2012,6,4,14,0,0)]);
packageTable.addRow([7, 1, 2, 'update', 'Copy data [10%]', 0.10, new Date(2012,6,4,14,10,0)]);
packageTable.addRow([7, 1, 2, 'update', 'Copy data [20%]', 0.20, new Date(2012,6,4,14,15,0)]);
packageTable.addRow([7, 1, 2, 'update', 'Copy data [50%]', 0.50, new Date(2012,6,4,14,20,0)]);
packageTable.addRow([7, 1, 2, 'update', 'Copy data [80%]', 0.80, new Date(2012,6,4,14,30,0)]);
packageTable.addRow([7, 1, 2, 'update', 'Copy data [100%]', 1.00, new Date(2012,6,4,14,35,0)]);
packageTable.addRow([7, 1, 2, 'delete', undefined, undefined, new Date(2012,6,4,14,40,0)]);
</pre>
<h3><a name="Changeset"></a>Changeset</h3>
<p>
The data of a rendered Graph can be changed dynamically.
Data can be updated by appending a changeset to the Graph
using methods <code>addNodes</code>, <code>addEdges</code>, and <code>addPackages</code>.
The appended data can contain new nodes, edges, and packages, but can
also adjust existing elements.
For example, the title of a Node or the width of a link can be updated.
</p>
<p>
The changeset is a regular Array like used
The <code>action</code> property describes one of the following changes
</p>
<ul>
<li>
<b>create</b> Create an element (node, link, or package).
When the new element has an id which already exists, the existing
element will be overwritten.
</li>
<li>
<b>update</b> Update an element, create when not existing.
Only applicable when the element has an id.
</li>
<li>
<b>delete</b> Delete an existing element.
Only applicable when
</li>
</ul>
<h2><a name="Methods"></a>Methods</h2> <h2><a name="Methods"></a>Methods</h2>
<p> <p>
Graph supports the following methods. Graph supports the following methods.
@ -1327,38 +1226,6 @@ packageTable.addRow([7, 1, 2, 'delete', undefined, undefined, new D
<th>Description</th> <th>Description</th>
</tr> </tr>
<tr>
<td>addEdges(edges)</td>
<td>none</td>
<td>Dynamically appends edges to the graph.
Parameter edges contains an Array.
A link can be created, updated, or deleted by specifying the property
<code>action</code> and choose a value <code>create</code>,
<code>update</code>, or <code>delete</code>.
</td>
</tr>
<tr>
<td>addNodes(nodes)</td>
<td>none</td>
<td>Dynamically adds nodes to the graph.
Parameter nodes contains an Array.
A node can be created, updated, or deleted by specifying the property
<code>action</code> and choose a value <code>create</code>,
<code>update</code>, or <code>delete</code>.
</tr>
<tr>
<td>addPackages(packages)</td>
<td>none</td>
<td>Dynamically appends packages to the graph.
Parameter packages contains an Array.
A package can be created, updated, or deleted by specifying the property
<code>action</code> and choose a value <code>create</code>,
<code>update</code>, or <code>delete</code>.
</td>
</tr>
<tr> <tr>
<td>animationSetAcceleration(acceleration)</td> <td>animationSetAcceleration(acceleration)</td>
<td>none</td> <td>none</td>
@ -1407,6 +1274,14 @@ packageTable.addRow([7, 1, 2, 'delete', undefined, undefined, new D
</td> </td>
</tr> </tr>
<tr>
<td>setOptions(options)</td>
<td>none</td>
<td>Set options for the graph. The available options are described in
the section <a href="#Configuration_Options">Configuration Options</a>.
</td>
</tr>
<tr> <tr>
<td>getSelection()</td> <td>getSelection()</td>
<td>Array of selection elements</td> <td>Array of selection elements</td>

+ 3
- 96
src/graph/graph.js View File

@ -1062,36 +1062,6 @@ Graph.prototype._setSize = function(width, height) {
} }
}; };
/**
* Append nodes
* Nodes with a duplicate id will be replaced
* @param {Array} nodes The data containing the nodes.
*/
Graph.prototype.addNodes = function(nodes) {
var hasValues = false;
var rowCount = nodes.length;
for (var i = 0; i < rowCount; i++) {
var properties = nodes[i];
if (properties.value != undefined) {
hasValues = true;
}
if (properties.id == undefined) {
throw "Column 'id' missing in table with nodes (row " + i + ")";
}
this._createNode(properties);
}
// calculate scaling function when value is provided
if (hasValues) {
this._updateValueRange(this.nodes);
}
this.start();
};
/** /**
* Load all nodes by reading the data table nodesTable * Load all nodes by reading the data table nodesTable
* @param {Array} nodes The data containing the nodes. * @param {Array} nodes The data containing the nodes.
@ -1130,8 +1100,7 @@ Graph.prototype.setNodes = function(nodes) {
/** /**
* Filter the current nodes table for nodes with a timestamp older than given * Filter the current nodes table for nodes with a timestamp older than given
* timestamp. Can only be used for nodes added via setNodes(), not via
* addNodes().
* timestamp.
* @param {*} [timestamp] If timestamp is undefined, all nodes are shown * @param {*} [timestamp] If timestamp is undefined, all nodes are shown
*/ */
Graph.prototype._filterNodes = function(timestamp) { Graph.prototype._filterNodes = function(timestamp) {
@ -1363,44 +1332,9 @@ Graph.prototype.setEdges = function(edges) {
} }
}; };
/**
* Load edges by reading the data table
* @param {Array} edges The data containing the edges.
*/
Graph.prototype.addEdges = function(edges) {
var hasValues = false;
var rowCount = edges.length;
for (var i = 0; i < rowCount; i++) {
// copy all properties
var properties = edges[i];
if (properties.from === undefined) {
throw "Column 'from' missing in table with edges (row " + i + ")";
}
if (properties.to === undefined) {
throw "Column 'to' missing in table with edges (row " + i + ")";
}
if (properties.value != undefined) {
hasValues = true;
}
this._createEdge(properties);
}
// calculate scaling function when value is provided
if (hasValues) {
this._updateValueRange(this.edges);
}
this.start();
};
/** /**
* Filter the current edges table for edges with a timestamp below given * Filter the current edges table for edges with a timestamp below given
* timestamp. Can only be used for edges added via setEdges(), not via
* addEdges().
* timestamp.
* @param {*} [timestamp] If timestamp is undefined, all edges are shown * @param {*} [timestamp] If timestamp is undefined, all edges are shown
*/ */
Graph.prototype._filterEdges = function(timestamp) { Graph.prototype._filterEdges = function(timestamp) {
@ -1589,32 +1523,6 @@ Graph.prototype._findEdgeByRow = function (row) {
return this.edges[row]; return this.edges[row];
}; };
/**
* Append packages
* Packages with a duplicate id will be replaced
* @param {Array} packages The data containing the packages.
*/
Graph.prototype.addPackages = function(packages) {
var rowCount = packages.length;
for (var i = 0; i < rowCount; i++) {
var properties = packages[i];
if (properties.from === undefined) {
throw "Column 'from' missing in table with packages (row " + i + ")";
}
if (properties.to === undefined) {
throw "Column 'to' missing in table with packages (row " + i + ")";
}
this._createPackage(properties);
}
// calculate scaling function when value is provided
this._updateValueRange(this.packages);
this.start();
};
/** /**
* Set a new packages table * Set a new packages table
* Packages with a duplicate id will be replaced * Packages with a duplicate id will be replaced
@ -1654,8 +1562,7 @@ Graph.prototype.setPackages = function(packages) {
/** /**
* Filter the current package table for packages with a timestamp below given * Filter the current package table for packages with a timestamp below given
* timestamp. Can only be used for packages added via setPackages(), not via
* addPackages().
* timestamp.
* @param {*} [timestamp] If timestamp is undefined, all packages are shown * @param {*} [timestamp] If timestamp is undefined, all packages are shown
*/ */
Graph.prototype._filterPackages = function(timestamp) { Graph.prototype._filterPackages = function(timestamp) {

+ 3
- 96
vis.js View File

@ -7869,36 +7869,6 @@ Graph.prototype._setSize = function(width, height) {
} }
}; };
/**
* Append nodes
* Nodes with a duplicate id will be replaced
* @param {Array} nodes The data containing the nodes.
*/
Graph.prototype.addNodes = function(nodes) {
var hasValues = false;
var rowCount = nodes.length;
for (var i = 0; i < rowCount; i++) {
var properties = nodes[i];
if (properties.value != undefined) {
hasValues = true;
}
if (properties.id == undefined) {
throw "Column 'id' missing in table with nodes (row " + i + ")";
}
this._createNode(properties);
}
// calculate scaling function when value is provided
if (hasValues) {
this._updateValueRange(this.nodes);
}
this.start();
};
/** /**
* Load all nodes by reading the data table nodesTable * Load all nodes by reading the data table nodesTable
* @param {Array} nodes The data containing the nodes. * @param {Array} nodes The data containing the nodes.
@ -7937,8 +7907,7 @@ Graph.prototype.setNodes = function(nodes) {
/** /**
* Filter the current nodes table for nodes with a timestamp older than given * Filter the current nodes table for nodes with a timestamp older than given
* timestamp. Can only be used for nodes added via setNodes(), not via
* addNodes().
* timestamp.
* @param {*} [timestamp] If timestamp is undefined, all nodes are shown * @param {*} [timestamp] If timestamp is undefined, all nodes are shown
*/ */
Graph.prototype._filterNodes = function(timestamp) { Graph.prototype._filterNodes = function(timestamp) {
@ -8170,44 +8139,9 @@ Graph.prototype.setEdges = function(edges) {
} }
}; };
/**
* Load edges by reading the data table
* @param {Array} edges The data containing the edges.
*/
Graph.prototype.addEdges = function(edges) {
var hasValues = false;
var rowCount = edges.length;
for (var i = 0; i < rowCount; i++) {
// copy all properties
var properties = edges[i];
if (properties.from === undefined) {
throw "Column 'from' missing in table with edges (row " + i + ")";
}
if (properties.to === undefined) {
throw "Column 'to' missing in table with edges (row " + i + ")";
}
if (properties.value != undefined) {
hasValues = true;
}
this._createEdge(properties);
}
// calculate scaling function when value is provided
if (hasValues) {
this._updateValueRange(this.edges);
}
this.start();
};
/** /**
* Filter the current edges table for edges with a timestamp below given * Filter the current edges table for edges with a timestamp below given
* timestamp. Can only be used for edges added via setEdges(), not via
* addEdges().
* timestamp.
* @param {*} [timestamp] If timestamp is undefined, all edges are shown * @param {*} [timestamp] If timestamp is undefined, all edges are shown
*/ */
Graph.prototype._filterEdges = function(timestamp) { Graph.prototype._filterEdges = function(timestamp) {
@ -8396,32 +8330,6 @@ Graph.prototype._findEdgeByRow = function (row) {
return this.edges[row]; return this.edges[row];
}; };
/**
* Append packages
* Packages with a duplicate id will be replaced
* @param {Array} packages The data containing the packages.
*/
Graph.prototype.addPackages = function(packages) {
var rowCount = packages.length;
for (var i = 0; i < rowCount; i++) {
var properties = packages[i];
if (properties.from === undefined) {
throw "Column 'from' missing in table with packages (row " + i + ")";
}
if (properties.to === undefined) {
throw "Column 'to' missing in table with packages (row " + i + ")";
}
this._createPackage(properties);
}
// calculate scaling function when value is provided
this._updateValueRange(this.packages);
this.start();
};
/** /**
* Set a new packages table * Set a new packages table
* Packages with a duplicate id will be replaced * Packages with a duplicate id will be replaced
@ -8461,8 +8369,7 @@ Graph.prototype.setPackages = function(packages) {
/** /**
* Filter the current package table for packages with a timestamp below given * Filter the current package table for packages with a timestamp below given
* timestamp. Can only be used for packages added via setPackages(), not via
* addPackages().
* timestamp.
* @param {*} [timestamp] If timestamp is undefined, all packages are shown * @param {*} [timestamp] If timestamp is undefined, all packages are shown
*/ */
Graph.prototype._filterPackages = function(timestamp) { Graph.prototype._filterPackages = function(timestamp) {

+ 4
- 4
vis.min.js
File diff suppressed because it is too large
View File


Loading…
Cancel
Save