[GRASS-SVN] r63759 - in grass/branches/releasebranch_7_0: . display/d.colortable display/d.font display/d.geodesic display/d.grid display/d.histogram display/d.labels display/d.linegraph display/d.mon display/d.path display/d.rast display/d.rast.num display/d.rhumbline display/d.thematic.area display/d.vect.chart
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Dec 25 07:10:42 PST 2014
Author: martinl
Date: 2014-12-25 07:10:42 -0800 (Thu, 25 Dec 2014)
New Revision: 63759
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/display/d.colortable/main.c
grass/branches/releasebranch_7_0/display/d.font/main.c
grass/branches/releasebranch_7_0/display/d.geodesic/main.c
grass/branches/releasebranch_7_0/display/d.grid/main.c
grass/branches/releasebranch_7_0/display/d.histogram/main.c
grass/branches/releasebranch_7_0/display/d.labels/main.c
grass/branches/releasebranch_7_0/display/d.linegraph/main.c
grass/branches/releasebranch_7_0/display/d.mon/start.c
grass/branches/releasebranch_7_0/display/d.path/main.c
grass/branches/releasebranch_7_0/display/d.rast.num/main.c
grass/branches/releasebranch_7_0/display/d.rast/main.c
grass/branches/releasebranch_7_0/display/d.rhumbline/main.c
grass/branches/releasebranch_7_0/display/d.thematic.area/main.c
grass/branches/releasebranch_7_0/display/d.vect.chart/main.c
Log:
update display modules to r63747 (no need to check return code of D_open_driver()) - part 2
(merge r63758 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,63756
+ /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,63758
Modified: grass/branches/releasebranch_7_0/display/d.colortable/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.colortable/main.c 2014-12-25 15:09:08 UTC (rev 63758)
+++ grass/branches/releasebranch_7_0/display/d.colortable/main.c 2014-12-25 15:10:42 UTC (rev 63759)
@@ -134,9 +134,8 @@
G_fatal_error(_("Color file for <%s> not available"), map_name);
if (Rast_read_fp_range(map_name, "", &fp_range) == -1)
G_fatal_error(_("Range file for <%s> not available"), map_name);
- 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_get_src(&t, &b, &l, &r);
Modified: grass/branches/releasebranch_7_0/display/d.font/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.font/main.c 2014-12-25 15:09:08 UTC (rev 63758)
+++ grass/branches/releasebranch_7_0/display/d.font/main.c 2014-12-25 15:10:42 UTC (rev 63759)
@@ -81,9 +81,7 @@
exit(EXIT_FAILURE);
/* load the font */
- if (D_open_driver() != 0)
- G_fatal_error(_("No graphics device selected. "
- "Use d.mon to select graphics device."));
+ D_open_driver();
if (flag1->answer) { /* List font names */
print_font_list(stdout, 0);
Modified: grass/branches/releasebranch_7_0/display/d.geodesic/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.geodesic/main.c 2014-12-25 15:09:08 UTC (rev 63758)
+++ grass/branches/releasebranch_7_0/display/d.geodesic/main.c 2014-12-25 15:10:42 UTC (rev 63759)
@@ -84,9 +84,7 @@
G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[3]);
- if (D_open_driver() != 0)
- G_fatal_error(_("No graphics device selected. "
- "Use d.mon to select graphics device."));
+ D_open_driver();
line_color = D_translate_color(parm.lcolor->answer);
if (!line_color)
Modified: grass/branches/releasebranch_7_0/display/d.grid/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.grid/main.c 2014-12-25 15:09:08 UTC (rev 63758)
+++ grass/branches/releasebranch_7_0/display/d.grid/main.c 2014-12-25 15:10:42 UTC (rev 63759)
@@ -249,9 +249,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();
/* Parse and select grid color */
colorg = D_parse_color(opt1->answer, FALSE);
Modified: grass/branches/releasebranch_7_0/display/d.histogram/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.histogram/main.c 2014-12-25 15:09:08 UTC (rev 63758)
+++ grass/branches/releasebranch_7_0/display/d.histogram/main.c 2014-12-25 15:10:42 UTC (rev 63759)
@@ -180,9 +180,7 @@
/* set up the graphics driver and initialize its color-table */
- 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); /* 0 = don't clear frame */
D_get_src(&t, &b, &l, &r);
Modified: grass/branches/releasebranch_7_0/display/d.labels/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.labels/main.c 2014-12-25 15:09:08 UTC (rev 63758)
+++ grass/branches/releasebranch_7_0/display/d.labels/main.c 2014-12-25 15:10:42 UTC (rev 63759)
@@ -113,9 +113,7 @@
if (infile == NULL)
G_fatal_error(_("Unable to open label file <%s>"), label_name);
- 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.linegraph/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.linegraph/main.c 2014-12-25 15:09:08 UTC (rev 63758)
+++ grass/branches/releasebranch_7_0/display/d.linegraph/main.c 2014-12-25 15:10:42 UTC (rev 63759)
@@ -264,9 +264,7 @@
}
/* get coordinates of current screen window, in pixels */
- 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_get_src(&t, &b, &l, &r);
Modified: grass/branches/releasebranch_7_0/display/d.mon/start.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.mon/start.c 2014-12-25 15:09:08 UTC (rev 63758)
+++ grass/branches/releasebranch_7_0/display/d.mon/start.c 2014-12-25 15:10:42 UTC (rev 63759)
@@ -22,9 +22,8 @@
G_add_error_handler(error_handler, (char *)name);
if (!output) {
- if (D_open_driver() != 0)
- G_fatal_error(_("No graphics device selected. "
- "Use d.mon to select graphics device."));
+ D_open_driver();
+
output_name = D_get_file();
if (!output_name)
return;
Modified: grass/branches/releasebranch_7_0/display/d.path/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.path/main.c 2014-12-25 15:09:08 UTC (rev 63758)
+++ grass/branches/releasebranch_7_0/display/d.path/main.c 2014-12-25 15:10:42 UTC (rev 63759)
@@ -150,9 +150,7 @@
G_fatal_error(_("%s - illegal y value"), coor_opt->answers[3]);
- if (D_open_driver() != 0)
- G_fatal_error(_("No graphics device selected. "
- "Use d.mon to select graphics device."));
+ D_open_driver();
color = G_standard_color_rgb(BLACK);
if (G_str_to_color(color_opt->answer, &r, &g, &b)) {
Modified: grass/branches/releasebranch_7_0/display/d.rast/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.rast/main.c 2014-12-25 15:09:08 UTC (rev 63758)
+++ grass/branches/releasebranch_7_0/display/d.rast/main.c 2014-12-25 15:10:42 UTC (rev 63759)
@@ -93,9 +93,7 @@
overlay = !flag_n->answer;
invert = flag_i->answer;
- if (D_open_driver() != 0)
- G_fatal_error(_("No graphics device selected. "
- "Use d.mon to select graphics device."));
+ D_open_driver();
fp = Rast_map_is_fp(name, "");
if (vallist->answer) {
Modified: grass/branches/releasebranch_7_0/display/d.rast.num/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.rast.num/main.c 2014-12-25 15:09:08 UTC (rev 63758)
+++ grass/branches/releasebranch_7_0/display/d.rast.num/main.c 2014-12-25 15:10:42 UTC (rev 63759)
@@ -194,9 +194,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_setup2(0, 0, t, b, l, r);
Modified: grass/branches/releasebranch_7_0/display/d.rhumbline/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.rhumbline/main.c 2014-12-25 15:09:08 UTC (rev 63758)
+++ grass/branches/releasebranch_7_0/display/d.rhumbline/main.c 2014-12-25 15:10:42 UTC (rev 63759)
@@ -84,9 +84,7 @@
G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[3]);
- if (D_open_driver() != 0)
- G_fatal_error(_("No graphics device selected. "
- "Use d.mon to select graphics device."));
+ D_open_driver();
line_color = D_translate_color(parm.lcolor->answer);
if (!line_color)
Modified: grass/branches/releasebranch_7_0/display/d.thematic.area/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.thematic.area/main.c 2014-12-25 15:09:08 UTC (rev 63758)
+++ grass/branches/releasebranch_7_0/display/d.thematic.area/main.c 2014-12-25 15:10:42 UTC (rev 63759)
@@ -362,9 +362,7 @@
if (!nodraw_flag->answer) {
/* Now's let's prepare the actual plotting */
- 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.vect.chart/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.vect.chart/main.c 2014-12-25 15:09:08 UTC (rev 63758)
+++ grass/branches/releasebranch_7_0/display/d.vect.chart/main.c 2014-12-25 15:10:42 UTC (rev 63759)
@@ -243,9 +243,7 @@
if (ctype_opt->answer[0] == 'b')
ctype = CTYPE_BAR;
- if (D_open_driver() != 0)
- G_fatal_error(_("No graphics device selected. "
- "Use d.mon to select graphics device."));
+ D_open_driver();
/* should we plot the maximum reference on bar plots? */
if (max_reference_opt->answer != NULL) {
More information about the grass-commit
mailing list