Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

grass.temporal: fix regression in printing metadata #4328

Merged
merged 2 commits into from
Sep 22, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
187 changes: 117 additions & 70 deletions python/grass/temporal/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,26 @@ def get_max(self):
min = property(fget=get_min, fset=set_min)
max = property(fget=get_max, fset=set_max)

def print_info(self):
"""Print information about this class in human readable style"""
self._print_info_body(shell=False)

def print_shell_info(self):
"""Print information about this class in shell style"""
self._print_info_body(shell=True)

def _print_info_head(self, shell=False):
"""Print information about this class (head part).

No header printed in shell style mode.

:param bool shell: True for human readable style otherwise shell style
"""
if not shell:
print(
" +-------------------- Metadata information ----------------------------------+" # noqa: E501
)

def _print_info_body(self, shell=False):
"""Print information about this class (body part).

Expand Down Expand Up @@ -331,6 +351,7 @@ class RasterMetadata(RasterMetadataBase):
| East-west resolution:....... 0.1
| Minimum value:.............. 0.0
| Maximum value:.............. 100.0
| Semantic label:............. None
>>> meta.print_shell_info()
datatype=CELL
cols=100
Expand All @@ -340,6 +361,7 @@ class RasterMetadata(RasterMetadataBase):
ewres=0.1
min=0.0
max=100.0
semantic_label=None

"""

Expand Down Expand Up @@ -384,17 +406,19 @@ def get_semantic_label(self):

semantic_label = property(fget=get_semantic_label, fset=set_semantic_label)

def _print_info_body(self, shell=False):
"""Print information about this class (body part).
def print_info(self):
"""Print information about this class."""
self._print_info_head(shell=False)
self._print_info_body(shell=False)
# semantic label section (raster specific only)
print(" | Semantic label:............. " + str(self.get_semantic_label()))

:param bool shell: True for human readable style otherwise shell style
"""
super()._print_info_body(shell)
def print_shell_info(self):
"""Print information about this class in shell style"""
self._print_info_head(shell=True)
self._print_info_body(shell=True)
# semantic label section (raster specific only)
if shell:
print("semantic_label=" + str(self.get_semantic_label()))
else:
print(" | Semantic label:............. " + str(self.get_semantic_label()))
print("semantic_label=" + str(self.get_semantic_label()))


###############################################################################
Expand Down Expand Up @@ -539,18 +563,19 @@ def get_tbres(self):
depths = property(fget=get_depths, fset=set_depths)
tbres = property(fget=get_tbres, fset=set_tbres)

def _print_info_body(self, shell=False):
"""Print information about this class (body part).
def print_info(self):
"""Print information about this class."""
self._print_info_head(shell=False)
self._print_info_body(shell=False)
print(" | Number of depths:........... " + str(self.get_depths()))
print(" | Top-Bottom resolution:...... " + str(self.get_tbres()))

:param bool shell: True for human readable style otherwise shell style
"""
super()._print_info_body(shell)
if shell:
print("depths=" + str(self.get_depths()))
print("tbres=" + str(self.get_tbres()))
else:
print(" | Number of depths:........... " + str(self.get_depths()))
print(" | Top-Bottom resolution:...... " + str(self.get_tbres()))
def print_shell_info(self):
"""Print information about this class in shell style"""
self._print_info_head(shell=True)
self._print_info_body(shell=True)
print("depths=" + str(self.get_depths()))
print("tbres=" + str(self.get_tbres()))


###############################################################################
Expand Down Expand Up @@ -870,53 +895,41 @@ def get_number_of_volumes(self):
number_of_holes = property(fget=get_number_of_holes, fset=set_number_of_holes)
number_of_volumes = property(fget=get_number_of_volumes, fset=set_number_of_volumes)

