From eb72ac9ae3ff0436da26c7f97c211c551b069bda Mon Sep 17 00:00:00 2001
From: dblouin <dominique.blouin@telecom-paristech.fr>
Date: Tue, 5 Mar 2019 14:04:57 +0100
Subject: [PATCH] Issue #312: Scale the initial size of components
---
src/main/java/ui/TGScalableComponent.java | 10 ++++++++++
src/main/java/ui/ad/TADActionState.java | 6 ++++--
src/main/java/ui/ad/TADChoice.java | 7 ++++---
src/main/java/ui/ad/TADStartState.java | 12 ++++++++----
src/main/java/ui/tmlad/TMLADDecrypt.java | 6 ++++--
src/main/java/ui/tmlad/TMLADDelay.java | 9 ++++++---
src/main/java/ui/tmlad/TMLADDelayInterval.java | 9 ++++++---
src/main/java/ui/tmlad/TMLADEncrypt.java | 2 ++
src/main/java/ui/tmlad/TMLADExecC.java | 9 ++++++---
src/main/java/ui/tmlad/TMLADExecCInterval.java | 7 +++++--
src/main/java/ui/tmlad/TMLADExecI.java | 6 ++++--
src/main/java/ui/tmlad/TMLADStartState.java | 2 +-
12 files changed, 60 insertions(+), 25 deletions(-)
diff --git a/src/main/java/ui/TGScalableComponent.java b/src/main/java/ui/TGScalableComponent.java
index 000a37b8fd..c8841123c4 100644
--- a/src/main/java/ui/TGScalableComponent.java
+++ b/src/main/java/ui/TGScalableComponent.java
@@ -20,6 +20,8 @@ public abstract class TGScalableComponent extends TGComponent implements Scalabl
protected int arc = 5;
protected double darc;
+ protected int lineLength = 5;
+
public TGScalableComponent(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos,
TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -45,6 +47,14 @@ public abstract class TGScalableComponent extends TGComponent implements Scalabl
displayText = true;
}
+ protected void initSize( final int width,
+ final int height ) {
+ this.width = width;
+ this.height = height;
+
+ initScaling( width, height );
+ }
+
protected void initScaling(int w, int h) {
oldScaleFactor = tdp.getZoom();
diff --git a/src/main/java/ui/ad/TADActionState.java b/src/main/java/ui/ad/TADActionState.java
index 2150082f81..5a70a7780f 100755
--- a/src/main/java/ui/ad/TADActionState.java
+++ b/src/main/java/ui/ad/TADActionState.java
@@ -66,12 +66,14 @@ public class TADActionState extends TADOneLineText/* Issue #69 TGCOneLineText*/
public TADActionState(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
- width = 30;
- height = 20;
+// width = 30;
+// height = 20;
+
minWidth = 30;
// Issue #31
textX = 5;
+ initSize( 30, 20 );
createConnectingPoints();
// nbConnectingPoint = 2;
diff --git a/src/main/java/ui/ad/TADChoice.java b/src/main/java/ui/ad/TADChoice.java
index 6764e6f8a8..1ba6382211 100755
--- a/src/main/java/ui/ad/TADChoice.java
+++ b/src/main/java/ui/ad/TADChoice.java
@@ -74,10 +74,11 @@ public class TADChoice extends TADComponentWithSubcomponents/* Issue #69 TGCWit
public TADChoice(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
- width = 30;
- height = 30;
-
// Issue #31
+// width = 30;
+// height = 30;
+ initSize( 30, 30 );
+
dtextX1 = -lineOutLength;
dtextY1 = height/2 - 5;
dtextX2 = width + 5;
diff --git a/src/main/java/ui/ad/TADStartState.java b/src/main/java/ui/ad/TADStartState.java
index b4d21f778e..34bd24858e 100755
--- a/src/main/java/ui/ad/TADStartState.java
+++ b/src/main/java/ui/ad/TADStartState.java
@@ -59,8 +59,10 @@ public class TADStartState extends TADComponentWithoutSubcomponents/* Issue #69
public TADStartState(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
- width = 15;
- height = 15;
+// width = 15;
+// height = 15;
+
+ initSize( 15, 15 );
createConnectingPoints();
// nbConnectingPoint = 1;
@@ -86,8 +88,10 @@ public class TADStartState extends TADComponentWithoutSubcomponents/* Issue #69
@Override
public void internalDrawing(Graphics g) {
- g.fillOval(x, y, width, height);
- g.drawLine(x+(width/2), y+height, x+(width/2), y + lineLength + height);
+ final int radius = width / 2;
+
+ g.fillOval(x, y, radius * 2, radius * 2 );//width, height);
+ g.drawLine(x+(width/2), y+height, x+(width/2), (int) (y + lineLength * oldScaleFactor + height));
}
@Override
diff --git a/src/main/java/ui/tmlad/TMLADDecrypt.java b/src/main/java/ui/tmlad/TMLADDecrypt.java
index 09c37ac7b2..988dd0a9bd 100755
--- a/src/main/java/ui/tmlad/TMLADDecrypt.java
+++ b/src/main/java/ui/tmlad/TMLADDecrypt.java
@@ -73,10 +73,12 @@ public class TMLADDecrypt extends TADComponentWithoutSubcomponents/* Issue #69 T
public TMLADDecrypt(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
- width = 15;
- height = 35;
+ // Issue #31
+// width = 15;
+// height = 35;
// textX = width + 5;
// textY = height/2 + 5;
+ initSize( 15, 35 );
nbConnectingPoint = 2;
connectingPoint = new TGConnectingPoint[2];
diff --git a/src/main/java/ui/tmlad/TMLADDelay.java b/src/main/java/ui/tmlad/TMLADDelay.java
index 30b948bc28..76ec96a253 100755
--- a/src/main/java/ui/tmlad/TMLADDelay.java
+++ b/src/main/java/ui/tmlad/TMLADDelay.java
@@ -65,9 +65,12 @@ public class TMLADDelay extends TADComponentWithSubcomponents /* Issue #69 TGCWi
public TMLADDelay(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
-
- width = 10;
- height = 30;
+
+ // Issue #31
+// width = 10;
+// height = 30;
+ initSize( 10, 30 );
+
textX = width + 5;
textY = height/2 + 5;
diff --git a/src/main/java/ui/tmlad/TMLADDelayInterval.java b/src/main/java/ui/tmlad/TMLADDelayInterval.java
index 4ac73a9260..9fc1a281c4 100755
--- a/src/main/java/ui/tmlad/TMLADDelayInterval.java
+++ b/src/main/java/ui/tmlad/TMLADDelayInterval.java
@@ -67,9 +67,12 @@ public class TMLADDelayInterval extends TADComponentWithSubcomponents /* Issue #
public TMLADDelayInterval(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
-
- width = 10;
- height = 30;
+
+ // Issue #31
+// width = 10;
+// height = 30;
+ initSize( 10, 30 );
+
textX = width + 5;
textY = height/2 + 5;
diff --git a/src/main/java/ui/tmlad/TMLADEncrypt.java b/src/main/java/ui/tmlad/TMLADEncrypt.java
index 8cd5c2e85b..16749da070 100755
--- a/src/main/java/ui/tmlad/TMLADEncrypt.java
+++ b/src/main/java/ui/tmlad/TMLADEncrypt.java
@@ -85,10 +85,12 @@ public class TMLADEncrypt extends TADComponentWithoutSubcomponents/* Issue #69 T
public TMLADEncrypt(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
+ // Issue #31
width = 15;
height = 35;
// textX = width + 5;
// textY = height/2 + 5;
+ initSize( 15, 35 );
nbConnectingPoint = 2;
connectingPoint = new TGConnectingPoint[2];
diff --git a/src/main/java/ui/tmlad/TMLADExecC.java b/src/main/java/ui/tmlad/TMLADExecC.java
index dc3741854b..effa20ed18 100755
--- a/src/main/java/ui/tmlad/TMLADExecC.java
+++ b/src/main/java/ui/tmlad/TMLADExecC.java
@@ -65,9 +65,12 @@ public class TMLADExecC extends TADComponentWithSubcomponents /* Issue #69 TGCWi
public TMLADExecC(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
-
- width = 10;
- height = 30;
+
+ // Issue #31
+// width = 10;
+// height = 30;
+ initSize( 10, 30 );
+
textX = width + 5;
textY = height/2 + 5;
diff --git a/src/main/java/ui/tmlad/TMLADExecCInterval.java b/src/main/java/ui/tmlad/TMLADExecCInterval.java
index 03c2ab9913..eb532153a7 100755
--- a/src/main/java/ui/tmlad/TMLADExecCInterval.java
+++ b/src/main/java/ui/tmlad/TMLADExecCInterval.java
@@ -66,8 +66,11 @@ public class TMLADExecCInterval extends TADComponentWithSubcomponents /* Issue #
public TMLADExecCInterval(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
- width = 10;
- height = 30;
+ // Issue #31
+// width = 10;
+// height = 30;
+ initSize( 10, 30 );
+
textX = width + 5;
textY = height/2 + 5;
diff --git a/src/main/java/ui/tmlad/TMLADExecI.java b/src/main/java/ui/tmlad/TMLADExecI.java
index 46a006318f..543fbfea8f 100755
--- a/src/main/java/ui/tmlad/TMLADExecI.java
+++ b/src/main/java/ui/tmlad/TMLADExecI.java
@@ -66,8 +66,10 @@ public class TMLADExecI extends TADComponentWithSubcomponents /* Issue #69 TGCWi
public TMLADExecI(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
- width = 10;
- height = 30;
+ // Issue #31
+// width = 10;
+// height = 30;
+ initSize( 10, 30 );
textX = width + 5;
textY = height/2 + 5;
diff --git a/src/main/java/ui/tmlad/TMLADStartState.java b/src/main/java/ui/tmlad/TMLADStartState.java
index 0fa07b1319..ae1b8317ac 100755
--- a/src/main/java/ui/tmlad/TMLADStartState.java
+++ b/src/main/java/ui/tmlad/TMLADStartState.java
@@ -53,7 +53,7 @@ import ui.ad.TADStartState;
* @author Ludovic APVRILLE
*/
public class TMLADStartState extends TADStartState /* Issue #69 TGCWithoutInternalComponent*/ implements EmbeddedComment{
- private int lineLength = 5;
+ //private int lineLength = 5;
public TMLADStartState(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
--
GitLab