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
9,632 Commits 27 Branches 61 Tags 309 MiB
00d767f67c
Commit Graph

274 Commits

Author SHA1 Message Date
Magne Sjaastad
1ae30ef11a (clang-tidy) : modernize-use-nullptr 2018-02-18 18:56:43 +01:00
Bjørn Erik Jensen
de498a71c2 #2474 fractures. Added plural form of fracture. Moved below sim wells 2018-02-15 12:34:34 +01:00
Magne Sjaastad
519771cb38 #2447 Fracture : Rename to fractureColors 2018-02-06 12:57:50 +01:00
Magne Sjaastad
b69fc78361 #2431 : Remove Rim3dView from function parameters 2018-02-05 20:12:22 +01:00
Magne Sjaastad
cd575ef9c1 #2431 : Use well path part manager in Rim3dView 2018-02-05 20:12:22 +01:00
Jacob Støren
29ac24f3dd #2426 Add working legends to 2D intersection Views. Refactor to make legend update code work from a separate view with separate legend configs. Make sure legend and results are updated as the main view is updated. Adjust legendconfig->setTitle to use QString 2018-02-02 07:48:27 +01:00
Bjørn Erik Jensen
4d98ac04e8 Merged patch to dev. #2429, #2430 2018-01-31 15:53:02 +01:00
Bjørn Erik Jensen
60afae10ad #2429, #2430. Display perforations correctly 2018-01-31 15:34:50 +01:00
Rebecca Cox
e50f7bf66f #2428 Fracture: Reorganize Fracture Colors tree item 2018-01-31 15:11:46 +01:00
Jacob Støren
02f6b95959 #2333 Add flattened intersectino geometry. Some view modifications to move towards a final 2D view experience 2018-01-26 11:19:15 +01:00
Magne Sjaastad
348b492cc1 RiaColorTables : Add and use undefinedCellColor() 2018-01-22 11:55:27 +01:00
Rebecca Cox
79539c1c99 #2378 Fractures: Hide "Fracture Colors" in Project tree when not in use 2018-01-18 15:04:04 +01:00
Rebecca Cox
39cf8e8b0d #2378 Fractures: Hide "Fracture Colors" in Project tree when not in use 2018-01-18 11:42:29 +01:00
Jacob Støren
b1cf7f6674 #2331 Cleaned up whitespace. Made crossectionCollection protected 2018-01-16 08:44:37 +01:00
Jacob Støren
cb6d49a611 #2331 Renamed RimView to Rim3dView 2018-01-09 10:11:28 +01:00
sigurdp
f940d0a3d5 #1753 Fracture: Reworked visualization of StimPlan fractures to limit surface tesselation to area with actual values instead of relying on transparency. Done to allow picking on items behind the fracture. Refactored and removed obsolete code related to StimPlan fracture visualization. 2018-01-03 11:13:15 +01:00
Magne Sjaastad
1583923ed1 #2287 Calculate Completion Type : Execute loadAndUpdate only when required 2017-12-21 18:57:30 +01:00
Magne Sjaastad
3024b19b6f #2188 Missing fault faces : Set watertight flag only when needed 2017-12-06 08:38:37 +01:00
Magne Sjaastad
3e844746eb #2188 Missing fault faces 
Make sure all visible geometry is marked as watertight to avoid open grid sections in some cases, especially when loading file and regeneration of geometry
 2017-12-05 18:20:35 +01:00
