Add support for lineThickness in AddRelTag (2 - fix argument order)

pull/256/head
KIRCHSTH 3 years ago committed by kirchsth
parent 5419ed6ea9
commit 5de3df31d4

@ -351,7 +351,7 @@ $tagSkin
!endif !endif
!$elementSkin = $elementSkin + %newline() !$elementSkin = $elementSkin + %newline()
!if ($lineThickness != "") !if ($lineThickness != "")
!$elementSkin = $elementSkin + " Thickness " + $lineThickness + %newline() !$elementSkin = $elementSkin + " thickness " + $lineThickness + %newline()
!endif !endif
!$elementSkin = $elementSkin + "}" + %newline() !$elementSkin = $elementSkin + "}" + %newline()
$elementSkin $elementSkin
@ -571,7 +571,7 @@ $elementSkin
!return $tagEntry !return $tagEntry
!endfunction !endfunction
!function $tagRelLegendEntry($tagStereo, $textColor, $lineColor, $lineStyle, $lineThickness, $legendText, $legendSprite) !function $tagRelLegendEntry($tagStereo, $textColor, $lineColor, $lineStyle, $legendText, $legendSprite, $lineThickness)
!$tc = $textColor !$tc = $textColor
!$lc = $lineColor !$lc = $lineColor
@ -645,7 +645,7 @@ $elementSkin
' !endif ' !endif
!endprocedure !endprocedure
!unquoted procedure $addRelTagToLegend($tagStereo, $textColor="", $lineColor="", $lineStyle="", $lineThickness, $legendText="", $legendSprite="") !unquoted procedure $addRelTagToLegend($tagStereo, $textColor="", $lineColor="", $lineStyle="", $legendText="", $legendSprite="", $lineThickness="")
'' Arrows have a bug with stereotype/skinparams and cannot combine text colors of one stereotype '' Arrows have a bug with stereotype/skinparams and cannot combine text colors of one stereotype
'' and the line color of another stereotype. Therefore the text color of one tag and the line color '' and the line color of another stereotype. Therefore the text color of one tag and the line color
'' of another tag have to be combined via a "workaround" tag ("v1.0&v1.1"). '' of another tag have to be combined via a "workaround" tag ("v1.0&v1.1").
@ -653,7 +653,7 @@ $elementSkin
'' be an inconsistency between the element tags and the rel tags and therefore '' be an inconsistency between the element tags and the rel tags and therefore
'' & combined workaround tags are not removed too (and in unlikely cases the color itself could be changed) '' & combined workaround tags are not removed too (and in unlikely cases the color itself could be changed)
' !if (%strpos($tagStereo, "&") < 0) ' !if (%strpos($tagStereo, "&") < 0)
!$tagEntry = $tagRelLegendEntry($tagStereo, $textColor, $lineColor, $lineStyle, $lineThickness, $legendText, $legendSprite) !$tagEntry = $tagRelLegendEntry($tagStereo, $textColor, $lineColor, $lineStyle, $legendText, $legendSprite, $lineThickness)
%set_variable_value("$" + $tagStereo + "_LineLegendEntry", $tagEntry) %set_variable_value("$" + $tagStereo + "_LineLegendEntry", $tagEntry)
!$tagCustomLegend = $tagCustomLegend + $tagStereo + "_Line\n" !$tagCustomLegend = $tagCustomLegend + $tagStereo + "_Line\n"
' !endif ' !endif
@ -727,7 +727,7 @@ $addTagToLegend($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $sha
!endprocedure !endprocedure
' used by new defined rel tags ' used by new defined rel tags
!unquoted procedure AddRelTag($tagStereo, $textColor="", $lineColor="", $lineStyle="", $lineThickness="", $sprite="", $techn="", $legendText="", $legendSprite="") !unquoted procedure AddRelTag($tagStereo, $textColor="", $lineColor="", $lineStyle="", $sprite="", $techn="", $legendText="", $legendSprite="", $lineThickness="")
$defineRelSkinparams($tagStereo, $textColor, $lineColor, $lineStyle, $lineThickness) $defineRelSkinparams($tagStereo, $textColor, $lineColor, $lineStyle, $lineThickness)
!if ($sprite != "") !if ($sprite != "")
%set_variable_value("$" + $tagStereo + "RelTagSprite", $sprite) %set_variable_value("$" + $tagStereo + "RelTagSprite", $sprite)
@ -739,7 +739,7 @@ $defineRelSkinparams($tagStereo, $textColor, $lineColor, $lineStyle, $lineThickn
!if ($techn != "") !if ($techn != "")
%set_variable_value("$" + $tagStereo + "RelTagTechn", $techn) %set_variable_value("$" + $tagStereo + "RelTagTechn", $techn)
!endif !endif
$addRelTagToLegend($tagStereo, $textColor, $lineColor, $lineStyle, $lineThickness, $legendText, $legendSprite) $addRelTagToLegend($tagStereo, $textColor, $lineColor, $lineStyle, $legendText, $legendSprite, $lineThickness)
!endprocedure !endprocedure
' update the style of existing elements like person, ... ' update the style of existing elements like person, ...

@ -497,7 +497,7 @@ Additional tags/stereotypes can be added to the existing element stereotypes (co
* `AddElementTag(tagStereo, ?bgColor, ?fontColor, ?borderColor, ?shadowing, ?shape, ?sprite, ?techn, ?legendText, ?legendSprite)`: * `AddElementTag(tagStereo, ?bgColor, ?fontColor, ?borderColor, ?shadowing, ?shape, ?sprite, ?techn, ?legendText, ?legendSprite)`:
Introduces a new element tag. The styles of the tagged elements are updated and the tag is displayed in the calculated legend. Introduces a new element tag. The styles of the tagged elements are updated and the tag is displayed in the calculated legend.
* `AddRelTag(tagStereo, ?textColor, ?lineColor, ?lineStyle, ?lineThickness, ?sprite, ?techn, ?legendText, ?legendSprite)`: * `AddRelTag(tagStereo, ?textColor, ?lineColor, ?lineStyle, ?sprite, ?techn, ?legendText, ?legendSprite, ?lineThickness)`:
Introduces a new Relationship tag. The styles of the tagged relationships are updated and the tag is displayed in the calculated legend. Introduces a new Relationship tag. The styles of the tagged relationships are updated and the tag is displayed in the calculated legend.
* `AddBoundaryTag(tagStereo, ?bgColor, ?fontColor, ?borderColor, ?shadowing, ?shape, ?type, ?legendText)`: * `AddBoundaryTag(tagStereo, ?bgColor, ?fontColor, ?borderColor, ?shadowing, ?shape, ?type, ?legendText)`:
Introduces a new Boundary tag. The styles of the tagged boundaries are updated and the tag is displayed in the calculated legend. Introduces a new Boundary tag. The styles of the tagged boundaries are updated and the tag is displayed in the calculated legend.

Loading…
Cancel
Save