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

9.1.0 release candidate #166

Merged
merged 26 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d0ce933
fix: volatile type cast error on export
bogovicj Dec 21, 2023
86d431e
fix: toward sensible WarpedSource.getSourceTransform impl
bogovicj Dec 21, 2023
cfc6009
feat: generalize methods saving affines and coordinate fields
bogovicj Dec 22, 2023
947b5d4
feat: export transform as parametrized tps
bogovicj Jan 8, 2024
427b03e
fix: ImproveFormattedTextField NPE
bogovicj Jan 8, 2024
1c28e5e
refactor: WarpedSource "name" to "suffix"
bogovicj Jan 8, 2024
d99cbaf
feat: BigWarpData improve api for adding and changing transforms
bogovicj Jan 8, 2024
9cc9087
fix: avoid error when there are no moving sources
bogovicj Jan 8, 2024
605f6dc
feat: start of TransformGraphPanel
bogovicj Jan 8, 2024
234cd40
fix: table actions and popup menu
bogovicj Jan 16, 2024
1734b17
chore(refactor): update to n5-universe 1.3.0
bogovicj Jan 17, 2024
e4e1e3e
fix: on-the-fly warping
bogovicj Jan 17, 2024
90e6450
pom: bump pom-scijava, update n5 artifact versions
bogovicj Jan 17, 2024
51a6114
Merge branch 'tform-cs-panel' of github.com:saalfeldlab/bigwarp into …
bogovicj Jan 17, 2024
530b013
fix: options panel component overlap
bogovicj Jan 17, 2024
b2df3c2
fix: use relative path for affine export
bogovicj Jan 17, 2024
4340382
fix: export affines as flat arrayd by default
bogovicj Jan 17, 2024
896b73f
feat: exporting images with n5 use ngff v0.4
bogovicj Jan 18, 2024
1eb22b7
fix: simplify naming of warped sources
bogovicj Jan 18, 2024
6b08d0f
chore: temporarily remove source coord system ui panel
bogovicj Jan 30, 2024
37255e9
fix: affine export
bogovicj Jan 30, 2024
6c01249
chore: pom updates, bump version to 9.1.0-SNAPSHOT
bogovicj Jan 31, 2024
e18c90c
chore: update n5-zarr version, add blosc and n5 (core)
bogovicj Jan 31, 2024
a5d37a7
chore: install blosc for builds
bogovicj Jan 31, 2024
ef65128
doc: java doc corrections throughout
bogovicj Jan 31, 2024
3f51a28
fix: parse ome-ngff v0.4
bogovicj Jan 31, 2024
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
4 changes: 4 additions & 0 deletions .github/workflows/build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Install blosc
run: |
sudo apt-get update
sudo apt-get install -y libblosc1
- name: Set up Java
uses: actions/setup-java@v3
with:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Install blosc
run: |
sudo apt-get update
sudo apt-get install -y libblosc1
- name: Set up Java
uses: actions/setup-java@v3
with:
Expand Down
20 changes: 8 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<version>36.0.0</version>
<version>37.0.0</version>
<relativePath />
</parent>

<groupId>sc.fiji</groupId>
<artifactId>bigwarp_fiji</artifactId>
<version>9.0.1-SNAPSHOT</version>
<version>9.1.0-SNAPSHOT</version>

<name>BigWarp plugin for Fiji</name>
<description>A tool for manual pointwise deformable registration using bigdataviewer.</description>
Expand Down Expand Up @@ -128,16 +128,12 @@
<!-- NB: Deploy releases to the SciJava Maven repository. -->
<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>

<n5.version>3.0.2</n5.version>
<n5-ij.version>3.2.6</n5-ij.version>
<n5-hdf5.version>2.0.1</n5-hdf5.version>
<n5-aws-s3.version>4.0.1</n5-aws-s3.version>
<n5-google-cloud.version>4.0.0</n5-google-cloud.version>
<n5-imglib2.version>7.0.0</n5-imglib2.version>
<n5-universe.version>1.2.0</n5-universe.version>
<n5-viewer_fiji.version>5.3.1</n5-viewer_fiji.version>
<n5-zarr.version>1.0.1</n5-zarr.version>
<bigdataviewer-core.version>10.4.8</bigdataviewer-core.version>
<n5.version>3.1.1</n5.version>
<n5-blosc.version>1.1.1</n5-blosc.version>
<n5-zarr.version>1.2.0</n5-zarr.version>
<n5-universe.version>1.3.1</n5-universe.version>
<n5-ij.version>4.0.0</n5-ij.version>
<n5-viewer_fiji.version>6.0.0</n5-viewer_fiji.version>

</properties>

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/bdv/gui/BigWarpViewerFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,8 @@ public void setTransformEnabled( final boolean enabled )
* Get {@code Behaviours} hook where TransformEventHandler behaviours are installed.
* This is installed in {@link #getTriggerBindings} with the id "transform".
* The hook can be used to update the keymap and install additional behaviours.
*
* @return the behaviours
*/
public Behaviours getTransformBehaviours()
{
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/bdv/gui/BigwarpLandmarkSelectionPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,18 @@ public class BigwarpLandmarkSelectionPanel<T> extends JPanel

/**
* Displays a dialog showing point matches
*
* @param data the data
* @param sources list of sources
* @param fieldOfViewOption option for inferring the field of view
* @param outputIntervalList list of output intervals
* @param matchedPtNames names of points for matching
* @param interp interpolation
* @param offsetIn the offset
* @param resolution the resolution
* @param isVirtual if true
* @param nThreads number of threads
* @param progressWriter progress writer
*/
public BigwarpLandmarkSelectionPanel(
final BigWarpData<T> data,
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/bdv/gui/ExportDisplacementFieldFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public class ExportDisplacementFieldFrame extends JFrame

// formats
public static final String FMT_NGFF = "NGFF";
public static final String FMT_BIGWARP_TPS = "TPS";
public static final String FMT_SLICER = "Slicer";

// macro recording
Expand Down Expand Up @@ -412,8 +413,7 @@ public JPanel basicPanel()
ctxt.gridx = 3;
panel.add( new JLabel( "Format:" ), ctxt );
gbcCheck.gridx = 4;
// formatComboBox = new JComboBox< String >( new String[] { FMT_NGFF, FMT_SLICER } );
formatComboBox = new JComboBox< String >( new String[] { FMT_NGFF } );
formatComboBox = new JComboBox< String >( new String[] { FMT_NGFF, FMT_BIGWARP_TPS } );
panel.add( formatComboBox, gbcCheck );

ctxt.gridx = 5;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/bdv/gui/ImprovedFormattedTextField.java
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,9 @@ public AttributedCharacterIterator formatToCharacterIterator( Object obj )
public Object parseObject( String source, ParsePosition pos )
{
final int initialIndex = pos.getIndex();
if( fDelegate == null )
return source;

final Object result = fDelegate.parseObject( source, pos );
if ( result != null && pos.getIndex() < source.length() )
{
Expand Down
Loading
Loading