Browse Source

support d.northarrow in parser HTML, use filenames matching options, center drawing in image middle

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@68946 15284696-431f-4ddb-bdfa-cd5b030d7da7
Vaclav Petras 8 years ago
parent
commit
6545ca6b8c
34 changed files with 17 additions and 11 deletions
  1. BIN
      display/d.northarrow/thumbnails/1a.png
  2. BIN
      display/d.northarrow/thumbnails/1b.png
  3. BIN
      display/d.northarrow/thumbnails/2.png
  4. BIN
      display/d.northarrow/thumbnails/3.png
  5. BIN
      display/d.northarrow/thumbnails/4.png
  6. BIN
      display/d.northarrow/thumbnails/5.png
  7. BIN
      display/d.northarrow/thumbnails/6.png
  8. BIN
      display/d.northarrow/thumbnails/7a.png
  9. BIN
      display/d.northarrow/thumbnails/7b.png
  10. BIN
      display/d.northarrow/thumbnails/8a.png
  11. BIN
      display/d.northarrow/thumbnails/8b.png
  12. BIN
      display/d.northarrow/thumbnails/9.png
  13. 11 9
      display/d.northarrow/thumbnails/README
  14. BIN
      display/d.northarrow/thumbnails/arrow1.png
  15. BIN
      display/d.northarrow/thumbnails/arrow2.png
  16. BIN
      display/d.northarrow/thumbnails/arrow3.png
  17. BIN
      display/d.northarrow/thumbnails/basic_compass.png
  18. BIN
      display/d.northarrow/thumbnails/fancy_compass.png
  19. BIN
      display/d.northarrow/thumbnails/n_arrow_1a.png
  20. BIN
      display/d.northarrow/thumbnails/n_arrow_1b.png
  21. BIN
      display/d.northarrow/thumbnails/n_arrow_2.png
  22. BIN
      display/d.northarrow/thumbnails/n_arrow_3.png
  23. BIN
      display/d.northarrow/thumbnails/n_arrow_4.png
  24. BIN
      display/d.northarrow/thumbnails/n_arrow_5.png
  25. BIN
      display/d.northarrow/thumbnails/n_arrow_6.png
  26. BIN
      display/d.northarrow/thumbnails/n_arrow_7a.png
  27. BIN
      display/d.northarrow/thumbnails/n_arrow_7b.png
  28. BIN
      display/d.northarrow/thumbnails/n_arrow_8a.png
  29. BIN
      display/d.northarrow/thumbnails/n_arrow_8b.png
  30. BIN
      display/d.northarrow/thumbnails/n_arrow_9.png
  31. BIN
      display/d.northarrow/thumbnails/n_arrow_basic_compass.png
  32. BIN
      display/d.northarrow/thumbnails/n_arrow_fancy_compass.png
  33. BIN
      display/d.northarrow/thumbnails/star.png
  34. 6 2
      lib/gis/parser_html.c

BIN
display/d.northarrow/thumbnails/1a.png


BIN
display/d.northarrow/thumbnails/1b.png


BIN
display/d.northarrow/thumbnails/2.png


BIN
display/d.northarrow/thumbnails/3.png


BIN
display/d.northarrow/thumbnails/4.png


BIN
display/d.northarrow/thumbnails/5.png


BIN
display/d.northarrow/thumbnails/6.png


BIN
display/d.northarrow/thumbnails/7a.png


BIN
display/d.northarrow/thumbnails/7b.png


BIN
display/d.northarrow/thumbnails/8a.png


BIN
display/d.northarrow/thumbnails/8b.png


BIN
display/d.northarrow/thumbnails/9.png


+ 11 - 9
display/d.northarrow/thumbnails/README

@@ -9,15 +9,17 @@ export GRASS_RENDER_WIDTH=300
 export GRASS_RENDER_HEIGHT=300
 g.region raster=elevation
 
