Переглянути джерело

update display modules to https://trac.osgeo.org/grass/changeset/63747 (no need to check return code of D_open_driver())

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63756 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 10 роки тому
батько
коміт
4889948207

+ 2 - 5
display/d.barscale/main.c

@@ -217,15 +217,12 @@ int main(int argc, char **argv)
 	do_background = FALSE;
 
 
-    if (D_open_driver() != 0)
-	G_fatal_error(_("No graphics device selected. "
-			"Use d.mon to select graphics device."));
-    D_setup(0);
+    D_open_driver();
 
+    D_setup(0);
 
     draw_scale(east, north, bar_style, text_position, fontsize);
 
-
     D_save_command(G_recreate_command());
     D_close_driver();
 

+ 1 - 3
display/d.erase/main.c

@@ -41,9 +41,7 @@ int main(int argc, char *argv[])
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
-    if (D_open_driver() != 0)
-	G_fatal_error(_("No graphics device selected. "
-			"Use d.mon to select graphics device."));
+    D_open_driver();
     
     D_setup_unity(0);
 

+ 1 - 3
display/d.fontlist/main.c

@@ -57,9 +57,7 @@ int main(int argc, char **argv)
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
-    if (D_open_driver() != 0)
-	G_fatal_error(_("No graphics device selected. "
-			"Use d.mon to select graphics device."));
+    D_open_driver();
     
     if (flagL->answer)
 	D_font_info(&list, &count);

+ 1 - 3
display/d.graph/main.c

@@ -94,9 +94,7 @@ int main(int argc, char **argv)
 	infile = stdin;
 
     /* open graphics window */
-    if (D_open_driver() != 0)
-	G_fatal_error(_("No graphics device selected. "
-			"Use d.mon to select graphics device."));
+    D_open_driver();
     
     /* Parse and select color */
     if (opt2->answer != NULL) {

+ 1 - 3
display/d.his/main.c

@@ -115,9 +115,7 @@ int main(int argc, char **argv)
 
     /* Do screen initializing stuff */
 
-    if (D_open_driver() != 0)
-	G_fatal_error(_("No graphics device selected. "
-			"Use d.mon to select graphics device."));
+    D_open_driver();
     
     /* Prepare the raster cell drawing functions */
     D_setup(0);

+ 1 - 3
display/d.info/main.c

@@ -66,9 +66,7 @@ int main(int argc, char *argv[])
 	G_fatal_error(_("No flag given"));
     }
 
-    if (D_open_driver() != 0)
-	G_fatal_error(_("No graphics device selected. "
-			"Use d.mon to select graphics device."));
+    D_open_driver();
     
     if (rflag->answer || dflag->answer || fflag->answer)
 	D_get_frame(&t, &b, &l, &r);

+ 1 - 3
display/d.legend/main.c

@@ -314,9 +314,7 @@ int main(int argc, char **argv)
 	flip = !flip;
     }
 
-    if (D_open_driver() != 0)
-	G_fatal_error(_("No graphics device selected. "
-			"Use d.mon to select graphics device."));
+    D_open_driver();
 
     white = D_translate_color(DEFAULT_FG_COLOR);
     black = D_translate_color(DEFAULT_BG_COLOR);

+ 1 - 3
display/d.mon/main.c

@@ -206,9 +206,7 @@ int main(int argc, char *argv[])
 			width, height, bgcolor_opt->answer,
 			!truecolor_flag->answer, x_flag->answer);
         if (output_opt->answer && !update_flag->answer) {
-            if (D_open_driver() != 0)
-                G_fatal_error(_("No graphics device selected. "
-                                "Use d.mon to select graphics device."));
+            D_open_driver();
             D_setup_unity(0);
             D_erase(bgcolor_opt->answer);
             D_close_driver();

+ 2 - 5
display/d.northarrow/main.c

@@ -126,15 +126,12 @@ int main(int argc, char **argv)
         line_width = 72;
 
 
-    if (D_open_driver() != 0)
-	G_fatal_error(_("No graphics device selected. "
-			"Use d.mon to select graphics device."));
-    D_setup(0);
+    D_open_driver();
 
+    D_setup(0);
 
     draw_n_arrow(east, north, fontsize, n_arrow->answer, line_width);
 
-
     D_save_command(G_recreate_command());
     D_close_driver();
 

+ 1 - 3
display/d.profile/main.c

@@ -256,9 +256,7 @@ int main(int argc, char **argv)
 	G_fatal_error(_("At least two points are required"));
 
     /* establish connection with graphics driver */
-    if (D_open_driver() != 0)
-	G_fatal_error(_("No graphics device selected. "
-			"Use d.mon to select graphics device."));
+    D_open_driver();
     
     D_setup2(1, 0, 1.05, -0.05, -0.15, 1.05);
 

+ 1 - 3
display/d.rast.arrow/main.c

@@ -221,9 +221,7 @@ int main(int argc, char **argv)
 
 
     /* Setup driver and check important information */
-    if (D_open_driver() != 0)
-      	G_fatal_error(_("No graphics device selected. "
-			"Use d.mon to select graphics device."));
+    D_open_driver();
     
     D_setup(0);
 

+ 1 - 3
display/d.rgb/main.c

@@ -78,9 +78,7 @@ int main(int argc, char **argv)
 	exit(EXIT_FAILURE);
 
     /* Do screen initializing stuff */
-    if (D_open_driver() != 0)
-	G_fatal_error(_("No graphics device selected. "
-			"Use d.mon to select graphics device."));
+    D_open_driver();
     
     overlay = !flag_n->answer;
 

+ 1 - 3
display/d.text/main.c

@@ -282,9 +282,7 @@ int main(int argc, char **argv)
 
     bold = flag.b->answer;
 
-    if (D_open_driver() != 0)
-	G_fatal_error(_("No graphics device selected. "
-			"Use d.mon to select graphics device."));
+    D_open_driver();
     
     if (opt.font->answer)
 	D_font(opt.font->answer);

+ 1 - 3
display/d.vect/main.c

@@ -299,9 +299,7 @@ int main(int argc, char **argv)
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
-    if (D_open_driver() != 0)
-	G_fatal_error(_("No graphics device selected. "
-			"Use d.mon to select graphics device."));
+    D_open_driver();
     
     G_get_set_window(&window);
     

+ 2 - 4
display/d.where/main.c

@@ -166,10 +166,8 @@ int main(int argc, char **argv)
     else
 	fp = stdin;
 
-    if (D_open_driver() != 0)
-	G_fatal_error(_("No graphics device selected. "
-			"Use d.mon to select graphics device."));
-    
+    D_open_driver();
+
     D_setup(0);
 
     where_am_i(coords->answers, fp, have_spheroid, decimal->answer, dcoord->answer);