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,453 Commits 27 Branches 61 Tags 309 MiB
f59c4b4b9e
Commit Graph

110 Commits

Author SHA1 Message Date
Magne Sjaastad
c180e06172 Removed duplicate feature 2017-02-22 09:43:15 +01:00
Magne Sjaastad
1753449772 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
 2017-02-22 09:42:51 +01:00
Magne Sjaastad
b2ec4e055f #1174 Added Show contributing wells from 3D view 2017-02-21 09:49:27 +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
722492b5c1 #1180 Use RiaColorTables for selection colors in 3D view 2017-02-10 08:27:20 +01:00
Magne Sjaastad
b13ca8bb1c #1135 Compute accumulated length along sim well and added slider 2017-01-30 14:28:41 +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
723e0f9286 #1107 #1111 Added update of well allocation plot from 3D view 2017-01-13 13:32:17 +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
9cacf0db6c #1068 Access mainGrid directly from RimEclipseView 2017-01-10 09:20:03 +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
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
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
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
Jacob Støren
ef0a12ea66 Moved New Polyline Intersection context command in viewer together with the other intersection commands. Reordered View link commands 2016-11-17 17:40:31 +01:00
Magne Sjaastad
9e0cf779b6 #949 Intersection : Convert coordinates using DisplayCoordTransform 2016-11-02 14:44:51 +01:00
Jacob Støren
c93c7e41df #933 Fixed the closes result for intersections also. Display the tensor data from the closest element node transformed onto the plane. 2016-10-26 17:14:33 +02:00
Jacob Støren
a9b2451cdd #933 Fixed closest result for pr element face-node result when picking on elements. Also fixed the result plot in the same respect. 2016-10-25 14:39:50 +02:00
Magne Sjaastad
e732d5c373 #922 Use setValueWithFieldChanged instead of setValueFromUi 2016-10-19 15:30:52 +02:00
Magne Sjaastad
f03e2431f9 #911 Fixed picking on category legend 2016-10-17 11:51:25 +02:00
Magne Sjaastad
27682f2a34 Select simulation well in property editor when picked in 3D view 2016-10-03 14:33:06 +02:00
Magne Sjaastad
1f1fd72f02 #884 Select intersection in property editor when clicking in 3D scene 2016-10-03 13:07:19 +02:00
Jacob Støren
3e48b102f3 #902 A separate command to add an intersection box at a position 2016-09-30 13:10:49 +02:00
Magne Sjaastad
1537b8c0d1 #884 RimIntersectionBox now manages the box manipulator object 2016-09-30 12:33:32 +02:00
Magne Sjaastad
d7a69bdae8 Merged intersection box interactive manipulation 2016-09-30 10:01:17 +02:00
Jacob Støren
7456d1e697 Revert "#902 Create box at position - context command" We need a separate feature for this 
This reverts commit e36b39289f.
 2016-09-30 09:51:11 +02:00
Magne Sjaastad
593d72d63b (#884) Refactor and cleanup 2016-09-30 09:34:45 +02:00
Magne Sjaastad
d4bdbcb7c8 (#884) Added prototype of event handler for interaction with box 2016-09-30 09:34:39 +02:00
Jacob Støren
e36b39289f #902 Create box at position - context command 2016-09-30 09:07:04 +02:00
Jacob Støren
3bca03a722 Fix of missing changes from previous merge commits. Missing rename of anchestor to ancestor 2016-09-28 14:35:57 +02:00
Magne Sjaastad
6b1dd89b2e #888 Intersection Box: Enable picking on intersection box geometry 2016-09-26 10:35:59 +02:00
Magne Sjaastad
5c4b92f9b8 #818 Intersection Box: Added XYZ slices to context menu in 3D view 2016-09-23 16:12:19 +02:00
Jacob Støren
a9d1f52005 #815 More renaming CrossSection -> Intersection 2016-09-21 11:44:28 +02:00
Jacob Støren
d549f45ad0 #815 More renaming CrossSection -> Intersection 2016-09-21 11:38:37 +02:00
Jacob Støren
08baa5ccc9 #815 Renamed RimCrossSection -> RimIntersection 2016-09-21 10:48:25 +02:00
Jacob Støren
e5cf69a3fe #815 More Rename CrossSection -> Intersection 2016-09-21 10:40:08 +02:00
Magne Sjaastad
23bd3c9b0c (#805) Cleaned up includes and generalized access to overlayItemLegend 2016-08-05 17:19:49 +02:00
Magne Sjaastad
686aef821e Cleaned up includes 2016-07-16 16:31:55 +02:00
Magne Sjaastad
0a15ccf577 Fixed missing selection of well path in project tree when clicking on a well path in 3D view 2015-12-16 09:46:08 +01:00
Magne Sjaastad
75b476c063 (#696) Select legend definition when clicking on legend in 3D view 2015-12-08 17:25:48 +01:00
Magne Sjaastad
dc6a50ec3c Renamed from setCurrentObjectInTreeView to selectAsCurrentItem 2015-12-07 10:07:51 +01:00
Magne Sjaastad
a2bfc12c57 (#674) Clicking on items in 3D view selects corresponding item in tree view/property panel 
Clicking on 3D Info box and legends for cell result, separate fault
result and cell edge selects corresponding items in tree view
 2015-12-07 09:59:19 +01:00