trans/graphhopper-jsprit
1
0
Fork 0
mirror of https://github.com/graphhopper/jsprit.git synced 2020-01-24 07:45:05 +01:00
Code Issues Releases Wiki Activity

fix code breaks coming along with gs upgrade

Browse source
This commit is contained in:
oblonski 2015-04-22 08:53:08 +02:00
parent 82d5befb31
commit bcd08cb22c
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
jsprit-analysis/src/main/java/jsprit/analysis/toolbox/AlgorithmEventsViewer.java
View file

@ -21,7 +21,7 @@ import org.graphstream.graph.Graph;
import org.graphstream.stream.Sink; import org.graphstream.stream.Sink;
import org.graphstream.stream.file.FileSource; import org.graphstream.stream.file.FileSource;
import org.graphstream.stream.file.FileSourceDGS; import org.graphstream.stream.file.FileSourceDGS;
import org.graphstream.ui.swingViewer.Viewer; import org.graphstream.ui.view.Viewer;
import java.io.IOException; import java.io.IOException;

15
jsprit-analysis/src/main/java/jsprit/analysis/toolbox/GraphStreamViewer.java
View file

@ -33,8 +33,9 @@ import org.graphstream.graph.Edge;
import org.graphstream.graph.Graph; import org.graphstream.graph.Graph;
import org.graphstream.graph.Node; import org.graphstream.graph.Node;
import org.graphstream.graph.implementations.MultiGraph; import org.graphstream.graph.implementations.MultiGraph;
import org.graphstream.ui.swingViewer.View; import org.graphstream.ui.swingViewer.ViewPanel;
import org.graphstream.ui.swingViewer.Viewer; import org.graphstream.ui.view.View;
import org.graphstream.ui.view.Viewer;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@ -176,9 +177,9 @@ public class GraphStreamViewer {
return g; return g;
} }
public static View createEmbeddedView(Graph graph, double scaling){ public static ViewPanel createEmbeddedView(Graph graph, double scaling){
Viewer viewer = new Viewer(graph,Viewer.ThreadingModel.GRAPH_IN_ANOTHER_THREAD); Viewer viewer = new Viewer(graph,Viewer.ThreadingModel.GRAPH_IN_ANOTHER_THREAD);
View view = viewer.addDefaultView(false); ViewPanel view = viewer.addDefaultView(false);
view.setPreferredSize(new Dimension((int) (698 * scaling), (int) (440 * scaling))); view.setPreferredSize(new Dimension((int) (698 * scaling), (int) (440 * scaling)));
return view; return view;
} }
@ -326,14 +327,14 @@ public class GraphStreamViewer {
Graph g = createMultiGraph("g"); Graph g = createMultiGraph("g");
View view = createEmbeddedView(g,scaling); ViewPanel view = createEmbeddedView(g,scaling);
createJFrame(view,scaling); createJFrame(view,scaling);
render(g, view); render(g, view);
} }
private JFrame createJFrame(View view, double scaling) { private JFrame createJFrame(ViewPanel view, double scaling) {
JFrame jframe = new JFrame(); JFrame jframe = new JFrame();
JPanel basicPanel = new JPanel(); JPanel basicPanel = new JPanel();
basicPanel.setLayout(new BoxLayout(basicPanel, BoxLayout.Y_AXIS)); basicPanel.setLayout(new BoxLayout(basicPanel, BoxLayout.Y_AXIS));
@ -377,7 +378,7 @@ public class GraphStreamViewer {
return GraphStreamViewer.createMultiGraph(name,STYLESHEET); return GraphStreamViewer.createMultiGraph(name,STYLESHEET);
} }
private void render(Graph g, View view) { private void render(Graph g, ViewPanel view) {
if(center != null){ if(center != null){
view.resizeFrame(view.getWidth(), view.getHeight()); view.resizeFrame(view.getWidth(), view.getHeight());
alignCamera(view); alignCamera(view);