From 4c810499565509abd32d453d2d77858fbb82d068 Mon Sep 17 00:00:00 2001 From: majean5 Date: Fri, 6 May 2022 13:42:01 +0200 Subject: [PATCH] UML mais encore plus cool --- Documents/Diagramme de class.mdj | 827 ++++++++++++++++++++++--------- WpfApp1/AddAShark.xaml | 2 +- WpfApp1/UserControlEdit.xaml | 2 +- 3 files changed, 595 insertions(+), 236 deletions(-) diff --git a/Documents/Diagramme de class.mdj b/Documents/Diagramme de class.mdj index e27a30e..7dd4016 100644 --- a/Documents/Diagramme de class.mdj +++ b/Documents/Diagramme de class.mdj @@ -214,7 +214,7 @@ "top": 249, "width": 931.74072265625, "height": 13, - "text": "+/PhotoCarte: Carte", + "text": "+/PhotoCarte: string", "horizontalAlignment": 0 }, { @@ -265,7 +265,7 @@ "top": 294, "width": 931.74072265625, "height": 13, - "text": "+/Repartion: Zone", + "text": "+/Repartion: List", "horizontalAlignment": 0 } ], @@ -368,8 +368,8 @@ "$ref": "AAAAAAGALSX7JqO0VeQ=" }, "font": "Arial;13;0", - "left": 293, - "top": 493, + "left": 421, + "top": 485, "width": 86.72802734375, "height": 13, "text": "«enumeration»" @@ -381,8 +381,8 @@ "$ref": "AAAAAAGALSX7JqO0VeQ=" }, "font": "Arial;13;1", - "left": 293, - "top": 508, + "left": 421, + "top": 500, "width": 86.72802734375, "height": 13, "text": "Zone" @@ -395,8 +395,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": -272, - "top": -64, + "left": -16, + "top": -80, "width": 73.67724609375, "height": 13, "text": "(from Model)" @@ -409,15 +409,15 @@ }, "visible": false, "font": "Arial;13;0", - "left": -272, - "top": -64, + "left": -16, + "top": -80, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", - "left": 288, - "top": 488, + "left": 416, + "top": 480, "width": 96.72802734375, "height": 38, "stereotypeLabel": { @@ -444,8 +444,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": -136, - "top": -32, + "left": -8, + "top": -40, "width": 10, "height": 10 }, @@ -460,8 +460,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": -136, - "top": -32, + "left": -8, + "top": -40, "width": 10, "height": 10 }, @@ -476,8 +476,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": -136, - "top": -32, + "left": -8, + "top": -40, "width": 10, "height": 10 }, @@ -492,8 +492,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": -136, - "top": -32, + "left": -8, + "top": -40, "width": 10, "height": 10 }, @@ -517,8 +517,8 @@ "$ref": "AAAAAAGALSaazqPhbE4=" }, "font": "Arial;13;0", - "left": 293, - "top": 531, + "left": 421, + "top": 523, "width": 86.72802734375, "height": 13, "text": "ATLANTIQUE", @@ -534,8 +534,8 @@ "$ref": "AAAAAAGALSahGqPn7iE=" }, "font": "Arial;13;0", - "left": 293, - "top": 546, + "left": 421, + "top": 538, "width": 86.72802734375, "height": 13, "text": "ARCTIQUE", @@ -551,8 +551,8 @@ "$ref": "AAAAAAGALSakh6Pt7dA=" }, "font": "Arial;13;0", - "left": 293, - "top": 561, + "left": 421, + "top": 553, "width": 86.72802734375, "height": 13, "text": "INDIEN", @@ -568,8 +568,8 @@ "$ref": "AAAAAAGALScHF6P3SkI=" }, "font": "Arial;13;0", - "left": 293, - "top": 576, + "left": 421, + "top": 568, "width": 86.72802734375, "height": 13, "text": "PACIFIQUE", @@ -577,16 +577,16 @@ } ], "font": "Arial;13;0", - "left": 288, - "top": 526, + "left": 416, + "top": 518, "width": 96.72802734375, "height": 68 } ], "font": "Arial;13;0", "containerChangeable": true, - "left": 288, - "top": 488, + "left": 416, + "top": 480, "width": 96.72802734375, "height": 106, "nameCompartment": { @@ -637,7 +637,7 @@ "$ref": "AAAAAAGALSoSe6Wzaf8=" }, "font": "Arial;13;0", - "left": 469, + "left": 621, "top": 477, "width": 86.72802734375, "height": 13, @@ -650,7 +650,7 @@ "$ref": "AAAAAAGALSoSe6Wzaf8=" }, "font": "Arial;13;1", - "left": 469, + "left": 621, "top": 492, "width": 86.72802734375, "height": 13, @@ -664,7 +664,6 @@ }, "visible": false, "font": "Arial;13;0", - "left": -304, "top": -176, "width": 73.67724609375, "height": 13, @@ -678,14 +677,13 @@ }, "visible": false, "font": "Arial;13;0", - "left": -304, "top": -176, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", - "left": 464, + "left": 616, "top": 472, "width": 96.72802734375, "height": 38, @@ -713,7 +711,6 @@ }, "visible": false, "font": "Arial;13;0", - "left": -152, "top": -88, "width": 10, "height": 10 @@ -729,7 +726,6 @@ }, "visible": false, "font": "Arial;13;0", - "left": -152, "top": -88, "width": 10, "height": 10 @@ -745,7 +741,6 @@ }, "visible": false, "font": "Arial;13;0", - "left": -152, "top": -88, "width": 10, "height": 10 @@ -761,7 +756,6 @@ }, "visible": false, "font": "Arial;13;0", - "left": -152, "top": -88, "width": 10, "height": 10 @@ -786,7 +780,7 @@ "$ref": "AAAAAAGALSo3z6XeNiw=" }, "font": "Arial;13;0", - "left": 469, + "left": 621, "top": 515, "width": 86.72802734375, "height": 13, @@ -803,7 +797,7 @@ "$ref": "AAAAAAGALSo9v6Xk2p8=" }, "font": "Arial;13;0", - "left": 469, + "left": 621, "top": 530, "width": 86.72802734375, "height": 13, @@ -820,7 +814,7 @@ "$ref": "AAAAAAGALSpA16Xq2Nw=" }, "font": "Arial;13;0", - "left": 469, + "left": 621, "top": 545, "width": 86.72802734375, "height": 13, @@ -837,7 +831,7 @@ "$ref": "AAAAAAGALSq1n6X0xvE=" }, "font": "Arial;13;0", - "left": 469, + "left": 621, "top": 560, "width": 86.72802734375, "height": 13, @@ -854,7 +848,7 @@ "$ref": "AAAAAAGALSq3p6X65bg=" }, "font": "Arial;13;0", - "left": 469, + "left": 621, "top": 575, "width": 86.72802734375, "height": 13, @@ -871,7 +865,7 @@ "$ref": "AAAAAAGALSq5v6YA4a8=" }, "font": "Arial;13;0", - "left": 469, + "left": 621, "top": 590, "width": 86.72802734375, "height": 13, @@ -888,7 +882,7 @@ "$ref": "AAAAAAGALSq756YG1CM=" }, "font": "Arial;13;0", - "left": 469, + "left": 621, "top": 605, "width": 86.72802734375, "height": 13, @@ -905,7 +899,7 @@ "$ref": "AAAAAAGALSq+H6YMZGE=" }, "font": "Arial;13;0", - "left": 469, + "left": 621, "top": 620, "width": 86.72802734375, "height": 13, @@ -922,7 +916,7 @@ "$ref": "AAAAAAGALSrAX6YS2CI=" }, "font": "Arial;13;0", - "left": 469, + "left": 621, "top": 635, "width": 86.72802734375, "height": 13, @@ -931,7 +925,7 @@ } ], "font": "Arial;13;0", - "left": 464, + "left": 616, "top": 510, "width": 96.72802734375, "height": 143 @@ -939,7 +933,7 @@ ], "font": "Arial;13;0", "containerChangeable": true, - "left": 464, + "left": 616, "top": 472, "width": 96.72802734375, "height": 181, @@ -965,245 +959,554 @@ } }, { - "_type": "UMLClassView", - "_id": "AAAAAAGALS3f26YmlwA=", + "_type": "UMLNoteView", + "_id": "AAAAAAGAVhPnICfluIc=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "font": "Arial;13;0", + "left": 792, + "width": 209, + "height": 129, + "text": "Dans ce diagramme; nous utiliserons la notation +/Ppté pour désigner une propriété Ppté composé d'un get public et d'un set privé. Si ces visibilités sont amenées à changer on utilisera la notation +/Ppté {+get; +set };" + }, + { + "_type": "UMLAssociationView", + "_id": "AAAAAAGAmStElfQSkBE=", "_parent": { "$ref": "AAAAAAFF+qBtyKM79qY=" }, "model": { - "$ref": "AAAAAAGALS3f2qYksiI=" + "$ref": "AAAAAAGAmStElPQOGGU=" }, "subViews": [ { - "_type": "UMLNameCompartmentView", - "_id": "AAAAAAGALS3f26YnA+w=", + "_type": "EdgeLabelView", + "_id": "AAAAAAGAmStElfQTaPs=", "_parent": { - "$ref": "AAAAAAGALS3f26YmlwA=" + "$ref": "AAAAAAGAmStElfQSkBE=" }, "model": { - "$ref": "AAAAAAGALS3f2qYksiI=" + "$ref": "AAAAAAGAmStElPQOGGU=" }, - "subViews": [ - { - "_type": "LabelView", - "_id": "AAAAAAGALS3f26YoJVU=", - "_parent": { - "$ref": "AAAAAAGALS3f26YnA+w=" - }, - "visible": false, - "font": "Arial;13;0", - "left": -752, - "top": 368, - "height": 13 - }, - { - "_type": "LabelView", - "_id": "AAAAAAGALS3f26Ypcys=", - "_parent": { - "$ref": "AAAAAAGALS3f26YnA+w=" - }, - "font": "Arial;13;1", - "left": 661, - "top": 495, - "width": 256.8515625, - "height": 13, - "text": "Carte" - }, - { - "_type": "LabelView", - "_id": "AAAAAAGALS3f26YqCik=", - "_parent": { - "$ref": "AAAAAAGALS3f26YnA+w=" - }, - "visible": false, - "font": "Arial;13;0", - "left": -752, - "top": 368, - "width": 73.67724609375, - "height": 13, - "text": "(from Model)" - }, - { - "_type": "LabelView", - "_id": "AAAAAAGALS3f26YrzIs=", - "_parent": { - "$ref": "AAAAAAGALS3f26YnA+w=" - }, - "visible": false, - "font": "Arial;13;0", - "left": -752, - "top": 368, - "height": 13, - "horizontalAlignment": 1 - } - ], + "visible": false, "font": "Arial;13;0", - "left": 656, - "top": 488, - "width": 266.8515625, - "height": 25, - "stereotypeLabel": { - "$ref": "AAAAAAGALS3f26YoJVU=" + "left": 532, + "top": 399, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGAmStElfQSkBE=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAmStElfQUxD0=", + "_parent": { + "$ref": "AAAAAAGAmStElfQSkBE=" }, - "nameLabel": { - "$ref": "AAAAAAGALS3f26Ypcys=" + "model": { + "$ref": "AAAAAAGAmStElPQOGGU=" }, - "namespaceLabel": { - "$ref": "AAAAAAGALS3f26YqCik=" + "visible": null, + "font": "Arial;13;0", + "left": 520, + "top": 390, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGAmStElfQSkBE=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAmStElfQVSKI=", + "_parent": { + "$ref": "AAAAAAGAmStElfQSkBE=" }, - "propertyLabel": { - "$ref": "AAAAAAGALS3f26YrzIs=" + "model": { + "$ref": "AAAAAAGAmStElPQOGGU=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 557, + "top": 416, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGAmStElfQSkBE=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAmStElfQWWxw=", + "_parent": { + "$ref": "AAAAAAGAmStElfQSkBE=" + }, + "model": { + "$ref": "AAAAAAGAmStElPQPoF0=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 502, + "top": 443, + "height": 13, + "alpha": 0.5235987755982988, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGAmStElfQSkBE=" + }, + "edgePosition": 2 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAmStElfQXT7g=", + "_parent": { + "$ref": "AAAAAAGAmStElfQSkBE=" + }, + "model": { + "$ref": "AAAAAAGAmStElPQPoF0=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 492, + "top": 433, + "height": 13, + "alpha": 0.7853981633974483, + "distance": 40, + "hostEdge": { + "$ref": "AAAAAAGAmStElfQSkBE=" + }, + "edgePosition": 2 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAmStElfQY7yU=", + "_parent": { + "$ref": "AAAAAAGAmStElfQSkBE=" + }, + "model": { + "$ref": "AAAAAAGAmStElPQPoF0=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 522, + "top": 462, + "height": 13, + "alpha": -0.5235987755982988, + "distance": 25, + "hostEdge": { + "$ref": "AAAAAAGAmStElfQSkBE=" + }, + "edgePosition": 2 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAmStElfQZVhM=", + "_parent": { + "$ref": "AAAAAAGAmStElfQSkBE=" + }, + "model": { + "$ref": "AAAAAAGAmStElPQQOIw=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 562, + "top": 356, + "height": 13, + "alpha": -0.5235987755982988, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGAmStElfQSkBE=" } }, { - "_type": "UMLAttributeCompartmentView", - "_id": "AAAAAAGALS3f26Ysl+w=", + "_type": "EdgeLabelView", + "_id": "AAAAAAGAmStElfQaTJc=", "_parent": { - "$ref": "AAAAAAGALS3f26YmlwA=" + "$ref": "AAAAAAGAmStElfQSkBE=" }, "model": { - "$ref": "AAAAAAGALS3f2qYksiI=" + "$ref": "AAAAAAGAmStElPQQOIw=" }, - "subViews": [ - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGALS4WMKZmmMs=", - "_parent": { - "$ref": "AAAAAAGALS3f26Ysl+w=" - }, - "model": { - "$ref": "AAAAAAGALS4WJ6ZOfow=" - }, - "font": "Arial;13;0", - "left": 661, - "top": 518, - "width": 256.8515625, - "height": 13, - "text": "+/Nom: string", - "horizontalAlignment": 0 - }, - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGALS4YxKaCaWY=", - "_parent": { - "$ref": "AAAAAAGALS3f26Ysl+w=" - }, - "model": { - "$ref": "AAAAAAGALS4Yv6ZqR5w=" - }, - "font": "Arial;13;0", - "left": 661, - "top": 533, - "width": 256.8515625, - "height": 13, - "text": "+/Url: string", - "horizontalAlignment": 0 - }, - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGALS4b5aae5bM=", - "_parent": { - "$ref": "AAAAAAGALS3f26Ysl+w=" - }, - "model": { - "$ref": "AAAAAAGALS4b4KaGNOo=" - }, - "font": "Arial;13;0", - "left": 661, - "top": 548, - "width": 256.8515625, - "height": 13, - "text": "+/LaZone: Zone", - "horizontalAlignment": 0 - } - ], + "visible": false, "font": "Arial;13;0", - "left": 656, - "top": 513, - "width": 266.8515625, - "height": 53 + "left": 550, + "top": 351, + "height": 13, + "alpha": -0.7853981633974483, + "distance": 40, + "hostEdge": { + "$ref": "AAAAAAGAmStElfQSkBE=" + } }, { - "_type": "UMLOperationCompartmentView", - "_id": "AAAAAAGALS3f26YtU3A=", + "_type": "EdgeLabelView", + "_id": "AAAAAAGAmStElfQbuUE=", "_parent": { - "$ref": "AAAAAAGALS3f26YmlwA=" + "$ref": "AAAAAAGAmStElfQSkBE=" }, "model": { - "$ref": "AAAAAAGALS3f2qYksiI=" + "$ref": "AAAAAAGAmStElPQQOIw=" }, + "visible": false, "font": "Arial;13;0", - "left": 656, - "top": 566, - "width": 266.8515625, - "height": 10 + "left": 587, + "top": 368, + "height": 13, + "alpha": 0.5235987755982988, + "distance": 25, + "hostEdge": { + "$ref": "AAAAAAGAmStElfQSkBE=" + } }, { - "_type": "UMLReceptionCompartmentView", - "_id": "AAAAAAGALS3f26Yu83I=", + "_type": "UMLQualifierCompartmentView", + "_id": "AAAAAAGAmStElfQc+cI=", "_parent": { - "$ref": "AAAAAAGALS3f26YmlwA=" + "$ref": "AAAAAAGAmStElfQSkBE=" }, "model": { - "$ref": "AAAAAAGALS3f2qYksiI=" + "$ref": "AAAAAAGAmStElPQPoF0=" }, "visible": false, "font": "Arial;13;0", - "left": -376, - "top": 184, "width": 10, "height": 10 }, { - "_type": "UMLTemplateParameterCompartmentView", - "_id": "AAAAAAGALS3f26Yvgl0=", + "_type": "UMLQualifierCompartmentView", + "_id": "AAAAAAGAmStElfQdAYI=", "_parent": { - "$ref": "AAAAAAGALS3f26YmlwA=" + "$ref": "AAAAAAGAmStElfQSkBE=" }, "model": { - "$ref": "AAAAAAGALS3f2qYksiI=" + "$ref": "AAAAAAGAmStElPQQOIw=" }, "visible": false, "font": "Arial;13;0", - "left": 685, - "top": 488, - "width": 130.6689453125, + "width": 10, "height": 10 } ], "font": "Arial;13;0", - "containerChangeable": true, - "left": 656, - "top": 488, - "width": 266.8515625, - "height": 106, - "nameCompartment": { - "$ref": "AAAAAAGALS3f26YnA+w=" + "head": { + "$ref": "AAAAAAGALQHg0qEHIYI=" }, - "attributeCompartment": { - "$ref": "AAAAAAGALS3f26Ysl+w=" + "tail": { + "$ref": "AAAAAAGALSX7JqOz6iI=" }, - "operationCompartment": { - "$ref": "AAAAAAGALS3f26YtU3A=" + "lineStyle": 1, + "points": "500:479;590:350", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGAmStElfQTaPs=" }, - "receptionCompartment": { - "$ref": "AAAAAAGALS3f26Yu83I=" + "stereotypeLabel": { + "$ref": "AAAAAAGAmStElfQUxD0=" }, - "templateParameterCompartment": { - "$ref": "AAAAAAGALS3f26Yvgl0=" + "propertyLabel": { + "$ref": "AAAAAAGAmStElfQVSKI=" + }, + "tailRoleNameLabel": { + "$ref": "AAAAAAGAmStElfQWWxw=" + }, + "tailPropertyLabel": { + "$ref": "AAAAAAGAmStElfQXT7g=" + }, + "tailMultiplicityLabel": { + "$ref": "AAAAAAGAmStElfQY7yU=" + }, + "headRoleNameLabel": { + "$ref": "AAAAAAGAmStElfQZVhM=" + }, + "headPropertyLabel": { + "$ref": "AAAAAAGAmStElfQaTJc=" + }, + "headMultiplicityLabel": { + "$ref": "AAAAAAGAmStElfQbuUE=" + }, + "tailQualifiersCompartment": { + "$ref": "AAAAAAGAmStElfQc+cI=" + }, + "headQualifiersCompartment": { + "$ref": "AAAAAAGAmStElfQdAYI=" } }, { - "_type": "UMLNoteView", - "_id": "AAAAAAGAVhPnICfluIc=", + "_type": "UMLAssociationView", + "_id": "AAAAAAGAmStY2fRb75U=", "_parent": { "$ref": "AAAAAAFF+qBtyKM79qY=" }, + "model": { + "$ref": "AAAAAAGAmStY2fRXGrg=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAmStY2fRcV7s=", + "_parent": { + "$ref": "AAAAAAGAmStY2fRb75U=" + }, + "model": { + "$ref": "AAAAAAGAmStY2fRXGrg=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 647, + "top": 403, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGAmStY2fRb75U=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAmStY2vRd0tA=", + "_parent": { + "$ref": "AAAAAAGAmStY2fRb75U=" + }, + "model": { + "$ref": "AAAAAAGAmStY2fRXGrg=" + }, + "visible": null, + "font": "Arial;13;0", + "left": 632, + "top": 403, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGAmStY2fRb75U=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAmStY2vReZ0o=", + "_parent": { + "$ref": "AAAAAAGAmStY2fRb75U=" + }, + "model": { + "$ref": "AAAAAAGAmStY2fRXGrg=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 676, + "top": 404, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGAmStY2fRb75U=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAmStY2vRfnNk=", + "_parent": { + "$ref": "AAAAAAGAmStY2fRb75U=" + }, + "model": { + "$ref": "AAAAAAGAmStY2fRYbhg=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 647, + "top": 439, + "height": 13, + "alpha": 0.5235987755982988, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGAmStY2fRb75U=" + }, + "edgePosition": 2 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAmStY2vRgflA=", + "_parent": { + "$ref": "AAAAAAGAmStY2fRb75U=" + }, + "model": { + "$ref": "AAAAAAGAmStY2fRYbhg=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 634, + "top": 436, + "height": 13, + "alpha": 0.7853981633974483, + "distance": 40, + "hostEdge": { + "$ref": "AAAAAAGAmStY2fRb75U=" + }, + "edgePosition": 2 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAmStY2vRhZOg=", + "_parent": { + "$ref": "AAAAAAGAmStY2fRb75U=" + }, + "model": { + "$ref": "AAAAAAGAmStY2fRYbhg=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 675, + "top": 443, + "height": 13, + "alpha": -0.5235987755982988, + "distance": 25, + "hostEdge": { + "$ref": "AAAAAAGAmStY2fRb75U=" + }, + "edgePosition": 2 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAmStY2vRi0mk=", + "_parent": { + "$ref": "AAAAAAGAmStY2fRb75U=" + }, + "model": { + "$ref": "AAAAAAGAmStY2fRZvUk=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 647, + "top": 370, + "height": 13, + "alpha": -0.5235987755982988, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGAmStY2fRb75U=" + } + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAmStY2vRjeaQ=", + "_parent": { + "$ref": "AAAAAAGAmStY2fRb75U=" + }, + "model": { + "$ref": "AAAAAAGAmStY2fRZvUk=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 633, + "top": 372, + "height": 13, + "alpha": -0.7853981633974483, + "distance": 40, + "hostEdge": { + "$ref": "AAAAAAGAmStY2fRb75U=" + } + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGAmStY2vRkP5I=", + "_parent": { + "$ref": "AAAAAAGAmStY2fRb75U=" + }, + "model": { + "$ref": "AAAAAAGAmStY2fRZvUk=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 674, + "top": 365, + "height": 13, + "alpha": 0.5235987755982988, + "distance": 25, + "hostEdge": { + "$ref": "AAAAAAGAmStY2fRb75U=" + } + }, + { + "_type": "UMLQualifierCompartmentView", + "_id": "AAAAAAGAmStY2vRl83Y=", + "_parent": { + "$ref": "AAAAAAGAmStY2fRb75U=" + }, + "model": { + "$ref": "AAAAAAGAmStY2fRYbhg=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 10, + "height": 10 + }, + { + "_type": "UMLQualifierCompartmentView", + "_id": "AAAAAAGAmStY2vRmT8Q=", + "_parent": { + "$ref": "AAAAAAGAmStY2fRb75U=" + }, + "model": { + "$ref": "AAAAAAGAmStY2fRZvUk=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 10, + "height": 10 + } + ], "font": "Arial;13;0", - "left": 792, - "width": 209, - "height": 129, - "text": "Dans ce diagramme; nous utiliserons la notation +/Ppté pour désigner une propriété Ppté composé d'un get public et d'un set privé. Si ces visibilités sont amenées à changer on utilisera la notation +/Ppté {+get; +set };" + "head": { + "$ref": "AAAAAAGALQHg0qEHIYI=" + }, + "tail": { + "$ref": "AAAAAAGALSoSe6WyJaI=" + }, + "lineStyle": 1, + "points": "663:471;662:350", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGAmStY2fRcV7s=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAGAmStY2vRd0tA=" + }, + "propertyLabel": { + "$ref": "AAAAAAGAmStY2vReZ0o=" + }, + "tailRoleNameLabel": { + "$ref": "AAAAAAGAmStY2vRfnNk=" + }, + "tailPropertyLabel": { + "$ref": "AAAAAAGAmStY2vRgflA=" + }, + "tailMultiplicityLabel": { + "$ref": "AAAAAAGAmStY2vRhZOg=" + }, + "headRoleNameLabel": { + "$ref": "AAAAAAGAmStY2vRi0mk=" + }, + "headPropertyLabel": { + "$ref": "AAAAAAGAmStY2vRjeaQ=" + }, + "headMultiplicityLabel": { + "$ref": "AAAAAAGAmStY2vRkP5I=" + }, + "tailQualifiersCompartment": { + "$ref": "AAAAAAGAmStY2vRl83Y=" + }, + "headQualifiersCompartment": { + "$ref": "AAAAAAGAmStY2vRmT8Q=" + } } ] }, @@ -1267,9 +1570,7 @@ "$ref": "AAAAAAGALQHg0aEFSj0=" }, "name": "/PhotoCarte", - "type": { - "$ref": "AAAAAAGALS3f2qYksiI=" - } + "type": "string" }, { "_type": "UMLAttribute", @@ -1298,9 +1599,7 @@ "$ref": "AAAAAAGALQHg0aEFSj0=" }, "name": "/Repartion", - "type": { - "$ref": "AAAAAAGALSX7JqOxrNY=" - } + "type": "List" } ] }, @@ -1311,6 +1610,36 @@ "$ref": "AAAAAAFF+qBWK6M3Z8Y=" }, "name": "Zone", + "ownedElements": [ + { + "_type": "UMLAssociation", + "_id": "AAAAAAGAmStElPQOGGU=", + "_parent": { + "$ref": "AAAAAAGALSX7JqOxrNY=" + }, + "end1": { + "_type": "UMLAssociationEnd", + "_id": "AAAAAAGAmStElPQPoF0=", + "_parent": { + "$ref": "AAAAAAGAmStElPQOGGU=" + }, + "reference": { + "$ref": "AAAAAAGALSX7JqOxrNY=" + } + }, + "end2": { + "_type": "UMLAssociationEnd", + "_id": "AAAAAAGAmStElPQQOIw=", + "_parent": { + "$ref": "AAAAAAGAmStElPQOGGU=" + }, + "reference": { + "$ref": "AAAAAAGALQHg0aEFSj0=" + }, + "aggregation": "shared" + } + } + ], "literals": [ { "_type": "UMLEnumerationLiteral", @@ -1353,6 +1682,36 @@ "$ref": "AAAAAAFF+qBWK6M3Z8Y=" }, "name": "Conservation", + "ownedElements": [ + { + "_type": "UMLAssociation", + "_id": "AAAAAAGAmStY2fRXGrg=", + "_parent": { + "$ref": "AAAAAAGALSoSe6WwcLU=" + }, + "end1": { + "_type": "UMLAssociationEnd", + "_id": "AAAAAAGAmStY2fRYbhg=", + "_parent": { + "$ref": "AAAAAAGAmStY2fRXGrg=" + }, + "reference": { + "$ref": "AAAAAAGALSoSe6WwcLU=" + } + }, + "end2": { + "_type": "UMLAssociationEnd", + "_id": "AAAAAAGAmStY2fRZvUk=", + "_parent": { + "$ref": "AAAAAAGAmStY2fRXGrg=" + }, + "reference": { + "$ref": "AAAAAAGALQHg0aEFSj0=" + }, + "aggregation": "shared" + } + } + ], "literals": [ { "_type": "UMLEnumerationLiteral", diff --git a/WpfApp1/AddAShark.xaml b/WpfApp1/AddAShark.xaml index 259915d..0ed532f 100644 --- a/WpfApp1/AddAShark.xaml +++ b/WpfApp1/AddAShark.xaml @@ -8,7 +8,7 @@ Title="AddAShark" Height="450" Width="800"> - + diff --git a/WpfApp1/UserControlEdit.xaml b/WpfApp1/UserControlEdit.xaml index 4b1a7f0..ce807bc 100644 --- a/WpfApp1/UserControlEdit.xaml +++ b/WpfApp1/UserControlEdit.xaml @@ -8,7 +8,7 @@ d:DesignHeight="450" d:DesignWidth="800"> - +