Differential D27584 Diff 76216 umbrello/umlwidgets/associationline.cpp

Changeset View

Standalone View

View Options

umbrello/umlwidgets/associationline.cpp

Context not available.
19#include "umldoc.h" 19​#include "umldoc.h"
20#include "umlwidget.h" 20​#include "umlwidget.h"
21 21​
22​// kde includes
23​#include <KLocalizedString>
24​
22// qt includes 25​// qt includes
23#include <QDomDocument> 26​#include <QDomDocument>
24#include <QPainter> 27​#include <QPainter>
Context not available.
149 * Includes start and end points. 152​ * Includes start and end points.
150 * @return number of points in the AssociationLine 153​ * @return number of points in the AssociationLine
151 */ 154​ */
152int AssociationLine::count() const 155​int AssociationLine::count() const
habackerUnsubmitted
Done

unrelated change, please omit.

habacker: unrelated change, please omit.
153{ 156​{
154 return m_points.size(); 157​ return m_points.size();
155} 158​}
Context not available.
524void AssociationLine::reconstructSymbols() 527​void AssociationLine::reconstructSymbols()
habackerUnsubmitted
Done

I am not happy with the extensive change in the order of the cases, because it makes it very difficult to check what exactly has changed and if something has broken.
If a change seems necessary, e.g. an alphabetical order, which makes it easier to find individual entries, then it should be done in a separate commit beforehand.

