Bladeren bron

rename 'compass' symbol to 'basic_compass'

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@57746 15284696-431f-4ddb-bdfa-cd5b030d7da7
Hamish Bowman 11 jaren geleden
bovenliggende
commit
89f26237bf

+ 3 - 3
display/d.northarrow/draw_n_arrow.c

@@ -67,7 +67,7 @@ int draw_n_arrow(double east, double north, double fontsize,
     	    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 @@ int draw_n_arrow(double east, double north, double fontsize,
     case '9':
     	symbol_size = 17.;
     	break;
-    case 'c':
+    case 'b':
     	symbol_size = 80.;
     	break;
     case 'f':
@@ -142,7 +142,7 @@ int draw_n_arrow(double east, double north, double fontsize,
     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");

+ 1 - 1
display/d.northarrow/main.c

@@ -46,7 +46,7 @@ int main(int argc, char **argv)
     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");
 

gui/images/symbols/n_arrows/compass.png → gui/images/symbols/n_arrows/basic_compass.png


lib/symbol/symbol/n_arrows/compass → lib/symbol/symbol/n_arrows/basic_compass