Skip to content
Snippets Groups Projects
Commit 53d6e736 authored by Thomas  MUSSET's avatar Thomas MUSSET
Browse files

updated pom to v3.0.0-a.1, fix classes accordingly to new architecture, added...

updated pom to v3.0.0-a.1, fix classes accordingly to new architecture, added icon, updated .gitignore
parent 2e0d7476
No related branches found
No related tags found
No related merge requests found
.idea/ /build*
.settings/ /workspace
build/ setting.xml
release/
target/ target/
bin/ !.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
icy.log
### IntelliJ IDEA ###
.idea/
*.iws
*.iml *.iml
*.jar *.ipr
### Eclipse ###
.apt_generated
.classpath .classpath
.factorypath
.project .project
export.jardesc .settings
**/.DS_Store .springBeans
\ No newline at end of file .sts4-cache
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/
### VS Code ###
.vscode/
### Mac OS ###
**/.DS_Store
Icon?
\ No newline at end of file
...@@ -7,13 +7,11 @@ ...@@ -7,13 +7,11 @@
<parent> <parent>
<groupId>org.bioimageanalysis.icy</groupId> <groupId>org.bioimageanalysis.icy</groupId>
<artifactId>pom-icy</artifactId> <artifactId>pom-icy</artifactId>
<version>2.2.0</version> <version>3.0.0-a.1</version>
</parent> </parent>
<artifactId>convexify</artifactId> <artifactId>convexify</artifactId>
<version>3.0.0</version> <version>3.0.0-a.1</version>
<packaging>jar</packaging>
<name>Convexify</name> <name>Convexify</name>
<description> <description>
...@@ -21,6 +19,14 @@ ...@@ -21,6 +19,14 @@
</description> </description>
<dependencies> <dependencies>
<dependency>
<groupId>org.bioimageanalysis.icy</groupId>
<artifactId>kernel-extensions</artifactId>
</dependency>
<dependency>
<groupId>org.bioimageanalysis.icy</groupId>
<artifactId>ezplug</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.bioimageanalysis.icy</groupId> <groupId>org.bioimageanalysis.icy</groupId>
<artifactId>protocols</artifactId> <artifactId>protocols</artifactId>
...@@ -33,12 +39,16 @@ ...@@ -33,12 +39,16 @@
<groupId>org.bioimageanalysis.icy</groupId> <groupId>org.bioimageanalysis.icy</groupId>
<artifactId>3d-mesh-roi</artifactId> <artifactId>3d-mesh-roi</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.bioimageanalysis.icy</groupId>
<artifactId>vecmath</artifactId>
</dependency>
</dependencies> </dependencies>
<repositories> <repositories>
<repository> <repository>
<id>icy</id> <id>icy</id>
<url>https://icy-nexus.pasteur.fr/repository/Icy/</url> <url>https://nexus-icy.pasteur.cloud/repository/icy/</url>
</repository> </repository>
</repositories> </repositories>
</project> </project>
\ No newline at end of file
/* /*
* Copyright (c) 2010-2023. Institut Pasteur. * Copyright (c) 2010-2024. Institut Pasteur.
* *
* This file is part of Icy. * This file is part of Icy.
* Icy is free software: you can redistribute it and/or modify * Icy is free software: you can redistribute it and/or modify
...@@ -18,12 +18,19 @@ ...@@ -18,12 +18,19 @@
package plugins.adufour.roi; package plugins.adufour.roi;
import icy.roi.ROI; import org.bioimageanalysis.extension.kernel.roi.roi2d.ROI2DArea;
import icy.roi.ROI2D; import org.bioimageanalysis.extension.kernel.roi.roi2d.ROI2DPolygon;
import icy.roi.ROI3D; import org.bioimageanalysis.extension.kernel.roi.roi2d.ROI2DShape;
import icy.roi.ROIUtil; import org.bioimageanalysis.extension.kernel.roi.roi3d.ROI3DArea;
import icy.sequence.Sequence; import org.bioimageanalysis.icy.common.geom.point.Point3D;
import icy.type.point.Point3D; import org.bioimageanalysis.icy.extension.plugin.annotation_.IcyPluginIcon;
import org.bioimageanalysis.icy.extension.plugin.annotation_.IcyPluginName;
import org.bioimageanalysis.icy.model.roi.ROI;
import org.bioimageanalysis.icy.model.roi.ROI2D;
import org.bioimageanalysis.icy.model.roi.ROI3D;
import org.bioimageanalysis.icy.model.roi.ROIUtil;
import org.bioimageanalysis.icy.model.sequence.Sequence;
import org.jetbrains.annotations.NotNull;
import plugins.adufour.blocks.tools.roi.ROIBlock; import plugins.adufour.blocks.tools.roi.ROIBlock;
import plugins.adufour.blocks.util.VarList; import plugins.adufour.blocks.util.VarList;
import plugins.adufour.ezplug.EzPlug; import plugins.adufour.ezplug.EzPlug;
...@@ -33,23 +40,18 @@ import plugins.adufour.quickhull.QuickHull2D; ...@@ -33,23 +40,18 @@ import plugins.adufour.quickhull.QuickHull2D;
import plugins.adufour.quickhull.QuickHull3D; import plugins.adufour.quickhull.QuickHull3D;
import plugins.adufour.roi.mesh.polygon.ROI3DPolygonalMesh; import plugins.adufour.roi.mesh.polygon.ROI3DPolygonalMesh;
import plugins.adufour.vars.lang.VarROIArray; import plugins.adufour.vars.lang.VarROIArray;
import plugins.kernel.roi.roi2d.ROI2DArea;
import plugins.kernel.roi.roi2d.ROI2DPolygon;
import plugins.kernel.roi.roi2d.ROI2DShape;
import plugins.kernel.roi.roi3d.ROI3DArea;
import javax.vecmath.Point3d; import javax.vecmath.Point3d;
import java.awt.geom.Point2D; import java.awt.geom.Point2D;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@IcyPluginName("Convexify")
@IcyPluginIcon(path = "/convexify.png")
public class Convexify extends EzPlug implements ROIBlock { public class Convexify extends EzPlug implements ROIBlock {
private final EzVarSequence input = new EzVarSequence("Input sequence"); private final EzVarSequence input = new EzVarSequence("Input sequence");
private final EzVarBoolean replace = new EzVarBoolean("Replace existing ROI", false); private final EzVarBoolean replace = new EzVarBoolean("Replace existing ROI", false);
private final VarROIArray roiIN = new VarROIArray("List of ROI"); private final VarROIArray roiIN = new VarROIArray("List of ROI");
private final VarROIArray roiOUT = new VarROIArray("List of ROI"); private final VarROIArray roiOUT = new VarROIArray("List of ROI");
@Override @Override
...@@ -96,11 +98,11 @@ public class Convexify extends EzPlug implements ROIBlock { ...@@ -96,11 +98,11 @@ public class Convexify extends EzPlug implements ROIBlock {
* future. * future.
* @throws IllegalArgumentException if the specified ROI is not supported * @throws IllegalArgumentException if the specified ROI is not supported
*/ */
public static ROI createConvexROI(final ROI roi) throws IllegalArgumentException { public static @NotNull ROI createConvexROI(final ROI roi) throws IllegalArgumentException {
ROI output = null; ROI output = null;
try { try {
if (roi instanceof ROI2D) { if (roi instanceof final ROI2D roi2d) {
final List<Point2D> envelope; final List<Point2D> envelope;
if (roi instanceof ROI2DShape) { if (roi instanceof ROI2DShape) {
...@@ -118,12 +120,11 @@ public class Convexify extends EzPlug implements ROIBlock { ...@@ -118,12 +120,11 @@ public class Convexify extends EzPlug implements ROIBlock {
output = new ROI2DPolygon(envelope); output = new ROI2DPolygon(envelope);
// copy position info // copy position info
final ROI2D roi2d = (ROI2D) roi;
((ROI2D) output).setT(roi2d.getT()); ((ROI2D) output).setT(roi2d.getT());
((ROI2D) output).setZ(roi2d.getZ()); ((ROI2D) output).setZ(roi2d.getZ());
((ROI2D) output).setC(roi2d.getC()); ((ROI2D) output).setC(roi2d.getC());
} }
else if (roi instanceof ROI3D) { else if (roi instanceof final ROI3D roi3d) {
final Point3D[] points = ((ROI3D) roi).getBooleanMask(true).getContourPoints(); final Point3D[] points = ((ROI3D) roi).getBooleanMask(true).getContourPoints();
// convert to vecmath's Point3d // convert to vecmath's Point3d
...@@ -140,7 +141,6 @@ public class Convexify extends EzPlug implements ROIBlock { ...@@ -140,7 +141,6 @@ public class Convexify extends EzPlug implements ROIBlock {
output = new ROI3DPolygonalMesh(qhull); output = new ROI3DPolygonalMesh(qhull);
// copy position info // copy position info
final ROI3D roi3d = (ROI3D) roi;
((ROI3D) output).setT(roi3d.getT()); ((ROI3D) output).setT(roi3d.getT());
((ROI3D) output).setC(roi3d.getC()); ((ROI3D) output).setC(roi3d.getC());
} }
...@@ -162,12 +162,12 @@ public class Convexify extends EzPlug implements ROIBlock { ...@@ -162,12 +162,12 @@ public class Convexify extends EzPlug implements ROIBlock {
} }
@Override @Override
public void declareInput(final VarList inputMap) { public void declareInput(final @NotNull VarList inputMap) {
inputMap.add("Regions of interest", roiIN); inputMap.add("Regions of interest", roiIN);
} }
@Override @Override
public void declareOutput(final VarList outputMap) { public void declareOutput(final @NotNull VarList outputMap) {
outputMap.add("Regions of interest", roiOUT); outputMap.add("Regions of interest", roiOUT);
} }
} }
src/main/resources/convexify.png

7.25 KiB

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment