From 2ef536e8894d7217a1fe543da553bd4f705f68bb Mon Sep 17 00:00:00 2001 From: kirchsth Date: Sun, 28 Jan 2024 19:11:24 +0100 Subject: [PATCH] support all PlantUML elements - fix sequence diagrams - Timmy/plantuml-action@v1 uses sometimes an older plantuml-1.2023.7.jar version and not the latest version --- C4_Sequence.puml | 12 ++++++------ percy/TestAllPlantUmlElements.puml | 14 ++++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/C4_Sequence.puml b/C4_Sequence.puml index 2da951c1..916bce02 100644 --- a/C4_Sequence.puml +++ b/C4_Sequence.puml @@ -232,7 +232,7 @@ $calcDescr $getParticipant("external_person", $alias, $label, $type, $descr, $sprite, $tags, $link) !endprocedure -!unquoted procedure System($alias, $label, $descr="", $sprite="", $tags="", $link="", $type="") +!unquoted procedure System($alias, $label, $descr="", $sprite="", $tags="", $link="", $type="", $plant="rectangle") ' $type reuses $techn definition of $tags $getParticipant("system", $alias, $label, $type, $descr, $sprite, $tags, $link) !endprocedure @@ -247,7 +247,7 @@ $calcDescr $getParticipant("system", $alias, $label, $type, $descr, $sprite, $tags, $link) !endprocedure -!unquoted procedure System_Ext($alias, $label, $descr="", $sprite="", $tags="", $link="", $type="") +!unquoted procedure System_Ext($alias, $label, $descr="", $sprite="", $tags="", $link="", $type="", $plant="rectangle") ' $type reuses $techn definition of $tags $getParticipant("external_system", $alias, $label, $type, $descr, $sprite, $tags, $link) !endprocedure @@ -264,7 +264,7 @@ $calcDescr -!unquoted procedure Container($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="") +!unquoted procedure Container($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="", $plant="rectangle") $getParticipant("container", $alias, $label, $techn, $descr, $sprite, $tags, $link) !endprocedure @@ -276,7 +276,7 @@ $calcDescr $getParticipant("container", $alias, $label, $techn, $descr, $sprite, $tags, $link) !endprocedure -!unquoted procedure Container_Ext($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="") +!unquoted procedure Container_Ext($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="", $plant="rectangle") $getParticipant("external_container", $alias, $label, $techn, $descr, $sprite, $tags, $link) !endprocedure @@ -290,7 +290,7 @@ $calcDescr -!unquoted procedure Component($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="") +!unquoted procedure Component($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="", $plant="rectangle") $getParticipant("component", $alias, $label, $techn, $descr, $sprite, $tags, $link) !endprocedure @@ -302,7 +302,7 @@ $calcDescr $getParticipant("component", $alias, $label, $techn, $descr, $sprite, $tags, $link) !endprocedure -!unquoted procedure Component_Ext($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="") +!unquoted procedure Component_Ext($alias, $label, $techn="", $descr="", $sprite="", $tags="", $link="", $plant="rectangle") $getParticipant("external_component", $alias, $label, $techn, $descr, $sprite, $tags, $link) !endprocedure diff --git a/percy/TestAllPlantUmlElements.puml b/percy/TestAllPlantUmlElements.puml index 53a8b920..d285706d 100644 --- a/percy/TestAllPlantUmlElements.puml +++ b/percy/TestAllPlantUmlElements.puml @@ -1,21 +1,23 @@ -@startuml + @startuml ' If ENABLE_ALL_PLANT_ELEMENTS is set BEFORE the first C4_* file is loaded, ' nearly "all" PlantUML elements can be used like ' Component(StorageA, "Storage A ", $plant="storage") !ENABLE_ALL_PLANT_ELEMENTS = 1 -!theme C4_united from -' !theme C4_green from - ' convert it with additional command line argument -DRELATIVE_INCLUDE="./.." to use locally !if %variable_exists("RELATIVE_INCLUDE") - !include %get_variable_value("RELATIVE_INCLUDE")/C4_Component.puml + ' percy runs (sometimes) with 1.2023.7 + ' !theme C4_united from %get_variable_value("RELATIVE_INCLUDE")/themes + !theme C4_united from ./../themes + ' !theme C4_green from ./../themes + !include ./../C4_Component.puml !else + !theme C4_united from https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/themes + ' !theme C4_green from https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/themes !include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Component.puml !endif - LAYOUT_TOP_DOWN() ' default is rectangle