Nearly working

This commit is contained in:
Dylan Vorster
2017-09-15 15:03:12 +02:00
parent d452f10906
commit 2cb0b53bd9
2 changed files with 3 additions and 8 deletions

View File

@ -200,11 +200,9 @@ export class DiagramEngine extends BaseEntity<DiagramEngineListener> {
var point = this.getRelativePoint(event.clientX, event.clientY);
return {
x:
point.x / (this.diagramModel.getZoomLevel() / 100.0) -
this.diagramModel.getOffsetX(),
(point.x - this.diagramModel.getOffsetX()) / (this.diagramModel.getZoomLevel() / 100.0),
y:
point.y / (this.diagramModel.getZoomLevel() / 100.0) -
this.diagramModel.getOffsetY()
(point.y - this.diagramModel.getOffsetY()) / (this.diagramModel.getZoomLevel() / 100.0)
};
}

View File

@ -273,7 +273,6 @@ export class DiagramWidget extends React.Component<DiagramProps, DiagramState> {
);
} else if (model.model instanceof PointModel) {
// this stuff needs to be pixel perfect, dont touch it
console.log();
model.model.x =
model.initialX + diagramModel.getGridPosition(amountX / amountZoom);
model.model.y =
@ -287,7 +286,7 @@ export class DiagramWidget extends React.Component<DiagramProps, DiagramState> {
if (this.props.allowCanvasTranslation) {
diagramModel.setOffset(
this.state.action.initialOffsetX +
(event.clientX - this.state.action.mouseX),
(event.clientX - this.state.action.mouseX) ,
this.state.action.initialOffsetY +
(event.clientY - this.state.action.mouseY)
);
@ -418,8 +417,6 @@ export class DiagramWidget extends React.Component<DiagramProps, DiagramState> {
diagramEngine.enableRepaintEntities([]);
this.forceUpdate();
requestAnimationFrame(() => this.forceUpdate());
}
}}
onMouseDown={event => {