utils: raspberrypi: ctt: Fix pycodestyle E203
E203 whitespace before ':' Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: David Plowman <david.plowman@raspberrypi.com>
This commit is contained in:
Laurent Pinchart
parent
da88fcec0d
commit
d6527d382e
6 changed files with 45 additions and 45 deletions
|
|
@ -78,78 +78,78 @@ class Camera:
|
||||||
initial json dict populated by uncalibrated values
|
initial json dict populated by uncalibrated values
|
||||||
"""
|
"""
|
||||||
self.json = {
|
self.json = {
|
||||||
"rpi.black_level" : {
|
"rpi.black_level": {
|
||||||
"black_level" : 4096
|
"black_level": 4096
|
||||||
},
|
},
|
||||||
"rpi.dpc" : {
|
"rpi.dpc": {
|
||||||
},
|
},
|
||||||
"rpi.lux" : {
|
"rpi.lux": {
|
||||||
"reference_shutter_speed": 10000,
|
"reference_shutter_speed": 10000,
|
||||||
"reference_gain": 1,
|
"reference_gain": 1,
|
||||||
"reference_aperture": 1.0
|
"reference_aperture": 1.0
|
||||||
},
|
},
|
||||||
"rpi.noise" : {
|
"rpi.noise": {
|
||||||
},
|
},
|
||||||
"rpi.geq" : {
|
"rpi.geq": {
|
||||||
},
|
},
|
||||||
"rpi.sdn": {
|
"rpi.sdn": {
|
||||||
},
|
},
|
||||||
"rpi.awb": {
|
"rpi.awb": {
|
||||||
"priors" : [
|
"priors": [
|
||||||
{"lux": 0, "prior": [2000, 1.0, 3000, 0.0, 13000, 0.0]},
|
{"lux": 0, "prior": [2000, 1.0, 3000, 0.0, 13000, 0.0]},
|
||||||
{"lux": 800, "prior": [2000, 0.0, 6000, 2.0, 13000, 2.0]},
|
{"lux": 800, "prior": [2000, 0.0, 6000, 2.0, 13000, 2.0]},
|
||||||
{"lux": 1500, "prior": [2000, 0.0, 4000, 1.0, 6000, 6.0, 6500, 7.0, 7000, 1.0, 13000, 1.0]}
|
{"lux": 1500, "prior": [2000, 0.0, 4000, 1.0, 6000, 6.0, 6500, 7.0, 7000, 1.0, 13000, 1.0]}
|
||||||
],
|
],
|
||||||
"modes" : {
|
"modes": {
|
||||||
"auto" : {"lo" : 2500, "hi" : 8000},
|
"auto": {"lo": 2500, "hi": 8000},
|
||||||
"incandescent" : {"lo" : 2500, "hi" : 3000},
|
"incandescent": {"lo": 2500, "hi": 3000},
|
||||||
"tungsten" : {"lo" : 3000, "hi" : 3500},
|
"tungsten": {"lo": 3000, "hi": 3500},
|
||||||
"fluorescent" : {"lo" : 4000, "hi" : 4700},
|
"fluorescent": {"lo": 4000, "hi": 4700},
|
||||||
"indoor" : {"lo" : 3000, "hi" : 5000},
|
"indoor": {"lo": 3000, "hi": 5000},
|
||||||
"daylight" : {"lo" : 5500, "hi" : 6500},
|
"daylight": {"lo": 5500, "hi": 6500},
|
||||||
"cloudy" : {"lo" : 7000, "hi" : 8600}
|
"cloudy": {"lo": 7000, "hi": 8600}
|
||||||
},
|
},
|
||||||
"bayes" : 1
|
"bayes": 1
|
||||||
},
|
},
|
||||||
"rpi.agc" : {
|
"rpi.agc": {
|
||||||
"metering_modes" : {
|
"metering_modes": {
|
||||||
"centre-weighted" : {
|
"centre-weighted": {
|
||||||
"weights" : [3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0]
|
"weights": [3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0]
|
||||||
},
|
},
|
||||||
"spot" : {
|
"spot": {
|
||||||
"weights" : [2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
|
"weights": [2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
|
||||||
},
|
},
|
||||||
"matrix": {
|
"matrix": {
|
||||||
"weights" : [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
|
"weights": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"exposure_modes" : {
|
"exposure_modes": {
|
||||||
"normal" : {
|
"normal": {
|
||||||
"shutter" : [100, 10000, 30000, 60000, 120000],
|
"shutter": [100, 10000, 30000, 60000, 120000],
|
||||||
"gain" : [1.0, 2.0, 4.0, 6.0, 6.0]
|
"gain": [1.0, 2.0, 4.0, 6.0, 6.0]
|
||||||
},
|
},
|
||||||
"sport": {
|
"sport": {
|
||||||
"shutter": [100, 5000, 10000, 20000, 120000],
|
"shutter": [100, 5000, 10000, 20000, 120000],
|
||||||
"gain": [1.0, 2.0, 4.0, 6.0, 6.0 ]
|
"gain": [1.0, 2.0, 4.0, 6.0, 6.0 ]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"constraint_modes" : {
|
"constraint_modes": {
|
||||||
"normal" : [
|
"normal": [
|
||||||
{"bound" : "LOWER", "q_lo" : 0.98, "q_hi" : 1.0, "y_target" : [0, 0.5, 1000, 0.5]}
|
{"bound": "LOWER", "q_lo": 0.98, "q_hi": 1.0, "y_target": [0, 0.5, 1000, 0.5]}
|
||||||
],
|
],
|
||||||
"highlight": [
|
"highlight": [
|
||||||
{"bound": "LOWER", "q_lo": 0.98, "q_hi": 1.0, "y_target": [0, 0.5, 1000, 0.5]},
|
{"bound": "LOWER", "q_lo": 0.98, "q_hi": 1.0, "y_target": [0, 0.5, 1000, 0.5]},
|
||||||
{"bound": "UPPER", "q_lo": 0.98, "q_hi": 1.0, "y_target": [0, 0.8, 1000, 0.8]}
|
{"bound": "UPPER", "q_lo": 0.98, "q_hi": 1.0, "y_target": [0, 0.8, 1000, 0.8]}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"y_target" : [0, 0.16, 1000, 0.165, 10000, 0.17]
|
"y_target": [0, 0.16, 1000, 0.165, 10000, 0.17]
|
||||||
},
|
},
|
||||||
"rpi.alsc": {
|
"rpi.alsc": {
|
||||||
'omega' : 1.3,
|
'omega': 1.3,
|
||||||
'n_iter' : 100,
|
'n_iter': 100,
|
||||||
'luminance_strength' : 0.7,
|
'luminance_strength': 0.7,
|
||||||
},
|
},
|
||||||
"rpi.contrast" : {
|
"rpi.contrast": {
|
||||||
"ce_enable": 1,
|
"ce_enable": 1,
|
||||||
"gamma_curve": [
|
"gamma_curve": [
|
||||||
0, 0,
|
0, 0,
|
||||||
|
|
|
||||||
|
|
@ -197,7 +197,7 @@ def awb(Cam, cal_cr_list, cal_cb_list, plot):
|
||||||
iterate backwards over list for easier indexing
|
iterate backwards over list for easier indexing
|
||||||
"""
|
"""
|
||||||
i = len(c_fit) - 1
|
i = len(c_fit) - 1
|
||||||
while i > 0 :
|
while i > 0:
|
||||||
if c_fit[i] > c_fit[i-1]:
|
if c_fit[i] > c_fit[i-1]:
|
||||||
Cam.log += '\nColour temperature increase found\n'
|
Cam.log += '\nColour temperature increase found\n'
|
||||||
Cam.log += '{} K at r = {} to '.format(c_fit[i-1], r_fit[i-1])
|
Cam.log += '{} K at r = {} to '.format(c_fit[i-1], r_fit[i-1])
|
||||||
|
|
|
||||||
|
|
@ -148,8 +148,8 @@ def ccm(Cam, cal_cr_list, cal_cb_list):
|
||||||
ccms = []
|
ccms = []
|
||||||
for i in sorted_ccms:
|
for i in sorted_ccms:
|
||||||
ccms.append({
|
ccms.append({
|
||||||
'ct' : i[0],
|
'ct': i[0],
|
||||||
'ccm' : i[1]
|
'ccm': i[1]
|
||||||
})
|
})
|
||||||
return ccms
|
return ccms
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -45,11 +45,11 @@ class Image:
|
||||||
Channel order depending on bayer pattern
|
Channel order depending on bayer pattern
|
||||||
"""
|
"""
|
||||||
bayer_case = {
|
bayer_case = {
|
||||||
0 : (0, 1, 2, 3), #red
|
0: (0, 1, 2, 3), #red
|
||||||
1 : (2, 0, 3, 1), #green next to red
|
1: (2, 0, 3, 1), #green next to red
|
||||||
2 : (3, 2, 1, 0), #green next to blue
|
2: (3, 2, 1, 0), #green next to blue
|
||||||
3 : (1, 0, 3, 2), #blue
|
3: (1, 0, 3, 2), #blue
|
||||||
128 : (0, 1, 2, 3) #arbitrary order for greyscale casw
|
128: (0, 1, 2, 3) #arbitrary order for greyscale casw
|
||||||
}
|
}
|
||||||
self.order = bayer_case[self.pattern]
|
self.order = bayer_case[self.pattern]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -180,7 +180,7 @@ def find_macbeth(Cam, img, mac_config=(0, 0)):
|
||||||
|
|
||||||
if small_chart:
|
if small_chart:
|
||||||
|
|
||||||
if cor < 0.75 and d_best > 1 :
|
if cor < 0.75 and d_best > 1:
|
||||||
imgs = []
|
imgs = []
|
||||||
shape = list(img.shape[:2])
|
shape = list(img.shape[:2])
|
||||||
w, h = shape
|
w, h = shape
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ def process_char(c, fout, state):
|
||||||
state["skipnewline"] = (c == '[')
|
state["skipnewline"] = (c == '[')
|
||||||
|
|
||||||
def pretty_print_json(str_in, output_filename):
|
def pretty_print_json(str_in, output_filename):
|
||||||
state = {"indent": 0, "inarray": [False], "arraycount": [], "skipnewline" : True}
|
state = {"indent": 0, "inarray": [False], "arraycount": [], "skipnewline": True}
|
||||||
with open(output_filename, "w") as fout:
|
with open(output_filename, "w") as fout:
|
||||||
process_file(str_in, fout, state)
|
process_file(str_in, fout, state)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue