wxGUI/datacatalog : Add STDS in datacatalog

gui/wxpython/core/gconsole.py

@@ -42,6 +42,7 @@
 from grass.pydispatch.signal import Signal
 
 from grass.grassdb import history
+from grass.grassdb.data import stds_exists
 from grass.grassdb.history import Status
 
 from core import globalvar
@@ -740,11 +741,31 @@ def OnCmdRun(self, event):
         )
         event.Skip()
 
+    @staticmethod
+    def _getStdsTypeCandidates(task):
+        """Space time dataset types a generic stds parameter of a tool can be
+
+        The type option of the tool names either the dataset type
+        (G_OPT_STDS_TYPE) or the type of the maps it holds (G_OPT_MAP_TYPE),
+        which leaves a single type to look up instead of all three.
+        """
+        stds_types = ("strds", "stvds", "str3ds")
+        map_types = {"raster": "strds", "vector": "stvds", "raster_3d": "str3ds"}
+        option = task.get_param(value="type", raiseError=False)
+        value = (option.get("value") or option.get("default")) if option else None
+        if value in stds_types:
+            return (value,)
+        if value in map_types:
+            return (map_types[value],)
+        return stds_types
+
     def OnCmdDone(self, event):
         """Command done (or aborted)
 
-        Sends signal mapCreated if map is recognized in output
-        parameters or for specific modules (as r.colors).
+        Sends signal mapCreated if map is recognized in output parameters
+        and signal grassdbChanged for maps and space time datasets, either
+        recognized in output parameters or for specific modules (as r.colors
+        or t.register) which modify their input.
         """
         # Process results here
         try:
@@ -814,15 +835,23 @@ def OnCmdDone(self, event):
             return
 
         name = task.get_name()
+        # Parameter prompts used by space time datasets. The generic "stds" one
+        # is used where a parameter accepts any of the three dataset types.
+        stds_prompts = {"stds", "strds", "stvds", "str3ds"}
+        stds_candidates = self._getStdsTypeCandidates(task)
         for p in task.get_options()["params"]:
             prompt = p.get("prompt", "")
-            if prompt in {"raster", "vector", "raster_3d"} and p.get("value", None):
+            if prompt in {"raster", "vector", "raster_3d"} | stds_prompts and p.get(
+                "value", None
+            ):
                 if p.get("age", "old") == "new" or name in {
                     "r.colors",
                     "r3.colors",
                     "v.colors",
                     "v.proj",
                     "r.proj",
+                    "t.register",
+                    "t.unregister",
                 }:
                     # if multiple maps (e.g. r.series.interp), we need add each
                     if p.get("multiple", False):
@@ -837,18 +866,47 @@ def OnCmdDone(self, event):
                     for lname in lnames:
                         if "@" not in lname:
                             lname += "@" + gs.gisenv()["MAPSET"]
-                        if gs.find_file(lname, element=p.get("element"))["fullname"]:
-                            self.mapCreated.emit(
-                                name=lname, ltype=prompt, add=event.addLayer
+                        element_name, element_mapset = lname.split("@", 1)
+
+                        # The generic stds prompt does not say which dataset
+                        # type this map is, so it is resolved per map. Keep it
+                        # apart from prompt, which describes every value of
+                        # the parameter and must stay the same for all of them.
+                        element = prompt
+                        if prompt == "stds":
+                            element = next(
+                                (
+                                    stds_type
+                                    for stds_type in stds_candidates
+                                    if stds_exists(
+                                        element_name, stds_type, element_mapset
+                                    )
+                                ),
+                                None,
+                            )
+                            exists = element is not None
+                        elif prompt in stds_prompts:
+                            exists = stds_exists(element_name, prompt, element_mapset)
+                        else:
+                            exists = bool(
+                                gs.find_file(lname, element=p.get("element"))[
+                                    "fullname"
+                                ]
                             )
+
+                        if exists:
+                            if element not in stds_prompts:
+                                self.mapCreated.emit(
+                                    name=lname, ltype=element, add=event.addLayer
+                                )
                             gisenv = gs.gisenv()
                             self._giface.grassdbChanged.emit(
                                 grassdb=gisenv["GISDBASE"],
                                 location=gisenv["LOCATION_NAME"],
                                 mapset=gisenv["MAPSET"],
                                 action="new",
-                                map=lname.split("@")[0],
-                                element=prompt,
+                                map=element_name,
+                                element=element,
                             )
         if name == "r.mask":
             action = "new"

gui/wxpython/datacatalog/catalog.py

@@ -361,6 +361,20 @@ def OnImportMenu(self, event):
         menu.AppendItem(item)
         self.Bind(wx.EVT_MENU, lambda evt: self.GuiParseCommand("v.in.ascii"), item)
 
+        menu.AppendSeparator()
+
+        item = wx.MenuItem(
+            menu, wx.ID_ANY, _("Import space time raster dataset  [t.rast.import]")
+        )
+        menu.AppendItem(item)
+        self.Bind(wx.EVT_MENU, lambda evt: self.GuiParseCommand("t.rast.import"), item)
+
+        item = wx.MenuItem(
+            menu, wx.ID_ANY, _("Import space time vector dataset  [t.vect.import]")
+        )
+        menu.AppendItem(item)
+        self.Bind(wx.EVT_MENU, lambda evt: self.GuiParseCommand("t.vect.import"), item)
+
         menu.AppendSeparator()
         menu.AppendMenu(wx.ID_ANY, _("Link external data"), subMenu)