src/Tools/Graphview/shapes.scala
changeset 59303 15cd9bcd6ddb
parent 59302 4d985afc0565
child 59384 c75327a34960
     1.1 --- a/src/Tools/Graphview/shapes.scala	Tue Jan 06 16:33:30 2015 +0100
     1.2 +++ b/src/Tools/Graphview/shapes.scala	Tue Jan 06 16:41:31 2015 +0100
     1.3 @@ -24,7 +24,7 @@
     1.4      def shape(visualizer: Visualizer, node: Graph_Display.Node): Rectangle2D.Double =
     1.5      {
     1.6        val metrics = visualizer.metrics
     1.7 -      val p = visualizer.get_vertex(Layout.Node(node))
     1.8 +      val p = visualizer.layout.get_vertex(Layout.Node(node))
     1.9        val bounds = metrics.string_bounds(node.toString)
    1.10        val w2 = ((bounds.getWidth + metrics.pad_x) / 2).ceil
    1.11        val h2 = ((bounds.getHeight + metrics.pad_y) / 2).ceil
    1.12 @@ -74,13 +74,13 @@
    1.13    {
    1.14      def paint(gfx: Graphics2D, visualizer: Visualizer, edge: Graph_Display.Edge)
    1.15      {
    1.16 -      val p = visualizer.get_vertex(Layout.Node(edge._1))
    1.17 -      val q = visualizer.get_vertex(Layout.Node(edge._2))
    1.18 +      val p = visualizer.layout.get_vertex(Layout.Node(edge._1))
    1.19 +      val q = visualizer.layout.get_vertex(Layout.Node(edge._2))
    1.20        val ds =
    1.21        {
    1.22          val a = p.y min q.y
    1.23          val b = p.y max q.y
    1.24 -        visualizer.dummies_iterator(edge).filter(d => a < d.y && d.y < b).toList
    1.25 +        visualizer.layout.dummies_iterator(edge).filter(d => a < d.y && d.y < b).toList
    1.26        }
    1.27        val path = new GeneralPath(Path2D.WIND_EVEN_ODD, ds.length + 2)
    1.28  
    1.29 @@ -106,13 +106,13 @@
    1.30  
    1.31      def paint(gfx: Graphics2D, visualizer: Visualizer, edge: Graph_Display.Edge)
    1.32      {
    1.33 -      val p = visualizer.get_vertex(Layout.Node(edge._1))
    1.34 -      val q = visualizer.get_vertex(Layout.Node(edge._2))
    1.35 +      val p = visualizer.layout.get_vertex(Layout.Node(edge._1))
    1.36 +      val q = visualizer.layout.get_vertex(Layout.Node(edge._2))
    1.37        val ds =
    1.38        {
    1.39          val a = p.y min q.y
    1.40          val b = p.y max q.y
    1.41 -        visualizer.dummies_iterator(edge).filter(d => a < d.y && d.y < b).toList
    1.42 +        visualizer.layout.dummies_iterator(edge).filter(d => a < d.y && d.y < b).toList
    1.43        }
    1.44  
    1.45        if (ds.isEmpty) Straight_Edge.paint(gfx, visualizer, edge)