From c488983e798f0fa53992b223334cfbc516d5ba16 Mon Sep 17 00:00:00 2001 From: StarryScythe <tim6542@aol.com> Date: Mon, 23 Dec 2024 15:34:22 +0100 Subject: [PATCH] tested exporting into .svg for topic transition - seems to work fine? (see test.svg); normal page has pnml_type PageNode, so its unclear if this was supposed to be the NodePage type or just normal pages, which are a type of nodes? in case this is just a renaming problem, the issues #6 and #4 are not really issues at all, otherwise only a new page type has to be declared that is basically just another page.. I will be seeing to the remaining problems: issue #2 is a huge hazard, the package was build from an examle without renaming the actual package and references, so now it is hard to see, which references are to actual other packages and which ones were just copied blindly --- TaskAndTimeTimJahn.txt | 11 +++---- glsp-client/workspace/DiNeROSNet.pnml | 8 ++--- glsp-client/workspace/test.pnml | 43 +++++++++++++++++++++++++++ glsp-client/workspace/test.svg | 1 + 4 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 glsp-client/workspace/test.pnml create mode 100644 glsp-client/workspace/test.svg diff --git a/TaskAndTimeTimJahn.txt b/TaskAndTimeTimJahn.txt index e71b7e9..2b6424f 100644 --- a/TaskAndTimeTimJahn.txt +++ b/TaskAndTimeTimJahn.txt @@ -42,13 +42,14 @@ Sebastian //------------------------------------------------------------------------------------------------------ hours: -14.11.24 8h -24.11.24 4h -30.11.24 8h -01.12.24 8h -08.12.24 8h +14.11.24 8h +24.11.24 4h +30.11.24 8h +01.12.24 8h +08.12.24 8h 16.12.24 12h 22.12.24 12h +23.12.24 8h //------------------------------------------------------------------------------------------------------ see https://github.com/eclipse-theia/theia/blob/master/doc/Developing.md#prerequisite_native_keymap diff --git a/glsp-client/workspace/DiNeROSNet.pnml b/glsp-client/workspace/DiNeROSNet.pnml index c1a3ef5..cd6f3e6 100644 --- a/glsp-client/workspace/DiNeROSNet.pnml +++ b/glsp-client/workspace/DiNeROSNet.pnml @@ -4,8 +4,8 @@ <page id="b620d456-1c1f-4c04-a5ad-779a04e28a13"> <name text="NewPage0"/> <nodegraphics> - <position x="136" y="6"/> - <dimension x="2286" y="1387"/> + <position x="-1084" y="-207"/> + <dimension x="1481" y="1157"/> </nodegraphics> <transition id="4c7d3c57-0863-4e9d-92b3-12857a3244d9"> <name text="ServiceY"/> @@ -93,7 +93,7 @@ <place id="2bfeb487-8fc2-4df5-9432-c94177cd9307" InArcs="8974e722-24f0-468f-b7ea-f4a548e3ac58"> <name text="Pa4"/> <nodegraphics> - <position x="349" y="189"/> + <position x="320" y="180"/> <dimension x="70" y="70"/> </nodegraphics> <initialMarking text="0"/> @@ -206,7 +206,7 @@ <page id="1f38c72b-f846-4cc3-b44c-f457c792ab23"> <name text="NodePageB"/> <nodegraphics> - <position x="1053" y="191"/> + <position x="1004" y="166"/> <dimension x="456" y="215"/> </nodegraphics> <arc id="3ae63869-874e-4d77-a2c1-df8de9e246b9" source="cfda6f51-c2cf-4108-95ea-f5175685222c" target="bb2afd13-950b-4647-887d-54e395970f91"> diff --git a/glsp-client/workspace/test.pnml b/glsp-client/workspace/test.pnml new file mode 100644 index 0000000..6fab4f3 --- /dev/null +++ b/glsp-client/workspace/test.pnml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<pnml xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns="http://www.pnml.org/version-2009/grammar/pnml"> + <net id="test"> + <page id="264f2fbc-b832-48a7-8222-0541aa4707ee"> + <name text="NewPage5"/> + <nodegraphics> + <position x="224" y="27"/> + <dimension x="500" y="500"/> + </nodegraphics> + <arc id="89e0d428-4f7a-463a-80d9-6d33f0541d22" source="2d062086-da61-4f6e-a247-635f8c6af7e9" target="c896e5ab-19e9-44b5-94f0-111700b7cd5f"> + <name text="NewArc0"/> + </arc> + <place id="c896e5ab-19e9-44b5-94f0-111700b7cd5f" InArcs="89e0d428-4f7a-463a-80d9-6d33f0541d22"> + <name text="NewPlace14"/> + <nodegraphics> + <position x="268" y="122"/> + <dimension x="70" y="70"/> + </nodegraphics> + <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1" node="264f2fbc-b832-48a7-8222-0541aa4707ee" subnet=""/> + </place> + <transition id="2d062086-da61-4f6e-a247-635f8c6af7e9" OutArcs="89e0d428-4f7a-463a-80d9-6d33f0541d22"> + <name text="NewTransition11"/> + <nodegraphics> + <position x="111" y="126"/> + <dimension x="30" y="70"/> + </nodegraphics> + <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1" type="discreteTransitionType" node="264f2fbc-b832-48a7-8222-0541aa4707ee" subnet=""/> + </transition> + <transition id="d5f3a600-7f20-42bf-9bc8-c011e11ab22e"> + <name text="NewTopic7"/> + <nodegraphics> + <position x="246" y="312"/> + <dimension x="100" y="150"/> + </nodegraphics> + <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1" type="topicTransitionType" topicName="NewTopic7"> + <subscribers> + <subscriber id="c896e5ab-19e9-44b5-94f0-111700b7cd5f" limit="10"/> + </subscribers> + </toolspecific> + </transition> + </page> + </net> +</pnml> diff --git a/glsp-client/workspace/test.svg b/glsp-client/workspace/test.svg new file mode 100644 index 0000000..86e0aa0 --- /dev/null +++ b/glsp-client/workspace/test.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" class="sprotty-graph" id="9edb881d-167b-486b-b39a-944365c07d6d" style="width: 500px !important;height: 500px !important;border: none !important;background-color:rgb(255, 255, 255);block-size:726.4px;border-block-end-color:rgb(187, 187, 187);border-block-end-style:solid;border-block-start-color:rgb(187, 187, 187);border-block-start-style:solid;border-bottom-color:rgb(187, 187, 187);border-bottom-style:solid;border-inline-end-color:rgb(187, 187, 187);border-inline-end-style:solid;border-inline-start-color:rgb(187, 187, 187);border-inline-start-style:solid;border-left-color:rgb(187, 187, 187);border-left-style:solid;border-right-color:rgb(187, 187, 187);border-right-style:solid;border-top-color:rgb(187, 187, 187);border-top-style:solid;caret-color:rgb(97, 97, 97);color:rgb(97, 97, 97);column-rule-color:rgb(97, 97, 97);cursor:default;flex-basis:0%;flex-grow:1;font-family:"Helvetica Neue", Helvetica, Arial, sans-serif;inline-size:0px;outline-color:rgb(97, 97, 97);perspective-origin:0px 363.2px;text-decoration:none solid rgb(97, 97, 97);text-decoration-color:rgb(97, 97, 97);text-emphasis-color:rgb(97, 97, 97);transform-origin:0px 363.2px;-webkit-locale:"en";-webkit-text-fill-color:rgb(97, 97, 97);-webkit-text-stroke-color:rgb(97, 97, 97);" version="1.1" viewBox="224 27 500 500"><g transform="scale(1) translate(0,0)"><g id="tasklist-diagram_2_264f2fbc-b832-48a7-8222-0541aa4707ee" transform="translate(224, 27)" class="node page-node" style="fill:rgba(150, 150, 150, 0.4);"><defs><clipPath id="264f2fbc-b832-48a7-8222-0541aa4707ee_clip_path"><path d="M2,20q0,-18 18,-18h460q18,0 18,18v460q0,18 -18,18h-460q-18,0 -18,-18z "/></clipPath></defs><path d="M0,20q0,-20 20,-20h460q20,0 20,20v460q0,20 -20,20h-460q-20,0 -20,-20z " class="sprotty-node" style="stroke:rgb(0, 0, 0);stroke-width:0px;"/><text class="label sprotty-label" id="tasklist-diagram_2_264f2fbc-b832-48a7-8222-0541aa4707ee_label" transform="translate(5, 5) translate(26.087499618530273, 9.600000381469727)" style="fill:rgb(0, 0, 0);font-family:sans-serif;font-size:10.6667px;perspective-origin:10.425px 0.95px;stroke:rgb(0, 0, 0);stroke-width:0px;text-anchor:middle;">NewPage5</text><g transform="translate(5, 18)" class="page sprotty-comp page-comp" id="tasklist-diagram_2_264f2fbc-b832-48a7-8222-0541aa4707ee_comp"><g id="tasklist-diagram_2_c896e5ab-19e9-44b5-94f0-111700b7cd5f" transform="translate(268, 122)" class="place" style="border-bottom-left-radius:1000px;border-bottom-right-radius:1000px;border-end-end-radius:1000px;border-end-start-radius:1000px;border-start-end-radius:1000px;border-start-start-radius:1000px;border-top-left-radius:1000px;border-top-right-radius:1000px;fill:rgb(241, 189, 108);outline-color:rgb(0, 0, 0);outline-style:solid;outline-width:0.8px;"><circle r="35" cx="35" cy="35" class="sprotty-node" style="stroke:rgb(0, 0, 0);stroke-width:0px;"/><text class="markingLabel sprotty-label" id="tasklist-diagram_2_c896e5ab-19e9-44b5-94f0-111700b7cd5f_marking" transform="translate(32.03125, 30) translate(2.96875, 9.600000381469727)" style="fill:rgb(0, 0, 0);font-family:sans-serif;font-size:10.6667px;perspective-origin:1.1875px 0.95px;stroke:rgb(0, 0, 0);stroke-width:0px;text-anchor:middle;">0</text></g><g id="tasklist-diagram_2_c896e5ab-19e9-44b5-94f0-111700b7cd5f_labelNode" transform="translate(253, 192)" class="label-node" style="fill:rgba(255, 255, 255, 0);"><rect x="0" y="0" width="100" height="22" class="sprotty-node" style="stroke:rgb(0, 0, 0);stroke-width:0px;"/><text class="label sprotty-label" id="tasklist-diagram_2_c896e5ab-19e9-44b5-94f0-111700b7cd5f_label" transform="translate(19.830217361450195, 5) translate(29.9375, 9.600000381469727)" style="fill:rgb(0, 0, 0);font-family:sans-serif;font-size:10.6667px;perspective-origin:11.975px 0.95px;stroke:rgb(0, 0, 0);stroke-width:0px;text-anchor:middle;">NewPlace14</text></g><g id="tasklist-diagram_2_2d062086-da61-4f6e-a247-635f8c6af7e9" transform="translate(111, 126)" class="transition" style="fill:rgb(241, 189, 108);outline-color:rgb(0, 0, 0);outline-style:solid;outline-width:0.8px;"><rect x="0" y="0" width="30" height="70" class="sprotty-node" style="stroke:rgb(0, 0, 0);stroke-width:0px;"/></g><g id="tasklist-diagram_2_2d062086-da61-4f6e-a247-635f8c6af7e9_labelNode" transform="translate(76, 196)" class="label-node" style="fill:rgba(255, 255, 255, 0);"><rect x="0" y="0" width="100" height="22" class="sprotty-node" style="stroke:rgb(0, 0, 0);stroke-width:0px;"/><text class="label sprotty-label" id="tasklist-diagram_2_2d062086-da61-4f6e-a247-635f8c6af7e9_label" transform="translate(10.581249237060547, 5) translate(39.41875076293945, 9.600000381469727)" style="fill:rgb(0, 0, 0);font-family:sans-serif;font-size:10.6667px;perspective-origin:15.7625px 0.95px;stroke:rgb(0, 0, 0);stroke-width:0px;text-anchor:middle;">NewTransition11</text></g><g id="tasklist-diagram_2_2d062086-da61-4f6e-a247-635f8c6af7e9_signalClauseLabelNode" transform="translate(26, 106)" class="label-node" style="fill:rgba(255, 255, 255, 0);"><rect x="0" y="0" width="200" height="20" class="sprotty-node" style="stroke:rgb(0, 0, 0);stroke-width:0px;"/><text class="signalClauseLabel sprotty-label signal-clause-true" id="tasklist-diagram_2_2d062086-da61-4f6e-a247-635f8c6af7e9_signalClause" transform="translate(100, 5)" style="fill:rgb(0, 0, 0);filter:invert(0.23) sepia(0.76) saturate(27.84) hue-rotate(84deg) brightness(0.96) contrast(0.97);font-family:sans-serif;font-size:10.6667px;stroke:rgb(0, 0, 0);stroke-width:0px;text-anchor:middle;"/></g><g id="tasklist-diagram_2_d5f3a600-7f20-42bf-9bc8-c011e11ab22e" transform="translate(246, 312)" class="node topic-node" style="fill:rgb(131, 182, 221);"><defs><clipPath id="d5f3a600-7f20-42bf-9bc8-c011e11ab22e_clip_path"><path d="M2,20q0,-18 18,-18h60q18,0 18,18v110q0,18 -18,18h-60q-18,0 -18,-18z "/></clipPath></defs><path d="M0,20q0,-20 20,-20h60q20,0 20,20v110q0,20 -20,20h-60q-20,0 -20,-20z " class="sprotty-node" style="stroke:rgb(0, 0, 0);stroke-width:0px;"/><text class="label sprotty-label" id="tasklist-diagram_2_d5f3a600-7f20-42bf-9bc8-c011e11ab22e_label" transform="translate(5, 5) translate(26.08125114440918, 9.600000381469727)" style="fill:rgb(0, 0, 0);font-family:sans-serif;font-size:10.6667px;perspective-origin:10.425px 0.95px;stroke:rgb(0, 0, 0);stroke-width:0px;text-anchor:middle;">NewTopic7</text></g><g id="tasklist-diagram_2_d5f3a600-7f20-42bf-9bc8-c011e11ab22e_c896e5ab-19e9-44b5-94f0-111700b7cd5f_topicLink" class="sprotty-edge topic-link" style="fill:none;filter:brightness(0) saturate(1) invert(0.19) sepia(0.41) saturate(54.61) hue-rotate(218deg) brightness(0.98) contrast(0.8);stroke:rgb(0, 0, 0);stroke-width:1.5px;"><path d="M 298.2826086956522,312 L 301.9352756088795,191.98380142252915"/><text class="edgeTextLabel sprotty-label" id="tasklist-diagram_2_d5f3a600-7f20-42bf-9bc8-c011e11ab22e_c896e5ab-19e9-44b5-94f0-111700b7cd5f_topicLinkLabel" transform="translate(300.10894215226585, 251.99190071126458) rotate(-88.25675351569421) translate(-0.21977615356445312, -2.3999996185302734)" style="fill:rgb(0, 0, 0);font-family:sans-serif;font-size:10.6667px;perspective-origin:9.8375px 0.95px;stroke-width:0px;text-anchor:middle;">subscriber</text><text class="topicLinkLimitLabel sprotty-label" id="tasklist-diagram_2_d5f3a600-7f20-42bf-9bc8-c011e11ab22e_c896e5ab-19e9-44b5-94f0-111700b7cd5f_subscriber_topicLinkLimitLabel" transform="translate(300.10894215226585, 251.99190071126458) rotate(-88.25675351569421) translate(0, 9.600000381469727)" style="fill:rgb(0, 0, 0);font-family:sans-serif;font-size:10.6667px;perspective-origin:2.3625px 0.95px;stroke-width:0px;text-anchor:middle;">10</text></g><g id="tasklist-diagram_2_89e0d428-4f7a-463a-80d9-6d33f0541d22" class="sprotty-edge arc" style="fill:none;stroke:rgb(0, 0, 0);stroke-width:1.5px;"><path d="M 141,160.66101694915255 L 268.0089339843835,157.79075855402525"/><path d="M 1,0 L 10,-4 L 10,4 Z" transform="rotate(178.7054004818357 268.0089339843835 157.79075855402525) translate(268.0089339843835 157.79075855402525)" class="sprotty-edge arrow" style="fill:rgb(0, 0, 0);"/><text class="arcWeightLabel sprotty-label" id="tasklist-diagram_2_89e0d428-4f7a-463a-80d9-6d33f0541d22_arcWeight" transform="translate(204.50446699219174, 159.2258877515889) rotate(-1.2945995181642798) translate(0, -2.3999996185302734)" style="fill:rgb(0, 0, 0);font-family:sans-serif;font-size:10.6667px;perspective-origin:1.1875px 0.95px;stroke-width:0px;text-anchor:middle;">1</text></g></g></g></g></svg> \ No newline at end of file -- GitLab