Rebecca Cox
75c506e257 #2109 Remove automatic color on well labels on background change 2017-11-13 07:55:22 +01:00
Rebecca Cox
c49db44909 #1490 Simulation well: Remove well head if it does not have perforations 2017-11-08 11:22:51 +01:00
Rebecca Cox
ea4a92ab27 Rename wellPathsPartManager -> wellPathCollection 2017-11-08 09:07:44 +01:00
Rebecca Cox
93a83cd756 #2094 Update well name color in 3d view (not sim well) 2017-11-08 09:07:44 +01:00
Bjørn Erik Jensen
ae20e1af10 Refactoring. RimViewWindow.loadDataAndUpdate -> onLoadDataAndUpdate 2017-10-31 12:49:36 +01:00
Rebecca Cox
9bd556a1b9 #1996 Remane RimFieldCollection -> RimFaultInViewCollection 2017-10-17 09:52:31 +02:00
Rebecca Cox
7da8e3091b #1996: Rename RimEclipseWellCollection -> RimSimWellInViewCollection 2017-10-17 09:52:31 +02:00
Rebecca Cox
44be1bfd6b #1996 Rename RigSingleWellResultsData -> RigSimWellData 2017-10-17 09:52:31 +02:00
Rebecca Cox
7d908394db #1996 Renaming. Remove unused includes and rename local variables 2017-10-17 09:52:31 +02:00
Rebecca Cox
d748803159 #1996 Rename RimEclipseWell -> RimSimWellInView 2017-10-17 09:52:31 +02:00
sigurdp
8d96e9e35a Renamed RiuEclipseSelectionItem::m_cellIndex to RiuEclipseSelectionItem::m_gridLocalCellIndex 2017-10-16 14:35:43 +02:00
Jacob Støren
7f07962187 #1693 Reroute all access to RigCaseCellResultsData away from RimReservoirCellResultsStorage 2017-09-13 11:50:27 +02:00
Jacob Støren
bb098a241b #1693 Rename of result() to resultStorage() as step to remove the access to RigCaseCellResultsData through RimReservoirCellResultsStorage 2017-09-13 11:50:27 +02:00
Bjørnar Grip Fjær
78760d569e #1807 Ensure flow characteristics plot is updated when view geometry changes when using visible cells filtering 2017-08-24 13:28:17 +02:00
Bjørnar Grip Fjær
5ead49e01e #1807 Add option to use visible cells in view as region selection in flow characteristics plot 2017-08-24 09:28:05 +02:00
Magne Sjaastad
553b3bf63e #1794 Add flag RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 15:24:20 +02:00
Magne Sjaastad
7dfcfde1d1 #1744 Load and update data for fractures when loading project file 2017-08-14 22:16:03 +02:00
Magne Sjaastad
0ba1746755 Merge branch 'dev' into pre-proto 2017-08-11 16:14:00 +02:00
Magne Sjaastad
88bbea6339 #1755 Remove porosity enum from RifReaderInterface 2017-08-11 14:27:22 +02:00
Magne Sjaastad
1adba2caf7 #1724 Removed unused code 2017-08-04 10:21:07 +02:00
Jacob Støren
fc05dd665f #1585 Add visualization (gray out) inactive parts of fractures based on containment. 2017-06-27 13:21:04 +02:00
Jacob Støren
cbb0a58673 #1648 Remove dependency on active view from color generation. 
Separate the fracture geometry generation methods from the wellpath methods. Use eclipse View as argument.
Fixed some constness stuff in View
 2017-06-25 10:42:53 +02:00
Jacob Støren
33b037a80b #1440 Merge dev into pre-proto (WellPath viz restructure and constness) 
Had to do quite a bit constness fiddeling to make the merge work
 2017-06-22 10:42:07 +02:00
Jacob Støren
3193127e32 #1440 Remove RivWellPathCollectionPartMgr as it did not manage any parts 
This is a step to make it easier to make the interface from the views to get the well path related geometry parts more "static".
 2017-06-21 15:39:59 +02:00
