OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#8250 Use variadic macros and remove obsolete parameters

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollection.cpp
View File

@@ -43,14 +43,11 @@ RimAnnotationCollection::RimAnnotationCollection()
{
CAF_PDM_InitObject( "Annotations", ":/Annotations16x16.png", "", "" );
CAF_PDM_InitFieldNoDefault( &m_reachCircleAnnotations, "ReachCircleAnnotations", "Reach Circle Annotations", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_reachCircleAnnotations, "ReachCircleAnnotations", "Reach Circle Annotations" );
CAF_PDM_InitFieldNoDefault( &m_userDefinedPolylineAnnotations,
"UserDefinedPolylineAnnotations",
"User Defined Polyline Annotations",
"",
"",
"" );
CAF_PDM_InitFieldNoDefault( &m_polylineFromFileAnnotations, "PolylineFromFileAnnotations", "Polylines From File", "", "", "" );
"User Defined Polyline Annotations" );
CAF_PDM_InitFieldNoDefault( &m_polylineFromFileAnnotations, "PolylineFromFileAnnotations", "Polylines From File" );
m_reachCircleAnnotations.uiCapability()->setUiTreeHidden( true );
m_userDefinedPolylineAnnotations.uiCapability()->setUiTreeHidden( true );

4
ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.cpp
View File

@@ -38,10 +38,10 @@ RimAnnotationCollectionBase::RimAnnotationCollectionBase()
{
CAF_PDM_InitObject( "Annotations", ":/WellCollection.png", "", "" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
m_isActive.uiCapability()->setUiHidden( true );
CAF_PDM_InitFieldNoDefault( &m_textAnnotations, "TextAnnotations", "Text Annotations", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_textAnnotations, "TextAnnotations", "Text Annotations" );
m_textAnnotations.uiCapability()->setUiTreeHidden( true );
m_textAnnotations = new RimAnnotationGroupCollection();

4
ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.cpp
View File

@@ -46,8 +46,8 @@ RimAnnotationGroupCollection::RimAnnotationGroupCollection()
{
CAF_PDM_InitObject( "Annotations", ":/WellCollection.png", "", "" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_annotations, "Annotations", "Annotations", "", "", "" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
CAF_PDM_InitFieldNoDefault( &m_annotations, "Annotations", "Annotations" );
m_isActive.uiCapability()->setUiHidden( true );
m_annotations.uiCapability()->setUiTreeHidden( true );

23
ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.cpp
View File

@@ -80,33 +80,24 @@ RimAnnotationInViewCollection::RimAnnotationInViewCollection()
{
CAF_PDM_InitObject( "Annotations", ":/Annotations16x16.png", "", "" );
CAF_PDM_InitField( &m_annotationPlaneDepth, "AnnotationPlaneDepth", 0.0, "Annotation Plane Depth", "", "", "" );
CAF_PDM_InitField( &m_snapAnnotations, "SnapAnnotations", false, "Snap Annotations to Plane", "", "", "" );
CAF_PDM_InitField( &m_annotationPlaneDepth, "AnnotationPlaneDepth", 0.0, "Annotation Plane Depth" );
CAF_PDM_InitField( &m_snapAnnotations, "SnapAnnotations", false, "Snap Annotations to Plane" );
m_annotationPlaneDepth.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() );
m_annotationPlaneDepth.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosType::TOP );
CAF_PDM_InitFieldNoDefault( &m_globalTextAnnotations, "TextAnnotationsInView", "Global Text Annotations", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_globalTextAnnotations, "TextAnnotationsInView", "Global Text Annotations" );
CAF_PDM_InitFieldNoDefault( &m_globalReachCircleAnnotations,
"ReachCircleAnnotationsInView",
"Global Reach Circle Annotations",
"",
"",
"" );
"Global Reach Circle Annotations" );
CAF_PDM_InitFieldNoDefault( &m_globalUserDefinedPolylineAnnotations,
"UserDefinedPolylinesAnnotationsInView",
"Global User Defined Polylines Annotations",
"",
"",
"" );
"Global User Defined Polylines Annotations" );
CAF_PDM_InitFieldNoDefault( &m_globalPolylineFromFileAnnotations,
"PolylinesFromFileAnnotationsInView",
"Global Polylines From File Annotations",
"",
"",
"" );
"Global Polylines From File Annotations" );
CAF_PDM_InitFieldNoDefault( &m_annotationFontSize, "AnnotationFontSize", "Default Font Size", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_annotationFontSize, "AnnotationFontSize", "Default Font Size" );
m_globalTextAnnotations.uiCapability()->setUiTreeHidden( true );
m_globalReachCircleAnnotations.uiCapability()->setUiTreeHidden( true );

