OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
11,827 Commits 53 Branches 83 Tags
2e8518b7c910f0f874026f800865e5565058230a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Støren f3fc7351d4 #5011 Add icon to Replace Case commands 2019-12-02 10:26:11 +01:00
Jacob Støren 59114d9624 #5145 Fix strange zigzag lines in summary curves 2019-12-02 10:21:12 +01:00
Jacob Støren de35b6d76b #5145 Fix strange zigzag lines in summary curves 2019-11-29 16:01:28 +01:00
Jacob Støren 4026e859d2 #5011 Add icon to Replace Case commands 2019-11-29 13:37:38 +01:00
Jacob Støren d736419fd4 Merge pull request #5130 from OPM/feature-polish-separate-intersection-results 
Polish separate intersection results
 2019-11-29 11:21:12 +01:00
Jacob Støren 6ac18d52ff #5117 Sep Inter Res: Fix missing use of cathegory legend 2019-11-29 10:27:43 +01:00
Jacob Støren f446d58b60 #5124, #5123 Fix irratic collapse of property group 
Fix missing timestep menu
 2019-11-29 10:27:43 +01:00
Jacob Støren 021af085a7 #5119, #5120 Default case for intersection result 
Fixed missing intersection colors when cellresults are turned off
 2019-11-29 10:27:43 +01:00
Jacob Støren 95ba482f54 Merge pull request #5118 from OPM/feature-fix-intersection-with-sep-results-picking 
Fix picking on intersections with separate results
 2019-11-28 15:27:48 +01:00
Jacob Støren ad25bb89c2 #5112 Add cell highlight on intersections with separate intersection result 2019-11-28 14:09:53 +01:00
Jacob Støren 14d7fa3780 #5112 Sep Inter Res: Fixed result info text for gomech 2019-11-28 14:09:52 +01:00
Jacob Støren 2a3c43bcc3 #5112 Fixed result info text for eclipse 
Needs more testing
 2019-11-28 14:09:52 +01:00
Jacob Støren 5556d2d9eb #5112 Make selected result definition available through 3ditem selection system 
Make PVT, Relperm, Mohr and rResult plot aware
 2019-11-28 14:09:52 +01:00
