Skip to content

Commit

Permalink
This release Fixes #1208
Browse files Browse the repository at this point in the history
  • Loading branch information
tischi committed Jan 9, 2025
1 parent 781a924 commit 058e179
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<groupId>org.embl.mobie</groupId>
<artifactId>mobie-viewer-fiji</artifactId>
<version>5.5.9</version>
<version>5.6.2</version>

<!-- mvn clean install -Dmaven.test.skip=true -Dscijava.app.directory=/Users/tischer/Desktop/Fiji/Fiji-MoBIE.app -->
<!-- ../scijava-scripts/release-version.sh - -skip-version-check - -skip-license-update -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
*/
package org.embl.mobie.lib.bdv.overlay;

import IceInternal.Ex;
import bdv.util.*;
import bdv.viewer.TransformListener;
import net.imglib2.FinalRealInterval;
Expand Down Expand Up @@ -82,8 +83,15 @@ public AnnotatedRegionsOverlay(
public void close()
{
overlaySource.removeFromBdv();
sliceViewer.updateTimepointSlider();
sliceViewer.getBdvHandle().getViewerPanel().requestRepaint();
try
{
sliceViewer.updateTimepointSlider();
sliceViewer.getBdvHandle().getViewerPanel().requestRepaint();
}
catch ( Exception e )
{
// do nothing
}
}

@Override
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/org/embl/mobie/lib/view/ViewManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -735,12 +735,14 @@ private void initSegmentVolumeViewer( SegmentationDisplay< ? extends AnnotatedSe
@SuppressWarnings( { "rawtypes", "unchecked" } )
public synchronized void removeDisplay( Display display, boolean closeImgLoader )
{
//remove sources from BVV
if ( display instanceof AbstractDisplay )
{
if(((AbstractDisplay)display).bigVolumeViewer.getBVV() != null)
if ( ( ( AbstractDisplay ) display).bigVolumeViewer != null )
{
((AbstractDisplay)display).bigVolumeViewer.removeSources( display.sourceAndConverters() );
if ( ( ( AbstractDisplay ) display ).bigVolumeViewer.getBVV() != null )
{
( ( AbstractDisplay ) display ).bigVolumeViewer.removeSources( display.sourceAndConverters() );
}
}
}

Expand Down Expand Up @@ -768,7 +770,6 @@ else if ( display instanceof ImageDisplay )
final ImageDisplay imageDisplay = ( ImageDisplay ) display;
imageDisplay.imageSliceView.close( false );
imageDisplay.imageVolumeViewer.close();

}

userInterface.removeDisplaySettingsPanel( display );
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/embl/mobie/ui/UserInterfaceHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,7 @@ public JPanel createSpotDisplaySettingsPanel( SpotDisplay display )
panel.add( space() );
panel.add( createSliceViewerVisibilityCheckbox( display.isVisible(), sourceAndConverters ) );
panel.add( createCheckboxPlaceholder() );
panel.add( createCheckboxPlaceholder() );
panel.add( createTableVisibilityCheckbox( display.tableView, display.showTable() ) );
panel.add( createScatterPlotViewerVisibilityCheckbox( display.scatterPlotView, display.showScatterPlot() ) );
return panel;
Expand Down
23 changes: 23 additions & 0 deletions src/test/java/debug/DebugSomething.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package debug;

import net.imagej.ImageJ;
import org.embl.mobie.command.open.OpenOMEZARRCommand;
import org.embl.mobie.command.open.project.OpenMoBIEProjectWithS3CredentialsCommand;
import org.embl.mobie.lib.io.DataFormats;

public class DebugSomething
{
public static void main( String[] args )
{
final ImageJ imageJ = new ImageJ();
imageJ.ui().showUI();

OpenMoBIEProjectWithS3CredentialsCommand command = new OpenMoBIEProjectWithS3CredentialsCommand();
command.uri = "https://s3.gwdg.de/fruitfly-larva-em";
command.s3SecretKey = "6FTq9mQwDyGvClVMvusftlMU9DhPDEr3VAJiz3MA";
command.s3AccessKey = "FK1YVED7MTDQAMZKWS7P";
command.location = DataFormats.Location.Remote;
command.run();

}
}

0 comments on commit 058e179

Please sign in to comment.