Magne Sjaastad
b9ee3d6d4a Add const and remove dependency to RimView 2017-06-19 22:53:19 +02:00
Magne Sjaastad
210bdab4c3 Remove scale transform 2017-06-19 22:15:28 +02:00
Magne Sjaastad
6cd0f0ebd2 #1440 Use view as basis for appending dynamic parts 2017-06-16 08:56:02 +02:00
Magne Sjaastad
e50f876cf0 Add infrastructure for dynamic parts to well path part managers 2017-06-15 14:07:04 +02:00
Magne Sjaastad
a8b8e061d7 #1596 Merge dev into pre-proto 2017-06-14 07:25:34 +02:00
Magne Sjaastad
cf859e7c16 #1596 Rename from RimDefines to RiaDefines 2017-06-13 15:41:52 +02:00
Jacob Støren
a2de4efb66 #1585 Remove RigFracture. No caching of transformed triangles related to each fracture instance 2017-06-12 12:52:39 +02:00
Magne Sjaastad
454e2e1559 #1570 Ensure the legend is updated before adding well path parts to scene 2017-06-07 15:31:10 +02:00
Magne Sjaastad
c35e79c3b5 Merge branch 'dev' into pre-proto 2017-04-20 13:40:56 +02:00
Jacob Støren
b3ecb423be #1399 QA of grouping in 3D main view property panels. Not Simulation Well Collection 2017-04-06 18:37:43 +02:00
Bjørnar Grip Fjær
b3c8a90cd8 #1011 Fix crash when deleting statistics source case 2017-04-03 10:06:49 +02:00
Magne Sjaastad
8255a3aaa3 Merge branch 'dev' into pre-proto 2017-04-03 07:34:56 +02:00
Jacob Støren
cde71ef07a #1344 AppFwk: Renamed methods in uiTreeOrdering to align with uiOrdering 2017-03-22 15:57:04 +01:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
Magne Sjaastad
647b4348eb Renamed to eclipseCaseData 2017-03-15 09:10:16 +01:00
Magne Sjaastad
78e6c6a8fc Renamed to m_eclipseCase 2017-03-15 08:45:08 +01:00
Jacob Støren
7f1d88e487 Merged Well Communication Lines into dev 2017-03-14 19:25:30 +01:00
Magne Sjaastad
a22a58dd5b #1297 Property Filter : Update ranges when time step changes 2017-03-14 17:26:40 +01:00
Jacob Støren
4c8e1e2bcd #1114 WIP: Refactor: Removed RivReservoirWellSpheresPartMgr 2017-03-13 11:35:49 +01:00
Jacob Støren
d34b4e3c05 #1114 WIP: Added field in Sim Well Collection, renamed a bit as preparations 2017-03-13 11:05:46 +01:00
Magne Sjaastad
ac9f405c96 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ResInsightVersion.cmake
 2017-03-02 11:46:25 +01:00
Magne Sjaastad
da416409aa #1266 Assign visible grid parts before appendStaticGeometryPartsToModel() 2017-03-01 14:20:27 +01:00
Magne Sjaastad
10f14aee8e Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-02-27 07:13:06 +01:00
Magne Sjaastad
ff99d56ea3 #1255 Removed includes from RimFaultCollection 2017-02-24 14:02:03 +01:00
Magne Sjaastad
5c20bff5d1 #1255 Remove includes from header files 2017-02-24 11:07:26 +01:00
Magne Sjaastad
139590760f #1240 Added checbox to StimPlan Colors 2017-02-22 15:32:19 +01:00
Magne Sjaastad
b7aebbb392 #1230 Created StimPlan colors and show lenged in 3D view 2017-02-20 09:31:24 +01:00
Magne Sjaastad
f9d8ab8bad Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ApplicationCode/Resources/ResInsight.qrc
 2017-02-16 10:18:39 +01:00
Magne Sjaastad
9a7f187765 #1222 Interpolate category colors and assign well color based on sorted order 2017-02-15 13:26:59 +01:00
Magne Sjaastad
9aa98a3895 #1078 Assign default colors when a new well is created 2017-02-13 13:26:05 +01:00
Magne Sjaastad
7cdc550f32 Fixed #1130 Make sure visibility of fractures follows pipe/sphere visibility 2017-02-09 06:59:34 +01:00
Magne Sjaastad
93954fece0 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/Commands/RicDeleteItemFeature.cpp
 2017-02-08 07:35:20 +01:00
