Commit dc742001 authored by Martin Heistermann's avatar Martin Heistermann

fix build error and a warning

parent 0686606a
......@@ -191,7 +191,7 @@ class PropertyNameListModel: public QAbstractListModel {
OpenMesh::BaseProperty * const baseProp = *pit;
if (!baseProp) continue;
TypeInfoWrapper bp_type = typeid(*baseProp);
TypeInfoWrapper bp_type {typeid(*baseProp)};
TYPE_INFO_SET::const_iterator sane_prop_it = sane_prop_types.find(bp_type);
if ((typeIdFilter == 0 || TypeInfoWrapper(*typeIdFilter) == bp_type) && sane_prop_it != sane_prop_types.end()) {
*oit++ = PROP_INFO(baseProp->name(), *sane_prop_it, entity);
......
......@@ -90,7 +90,7 @@ private:
template<typename EntityTag, typename EntityIterator>
void visualizeForEntity(EntityIterator e_begin, EntityIterator e_end);
Matrix3x3Widget* getWidget() {return static_cast<Matrix3x3Widget*>(PropertyVisualizer::widget);}
Matrix3x3Widget* getMatWidget() {return static_cast<Matrix3x3Widget*>(PropertyVisualizer::widget);}
};
......
......@@ -100,7 +100,7 @@ visualizeAsCrossesForEntity(Property prop, EntityIterator e_begin, EntityIterato
EntityPosition<MeshT> ep{m};
double scaleFactor = getWidget()->getScaleFactor();
double scaleFactor = getMatWidget()->getScaleFactor();
for (EntityIterator e_it = e_begin; e_it != e_end; ++e_it) {
Matrix3x3d mat = prop[*e_it];
......@@ -129,7 +129,7 @@ visualizeAsBoxesForEntity(Property prop, EntityIterator e_begin, EntityIterator
Vec3d center_pos = ep(*e_it);
boxesNode->push_back({mat, center_pos});
}
boxesNode->setScaleFactor(getWidget()->getScaleFactor());
boxesNode->setScaleFactor(getMatWidget()->getScaleFactor());
}
template<typename MeshT>
......@@ -143,9 +143,9 @@ visualizeForEntity(EntityIterator e_begin, EntityIterator e_end)
if (!prop)
throw VizException("Getting PropHandle from mesh for selected property failed.");
if (getWidget()->as_crosses->isChecked()) {
if (getMatWidget()->as_crosses->isChecked()) {
visualizeAsCrossesForEntity<EntityTag>(prop, e_begin, e_end);
} else if (getWidget()->as_boxes->isChecked()) {
} else if (getMatWidget()->as_boxes->isChecked()) {
visualizeAsBoxesForEntity<EntityTag>(prop, e_begin, e_end);
}
}
......
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