def _print_info_body(self, shell=False):
"""Print information about this class (body part).
def print_info(self):
"""Print information about this class in human readable style"""
# 0123456789012345678901234567890
print(
" +-------------------- Metadata information ----------------------------------+" # noqa: E501
)
print(" | Is map 3d .................. " + str(self.get_3d_info()))
print(" | Number of points ........... " + str(self.get_number_of_points()))
print(" | Number of lines ............ " + str(self.get_number_of_lines()))
print(" | Number of boundaries ....... " + str(self.get_number_of_boundaries()))
print(" | Number of centroids ........ " + str(self.get_number_of_centroids()))
print(" | Number of faces ............ " + str(self.get_number_of_faces()))
print(" | Number of kernels .......... " + str(self.get_number_of_kernels()))
print(" | Number of primitives ....... " + str(self.get_number_of_primitives()))
print(" | Number of nodes ............ " + str(self.get_number_of_nodes()))
print(" | Number of areas ............ " + str(self.get_number_of_areas()))
print(" | Number of islands .......... " + str(self.get_number_of_islands()))
print(" | Number of holes ............ " + str(self.get_number_of_holes()))
print(" | Number of volumes .......... " + str(self.get_number_of_volumes()))

:param bool shell: True for human readable style otherwise shell style
"""
if shell:
print("is_3d=" + str(self.get_3d_info()))
print("points=" + str(self.get_number_of_points()))
print("lines=" + str(self.get_number_of_lines()))
print("boundaries=" + str(self.get_number_of_boundaries()))
print("centroids=" + str(self.get_number_of_centroids()))
print("faces=" + str(self.get_number_of_faces()))
print("kernels=" + str(self.get_number_of_kernels()))
print("primitives=" + str(self.get_number_of_primitives()))
print("nodes=" + str(self.get_number_of_nodes()))
print("areas=" + str(self.get_number_of_areas()))
print("islands=" + str(self.get_number_of_islands()))
print("holes=" + str(self.get_number_of_holes()))
print("volumes=" + str(self.get_number_of_volumes()))
else:
print(" | Is map 3d .................. " + str(self.get_3d_info()))
print(" | Number of points ........... " + str(self.get_number_of_points()))
print(" | Number of lines ............ " + str(self.get_number_of_lines()))
print(
" | Number of boundaries ....... "
+ str(self.get_number_of_boundaries())
)
print(
" | Number of centroids ........ " + str(self.get_number_of_centroids())
)
print(" | Number of faces ............ " + str(self.get_number_of_faces()))
print(
" | Number of kernels .......... " + str(self.get_number_of_kernels())
)
print(
" | Number of primitives ....... "
+ str(self.get_number_of_primitives())
)
print(" | Number of nodes ............ " + str(self.get_number_of_nodes()))
print(" | Number of areas ............ " + str(self.get_number_of_areas()))
print(
" | Number of islands .......... " + str(self.get_number_of_islands())
)
print(" | Number of holes ............ " + str(self.get_number_of_holes()))
print(
" | Number of volumes .......... " + str(self.get_number_of_volumes())
)
def print_shell_info(self):
"""Print information about this class in shell style"""
print("is_3d=" + str(self.get_3d_info()))
print("points=" + str(self.get_number_of_points()))
print("lines=" + str(self.get_number_of_lines()))
print("boundaries=" + str(self.get_number_of_boundaries()))
print("centroids=" + str(self.get_number_of_centroids()))
print("faces=" + str(self.get_number_of_faces()))
print("kernels=" + str(self.get_number_of_kernels()))
print("primitives=" + str(self.get_number_of_primitives()))
print("nodes=" + str(self.get_number_of_nodes()))
print("areas=" + str(self.get_number_of_areas()))
print("islands=" + str(self.get_number_of_islands()))
print("holes=" + str(self.get_number_of_holes()))
print("volumes=" + str(self.get_number_of_volumes()))


###############################################################################
Expand Down Expand Up @@ -1034,13 +1047,11 @@ def get_number_of_maps(self):

def print_info(self):
"""Print information about this class in human readable style"""
self._print_info_head(shell=False)
self._print_info_body(shell=False)
self._print_info_tail(shell=False)

def print_shell_info(self):
"""Print information about this class in shell style"""
self._print_info_head(shell=True)
self._print_info_body(shell=True)
self._print_info_tail(shell=True)

Expand All @@ -1056,6 +1067,12 @@ def _print_info_head(self, shell=False):
" +-------------------- Metadata information ----------------------------------+" # noqa: E501
)

def _print_info_body(self, shell=False):
"""Print information about this class (body part).

:param bool shell: True for human readable style otherwise shell style
"""

def _print_info_tail(self, shell=False):
"""Print information about this class (tail part).

Expand Down Expand Up @@ -1476,6 +1493,16 @@ def get_semantic_labels(self):
number_of_semantic_labels = property(fget=get_number_of_semantic_labels)
semantic_labels = property(fget=get_semantic_labels)

def print_info(self):
"""Print information about this class in human readable style"""
self._print_info_head(shell=False)
super().print_info()

def print_shell_info(self):
"""Print information about this class in shell style"""
self._print_info_head(shell=True)
super().print_shell_info()

def _print_info_body(self, shell=False):
"""Print information about this class (body part).

Expand Down Expand Up @@ -1562,6 +1589,8 @@ class STR3DSMetadata(STDSRasterMetadataBase):
| Command history:
>>> meta.print_shell_info()
raster3d_register=None
tbres_min=None
tbres_max=None
nsres_min=None
nsres_max=None
ewres_min=None
Expand All @@ -1570,8 +1599,6 @@ class STR3DSMetadata(STDSRasterMetadataBase):
min_max=None
max_min=None
max_max=None
tbres_min=None
tbres_max=None
aggregation_type=None
number_of_maps=None

Expand Down Expand Up @@ -1624,6 +1651,16 @@ def get_tbres_max(self):
tbres_min = property(fget=get_tbres_min)
tbres_max = property(fget=get_tbres_max)

def print_info(self):
"""Print information about this class in human readable style"""
self._print_info_head(shell=False)
super().print_info()

def print_shell_info(self):
"""Print information about this class in shell style"""
self._print_info_head(shell=True)
super().print_shell_info()

def _print_info_body(self, shell=False):
"""Print information about this class (body part).

Expand Down Expand Up @@ -1889,6 +1926,16 @@ def get_number_of_volumes(self):
number_of_holes = property(fget=get_number_of_holes)
number_of_volumes = property(fget=get_number_of_volumes)

def print_info(self):
"""Print information about this class in human readable style"""
self._print_info_head(shell=False)
super().print_info()

def print_shell_info(self):
"""Print information about this class in shell style"""
self._print_info_head(shell=True)
super().print_shell_info()

def _print_info_body(self, shell=False):
"""Print information about this class (body part).

Expand Down
Loading