Commit Graph

932 Commits

Author SHA1 Message Date
Rebecca Cox
85cd8b0e1d 3D Well Log Curve: Give Plane Part Mgr more responsibility 2018-03-21 15:32:15 +01:00
Jacob Støren
203677e837 Merge several 2D Intersection View fixes (MD and Perf intervals) into dev 2018-03-21 14:27:20 +01:00
Jacob Støren
dd29a3c727 #2634 Fix wrong MD when context menu creating completions in 2D intersectino View 2018-03-21 14:13:56 +01:00
Jacob Støren
25ff51c82b #2630 Fix wrong picked MD on clipped well paths 2018-03-21 13:56:24 +01:00
Jacob Støren
2b4e26aaca #2630, #2605 unfalltenedTransformMatrix now returns mx[0] and mx[last] for points before and after end. 2018-03-21 13:47:22 +01:00
Rebecca Cox
e688b3de36 #2591 3D well log curves: Increase size of offset between pipe and plot 2018-03-21 13:46:03 +01:00
Rebecca Cox
a1d82fcffa #2633 3D well log curves: Clip curve on well path bounding box 2018-03-21 13:15:48 +01:00
Rebecca Cox
b20b633c40 #2633 3D well log curves: Use currect normals when making grid 2018-03-21 13:14:22 +01:00
Unknown
687ddcb0a6 #2591 3D well log curves: Only add grid if curve is added 2018-03-21 10:54:26 +01:00
Unknown
131eb64748 #2633 3D well log curves: Clip grid on well path bounding box 2018-03-21 10:54:26 +01:00
Jacob Støren
c22bafbf29 #2605 Show perforations along well path in 2D intersections view 2018-03-20 17:28:27 +01:00
Jacob Støren
65b35cff92 #2481, #2605, #2486, #2568 Remove obsolete code 2018-03-20 15:44:45 +01:00
Jacob Støren
a9daea0938 #2481, #2605, #2486 Use a flattened version of the normal wellpath visualization in 2D intersection view 2018-03-20 15:44:45 +01:00
Unknown
0de43ac938 #2628 3D well log curves: Scale curves by grid size 2018-03-20 15:37:02 +01:00
Unknown
cc5f4b2ec6 #2591 3D well log curves: Add grid line along path 2018-03-20 13:51:59 +01:00
Magne Sjaastad
57a766fd09 Return if geometry generator is null 2018-03-20 13:18:24 +01:00
Unknown
8766ea3057 #2591 3D well log curves: Option to turn grid on/off 2018-03-20 11:29:59 +01:00
Unknown
60120c70d5 #2591 3D well log curves: Make point normal function use well path geom 2018-03-20 11:29:59 +01:00
Unknown
e1aa4bb164 #2591 3D well log curves: Draw normals on fixed interval 2018-03-20 11:29:59 +01:00
Magne Sjaastad
241bf0364c #2600 Well CF Visualization: Make sure all connections are visualized 2018-03-19 14:41:46 +01:00
Unknown
af4b35b990 #2618 Tensor Vectors: Add arrow length scaling range option for result 2018-03-19 11:16:53 +01:00
Magne Sjaastad
0583c7a815 Rename 2018-03-16 16:46:51 +01:00
Magne Sjaastad
200873f2da Code cleanup 2018-03-16 16:12:25 +01:00
Magne Sjaastad
1aad577a49 #2544 Well CF Visualization: Use simplified star geometry 2018-03-16 15:58:04 +01:00
Magne Sjaastad
7bb705b1b7 #2600 Well CF Visualization: Add picking on connection factor objects 2018-03-16 15:33:57 +01:00
Magne Sjaastad
471d625051 #2621 Improve interface of part managers to prepare for use in 2D intersection views 2018-03-16 11:48:51 +01:00
Magne Sjaastad
4853957637 #2544 Well CF Visualization: Add geometry generator and source info object
rename


remove unused


move to separate file