habacker: I am not happy with the extensive change in the order of the cases, because it makes it very…
525{ 528​{
526 switch( m_associationWidget->associationType() ) { 529​ switch( m_associationWidget->associationType() ) {
527 case Uml::AssociationType::Exception: 530​ case Uml::AssociationType::Generalization:
528 setLayout(Uml::LayoutType::Polyline); 531​ setToolTip(i18n("<b>Generalization</b>"
529 case Uml::AssociationType::State: 532​ "<p>A <b>Generalization</b> is an inheritance link indicating "
530 case Uml::AssociationType::Activity: 533​ "one class is a superclass of the other and has a triangle pointing "
531 case Uml::AssociationType::UniAssociation: 534​ "to the superclass.</p>"));
535​ setStartSymbol(Symbol::None);
536​ setEndSymbol(Symbol::ClosedArrow);
537​ removeSubsetSymbol();
538​ removeCollaborationLine();
539​ break;
540​
541​ case Uml::AssociationType::Aggregation:
542​ setToolTip(i18n("<b>Aggregation</b>"
543​ "<p>An <b>Aggregation</b> is an association in which one "
544​ "class belongs to a collection. An aggregation has a diamond "
545​ "end pointing to the part containing the whole and can "
546​ "have either one-to-many or many-to-many multiplicity</p>"));
547​ setStartSymbol(Symbol::Diamond);
548​ setEndSymbol(Symbol::None);
549​ removeSubsetSymbol();
550​ removeCollaborationLine();
551​ break;
552​
532 case Uml::AssociationType::Dependency: 553​ case Uml::AssociationType::Dependency:
554​ setToolTip(i18n("<b>Dependency</b>"
555​ "<p>A relationship between two elements in "
556​ "which a change to one element (the supplier) "
557​ "may affect or supply information needed by "
558​ "the other element (the client). This is a "
559​ "term of convenience that groups together "
560​ "several different kinds of modeling relationships.</p>"));
561​ setLayout(Uml::LayoutType::Polyline);
533 setStartSymbol(Symbol::None); 562​ setStartSymbol(Symbol::None);
534 setEndSymbol(Symbol::OpenArrow); 563​ setEndSymbol(Symbol::OpenArrow);
535 removeSubsetSymbol(); 564​ removeSubsetSymbol();
536 removeCollaborationLine(); 565​ removeCollaborationLine();
537 break; 566​ break;
538 567​
539 case Uml::AssociationType::Relationship: 568​ case Uml::AssociationType::Association:
569​ setToolTip(i18n("<b>Association</b>"
570​ "<p>An <b>Association</b> represents a relationship between instances "
571​ "of the two classes. There is an association between two classes if an "
572​ "instance of one class must know about the other in order to perform its "
573​ "work. In a diagram, an association is a link connecting two classes.</p>"));
574​ break;
575​
576​ case Uml::AssociationType::Association_Self:
577​ setToolTip(i18n("<b>Self Association</b>"
578​ "<p>A stereotype of an association end (including link "
579​ "end and the end of an association role), specifying a "
580​ "pseudolink from an object to itself for the purpose of "
581​ "calling an operation on the same object within an "
582​ "interaction. It does not imply an actual data structure.</p>"));
583​ break;
584​
585​ case Uml::AssociationType::Coll_Message_Asynchronous:
habackerUnsubmitted
Done

A tooltip is missing here

habacker: A tooltip is missing here
540 setStartSymbol(Symbol::None); 586​ setStartSymbol(Symbol::None);
541 setEndSymbol(Symbol::CrowFeet); 587​ setEndSymbol(Symbol::None);
542 removeSubsetSymbol(); 588​ removeSubsetSymbol();
543 removeCollaborationLine(); 589​ createCollaborationLine();
544 break; 590​ break;
545 591​
546 case Uml::AssociationType::Generalization: 592​ case Uml::AssociationType::Seq_Message:
547 case Uml::AssociationType::Realization: 593​ setToolTip(i18n("<b>Sequence Message</b>"
594​ "<p>On a <b>Sequence Diagram</b>, a message is shown as a solid "
595​ "arrow from the lifeline of one object (the sender) to the "
596​ "lifeline of another object (the target). If the arrow is "
597​ "perpendicular to the lifelines, the message transmission is "
598​ "regarded as instantaneous or at least fast, compared with "
599​ "external messages. If the arrow is slanted, then the message "
600​ "transmission is regarded as having duration, during which other "
601​ "messages might be sent. In case of a message from an object to "
602​ "itself, the arrow may start and finish on the same lifeline.</p>"));
603​ break;
604​
605​ case Uml::AssociationType::Coll_Message_Self:
606​ setToolTip(i18n("<b>Call Message</b>"
607​ "<p>A transition in which the source state "
608​ "and the target state are the same. It is "
609​ "considered a state change. When it fires, "
610​ "the source state is exited and reentered so "
611​ "exit actions and entry actions are invoked. "
612​ "It is not equivalent to an internal transition, "
613​ "in which no change of state occurs.</p>"));
548 setStartSymbol(Symbol::None); 614​ setStartSymbol(Symbol::None);
549 setEndSymbol(Symbol::ClosedArrow); 615​ setEndSymbol(Symbol::None);
616​ removeSubsetSymbol();
617​ createCollaborationLine();
618​ break;
619​
620​ case Uml::AssociationType::Seq_Message_Self:
621​ setToolTip(i18n("<b>Seq_Message_Self</b>"));
yurchorUnsubmitted
Done

Should be "Sequence Self Message"

yurchor: Should be "Sequence Self Message"
622​ break;
623​
624​ case Uml::AssociationType::Containment:
625​ setToolTip(i18n("<b>Containment</b>"
626​ "<p>An object that exists to contain other "
627​ "objects, and which provides operations to "
628​ "access or iterate over its contents, or a "
629​ "class describing such objects. For example, "
630​ "arrays, lists, and sets.</p>"));
631​ setStartSymbol(Symbol::Circle);
632​ setEndSymbol(Symbol::None);
550 removeSubsetSymbol(); 633​ removeSubsetSymbol();
551 removeCollaborationLine(); 634​ removeCollaborationLine();
552 break; 635​ break;
553 636​
554 case Uml::AssociationType::Composition: 637​ case Uml::AssociationType::Composition:
555 case Uml::AssociationType::Aggregation: 638​ setToolTip(i18n("<b>Composition</b>"
639​ "<p>A form of aggregation association with strong "
640​ "ownership and coincident lifetime of parts by the "
641​ "whole. A part may belong to only one composite.</p>"));
556 setStartSymbol(Symbol::Diamond); 642​ setStartSymbol(Symbol::Diamond);
557 setEndSymbol(Symbol::None); 643​ setEndSymbol(Symbol::None);
558 removeSubsetSymbol(); 644​ removeSubsetSymbol();
559 removeCollaborationLine(); 645​ removeCollaborationLine();
560 break; 646​ break;
561 647​
562 case Uml::AssociationType::Containment: 648​ case Uml::AssociationType::Realization:
563 setStartSymbol(Symbol::Circle); 649​ setToolTip(i18n("<b>Realization</b>"
564 setEndSymbol(Symbol::None); 650​ "<p>The relationship between a specification "
651​ "and its implementation; an indication of the "
652​ "inheritance of behavior without the inheritance "
653​ "of structure.</p>"));
654​ setStartSymbol(Symbol::None);
655​ setEndSymbol(Symbol::ClosedArrow);
565 removeSubsetSymbol(); 656​ removeSubsetSymbol();
566 removeCollaborationLine(); 657​ removeCollaborationLine();
567 break; 658​ break;
568 659​
660​ case Uml::AssociationType::UniAssociation:
661​ setToolTip(i18n("<b>UniAssociation</b>"
662​ "<p>Is a single directed arrow from a single source "
663​ "and terminating on a single target. The association "
664​ "only runs one direction.</p>"));
665​ setLayout(Uml::LayoutType::Polyline);
666​ setStartSymbol(Symbol::None);
667​ setEndSymbol(Symbol::OpenArrow);
668​ removeSubsetSymbol();
669​ removeCollaborationLine();
670​ break;
671​
672​ case Uml::AssociationType::Anchor:
673​ setToolTip(i18n("<b>Anchor</b>"
674​ "<p>An anchor association that allows the modeller to tie or "
675​ "associate a note object with another object.</p>"));
676​ break;
677​
678​ case Uml::AssociationType::State:
679​ setToolTip(i18n("<b>State Transition</b>"
680​ "<p>A Transition is a single directed arrow "
681​ "originating from a single source and "
682​ "terminating on a single target</p>"));
683​ setLayout(Uml::LayoutType::Polyline);
684​ setStartSymbol(Symbol::None);
685​ setEndSymbol(Symbol::OpenArrow);
686​ removeSubsetSymbol();
687​ removeCollaborationLine();
688​ break;
689​
690​ case Uml::AssociationType::Activity:
691​ setToolTip(i18n("<b>Activity</b>"
692​ "<p>An activity is a coordinated "
693​ "set of actions</p>"));
694​ setLayout(Uml::LayoutType::Polyline);
695​ setStartSymbol(Symbol::None);
696​ setEndSymbol(Symbol::OpenArrow);
697​ removeSubsetSymbol();
698​ removeCollaborationLine();
699​ break;
700​
701​ case Uml::AssociationType::Exception:
702​ setToolTip(i18n("<b>Exception</b>"
703​ "<p>A signal raised in response to behavioral "
704​ "faults by the underlying execution machinery.</p>"));
705​ setLayout(Uml::LayoutType::Polyline);
706​ setStartSymbol(Symbol::None);
707​ setEndSymbol(Symbol::OpenArrow);
708​ removeSubsetSymbol();
709​ removeCollaborationLine();
710​ break;
711​
712​ case Uml::AssociationType::Category2Parent:
713​ setToolTip(i18n("<b>Category to Parent</b>"
714​ "<p>An anchor line between a category and it's parent.</p>"));
yurchorUnsubmitted
Done

Typo: it's -> its

yurchor: Typo: it's -> its
715​ break;
716​
569 case Uml::AssociationType::Child2Category: 717​ case Uml::AssociationType::Child2Category:
718​ setToolTip(i18n("<b>Child to Category</b>"
719​ "<p>An anchor line between a child object and it's parent category.</p>"));
yurchorUnsubmitted
Done

Typo: it's -> its

yurchor: Typo: it's -> its
570 setStartSymbol(Symbol::None); 720​ setStartSymbol(Symbol::None);
571 setEndSymbol(Symbol::None); 721​ setEndSymbol(Symbol::None);
572 createSubsetSymbol(); 722​ createSubsetSymbol();
573 removeCollaborationLine(); 723​ removeCollaborationLine();
574 break; 724​ break;
575 725​
726​ case Uml::AssociationType::Relationship:
727​ setToolTip(i18n("<b>Relationship</b>"
728​ "<p>An abstract semantic connection among model elements. "
729​ "Kinds of relationships include association, generalization, "
730​ "metarelationship, flow, and several kinds grouped under dependency.</p>"));
731​ setStartSymbol(Symbol::None);
732​ setEndSymbol(Symbol::CrowFeet);
733​ removeSubsetSymbol();
734​ removeCollaborationLine();
735​ break;
736​
576 case Uml::AssociationType::Coll_Message_Synchronous: 737​ case Uml::AssociationType::Coll_Message_Synchronous:
577 case Uml::AssociationType::Coll_Message_Asynchronous: ​
578 case Uml::AssociationType::Coll_Message_Self: ​
579 setStartSymbol(Symbol::None); 738​ setStartSymbol(Symbol::None);
habackerUnsubmitted
Done

A tooltip is missing here

habacker: A tooltip is missing here
580 setEndSymbol(Symbol::None); 739​ setEndSymbol(Symbol::None);
581 removeSubsetSymbol(); 740​ removeSubsetSymbol();
Context not available.
869 QPointF c1, c2; 1028​ QPointF c1, c2;
870 QPointF p1 = m_points.first(); // start point 1029​ QPointF p1 = m_points.first(); // start point
871 QPointF p2 = m_points.last(); // end point 1030​ QPointF p2 = m_points.last(); // end point
872 1031​
873 if (m_autoLayoutSpline) { 1032​ if (m_autoLayoutSpline) {
874 qreal dx = p2.x() - p1.x(); 1033​ qreal dx = p2.x() - p1.x();
875 qreal dy = p2.y() - p1.y(); 1034​ qreal dy = p2.y() - p1.y();
Context not available.
893 c2dx = 0; 1052​ c2dx = 0;
894 c2dy = -oneHalfY; 1053​ c2dy = -oneHalfY;
895 } 1054​ }
896 1055​
897 c1 = QPointF(p1.x() + c1dx, // control point 1 1056​ c1 = QPointF(p1.x() + c1dx, // control point 1
898 p1.y() + c1dy); 1057​ p1.y() + c1dy);
899 c2 = QPointF(p2.x() + c2dx, // control point 2 1058​ c2 = QPointF(p2.x() + c2dx, // control point 2
Context not available.
901 } else { 1060​ } else {
902 //c1 = m_points[1]; 1061​ //c1 = m_points[1];
903 //c2 = m_points[2]; 1062​ //c2 = m_points[2];
904 1063​
905 //c1dx = c1.x() - p1.x(); 1064​ //c1dx = c1.x() - p1.x();
906 //c1dy = c1.y() - p1.y(); 1065​ //c1dy = c1.y() - p1.y();
907 //c2dx = c2.x() - p2.x(); 1066​ //c2dx = c2.x() - p2.x();
908 //c2dy = c2.y() - p2.y(); 1067​ //c2dy = c2.y() - p2.y();
909 1068​
910 c1 = QPointF(p1.x() + c1dx, // control point 1 1069​ c1 = QPointF(p1.x() + c1dx, // control point 1
911 p1.y() + c1dy); 1070​ p1.y() + c1dy);
912 c2 = QPointF(p2.x() + c2dx, // control point 2 1071​ c2 = QPointF(p2.x() + c2dx, // control point 2
Context not available.
1074 painter->drawRect(circle); 1233​ painter->drawRect(circle);
1075 } 1234​ }
1076 } 1235​ }
1077 1236​
1078 //circle.moveCenter(savedStart); 1237​ //circle.moveCenter(savedStart);
1079 //painter->drawRect(circle); 1238​ //painter->drawRect(circle);
1080 1239​
1081 // draw bezier handles 1240​ // draw bezier handles
1082 if (m_layout == Uml::LayoutType::Spline) { 1241​ if (m_layout == Uml::LayoutType::Spline) {
1083 for (int i = 2; i < sz-1; ++i) { 1242​ for (int i = 2; i < sz-1; ++i) {
Context not available.
1085 // if(m_layout == Uml::LayoutType::Spline) { 1244​ // if(m_layout == Uml::LayoutType::Spline) {
1086 QLineF mysegmentLine(savedStart, m_points[i-1]); 1245​ QLineF mysegmentLine(savedStart, m_points[i-1]);
1087 painter->drawLine(mysegmentLine); 1246​ painter->drawLine(mysegmentLine);
1088 1247​
1089 QLineF mysegmentLine2(m_points[i], savedEnd); 1248​ QLineF mysegmentLine2(m_points[i], savedEnd);
1090 painter->drawLine(mysegmentLine2); 1249​ painter->drawLine(mysegmentLine2);
1091 } 1250​ }
1092 } 1251​ }
1093 1252​
1094 circle.moveCenter(savedEnd); 1253​ circle.moveCenter(savedEnd);
1095 painter->drawRect(circle); 1254​ painter->drawRect(circle);
1096 1255​
Context not available.
1111 painter->drawLine(segmentLine); 1270​ painter->drawLine(segmentLine);
1112 } 1271​ }
1113 } 1272​ }
1114 1273​
1115 // debug info 1274​ // debug info
1116 if (Tracer::instance()->isEnabled(QString::fromLatin1(metaObject()->className()))) { 1275​ if (Tracer::instance()->isEnabled(QString::fromLatin1(metaObject()->className()))) {
1117 QPen p(Qt::green); 1276​ QPen p(Qt::green);
Context not available.