From d3a0a0bb9b3793bd539c8b5e9a0e155fa3b8f7bf Mon Sep 17 00:00:00 2001
From: Lee <irina.lee@etu.upmc.fr>
Date: Mon, 6 Aug 2018 18:03:48 +0200
Subject: [PATCH] modify vccs and vcvs drawing (eln)
---
...mponentVoltageControlledCurrentSource.java | 48 ++++-----
...mponentVoltageControlledVoltageSource.java | 100 +++++++++---------
2 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java
index 499e97ba6a..340623fb35 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java
@@ -626,11 +626,11 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 12,
x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
x + 2 * width / 6 - width / 24 };
- int[] pty3 = { y + height / 4, y + height / 4, y + height / 4 - height / 16, y + height / 4 + height / 16,
- y + height / 4, y + height / 4 };
+ int[] pty3 = { y + height / 8 + height / 16, y + height / 8 + height / 16, y + height / 8, y + height / 4,
+ y + height / 8 + height / 16, y + height / 8 + height / 16 };
g.drawPolygon(ptx3, pty3, 6);
int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 24 };
- int[] pty4 = { y + height - height / 4, y + height - height / 4 };
+ int[] pty4 = { y + height - height / 8 - height / 16, y + height - height / 8 - height / 16 };
g.drawPolygon(ptx4, pty4, 2);
int[] ptx5 = { x + 5 * width / 6 + width / 12 + width / 24, x + 5 * width / 6 + width / 12 + width / 24,
x + 5 * width / 6 + width / 12, x + 5 * width / 6 + width / 12 + width / 24,
@@ -683,11 +683,11 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 12,
x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
x + 2 * width / 6 - width / 24 };
- int[] pty3 = { y + height - height / 4, y + height - height / 4, y + height - height / 4 + height / 16,
- y + height - height / 4 - height / 16, y + height - height / 4, y + height - height / 4 };
+ int[] pty3 = { y + height - height / 8 - height / 16, y + height - height / 8 - height / 16, y + height - height / 8, y + height - height / 4,
+ y + height - height / 8 - height / 16, y + height - height / 8 - height / 16 };
g.drawPolygon(ptx3, pty3, 6);
int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 24 };
- int[] pty4 = { y + height / 4, y + height / 4 };
+ int[] pty4 = { y + height / 8 + height / 16, y + height / 8 + height / 16 };
g.drawPolygon(ptx4, pty4, 2);
int[] ptx5 = { x + 5 * width / 6 + width / 12 + width / 24, x + 5 * width / 6 + width / 12 + width / 24,
x + 5 * width / 6 + width / 12, x + 5 * width / 6 + width / 12 + width / 24,
@@ -740,11 +740,11 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
int[] ptx3 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty3 = { y + height - height / 4, y + height - height / 4, y + height - height / 4 + height / 16,
- y + height - height / 4 - height / 16, y + height - height / 4, y + height - height / 4 };
+ int[] pty3 = { y + height - height / 8 - height / 16, y + height - height / 8 - height / 16, y + height - height / 8, y + height - height / 4,
+ y + height - height / 8 - height / 16, y + height - height / 8 - height / 16 };
g.drawPolygon(ptx3, pty3, 6);
int[] ptx4 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty4 = { y + height / 4, y + height / 4 };
+ int[] pty4 = { y + height / 8 + height / 16, y + height / 8 + height / 16 };
g.drawPolygon(ptx4, pty4, 2);
int[] ptx5 = { x + width / 6 - width / 12 - width / 24, x + width / 6 - width / 12 - width / 24,
x + width / 6 - width / 12, x + width / 6 - width / 12 - width / 24, x + width / 6 - width / 6,
@@ -797,11 +797,11 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
int[] ptx3 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty3 = { y + height / 4, y + height / 4, y + height / 4 - height / 16, y + height / 4 + height / 16,
- y + height / 4, y + height / 4 };
+ int[] pty3 = { y + height / 8 + height / 16, y + height / 8 + height / 16, y + height / 8, y + height / 4,
+ y + height / 8 + height / 16, y + height / 8 + height / 16 };
g.drawPolygon(ptx3, pty3, 6);
int[] ptx4 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty4 = { y + height - height / 4, y + height - height / 4 };
+ int[] pty4 = { y + height - height / 8 - height / 16, y + height - height / 8 - height / 16 };
g.drawPolygon(ptx4, pty4, 2);
int[] ptx5 = { x + width / 6 - width / 12 - width / 24, x + width / 6 - width / 12 - width / 24,
x + width / 6 - width / 12, x + width / 6 - width / 12 - width / 24, x + width / 6 - width / 6,
@@ -851,13 +851,13 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
y + 4 * height / 6, y + height, y + 4 * height / 6, y + 4 * height / 6, y + 5 * height / 6,
y + 3 * height / 6, y + 5 * height / 6, y + 4 * height / 6, y + 4 * height / 6 };
g.drawPolygon(ptx2, pty2, 14);
- int[] ptx3 = { x + width - width / 4, x + width - width / 4, x + width - width / 4 + width / 16,
- x + width - width / 4 - width / 16, x + width - width / 4, x + width - width / 4 };
+ int[] ptx3 = { x + width - width / 8 - width / 16, x + width - width / 8 - width / 16, x + width - width / 8,
+ x + width - width / 4, x + width - width / 8 - width / 16, x + width - width / 8 - width / 16 };
int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 12,
y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12,
y + 2 * height / 6 - height / 24 };
g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + width / 4, x + width / 4 };
+ int[] ptx4 = { x + width / 8 + width / 16, x + width / 8 + width / 16 };
int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 24 };
g.drawPolygon(ptx4, pty4, 2);
int[] ptx5 = { x + 3 * width / 4, x + width / 4 + width / 8, x + width / 4 + width / 8, x + width / 4,
@@ -908,13 +908,13 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
y + 2 * height / 6, y, y + 2 * height / 6, y + 2 * height / 6, y + 3 * height / 6, y + height / 6,
y + 3 * height / 6, y + 2 * height / 6, y + 2 * height / 6 };
g.drawPolygon(ptx2, pty2, 14);
- int[] ptx3 = { x + width - width / 4, x + width - width / 4, x + width - width / 4 + width / 16,
- x + width - width / 4 - width / 16, x + width - width / 4, x + width - width / 4 };
+ int[] ptx3 = { x + width - width / 8 - width / 16, x + width - width / 8 - width / 16, x + width - width / 8,
+ x + width - width / 4, x + width - width / 8 - width / 16, x + width - width / 8 - width / 16 };
int[] pty3 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12,
y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12,
y + 4 * height / 6 + height / 12 + height / 24 };
g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + width / 4, x + width / 4 };
+ int[] ptx4 = { x + width / 8 + width / 16, x + width / 8 + width / 16 };
int[] pty4 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
g.drawPolygon(ptx4, pty4, 2);
int[] ptx5 = { x + 3 * width / 4, x + width / 4 + width / 8, x + width / 4 + width / 8, x + width / 4,
@@ -965,13 +965,13 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
y + 2 * height / 6, y, y + 2 * height / 6, y + 2 * height / 6, y + 3 * height / 6, y + height / 6,
y + 3 * height / 6, y + 2 * height / 6, y + 2 * height / 6 };
g.drawPolygon(ptx2, pty2, 14);
- int[] ptx3 = { x + width / 4, x + width / 4, x + width / 4 - width / 16, x + width / 4 + width / 16,
- x + width / 4, x + width / 4 };
+ int[] ptx3 = { x + width / 8 + width / 16, x + width / 8 + width / 16, x + width / 8, x + width / 4,
+ x + width / 8 + width / 16, x + width / 8 + width / 16 };
int[] pty3 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12,
y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12,
y + 4 * height / 6 + height / 12 + height / 24 };
g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + width - width / 4, x + width - width / 4 };
+ int[] ptx4 = { x + width - width / 8 - width / 16, x + width - width / 8 - width / 16 };
int[] pty4 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
g.drawPolygon(ptx4, pty4, 2);
int[] ptx5 = { x + width / 4, x + 3 * width / 4 - width / 8, x + 3 * width / 4 - width / 8, x + 3 * width / 4,
@@ -1022,13 +1022,13 @@ public class ELNComponentVoltageControlledCurrentSource extends TGCScalableWithI
y + 4 * height / 6, y + height, y + 4 * height / 6, y + 4 * height / 6, y + 5 * height / 6,
y + 3 * height / 6, y + 5 * height / 6, y + 4 * height / 6, y + 4 * height / 6 };
g.drawPolygon(ptx2, pty2, 14);
- int[] ptx3 = { x + width / 4, x + width / 4, x + width / 4 - width / 16, x + width / 4 + width / 16,
- x + width / 4, x + width / 4 };
+ int[] ptx3 = { x + width / 8 + width / 16, x + width / 8 + width / 16, x + width / 8, x + width / 4,
+ x + width / 8 + width / 16, x + width / 8 + width / 16 };
int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 12,
y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12,
y + 2 * height / 6 - height / 24 };
g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + width - width / 4, x + width - width / 4 };
+ int[] ptx4 = { x + width - width / 8 - width / 16, x + width - width / 8 - width / 16 };
int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 24 };
g.drawPolygon(ptx4, pty4, 2);
int[] ptx5 = { x + width / 4, x + 3 * width / 4 - width / 8, x + 3 * width / 4 - width / 8, x + 3 * width / 4,
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java
index 7204be924b..44ed9134a8 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java
@@ -624,20 +624,20 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 12,
x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
x + 2 * width / 6 - width / 24 };
- int[] pty3 = { y + height / 4, y + height / 4, y + height / 4 - height / 16, y + height / 4 + height / 16,
- y + height / 4, y + height / 4 };
+ int[] pty3 = { y + height / 8 + height / 16, y + height / 8 + height / 16, y + height / 8, y + height / 4,
+ y + height / 8 + height / 16, y + height / 8 + height / 16 };
g.drawPolygon(ptx3, pty3, 6);
int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 24 };
- int[] pty4 = { y + height - height / 4, y + height - height / 4 };
+ int[] pty4 = { y + height - height / 8 - height / 16, y + height - height / 8 - height / 16 };
g.drawPolygon(ptx4, pty4, 2);
int[] ptx5 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty5 = { y + height / 4, y + height / 4, y + height / 4 - height / 16, y + height / 4 + height / 16,
- y + height / 4, y + height / 4 };
+ int[] pty5 = { y + height / 8 + height / 16, y + height / 8 + height / 16, y + height / 8, y + height / 4,
+ y + height / 8 + height / 16, y + height / 8 + height / 16 };
g.drawPolygon(ptx5, pty5, 6);
int[] ptx6 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty6 = { y + height - height / 4, y + height - height / 4 };
+ int[] pty6 = { y + height - height / 8 - height / 16, y + height - height / 8 - height / 16 };
g.drawPolygon(ptx6, pty6, 2);
Graphics2D g2d = (Graphics2D) g.create();
@@ -683,20 +683,20 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 12,
x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
x + 2 * width / 6 - width / 24 };
- int[] pty3 = { y + height - height / 4, y + height - height / 4, y + height - height / 4 + height / 16,
- y + height - height / 4 - height / 16, y + height - height / 4, y + height - height / 4 };
+ int[] pty3 = { y + height - height / 8 - height / 16, y + height - height / 8 - height / 16, y + height - height / 8, y + height - height / 4,
+ y + height - height / 8 - height / 16, y + height - height / 8 - height / 16 };
g.drawPolygon(ptx3, pty3, 6);
int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 24 };
- int[] pty4 = { y + height / 4, y + height / 4 };
+ int[] pty4 = { y + height / 8 + height / 16, y + height / 8 + height / 16 };
g.drawPolygon(ptx4, pty4, 2);
int[] ptx5 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty5 = { y + height - height / 4, y + height - height / 4, y + height - height / 4 + height / 16,
- y + height - height / 4 - height / 16, y + height - height / 4, y + height - height / 4 };
+ int[] pty5 = { y + height - height / 8 - height / 16, y + height - height / 8 - height / 16, y + height - height / 8, y + height - height / 4,
+ y + height - height / 8 - height / 16, y + height - height / 8 - height / 16 };
g.drawPolygon(ptx5, pty5, 6);
int[] ptx6 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty6 = { y + height / 4, y + height / 4 };
+ int[] pty6 = { y + height / 8 + height / 16, y + height / 8 + height / 16 };
g.drawPolygon(ptx6, pty6, 2);
Graphics2D g2d = (Graphics2D) g.create();
@@ -741,20 +741,20 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 12,
x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
x + 2 * width / 6 - width / 24 };
- int[] pty3 = { y + height - height / 4, y + height - height / 4, y + height - height / 4 + height / 16,
- y + height - height / 4 - height / 16, y + height - height / 4, y + height - height / 4 };
+ int[] pty3 = { y + height - height / 8 - height / 16, y + height - height / 8 - height / 16, y + height - height / 8, y + height - height / 4,
+ y + height - height / 8 - height / 16, y + height - height / 8 - height / 16 };
g.drawPolygon(ptx3, pty3, 6);
int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 24 };
- int[] pty4 = { y + height / 4, y + height / 4 };
+ int[] pty4 = { y + height / 8 + height / 16, y + height / 8 + height / 16 };
g.drawPolygon(ptx4, pty4, 2);
int[] ptx5 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty5 = { y + height - height / 4, y + height - height / 4, y + height - height / 4 + height / 16,
- y + height - height / 4 - height / 16, y + height - height / 4, y + height - height / 4 };
+ int[] pty5 = { y + height - height / 8 - height / 16, y + height - height / 8 - height / 16, y + height - height / 8, y + height - height / 4,
+ y + height - height / 8 - height / 16, y + height - height / 8 - height / 16 };
g.drawPolygon(ptx5, pty5, 6);
int[] ptx6 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty6 = { y + height / 4, y + height / 4 };
+ int[] pty6 = { y + height / 8 + height / 16, y + height / 8 + height / 16 };;
g.drawPolygon(ptx6, pty6, 2);
Graphics2D g2d = (Graphics2D) g.create();
@@ -799,20 +799,20 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
int[] ptx3 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 12,
x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12, x + 2 * width / 6 - width / 12,
x + 2 * width / 6 - width / 24 };
- int[] pty3 = { y + height / 4, y + height / 4, y + height / 4 - height / 16, y + height / 4 + height / 16,
- y + height / 4, y + height / 4 };
+ int[] pty3 = { y + height / 8 + height / 16, y + height / 8 + height / 16, y + height / 8, y + height / 4,
+ y + height / 8 + height / 16, y + height / 8 + height / 16 };
g.drawPolygon(ptx3, pty3, 6);
int[] ptx4 = { x + 2 * width / 6 - width / 12 - width / 24, x + 2 * width / 6 - width / 24 };
- int[] pty4 = { y + height - height / 4, y + height - height / 4 };
+ int[] pty4 = { y + height - height / 8 - height / 16, y + height - height / 8 - height / 16 };
g.drawPolygon(ptx4, pty4, 2);
int[] ptx5 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
x + 4 * width / 6 + width / 12, x + 4 * width / 6 + width / 12,
x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty5 = { y + height / 4, y + height / 4, y + height / 4 - height / 16, y + height / 4 + height / 16,
- y + height / 4, y + height / 4 };
+ int[] pty5 = { y + height / 8 + height / 16, y + height / 8 + height / 16, y + height / 8, y + height / 4,
+ y + height / 8 + height / 16, y + height / 8 + height / 16 };
g.drawPolygon(ptx5, pty5, 6);
int[] ptx6 = { x + 4 * width / 6 + width / 24, x + 4 * width / 6 + width / 12 + width / 24 };
- int[] pty6 = { y + height - height / 4, y + height - height / 4 };
+ int[] pty6 = { y + height - height / 8 - height / 16, y + height - height / 8 - height / 16 };
g.drawPolygon(ptx6, pty6, 2);
Graphics2D g2d = (Graphics2D) g.create();
@@ -855,22 +855,22 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
y + 4 * height / 6, y + 5 * height / 6, y + 4 * height / 6, y + 4 * height / 6, y + height,
y + 4 * height / 6, y + 4 * height / 6 };
g.drawPolygon(ptx2, pty2, 12);
- int[] ptx3 = { x + width - width / 4, x + width - width / 4, x + width - width / 4 + width / 16,
- x + width - width / 4 - width / 16, x + width - width / 4, x + width - width / 4 };
+ int[] ptx3 = { x + width - width / 8 - width / 16, x + width - width / 8 - width / 16, x + width - width / 8,
+ x + width - width / 4, x + width - width / 8 - width / 16, x + width - width / 8 - width / 16 };
int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 12,
y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12,
y + 2 * height / 6 - height / 24 };
g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + width / 4, x + width / 4 };
+ int[] ptx4 = { x + width / 8 + width / 16, x + width / 8 + width / 16 };
int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 24 };
g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + width - width / 4, x + width - width / 4, x + width - width / 4 + width / 16,
- x + width - width / 4 - width / 16, x + width - width / 4, x + width - width / 4 };
+ int[] ptx5 = { x + width - width / 8 - width / 16, x + width - width / 8 - width / 16, x + width - width / 8,
+ x + width - width / 4, x + width - width / 8 - width / 16, x + width - width / 8 - width / 16 };
int[] pty5 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12,
y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12,
y + 4 * height / 6 + height / 12 + height / 24 };
g.drawPolygon(ptx5, pty5, 6);
- int[] ptx6 = { x + width / 4, x + width / 4 };
+ int[] ptx6 = { x + width / 8 + width / 16, x + width / 8 + width / 16 };
int[] pty6 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
g.drawPolygon(ptx6, pty6, 2);
@@ -914,21 +914,24 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
y + 2 * height / 6, y + 3 * height / 6, y + 2 * height / 6, y + 2 * height / 6, y, y + 2 * height / 6,
y + 2 * height / 6 };
g.drawPolygon(ptx2, pty2, 12);
- int[] ptx3 = { x + width - width / 4, x + width - width / 4, x + width - width / 4 + width / 16,
- x + width - width / 4 - width / 16, x + width - width / 4, x + width - width / 4 };
+ int[] ptx3 = { x + width - width / 8 - width / 16, x + width - width / 8 - width / 16, x + width - width / 8,
+ x + width - width / 4, x + width - width / 8 - width / 16, x + width - width / 8 - width / 16 };
int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 12,
y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12,
y + 2 * height / 6 - height / 24 };
g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + width / 4, x + width / 4 };
+ int[] ptx4 = { x + width / 8 + width / 16, x + width / 8 + width / 16 };
int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 24 };
g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + width - width / 4, x + width - width / 4, x + width - width / 4 + width / 16,
- x + width - width / 4 - width / 16, x + width - width / 4, x + width - width / 4 };
+ int[] ptx5 = { x + width - width / 8 - width / 16, x + width - width / 8 - width / 16, x + width - width / 8,
+ x + width - width / 4, x + width - width / 8 - width / 16, x + width - width / 8 - width / 16 };
int[] pty5 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12,
y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12,
y + 4 * height / 6 + height / 12 + height / 24 };
g.drawPolygon(ptx5, pty5, 6);
+ int[] ptx6 = { x + width / 8 + width / 16, x + width / 8 + width / 16 };
+ int[] pty6 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
+ g.drawPolygon(ptx6, pty6, 2);
Graphics2D g2d = (Graphics2D) g.create();
Stroke dashed = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[] { 9 }, 0);
@@ -937,9 +940,6 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
10, 10));
g2d.dispose();
- int[] ptx6 = { x + width / 4, x + width / 4 };
- int[] pty6 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
- g.drawPolygon(ptx6, pty6, 2);
g.drawOval(x, y, width / 8, height / 12);
g.setColor(Color.WHITE);
g.fillOval(x, y, width / 8, height / 12);
@@ -973,22 +973,22 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
y + 2 * height / 6, y + 3 * height / 6, y + 2 * height / 6, y + 2 * height / 6, y, y + 2 * height / 6,
y + 2 * height / 6 };
g.drawPolygon(ptx2, pty2, 12);
- int[] ptx3 = { x + width / 4, x + width / 4, x + width / 4 - width / 16, x + width / 4 + width / 16,
- x + width / 4, x + width / 4 };
+ int[] ptx3 = { x + width / 8 + width / 16, x + width / 8 + width / 16, x + width / 8, x + width / 4,
+ x + width / 8 + width / 16, x + width / 8 + width / 16 };
int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 12,
y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12,
y + 2 * height / 6 - height / 24 };
g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + width - width / 4, x + width - width / 4 };
+ int[] ptx4 = { x + width - width / 8 - width / 16, x + width - width / 8 - width / 16 };
int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 24 };
g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + width / 4, x + width / 4, x + width / 4 - width / 16, x + width / 4 + width / 16,
- x + width / 4, x + width / 4 };
+ int[] ptx5 = { x + width / 8 + width / 16, x + width / 8 + width / 16, x + width / 8, x + width / 4,
+ x + width / 8 + width / 16, x + width / 8 + width / 16 };
int[] pty5 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12,
y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12,
y + 4 * height / 6 + height / 12 + height / 24 };
g.drawPolygon(ptx5, pty5, 6);
- int[] ptx6 = { x + width - width / 4, x + width - width / 4 };
+ int[] ptx6 = { x + width - width / 8 - width / 16, x + width - width / 8 - width / 16 };
int[] pty6 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
g.drawPolygon(ptx6, pty6, 2);
@@ -1032,22 +1032,22 @@ public class ELNComponentVoltageControlledVoltageSource extends TGCScalableWithI
y + 4 * height / 6, y + 5 * height / 6, y + 4 * height / 6, y + 4 * height / 6, y + height,
y + 4 * height / 6, y + 4 * height / 6 };
g.drawPolygon(ptx2, pty2, 12);
- int[] ptx3 = { x + width / 4, x + width / 4, x + width / 4 - width / 16, x + width / 4 + width / 16,
- x + width / 4, x + width / 4 };
+ int[] ptx3 = { x + width / 8 + width / 16, x + width / 8 + width / 16, x + width / 8, x + width / 4,
+ x + width / 8 + width / 16, x + width / 8 + width / 16 };
int[] pty3 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 12,
y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12, y + 2 * height / 6 - height / 12,
y + 2 * height / 6 - height / 24 };
g.drawPolygon(ptx3, pty3, 6);
- int[] ptx4 = { x + width - width / 4, x + width - width / 4 };
+ int[] ptx4 = { x + width - width / 8 - width / 16, x + width - width / 8 - width / 16 };
int[] pty4 = { y + 2 * height / 6 - height / 12 - height / 24, y + 2 * height / 6 - height / 24 };
g.drawPolygon(ptx4, pty4, 2);
- int[] ptx5 = { x + width / 4, x + width / 4, x + width / 4 - width / 16, x + width / 4 + width / 16,
- x + width / 4, x + width / 4 };
+ int[] ptx5 = { x + width / 8 + width / 16, x + width / 8 + width / 16, x + width / 8, x + width / 4,
+ x + width / 8 + width / 16, x + width / 8 + width / 16 };
int[] pty5 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12,
y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12, y + 4 * height / 6 + height / 12,
y + 4 * height / 6 + height / 12 + height / 24 };
g.drawPolygon(ptx5, pty5, 6);
- int[] ptx6 = { x + width - width / 4, x + width - width / 4 };
+ int[] ptx6 = { x + width - width / 8 - width / 16, x + width - width / 8 - width / 16 };
int[] pty6 = { y + 4 * height / 6 + height / 24, y + 4 * height / 6 + height / 12 + height / 24 };
g.drawPolygon(ptx6, pty6, 2);
--
GitLab