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
10,062 Commits 53 Branches 83 Tags
1717a5bf303db1ee84e7123ecb44fa853166ba86
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gaute Lindkvist c9419b41e2 #4042 Add class diagram structure for caf::PickEventHandler 2019-02-06 14:15:24 +01:00
Gaute Lindkvist c4f5065032 #4045 Don't accept pick events if the current selected object isn't the object owning the pick handler. 2019-02-06 13:24:26 +01:00
Gaute Lindkvist dbe21b7809 Renames in RicPickEventHandler hierarchy 2019-02-06 09:45:30 +01:00
Gaute Lindkvist 4ec8869743 Rename in caf::PdmUiVec3dEditor 2019-02-06 09:39:47 +01:00
Gaute Lindkvist e4fa4b9994 Set a default Radius=100 for reach circles so they show up as soon as you pick 2019-02-06 08:21:14 +01:00
Gaute Lindkvist 8400e4ea02 Renames in RicPickEvent 2019-02-06 08:21:14 +01:00
Gaute Lindkvist 0e52426071 #4014 Use Vec3d Editor for Text and ReachCircle Annotations 2019-02-06 08:21:14 +01:00
Gaute Lindkvist 058b9cfb7a #4014 Implement caf::PdmUiVec3dEditor and a RicVec3dPickEventHandler 2019-02-06 08:21:14 +01:00
Gaute Lindkvist 5d35678d97 Refactor PickEvent Hierarchy to have a basis in Caf 2019-02-06 08:12:30 +01:00
Gaute Lindkvist d70e94ca85 #3996 Shift Measurement text box to not overlap with current segment 
* Check if line is tending left or tending right and shift box if it is tending left.
 2019-02-04 15:29:07 +01:00
Gaute Lindkvist f15d6dd385 #3997 Use AppEnum for font size in preferences as well so it is more easily shared. 2019-02-04 15:20:56 +01:00
Gaute Lindkvist 08cdd73148 #4024 Always report that a time step dependent result is visible in GeoMech contour maps 
* However, if a result is not a valid time step result, we instead show a dummy 0-result across the reservoir.
* This way we show something even if a valid result is not chosen.
* Also make this more obvious by reporting it in info box and legend.
 2019-02-04 12:02:12 +01:00
Gaute Lindkvist 956c973d17 #4032 Fix SFG-values in Well bore stability plots 2019-02-04 11:37:15 +01:00
Gaute Lindkvist 9bc6a4bc21 #4034 Make it optional to GeoMech Contour Map boundaries vertically 
* Map boundaries rather than grid boundaries.
* Does not limit height by default, but make it possible.
* Make sure we don't try to apply filters if the filter collection is inactive

Boundaries
 2019-02-04 11:06:07 +01:00
Gaute Lindkvist 1171884c1b #4033 Fix glitch with large padding for GeoMech 
* Off by one error in distance transform
* Need a larger bounding box to allow for full padding.
 2019-02-04 10:13:42 +01:00
Gaute Lindkvist 78b31db3b8 #4032 Fix SFG-values in Well bore stability plots 2019-02-04 09:27:02 +01:00
Gaute Lindkvist 653b0eb856 #4026 Contour Maps: Set +infinity (invalid) as max value if no valid max value was found 2019-02-04 08:17:02 +01:00
Gaute Lindkvist 9b90799e4c #3986 Fix a CMake warning and remove debug output for Qt5 
* Stop trying to copy the MSVC runtime with windeployqt. It isn't needed for private installs and for full installs it is already handled (removes warning about VCINSTALLDIR).
* Don't copy translations and QtQuick-import.
* Set verbosity to 0. This removes some useful messages about which libraries are copied, but also removes many useless warnings. The default verbosity of 1 leaves them all in. It doesn't appear very fine grained.
 2019-02-01 12:45:10 +01:00
Gaute Lindkvist ff1cedcc6f #4011 Remove stop button and alter state of buttons depending on animation stage. 2019-02-01 11:05:51 +01:00
Gaute Lindkvist 22b60d4cff Remove unused variables from Well Target Pick Event Handler 2019-02-01 07:56:48 +01:00
Gaute Lindkvist b4231775ef #4012 Add assert to the well path element intersections 2019-02-01 07:56:05 +01:00
Gaute Lindkvist e689b7ceaf Updates to make well path creation intersection work better with GeoMech 2019-02-01 07:56:05 +01:00
Gaute Lindkvist 107a4b9b60 #4012 Always place well target points in real cell geometry 2019-02-01 07:56:05 +01:00
Gaute Lindkvist d882261511 #4027 Increase max padding for GeoMech contour maps 2019-01-31 16:05:25 +01:00
Gaute Lindkvist 4019f1f981 Remove initialization list use for QStringList 2019-01-31 09:16:35 +01:00
Gaute Lindkvist 69b20a2aa9 #4007 Create new combined import button and move the others to an opt… (#4021) 
* #4007 Create new combined import button and move the others to an optional "Import"-toolbar

* #4007 Make sure we check that fileName vector isn't empty before accessing it
 2019-01-31 09:02:09 +01:00
Gaute Lindkvist d61a18ee6e Fix Linux build by removing unused EnsembleParameter::range 2019-01-30 09:19:17 +01:00
Gaute Lindkvist 54b5dc33f4 #4013 Create variation bins for ensemble parameters based on current data 
* Rather than having a fixed index.
* This way the variation is more or less always normal distributed.
 2019-01-30 09:07:52 +01:00
Gaute Lindkvist 4c5e277ebf std::fabs fix for Linux 2019-01-29 16:08:24 +01:00
Gaute Lindkvist eb498ad0dc #4013 Sort ensemble parameters by variation 2019-01-29 15:42:17 +01:00
Gaute Lindkvist 7a50fa12f8 #3953 Extend well completions spec 2019-01-29 10:18:20 +01:00
Gaute Lindkvist a185929826 #3984 Improve layout for new/edit template buttons for valve/fractures 2019-01-28 15:29:20 +01:00
Gaute Lindkvist 64c30d00d1 #3994 Fix crash when creating valves and no valve template is present 2019-01-28 15:29:20 +01:00
Gaute Lindkvist 80c99f452f Set Default unit label on correct field in valve template collection 2019-01-28 15:29:20 +01:00
Gaute Lindkvist 49a6650e77 Make Valve template units visible 2019-01-23 11:01:48 +01:00
Gaute Lindkvist 2d5d5d13d2 Fix debug compile issue in RiaImageTools.cpp 2019-01-23 10:46:14 +01:00
Gaute Lindkvist 3fddca093e Fix compile warning in GeoMechContourMapProjection 2019-01-23 09:45:06 +01:00
Gaute Lindkvist f0731ace6f Fix compile warnings in RifEclipseDataTableFormatter 2019-01-23 09:41:25 +01:00
Gaute Lindkvist 2d0df3a990 Fix compile warning in RiaImageTools 2019-01-23 09:41:25 +01:00
Gaute Lindkvist bfdf55ec7b geomec pick 2019-01-23 09:41:24 +01:00
Gaute Lindkvist 796c6a0e0a #3987 Fix picking on Geo Mech contour maps 2019-01-23 09:23:22 +01:00
Gaute Lindkvist d9f7e68739 Add legend levels field to Contor Map projection and make sliders delay update until release 2019-01-22 15:48:21 +01:00
Gaute Lindkvist 19bf92c336 Move distance transform to RiaImageTools 2019-01-22 15:47:25 +01:00
Gaute Lindkvist 9a3a61811f #3980 Optimizing and expanding geomech boundaries to outside Pore pressure region 2019-01-22 14:00:40 +01:00
Gaute Lindkvist 810a991ba4 #3979 #3980 Contour Maps: Fix GeoMech crash and make limit to POR-result optional. 2019-01-22 14:00:09 +01:00
Gaute Lindkvist 4cd43d76d2 #3975 Avoid wrapping header lines in eclipse output + well plan 2019-01-18 14:55:12 +01:00
Gaute Lindkvist b800510568 #3970 Make min/max for all time steps available for all results in contour map 2019-01-18 13:53:03 +01:00
Gaute Lindkvist 26015753a3 Massively improve contour map speed by polygon simplification before clipping 2019-01-18 13:53:03 +01:00
Gaute Lindkvist 7ede074386 #3970 Contour Maps: Remove a wrong false && that was added to test performance but caused the fix not to be effective. 2019-01-18 08:55:13 +01:00
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