Save also mask name in history

OSGeo · Jan 27, 2025 · d6e041a · d6e041a
1 parent f860f22
commit d6e041a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/gui/wxpython/lmgr/statusbar.py b/gui/wxpython/lmgr/statusbar.py
@@ -142,9 +142,7 @@ def OnRemoveMask(self, event):
             dlg.Destroy()
             return
         RunCommand("r.mask", flags="r")
-        mask_full_name = gs.parse_command("r.mask.status", format="json")[
-            "configured_name"
-        ]
+        mask_full_name = gs.parse_command("r.mask.status", format="json")["name"]
         mask_name, mask_mapset = mask_full_name.split("@", maxsplit=1)
         gisenv = gs.gisenv()
         self.giface.grassdbChanged.emit(

diff --git a/python/grass/grassdb/history.py b/python/grass/grassdb/history.py
@@ -258,23 +258,24 @@ def get_initial_command_info(env_run):
     exec_time = datetime.now().isoformat()
 
     # 2D raster MASK presence
-    mask2d_present = gs.parse_command("r.mask.status", format="json", env=env_run)[
-        "present"
-    ]
+    mask2d_status = gs.parse_command("r.mask.status", format="json", env=env_run)
 
     # 3D raster MASK presence
     env = gs.gisenv(env_run)
     mapset_path = Path(env["GISDBASE"]) / env["LOCATION_NAME"] / env["MAPSET"]
     mask3d_present = (mapset_path / "grid3" / "RASTER3D_MASK").exists()
+    mask3d_name = f"RASTER3D_MASK@{env['MAPSET']}"
 
     # Computational region settings
     region_settings = gs.region(env=env_run)
 
     # Finalize the command info dictionary
     return {
         "timestamp": exec_time,
-        "mask2d": mask2d_present,
-        "mask3d": mask3d_present,
+        "mask2dx": mask2d_status["present"],
+        "mask2d_name": mask2d_status["name"],
+        "mask3dx": mask3d_present,
+        "mask3d_name": mask3d_name,
         "region": region_settings,
         "status": Status.RUNNING.value,
     }