diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt index 4a854557d5..472c5c45e1 100644 --- a/ApplicationCode/CMakeLists.txt +++ b/ApplicationCode/CMakeLists.txt @@ -54,44 +54,19 @@ list( APPEND CPP_SOURCES SocketInterface/RiaSocketServer.cpp ) -list( APPEND CPP_SOURCES - ProjectDataModel/RimCaseCollection.cpp - ProjectDataModel/RimCellFilter.cpp - ProjectDataModel/RimCellPropertyFilter.cpp - ProjectDataModel/RimCellPropertyFilterCollection.cpp - ProjectDataModel/RimCellRangeFilter.cpp - ProjectDataModel/RimCellRangeFilterCollection.cpp - ProjectDataModel/RimDefines.cpp - ProjectDataModel/RimLegendConfig.cpp - ProjectDataModel/RimProject.cpp - ProjectDataModel/RimCase.cpp - ProjectDataModel/RimIdenticalGridCaseGroup.cpp - ProjectDataModel/RimInputProperty.cpp - ProjectDataModel/RimInputPropertyCollection.cpp - ProjectDataModel/RimInputCase.cpp - ProjectDataModel/RimResultCase.cpp - ProjectDataModel/RimReservoirView.cpp - ProjectDataModel/RimResultDefinition.cpp - ProjectDataModel/RimResultSlot.cpp - ProjectDataModel/RimCellEdgeResultSlot.cpp - ProjectDataModel/RimWell.cpp - ProjectDataModel/RimWellCollection.cpp - ProjectDataModel/RimScriptCollection.cpp - ProjectDataModel/RimStatisticsCase.cpp - ProjectDataModel/RimStatisticsCaseCollection.cpp - ProjectDataModel/RimCalcScript.cpp - ProjectDataModel/RimExportInputPropertySettings.cpp - ProjectDataModel/RimBinaryExportSettings.cpp - ProjectDataModel/Rim3dOverlayInfoConfig.cpp - ProjectDataModel/RimUiTreeModelPdm.cpp - ProjectDataModel/RimUiTreeView.cpp - ProjectDataModel/RimReservoirCellResultsCacher.cpp - ProjectDataModel/RimStatisticsCaseEvaluator.cpp + +list( APPEND REFERENCED_CMAKE_FILES + ReservoirDataModel/CMakeLists_files.cmake + FileInterface/CMakeLists_files.cmake + ProjectDataModel/CMakeLists_files.cmake ) -# Populate the filenames into variable lists -include ("ReservoirDataModel/CMakeLists_files.cmake") -include ("FileInterface/CMakeLists_files.cmake") +# Include source file lists from *.cmake files +foreach (referencedfile ${REFERENCED_CMAKE_FILES}) + include (${referencedfile}) +endforeach (referencedfile) + + list( APPEND CPP_SOURCES ${CODE_SOURCE_FILES} ) @@ -114,6 +89,7 @@ set ( QT_MOC_HEADERS ProjectDataModel/RimUiTreeModelPdm.h ProjectDataModel/RimUiTreeView.h + ProjectDataModel/RimMimeData.h UserInterface/RiuMainWindow.h UserInterface/RiuPreferencesDialog.h @@ -214,6 +190,7 @@ add_executable(ResInsight ${QRC_FILES_CPP} ${WIN_RESOURCE} ${HEADER_FILES} + ${REFERENCED_CMAKE_FILES} ) diff --git a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake new file mode 100644 index 0000000000..9f6d3a9ac2 --- /dev/null +++ b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake @@ -0,0 +1,80 @@ + +# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly +if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") + set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) +endif() + + +list(APPEND CODE_HEADER_FILES +${CEE_CURRENT_LIST_DIR}RimCaseCollection.h +${CEE_CURRENT_LIST_DIR}RimCellFilter.h +${CEE_CURRENT_LIST_DIR}RimCellPropertyFilter.h +${CEE_CURRENT_LIST_DIR}RimCellPropertyFilterCollection.h +${CEE_CURRENT_LIST_DIR}RimCellRangeFilter.h +${CEE_CURRENT_LIST_DIR}RimCellRangeFilterCollection.h +${CEE_CURRENT_LIST_DIR}RimDefines.h +${CEE_CURRENT_LIST_DIR}RimLegendConfig.h +${CEE_CURRENT_LIST_DIR}RimProject.h +${CEE_CURRENT_LIST_DIR}RimCase.h +${CEE_CURRENT_LIST_DIR}RimIdenticalGridCaseGroup.h +${CEE_CURRENT_LIST_DIR}RimInputProperty.h +${CEE_CURRENT_LIST_DIR}RimInputPropertyCollection.h +${CEE_CURRENT_LIST_DIR}RimInputCase.h +${CEE_CURRENT_LIST_DIR}RimResultCase.h +${CEE_CURRENT_LIST_DIR}RimReservoirView.h +${CEE_CURRENT_LIST_DIR}RimResultDefinition.h +${CEE_CURRENT_LIST_DIR}RimResultSlot.h +${CEE_CURRENT_LIST_DIR}RimCellEdgeResultSlot.h +${CEE_CURRENT_LIST_DIR}RimWell.h +${CEE_CURRENT_LIST_DIR}RimWellCollection.h +${CEE_CURRENT_LIST_DIR}RimScriptCollection.h +${CEE_CURRENT_LIST_DIR}RimStatisticsCase.h +${CEE_CURRENT_LIST_DIR}RimStatisticsCaseCollection.h +${CEE_CURRENT_LIST_DIR}RimCalcScript.h +${CEE_CURRENT_LIST_DIR}RimExportInputPropertySettings.h +${CEE_CURRENT_LIST_DIR}RimBinaryExportSettings.h +${CEE_CURRENT_LIST_DIR}Rim3dOverlayInfoConfig.h +${CEE_CURRENT_LIST_DIR}RimUiTreeModelPdm.h +${CEE_CURRENT_LIST_DIR}RimUiTreeView.h +${CEE_CURRENT_LIST_DIR}RimReservoirCellResultsCacher.h +${CEE_CURRENT_LIST_DIR}RimStatisticsCaseEvaluator.h +${CEE_CURRENT_LIST_DIR}RimMimeData.h +) + +list(APPEND CODE_SOURCE_FILES +${CEE_CURRENT_LIST_DIR}RimCaseCollection.cpp +${CEE_CURRENT_LIST_DIR}RimCellFilter.cpp +${CEE_CURRENT_LIST_DIR}RimCellPropertyFilter.cpp +${CEE_CURRENT_LIST_DIR}RimCellPropertyFilterCollection.cpp +${CEE_CURRENT_LIST_DIR}RimCellRangeFilter.cpp +${CEE_CURRENT_LIST_DIR}RimCellRangeFilterCollection.cpp +${CEE_CURRENT_LIST_DIR}RimDefines.cpp +${CEE_CURRENT_LIST_DIR}RimLegendConfig.cpp +${CEE_CURRENT_LIST_DIR}RimProject.cpp +${CEE_CURRENT_LIST_DIR}RimCase.cpp +${CEE_CURRENT_LIST_DIR}RimIdenticalGridCaseGroup.cpp +${CEE_CURRENT_LIST_DIR}RimInputProperty.cpp +${CEE_CURRENT_LIST_DIR}RimInputPropertyCollection.cpp +${CEE_CURRENT_LIST_DIR}RimInputCase.cpp +${CEE_CURRENT_LIST_DIR}RimResultCase.cpp +${CEE_CURRENT_LIST_DIR}RimReservoirView.cpp +${CEE_CURRENT_LIST_DIR}RimResultDefinition.cpp +${CEE_CURRENT_LIST_DIR}RimResultSlot.cpp +${CEE_CURRENT_LIST_DIR}RimCellEdgeResultSlot.cpp +${CEE_CURRENT_LIST_DIR}RimWell.cpp +${CEE_CURRENT_LIST_DIR}RimWellCollection.cpp +${CEE_CURRENT_LIST_DIR}RimScriptCollection.cpp +${CEE_CURRENT_LIST_DIR}RimStatisticsCase.cpp +${CEE_CURRENT_LIST_DIR}RimStatisticsCaseCollection.cpp +${CEE_CURRENT_LIST_DIR}RimCalcScript.cpp +${CEE_CURRENT_LIST_DIR}RimExportInputPropertySettings.cpp +${CEE_CURRENT_LIST_DIR}RimBinaryExportSettings.cpp +${CEE_CURRENT_LIST_DIR}Rim3dOverlayInfoConfig.cpp +${CEE_CURRENT_LIST_DIR}RimUiTreeModelPdm.cpp +${CEE_CURRENT_LIST_DIR}RimUiTreeView.cpp +${CEE_CURRENT_LIST_DIR}RimReservoirCellResultsCacher.cpp +${CEE_CURRENT_LIST_DIR}RimStatisticsCaseEvaluator.cpp +${CEE_CURRENT_LIST_DIR}RimMimeData.cpp +) + + diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp index 0aa4acad71..d767854e3d 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp @@ -84,9 +84,11 @@ void Rim3dOverlayInfoConfig::update3DInfo() QString activeCellCountText; QString fractureActiveCellCount; QString iSize, jSize, kSize; + QString zScale; QString propName; QString cellEdgeName; + if (m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData() && m_reservoirView->eclipseCase()->reservoirData()->mainGrid()) { caseName = m_reservoirView->eclipseCase()->caseUserDescription(); @@ -100,6 +102,9 @@ void Rim3dOverlayInfoConfig::update3DInfo() iSize = QString::number(m_reservoirView->eclipseCase()->reservoirData()->mainGrid()->cellCountI()); jSize = QString::number(m_reservoirView->eclipseCase()->reservoirData()->mainGrid()->cellCountJ()); kSize = QString::number(m_reservoirView->eclipseCase()->reservoirData()->mainGrid()->cellCountK()); + + zScale = QString::number(m_reservoirView->scaleZ()); + propName = m_reservoirView->cellResult()->resultVariable(); cellEdgeName = m_reservoirView->cellEdgeResult()->resultVariable(); } @@ -107,7 +112,7 @@ void Rim3dOverlayInfoConfig::update3DInfo() QString infoText = QString( "

-- %1 --

" "Cell count. Total: %2 Active: %3
" - "Main Grid I,J,K: %4, %5, %6
").arg(caseName, totCellCount, activeCellCountText, iSize, jSize, kSize); + "Main Grid I,J,K: %4, %5, %6 Z-Scale: %7
").arg(caseName, totCellCount, activeCellCountText, iSize, jSize, kSize, zScale); if (m_reservoirView->animationMode() && m_reservoirView->cellResult()->hasResult()) { diff --git a/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp b/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp index a9d392c359..aa38daeeba 100644 --- a/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp +++ b/ApplicationCode/ProjectDataModel/RimLegendConfig.cpp @@ -76,7 +76,7 @@ RimLegendConfig::RimLegendConfig() { CAF_PDM_InitObject("Legend Definition", ":/Legend.png", "", ""); CAF_PDM_InitField(&m_numLevels, "NumberOfLevels", 8, "Number of levels", "", "",""); - CAF_PDM_InitField(&m_precision, "Precision", 6, "Precision", "", "",""); + CAF_PDM_InitField(&m_precision, "Precision", 2, "Precision", "", "",""); CAF_PDM_InitField(&m_colorRangeMode, "ColorRangeMode", ColorRangeEnum(NORMAL) , "Color range", "", "", ""); CAF_PDM_InitField(&m_mappingMode, "MappingMode", MappingEnum(LINEAR_CONTINUOUS) , "Mapping", "", "", ""); CAF_PDM_InitField(&m_rangeMode, "RangeType", caf::AppEnum(AUTOMATIC_ALLTIMESTEPS), "Legend range type", "", "Switches between automatic and user defined range on the legend", ""); diff --git a/ApplicationCode/ProjectDataModel/RimMimeData.cpp b/ApplicationCode/ProjectDataModel/RimMimeData.cpp new file mode 100644 index 0000000000..e16db847d6 --- /dev/null +++ b/ApplicationCode/ProjectDataModel/RimMimeData.cpp @@ -0,0 +1,81 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2011-2012 Statoil ASA, Ceetron 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. +// +///////////////////////////////////////////////////////////////////////////////// + +#include "RiaStdInclude.h" + +#include "RimMimeData.h" + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +MimeDataWithIndexes::MimeDataWithIndexes() +{ + +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +MimeDataWithIndexes::MimeDataWithIndexes(const MimeDataWithIndexes & other) : QMimeData() +{ + setIndexes(other.indexes()); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void MimeDataWithIndexes::setIndexes(const QModelIndexList & indexes) +{ + m_indexes = indexes; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +const QModelIndexList& MimeDataWithIndexes::indexes() const +{ + return m_indexes; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +bool MimeDataWithIndexes::hasFormat(const QString &mimetype) const +{ + return (mimetype == formatName()); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QStringList MimeDataWithIndexes::formats() const +{ + QStringList supportedFormats = QMimeData::formats(); + supportedFormats << formatName(); + + return supportedFormats; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString MimeDataWithIndexes::formatName() +{ + return "MimeDataWithIndexes"; +} + diff --git a/ApplicationCode/ProjectDataModel/RimMimeData.h b/ApplicationCode/ProjectDataModel/RimMimeData.h new file mode 100644 index 0000000000..0ff9fa9714 --- /dev/null +++ b/ApplicationCode/ProjectDataModel/RimMimeData.h @@ -0,0 +1,46 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2011-2012 Statoil ASA, Ceetron 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 +#include + + +//-------------------------------------------------------------------------------------------------- +/// MimeData class used to carry a QModelIndexList +//-------------------------------------------------------------------------------------------------- +class MimeDataWithIndexes : public QMimeData +{ + Q_OBJECT + +public: + MimeDataWithIndexes(); + MimeDataWithIndexes(const MimeDataWithIndexes & other); + + void setIndexes(const QModelIndexList& indexes); + const QModelIndexList& indexes() const; + virtual bool hasFormat(const QString& mimetype) const; + virtual QStringList formats() const; + static QString formatName(); + +private: + QModelIndexList m_indexes; +}; + +Q_DECLARE_METATYPE(MimeDataWithIndexes) diff --git a/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp b/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp index 076ef7df8d..5357ee7e82 100644 --- a/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp +++ b/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp @@ -40,6 +40,7 @@ #include "RigGridManager.h" #include "RimCase.h" #include "RigCaseData.h" +#include "RimMimeData.h" //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.h b/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.h index dc265b738f..81ba4f43c9 100644 --- a/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.h +++ b/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.h @@ -23,8 +23,6 @@ #include "cafPdmDocument.h" #include "cafUiTreeModelPdm.h" -#include - class QFileSystemWatcher; class RimCellPropertyFilter; @@ -35,55 +33,6 @@ class RimInputProperty; class RimStatisticsCase; class RimIdenticalGridCaseGroup; -//-------------------------------------------------------------------------------------------------- -/// MimeData class used to carry a QModelIndexList -//-------------------------------------------------------------------------------------------------- -class MimeDataWithIndexes : public QMimeData -{ - Q_OBJECT - -public: - MimeDataWithIndexes() - { - } - - - MimeDataWithIndexes(const MimeDataWithIndexes & other) : QMimeData() - { - setIndexes(other.indexes()); - } - - void setIndexes(const QModelIndexList & indexes) - { - m_indexes = indexes; - } - - const QModelIndexList& indexes() const { return m_indexes; } - - virtual bool hasFormat( const QString &mimetype ) const - { - return (mimetype == formatName()); - } - - virtual QStringList formats() const - { - QStringList supportedFormats = QMimeData::formats(); - supportedFormats << formatName(); - - return supportedFormats; - } - - static QString formatName() - { - return "MimeDataWithIndexes"; - } - -private: - QModelIndexList m_indexes; -}; - -Q_DECLARE_METATYPE(MimeDataWithIndexes) - //================================================================================================== /// diff --git a/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp b/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp index 7dbdeea1d3..909250cb02 100644 --- a/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp +++ b/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp @@ -35,6 +35,7 @@ #include "RigCaseCellResultsData.h" #include "RimStatisticsCase.h" #include "RimResultCase.h" +#include "RimMimeData.h" //-------------------------------------------------------------------------------------------------- /// @@ -1097,7 +1098,7 @@ bool RimUiTreeView::userConfirmedGridCaseGroupChange(const QModelIndexList& item else { questionText = "This operation will invalidate statistics results in grid case groups\n"; - for (int i = 0; i < typedObjects.size(); i++) + for (size_t i = 0; i < typedObjects.size(); i++) { questionText += QString("\"%1\"\n").arg(typedObjects[i]->name()); } diff --git a/ApplicationCode/ProjectDataModel/RimWell.cpp b/ApplicationCode/ProjectDataModel/RimWell.cpp index 893a3d13ae..2f0f403172 100644 --- a/ApplicationCode/ProjectDataModel/RimWell.cpp +++ b/ApplicationCode/ProjectDataModel/RimWell.cpp @@ -45,9 +45,6 @@ RimWell::RimWell() CAF_PDM_InitField(&showWellCells, "ShowWellCells", true, "Add cells to range filter", "", "", ""); CAF_PDM_InitField(&showWellCellFence, "ShowWellCellFence", false, " Use well fence", "", "", ""); - //CAF_PDM_InitField(&wellCellColor, "WellCellColor", cvf::Color3f(cvf::Color3f::BROWN), "Well cell color", "", "", ""); - - name.setUiHidden(true); name.setUiReadOnly(true); diff --git a/ApplicationCode/ProjectDataModel/RimWell.h b/ApplicationCode/ProjectDataModel/RimWell.h index a9f18b1ea7..23d8b5090e 100644 --- a/ApplicationCode/ProjectDataModel/RimWell.h +++ b/ApplicationCode/ProjectDataModel/RimWell.h @@ -42,7 +42,7 @@ public: void setReservoirView(RimReservoirView* ownerReservoirView); void setWellResults(RigSingleWellResultsData* wellResults) { m_wellResults = wellResults;} - RigSingleWellResultsData* wellResults() { return m_wellResults.p();} + RigSingleWellResultsData* wellResults() { return m_wellResults.p(); } virtual caf::PdmFieldHandle* userDescriptionField(); @@ -54,14 +54,13 @@ public: caf::PdmField showWellCells; caf::PdmField showWellCellFence; - //caf::PdmField wellCellColor; caf::PdmField showWellPipes; caf::PdmField wellPipeColor; caf::PdmField pipeRadiusScaleFactor; private: - cvf::ref m_wellResults; + cvf::ref m_wellResults; RimReservoirView* m_reservoirView; }; diff --git a/ApplicationCode/Resources/ResInsight.qrc b/ApplicationCode/Resources/ResInsight.qrc index 4bb322cec7..a51739f3de 100644 --- a/ApplicationCode/Resources/ResInsight.qrc +++ b/ApplicationCode/Resources/ResInsight.qrc @@ -29,6 +29,13 @@ Histogram16x16.png Histograms16x16.png ZoomAll16x16.png + draw_style_lines_24x24.png + draw_style_meshlines_24x24.png + draw_style_meshoutlines_24x24.png + draw_style_outlines_24x24.png + draw_style_surface_24x24.png + SnapShot.png + SnapShotSave.png fs_CellFace.glsl diff --git a/ApplicationCode/Resources/SnapShot.png b/ApplicationCode/Resources/SnapShot.png new file mode 100644 index 0000000000..ad94cdef02 Binary files /dev/null and b/ApplicationCode/Resources/SnapShot.png differ diff --git a/ApplicationCode/Resources/SnapShotSave.png b/ApplicationCode/Resources/SnapShotSave.png new file mode 100644 index 0000000000..f0536c39b9 Binary files /dev/null and b/ApplicationCode/Resources/SnapShotSave.png differ diff --git a/ApplicationCode/Resources/draw_style_lines_24x24.png b/ApplicationCode/Resources/draw_style_lines_24x24.png new file mode 100644 index 0000000000..11e078e856 Binary files /dev/null and b/ApplicationCode/Resources/draw_style_lines_24x24.png differ diff --git a/ApplicationCode/Resources/draw_style_meshlines_24x24.png b/ApplicationCode/Resources/draw_style_meshlines_24x24.png new file mode 100644 index 0000000000..04207db593 Binary files /dev/null and b/ApplicationCode/Resources/draw_style_meshlines_24x24.png differ diff --git a/ApplicationCode/Resources/draw_style_meshoutlines_24x24.png b/ApplicationCode/Resources/draw_style_meshoutlines_24x24.png new file mode 100644 index 0000000000..9bc069d03a Binary files /dev/null and b/ApplicationCode/Resources/draw_style_meshoutlines_24x24.png differ diff --git a/ApplicationCode/Resources/draw_style_outlines_24x24.png b/ApplicationCode/Resources/draw_style_outlines_24x24.png new file mode 100644 index 0000000000..ae1b962792 Binary files /dev/null and b/ApplicationCode/Resources/draw_style_outlines_24x24.png differ diff --git a/ApplicationCode/Resources/draw_style_surface_24x24.png b/ApplicationCode/Resources/draw_style_surface_24x24.png new file mode 100644 index 0000000000..012adb6b72 Binary files /dev/null and b/ApplicationCode/Resources/draw_style_surface_24x24.png differ diff --git a/ApplicationCode/SocketInterface/RiaSocketServer.cpp b/ApplicationCode/SocketInterface/RiaSocketServer.cpp index ad676d6462..6e732b86ec 100644 --- a/ApplicationCode/SocketInterface/RiaSocketServer.cpp +++ b/ApplicationCode/SocketInterface/RiaSocketServer.cpp @@ -57,7 +57,7 @@ RiaSocketServer::RiaSocketServer(QObject* parent) { m_errorMessageDialog->showMessage("Octave communication disabled :\n" "\n" - "This instance of ResInsight could not start the Socket Server enabeling octave to get and set data.\n" + "This instance of ResInsight could not start the Socket Server enabling octave to get and set data.\n" "This is probably because you already have a running ResInsight process.\n" "Octave can only communicate with one ResInsight process at a time, so the Octave\n" "communication in this ResInsight instance will be disabled.\n" @@ -367,7 +367,8 @@ void RiaSocketServer::readCommandFromOctave() return; } - calculateMatrixModelActiveCellInfo(activeCellInfo[0], + calculateMatrixModelActiveCellInfo(reservoir, + activeCellInfo[0], activeCellInfo[1], activeCellInfo[2], activeCellInfo[3], @@ -618,7 +619,7 @@ void RiaSocketServer::slotReadyRead() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiaSocketServer::calculateMatrixModelActiveCellInfo(std::vector& gridNumber, std::vector& cellI, std::vector& cellJ, std::vector& cellK, std::vector& parentGridNumber, std::vector& hostCellI, std::vector& hostCellJ, std::vector& hostCellK) +void RiaSocketServer::calculateMatrixModelActiveCellInfo(RimCase* reservoirCase, std::vector& gridNumber, std::vector& cellI, std::vector& cellJ, std::vector& cellK, std::vector& parentGridNumber, std::vector& hostCellI, std::vector& hostCellJ, std::vector& hostCellK) { gridNumber.clear(); cellI.clear(); @@ -629,12 +630,12 @@ void RiaSocketServer::calculateMatrixModelActiveCellInfo(std::vector& gr hostCellJ.clear(); hostCellK.clear(); - if (!m_currentReservoir || !m_currentReservoir->reservoirData() || !m_currentReservoir->reservoirData()->mainGrid()) + if (!reservoirCase || !reservoirCase->reservoirData() || !reservoirCase->reservoirData()->mainGrid()) { return; } - RigActiveCellInfo* actCellInfo = m_currentReservoir->reservoirData()->activeCellInfo(RifReaderInterface::MATRIX_RESULTS); + RigActiveCellInfo* actCellInfo = reservoirCase->reservoirData()->activeCellInfo(RifReaderInterface::MATRIX_RESULTS); size_t numMatrixModelActiveCells = actCellInfo->globalActiveCellCount(); gridNumber.reserve(numMatrixModelActiveCells); @@ -646,7 +647,7 @@ void RiaSocketServer::calculateMatrixModelActiveCellInfo(std::vector& gr hostCellJ.reserve(numMatrixModelActiveCells); hostCellK.reserve(numMatrixModelActiveCells); - const std::vector& globalCells = m_currentReservoir->reservoirData()->mainGrid()->cells(); + const std::vector& globalCells = reservoirCase->reservoirData()->mainGrid()->cells(); for (size_t cIdx = 0; cIdx < globalCells.size(); ++cIdx) { diff --git a/ApplicationCode/SocketInterface/RiaSocketServer.h b/ApplicationCode/SocketInterface/RiaSocketServer.h index 6e19a1bb74..4cfc8d6c0e 100644 --- a/ApplicationCode/SocketInterface/RiaSocketServer.h +++ b/ApplicationCode/SocketInterface/RiaSocketServer.h @@ -53,17 +53,18 @@ private: void handleClientConnection( QTcpSocket* clientToHandle); - RimCase* findReservoir(const QString &casename); + RimCase* findReservoir(const QString &casename); void terminateCurrentConnection(); - void calculateMatrixModelActiveCellInfo(std::vector& gridNumber, - std::vector& cellI, - std::vector& cellJ, - std::vector& cellK, - std::vector& parentGridNumber, - std::vector& hostCellI, - std::vector& hostCellJ, - std::vector& hostCellK); + void calculateMatrixModelActiveCellInfo( RimCase* reservoirCase, + std::vector& gridNumber, + std::vector& cellI, + std::vector& cellJ, + std::vector& cellK, + std::vector& parentGridNumber, + std::vector& hostCellI, + std::vector& hostCellJ, + std::vector& hostCellK); private: @@ -79,8 +80,9 @@ private: quint64 m_timeStepCountToRead; quint64 m_bytesPerTimeStepToRead; size_t m_currentTimeStepToRead; - std::vector< std::vector >* m_scalarResultsToAdd; - RimCase* m_currentReservoir; + std::vector< std::vector >* + m_scalarResultsToAdd; + RimCase* m_currentReservoir; size_t m_currentScalarIndex; QString m_currentPropertyName; bool m_invalidActiveCellCountDetected; diff --git a/ResInsightVersion.cmake b/ResInsightVersion.cmake index a0457d510c..f419390018 100644 --- a/ResInsightVersion.cmake +++ b/ResInsightVersion.cmake @@ -1,7 +1,7 @@ set(CMAKE_MAJOR_VERSION 0) set(CMAKE_MINOR_VERSION 9) -set(CMAKE_PATCH_VERSION 6) +set(CMAKE_PATCH_VERSION 8) set(PRODUCTVER ${CMAKE_MAJOR_VERSION},${CMAKE_MINOR_VERSION},0,${CMAKE_PATCH_VERSION}) set(STRPRODUCTVER ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION})