osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

More size and position tweaks. 

svn path=/trunk/; revision=52913
This commit is contained in:
Gerald Combs 2013-10-28 01:39:20 +00:00
parent 20bbd49810
commit 3b7c0fffe4
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/qt/qt_ui_utils.cpp
View File

@ -57,12 +57,15 @@ QString gchar_free_to_qstring(gchar *glib_string) {
void smooth_font_size(QFont &font) {
QFontDatabase fdb;
int last_size = 0;
foreach (int cur_size, fdb.smoothSizes(font.family(), font.styleName())) {
QList<int> size_list = fdb.smoothSizes(font.family(), font.styleName());
if (size_list.size() < 2) return;
int last_size = size_list.takeFirst();
foreach (int cur_size, size_list) {
if (font.pointSize() > last_size && font.pointSize() <= cur_size) {
font.setPointSize(cur_size);
break;
return;
}
last_size = cur_size;
}

32
ui/qt/sequence_diagram.cpp
View File

@ -83,7 +83,7 @@ SequenceDiagram::SequenceDiagram(QCPAxis *keyAxis, QCPAxis *valueAxis, QCPAxis *
comment_axis_->grid()->setVisible(false);
QFont comment_font = comment_axis_->tickLabelFont();
comment_font.setPointSizeF(comment_font.pointSizeF() * 0.75);
comment_font.setPointSizeF(comment_font.pointSizeF() * 0.8);
smooth_font_size(comment_font);
comment_axis_->setTickLabelFont(comment_font);
comment_axis_->setSelectedTickLabelFont(QFont(comment_font.family(), comment_font.pointSizeF(), QFont::Bold));
@ -177,27 +177,29 @@ void SequenceDiagram::draw(QCPPainter *painter)
continue;
}
QFontMetrics cfm(comment_axis_->tickLabelFont());
int dir_mul = (sai->src_node < sai->dst_node) ? 1 : -1;
double ah_size = (cfm.height() / 5) * dir_mul;
QPoint arrow_start(coordsToPixels(cur_key, sai->src_node).toPoint());
QPoint arrow_end(coordsToPixels(cur_key, sai->dst_node).toPoint());
QLine arrow_line(arrow_start, arrow_end);
QPolygon arrow_head;
arrow_head
<< QPoint(arrow_end.x() - (ah_size*3), arrow_end.y() - ah_size)
<< arrow_end
<< QPoint(arrow_end.x() - (ah_size*3), arrow_end.y() + ah_size);
if (mainPen().style() != Qt::NoPen && mainPen().color().alpha() != 0) {
painter->save();
QFontMetrics cfm(comment_axis_->tickLabelFont());
double en_w = cfm.height() / 2.0;
int dir_mul = (sai->src_node < sai->dst_node) ? 1 : -1;
double ah_size = (cfm.height() / 5) * dir_mul;
QPoint arrow_start(coordsToPixels(cur_key, sai->src_node).toPoint());
arrow_start.setY(arrow_start.y() + (en_w / 2));
QPoint arrow_end(coordsToPixels(cur_key, sai->dst_node).toPoint());
arrow_end.setY(arrow_start.y());
QLine arrow_line(arrow_start, arrow_end);
QPolygon arrow_head;
arrow_head
<< QPoint(arrow_end.x() - (ah_size*3), arrow_end.y() - ah_size)
<< arrow_end
<< QPoint(arrow_end.x() - (ah_size*3), arrow_end.y() + ah_size);
painter->setBrush(mainPen().color());
painter->setPen(mainPen());
painter->drawLine(arrow_line);
painter->drawPolygon(arrow_head);
painter->setFont(comment_axis_->tickLabelFont());
double comment_start = (sai->src_node < sai->dst_node)
? arrow_start.x() : arrow_end.x();
double arrow_width = (arrow_end.x() - arrow_start.x()) * dir_mul;
@ -205,6 +207,7 @@ void SequenceDiagram::draw(QCPPainter *painter)
QPoint text_pt(comment_start + ((arrow_width - cfm.width(arrow_label)) / 2),
arrow_start.y() - (en_w / 2));
painter->setFont(comment_axis_->tickLabelFont());
painter->drawText(text_pt, arrow_label);
if (sai->port_src && sai->port_dst) {
@ -217,6 +220,7 @@ void SequenceDiagram::draw(QCPPainter *painter)
text_pt.setX(arrow_end.x() - en_w + (cfm.width(port_num) * dir_mul));
painter->drawText(text_pt, port_num);
}
painter->restore();
}
}
}