octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-11-25 14:27:33 +00:00
Code Issues Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Arnaud Roques 2022-01-14 18:06:05 +01:00
parent e823b5f00f
commit adc23450c8
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
skin/plantuml.skin
View File

@ -313,6 +313,9 @@ ganttDiagram {
Margin 2 2 2 2 Margin 2 2 2 2
Padding 0 Padding 0
} }
undone {
BackGroundColor white
}
milestone { milestone {
Margin 2 Margin 2
Padding 3 Padding 3

2
src/net/sourceforge/plantuml/nwdiag/CommandNetwork.java
View File

@ -54,7 +54,7 @@ public class CommandNetwork extends SingleLineCommand2<NwDiagram> {
RegexLeaf.spaceZeroOrMore(), // RegexLeaf.spaceZeroOrMore(), //
new RegexLeaf("network"), // new RegexLeaf("network"), //
RegexLeaf.spaceZeroOrMore(), // RegexLeaf.spaceZeroOrMore(), //
new RegexLeaf("NAME", "([%pLN_]+)?"), // new RegexLeaf("NAME", "([-.%pLN_]+)?"), //
RegexLeaf.spaceZeroOrMore(), // RegexLeaf.spaceZeroOrMore(), //
new RegexLeaf("\\{"), RegexLeaf.end()); new RegexLeaf("\\{"), RegexLeaf.end());
} }

5
src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java
View File

@ -69,6 +69,7 @@ import net.sourceforge.plantuml.style.SName;
import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.Style;
import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleBuilder;
import net.sourceforge.plantuml.style.StyleSignature; import net.sourceforge.plantuml.style.StyleSignature;
import net.sourceforge.plantuml.style.Value;
import net.sourceforge.plantuml.svek.image.Opale; import net.sourceforge.plantuml.svek.image.Opale;
import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphic;
import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.ULine;
@ -291,13 +292,13 @@ public class TaskDrawRegular extends AbstractTaskDraw {
off.add(new Segment(x1, x2)); off.add(new Segment(x1, x2));
} }
final HColor back2 = StyleSignature.of(SName.root, SName.document, SName.ganttDiagram) final HColor backUndone = StyleSignature.of(SName.root, SName.element, SName.ganttDiagram, SName.undone)
.getMergedStyle(getStyleBuilder()).value(PName.BackGroundColor) .getMergedStyle(getStyleBuilder()).value(PName.BackGroundColor)
.asColor(skinParam.getThemeStyle(), getColorSet()); .asColor(skinParam.getThemeStyle(), getColorSet());
final RectangleTask rectangleTask = new RectangleTask(startPos, endPos, round, getCompletion(), off); final RectangleTask rectangleTask = new RectangleTask(startPos, endPos, round, getCompletion(), off);
rectangleTask.draw(ug, getShapeHeight(stringBounder), back2, oddStart, oddEnd); rectangleTask.draw(ug, getShapeHeight(stringBounder), backUndone, oddStart, oddEnd);
if (url != null) { if (url != null) {
ug.closeUrl(); ug.closeUrl();

1
src/net/sourceforge/plantuml/style/SName.java
View File

@ -118,6 +118,7 @@ public enum SName {
timeline, // timeline, //
timingDiagram, // timingDiagram, //
title, // title, //
undone, //
unstarted, // unstarted, //
usecase, // usecase, //
wbsDiagram, // wbsDiagram, //

2
src/net/sourceforge/plantuml/version/Version.java
View File

@ -80,7 +80,7 @@ public class Version {
} }
public static int beta() { public static int beta() {
final int beta = 1; final int beta = 3;
return beta; return beta;
} }