[Uml-devel] branches/work/soc-umbrello/umbrello/widgets

[Andi Fischer]

SVN commit 1289095 by fischer:

Differences to trunk reduced.

 M  +10 -8     associationwidget.cpp  
 M  +12 -10    associationwidget.h  


--- branches/work/soc-umbrello/umbrello/widgets/associationwidget.cpp #1289094:1289095
@@ -246,9 +246,11 @@
  */
 UMLClassifier *AssociationWidget::operationOwner()
 {
-    Uml::Role_Type role = isCollaboration() ? Uml::B : Uml::A;
+    Uml::Role_Type role = (isCollaboration() ? Uml::B : Uml::A);
     UMLObject *o = widgetForRole(role)->umlObject();
-    if (!o) return 0;
+    if (!o) {
+        return 0;
+    }
     UMLClassifier *c = dynamic_cast<UMLClassifier*>(o);
     if (!c) {
         uError() << "widgetForRole(" << role << ") is not a classifier";
@@ -1873,7 +1875,7 @@
     DEBUG_REGISTER(DBG_SRC);
 }
 
-void AssociationWidget::setFloatingText(Uml::TextRole tr, const QString& text, FloatingTextWidget* ft)
+void AssociationWidget::setFloatingText(Uml::TextRole role, const QString& text, FloatingTextWidget* ft)
 {
     if (! FloatingTextWidget::isTextValid(text)) {
         // FloatingTextWidgets are no longer deleted/reconstructed to make it easier.
@@ -1883,10 +1885,10 @@
     }
 
     ft->setText(text);
-    setTextPosition(tr);
+    setTextPosition(role);
 }
 
-QPointF AssociationWidget::calculateTextPosition(Uml::TextRole role)
+UMLScenePoint AssociationWidget::calculateTextPosition(Uml::TextRole role)
 {
     const qreal SPACE = 2;
     QPointF p(-1, -1), q(-1, -1);
@@ -1974,18 +1976,18 @@
     return p;
 }
 
-void AssociationWidget::setTextPosition(Uml::TextRole tr)
+void AssociationWidget::setTextPosition(Uml::TextRole role)
 {
     bool startMove = false;
     //TODO: Check startMove removal
     if (startMove) {
         return;
     }
-    FloatingTextWidget *ft = textWidgetByRole(tr);
+    FloatingTextWidget *ft = textWidgetByRole(role);
     if (!ft) {
         return;
     }
-    QPointF pos = calculateTextPosition(tr);
+    QPointF pos = calculateTextPosition(role);
     if ( (pos.x() < 0.0 || pos.x() > FloatingTextWidget::restrictPositionMax) ||
             (pos.y() < 0.0 || pos.y() > FloatingTextWidget::restrictPositionMax) ) {
         DEBUG(DBG_SRC) << "(x=" << pos.x() << " , y=" << pos.y() << ") "
--- branches/work/soc-umbrello/umbrello/widgets/associationwidget.h #1289094:1289095
@@ -133,6 +133,12 @@
     Uml::Changeability changeability(Uml::Role_Type role) const;
     void setChangeability(Uml::Changeability value, Uml::Role_Type role);
 
+    Uml::IDType widgetIDForRole(Uml::Role_Type role) const;
+    UMLWidget* widgetForRole(Uml::Role_Type role) const;
+    void setWidgetForRole(UMLWidget *widget, Uml::Role_Type role);
+
+    void setWidgets(UMLWidget *widgetA, UMLWidget *widgetB);
+
     bool associates(UMLWidget *a, UMLWidget *b) const;
     bool containsWidget(UMLWidget *widget) const;
 
@@ -142,12 +148,6 @@
     ClassifierWidget* associationClass() const;
     void setAssociationClass(ClassifierWidget *classifier);
 
-    UMLWidget* widgetForRole(Uml::Role_Type role) const;
-    void setWidgetForRole(UMLWidget *widget, Uml::Role_Type role);
-    void setWidgets(UMLWidget *widgetA, UMLWidget *widgetB);
-
-    Uml::IDType widgetIDForRole(Uml::Role_Type role) const;
-
     Uml::AssociationType associationType() const;
     void setAssociationType(Uml::AssociationType type);
 
@@ -194,20 +194,22 @@
 
 private:
     void init();
-    void setFloatingText(Uml::TextRole tr, const QString& text, FloatingTextWidget* ft);
-    QPointF calculateTextPosition(Uml::TextRole tr);
-    void setTextPosition(Uml::TextRole tr);
+
+    UMLScenePoint calculateTextPosition(Uml::TextRole role);
+    void setTextPosition(Uml::TextRole role);
+    void setFloatingText(Uml::TextRole role, const QString& text, FloatingTextWidget* ft);
+
     void updateNameWidgetRole();
 
     friend class AssociationLine;
 
     AssociationLine *m_associationLine;
     ClassifierWidget *m_associationClass;
+    Uml::AssociationType m_associationType;
     WidgetRole m_role[2];
     FloatingTextWidget *m_nameWidget;
     int m_nameSegmentIndex;
 
-    Uml::AssociationType m_associationType;
     bool m_slotUMLObjectDataChangedFirstCall;
 };