diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2020-10-20 14:20:06 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-10-20 14:20:06 (GMT) |
commit | 0006f830184ea30abdd9eb13e79ca2587004a63d (patch) | |
tree | 7e1679e7c77c7da97f7b987075b71f4497d1180c | |
parent | 173211aed6e2d2560d60f7434ebb5aada0a2196b (diff) | |
download | Doxygen-0006f830184ea30abdd9eb13e79ca2587004a63d.zip Doxygen-0006f830184ea30abdd9eb13e79ca2587004a63d.tar.gz Doxygen-0006f830184ea30abdd9eb13e79ca2587004a63d.tar.bz2 |
Some tweaks & fixes
- Changed DOT_MAX_FOLD to DOT_WRAP_THRESHOLD
- Improved documentation
- Applied DOT_WRAP_THRESHOLD to the whole string instead of individual
parts.
-rw-r--r-- | src/config.xml | 34 | ||||
-rw-r--r-- | src/dotnode.cpp | 26 |
2 files changed, 32 insertions, 28 deletions
diff --git a/src/config.xml b/src/config.xml index b90e243..b080bec 100644 --- a/src/config.xml +++ b/src/config.xml @@ -3419,7 +3419,7 @@ to be found in the default search path. ]]> </docs> </option> - <option type='int' id='UML_LIMIT_NUM_FIELDS' defval='10' minval='0' maxval='100' depends='HAVE_DOT'> + <option type='int' id='UML_LIMIT_NUM_FIELDS' defval='10' minval='0' maxval='100' depends='UML_LOOK'> <docs> <![CDATA[ If the \ref cfg_uml_look "UML_LOOK" tag is enabled, the fields and methods are shown inside @@ -3433,6 +3433,23 @@ to be found in the default search path. ]]> </docs> </option> + <option type='bool' id='DOT_UML_DETAILS' defval='0' depends='UML_LOOK'> + <docs> +<![CDATA[ +If the \c DOT_UML_DETAILS tag is set to \c YES, doxygen will +add type and arguments for attributes and methods in the UML graphs. +]]> + </docs> + </option> + <option type='int' id='DOT_WRAP_THRESHOLD' defval='17' minval='0' maxval='1000' depends='HAVE_DOT'> + <docs> +<![CDATA[ + The \c DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters to display on + a single line. If the actual line length exceeds this threshold significantly it will wrapped + across multiple lines. Some heuristics are apply to avoid ugly line breaks. +]]> + </docs> + </option> <option type='bool' id='TEMPLATE_RELATIONS' defval='0' depends='HAVE_DOT'> <docs> <![CDATA[ @@ -3671,21 +3688,6 @@ remove the intermediate dot files that are used to generate the various graphs. ]]> </docs> </option> - <option type='int' id='DOT_MAX_FOLD' defval='17' minval='0' maxval='1000' depends='HAVE_DOT'> - <docs> -<![CDATA[ - The \c DOT_MAX_FOLD tag can be used to set the length to fold text of dot graphs. -]]> - </docs> - </option> - <option type='bool' id='DOT_UML_DETAILS' defval='0' depends='HAVE_DOT'> - <docs> -<![CDATA[ -If the \c DOT_UML_DETAILS tag is set to \c YES, doxygen will -add details in the uml graphs. -]]> - </docs> - </option> <option type='obsolete' id='USE_WINDOWS_ENCODING'/> <option type='obsolete' id='DETAILS_AT_TOP'/> <option type='obsolete' id='QTHELP_FILE'/> diff --git a/src/dotnode.cpp b/src/dotnode.cpp index 89fe9a7..8ce1bb3 100644 --- a/src/dotnode.cpp +++ b/src/dotnode.cpp @@ -148,23 +148,25 @@ static void writeBoxMemberList(FTextStream &t, else { t << prot << " "; + QCString label; if(Config_getBool(DOT_UML_DETAILS)) { - t << DotNode::convertLabel(mma->typeString()); - t << " "; + label+=mma->typeString(); + label+=" "; } - t << DotNode::convertLabel(mma->name()); + label+=mma->name(); if (!mma->isObjCMethod() && (mma->isFunction() || mma->isSlot() || mma->isSignal())) { - if(Config_getBool(DOT_UML_DETAILS)) - { - t << DotNode::convertLabel(mma->argsString()); - } - else - { - t << "()"; - } + if(Config_getBool(DOT_UML_DETAILS)) + { + label+=mma->argsString(); + } + else + { + label+="()"; + } } + t << DotNode::convertLabel(label); t << "\\l"; count++; } @@ -199,7 +201,7 @@ QCString DotNode::convertLabel(const QCString &l) int len=p.length(); int charsLeft=len; int sinceLast=0; - int foldLen = Config_getInt(DOT_MAX_FOLD); // ideal text length + int foldLen = Config_getInt(DOT_WRAP_THRESHOLD); // ideal text length while (idx < p.length()) { c = p[idx++]; |