Jacob Støren 8cc2194764 (#5112) Move cell and nnc picking code to a separate pick event handler 2019-11-28 14:09:52 +01:00
Jacob Støren e4a4b40a3c Merge pull request #5096 from OPM/feature-rename-RimIntersection 
Rename RimIntersection
 2019-11-26 15:28:23 +01:00
Jacob Støren 191419b6b4 clang-format after intersection rename 2019-11-26 13:56:02 +01:00
Jacob Støren 06596673dc Rename RimIntersectionHandle to RimIntersection 2019-11-26 13:26:37 +01:00
Jacob Støren 0a358941fb Rename RivIntersectionBoxGeometryGenerator to RivBoxIntersectionGeometryGenerator 
Rename RivIntersectionBoxSourceInfo to RivBoxIntersectionSourceInfo
 2019-11-26 13:20:16 +01:00
Jacob Støren 4672528a4d Rename RimintersectionBox to RimBoxIntersection 
Rename RivIntersectionBoxPartMgr to RimBoxIntersectionPartManager
 2019-11-26 13:14:55 +01:00
Jacob Støren 0e14c63f07 Rename crossSection to intersection in general code 2019-11-26 12:45:08 +01:00
Jacob Støren 54c96581f1 Rename RivIntersectionSourceInfo to RivExtrudedCurveIntersectionSourceInfo 2019-11-26 11:56:05 +01:00
Jacob Støren 0617b56850 Rename RivIntersectionGeometryGenerator to RivExtrudedCurveIntersectionGeometryGenerator 
and RivIntersectionPartMgr to RivExtrudedCurveIntersectionPartMgr
 2019-11-26 11:51:54 +01:00
Jacob Støren 152d2bde17 Rename RimIntersection to RimExtrudedCurveIntersection 2019-11-26 11:35:21 +01:00
Jacob Støren bf8ed71641 Method rename 2019-11-26 10:35:45 +01:00
Jacob Støren 5593fb198c Merge pull request #5094 from OPM/feature-#5019-separate-intersection-results 
Feature #5019 separate intersection results
 2019-11-26 10:15:30 +01:00
Jacob Støren 15aa4d6e0b Merge dev and feature-#5019-separate-intersection-results branch 2019-11-25 15:50:29 +01:00
Jacob Støren c2717f9bb9 #5019 Preliminary fix crash when picking intersections using sep results 2019-11-25 15:36:35 +01:00
Jacob Støren 6e99a43247 #5019 Add/Delete Separate Intersection Result commands 2019-11-25 15:34:36 +01:00
Jacob Støren 7aec88de3c #5019 Fix wrong use of explicit scalar mappers for intersections 
Only 2d intersection view is supposed to use them
 2019-11-25 15:33:42 +01:00
Jacob Støren baedf02ba9 #5019 Fix crash when case is not set in Separate intersection Result 2019-11-25 15:27:25 +01:00
Jacob Støren 919f035a48 #5019 Add an enable separate results button to each intersection 2019-11-25 13:31:21 +01:00
Jacob Støren 4bafefa225 #5019 2D Intersection views based on separate intersection results now respects the animation toolbar 2019-11-25 13:02:35 +01:00
Jacob Støren eed9f6abad #5019 Update 2dIntersection views when toggling sparate intersection results 2019-11-25 11:42:46 +01:00
Jacob Støren 9bfe51b205 #5019 Support separate intersection results for 2Dintersection views 2019-11-25 11:40:57 +01:00
Jacob Støren 1ab815e673 #5019 Use same code for separate intersection legend setup in eclipse and geomech 2019-11-22 13:31:35 +01:00
Jacob Støren b5e39519c5 #5019 Separate intersection legends in place in ordinary views 
Needs some cleanup and not working in 2dintersection views
 2019-11-22 12:36:39 +01:00
Jacob Støren f3b458dfbc Fix regressions for intersection views. 
Introduced by cd08185678
Wrong scalar mappers used when coloring.
Wrong timestep used
 2019-11-21 15:14:17 +01:00
Jacob Støren c1df283369 Fix crash in intersection coloring wne geometry is missing 2019-11-21 12:43:26 +01:00
Jacob Støren 10257e3bfb Fix missing rebuild of intersections in geomech view 
Fix missing ternary legend reset
Fix missing regular legend reset in geomech view
 2019-11-21 10:05:56 +01:00
Jacob Støren 53f2c94763 #5019 Sep Intersection Res: Fix missing use of user range when loading from project file 2019-11-21 09:24:24 +01:00
Jacob Støren 5d03ecb115 Add some const to GeoMechResultDefinition 
To prepare for separate legend update code needed bu #5019
 2019-11-21 08:30:04 +01:00
Jacob Støren 31a698243d #5019 Update display model on separate intersection settings change 2019-11-21 08:28:00 +01:00
Jacob Støren a181e0c11d #5019 Refactoring Move IntersectionResultsColoringTool to a separate file 
Also moved the implementation code
 2019-11-20 13:59:16 +01:00
Jacob Støren cd08185678 #5019 Use the static methods to color intersections as well 
Move all the color/texture  generation methods into a separate tools class.
(Only scope wise)
 2019-11-20 13:01:25 +01:00
Jacob Støren 46f335ad0b #5019 Refactor the color generation in the boxintersection into static methods 
These methods are to be used from the normal intersections as well.
 2019-11-20 12:00:43 +01:00
Jacob Støren c8053284d1 #5019 Add relevant access to IntersectionResultDefinition 
Implement initAfterRead to populate the resultDefinitions with correct case
 2019-11-20 10:39:48 +01:00
Jacob Støren c79de08c40 Improve const-ness somewhat on some results color related methods 2019-11-20 10:39:48 +01:00
Jacob Støren 6e96570995 #5019 Position the separate source box/intersections correctly acc to displayOffset 2019-11-20 10:39:48 +01:00
Jacob Støren 439071dddf Fix crash when copying the intersection. 
Updating of the default is handled later, so is not neccesary when doint initAfterRead after deserialization.
 2019-11-20 10:39:48 +01:00
Jacob Støren dcb32c285f Unification of color texturing code in Intersection and -Box 2019-11-20 10:39:48 +01:00
Jacob Støren 57dfd3b67a Intersection color texturing: Remove dependency on view and RimEclipseResultColor 
Also start to harmonize intersection and intersection box texturing
 2019-11-20 10:39:48 +01:00
Jacob Støren db0bbb96c4 #5019 Use hex grid interface creation from data source for all intersections 2019-11-20 10:39:48 +01:00
Jacob Støren 612332cbbc #5019 Move RimIntersectionHandle to separate files Use in RimIntersectionBox 2019-11-20 10:39:48 +01:00
Jacob Støren 9ed3d8babc #5019 WIP: Made fields in IntersectionHandle protected 2019-11-20 10:39:48 +01:00
Jacob Støren 8fb3fbc097 #5019 WIP: Create a RimIntersectionHandle base class 2019-11-20 10:39:48 +01:00
Jacob Støren 62ed71ed76 #5019 Intersections have first data source as ianctive default 
Icon state update for IResDefCollection
 2019-11-20 10:39:48 +01:00
Jacob Støren fec449dc43 #5019 Add separate intersection results collection and items 2019-11-20 10:39:47 +01:00
Jacob Støren 470dab8d58 Merge pull request #5059 from OPM/feature-well-path-modeling-improvements 
Feature well path modeling improvements
 2019-11-18 13:03:28 +01:00
Jacob Støren 72cc643cd1 Update unit tests to accomodate changes in PolyArcLineSampler 2019-11-18 10:29:53 +01:00
Jacob Støren 6c0c5803da #5058 Use two decimals in vector positions in Well Paths 2019-11-18 09:51:51 +01:00
Jacob Støren d312d423e2 #5055 Fix crash when deleting first row in tables views 2019-11-18 09:51:51 +01:00
Jacob Støren 9f6d6f693e #5050 Improve Insert Well Target command 2019-11-18 09:51:51 +01:00
Jacob Støren de6dab7d2e Merge pull request #5046 from OPM/bugfixes-wellpath-modelling 
Bugfixes wellpath modeling
 2019-11-15 09:16:02 +01:00
Jacob Støren f6675b7c45 #4789, #5045 Made wellpath calculator control dogleg editability 
Making them correct.
Doglegs with an actual value less than the user provided value  are colored green.
Removed the text stating that the constraint is not met.
 2019-11-14 17:23:52 +01:00
Jacob Støren effa3025e1 #5044 Add a max angle for sampling of arcs at approx 6 deg dogleg 2019-11-14 17:05:10 +01:00
Jacob Støren e82f6a5ab7 #5030, #5035 Fix missing update of intersection boundingboxes. 
Regression introduced by 3c3c207bbc
Which removes (mostly) unneccessary recursiveBBox updates when inserting static models in viewer
The commit might expose other bugs as well.
 2019-11-14 14:00:54 +01:00
Jacob Støren fe88fb9ccb #5037 Fixed crash in well path target points geometry generation 2019-11-14 13:48:54 +01:00
Jacob Støren 4658893850 Merge pull request #5018 from OPM/bugfix-#4869-create-rangefilter-on-inactive-view 
Bugfix #4869 create rangefilter on inactive view
 2019-11-08 12:35:24 +01:00
Jacob Støren 19fe1fcd1b Merge pull request #5017 from OPM/feature-adjust-comparison-overlay-items 
Feature adjust comparison overlay items
 2019-11-08 11:24:09 +01:00
Jacob Støren ea28cb5733 #4869 Fixed range filter commands on inactive view 2019-11-08 11:23:06 +01:00
Jacob Støren e78b0d4204 #4994 Make ComparisonView mode for InfoBox and animation progress 2019-11-08 10:40:37 +01:00
Jacob Støren c27c19ce96 caf::Viewer: Add inComparisonView option to isAnimationActive 
#4994 preparations
 2019-11-08 10:40:37 +01:00
Jacob Støren 0f6a4c0934 Fix opengl errors when resizing comparison view to invalid size 
Clamp to min 0.0 width
 2019-11-08 10:40:37 +01:00
Jacob Støren 8eb94eaabe Fix bbox invalid assert in RiuViewer in debug build 2019-11-08 10:40:37 +01:00
Jacob Støren a9dc07ddc9 #4995 Place legends from comparison view to the right. 
Adjust the axiscross to follow the legends
 2019-11-08 10:40:37 +01:00
Jacob Støren 331361e2b2 Cleanup of add legend code in RiuViewer 
Preparations
 2019-11-08 10:40:37 +01:00
Jacob Støren 38e8f04990 Use cvfMath for PI and sin/cos in PointTangentManipulator 
To avoid errors from pedantic compilers
 2019-11-07 08:58:49 +01:00
Jacob Støren 7d2f1ec9c1 Fix M_PI related errors 2019-11-06 18:59:40 +01:00
Jacob Støren e78ae37cb7 #5005 Improved welltarget 3d dragger geometry 2019-11-06 18:01:55 +01:00
Jacob Støren 7670874181 #5006 Changed first default color of created well paths 2019-11-06 18:01:55 +01:00
Jacob Støren 6bd07aa8ee #650 Removed the ugly nan legend displayed while loading things 2019-11-06 18:01:55 +01:00
Jacob Støren 55470cc1cd #5004 Remove comparison view option from 2dIntersection view 2019-11-06 18:01:55 +01:00
Jacob Støren d82b957add Improve linked views toolbutton icon slightly 2019-11-06 18:01:55 +01:00
Jacob Støren 5ecdd11318 Merge pull request #5003 from OPM/feature-fix-point-manipulators-in-comparison-view 
Feature fix point manipulators in comparison view
 2019-11-06 15:42:58 +01:00
Jacob Støren 277f8c8b7a #4969 Fix Well path and annotation draggers not visible and does not work in comparison view 2019-11-06 14:13:01 +01:00
Jacob Støren 904808394b caf::Viewer: Maintain a flag telling if we have an active comparison view. 
Set a custom widget property to communicate it to PdmUiSelection3dEditorVisualizer
Add method to specifically get the Ray intersect speck from each rendering
 2019-11-06 14:13:01 +01:00
Jacob Støren 6850a37c11 #4999 Fixed well target manipulators not sensitive sometimes 2019-11-06 14:13:01 +01:00
Jacob Støren 25b97c9cca #4999 Refactoring point target manipulator part manager preparing for fix 2019-11-06 14:13:01 +01:00
Jacob Støren 3aa4e37383 Add a plantuml of the well target 3D editor system 2019-11-06 14:13:01 +01:00
Jacob Støren 58c1734334 Merge pull request #4985 from OPM/feature-fix-point-manipulators-in-comparison-view 
#4981 Fix well target manipulators not responding
 2019-11-05 15:42:02 +01:00
Jacob Støren 3c3c207bbc #4981 Fix well target manipulators not responding 
Moved z scale change notification to method setting zscale for label
Was always done, and recreated target manipulators at first mousemove
Avoid updating cached values in scene on repeated calls to show gridbox
 2019-11-05 09:30:58 +01:00
Jacob Støren c6e4641725 caf::Viewer: Avoid updating boundingboxes when static models are not removed 2019-11-05 09:30:58 +01:00
Jacob Støren 03b44fc36f Avoid regenerating gridbox when unchanged 2019-11-05 09:30:58 +01:00
Jacob Støren ed54ccbd01 #4971 Fix Background color in comparison view is always the default color 2019-11-04 10:01:40 +01:00
Jacob Støren 58940a31c8 Updated viewer display model generation sequence diagram 
New names and flow
 2019-11-04 09:48:12 +01:00
Jacob Støren 5044784201 Merge pull request #4968 from OPM/feaure-fix-point-picking-in-comparison-view 
Fixes several issues from #4857
#4956 Fix List editor background setting
#4880 Fix annotations missing in comparison view
 2019-11-04 09:44:56 +01:00
Jacob Støren 52177994bd Improve readability of 3dView measurement in comparison view fix 2019-11-04 09:09:03 +01:00
Jacob Støren 6220225cfa #4970 Fix measurement text not visible in comparison view 2019-11-01 16:42:42 +01:00
Jacob Støren f7fb4caa69 #4880 Fix annotations missing in comparison view 2019-11-01 15:57:04 +01:00
Jacob Støren 8bdb05447c Reordered Rim3dView.h 2019-11-01 15:57:04 +01:00