Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add editing and refactor entire code base #86

Merged
merged 137 commits into from
Oct 18, 2024
Merged

Commits on Sep 17, 2024

  1. Reorganize everything

    cmalinmayor committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    f966b58 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    397272a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9f76c52 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. update yaml commands

    AnniekStok committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    dac54fe View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    491d730 View commit details
    Browse the repository at this point in the history
  3. remove the __future__ annotations as this breaks in the injection whe…

    …n starting widgets from the plugins menu
    AnniekStok committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    78727e5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    da90ecd View commit details
    Browse the repository at this point in the history
  5. call the assign_tracklet_id function from motile_toolbox after removi…

    …ng a node, to reassign the tracklet_ids
    AnniekStok committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    bb46a59 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Configuration menu
    Copy the full SHA
    1da371c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    001faf3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    41a19f1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a139a28 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f826e26 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b6d56a2 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    db3fb8f View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. implement editing from the segmentation, including adding new nodes, …

    …removing nodes, and updating their size
    AnniekStok committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    0419c63 View commit details
    Browse the repository at this point in the history
  2. allow creation of edges more than one time point apart - still have t…

    …o implement a separate validation function
    AnniekStok committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    9380366 View commit details
    Browse the repository at this point in the history
  3. update the autorange logic, refreshing when switching between all/lin…

    …eage and tree/area but not when viewing the tree
    AnniekStok committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    a118aa7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8df7933 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    bbe49a1 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c8a69ee View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    bca49df View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. Configuration menu
    Copy the full SHA
    514efb1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e550389 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4bf45f4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2698a45 View commit details
    Browse the repository at this point in the history
  5. display a messagebox when attempting to merge tracks, optionally disc…

    …arding the existing edge. How to combine this delete edge action with the add action in an Actiongroup?
    AnniekStok committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    2bb8ed2 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    195bbe8 View commit details
    Browse the repository at this point in the history
  7. do not allow moving points if there is a seg layer, but update attrib…

    …utes if points were the source for tracking
    AnniekStok committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    1186e44 View commit details
    Browse the repository at this point in the history
  8. automatically set the brush color in the labels layer to the track id…

    …: this way it is also easier to add a segmentation for a new point
    AnniekStok committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    28240dd View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    9640e7d View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. make sure that the dict mapping node_id to track_id is created when a…

    … run solve is complete (if it was not already done at init)
    AnniekStok committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    f753bda View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    42d94ad View commit details
    Browse the repository at this point in the history
  3. centralize the colormap in the tracks_viewer, and update across all v…

    …iewers (in the case the user shuffles the colors in the labels layer)
    AnniekStok committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    8a3f9b2 View commit details
    Browse the repository at this point in the history
  4. fix bug in the tracks layer: track_ids were out of sync with the grap…

    …h because they were regenerated. Hence the apparent colormap issue. Implemented an adapted version of the to_napari_tracks_layer function that does not reassign track_ids, but takes them from the provided graph
    AnniekStok committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    ba6b8ac View commit details
    Browse the repository at this point in the history
  5. force refresh the colormap in the trackslayer by reapplying the turbo…

    … colormap, otherwise colors do not update correctly when the user shuffles the label colors
    AnniekStok committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    2aa5106 View commit details
    Browse the repository at this point in the history
  6. remove the build-in properties on the labels layer as this was showin…

    …g incorrect results because we cannot assign different properties to the same label at a different time point. Instead use a new attribute node_properties to store this information to keep it accessible when clicking on a label
    AnniekStok committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    c804966 View commit details
    Browse the repository at this point in the history
  7. override the default _type_string in trackpoints and tracklabels laye…

    …rs to return normal points and labels for saving purposes
    AnniekStok committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    1bc1fb2 View commit details
    Browse the repository at this point in the history
  8. combine widgets in a multi widget but also allow to open them separat…

    …ely. There appears to be a bug when opening the TracksListWidget after the MultiWidget was already called
    AnniekStok committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    33c61db View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. Configuration menu
    Copy the full SHA
    7796fdf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    432ba4c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    01d31ea View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    efc2f81 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6fb6858 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ddbd397 View commit details
    Browse the repository at this point in the history
  7. fix issue in the labels colormap that resulted in incorrect visibilit…

    …y/invisibility and highlighting due to use of the cycliclabelcolormap, we do need the directmap because there are typically more track_ids than colors
    AnniekStok committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    025bcc4 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    b313d88 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    9eac92e View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. refactor action handling to use new ActionHistory class, taking care …

    …of the entire undo/redo logic including segmentation updates
    AnniekStok committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    466af26 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4c1f0d8 View commit details
    Browse the repository at this point in the history
  3. emit a selection update event after refresh, even if there are no nod…

    …es selected (for setting the opacity in the labels layer)
    AnniekStok committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    623df1e View commit details
    Browse the repository at this point in the history
  4. bugfix: make sure that the None and 0 (if provided) keys in the color…

    …map dict always have opacity of 0, otherwise we end up with the weird case of nontransparent blackness
    AnniekStok committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    ab315e5 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Configuration menu
    Copy the full SHA
    2c148e7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a202b88 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4f8a672 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e36773f View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. first check if the labels layer is present and not in edit mode befor…

    …e centering the view, as centering while editing is annoying especially in 3D
    AnniekStok committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    84fad68 View commit details
    Browse the repository at this point in the history
  2. disable selecting nodes in the seg_layer when in 3D lineage mode. Oth…

    …erwise, check whether the selected label is visible (non zero in the colormap opacity)
    AnniekStok committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    656c349 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'refactor_for_editing' of github.com:funkelab/motile_nap…

    …ari_plugin into refactor_for_editing
    cmalinmayor committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    ce667fd View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0af3cba View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Configuration menu
    Copy the full SHA
    ec19651 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6d1820b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    469f20e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e7f234f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6405952 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5fa7a31 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    35c51c1 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Configuration menu
    Copy the full SHA
    dfa2137 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2ab7412 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Configuration menu
    Copy the full SHA
    9ef0e25 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. use rectangular selection in treeview to append a list of nodes to th…

    …e selection, rescaling the view range if necessary
    AnniekStok committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    b49e529 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7b6c9df View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d7927f3 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ba51b38 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    77783ac View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. bug fixing: update the tracks.seg_time_to_node and max_track_id in up…

    …date_tracks, otherwise they are empty. Also call the update signal before updating the node selecting (if a node is new, it is otherwise not yet in the tree dataframe)
    AnniekStok committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    00f95f9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f2bfea8 View commit details
    Browse the repository at this point in the history
  3. finish merge

    AnniekStok committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    e50afb3 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2024

  1. Configuration menu
    Copy the full SHA
    2a10243 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Configuration menu
    Copy the full SHA
    c99d985 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'refactor_for_editing' of github.com:funkelab/motile_nap…

    …ari_plugin into refactor_for_editing
    cmalinmayor committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    aa2d7cf View commit details
    Browse the repository at this point in the history
  3. update docs

    AnniekStok committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    f2e16eb View commit details
    Browse the repository at this point in the history
  4. Merge branch 'refactor_for_editing' of github.com:funkelab/motile_nap…

    …ari_plugin into refactor_for_editing
    cmalinmayor committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    68154bb View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    12600be View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d1ca6c6 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    9baa5c3 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    108ea04 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    6b918d1 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    506935b View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Configuration menu
    Copy the full SHA
    7c0d4e4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b6a27ac View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    17fe621 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    eb7d53c View commit details
    Browse the repository at this point in the history
  5. fix typo

    AnniekStok committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    e245c35 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    112468a View commit details
    Browse the repository at this point in the history
  7. Merge branch 'refactor_for_editing' of github.com:funkelab/motile_nap…

    …ari_plugin into refactor_for_editing
    cmalinmayor committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    26944dc View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    4ed3db6 View commit details
    Browse the repository at this point in the history
  9. update _delete_nodes, combining all to be deleted edges in a single D…

    …eleteEdges action, and all to be created skip edges in a single AddEdges action
    AnniekStok committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    8ed3c78 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    a7688da View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    53b2fdc View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    dbb77df View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    e4acf84 View commit details
    Browse the repository at this point in the history
  14. Minor bugfixes

    cmalinmayor committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    f28b5fc View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    907485b View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. fix colormap refresh issue by calling update_selection, which fixes t…

    …he highlighting of selected nodes
    AnniekStok committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    5e272bb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    80b96b3 View commit details
    Browse the repository at this point in the history
  3. fix treeview display in lineage mode: when deleting a node, keep show…

    …ing the previous lineages instead of a black tree view. Also make sure to complete reset the view when there is a new run
    AnniekStok committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    df5f40f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d907a41 View commit details
    Browse the repository at this point in the history
  5. store the previously visible nodes and reuse them for the napari view…

    …s in case mode == lineage and self.selected_nodes is empty
    AnniekStok committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    190e658 View commit details
    Browse the repository at this point in the history
  6. check which nodes were previously visible and are still present in th…

    …e graph in a more efficient manner
    AnniekStok committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    f0c9b32 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    69044f2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    471e095 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    6b74794 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    3f7438d View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    e971efd View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. check the previous track_df sorting (if available) to keep the lineag…

    …e tree as consistently ordered as possible when editing
    AnniekStok committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    e0a9435 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b6c4b4e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    31138f3 View commit details
    Browse the repository at this point in the history
  4. disconnect TracksViewer from any previous Tracks before reassigning s…

    …elf.tracks and connecting self.tracks.refresh again, to prevent emitting multiple signals
    AnniekStok committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    6768f2e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c3952aa View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ee83ab5 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'refactor_for_editing' of github.com:funkelab/motile_nap…

    …ari_plugin into refactor_for_editing
    cmalinmayor committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    8c5626e View commit details
    Browse the repository at this point in the history
  8. update docs

    AnniekStok committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    f79d1bc View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    c310909 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. Configuration menu
    Copy the full SHA
    dbc0eb2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e9f15bf View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0be0191 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    43a718e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    fae3ea0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5f76853 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    6135a48 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    99a4bfb View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    4c04e8b View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    71c21d3 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    40b128f View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    62c0f9d View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    68cc6e7 View commit details
    Browse the repository at this point in the history