OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-12 16:32:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
9,931 Commits 59 Branches 85 Tags
b1ad93f4b9c0669bf441541cce31d1fc2cf66ee4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gaute Lindkvist b1ad93f4b9 #3970 Contour Maps: improve edge look 
* Remove excess tiny triangles around edges
* Remove labels from contour lines that overlap inner contour lines
 2019-01-17 20:18:15 +01:00
Gaute Lindkvist 3692f66b6d #3526 Support picking of Valve objects and well path attributes 2019-01-16 15:46:15 +01:00
Gaute Lindkvist 431ce346ea #3974 Update view when attributes are created 2019-01-16 15:46:07 +01:00
Gaute Lindkvist fb92b548c5 #3966 Add buttons for creating/editing fracture templates from fractures (#3973) 
* #3966 Add buttons for creating/editing fracture templates from fractures

* Make sure view is updated whenever a new template is created from the fracture
 2019-01-16 14:57:43 +01:00
Gaute Lindkvist 0b9b7e8eb7 #3971 Contour maps: add a label candidate for every segment but use bounding boxes and minimum curve distance to skip. 2019-01-16 14:09:28 +01:00
Gaute Lindkvist 1f754f2b63 #3807 Initial implementation of GeoMech contour maps. 2019-01-16 14:09:28 +01:00
Gaute Lindkvist 314a5747db #3957 Restore UI-order in Well Path Valve property editor 2019-01-15 17:13:23 +01:00
Gaute Lindkvist 5c24153646 #3957 Add button to valve for creating new valve template or editing existing template 
* Also added separate delete valve feature so we can clear the template and update the valves referencing it.
 2019-01-15 14:30:26 +01:00
Gaute Lindkvist 59a9136bf1 #3807 Make sure changing weights updates contour map 2019-01-11 16:14:54 +01:00
Gaute Lindkvist 9a6d0ab9ef #3807 Tidy up contour map code after splitting out Eclipse specific code 2019-01-11 16:08:37 +01:00
Gaute Lindkvist bad98b81ad #3807 Make RimEclipseContourMapProjection a child of an abstract RimContourMapProjection 2019-01-11 16:06:54 +01:00
Gaute Lindkvist fb5c222047 #3961 Disable case name in auto name for 3d Views by default 2019-01-11 16:06:53 +01:00
Gaute Lindkvist f3c188ef56 #3807 Rename RimContourMapView to RimEclipseContourMapView 2019-01-11 16:06:53 +01:00
Gaute Lindkvist 31c67e29e4 #3807 Rename RimContourMapProjection to RimEclipseContourMapProjection 2019-01-11 16:06:53 +01:00
Gaute Lindkvist 4f09b6fbf6 #3945 Fix bug related to updating Contour Map when changing result and weighting parameter 2019-01-11 12:32:46 +01:00
Gaute Lindkvist d1a457bf07 #3943 Stop regenerating map geometry when altering other geometry. 
* Do this by caching results and clearing the cache in three stages with each dependent on the previous stages:
  1. Grid Mapping
  2. Results
  3. Geometry
* Clearing grid mapping clears results and clearing results clears geometry.
* Some operations require only geometry changes, while others require a full change to grid mapping and consequently everything else.
 2019-01-11 10:48:28 +01:00
Gaute Lindkvist 14cce66d2a #3945 Avoid ray tracing around edges of contour map 2019-01-10 21:16:22 +01:00
Gaute Lindkvist 23142acc01 #3942 disable contour smoothing when contour lines are disabled 2019-01-10 20:58:36 +01:00
Gaute Lindkvist 82686ffe14 #3945 Avoid redoing ray tracing for contour maps when we can 2019-01-10 20:55:58 +01:00
Gaute Lindkvist a309ffd1ea #3941 Slighly improve contour map performance 2019-01-10 19:13:18 +01:00
Gaute Lindkvist 602bca4ea6 #3939 Make sure contour smoothing doesn't cause level overlap. 2019-01-10 16:07:58 +01:00
Gaute Lindkvist 8428e848de #3941 Improve contour map performance by several measures 
* Discarding triangles that aren't inside current level. Big gain.
* Checking bbox for contour levels. Minor gain.
* Doing less interpolation. Minor gain.
 2019-01-10 14:53:37 +01:00
