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

Fix issue with solution panel when a new graph was loaded.

Browse Source
This commit is contained in:
Mikael Capelle 2018-03-02 11:03:43 +01:00
parent 4fae0e890c
commit 23fa24377d
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/org/insa/graphics/ShortestPathSolutionPanel.java
View File

@ -30,7 +30,8 @@ import org.insa.graph.io.BinaryPathWriter;
import org.insa.graphics.drawing.Drawing; import org.insa.graphics.drawing.Drawing;
import org.insa.graphics.drawing.overlays.PathOverlay; import org.insa.graphics.drawing.overlays.PathOverlay;
public class ShortestPathSolutionPanel extends JPanel implements DrawingChangeListener, GraphChangeListener { public class ShortestPathSolutionPanel extends JPanel
implements DrawingChangeListener, GraphChangeListener {
/** /**
* *
@ -95,13 +96,12 @@ public class ShortestPathSolutionPanel extends JPanel implements DrawingChangeLi
/* /*
* (non-Javadoc) * (non-Javadoc)
*
* @see java.lang.Object#toString() * @see java.lang.Object#toString()
*/ */
public String toString() { public String toString() {
return "Shortest-path from #" + this.getData().getOrigin().getId() + " to #" return "Shortest-path from #" + this.getData().getOrigin().getId() + " to #"
+ this.getData().getDestination().getId() + " [" + this.getData().getMode().toString().toLowerCase() + this.getData().getDestination().getId() + " ["
+ "]"; + this.getData().getMode().toString().toLowerCase() + "]";
} }
} }
@ -125,8 +125,6 @@ public class ShortestPathSolutionPanel extends JPanel implements DrawingChangeLi
this.drawing = drawing; this.drawing = drawing;
// TODO: Create select + Block for JPanel
solutionSelect = new JComboBox<>(); solutionSelect = new JComboBox<>();
solutionSelect.setBackground(Color.WHITE); solutionSelect.setBackground(Color.WHITE);
solutionSelect.setAlignmentX(Component.LEFT_ALIGNMENT); solutionSelect.setAlignmentX(Component.LEFT_ALIGNMENT);
@ -163,7 +161,8 @@ public class ShortestPathSolutionPanel extends JPanel implements DrawingChangeLi
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
String filepath = System.getProperty("user.dir"); String filepath = System.getProperty("user.dir");
filepath += File.separator + String.format("path_%#x_%d_%d.path", filepath += File.separator + String.format("path_%#x_%d_%d.path",
currentBundle.getData().getGraph().getMapId(), currentBundle.getData().getOrigin().getId(), currentBundle.getData().getGraph().getMapId(),
currentBundle.getData().getOrigin().getId(),
currentBundle.getData().getDestination().getId()); currentBundle.getData().getDestination().getId());
JFileChooser fileChooser = new JFileChooser(); JFileChooser fileChooser = new JFileChooser();
fileChooser.setSelectedFile(new File(filepath)); fileChooser.setSelectedFile(new File(filepath));
@ -172,12 +171,13 @@ public class ShortestPathSolutionPanel extends JPanel implements DrawingChangeLi
if (fileChooser.showOpenDialog(parent) == JFileChooser.APPROVE_OPTION) { if (fileChooser.showOpenDialog(parent) == JFileChooser.APPROVE_OPTION) {
File file = fileChooser.getSelectedFile(); File file = fileChooser.getSelectedFile();
try { try {
BinaryPathWriter writer = new BinaryPathWriter( BinaryPathWriter writer = new BinaryPathWriter(new DataOutputStream(
new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file)))); new BufferedOutputStream(new FileOutputStream(file))));
writer.writePath(currentBundle.getSolution().getPath()); writer.writePath(currentBundle.getSolution().getPath());
} }
catch (IOException e1) { catch (IOException e1) {
JOptionPane.showMessageDialog(parent, "Unable to write path to the selected file."); JOptionPane.showMessageDialog(parent,
"Unable to write path to the selected file.");
e1.printStackTrace(); e1.printStackTrace();
} }
} }
@ -197,6 +197,11 @@ public class ShortestPathSolutionPanel extends JPanel implements DrawingChangeLi
ShortestPathBundle bundle = (ShortestPathBundle) solutionSelect.getSelectedItem(); ShortestPathBundle bundle = (ShortestPathBundle) solutionSelect.getSelectedItem();
// Handle case when the JComboBox is empty.
if (bundle == null) {
return;
}
if (currentBundle != null && currentBundle.getOverlay() != null) { if (currentBundle != null && currentBundle.getOverlay() != null) {
currentBundle.getOverlay().setVisible(false); currentBundle.getOverlay().setVisible(false);
} }
@ -225,12 +230,12 @@ public class ShortestPathSolutionPanel extends JPanel implements DrawingChangeLi
ShortestPathData data = bundle.getData(); ShortestPathData data = bundle.getData();
String info = null; String info = null;
if (!bundle.getSolution().isFeasible()) { if (!bundle.getSolution().isFeasible()) {
info = String.format("Shortest path: No path found from node #%d to node #%d.", data.getOrigin().getId(), info = String.format("Shortest path: No path found from node #%d to node #%d.",
data.getDestination().getId()); data.getOrigin().getId(), data.getDestination().getId());
} }
else { else {
info = String.format("Shortest path: Found a path from node #%d to node #%d", data.getOrigin().getId(), info = String.format("Shortest path: Found a path from node #%d to node #%d",
data.getDestination().getId()); data.getOrigin().getId(), data.getDestination().getId());
if (data.getMode() == Mode.LENGTH) { if (data.getMode() == Mode.LENGTH) {
info = String.format("%s, %.2f kilometers.", info, info = String.format("%s, %.2f kilometers.", info,
(bundle.getSolution().getPath().getLength() / 1000.0)); (bundle.getSolution().getPath().getLength() / 1000.0));
@ -247,6 +252,7 @@ public class ShortestPathSolutionPanel extends JPanel implements DrawingChangeLi
public void newGraphLoaded(Graph graph) { public void newGraphLoaded(Graph graph) {
this.solutionSelect.removeAllItems(); this.solutionSelect.removeAllItems();
this.currentBundle = null; this.currentBundle = null;
this.setVisible(false);
} }
@Override @Override