OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-16 18:34:54 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,315 Commits 27 Branches 61 Tags 309 MiB
c815cfa835
Commit Graph

151 Commits

Author SHA1 Message Date
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
astridkbjorke
fe9ac8f908 #1044 - pre-proto - Updates in infrastructure for finding i,j,k for simulation well 2017-01-04 09:28:10 +01:00
Magne Sjaastad
d1bf189154 #1040 Established basis for fracture visualization 2017-01-04 08:10:02 +01:00
Jacob Støren
5aed8ea939 #1053 Disabled the All Timesteps option in Legend range selection 2017-01-03 14:58:34 +01:00
Jacob Støren
22143969c1 #1048 Added derived result: Tracer with max fraction 2017-01-03 09:27:25 +01:00
Jacob Støren
003271ff54 #1035 Connected the Flow Diag solver, and added the statistics needed for legend. Now many things work . 2016-12-20 11:41:05 +01:00
Jacob Støren
7222d50645 #1035 Top level systems now access the Flow Diag data. There are none yet, so rendered gray. 2016-12-16 14:53:56 +01:00
Jacob Støren
8562d0e98b Merge with Flow Gui additions 2016-12-14 11:16:08 +01:00
Magne Sjaastad
0fc23c5610 System : Manipulation of time step is now only available from RiuViewer 2016-12-14 10:35:28 +01:00
Jacob Støren
afa381b4b9 #1029 Refactored to prepare for more Flow Diag. Removed use of specific field visibility methods 2016-12-14 10:27:46 +01:00
Magne Sjaastad
860b51931c #1025 Removed unsused code and renamed to isWellPipe/SpheresVisible 2016-12-14 07:15:44 +01:00
astridkbjorke
8e81c53520 #1025 Code cean-up. Removed obsolete scaletransform for cell center spheres. 2016-12-12 11:03:37 +01:00
Magne Sjaastad
f04c56df01 #559 Linked views : Removed obsolete storage of RimView 2016-12-09 21:17:06 +01:00
astridkbjorke
600f3da30a #1025 Established geometry for all well cell centers 2016-12-07 12:06:24 +01:00
Magne Sjaastad
af7dae6374 #945 Improved display of fault labels 2016-11-21 13:13:53 +01:00
Magne Sjaastad
7d52242285 #945 Use visible grid parts to force watertight faults 2016-11-21 13:13:53 +01:00
Magne Sjaastad
50c5ff8da4 #945 Reverted forceWatertightGeometryOn and visibleFaultGeometryTypes to commit 3ba7ade8 2016-11-21 13:13:53 +01:00
Magne Sjaastad
e89b73d64c #945 Removed flag as watertight flag was always set true 2016-11-18 14:05:50 +01:00
Magne Sjaastad
8344617ba9 #945 Improved handling of visible fault geometry when showing faults outside filters 2016-11-18 13:57:01 +01:00
Magne Sjaastad
c52e1809ab #992 Fixed invalid access of nullpointer for property filtered geometry 2016-11-18 10:49:06 +01:00
Magne Sjaastad
3ba7ade88e #945 Rename 2016-11-18 10:49:06 +01:00
Jacob Støren
2c6e6f4a80 #950 Improved the updates, but there is still work to be done. 2016-11-04 08:08:55 +01:00
Jacob Støren
8e95fda144 #846 Plot Window and 3D Window icons 2016-10-04 14:36:49 +02:00
Jacob Støren
1349cf0104 #900 Merged Intersection Boxes into Intersections folder 2016-09-30 08:40:46 +02:00