labdata 0.1.3__tar.gz → 0.1.4__tar.gz

{labdata-0.1.3 → labdata-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labdata
-Version: 0.1.3
+Version: 0.1.4
 Summary: Package to manage data in experimental neuroscience labs
 Author-email: Joao Couto <jpcouto@gmail.com>
 Project-URL: Homepage, https://github.com/jcouto/labdata

{labdata-0.1.3 → labdata-0.1.4}/labdata/__init__.py

@@ -1,4 +1,4 @@
-VERSION = "0.1.3"
+VERSION = "0.1.4"
 
 from .utils import *
 from .copy import copy_to_upload_server

{labdata-0.1.3 → labdata-0.1.4}/labdata/dashboard/segmentation.py

@@ -83,7 +83,7 @@ def segmentation_tab(schema=None):
 
     @st.cache_data
     def get_roi_color_proj(subject_name, session_name, dataset_name, parameter_set_num,
-                           sel_method, selected_only):
+                           sel_method, sel_label):
         from labdata.stacks import roi_color_projection
         key = dict(subject_name=subject_name, session_name=session_name,
                    dataset_name=dataset_name, parameter_set_num=parameter_set_num)
@@ -99,10 +99,10 @@ def segmentation_tab(schema=None):
             roi_nums = list(roi_table.fetch('roi_num'))
             if not roi_nums:
                 continue
-            if selected_only:
+            if sel_label is not None:
                 sel_rois = set(
                     (schema.CellSegmentation.Selection
-                     & dict(plane_key, selection_method=sel_method, selection=1)
+                     & dict(plane_key, selection_method=sel_method, selection=sel_label)
                     ).fetch('roi_num'))
                 cell_indices = [i for i, rn in enumerate(roi_nums) if rn in sel_rois]
             else:
@@ -526,7 +526,7 @@ def segmentation_tab(schema=None):
     with st.spinner('Loading ROI color projection…'):
         roi_color_projs = get_roi_color_proj(
             subject, row['session_name'], row['dataset_name'], param_set, sel_method,
-            selected_only=(sel_label_filter != 'All'))
+            sel_label=None if sel_label_filter == 'All' else int(sel_label_filter))
 
     all_projections = roi_color_projs + list(projections)
 
@@ -758,60 +758,77 @@ def segmentation_tab(schema=None):
             frame_rate, _ = get_frame_rate(subject, row['session_name'], row['dataset_name'])
             traces_df = traces_df.copy()
             traces_df['t_sec'] = traces_df['t'] / frame_rate
-
             y_min = min(0.0, float(traces_df['value'].min()))
             y_max = float(traces_df['value'].max())
-
             window_s = 300.0
             total_s = float(traces_df['t_sec'].max())
