zebra/pyzebra
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Represent multivar elems as dicts

Browse Source
This commit is contained in:
usov_i 2020-07-28 14:02:29 +02:00
parent 7cc282ffcd
commit f73847b0f5
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pyzebra/anatric.py
View File

@ -281,8 +281,8 @@ class AnatricConfig:
@aps_window.setter @aps_window.setter
def aps_window(self, value): def aps_window(self, value):
for i, coord in enumerate(("x", "y", "z")): for coord in ("x", "y", "z"):
self._set_alg_attr("adaptivemaxcog", "window", coord, value[i]) self._set_alg_attr("adaptivemaxcog", "window", coord, value[coord])
# --- adaptivedynamic # --- adaptivedynamic
@property @property
@ -294,8 +294,8 @@ class AnatricConfig:
@adm_window.setter @adm_window.setter
def adm_window(self, value): def adm_window(self, value):
for i, coord in enumerate(("x", "y", "z")): for coord in ("x", "y", "z"):
self._set_alg_attr("adaptivedynamic", "window", coord, value[i]) self._set_alg_attr("adaptivedynamic", "window", coord, value[coord])
@property @property
def border(self): def border(self):
@ -306,8 +306,8 @@ class AnatricConfig:
@border.setter @border.setter
def border(self, value): def border(self, value):
for i, coord in enumerate(("x", "y", "z")): for coord in ("x", "y", "z"):
self._set_alg_attr("adaptivedynamic", "border", coord, value[i]) self._set_alg_attr("adaptivedynamic", "border", coord, value[coord])
@property @property
def minWindow(self): def minWindow(self):
@ -318,8 +318,8 @@ class AnatricConfig:
@minWindow.setter @minWindow.setter
def minWindow(self, value): def minWindow(self, value):
for i, coord in enumerate(("x", "y", "z")): for coord in ("x", "y", "z"):
self._set_alg_attr("adaptivedynamic", "minWindow", coord, value[i]) self._set_alg_attr("adaptivedynamic", "minWindow", coord, value[coord])
@property @property
def reflectionFile(self): def reflectionFile(self):

18
pyzebra/app/panel_anatric.py
View File

@ -1,3 +1,5 @@
import re
from bokeh.layouts import column, row from bokeh.layouts import column, row
from bokeh.models import Button, Panel, RadioButtonGroup, Select, TextAreaInput, TextInput from bokeh.models import Button, Panel, RadioButtonGroup, Select, TextAreaInput, TextInput
@ -35,12 +37,12 @@ def create():
steepness_textinput.value = config.steepness steepness_textinput.value = config.steepness
duplicateDistance_textinput.value = config.duplicateDistance duplicateDistance_textinput.value = config.duplicateDistance
maxequal_textinput.value = config.maxequal maxequal_textinput.value = config.maxequal
aps_window_textinput.value = str(tuple(config.aps_window.values())) aps_window_textinput.value = str(tuple(map(int, config.aps_window.values())))
elif config.algorithm == "adaptivedynamic": elif config.algorithm == "adaptivedynamic":
adm_window_textinput.value = str(tuple(config.adm_window)) adm_window_textinput.value = str(tuple(map(int, config.adm_window.values())))
border_textinput.value = str(tuple(config.border)) border_textinput.value = str(tuple(map(int, config.border.values())))
minWindow_textinput.value = str(tuple(config.minWindow)) minWindow_textinput.value = str(tuple(map(int, config.minWindow.values())))
reflectionFile_textinput.value = config.reflectionFile reflectionFile_textinput.value = config.reflectionFile
targetMonitor_textinput.value = config.targetMonitor targetMonitor_textinput.value = config.targetMonitor
smoothSize_textinput.value = config.smoothSize smoothSize_textinput.value = config.smoothSize
@ -232,7 +234,7 @@ def create():
# ---- window # ---- window
def aps_window_textinput_callback(_attr, _old, new): def aps_window_textinput_callback(_attr, _old, new):
config.aps_window = new config.aps_window = dict(zip(("x", "y", "z"), re.findall(r"\b\d+\b", new)))
aps_window_textinput = TextInput(title="Window") aps_window_textinput = TextInput(title="Window")
aps_window_textinput.on_change("value", aps_window_textinput_callback) aps_window_textinput.on_change("value", aps_window_textinput_callback)
@ -240,21 +242,21 @@ def create():
# Adaptive Dynamic Mask Integration (adaptivedynamic) # Adaptive Dynamic Mask Integration (adaptivedynamic)
# ---- window # ---- window
def adm_window_textinput_callback(_attr, _old, new): def adm_window_textinput_callback(_attr, _old, new):
config.adm_window = new config.adm_window = dict(zip(("x", "y", "z"), re.findall(r"\b\d+\b", new)))
adm_window_textinput = TextInput(title="Window") adm_window_textinput = TextInput(title="Window")
adm_window_textinput.on_change("value", adm_window_textinput_callback) adm_window_textinput.on_change("value", adm_window_textinput_callback)
# ---- border # ---- border
def border_textinput_callback(_attr, _old, new): def border_textinput_callback(_attr, _old, new):
config.border = new config.border = dict(zip(("x", "y", "z"), re.findall(r"\b\d+\b", new)))
border_textinput = TextInput(title="Border") border_textinput = TextInput(title="Border")
border_textinput.on_change("value", border_textinput_callback) border_textinput.on_change("value", border_textinput_callback)
# ---- minWindow # ---- minWindow
def minWindow_textinput_callback(_attr, _old, new): def minWindow_textinput_callback(_attr, _old, new):
config.minWindow = new config.minWindow = dict(zip(("x", "y", "z"), re.findall(r"\b\d+\b", new)))
minWindow_textinput = TextInput(title="Min Window") minWindow_textinput = TextInput(title="Min Window")
minWindow_textinput.on_change("value", minWindow_textinput_callback) minWindow_textinput.on_change("value", minWindow_textinput_callback)