[GRASS-SVN] r64432 - grass/trunk/scripts/d.frame

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-02-03 08:55:49 -0800 (Tue, 03 Feb 2015)
New Revision: 64432

Modified:
   grass/trunk/scripts/d.frame/d.frame.html
   grass/trunk/scripts/d.frame/d.frame.py
Log:
d.frame: update to the new monitor architecture


Modified: grass/trunk/scripts/d.frame/d.frame.html
===================================================================
--- grass/trunk/scripts/d.frame/d.frame.html	2015-02-03 16:54:14 UTC (rev 64431)
+++ grass/trunk/scripts/d.frame/d.frame.html	2015-02-03 16:55:49 UTC (rev 64432)
@@ -77,7 +77,7 @@
 </em>
 
 <p>
-  <a href="variables.html#rendering">GRASS environment variables for
+  <a href="variables.html#list-of-selected-grass-environment-variables-for-rendering">GRASS environment variables for
   rendering</a> (GRASS_RENDER_FRAME)
   
 <h2>AUTHOR</h2>

Modified: grass/trunk/scripts/d.frame/d.frame.py
===================================================================
--- grass/trunk/scripts/d.frame/d.frame.py	2015-02-03 16:54:14 UTC (rev 64431)
+++ grass/trunk/scripts/d.frame/d.frame.py	2015-02-03 16:55:49 UTC (rev 64432)
@@ -6,7 +6,7 @@
 # AUTHOR(S):    Martin Landa <landa.martin gmail.com>
 #               Based on d.frame from GRASS 6
 # PURPOSE:      Manages display frames on the user's graphics monitor
-# COPYRIGHT:    (C) 2014 by Martin Landa, and the GRASS Development Team
+# COPYRIGHT:    (C) 2014-2015 by Martin Landa, and the GRASS Development Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -68,13 +68,14 @@
 import os
 import sys
 
-from grass.script.core import parser, read_command, fatal, debug, run_command, gisenv, warning
+from grass.script.core import parser, read_command, fatal, debug, run_command, gisenv, warning, parse_command
 
 # check if monitor is running
 def check_monitor():
     return read_command('d.mon', flags='p', quiet=True).strip()
 
 # read monitor file and return list of lines
+# TODO: replace by d.info (see #2577)
 def read_monitor_file(monitor, ftype='env'):
     mfile = check_monitor_file(monitor, ftype)
     try:
@@ -92,8 +93,7 @@
 
 # check if monitor file exists
 def check_monitor_file(monitor, ftype='env'):
-    var = 'MONITOR_%s_%sFILE' % (monitor.upper(), ftype.upper())
-    mfile = gisenv().get(var, None)
+    mfile = parse_command('d.info', flags='s').get(ftype, None)
     if mfile is None or not os.path.isfile(mfile):
         fatal(_("Unable to get monitor info (no %s found)") % var)