Skip to content

Commit

Permalink
Diagram: #1266 Resize (button, or automatic) should take into account…
Browse files Browse the repository at this point in the history 
… ports
  • Loading branch information
@slisson
slisson committed Jan 11, 2016
1 parent 704a995 commit 11d9853
Showing 1 changed file with 266 additions and 23 deletions.
289 changes: 266 additions & 23 deletions ....itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,7 @@
<concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
<child id="1205679832066" name="ascending" index="2S7zOq" />
</concept>
<concept id="1237909114519" name="jetbrains.mps.baseLanguage.collections.structure.GetValuesOperation" flags="nn" index="T8wYR" />
<concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
<concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
Expand Down Expand Up @@ -641,6 +642,9 @@
<concept id="8293956702609956630" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachVariableReference" flags="nn" index="3M$PaV">
<reference id="8293956702609966325" name="variable" index="3M$S_o" />
</concept>
<concept id="1522217801069396578" name="jetbrains.mps.baseLanguage.collections.structure.FoldLeftOperation" flags="nn" index="1MD8d$">
<child id="1522217801069421796" name="seed" index="1MDeny" />
</concept>
<concept id="1180964022718" name="jetbrains.mps.baseLanguage.collections.structure.ConcatOperation" flags="nn" index="3QWeyG" />
<concept id="599357942184015200" name="jetbrains.mps.baseLanguage.collections.structure.AlsoSortOperation" flags="nn" index="1XvEQZ" />
</language>
Expand Down Expand Up @@ -43005,6 +43009,235 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="7FkgTXZJq7G" role="jymVt" />
<node concept="3clFb_" id="7FkgTXZJpC2" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="getRequiredSize" />
<node concept="1LlUBW" id="7FkgTXZJpC3" role="3clF45">
<node concept="10P55v" id="7FkgTXZJpC4" role="1Lm7xW" />
<node concept="10P55v" id="7FkgTXZJpC5" role="1Lm7xW" />
</node>
<node concept="3Tm1VV" id="7FkgTXZJpC6" role="1B3o_S" />
<node concept="2AHcQZ" id="7FkgTXZJpC7" role="2AJF6D">
<ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
</node>
<node concept="2AHcQZ" id="7FkgTXZJpCA" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
<node concept="3clFbS" id="7FkgTXZJpCB" role="3clF47">
<node concept="3cpWs8" id="7FkgTXZJqvv" role="3cqZAp">
<node concept="3cpWsn" id="7FkgTXZJqvw" role="3cpWs9">
<property role="TrG5h" value="size" />
<node concept="1LlUBW" id="7FkgTXZJqvo" role="1tU5fm">
<node concept="10P55v" id="7FkgTXZJqvt" role="1Lm7xW" />
<node concept="10P55v" id="7FkgTXZJqvu" role="1Lm7xW" />
</node>
<node concept="3nyPlj" id="7FkgTXZJqvx" role="33vP2m">
<ref role="37wK5l" node="5emhLEC$jET" resolve="getRequiredSize" />
</node>
</node>
</node>
<node concept="3clFbF" id="7FkgTXZJE86" role="3cqZAp">
<node concept="37vLTI" id="7FkgTXZJGAo" role="3clFbG">
<node concept="2YIFZM" id="7FkgTXZJH7G" role="37vLTx">
<ref role="37wK5l" to="wyt6:~Math.max(double,double):double" resolve="max" />
<ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
<node concept="1LFfDK" id="7FkgTXZJI22" role="37wK5m">
<node concept="3cmrfG" id="7FkgTXZJItZ" role="1LF_Uc">
<property role="3cmrfH" value="1" />
</node>
<node concept="37vLTw" id="7FkgTXZJHz8" role="1LFl5Q">
<ref role="3cqZAo" node="7FkgTXZJqvw" resolve="size" />
</node>
</node>
<node concept="1rXfSq" id="7FkgTXZN7Ve" role="37wK5m">
<ref role="37wK5l" node="7FkgTXZN2O0" resolve="getRequiredHeightForPorts" />
</node>
</node>
<node concept="1LFfDK" id="7FkgTXZJG5A" role="37vLTJ">
<node concept="3cmrfG" id="7FkgTXZJGzv" role="1LF_Uc">
<property role="3cmrfH" value="1" />
</node>
<node concept="37vLTw" id="7FkgTXZJE84" role="1LFl5Q">
<ref role="3cqZAo" node="7FkgTXZJqvw" resolve="size" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="7FkgTXZJpCD" role="3cqZAp">
<node concept="37vLTw" id="7FkgTXZJqvy" role="3clFbG">
<ref role="3cqZAo" node="7FkgTXZJqvw" resolve="size" />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="7FkgTXZN1Mj" role="jymVt" />
<node concept="3clFb_" id="7FkgTXZN2O0" role="jymVt">
<property role="TrG5h" value="getRequiredHeightForPorts" />
<node concept="10P55v" id="7FkgTXZN6gT" role="3clF45" />
<node concept="3Tmbuc" id="7FkgTXZNPy8" role="1B3o_S" />
<node concept="3clFbS" id="7FkgTXZN2O4" role="3clF47">
<node concept="3cpWs8" id="7FkgTXZN5F2" role="3cqZAp">
<node concept="3cpWsn" id="7FkgTXZN5F3" role="3cpWs9">
<property role="TrG5h" value="portsHeights" />
<node concept="3rvAFt" id="7FkgTXZN5F4" role="1tU5fm">
<node concept="10P55v" id="7FkgTXZN5F5" role="3rvSg0" />
<node concept="10P55v" id="7FkgTXZN5F6" role="3rvQeY" />
</node>
<node concept="2ShNRf" id="7FkgTXZN5F7" role="33vP2m">
<node concept="3rGOSV" id="7FkgTXZN5F8" role="2ShVmc">
<node concept="10P55v" id="7FkgTXZN5F9" role="3rHrn6" />
<node concept="10P55v" id="7FkgTXZN5Fa" role="3rHtpV" />
</node>
</node>
</node>
</node>
<node concept="2Gpval" id="7FkgTXZN5Fb" role="3cqZAp">
<node concept="2GrKxI" id="7FkgTXZN5Fc" role="2Gsz3X">
<property role="TrG5h" value="port" />
</node>
<node concept="3clFbS" id="7FkgTXZN5Fd" role="2LFqv$">
<node concept="3cpWs8" id="7FkgTXZN5Fe" role="3cqZAp">
<node concept="3cpWsn" id="7FkgTXZN5Ff" role="3cpWs9">
<property role="TrG5h" value="portsHeight" />
<node concept="10P55v" id="7FkgTXZN5Fg" role="1tU5fm" />
<node concept="3K4zz7" id="7FkgTXZN5Fh" role="33vP2m">
<node concept="3b6qkQ" id="7FkgTXZN5Fi" role="3K4GZi">
<property role="$nhwW" value="0.0" />
</node>
<node concept="2OqwBi" id="7FkgTXZN5Fj" role="3K4Cdx">
<node concept="37vLTw" id="7FkgTXZN5Fk" role="2Oq$k0">
<ref role="3cqZAo" node="7FkgTXZN5F3" resolve="portsHeights" />
</node>
<node concept="2Nt0df" id="7FkgTXZN5Fl" role="2OqNvi">
<node concept="2OqwBi" id="7FkgTXZN5Fm" role="38cxEo">
<node concept="2GrUjf" id="7FkgTXZN5Fn" role="2Oq$k0">
<ref role="2Gs0qQ" node="7FkgTXZN5Fc" resolve="port" />
</node>
<node concept="liA8E" id="7FkgTXZN5Fo" role="2OqNvi">
<ref role="37wK5l" to="nkm5:5elYBhUTTjT" resolve="getRelativeXNN" />
</node>
</node>
</node>
</node>
<node concept="3EllGN" id="7FkgTXZN5Fp" role="3K4E3e">
<node concept="37vLTw" id="7FkgTXZN5Fq" role="3ElQJh">
<ref role="3cqZAo" node="7FkgTXZN5F3" resolve="portsHeights" />
</node>
<node concept="2OqwBi" id="7FkgTXZN5Fr" role="3ElVtu">
<node concept="2GrUjf" id="7FkgTXZN5Fs" role="2Oq$k0">
<ref role="2Gs0qQ" node="7FkgTXZN5Fc" resolve="port" />
</node>
<node concept="liA8E" id="7FkgTXZN5Ft" role="2OqNvi">
<ref role="37wK5l" to="nkm5:5elYBhUTTjT" resolve="getRelativeXNN" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="7FkgTXZN5Fu" role="3cqZAp">
<node concept="d57v9" id="7FkgTXZN5Fv" role="3clFbG">
<node concept="2OqwBi" id="7FkgTXZN5Fw" role="37vLTx">
<node concept="2GrUjf" id="7FkgTXZN5Fx" role="2Oq$k0">
<ref role="2Gs0qQ" node="7FkgTXZN5Fc" resolve="port" />
</node>
<node concept="liA8E" id="7FkgTXZN5Fy" role="2OqNvi">
<ref role="37wK5l" to="nkm5:5NCN5Pnk34t" resolve="getHeight" />
</node>
</node>
<node concept="37vLTw" id="7FkgTXZN5Fz" role="37vLTJ">
<ref role="3cqZAo" node="7FkgTXZN5Ff" resolve="portsHeight" />
</node>
</node>
</node>
<node concept="3clFbF" id="7FkgTXZN5F$" role="3cqZAp">
<node concept="d57v9" id="7FkgTXZN5F_" role="3clFbG">
<node concept="37vLTw" id="7FkgTXZN5FA" role="37vLTJ">
<ref role="3cqZAo" node="7FkgTXZN5Ff" resolve="portsHeight" />
</node>
<node concept="10M0yZ" id="7FkgTXZN5FB" role="37vLTx">
<ref role="1PxDUh" to="xqcy:3FRjz$vys4Z" resolve="PortLayouter" />
<ref role="3cqZAo" to="xqcy:7TThwQl_5Ux" resolve="SPACE_BETWEEN_PORTS" />
</node>
</node>
</node>
<node concept="3clFbF" id="7FkgTXZN5FC" role="3cqZAp">
<node concept="37vLTI" id="7FkgTXZN5FD" role="3clFbG">
<node concept="37vLTw" id="7FkgTXZN5FE" role="37vLTx">
<ref role="3cqZAo" node="7FkgTXZN5Ff" resolve="portsHeight" />
</node>
<node concept="3EllGN" id="7FkgTXZN5FF" role="37vLTJ">
<node concept="2OqwBi" id="7FkgTXZN5FG" role="3ElVtu">
<node concept="2GrUjf" id="7FkgTXZN5FH" role="2Oq$k0">
<ref role="2Gs0qQ" node="7FkgTXZN5Fc" resolve="port" />
</node>
<node concept="liA8E" id="7FkgTXZN5FI" role="2OqNvi">
<ref role="37wK5l" to="nkm5:5elYBhUTTjT" resolve="getRelativeXNN" />
</node>
</node>
<node concept="37vLTw" id="7FkgTXZN5FJ" role="3ElQJh">
<ref role="3cqZAo" node="7FkgTXZN5F3" resolve="portsHeights" />
</node>
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="7FkgTXZN5FK" role="2GsD0m">
<node concept="2OqwBi" id="7FkgTXZN5FL" role="2Oq$k0">
<node concept="37vLTw" id="7FkgTXZN5FM" role="2Oq$k0">
<ref role="3cqZAo" node="f4v_NgLsq3" resolve="myBox" />
</node>
<node concept="liA8E" id="7FkgTXZN5FN" role="2OqNvi">
<ref role="37wK5l" to="nkm5:3FRjz$v9I0d" resolve="get" />
</node>
</node>
<node concept="liA8E" id="7FkgTXZN5FO" role="2OqNvi">
<ref role="37wK5l" to="nkm5:1FlH1cK4vt8" resolve="getPorts" />
</node>
</node>
</node>
<node concept="3clFbF" id="7FkgTXZN6LX" role="3cqZAp">
<node concept="2OqwBi" id="7FkgTXZN5G4" role="3clFbG">
<node concept="2OqwBi" id="7FkgTXZN5G5" role="2Oq$k0">
<node concept="37vLTw" id="7FkgTXZN5G6" role="2Oq$k0">
<ref role="3cqZAo" node="7FkgTXZN5F3" resolve="portsHeights" />
</node>
<node concept="T8wYR" id="7FkgTXZN5G7" role="2OqNvi" />
</node>
<node concept="1MD8d$" id="7FkgTXZN5G8" role="2OqNvi">
<node concept="1bVj0M" id="7FkgTXZN5G9" role="23t8la">
<node concept="3clFbS" id="7FkgTXZN5Ga" role="1bW5cS">
<node concept="3clFbF" id="7FkgTXZN5Gb" role="3cqZAp">
<node concept="2YIFZM" id="7FkgTXZN5Gc" role="3clFbG">
<ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
<ref role="37wK5l" to="wyt6:~Math.max(double,double):double" resolve="max" />
<node concept="37vLTw" id="7FkgTXZN5Gd" role="37wK5m">
<ref role="3cqZAo" node="7FkgTXZN5Gf" resolve="s" />
</node>
<node concept="37vLTw" id="7FkgTXZN5Ge" role="37wK5m">
<ref role="3cqZAo" node="7FkgTXZN5Gh" resolve="it" />
</node>
</node>
</node>
</node>
<node concept="37vLTG" id="7FkgTXZN5Gf" role="1bW2Oz">
<property role="TrG5h" value="s" />
<node concept="10P55v" id="7FkgTXZN5Gg" role="1tU5fm" />
</node>
<node concept="Rh6nW" id="7FkgTXZN5Gh" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="7FkgTXZN5Gi" role="1tU5fm" />
</node>
</node>
<node concept="3b6qkQ" id="7FkgTXZN5Gj" role="1MDeny">
<property role="$nhwW" value="0.0" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="312cEu" id="f4v_NgK4Sg">
<property role="TrG5h" value="EdgeDCell" />
Expand Down Expand Up @@ -89179,38 +89412,48 @@
</node>
</node>
</node>
<node concept="3cpWs6" id="5emhLEC$mDQ" role="3cqZAp">
<node concept="1Ls8ON" id="5emhLEC$nx1" role="3cqZAk">
<node concept="3cpWs3" id="5emhLEC$rNn" role="1Lso8e">
<node concept="10M0yZ" id="5emhLEC$sDY" role="3uHU7w">
<ref role="1PxDUh" to="nkm5:27djZ8_YaUo" resolve="Box" />
<ref role="3cqZAo" to="nkm5:TBoO2mIKvo" resolve="PADDING" />
</node>
<node concept="1LFfDK" id="5emhLEC$q35" role="3uHU7B">
<node concept="3cmrfG" id="5emhLEC$qRp" role="1LF_Uc">
<property role="3cmrfH" value="0" />
<node concept="3clFbF" id="7FkgTXZHx5i" role="3cqZAp">
<node concept="37vLTI" id="7FkgTXZHy5Y" role="3clFbG">
<node concept="37vLTw" id="7FkgTXZHx5g" role="37vLTJ">
<ref role="3cqZAo" node="5emhLEC$map" resolve="size" />
</node>
<node concept="1Ls8ON" id="5emhLEC$nx1" role="37vLTx">
<node concept="3cpWs3" id="5emhLEC$rNn" role="1Lso8e">
<node concept="10M0yZ" id="5emhLEC$sDY" role="3uHU7w">
<ref role="1PxDUh" to="nkm5:27djZ8_YaUo" resolve="Box" />
<ref role="3cqZAo" to="nkm5:TBoO2mIKvo" resolve="PADDING" />
</node>
<node concept="37vLTw" id="5emhLEC$p6Y" role="1LFl5Q">
<ref role="3cqZAo" node="5emhLEC$map" resolve="size" />
<node concept="1LFfDK" id="5emhLEC$q35" role="3uHU7B">
<node concept="3cmrfG" id="5emhLEC$qRp" role="1LF_Uc">
<property role="3cmrfH" value="0" />
</node>
<node concept="37vLTw" id="5emhLEC$p6Y" role="1LFl5Q">
<ref role="3cqZAo" node="5emhLEC$map" resolve="size" />
</node>
</node>
</node>
</node>
<node concept="3cpWs3" id="5emhLEC$vcP" role="1Lso8e">
<node concept="10M0yZ" id="5emhLEC$vcQ" role="3uHU7w">
<ref role="1PxDUh" to="nkm5:27djZ8_YaUo" resolve="Box" />
<ref role="3cqZAo" to="nkm5:TBoO2mIKvo" resolve="PADDING" />
</node>
<node concept="1LFfDK" id="5emhLEC$vcR" role="3uHU7B">
<node concept="3cmrfG" id="5emhLEC$vcS" role="1LF_Uc">
<property role="3cmrfH" value="1" />
<node concept="3cpWs3" id="5emhLEC$vcP" role="1Lso8e">
<node concept="10M0yZ" id="5emhLEC$vcQ" role="3uHU7w">
<ref role="1PxDUh" to="nkm5:27djZ8_YaUo" resolve="Box" />
<ref role="3cqZAo" to="nkm5:TBoO2mIKvo" resolve="PADDING" />
</node>
<node concept="37vLTw" id="5emhLEC$vcT" role="1LFl5Q">
<ref role="3cqZAo" node="5emhLEC$map" resolve="size" />
<node concept="1LFfDK" id="5emhLEC$vcR" role="3uHU7B">
<node concept="3cmrfG" id="5emhLEC$vcS" role="1LF_Uc">
<property role="3cmrfH" value="1" />
</node>
<node concept="37vLTw" id="5emhLEC$vcT" role="1LFl5Q">
<ref role="3cqZAo" node="5emhLEC$map" resolve="size" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs6" id="5emhLEC$mDQ" role="3cqZAp">
<node concept="37vLTw" id="7FkgTXZHzRH" role="3cqZAk">
<ref role="3cqZAo" node="5emhLEC$map" resolve="size" />
</node>
</node>
</node>
<node concept="2AHcQZ" id="5emhLEC$jG0" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
Expand Down

0 comments on commit 11d9853

Please sign in to comment.