From 99c80c98170b5cd2923c57bb746ebb7da7ee68cc Mon Sep 17 00:00:00 2001
From: Moemoea Fierin <moemoea.fierin@epita.fr>
Date: Thu, 3 Oct 2019 13:54:47 +0200
Subject: [PATCH] [ZOOM] Issue #31 Avatar Meth. Defined minHeight and width
---
.../java/ui/avatarmad/AvatarMADAssumption.java | 14 ++++++--------
.../AvatarMethodologyDiagramName.java | 7 ++++++-
.../AvatarMethodologyDiagramReference.java | 7 +++++--
3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/main/java/ui/avatarmad/AvatarMADAssumption.java b/src/main/java/ui/avatarmad/AvatarMADAssumption.java
index 5a977737b9..1475ffc034 100644
--- a/src/main/java/ui/avatarmad/AvatarMADAssumption.java
+++ b/src/main/java/ui/avatarmad/AvatarMADAssumption.java
@@ -64,8 +64,8 @@ import java.awt.*;
*/
public class AvatarMADAssumption extends TGCScalableWithInternalComponent implements WithAttributes, TGAutoAdjust {
public String oldValue;
- protected int textX = 5;
- protected int textY = 22;
+ //protected int textX = 5;
+ //protected int textY = 22;
protected int lineHeight = 30;
private double dlineHeight = 0.0;
//protected int reqType = 0;
@@ -110,7 +110,8 @@ public class AvatarMADAssumption extends TGCScalableWithInternalComponent implem
public AvatarMADAssumption(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);
-
+ textX = 5;
+ textY = 22;
initScaling(200, 120);
oldScaleFactor = tdp.getZoom();
dlineHeight = lineHeight * oldScaleFactor;
@@ -229,12 +230,9 @@ public class AvatarMADAssumption extends TGCScalableWithInternalComponent implem
if ((lineHeight > 23) && (width > 23)){
g.drawImage(scale(IconManager.img5100), x + width - scale(iconSize + 1), y + scale(3), Color.yellow, null);
}
-
- //issue #31 text must be readable to be displayed
+
int fontSize = g.getFont().getSize();
- if (!isTextReadable(g) || !canTextGoInTheBox(g, fontSize, value, iconSize))
- return;
-
+
if (displayText) {
size = currentFontSize - 2;
g.setFont(myFont.deriveFont((float)(myFont.getSize() - 2)));
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramName.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramName.java
index 05010fcf2c..ff56e0cc54 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramName.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramName.java
@@ -96,6 +96,11 @@ public class AvatarMethodologyDiagramName extends TGCScalableWithoutInternalComp
public AvatarMethodologyDiagramName(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
+ minWidth = 10;
+ minHeight = lineLength;
+ initScaling(10, 10);
+
nbConnectingPoint = 0;
minWidth = 10;
nbInternalTGComponent = 0;
@@ -106,7 +111,7 @@ public class AvatarMethodologyDiagramName extends TGCScalableWithoutInternalComp
name = "value ";
- initScaling(10, 10);
+
myImageIcon = IconManager.imgic302;
}
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramReference.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramReference.java
index 60e2a355bb..8fcb1a8837 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramReference.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramReference.java
@@ -188,12 +188,15 @@ public abstract class AvatarMethodologyDiagramReference extends TGCScalableWithI
//g.setColor(ColorManager.AVATAR_REQUIREMENT_TOP);
//g.fillRect(x+1, y+1+lineHeight, width-1, height-1-lineHeight);
ColorManager.setColor(g, getState(), 0);
+ //if (!isTextReadable(g))
+ // return;
+ if (!isTextReadable(g) || !canTextGoInTheBox(g, fontSize, value, ICON_SIZE))
+ return;
//if ((lineLength > 23) && (width > 23)){
//g.drawImage(IconManager.img5100, x + width - iconSize + 1, y + 3, Color.yellow, null);
g.drawImage( scale( IconManager.img5100 ), x + width - scale(ICON_SIZE + 1 ), y + scale( 3 ), Color.yellow, null);
//}
- if (!isTextReadable(g))
- return;
+
if (displayText) {
//size = currentFontSize - 2;
//g.setFont(myFontB);
--
GitLab