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

Added RimView, and sorted the libs in folders

Browse Source
This commit is contained in:
Jacob Støren 2015-04-29 10:50:25 +02:00
parent a7e38bcda1
commit 4a21bb4a30
12 changed files with 109 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/CMakeLists.txt
View File

@ -250,7 +250,7 @@ set( EXE_FILES
${QRC_FILES_CPP} ${QRC_FILES_CPP}
${WIN_RESOURCE} ${WIN_RESOURCE}
${HEADER_FILES} ${HEADER_FILES}
${REFERENCED_CMAKE_FILES} ${REFERENCED_CMAKE_FILES}
../ResInsightVersion.cmake ../ResInsightVersion.cmake
) )

2
ApplicationCode/FileInterface/CMakeLists_files.cmake
View File

@ -40,4 +40,4 @@ list(APPEND CODE_SOURCE_FILES
${SOURCE_GROUP_SOURCE_FILES} ${SOURCE_GROUP_SOURCE_FILES}
) )
source_group( "FileInterface" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ) source_group( "FileInterface" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )

2
ApplicationCode/GeoMech/GeoMechVisualization/CMakeLists_files.cmake
View File

@ -24,4 +24,4 @@ list(APPEND CODE_SOURCE_FILES
${SOURCE_GROUP_SOURCE_FILES} ${SOURCE_GROUP_SOURCE_FILES}
) )
source_group( "GeoMechViz" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ) source_group( "GeoMechViz" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )

2
ApplicationCode/ModelVisualization/CMakeLists_files.cmake
View File

@ -66,4 +66,4 @@ list(APPEND CODE_SOURCE_FILES
${SOURCE_GROUP_SOURCE_FILES} ${SOURCE_GROUP_SOURCE_FILES}
) )
source_group( "ModelVisualization" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ) source_group( "ModelVisualization" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )

5
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@ -55,6 +55,8 @@ ${CEE_CURRENT_LIST_DIR}RimGeoMechModels.h
${CEE_CURRENT_LIST_DIR}RimGeoMechCase.h ${CEE_CURRENT_LIST_DIR}RimGeoMechCase.h
${CEE_CURRENT_LIST_DIR}RimGeoMechView.h ${CEE_CURRENT_LIST_DIR}RimGeoMechView.h
${CEE_CURRENT_LIST_DIR}RimGeoMechResultSlot.h ${CEE_CURRENT_LIST_DIR}RimGeoMechResultSlot.h
${CEE_CURRENT_LIST_DIR}RimView.h
) )
set (SOURCE_GROUP_SOURCE_FILES set (SOURCE_GROUP_SOURCE_FILES
@ -108,6 +110,7 @@ ${CEE_CURRENT_LIST_DIR}RimGeoMechModels.cpp
${CEE_CURRENT_LIST_DIR}RimGeoMechCase.cpp ${CEE_CURRENT_LIST_DIR}RimGeoMechCase.cpp
${CEE_CURRENT_LIST_DIR}RimGeoMechView.cpp ${CEE_CURRENT_LIST_DIR}RimGeoMechView.cpp
${CEE_CURRENT_LIST_DIR}RimGeoMechResultSlot.cpp ${CEE_CURRENT_LIST_DIR}RimGeoMechResultSlot.cpp
${CEE_CURRENT_LIST_DIR}RimView.cpp
) )
list(APPEND CODE_HEADER_FILES list(APPEND CODE_HEADER_FILES
@ -118,4 +121,4 @@ list(APPEND CODE_SOURCE_FILES
${SOURCE_GROUP_SOURCE_FILES} ${SOURCE_GROUP_SOURCE_FILES}
) )
source_group( "ProjectDataModel" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ) source_group( "ProjectDataModel" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )

2
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@ -253,6 +253,8 @@ void RimGeoMechView::createDisplayModelAndRedraw()
m_geoMechVizModel->setCellVisibility(femPartIdx, elmVisibility.p()); m_geoMechVizModel->setCellVisibility(femPartIdx, elmVisibility.p());
} }
m_geoMechVizModel->updateCellColor(cvf::Color4f(cvf::Color3f::ORANGE));
m_geoMechVizModel->appendGridPartsToModel(cvfModel.p()); m_geoMechVizModel->appendGridPartsToModel(cvfModel.p());
cvf::ref<cvf::Scene> scene = new cvf::Scene; cvf::ref<cvf::Scene> scene = new cvf::Scene;

20
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@ -62,26 +62,6 @@
#include <limits.h> #include <limits.h>
CAF_PDM_SOURCE_INIT(RimView, "GenericView");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView::RimView(void)
{
CAF_PDM_InitObject("Generic View", ":/ReservoirView.png", "", "");
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView::~RimView(void)
{
}
namespace caf { namespace caf {
template<> template<>

14
ApplicationCode/ProjectDataModel/RimReservoirView.h
View File

@ -69,20 +69,6 @@ enum PartRenderMaskEnum
faultBit = 0x00000004, faultBit = 0x00000004,
meshFaultBit = 0x00000008, meshFaultBit = 0x00000008,
}; };
//==================================================================================================
///
///
//==================================================================================================
class RimView : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimView(void);
virtual ~RimView(void);
};
//================================================================================================== //==================================================================================================
/// ///

24
ApplicationCode/ProjectDataModel/RimView.cpp Normal file
View File

@ -0,0 +1,24 @@
#include "RimView.h"
#include "cafPdmObjectFactory.h"
CAF_PDM_SOURCE_INIT(RimView, "GenericView");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView::RimView(void)
{
CAF_PDM_InitObject("Generic View", ":/ReservoirView.png", "", "");
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimView::~RimView(void)
{
}

39
ApplicationCode/ProjectDataModel/RimView.h Normal file
View File

@ -0,0 +1,39 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2015- Statoil ASA
// Copyright (C) 2015- 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 "cafPdmObject.h"
//==================================================================================================
///
///
//==================================================================================================
class RimView : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimView(void);
virtual ~RimView(void);
};

2
ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
View File

@ -74,4 +74,4 @@ list(APPEND CODE_SOURCE_FILES
${SOURCE_GROUP_SOURCE_FILES} ${SOURCE_GROUP_SOURCE_FILES}
) )
source_group( "ReservoirDataModel" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ) source_group( "ReservoirDataModel" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )

38
CMakeLists.txt
View File

@ -5,6 +5,7 @@ project (ResInsight)
set (VIZ_MODULES_FOLDER_NAME Fwk/VizFwk) set (VIZ_MODULES_FOLDER_NAME Fwk/VizFwk)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
################################################################################ ################################################################################
@ -98,6 +99,14 @@ else (ERT_EXTERNAL)
) )
endif (ERT_EXTERNAL) endif (ERT_EXTERNAL)
set_property(TARGET
ecl
ecl_lfs
ecl_well
ert_geometry
ert_util
PROPERTY FOLDER "ERT"
)
################################################################################ ################################################################################
# Qt # Qt
@ -156,6 +165,15 @@ include_directories(
${LibGuiQt_SOURCE_DIR} ${LibGuiQt_SOURCE_DIR}
) )
set_property(TARGET
LibCore
LibGeometry
LibGuiQt
LibRender
LibViewing
PROPERTY FOLDER "VizFwk"
)
################################################################################ ################################################################################
# Application Framework # Application Framework
@ -177,6 +195,17 @@ include_directories(
${cafViewer_SOURCE_DIR} ${cafViewer_SOURCE_DIR}
) )
set_property(TARGET
cafAnimControl
cafPdmCvf
cafProjectDataModel
cafUserInterface
cafViewer
CommonCode
PROPERTY FOLDER "AppFwk"
)
################################################################################ ################################################################################
# Installation settings # Installation settings
################################################################################ ################################################################################
@ -202,8 +231,6 @@ endif (RESINSIGHT_PRIVATE_INSTALL)
add_subdirectory(ApplicationCode) add_subdirectory(ApplicationCode)
add_subdirectory(OctavePlugin) add_subdirectory(OctavePlugin)
#
################################################################################ ################################################################################
# Unit tests # Unit tests
################################################################################ ################################################################################
@ -211,7 +238,12 @@ add_subdirectory(ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests
add_subdirectory(ApplicationCode/FileInterface/FileInterface_UnitTests) add_subdirectory(ApplicationCode/FileInterface/FileInterface_UnitTests)
add_subdirectory(ApplicationCode/ModelVisualization/ModelVisualization_UnitTests) add_subdirectory(ApplicationCode/ModelVisualization/ModelVisualization_UnitTests)
set_property(TARGET
ModelVisualization_UnitTests
FileInterface_UnitTests
RigReservoirDataModel_UnitTests
PROPERTY FOLDER "UnitTests"
)
################################################################################ ################################################################################