[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [umbrello] umbrello: Add UniAssociation support in Component and Deployment View:
From:       Oliver Kellogg <okellogg () users ! sourceforge ! net>
Date:       2014-05-29 20:49:23
Message-ID: E1Wq7GN-0008CV-Hn () scm ! kde ! org
[Download RAW message or body]

Git commit 56f346d48af847cfc85f4eac627c424488d2ff95 by Oliver Kellogg.
Committed on 29/05/2014 at 20:49.
Pushed by okellogg into branch 'master'.

Add UniAssociation support in Component and Deployment View:

umbrello/worktoolbar.cpp
- In function insertBasicAssociations(), insert button for UniAssociation
  also on Uml::DiagramType Component or Deployment.

umbrello/assocrules.cpp
- In m_AssocRules[], add following entries:
  Association    from Node      to Node
  UniAssociation from Component to Artifact, bidir.
  UniAssociation from Node      to Node
  Dependency     from Component to Package
  Dependency     from Package   to Artifact, bidir.
  Dependency     from Node      to Node

M  +15   -10   umbrello/assocrules.cpp
M  +2    -1    umbrello/worktoolbar.cpp

http://commits.kde.org/umbrello/56f346d48af847cfc85f4eac627c424488d2ff95

diff --git a/umbrello/assocrules.cpp b/umbrello/assocrules.cpp
index a4b4997..75309ac 100644
--- a/umbrello/assocrules.cpp
+++ b/umbrello/assocrules.cpp
@@ -376,6 +376,7 @@ AssocRules::Assoc_Rule AssocRules::m_AssocRules []= {
     { Uml::AssociationType::Association,      WidgetBase::wt_Port,       WidgetBase::wt_Interface,   \
                true,   false,  false,  false },
     { Uml::AssociationType::Association,      WidgetBase::wt_Interface,  WidgetBase::wt_Artifact,    \
                true,   false,  false,  false },
     { Uml::AssociationType::Association,      WidgetBase::wt_Node,       WidgetBase::wt_Node,        \
true,   false,  false,  false }, +    { Uml::AssociationType::Association,      WidgetBase::wt_Node,      \
                WidgetBase::wt_Node,        true,   false,  false,  false },
     { Uml::AssociationType::UniAssociation,   WidgetBase::wt_Class,      WidgetBase::wt_Class,       \
                true,   true,   true,   true  },
     { Uml::AssociationType::UniAssociation,   WidgetBase::wt_Object,     WidgetBase::wt_Object,      \
                true,   true,   true,   true  },
     { Uml::AssociationType::UniAssociation,   WidgetBase::wt_Interface,  WidgetBase::wt_Interface,   \
true,   true,   true,   true  }, @@ -386,7 +387,9 @@ AssocRules::Assoc_Rule AssocRules::m_AssocRules []= \
                {
     { Uml::AssociationType::UniAssociation,   WidgetBase::wt_UseCase,    WidgetBase::wt_UseCase,     \
                true,   false,  false,  false },
     { Uml::AssociationType::UniAssociation,   WidgetBase::wt_UseCase,    WidgetBase::wt_Actor,       \
                true,   false,  false,  false },
     { Uml::AssociationType::UniAssociation,   WidgetBase::wt_Component,  WidgetBase::wt_Interface,   \
true,   false,  false,  false }, +    { Uml::AssociationType::UniAssociation,   WidgetBase::wt_Component, \
                WidgetBase::wt_Artifact,    true,   false,  true,  false },
     { Uml::AssociationType::UniAssociation,   WidgetBase::wt_Port,       WidgetBase::wt_Interface,   \
true,   false,  false,  false }, +    { Uml::AssociationType::UniAssociation,   WidgetBase::wt_Node,      \
                WidgetBase::wt_Node,        true,   false,  false,  false },
     { Uml::AssociationType::Generalization,   WidgetBase::wt_Class,      WidgetBase::wt_Datatype,    \
                false,  false,  false,  false },
     { Uml::AssociationType::Generalization,   WidgetBase::wt_Class,      WidgetBase::wt_Class,       \
                false,  false,  false,  false },
     { Uml::AssociationType::Generalization,   WidgetBase::wt_Interface,  WidgetBase::wt_Interface,   \
false,  false,  false,  false }, @@ -401,18 +404,20 @@ AssocRules::Assoc_Rule AssocRules::m_AssocRules \
                []= {
     { Uml::AssociationType::Dependency,       WidgetBase::wt_UseCase,    WidgetBase::wt_UseCase,     \
                true,   false,  false,  false },
     { Uml::AssociationType::Dependency,       WidgetBase::wt_Actor,      WidgetBase::wt_Actor,       \
                true,   false,  false,  false },
     { Uml::AssociationType::Dependency,       WidgetBase::wt_Actor,      WidgetBase::wt_UseCase,     \
                true,   false,  false,  false },
-    { Uml::AssociationType::Dependency,       WidgetBase::wt_Package,    WidgetBase::wt_Package,     \
                true,   true,   true,   true  },
-    { Uml::AssociationType::Dependency,       WidgetBase::wt_Class,      WidgetBase::wt_Package,     \
                true,   true,   true,   true  },
-    { Uml::AssociationType::Dependency,       WidgetBase::wt_Interface,  WidgetBase::wt_Package,     \
true,   true,   true,   true  }, +    { Uml::AssociationType::Dependency,       WidgetBase::wt_Package,   \
WidgetBase::wt_Package,     true,   true,   true,   false  }, +    { Uml::AssociationType::Dependency,    \
WidgetBase::wt_Class,      WidgetBase::wt_Package,     true,   true,   true,   false  }, +    { \
Uml::AssociationType::Dependency,       WidgetBase::wt_Interface,  WidgetBase::wt_Package,     true,   \
                true,   true,   false  },
     { Uml::AssociationType::Dependency,       WidgetBase::wt_Interface,  WidgetBase::wt_Interface,   \
                true,   true,   true,   true  },
-    { Uml::AssociationType::Dependency,       WidgetBase::wt_Class,      WidgetBase::wt_Interface,   \
                true,   true,   true,   true  },
-    { Uml::AssociationType::Dependency,       WidgetBase::wt_Class,      WidgetBase::wt_Datatype,    \
                true,   true,   true,   true  },
-    { Uml::AssociationType::Dependency,       WidgetBase::wt_Class,      WidgetBase::wt_Enum,        \
                true,   true,   true,   true  },
-    { Uml::AssociationType::Dependency,       WidgetBase::wt_Interface,  WidgetBase::wt_Enum,        \
true,   true,   true,   true  }, +    { Uml::AssociationType::Dependency,       WidgetBase::wt_Class,     \
WidgetBase::wt_Interface,   true,   true,   true,   false  }, +    { Uml::AssociationType::Dependency,    \
WidgetBase::wt_Class,      WidgetBase::wt_Datatype,    true,   true,   true,   false  }, +    { \
Uml::AssociationType::Dependency,       WidgetBase::wt_Class,      WidgetBase::wt_Enum,        true,   \
true,   true,   false  }, +    { Uml::AssociationType::Dependency,       WidgetBase::wt_Interface,  \
                WidgetBase::wt_Enum,        true,   true,   true,   false  },
     { Uml::AssociationType::Dependency,       WidgetBase::wt_Component,  WidgetBase::wt_Component,   \
                true,   true,   true,   true  },
-    { Uml::AssociationType::Dependency,       WidgetBase::wt_Component,  WidgetBase::wt_Interface,   \
                true,   true,   true,   true  },
-    { Uml::AssociationType::Dependency,       WidgetBase::wt_Component,  WidgetBase::wt_Artifact,    \
                true,   false,  false,  false },
-    { Uml::AssociationType::Dependency,       WidgetBase::wt_Node,       WidgetBase::wt_Component,   \
true,   false,  false,  false }, +    { Uml::AssociationType::Dependency,       WidgetBase::wt_Component, \
WidgetBase::wt_Interface,   true,   true,   true,   false  }, +    { Uml::AssociationType::Dependency,    \
WidgetBase::wt_Component,  WidgetBase::wt_Artifact,    true,   false,  true,  false }, +    { \
Uml::AssociationType::Dependency,       WidgetBase::wt_Component,  WidgetBase::wt_Package,    true,   \
false,  false,  false }, +    { Uml::AssociationType::Dependency,       WidgetBase::wt_Package,    \
WidgetBase::wt_Artifact,    true,   false,  true,  false }, +    { Uml::AssociationType::Dependency,      \
                WidgetBase::wt_Node,       WidgetBase::wt_Node,        true,   false,  false,  false },
     { Uml::AssociationType::Realization,      WidgetBase::wt_Class,      WidgetBase::wt_Interface,   \
                false,  false,  false,  false },
     { Uml::AssociationType::Realization,      WidgetBase::wt_Interface,  WidgetBase::wt_Package,     \
                false,  false,  false,  false },
     { Uml::AssociationType::Realization,      WidgetBase::wt_Interface,  WidgetBase::wt_Interface,   \
                false,  false,  false,  false },
diff --git a/umbrello/worktoolbar.cpp b/umbrello/worktoolbar.cpp
index 3d9e22d..daa93a4 100644
--- a/umbrello/worktoolbar.cpp
+++ b/umbrello/worktoolbar.cpp
@@ -78,7 +78,8 @@ QAction* WorkToolBar::insertHotBtn(ToolBar_Buttons tbb)
 void WorkToolBar::insertBasicAssociations()
 {
     insertHotBtn(tbb_Association);
-    if (m_Type == Uml::DiagramType::Class || m_Type == Uml::DiagramType::UseCase) {
+    if (m_Type == Uml::DiagramType::Class || m_Type == Uml::DiagramType::UseCase ||
+        m_Type == Uml::DiagramType::Component || m_Type == Uml::DiagramType::Deployment) {
         insertHotBtn(tbb_UniAssociation);
     }
     insertHotBtn(tbb_Dependency);


[prev in list] [next in list] [prev in thread] [next in thread]