Skip to content
Snippets Groups Projects
Commit 210916cd authored by Maximilian Giller's avatar Maximilian Giller
Browse files

Implemented drag to click handling into tool and state

parent c7596c35
No related branches found
No related tags found
No related merge requests found
Pipeline #52704 passed
...@@ -3,7 +3,7 @@ import * as Graph from "./graph"; ...@@ -3,7 +3,7 @@ import * as Graph from "./graph";
import { loadGraphJson } from "../../datasets/datasets"; import { loadGraphJson } from "../../datasets/datasets";
import ForceGraph from "force-graph"; import ForceGraph from "force-graph";
import * as Interactions from "./interactions"; import * as Interactions from "./interactions";
import { DRAG_THRESHOLD_2D, setSpace, SPACE } from "../../config"; import { setSpace, SPACE } from "../../config";
export var state = undefined; export var state = undefined;
export var graph = undefined; export var graph = undefined;
...@@ -57,7 +57,7 @@ function load() { ...@@ -57,7 +57,7 @@ function load() {
.linkColor((link) => state.linkColor(link)) .linkColor((link) => state.linkColor(link))
.nodeColor((node) => state.nodeColor(node)) .nodeColor((node) => state.nodeColor(node))
.onNodeClick((node) => state.onNodeClick(node)) .onNodeClick((node) => state.onNodeClick(node))
.onNodeDragEnd((node, translate) => onNodeDragEnd(node, translate)) .onNodeDragEnd((node, translate) => state.onNodeDragEnd(node, translate))
.autoPauseRedraw(false) // keep redrawing after engine has stopped .autoPauseRedraw(false) // keep redrawing after engine has stopped
.linkWidth((link) => state.linkWidth(link)) .linkWidth((link) => state.linkWidth(link))
.linkDirectionalParticles(state.linkDirectionalParticles()) .linkDirectionalParticles(state.linkDirectionalParticles())
...@@ -81,12 +81,3 @@ function load() { ...@@ -81,12 +81,3 @@ function load() {
graphObj.graphData(data); graphObj.graphData(data);
}); });
} }
function onNodeDragEnd(node, translate) {
if (
Math.sqrt(Math.pow(translate.x, 2) + Math.pow(translate.y, 2)) <
DRAG_THRESHOLD_2D
) {
state.onNodeClick(node);
}
}
...@@ -10,6 +10,7 @@ import SaveTool from "./tools/savetool"; ...@@ -10,6 +10,7 @@ import SaveTool from "./tools/savetool";
import { graph } from "./editor"; import { graph } from "./editor";
import Toolbar from "./toolbar"; import Toolbar from "./toolbar";
import * as Graph from "./graph"; import * as Graph from "./graph";
import { DRAG_THRESHOLD_2D } from "../../config";
export const TOOLS = { export const TOOLS = {
undo: new UndoTool("undo"), undo: new UndoTool("undo"),
...@@ -86,6 +87,18 @@ export class State extends Tool { ...@@ -86,6 +87,18 @@ export class State extends Tool {
this.tool.onNodeClick(node); this.tool.onNodeClick(node);
} }
onNodeDragEnd(node, translate) {
// Handle as click event, if drag distance under a certain threshold
var distanceDragged = Math.sqrt(Math.pow(translate.x, 2) + Math.pow(translate.y, 2));
if (distanceDragged < DRAG_THRESHOLD_2D) {
this.onNodeClick(node);
return;
} else {
this.tool.onNodeDragEnd(node, translate);
}
}
onLinkClick(link) { onLinkClick(link) {
this.tool.onLinkClick(link); this.tool.onLinkClick(link);
} }
......
...@@ -64,6 +64,12 @@ export default class Tool { ...@@ -64,6 +64,12 @@ export default class Tool {
} }
} }
onNodeDragEnd(node, translate) {
if (this.warnings) {
console.warn('Method "onNodeDragEnd" not implemented.');
}
}
onLinkClick(link) { onLinkClick(link) {
if (this.warnings) { if (this.warnings) {
console.warn('Method "onLinkClick" not implemented.'); console.warn('Method "onLinkClick" not implemented.');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment