diff --git a/at/fos/ermodel/gui/Graphic_ATTR_Elem.java b/at/fos/ermodel/gui/Graphic_ATTR_Elem.java index 6171af7..0b5e9a7 100644 --- a/at/fos/ermodel/gui/Graphic_ATTR_Elem.java +++ b/at/fos/ermodel/gui/Graphic_ATTR_Elem.java @@ -27,6 +27,7 @@ public abstract class Graphic_ATTR_Elem protected String par2; protected String par1_label; protected String par2_label; + boolean derived = false; public Graphic_ATTR_Elem(GraphicsContext gc, double x, double y, String name, long elementID) { super(gc, name, elementID); @@ -254,6 +255,29 @@ public abstract class Graphic_ATTR_Elem public void setPar2_label(String par2_label) { this.par2_label = par2_label; } + + public void dsfdsfds6787686(Color c) { + if (!this.isVisible) { + return; + } + this.gc.beginPath(); + this.gc.setStroke(c); + if (this.derived) { + this.gc.setLineWidth(1.0D); + this.gc.setLineDashes(3.0D); + } + this.gc.strokeOval(this.xPos - this.textWidth / 2.0D, this.yPos - this.textHeight / 2.0D, this.textWidth, this.textHeight); + this.gc.setLineDashes(); + + + this.gc.setFill(C2.ERMTextColor); + this.gc.fillText(this.name, this.xPos - this.textWidth / 2.0D + 10.0D, this.yPos + this.textHeight / 2.0D - 15.0D); + this.gc.closePath(); + } + + public void setDerived(boolean derived) { + this.derived = derived; + } } diff --git a/at/fos/ermodel/gui/Graphic_ATTR_Key_Elem.java b/at/fos/ermodel/gui/Graphic_ATTR_Key_Elem.java index 04d586d..88d1457 100644 --- a/at/fos/ermodel/gui/Graphic_ATTR_Key_Elem.java +++ b/at/fos/ermodel/gui/Graphic_ATTR_Key_Elem.java @@ -16,17 +16,16 @@ public class Graphic_ATTR_Key_Elem } - protected void dsfdsfds6787686(Color c) { + public void dsfdsfds6787686(Color c) { if (!this.isVisible) return; this.gc.beginPath(); this.gc.setStroke(c); this.gc.strokeOval(this.xPos - this.textWidth / 2.0D, this.yPos - this.textHeight / 2.0D, this.textWidth, this.textHeight); - this.gc.setFill(C2.ERMTextColor); - this.gc.setStroke(Color.WHITE); this.gc.fillText(this.name, this.xPos - this.textWidth / 2.0D + 10.0D, this.yPos + this.textHeight / 2.0D - 15.0D); + this.gc.strokeLine(this.xPos - this.textWidth / 2.0D + 10.0D, this.yPos + this.textHeight / 2.0D - 13.0D, this.xPos + this.textWidth / 2.0D - 10.0D, this.yPos + this.textHeight / 2.0D - 13.0D); this.gc.closePath(); diff --git a/at/fos/ermodel/gui/Graphic_ATTR_Multi_Elem.java b/at/fos/ermodel/gui/Graphic_ATTR_Multi_Elem.java index 8084a2a..1eb1d58 100644 --- a/at/fos/ermodel/gui/Graphic_ATTR_Multi_Elem.java +++ b/at/fos/ermodel/gui/Graphic_ATTR_Multi_Elem.java @@ -10,21 +10,19 @@ public class Graphic_ATTR_Multi_Elem extends Graphic_ATTR_Elem { @Serial private static final long serialVersionUID = 1L; - private final boolean derived; public Graphic_ATTR_Multi_Elem(GraphicsContext gc, double x, double y, String name, boolean derived, long elementID) { super(gc, x, y, name, elementID); - this.derived = derived; + super.setDerived(derived); } - - protected void dsfdsfds6787686(Color c) { + public void dsfdsfds6787686(Color c) { if (!this.isVisible) return; this.gc.beginPath(); this.gc.setStroke(c); - if (this.derived) { + if (super.derived) { this.gc.setLineWidth(1.0D); this.gc.setLineDashes(3.0D); } diff --git a/at/fos/ermodel/gui/Graphic_ATTR_One_Elem.java b/at/fos/ermodel/gui/Graphic_ATTR_One_Elem.java index fb32a81..c8ca6ec 100644 --- a/at/fos/ermodel/gui/Graphic_ATTR_One_Elem.java +++ b/at/fos/ermodel/gui/Graphic_ATTR_One_Elem.java @@ -10,33 +10,15 @@ public class Graphic_ATTR_One_Elem extends Graphic_ATTR_Elem { @Serial private static final long serialVersionUID = 1L; - private final boolean derived; public Graphic_ATTR_One_Elem(GraphicsContext gc, double x, double y, String name, boolean derived, long elementID) { super(gc, x, y, name, elementID); - this.derived = derived; + super.setDerived(derived); } - protected void dsfdsfds6787686(Color c) { - if (!this.isVisible) { - return; - } - this.gc.beginPath(); - this.gc.setStroke(c); - if (this.derived) { - this.gc.setLineWidth(1.0D); - this.gc.setLineDashes(3.0D); - } - this.gc.strokeOval(this.xPos - this.textWidth / 2.0D, this.yPos - this.textHeight / 2.0D, this.textWidth, this.textHeight); - this.gc.setLineDashes(); - this.gc.setFill(C2.ERMTextColor); - this.gc.fillText(this.name, this.xPos - this.textWidth / 2.0D + 10.0D, this.yPos + this.textHeight / 2.0D - 15.0D); - this.gc.closePath(); - } - public String safsafdsa456456456() { return "A"; diff --git a/at/fos/ermodel/gui/Graphic_ATTR_Weak_Key_Elem.java b/at/fos/ermodel/gui/Graphic_ATTR_Weak_Key_Elem.java index ff8af92..1b8bbeb 100644 --- a/at/fos/ermodel/gui/Graphic_ATTR_Weak_Key_Elem.java +++ b/at/fos/ermodel/gui/Graphic_ATTR_Weak_Key_Elem.java @@ -16,18 +16,16 @@ public class Graphic_ATTR_Weak_Key_Elem } - protected void dsfdsfds6787686(Color c) { + public void dsfdsfds6787686(Color c) { if (!this.isVisible) return; this.gc.beginPath(); - this.gc.setStroke(c); this.gc.strokeOval(this.xPos - this.textWidth / 2.0D, this.yPos - this.textHeight / 2.0D, this.textWidth, this.textHeight); - this.gc.setFill(C2.ERMTextColor); - - this.gc.setStroke(Color.BLACK); + this.gc.setStroke(Color.WHITE); this.gc.fillText(this.name, this.xPos - this.textWidth / 2.0D + 10.0D, this.yPos + this.textHeight / 2.0D - 15.0D); + this.gc.setLineWidth(1.0D); this.gc.setLineDashes(3.0D); this.gc.strokeLine(this.xPos - this.textWidth / 2.0D + 10.0D,