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
5,231 Commits 27 Branches 61 Tags 309 MiB
2e764b3fe5
Commit Graph

177 Commits

Author SHA1 Message Date
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