fixed small javadoc / invalid char issues

parent 5b94176c
......@@ -357,7 +357,7 @@ public class Canvas2D extends IcyCanvas2D implements ROITaskListener
final double destAngle;
// shift action --> limit to 45 rotation
// shift action --> limit to 45° rotation
if (EventUtil.isShiftDown(e))
destAngle = Math.rint((mapStartRotationZ + angle) * (8d / (2 * Math.PI))) * ((2 * Math.PI) / 8d);
else
......@@ -1026,7 +1026,7 @@ public class Canvas2D extends IcyCanvas2D implements ROITaskListener
final double destAngle;
// shift action --> limit to 45 rotation
// shift action --> limit to 45° rotation
if (shift)
destAngle = Math.rint((startRotationZ + angle) * (8d / (2 * Math.PI))) * ((2 * Math.PI) / 8d);
else
......@@ -3210,7 +3210,7 @@ public class Canvas2D extends IcyCanvas2D implements ROITaskListener
});
// and in canvas
canvasView.setZoomMessage("Zoom : " + zoomInfo + " %", 500);
canvasView.setZoomMessage("Zoom : " + zoomInfo + " \u0025", 500);
}
else if (type == IcyCanvasEventType.ROTATION_CHANGED)
{
......@@ -3236,7 +3236,7 @@ public class Canvas2D extends IcyCanvas2D implements ROITaskListener
});
// and in canvas
canvasView.setRotationMessage("Rotation : " + rotInfo + " ", 500);
canvasView.setRotationMessage("Rotation : " + rotInfo + " \u00B0", 500);
}
// refresh canvas
......
......@@ -196,12 +196,12 @@ public class Canvas2DSettingPanel extends JPanel
{
// subPanel.add(GuiUtil.createLineBoxPanel(Box.createHorizontalStrut(4),
// GuiUtil.createFixedWidthBoldLabel("Zoom", 70), zoomComboBox,
// GuiUtil.createFixedWidthBoldLabel("%", 20), Box.createHorizontalGlue(), zoomMinus,
// GuiUtil.createFixedWidthBoldLabel("\u0025", 20), Box.createHorizontalGlue(), zoomMinus,
// Box.createHorizontalStrut(4), zoomPlus, Box.createHorizontalStrut(4)));
// subPanel.add(Box.createVerticalStrut(4));
// subPanel.add(GuiUtil.createLineBoxPanel(Box.createHorizontalStrut(4),
// GuiUtil.createFixedWidthBoldLabel("Rotation", 70), rotationComboBox,
// GuiUtil.createFixedWidthBoldLabel("", 20), Box.createHorizontalGlue(), rotateUnclock,
// GuiUtil.createFixedWidthBoldLabel("\u00B0", 20), Box.createHorizontalGlue(), rotateUnclock,
// Box.createHorizontalStrut(4), rotateClock, Box.createHorizontalStrut(4)));
setLayout(new BorderLayout());
......@@ -284,7 +284,7 @@ public class Canvas2DSettingPanel extends JPanel
gbc_rotationComboBox.gridy = 1;
panel.add(rotationComboBox, gbc_rotationComboBox);
JLabel label_4 = new JLabel("");
JLabel label_4 = new JLabel("\u00B0");
label_4.setFont(new Font("Tahoma", Font.BOLD, 11));
GridBagConstraints gbc_label_4 = new GridBagConstraints();
gbc_label_4.anchor = GridBagConstraints.WEST;
......
......@@ -170,7 +170,7 @@ public class ImageJUtil
cal.pixelHeight = psy;
cal.pixelDepth = psz;
// default unit size icy
cal.setUnit("m");
cal.setUnit("\u00B5m");
}
final double ti = seq.getTimeInterval();
......
......@@ -2360,7 +2360,7 @@ public class BooleanMask2D implements Cloneable
perimeter += 1 + (Math.PI / 2);
break;
default: // assume triangle with 45 angle
default: // assume triangle with 45° angle
cornerEdges++;
sideEdges++;
perimeter += 1 + Math.sqrt(2);
......@@ -2380,13 +2380,13 @@ public class BooleanMask2D implements Cloneable
}
else
{
// consider 90 corner
// consider 90° corner
cornerEdges++;
perimeter += Math.sqrt(2);
}
break;
case 3: // classic border (180)
case 3: // classic border (180°)
switch (diagConnection)
{
default: // classic border
......@@ -2395,7 +2395,7 @@ public class BooleanMask2D implements Cloneable
break;
case 3:
// consider 225 interior corner
// consider 225° interior corner
cornerEdges += 0.5;
sideEdges += 0.5;
perimeter += 0.5 + (Math.sqrt(2) / 2);
......
......@@ -205,7 +205,7 @@ public abstract class ROIDescriptor
public abstract String getDescription();
/**
* Returns the unit of this descriptor (<code>ex: "px", "mm", "m2"...</code>).<br>
* Returns the unit of this descriptor (<code>ex: "px", "mm", "\u00B5m2"...</code>).<br>
* It can return an empty or <code>null</code> string (default implementation) if there is no
* specific unit attached to the descriptor.<br>
* Note that unit is concatenated to the name to build the title (column header) in the ROI
......
......@@ -1027,7 +1027,7 @@ public class MetaDataUtil
* @param metaData OME metadata
* @param series int
* @param defaultValue double
* @return Returns X pixel size (in m) of the specified image series.
* @return Returns X pixel size (in &micro;m) of the specified image series.
*/
public static double getPixelSizeX(OMEXMLMetadata metaData, int series, double defaultValue)
{
......@@ -1056,7 +1056,7 @@ public class MetaDataUtil
* @param metaData OME metadata
* @param series int
* @param defaultValue double
* @return Returns Y pixel size (in m) of the specified image series.
* @return Returns Y pixel size (in &micro;m) of the specified image series.
*/
public static double getPixelSizeY(OMEXMLMetadata metaData, int series, double defaultValue)
{
......@@ -1085,7 +1085,7 @@ public class MetaDataUtil
* @param metaData OME metadata
* @param series int
* @param defaultValue double
* @return Returns Z pixel size (in m) of the specified image series.
* @return Returns Z pixel size (in &micro;m) of the specified image series.
*/
public static double getPixelSizeZ(OMEXMLMetadata metaData, int series, double defaultValue)
{
......@@ -1184,7 +1184,7 @@ public class MetaDataUtil
}
/**
* Set X pixel size (in m) of the specified image series.
* Set X pixel size (in &micro;m) of the specified image series.
* @param metaData OME metadata
* @param series int
* @param value double
......@@ -1207,7 +1207,7 @@ public class MetaDataUtil
}
/**
* Set Y pixel size (in m) of the specified image series.
* Set Y pixel size (in &micro;m) of the specified image series.
* @param metaData OME metadata
* @param series int
* @param value double
......@@ -1230,7 +1230,7 @@ public class MetaDataUtil
}
/**
* Set Z pixel size (in m) of the specified image series.
* Set Z pixel size (in &micro;m) of the specified image series.
* @param metaData OME metadata
* @param series int
* @param value double
......@@ -1282,7 +1282,7 @@ public class MetaDataUtil
* @param c int
* @param t int
* @param z int
* @return Returns the X field position (in m) for the image at the specified Z, T, C position.
* @return Returns the X field position (in &micro;m) for the image at the specified Z, T, C position.
*/
public static double getPositionX(OMEXMLMetadata metaData, int series, int t, int z, int c, double defaultValue)
{
......@@ -1306,7 +1306,7 @@ public class MetaDataUtil
* @param c int
* @param t int
* @param z int
* @return Returns the Y field position (in m) for the image at the specified Z, T, C position.
* @return Returns the Y field position (in &micro;m) for the image at the specified Z, T, C position.
*/
public static double getPositionY(OMEXMLMetadata metaData, int series, int t, int z, int c, double defaultValue)
{
......@@ -1330,7 +1330,7 @@ public class MetaDataUtil
* @param c int
* @param t int
* @param z int
* @return Returns the Z field position (in m) for the image at the specified Z, T, C position.
* @return Returns the Z field position (in &micro;m) for the image at the specified Z, T, C position.
*/
public static double getPositionZ(OMEXMLMetadata metaData, int series, int t, int z, int c, double defaultValue)
{
......@@ -1509,7 +1509,7 @@ public class MetaDataUtil
}
/**
* Sets the X field position (in m) for the image at the specified Z, T, C position.
* Sets the X field position (in &micro;m) for the image at the specified Z, T, C position.
* @param metaData OME metadata
* @param series int
* @param value double
......@@ -1531,7 +1531,7 @@ public class MetaDataUtil
}
/**
* Sets the Y field position (in m) for the image at the specified Z, T, C position.
* Sets the Y field position (in &micro;m) for the image at the specified Z, T, C position.
* @param metaData OME metadata
* @param series int
* @param value double
......@@ -1553,7 +1553,7 @@ public class MetaDataUtil
}
/**
* Sets the Z field position (in m) for the image at the specified Z, T, C position.
* Sets the Z field position (in &micro;m) for the image at the specified Z, T, C position.
* @param metaData OME metadata
* @param series int
* @param value double
......
This diff is collapsed.
......@@ -120,7 +120,7 @@ public class OMEUtil
}
/**
* Convert specified Length to double value in m (for backward compatibility).<br>
* Convert specified Length to double value in &micro;m (for backward compatibility).<br>
* Return defaultValue if specified object is <code>null</code>.
*/
public static double getValue(Length obj, double defaultValue)
......@@ -176,7 +176,7 @@ public class OMEUtil
}
/**
* Return a Length object representing the specified value (in m)
* Return a Length object representing the specified value (in &micro;m)
*/
public static Length getLength(double value)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment