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
12,075 Commits 27 Branches 61 Tags 309 MiB
e9086005d4
Commit Graph

252 Commits

Author SHA1 Message Date
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
Magne Sjaastad
e65facd590 (#404) Added RicViewerEventInterface and moved well path text display into a separate class 2015-12-04 15:15:54 +01:00
Magne Sjaastad
27206cab3b (#404) Added display of picked well path text in Result Info 2015-12-04 15:15:54 +01:00
Magne Sjaastad
3eade62961 (#641) Use checkable button for point input from viewer 2015-12-01 12:34:30 +01:00
Magne Sjaastad
8b3adf0f5b (#641) Refactoring to improve readability 2015-12-01 12:34:29 +01:00
Magne Sjaastad
bd2a65acb4 (#641) Create user defined polyline by clicking on reservoir cells 2015-11-27 17:18:51 +01:00
Jacob Støren
7b9f2b41ed CppCheck fixes, Errors Warnings and performance 2015-11-27 16:37:26 +01:00
Magne Sjaastad
3c4142fc52 (#678) Show context menu commands on intersection 
Added hide intersection
 2015-11-26 16:01:23 +01:00
Jacob Støren
3e78eebee3 (#633) Cross sections on simulation wells 2015-11-26 11:09:10 +01:00
Magne Sjaastad
9429458d32 Rename from cells to globalCellArray 2015-11-24 14:21:02 +01:00
Magne Sjaastad
1890ff19f9 (#664) Picking on intersections for eclipse and geo models 2015-11-24 14:14:39 +01:00
Magne Sjaastad
0b097ec2eb Hide cross section command from context menu of simulation well 2015-11-21 15:36:01 +01:00
Magne Sjaastad
ca5dc6e80a Removed unused function 2015-11-19 19:04:28 +01:00
Magne Sjaastad
115e0cb660 (#657) Improved 3D view commands and context menu creation 2015-11-19 18:57:32 +01:00
Magne Sjaastad
69e30dc8bc (#657) Added support for creation of cross section from simulation well context menu 2015-11-18 18:21:22 +01:00
Magne Sjaastad
dc894928b5 (#657) Added support for creating a cross section from well path context menu in 3D viewer 2015-11-18 17:55:05 +01:00
Jacob Støren
7b65cb91ce (#625) Added access to the generalized propertyFilterCollection in the view 2015-11-12 10:48:13 +01:00
Magne Sjaastad
a13376a8bf (#632) Update application items when selection changes using a separate class 
Added RiuSelectionChangedHandler
Moved code from ViewerCommands into SelectionChangedHandler
 2015-11-11 11:41:11 +01:00
Magne Sjaastad
a584bcfdf6 Removed unused functions and variables 2015-11-10 11:11:13 +01:00
Magne Sjaastad
17493070ac (#632) Improved colors used for selection and time history curves 2015-11-10 09:43:56 +01:00
Magne Sjaastad
f05385129b (#632) Single click on cell gives single cell selection for curves, CTRL + click appends 2015-11-10 08:58:17 +01:00
Magne Sjaastad
7cd2cd0f50 (#632) Add Eclipse cell to selection and show in 3D view and time history plot 
Consolidated remove of model based on name in RimView
Cleanup selection and time history plot when project is closed
 2015-11-09 19:05:31 +01:00
Magne Sjaastad
cef31b2c4a (#612) Make sure time step dates are taken from scalar dataset with highest time step count 2015-11-05 14:12:49 +01:00
Magne Sjaastad
e3d76be0aa (#612) Improved user interaction for adding/deleting curves 
When time hist plot is visible,
CTRL + mouse click on a cell adds curve to plot
Mouse click outside clears curve plot
 2015-11-05 13:48:10 +01:00
Magne Sjaastad
ff6e2755aa Added time history plot for geo mech models 2015-11-05 13:48:10 +01:00
Magne Sjaastad
b30604edd1 Rename 2015-11-05 13:48:09 +01:00
Magne Sjaastad
7db6835075 (#612) Append new curves on cell click, clear when no cell is hit 2015-11-05 13:48:09 +01:00
Magne Sjaastad
0011f090de (#612) Time history result accessor and display of curve from selection 2015-11-05 13:48:08 +01:00
Magne Sjaastad
cb1723494c (578) Disable commands in 3D view if range/property is overridden 2015-11-02 09:50:42 +01:00
Magne Sjaastad
0405584bb6 System : Replaced tab with four spaces in ApplicationCode and subfolders 2015-10-23 15:46:25 +02:00
Magne Sjaastad
dbd6ce09c5 (#539) Check for NULL pointer when deciding what kind of range filter collection to use 
As the management of override range filter collection is handled
independenly from scheduleRedraw, we must check for a valid pointer when
trying to access the override range filter
 2015-10-21 13:32:10 +02:00
Magne Sjaastad
8de8100c3e (#539) When view is unlinked, ask user to keep either override or original range filter collection 2015-10-21 13:16:09 +02:00
Pål Hagen
9830522745 (#546) Check if they should be enabled before adding well path related context menu items 2015-09-25 17:10:17 +02:00
Jacob Støren
5b9bf3bcd2 (#518) Removed link visible views from 3DView context menu 
Modified the command enabled state to be enabled only when it is sensible to run it.
(Unlinked views is present.)
 2015-09-25 15:24:32 +02:00
Pål Hagen
759302b370 (#446) Added "Link Visible Views" to 3D context menu 2015-09-22 14:26:23 +02:00
Pål Hagen
ae1cc96979 (#501) "Link view" context menu items only visible when clicking the background 2015-09-22 13:34:43 +02:00
Pål Hagen
ff1f7b24b5 (#468) Showing well log plot context menu items only when a well path is picked 2015-09-22 13:14:08 +02:00
Pål Hagen
75dc7376ad (#404) Selecting well path in the tree view when picked in the 3D view 
Added method for setting selection based on the picked part.
 2015-09-22 10:30:11 +02:00
Pål Hagen
be29a06883 (#501) Always displaying well log curve creation commands in the context menu 
The command feature system handles enabled/disabled state.
 2015-09-22 10:02:03 +02:00
Pål Hagen
0daaba58a4 (#501) Made sure that "link view" items in the context menu don't need hit info in the view 2015-09-22 09:40:44 +02:00
Pål Hagen
5e58cb141e (#468) Added context menu item in 3D view for plotting of well log extraction curves 2015-09-21 14:24:29 +02:00
Pål Hagen
8667b6baa0 (#468) Added context menu item in 3D view for plotting of logs from LAS files 2015-09-21 14:02:33 +02:00
Magne Sjaastad
f1e11780ce (#446) Added feature "Set master view" to context menu in 3D and in project tree 2015-09-16 15:13:56 +02:00
Magne Sjaastad
d99c5daee1 Added icons to context menu in 3D view 2015-09-15 16:33:41 +02:00
Magne Sjaastad
708e34045d (#446) Added link view commands to context menu in 3D view 2015-09-15 16:33:41 +02:00
Pål Hagen
6eaef49996 (#404) Using well path pointer instead of index for source info for picking 2015-09-07 16:17:40 +02:00
Pål Hagen
4d4ed88041 (#404) Displaying well path name when a well path is picked 
TODO: Display depth and additional well data
 2015-09-07 12:21:22 +02:00
Magne Sjaastad
4618f50e9e (#407) Disable "Add property filter" for per-cell face color results 2015-09-07 10:12:59 +02:00
Pål Hagen
0c8600c6dd (#355) Got rid of all RimUiTreeModelPdm includes 2015-08-24 17:42:42 +02:00
Pål Hagen
0bd54ba98a (#355) Removed out-ifdef'ed obsolete code related to the old project tree view 2015-08-24 16:06:20 +02:00
Jacob Storen
f3810640ca Fixed Linux compile issues 2015-08-14 06:42:12 -07:00
Jacob Støren
85ea085c4e (#371) RiuViewerCommands: Used the new exec commands 2015-08-14 13:27:26 +02:00
Magne Sjaastad
57e363896f Replaced uiField() and xmlField() with uiCapability() and xmlCapability() 2015-08-05 12:34:07 +02:00
Magne Sjaastad
737936d846 Major modularization adjustments 
Use uiField() when issuing setUi....() commands
Use PdmChildArrayField instead of PdmPointersFielc
Use PdmChildField instead of PdmField to pdm pointer objects
Use PdmChildArrayField instead of PdmField< std::list< caf::PdmPointer<
type > > >
Use PdmObjectHandle instead of PdmObject
Replaced parentFields(std::vector)  with parentField()
Use PdmUiPropertyViewDialog instead of PdmUiPropertyDialog
 2015-07-31 18:58:23 +02:00
Pål Hagen
68a7993105 (#342) Added "Add property filter" to the 3D view's context menu 2015-06-30 15:37:53 +02:00
Pål Hagen
320b0c62c4 (#260) Displaying NNC info and intersection point for picked faults when there's no cell index 2015-06-30 13:25:11 +02:00
Pål Hagen
04d70a9204 (#260) Fixed problem with picking faults in some rare cases 
Made sure that we handle the case when an item has been hit which is not
a non-NNC item.
 2015-06-30 12:05:24 +02:00
Jacob Støren
cfb0bfeb55 Moved RivCellSetEnum to a separate file. 
Preparations for property filtering
 2015-06-18 14:17:03 +02:00
Jacob Støren
3d0e0ace7a Linux compile fix 2015-06-11 13:15:59 +02:00
Jacob Støren
385fa55cdc Fixed one linux compile error and cleaned out some compiler warnings 2015-06-11 13:05:59 +02:00
Jacob Støren
4f77afe43c Implemented #310 Result info when picking 
This included some refactorization to remove the command stuff out of
RiuViewer,
and to communicate the grid index via the source info struct, and not as
a cvfPart::id
 2015-06-11 11:38:51 +02:00