Changeset 30150 in osm for applications/editors/josm/plugins/smed2/src/render/Renderer.java

Timestamp:

2013-12-25T11:40:00+01:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src/render

Files:

• . (moved) (moved from applications/editors/josm/plugins/smed2/src/seamap )
• Renderer.java (modified) (8 diffs)

applications/editors/josm/plugins/smed2/src/render/Renderer.java

@@ -8 +8 @@
  */
 
-package seamap;
+package render;
 
 import java.awt.*;
@@ -17 +17 @@
 
 import s57.S57val.*;
-import seamap.SeaMap;
-import seamap.SeaMap.*;
-import seamap.SeaMap.Area;
+import s57.S57map;
+import s57.S57map.*;
+import s57.S57map.Area;
 import symbols.Areas;
-import symbols.Harbours;
 import symbols.Symbols;
 import symbols.Symbols.*;
@@ -29 +28 @@
         public static final double symbolScale[] = { 256.0, 128.0, 64.0, 32.0, 16.0, 8.0, 4.0, 2.0, 1.0, 0.61, 0.372, 0.227, 0.138, 0.0843, 0.0514, 0.0313, 0.0191, 0.0117, 0.007, 0.138 };
 
-        public static final Color Yland = new Color(0x50b0ff);
-        public static final Color Mline = new Color(0xc480ff);
-        public static final Color Msymb = new Color(0xa30075);
-        
         static final EnumMap<ColCOL, Color> bodyColours = new EnumMap<ColCOL, Color>(ColCOL.class);
         static {
@@ -67 +62 @@
 
         static MapContext context;
-        static SeaMap map;
+        static S57map map;
         static double sScale;
         static Graphics2D g2;
         static int zoom;
 
-        public static void reRender(Graphics2D g, int z, double factor, SeaMap m, MapContext c) {
+        public static void reRender(Graphics2D g, int z, double factor, S57map m, MapContext c) {
                 g2 = g;
                 zoom = z;
@@ -82 +77 @@
                         g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_GASP);
                         g2.setStroke(new BasicStroke(0, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER));
-                        Rules.rules(map, zoom);
+                        Rules.rules();
                 }
         }
@@ -525 +520 @@
                         Point2D curr = new Point2D.Double();
                         Point2D succ = new Point2D.Double();
-                        boolean gap = true;
                         boolean piv = false;
                         double len = 0;
@@ -539 +533 @@
                                         if (first) {
                                                 curr = succ = next;
-//                                              gap = (space > 0);
-//                                              len = gap ? psize * space * 0.5 : psize;
+//                                              len = psize;
                                                 first = false;
                                         } else {
@@ -559 +552 @@
                                                                 succ = new Point2D.Double(curr.getX() + (len * Math.cos(angle)), curr.getY() + (len * Math.sin(angle)));
                                                         }
-                                                        if (!gap) {
 //                                                              Symbols.drawSymbol(g2, symbol, sScale, curr.getX(), curr.getY(), new Delta(Handle.BC, AffineTransform.getRotateInstance(Math.atan2((succ.getY() - curr.getY()), (succ.getX() - curr.getX())) + Math.toRadians(90))), null);
-                                                        }
-                                                        gap = false;
                                                         curr = succ;
 //                                                      len = psize;