GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-28 07:03:17 +08:00
Code Issues Projects Releases Wiki Activity

WIP - able to draw circles now.

Browse Source
This commit is contained in:
Raghu Rajagopalan 2016-03-29 20:55:22 +05:30
parent 2fee6e62aa
commit 65140f6b3f
5 changed files with 259 additions and 20019 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20199
dist/www/javascripts/lib/mermaid.js vendored
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -27,7 +27,7 @@
"dist-slim-mermaid": "node node_modules/browserify/bin/cmd.js src/mermaid.js -t babelify -s mermaid -o dist/mermaid.slim.js -x d3 && cat dist/mermaid.slim.js | node node_modules/uglifyjs/bin/uglifyjs -mc > dist/mermaid.slim.min.js",
"dist-slim-mermaidAPI": "node node_modules/browserify/bin/cmd.js src/mermaidAPI.js -t babelify -s mermaidAPI -o dist/mermaidAPI.slim.js -x d3 && cat dist/mermaidAPI.slim.js | node node_modules/uglifyjs/bin/uglifyjs -mc > dist/mermaidAPI.slim.min.js",
"dist-mermaid": "node node_modules/browserify/bin/cmd.js src/mermaid.js -t babelify -s mermaid -o dist/mermaid.js && cat dist/mermaid.js | node node_modules/uglifyjs/bin/uglifyjs -mc > dist/mermaid.min.js",
"dist-mermaid-nomin": "node node_modules/browserify/bin/cmd.js src/mermaid.js -t babelify -s mermaid -o dist/mermaid.js && node bin/mermaid -v -p testgitgraph.mm && testgitgraph.mm.png",
"dist-mermaid-nomin": "node node_modules/browserify/bin/cmd.js src/mermaid.js -t babelify -s mermaid -o dist/mermaid.js && node bin/mermaid -v -s testgitgraph.mm && testgitgraph.mm.svg",
"dist-mermaidAPI": "node node_modules/browserify/bin/cmd.js src/mermaidAPI.js -t babelify -s mermaidAPI -o dist/mermaidAPI.js && cat dist/mermaidAPI.js | node node_modules/uglifyjs/bin/uglifyjs -mc > dist/mermaidAPI.min.js",
"dist": "npm run dist-slim-mermaid && npm run dist-slim-mermaidAPI && npm run dist-mermaid && npm run dist-mermaidAPI"
},

39
src/diagrams/gitGraph/gitGraphAst.js
View File

@ -1,9 +1,8 @@
var crypto = require("crypto");
var Logger = require('../../logger');
var _ = require("lodash");
var log = new Logger.Log();
//var log = new Logger.Log(1);
//var log = new Logger.Log();
var log = new Logger.Log(1);
var commits = {};
@ -12,9 +11,16 @@ var branches = { "master" : head };
var curBranch = "master";
var direction = "LR";
var seq = 0;
function getRandomInt(min, max) {
return Math.floor(Math.random() * (max - min)) + min;
}
function getId() {
return crypto.randomBytes(20).toString('hex').substring(0, 7);
var pool="0123456789abcdef";
var id = "";
for (var i = 0; i < 7; i++) {
id += pool[getRandomInt(0,16)]
}
return id;
}
@ -54,7 +60,7 @@ exports.commit = function(msg) {
head = commit;
commits[commit.id] = commit;
branches[curBranch] = commit.id;
log.debug("in pushCommit");
log.debug("in pushCommit '" + commit.id + "'");
}
exports.branch = function(name) {
@ -143,12 +149,8 @@ function prettyPrintCommitHistory(commitArr) {
}
exports.prettyPrint = function() {
var commitArr = Object.keys(commits).map(function (key) {
return commits[key];
});
var sortedCommits = _.orderBy(commitArr, ['seq'], ['desc']);
console.log(sortedCommits);
var node = sortedCommits[0];
log.debug(commits);
var node = exports.getCommitsArray()[0];
prettyPrintCommitHistory([node]);
}
@ -159,9 +161,20 @@ exports.clear = function () {
curBranch = "master";
seq =0;
}
exports.getBranchesAsObjArray = function() {
return _.map(branches, function(v,k) {
return {"name": k, "commitid": v};
});
}
exports.getBranches = function() { return branches; }
exports.getCommits = function() { return commits; }
exports.getCommitsArray = function() {
var commitArr = Object.keys(commits).map(function (key) {
return commits[key];
});
_.each(commitArr, function(o) { console.log(o.id) });
return _.orderBy(commitArr, ['seq'], ['desc']);
}
exports.getCurrentBranch = function() { return curBranch; }
exports.getDirection = function() { return direction; }
exports.getHead = function() { return head; }

33
src/diagrams/gitGraph/gitGraphRenderer.js
View File

@ -17,22 +17,37 @@ exports.draw = function (txt, id, ver) {
log.debug('in gitgraph renderer', txt, id, ver);
// Parse the graph definition
//log.debug(parser, db);
parser.parse(txt + "\n");
var commits = db.getCommitsArray();
log.debug(commits);
log.debug("id: " + commits[0].id);
log.debug(db.getCommits());
log.debug("length:", commits.length);
log.debug("length:", Object.keys(db.getCommits()).length);
// Fetch the default direction, use TD if none was found
var svg = d3.select('#'+id);
var g = svg.append('g');
g.append('text') // text label for the x axis
.attr('x', 100)
.attr('y', 40)
.attr('class','version')
.attr('font-size','32px')
.style('text-anchor', 'middle')
.text('mermaid raghu'+ ver);
//g.append('text') // text label for the x axis
//.attr('x', 100)
//.attr('y', 40)
//.attr('class','version')
//.attr('font-size','32px')
//.style('text-anchor', 'middle')
//.text('mermaid raghu'+ ver);
var circles = svg.selectAll("circle")
.data(commits)
.enter()
.append("circle")
.attr("cx", function(d, i){
return (i*50) + 25;
})
.attr("cy", 50)
.attr("r", 15)
.attr("fill", "yellow")
.attr("stroke", "grey");
/*
var box = exports.bounds.getBounds();

5
src/logger.js
View File

@ -69,7 +69,10 @@ function Log(level) {
if (typeof console.log !== 'undefined') { //eslint-disable-line no-console
//return console.log('[' + formatTime(new Date()) + '] ' , str); //eslint-disable-line no-console
args.unshift('[' + formatTime(new Date()) + '] ');
console.log.apply(console, args);
console.log.apply(console, args.map(function(a){
if (typeof a === "object") return JSON.stringify(a, null, 2);
return a;
}));
}
}
}