Gaute Lindkvist 225f190f4b #3934 Improve picking speed on contour map 2019-01-09 09:57:47 +01:00
Gaute Lindkvist 1a5fdec2d3 #3934 Make contour map colors exactly match the contour lines. 2019-01-09 09:09:26 +01:00
Gaute Lindkvist a024a772a8 Cache cvf::Effect for text labels locally in RivContourMapProjectionPartMgr 2019-01-09 09:08:46 +01:00
Gaute Lindkvist b281a801a8 Fix zoom check in RimContourMapView 2019-01-09 09:04:11 +01:00
Gaute Lindkvist bac377a4eb #3934 Optionally (on default) smooth all contour lines 2019-01-09 08:42:20 +01:00
Gaute Lindkvist 7fccdf7153 #3934 Implement area threshold for contour polygons 2019-01-09 08:42:20 +01:00
Gaute Lindkvist c8f9505d1e Fix crash in text rendering 2019-01-08 20:07:55 +01:00
Gaute Lindkvist f099b8a747 Make contour map labels default on 2019-01-08 11:07:37 +01:00
Gaute Lindkvist 8de9a46c6a Rename RimContourMapProjection::generateTriangles to generateTrianglesWithVertexValues 
Signed-off-by: Gaute Lindkvist <lindkvis@gmail.com>
 2019-01-08 11:07:37 +01:00
