setup: bump dclab to 0.22.5

.gitignore

@@ -72,3 +72,6 @@ docs/shapeout.bib.sav
 
 *.bib.bak
 *.xcf
+
+.env
+.envdocs

CHANGELOG

@@ -1,5 +1,7 @@
 1.0.4
- - setup: bump dclab from 0.21.1 to 0.23.4 (improve contour retrieval
+ - fix: minor issue with converting pos_y feature in sessions from
+   before 0.7.6
+ - setup: bump dclab from 0.21.1 to 0.22.5 (improve contour retrieval
    for mask images with artefacts, disable computation of Young's
    modulus for reservoir measurements)
 1.0.3

setup.py

@@ -46,7 +46,7 @@
                                ],
                       },
     install_requires=["appdirs",
-                      "dclab[all]>=0.22.4",
+                      "dclab[all]>=0.22.5",
                       "fcswrite>=0.5.0",
                       "h5py>=2.8.0",
                       "imageio>=2.3.0,<2.5.0",

shapeout/gui/controls.py

@@ -107,7 +107,7 @@ def OnChangeFilter(self, e=None, updp=True, draw=True):
         wx.BeginBusyCursor()
         ctrls = self.page_filter.GetChildren()
         samdict = self.analysis.measurements[0].config.copy()["filtering"]
-        newfilt = rt_config.CaseInsensitiveDict()
+        newfilt = rt_config.ConfigurationDict(section="filtering")
 
         # identify controls via their name correspondence in the cfg
         for c in ctrls:
@@ -178,7 +178,7 @@ def OnChangePlot(self, e=None, updp=True):
         ctrls += list(self.page_cont.GetChildren())
         ctrls += list(self.page_scat.GetChildren())
         samdict = self.analysis.measurements[0].config.copy()["plotting"]
-        newfilt = rt_config.CaseInsensitiveDict()
+        newplot = rt_config.ConfigurationDict(section="plotting")
 
         # identify controls via their name correspondence in the cfg
         for c in ctrls:
@@ -197,7 +197,7 @@ def OnChangePlot(self, e=None, updp=True):
                     val = c.GetValue()
 
                 var, val = rt_config.keyval_str2typ(var, val)
-                newfilt[var] = val
+                newplot[var] = val
             elif name.startswith("title "):
                 # Change title of measurement
                 for mm in self.analysis.measurements:
@@ -211,8 +211,8 @@ def OnChangePlot(self, e=None, updp=True):
                         col = np.array([col.Red(), col.Green(),
                                        col.Blue(), col.Alpha()])/255
                         mm.config["plotting"]["contour color"] = col.tolist()
-        
-        cfg = {"plotting": newfilt }
+
+        cfg = {"plotting": newplot}
 
         self.analysis.SetParameters(cfg)
 

shapeout/session/conversion.py

@@ -66,6 +66,7 @@
     ["fl-3npeaks", "fl3_npeaks"],
     ["fl-3pos", "fl3_pos"],
     ["pos x", "pos_x"],
+    ["pos y", "pos_y"],
     ["pos lat", "pos_y"],
     ["x-size", "size_x"],
     ["y-size", "size_y"],

tests/test_session_conversion.py

@@ -20,6 +20,8 @@ def compatibility_task(name):
     return analysis
 
 
+@pytest.mark.filterwarnings(
+    'ignore::dclab.rtdc_dataset.config.UnknownConfigurationKeyWarning')
 def test_060():
     analysis = compatibility_task("session_v0.6.0.zmso")
     mm = analysis.measurements[0]