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

[dev] Fetch changes from public folder.

Browse Source
This commit is contained in:
Mikael CAPELLE
2024-11-21 10:08:08 +01:00
parent b8c86f3645
commit 443539a6ba
17 changed files with 257 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
be-graphes-gui/src/main/java/org/insa/graphs/gui/drawing/components/BasicDrawing.java
View File

@@ -686,7 +686,7 @@ public class BasicDrawing extends JPanel implements Drawing {
// Draw arcs only if there are one-way arcs or if origin is lower than
// destination, avoid drawing two-ways arc twice.
if (arc.getRoadInformation().isOneWay()
|| arc.getOrigin().compareTo(arc.getDestination()) < 0) {
|| arc.getOrigin().getId() < arc.getDestination().getId()) {
drawArc(arc, palette, false);
}
}

40
be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/Launch.java
View File

@@ -21,9 +21,8 @@ public class Launch {
/**
* Create a new Drawing inside a JFrame an return it.
*
*
* @return The created drawing.
*
* @throws Exception if something wrong happens when creating the graph.
*/
public static Drawing createDrawing() throws Exception {
@@ -45,29 +44,36 @@ 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";
// visit these directory to see the list of available files on commetud.
final String mapName =
"/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/insa.mapgr";
final String pathName =
"/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Paths/path_fr31insa_rangueil_r2.path";
// Create a graph reader.
final GraphReader reader = new BinaryGraphReader(
new DataInputStream(new BufferedInputStream(new FileInputStream(mapName))));
final Graph graph;
final Path path;
// TODO: Read the graph.
final Graph graph = null;
// create a graph reader
try (final GraphReader reader = new BinaryGraphReader(new DataInputStream(
new BufferedInputStream(new FileInputStream(mapName))))) {
// Create the drawing:
// TODO: read the graph
graph = null;
}
// create the drawing
final Drawing drawing = createDrawing();
// TODO: Draw the graph on the drawing.
// TODO: draw the graph on the drawing
// TODO: Create a PathReader.
final PathReader pathReader = null;
// TODO: create a path reader
try (final PathReader pathReader = null) {
// TODO: Read the path.
final Path path = null;
// TODO: read the path
path = null;
}
// TODO: Draw the path.
// TODO: draw the path on the drawing
}
}

4
be-graphes-gui/src/main/java/org/insa/graphs/gui/utils/FileUtils.java
View File

@@ -59,10 +59,10 @@ public class FileUtils {
static {
// Populate folderToEntry
folderToEntry.put(FolderType.Map, new PreferencesEntry("DefaultMapFolder",
"/home/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps"));
"/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps"));
folderToEntry.put(FolderType.PathInput,
new PreferencesEntry("DefaultPathInputFolder",
"/home/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Paths"));
"/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Paths"));
folderToEntry.put(FolderType.PathOutput,
new PreferencesEntry("DefaultPathOutputsFolder", "paths"));