OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2024-12-29 10:21:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move faults into subfolder. Remove obsolete code.

Browse Source
This commit is contained in:
jonjenssen 2021-03-11 00:57:01 +01:00 committed by jonjenssen
parent 4099662cbc
commit aa8c630c98
11 changed files with 22 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/CMakeLists.txt
View File

@ -97,6 +97,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/CorrelationPlots
${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Annotations
${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Completions
${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Faults
${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/Flow
${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/GridCrossPlots
${CMAKE_CURRENT_SOURCE_DIR}/ProjectDataModel/GeoMech
@ -158,6 +159,7 @@ list(
ProjectDataModel/CMakeLists_files.cmake
ProjectDataModel/AnalysisPlots/CMakeLists_files.cmake
ProjectDataModel/CorrelationPlots/CMakeLists_files.cmake
ProjectDataModel/Faults/CMakeLists_files.cmake
ProjectDataModel/GeoMech/CMakeLists_files.cmake
ProjectDataModel/GridCrossPlots/CMakeLists_files.cmake
ProjectDataModel/GridCrossPlots/CellFilters/CMakeLists_files.cmake

8
ApplicationLibCode/ProjectDataModel/CMakeLists_files.cmake
View File

@ -45,15 +45,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RimEclipseStatisticsCaseEvaluator.h
${CMAKE_CURRENT_LIST_DIR}/RimMimeData.h
${CMAKE_CURRENT_LIST_DIR}/RimCommandObject.h
${CMAKE_CURRENT_LIST_DIR}/RimTools.h
${CMAKE_CURRENT_LIST_DIR}/RimFaultInView.h
${CMAKE_CURRENT_LIST_DIR}/RimFaultInViewCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimFormationNames.h
${CMAKE_CURRENT_LIST_DIR}/RimFormationNamesCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimMockModelSettings.h
${CMAKE_CURRENT_LIST_DIR}/RimTernaryLegendConfig.h
${CMAKE_CURRENT_LIST_DIR}/RimEclipseFaultColors.h
${CMAKE_CURRENT_LIST_DIR}/RimNoCommonAreaNNC.h
${CMAKE_CURRENT_LIST_DIR}/RimNoCommonAreaNncCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimViewWindow.h
${CMAKE_CURRENT_LIST_DIR}/Rim3dView.h
${CMAKE_CURRENT_LIST_DIR}/RimGridView.h
@ -204,15 +200,11 @@ ${CMAKE_CURRENT_LIST_DIR}/RimEclipseStatisticsCaseEvaluator.cpp
${CMAKE_CURRENT_LIST_DIR}/RimMimeData.cpp
${CMAKE_CURRENT_LIST_DIR}/RimCommandObject.cpp
${CMAKE_CURRENT_LIST_DIR}/RimTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RimFaultInView.cpp
${CMAKE_CURRENT_LIST_DIR}/RimFaultInViewCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimFormationNames.cpp
${CMAKE_CURRENT_LIST_DIR}/RimFormationNamesCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimMockModelSettings.cpp
${CMAKE_CURRENT_LIST_DIR}/RimTernaryLegendConfig.cpp
${CMAKE_CURRENT_LIST_DIR}/RimEclipseFaultColors.cpp
${CMAKE_CURRENT_LIST_DIR}/RimNoCommonAreaNNC.cpp
${CMAKE_CURRENT_LIST_DIR}/RimNoCommonAreaNncCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimMudWeightWindowParameters.cpp
${CMAKE_CURRENT_LIST_DIR}/RimViewWindow.cpp
${CMAKE_CURRENT_LIST_DIR}/Rim3dView.cpp

20
ApplicationLibCode/ProjectDataModel/Faults/CMakeLists_files.cmake Normal file
View File

@ -0,0 +1,20 @@
set (SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RimFaultInView.h
${CMAKE_CURRENT_LIST_DIR}/RimFaultInViewCollection.h
)
set (SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RimFaultInView.cpp
${CMAKE_CURRENT_LIST_DIR}/RimFaultInViewCollection.cpp
)
list(APPEND CODE_HEADER_FILES
${SOURCE_GROUP_HEADER_FILES}
)
list(APPEND CODE_SOURCE_FILES
${SOURCE_GROUP_SOURCE_FILES}
)
source_group( "ProjectDataModel\\Faults" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake )

0
ApplicationLibCode/ProjectDataModel/RimFaultInView.cpp → ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.cpp
View File

0
ApplicationLibCode/ProjectDataModel/RimFaultInView.h → ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.h
View File

2
ApplicationLibCode/ProjectDataModel/RimFaultInViewCollection.cpp → ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp
View File

@ -31,8 +31,6 @@
#include "RimEclipseView.h"
#include "RimFaultInView.h"
#include "RimIntersectionCollection.h"
#include "RimNoCommonAreaNNC.h"
#include "RimNoCommonAreaNncCollection.h"
#include "RiuMainWindow.h"

1
ApplicationLibCode/ProjectDataModel/RimFaultInViewCollection.h → ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.h
View File

@ -33,7 +33,6 @@
class RimEclipseView;
class RimFaultInView;
class RimNoCommonAreaNncCollection;
//==================================================================================================
///

41
ApplicationLibCode/ProjectDataModel/RimNoCommonAreaNNC.cpp
View File

@ -1,41 +0,0 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) Statoil ASA
// Copyright (C) Ceetron Solutions AS
//
// 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>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimNoCommonAreaNNC.h"
CAF_PDM_SOURCE_INIT( RimNoCommonAreaNNC, "NoCommonAreaNNC" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimNoCommonAreaNNC::RimNoCommonAreaNNC()
{
CAF_PDM_InitObject( "RimNoCommonAreaNNC", "", "", "" );
CAF_PDM_InitFieldNoDefault( &name, "Name", "Name", "", "", "" );
name.uiCapability()->setUiReadOnly( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimNoCommonAreaNNC::userDescriptionField()
{
return &name;
}

40
ApplicationLibCode/ProjectDataModel/RimNoCommonAreaNNC.h
View File

@ -1,40 +0,0 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) Statoil ASA
// Copyright (C) Ceetron Solutions AS
//
// 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>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "cafPdmPointer.h"
//==================================================================================================
///
///
//==================================================================================================
class RimNoCommonAreaNNC : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimNoCommonAreaNNC();
caf::PdmField<QString> name;
caf::PdmFieldHandle* userDescriptionField() override;
};

64
ApplicationLibCode/ProjectDataModel/RimNoCommonAreaNncCollection.cpp
View File

@ -1,64 +0,0 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) Statoil ASA
// Copyright (C) Ceetron Solutions AS
//
// 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>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimNoCommonAreaNncCollection.h"
#include "RimNoCommonAreaNNC.h"
CAF_PDM_SOURCE_INIT( RimNoCommonAreaNncCollection, "RimNoCommonAreaNncCollection" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimNoCommonAreaNncCollection::RimNoCommonAreaNncCollection()
{
CAF_PDM_InitObject( "RimNoCommonAreaNncCollection", "", "", "" );
CAF_PDM_InitField( &name, "UserDescription", QString( "No Common Area Nncs" ), "Name", "", "", "" );
name.uiCapability()->setUiHidden( true );
CAF_PDM_InitFieldNoDefault( &noCommonAreaNncs, "NoCommonAreaNncs", "NoCommonAreaNncs", "", "", "" );
noCommonAreaNncs.uiCapability()->setUiHidden( true );
noCommonAreaNncs.xmlCapability()->disableIO();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimNoCommonAreaNncCollection::~RimNoCommonAreaNncCollection()
{
noCommonAreaNncs.deleteAllChildObjects();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimNoCommonAreaNncCollection::userDescriptionField()
{
return &name;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimNoCommonAreaNncCollection::updateName()
{
name = QString( "NNCs With No Common Area (%1)" ).arg( noCommonAreaNncs().size() );
}

47
ApplicationLibCode/ProjectDataModel/RimNoCommonAreaNncCollection.h
View File

@ -1,47 +0,0 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) Statoil ASA
// Copyright (C) Ceetron Solutions AS
//
// 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>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "cafPdmChildArrayField.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "cafPdmPointer.h"
class RimNoCommonAreaNNC;
//==================================================================================================
/// Placeholder class used to create a folder in the tree view.
/// TODO: Remove this class when new tree view is integrated
//==================================================================================================
class RimNoCommonAreaNncCollection : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimNoCommonAreaNncCollection();
~RimNoCommonAreaNncCollection() override;
void updateName();
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmField<QString> name;
caf::PdmChildArrayField<RimNoCommonAreaNNC*> noCommonAreaNncs;
};