Update.
This commit is contained in:
Holt59
parent
cfb59ac0f1
commit
eceaecd813
27
.classpath
27
.classpath
@ -1,8 +1,22 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src/main"/>
|
||||
<classpathentry kind="src" path="src/test"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="src" output="target/classes" path="src/main">
|
||||
<attributes>
|
||||
<attribute name="optional" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="src" output="target/test-classes" path="src/test">
|
||||
<attributes>
|
||||
<attribute name="optional" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
|
||||
<classpathentry kind="lib" path="libs/piccolo2d-core-3.0.jar">
|
||||
<attributes>
|
||||
@ -19,5 +33,10 @@
|
||||
<attribute name="javadoc_location" value="jar:platform:/resource/be-graphes-base/libs/piccolo2d-swt-3.0-javadoc.jar!/"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
</classpath>
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
.DS_Store
|
||||
bin
|
||||
/target/
|
||||
|
||||
6
.project
6
.project
@ -10,8 +10,14 @@
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
|
||||
@ -11,10 +11,12 @@ import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.io.PrintStream;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import javax.swing.BorderFactory;
|
||||
import javax.swing.BoxLayout;
|
||||
import javax.swing.JButton;
|
||||
import javax.swing.JFileChooser;
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JLabel;
|
||||
@ -28,13 +30,21 @@ import javax.swing.JSplitPane;
|
||||
import javax.swing.JTextArea;
|
||||
import javax.swing.KeyStroke;
|
||||
import javax.swing.SwingConstants;
|
||||
import javax.swing.UIManager;
|
||||
import javax.swing.filechooser.FileNameExtensionFilter;
|
||||
|
||||
import org.insa.algo.AbstractSolution;
|
||||
import org.insa.algo.shortestpath.BellmanFordAlgorithm;
|
||||
import org.insa.algo.shortestpath.ShortestPathAlgorithm;
|
||||
import org.insa.algo.shortestpath.ShortestPathGraphicObserver;
|
||||
import org.insa.algo.shortestpath.ShortestPathInstance;
|
||||
import org.insa.algo.shortestpath.ShortestPathInstance.Mode;
|
||||
import org.insa.algo.shortestpath.ShortestPathSolution;
|
||||
import org.insa.algo.weakconnectivity.WeaklyConnectedComponentGraphicObserver;
|
||||
import org.insa.algo.weakconnectivity.WeaklyConnectedComponentTextObserver;
|
||||
import org.insa.algo.weakconnectivity.WeaklyConnectedComponentsAlgorithm;
|
||||
import org.insa.algo.weakconnectivity.WeaklyConnectedComponentsInstance;
|
||||
import org.insa.drawing.DrawingVisible;
|
||||
import org.insa.drawing.Drawing;
|
||||
import org.insa.drawing.graph.BlackAndWhiteGraphPalette;
|
||||
import org.insa.drawing.graph.GraphDrawing;
|
||||
import org.insa.drawing.graph.PathDrawing;
|
||||
@ -97,14 +107,19 @@ public class MainWindow extends JFrame {
|
||||
// Label containing the map ID of the current graph.
|
||||
private JLabel mapIdPanel;
|
||||
|
||||
private JPanel threadPanel;
|
||||
|
||||
// Log stream and print stream
|
||||
private JOutputStream logStream;
|
||||
private PrintStream printStream;
|
||||
|
||||
// Current running thread
|
||||
private Thread currentThread;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private DrawingVisible drawing;
|
||||
private Drawing drawing;
|
||||
|
||||
public MainWindow() {
|
||||
super(WINDOW_TITLE);
|
||||
@ -129,7 +144,7 @@ public class MainWindow extends JFrame {
|
||||
// Create graph area
|
||||
JSplitPane sp = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
|
||||
|
||||
drawing = new DrawingVisible();
|
||||
drawing = new Drawing();
|
||||
drawing.setBackground(Color.WHITE);
|
||||
|
||||
JTextArea infoPanel = new JTextArea();
|
||||
@ -153,6 +168,40 @@ public class MainWindow extends JFrame {
|
||||
this.add(createStatusBar(), BorderLayout.SOUTH);
|
||||
}
|
||||
|
||||
private void launchThread(Runnable runnable) {
|
||||
currentThread = new Thread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
threadPanel.setVisible(true);
|
||||
runnable.run();
|
||||
threadPanel.setVisible(false);
|
||||
}
|
||||
});
|
||||
currentThread.start();
|
||||
}
|
||||
|
||||
private ShortestPathInstance getShortestPathParameters() {
|
||||
// TODO: Select origin / end nodes.
|
||||
return new ShortestPathInstance(
|
||||
graph, graph.getNodes().get(2), graph.getNodes().get(139), Mode.TIME);
|
||||
}
|
||||
|
||||
private void launchShortestPathThread(ShortestPathAlgorithm spAlgorithm) {
|
||||
spAlgorithm.addObserver(new ShortestPathGraphicObserver(drawing));
|
||||
// algo.addObserver(new ShortestPathTextObserver(printStream));
|
||||
launchThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
spAlgorithm.run();
|
||||
AbstractSolution solution = spAlgorithm.getLastSolution();
|
||||
if (solution != null && solution.isFeasible()) {
|
||||
new PathDrawing(drawing).drawPath(((ShortestPathSolution)solution).getPath());
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@SuppressWarnings("restriction")
|
||||
private JMenuBar createMenuBar() {
|
||||
|
||||
// Open Map item...
|
||||
@ -258,10 +307,14 @@ public class MainWindow extends JFrame {
|
||||
drawGraphItem.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
launchThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
drawing.clear();
|
||||
drawing.setAutoRepaint(true);
|
||||
new GraphDrawing(drawing).drawGraph(graph);
|
||||
drawing.setAutoRepaint(false);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
graphItems.add(drawGraphItem);
|
||||
@ -271,10 +324,14 @@ public class MainWindow extends JFrame {
|
||||
drawGraphBWItem.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
launchThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
drawing.clear();
|
||||
drawing.setAutoRepaint(true);
|
||||
new GraphDrawing(drawing, new BlackAndWhiteGraphPalette()).drawGraph(graph);
|
||||
drawing.setAutoRepaint(false);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
graphItems.add(drawGraphBWItem);
|
||||
@ -286,21 +343,35 @@ public class MainWindow extends JFrame {
|
||||
// Algo menu
|
||||
JMenu algoMenu = new JMenu("Algorithms");
|
||||
|
||||
// Weakly connected components
|
||||
JMenuItem wccItem = new JMenuItem("Weakly Connected Components");
|
||||
wccItem.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
|
||||
WeaklyConnectedComponentsInstance instance = new WeaklyConnectedComponentsInstance(graph);
|
||||
WeaklyConnectedComponentsAlgorithm algo = new WeaklyConnectedComponentsAlgorithm(instance);
|
||||
algo.addObserver(new WeaklyConnectedComponentGraphicObserver(drawing));
|
||||
// algo.addObserver(new WeaklyConnectedComponentTextObserver(printStream));
|
||||
launchThread(algo);
|
||||
}
|
||||
});
|
||||
|
||||
(new Thread(algo)).start();
|
||||
// Shortest path
|
||||
JMenuItem bellmanItem = new JMenuItem("Shortest Path (Bellman-Ford)");
|
||||
bellmanItem.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
launchShortestPathThread(new BellmanFordAlgorithm(getShortestPathParameters()));
|
||||
}
|
||||
});
|
||||
graphItems.add(wccItem);
|
||||
graphItems.add(bellmanItem);
|
||||
|
||||
algoMenu.add(wccItem);
|
||||
algoMenu.addSeparator();
|
||||
algoMenu.add(bellmanItem);
|
||||
// algoMenu.add(djikstraItem);
|
||||
// algoMenu.add(aStarItem);
|
||||
|
||||
// Create the menu bar.
|
||||
JMenuBar menuBar = new JMenuBar();
|
||||
@ -320,17 +391,48 @@ public class MainWindow extends JFrame {
|
||||
// create the status bar panel and shove it down the bottom of the frame
|
||||
JPanel statusPanel = new JPanel();
|
||||
statusPanel.setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0, Color.GRAY));
|
||||
statusPanel.setPreferredSize(new Dimension(getWidth(), 20));
|
||||
statusPanel.setLayout(new BoxLayout(statusPanel, BoxLayout.X_AXIS));
|
||||
statusPanel.setPreferredSize(new Dimension(getWidth(), 34));
|
||||
statusPanel.setLayout(new BorderLayout());
|
||||
|
||||
mapIdPanel = new JLabel();
|
||||
mapIdPanel.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
statusPanel.add(mapIdPanel);
|
||||
statusPanel.add(mapIdPanel, BorderLayout.WEST);
|
||||
|
||||
JLabel threadInfo = new JLabel("Thread running... ");
|
||||
JButton threadButton = new JButton("Stop");
|
||||
threadButton.addActionListener(new ActionListener() {
|
||||
@SuppressWarnings("deprecation")
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
if (currentThread != null && currentThread.isAlive()) {
|
||||
int confirmed = JOptionPane.showConfirmDialog(null,
|
||||
"Are you sure you want to kill the running thread?", "Kill Confirmation",
|
||||
JOptionPane.YES_NO_OPTION);
|
||||
if (confirmed == JOptionPane.YES_OPTION) {
|
||||
currentThread.stop();
|
||||
currentThread = null;
|
||||
threadPanel.setVisible(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
threadPanel = new JPanel();
|
||||
threadPanel.add(threadInfo);
|
||||
threadPanel.add(threadButton);
|
||||
// threadPanel.setVisible(false);
|
||||
statusPanel.add(threadPanel, BorderLayout.EAST);
|
||||
|
||||
return statusPanel;
|
||||
}
|
||||
|
||||
public static void main(final String[] args) {
|
||||
|
||||
// Try to set system look and feel.
|
||||
try {
|
||||
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()) ;
|
||||
}
|
||||
catch (Exception e) { }
|
||||
|
||||
MainWindow w = new MainWindow();
|
||||
w.setExtendedState(JFrame.MAXIMIZED_BOTH);
|
||||
w.setVisible(true);
|
||||
|
||||
@ -1,88 +1,170 @@
|
||||
package org.insa.drawing ;
|
||||
package org.insa.drawing;
|
||||
|
||||
import java.awt.BasicStroke;
|
||||
import java.awt.Color;
|
||||
import java.awt.Graphics;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.Image;
|
||||
import java.awt.image.*;
|
||||
|
||||
import javax.swing.JPanel;
|
||||
|
||||
/**
|
||||
* Classe abstraite pour dessiner a l'ecran.
|
||||
* Deux implementations : une sous-classe DessinVisible qui dessine vraiment a l'ecran
|
||||
* et une sous-classe DessinInvisible qui ne dessine rien (pour ne pas ralentir les tests avec l'affichage).
|
||||
* Cette implementation de la classe Dessin produit vraiment un affichage
|
||||
* (au contraire de la classe DessinInvisible).
|
||||
*/
|
||||
|
||||
import java.awt.* ;
|
||||
|
||||
public interface Drawing {
|
||||
public class Drawing extends JPanel {
|
||||
|
||||
/**
|
||||
* Enable auto-repaint mode - When this mode is enable, call to
|
||||
* drawing function will automatically repaint the drawing, which
|
||||
* may be very slow in some case.
|
||||
*
|
||||
* @param autoRepaint Use true to enable auto-repaint, false to disable.
|
||||
*
|
||||
*/
|
||||
public void setAutoRepaint(boolean autoRepaint);
|
||||
private static final long serialVersionUID = 96779785877771827L;
|
||||
|
||||
private final Graphics2D gr;
|
||||
|
||||
private float long1;
|
||||
private float long2;
|
||||
private float lat1;
|
||||
private float lat2;
|
||||
|
||||
// Width and height of the image
|
||||
private final int width, height;
|
||||
|
||||
private boolean bb_is_set ;
|
||||
|
||||
private Image image;
|
||||
private ZoomAndPanListener zoomAndPanListener;
|
||||
|
||||
public boolean autoRepaint = true;
|
||||
|
||||
/**
|
||||
* Repaint the drawing.
|
||||
*
|
||||
* Cree et affiche une nouvelle fenetre de dessin.
|
||||
*/
|
||||
public void repaint();
|
||||
public Drawing() {
|
||||
|
||||
/**
|
||||
* Set the pencil width.
|
||||
*
|
||||
* @param width Width for the pencil.
|
||||
*
|
||||
*/
|
||||
public void setWidth(int width);
|
||||
this.zoomAndPanListener = new ZoomAndPanListener(this, ZoomAndPanListener.DEFAULT_MIN_ZOOM_LEVEL, 20, 1.2);
|
||||
this.addMouseListener(zoomAndPanListener);
|
||||
this.addMouseMotionListener(zoomAndPanListener);
|
||||
this.addMouseWheelListener(zoomAndPanListener);
|
||||
|
||||
/**
|
||||
* Set the pencil color.
|
||||
*
|
||||
* @param color Color for the pencil.
|
||||
*
|
||||
*/
|
||||
public void setColor(Color col);
|
||||
this.width = 2000;
|
||||
this.height = 1600;
|
||||
|
||||
/**
|
||||
* Clear the drawing.
|
||||
*/
|
||||
public void clear();
|
||||
BufferedImage img = new BufferedImage(this.width, this.height, BufferedImage.TYPE_3BYTE_BGR);
|
||||
|
||||
/**
|
||||
* Indique les bornes de la fenetre graphique.
|
||||
* Le calcul des coordonnees en pixel se fera automatiquement
|
||||
* a l'appel des methodes drawLine et autres.
|
||||
*
|
||||
* @param long1 longitude du bord gauche
|
||||
* @param long2 longitude du bord droit
|
||||
* @param lat1 latitude du bord bas
|
||||
* @param lat2 latitude du bord haut
|
||||
*
|
||||
*/
|
||||
public void setBB(double long1, double long2, double lat1, double lat2);
|
||||
this.image = img;
|
||||
this.gr = img.createGraphics();
|
||||
|
||||
/**
|
||||
* Trace un segment.
|
||||
* @param long1 longitude du premier point
|
||||
* @param lat1 latitude du premier point
|
||||
* @param long2 longitude du second point
|
||||
* @param lat2 latitude du second point
|
||||
*/
|
||||
public void drawLine(float long1, float lat1, float long2, float lat2);
|
||||
this.zoomAndPanListener.setCoordTransform(this.gr.getTransform());
|
||||
|
||||
/**
|
||||
* Trace un point.
|
||||
* @param lon longitude du point
|
||||
* @param lat latitude du point
|
||||
* @param width grosseur du point
|
||||
*/
|
||||
public void drawPoint(float lon, float lat, int width);
|
||||
this.bb_is_set = false;
|
||||
|
||||
/**
|
||||
* Ecrit du texte a la position indiquee.
|
||||
* @param lon longitude du point ou positionner le texte.
|
||||
* @param lat latitude du point ou positionner le texte.
|
||||
* @param txt le texte a ecrire.
|
||||
*/
|
||||
public void putText(float lon, float lat, String txt);
|
||||
|
||||
this.long1 = 0.0f;
|
||||
this.long2 = this.width;
|
||||
this.lat1 = 0.0f;
|
||||
this.lat2 = this.height;
|
||||
|
||||
this.clear();
|
||||
this.repaint();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void paintComponent(Graphics g1) {
|
||||
Graphics2D g = (Graphics2D)g1;
|
||||
g.clearRect(0, 0, getWidth(), getHeight());
|
||||
g.setTransform(zoomAndPanListener.getCoordTransform());
|
||||
g.drawImage(image, 0, 0, this);
|
||||
}
|
||||
|
||||
public void setAutoRepaint(boolean autoRepaint) {
|
||||
this.autoRepaint = autoRepaint;
|
||||
}
|
||||
|
||||
protected void doAutoPaint() {
|
||||
if (autoRepaint) {
|
||||
this.repaint();
|
||||
}
|
||||
}
|
||||
|
||||
public void setWidth(int width) {
|
||||
this.gr.setStroke(new BasicStroke(width));
|
||||
}
|
||||
|
||||
public void setColor(Color col) {
|
||||
this.gr.setColor(col);
|
||||
}
|
||||
|
||||
public void clear() {
|
||||
this.gr.setColor(Color.WHITE);
|
||||
this.gr.fillRect(0, 0, this.width, this.height);
|
||||
}
|
||||
|
||||
public void setBB(double long1, double long2, double lat1, double lat2) {
|
||||
|
||||
if (long1 > long2 || lat1 > lat2) {
|
||||
throw new Error("DessinVisible.setBB : mauvaises coordonnees.");
|
||||
}
|
||||
|
||||
this.long1 = (float)long1;
|
||||
this.long2 = (float)long2;
|
||||
this.lat1= (float)lat1;
|
||||
this.lat2 = (float)lat2;
|
||||
|
||||
this.bb_is_set = true;
|
||||
|
||||
double scale = 1 / Math.max(this.width / (double)this.getWidth(), this.height / (double)this.getHeight());
|
||||
|
||||
this.zoomAndPanListener.getCoordTransform().setToIdentity();
|
||||
this.zoomAndPanListener.getCoordTransform().translate((this.getWidth() - this.width * scale) / 2,
|
||||
(this.getHeight() - this.height * scale) / 2);
|
||||
this.zoomAndPanListener.getCoordTransform().scale(scale, scale);
|
||||
this.zoomAndPanListener.setZoomLevel(0);
|
||||
this.repaint();
|
||||
|
||||
}
|
||||
|
||||
private int projx(float lon) {
|
||||
return (int)(width * (lon - this.long1) / (this.long2 - this.long1)) ;
|
||||
}
|
||||
|
||||
private int projy(float lat) {
|
||||
return (int)(height * (1 - (lat - this.lat1) / (this.lat2 - this.lat1))) ;
|
||||
}
|
||||
|
||||
private void checkBB() {
|
||||
if (!this.bb_is_set) {
|
||||
throw new Error("Classe DessinVisible : vous devez invoquer la methode setBB avant de dessiner.") ;
|
||||
}
|
||||
}
|
||||
|
||||
public void drawLine(float long1, float lat1, float long2, float lat2) {
|
||||
this.checkBB() ;
|
||||
int x1 = this.projx(long1) ;
|
||||
int x2 = this.projx(long2) ;
|
||||
int y1 = this.projy(lat1) ;
|
||||
int y2 = this.projy(lat2) ;
|
||||
|
||||
gr.drawLine(x1, y1, x2, y2) ;
|
||||
this.doAutoPaint();
|
||||
}
|
||||
|
||||
public void drawPoint(float lon, float lat, int width) {
|
||||
this.checkBB() ;
|
||||
int x = this.projx(lon) - width / 2 ;
|
||||
int y = this.projy(lat) - width / 2 ;
|
||||
gr.fillOval (x, y, width, width) ;
|
||||
this.doAutoPaint();
|
||||
}
|
||||
|
||||
public void putText(float lon, float lat, String txt) {
|
||||
this.checkBB() ;
|
||||
int x = this.projx(lon) ;
|
||||
int y = this.projy(lat) ;
|
||||
gr.drawString (txt, x, y) ;
|
||||
this.doAutoPaint();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user