OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-24 07:16:53 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,687 Commits 29 Branches 61 Tags 286 MiB
b091333daa
Commit Graph

2817 Commits

Author SHA1 Message Date
Magne Sjaastad
8277080c2e #846 If plot window is hidden, do not open plot window when loading case with summary data 2016-10-04 13:14:39 +02:00
Magne Sjaastad
6313a06f2e #846 Linux fix 2016-10-04 11:44:31 +02:00
Magne Sjaastad
16f8fc186e #846 Removed obsolete flag to closeProject and make sure project is closed when last main window is closed 2016-10-04 11:03:54 +02:00
Magne Sjaastad
3a2454cba0 #851 Added "Open 3D Window" tool button in plot window. Raise mainWindow when activated from toolbar 2016-10-04 11:03:53 +02:00
Jacob Støren
0fc1d9cbf8 #814 Intersection Box: Adjusted UI a bit 2016-10-04 10:10:06 +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
7659f58fd6 #884 Intersection collection is responsible for adding box manipulator geometry to model used in 3D viewer 2016-10-03 14:26:46 +02:00
Magne Sjaastad
1f1fd72f02 #884 Select intersection in property editor when clicking in 3D scene 2016-10-03 13:07:19 +02:00
Magne Sjaastad
bdf880d1ab #884 Update manipulator box when single plane state changes 2016-10-03 10:15:14 +02:00
Jacob Støren
87e7b5dc80 #884 Changed colors to megenta, and improved interface for manipulator a bit. Adjusted size of handles. 2016-10-03 09:39:18 +02:00
Magne Sjaastad
58acd22afa #884 Improved interface to BoxManipulatorPartManager 2016-09-30 15:10:39 +02:00
Jacob Støren
8d5240aca5 #889 Added different icons to the intersection box tree items as well 2016-09-30 13:10:49 +02:00
Jacob Støren
45634df0e9 #889 Added intersection box icons 2016-09-30 13:10:49 +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
b4ec6b3a81 Linux compile fixes 2016-09-30 11:24:02 +02:00
Magne Sjaastad
7b49f6b227 Linux compile fixes 2016-09-30 11:16:45 +02:00
Magne Sjaastad
465a28dfe9 #884 Fixed change from z-coord to depth 2016-09-30 10:28:43 +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
Jacob Støren
11b2469f08 #889 Intersection Box Icon 2016-09-30 09:43:37 +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
1349cf0104 #900 Merged Intersection Boxes into Intersections folder 2016-09-30 08:40:46 +02:00
Jacob Støren
638f5526ac #899 Fixed Grid On/Off state in toolbar 2016-09-29 15:42:19 +02:00
Jacob Støren
cede61dd9a Minor cleanups 2016-09-29 15:41:49 +02:00
Jacob Støren
865d1e1d9c #898 Include inactive cells in box intersections 2016-09-29 14:57:27 +02:00
Jacob Støren
2fa72385ea #897 Use Depth instead of Z 2016-09-29 14:21:22 +02:00
Jacob Støren
a89c5bf320 #896 Reorganized labels in Intersection Box, to make more room for the sliders 2016-09-29 13:32:33 +02:00
Jacob Støren
585eeef726 #894 Fixed intersection box collapse transitions 2016-09-29 10:02:12 +02:00
Jacob Støren
c2eff1b733 Linux compile fixes 2016-09-28 15:07:19 +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
Jacob Støren
cbb626aa31 Merged intersection-box into dev 2016-09-28 14:27:17 +02:00
Jacob Støren
fa6a6b4f08 #817 #815 Improved commands for xyz - slices intersection boxes. 2016-09-28 12:39:43 +02:00
Jacob Støren
0d4e4508dc #892 Fixed problem with one element only gray colors 2016-09-28 09:27:28 +02:00
Jacob Støren
3ca53b6103 Fixed some missing update guards on intersections/intersection box 2016-09-28 09:04:21 +02:00
Jacob Støren
db57bc5b28 #817 Single plane visualization (Avoid creating the other planes) 2016-09-27 11:28:39 +02:00
Jacob Støren
4c98ea2283 #815 First working interpolation scheme, so values are not insane 2016-09-27 10:16:16 +02:00
Magne Sjaastad
6b1dd89b2e #888 Intersection Box: Enable picking on intersection box geometry 2016-09-26 10:35:59 +02:00
Magne Sjaastad
d87aa6a466 #818 Update visibility of fields for slice intersection boxes 2016-09-23 16:17:53 +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
Magne Sjaastad
bb81009b33 #817 New intersection box is created at center of active cells with half the size of active cells bounding box. Grid cell is hidden. 2016-09-23 13:38:08 +02:00
Magne Sjaastad
259df01e0a #817 Regenerate geometry when intersection box is deleted 2016-09-23 13:11:35 +02:00
Magne Sjaastad
633b0a136a Guard for null pointer 2016-09-23 13:10:54 +02:00
Magne Sjaastad
c16daff875 #814 Clamp values and added support for collapse to single plane 2016-09-23 11:37:33 +02:00
Jacob Støren
d9f71ad054 #815 Box is now working with correct clipping. Values are not correct on edges of the box. 2016-09-23 11:13:42 +02:00
Magne Sjaastad
88e40aa2d9 #886 LAS Export: Set the STEP if the data is resampled 2016-09-23 10:20:05 +02:00
Magne Sjaastad
8514664d06 #880 LAS: Export of TVDRKB 2016-09-23 10:07:15 +02:00
Magne Sjaastad
120cc8b6dc #887 Category Legend: Limit legend height when having few categories 2016-09-22 15:31:21 +02:00
Magne Sjaastad
993a67edb6 Increased number of items in recent files to 9 2016-09-22 15:01:52 +02:00
Magne Sjaastad
d9c383f7d3 #815 Rebuild geometry when min/max values for intersection box changes 2016-09-22 14:54:46 +02:00
Magne Sjaastad
61b7a6c57d #815 Initialize intersection boxes after loading of case 2016-09-22 10:38:57 +02:00
Magne Sjaastad
3d83d32055 #815 Fixed issue for use of setFromPointAndNormal 2016-09-22 10:09:03 +02:00
Magne Sjaastad
e3cec5bfec #815 Wired up infrastructure for intersection box from view to geometry generators 2016-09-22 10:09:03 +02:00
Jacob Støren
8f501d96ea #815 Reentered Whitespace 2016-09-21 15:05:59 +02:00
Magne Sjaastad
e789694780 #815 : Intersection Box : Added PartManager and SourceInfo 2016-09-21 14:47:02 +02:00
Jacob Støren
33296e4424 #815 Preliminary box calculations lacking some clipping 2016-09-21 14:21:45 +02:00
Magne Sjaastad
531aaaa445 AppFwk : Fixed typo of firstAncestorOrThisOfType 2016-09-21 13:59:41 +02:00
Magne Sjaastad
1bcfc41542 #883 Las Export: Inconsistency in NULL value 2016-09-21 13:41:33 +02:00
Magne Sjaastad
16d5506bc2 #882 More space in dialog 2016-09-21 13:08:29 +02:00
Magne Sjaastad
86dcc29bce #882 Enable export LAS command for Tracks, Plots and Well Logs Folder 2016-09-21 13:04:34 +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
73057cdcdc #815 More renaming CrossSection -> Intersection 2016-09-21 11:09:37 +02:00
Jacob Støren
f734bf595b #815 Renamed RimCrossSectionCollection -> RimIntersectionCollection 2016-09-21 10:52:16 +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
Jacob Støren
16ab7fcb72 #815 More renaming CrossSection -> Intersection 2016-09-21 10:36:11 +02:00
Jacob Støren
0083fb068f #815 More renaming CrossSection -> Intersection 2016-09-21 10:32:29 +02:00
Jacob Støren
1c612030ef #815 Renamed CrossSection -> Intersection 2016-09-21 10:15:38 +02:00
Magne Sjaastad
33abbed1fd #882 RiaApplication : Renamed to lastUsedDialogDirectory and added currentProjectPath. Use project path as fallback path for LAS export 2016-09-21 09:46:17 +02:00
Magne Sjaastad
c08dce7167 #815 Prototype of interface for RivIntersectionBoxGeometryGenerator 2016-09-21 08:50:55 +02:00
Magne Sjaastad
bb906cdbe2 #815 Moved code to RivHexGridIntersectionTools 2016-09-21 07:57:39 +02:00
Magne Sjaastad
935d49dfdb #815 Moved files to Intersections folder 2016-09-20 16:09:27 +02:00
Magne Sjaastad
b524abc48d #815 Moved common geometry code to HexGridIntersectionTools 2016-09-20 15:57:06 +02:00
Magne Sjaastad
45952e59d3 #814 New project tree items Intersection Boxes and Intersection Box. Support for add, toggle and delete 2016-09-20 12:03:26 +02:00
Magne Sjaastad
ae6397c5c6 #821 Fixed missing include on Linux 2016-09-19 11:22:45 +02:00
Magne Sjaastad
7de4f8f175 #821 Added export dialog with resampling support 2016-09-19 11:17:36 +02:00
Magne Sjaastad
cb6d9d714b #821 Added RigLasFileExporter. Export one LAS file for same case, well and date. 2016-09-16 12:47:27 +02:00
Magne Sjaastad
1e4a96d79d #821 Remember export path and replace default file name including '/' with '_' 2016-09-16 12:47:27 +02:00
Jacob Støren
0dfb68babf #838 Turned "Undefined Grid Faults With Inactive" off by default 2016-09-16 12:04:20 +02:00
Jacob Støren
4d005bdfc8 #836 Fixed missing data load when toggling on a curve 
This bug would also cause wrong data to be displayed, if a curve had been toggled off, then changed, and toggled on again.
 2016-09-15 08:19:37 +02:00
