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
4,128 Commits 28 Branches 61 Tags
da371c099bff6f65d7a5db191ecd58e087cdced6
Commit Graph

663 Commits

Author SHA1 Message Date
Magne Sjaastad
da371c099b Merged branch dev into pre-proto 2017-01-19 10:45:22 +01:00
Magne Sjaastad
2edc090c89 Restored previous behaviour related to result accessor creation 2017-01-19 10:39:08 +01:00
Magne Sjaastad
9b42f1ca8c Reverted 4ec7c97a77 
Access of RimEclipseCase was done by firstAncestorOf from, and in several cases RimEclipseCase is not parent of RimEclipseCellColors. RimEclipseCase must be explicitly specified.
 2017-01-19 10:37:59 +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
e0ba009e34 Cleaned up includes 
Removed includes to cvfLibCore and friends. Removed several includes from header files.
 2017-01-17 15:11:02 +01:00
Magne Sjaastad
1b5dc51a7e #1084 Snapshot : Removed header above table 2017-01-17 13:11:09 +01:00
Magne Sjaastad
9c1e9f0970 #1080 Snapshot : Show parameter and case as default 2017-01-17 10:40:38 +01:00
Magne Sjaastad
22f870bff0 #1082 Snapshot : Added four empty rows 2017-01-16 23:21:28 +01:00
Magne Sjaastad
723e0f9286 #1107 #1111 Added update of well allocation plot from 3D view 2017-01-13 13:32:17 +01:00
Magne Sjaastad
0cbdcd587d #1105 Stripped down basic infrastructure code 2017-01-13 13:32:17 +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
8ce8b4e7f1 #1105 Added framework files for Well Allocation plot 2017-01-12 15:00:23 +01:00
Magne Sjaastad
00db484f0c #1056 Do not show time history plots for flow data 2017-01-12 10:42:51 +01:00
Magne Sjaastad
b104b1a97c #1056 Simplified TimeHistoryResultAccessor 
#1056 Simplified TimeHistoryResultAccessor
 2017-01-12 07:22:19 +01:00
Magne Sjaastad
4ec7c97a77 #1056 Removed obsolete code 2017-01-11 21:41:22 +01:00
Magne Sjaastad
4a9fec49bf #1056 Added cell edge picking text info 2017-01-11 21:07:03 +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
f70806e056 #1068 Avoid include of RigCell.h and RigSingleWellResultsData 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
785a5e9ff8 #1060 Use DisplayCoordTransform in ResultTextBuilder 2017-01-09 07:43:17 +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
6b58adb91b #1044 - pre-proto - Updating indexing for i j and k in SimWellFracture to follow Eclipse indexing (starting with 1) and updating depth of z position at wellpath for WellPathFractures to be displayed as positive 2017-01-04 09:35:35 +01:00
Magne Sjaastad
dc970edf7e Merged in changes from dev 2017-01-03 11:32:00 +01:00
Magne Sjaastad
51e8cae11b Added branch index to source info as basis for more work on #1044 2017-01-03 11:11:36 +01:00
astridkbjorke
b3bc0a9135 #1044 - pre-proto - Added function for creating new sim well fracture, not yet setting correct i j k 2017-01-03 09:37:59 +01:00
astridkbjorke
a45ed4bc19 #1038 - pre-proto - Renaming feature for creating new well path fracture 2017-01-03 09:37:59 +01:00
Magne Sjaastad
66d0bc9488 #1018 Snapshot - set dialog width to 1000 2016-12-22 11:55:26 +01:00
Magne Sjaastad
8d8ef3ddc1 #1018 : Snapshot - Use active view as basis for new snapshot definitions 2016-12-22 08:45:50 +01:00
astridkbjorke
46e4815f9a #1038 - pre-proto - added calculation of measured depth along well path when creating new well path fracture in 3D view 2016-12-21 13:40:53 +01:00
astridkbjorke
7784cad47f Merge branch 'dev' 2016-12-21 08:43:57 +01:00
astridkbjorke
f6221340b1 Merge branch 'dev' 2016-12-21 08:38:52 +01:00
astridkbjorke
2022e2dd3d (#1038) - pre-proto - Added new well path fracture from context menu in 3D view. Measured depth along well path for fracture is not yet updated. 2016-12-21 08:35:44 +01:00
Magne Sjaastad
2e3ba3a644 System : Prepare for temporary selection 2016-12-21 08:22:45 +01:00
Magne Sjaastad
ebb191069f System : Added a temporary selection role to for application specific selection items 2016-12-21 08:05:01 +01:00
Jacob Støren
39ff269e5f Merge branch 'dev' of https://github.com/OPM/ResInsight.git 2016-12-20 14:43:28 +01:00
Jacob Støren
4b64de258e Flow: Avoid crash when picking cells with flow Diag results 2016-12-20 14:42:46 +01:00
astridkbjorke
b6a08700a2 #1044 - pre-proto - Started adding feature for making new simulation well fracture in 3D view, but not finished due to missing infrastructure 2016-12-20 13:10:03 +01:00
astridkbjorke
ff996e75ea Show intersection context menu item when linked view is range filter controlled 2016-12-20 11:25:06 +01:00
Magne Sjaastad
b934ae3f26 Merged branch maintenance-enhancements into dev 2016-12-19 15:12:26 +01:00
Magne Sjaastad
2e30ede5e6 #1018 : Allow table rows to be resized 2016-12-19 15:05:53 +01:00
Magne Sjaastad
3d08b453c4 #1018 Snapshots : Show both case name and view name in view description 2016-12-19 08:49:41 +01:00
Magne Sjaastad
d32ce739c7 #552 Linked views : Hide cursor in dependent views when view receives leave event 2016-12-16 14:53:19 +01:00
Magne Sjaastad
27df0a20cf #552 : Linked Views: Cleanup 2016-12-15 19:00:36 +01:00
Magne Sjaastad
4583dbf3b1 #552 Linked Views : Draw a cross hair marker 2016-12-15 18:45:10 +01:00
Magne Sjaastad
90a2d384d3 #552 Linked Views : Prototype - show label at cursor position in dependant views 2016-12-15 18:20:43 +01:00
astridkbjorke
f57f9d356e #1018 Added saving of snapshots to loop infrastructure already established 2016-12-15 13:57:13 +01:00
astridkbjorke
8bf1456644 #1018 Added loops for making multiple snapshots based on user input in widget. Filnames are generated, but no images saved yet. 2016-12-15 13:57:13 +01:00
Jacob Støren
ec5ad417f3 #1035 Renamed overloaded methods in result accessor to make it easier to see where the flow interception must come. 2016-12-14 14:51:53 +01:00
Magne Sjaastad
69695ffa32 #1018 Snapshots : Resize rows and columns to content 2016-12-14 12:42:13 +01:00