Merge pull request #3 from trackmate-sc/v8-new

Adapt to the TrackMate v8 API

Author: tinevez

pom.xml

@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>34.0.0</version>
+		<version>43.0.0</version>
 		<relativePath />
 	</parent>
 
 	<groupId>sc.fiji</groupId>
 	<artifactId>TrackMate-Weka</artifactId>
-	<version>1.3.2-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 
 	<name>TrackMate-Weka</name>
 	<description>TrackMate detector based on the Weka trainable segmentation plugin.</description>
@@ -84,9 +84,7 @@
 		<!-- NB: Deploy releases to the SciJava Maven repository. -->
 		<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
 
-		<javaGeom.version>0.11.1</javaGeom.version>
-
-		<TrackMate.version>7.10.2</TrackMate.version>
+		<TrackMate.version>8.0.0</TrackMate.version>
 	</properties>
 
 	<dependencies>
@@ -131,13 +129,6 @@
 			<artifactId>scijava-common</artifactId>
 		</dependency>
 
-		<!-- Other dependencies -->
-		<dependency>
-			<groupId>math.geom2d</groupId>
-			<artifactId>javaGeom</artifactId>
-			<version>${javaGeom.version}</version>
-		</dependency>
-
 		<!-- Test dependencies -->
 		<dependency>
 			<groupId>junit</groupId>

src/main/java/fiji/plugin/trackmate/weka/WekaDetectorConfigurationPanel.java

@@ -8,12 +8,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -26,6 +26,7 @@
 import static fiji.plugin.trackmate.gui.Fonts.FONT;
 import static fiji.plugin.trackmate.gui.Fonts.SMALL_FONT;
 import static fiji.plugin.trackmate.gui.Icons.MAGNIFIER_ICON;
+import static fiji.plugin.trackmate.weka.WekaDetectorFactory.ICON;
 import static fiji.plugin.trackmate.weka.WekaDetectorFactory.KEY_CLASSIFIER_FILEPATH;
 import static fiji.plugin.trackmate.weka.WekaDetectorFactory.KEY_CLASS_INDEX;
 import static fiji.plugin.trackmate.weka.WekaDetectorFactory.KEY_PROBA_THRESHOLD;
@@ -36,7 +37,6 @@
 import java.awt.Insets;
 import java.beans.PropertyChangeListener;
 import java.io.File;
-import java.net.URL;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.Arrays;
@@ -46,7 +46,6 @@
 import java.util.Vector;
 
 import javax.swing.DefaultComboBoxModel;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JFormattedTextField;
@@ -80,8 +79,6 @@ public class WekaDetectorConfigurationPanel extends ConfigurationPanel
 
 	private static final NumberFormat THRESHOLD_FORMAT = new DecimalFormat( "#.##" );
 
-	protected static final ImageIcon ICON = new ImageIcon( getResource( "images/TrackMateWeka-logo-100px.png" ) );
-
 	private static final String TITLE = WekaDetectorFactory.NAME;
 
 	private static final FileFilter fileFilter = new FileNameExtensionFilter( "Weka classifier files.", "model" );
@@ -114,9 +111,8 @@ public WekaDetectorConfigurationPanel( final Settings settings, final Model mode
 
 		final GridBagLayout gridBagLayout = new GridBagLayout();
 		gridBagLayout.columnWidths = new int[] { 144, 0, 32 };
-		gridBagLayout.rowHeights = new int[] { 0, 84, 0, 27, 0, 0, 0, 0, 37, 23 };
+		gridBagLayout.rowHeights = new int[] { 0, 0, 0, 27, 0, 0, 0, 0, 150 };
 		gridBagLayout.columnWeights = new double[] { 0.0, 1.0, 0.0 };
-		gridBagLayout.rowWeights = new double[] { 0., 1., 0., 0., 0., 0., 0., 0., 0., 0. };
 		setLayout( gridBagLayout );
 
 		final JLabel lblDetector = new JLabel( TITLE, ICON, JLabel.RIGHT );
@@ -140,7 +136,13 @@ public WekaDetectorConfigurationPanel( final Settings settings, final Model mode
 		gbcLblHelptext.insets = new Insets( 5, 10, 5, 10 );
 		gbcLblHelptext.gridx = 0;
 		gbcLblHelptext.gridy = 1;
-		add( GuiUtils.textInScrollPanel( GuiUtils.infoDisplay( WekaDetectorFactory.INFO_TEXT ) ), gbcLblHelptext );
+		gbcLblHelptext.weighty = 1.;
+		add( GuiUtils.textInScrollPanel( GuiUtils.infoDisplay(
+				"<html>Online documentation: <br/>"
+						+ "<a href='" + WekaDetectorFactory.DOC_URL + "'>"
+						+ WekaDetectorFactory.DOC_URL
+						+ "</a></html>" ) ),
+				gbcLblHelptext );
 
 		/*
 		 * Channel selector.
@@ -433,9 +435,4 @@ public void run()
 			}
 		}.start();
 	}
-
-	protected static URL getResource( final String name )
-	{
-		return WekaDetectorFactory.class.getClassLoader().getResource( name );
-	}
 }