diff --git a/.idea/runConfigurations/Main_no_UI.xml b/.idea/runConfigurations/Main_no_UI.xml new file mode 100644 index 0000000..4028864 --- /dev/null +++ b/.idea/runConfigurations/Main_no_UI.xml @@ -0,0 +1,15 @@ + + + + \ No newline at end of file diff --git a/be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/Launch.java b/be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/Launch.java index 7be58b3..c4d9865 100644 --- a/be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/Launch.java +++ b/be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/Launch.java @@ -5,6 +5,7 @@ import java.awt.Dimension; import java.io.BufferedInputStream; import java.io.DataInputStream; import java.io.FileInputStream; +import java.io.IOException; import javax.swing.JFrame; import javax.swing.SwingUtilities; @@ -14,6 +15,7 @@ import org.insa.graphs.gui.drawing.components.BasicDrawing; import org.insa.graphs.model.Graph; import org.insa.graphs.model.Path; import org.insa.graphs.model.io.BinaryGraphReader; +import org.insa.graphs.model.io.BinaryPathReader; import org.insa.graphs.model.io.GraphReader; import org.insa.graphs.model.io.PathReader; @@ -46,28 +48,43 @@ public class Launch { public static void main(String[] args) throws Exception { // Visit these directory to see the list of available files on Commetud. - final String mapName = "/home/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/insa.mapgr"; - final String pathName = "/home/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Paths/path_fr31insa_rangueil_r2.path"; + final String mapName = "Maps/insa.mapgr"; + final String pathName = "Paths/path_fr31insa_rangueil_r2.path"; // Create a graph reader. final GraphReader reader = new BinaryGraphReader( new DataInputStream(new BufferedInputStream(new FileInputStream(mapName)))); // TODO: Read the graph. - final Graph graph = null; + final Graph graph; + try { + graph = reader.read(); + } catch (IOException e) { + System.err.println(e); + return; + } // Create the drawing: - final Drawing drawing = createDrawing(); + final Drawing drawing; + try { + drawing = createDrawing(); + } catch (Exception e) { + System.err.println(e); + return; + } // TODO: Draw the graph on the drawing. + drawing.drawGraph(graph); // TODO: Create a PathReader. - final PathReader pathReader = null; + final PathReader pathReader = new BinaryPathReader( + new DataInputStream(new BufferedInputStream(new FileInputStream(pathName)))); // TODO: Read the path. - final Path path = null; + final Path path = pathReader.readPath(graph); // TODO: Draw the path. + drawing.drawPath(path); } }