Commit 1c521bfc authored by Clement Lucas's avatar Clement Lucas
Browse files

v3.2

parent 31a9c150
......@@ -65,8 +65,8 @@
<yjs:Font fontSize="12" fontFamily="'Arial'"/>
</yjs:DefaultLabelStyle.font>
</yjs:DefaultLabelStyle>
<yjs:Stroke x:Key="21" fill="#FF000000"/>
<yjs:PolylineEdgeStyle x:Key="22" stroke="{y:GraphMLReference 21}"/>
<yjs:PolylineEdgeStyle x:Key="21" stroke="{y:GraphMLReference 18}"/>
<yjs:Stroke x:Key="22" fill="#FF000000"/>
</y:SharedData>
</data>
<graph id="G" edgedefault="directed">
......@@ -259,6 +259,7 @@
</uml:UMLNodeStyle>
</data>
<port name="p0"/>
<port name="p1"/>
</node>
<node id="n7">
<data key="d0">10</data>
......@@ -340,31 +341,6 @@
<port name="p2"/>
</node>
<node id="n10">
<data key="d0">13</data>
<data key="d5">
<y:RectD X="236.13802645028784" Y="-16.25" Width="136.7350422942026" Height="124"/>
</data>
<data key="d7">
<uml:UMLNodeStyle fill="{y:GraphMLReference 1}" highlightFill="{y:GraphMLReference 2}">
<uml:UMLNodeStyle.model>
<uml:UMLClassModel stereotype="" constraint="" className="Jour" attributesOpen="true" operationsOpen="true">
<uml:UMLClassModel.attributes>
<x:Array Type="sys:Object">
<sys:String><![CDATA[nom_jour : {lundi,...}]]></sys:String>
</x:Array>
</uml:UMLClassModel.attributes>
<uml:UMLClassModel.operations>
<x:Array Type="sys:Object">
<sys:String>est_actif()</sys:String>
</x:Array>
</uml:UMLClassModel.operations>
</uml:UMLClassModel>
</uml:UMLNodeStyle.model>
</uml:UMLNodeStyle>
</data>
<port name="p0"/>
</node>
<node id="n11">
<data key="d0">14</data>
<data key="d5">
<y:RectD X="-867.3521297147254" Y="-101.75" Width="215.70425942945027" Height="172"/>
......@@ -393,10 +369,10 @@
<port name="p1"/>
<port name="p2"/>
</node>
<node id="n12">
<node id="n11">
<data key="d0">15</data>
<data key="d5">
<y:RectD X="0.9165751835717941" Y="-404.5" Width="215.70425942945027" Height="108"/>
<y:RectD X="0.9165751835718083" Y="-404.5" Width="215.70425942945027" Height="108"/>
</data>
<data key="d7">
<uml:UMLNodeStyle fill="{y:GraphMLReference 1}" highlightFill="{y:GraphMLReference 2}">
......@@ -416,7 +392,7 @@
</data>
<port name="p0"/>
</node>
<node id="n13">
<node id="n12">
<data key="d0">16</data>
<data key="d5">
<y:RectD X="275.7843772272445" Y="-217.75" Width="125" Height="108"/>
......@@ -445,7 +421,7 @@
</port>
<port name="p2"/>
</node>
<node id="n14">
<node id="n13">
<data key="d0">17</data>
<data key="d5">
<y:RectD X="-93.10212971472515" Y="-30.875" Width="215.70425942945027" Height="172"/>
......@@ -479,10 +455,10 @@
<port name="p1"/>
<port name="p2"/>
</node>
<node id="n15">
<node id="n14">
<data key="d0">18</data>
<data key="d5">
<y:RectD X="-93.10212971472515" Y="-225.75" Width="215.70425942945027" Height="124"/>
<y:RectD X="-93.10212971472515" Y="-233.75" Width="215.70425942945027" Height="140"/>
</data>
<data key="d7">
<uml:UMLNodeStyle fill="{y:GraphMLReference 3}" highlightFill="{y:GraphMLReference 4}">
......@@ -492,6 +468,7 @@
<x:Array Type="sys:Object">
<sys:String><![CDATA[arrivée : heure]]></sys:String>
<sys:String><![CDATA[départ : heure]]></sys:String>
<sys:String><![CDATA[date : date]]></sys:String>
</x:Array>
</uml:UMLClassModel.attributes>
<uml:UMLClassModel.operations>
......@@ -505,18 +482,40 @@
<port name="p1"/>
<port name="p2"/>
<port name="p3"/>
<port name="p4"/>
<port name="p5">
<port name="p4">
<data key="d16">
<y:FreeNodePortLocationModelParameter Ratio="0.0045933873899424715,0.5"/>
</data>
</port>
<port name="p6">
<port name="p5">
<data key="d16">
<y:FreeNodePortLocationModelParameter Ratio="0.0045933873899424715,0.5"/>
</data>
</port>
</node>
<node id="n15">
<data key="d0">19</data>
<data key="d5">
<y:RectD X="-371.6175211471014" Y="-404.5" Width="136.7350422942026" Height="108"/>
</data>
<data key="d7">
<uml:UMLNodeStyle fill="{y:GraphMLReference 1}" highlightFill="{y:GraphMLReference 2}">
<uml:UMLNodeStyle.model>
<uml:UMLClassModel stereotype="" constraint="" className="Calendrier" attributesOpen="true" operationsOpen="false">
<uml:UMLClassModel.attributes>
<x:Array Type="sys:Object">
<sys:String><![CDATA[jour : {lundi,...}]]></sys:String>
</x:Array>
</uml:UMLClassModel.attributes>
<uml:UMLClassModel.operations>
<x:Array Type="sys:Object"/>
</uml:UMLClassModel.operations>
</uml:UMLClassModel>
</uml:UMLNodeStyle.model>
</uml:UMLNodeStyle>
</data>
<port name="p0"/>
</node>
<edge id="e0" source="n1" target="n3" sourceport="p0" targetport="p0">
<data key="d11">
<x:List>
......@@ -543,7 +542,7 @@
<yjs:PolylineEdgeStyle stroke="{y:GraphMLReference 13}" targetArrow="{y:GraphMLReference 14}"/>
</data>
</edge>
<edge id="e1" source="n14" target="n4" sourceport="p2" targetport="p0">
<edge id="e1" source="n13" target="n4" sourceport="p2" targetport="p0">
<data key="d12">
<x:List>
<y:Bend Location="14.75,176.25"/>
......@@ -554,7 +553,7 @@
<y:GraphMLReference ResourceKey="6"/>
</data>
</edge>
<edge id="e2" source="n14" target="n5" sourceport="p1" targetport="p0">
<edge id="e2" source="n13" target="n5" sourceport="p1" targetport="p0">
<data key="d12">
<x:List>
<y:Bend Location="14.75,176.25"/>
......@@ -565,7 +564,7 @@
<y:GraphMLReference ResourceKey="6"/>
</data>
</edge>
<edge id="e3" source="n11" target="n2" sourceport="p0" targetport="p0">
<edge id="e3" source="n10" target="n2" sourceport="p0" targetport="p0">
<data key="d11">
<x:List>
<y:Label>
......@@ -594,10 +593,10 @@
</x:List>
</data>
<data key="d13">
<yjs:PolylineEdgeStyle stroke="{y:GraphMLReference 21}"/>
<yjs:PolylineEdgeStyle stroke="{y:GraphMLReference 18}"/>
</data>
</edge>
<edge id="e4" source="n11" target="n7" sourceport="p1" targetport="p0">
<edge id="e4" source="n10" target="n7" sourceport="p1" targetport="p0">
<data key="d12">
<x:List>
<y:Bend Location="-759.5000000000002,127"/>
......@@ -608,7 +607,7 @@
<y:GraphMLReference ResourceKey="8"/>
</data>
</edge>
<edge id="e5" source="n11" target="n8" sourceport="p2" targetport="p0">
<edge id="e5" source="n10" target="n8" sourceport="p2" targetport="p0">
<data key="d12">
<x:List>
<y:Bend Location="-759.5000000000002,127"/>
......@@ -619,7 +618,7 @@
<y:GraphMLReference ResourceKey="8"/>
</data>
</edge>
<edge id="e6" source="n13" target="n0" sourceport="p0" targetport="p0">
<edge id="e6" source="n12" target="n0" sourceport="p0" targetport="p0">
<data key="d11">
<x:List>
<y:Label LayoutParameter="{y:GraphMLReference 9}" Style="{y:GraphMLReference 10}">
......@@ -631,7 +630,7 @@
<y:GraphMLReference ResourceKey="11"/>
</data>
</edge>
<edge id="e7" source="n15" target="n13" sourceport="p0" targetport="p1">
<edge id="e7" source="n14" target="n12" sourceport="p0" targetport="p1">
<data key="d11">
<x:List>
<y:Label LayoutParameter="{y:GraphMLReference 9}" Style="{y:GraphMLReference 10}">
......@@ -643,7 +642,7 @@
<y:GraphMLReference ResourceKey="11"/>
</data>
</edge>
<edge id="e8" source="n13" target="n1" sourceport="p2" targetport="p1">
<edge id="e8" source="n12" target="n1" sourceport="p2" targetport="p1">
<data key="d11">
<x:List>
<y:Label Style="{y:GraphMLReference 10}">
......@@ -658,7 +657,7 @@
<y:GraphMLReference ResourceKey="15"/>
</data>
</edge>
<edge id="e9" source="n15" target="n14" sourceport="p1" targetport="p0">
<edge id="e9" source="n14" target="n13" sourceport="p1" targetport="p0">
<data key="d11">
<x:List>
<y:Label Style="{y:GraphMLReference 10}">
......@@ -688,7 +687,7 @@
<y:GraphMLReference ResourceKey="15"/>
</data>
</edge>
<edge id="e11" source="n15" target="n6" sourceport="p2" targetport="p0">
<edge id="e11" source="n14" target="n6" sourceport="p2" targetport="p0">
<data key="d12">
<x:List>
<y:Bend Location="14.749999999999986,-259.5"/>
......@@ -699,7 +698,7 @@
<y:GraphMLReference ResourceKey="17"/>
</data>
</edge>
<edge id="e12" source="n15" target="n12" sourceport="p3" targetport="p0">
<edge id="e12" source="n14" target="n11" sourceport="p3" targetport="p0">
<data key="d12">
<x:List>
<y:Bend Location="14.749999999999986,-259.5"/>
......@@ -710,26 +709,7 @@
<y:GraphMLReference ResourceKey="17"/>
</data>
</edge>
<edge id="e13" source="n15" target="n10" sourceport="p4" targetport="p0">
<data key="d11">
<x:List>
<y:Label Style="{y:GraphMLReference 20}">
<y:Label.Text><![CDATA[0..n 1..7]]></y:Label.Text>
<y:Label.LayoutParameter>
<y:SmartEdgeLabelModelParameter Model="{y:GraphMLReference 19}" SegmentRatio="0.6742717265080623" Distance="5.000000000000126"/>
</y:Label.LayoutParameter>
</y:Label>
</x:List>
</data>
<data key="d13">
<yjs:PolylineEdgeStyle stroke="{y:GraphMLReference 18}">
<yjs:PolylineEdgeStyle.sourceArrow>
<yjs:Arrow type="DIAMOND" stroke="{y:GraphMLReference 18}" fill="#FFFFFFFF"/>
</yjs:PolylineEdgeStyle.sourceArrow>
</yjs:PolylineEdgeStyle>
</data>
</edge>
<edge id="e14" source="n9" target="n15" sourceport="p1" targetport="p5">
<edge id="e13" source="n9" target="n14" sourceport="p1" targetport="p4">
<data key="d11">
<x:List>
<y:Label Style="{y:GraphMLReference 20}">
......@@ -747,10 +727,10 @@
</x:List>
</data>
<data key="d13">
<y:GraphMLReference ResourceKey="22"/>
<y:GraphMLReference ResourceKey="21"/>
</data>
</edge>
<edge id="e15" source="n9" target="n15" sourceport="p2" targetport="p6">
<edge id="e14" source="n9" target="n14" sourceport="p2" targetport="p5">
<data key="d11">
<x:List>
<y:Label Style="{y:GraphMLReference 20}">
......@@ -768,7 +748,37 @@
</x:List>
</data>
<data key="d13">
<y:GraphMLReference ResourceKey="22"/>
<y:GraphMLReference ResourceKey="21"/>
</data>
</edge>
<edge id="e15" source="n6" target="n15" sourceport="p1" targetport="p0">
<data key="d11">
<x:List>
<y:Label>
<y:Label.Text>0..n</y:Label.Text>
<y:Label.LayoutParameter>
<y:SmartEdgeLabelModelParameter SegmentRatio="1" Distance="5">
<y:SmartEdgeLabelModelParameter.Model>
<y:SmartEdgeLabelModel/>
</y:SmartEdgeLabelModelParameter.Model>
</y:SmartEdgeLabelModelParameter>
</y:Label.LayoutParameter>
<y:Label.Style>
<yjs:DefaultLabelStyle verticalTextAlignment="BOTTOM" horizontalTextAlignment="CENTER" textFill="BLACK">
<yjs:DefaultLabelStyle.font>
<yjs:Font fontSize="12" fontFamily="'Arial'"/>
</yjs:DefaultLabelStyle.font>
</yjs:DefaultLabelStyle>
</y:Label.Style>
</y:Label>
</x:List>
</data>
<data key="d13">
<yjs:PolylineEdgeStyle stroke="{y:GraphMLReference 22}">
<yjs:PolylineEdgeStyle.sourceArrow>
<yjs:Arrow type="DIAMOND" stroke="{y:GraphMLReference 22}" fill="#FFFFFFFF"/>
</yjs:PolylineEdgeStyle.sourceArrow>
</yjs:PolylineEdgeStyle>
</data>
</edge>
</graph>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment