Skip to content

Commit 0006f83

Browse files
committed
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.
1 parent 173211a commit 0006f83

File tree

2 files changed

+32
-28
lines changed

2 files changed

+32
-28
lines changed

src/config.xml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3419,7 +3419,7 @@ to be found in the default search path.
34193419
]]>
34203420
</docs>
34213421
</option>
3422-
<option type='int' id='UML_LIMIT_NUM_FIELDS' defval='10' minval='0' maxval='100' depends='HAVE_DOT'>
3422+
<option type='int' id='UML_LIMIT_NUM_FIELDS' defval='10' minval='0' maxval='100' depends='UML_LOOK'>
34233423
<docs>
34243424
<![CDATA[
34253425
If the \ref cfg_uml_look "UML_LOOK" tag is enabled, the fields and methods are shown inside
@@ -3430,6 +3430,23 @@ to be found in the default search path.
34303430
exceeded by 50% before the limit is enforced. So when you set the threshold
34313431
to 10, up to 15 fields may appear, but if the number exceeds 15, the
34323432
total amount of fields shown is limited to 10.
3433+
]]>
3434+
</docs>
3435+
</option>
3436+
<option type='bool' id='DOT_UML_DETAILS' defval='0' depends='UML_LOOK'>
3437+
<docs>
3438+
<![CDATA[
3439+
If the \c DOT_UML_DETAILS tag is set to \c YES, doxygen will
3440+
add type and arguments for attributes and methods in the UML graphs.
3441+
]]>
3442+
</docs>
3443+
</option>
3444+
<option type='int' id='DOT_WRAP_THRESHOLD' defval='17' minval='0' maxval='1000' depends='HAVE_DOT'>
3445+
<docs>
3446+
<![CDATA[
3447+
The \c DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters to display on
3448+
a single line. If the actual line length exceeds this threshold significantly it will wrapped
3449+
across multiple lines. Some heuristics are apply to avoid ugly line breaks.
34333450
]]>
34343451
</docs>
34353452
</option>
@@ -3668,21 +3685,6 @@ to be found in the default search path.
36683685
<![CDATA[
36693686
If the \c DOT_CLEANUP tag is set to \c YES, doxygen will
36703687
remove the intermediate dot files that are used to generate the various graphs.
3671-
]]>
3672-
</docs>
3673-
</option>
3674-
<option type='int' id='DOT_MAX_FOLD' defval='17' minval='0' maxval='1000' depends='HAVE_DOT'>
3675-
<docs>
3676-
<![CDATA[
3677-
The \c DOT_MAX_FOLD tag can be used to set the length to fold text of dot graphs.
3678-
]]>
3679-
</docs>
3680-
</option>
3681-
<option type='bool' id='DOT_UML_DETAILS' defval='0' depends='HAVE_DOT'>
3682-
<docs>
3683-
<![CDATA[
3684-
If the \c DOT_UML_DETAILS tag is set to \c YES, doxygen will
3685-
add details in the uml graphs.
36863688
]]>
36873689
</docs>
36883690
</option>

src/dotnode.cpp

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -148,23 +148,25 @@ static void writeBoxMemberList(FTextStream &t,
148148
else
149149
{
150150
t << prot << " ";
151+
QCString label;
151152
if(Config_getBool(DOT_UML_DETAILS))
152153
{
153-
t << DotNode::convertLabel(mma->typeString());
154-
t << " ";
154+
label+=mma->typeString();
155+
label+=" ";
155156
}
156-
t << DotNode::convertLabel(mma->name());
157+
label+=mma->name();
157158
if (!mma->isObjCMethod() && (mma->isFunction() || mma->isSlot() || mma->isSignal()))
158159
{
159-
if(Config_getBool(DOT_UML_DETAILS))
160-
{
161-
t << DotNode::convertLabel(mma->argsString());
162-
}
163-
else
164-
{
165-
t << "()";
166-
}
160+
if(Config_getBool(DOT_UML_DETAILS))
161+
{
162+
label+=mma->argsString();
163+
}
164+
else
165+
{
166+
label+="()";
167+
}
167168
}
169+
t << DotNode::convertLabel(label);
168170
t << "\\l";
169171
count++;
170172
}
@@ -199,7 +201,7 @@ QCString DotNode::convertLabel(const QCString &l)
199201
int len=p.length();
200202
int charsLeft=len;
201203
int sinceLast=0;
202-
int foldLen = Config_getInt(DOT_MAX_FOLD); // ideal text length
204+
int foldLen = Config_getInt(DOT_WRAP_THRESHOLD); // ideal text length
203205
while (idx < p.length())
204206
{
205207
c = p[idx++];

0 commit comments

Comments
 (0)