diff --git a/modules/gui/src/data_viewer/data_viewer_panel_base.cc b/modules/gui/src/data_viewer/data_viewer_panel_base.cc index c89f27655663dfb8c6b6becb455d5ef39756b8ac..205012c1321d161599fdada91b6d16d3b8caf974 100644 --- a/modules/gui/src/data_viewer/data_viewer_panel_base.cc +++ b/modules/gui/src/data_viewer/data_viewer_panel_base.cc @@ -1071,7 +1071,11 @@ void DataViewerPanelBase::draw_pixel_values(QPainter& painter) unsigned char rgb = (rv>130.0) ? 0 : 255; painter.setPen(QColor(rgb,rgb,rgb)); int string_h=painter.fontMetrics().height(); +#if (QT_VERSION < QT_VERSION_CHECK(5,11,0)) + int string_w=painter.fontMetrics().width(value_string); +#else int string_w=painter.fontMetrics().horizontalAdvance(value_string); +#endif painter.drawText(p.x() - string_w/2, p.y() + string_h/2, value_string); } } @@ -1087,7 +1091,11 @@ void DataViewerPanelBase::draw_pixel_values(QPainter& painter) unsigned char rgb = (rv>130.0) ? 0 : 255; painter.setPen(QColor(rgb,rgb,rgb)); int string_h=painter.fontMetrics().height(); +#if (QT_VERSION < QT_VERSION_CHECK(5,11,0)) + int string_w=painter.fontMetrics().width(value_string); +#else int string_w=painter.fontMetrics().horizontalAdvance(value_string); +#endif painter.drawText(p.x() - string_w/2, p.y() + string_h/2, value_string); } } diff --git a/modules/gui/src/python_shell/python_shell_widget.cc b/modules/gui/src/python_shell/python_shell_widget.cc index 040ee6b1f91772de9003ceabc15d76c9dbc7e2b0..a7d4ae61a85787962391a82aeb6f63185c1084e1 100644 --- a/modules/gui/src/python_shell/python_shell_widget.cc +++ b/modules/gui/src/python_shell/python_shell_widget.cc @@ -76,7 +76,11 @@ PythonShellWidget::PythonShellWidget(QWidget* parent): setUndoRedoEnabled(false); setFont(QFont("Courier",font().pointSize()+2)); QFontMetrics metrics(font()); +#if (QT_VERSION < QT_VERSION_CHECK(5,11,0)) + setTabStopWidth(2*metrics.width(" ")); +#else setTabStopDistance(2*metrics.horizontalAdvance(" ")); +#endif setMaximumBlockCount(1000000); textCursor().block().setUserState(BLOCKTYPE_ACTIVE); @@ -534,7 +538,11 @@ void PythonShellWidget::OnExecuteStateEntered() void PythonShellWidget::SetTabWidth(int width) { tab_width_=width; QFontMetrics metrics(font()); +#if (QT_VERSION < QT_VERSION_CHECK(5,11,0)) + setTabStopWidth(tab_width_*metrics.width(" ")); +#else setTabStopDistance(tab_width_*metrics.horizontalAdvance(" ")); +#endif } diff --git a/modules/gui/src/sequence_viewer/sequence_table_view.cc b/modules/gui/src/sequence_viewer/sequence_table_view.cc index c72842704ecc71c4bc161bc27681ffb71c4058d2..95aa637cd4fc8995736fb2646f641721dacbb4f9 100644 --- a/modules/gui/src/sequence_viewer/sequence_table_view.cc +++ b/modules/gui/src/sequence_viewer/sequence_table_view.cc @@ -477,7 +477,11 @@ void SequenceTableView::keyPressEvent(QKeyEvent* event) } int SequenceTableView::sizeHintForColumn(int column) const { - return this->fontMetrics().horizontalAdvance('W'); +#if (QT_VERSION < QT_VERSION_CHECK(5,11,0)) + return this->fontMetrics().width('W'); +#else + return this->fontMetrics().horizontalAdvance('W'); +#endif } int SequenceTableView::sizeHintForRow(int row) const {