Merge branch 'albert-github-feature/bug_uml_edge_fields'

Author: doxygen

src/config.xml

@@ -3921,6 +3921,16 @@ where `loc1` and `loc2` can be relative or absolute paths or URLs.
  exceeded by 50% before the limit is enforced. So when you set the threshold
  to 10, up to 15 fields may appear, but if the number exceeds 15, the
  total amount of fields shown is limited to 10.
+]]>
+      </docs>
+    </option>
+    <option type='int' id='UML_MAX_EDGE_LABELS' defval='10' minval='0' maxval='100' depends='UML_LOOK'>
+      <docs>
+<![CDATA[
+ If the \ref cfg_uml_look "UML_LOOK" tag is enabled, field labels are shown along
+ the edge between two class nodes. If there are many fields and many nodes the
+ graph may become too cluttered. The \c UML_MAX_EDGE_LABELS threshold limits
+ the number of items to make the size more manageable. Set this to 0 for no limit.
 ]]>
       </docs>
     </option>

src/dotclassgraph.cpp

@@ -231,17 +231,20 @@ static QCString joinLabels(const StringSet &ss)
 {
   QCString label;
   int count=1;
-  int maxLabels=10;
+  int maxLabels = Config_getInt(UML_MAX_EDGE_LABELS);
   auto it = std::begin(ss), e = std::end(ss);
   if (it!=e) // set not empty
   {
-    label += (*it++).c_str();
-    for (; it!=e && count < maxLabels ; ++it,++count)
+    label = *it++;
+    for (; it!=e && (maxLabels==0 || count<maxLabels) ; ++it,++count)
     {
       label += '\n';
-      label += (*it).c_str();
+      label += *it;
+    }
+    if (maxLabels!=0 && count==maxLabels)
+    {
+      label+="\n...";
     }
-    if (count==maxLabels) label+="\n...";
   }
   return label;
 }