kopia lustrzana https://github.com/OpenDroneMap/WebODM
Fix band order bug, temperature formulas
rodzic
8997fb7261
commit
d06fc0088f
|
@ -100,11 +100,11 @@ algos = {
|
||||||
'range': (-1, 1)
|
'range': (-1, 1)
|
||||||
},
|
},
|
||||||
'Thermal C': {
|
'Thermal C': {
|
||||||
'expr': 'Lwir',
|
'expr': 'L',
|
||||||
'help': _('Thermal temperature in Celsius degrees.')
|
'help': _('Thermal temperature in Celsius degrees.')
|
||||||
},
|
},
|
||||||
'Thermal K': {
|
'Thermal K': {
|
||||||
'expr': 'Lwir / 100 - 273.15',
|
'expr': 'L * 100 + 27315',
|
||||||
'help': _('Thermal temperature in Centikelvin degrees.')
|
'help': _('Thermal temperature in Centikelvin degrees.')
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -135,8 +135,8 @@ camera_filters = [
|
||||||
'RGBNRe',
|
'RGBNRe',
|
||||||
'RGBReN',
|
'RGBReN',
|
||||||
|
|
||||||
'BGRNReLwir',
|
'BGRNReL',
|
||||||
'BGRReNLwir',
|
'BGRReNL',
|
||||||
|
|
||||||
# more?
|
# more?
|
||||||
# TODO: certain cameras have only two bands? eg. MAPIR NDVI BLUE+NIR
|
# TODO: certain cameras have only two bands? eg. MAPIR NDVI BLUE+NIR
|
||||||
|
@ -152,7 +152,7 @@ def lookup_formula(algo, band_order = 'RGB'):
|
||||||
if algo not in algos:
|
if algo not in algos:
|
||||||
raise ValueError("Cannot find algorithm " + algo)
|
raise ValueError("Cannot find algorithm " + algo)
|
||||||
|
|
||||||
input_bands = tuple(band_order)
|
input_bands = tuple(b for b in re.split(r"([A-Z][a-z]*)", band_order) if b != "")
|
||||||
|
|
||||||
def repl(matches):
|
def repl(matches):
|
||||||
b = matches.group(1)
|
b = matches.group(1)
|
||||||
|
|
Ładowanie…
Reference in New Issue