Really disable log messages for feature computation when we ask them to be off.

Author: tinevez

src/main/java/fiji/plugin/trackmate/TrackMate.java

@@ -160,7 +160,7 @@ public boolean computeSpotFeatures( final boolean doLogIt )
 		cancelables.clear();
 
 		final Logger logger = model.getLogger();
-		final SpotFeatureCalculator calculator = new SpotFeatureCalculator( model, settings );
+		final SpotFeatureCalculator calculator = new SpotFeatureCalculator( model, settings, doLogIt );
 		cancelables.add( calculator );
 		calculator.setNumThreads( numThreads );
 		if ( calculator.checkInput() && calculator.process() )
@@ -201,7 +201,7 @@ public boolean computeEdgeFeatures( final boolean doLogIt )
 		cancelables.clear();
 
 		final Logger logger = model.getLogger();
-		final EdgeFeatureCalculator calculator = new EdgeFeatureCalculator( model, settings );
+		final EdgeFeatureCalculator calculator = new EdgeFeatureCalculator( model, settings, doLogIt );
 		cancelables.add( calculator );
 		calculator.setNumThreads( numThreads );
 		if ( !calculator.checkInput() || !calculator.process() )
@@ -235,7 +235,7 @@ public boolean computeTrackFeatures( final boolean doLogIt )
 		cancelables.clear();
 
 		final Logger logger = model.getLogger();
-		final TrackFeatureCalculator calculator = new TrackFeatureCalculator( model, settings );
+		final TrackFeatureCalculator calculator = new TrackFeatureCalculator( model, settings, doLogIt );
 		cancelables.add( calculator );
 		calculator.setNumThreads( numThreads );
 		if ( calculator.checkInput() && calculator.process() )

src/main/java/fiji/plugin/trackmate/features/EdgeFeatureCalculator.java

@@ -55,10 +55,13 @@ public class EdgeFeatureCalculator extends MultiThreadedBenchmarkAlgorithm imple
 
 	private String cancelReason;
 
-	public EdgeFeatureCalculator( final Model model, final Settings settings )
+	private final boolean doLogIt;
+
+	public EdgeFeatureCalculator( final Model model, final Settings settings, final boolean doLogIt )
 	{
 		this.settings = settings;
 		this.model = model;
+		this.doLogIt = doLogIt;
 	}
 
 	/*
@@ -102,7 +105,7 @@ public boolean process()
 		}
 
 		// Do it.
-		computeEdgeFeaturesAgent( model.getTrackModel().edgeSet(), settings.getEdgeAnalyzers(), true );
+		computeEdgeFeaturesAgent( model.getTrackModel().edgeSet(), settings.getEdgeAnalyzers(), doLogIt );
 
 		final long end = System.currentTimeMillis();
 		processingTime = end - start;

src/main/java/fiji/plugin/trackmate/features/ModelFeatureUpdater.java

@@ -66,9 +66,11 @@ public class ModelFeatureUpdater implements ModelChangeListener, MultiThreaded
 	public ModelFeatureUpdater( final Model model, final Settings settings )
 	{
 		this.model = model;
-		this.spotFeatureCalculator = new SpotFeatureCalculator( model, settings );
-		this.edgeFeatureCalculator = new EdgeFeatureCalculator( model, settings );
-		this.trackFeatureCalculator = new TrackFeatureCalculator( model, settings );
+		// don't log feature computation for updates.
+		final boolean doLogIt = false;
+		this.spotFeatureCalculator = new SpotFeatureCalculator( model, settings, doLogIt );
+		this.edgeFeatureCalculator = new EdgeFeatureCalculator( model, settings, doLogIt );
+		this.trackFeatureCalculator = new TrackFeatureCalculator( model, settings, doLogIt );
 		model.addModelChangeListener( this );
 		setNumThreads();
 	}
@@ -81,7 +83,7 @@ public ModelFeatureUpdater( final Model model, final Settings settings )
 	public void modelChanged( final ModelChangeEvent event )
 	{
 		if ( event.getEventID() != ModelChangeEvent.MODEL_MODIFIED )
-		{ return; }
+			return;
 
 		// Build spot list
 		final ArrayList< Spot > spots = new ArrayList<>( event.getSpots().size() );

src/main/java/fiji/plugin/trackmate/features/SpotFeatureCalculator.java

@@ -66,10 +66,13 @@ public class SpotFeatureCalculator extends MultiThreadedBenchmarkAlgorithm imple
 
 	private String cancelReason;
 
-	public SpotFeatureCalculator( final Model model, final Settings settings )
+	private final boolean doLogIt;
+
+	public SpotFeatureCalculator( final Model model, final Settings settings, final boolean doLogIt )
 	{
 		this.settings = settings;
 		this.model = model;
+		this.doLogIt = doLogIt;
 	}
 
 	/*
@@ -116,7 +119,7 @@ public boolean process()
 		}
 
 		// Do it.
-		computeSpotFeaturesAgent( model.getSpots(), settings.getSpotAnalyzerFactories(), true );
+		computeSpotFeaturesAgent( model.getSpots(), settings.getSpotAnalyzerFactories(), doLogIt );
 		return true;
 	}
 
@@ -149,6 +152,7 @@ private void computeSpotFeaturesAgent( final SpotCollection toCompute, final Lis
 		final long start = System.currentTimeMillis();
 		final Logger logger = doLogIt ? model.getLogger() : Logger.VOID_LOGGER;
 
+
 		// Can't compute any spot feature without an image to compute on.
 		if ( settings.imp == null )
 			return;
@@ -200,6 +204,7 @@ public Void call() throws Exception
 							if ( isCanceled() )
 								return null;
 
+
 							@SuppressWarnings( "unchecked" )
 							final SpotAnalyzer< ? > analyzer = factory.getAnalyzer( img, frame, channel );
 							// Fine-tune multithreading if we can.
@@ -234,6 +239,7 @@ public Void call() throws Exception
 		executorService.shutdown();
 		logger.setProgress( 1 );
 		logger.setStatus( "" );
+
 		final long end = System.currentTimeMillis();
 		processingTime = end - start;
 	}

src/main/java/fiji/plugin/trackmate/features/TrackFeatureCalculator.java

@@ -54,10 +54,13 @@ public class TrackFeatureCalculator extends MultiThreadedBenchmarkAlgorithm impl
 
 	private String cancelReason;
 
-	public TrackFeatureCalculator( final Model model, final Settings settings )
+	private final boolean doLogIt;
+
+	public TrackFeatureCalculator( final Model model, final Settings settings, final boolean doLogIt )
 	{
 		this.settings = settings;
 		this.model = model;
+		this.doLogIt = doLogIt;
 	}
 
 	/*
@@ -101,7 +104,7 @@ public boolean process()
 		}
 
 		// Do it.
-		computeTrackFeaturesAgent( model.getTrackModel().trackIDs( false ), settings.getTrackAnalyzers(), true );
+		computeTrackFeaturesAgent( model.getTrackModel().trackIDs( false ), settings.getTrackAnalyzers(), doLogIt );
 
 		final long end = System.currentTimeMillis();
 		processingTime = end - start;