Skip to content
GitLab
Commit bcedad68 authored by Nico Mack's avatar Nico Mack
Browse files

Harmonization and Cleanup of Coronas and respective Builders. 

Deprecation of obsolete Coronas
parent 31f0e344
Hide whitespace changes
Inline Side-by-side
TULIP/config/externalization.properties
View file @ bcedad68
......@@ -109,6 +109,7 @@ STROKE_COLOUR_ELEMENT=strokeColour
LABEL_COLOUR_ELEMENT=labelColour
FACE_COLOUR_ELEMENT=faceColour
BEZEL_COLOUR_ELEMENT=bezelColour
TICKMARK_COLOUR_NODE=tickMarkColour
SELECTED_ELEMENT=selected
DESELECTED_ELEMENT=deselected
ABOVE_ELEMENT=above
......
TULIP/src/lu/list/itis/dkd/tui/bootstrapping/BootstrappingUtils.java
View file @ bcedad68
......@@ -632,14 +632,14 @@ public class BootstrappingUtils {
* @param rootElement
* @param childName
* @param optional
* @param defaultColour
* @param defaultAngle
* @return
* @throws BuildException
*/
// ---------------------------------------------------------------------------
public static double getContentAsAngle(Element rootElement, String childName, boolean optional, double defaultAngle) throws BuildException {
return getContentAsAngle(rootElement, childName, optional, defaultAngle, null);
public static double getContentAsRadians(Element rootElement, String childName, boolean optional, Double defaultAngle) throws BuildException {
return getContentAsRadians(rootElement, childName, optional, defaultAngle, null);
}
// ---------------------------------------------------------------------------
......@@ -647,14 +647,29 @@ public class BootstrappingUtils {
* @param rootElement
* @param childName
* @param optional
* @param defaultColour
* @param defaultAngle
* @return
* @throws BuildException
*/
// ---------------------------------------------------------------------------
public static double getContentAsDegrees(Element rootElement, String childName, boolean optional, Double defaultAngle) throws BuildException {
return getContentAsDegrees(rootElement, childName, optional, defaultAngle, null);
}
// ---------------------------------------------------------------------------
/**
* @param rootElement
* @param childName
* @param optional
* @param defaultAngle
* @param context
* @return
* @throws BuildException
*/
// ---------------------------------------------------------------------------
public static double getContentAsAngle(Element rootElement, String childName, boolean optional, double defaultAngle, BootstrapContext context) throws BuildException {
public static double getContentAsRadians(Element rootElement, String childName, boolean optional, Double defaultAngle, BootstrapContext context) throws BuildException {
double value = 0;
String contentAsString = Strings.nullToEmpty(getContent(rootElement, childName, context));
if (contentAsString.length() > 0) {
......@@ -682,4 +697,44 @@ public class BootstrappingUtils {
return value;
}
// ---------------------------------------------------------------------------
/**
* @param rootElement
* @param childName
* @param optional
* @param defaultAngle
* @param context
* @return
* @throws BuildException
*/
// ---------------------------------------------------------------------------
public static double getContentAsDegrees(Element rootElement, String childName, boolean optional, Double defaultAngle, BootstrapContext context) throws BuildException {
double value = 0;
String contentAsString = Strings.nullToEmpty(getContent(rootElement, childName, context));
if (contentAsString.length() > 0) {
Matcher angleMatcher = ANGLE_PATTERN.matcher(contentAsString);
if (angleMatcher.matches()) {
String angle = angleMatcher.group(1);
String unit = angleMatcher.group(2);
unit = (Strings.isNullOrEmpty(unit)) ? "deg" : unit.toLowerCase(); //$NON-NLS-1$
try {
value = Double.parseDouble(angle);
} catch (NumberFormatException exception) {
throw new BuildException("Value provide for " + childName + " node must be a decimal number. Specified value " + angle + " could not be interpreted as such!"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
if ("rad".equals(unit)) { //$NON-NLS-1$
value = Math.toDegrees(value);
}
}
} else {
if (optional)
value = defaultAngle;
else
throw new BuildException("Node " + childName + " is mandatory and MUST be provided!"); //$NON-NLS-1$//$NON-NLS-2$
}
return value;
}
}
TULIP/src/lu/list/itis/dkd/tui/utility/Externalization.java
View file @ bcedad68
......@@ -57,6 +57,7 @@ public class Externalization extends NLS {
public static String EDGE_COLOUR_NODE;
public static String EMPTY_STRING;
public static String FILL_COLOUR_NODE;
public static String TICKMARK_COLOUR_NODE;
public static String FONT_NODE;
public static String FONT_SIZE_NODE;
public static String GLOBAL_STATE_LISTENER_NODE;
......@@ -212,7 +213,7 @@ public class Externalization extends NLS {
public static String MARKER_BUILDER_NAMESPACE;
public static String POINTING_OFFSET_NODE;
public static String PATH_NODE;
......
TULIP/src/lu/list/itis/dkd/tui/utility/Point.java
View file @ bcedad68
......@@ -243,7 +243,7 @@ public class Point extends Float implements KdComparator<Point> {
this.x = (float) BootstrappingUtils.getContentAsDouble(rootNode, Externalization.X_NODE, BootstrappingUtils.OPTIONAL, 0.0, context);
this.y = (float) BootstrappingUtils.getContentAsDouble(rootNode, Externalization.Y_NODE, BootstrappingUtils.OPTIONAL, 0.0, context);
this.angle = (float) BootstrappingUtils.getContentAsAngle(rootNode, Externalization.Z_NODE, BootstrappingUtils.OPTIONAL, 0.0, context);
this.angle = (float) BootstrappingUtils.getContentAsRadians(rootNode, Externalization.Z_NODE, BootstrappingUtils.OPTIONAL, 0.0, context);
this.state = CoordinateStateBootstrapper.getCoordinateState(rootNode, this, context, callback);
//
//
......
TULIP/src/lu/list/itis/dkd/tui/widget/corona/Radius.java
View file @ bcedad68
......@@ -41,6 +41,7 @@ import java.awt.image.BufferedImage;
* @since 1.0
* @version 2.3.0
*/
@Deprecated
@NonNullByDefault
public class Radius extends Corona {
/** The radius of the ellipse {@link Shape}. */
......
TULIP/src/lu/list/itis/dkd/tui/widget/corona/Scale.java
View file @ bcedad68
package lu.list.itis.dkd.tui.widget.corona;
import lu.list.itis.dkd.tui.utility.Point;
import lu.list.itis.dkd.tui.utility.ScreenCoordinates;
import lu.list.itis.dkd.tui.widget.corona.builder.ScaleBuilder;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
import java.awt.geom.Area;
import java.awt.geom.Point2D;
import java.awt.image.BufferedImage;
......@@ -11,144 +14,141 @@ import eu.hansolo.steelseries.gauges.AbstractRadial;
import eu.hansolo.steelseries.gauges.Radial;
import eu.hansolo.steelseries.tools.BackgroundImageFactory;
import eu.hansolo.steelseries.tools.FrameType;
import eu.hansolo.steelseries.tools.GaugeType;
import eu.hansolo.steelseries.tools.Model;
import eu.hansolo.steelseries.tools.Orientation;
import eu.hansolo.steelseries.tools.TickmarkImageFactory;
import lu.list.itis.dkd.tui.utility.Point;
import lu.list.itis.dkd.tui.widget.corona.builder.ScaleBuilder;
/**
* @author nmack
* @date 27 Apr 2015
*
* <br>$Log: Gauge.java,v $
* <br>
* $Log: Gauge.java,v $
*/
//***************************************************************************
//* Class Definition and Members *
//***************************************************************************
public class Scale extends Corona
{
AbstractRadial scale;
int width;
int height;
BufferedImage rendered;
Rectangle bounds;
//***************************************************************************
//* Constants *
//***************************************************************************
protected static final TickmarkImageFactory TICKMARK_FACTORY = TickmarkImageFactory.INSTANCE;
protected static final BackgroundImageFactory BACKGROUND_FACTORY = BackgroundImageFactory.INSTANCE;
private static final int imageType = BufferedImage.TYPE_INT_ARGB; // BufferedImage.TYPE_4BYTE_ABGR; //BufferedImage.TYPE_INT_ARGB
//---------------------------------------------------------------------------
//***************************************************************************
//* Constructor(s) *
//***************************************************************************
//---------------------------------------------------------------------------
public Scale(ScaleBuilder builder)
{
super(builder);
width = (int)builder.width;
height = (int)builder.height;
scale = new Radial();
scale.setMinValue(builder.lowerBound);
scale.setMaxValue(builder.upperBound);
scale.setFrameType (FrameType.ROUND);
scale.setFrameVisible(false);
scale.setPostsVisible(false);
scale.setLcdVisible(false);
scale.setVisible(true);
scale.setSize(width, height);
scale.setLedVisible(false);
Model model = scale.getModel();
rendered = new BufferedImage(width,height,imageType);
bounds = new Rectangle (0,0,width,height);
BACKGROUND_FACTORY.createRadialBackground(width,
scale.getBackgroundColor(),
model.getCustomBackground(),
model.getTextureColor(),
rendered);
TICKMARK_FACTORY.create_RADIAL_TICKMARKS_Image(width,
model.getNiceMinValue(),
model.getNiceMaxValue(),
model.getMaxNoOfMinorTicks(),
model.getMaxNoOfMajorTicks(),
model.getMinorTickSpacing(),
model.getMajorTickSpacing(),
scale.getGaugeType(),
scale.getMinorTickmarkType(),
scale.getMajorTickmarkType(),
scale.isTickmarksVisible(),
scale.isTicklabelsVisible(),
model.isMinorTickmarksVisible(),
model.isMajorTickmarksVisible(),
scale.getLabelNumberFormat(),
scale.isTickmarkSectionsVisible(),
scale.getBackgroundColor(),
scale.getTickmarkColor(),
scale.isTickmarkColorFromThemeEnabled(),
scale.getTickmarkSections(),
scale.isSectionTickmarksOnly(),
scale.getSections(),
0.33f,
-0.04f,
new Point2D.Double((width/2),(height/2)),
new Point2D.Double(0, 0),
Orientation.NORTH,
model.getTicklabelOrientation(),
model.isNiceScale(),
model.isLogScale(),
rendered);
}
//---------------------------------------------------------------------------
//***************************************************************************
//* Primitives *
//***************************************************************************
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
//***************************************************************************
//* Class Body *
//***************************************************************************
//---------------------------------------------------------------------------
@Override
public void paint(Graphics2D canvas)
{
if (!active) return;
centre.toScreenCoordinates();
if(initialTranslation != null) initialTranslation.toScreenCoordinates();
Point drawAt = centre.add(initialTranslation);
AffineTransform rotation = new AffineTransform();
rotation.translate(drawAt.x, drawAt.y);
canvas.drawImage(rendered, rotation, null);
// clippingRegion.reset();
// clippingRegion.add(new Area(rotation.createTransformedShape(bounds)));
}
//---------------------------------------------------------------------------
//***************************************************************************
//* End of Class *
//***************************************************************************
//---------------------------------------------------------------------------
}
// ***************************************************************************
// * Class Definition and Members *
// ***************************************************************************
public class Scale extends Corona {
protected AbstractRadial scale;
protected int width;
protected int height;
protected Color fillColour;
protected Color tickMarkColour;
protected BufferedImage rendered;
protected Point scaleCentre;
// ***************************************************************************
// * Constants *
// ***************************************************************************
protected static final TickmarkImageFactory TICKMARK_FACTORY = TickmarkImageFactory.INSTANCE;
protected static final BackgroundImageFactory BACKGROUND_FACTORY = BackgroundImageFactory.INSTANCE;
private static final int imageType = BufferedImage.TYPE_INT_ARGB;
// ---------------------------------------------------------------------------
// ***************************************************************************
// * Constructor(s) *
// ***************************************************************************
// ---------------------------------------------------------------------------
/**
* @param builder
*/
public Scale(ScaleBuilder builder) {
super(builder);
width = (int) builder.width;
height = (int) builder.height;
tickMarkColour = builder.tickMarkColour;
scale = new Radial();
scale.setMinValue(builder.lowerBound);
scale.setMaxValue(builder.upperBound);
scale.setFrameType(FrameType.ROUND);
scale.setFrameVisible(false);
scale.setPostsVisible(false);
scale.setLcdVisible(false);
scale.setVisible(true);
scale.setSize(width, height);
scale.setLedVisible(false);
if (tickMarkColour != null) {
scale.setTickmarkColor(tickMarkColour);
scale.setTickmarkColorFromThemeEnabled(false);
}
Model model = scale.getModel();
rendered = new BufferedImage(width, height, imageType);
scaleCentre = new Point(width / 2, height / 2, 0, ScreenCoordinates.class);
// BACKGROUND_FACTORY.createRadialBackground(width,
// scale.getBackgroundColor(),
// model.getCustomBackground(),
// model.getTextureColor(),
// rendered);
TICKMARK_FACTORY.create_RADIAL_TICKMARKS_Image(width,
model.getNiceMinValue(),
model.getNiceMaxValue(),
model.getMaxNoOfMinorTicks(),
model.getMaxNoOfMajorTicks(),
model.getMinorTickSpacing(),
model.getMajorTickSpacing(),
scale.getGaugeType(),
scale.getMinorTickmarkType(),
scale.getMajorTickmarkType(),
scale.isTickmarksVisible(),
scale.isTicklabelsVisible(),
model.isMinorTickmarksVisible(),
model.isMajorTickmarksVisible(),
scale.getLabelNumberFormat(),
scale.isTickmarkSectionsVisible(),
scale.getBackgroundColor(),
scale.getTickmarkColor(),
scale.isTickmarkColorFromThemeEnabled(),
scale.getTickmarkSections(),
scale.isSectionTickmarksOnly(),
scale.getSections(),
0.33f,
-0.04f,
new Point2D.Double((width / 2), (height / 2)),
new Point2D.Double(0, 0),
Orientation.NORTH,
model.getTicklabelOrientation(),
model.isNiceScale(),
model.isLogScale(),
rendered);
}
// ---------------------------------------------------------------------------
// ***************************************************************************
// * Primitives *
// ***************************************************************************
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// ***************************************************************************
// * Class Body *
// ***************************************************************************
// ---------------------------------------------------------------------------
@Override
public void paint(Graphics2D canvas) {
if (!active)
return;
AffineTransform transform = this.getTransform(scaleCentre);
canvas.drawImage(rendered, transform, null);
}
// ---------------------------------------------------------------------------
// ***************************************************************************
// * End of Class *
// ***************************************************************************
// ---------------------------------------------------------------------------
}
TULIP/src/lu/list/itis/dkd/tui/widget/corona/Sector.java
View file @ bcedad68
......@@ -41,7 +41,6 @@ public class Sector extends IndexedCorona {
private ColorPair fillColour;
private ColorPair strokeColour;
private ColorPair textColour;
private String label;
private Shape curvedText;
private Stroke borderStroke;
......@@ -65,7 +64,6 @@ public class Sector extends IndexedCorona {
public Sector(SectorBuilder builder) {
super(builder);
// index = builder.index;
outerRadius = builder.outerRadius;
innerRadius = builder.innerRadius;
fillColour = builder.fillColour;
......@@ -128,7 +126,6 @@ public class Sector extends IndexedCorona {
// * Class Body *
// ***************************************************************************
// ---------------------------------------------------------------------------
/**
* toggles selection state of this sector.
*
......@@ -136,6 +133,8 @@ public class Sector extends IndexedCorona {
* specify <code>true</code> to select this sector, <code>false</code> to de-select this
* sector
*/
// ---------------------------------------------------------------------------
@Override
public void setSelected(boolean selectIt) {
super.setSelected(selectIt);
......@@ -154,19 +153,6 @@ public class Sector extends IndexedCorona {
Graphics2D localCanvas = (Graphics2D) canvas.create();
localCanvas.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
// centre.toScreenCoordinates();
// if (initialTranslation != null) {
// initialTranslation.toScreenCoordinates();
// }
//
// Point drawAt = centre.add(initialTranslation);
//
// AffineTransform sectorTransform = new AffineTransform();
// sectorTransform.translate(drawAt.x, drawAt.y);
// if (this.rotateWithHandle)
// sectorTransform.rotate(drawAt.getAngle());
// Shape transformed = sectorTransform.createTransformedShape(sector);
AffineTransform transform = this.getTransform(null);
Shape transformed = transform.createTransformedShape(sector);
......
TULIP/src/lu/list/itis/dkd/tui/widget/corona/Shadow.java
View file @ bcedad68
......@@ -37,6 +37,7 @@ import java.awt.geom.AffineTransform;
* @since 1.0
* @version 2.3.0
*/
@Deprecated
@NonNullByDefault
public class Shadow extends Corona {
/**
......
TULIP/src/lu/list/itis/dkd/tui/widget/corona/TextBox.java
View file @ bcedad68
......@@ -44,6 +44,7 @@ import java.awt.geom.AffineTransform;
* @since 1.0
* @version 2.3.0
*/
@Deprecated
@NonNullByDefault
public class TextBox extends Corona implements ContextEventListener, InformationReceiver<String> {
/** Field holding the text to visualise. */
......
TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/CoronaBuilder.java
View file @ bcedad68
......@@ -143,7 +143,7 @@ public abstract class CoronaBuilder<B extends CoronaBuilder<B>> {
}
drawPriority = BootstrappingUtils.getContentAsInteger(rootElement, Externalization.DRAW_PRIORITY_NODE, BootstrappingUtils.MANDATORY, 0, context);
initialRotation = BootstrappingUtils.getContentAsAngle(rootElement, Externalization.INITIAL_ROTATION_NODE, BootstrappingUtils.OPTIONAL, 0.0, context);
initialRotation = BootstrappingUtils.getContentAsRadians(rootElement, Externalization.INITIAL_ROTATION_NODE, BootstrappingUtils.OPTIONAL, 0.0, context);
initialTranslation = new Point(rootElement.getChild(Externalization.INITIAL_TRANSLATION_NODE), context, callback);
......
TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/ScaleBuilder.java
View file @ bcedad68
package lu.list.itis.dkd.tui.widget.corona.builder;
import lu.list.itis.dkd.dbc.annotation.Nullable;
import lu.list.itis.dkd.tui.bootstrapping.BootstrapCallback;
import lu.list.itis.dkd.tui.bootstrapping.BootstrapContext;
import lu.list.itis.dkd.tui.bootstrapping.BootstrappingUtils;
import lu.list.itis.dkd.tui.exception.BuildException;
import lu.list.itis.dkd.tui.utility.Externalization;
......@@ -8,6 +11,8 @@ import lu.list.itis.dkd.tui.widget.corona.Scale;
import org.jdom2.Element;
import java.awt.Color;
/**
* @author nmack
* @date 28 Apr 2015
......@@ -21,10 +26,16 @@ import org.jdom2.Element;
// ***************************************************************************
public class ScaleBuilder extends CoronaBuilder<ScaleBuilder> {
/** */
public double width;
/** */
public double height;
/** */
public double lowerBound;
/** */
public double upperBound;
/** */
public Color tickMarkColour;
// ***************************************************************************
// * Constants *
......@@ -35,55 +46,67 @@ public class ScaleBuilder extends CoronaBuilder<ScaleBuilder> {
// * Constructor(s) *
// ***************************************************************************
// ---------------------------------------------------------------------------
/**
* @param centre
*/
// ---------------------------------------------------------------------------
public ScaleBuilder(Point centre) {
super(centre);
// TODO Auto-generated constructor stub
}
// ---------------------------------------------------------------------------
/**
* @param rootElement
* @throws BuildException
*/
// ---------------------------------------------------------------------------
public ScaleBuilder(Element rootElement) throws BuildException {
super(rootElement);
this.buildFromBootstrap(rootElement, null, null);
}
/** Mandatory fields */
// ---------------------------------------------------------------------------
/**
* @param rootElement
* @param context
* @param callback
* @throws BuildException
*/
// ---------------------------------------------------------------------------
width = BootstrappingUtils.getContentAsDouble(rootElement, Externalization.WIDTH_NODE, BootstrappingUtils.MANDATORY, null);
height = BootstrappingUtils.getContentAsDouble(rootElement, Externalization.HEIGHT_NODE, BootstrappingUtils.MANDATORY, null);
lowerBound = BootstrappingUtils.getContentAsDouble(rootElement, Externalization.LOWER_BOUND_NODE, BootstrappingUtils.MANDATORY, null);
upperBound = BootstrappingUtils.getContentAsDouble(rootElement, Externalization.UPPER_BOUND_NODE, BootstrappingUtils.MANDATORY, null);
public ScaleBuilder(Element rootElement, BootstrapContext context, BootstrapCallback callback) throws BuildException {
super(rootElement, context, callback);
this.buildFromBootstrap(rootElement, context, callback);
}
// ---------------------------------------------------------------------------
// ***************************************************************************
// * Primitives *
// ***************************************************************************
// ---------------------------------------------------------------------------
private void buildFromBootstrap(@Nullable Element rootElement, BootstrapContext context, BootstrapCallback callback) throws BuildException {
width = BootstrappingUtils.getContentAsDouble(rootElement