-            if total_s > window_s:
-                max_start = round(total_s - window_s, 2)
-                _lc, _tb, _sc, _tf = st.columns([1, 0.2, 10, 0.2])
-                _lc.markdown('**Time (s)**')
-                if _tb.button('-', key='seg_time_back', use_container_width=True):
-                    cur = st.session_state.get('seg_trace_window', 0.0)
-                    st.session_state['seg_trace_window'] = max(0.0, cur - window_s)
-                    st.rerun()
-                if _tf.button('+', key='seg_time_fwd', use_container_width=True):
-                    cur = st.session_state.get('seg_trace_window', 0.0)
-                    st.session_state['seg_trace_window'] = min(max_start, cur + window_s)
-                    st.rerun()
-                t_start = _sc.slider('Time (s)', 0.0, max_start,
-                                     st.session_state.get('seg_trace_window', 0.0),
-                                     step=30.0, key='seg_trace_window',
-                                     label_visibility='collapsed')
-            else:
-                t_start = 0.0
-            t_end = t_start + window_s
-
-            view_df = traces_df[
-                (traces_df['t_sec'] >= t_start) & (traces_df['t_sec'] <= t_end)]
-            trace_chart = (
-                alt.Chart(view_df)
-                .mark_line(strokeWidth=1.2)
-                .encode(
-                    x=alt.X('t_sec:Q', title='Time (s)',
-                             scale=alt.Scale(domain=[t_start, t_end]),
-                             axis=alt.Axis(tickCount=5, tickSize=5, grid=False)),
-                    y=alt.Y('value:Q', title=trace_type,
-                             scale=alt.Scale(domain=[y_min-0.1, y_max+0.1]),
-                             axis=alt.Axis(tickCount=5, tickSize=5, grid=False)),
-                    color=alt.Color('roi:N', title='ROI',
-                                    scale=alt.Scale(domain=roi_labels, range=roi_color_range)),
-                    tooltip=['roi:N', alt.Tooltip('t_sec:Q', title='Time (s)', format='.2f'),
-                             alt.Tooltip('value:Q', format='.4f')],
+
+            def _draw_traces():
+                if total_s > window_s:
+                    max_start = round(total_s - window_s, 2)
+                    _lc, _tb, _sc, _tf = st.columns([1, 0.2, 10, 0.2])
+                    _lc.markdown('**Time (s)**')
+                    if _tb.button('-', key='seg_time_back', use_container_width=True):
+                        cur = st.session_state.get('seg_trace_window', 0.0)
+                        st.session_state['seg_trace_window'] = max(0.0, cur - window_s/2)
+                        _rerun()
+                    if _tf.button('+', key='seg_time_fwd', use_container_width=True):
+                        cur = st.session_state.get('seg_trace_window', 0.0)
+                        st.session_state['seg_trace_window'] = min(max_start, cur + window_s/2)
+                        _rerun()
+                    t_start = _sc.slider('Time (s)', 0.0, max_start,
+                                         st.session_state.get('seg_trace_window', 0.0),
+                                         step=30.0, key='seg_trace_window',
+                                         label_visibility='collapsed')
+                else:
+                    t_start = 0.0
+                t_end = t_start + window_s
+                view_df = traces_df[
+                    (traces_df['t_sec'] >= t_start) & (traces_df['t_sec'] <= t_end)]
+                trace_chart = (
+                    alt.Chart(view_df)
+                    .mark_line(strokeWidth=1.2)
+                    .encode(
+                        x=alt.X('t_sec:Q', title='Time (s)',
+                                 scale=alt.Scale(domain=[t_start, t_end]),
+                                 axis=alt.Axis(tickCount=5, tickSize=5, grid=False)),
+                        y=alt.Y('value:Q', title=trace_type,
+                                 scale=alt.Scale(domain=[y_min-0.1, y_max+0.1]),
+                                 axis=alt.Axis(tickCount=5, tickSize=5, grid=False)),
+                        color=alt.Color('roi:N', title='ROI',
+                                        scale=alt.Scale(domain=roi_labels,
+                                                        range=roi_color_range)),
+                        tooltip=['roi:N',
+                                 alt.Tooltip('t_sec:Q', title='Time (s)', format='.2f'),
+                                 alt.Tooltip('value:Q', format='.4f')],
+                    )
+                    .properties(height=220).interactive()
                 )
-                .properties(height=220).interactive()
-            )
-            st.altair_chart(trace_chart, width='stretch')
+                st.altair_chart(trace_chart, width='stretch')
+
+            if hasattr(st, 'fragment'):
+                def _rerun(): st.rerun(scope='fragment')
+                st.fragment(_draw_traces)()
+            else:
+                def _rerun(): st.rerun()
+                _draw_traces()
 
     # classification editor — shows currently picked cells and cells whose
     # classification was changed from the original value
     st.write('**ROI classification**')
+
+    # avoid second re-run
+    if st.session_state.pop('_seg_propagate_pending', False):
+        pv = st.session_state.pop('_seg_propagate_val', None)
+        if pv is not None:
+            st.session_state['seg_editor_rows'] = [
+                dict(r, selection=pv) for r in st.session_state['seg_editor_rows']]
+            st.session_state.pop('seg_selection_editor', None)
+
     editor_rows = list(st.session_state['seg_editor_rows'])
     picked_keys = {(p['plane_num'], p['roi_num']) for p in picked}
 
-    # pending widget edits into editor_rows so filtering sees the current values
+    # pending editor_rows so filtering sees the current values
     widget_edits = (st.session_state.get('seg_selection_editor') or {}).get('edited_rows', {})
     for i in range(len(editor_rows)):
         edits = widget_edits.get(i, widget_edits.get(str(i), {}))
@@ -923,10 +940,8 @@ def segmentation_tab(schema=None):
     if _bA.button('Save classification', key='seg_save_selection'):
         _do_save(edited)
     if _bB.button('Propagate first', key='seg_propagate_first',
-                  disabled=edited.empty or edited['selection'].isna().all()):
+                  disabled=edited.empty or bool(edited['selection'].isna().all())):
         first_val = int(edited['selection'].dropna().iloc[0])
-        updated = [dict(r, selection=first_val) for r in editor_rows]
-        st.session_state['seg_editor_rows'] = updated
-        st.session_state.pop('seg_selection_editor', None)
-        st.rerun()
+        st.session_state['_seg_propagate_pending'] = True
+        st.session_state['_seg_propagate_val'] = first_val
 

{labdata-0.1.3 → labdata-0.1.4}/labdata.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labdata
-Version: 0.1.3
+Version: 0.1.4
 Summary: Package to manage data in experimental neuroscience labs
 Author-email: Joao Couto <jpcouto@gmail.com>
 Project-URL: Homepage, https://github.com/jcouto/labdata