-for STYLE in 1a 1b 2 3 4 5 6 7a 7b 8a 8b 9 fancy_compass basic_compass
+#PREFIX=n_arrow_
+PREFIX=""
+
+for STYLE in 1a 1b 2 3 4 5 6 7a 7b 8a 8b 9 fancy_compass basic_compass arrow1 arrow2 arrow3 star
 do
 	echo ${STYLE}
-	export GRASS_RENDER_FILE=n_arrow_${STYLE}.png
-	d.northarrow style=${STYLE} at=20,20
-	mogrify -trim n_arrow_${STYLE}.png
-	identify -format "%[fx:w]x%[fx:h]" n_arrow_${STYLE}.png
-#	convert n_arrow_${STYLE}.png -gravity center -background white -extent 170x24 n_arrow_${STYLE}.png
-	convert n_arrow_${STYLE}.png -gravity center -background white n_arrow_${STYLE}.png
-	optipng -o5 n_arrow_${STYLE}.png n_arrow_${STYLE}.png --quiet
+	export GRASS_RENDER_FILE=${PREFIX}${STYLE}.png
+	d.northarrow -t style=${STYLE} at=20,20
+	mogrify -trim ${PREFIX}${STYLE}.png
+	identify -format "%[fx:w]x%[fx:h]" ${PREFIX}${STYLE}.png
+	# first resize it to max size and then place it into a bigger rectangle
+	mogrify -resize 24x24 -background white -gravity Center -extent 24x24 ${PREFIX}${STYLE}.png
+	optipng -o5 ${PREFIX}${STYLE}.png ${PREFIX}${STYLE}.png --quiet
 done
-

BIN
display/d.northarrow/thumbnails/arrow1.png


BIN
display/d.northarrow/thumbnails/arrow2.png


BIN
display/d.northarrow/thumbnails/arrow3.png


BIN
display/d.northarrow/thumbnails/basic_compass.png


BIN
display/d.northarrow/thumbnails/fancy_compass.png


BIN
display/d.northarrow/thumbnails/n_arrow_1a.png


BIN
display/d.northarrow/thumbnails/n_arrow_1b.png


BIN
display/d.northarrow/thumbnails/n_arrow_2.png


BIN
display/d.northarrow/thumbnails/n_arrow_3.png


BIN
display/d.northarrow/thumbnails/n_arrow_4.png


BIN
display/d.northarrow/thumbnails/n_arrow_5.png


BIN
display/d.northarrow/thumbnails/n_arrow_6.png


BIN
display/d.northarrow/thumbnails/n_arrow_7a.png


BIN
display/d.northarrow/thumbnails/n_arrow_7b.png


BIN
display/d.northarrow/thumbnails/n_arrow_8a.png


BIN
display/d.northarrow/thumbnails/n_arrow_8b.png


BIN
display/d.northarrow/thumbnails/n_arrow_9.png


BIN
display/d.northarrow/thumbnails/n_arrow_basic_compass.png


BIN
display/d.northarrow/thumbnails/n_arrow_fancy_compass.png


BIN
display/d.northarrow/thumbnails/star.png


+ 6 - 2
lib/gis/parser_html.c

@@ -256,9 +256,13 @@ void G__usage_html(void)
                             else if (strcmp(opt->gisprompt,
                                             "old,barscale,barscale") == 0)
                                 thumbnails = "barscales";
-                            
+                            else if (strcmp(opt->gisprompt,
+                                            "old,northarrow,northarrow") == 0)
+                                thumbnails = "northarrows";
+
                             if (thumbnails)
-                                fprintf(stdout, "<img width=\"80\" height=\"12\" "
+                                fprintf(stdout, "<img height=\"12\" "
+                                        "style=\"max-width: 80;\""
                                         "src=\"%s/%s.png\" alt=\"%s\"> ",
                                         thumbnails, opt->opts[i], opt->opts[i]);
                         }