Skip to content
GitLab
Menu
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
42750e34
Commit
42750e34
authored
Oct 24, 2016
by
Jan Möbius
Browse files
Changed function parameters for picking from using unsigned int to size_t. Breaking Change!
parent
4c8a8156
Changes
2
Hide whitespace changes
Inline
Side-by-side
OpenMesh/OMPropertyModelT.cc
View file @
42750e34
...
...
@@ -382,21 +382,21 @@ void OMPropertyModel<MeshT>::mouseEvent(QMouseEvent* _event)
if
(
_event
->
type
()
==
QEvent
::
MouseButtonPress
)
{
unsigned
int
node_idx
,
face_idx
;
ACG
::
Vec3d
hit_point
;
size_t
node_idx
,
face_idx
;
ACG
::
Vec3d
hit_point
;
if
(
PluginFunctions
::
scenegraphPick
(
ACG
::
SceneGraph
::
PICK_FACE
,
_event
->
pos
(),
node_idx
,
face_idx
,
&
hit_point
))
{
BaseObjectData
*
object
;
PluginFunctions
::
getPickedObject
(
node_idx
,
object
);
if
(
PluginFunctions
::
scenegraphPick
(
ACG
::
SceneGraph
::
PICK_FACE
,
_event
->
pos
(),
node_idx
,
face_idx
,
&
hit_point
))
{
BaseObjectData
*
object
;
PluginFunctions
::
getPickedObject
(
node_idx
,
object
);
if
(
object
->
id
()
==
objectID_
)
{
OMPropertyVisualizer
<
MeshT
>*
viz
=
dynamic_cast
<
OMPropertyVisualizer
<
MeshT
>*>
(
propertyVisualizers
[
currentlySelectedIndices
.
first
().
row
()]
);
unsigned
int
primitiveId
=
viz
->
getClosestPrimitiveId
(
face_idx
,
hit_point
);
mPickWidget
.
pickedHandle
->
setText
(
tr
(
"%1"
).
arg
(
primitiveId
));
mPickWidget
.
pickedValue
->
setText
(
viz
->
getPropertyText
(
primitiveId
));
}
if
(
object
->
id
()
==
objectID_
)
{
OMPropertyVisualizer
<
MeshT
>*
viz
=
dynamic_cast
<
OMPropertyVisualizer
<
MeshT
>*>
(
propertyVisualizers
[
currentlySelectedIndices
.
first
().
row
()]
);
unsigned
int
primitiveId
=
viz
->
getClosestPrimitiveId
(
face_idx
,
hit_point
);
mPickWidget
.
pickedHandle
->
setText
(
tr
(
"%1"
).
arg
(
primitiveId
));
mPickWidget
.
pickedValue
->
setText
(
viz
->
getPropertyText
(
primitiveId
));
}
}
}
}
...
...
OpenVolumeMesh/OVMPropertyModelT.cc
View file @
42750e34
...
...
@@ -182,12 +182,12 @@ void OVMPropertyModel<MeshT>::mouseEvent(QMouseEvent* _event)
if
(
_event
->
type
()
==
QEvent
::
MouseButtonPress
)
{
unsigned
int
node_idx
;
size_t
node_idx
;
ACG
::
Vec3d
hit_point
;
OVMPropertyVisualizer
<
MeshT
>*
viz
=
dynamic_cast
<
OVMPropertyVisualizer
<
MeshT
>*>
(
propertyVisualizers
[
currentlySelectedIndices
.
first
().
row
()]);
unsigned
in
t
entityId
=
0
;
size_
t
entityId
=
0
;
ACG
::
SceneGraph
::
PickTarget
pickTarget
;
if
(
viz
->
getPropertyInfo
().
isCellProp
())
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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