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

Change the way restrictions on arc are managed.

Browse Source
This commit is contained in:
Holt59
2018-03-04 21:22:52 +01:00
parent d5de1cf2ff
commit 8acc13c7f6
6 changed files with 122 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/org/insa/graphics/AlgorithmPanel.java
View File

@@ -10,6 +10,7 @@ import java.awt.event.ActionListener;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
import javax.swing.Box;
@@ -29,9 +30,11 @@ import org.insa.algo.AbstractInputData;
import org.insa.algo.AbstractInputData.ArcFilter;
import org.insa.algo.AbstractInputData.Mode;
import org.insa.algo.AlgorithmFactory;
import org.insa.graph.AccessRestrictions;
import org.insa.graph.AccessRestrictions.AccessMode;
import org.insa.graph.AccessRestrictions.AccessRestriction;
import org.insa.graph.Arc;
import org.insa.graph.Node;
import org.insa.graph.RoadInformation.AccessMode;
import org.insa.graphics.NodesInputPanel.InputChangedEvent;
public class AlgorithmPanel extends JPanel {
@@ -182,8 +185,9 @@ public class AlgorithmPanel extends JPanel {
}, new AbstractInputData.ArcFilter() {
@Override
public boolean isAllowed(Arc arc) {
return arc.getRoadInformation().getAccessRestrictions().isAllowedFor(AccessMode.MOTORCAR)
&& !arc.getRoadInformation().getAccessRestrictions().isPrivate();
AccessRestrictions restrictions = arc.getRoadInformation().getAccessRestrictions();
return restrictions.isAllowedForAny(AccessMode.MOTORCAR, EnumSet
.complementOf(EnumSet.of(AccessRestriction.PRIVATE, AccessRestriction.FORBIDDEN)));
}
@Override

8
src/main/org/insa/graphics/drawing/BasicGraphPalette.java
View File

@@ -52,10 +52,12 @@ public class BasicGraphPalette implements GraphPalette {
case TERTIARY:
case RESIDENTIAL:
case UNCLASSIFIED:
case ROAD:
case LIVING_STREET:
case SERVICE:
case ROUNDABOUT:
case PEDESTRIAN:
case CYCLEWAY:
case TRACK:
color = smallroad;
break;
case COASTLINE:
@@ -86,10 +88,12 @@ public class BasicGraphPalette implements GraphPalette {
case TERTIARY:
case RESIDENTIAL:
case UNCLASSIFIED:
case ROAD:
case LIVING_STREET:
case SERVICE:
case ROUNDABOUT:
case PEDESTRIAN:
case CYCLEWAY:
case TRACK:
width = 1;
break;
case COASTLINE: