fix more bugs

This commit is contained in:
Dylan Vorster
2018-02-23 18:58:34 +02:00
parent 6dea182ab8
commit a318b71ef1
5 changed files with 23 additions and 14 deletions

View File

@ -41,13 +41,19 @@ export class AdvancedLinkFactory extends DefaultLinkFactory {
return new AdvancedLinkModel(); return new AdvancedLinkModel();
} }
generateLinkSegment(model: DefaultLinkModel, selected: boolean, path: string) {
generateReactWidget(diagramEngine: DiagramEngine, link: AdvancedLinkModel): JSX.Element { return (
return React.createElement(DefaultLinkWidget, { <g>
link, <path
diagramEngine className={selected ? "selected" : ''}
}); strokeWidth={model.width}
stroke="red"
d={path}
/>
</g>
);
} }
} }
/** /**
* *

View File

@ -1,13 +1,14 @@
import * as SRD from "../../src/main";
import * as _ from "lodash"; import * as _ from "lodash";
import {LinkModel} from "../../src/models/LinkModel"; import {LinkModel} from "../../src/models/LinkModel";
import {DiagramEngine} from "../../src/DiagramEngine"; import {DiagramEngine} from "../../src/DiagramEngine";
import {PortModel} from "../../src/models/PortModel";
import {DefaultLinkModel} from "../../src/defaults/models/DefaultLinkModel";
export class DiamondPortModel extends SRD.PortModel { export class DiamondPortModel extends PortModel {
position: string | "top" | "bottom" | "left" | "right"; position: string | "top" | "bottom" | "left" | "right";
constructor(pos: string = "top") { constructor(pos: string = "top") {
super(pos); super(pos, "diamond");
this.position = pos; this.position = pos;
} }
@ -23,6 +24,6 @@ export class DiamondPortModel extends SRD.PortModel {
} }
createLinkModel(): LinkModel{ createLinkModel(): LinkModel{
return new SRD.DefaultLinkModel(); return new DefaultLinkModel();
} }
} }

View File

@ -31,7 +31,7 @@ export default () => {
//3-A) create a default node //3-A) create a default node
var node1 = new DefaultNodeModel("Node 1", "rgb(0,192,255)"); var node1 = new DefaultNodeModel("Node 1", "rgb(0,192,255)");
var port1 = node1.addPort(new DefaultPortModel(false, "out-1", "Out")); var port1 = node1.addOutPort("Out")
node1.setPosition(100, 150); node1.setPosition(100, 150);
//3-B) create our new custom node //3-B) create our new custom node
@ -39,7 +39,7 @@ export default () => {
node2.setPosition(250, 108); node2.setPosition(250, 108);
var node3 = new DefaultNodeModel("Node 3", "red"); var node3 = new DefaultNodeModel("Node 3", "red");
var port3 = node3.addPort(new DefaultPortModel(true, "in-1", "In")); var port3 = node3.addInPort("In")
node3.setPosition(500, 150); node3.setPosition(500, 150);
//3-C) link the 2 nodes together //3-C) link the 2 nodes together

View File

@ -37,7 +37,10 @@ export class DefaultPortModel extends PortModel {
} }
canLinkToPort(port: PortModel): boolean { canLinkToPort(port: PortModel): boolean {
return port instanceof DefaultPortModel && this.in !== port.in; if(port instanceof DefaultPortModel){
return this.in !== port.in;
}
return true;
} }
createLinkModel(): LinkModel { createLinkModel(): LinkModel {

View File

@ -111,7 +111,6 @@
//box-shadow: 0 0 10px rgba(black,0.5); //box-shadow: 0 0 10px rgba(black,0.5);
.title{ .title{
/* background-image: linear-gradient(rgba(black,0.1),rgba(black,0.2));*/
background: rgba(black,0.3); background: rgba(black,0.3);
display: flex; display: flex;
white-space: nowrap; white-space: nowrap;