Tweak adding elements to the config panel.

Author: tinevez

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>.
@@ -102,16 +102,15 @@ public class WekaDetectorConfigurationPanel extends ConfigurationPanel
 
 	private final boolean is3D;
 
-	/**
-	 * Create the panel.
-	 */
 	public WekaDetectorConfigurationPanel( final Settings settings, final Model model )
 	{
 		@SuppressWarnings( "rawtypes" )
 		final ImgPlus img = TMUtils.rawWraps( settings.imp );
 		this.is3D = img.dimensionIndex( Axes.Z ) >= 0;
 		this.prefService = TMUtils.getContext().getService( PrefService.class );
 
+		int gridy = 0;
+
 		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 };
@@ -127,40 +126,45 @@ public WekaDetectorConfigurationPanel( final Settings settings, final Model mode
 		gbcLblDetector.insets = new Insets( 5, 5, 5, 0 );
 		gbcLblDetector.fill = GridBagConstraints.HORIZONTAL;
 		gbcLblDetector.gridx = 0;
-		gbcLblDetector.gridy = 0;
+		gbcLblDetector.gridy = gridy;
 		add( lblDetector, gbcLblDetector );
 
 		/*
 		 * Help text.
 		 */
+
+		gridy++;
+
 		final GridBagConstraints gbcLblHelptext = new GridBagConstraints();
 		gbcLblHelptext.anchor = GridBagConstraints.NORTH;
 		gbcLblHelptext.fill = GridBagConstraints.BOTH;
 		gbcLblHelptext.gridwidth = 3;
 		gbcLblHelptext.insets = new Insets( 5, 10, 5, 10 );
 		gbcLblHelptext.gridx = 0;
-		gbcLblHelptext.gridy = 1;
+		gbcLblHelptext.gridy = gridy;
 		add( GuiUtils.textInScrollPanel( GuiUtils.infoDisplay( WekaDetectorFactory.INFO_TEXT ) ), gbcLblHelptext );
 
 		/*
 		 * Channel selector.
 		 */
 
+		gridy++;
+
 		final JLabel lblSegmentInChannel = new JLabel( "Segment in channel:" );
 		lblSegmentInChannel.setFont( SMALL_FONT );
 		final GridBagConstraints gbcLblSegmentInChannel = new GridBagConstraints();
 		gbcLblSegmentInChannel.anchor = GridBagConstraints.EAST;
 		gbcLblSegmentInChannel.insets = new Insets( 5, 5, 5, 5 );
 		gbcLblSegmentInChannel.gridx = 0;
-		gbcLblSegmentInChannel.gridy = 2;
+		gbcLblSegmentInChannel.gridy = gridy;
 		add( lblSegmentInChannel, gbcLblSegmentInChannel );
 
 		sliderChannel = new JSlider();
 		final GridBagConstraints gbcSliderChannel = new GridBagConstraints();
 		gbcSliderChannel.fill = GridBagConstraints.HORIZONTAL;
 		gbcSliderChannel.insets = new Insets( 5, 5, 5, 5 );
 		gbcSliderChannel.gridx = 1;
-		gbcSliderChannel.gridy = 2;
+		gbcSliderChannel.gridy = gridy;
 		add( sliderChannel, gbcSliderChannel );
 
 		final JLabel labelChannel = new JLabel( "1" );
@@ -169,7 +173,7 @@ public WekaDetectorConfigurationPanel( final Settings settings, final Model mode
 		final GridBagConstraints gbcLabelChannel = new GridBagConstraints();
 		gbcLabelChannel.insets = new Insets( 5, 5, 5, 0 );
 		gbcLabelChannel.gridx = 2;
-		gbcLabelChannel.gridy = 2;
+		gbcLabelChannel.gridy = gridy;
 		add( labelChannel, gbcLabelChannel );
 
 		sliderChannel.addChangeListener( l -> labelChannel.setText( "" + sliderChannel.getValue() ) );
@@ -178,13 +182,15 @@ public WekaDetectorConfigurationPanel( final Settings settings, final Model mode
 		 * Model file.
 		 */
 
+		gridy++;
+
 		final JLabel lblCusstomModelFile = new JLabel( "Weka model file:" );
 		lblCusstomModelFile.setFont( FONT );
 		final GridBagConstraints gbcLblCusstomModelFile = new GridBagConstraints();
 		gbcLblCusstomModelFile.anchor = GridBagConstraints.SOUTHWEST;
 		gbcLblCusstomModelFile.insets = new Insets( 0, 5, 5, 5 );
 		gbcLblCusstomModelFile.gridx = 0;
-		gbcLblCusstomModelFile.gridy = 3;
+		gbcLblCusstomModelFile.gridy = gridy;
 		add( lblCusstomModelFile, gbcLblCusstomModelFile );
 
 		btnBrowse = new JButton( "Browse" );
@@ -194,31 +200,35 @@ public WekaDetectorConfigurationPanel( final Settings settings, final Model mode
 		gbcBtnBrowse.anchor = GridBagConstraints.SOUTHEAST;
 		gbcBtnBrowse.gridwidth = 2;
 		gbcBtnBrowse.gridx = 1;
-		gbcBtnBrowse.gridy = 3;
+		gbcBtnBrowse.gridy = gridy;
 		add( btnBrowse, gbcBtnBrowse );
 
+		gridy++;
+
 		modelFileTextField = new JTextField( "" );
 		modelFileTextField.setFont( SMALL_FONT );
 		final GridBagConstraints gbcTextField = new GridBagConstraints();
 		gbcTextField.gridwidth = 3;
 		gbcTextField.insets = new Insets( 0, 5, 5, 5 );
 		gbcTextField.fill = GridBagConstraints.BOTH;
 		gbcTextField.gridx = 0;
-		gbcTextField.gridy = 4;
+		gbcTextField.gridy = gridy;
 		add( modelFileTextField, gbcTextField );
 		modelFileTextField.setColumns( 10 );
 
 		/*
 		 * Class index.
 		 */
 
+		gridy++;
+		
 		final JLabel lblClassId = new JLabel( "Target class:" );
 		lblClassId.setFont( SMALL_FONT );
 		final GridBagConstraints gbcLblOverlapThreshold = new GridBagConstraints();
 		gbcLblOverlapThreshold.anchor = GridBagConstraints.EAST;
 		gbcLblOverlapThreshold.insets = new Insets( 5, 5, 5, 5 );
 		gbcLblOverlapThreshold.gridx = 0;
-		gbcLblOverlapThreshold.gridy = 5;
+		gbcLblOverlapThreshold.gridy = gridy;
 		add( lblClassId, gbcLblOverlapThreshold );
 
 		// For now we simply put a list of dummy class names.
@@ -231,20 +241,22 @@ public WekaDetectorConfigurationPanel( final Settings settings, final Model mode
 		gbcSliderClassId.fill = GridBagConstraints.HORIZONTAL;
 		gbcSliderClassId.insets = new Insets( 0, 0, 5, 5 );
 		gbcSliderClassId.gridx = 1;
-		gbcSliderClassId.gridy = 5;
+		gbcSliderClassId.gridy = gridy;
 		add( cmbboxClassId, gbcSliderClassId );
 
 		/*
 		 * Proba threshold.
 		 */
+		
+		gridy++;
 
 		final JLabel lblScoreTreshold = new JLabel( "Threshold on probability:" );
 		lblScoreTreshold.setFont( SMALL_FONT );
 		final GridBagConstraints gbcLblScoreTreshold = new GridBagConstraints();
 		gbcLblScoreTreshold.anchor = GridBagConstraints.EAST;
 		gbcLblScoreTreshold.insets = new Insets( 5, 5, 5, 5 );
 		gbcLblScoreTreshold.gridx = 0;
-		gbcLblScoreTreshold.gridy = 6;
+		gbcLblScoreTreshold.gridy = gridy;
 		add( lblScoreTreshold, gbcLblScoreTreshold );
 
 		ftfProbaThreshold = new JFormattedTextField( THRESHOLD_FORMAT );
@@ -255,12 +267,14 @@ public WekaDetectorConfigurationPanel( final Settings settings, final Model mode
 		gbcScore.fill = GridBagConstraints.HORIZONTAL;
 		gbcScore.insets = new Insets( 5, 5, 5, 5 );
 		gbcScore.gridx = 1;
-		gbcScore.gridy = 6;
+		gbcScore.gridy = gridy;
 		add( ftfProbaThreshold, gbcScore );
 
 		/*
 		 * Refresh class names.
 		 */
+		
+		gridy++;
 
 		final JButton btnClassNames = new JButton( "Refresh class names", MAGNIFIER_ICON );
 		btnClassNames.setFont( FONT );
@@ -269,7 +283,7 @@ public WekaDetectorConfigurationPanel( final Settings settings, final Model mode
 		gbcBtnClassNames.anchor = GridBagConstraints.SOUTHWEST;
 		gbcBtnClassNames.insets = new Insets( 5, 5, 5, 5 );
 		gbcBtnClassNames.gridx = 0;
-		gbcBtnClassNames.gridy = 7;
+		gbcBtnClassNames.gridy = gridy;
 		add( btnClassNames, gbcBtnClassNames );
 
 		/*
@@ -283,19 +297,21 @@ public WekaDetectorConfigurationPanel( final Settings settings, final Model mode
 		gbcBtnLastProba.anchor = GridBagConstraints.SOUTHEAST;
 		gbcBtnLastProba.insets = new Insets( 5, 5, 5, 5 );
 		gbcBtnLastProba.gridx = 1;
-		gbcBtnLastProba.gridy = 7;
+		gbcBtnLastProba.gridy = gridy;
 		add( btnLastProba, gbcBtnLastProba );
 
 		/*
 		 * Preview.
 		 */
 
+		gridy++;
+		
 		final GridBagConstraints gbcBtnPreview = new GridBagConstraints();
 		gbcBtnPreview.gridwidth = 3;
 		gbcBtnPreview.fill = GridBagConstraints.BOTH;
 		gbcBtnPreview.insets = new Insets( 5, 5, 5, 5 );
 		gbcBtnPreview.gridx = 0;
-		gbcBtnPreview.gridy = 8;
+		gbcBtnPreview.gridy = gridy;
 
 		previewer = new WekaDetectionPreviewer<>(
 				model,