[GRASS-SVN] r57746 - in grass/trunk: display/d.northarrow gui/images/symbols/n_arrows lib/symbol/symbol/n_arrows
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Sep 18 23:16:19 PDT 2013
Author: hamish
Date: 2013-09-18 23:16:19 -0700 (Wed, 18 Sep 2013)
New Revision: 57746
Added:
grass/trunk/gui/images/symbols/n_arrows/basic_compass.png
grass/trunk/lib/symbol/symbol/n_arrows/basic_compass
Removed:
grass/trunk/gui/images/symbols/n_arrows/compass.png
grass/trunk/lib/symbol/symbol/n_arrows/compass
Modified:
grass/trunk/display/d.northarrow/draw_n_arrow.c
grass/trunk/display/d.northarrow/main.c
Log:
rename 'compass' symbol to 'basic_compass'
Modified: grass/trunk/display/d.northarrow/draw_n_arrow.c
===================================================================
--- grass/trunk/display/d.northarrow/draw_n_arrow.c 2013-09-19 06:08:54 UTC (rev 57745)
+++ grass/trunk/display/d.northarrow/draw_n_arrow.c 2013-09-19 06:16:19 UTC (rev 57746)
@@ -67,7 +67,7 @@
D_pos_abs(x_pos - (tr + tl) / 2, y_pos - 55);
D_text("N");
break;
- case 'c':
+ case 'b':
D_pos_abs(x_pos - (tr + tl) / 2, y_pos - 48.5);
D_text("N");
break;
@@ -129,7 +129,7 @@
case '9':
symbol_size = 17.;
break;
- case 'c':
+ case 'b':
symbol_size = 80.;
break;
case 'f':
@@ -142,7 +142,7 @@
x0 = D_d_to_u_col(x_pos);
y0 = D_d_to_u_row(y_pos);
- if (n_arrow_num[0] == 'c')
+ if (n_arrow_num[0] == 'b')
strcpy(icon, "n_arrows/compass");
else if (n_arrow_num[0] == 'f')
strcpy(icon, "n_arrows/fancy_compass");
Modified: grass/trunk/display/d.northarrow/main.c
===================================================================
--- grass/trunk/display/d.northarrow/main.c 2013-09-19 06:08:54 UTC (rev 57745)
+++ grass/trunk/display/d.northarrow/main.c 2013-09-19 06:16:19 UTC (rev 57746)
@@ -46,7 +46,7 @@
n_arrow = G_define_option();
n_arrow->key = "style";
n_arrow->description = _("North arrow style");
- n_arrow->options = "1a,1b,2,3,4,5,6,7a,7b,8a,8b,9,fancy_compass,compass";
+ n_arrow->options = "1a,1b,2,3,4,5,6,7a,7b,8a,8b,9,fancy_compass,basic_compass";
n_arrow->answer = "1a";
n_arrow->guisection = _("Style");
Copied: grass/trunk/gui/images/symbols/n_arrows/basic_compass.png (from rev 57744, grass/trunk/gui/images/symbols/n_arrows/compass.png)
===================================================================
(Binary files differ)
Deleted: grass/trunk/gui/images/symbols/n_arrows/compass.png
===================================================================
(Binary files differ)
Copied: grass/trunk/lib/symbol/symbol/n_arrows/basic_compass (from rev 57744, grass/trunk/lib/symbol/symbol/n_arrows/compass)
===================================================================
--- grass/trunk/lib/symbol/symbol/n_arrows/basic_compass (rev 0)
+++ grass/trunk/lib/symbol/symbol/n_arrows/basic_compass 2013-09-19 06:16:19 UTC (rev 57746)
@@ -0,0 +1,88 @@
+VERSION 1.0
+BOX -2 -2 2 2
+POLYGON
+ COLOR NONE
+ RING
+ LINE
+ 0 0
+ 0 2
+ 0.5 0.5
+ 0 0
+ 2 0
+ 0.5 -0.5
+ 0 0
+ 0 -2
+ -0.5 -0.5
+ 0 0
+ -2 0
+ -0.5 0.5
+ 0 0
+ END
+END
+POLYGON
+ COLOR NONE
+ FCOLOR 255 255 255
+ RING
+ LINE
+ 0 0
+ 0.5 0.5
+ 2 0
+ 0 0
+ 0.5 -0.5
+ 0 -2
+ 0 0
+ -0.5 -0.5
+ -2 0
+ 0 0
+ -0.5 0.5
+ 0 2
+ 0 0
+ END
+END
+POLYGON
+ FCOLOR NONE
+ RING
+ LINE
+ 0 2
+ 0.5 0.5
+ 2 0
+ 0.5 -0.5
+ 0 -2
+ -0.5 -0.5
+ -2 0
+ -0.5 0.5
+ 0 2
+ END
+END
+POLYGON
+ FCOLOR NONE
+ RING
+ LINE
+ 0.5 0.5
+ -0.5 -0.5
+ END
+END
+POLYGON
+ FCOLOR NONE
+ RING
+ LINE
+ 0.5 -0.5
+ -0.5 0.5
+ END
+END
+POLYGON
+ FCOLOR NONE
+ RING
+ LINE
+ 0 2
+ 0 -2
+ END
+END
+POLYGON
+ FCOLOR NONE
+ RING
+ LINE
+ -2 0
+ 2 0
+ END
+END
Deleted: grass/trunk/lib/symbol/symbol/n_arrows/compass
===================================================================
--- grass/trunk/lib/symbol/symbol/n_arrows/compass 2013-09-19 06:08:54 UTC (rev 57745)
+++ grass/trunk/lib/symbol/symbol/n_arrows/compass 2013-09-19 06:16:19 UTC (rev 57746)
@@ -1,88 +0,0 @@
-VERSION 1.0
-BOX -2 -2 2 2
-POLYGON
- COLOR NONE
- RING
- LINE
- 0 0
- 0 2
- 0.5 0.5
- 0 0
- 2 0
- 0.5 -0.5
- 0 0
- 0 -2
- -0.5 -0.5
- 0 0
- -2 0
- -0.5 0.5
- 0 0
- END
-END
-POLYGON
- COLOR NONE
- FCOLOR 255 255 255
- RING
- LINE
- 0 0
- 0.5 0.5
- 2 0
- 0 0
- 0.5 -0.5
- 0 -2
- 0 0
- -0.5 -0.5
- -2 0
- 0 0
- -0.5 0.5
- 0 2
- 0 0
- END
-END
-POLYGON
- FCOLOR NONE
- RING
- LINE
- 0 2
- 0.5 0.5
- 2 0
- 0.5 -0.5
- 0 -2
- -0.5 -0.5
- -2 0
- -0.5 0.5
- 0 2
- END
-END
-POLYGON
- FCOLOR NONE
- RING
- LINE
- 0.5 0.5
- -0.5 -0.5
- END
-END
-POLYGON
- FCOLOR NONE
- RING
- LINE
- 0.5 -0.5
- -0.5 0.5
- END
-END
-POLYGON
- FCOLOR NONE
- RING
- LINE
- 0 2
- 0 -2
- END
-END
-POLYGON
- FCOLOR NONE
- RING
- LINE
- -2 0
- 2 0
- END
-END
More information about the grass-commit
mailing list