Berack/upo-graphs
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Hotfix

Browse Source 
* fixed graph adding edge to same vertex
This commit is contained in:
Giacomo Bertolazzi
2019-02-26 22:13:31 +01:00
parent cdc183754f
commit bf0f3abe04
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/berack96/sim/util/graph/view/edge/EdgeListener.java
View File

@@ -54,7 +54,8 @@ public abstract class EdgeListener<V, W extends Number> implements GraphListener
VertexComponent<V> source = componentPressed.get(); VertexComponent<V> source = componentPressed.get();
VertexComponent<V> destination = graphPanel.getVertexAt(e.getPoint()); VertexComponent<V> destination = graphPanel.getVertexAt(e.getPoint());
if (!graphPanel.getGraph().containsEdge(source.vertex.getValue(), destination.vertex.getValue())) if (!graphPanel.getGraph().containsEdge(source.vertex.getValue(), destination.vertex.getValue())
&& !source.vertex.equals(destination.vertex))
graphPanel.addEdge(source, destination, buildNewEdge(source.vertex, destination.vertex)); graphPanel.addEdge(source, destination, buildNewEdge(source.vertex, destination.vertex));
} catch (Exception ignore) { } catch (Exception ignore) {
} }
@@ -78,12 +79,11 @@ public abstract class EdgeListener<V, W extends Number> implements GraphListener
public void keyPressed(KeyEvent e) { public void keyPressed(KeyEvent e) {
if (edge.get() != null && Character.isDigit(e.getKeyChar())) { if (edge.get() != null && Character.isDigit(e.getKeyChar())) {
string.append(e.getKeyChar()); string.append(e.getKeyChar());
if (!edge.get().source.equals(edge.get().destination)) try {
try { graphPanel.modEdge(edge.get().source, edge.get().destination, buildEdgeFrom(string.toString()));
graphPanel.modEdge(edge.get().source, edge.get().destination, buildEdgeFrom(string.toString())); graphPanel.repaint();
graphPanel.repaint(); } catch (Exception ignored) {
} catch (Exception ignored) { }
}
} else { } else {
try { try {