Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/1295 generic rendering engine #1326

Merged
merged 27 commits into from
Mar 30, 2020
Merged

Feature/1295 generic rendering engine #1326

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
aa32d45
#1295 First draft of generic renderer applied to flowcharts.
knsv Mar 8, 2020
1b64af1
#1295 Drawing edges between nodes
knsv Mar 11, 2020
7bd5529
1295 Support for subgraphs with wide labels
knsv Mar 11, 2020
da048cb
1295 Handling labels of clusters
knsv Mar 11, 2020
ad288be
1295 Lint fixes
knsv Mar 14, 2020
35ea4d1
Merge branch 'develop' into feature/1295_generic_rendering_engine
knsv Mar 14, 2020
0cacd11
Merge branch 'develop' into feature/1295_generic_rendering_engine
knsv Mar 14, 2020
5f5e453
Small for for merge issue
knsv Mar 14, 2020
963a0ce
#1295 Edges between subgraphs
knsv Mar 14, 2020
9266eae
#1295 Small fix for import
knsv Mar 14, 2020
5b74d75
#1295 Arrow head start
knsv Mar 14, 2020
215e930
#1295 Markers implmented, the gereric pattern and diagram specific fo…
knsv Mar 16, 2020
4010c89
#1295 'arrow' renamed to 'arrow_point'
knsv Mar 16, 2020
17f0656
#1295 Added the flowchart shapes
knsv Mar 18, 2020
02b19fe
Merge branch 'develop' into feature/1295_generic_rendering_engine
knsv Mar 22, 2020
df2925e
#1295 Fix for edges form clusters
knsv Mar 22, 2020
5b302ae
#1295 Applying new rendering engine for stateDiagrams
knsv Mar 22, 2020
c7aa67b
#1295 Lint fix
knsv Mar 22, 2020
159a3a3
#1295 Start shape and handling of setting a unique start id per clust…
knsv Mar 25, 2020
598b392
#1295 Lint fixes
knsv Mar 25, 2020
391dc06
Merge branch 'develop' into feature/1295_generic_rendering_engine
knsv Mar 25, 2020
85f47e1
#1295 Styling of start/end nodes, arrows and regular states
knsv Mar 28, 2020
44ae5c8
#1295 Lint fix
knsv Mar 28, 2020
3a6aa8f
#1295 Lint fix
knsv Mar 28, 2020
5fbb69e
#1295 Styling of composite states
knsv Mar 28, 2020
240077f
#1295 Adding note support to state diagrams
knsv Mar 29, 2020
a5af248
Merge branch 'develop' into feature/1295_generic_rendering_engine
knsv Mar 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
#1295 Lint fixes
  • Loading branch information
@knsv
knsv committed Mar 25, 2020
commit 598b392878e3d0a335905a6c03854ad8d0a4f201
1 change: 0 additions & 1 deletion src/dagre-wrapper/edges.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { logger } from '../logger'; // eslint-disable-line
import createLabel from './createLabel';
import * as d3 from 'd3';
import inter from './intersect/index.js';
import { getConfig } from '../config';

let edgeLabels = {};
Expand Down
4 changes: 1 addition & 3 deletions src/diagrams/state/stateRenderer-v2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ import state from './parser/stateDiagram';
import { getConfig } from '../../config';

import { render } from '../../dagre-wrapper/index.js';
import addHtmlLabel from 'dagre-d3/lib/label/add-html-label.js';
import { logger } from '../../logger';
import { interpolateToCurve, getStylesFromArray } from '../../utils';

const conf = {};
export const setConf = function(cnf) {
Expand All @@ -34,7 +32,7 @@ export const getClasses = function(text) {
return stateDb.getClasses();
};

const setupNode = (g, parent, node, first) => {
const setupNode = (g, parent, node) => {
// Add the node
if (node.id !== 'root') {
let shape = 'rect';
Expand Down