diff --git a/HISTORY.md b/HISTORY.md index fb6bca1d..5b31a395 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,12 @@ vis.js history http://visjs.org +## 2014-03-04, version 0.6.1 + +### Graph + +- Bugfix graphviz examples + ## 2014-03-04, version 0.6.0 ### Graph diff --git a/dist/vis.js b/dist/vis.js index ce3074a0..f6b5558d 100644 --- a/dist/vis.js +++ b/dist/vis.js @@ -5,7 +5,7 @@ * A dynamic, browser-based visualization library. * * @version 0.6.0-SNAPSHOT - * @date 2014-03-03 + * @date 2014-03-05 * * @license * Copyright (C) 2011-2014 Almende B.V, http://almende.com @@ -2350,380 +2350,6 @@ DataView.prototype._trigger = DataSet.prototype._trigger; DataView.prototype.subscribe = DataView.prototype.on; DataView.prototype.unsubscribe = DataView.prototype.off; -/** - * Created by Alex on 2/27/14. - */ - - - -function SvgAxis (range,mainId, constants) { - this.svgId = mainId; - this.range = range; - this.constants = constants; - this.duration = this.range.end - this.range.start; // in milliseconds - this.minColumnWidth = 100; - - this._drawElements(); - this._update(); -} - -SvgAxis.prototype._drawElements = function() { - d3.select(this.svgId) - .append("rect") - .attr("id","bars") - .attr("x",0) - .attr("y",0) - .attr("width", this.constants.width) - .attr("height",this.constants.barHeight) - .style("stroke", "rgb(6,120,155)"); - - this.leftText = d3.select(this.svgId) - .append("text") - .attr("x", 5) - .attr("y", 20) - .attr("font-size", 14) - .text(moment(this.range.start)); - - this.rightText = d3.select(this.svgId) - .append("text") - .attr("y", 20) - .attr("font-size", 14) - .text(moment(this.range.end)) - this.rightText.attr("x", this.constants.width - 5 - this.rightText.node().getBBox().width); - - this.dateLabels = {}; - this.markerLines = {}; -} - -SvgAxis.prototype._createMarkerLine = function(index) { - this.markerLines[index] = {svg:d3.select("svg#main").append("line") - .attr('y1',0) - .attr('y2',this.constants.height) - .style("stroke", "rgb(220,220,220)") - } -} - -SvgAxis.prototype._createDateLabel = function(index) { - this.dateLabels[index] = {svg:d3.select(this.svgId) - .append("text") - .attr("font-size",12) - , active:false}; -} - -SvgAxis.prototype._update = function() { - this.duration = this.range.end - this.range.start; // in milliseconds - this.leftText.text(moment(this.range.start).format("DD-MM-YYYY HH:mm:ss")) - - this.rightText.text(moment(this.range.end).format("DD-MM-YYYY")) - this.rightText.attr("x", this.constants.width - 5 - this.rightText.node().getBBox().width); - - this.msPerPixel = this.duration / this.constants.width; - this.columnDuration = this.minColumnWidth * this.msPerPixel; - - var milliSecondScale = [1,10,50,100,250,500]; - var secondScale = [1,5,15,30]; - var minuteScale = [1,5,15,30]; - var hourScale = [1,3,6,12]; - var dayScale = [1,2,3,5,10,15]; - var monthScale = [1,2,3,4,5,6]; - var yearScale = [1,2,3,4,5,6,7,8,9,10,15,20,25,50,75,100,150,250,500,1000]; - var multipliers = [1,1000,60000,3600000,24*3600000,30*24*3600000,365*24*3600000]; - var scales = [milliSecondScale,secondScale,minuteScale,hourScale,dayScale,monthScale,yearScale] - var formats = ["SSS","mm:ss","hh:mm:ss","DD HH:mm","DD-MM","MM-YYYY","YYYY"] - var indices = this._getAppropriateScale(scales,multipliers); - var scale = scales[indices[0]][indices[1]] * multipliers[indices[0]]; - - var dateCorrection = (this.range.start.valueOf() % scale) +3600000; - - for (var i = 0; i < 30; i++) { - var date = this.range.start + i*scale - dateCorrection; - if (((i+1)*scale - dateCorrection)/this.msPerPixel > this.constants.width + 200) { - if (this.dateLabels.hasOwnProperty(i)) { - this.dateLabels[i].svg.remove(); - delete this.dateLabels[i] - } - if (this.markerLines.hasOwnProperty(i)) { - this.markerLines[i].svg.remove(); - delete this.markerLines[i] - } - } - else { - if (!this.dateLabels.hasOwnProperty(i)) { - this._createDateLabel(i); - } - if (!this.markerLines.hasOwnProperty(i)) { - this._createMarkerLine(i); - } - - this.dateLabels[i].svg.text(moment(date).format(formats[indices[0]])) - .attr("x",(i*scale - dateCorrection)/this.msPerPixel) - .attr("y",50) - this.markerLines[i].svg.attr("x1",(i*scale - dateCorrection)/this.msPerPixel) - .attr("x2",(i*scale - dateCorrection)/this.msPerPixel) - } - } -} - -SvgAxis.prototype._getAppropriateScale = function(scales,multipliers) { - for (var i = 0; i < scales.length; i++) { - for (var j = 0; j < scales[i].length; j++) { - if (scales[i][j] * multipliers[i] > this.columnDuration) { - return [i,j] - } - } - } -} - - -/** - * @constructor SvgTimeline - * Create a graph visualization, displaying nodes and edges. - * - * @param {Element} container The DOM element in which the Graph will - * be created. Normally a div element. - * @param {Object} items An object containing parameters - * {Array} nodes - * {Array} edges - * @param {Object} options Options - */ -function SvgTimeline (container, items, options) { - this.constants = { - width:1400, - height:400, - barHeight: 60 - } - - var now = moment().hours(0).minutes(0).seconds(0).milliseconds(0); - this.range = { - start:now.clone().add('days', -3).valueOf(), - end: now.clone().add('days', 4).valueOf() - } - - this.items = {}; - this.sortedItems = []; - this.activeItems = {}; - this.sortedActiveItems = []; - - this._createItems(items); - - this.container = container; - this._createSVG(); - - - this.axis = new SvgAxis(this.range,"svg#main",this.constants); - - var me = this; - this.hammer = Hammer(document.getElementById("main"), { - prevent_default: true - }); - this.hammer.on('tap', me._onTap.bind(me) ); - this.hammer.on('doubletap', me._onDoubleTap.bind(me) ); - this.hammer.on('hold', me._onHold.bind(me) ); - this.hammer.on('pinch', me._onPinch.bind(me) ); - this.hammer.on('touch', me._onTouch.bind(me) ); - this.hammer.on('dragstart', me._onDragStart.bind(me) ); - this.hammer.on('drag', me._onDrag.bind(me) ); - this.hammer.on('dragend', me._onDragEnd.bind(me) ); - this.hammer.on('release', me._onRelease.bind(me) ); - this.hammer.on('mousewheel',me._onMouseWheel.bind(me) ); - this.hammer.on('DOMMouseScroll',me._onMouseWheel.bind(me) ); // for FF - this.hammer.on('mousemove', me._onMouseMoveTitle.bind(me) ); - //this._drawLines(); - - this._update(); - -} - -SvgTimeline.prototype._createSVG = function() { - d3.select("div#visualization") - .append("svg").attr("id","main") - .attr("width",this.constants.width) - .attr("height",this.constants.height) - .attr("style","border:1px solid black") -}; - -SvgTimeline.prototype._createItems = function (items) { - for (var i = 0; i < items.length; i++) { - this.items[items[i].id] = new Item(items[i], this.constants); - this.sortedItems.push(this.items[items[i].id]); - } - this._sortItems(this.sortedItems); -} - -SvgTimeline.prototype._sortItems = function (items) { - items.sort(function(a,b) {return a.start - b.start}); -} - -SvgTimeline.prototype._getPointer = function (touch) { - return { - x: touch.pageX, - y: touch.pageY - }; -}; - -SvgTimeline.prototype._onTap = function() {}; -SvgTimeline.prototype._onDoubleTap = function() {}; -SvgTimeline.prototype._onHold = function() {}; -SvgTimeline.prototype._onPinch = function() {}; -SvgTimeline.prototype._onTouch = function(event) {}; -SvgTimeline.prototype._onDragStart = function(event) { - this.initialDragPos = this._getPointer(event.gesture.center); -}; -SvgTimeline.prototype._onDrag = function(event) { - var pointer = this._getPointer(event.gesture.center); - var diffX = pointer.x - this.initialDragPos.x; -// var diffY = pointer.y - this.initialDragPos.y; - - this.initialDragPos = pointer; - - this.range.start -= diffX * this.axis.msPerPixel; - this.range.end -= diffX * this.axis.msPerPixel; - this._update(); -}; -SvgTimeline.prototype._onDragEnd = function() {}; -SvgTimeline.prototype._onRelease = function() {}; -SvgTimeline.prototype._onMouseWheel = function(event) { - - var delta = 0; - if (event.wheelDelta) { /* IE/Opera. */ - delta = event.wheelDelta/120; - } - else if (event.detail) { /* Mozilla case. */ - // In Mozilla, sign of delta is different than in IE. - // Also, delta is multiple of 3. - delta = -event.detail/3; - } - if (delta) { - var pointer = {x:event.x, y:event.y} - var center = this.range.start + this.axis.duration * 0.5; - var zoomSpeed = 0.1; - var scrollSpeed = 0.1; - - this.range.start = center - 0.5*(this.axis.duration * (1 - delta*zoomSpeed)); - this.range.end = this.range.start + (this.axis.duration * (1 - delta*zoomSpeed)); - - var diffX = delta*(pointer.x - 0.5*this.constants.width); -// var diffY = pointer.y - this.initialDragPos.y; - - - this.range.start -= diffX * this.axis.msPerPixel * scrollSpeed; - this.range.end -= diffX * this.axis.msPerPixel * scrollSpeed; - - this._update(); - } -}; -SvgTimeline.prototype._onMouseMoveTitle = function() {}; - -SvgTimeline.prototype._update = function() { - this.axis._update(); - this._getActiveItems(); - this._updateItems(); -}; - -SvgTimeline.prototype._getActiveItems = function() { - // reset all currently active items to inactive - for (var itemId in this.activeItems) { - if (this.activeItems.hasOwnProperty(itemId)) { - this.activeItems[itemId].active = false; - } - } - - this.sortedActiveItems = [] - var rangeStart = this.range.start-200*this.axis.msPerPixel - var rangeEnd = (this.range.end+200*this.axis.msPerPixel) - for (var itemId in this.items) { - if (this.items.hasOwnProperty(itemId)) { - if (this.items[itemId].start >= rangeStart && this.items[itemId].start < rangeEnd || - this.items[itemId].end >= rangeStart && this.items[itemId].end < rangeEnd) { - if (this.items[itemId].active == false) { - this.activeItems[itemId] = this.items[itemId]; - } - this.activeItems[itemId].active = true; - this.sortedActiveItems.push(this.activeItems[itemId]); - } - } - } - this._sortItems(this.sortedActiveItems); - - // cleanup - for (var itemId in this.activeItems) { - if (this.activeItems.hasOwnProperty(itemId)) { - if (this.activeItems[itemId].active == false) { - this.activeItems[itemId].svg.remove(); - this.activeItems[itemId].svg = null; - this.activeItems[itemId].svgLine.remove(); - this.activeItems[itemId].svgLine = null; - delete this.activeItems[itemId]; - } - } - } -}; - - -SvgTimeline.prototype._updateItems = function() { - for (var i = 0; i < this.sortedActiveItems.length; i++) { - var item = this.sortedActiveItems[i]; - if (item.svg == null) { -// item.svg = d3.select("svg#main") -// .append("rect") -// .attr("class","item") -// .style("stroke", "rgb(6,120,155)") -// .style("fill", "rgb(6,120,155)"); - item.svg = d3.select("svg#main") - .append("foreignObject") - item.svgContent = item.svg.append("xhtml:body") - .style("font", "14px 'Helvetica Neue'") - .style("background-color", "#ff00ff") - .html("
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec eu enim quam. Quisque nisi risus, sagittis quis tempor nec, aliquam eget neque. Nulla bibendum semper lorem non ullamcorper. Nulla non ligula lorem. Praesent porttitor, tellus nec suscipit aliquam, enim elit posuere lorem, at laoreet enim ligula sed tortor. Ut sodales, urna a aliquam semper, nibh diam gravida sapien, sit amet fermentum purus lacus eget massa. Donec ac arcu vel magna consequat pretium et vel ligula. Donec sit amet erat elit. Vivamus eu metus eget est hendrerit rutrum. Curabitur vitae orci et leo interdum egestas ut sit amet dui. In varius enim ut sem posuere in tristique metus ultrices.
Integer mollis massa at orci porta vestibulum. Pellentesque dignissim turpis ut tortor ultricies condimentum et quis nibh. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer euismod lorem vulputate dui pharetra luctus. Sed vulputate, nunc quis porttitor scelerisque, dui est varius ipsum, eu blandit mauris nibh pellentesque tortor. Vivamus ultricies ante eget ipsum pulvinar ac tempor turpis mollis. Morbi tortor orci, euismod vel sagittis ac, lobortis nec est. Quisque euismod venenatis felis at dapibus. Vestibulum dignissim nulla ut nisi tristique porttitor. Proin et nunc id arcu cursus dapibus non quis libero. Nunc ligula mi, bibendum non mattis nec, luctus id neque. Suspendisse ut eros lacus. Praesent eget lacus eget risus congue vestibulum. Morbi tincidunt pulvinar lacus sed faucibus. Phasellus sed vestibulum sapien."); - - - - if (item.end == 0) { - item.svgLine = d3.select("svg#main") - .append("line") - .attr("y1",this.constants.barHeight) - .style("stroke", "rgb(200,200,255)") - .style("stroke-width", 3) - } - } - item.svg.attr('width',item.getLength(this.axis.msPerPixel)) - .attr("x",this._getXforItem(item)) - .attr("y",this._getYforItem(item, i)) - - - .attr('height',25) - if (item.end == 0) { - item.svgLine.attr('y2',item.y) - .attr('x1',item.timeX) - .attr('x2',item.timeX) - } - } -}; - -SvgTimeline.prototype._getXforItem = function(item) { - item.timeX = (item.start - this.range.start)/this.axis.msPerPixel; - if (item.end == 0) { - item.drawX = item.timeX - item.width * 0.5; - } - else { - item.drawX = item.timeX; - } - return item.drawX; -} - -SvgTimeline.prototype._getYforItem = function(item, index) { - var bounds = 10; - var startIndex = Math.max(0,index-bounds); - item.level = 0; - for (var i = startIndex; i < index; i++) { - var item2 = this.sortedActiveItems[i]; - if (item.drawX <= (item2.drawX + item2.width + 5) && item2.level == item.level) { - item.level += 1; - } - } - item.y = 100 + 50*item.level; - return item.y; -} /** * @constructor TimeStep * The class TimeStep is an iterator for dates. You provide a start date and an @@ -16524,8 +16150,6 @@ Graph.prototype.zoomExtent = function(initialZoom, disableStart) { } - - this.pinch.mousewheelScale = zoomLevel; this._setScale(zoomLevel); this._centerGraph(range); if (disableStart == false) { @@ -17324,7 +16948,7 @@ Graph.prototype.setSize = function(width, height) { this.manipulationDiv.style.width = this.frame.canvas.clientWidth; } - this.emit('frameResize', {width:this.frame.canvas.width,height:this.frame.canvas.height}); + this.emit('resize', {width:this.frame.canvas.width,height:this.frame.canvas.height}); }; /** @@ -17727,6 +17351,7 @@ Graph.prototype._getTranslation = function() { */ Graph.prototype._setScale = function(scale) { this.scale = scale; + this.pinch.mousewheelScale = scale; }; /** diff --git a/src/graph/Graph.js b/src/graph/Graph.js index 4b2ec27f..f473d44c 100644 --- a/src/graph/Graph.js +++ b/src/graph/Graph.js @@ -386,8 +386,6 @@ Graph.prototype.zoomExtent = function(initialZoom, disableStart) { } - - this.pinch.mousewheelScale = zoomLevel; this._setScale(zoomLevel); this._centerGraph(range); if (disableStart == false) { @@ -1589,6 +1587,7 @@ Graph.prototype._getTranslation = function() { */ Graph.prototype._setScale = function(scale) { this.scale = scale; + this.pinch.mousewheelScale = scale; }; /**