[GRASS-SVN] r63926 - in grass/branches/releasebranch_7_0: . display/d.mon
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Jan 2 00:22:48 PST 2015
Author: martinl
Date: 2015-01-02 00:22:48 -0800 (Fri, 02 Jan 2015)
New Revision: 63926
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/display/d.mon/main.c
grass/branches/releasebranch_7_0/display/d.mon/proto.h
grass/branches/releasebranch_7_0/display/d.mon/start.c
Log:
d.mon: erase output file when --overwrite is given
(merge r63760 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-63363,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,63744-63749,63751-63752,63756,63758,63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862,63865,63869,63871,63882,63884,63889-63890,63892-63895,63897-63898,63900,63902-63903,63905,63907,63909-63911,63913-63914
+ /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-63363,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,63744-63749,63751-63752,63756,63758,63760-63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862,63865,63869,63871,63882,63884,63889-63890,63892-63895,63897-63898,63900,63902-63903,63905,63907,63909-63911,63913-63914
Modified: grass/branches/releasebranch_7_0/display/d.mon/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.mon/main.c 2015-01-01 22:53:48 UTC (rev 63925)
+++ grass/branches/releasebranch_7_0/display/d.mon/main.c 2015-01-02 08:22:48 UTC (rev 63926)
@@ -130,7 +130,7 @@
update_flag = G_define_flag();
update_flag->key = 'u';
update_flag->label = _("Open output file in update mode");
- update_flag->description = _("Requires --overwrite flag. If not given the output file is overwritten.");
+ update_flag->description = _("Requires --overwrite flag");
update_flag->guisection = _("Settings");
if (G_parser(argc, argv))
@@ -197,7 +197,7 @@
ret = start_mon(start_opt->answer, output_opt->answer, !select_flag->answer,
width, height, bgcolor_opt->answer,
- !truecolor_flag->answer);
+ !truecolor_flag->answer, update_flag->answer);
if (output_opt->answer && !update_flag->answer) {
D_open_driver();
D_setup_unity(0);
Modified: grass/branches/releasebranch_7_0/display/d.mon/proto.h
===================================================================
--- grass/branches/releasebranch_7_0/display/d.mon/proto.h 2015-01-01 22:53:48 UTC (rev 63925)
+++ grass/branches/releasebranch_7_0/display/d.mon/proto.h 2015-01-02 08:22:48 UTC (rev 63926)
@@ -1,6 +1,6 @@
/* start */
int start_mon(const char *, const char *, int, int, int,
- const char *, int);
+ const char *, int, int);
/* select.c */
int select_mon(const char *);
Modified: grass/branches/releasebranch_7_0/display/d.mon/start.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.mon/start.c 2015-01-01 22:53:48 UTC (rev 63925)
+++ grass/branches/releasebranch_7_0/display/d.mon/start.c 2015-01-02 08:22:48 UTC (rev 63926)
@@ -7,13 +7,13 @@
#include "proto.h"
-static void start(const char *, const char *);
+static void start(const char *, const char *, int);
static void start_wx(const char *, const char *, const char *,
const char *, int, int);
static void error_handler(void *);
/* start file-based monitor */
-void start(const char *name, const char *output)
+void start(const char *name, const char *output, int update)
{
char *env_name, output_path[GPATH_MAX];
const char *output_name;
@@ -27,9 +27,11 @@
output_name = D_get_file();
if (!output_name)
return;
- if (access(output_name, F_OK) == 0) {
+ if (!update && access(output_name, F_OK) == 0) {
if (G_get_overwrite()) {
G_warning(_("File '%s' already exists and will be overwritten"), output_name);
+ D_setup_unity(0);
+ D_erase("white");
}
else {
D_close_driver();
@@ -100,7 +102,7 @@
int start_mon(const char *name, const char *output, int select,
int width, int height, const char *bgcolor,
- int truecolor)
+ int truecolor, int update)
{
char *u_name;
char *env_name, *env_value, *cmd_value;
@@ -180,7 +182,7 @@
start_wx(name, tempfile, env_value, cmd_value,
width, height);
else
- start(name, output);
+ start(name, output, update);
return 0;
}
More information about the grass-commit
mailing list