Gaute Lindkvist 1c780deeab Make it more likely that we pick a dark contrast color from RiaColorTools 2019-01-08 11:07:37 +01:00
Gaute Lindkvist 7a275be335 #3876 Implement rotated labels on contour maps 2019-01-08 11:07:37 +01:00
Gaute Lindkvist 71cacc550f #3881 Smooth outer contour line and clip geometry 2019-01-08 11:07:37 +01:00
Gaute Lindkvist ec0419a945 #3881 Prepare for better edge clipping by making interpolation function more accessible. 2019-01-08 11:07:36 +01:00
Gaute Lindkvist c1f9e664cd #3876 Fix picking offset issue arising from contour line fixes. 2019-01-01 16:20:04 +01:00
Gaute Lindkvist e63ba3ee6d #3768 and #3903 Fix border issue by making OpenGL widget a child of the main window. 2019-01-01 15:14:45 +01:00
Gaute Lindkvist 128208d35a Fix type in RiaColorTools contrastColor 2018-12-21 10:12:58 +01:00
Gaute Lindkvist b1b278fffc #3876 Add reference to Shoelace formula for counter clockwise polygon test. 2018-12-21 09:48:57 +01:00
Gaute Lindkvist 9fdec77c94 #3919 Contrast colors for contour lines 2018-12-21 09:48:57 +01:00
Gaute Lindkvist 22f054c6b9 #3919 Apply contrast colours to contour lines as well. 2018-12-21 09:48:57 +01:00
Gaute Lindkvist 68fb72311e #3919 Implement a better threshold check for contrast colors 2018-12-21 09:48:56 +01:00
Gaute Lindkvist 6754f837d4 #3876 First label implementation. Not rotated yet. 2018-12-21 09:48:56 +01:00
Gaute Lindkvist 37a3342db5 Fix unit test on Linux due to empty QRegExpValidator constructor (doesn't build on Qt 4.6) 2018-12-21 09:48:56 +01:00
Gaute Lindkvist 9b7f516a2e #3863 fix default MSW parameters for perforation intervals. 2018-12-20 16:08:05 +01:00
Gaute Lindkvist ac1f57e5f9 #3915 Make valve count mode label "Start/End/Number" instead of "Start/End/Number of Valves". 
* This way it works for both ICDs/AICDs and fishbones.
* Not necessary for patch branch.
 2018-12-20 14:21:47 +01:00
Gaute Lindkvist 8442cc3f92 #3915 use subs instead of valves for fishbones 2018-12-20 14:10:20 +01:00
Gaute Lindkvist d259f8f33a Move display transforms from contour map 2018-12-20 14:10:20 +01:00
Gaute Lindkvist e837d2e9ee #3915 use subs instead of valves for fishbones 2018-12-20 14:09:57 +01:00
Gaute Lindkvist 5c9b8b36f9 #3910 Add compdat export test with 132 line length and 133 line length. 2018-12-20 10:18:13 +01:00
Gaute Lindkvist 66c58bad28 Fix unit test build problem 2018-12-20 10:06:30 +01:00
Gaute Lindkvist 4e5925808a #3910 Unit test for table formatter and split text 2018-12-20 09:50:05 +01:00
Gaute Lindkvist 708f24943b Hide Unit Test Feature if USE_UNIT_TESTS is not defined 2018-12-20 09:50:05 +01:00
Gaute Lindkvist 975cd15c32 #3910 Unit test for reg exp validator 2018-12-20 09:50:05 +01:00
Gaute Lindkvist 10da90350f #3876 Create Counter Clockwise closed polygons out of the contour line segments 2018-12-20 09:47:25 +01:00
Gaute Lindkvist 5ed13d3530 Fix QValidator build problem on Linux related to Annotations 2018-12-18 17:09:43 +01:00
Gaute Lindkvist 394c84efef #3854 Add MSW reference depth to Perforations 2018-12-18 17:09:43 +01:00
Gaute Lindkvist 7296c11bc2 #3877 Add RegExp-validator to "Well name for export" field for COMPDAT export 
* Max 8 characters, minimum 1
* Only alpha-numeric characters and hyphen and underscore are acceptable. (no space)
 2018-12-18 17:09:43 +01:00
Gaute Lindkvist 9851a2d938 #3853 Add line shift to compdat export table rows if the line exceeds 132 characters 2018-12-18 17:09:43 +01:00
Gaute Lindkvist a9f70a13b3 #3851 Just one ICV per completion, not one per segment. 2018-12-18 17:09:43 +01:00
Gaute Lindkvist fff70bb9f6 #3888 Report error if the valve is invalid 2018-12-18 16:49:52 +01:00
Gaute Lindkvist 0ba7725c23 #3825 Time Step Filter: disable IO for field not available for user. 2018-12-17 08:03:21 +01:00
Gaute Lindkvist d6e40f25ff #3879 Rename valve location parameter to Number of Valves 2018-12-14 16:03:04 +01:00
Gaute Lindkvist 3adb1cc4bd #3884 Implemented Valve Templates for MSW parameters 2018-12-14 16:03:04 +01:00
Gaute Lindkvist 4b1feb842d #3885 Include "Cached" memory in available virtual memory on Linux. 
* Cached memory is easily available to processes if needed.
 2018-12-14 10:47:33 +01:00
Gaute Lindkvist b43ef3dc0b #3885 Include "Cached" memory in available virtual memory on Linux. 
* Cached memory is easily available to processes if needed.
 2018-12-14 10:33:51 +01:00
Gaute Lindkvist 47bb14eb06 #3864 Update and clamp valve positions to perforation interval when perforation interval changes. 2018-12-14 08:45:43 +01:00
Gaute Lindkvist 92e4fa9024 #3863 fix default MSW parameters for perforation intervals. 2018-12-12 15:37:10 +01:00
Gaute Lindkvist 8821a37b90 #3853 Remove zero padding and unnecessary space at beginning and end of row for WSEGAICD 2018-12-12 15:07:04 +01:00
Gaute Lindkvist b2d178e584 #3857 Fix split on well and completion for MSW export. 2018-12-12 11:04:55 +01:00
Gaute Lindkvist ea371f8321 #3858 add quotes to pressure drop text and make HF- default 2018-12-12 10:20:12 +01:00
Gaute Lindkvist 509f77c7f1 #3855 Limit entry and exit lengths in perforation COMPSEGS when perforation doesn't pass through entire cell. 2018-12-12 09:44:00 +01:00
Gaute Lindkvist 762b6ef382 Fix name for MSW export file for fishbones 2018-12-12 09:10:19 +01:00
Gaute Lindkvist 18a5961230 #3857 Support file split option in command file for export MSW 2018-12-12 08:42:24 +01:00
Gaute Lindkvist 914daded6b #3794 Improve wheel zooming 2018-12-12 08:01:13 +01:00
Gaute Lindkvist 240c748910 #3830 Replace column headers in WSEGAICD table with numbers with a description of the numbers first. 
* This way columns don't take up much space.
 2018-12-11 21:05:43 +01:00
Gaute Lindkvist 2766b18a2f #3844 and #3845 Split MSW export the same way as regular export and unify names. 2018-12-11 20:06:41 +01:00
Gaute Lindkvist 41dc8feca3 #3849 Shorten column space for WSEGAICD table to 1 2018-12-11 16:57:05 +01:00
Gaute Lindkvist 3dafd06859 #3850 Implement calculation of AICD length 2018-12-11 16:21:17 +01:00
Gaute Lindkvist e510237793 Make Qt5 fix for RiaApplication::launchUnitTests() a bit safer. 2018-12-11 15:39:12 +01:00
Gaute Lindkvist cd75be6671 #3848 Fix crash with text picking by guarding pointer to scene. 2018-12-11 15:33:47 +01:00
Gaute Lindkvist f3a2f0c5b2 Fix build problem on Qt5 in relation to unit tests. 2018-12-11 15:32:08 +01:00
Gaute Lindkvist 5368574848 #3846 Make HF- the default pressure drop for MSW and put quotes around the text. 2018-12-11 15:32:07 +01:00
Gaute Lindkvist d78cda3234 #3847 Use export name for well names in MSW export 2018-12-11 15:32:07 +01:00
Gaute Lindkvist 7c110091d5 #3809 Make Flow diagnostics work with contour maps 2018-12-11 13:39:28 +01:00
Gaute Lindkvist 2e8c2e28a8 #3780 Get rid of debug output from painter 
* don't really need the boundingRect override for RiuQwtSymbol
* And it needs a painter
* Just get rid of it and pass in the painter for the labelBoundingRect
 2018-12-11 13:18:01 +01:00
Gaute Lindkvist 1ffcca8f20 #3798 Make sure 3d overlay info update is called even if it is inactive 
* It also causes animation bar to be hidden if the overlay info is inactive
 2018-12-11 13:17:49 +01:00
Gaute Lindkvist 825ac5ce32 #3801 Postpone assignment of old selectedTracer-field to producers and injectors 
* initAfterRead is too soon as the solver hasn't been set up yet.
* wait until onEditorWidgetsCreated()
 2018-12-11 13:17:39 +01:00
Gaute Lindkvist 2ae4e483ed #3783 Guard in case of incomplete project data 2018-12-11 13:14:58 +01:00
Gaute Lindkvist 734d76f74a Revert "#3751 Fix keyboard selection in Summary Plot Editor" 
This reverts commit ab0fa2fb19.

* This change should never have been merged back into the repo.
 2018-12-11 13:12:24 +01:00
Gaute Lindkvist 8570e51362 #3798 Make sure 3d overlay info update is called even if it is inactive 
* It also causes animation bar to be hidden if the overlay info is inactive
 2018-12-11 13:12:06 +01:00
Gaute Lindkvist 4bdab329e1 #3801 Postpone assignment of old selectedTracer-field to producers and injectors 
* initAfterRead is too soon as the solver hasn't been set up yet.
* wait until onEditorWidgetsCreated()
 2018-12-11 13:05:13 +01:00
Gaute Lindkvist d119f3d146 #3825 Time Step Filter: disable IO for field not available for user. 2018-12-11 11:46:40 +01:00
Gaute Lindkvist 37b5d10c49 #3829 Remove spaces in Export Completion file names: Patch fix 2018-12-11 11:46:40 +01:00
Gaute Lindkvist 17e12a92a0 Update CMake to only look for Qt5 if RESINSIGHT_BUILD_WITH_QT5 is set 2018-12-10 15:10:46 +01:00
Gaute Lindkvist a6493042d4 #3779 Fix inf -> 1* output in AICD export tables 2018-12-10 10:04:08 +01:00
Gaute Lindkvist 15576a9ae3 #3779 Preliminary AICD output 2018-12-07 15:48:18 +01:00
Gaute Lindkvist ddd454077f #3779 Implement accumulator system for ICDs in preparation of using this for AICDs 2018-12-07 15:48:18 +01:00
Gaute Lindkvist 539914a541 Fix crash in RimWellPathValve when perforation is larger than wellpath 
* This is the case with the Completions_msw Regression test
 2018-12-07 12:58:03 +01:00
Gaute Lindkvist c51b938d03 Switch to more robust check for Qt5 for cafUserInterface. This should be applied to other projects 2018-12-07 12:58:03 +01:00