diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottom.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottom.java index ec61aa262..295c495e5 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottom.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottom.java @@ -55,6 +55,7 @@ public class CommunicationTileNoteBottom extends CommunicationTileNoteBottomTopA super(tile, message, skin, skinParam, noteOnMessage, currentY); } + @Override public void drawU(UGraphic ug) { final StringBounder stringBounder = ug.getStringBounder(); final Component comp = getComponent(stringBounder); @@ -62,6 +63,9 @@ public class CommunicationTileNoteBottom extends CommunicationTileNoteBottomTopA final Area area = Area.create(dim.getWidth(), dim.getHeight()); ((UDrawable) tile).drawU(ug); + if (YGauge.USE_ME) + ug = ug.apply(UTranslate.dy(getYGauge().getMin().getCurrentValue())); + final double middleMsg = (tile.getMinX().getCurrentValue() + tile.getMaxX().getCurrentValue()) / 2; final double xNote = getNotePosition(stringBounder).getCurrentValue(); diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottomTopAbstract.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottomTopAbstract.java index 0576c8655..579f4906a 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottomTopAbstract.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottomTopAbstract.java @@ -111,25 +111,6 @@ public abstract class CommunicationTileNoteBottomTopAbstract extends AbstractTil return minX; } - public void drawU(UGraphic ug) { - final StringBounder stringBounder = ug.getStringBounder(); - final Component comp = getComponent(stringBounder); - final XDimension2D dim = comp.getPreferredDimension(stringBounder); - final Area area = Area.create(dim.getWidth(), dim.getHeight()); - ((UDrawable) tile).drawU(ug); - - final double middleMsg = (tile.getMinX().getCurrentValue() + tile.getMaxX().getCurrentValue()) / 2; - - final double xNote = getNotePosition(stringBounder).getCurrentValue(); - final double yNote = tile.getPreferredHeight(); - - comp.drawU(ug.apply(new UTranslate(xNote, yNote + spacey)), area, (Context2D) ug); - - drawLine(ug, middleMsg, tile.getContactPointRelative(), xNote + dim.getWidth() / 2, - yNote + spacey + Rose.paddingY); - - } - protected final double spacey = 10; protected final void drawLine(UGraphic ug, double x1, double y1, double x2, double y2) { diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteRight.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteRight.java index 60b1865cd..388734722 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteRight.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteRight.java @@ -121,6 +121,8 @@ public class CommunicationTileNoteRight extends AbstractTile { final Area area = Area.create(dim.getWidth(), dim.getHeight()); ((UDrawable) tile).drawU(ug); final Real p = getNotePosition(stringBounder); + if (YGauge.USE_ME) + ug = ug.apply(UTranslate.dy(getYGauge().getMin().getCurrentValue())); comp.drawU(ug.apply(UTranslate.dx(p.getCurrentValue())), area, (Context2D) ug); } diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteTop.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteTop.java index 3e6f2d66e..e436e6cd4 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteTop.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteTop.java @@ -55,6 +55,7 @@ public class CommunicationTileNoteTop extends CommunicationTileNoteBottomTopAbst super(tile, message, skin, skinParam, noteOnMessage, currentY); } + @Override public void drawU(UGraphic ug) { final StringBounder stringBounder = ug.getStringBounder(); final Component comp = getComponent(stringBounder); @@ -63,6 +64,9 @@ public class CommunicationTileNoteTop extends CommunicationTileNoteBottomTopAbst ((UDrawable) tile).drawU(ug.apply(UTranslate.dy(dim.getHeight() + spacey))); + if (YGauge.USE_ME) + ug = ug.apply(UTranslate.dy(getYGauge().getMin().getCurrentValue())); + final double middleMsg = (tile.getMinX().getCurrentValue() + tile.getMaxX().getCurrentValue()) / 2; final double xNote = getNotePosition(stringBounder).getCurrentValue(); diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelfNoteRight.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelfNoteRight.java index d543aa21a..9c24d4245 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelfNoteRight.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelfNoteRight.java @@ -110,6 +110,9 @@ public class CommunicationTileSelfNoteRight extends AbstractTile { tile.drawU(ug); final Real p = getNotePosition(stringBounder); + if (YGauge.USE_ME) + ug = ug.apply(UTranslate.dy(getYGauge().getMin().getCurrentValue())); + comp.drawU(ug.apply(UTranslate.dx(p.getCurrentValue())), area, (Context2D) ug); } diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index adfba00fd..1d1507806 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -45,7 +45,7 @@ public class Version { private static final int MAJOR_SEPARATOR = 1000000; public static int version() { - return 1202209; + return 1202210; } public static int versionPatched() { @@ -81,7 +81,7 @@ public class Version { } public static int beta() { - final int beta = 2; + final int beta = 0; return beta; } @@ -94,7 +94,7 @@ public class Version { } public static long compileTime() { - return 1664295006047L; + return 1666371002299L; } public static String compileTimeString() {