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

#4683 clang-format on all files in ApplicationCode

Browse Source
This commit is contained in:
Magne Sjaastad
2019-09-06 10:40:57 +02:00
parent 3a317504bb
commit fe9e567825
2092 changed files with 117952 additions and 111846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
ApplicationCode/ProjectDataModel/Annotations/RimAnnotationLineAppearance.cpp
View File

@@ -1,17 +1,17 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2018- Equinor ASA
//
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
@@ -31,64 +31,63 @@
class ThicknessValidator : public QValidator
{
public:
State validate(QString &input, int &pos) const override
State validate( QString& input, int& pos ) const override
{
if (input.isEmpty()) return State::Intermediate;
if ( input.isEmpty() ) return State::Intermediate;
int val = RiaStdStringTools::toInt(input.toStdString());
if (val > 0 && val < 8) return State::Acceptable;
else return State::Invalid;
int val = RiaStdStringTools::toInt( input.toStdString() );
if ( val > 0 && val < 8 )
return State::Acceptable;
else
return State::Invalid;
}
};
namespace caf
{
template<>
template <>
void RimAnnotationLineAppearance::LineStyle::setUp()
{
addItem(RimAnnotationLineAppearance::STYLE_SOLID, "STYLE_SOLID", "Solid");
addItem(RimAnnotationLineAppearance::STYLE_DASH, "STYLE_DASH", "Dashes");
addItem( RimAnnotationLineAppearance::STYLE_SOLID, "STYLE_SOLID", "Solid" );
addItem( RimAnnotationLineAppearance::STYLE_DASH, "STYLE_DASH", "Dashes" );
setDefault(RimAnnotationLineAppearance::STYLE_SOLID);
}
setDefault( RimAnnotationLineAppearance::STYLE_SOLID );
}
} // namespace caf
CAF_PDM_SOURCE_INIT(RimAnnotationLineAppearance, "RimAnnotationLineAppearance");
CAF_PDM_SOURCE_INIT( RimAnnotationLineAppearance, "RimAnnotationLineAppearance" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimAnnotationLineAppearance::RimAnnotationLineAppearance()
{
CAF_PDM_InitObject("AnnotationLineAppearance", ":/WellCollection.png", "", "");
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", "", "", "");
m_style.uiCapability()->setUiHidden(true);
CAF_PDM_InitField( &m_style, "Style", LineStyle(), "Style", "", "", "" );
m_style.uiCapability()->setUiHidden( true );
m_style.xmlCapability()->disableIO();
m_lineFieldsHidden.uiCapability()->setUiHidden(true);
m_lineFieldsHidden.uiCapability()->setUiHidden( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimAnnotationLineAppearance::setLineFieldsHidden(bool hidden)
void RimAnnotationLineAppearance::setLineFieldsHidden( bool hidden )
{
m_lineFieldsHidden = hidden;
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
void RimAnnotationLineAppearance::setColor(const cvf::Color3f& newColor)
void RimAnnotationLineAppearance::setColor( const cvf::Color3f& newColor )
{
m_color = newColor;
}
@@ -120,67 +119,67 @@ int RimAnnotationLineAppearance::thickness() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimAnnotationLineAppearance::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RimAnnotationLineAppearance::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
if (!m_lineFieldsHidden())
if ( !m_lineFieldsHidden() )
{
uiOrdering.add(&m_color);
uiOrdering.add(&m_style);
uiOrdering.add(&m_thickness);
uiOrdering.add( &m_color );
uiOrdering.add( &m_style );
uiOrdering.add( &m_thickness );
}
uiOrdering.skipRemainingFields(true);
uiOrdering.skipRemainingFields( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimAnnotationLineAppearance::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue)
void RimAnnotationLineAppearance::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue )
{
RimAnnotationCollection* annColl = nullptr;
this->firstAncestorOrThisOfTypeAsserted(annColl);
annColl->scheduleRedrawOfRelevantViews();
this->firstAncestorOrThisOfTypeAsserted( annColl );
annColl->scheduleRedrawOfRelevantViews();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimAnnotationLineAppearance::defineEditorAttribute(const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute)
void RimAnnotationLineAppearance::defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute )
{
if (field == &m_thickness)
if ( field == &m_thickness )
{
auto myAttr = dynamic_cast<caf::PdmUiLineEditorAttribute*>(attribute);
if (myAttr)
auto myAttr = dynamic_cast<caf::PdmUiLineEditorAttribute*>( attribute );
if ( myAttr )
{
myAttr->validator = new ThicknessValidator();
}
}
}
CAF_PDM_SOURCE_INIT(RimPolylineAppearance, "RimPolylineAppearance");
CAF_PDM_SOURCE_INIT( RimPolylineAppearance, "RimPolylineAppearance" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimPolylineAppearance::RimPolylineAppearance()
{
CAF_PDM_InitObject("PolylineAppearance", ":/WellCollection.png", "", "");
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);
m_sphereFieldsHidden.uiCapability()->setUiHidden( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimPolylineAppearance::setSphereFieldsHidden(bool hidden)
void RimPolylineAppearance::setSphereFieldsHidden( bool hidden )
{
m_sphereFieldsHidden = hidden;
}
@@ -188,7 +187,7 @@ void RimPolylineAppearance::setSphereFieldsHidden(bool hidden)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimPolylineAppearance::setSphereColor(const cvf::Color3f& color)
void RimPolylineAppearance::setSphereColor( const cvf::Color3f& color )
{
m_sphereColor = color;
}
@@ -212,25 +211,25 @@ double RimPolylineAppearance::sphereRadiusFactor() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimPolylineAppearance::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RimPolylineAppearance::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
RimAnnotationLineAppearance::defineUiOrdering(uiConfigName, uiOrdering);
RimAnnotationLineAppearance::defineUiOrdering( uiConfigName, uiOrdering );
if (!m_sphereFieldsHidden)
if ( !m_sphereFieldsHidden )
{
uiOrdering.add(&m_sphereColor);
uiOrdering.add(&m_sphereRadiusFactor);
uiOrdering.add( &m_sphereColor );
uiOrdering.add( &m_sphereRadiusFactor );
}
uiOrdering.skipRemainingFields(true);
uiOrdering.skipRemainingFields( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimPolylineAppearance::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue)
void RimPolylineAppearance::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue )
{
RimAnnotationLineAppearance::fieldChangedByUi(changedField, oldValue, newValue);
RimAnnotationLineAppearance::fieldChangedByUi( changedField, oldValue, newValue );
}