Jacob Støren
5e9308f7b3 #821 Implemented a method to do resampling of the well log data. Untested. 2016-09-14 16:33:07 +02:00
Magne Sjaastad
0fc911e50b #837 Set category legend width to 150 px 2016-09-14 08:27:04 +02:00
Magne Sjaastad
91476b43c8 #837 Rename 2016-09-13 14:07:45 +02:00
Magne Sjaastad
b3f036fb0e #837 GeoMech: Added formation property filter. Moved some functionality to RimCellFilter 2016-09-13 13:43:27 +02:00
Magne Sjaastad
384a8cc8e7 #837 Formation Names: Show layer names in property filter (Eclipse) 2016-09-13 13:43:27 +02:00
Jacob Støren
ba0a3b53f5 #820 Use TVDMSL as channel name for TVD 2016-09-13 11:19:27 +02:00
Jacob Støren
9041e4a582 #836 Fixed missing/wrong zoom update for well log plots when opening project. 
Refactored the zoom update method names
 2016-09-13 09:59:34 +02:00
Jacob Støren
2ea167337f #820 Export of TVD along with MD to LAS file 
Now the tvd data is always put into the RigWellLogCurveData
Existing tvd data is written to LAS file.
 2016-09-12 16:43:31 +02:00
Jacob Støren
a4fb6a37ae #829 Improved category colors slightly 2016-09-12 14:29:00 +02:00
Jacob Støren
0b4a0fef4c #852 Set default summary curve line thickness to 2 2016-09-12 13:15:39 +02:00
Jacob Støren
88af194702 #829 Update display and pick information when reloading / selecting a formation names file 2016-09-12 13:15:39 +02:00
Magne Sjaastad
e360c55e16 #272 Rename 2016-09-12 11:24:15 +02:00
Magne Sjaastad
7306950d9d #831 Category legend use full height to be able to show as many category names as possible 2016-09-12 11:11:25 +02:00
Jacob Støren
25d5a500f0 #829 improved category palette 2016-09-09 14:59:20 +02:00
Jacob Støren
38c0b29b84 #829 Ordered the legend for formation names in the natural top to bottom order 2016-09-09 12:11:00 +02:00
Magne Sjaastad
077351cd04 #272 Use combo box to switch between predefined and custom cell edge result 2016-09-09 11:47:00 +02:00
Magne Sjaastad
2f5acc38ac Added debug output of grid name and size, added comments 2016-09-09 11:47:00 +02:00
Jacob Støren
39d82a28f4 #829 Use interpolated colors in category legend by default 2016-09-09 11:17:08 +02:00
Jacob Støren
c360040213 #829 Added a comment on link to color info 2016-09-09 09:59:35 +02:00
Magne Sjaastad
0a523a252a #828 Report and clamp invalid K-values for well connections 2016-09-08 15:21:40 +02:00
Magne Sjaastad
1180db39f7 #829 Rename 2016-09-08 10:43:26 +02:00
Magne Sjaastad
0f88475fd8 #829 Show formation colors for all time steps 2016-09-08 08:50:10 +02:00
Jacob Støren
f057f684b1 #829 Sorted category colors by hue 2016-09-08 08:19:26 +02:00
Jacob Støren
78b29fc3a0 Fixed zoom all bounding box issue related to 1209c908e5 
Used explicit mainRendering instead of renderSequence->firstRendering()
 2016-09-07 15:54:12 +02:00
