#8250 Use variadic macros and remove obsolete parameters

This commit is contained in:
Magne Sjaastad
2021-11-14 14:15:12 +01:00
parent 1b869a9356
commit 2a65636ba3
392 changed files with 2275 additions and 2533 deletions

View File

@@ -65,12 +65,12 @@ RimAnnotationLineAppearance::RimAnnotationLineAppearance()
{
CAF_PDM_InitObject( "AnnotationLineAppearance", ":/WellCollection.png", "", "" );
CAF_PDM_InitField( &m_lineFieldsHidden, "LineFieldsHidden", false, "Line Fields Hidden", "", "", "" );
CAF_PDM_InitField( &m_color, "Color", cvf::Color3f( cvf::Color3f::BLACK ), "Line Color", "", "", "" );
CAF_PDM_InitField( &m_thickness, "Thickness", 2, "Line Thickness", "", "", "" );
CAF_PDM_InitField( &m_lineFieldsHidden, "LineFieldsHidden", false, "Line Fields Hidden" );
CAF_PDM_InitField( &m_color, "Color", cvf::Color3f( cvf::Color3f::BLACK ), "Line Color" );
CAF_PDM_InitField( &m_thickness, "Thickness", 2, "Line Thickness" );
// Stippling not yet supported. Needs new stuff in VizFwk
CAF_PDM_InitField( &m_style, "Style", LineStyle(), "Style", "", "", "" );
CAF_PDM_InitField( &m_style, "Style", LineStyle(), "Style" );
m_style.uiCapability()->setUiHidden( true );
m_style.xmlCapability()->disableIO();
@@ -172,9 +172,9 @@ RimPolylineAppearance::RimPolylineAppearance()
{
CAF_PDM_InitObject( "PolylineAppearance", ":/WellCollection.png", "", "" );
CAF_PDM_InitField( &m_sphereFieldsHidden, "SphereFieldsHidden", false, "Sphere Fields Hidden", "", "", "" );
CAF_PDM_InitField( &m_sphereColor, "SphereColor", cvf::Color3f( cvf::Color3f::BLACK ), "Sphere Color", "", "", "" );
CAF_PDM_InitField( &m_sphereRadiusFactor, "SphereRadiusFactor", 0.1, "Sphere Radius Factor", "", "", "" );
CAF_PDM_InitField( &m_sphereFieldsHidden, "SphereFieldsHidden", false, "Sphere Fields Hidden" );
CAF_PDM_InitField( &m_sphereColor, "SphereColor", cvf::Color3f( cvf::Color3f::BLACK ), "Sphere Color" );
CAF_PDM_InitField( &m_sphereRadiusFactor, "SphereRadiusFactor", 0.1, "Sphere Radius Factor" );
m_sphereFieldsHidden.uiCapability()->setUiHidden( true );
}