Skip to content

Commit

Permalink
Merge pull request #866 from JetBrains/bugfix/diagram_improvements
Browse files Browse the repository at this point in the history 
Diagram improvements
  • Loading branch information
@alexanderpann
alexanderpann authored Jun 27, 2024
2 parents 0c8d599 + 1a9ffe8 commit c35f1b0
Show file tree
Hide file tree
Showing 37 changed files with 23,521 additions and 8,137 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e

- *de.itemis.mps.editor.diagram.runtime*: Diagrams can now be used in an headless environment (e.g. for rendering documentation).
- *de.itemis.mps.editor.diagram.runtime*: The dependency to *de.q60.mps.collections.libs* was removed.
- *de.itemis.mps.editor.diagram*: Various improvements to diagrams were made. (see: [PR #866](https://github.com/JetBrains/MPS-extensions/pull/866) )

## May 2024

Expand Down
42 changes: 37 additions & 5 deletions .../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5063,6 +5063,12 @@
<node concept="m$_yC" id="3_sZyadxXAa" role="m$_yJ">
<ref role="m$_y1" to="ffeo:6Hpa5co69BH" resolve="jetbrains.mps.editor.tooltips" />
</node>
<node concept="m$_yC" id="5CBfeKljtXO" role="m$_yJ">
<ref role="m$_y1" node="3$A0JaN5ezp" resolve="MPS.ThirdParty" />
</node>
<node concept="m$_yC" id="Lh$XQAfAuF" role="m$_yJ">
<ref role="m$_y1" to="ffeo:4k71ibbLe59" resolve="com.intellij.modules.mps" />
</node>
</node>
<node concept="2G$12M" id="4be$WTb1AxY" role="3989C9">
<property role="TrG5h" value="de.itemis.mps.editor.diagram" />
Expand Down Expand Up @@ -5123,11 +5129,6 @@
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
</node>
</node>
<node concept="1SiIV0" id="tUmIYfjym1" role="3bR37C">
<node concept="3bR9La" id="tUmIYfjym2" role="1SiIV1">
<ref role="3bR37D" node="2Xjt3l57hht" resolve="de.slisson.mps.reflection.runtime" />
</node>
</node>
<node concept="1SiIV0" id="tUmIYfjym3" role="3bR37C">
<node concept="3bR9La" id="tUmIYfjym4" role="1SiIV1">
<property role="3bR36h" value="true" />
Expand Down Expand Up @@ -5550,6 +5551,26 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="YGA9S6qTe9" role="3bR37C">
<node concept="3bR9La" id="YGA9S6qTea" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1TaHNgiIbJ$" resolve="jetbrains.mps.ide.editor" />
</node>
</node>
<node concept="1SiIV0" id="5CBfeKkVNlr" role="3bR37C">
<node concept="3bR9La" id="5CBfeKkVNls" role="1SiIV1">
<ref role="3bR37D" node="3$A0JaN5bpX" resolve="MPS.ThirdParty" />
</node>
</node>
<node concept="1SiIV0" id="5CBfeKkVNlx" role="3bR37C">
<node concept="3bR9La" id="5CBfeKkVNly" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
</node>
</node>
<node concept="1SiIV0" id="5CBfeKkVNlz" role="3bR37C">
<node concept="3bR9La" id="5CBfeKkVNl$" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
</node>
</node>
</node>
<node concept="1E1JtA" id="6wEeo$QJAsB" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -5786,6 +5807,12 @@
<ref role="3bR37D" to="ffeo:7YI57w6K0iE" resolve="jetbrains.mps.lang.editor#1129914002149" />
</node>
</node>
<node concept="1SiIV0" id="6OfpnAhj8QS" role="3bR37C">
<node concept="3bR9La" id="6OfpnAhj8QT" role="1SiIV1">
<property role="3bR36h" value="true" />
<ref role="3bR37D" to="ffeo:2eDSGe9d1q1" resolve="MPS.Workbench" />
</node>
</node>
</node>
<node concept="3rtmxn" id="3xFG3bj5Mmn" role="3bR31x">
<node concept="3LXTmp" id="3xFG3bj5Mmo" role="3rtmxm">
Expand Down Expand Up @@ -5900,6 +5927,11 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="74e51Ji4Ba7" role="3bR37C">
<node concept="3bR9La" id="74e51Ji4Ba8" role="1SiIV1">
<ref role="3bR37D" node="4be$WTb1AQa" resolve="de.itemis.mps.editor.diagram.runtime" />
</node>
</node>
</node>
<node concept="1E1JtD" id="56Tfdun3uan" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down
153 changes: 2 additions & 151 deletions code/diagram/languages/de.itemis.mps.editor.diagram.demo.activity/languageModels/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +262,6 @@
</concept>
</language>
<language id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram">
<concept id="8433227566816385664" name="de.itemis.mps.editor.diagram.structure.ILayoutAlgorithm" flags="ng" index="35SPa">
<child id="2064429317493348220" name="config" index="3pGojU" />
</concept>
<concept id="6554619383003875357" name="de.itemis.mps.editor.diagram.structure.InlineEditorComponent" flags="ig" index="238au4" />
<concept id="8433227566817223068" name="de.itemis.mps.editor.diagram.structure.LayeredLayoutAlgorithm" flags="ng" index="39fpm">
<property id="7623784619795245948" name="direction" index="1NdBj4" />
Expand Down Expand Up @@ -328,33 +325,12 @@
<child id="7890587897031726225" name="query" index="2M4AHN" />
</concept>
<concept id="7890587897031711745" name="de.itemis.mps.editor.diagram.structure.Content_GenericEdgeQuery" flags="ng" index="2M4Efz" />
<concept id="5878290447138467534" name="de.itemis.mps.editor.diagram.structure.Padding" flags="ng" index="POkNa">
<property id="5878290447138468454" name="top" index="POl1y" />
<property id="5878290447138468820" name="right" index="POl7g" />
<property id="5878290447138469609" name="bottom" index="POljH" />
<property id="5878290447138469821" name="left" index="POlmT" />
</concept>
<concept id="5878290447138443303" name="de.itemis.mps.editor.diagram.structure.ContentAlignment" flags="ng" index="POr8z">
<property id="5878290447138443694" name="alignment" index="POreE" />
</concept>
<concept id="6237710625713942002" name="de.itemis.mps.editor.diagram.structure.Content_BLQuery" flags="ig" index="2ZMM4L" />
<concept id="6237710625713964946" name="de.itemis.mps.editor.diagram.structure.Parameter_Node" flags="ng" index="2ZN8Hh" />
<concept id="3662141892379115490" name="de.itemis.mps.editor.diagram.structure.Margin" flags="ng" index="36xZl7">
<property id="3662141892379115493" name="bottom" index="36xZl0" />
<property id="3662141892379115492" name="right" index="36xZl1" />
<property id="3662141892379115494" name="left" index="36xZl3" />
<property id="3662141892379115491" name="top" index="36xZl6" />
</concept>
<concept id="3662141892377043655" name="de.itemis.mps.editor.diagram.structure.ISupportTopdownPacking" flags="ng" index="36TQxy">
<property id="3662141892371757000" name="topdownHierarchicalNodeAspectRatio" index="31dVPH" />
<property id="3662141892371761113" name="topdownScaleFactor" index="31dWPW" />
<property id="3662141892374571168" name="topdownNodeType" index="36KE85" />
<property id="3662141892374569619" name="topdownHierarchicalNodeWidth" index="36KEwQ" />
</concept>
<concept id="8963411245957652387" name="de.itemis.mps.editor.diagram.structure.Content_GenericElementQuery_Query" flags="ig" index="37q72E" />
<concept id="8963411245958754161" name="de.itemis.mps.editor.diagram.structure.Content_GenericElementQuery_ParameterObject" flags="ng" index="37u81S" />
<concept id="6910723851735106293" name="de.itemis.mps.editor.diagram.structure.DiagramButtonConfig" flags="ng" index="3sA_1f">
<property id="2773448605512242576" name="hasShowPortsLabels" index="3g8l5v" />
<property id="2773448605512242576" name="hasShowPortsLabelsButton" index="3g8l5v" />
<property id="6910723851735128113" name="hasResetViewButton" index="3sAwEb" />
<property id="6910723851735128104" name="hasLayoutDiagramButton" index="3sAwEi" />
<property id="6910723851735128109" name="hasMaximizeDiagramButton" index="3sAwEn" />
Expand All @@ -372,56 +348,6 @@
<concept id="6987730699889040827" name="de.itemis.mps.editor.diagram.structure.LineWidth" flags="lg" index="3C0NmR">
<property id="6987730699889499559" name="value" index="3DY3mF" />
</concept>
<concept id="3333801137936756207" name="de.itemis.mps.editor.diagram.structure.LayeredLayoutConfig" flags="ng" index="3GLQun">
<property id="3662141892379183286" name="highDegreeNodeMaximumTreeHeight" index="36x08j" />
<property id="3662141892379184421" name="highDegreeNodeThreshold" index="36x0u0" />
<property id="3662141892379181918" name="hierarchicalSweepiness" index="36x0BV" />
<property id="3662141892379181279" name="greedySwitchCrossingminimizationHierarchical" index="36x0DU" />
<property id="3662141892379187702" name="improveCuts" index="36x1dj" />
<property id="3662141892379188269" name="improveWrappedEdges" index="36x1q8" />
<property id="3662141892379186382" name="horizontalSpacingBetweenLabelAndPort" index="36x1TF" />
<property id="3662141892379191931" name="labelSpacing" index="36x23u" />
<property id="3662141892379192633" name="layerBound" index="36x2us" />
<property id="3662141892379191100" name="labelNodeSpacing" index="36x2Qp" />
<property id="3662141892379194849" name="linearSegmentDeflectionDampening" index="36x3X4" />
<property id="3662141892379204315" name="maxNodePromotionIterations" index="36x51Y" />
<property id="3662141892379206070" name="mergeHierarchyCrossingEdges" index="36x6Gj" />
<property id="3662141892379207456" name="msdFreedom" index="36x6Q5" />
<property id="3662141892379211526" name="nodeNodeBetweenLayersSpacing" index="36x7Qz" />
<property id="3662141892379155187" name="crossingCounterPortInfluence" index="36x91m" />
<property id="3662141892379153202" name="correctionFactorForWrapping" index="36x9An" />
<property id="3662141892379154155" name="crossingCounterNodeInfluence" index="36x9Le" />
<property id="3662141892379162028" name="multiEdgeDistancePenalty" index="36xbW9" />
<property id="3662141892379167712" name="edgeNodeBetweenLayersSpacing" index="36xc55" />
<property id="3662141892379166982" name="edgeLabelSpacing" index="36xcez" />
<property id="3662141892379164867" name="edgeEdgeBetweenLayersSpacing" index="36xcDA" />
<property id="3662141892379171281" name="edgeSpacing" index="36xddO" />
<property id="3662141892379171857" name="edgeThickness" index="36xdqO" />
<property id="3662141892379168833" name="edgeNodeSpacing" index="36xdF$" />
<property id="3662141892379180082" name="greedySwitchCrossingminimization" index="36xfqn" />
<property id="3662141892379178639" name="greedySwitchActivationThreshold" index="36xfKE" />
<property id="3662141892379216113" name="nodeSelfLoopSpacing" index="36xo9k" />
<property id="3662141892379216986" name="nodeSpacing" index="36xorZ" />
<property id="3662141892379221784" name="randomizationSeed" index="36xpmX" />
<property id="3662141892379218932" name="portSpacing" index="36xp_h" />
<property id="3662141892379224606" name="slopedEdgeZoneWidth" index="36xq2V" />
<property id="3662141892379225514" name="sloppySplineLayerSpacingFactor" index="36xqsf" />
<property id="3662141892379223673" name="separateConnectedComponents" index="36xqNs" />
<property id="3662141892379228412" name="thoroughness" index="36xr9p" />
<property id="3662141892379230763" name="upperBoundOnWidthMinWidthLayerer" index="36xsye" />
<property id="3662141892379231963" name="upperLayerEstimationScalingFactorMinWidthLayerer" index="36xsLY" />
<property id="3662141892379238267" name="verticalSpacingBetweenLabelAndPort" index="36xtnu" />
<property id="3662141892379139136" name="additionalWrappedEdgesSpacing" index="36xPr_" />
<property id="3662141892379140237" name="aspectRatio" index="36xQCC" />
<property id="3662141892379147547" name="considerModelOrderStrategy" index="36xRuY" />
<property id="3662141892379145171" name="commentNodeSpacing" index="36xR_Q" />
<property id="3662141892379144303" name="commentCommentSpacing" index="36xRFa" />
<property id="3662141892379145832" name="componentsSpacing" index="36xRNd" />
<child id="3662141892379210077" name="nodeLabelPadding" index="36x7JS" />
<child id="3662141892379152132" name="contentAlignment" index="36x8mx" />
<child id="3662141892379217652" name="padding" index="36xohh" />
<child id="3662141892379113988" name="additionalPortSpace" index="36xZ2x" />
</concept>
<concept id="301931493264781535" name="de.itemis.mps.editor.diagram.structure.CellModel_DiagramContent" flags="ng" index="3IJ5R8">
<child id="301931493268065286" name="ingoingRedirect" index="3IzU4h" />
<child id="301931493268065521" name="outgoingRedirect" index="3IzU7A" />
Expand Down Expand Up @@ -1711,82 +1637,7 @@
<property role="3sAwEi" value="true" />
<property role="3g8l5v" value="false" />
</node>
<node concept="3fe8g" id="1MAkSr4BiCN" role="35U2g">
<node concept="3GLQun" id="1JVIYvy9lAX" role="3pGojU">
<property role="36xPr_" value="10.0" />
<property role="36xQCC" value="1.6" />
<property role="36xRFa" value="10.0" />
<property role="36xR_Q" value="10.0" />
<property role="36xRNd" value="20.0" />
<property role="36xRuY" value="3biyEnOlw4v/NONE" />
<property role="36x9An" value="1.0" />
<property role="36x9Le" value="0.0" />
<property role="36x91m" value="0.0" />
<property role="36xbW9" value="2.0" />
<property role="36xcDA" value="10.0" />
<property role="36xcez" value="2.0" />
<property role="36xc55" value="10.0" />
<property role="36xdF$" value="10.0" />
<property role="36xddO" value="10.0" />
<property role="36xdqO" value="1.0" />
<property role="36xfKE" value="40" />
<property role="36xfqn" value="3biyEnOlBXf/TWO_SIDED" />
<property role="36x0DU" value="3biyEnOlBXk/OFF" />
<property role="36x0BV" value="0.1" />
<property role="36x08j" value="5" />
<property role="36x0u0" value="16" />
<property role="36x1TF" value="1.0" />
<property role="36x1dj" value="true" />
<property role="36x1q8" value="true" />
<property role="36x2Qp" value="5.0" />
<property role="36x23u" value="0.0" />
<property role="36x2us" value="2147483647" />
<property role="36x3X4" value="0.3" />
<property role="36x51Y" value="0" />
<property role="36x6Gj" value="true" />
<property role="36x6Q5" value="1" />
<property role="36x7Qz" value="20.0" />
<property role="36xo9k" value="10.0" />
<property role="36xorZ" value="20.0" />
<property role="36xp_h" value="10.0" />
<property role="36xpmX" value="1" />
<property role="36xqNs" value="true" />
<property role="36xq2V" value="2.0" />
<property role="36xqsf" value="0.2" />
<property role="36xr9p" value="7" />
<property role="31dVPH" value="1.414" />
<property role="36KEwQ" value="150.0" />
<property role="36KE85" value="qwNnoEIHRM/HIERARCHICAL_NODE" />
<property role="31dWPW" value="1.0" />
<property role="36xsye" value="4" />
<property role="36xsLY" value="2" />
<property role="36xtnu" value="1.0" />
<node concept="36xZl7" id="1JVIYvy9lAY" role="36xZ2x">
<property role="36xZl6" value="0.0" />
<property role="36xZl1" value="0.0" />
<property role="36xZl0" value="0.0" />
<property role="36xZl3" value="0.0" />
</node>
<node concept="POr8z" id="1JVIYvy9lAZ" role="36x8mx">
<property role="POreE" value="56jSwh$g$O2/V_TOP" />
</node>
<node concept="POr8z" id="1JVIYvy9lB0" role="36x8mx">
<property role="POreE" value="56jSwh$g_03/H_LEFT" />
</node>
<node concept="POkNa" id="1JVIYvy9lB1" role="36x7JS">
<property role="POl1y" value="5.0" />
<property role="POl7g" value="5.0" />
<property role="POljH" value="5.0" />
<property role="POlmT" value="5.0" />
</node>
<node concept="POkNa" id="1JVIYvy9lB2" role="36xohh">
<property role="POl1y" value="12.0" />
<property role="POl7g" value="12.0" />
<property role="POljH" value="12.0" />
<property role="POlmT" value="12.0" />
</node>
</node>
</node>
<node concept="3fe8g" id="1MAkSr4BiCN" role="35U2g" />
</node>
<node concept="2w$q5c" id="5kFTseQTjoA" role="2whIAn">
<node concept="2aJ2om" id="5kFTseQTjoB" role="2w$qW5">
Expand Down
Loading

0 comments on commit c35f1b0

Please sign in to comment.