Skip to content

Commit

Permalink
Remove None Gridtype and make Transformed the default
Browse files Browse the repository at this point in the history
  • Loading branch information
tischi committed Aug 9, 2024
1 parent 47f6abf commit f899110
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 13 deletions.
3 changes: 1 addition & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@

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

<version>5.3.7</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 @@ -76,7 +76,7 @@ public class OpenTableCommand implements Command {
public SpatialCalibration spatialCalibration = SpatialCalibration.FromImage;

@Parameter( label = "Grid", description = MoBIEHelper.GRID_TYPE_HELP )
public GridType gridType = GridType.Stitched;
public GridType gridType = GridType.Transformed;

@Override
public void run()
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/org/embl/mobie/lib/data/GridSourcesDataSetter.java
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,16 @@ public void addDataAndDisplaysAndViews( Dataset dataset )
// all sources will have the same grid type
// thus it suffices to check the first one
// ( obviously this smells as if this logic could be improved )
if ( allSources.get( 0 ).getGridType().equals( GridType.None ) )
{
addIndividualViews( dataset, allSources );
}
else
{
// if ( allSources.get( 0 ).getGridType().equals( GridType.None ) )
// {
// addIndividualViews( dataset, allSources );
// }
// else
// {
// create a grid view for all sources
// assuming that they all live in the same grid
addGridView( dataset, allSources );
}
// }
}

// This assumes that all the individual views are similar
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/embl/mobie/lib/transform/GridType.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

public enum GridType
{
None,
Stitched,
Transformed;
Transformed,
Stitched;
}

0 comments on commit f899110

Please sign in to comment.