INSA/be-graphes
3
0
Fork 0
Code Issues 4 Releases Wiki Activity

Update MainWindow to allow choice of mode for SP.

Browse Source
This commit is contained in:
Mikael Capelle 2018-02-20 11:41:18 +01:00
parent 1eee9b8dd9
commit 237edea766
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/org/insa/base/MainWindow.java
View File

@ -8,11 +8,9 @@ import java.awt.event.ActionListener;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
import java.awt.geom.NoninvertibleTransformException; import java.awt.geom.NoninvertibleTransformException;
import java.awt.geom.Point2D;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
@ -144,22 +142,11 @@ public class MainWindow extends JFrame {
return; return;
} }
System.out.println("MOUSE CLICKED: " + evt.getPoint() + " -> " + lonlat); Node node = graph.findClosestNode(lonlat);
ArrayList<Node> nodes = graph.getNodes();
Node node = null;
double minDis = Double.POSITIVE_INFINITY;
for (int n = 0 ; n < nodes.size(); ++n) {
double dis = lonlat.distanceTo(nodes.get(n).getPoint());
if (dis < minDis) {
node = nodes.get(n);
minDis = dis;
}
}
new GraphDrawing(drawing).drawPoint(node.getPoint(), 10, Color.BLUE); new GraphDrawing(drawing).drawPoint(node.getPoint(), 10, Color.BLUE);
points.add(node); points.add(node);
if (points.size() == nTargetPoints) { if (points.size() == nTargetPoints) {
System.out.println("CALLABLE!");
callable.call(points); callable.call(points);
this.disable(); this.disable();
} }
@ -487,14 +474,22 @@ public class MainWindow extends JFrame {
bellmanItem.addActionListener(new ActionListener() { bellmanItem.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
int idx = JOptionPane.showOptionDialog(MainWindow.this,
"Which mode do you want?", "Mode selection",
JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE,
null, Mode.values(), Mode.LENGTH);
if (idx != -1) {
Mode mode = Mode.values()[idx];
clickAdapter.enable(2, new CallableWithNodes() { clickAdapter.enable(2, new CallableWithNodes() {
@Override @Override
public void call(ArrayList<Node> nodes) { public void call(ArrayList<Node> nodes) {
launchShortestPathThread(new BellmanFordAlgorithm( launchShortestPathThread(new BellmanFordAlgorithm(
new ShortestPathInstance(graph, nodes.get(0), nodes.get(1), Mode.TIME))); new ShortestPathInstance(graph, nodes.get(0), nodes.get(1), mode)));
} }
}); });
} }
}
}); });
graphItems.add(wccItem); graphItems.add(wccItem);
graphItems.add(bellmanItem); graphItems.add(bellmanItem);