Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
Plugin-PropertyVis
Commits
40ff2a5b
Commit
40ff2a5b
authored
Dec 05, 2018
by
Jan Möbius
Browse files
Revert "Merge branch 'linewidth-backport-qt-before-5.7' into 'master'"
This reverts merge request
!12
parent
1cc95194
Changes
3
Hide whitespace changes
Inline
Side-by-side
OpenMesh/OMPropertyVisualizerVector2T.cc
View file @
40ff2a5b
...
...
@@ -71,8 +71,7 @@ OMPropertyVisualizerVector2<MeshT, VectorType>::OMPropertyVisualizerVector2(Mesh
{
w
->
vectors_edges_rb
->
hide
();
}
// starting with Qt 5.7, use QOverload<double>::of(&QDoubleSpinBox::valueChanged)
this
->
connect
(
w
->
lineWidth
,
static_cast
<
void
(
QDoubleSpinBox
::*
)(
double
)
>
(
&
QDoubleSpinBox
::
valueChanged
),
this
->
connect
(
w
->
lineWidth
,
QOverload
<
double
>::
of
(
&
QDoubleSpinBox
::
valueChanged
),
[
this
](
double
value
)
{
lineNode
->
set_line_width
(
value
);});
}
...
...
OpenMesh/OMPropertyVisualizerVectorT.cc
View file @
40ff2a5b
...
...
@@ -70,8 +70,7 @@ OMPropertyVisualizerVector<MeshT>::OMPropertyVisualizerVector(MeshT* _mesh, int
{
w
->
vectors_edges_rb
->
hide
();
}
// starting with Qt 5.7, use QOverload<double>::of(&QDoubleSpinBox::valueChanged)
this
->
connect
(
w
->
lineWidth
,
static_cast
<
void
(
QDoubleSpinBox
::*
)(
double
)
>
(
&
QDoubleSpinBox
::
valueChanged
),
this
->
connect
(
w
->
lineWidth
,
QOverload
<
double
>::
of
(
&
QDoubleSpinBox
::
valueChanged
),
[
this
](
double
value
)
{
lineNode
->
set_line_width
(
value
);});
}
...
...
OpenVolumeMesh/OVMPropertyVisualizerVectorT.cc
View file @
40ff2a5b
...
...
@@ -67,9 +67,7 @@ OVMPropertyVisualizerVector<MeshT>::OVMPropertyVisualizerVector(MeshT* _mesh, in
PluginFunctions
::
getObject
(
objectID
,
bod
);
lineNode
=
new
ACG
::
SceneGraph
::
LineNode
(
ACG
::
SceneGraph
::
LineNode
::
LineSegmentsMode
,
bod
->
baseNode
());
w
->
vectors_edges_rb
->
hide
();
// starting with Qt 5.7, use QOverload<double>::of(&QDoubleSpinBox::valueChanged)
this
->
connect
(
w
->
lineWidth
,
static_cast
<
void
(
QDoubleSpinBox
::*
)(
double
)
>
(
&
QDoubleSpinBox
::
valueChanged
),
this
->
connect
(
w
->
lineWidth
,
QOverload
<
double
>::
of
(
&
QDoubleSpinBox
::
valueChanged
),
[
this
](
double
value
)
{
lineNode
->
set_line_width
(
value
);});
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment