From 4a21bb4a30e0665cac6b706520c1ddf765ea7753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Wed, 29 Apr 2015 10:50:25 +0200 Subject: [PATCH] Added RimView, and sorted the libs in folders --- ApplicationCode/CMakeLists.txt | 2 +- .../FileInterface/CMakeLists_files.cmake | 2 +- .../CMakeLists_files.cmake | 2 +- .../ModelVisualization/CMakeLists_files.cmake | 2 +- .../ProjectDataModel/CMakeLists_files.cmake | 5 ++- .../ProjectDataModel/RimGeoMechView.cpp | 2 + .../ProjectDataModel/RimReservoirView.cpp | 20 ---------- .../ProjectDataModel/RimReservoirView.h | 14 ------- ApplicationCode/ProjectDataModel/RimView.cpp | 24 ++++++++++++ ApplicationCode/ProjectDataModel/RimView.h | 39 +++++++++++++++++++ .../ReservoirDataModel/CMakeLists_files.cmake | 2 +- CMakeLists.txt | 38 ++++++++++++++++-- 12 files changed, 109 insertions(+), 43 deletions(-) create mode 100644 ApplicationCode/ProjectDataModel/RimView.cpp create mode 100644 ApplicationCode/ProjectDataModel/RimView.h diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt index 4aeec72acf..e681b42cdf 100644 --- a/ApplicationCode/CMakeLists.txt +++ b/ApplicationCode/CMakeLists.txt @@ -250,7 +250,7 @@ set( EXE_FILES ${QRC_FILES_CPP} ${WIN_RESOURCE} ${HEADER_FILES} - ${REFERENCED_CMAKE_FILES} + ${REFERENCED_CMAKE_FILES} ../ResInsightVersion.cmake ) diff --git a/ApplicationCode/FileInterface/CMakeLists_files.cmake b/ApplicationCode/FileInterface/CMakeLists_files.cmake index 34a6ec93be..2e7a6a4c61 100644 --- a/ApplicationCode/FileInterface/CMakeLists_files.cmake +++ b/ApplicationCode/FileInterface/CMakeLists_files.cmake @@ -40,4 +40,4 @@ list(APPEND CODE_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 ) diff --git a/ApplicationCode/GeoMech/GeoMechVisualization/CMakeLists_files.cmake b/ApplicationCode/GeoMech/GeoMechVisualization/CMakeLists_files.cmake index 5d23033f58..c7db9a8912 100644 --- a/ApplicationCode/GeoMech/GeoMechVisualization/CMakeLists_files.cmake +++ b/ApplicationCode/GeoMech/GeoMechVisualization/CMakeLists_files.cmake @@ -24,4 +24,4 @@ list(APPEND CODE_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 ) diff --git a/ApplicationCode/ModelVisualization/CMakeLists_files.cmake b/ApplicationCode/ModelVisualization/CMakeLists_files.cmake index fec6bd6869..cf1481e3fe 100644 --- a/ApplicationCode/ModelVisualization/CMakeLists_files.cmake +++ b/ApplicationCode/ModelVisualization/CMakeLists_files.cmake @@ -66,4 +66,4 @@ list(APPEND CODE_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 ) diff --git a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake index 99b1bf6f4b..a70b0d862a 100644 --- a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake +++ b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake @@ -55,6 +55,8 @@ ${CEE_CURRENT_LIST_DIR}RimGeoMechModels.h ${CEE_CURRENT_LIST_DIR}RimGeoMechCase.h ${CEE_CURRENT_LIST_DIR}RimGeoMechView.h ${CEE_CURRENT_LIST_DIR}RimGeoMechResultSlot.h +${CEE_CURRENT_LIST_DIR}RimView.h + ) 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}RimGeoMechView.cpp ${CEE_CURRENT_LIST_DIR}RimGeoMechResultSlot.cpp +${CEE_CURRENT_LIST_DIR}RimView.cpp ) list(APPEND CODE_HEADER_FILES @@ -118,4 +121,4 @@ list(APPEND CODE_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 ) diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp index f134f0e68a..3fb6747c37 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp +++ b/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp @@ -253,6 +253,8 @@ void RimGeoMechView::createDisplayModelAndRedraw() m_geoMechVizModel->setCellVisibility(femPartIdx, elmVisibility.p()); } + m_geoMechVizModel->updateCellColor(cvf::Color4f(cvf::Color3f::ORANGE)); + m_geoMechVizModel->appendGridPartsToModel(cvfModel.p()); cvf::ref scene = new cvf::Scene; diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp index 99b085cf91..a38575190c 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp +++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp @@ -62,26 +62,6 @@ #include -CAF_PDM_SOURCE_INIT(RimView, "GenericView"); - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimView::RimView(void) -{ - CAF_PDM_InitObject("Generic View", ":/ReservoirView.png", "", ""); - -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimView::~RimView(void) -{ - -} - - namespace caf { template<> diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.h b/ApplicationCode/ProjectDataModel/RimReservoirView.h index 773c24cac6..eea83a88cb 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirView.h +++ b/ApplicationCode/ProjectDataModel/RimReservoirView.h @@ -69,20 +69,6 @@ enum PartRenderMaskEnum faultBit = 0x00000004, meshFaultBit = 0x00000008, }; -//================================================================================================== -/// -/// -//================================================================================================== -class RimView : public caf::PdmObject -{ - CAF_PDM_HEADER_INIT; -public: - RimView(void); - virtual ~RimView(void); - - -}; - //================================================================================================== /// diff --git a/ApplicationCode/ProjectDataModel/RimView.cpp b/ApplicationCode/ProjectDataModel/RimView.cpp new file mode 100644 index 0000000000..3f3b4ffba7 --- /dev/null +++ b/ApplicationCode/ProjectDataModel/RimView.cpp @@ -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) +{ + +} + + + diff --git a/ApplicationCode/ProjectDataModel/RimView.h b/ApplicationCode/ProjectDataModel/RimView.h new file mode 100644 index 0000000000..d448f26d10 --- /dev/null +++ b/ApplicationCode/ProjectDataModel/RimView.h @@ -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 +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafPdmObject.h" + +//================================================================================================== +/// +/// +//================================================================================================== +class RimView : public caf::PdmObject +{ + CAF_PDM_HEADER_INIT; +public: + RimView(void); + virtual ~RimView(void); + + +}; + + + diff --git a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake index 06835f0e32..63bb007358 100644 --- a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake +++ b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake @@ -74,4 +74,4 @@ list(APPEND CODE_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 ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 836e258ab3..b51a18a868 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ project (ResInsight) set (VIZ_MODULES_FOLDER_NAME Fwk/VizFwk) +set_property(GLOBAL PROPERTY USE_FOLDERS ON) ################################################################################ @@ -98,6 +99,14 @@ else (ERT_EXTERNAL) ) endif (ERT_EXTERNAL) +set_property(TARGET + ecl + ecl_lfs + ecl_well + ert_geometry + ert_util + PROPERTY FOLDER "ERT" +) ################################################################################ # Qt @@ -156,6 +165,15 @@ include_directories( ${LibGuiQt_SOURCE_DIR} ) +set_property(TARGET + LibCore + LibGeometry + LibGuiQt + LibRender + LibViewing + PROPERTY FOLDER "VizFwk" +) + ################################################################################ # Application Framework @@ -177,6 +195,17 @@ include_directories( ${cafViewer_SOURCE_DIR} ) +set_property(TARGET + cafAnimControl + cafPdmCvf + cafProjectDataModel + cafUserInterface + cafViewer + CommonCode + PROPERTY FOLDER "AppFwk" +) + + ################################################################################ # Installation settings ################################################################################ @@ -202,8 +231,6 @@ endif (RESINSIGHT_PRIVATE_INSTALL) add_subdirectory(ApplicationCode) add_subdirectory(OctavePlugin) -# - ################################################################################ # Unit tests ################################################################################ @@ -211,7 +238,12 @@ add_subdirectory(ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests add_subdirectory(ApplicationCode/FileInterface/FileInterface_UnitTests) add_subdirectory(ApplicationCode/ModelVisualization/ModelVisualization_UnitTests) - +set_property(TARGET + ModelVisualization_UnitTests + FileInterface_UnitTests + RigReservoirDataModel_UnitTests + PROPERTY FOLDER "UnitTests" +) ################################################################################