Magne Sjaastad
2404cf1582 #1189 Visibility of well cells now follow visible range filtered cells 2017-02-07 15:33:04 +01:00
Magne Sjaastad
6dc0a7ff59 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ResInsightVersion.cmake
 2017-02-03 10:51:46 +01:00
Magne Sjaastad
c4d9c1d780 #1148 Made tristate of well cell fence 2017-02-02 09:59:26 +01:00
Magne Sjaastad
fad0974b3f #1148 Use tristate for well cell visibility 2017-02-02 09:59:26 +01:00
Magne Sjaastad
d8c2eb0357 #1158 Fixed position of simulation well fractures after scale change 2017-02-01 13:25:07 +01:00
Magne Sjaastad
f2a4fee68f Added missing updateConnectedEditors 2017-01-30 14:59:10 +01:00
Magne Sjaastad
7b6574327e #1094 Gray out wells not visible because they do not intersect visible cells 2017-01-27 15:50:17 +01:00
Magne Sjaastad
8f4fa4592a #1078 Improved well cells and well cell fence settings 2017-01-26 17:41:34 +01:00
Magne Sjaastad
e845ae1ed8 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/CMakeLists.txt
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
 2017-01-24 15:23:02 +01:00
Magne Sjaastad
cebe5428be #1107 Moved showWindow field to RimViewWindow and removed showWindow field from derived classes 2017-01-20 16:25:05 +01:00
Jacob Støren
c025c2a3d7 Renaming in the aftermath of the MDI window control refactorization. Aligned fieldChangedByUi in that respact as well. 2017-01-20 11:38:18 +01:00
Jacob Støren
43249f7af8 Refactor related to #1106, #1107, #1109, #1113. Refactored the MDI control 
of windows. This might introduce problems.
 2017-01-19 17:54:01 +01:00
Magne Sjaastad
74fc8458ed Refactored visualization : One part manager for each fracture 2017-01-19 07:28:04 +01:00
Magne Sjaastad
36bcdab426 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
 2017-01-18 12:19:07 +01:00
Magne Sjaastad
539db3cc52 #1128m Cleaned up includes 2017-01-18 09:56:42 +01:00
Magne Sjaastad
894b4468b4 #1125 Limit size of string in legend and info, reordered tracer combo 2017-01-12 15:00:23 +01:00
Magne Sjaastad
4a9fec49bf #1056 Added cell edge picking text info 2017-01-11 21:07:03 +01:00
Magne Sjaastad
f16228ecc5 #1056 Added support for flow data for cell edge in 3D view 2017-01-11 15:03:39 +01:00
Magne Sjaastad
9cd17ec508 Merge dev into pre-proto 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseView.cpp
	ApplicationCode/ProjectDataModel/RimEclipseView.h
 2017-01-10 10:09:44 +01:00
Magne Sjaastad
8970d93a4d #1068 Renamed to RigEclipseCaseData 2017-01-10 09:51:39 +01:00
Magne Sjaastad
93032a23eb #1068 Avoid include of RigActiveCellInfo.h in RigCaseData.h 2017-01-10 09:20:03 +01:00
Magne Sjaastad
ccd4cb24c9 #1068 Avoid include of RigMainGrid.h in RigCaseData.h 2017-01-10 09:20:03 +01:00
Magne Sjaastad
9cacf0db6c #1068 Access mainGrid directly from RimEclipseView 2017-01-10 09:20:03 +01:00
Magne Sjaastad
45b581dc74 #1068 Added mainGrid() to RimEclipseView 2017-01-09 10:37:07 +01:00
Jacob Støren
ebddaa31e6 #1054 Added sensible information to the Result Info window when picking Flow Diag results. 
Also rolled out the use of resultVariableUiName() to places that should use it.
 2017-01-04 13:13:06 +01:00