Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up Java
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'zulu'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up Java
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'zulu'
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,8 @@ The plugin allows performing various operations based on the correspondence info
* Menu Location: `Plugins > Lineage analysis > Show spot and division counts over time`
* The command shows a plot of the number of spots and divisions over time.
* It is possible to set a window size, which is used to compute a sliding average.
* Colors, visibilities, and sliding average windows size can be set in the plot and are persisted as user preference
* A context menu allows to export the plot as a PNG/SVG file.
* A division is defined as a spot with more than one outgoing edge.
* Example: ![spot_and_division_counts_over_time.png](doc/lineageanalysis/spot_and_division_counts_over_time.png)

Expand Down
Binary file modified doc/lineageanalysis/spot_and_division_counts_over_time.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
import org.mastodon.mamut.model.Spot;
import org.mastodon.mamut.plugin.MamutPlugin;
import org.mastodon.mamut.tomancak.compact_lineage.CompactLineageFrame;
import org.mastodon.mamut.tomancak.divisioncount.ShowSpotAndDivisionCountsOverTimeCommand;
import org.mastodon.mamut.tomancak.divisioncount.SpotAndDivisionCountChart;
import org.mastodon.mamut.tomancak.divisiontagset.CellDivisionsTagSetCommand;
import org.mastodon.mamut.tomancak.export.ExportCounts;
import org.mastodon.mamut.tomancak.export.ExportDivisionCountsPerTimepointCommand;
Expand All @@ -70,6 +70,7 @@
import org.scijava.command.CommandService;
import org.scijava.plugin.Parameter;
import org.scijava.plugin.Plugin;
import org.scijava.prefs.PrefService;
import org.scijava.ui.behaviour.io.gui.CommandDescriptionProvider;
import org.scijava.ui.behaviour.io.gui.CommandDescriptions;
import org.scijava.ui.behaviour.util.AbstractNamedAction;
Expand Down Expand Up @@ -225,6 +226,9 @@ public void getCommandDescriptions( final CommandDescriptions descriptions )
@Parameter
private CommandService commandService;

@Parameter
private PrefService prefService;

private final AbstractNamedAction exportPhyloXmlAction;

private final AbstractNamedAction flipDescendantsAction;
Expand Down Expand Up @@ -488,7 +492,7 @@ private void exportDivisionCountsPerTimepoint()

private void showSpotAndDivisionCountsOverTime()
{
commandService.run( ShowSpotAndDivisionCountsOverTimeCommand.class, true, "projectModel", projectModel );
SpotAndDivisionCountChart.show( projectModel, prefService );
}

private void changeBranchLabels()
Expand Down

This file was deleted.

Loading