14
ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationLineAppearance.cpp
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 );
}

6
ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationTextAppearance.cpp
View File

@@ -35,11 +35,11 @@ RimAnnotationTextAppearance::RimAnnotationTextAppearance()
auto prefs = RiaPreferences::current();
auto defaultBackgroundColor = prefs->defaultViewerBackgroundColor();
CAF_PDM_InitFieldNoDefault( &m_fontSize, "FontSize", "Font Size", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_fontSize, "FontSize", "Font Size" );
m_fontSize = prefs->defaultAnnotationFontSize();
CAF_PDM_InitField( &m_fontColor, "FontColor", cvf::Color3f( cvf::Color3f::BLACK ), "Font Color", "", "", "" );
CAF_PDM_InitField( &m_backgroundColor, "BackgroundColor", defaultBackgroundColor, "Background Color", "", "", "" );
CAF_PDM_InitField( &m_fontColor, "FontColor", cvf::Color3f( cvf::Color3f::BLACK ), "Font Color" );
CAF_PDM_InitField( &m_backgroundColor, "BackgroundColor", defaultBackgroundColor, "Background Color" );
CAF_PDM_InitField( &m_anchorLineColor,
"AnchorLineColor",
cvf::Color3f( cvf::Color3f::BLACK ),

4
ApplicationLibCode/ProjectDataModel/Annotations/RimPolylineTarget.cpp
View File

@@ -31,8 +31,8 @@ CAF_PDM_SOURCE_INIT( RimPolylineTarget, "PolylineTarget" );
RimPolylineTarget::RimPolylineTarget()
: m_isFullUpdateEnabled( true )
{
CAF_PDM_InitField( &m_isEnabled, "IsEnabled", true, "", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_targetPointXyd, "TargetPointXyd", "Point", "", "", "" );
CAF_PDM_InitField( &m_isEnabled, "IsEnabled", true, "" );
CAF_PDM_InitFieldNoDefault( &m_targetPointXyd, "TargetPointXyd", "Point" );
}
//--------------------------------------------------------------------------------------------------

10
ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.cpp
View File

@@ -37,14 +37,14 @@ RimPolylinesAnnotation::RimPolylinesAnnotation()
{
CAF_PDM_InitObject( "PolylineAnnotation", ":/WellCollection.png", "", "" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
m_isActive.uiCapability()->setUiHidden( true );
CAF_PDM_InitField( &m_closePolyline, "ClosePolyline", false, "Close Polyline", "", "", "" );
CAF_PDM_InitField( &m_showLines, "ShowLines", true, "Show Lines", "", "", "" );
CAF_PDM_InitField( &m_showSpheres, "ShowSpheres", false, "Show Spheres", "", "", "" );
CAF_PDM_InitField( &m_closePolyline, "ClosePolyline", false, "Close Polyline" );
CAF_PDM_InitField( &m_showLines, "ShowLines", true, "Show Lines" );
CAF_PDM_InitField( &m_showSpheres, "ShowSpheres", false, "Show Spheres" );
CAF_PDM_InitFieldNoDefault( &m_appearance, "Appearance", "Appearance", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_appearance, "Appearance", "Appearance" );
m_appearance = new RimPolylineAppearance();
m_appearance.uiCapability()->setUiTreeHidden( true );

4
ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesAnnotationInView.cpp
View File

@@ -33,8 +33,8 @@ RimPolylinesAnnotationInView::RimPolylinesAnnotationInView()
{
CAF_PDM_InitObject( "PolyLinesAnnotationInView", ":/WellCollection.png", "", "" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation", "", "", "" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation" );
m_isActive.uiCapability()->setUiHidden( true );
m_sourceAnnotation.uiCapability()->setUiHidden( true );

4
ApplicationLibCode/ProjectDataModel/Annotations/RimPolylinesFromFileAnnotation.cpp
View File

@@ -37,8 +37,8 @@ RimPolylinesFromFileAnnotation::RimPolylinesFromFileAnnotation()
{
CAF_PDM_InitObject( "PolyLines Annotation", ":/PolylinesFromFile16x16.png", "", "" );
CAF_PDM_InitFieldNoDefault( &m_polyLinesFileName, "PolyLineFilePath", "File", "", "", "" );
CAF_PDM_InitField( &m_userDescription, "PolyLineDescription", QString( "" ), "Name", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_polyLinesFileName, "PolyLineFilePath", "File" );
CAF_PDM_InitField( &m_userDescription, "PolyLineDescription", QString( "" ), "Name" );
}
//--------------------------------------------------------------------------------------------------

12
ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp
View File

@@ -38,19 +38,19 @@ RimReachCircleAnnotation::RimReachCircleAnnotation()
{
CAF_PDM_InitObject( "CircleAnnotation", ":/ReachCircle16x16.png", "", "" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
m_isActive.uiCapability()->setUiHidden( true );
CAF_PDM_InitField( &m_centerPointXyd, "CenterPointXyd", Vec3d::ZERO, "Center Point", "", "", "" );
CAF_PDM_InitField( &m_centerPointXyd, "CenterPointXyd", Vec3d::ZERO, "Center Point" );
m_centerPointXyd.uiCapability()->setUiEditorTypeName( caf::PdmUiPickableLineEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_centerPointPickEnabled, "AnchorPointPick", false, "", "", "", "" );
CAF_PDM_InitField( &m_centerPointPickEnabled, "AnchorPointPick", false, "" );
caf::PdmUiPushButtonEditor::configureEditorForField( &m_centerPointPickEnabled );
m_centerPointPickEnabled.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosType::HIDDEN );
CAF_PDM_InitField( &m_radius, "Radius", 100.0, "Radius", "", "", "" );
CAF_PDM_InitField( &m_name, "Name", QString( "Circle Annotation" ), "Name", "", "", "" );
CAF_PDM_InitField( &m_radius, "Radius", 100.0, "Radius" );
CAF_PDM_InitField( &m_name, "Name", QString( "Circle Annotation" ), "Name" );
CAF_PDM_InitFieldNoDefault( &m_appearance, "Appearance", "Appearance", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_appearance, "Appearance", "Appearance" );
m_appearance = new RimReachCircleLineAppearance();
m_appearance.uiCapability()->setUiTreeHidden( true );

4
ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotationInView.cpp
View File

@@ -30,8 +30,8 @@ RimReachCircleAnnotationInView::RimReachCircleAnnotationInView()
{
CAF_PDM_InitObject( "ReachCircleAnnotationInView", ":/ReachCircle16x16.png", "", "" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation", "", "", "" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation" );
m_isActive.uiCapability()->setUiHidden( true );
m_sourceAnnotation.uiCapability()->setUiHidden( true );

16
ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp
View File

@@ -47,30 +47,30 @@ RimTextAnnotation::RimTextAnnotation()
CAF_PDM_InitObject( "TextAnnotation", ":/TextAnnotation16x16.png", "", "" );
this->setUi3dEditorTypeName( RicTextAnnotation3dEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_anchorPointXyd, "AnchorPointXyd", Vec3d::ZERO, "Anchor Point", "", "", "" );
CAF_PDM_InitField( &m_anchorPointXyd, "AnchorPointXyd", Vec3d::ZERO, "Anchor Point" );
m_anchorPointXyd.uiCapability()->setUiEditorTypeName( caf::PdmUiPickableLineEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_anchorPointPickEnabledButtonField, "AnchorPointPick", false, "", "", "", "" );
CAF_PDM_InitField( &m_anchorPointPickEnabledButtonField, "AnchorPointPick", false, "" );
caf::PdmUiPushButtonEditor::configureEditorForField( &m_anchorPointPickEnabledButtonField );
m_anchorPointPickEnabledButtonField.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosType::HIDDEN );
CAF_PDM_InitField( &m_labelPointXyd, "LabelPointXyd", Vec3d::ZERO, "Label Point", "", "", "" );
CAF_PDM_InitField( &m_labelPointXyd, "LabelPointXyd", Vec3d::ZERO, "Label Point" );
m_labelPointXyd.uiCapability()->setUiEditorTypeName( caf::PdmUiPickableLineEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_labelPointPickEnabledButtonField, "LabelPointPick", false, "", "", "", "" );
CAF_PDM_InitField( &m_labelPointPickEnabledButtonField, "LabelPointPick", false, "" );
caf::PdmUiPushButtonEditor::configureEditorForField( &m_labelPointPickEnabledButtonField );
m_labelPointPickEnabledButtonField.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosType::HIDDEN );
CAF_PDM_InitField( &m_text, "Text", QString( "(New text)" ), "Text", "", "", "" );
CAF_PDM_InitField( &m_text, "Text", QString( "(New text)" ), "Text" );
m_text.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
m_isActive.uiCapability()->setUiHidden( true );
CAF_PDM_InitFieldNoDefault( &m_textAppearance, "TextAppearance", "Text Appearance", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_textAppearance, "TextAppearance", "Text Appearance" );
m_textAppearance = new RimAnnotationTextAppearance();
m_textAppearance.uiCapability()->setUiTreeHidden( true );
m_textAppearance.uiCapability()->setUiTreeChildrenHidden( true );
CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name Proxy", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_nameProxy, "NameProxy", "Name Proxy" );
m_nameProxy.registerGetMethod( this, &RimTextAnnotation::extractNameFromText );
m_nameProxy.uiCapability()->setUiReadOnly( true );
m_nameProxy.xmlCapability()->disableIO();

4
ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotationInView.cpp
View File

@@ -30,8 +30,8 @@ RimTextAnnotationInView::RimTextAnnotationInView()
{
CAF_PDM_InitObject( "TextAnnotationInView", ":/TextAnnotation16x16.png", "", "" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation", "", "", "" );
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Is Active" );
CAF_PDM_InitFieldNoDefault( &m_sourceAnnotation, "SourceAnnotation", "Source Annotation" );
m_isActive.uiCapability()->setUiHidden( true );
m_sourceAnnotation.uiCapability()->setUiHidden( true );

6
ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp
View File

@@ -46,13 +46,13 @@ RimUserDefinedPolylinesAnnotation::RimUserDefinedPolylinesAnnotation()
{
CAF_PDM_InitObject( "PolyLines Annotation", ":/PolylinesFromFile16x16.png", "", "" );
CAF_PDM_InitField( &m_name, "Name", QString( "User Defined Polyline" ), "Name", "", "", "" );
CAF_PDM_InitField( &m_name, "Name", QString( "User Defined Polyline" ), "Name" );
CAF_PDM_InitField( &m_enablePicking, "EnablePicking", false, "", "", "", "" );
CAF_PDM_InitField( &m_enablePicking, "EnablePicking", false, "" );
caf::PdmUiPushButtonEditor::configureEditorForField( &m_enablePicking );
m_enablePicking.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosType::HIDDEN );
CAF_PDM_InitFieldNoDefault( &m_targets, "Targets", "Targets", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_targets, "Targets", "Targets" );
m_targets.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() );
// m_targets.uiCapability()->setUiTreeHidden(true);
m_targets.uiCapability()->setUiTreeChildrenHidden( true );