Commit Graph

129 Commits

Author SHA1 Message Date
Bjørnar Grip Fjær
1c483c7420 #1697 Export of visible cells to FLUXNUM / MULTNUM .GRDECL file 2017-08-29 14:30:01 +02:00
Magne Sjaastad
4718caed9a #1794 Put all fracture command ids inside ifdefs 2017-08-21 20:44:28 +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
Magne Sjaastad
a45aee0cc2 Merge branch 'fishbones' into pre-proto 2017-05-23 10:28:42 +02:00
Magne Sjaastad
6e78c0b2cc Fix computation of measured depth when picking in 3D 2017-05-20 20:10:03 +02:00
Magne Sjaastad
829df457ff #1502 Fishbones : Add "New Perforation" to context menu when clicking on well path 2017-05-19 11:03:22 +02:00
Magne Sjaastad
f81ef5b2fe #1486 Use RiuWellPathSelectionItem to communicate data to feature 2017-05-16 10:22:16 +02:00
Magne Sjaastad
a8cab547a0 1251 Added RivObjectSourceInfo for selecting any pdmObject 2017-05-05 12:18:10 +02:00
Jacob Støren
6f07a3698b #1427 Enable the new Well Log Curve command for Simulation Wells 2017-04-25 16:12:55 +02:00
Magne Sjaastad
8255a3aaa3 Merge branch 'dev' into pre-proto 2017-04-03 07:34:56 +02:00
Jacob Støren
ba60bf3c13 #1321 Added a comand to show Flow Characteristics plot. Added timestp colors, zoom, mouse tracking, and titles 2017-03-28 23:36:56 +02:00
Magne Sjaastad
bdf2ea4961 #1323 Added context menu in 3D "Plot Time History for Selected Cells" 2017-03-19 08:59:46 +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
a81980c235 #1185 Added "Plot Production Rates" for sim well in 3D and project tree 2017-03-08 11:42:08 +01:00
Magne Sjaastad
10f14aee8e Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-02-27 07:13:06 +01:00
Magne Sjaastad
5c20bff5d1 #1255 Remove includes from header files 2017-02-24 11:07:26 +01:00
Magne Sjaastad
555ecba8b3 #1251 Added RivObjectSourceInfo for selecting any pdmObject 2017-02-23 11:52:56 +01:00
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