Skip to content

Commit

Permalink
bugfix of issue #46
Browse files Browse the repository at this point in the history
  • Loading branch information
DrMarkusVoss committed Oct 14, 2023
1 parent e7d43ab commit 4772bfe
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 25 deletions.
43 changes: 19 additions & 24 deletions pumla_macros_global.puml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,24 @@
!endprocedure
!endprocedure

' ---------------------------------------------
' ############################################
' ---------------------------------------------
' inject child elements for the current re-usable
' element
'
!unquoted procedure PUMLARUAInjectChildElements()
!foreach $el in $allelems.elements
!if ($el.parent == $pum_global_current_rua_alias)
!if ($PUMVarShowBodyInternals)
_PUMPutElementFiltered($el.path, $el.filename)
!endif
!endif
!endfor
!endprocedure
!endprocedure



' ############################################
' ---------------------------------------------
Expand Down Expand Up @@ -768,30 +786,7 @@ PUMLAInterface($ifname, $ifalias, $elemalias, $type)
!if ((($el.start == $elemalias) || ($el.end == $elemalias)) && ($el.reltype == $reltype))
' make sure to not put the same relation twice
!if (%not(%variable_exists($$el.id)))
!if ((%not($el.reltxt == "instance of")) || ($PUMVarShowInstantiationRel))
!$reladr=""
!if ($PUMVarShowTaggedValues)
!$tvs = ""
!$cma = ""
!foreach $tv in $el.taggedvalues
!$tvs = $tvs + "[" + $tv.tag + ": " + $tv.values + "]"
!endfor

!if ($tvs!= "")
!$reladr = "\n{" + $tvs + "}"
!endif
!endif
!if ($tag == "")
$el.start $el.reltype $el.end : $el.reltxt $reladr
!else
!if ($tv_found == "YES")
$el.start $el.reltype $el.end : $el.reltxt $reladr
!endif
!endif
' set global variable to indicate that the relation
' is already put onto the diagram
%set_variable_value($$el.id, "%true()")
!endif
PUMLAPutRelation($el.id)
!endif
!endif
!endfor
Expand Down
1 change: 1 addition & 0 deletions test/examples/C4example/pumlaC4ExampleDiagram.puml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ PUMLAPutAllRelations()

' show the elements of the model repository
PUMLACheatSheetAllAttributes()

' final layout adoption
Lay_R(rel_db, filesystem)
@enduml
1 change: 0 additions & 1 deletion test/examples/WeatherStation/cheatSheetAdvanced.puml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
!$PUMVarShowBodyInternalsDyn = %false()

title Cheat Sheet with all attributes example

' this commands gives you an overview
' on the contents of the model repository
' with all the available attributes. you
Expand Down

0 comments on commit 4772bfe

Please sign in to comment.