4848import net .imglib2 .type .numeric .real .DoubleType ;
4949import net .imglib2 .view .Views ;
5050
51- import org .scijava .Cancelable ;
5251import org .scijava .function .Computers ;
5352import org .scijava .ops .spi .OpDependency ;
5453
9392 *@implNote op names='filter.tubeness'
9493 */
9594public class DefaultTubeness <T extends RealType <T >> implements
96- Computers .Arity4 <RandomAccessibleInterval <T >, ExecutorService , Double , double [], IterableInterval <DoubleType >>,
97- Cancelable {
95+ Computers .Arity4 <RandomAccessibleInterval <T >, ExecutorService , Double , double [], IterableInterval <DoubleType >>
96+ {
9897
99- /** Reason for cancelation, or null if not canceled. */
100- private String cancelReason ;
101-
10298 @ OpDependency (name = "create.imgFactory" )
10399 private Function <Dimensions , ImgFactory <DoubleType >> createFactoryOp ;
104-
100+
105101 //TODO: make sure this works
106102 @ OpDependency (name = "project" )
107103 private Computers .Arity3 <RandomAccessibleInterval <DoubleType >, Computers .Arity1 <Iterable <DoubleType >, DoubleType >, Integer , IterableInterval <DoubleType >> projector ;
108104
109- /**
110- * TODO
111- *
112- * @param input
113- * @param executorService
114- * @param sigma
115- * @param calibration
116- * @param output
117- */
118105 @ Override
119106 public void compute (final RandomAccessibleInterval <T > input , ExecutorService es , final Double sigma ,
120- final double [] calibration , final IterableInterval <DoubleType > tubeness ) {
121- cancelReason = null ;
107+ final double [] calibration , final IterableInterval <DoubleType > tubeness )
108+ {
122109
123110 final int numDimensions = input .numDimensions ();
124111 // Sigmas in pixel units.
@@ -156,16 +143,10 @@ public void compute(final RandomAccessibleInterval<T> input, ExecutorService es,
156143 HessianMatrix .calculateMatrix (Views .extendBorder (input ), gaussian , gradient , hessian ,
157144 new OutOfBoundsBorderFactory <>(), nThreads , es , sigma );
158145
159- if (isCanceled ())
160- return ;
161-
162146 // Hessian eigenvalues.
163147 final RandomAccessibleInterval <DoubleType > evs = TensorEigenValues .calculateEigenValuesSymmetric (hessian ,
164148 TensorEigenValues .createAppropriateResultImg (hessian , factory , new DoubleType ()), nThreads , es );
165149
166- if (isCanceled ())
167- return ;
168-
169150 final Computers .Arity1 <Iterable <DoubleType >, DoubleType > method ;
170151 switch (numDimensions ) {
171152 case 2 :
@@ -205,7 +186,6 @@ public void compute(final Iterable<DoubleType> input, final DoubleType output) {
205186 output .setZero ();
206187 else
207188 output .set (sigma * sigma * Math .abs (val ));
208-
209189 }
210190 }
211191
@@ -228,28 +208,8 @@ public void compute(final Iterable<DoubleType> input, final DoubleType output) {
228208 output .setZero ();
229209 else
230210 output .set (sigma * sigma * Math .sqrt (val1 * val2 ));
231-
232211 }
233212 }
234-
235- // -- Cancelable methods --
236-
237- @ Override
238- public boolean isCanceled () {
239- return cancelReason != null ;
240- }
241-
242- /** Cancels the command execution, with the given reason for doing so. */
243- @ Override
244- public void cancel (final String reason ) {
245- cancelReason = reason == null ? "" : reason ;
246- }
247-
248- @ Override
249- public String getCancelReason () {
250- return cancelReason ;
251- }
252-
253213}
254214
255215/**
@@ -261,18 +221,9 @@ class DefaultTubenessWithoutCalibration<T extends RealType<T>> implements
261221 @ OpDependency (name = "filter.tubeness" )
262222 Computers .Arity4 <RandomAccessibleInterval <T >, ExecutorService , Double , double [], IterableInterval <DoubleType >> tubenessOp ;
263223
264- /**
265- * TODO
266- *
267- * @param input
268- * @param executorService
269- * @param sigma
270- * @param output
271- */
272224 @ Override
273225 public void compute (RandomAccessibleInterval <T > in1 , ExecutorService in2 , Double in3 ,
274226 IterableInterval <DoubleType > out ) {
275227 tubenessOp .compute (in1 , in2 , in3 , new double [] {}, out );
276228 }
277-
278229}
0 commit comments