Commit 1cc95194 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'linewidth-backport-qt-before-5.7' into 'master'

backport linewidth feature to qt < 5.7, as per OpenFlipper-Free#161

See merge request !12
parents c1b50067 3aba520e
...@@ -71,7 +71,8 @@ OMPropertyVisualizerVector2<MeshT, VectorType>::OMPropertyVisualizerVector2(Mesh ...@@ -71,7 +71,8 @@ OMPropertyVisualizerVector2<MeshT, VectorType>::OMPropertyVisualizerVector2(Mesh
{ {
w->vectors_edges_rb->hide(); w->vectors_edges_rb->hide();
} }
this->connect(w->lineWidth, QOverload<double>::of(&QDoubleSpinBox::valueChanged), // starting with Qt 5.7, use QOverload<double>::of(&QDoubleSpinBox::valueChanged)
this->connect(w->lineWidth, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
[this](double value) {lineNode->set_line_width(value);}); [this](double value) {lineNode->set_line_width(value);});
} }
......
...@@ -70,7 +70,8 @@ OMPropertyVisualizerVector<MeshT>::OMPropertyVisualizerVector(MeshT* _mesh, int ...@@ -70,7 +70,8 @@ OMPropertyVisualizerVector<MeshT>::OMPropertyVisualizerVector(MeshT* _mesh, int
{ {
w->vectors_edges_rb->hide(); w->vectors_edges_rb->hide();
} }
this->connect(w->lineWidth, QOverload<double>::of(&QDoubleSpinBox::valueChanged), // starting with Qt 5.7, use QOverload<double>::of(&QDoubleSpinBox::valueChanged)
this->connect(w->lineWidth, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
[this](double value) {lineNode->set_line_width(value);}); [this](double value) {lineNode->set_line_width(value);});
} }
......
...@@ -67,7 +67,9 @@ OVMPropertyVisualizerVector<MeshT>::OVMPropertyVisualizerVector(MeshT* _mesh, in ...@@ -67,7 +67,9 @@ OVMPropertyVisualizerVector<MeshT>::OVMPropertyVisualizerVector(MeshT* _mesh, in
PluginFunctions::getObject(objectID, bod); PluginFunctions::getObject(objectID, bod);
lineNode = new ACG::SceneGraph::LineNode(ACG::SceneGraph::LineNode::LineSegmentsMode, bod->baseNode()); lineNode = new ACG::SceneGraph::LineNode(ACG::SceneGraph::LineNode::LineSegmentsMode, bod->baseNode());
w->vectors_edges_rb->hide(); w->vectors_edges_rb->hide();
this->connect(w->lineWidth, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
// starting with Qt 5.7, use QOverload<double>::of(&QDoubleSpinBox::valueChanged)
this->connect(w->lineWidth, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
[this](double value) {lineNode->set_line_width(value);}); [this](double value) {lineNode->set_line_width(value);});
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment