Compare commits
5 Commits
e303b7349e
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 5a9a67b7b6 | |||
| ea14faff14 | |||
| 67c8c1e93d | |||
| 8bc33c790c | |||
| e442fc9f0f |
@@ -42,7 +42,7 @@ class MathEntry(wx.TextCtrl):
|
||||
def SetValue(self, val):
|
||||
self.value_type = type(val)
|
||||
val = str(val)
|
||||
super().SetValue(val)
|
||||
super().ChangeValue(val) #TODO
|
||||
|
||||
|
||||
def on_enter(self, event):
|
||||
@@ -94,7 +94,7 @@ class MathEntry(wx.TextCtrl):
|
||||
|
||||
|
||||
def clear(self):
|
||||
super().SetValue("")
|
||||
super().ChangeValue("") #TODO
|
||||
|
||||
|
||||
|
||||
|
||||
20
scam.py
20
scam.py
@@ -81,6 +81,9 @@ class MainPanel(wx.Panel):
|
||||
self.instance = None
|
||||
self.camera = None
|
||||
|
||||
self.orig_cfg = None
|
||||
self.pipeline_cfg = None
|
||||
|
||||
self.pls = pls = Pipelines()
|
||||
|
||||
pl_names = [GOOD + n for n in pls.active]
|
||||
@@ -158,6 +161,8 @@ class MainPanel(wx.Panel):
|
||||
cfg = pipeline.get()
|
||||
print("current config:", cfg)
|
||||
|
||||
self.pipeline_cfg = cfg
|
||||
|
||||
# use contents of KNOWN_TYPES to pre-fill cfg
|
||||
#TODO use setdefault instead?
|
||||
cfg_o = cfg
|
||||
@@ -223,7 +228,7 @@ class MainPanel(wx.Panel):
|
||||
|
||||
def on_screenpanel(self, event):
|
||||
cam = self.camera
|
||||
cmd = f"screen_panel -persist -cam={cam}"
|
||||
cmd = f"screen_panel -persist -cam {cam}"
|
||||
print(cmd)
|
||||
subprocess.Popen(cmd.split(), start_new_session=True)
|
||||
|
||||
@@ -297,8 +302,17 @@ class MainPanel(wx.Panel):
|
||||
|
||||
|
||||
def on_change(self, event):
|
||||
old_cfg = self.orig_cfg
|
||||
old_cfg = self.pipeline_cfg or {}
|
||||
new_cfg = self.make_cfg()
|
||||
|
||||
new = {}
|
||||
old = {}
|
||||
for i in sorted(set(old_cfg) & set(new_cfg)):
|
||||
old[i] = old_cfg.get(i)
|
||||
new[i] = new_cfg.get(i)
|
||||
old_cfg = old
|
||||
new_cfg = new
|
||||
|
||||
color = wx.Colour(164, 36, 23) if new_cfg != old_cfg else wx.NullColour
|
||||
self.btn_save.SetBackgroundColour(color)
|
||||
|
||||
@@ -326,7 +340,7 @@ def check_incoming_cfg(cfg):
|
||||
|
||||
|
||||
def check_outgoing_cfg(cfg):
|
||||
bkg = cfg["image_background"]
|
||||
bkg = cfg.get("image_background", None)
|
||||
cfg["image_background_enable"] = "passive" if bkg else None
|
||||
|
||||
cfg["image_threshold"] = None
|
||||
|
||||
Reference in New Issue
Block a user