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

#5101 clang-format: Adjusted penalties

Browse Source 
Use lower absolute values to improve control of behavior
This commit is contained in:
Magne Sjaastad
2020-02-12 11:43:15 +01:00
parent 10f0abc9b5
commit c82df63e10
710 changed files with 3167 additions and 4721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/SsiHubImportCommands/RicWellPathsImportSsihubFeature.cpp
View File

@@ -61,9 +61,9 @@ void RicWellPathsImportSsihubFeature::onActionTriggered( bool isChecked )
QMessageBox msgBox( guiApp->mainWindow() );
msgBox.setIcon( QMessageBox::Question );
QString questionText = QString(
"Import of well paths will be stored as a part of a ResInsight project file. Please "
"save the project to file before importing well paths." );
QString questionText =
QString( "Import of well paths will be stored as a part of a ResInsight project file. Please "
"save the project to file before importing well paths." );
msgBox.setText( questionText );
msgBox.setInformativeText( "Do you want to save the project?" );

4
ApplicationCode/Commands/SsiHubImportCommands/RimOilFieldEntry.h
View File

@@ -43,9 +43,7 @@ public:
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField() override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void initAfterRead() override;
// private:

4
ApplicationCode/Commands/SsiHubImportCommands/RimOilRegionEntry.h
View File

@@ -35,9 +35,7 @@ public:
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField() override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void updateState();

4
ApplicationCode/Commands/SsiHubImportCommands/RimWellPathImport.h
View File

@@ -55,9 +55,7 @@ public:
void updateRegions( const QStringList& regions, const QStringList& fields, const QStringList& edmIds );
void initAfterRead() override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
void updateFieldVisibility();

26
ApplicationCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp
View File

@@ -142,9 +142,7 @@ void RiuWellImportWizard::issueHttpRequestToFile( QString completeUrlText, QStri
{
QMessageBox::information( this,
tr( "HTTP" ),
tr( "Unable to save the file %1: %2." )
.arg( destinationFileName )
.arg( m_file->errorString() ) );
tr( "Unable to save the file %1: %2." ).arg( destinationFileName ).arg( m_file->errorString() ) );
delete m_file;
m_file = nullptr;
return;
@@ -227,8 +225,8 @@ void RiuWellImportWizard::httpFinished()
if ( singleWellPathContent.indexOf( '{' ) > 0 )
{
singleWellPathContent = singleWellPathContent.right( singleWellPathContent.size() -
singleWellPathContent.indexOf( '{' ) );
singleWellPathContent =
singleWellPathContent.right( singleWellPathContent.size() - singleWellPathContent.indexOf( '{' ) );
}
if ( singleWellPathContent[singleWellPathContent.size() - 1] == ']' )
@@ -480,14 +478,13 @@ void RiuWellImportWizard::downloadWells()
}
else
{
wellRequest =
QString(
"/resinsight/projects/%1/wellsInArea?north=%2&south=%3&east=%4&west=%5&utmzone=32N" )
.arg( oilField->edmId )
.arg( QString::number( m_wellPathImportObject->north, 'g', 10 ) )
.arg( QString::number( m_wellPathImportObject->south, 'g', 10 ) )
.arg( QString::number( m_wellPathImportObject->east, 'g', 10 ) )
.arg( QString::number( m_wellPathImportObject->west, 'g', 10 ) );
wellRequest = QString( "/resinsight/projects/%1/"
"wellsInArea?north=%2&south=%3&east=%4&west=%5&utmzone=32N" )
.arg( oilField->edmId )
.arg( QString::number( m_wellPathImportObject->north, 'g', 10 ) )
.arg( QString::number( m_wellPathImportObject->south, 'g', 10 ) )
.arg( QString::number( m_wellPathImportObject->east, 'g', 10 ) )
.arg( QString::number( m_wellPathImportObject->west, 'g', 10 ) );
}
urlToFile.requestUrl = m_webServiceAddress + wellRequest;
@@ -1049,8 +1046,7 @@ void WellSelectionPage::customMenuRequested( const QPoint& pos )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool lessByDescription( const caf::PdmPointer<caf::PdmObjectHandle>& obj1,
const caf::PdmPointer<caf::PdmObjectHandle>& obj2 )
bool lessByDescription( const caf::PdmPointer<caf::PdmObjectHandle>& obj1, const caf::PdmPointer<caf::PdmObjectHandle>& obj2 )
{
caf::PdmUiFieldHandle* uiFieldHandle1 = nullptr;
caf::PdmUiFieldHandle* uiFieldHandle2 = nullptr;