[GRASS-SVN] r66934 - in grass/branches/releasebranch_7_0/gui/wxpython: . lmgr tplot xml

[svn_grass at osgeo.org]

Author: lucadelu
Date: 2015-11-26 02:44:04 -0800 (Thu, 26 Nov 2015)
New Revision: 66934

Added:
   grass/branches/releasebranch_7_0/gui/wxpython/tplot/
Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/Makefile
   grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py
   grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml
   grass/branches/releasebranch_7_0/gui/wxpython/xml/wxgui_items.xml
Log:
g.gui.tplot: backported by grass trunk

Modified: grass/branches/releasebranch_7_0/gui/wxpython/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/Makefile	2015-11-26 04:23:08 UTC (rev 66933)
+++ grass/branches/releasebranch_7_0/gui/wxpython/Makefile	2015-11-26 10:44:04 UTC (rev 66934)
@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../..
 
-SUBDIRS = docs animation mapswipe gmodeler rlisetup psmap dbmgr vdigit iclass gcp timeline
+SUBDIRS = docs animation mapswipe gmodeler rlisetup psmap dbmgr vdigit iclass gcp timeline tplot
 EXTRA_CLEAN_FILES = menustrings.py build_ext.pyc xml/menudata.xml xml/module_tree_menudata.xml */*.pyc
 
 include $(MODULE_TOPDIR)/include/Make/Dir.make
@@ -12,7 +12,7 @@
 	$(wildcard animation/* core/*.py dbmgr/* gcp/*.py gmodeler/* \
 	gui_core/*.py iclass/* lmgr/*.py location_wizard/*.py mapwin/*.py mapdisp/*.py \
 	mapswipe/* modules/*.py nviz/*.py psmap/* rlisetup/* timeline/* vdigit/* \
-	vnet/*.py web_services/*.py wxplot/*.py iscatt/*.py) \
+	vnet/*.py web_services/*.py wxplot/*.py iscatt/*.py tplot/*) \
 	gis_set.py gis_set_error.py wxgui.py README
 
 DSTFILES := $(patsubst %,$(DSTDIR)/%,$(SRCFILES)) \
@@ -20,7 +20,7 @@
 
 PYDSTDIRS := $(patsubst %,$(DSTDIR)/%,animation core dbmgr gcp gmodeler \
 	gui_core iclass lmgr location_wizard mapwin mapdisp modules nviz psmap \
-	mapswipe vdigit wxplot web_services rlisetup vnet timeline iscatt)
+	mapswipe vdigit wxplot web_services rlisetup vnet timeline iscatt tplot)
 
 
 DSTDIRS := $(patsubst %,$(DSTDIR)/%,icons scripts xml)

Modified: grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py	2015-11-26 04:23:08 UTC (rev 66933)
+++ grass/branches/releasebranch_7_0/gui/wxpython/lmgr/frame.py	2015-11-26 10:44:04 UTC (rev 66934)
@@ -1616,6 +1616,16 @@
         frame = TimelineFrame(None)
         frame.Show()
 
+    def OnTplotTool(self, event=None, cmd=None):
+        """Launch Temporal Plot Tool"""
+        try:
+            from tplot.frame import TplotFrame
+        except ImportError:
+            GError(parent=self, message=_("Unable to start Temporal Plot Tool."))
+            return
+        frame = TplotFrame(parent=self, giface=self._giface)
+        frame.Show()
+          
     def OnHistogram(self, event):
         """Init histogram display canvas and tools
         """


Property changes on: grass/branches/releasebranch_7_0/gui/wxpython/tplot
___________________________________________________________________
Added: svn:mergeinfo
   + /grass/branches/releasebranch_7_0/gui/wxpython/tplot:62348

Modified: grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml	2015-11-26 04:23:08 UTC (rev 66933)
+++ grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml	2015-11-26 10:44:04 UTC (rev 66934)
@@ -1952,6 +1952,7 @@
     <items>
       <wxgui-item name="AnimationTool"/>
       <wxgui-item name="TimelineTool"/>
+      <wxgui-item name="TplotTool"/>
     </items>
   </toolbox>
   <toolbox name="GuiTools">

Modified: grass/branches/releasebranch_7_0/gui/wxpython/xml/wxgui_items.xml
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/xml/wxgui_items.xml	2015-11-26 04:23:08 UTC (rev 66933)
+++ grass/branches/releasebranch_7_0/gui/wxpython/xml/wxgui_items.xml	2015-11-26 10:44:04 UTC (rev 66934)
@@ -35,6 +35,13 @@
     <description>Plot temporal extents.</description>
     <keywords>general,gui,temporal</keywords>
   </wxgui-item>
+  <wxgui-item name="TplotTool">
+    <label>Temporal plot tool</label>
+    <handler>OnTplotTool</handler>
+    <related-module>g.gui.tplot</related-module>
+    <description>Plot temporal values.</description>
+    <keywords>general,gui,temporal</keywords>
+  </wxgui-item>
   <wxgui-item name="CartographicComposer">
     <label>Cartographic Composer</label>
     <handler>OnPsMap</handler>