[GRASS-SVN] r63757 - in grass/branches/releasebranch_7_0: . display/d.barscale display/d.erase display/d.fontlist display/d.graph display/d.his display/d.info display/d.legend display/d.mon display/d.northarrow display/d.profile display/d.rast.arrow display/d.rgb display/d.text display/d.vect display/d.where
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Dec 25 07:04:14 PST 2014
Author: martinl
Date: 2014-12-25 07:04:14 -0800 (Thu, 25 Dec 2014)
New Revision: 63757
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/display/d.barscale/main.c
grass/branches/releasebranch_7_0/display/d.erase/main.c
grass/branches/releasebranch_7_0/display/d.fontlist/main.c
grass/branches/releasebranch_7_0/display/d.graph/main.c
grass/branches/releasebranch_7_0/display/d.his/main.c
grass/branches/releasebranch_7_0/display/d.info/main.c
grass/branches/releasebranch_7_0/display/d.legend/main.c
grass/branches/releasebranch_7_0/display/d.mon/main.c
grass/branches/releasebranch_7_0/display/d.northarrow/main.c
grass/branches/releasebranch_7_0/display/d.profile/main.c
grass/branches/releasebranch_7_0/display/d.rast.arrow/main.c
grass/branches/releasebranch_7_0/display/d.rgb/main.c
grass/branches/releasebranch_7_0/display/d.text/main.c
grass/branches/releasebranch_7_0/display/d.vect/main.c
grass/branches/releasebranch_7_0/display/d.where/main.c
Log:
update display modules to r63747 (no need to check return code of D_open_driver())
(merge r63756 from trunk)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63362,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63740-63742,63747-63749,63751-63752
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63362,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63740-63742,63747-63749,63751-63752,63756
Modified: grass/branches/releasebranch_7_0/display/d.barscale/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.barscale/main.c 2014-12-25 15:01:16 UTC (rev 63756)
+++ grass/branches/releasebranch_7_0/display/d.barscale/main.c 2014-12-25 15:04:14 UTC (rev 63757)
@@ -217,15 +217,12 @@
do_background = FALSE;
- 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);
-
draw_scale(east, north, bar_style, text_position, fontsize);
-
D_save_command(G_recreate_command());
D_close_driver();
Modified: grass/branches/releasebranch_7_0/display/d.erase/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.erase/main.c 2014-12-25 15:01:16 UTC (rev 63756)
+++ grass/branches/releasebranch_7_0/display/d.erase/main.c 2014-12-25 15:04:14 UTC (rev 63757)
@@ -41,9 +41,7 @@
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);
Modified: grass/branches/releasebranch_7_0/display/d.fontlist/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.fontlist/main.c 2014-12-25 15:01:16 UTC (rev 63756)
+++ grass/branches/releasebranch_7_0/display/d.fontlist/main.c 2014-12-25 15:04:14 UTC (rev 63757)
@@ -57,9 +57,7 @@
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);
Modified: grass/branches/releasebranch_7_0/display/d.graph/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.graph/main.c 2014-12-25 15:01:16 UTC (rev 63756)
+++ grass/branches/releasebranch_7_0/display/d.graph/main.c 2014-12-25 15:04:14 UTC (rev 63757)
@@ -94,9 +94,7 @@
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) {
Modified: grass/branches/releasebranch_7_0/display/d.his/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.his/main.c 2014-12-25 15:01:16 UTC (rev 63756)
+++ grass/branches/releasebranch_7_0/display/d.his/main.c 2014-12-25 15:04:14 UTC (rev 63757)
@@ -115,9 +115,7 @@
/* 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);
Modified: grass/branches/releasebranch_7_0/display/d.info/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.info/main.c 2014-12-25 15:01:16 UTC (rev 63756)
+++ grass/branches/releasebranch_7_0/display/d.info/main.c 2014-12-25 15:04:14 UTC (rev 63757)
@@ -66,9 +66,7 @@
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_window(&t, &b, &l, &r);
Modified: grass/branches/releasebranch_7_0/display/d.legend/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.legend/main.c 2014-12-25 15:01:16 UTC (rev 63756)
+++ grass/branches/releasebranch_7_0/display/d.legend/main.c 2014-12-25 15:04:14 UTC (rev 63757)
@@ -314,9 +314,7 @@
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);
Modified: grass/branches/releasebranch_7_0/display/d.mon/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.mon/main.c 2014-12-25 15:01:16 UTC (rev 63756)
+++ grass/branches/releasebranch_7_0/display/d.mon/main.c 2014-12-25 15:04:14 UTC (rev 63757)
@@ -196,9 +196,7 @@
width, height, bgcolor_opt->answer,
!truecolor_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();
Modified: grass/branches/releasebranch_7_0/display/d.northarrow/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.northarrow/main.c 2014-12-25 15:01:16 UTC (rev 63756)
+++ grass/branches/releasebranch_7_0/display/d.northarrow/main.c 2014-12-25 15:04:14 UTC (rev 63757)
@@ -126,15 +126,12 @@
line_width = 72;
- 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);
-
draw_n_arrow(east, north, fontsize, n_arrow->answer, line_width);
-
D_save_command(G_recreate_command());
D_close_driver();
Modified: grass/branches/releasebranch_7_0/display/d.profile/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.profile/main.c 2014-12-25 15:01:16 UTC (rev 63756)
+++ grass/branches/releasebranch_7_0/display/d.profile/main.c 2014-12-25 15:04:14 UTC (rev 63757)
@@ -256,9 +256,7 @@
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);
Modified: grass/branches/releasebranch_7_0/display/d.rast.arrow/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.rast.arrow/main.c 2014-12-25 15:01:16 UTC (rev 63756)
+++ grass/branches/releasebranch_7_0/display/d.rast.arrow/main.c 2014-12-25 15:04:14 UTC (rev 63757)
@@ -221,9 +221,7 @@
/* 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);
Modified: grass/branches/releasebranch_7_0/display/d.rgb/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.rgb/main.c 2014-12-25 15:01:16 UTC (rev 63756)
+++ grass/branches/releasebranch_7_0/display/d.rgb/main.c 2014-12-25 15:04:14 UTC (rev 63757)
@@ -78,9 +78,7 @@
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;
Modified: grass/branches/releasebranch_7_0/display/d.text/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.text/main.c 2014-12-25 15:01:16 UTC (rev 63756)
+++ grass/branches/releasebranch_7_0/display/d.text/main.c 2014-12-25 15:04:14 UTC (rev 63757)
@@ -282,9 +282,7 @@
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);
Modified: grass/branches/releasebranch_7_0/display/d.vect/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.vect/main.c 2014-12-25 15:01:16 UTC (rev 63756)
+++ grass/branches/releasebranch_7_0/display/d.vect/main.c 2014-12-25 15:04:14 UTC (rev 63757)
@@ -299,9 +299,7 @@
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);
Modified: grass/branches/releasebranch_7_0/display/d.where/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.where/main.c 2014-12-25 15:01:16 UTC (rev 63756)
+++ grass/branches/releasebranch_7_0/display/d.where/main.c 2014-12-25 15:04:14 UTC (rev 63757)
@@ -166,10 +166,8 @@
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);
More information about the grass-commit
mailing list