mirror
/
OpenDroneMap-ODM
kopia lustrzana https://github.com/OpenDroneMap/ODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Add support for XMP fraction values, fix #1163

pull/1165/head
Piero Toffanin 2020-10-14 10:20:49 -04:00
rodzic a1d4cd5ba8
commit 5d3ec4907b
1 zmienionych plików z 15 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

17
opendm/photo.py
Wyświetl plik

@ -119,7 +119,7 @@ class ODM_Photo:
if 'GPS GPSLongitude' in tags and 'GPS GPSLongitudeRef' in tags: if 'GPS GPSLongitude' in tags and 'GPS GPSLongitudeRef' in tags:
self.longitude = self.dms_to_decimal(tags['GPS GPSLongitude'], tags['GPS GPSLongitudeRef']) self.longitude = self.dms_to_decimal(tags['GPS GPSLongitude'], tags['GPS GPSLongitudeRef'])
except IndexError as e: except IndexError as e:
log.ODM_WARNING("Cannot read basic EXIF tags for %s: %s" % (_path_file, e.message)) log.ODM_WARNING("Cannot read basic EXIF tags for %s: %s" % (_path_file, str(e)))
try: try:
if 'Image Tag 0xC61A' in tags: if 'Image Tag 0xC61A' in tags:
@ -233,7 +233,7 @@ class ODM_Photo:
self.set_attr_from_xmp_tag('dls_pitch', tags, ['DLS:Pitch'], float) self.set_attr_from_xmp_tag('dls_pitch', tags, ['DLS:Pitch'], float)
self.set_attr_from_xmp_tag('dls_roll', tags, ['DLS:Roll'], float) self.set_attr_from_xmp_tag('dls_roll', tags, ['DLS:Roll'], float)
except Exception as e: except Exception as e:
log.ODM_WARNING("Cannot read XMP tags for %s: %s" % (_path_file, e.message)) log.ODM_WARNING("Cannot read XMP tags for %s: %s" % (_path_file, str(e)))
# self.set_attr_from_xmp_tag('center_wavelength', tags, [ # self.set_attr_from_xmp_tag('center_wavelength', tags, [
# 'Camera:CentralWavelength' # 'Camera:CentralWavelength'
@ -253,6 +253,9 @@ class ODM_Photo:
if cast is None: if cast is None:
setattr(self, attr, v) setattr(self, attr, v)
else: else:
# Handle fractions
if (cast == float or cast == int) and "/" in v:
v = self.try_parse_fraction(v)
setattr(self, attr, cast(v)) setattr(self, attr, cast(v))
def get_xmp_tag(self, xmp_tags, tags): def get_xmp_tag(self, xmp_tags, tags):
@ -335,6 +338,16 @@ class ODM_Photo:
def list_values(self, tag): def list_values(self, tag):
return " ".join(map(str, tag.values)) return " ".join(map(str, tag.values))
def try_parse_fraction(self, val):
parts = val.split("/")
if len(parts) == 2:
try:
num, den = map(float, parts)
return num / den if den != 0 else val
except ValueError:
pass
return val
def get_radiometric_calibration(self): def get_radiometric_calibration(self):
if isinstance(self.radiometric_calibration, str): if isinstance(self.radiometric_calibration, str):
parts = self.radiometric_calibration.split(" ") parts = self.radiometric_calibration.split(" ")