rename
2018-03-15 21:27:42 +01:00
Magne Sjaastad
eb6b7450eb #2544 Well CF Visualization: Add support for no lighting 2018-03-15 19:20:40 +01:00
Magne Sjaastad
f55d029256 #2544 Well CF Visualization: Make the orientation of the star geometry follow well path 2018-03-15 19:19:18 +01:00
Jacob Støren
4ac0a6354c #2552 Simulation well heads for branches in 2d intersection view 2018-03-15 14:46:57 +01:00
Rebecca Cox
69caf4b3b2 #2591 3D Well Log Curve: Make geometry making more robust 2018-03-15 13:05:00 +01:00
Rebecca Cox
cc47016572 #2597 3D Well Log Curve: Add option to create LAS curve 2018-03-15 13:05:00 +01:00
Magne Sjaastad
c8b92a0c89 #2601 Well CF Visualization: Support regeneration of viz on time step changes 2018-03-15 07:52:54 +01:00
Magne Sjaastad
cf1557fdf8 Include cleanup 2018-03-14 15:26:19 +01:00
Jacob Støren
9f42c45dcc Include cleanup SimWellPipespartMgr 2018-03-14 15:13:25 +01:00
Jacob Støren
bb28cf3f09 #2552 Add well head visualization. Not yet working for multiple branches 2018-03-14 15:13:25 +01:00
Jacob Støren
1861255281 #2552 Fix visualization of branch-depth, both wells and intersection geoemetry. 2018-03-14 15:13:25 +01:00
Jacob Støren
9cad0bff1e #2552 Refactor and align the partmanagers of sim well and sim well head. Prepare to get wellhead into 2d intersection views 2018-03-14 15:13:24 +01:00
Jacob Støren
b755ddc11d #2552 Embed pipe visualization of Simulation Wells in intersection views 2018-03-14 15:13:24 +01:00
Jacob Støren
e52c88ff77 #2552 WIP : Add flattening code to simwell part generator 2018-03-14 15:13:24 +01:00
Jacob Støren
1fa898b798 #2552 Small refactorings 2018-03-14 15:13:24 +01:00
Jacob Støren
e314450e2e #2552 Minor refactoring 2018-03-14 15:13:24 +01:00
Jacob Støren
543c99371b #2552 Use displayCoordTransform and redability changes 2018-03-14 15:13:24 +01:00
Magne Sjaastad
0aba950c12 #2544 Well CF Visualization: Use coordinate on well path as center 2018-03-14 14:35:45 +01:00
Magne Sjaastad
b1fc73bc95 #2544 Well CF Visualization : Add basic star geometry 2018-03-14 14:35:45 +01:00
Rebecca Cox
46c4693ae6 3D well log curve: Establish a coordinate system for curve normals 2018-03-14 14:22:18 +01:00
Magne Sjaastad
108ef5eecc #2544 Well CF Viz : Add basiz viz with spheres, add legend to view 2018-03-14 09:35:48 +01:00
Rebecca Cox
2fa8202332 #2592 3D well log curves: Update curves after editing properties 2018-03-13 11:18:38 +01:00
Rebecca Cox
ae077b86fd lenght -> length 2018-03-13 10:55:35 +01:00
Rebecca Cox
60adcf299a Fix build. include cmath 2018-03-13 09:42:54 +01:00
Rebecca Cox
cf4830e0ad #2592 3D well log curves: Visualize results 2018-03-13 09:25:29 +01:00
Rebecca Cox
3da3856c51 #2591 3D well log curves: Add grid along well path 2018-03-12 16:18:45 +01:00
Bjørn Erik Jensen
1e8f1bb95e #2589 intersections. Show extrusion line fix 2018-03-12 15:14:22 +01:00
Bjørn Erik Jensen
e13702a88a #2485 Intersection. Field controlling polylines visibility 2018-03-12 13:27:32 +01:00
Magne Sjaastad
716bb3184b System : Replace tab with four spaces 2018-03-12 11:12:39 +01:00
Magne Sjaastad
8e8c168405 #2546 Well Connection Factors : Several changes related to data access
Moved rig classes from command feature into ReservoirDataModel\Completions\
2018-03-12 11:07:46 +01:00
Jacob Støren
009ae7c750 #2552 Separated the flattening code, to be able to use it to flatten simwells and wellpaths 2018-03-12 10:00:09 +01:00
Jacob Støren
ec5a9e1682 #2552 Generalized the flatting transforms to be able to reuse for simwells and wellpaths 2018-03-12 10:00:09 +01:00
Rebecca Cox
c63aee779d #2585 3d Well Log Curves: Draw line along well path 2018-03-09 15:42:23 +01:00
Rebecca Cox
540c4e57c9 #2585 Fix build??? 2018-03-09 14:09:54 +01:00
Rebecca Cox
62a2ddfe82 #2585 Fix linux build 2018-03-09 14:00:41 +01:00
Rebecca Cox
d72d5ba343 #2585 Fix linux build (move cvfBase to top) 2018-03-09 13:56:05 +01:00
Rebecca Cox
06504b6fef #2585 3D well log curves: Create visualization for a curve, random offsetted from a well path 2018-03-09 13:17:40 +01:00
Bjørn Erik Jensen
16551c05c4 #2486 2d intersection view. Temporary fix to avoid crash 2018-03-09 10:22:58 +01:00
Jacob Støren
0bdde36aa3 Merge #51 Legend background and #2478 Edge axis top into dev 2018-03-08 16:22:13 +01:00
Jacob Støren
b4935a0534 #51 Add background to ternary legend 2018-03-08 16:14:13 +01:00
Magne Sjaastad
c424063d86 #2586 StimPlan Viz : Mesh lines flickers when interpolating result values 2018-03-08 11:43:53 +01:00
Bjørn Erik Jensen
6942a99406 #2569 Fracture containment. Fix fracture border polygon calculation 2018-03-08 11:06:17 +01:00
Jacob Støren
df0a356a0a #2478 Add top edge axis (intersection View) and repositioned info box and legends to follow. 2018-03-07 12:47:48 +01:00
Jacob Støren
0083ecdf6a #2506 Finally found the error with near vertical intersections 2018-03-06 16:31:12 +01:00
Jacob Støren
91daf49e8a #2578 Fix avoid UTM coordinates in 2D intersection View (behind the scenes) 2018-03-06 16:31:12 +01:00
Magne Sjaastad
e386b031c1 #2567 Fracture : Fix display of result values for all result types 2018-03-04 10:36:39 +01:00
Magne Sjaastad
ef2179f1ba #2545 Move fields from public to private 2018-03-02 14:27:52 +01:00
Unknown
6bb06ce53c Tensor results: Add function to create arrow indices 2018-03-02 08:16:36 +01:00
Unknown
82a394d588 #2543 Tensor vectors: Use tensor value, not length, for color mapping 2018-03-01 16:01:19 +01:00
Jacob Støren
5087085635 #2482 Add wellhead pipe piece to simulation wells. 2018-02-28 17:19:05 +01:00
Magne Sjaastad
25a1823f35 Merge branch 'dev' into cmake-improvements 2018-02-28 08:47:01 +01:00
Magne Sjaastad
89c090ba24 #2536 Build System : Remove obsolete code for cmake older than "2.8.2" 2018-02-28 08:05:00 +01:00
Rebecca Cox
cbbc9c0f26 #2496 Tensor vectors: Two new paletts 2018-02-27 09:39:47 +01:00
Magne Sjaastad
f4bae6f796 #2529 Fracture : Remove RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES from CMake files 2018-02-26 21:11:14 +01:00
Magne Sjaastad
72b5f540e5 #2529 Fracture : Remove all #ifdef USE_PROTOTYPE_FEATURE_FRACTURES 2018-02-26 20:54:45 +01:00
Rebecca Cox
f3859a6bee #2528 Tensor Vectors: Make tensor vectors for result "E" 2018-02-26 11:03:57 +01:00
Magne Sjaastad
c6b12b85e0 Merge fracture unit refactoring into dev #2509
Add display of M and F in front of fracture templates
Add convert of StimPlan templates
Add copy/paste of StimPlan templates
Remove obsolete unit conversion code
2018-02-21 10:15:56 +01:00
Magne Sjaastad
b0be540977 #2509 Fracture : Remove obsolete unit conversion code 2018-02-21 08:18:55 +01:00
Rebecca Cox
b69b15145f #2496 Tensor vectors: Use dark magenta for principal 1 and move color code to RiaColorTables 2018-02-20 14:27:10 +01:00
Rebecca Cox
0366361767 #2460 Tensor vectors: Move cvf::ref of scaler mapper out to avoid nullptr exception 2018-02-20 13:56:36 +01:00
Rebecca Cox
4ca78ca833 #2460 Tensor Vectors: Use result as colormapping on the vectors 2018-02-20 13:47:47 +01:00
Magne Sjaastad
1ae30ef11a (clang-tidy) : modernize-use-nullptr 2018-02-18 18:56:43 +01:00
Magne Sjaastad
88ead1f986 Fix signed /unsigned compare 2018-02-16 16:56:39 +01:00
Bjørn Erik Jensen
772ba788ad #2449 2d intersection view. Show UTM intersection point in result info window 2018-02-16 14:38:28 +01:00
Rebecca Cox
1fd6d10b69 #2460 Tensor vectors: Put scalar mapper code in separate functions 2018-02-15 15:45:40 +01:00
Rebecca Cox
22ba541145 #2359 Tensor Vectors: Use lines to draw the vectors 2018-02-15 10:47:14 +01:00
Magne Sjaastad
1a78490991 Fix warnings related to signed / unsigned compare 2018-02-14 13:27:50 +01:00
Magne Sjaastad
646eb8fee4 StimPlan Fracture : Make sure geometry is recomputed when required 2018-02-14 13:07:16 +01:00
Jacob Støren
cb38d435cd #2457 Make 2d intersection view length start at well start 2018-02-13 16:56:48 +01:00
Jacob Støren
2e8a497989 #2461 Align the vertices between shader and fixed function rendering methods. 2018-02-13 12:53:50 +01:00
Jacob Støren
ab27efcb7d #2461 Add explicit render code for shader based rendering. Should solve the issue. 2018-02-13 12:12:55 +01:00
Rebecca Cox
7222a6ba46 Fix colors on tensor glyphs 2018-02-12 13:06:56 +01:00
Jacob Støren
c3c2dfc678 #2337 Made EdgeAxis overly item more robust. Some cleanup and renaming. 2018-02-12 10:07:07 +01:00
Jacob Støren
c6846f0d57 Fix linux compile issues 2018-02-09 16:47:24 +01:00
Jacob Støren
068adf6aa2 #2337 Fix crash when having too few tickmarks. Some rename 2018-02-09 14:09:41 +01:00
Jacob Støren
911571e267 #2337 Window Edge axis overlay item working. 2018-02-09 14:08:55 +01:00
Rebecca Cox
c3ea8f3415 2344 Tensor vectors: Code cleanup 2018-02-09 11:44:42 +01:00
Rebecca Cox
f747c22fd3 #2344 Tensor vectors: Avoid creating vectors of Infinity result values 2018-02-09 10:10:09 +01:00
Rebecca Cox
bd0d23520b #2344 Tensor Vectors: Vector visualization code 2018-02-08 16:43:18 +01:00
Bjørn Erik Jensen
7ddfaeb234 #2388 fractures. Support for asymmetric stim plan 2018-02-08 11:05:55 +01:00
Jacob Støren
bd14c65678 #2334 Add visualization of well paths and simulation wells to Intersection Views. 2018-02-07 11:44:38 +01:00
Jacob Støren
59b0a4bd1e Remove obsolete code 2018-02-06 14:55:55 +01:00
Magne Sjaastad
519771cb38 #2447 Fracture : Rename to fractureColors 2018-02-06 12:57:50 +01:00
Magne Sjaastad
4fdb7671a8 #2431 : Removed obsolete struct 2018-02-06 11:09:22 +01:00
Magne Sjaastad
67da4af831 #2431 : Use const ref and nullptr 2018-02-05 20:12:22 +01:00
Magne Sjaastad
b69fc78361 #2431 : Remove Rim3dView from function parameters 2018-02-05 20:12:22 +01:00
Magne Sjaastad
cd575ef9c1 #2431 : Use well path part manager in Rim3dView 2018-02-05 20:12:22 +01:00
Magne Sjaastad
5919cb20fb #2431 : Refactor of well part manager 2018-02-05 20:12:22 +01:00
Magne Sjaastad
0679ec4ba5 #2431 : Add part manager for all well paths WIP 2018-02-05 20:12:22 +01:00
Jacob Støren
e8b29f7279 #2334 Add polyline visualization to 2D intersection view as a preparation for showing the main well. 2018-02-05 17:57:20 +01:00
Jacob Støren
29ac24f3dd #2426 Add working legends to 2D intersection Views. Refactor to make legend update code work from a separate view with separate legend configs. Make sure legend and results are updated as the main view is updated. Adjust legendconfig->setTitle to use QString 2018-02-02 07:48:27 +01:00
Rebecca Cox
e50f7bf66f #2428 Fracture: Reorganize Fracture Colors tree item 2018-01-31 15:11:46 +01:00
Jacob Støren
02f6b95959 #2333 Add flattened intersectino geometry. Some view modifications to move towards a final 2D view experience 2018-01-26 11:19:15 +01:00
Magne Sjaastad
aa6b657027 #2141 : Fracture : Show conductivity result name from file 2018-01-25 14:24:54 +01:00
Magne Sjaastad
6ff354c7ec Fix signed/insigned compare 2018-01-25 14:17:10 +01:00
Magne Sjaastad
430b193437 #2402 Fracture : Compute conductivity scaling for all conductivity variants 2018-01-25 14:17:10 +01:00
Magne Sjaastad
001742cbd3 #2402 Fracture : Add support for multiple conductivities on a template 2018-01-25 14:17:10 +01:00
Bjørn Erik Jensen
9cfd2ff3cf #2358 fracture. When clicking on an ellipse fracture, display info in result into panel 2018-01-23 14:30:58 +01:00
Bjørn Erik Jensen
1c668ce3b4 #2358 fracture. Display values in resultInfo panel when clicking on stim plan fracture cell 2018-01-23 14:14:40 +01:00
Magne Sjaastad
759d46813d #1544 Fracture Perforation Length : Set color to deep green 2018-01-22 13:00:11 +01:00
Magne Sjaastad
348b492cc1 RiaColorTables : Add and use undefinedCellColor() 2018-01-22 11:55:27 +01:00
Magne Sjaastad
9a420183e1 Remove unused code 2018-01-22 11:09:37 +01:00
Magne Sjaastad
5c1f5326a0 #1544 Fracture : Show perforation length for along well path fractures 2018-01-19 15:08:31 +01:00
Magne Sjaastad
c7d61ed7f4 #1544 : Move well path radius to RimWellPath 2018-01-19 15:08:31 +01:00
Magne Sjaastad
8e5bcef7c7 #1544 Removed unused functions and other minor improvements 2018-01-19 15:08:31 +01:00
Magne Sjaastad
ef3d9f1095 #2141 Fracture Legend : If conductivity, use legend to set ellipse fracture color 2018-01-19 15:08:31 +01:00
Magne Sjaastad
b53603e906 Use range based for 2018-01-17 09:23:45 +01:00
Magne Sjaastad
0ecfdeee6b Reorder functions, remove unused function 2018-01-17 09:23:45 +01:00
Magne Sjaastad
1523ce55f0 #2150 Fracture : Duplicate fracture geometry for along well pipe fractures 2018-01-17 09:23:45 +01:00
Magne Sjaastad
673ae6b1ff #2150 Fracture : Create two parts of fracture geometry 2018-01-17 09:23:45 +01:00
Jacob Støren
b092565a61 #2331 Introduce new intermediate class RimGridView 2018-01-15 14:53:48 +01:00
Bjørn Erik Jensen
ee50b0492d #2151 fractures. Turn on/off fractures in views by toggling fracture colors 2018-01-15 09:24:19 +01:00
Magne Sjaastad
85ead20ec9 #2371 Fracture : Guard for null pointer access 2018-01-15 08:58:56 +01:00
Magne Sjaastad
e5aaf73a84 #2152 Fracture : Add StimPlan cell element color 2018-01-15 08:58:56 +01:00
Rebecca Cox
3b46849c79 Fix warning 2018-01-12 16:14:30 +01:00
Magne Sjaastad
ff03820a19 #2152 Minor refactoring 2018-01-12 14:56:05 +01:00
Rebecca Cox
e4e160cdd4 #2347 Elm Props: Evaluate result type ELEMENT for Intersections 2018-01-11 11:35:08 +01:00
Jacob Støren
cb6d49a611 #2331 Renamed RimView to Rim3dView 2018-01-09 10:11:28 +01:00
sigurdp
9b38e9f9c2 #1880: Fixed visualization so that completions and well paths are visible through transparent cells 2018-01-03 14:27:17 +01:00
sigurdp
f940d0a3d5 #1753 Fracture: Reworked visualization of StimPlan fractures to limit surface tesselation to area with actual values instead of relying on transparency. Done to allow picking on items behind the fracture. Refactored and removed obsolete code related to StimPlan fracture visualization. 2018-01-03 11:13:15 +01:00
Bjørn Erik Jensen
82d8b7c98a #2295. Guard for null frac template where it is being used 2018-01-02 12:54:10 +01:00
Magne Sjaastad
4956604a86 #2288 Fracture Viz : Do not show fracture attached to an invisible well path 2017-12-22 13:43:35 +01:00
sigurdp
dbd1265f31 #1873: Changed naming scheme when exporting laterals. Make sure fishbone name is exported and be more explicit in the enumeration of the subs and laterals.
Refactored RimFishbonesMultipleSubs so that it is clear that the fishbone instances only have auto generated names based on their current index.
2017-12-19 11:06:28 +01:00
Rebecca Cox
c90715d038 Fix linux error 2017-12-04 12:08:29 +01:00