From 1fec45a82248b6927db61693bc1273670e870a19 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Tue, 16 Apr 2013 08:43:51 +0200 Subject: [PATCH 01/11] Updated to development version 0.9.7 p4#: 21299 --- ResInsightVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ResInsightVersion.cmake b/ResInsightVersion.cmake index a0457d510c..c48333f531 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 7) set(PRODUCTVER ${CMAKE_MAJOR_VERSION},${CMAKE_MINOR_VERSION},0,${CMAKE_PATCH_VERSION}) set(STRPRODUCTVER ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}) From d89ea1e38513de9b39b18f7ae3ecacb38ac72721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 16 Apr 2013 08:50:31 +0200 Subject: [PATCH 02/11] Legend default number precision set to 2 p4#: 21301 --- ApplicationCode/ProjectDataModel/RimLegendConfig.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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", ""); From 99ad86b984591449eac473653192fb69b367aff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 16 Apr 2013 09:03:40 +0200 Subject: [PATCH 03/11] Added Z-Scale to the 3D overlay info text p4#: 21303 --- .../ProjectDataModel/Rim3dOverlayInfoConfig.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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()) { From 66f0310d55c8449adb1b0d376f03d27ab225bd42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 16 Apr 2013 09:44:31 +0200 Subject: [PATCH 04/11] Added new icons to resource file p4#: 21306 --- ApplicationCode/Resources/ResInsight.qrc | 7 +++++++ ApplicationCode/Resources/SnapShot.png | Bin 0 -> 1452 bytes ApplicationCode/Resources/SnapShotSave.png | Bin 0 -> 1552 bytes .../Resources/draw_style_lines_24x24.png | Bin 0 -> 409 bytes .../Resources/draw_style_meshlines_24x24.png | Bin 0 -> 686 bytes .../Resources/draw_style_meshoutlines_24x24.png | Bin 0 -> 562 bytes .../Resources/draw_style_outlines_24x24.png | Bin 0 -> 293 bytes .../Resources/draw_style_surface_24x24.png | Bin 0 -> 551 bytes 8 files changed, 7 insertions(+) create mode 100644 ApplicationCode/Resources/SnapShot.png create mode 100644 ApplicationCode/Resources/SnapShotSave.png create mode 100644 ApplicationCode/Resources/draw_style_lines_24x24.png create mode 100644 ApplicationCode/Resources/draw_style_meshlines_24x24.png create mode 100644 ApplicationCode/Resources/draw_style_meshoutlines_24x24.png create mode 100644 ApplicationCode/Resources/draw_style_outlines_24x24.png create mode 100644 ApplicationCode/Resources/draw_style_surface_24x24.png 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 0000000000000000000000000000000000000000..ad94cdef029277964313a786c328cebbb0d63e32 GIT binary patch literal 1452 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 literal 0 HcmV?d00001 diff --git a/ApplicationCode/Resources/draw_style_meshlines_24x24.png b/ApplicationCode/Resources/draw_style_meshlines_24x24.png new file mode 100644 index 0000000000000000000000000000000000000000..04207db593f3429dabfc1c4a089df793a46228d7 GIT binary patch literal 686 zcmV;f0#W^mP)v&jbJf03CEi zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00I(8L_t(|+TE0~YZFl% z$3M^JvUDhP5ju!j3W7LDKsqEkh=Uj?p+zWNTslMqr%YO}tx(8dq~O-ELx)l+{R@IF z!J!bBVkdDaoiDw2DfiAHz019OcV`GL`ulObyZ6ZVd%w@`mxKR0s?F+GAeit1ppYeA zdt3W@6ad#8vKa^<8=odd$9?W$N)1Qc0weTm@IdA2xu~kxr_?>igC2dvEsc zuAQzSeTgNk=<1fcl(tGtKbgk$U5cWJB`iGU(SOv3x^7@Zqt*BU1eI5nv2o12m>J&J z39xlUA}-$i*!iPl-$DvWK@{lR?+mdV{&{F7o0d2h+eD-_ z`6M{Oi={;3;jt{1*$sA${SC1J_Y$w!(;qd1K7CCf%(OF!G#T_vR5y|aVLCX`8lHuF zVH$B5H8{J1_#4J6aBx!hH7vI2sTnvpNF)OW28uL%Sy(a++DmPGd=x5L6$*f(r6X<6 z$JepgV;HO)tfWrSnK)zNV8Ot5Auck7Qw=V;L|$idigJ4p4;!fPnJ+m#hzkuE7z2WFU8GbZ8({Xk{QrNlj4iWF>9@00EXsL_t(|+TE4EPQpMO z$G?|w$0NA8xfut;WFqkeNC-1C11?UTkN`R{84`H{1|}VN0-~D(i4G7G6O0QF&~isf zuMRD3DR-21~&9l$K)CL27R}q{$#5|Qmpp(5<&ezF$j@ez$@p@tg#!SIjNMFI zO$Bd-?5z?_+zD2ZM?mZyw@F(Yxv~cqtR0vRE+7s{P%9uHV8h;aQ$O2(P3rk!n2& ze(*tyuW@kLuoK~_PO_>GN$|L3`!!xiZ~tSoe>YyX{4C(+sQ>@~07*qoM6N<$f_aGF A!TN!u6?S^MIEGZ*dOP(YSAzmiOaBYa?;E~ld=6K9`sG}ggV3MF zx66gM3D2mNWRSmOV$UN+@LHt48sketj8)fgES-EmI2Y>OR$bDy@8Hm@O1TaS?83{1OSq6Xk`EZ literal 0 HcmV?d00001 diff --git a/ApplicationCode/Resources/draw_style_surface_24x24.png b/ApplicationCode/Resources/draw_style_surface_24x24.png new file mode 100644 index 0000000000000000000000000000000000000000..012adb6b728a1f057348a5683b180dc9e7b46d36 GIT binary patch literal 551 zcmV+?0@(eDP)WFU8GbZ8({Xk{QrNlj4iWF>9@00E0hL_t(|+TE1BZo)7W zg-_Jj44}LOBSYuzeSq#=`VQ<>B}U!?b!UO86AKe4RfRyJ9nvmcI#de54k))Bh!gT- zhp@HRvh4Uu-?{h13Gmm$G9|mO-AC7VZv_d26he@IB$=#g7UBcI-GOcE;QjahaPH4< z9NPgW4nYEp7+A!>tn8E|vH#hpa4+SQ3Jg96PcwgZ?br@@#4|8%ad3)f#KEmYKBN$V z7i8e20^_go)b-sf=fX+BN0m!U!nW*GkT@7Icx$f!F9=M(r_YOEaj9%!QCx9cWrG?C zQ0+N!tQM$a*~K@&T2??H7kd6{V88G%-_)$TMqkdO%Dq4vjT`P^tY zGG5a}AV5$6m5JqrtD;ok6d|>qEU>{Q1Cfx}VOQBjtqyd)oA$LW%2!_Ye3n4oB2(pO zTcm^Nx~ScOg4DULn&=e-w%BIiYBl+<5$NFo_oW?}EYh8u;3t1*`7;5LbY_BA-lDu6 p`8 Date: Tue, 16 Apr 2013 09:53:31 +0200 Subject: [PATCH 05/11] Whitespace p4#: 21309 --- ApplicationCode/ProjectDataModel/RimWell.cpp | 3 --- ApplicationCode/ProjectDataModel/RimWell.h | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) 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; }; From da82770e5fa704daaa001487ea02928f10638147 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Tue, 16 Apr 2013 10:27:36 +0200 Subject: [PATCH 06/11] Moved file list from ApplicationCode to ProjectDataModel p4#: 21315 --- ApplicationCode/CMakeLists.txt | 48 +++--------- .../ProjectDataModel/CMakeLists_files.cmake | 78 +++++++++++++++++++ 2 files changed, 90 insertions(+), 36 deletions(-) create mode 100644 ApplicationCode/ProjectDataModel/CMakeLists_files.cmake diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt index 4a854557d5..060a57de55 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} ) @@ -214,6 +189,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..c18ca33b7a --- /dev/null +++ b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake @@ -0,0 +1,78 @@ + +# 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 +) + +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 +) + + From 427bf5a2dd13a2d89b55a48d28dfb9372b25a3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 16 Apr 2013 10:46:29 +0200 Subject: [PATCH 07/11] Linux compile warning fix p4#: 21316 --- ApplicationCode/ProjectDataModel/RimUiTreeView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp b/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp index 7dbdeea1d3..46a9430810 100644 --- a/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp +++ b/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp @@ -1097,7 +1097,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()); } From 9f07daefadf4c33471ac8681781f7df596adda69 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Tue, 16 Apr 2013 11:19:37 +0200 Subject: [PATCH 08/11] Moved MimeData into RimMimeData p4#: 21317 --- ApplicationCode/CMakeLists.txt | 1 + .../ProjectDataModel/CMakeLists_files.cmake | 2 + .../ProjectDataModel/RimMimeData.cpp | 81 +++++++++++++++++++ .../ProjectDataModel/RimMimeData.h | 46 +++++++++++ .../ProjectDataModel/RimUiTreeModelPdm.cpp | 1 + .../ProjectDataModel/RimUiTreeModelPdm.h | 51 ------------ .../ProjectDataModel/RimUiTreeView.cpp | 1 + 7 files changed, 132 insertions(+), 51 deletions(-) create mode 100644 ApplicationCode/ProjectDataModel/RimMimeData.cpp create mode 100644 ApplicationCode/ProjectDataModel/RimMimeData.h diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt index 060a57de55..472c5c45e1 100644 --- a/ApplicationCode/CMakeLists.txt +++ b/ApplicationCode/CMakeLists.txt @@ -89,6 +89,7 @@ set ( QT_MOC_HEADERS ProjectDataModel/RimUiTreeModelPdm.h ProjectDataModel/RimUiTreeView.h + ProjectDataModel/RimMimeData.h UserInterface/RiuMainWindow.h UserInterface/RiuPreferencesDialog.h diff --git a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake index c18ca33b7a..9f6d3a9ac2 100644 --- a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake +++ b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake @@ -38,6 +38,7 @@ ${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 @@ -73,6 +74,7 @@ ${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/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 46a9430810..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" //-------------------------------------------------------------------------------------------------- /// From b38d4313d7fe9e19b0e10f329c2b0ef21409d3cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 16 Apr 2013 12:08:45 +0200 Subject: [PATCH 09/11] Octave Server: Fix on getting active cellinfo p4#: 21318 --- ApplicationCode/SocketInterface/RiaSocketServer.cpp | 13 +++++++------ ApplicationCode/SocketInterface/RiaSocketServer.h | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) 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..a84519fd86 100644 --- a/ApplicationCode/SocketInterface/RiaSocketServer.h +++ b/ApplicationCode/SocketInterface/RiaSocketServer.h @@ -56,7 +56,8 @@ private: RimCase* findReservoir(const QString &casename); void terminateCurrentConnection(); - void calculateMatrixModelActiveCellInfo(std::vector& gridNumber, + void calculateMatrixModelActiveCellInfo(RimCase* reservoirCase, + std::vector& gridNumber, std::vector& cellI, std::vector& cellJ, std::vector& cellK, From df533d0afe4715c158c07523b6faec500933b90e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Wed, 17 Apr 2013 07:41:48 +0200 Subject: [PATCH 10/11] Alligning p4#: 21321 --- .../SocketInterface/RiaSocketServer.h | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/ApplicationCode/SocketInterface/RiaSocketServer.h b/ApplicationCode/SocketInterface/RiaSocketServer.h index a84519fd86..4cfc8d6c0e 100644 --- a/ApplicationCode/SocketInterface/RiaSocketServer.h +++ b/ApplicationCode/SocketInterface/RiaSocketServer.h @@ -53,18 +53,18 @@ private: void handleClientConnection( QTcpSocket* clientToHandle); - RimCase* findReservoir(const QString &casename); + RimCase* findReservoir(const QString &casename); void terminateCurrentConnection(); - 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); + 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: @@ -80,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; From f7bf7dd21a7391f87ae0a4705fee857a1ec033fa Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 17 Apr 2013 07:42:32 +0200 Subject: [PATCH 11/11] Updated to version 0.9.8 p4#: 21322 --- ResInsightVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ResInsightVersion.cmake b/ResInsightVersion.cmake index c48333f531..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 7) +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})