Skip to content

Commit 796d53e

Browse files
committed
Fix javadoc errors and warnings.
1 parent b202909 commit 796d53e

66 files changed

Lines changed: 718 additions & 292 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
* it under the terms of the GNU General Public License as
99
* published by the Free Software Foundation, either version 3 of the
1010
* License, or (at your option) any later version.
11-
*
11+
*
1212
* This program is distributed in the hope that it will be useful,
1313
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1414
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1515
* GNU General Public License for more details.
16-
*
16+
*
1717
* You should have received a copy of the GNU General Public
1818
* License along with this program. If not, see
1919
* <http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -257,7 +257,7 @@ public String getName()
257257

258258
/**
259259
* Set the name of this Spot.
260-
*
260+
*
261261
* @param name
262262
* the name to use.
263263
*/
@@ -284,7 +284,7 @@ public String toString()
284284

285285
/**
286286
* Return a string representation of this spot, with calculated features.
287-
*
287+
*
288288
* @return a string representation of the spot.
289289
*/
290290
public String echo()
@@ -369,10 +369,14 @@ public void putFeature( final String feature, final Double value )
369369
}
370370

371371
/**
372-
* Copy the listed features of the spot src to the current spot
373-
*
372+
* Copy the listed features of the source spot to this spot.
373+
*
374+
* @param src
375+
* the source spot.
376+
* @param features
377+
* the features to copy.
374378
*/
375-
public void copyFeatures( Spot src, final Map< String, Double > features )
379+
public void copyFeatures( final Spot src, final Map< String, Double > features )
376380
{
377381
if ( null == features || features.isEmpty() )
378382
return;

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
* it under the terms of the GNU General Public License as
99
* published by the Free Software Foundation, either version 3 of the
1010
* License, or (at your option) any later version.
11-
*
11+
*
1212
* This program is distributed in the hope that it will be useful,
1313
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1414
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1515
* GNU General Public License for more details.
16-
*
16+
*
1717
* You should have received a copy of the GNU General Public
1818
* License along with this program. If not, see
1919
* <http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -61,12 +61,14 @@ public SpotRoi copy()
6161
/**
6262
* Returns a new <code>int</code> array containing the X pixel coordinates
6363
* to which to paint this polygon.
64-
*
64+
*
6565
* @param calibration
6666
* the pixel size in X, to convert physical coordinates to pixel
6767
* coordinates.
6868
* @param xcorner
6969
* the top-left X corner of the view in the image to paint.
70+
* @param spotXCenter
71+
* the X coordinate of the spot center.
7072
* @param magnification
7173
* the magnification of the view.
7274
* @return a new <code>int</code> array.
@@ -85,12 +87,14 @@ public double[] toPolygonX( final double calibration, final double xcorner, fina
8587
/**
8688
* Returns a new <code>int</code> array containing the Y pixel coordinates
8789
* to which to paint this polygon.
88-
*
90+
*
8991
* @param calibration
9092
* the pixel size in Y, to convert physical coordinates to pixel
9193
* coordinates.
9294
* @param ycorner
9395
* the top-left Y corner of the view in the image to paint.
96+
* @param spotYCenter
97+
* the spot Y center in physical units.
9498
* @param magnification
9599
* the magnification of the view.
96100
* @return a new <code>int</code> array.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ public interface TrackMateFactoryBase< F extends TrackMateFactoryBase< F > > ext
5252
* {@value DetectorKeys#XML_ATTRIBUTE_DETECTOR_NAME} that saves the target
5353
* {@link SpotDetectorFactory} key.
5454
*
55+
* @param settings
56+
* the map to marshal.
57+
* @param element
58+
* the JDom element to update.
5559
* @return an error message if marshaling was unsuccessful. If successful,
5660
* returns <code>null</code>.
5761
*/

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,11 @@ else if ( imp.getType() == ImagePlus.COLOR_RGB )
128128
* launched by this plugin.
129129
*
130130
* @param trackmate
131+
* the {@link TrackMate} instance to use.
131132
* @param selectionModel
133+
* the {@link SelectionModel} to use.
132134
* @param displaySettings
135+
* the {@link DisplaySettings} to use.
133136
* @return a new sequence.
134137
*/
135138
protected WizardSequence createSequence( final TrackMate trackmate, final SelectionModel selectionModel, final DisplaySettings displaySettings )
@@ -143,7 +146,7 @@ protected WizardSequence createSequence( final TrackMate trackmate, final Select
143146
* {@link TrackMate} instance.
144147
*
145148
* @param imp
146-
*
149+
* the {@link ImagePlus} to operate on.
147150
* @return a new {@link Model} instance.
148151
*/
149152
protected Model createModel( final ImagePlus imp )
@@ -178,6 +181,10 @@ protected Settings createSettings( final ImagePlus imp )
178181
* Hook for subclassers: <br>
179182
* Creates the TrackMate instance that will be controlled in the GUI.
180183
*
184+
* @param model
185+
* the model to use.
186+
* @param settings
187+
* the settings to use.
181188
* @return a new {@link TrackMate} instance.
182189
*/
183190
protected TrackMate createTrackMate( final Model model, final Settings settings )

src/main/java/fiji/plugin/trackmate/action/CTCExporter.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
* it under the terms of the GNU General Public License as
99
* published by the Free Software Foundation, either version 3 of the
1010
* License, or (at your option) any later version.
11-
*
11+
*
1212
* This program is distributed in the hope that it will be useful,
1313
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1414
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1515
* GNU General Public License for more details.
16-
*
16+
*
1717
* You should have received a copy of the GNU General Public
1818
* License along with this program. If not, see
1919
* <http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -77,7 +77,7 @@
7777
* Cell-Tracking-Challenge convention.
7878
* <p>
7979
* See http://celltrackingchallenge.net/
80-
*
80+
*
8181
* @author Jean-Yves Tinevez
8282
*
8383
*/
@@ -173,7 +173,7 @@ public static String exportAll( final String exportRootFolder, final TrackMate t
173173

174174
/**
175175
* Saves the settings part as XML for reference.
176-
*
176+
*
177177
* @param exportRootFolder
178178
* the root folder for exporting.
179179
* @param saveId
@@ -183,6 +183,8 @@ public static String exportAll( final String exportRootFolder, final TrackMate t
183183
* the trackmate to export.
184184
* @param logger
185185
* a logger to report progress.
186+
* @throws IOException
187+
* if a problem happens during writing.
186188
*/
187189
public static void exportSettingsFile( final String exportRootFolder, final int saveId, final TrackMate trackmate, final Logger logger ) throws IOException
188190
{
@@ -202,7 +204,7 @@ public static void exportSettingsFile( final String exportRootFolder, final int
202204
* For instance the first id return will be '1', which means that the
203205
* original image data will be saved under the folder '01'. If '01' already
204206
* exists, then this method will return 2, etc.
205-
*
207+
*
206208
* @param exportRootFolder
207209
* the root folder in which to export the data.
208210
* @return an integer id that can be passed in the other method of this
@@ -269,7 +271,7 @@ public static void exportOriginalImageData( final String exportRootFolder, final
269271
* <p>
270272
* Only exports the spots that have a ROI, and write only the frames that
271273
* have at least one spot with a ROI.
272-
*
274+
*
273275
* @param exportRootFolder
274276
* the root of the export folder.
275277
* @param saveId
@@ -338,7 +340,7 @@ public static void exportSegmentationData( final String exportRootFolder, final
338340
final Function< Long, String > tifNameGen = nFrames > 999
339341
? i -> String.format( "man_seg%04d.tif", i )
340342
: i -> String.format( "man_seg%03d.tif", i );
341-
343+
342344
// Only save frames with spots in.
343345
for ( final int frame : framesToWrite )
344346
{
@@ -508,7 +510,7 @@ public static String exportTrackingData( final String exportRootFolder, final in
508510

509511
/**
510512
* Returns the folder in which the tracking data will be exported.
511-
*
513+
*
512514
* @param exportRootFolder
513515
* the root folder to export in.
514516
* @param saveId
@@ -559,7 +561,7 @@ private static final Model sanitizeAndCopy( final Model model )
559561
final Spot s2 = spots.get( j );
560562
final double r2 = s2.getFeature( Spot.RADIUS ).doubleValue();
561563
final double d = Math.sqrt( s1.squareDistanceTo( s2 ) );
562-
564+
563565
if ( fudgeFactor * r1 > ( d + r2 ) || fudgeFactor * r2 > ( d + r1 ) )
564566
{
565567
// They overlap too much. We must fix this.
@@ -609,7 +611,7 @@ private static final Model sanitizeAndCopy( final Model model )
609611
else
610612
sources.add( trackModel.getEdgeSource( edge ) );
611613
}
612-
614+
613615
model.beginUpdate();
614616
try
615617
{

src/main/java/fiji/plugin/trackmate/action/CaptureOverlayAction.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
* it under the terms of the GNU General Public License as
99
* published by the Free Software Foundation, either version 3 of the
1010
* License, or (at your option) any later version.
11-
*
11+
*
1212
* This program is distributed in the hope that it will be useful,
1313
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1414
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1515
* GNU General Public License for more details.
16-
*
16+
*
1717
* You should have received a copy of the GNU General Public
1818
* License along with this program. If not, see
1919
* <http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -120,7 +120,7 @@ public void execute( final TrackMate trackmate, final SelectionModel selectionMo
120120
TMUtils.getSpatialCalibration( imp ) );
121121
if ( whiteBackground )
122122
{
123-
ImageProcessor ip = imp2.getProcessor();
123+
final ImageProcessor ip = imp2.getProcessor();
124124
ip.invertLut();
125125
if ( imp2.getStackSize() > 1 )
126126
imp2.getStack().setColorModel( ip.getColorModel() );
@@ -153,6 +153,8 @@ public void execute( final TrackMate trackmate, final SelectionModel selectionMo
153153
* the first frame, inclusive, to capture.
154154
* @param last
155155
* the last frame, inclusive, to capture.
156+
* @param logger
157+
* a {@link Logger} to report capture progress.
156158
* @return a new ImagePlus.
157159
*/
158160
public static ImagePlus capture( final TrackMate trackmate, final int first, final int last, final Logger logger )

src/main/java/fiji/plugin/trackmate/action/LabelImgExporter.java

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
* it under the terms of the GNU General Public License as
99
* published by the Free Software Foundation, either version 3 of the
1010
* License, or (at your option) any later version.
11-
*
11+
*
1212
* This program is distributed in the hope that it will be useful,
1313
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1414
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1515
* GNU General Public License for more details.
16-
*
16+
*
1717
* You should have received a copy of the GNU General Public
1818
* License along with this program. If not, see
1919
* <http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -212,7 +212,7 @@ public static final ImagePlus createLabelImagePlus(
212212
* different from the track IDs and different for each spot.
213213
* @param labelIdPainting
214214
* specifies how to paint the label ID of spots.
215-
*
215+
*
216216
* @return a new {@link ImagePlus}.
217217
*/
218218
public static final ImagePlus createLabelImagePlus(
@@ -285,6 +285,10 @@ public static final ImagePlus createLabelImagePlus(
285285
* the desired dimensions of the output image (width, height,
286286
* nZSlices, nFrames) as a 4 element long array. Spots outside
287287
* these dimensions are ignored.
288+
* @param calibration
289+
* the desired calibration of the output image (pixel width,
290+
* pixel height, pixel depth, frame interval) as a 4 element
291+
* double array.
288292
* @param exportSpotsAsDots
289293
* if <code>true</code>, spots will be painted as single dots
290294
* instead their shape.
@@ -295,7 +299,7 @@ public static final ImagePlus createLabelImagePlus(
295299
* different from the track IDs and different for each spot.
296300
* @param labelIdPainting
297301
* specifies how to paint the label ID of spots.
298-
*
302+
*
299303
* @return a new {@link ImagePlus}.
300304
*/
301305
public static final ImagePlus createLabelImagePlus(
@@ -319,6 +323,10 @@ public static final ImagePlus createLabelImagePlus(
319323
* the desired dimensions of the output image (width, height,
320324
* nZSlices, nFrames) as a 4 element int array. Spots outside
321325
* these dimensions are ignored.
326+
* @param calibration
327+
* the desired calibration of the output image (pixel width,
328+
* pixel height, pixel depth, frame interval) as a 4 element
329+
* double array.
322330
* @param exportSpotsAsDots
323331
* if <code>true</code>, spots will be painted as single dots
324332
* instead their shape.
@@ -367,6 +375,10 @@ public static final ImagePlus createLabelImagePlus(
367375
* the desired dimensions of the output image (width, height,
368376
* nZSlices, nFrames) as a 4 element long array. Spots outside
369377
* these dimensions are ignored.
378+
* @param calibration
379+
* the desired calibration of the output image (pixel width,
380+
* pixel height, pixel depth, frame interval) as a 4 element
381+
* double array.
370382
* @param exportSpotsAsDots
371383
* if <code>true</code>, spots will be painted as single dots
372384
* instead their shape.
@@ -377,7 +389,7 @@ public static final ImagePlus createLabelImagePlus(
377389
* different from the track IDs and different for each spot.
378390
* @param labelIdPainting
379391
* specifies how to paint the label ID of spots.
380-
*
392+
*
381393
* @return a new {@link Img}.
382394
*/
383395
public static final Img< FloatType > createLabelImg(
@@ -401,6 +413,10 @@ public static final Img< FloatType > createLabelImg(
401413
* the desired dimensions of the output image (width, height,
402414
* nZSlices, nFrames) as a 4 element long array. Spots outside
403415
* these dimensions are ignored.
416+
* @param calibration
417+
* the desired calibration of the output image (pixel width,
418+
* pixel height, pixel depth, frame interval) as a 4 element
419+
* double.
404420
* @param exportSpotsAsDots
405421
* if <code>true</code>, spots will be painted as single dots
406422
* instead their shape.
@@ -471,27 +487,34 @@ public static final Img< FloatType > createLabelImg(
471487

472488

473489
/**
474-
* Creates a new label {@link ImgPlus} of {@link FloatType} where the spots
475-
* are painted with an ID. All visible spots are painted, whether they are
476-
* in a track or not.
477-
*
490+
* Creates a new label {@link ImgPlus} of specified pixel type where the
491+
* spots are painted with an ID. All visible spots are painted, whether they
492+
* are in a track or not.
493+
*
478494
* @param spots
479495
* the spots to paint.
480496
* @param dimensions
481497
* the desired dimensions of the output image (width, height,
482498
* nZSlices, nFrames) as a 4 element long array. Spots outside
483499
* these dimensions are ignored.
500+
* @param calibration
501+
* the desired calibration of the output image (pixel width,
502+
* pixel height, pixel depth, frame interval) as a 4 element
503+
* double array.
484504
* @param exportSpotsAsDots
485505
* if <code>true</code>, spots will be painted as single dots
486506
* instead of their shape.
487507
* @param labelIdPainting
488508
* specifies how to paint the label ID of spots. The
489509
* {@link LabelIdPainting#LABEL_IS_TRACK_ID} is not supported and
490510
* defaults to {@link LabelIdPainting#LABEL_IS_SPOT_ID}.
511+
* @param outputType
512+
* the output pixel type.
491513
* @param logger
492514
* a {@link Logger} instance, to report progress of the export
493515
* process.
494-
*
516+
* @param <T>
517+
* the pixel type of the output image.
495518
* @return a new {@link ImgPlus}.
496519
*/
497520
public static < T extends RealType< T > & NativeType< T > > ImgPlus< T > createLabelImg(

0 commit comments

Comments
 (0)