X-Git-Url: https://git.auder.net/img/bundles/framework/images/logo_symfony.png?a=blobdiff_plain;f=parser.js;h=ea0841a40dd6fabe9db4dd11ca411e8b0caa0642;hb=a2d8ba728c576049b6f0d602b27f62c2e1f737a2;hp=8a4c52499f17df2fe92e28150b72e825b98c0f69;hpb=d6c9499e06c65780d5f4c95664c2cb851ff6f2de;p=erdiag.git diff --git a/parser.js b/parser.js index 8a4c524..ea0841a 100644 --- a/parser.js +++ b/parser.js @@ -67,7 +67,7 @@ class ErDiags { case '[': // Entity = { name: { attributes, [weak] } } - let name = lines[start].match(/[^\[\]\s]+/)[0]; + let name = lines[start].match(/[^\[\]"\s]+/)[0]; let entity = { attributes: this.parseAttributes(lines, start+1, end) }; if (lines[start].charAt(1) == '[') entity.weak = true; @@ -79,7 +79,7 @@ class ErDiags case '{': //association // Association = { [name], [attributes], [weak], entities: ArrayOf entity indices } let relationship = { }; - let nameRes = lines[start].match(/[^{}\s]+/); + let nameRes = lines[start].match(/[^{}"\s]+/); if (nameRes !== null) relationship.name = nameRes[0]; if (lines[start].charAt(1) == '{') @@ -102,7 +102,7 @@ class ErDiags field.isKey = true; line = line.slice(1); } - field.name = line.match(/[^()\s]+/)[0]; + field.name = line.match(/[^()"\s]+/)[0]; let parenthesis = line.match(/\((.+)\)/); if (parenthesis !== null) { @@ -177,6 +177,7 @@ class ErDiags } // "Modèle conceptuel des données". TODO: option for graph size + // NOTE: randomizing helps to obtain better graphs (sometimes) drawMcd(id, mcdStyle) //mcdStyle: bubble, or compact { let element = document.getElementById(id); @@ -188,11 +189,14 @@ class ErDiags } // Build dot graph input let mcdDot = 'graph {\n'; + mcdDot += 'rankdir="LR";\n'; // Nodes: - Object.keys(this.entities).forEach( name => { + if (mcdStyle == "compact") + mcdDot += "node [shape=plaintext];\n"; + _.shuffle(Object.keys(this.entities)).forEach( name => { if (mcdStyle == "bubble") { - mcdDot += name + '[shape=rectangle, label="' + name + '"'; + mcdDot += '"' + name + '" [shape=rectangle, label="' + name + '"'; if (this.entities[name].weak) mcdDot += ', peripheries=2'; mcdDot += '];\n'; @@ -200,14 +204,18 @@ class ErDiags { this.entities[name].attributes.forEach( a => { let label = (a.isKey ? '#' : '') + a.name; - mcdDot += name + '_' + a.name + '[shape=ellipse, label="' + label + '"];\n'; - mcdDot += name + '_' + a.name + ' -- ' + name + ';\n'; + let attrName = name + '_' + a.name; + mcdDot += '"' + attrName + '" [shape=ellipse, label="' + label + '"];\n'; + if (Math.random() < 0.5) + mcdDot += '"' + attrName + '" -- "' + name + '";\n'; + else + mcdDot += '"' + name + '" -- "' + attrName + '";\n'; }); } } else { - mcdDot += name + '[shape=plaintext, label=<'; + mcdDot += '"' + name + '" [label=<'; if (this.entities[name].weak) { mcdDot += '
) drawMld(id) { let element = document.getElementById(id); |