#3868 Annotations. Fix polyline visualization and property editor

This commit is contained in:
Bjørn Erik Jensen
2018-12-18 12:50:21 +01:00
parent a2e2907e41
commit 4873381176
6 changed files with 107 additions and 32 deletions

View File

@@ -177,10 +177,16 @@ void RimPolylinesFromFileAnnotation::setDescriptionFromFileName()
//--------------------------------------------------------------------------------------------------
void RimPolylinesFromFileAnnotation::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
uiOrdering.add(&m_polyLinesFileName);
uiOrdering.add(&m_closePolyline);
appearance()->setLineFieldsHidden(!m_showLines());
appearance()->setSphereFieldsHidden(!m_showSpheres());
uiOrdering.add(&m_polyLinesFileName);
auto appearanceGroup = uiOrdering.addNewGroup("Appearance");
appearanceGroup->add(&m_closePolyline);
appearanceGroup->add(&m_showLines);
appearanceGroup->add(&m_showSpheres);
auto appearanceGroup = uiOrdering.addNewGroup("Line Appearance");
appearance()->uiOrdering(uiConfigName, *appearanceGroup);
uiOrdering.skipRemainingFields(true);
@@ -204,6 +210,14 @@ void RimPolylinesFromFileAnnotation::fieldChangedByUi(const caf::PdmFieldHandle*
QMessageBox::warning(nullptr, "Import Polylines", totalError);
}
}
else if (changedField == &m_showLines)
{
appearance()->setLineFieldsHidden(!m_showLines());
}
else if (changedField == &m_showSpheres)
{
appearance()->setSphereFieldsHidden(!m_showSpheres());
}
RimAnnotationCollection* annColl = nullptr;
this->firstAncestorOrThisOfTypeAsserted(annColl);