afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

rest - fixed socketio import

Browse source
This commit is contained in:
Blake J. Harnden 2018-09-14 10:46:47 -07:00
parent 0d63630c99
commit c50dfdda85
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
corefx/src/main/java/com/core/graph/CoreObservableGraph.java
View file

@ -15,7 +15,6 @@ public class CoreObservableGraph<V, E> extends ObservableGraph<V, E> {
@Override @Override
public boolean addEdge(E e, V v1, V v2, EdgeType edgeType) { public boolean addEdge(E e, V v1, V v2, EdgeType edgeType) {
logger.info("graph adding edge: {} - {}", v1, v2);
if (v1 == null || v2 == null) { if (v1 == null || v2 == null) {
return false; return false;
} }
@ -24,7 +23,6 @@ public class CoreObservableGraph<V, E> extends ObservableGraph<V, E> {
@Override @Override
public boolean addEdge(E e, V v1, V v2) { public boolean addEdge(E e, V v1, V v2) {
logger.info("graph adding edge: {} - {}", v1, v2);
if (v1 == null || v2 == null) { if (v1 == null || v2 == null) {
return false; return false;
} }

3
corefx/src/main/java/com/core/graph/NetworkGraph.java
View file

@ -307,7 +307,7 @@ public class NetworkGraph {
vertexId = Math.max(node.getId() + 1, node.getId()); vertexId = Math.max(node.getId() + 1, node.getId());
Double x = Math.abs(node.getPosition().getX()); Double x = Math.abs(node.getPosition().getX());
Double y = Math.abs(node.getPosition().getY()); Double y = Math.abs(node.getPosition().getY());
logger.info("adding session node: {}", node); logger.info("adding session node: {}", node);
graph.addVertex(node); graph.addVertex(node);
graphLayout.setLocation(node, x, y); graphLayout.setLocation(node, x, y);
nodeMap.put(node.getId(), node); nodeMap.put(node.getId(), node);
@ -358,6 +358,7 @@ public class NetworkGraph {
} }
public void addLink(CoreLink link) { public void addLink(CoreLink link) {
logger.info("adding session link: {}", link);
link.setId(linkId++); link.setId(linkId++);
CoreNode nodeOne = nodeMap.get(link.getNodeOne()); CoreNode nodeOne = nodeMap.get(link.getNodeOne());
CoreNode nodeTwo = nodeMap.get(link.getNodeTwo()); CoreNode nodeTwo = nodeMap.get(link.getNodeTwo());

2
webapp/websocket_routes.py
View file

@ -1,4 +1,4 @@
from flask.ext.socketio import SocketIO, emit from flask_socketio import SocketIO
from core import logger from core import logger