Magne Sjaastad
45f56b9fab #829 Use HUGE_VAL for k-layers not covered by formation definitions 2016-09-07 13:31:49 +02:00
Jacob Støren
1209c908e5 Fixed clip plane related assert on linux. Hopefully the final fix of trouble related to : ca6e650a72 and 80985785 and 0128baddff 
The fundamental problem was that the quad rendering was included in the boundingbox.
 2016-09-07 12:52:40 +02:00
Magne Sjaastad
cf8190cbf1 #829 Eclipse: Set default legend mapping and color range when selecting a category result 2016-09-07 11:41:02 +02:00
Magne Sjaastad
f404299702 (#829) Moved RimLegendConfig as a private field to be able to switch between standard and single var result color 2016-09-07 11:12:45 +02:00
Magne Sjaastad
f1c214c1d7 (#829) Use std::vector instead of std::set for categories. Added categoryNames to RimLegendConfig 2016-09-07 11:12:31 +02:00
Magne Sjaastad
3e40db6ef0 #827 Refactored CategoryMapper function names and added comments 2016-09-07 08:52:32 +02:00
Magne Sjaastad
3ddec2c65a Allow grids with varying number of active cells to be part of same grid group 2016-09-06 15:11:39 +02:00
Magne Sjaastad
9281156d4d Fixed missing clear of statistics data cache 2016-09-06 15:11:39 +02:00
Jacob Støren
fcace2a92b Merge Formation Names coloring work and FlowDiagnostics integration 2016-09-06 14:17:50 +02:00
Jacob Støren
e4e3c37f89 #811 Setting default legend type for category results 2016-09-06 14:03:02 +02:00
Jacob Støren
3e8873c870 #812 and related to #272 Formation and Category for Cell edge 2016-09-06 12:17:02 +02:00
Jacob Støren
c903e87dfd #811, #812 WIP, Formation names coloring of cells. First shot. Works but needs refinment. 2016-09-06 10:27:30 +02:00
Magne Sjaastad
5420960b22 #826 Added opm-flowdiagnostics libary with a basic test 2016-09-05 15:23:24 +02:00
Magne Sjaastad
8b16c036fd Commented out local file path usage 2016-09-05 15:22:22 +02:00
Magne Sjaastad
a83e797e63 Fixed missing grid box geometry when a hidden view was activated 2016-09-02 14:19:20 +02:00
Magne Sjaastad
191788643c #719 Extended Grid Box axis to make sure a label coord is present both above max coord and below min coord 2016-09-02 14:04:17 +02:00
Magne Sjaastad
c9be561937 #722 Grid Case Group Statistics: Include in-active cells for ACTNUM statistics 2016-09-01 18:34:59 +02:00
Magne Sjaastad
f1451a1126 #724 Grid Case Group Statistics: Add option to include in-active cell value as zero 2016-09-01 18:08:51 +02:00
Magne Sjaastad
1b38326d83 #279 Include cleanup 2016-09-01 13:01:17 +02:00
Magne Sjaastad
0128baddff #279 Use frame buffer objects for snapshots when available, otherwise use grabFrameBuffer() 2016-08-31 17:34:31 +02:00
Magne Sjaastad
457c3c732b #569 Added font sizes 12, 24, and 32 2016-08-29 14:25:50 +02:00
Jacob Støren
f3e4a6edea #819 Added reload formation names command 2016-08-26 16:12:55 +02:00
Jacob Støren
f03e6de1f2 #810, #813, #808 Display formation name when picking 2016-08-24 15:19:39 +02:00
Jacob Støren
b46c6ebcf8 #809 Created Formation Names project items. 
#819 Added delete command to Formation names
#808 Added an import Formation Names command
 2016-08-24 08:30:12 +02:00
Jacob Støren
5260a3f870 #478 Allowed static results (INIT-file) to not have values for LGRs 2016-08-22 17:00:57 +02:00
Jacob Støren
b305202a35 #478 Made access function const in ActiveCellInfo 2016-08-22 16:59:22 +02:00
Jacob Støren
cf93a67b5e #273 Undefined grid faults between cells where one or both are inactive is now sorted into a seaparate predefined fault section. 2016-08-22 13:24:46 +02:00
Jacob Støren
37099929d6 #273 Added some comments 2016-08-22 10:48:40 +02:00
Jacob Støren
5d0c0cdc67 Fixed assert due to two fields in uiordering in GeoMechPropertyFilter 2016-08-22 10:39:44 +02:00
Jacob Støren
c1f5ec5bdf #168 Finalized. Zoom along ray is now updated to cope with parallel projection. The code in the different navigations are cleaned up a bit, and alligned 2016-08-17 10:54:15 +02:00
Jacob Støren
fbcf9fca11 #168 Merged in parallel projection 2016-08-16 23:20:33 +02:00
Jacob Støren
27830dcbeb #168 Added Perspective/parallel view tool button 2016-08-16 22:43:22 +02:00
Jacob Støren
4eddcc859a #168 Save and restore of parallel projection 2016-08-16 14:34:37 +02:00
Jacob Støren
0eace5579a #168 Fixed shader based light in parallel projection 
Added the light position as a uniform in the standard light model shader snippet in the effect generator.
Set the uniform default value on the shader program where ever it is used.
Added an override global uniform set on the viewer to control the light position, and to set it far behind camera when in parallel projection.
 2016-08-16 10:58:07 +02:00
Jacob Støren
742ee46f78 #168 Grid box side visibility now handles parallel projection 2016-08-15 08:57:20 +02:00
Jacob Støren
5cdf307d4e WIP: Improved support for parallel projection. #168 
Near plane negative to show everything
ZoomAlongRay now works for parallel projection (only implemented in
ceetron Plus)
 2016-08-15 08:55:28 +02:00
Magne Sjaastad
cea77a4299 Merged in changes from maintenace branch 2016-08-12 14:53:04 +02:00
Magne Sjaastad
623c07a2f0 Fixed more compiler warnings for variables declared outside an OpenMP loop 2016-08-12 14:48:13 +02:00
Magne Sjaastad
e754a04275 #727 Fixed issue for dual porosity case and simplified logic related to valid result names 2016-08-12 14:24:41 +02:00
Magne Sjaastad
541c770b80 Fixed compiler warnings for variables declared outside an OpenMP loop 2016-08-11 15:30:55 +02:00
Magne Sjaastad
cb4aa45cd3 Merged in changes from maintenance branch 2016-08-11 10:29:14 +02:00
Magne Sjaastad
6d95261410 Removed obsolete includes to cafPdmUiTreeView 2016-08-11 09:10:56 +02:00
Magne Sjaastad
0b8285d333 #723 Make sure a view is created if no view is present for a statistics case 2016-08-11 08:51:32 +02:00