Commit f1ed4f1d authored by Nico Mack's avatar Nico Mack

Fixed a number of bugs

parent d8af8a53
......@@ -11,7 +11,7 @@ import lu.list.itis.dkd.tui.utility.Point;
// * Class Definition and Members *
// ***************************************************************************
public class InfoMarker<T> extends TetherableMarker implements InformationReceiver<T>, InformationProvider<T> {
public class InfoMarker<T> extends ModalMarker implements InformationReceiver<T>, InformationProvider<T> {
private T information;
private Variable<T> variable;
......
......@@ -17,7 +17,7 @@ import org.jdom2.Element;
// * Class Definition and Members *
// ***************************************************************************
public abstract class BaseInfoMarkerBuilder<B extends BaseInfoMarkerBuilder<B>> extends BaseTetherableMarkerBuilder<B> {
public abstract class BaseInfoMarkerBuilder<B extends BaseInfoMarkerBuilder<B>> extends BaseModalMarkerBuilder<B> {
public Object information;
public Variable<?> variable;
......@@ -32,7 +32,8 @@ public abstract class BaseInfoMarkerBuilder<B extends BaseInfoMarkerBuilder<B>>
// ***************************************************************************
// ---------------------------------------------------------------------------
protected BaseInfoMarkerBuilder() {}
protected BaseInfoMarkerBuilder() {
}
// ---------------------------------------------------------------------------
......@@ -43,12 +44,12 @@ public abstract class BaseInfoMarkerBuilder<B extends BaseInfoMarkerBuilder<B>>
// ---------------------------------------------------------------------------
/**
* Constructor initializing all fields from an {@link Element} containing as child elements all the
* information on fields to initialize.
* Constructor initializing all fields from an {@link Element} containing as child elements all
* the information on fields to initialize.
*
* @param rootElement
* The element harbouring, on child nodes, the necessary information to initialize all fields
* of the builder.
* The element harbouring, on child nodes, the necessary information to initialize all
* fields of the builder.
* @throws BuildException
* Thrown when any of the fields fail to populate due to an error in reading information
* from the XML file.
......
......@@ -91,8 +91,6 @@ public class CoxcombSlice extends ValueCorona implements InformationProvider<Obj
protected Timeline blinkingTimeline;
protected Timeline balisticTimeline;
protected TouchManager touchManager;
private double normalizedValue;
private Area outer;
private Area inner;
......
......@@ -95,6 +95,28 @@ public class Indicator extends ValueCorona {
this.buildFromProperties();
}
// ---------------------------------------------------------------------------
/**
* @param builder
*/
// ---------------------------------------------------------------------------
public Indicator(Indicator original) {
super(original);
this.fillColour = original.fillColour;
this.strokeColour = original.strokeColour;
this.textColour = original.textColour;
this.textFont = original.textFont;
this.strokeWidth = original.strokeWidth;
this.insetBorder = original.insetBorder;
this.labelFormat = original.labelFormat;
this.labelShape = original.labelShape;
this.stretchToFit = original.stretchToFit;
this.maintainAspectRatio = original.maintainAspectRatio;
this.buildFromProperties();
}
// ---------------------------------------------------------------------------
// ***************************************************************************
// * Primitives *
......@@ -267,6 +289,13 @@ public class Indicator extends ValueCorona {
localCanvas.dispose();
}
// ---------------------------------------------------------------------------
@Override
public Indicator clone() {
return new Indicator(this);
}
// ---------------------------------------------------------------------------
// ***************************************************************************
// * End of Class *
......
......@@ -40,7 +40,7 @@ import java.awt.Shape;
// * Class Definition and Members *
// ***************************************************************************
public abstract class BaseIndicatorBuilder<B extends ValueCoronaBuilder<B>> extends ValueCoronaBuilder<B> {
public abstract class BaseIndicatorBuilder<B extends BaseIndicatorBuilder<B>> extends ValueCoronaBuilder<B> {
public ColorPair strokeColour;
public ColorPair fillColour;
......
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