OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-11 07:56:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,942 Commits 29 Branches 61 Tags 290 MiB
11e73a76fc
Commit Graph

4690 Commits

Author SHA1 Message Date
Magne Sjaastad
f2146c6007 #4114 Regression Test : Remove cached pointer to eclipse case 2019-02-20 11:35:31 +01:00
Magne Sjaastad
3acd426ead Whitespace 2019-02-18 11:15:34 +01:00
Magne Sjaastad
7fe0b92839 #4111 Move resultDefinition field to private 2019-02-18 11:07:54 +01:00
Magne Sjaastad
fdf3313320 Whitespace 2019-02-18 10:55:35 +01:00
Magne Sjaastad
f9021117f4 #4111 3D calculations : Always show difference options 2019-02-18 10:52:11 +01:00
Gaute Lindkvist
6bdd4b8178 #4088 Update View names in Window Title when changing the custom name part 2019-02-15 13:36:20 +01:00
Gaute Lindkvist
aeb964a89a #4096 Make sure the base time steps are taken from the base case 
* Also clear time lapse option when changing base case. We don't know if the currently
  selected time step exists in the new case.
 2019-02-15 13:16:51 +01:00
Gaute Lindkvist
e0913d8a21 #4096 Reorder case / time diff to put case diff first 2019-02-15 13:16:51 +01:00
Gaute Lindkvist
fbd1486a4c #4096 Fix combination of case and time diff for identical cases 2019-02-15 13:16:51 +01:00
Gaute Lindkvist
833a29c3c2 #4062 #4081 Make time and case diff apply immediately and don't change variable name 
* Instead show the change in the Result label, legend and info box.
 2019-02-15 13:16:51 +01:00
Magne Sjaastad
69bbf6921c #4092 Summary Plot: Data Source fails for combined Well and Segment plot 2019-02-15 12:31:32 +01:00
Magne Sjaastad
4eea7e91ee #4093 RFT Plot : Not possible to select both RFT and Grid as source at the same time 
Avoid updating the UI selections based on curves in defineUiOrdering
 2019-02-15 10:53:56 +01:00
Magne Sjaastad
1abf370176 #4091 Whitespace 2019-02-14 21:44:01 +01:00
Magne Sjaastad
22a0957d9b #4091 Reload case : Remove unused includes 2019-02-14 21:42:31 +01:00
Magne Sjaastad
e660433d29 #4091 Reload case : Move reload of case into helper function 2019-02-14 21:26:54 +01:00
Magne Sjaastad
4e9895ef0e System : Remove unused class 2019-02-14 15:11:27 +01:00
Magne Sjaastad
5c355245f9 Typo : Use lower case for "of" 2019-02-13 11:23:47 +01:00
Magne Sjaastad
237f31ca17 #4076 Result difference options : Show result diff on "Cell Result" 2019-02-13 09:37:02 +01:00
Magne Sjaastad
79e1170ed8 #4050 3D calculations : UI for case difference 
Show case diff for static and generated
 2019-02-12 15:19:41 +01:00
Magne Sjaastad
1d4ab1a0b2 #4048 #4050 3D calculations : Add UI and calculation of case difference 2019-02-12 14:49:37 +01:00
Magne Sjaastad
157ff774e8 #4068 System : Add forward declare 2019-02-12 14:49:37 +01:00
Magne Sjaastad
39af63a27d #4068 System : Add forward declare 2019-02-12 14:49:37 +01:00
Magne Sjaastad
803e6cd2b4 #4068 System : Add forward declare 2019-02-12 14:49:37 +01:00
Gaute Lindkvist
8c130bbc6e #4070 Add pick cursor to measurements 2019-02-12 08:21:01 +01:00
Gaute Lindkvist
d9672ad9a1 Simplify pick event system 2019-02-11 15:48:02 +01:00
Gaute Lindkvist
0fd51b2088 #4025 Show delayed action progress bar during contour map generation 2019-02-11 13:10:38 +01:00
Magne Sjaastad
72e9683ac9 #4049 : Add "Disabled" to drop down item of time steps 2019-02-11 12:41:34 +01:00
Magne Sjaastad
f631321ad1 #4049 3D calculations : Use _dt_<time step index> to indicate time differenc 2019-02-11 07:59:03 +01:00
Magne Sjaastad
7ea2a907ad #4049 3D calculations : Add time step index to list of date strings 2019-02-11 07:58:03 +01:00
Magne Sjaastad
06feb039fc #4029 3D calculations : Hide ternary and completion type from diff variables 2019-02-08 14:03:54 +01:00
Magne Sjaastad
3cd14df5b6 #4029 3D calculations : Move result string function to RiaDefines 2019-02-08 13:59:10 +01:00
Magne Sjaastad
3586988d1d Whitespace 2019-02-08 13:02:48 +01:00
Magne Sjaastad
d20c0fc004 #3862 Reload case does not work correctly 
When issuing reload case by right-click on case, reset time history filter
 2019-02-07 10:21:08 +01:00
Magne Sjaastad
189234c0c9 #3920 Create Well Path: New well name not used in Completions 2019-02-07 08:44:12 +01:00
Magne Sjaastad
f4e0a154ee #4038 2D plot Source data stepping re-set curve interpolation 2019-02-07 08:30:55 +01:00
Magne Sjaastad
1717a5bf30 #3995 Completions : Reorder items in context menu 2019-02-07 07:26:25 +01:00
Magne Sjaastad
152c1ad941 #3958 Rename to "Time Difference" 2019-02-06 13:28:14 +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
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
0e52426071 #4014 Use Vec3d Editor for Text and ReachCircle Annotations 2019-02-06 08:21:14 +01:00
Magne Sjaastad
fad4dc91d7 #4036 Ensemble : Use list editor instead of drop down when selecting parameter 2019-02-05 11:18:06 +01:00
Magne Sjaastad
619abd2f1f #4000: Rename Observed Time History Data -> Observed Data 2019-02-05 08:18:49 +01:00
Magne Sjaastad
47abb3c6a1 #3999 Summary : Rename to Cases and Data 2019-02-05 08:18:20 +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
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
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
d882261511 #4027 Increase max padding for GeoMech contour maps 2019-01-31 16:05:25 +01:00
Jacob Støren
61e9a2a696 #3958 First shot on time difference implementation 2019-01-30 16:46:16 +01:00
Jacob Støren
1d60bd9843 Simple rename variables 2019-01-30 15:28:45 +01:00
Jacob Støren
58ac488929 #3958 Refactoring : RigResultAccessorFactory simplification 
To make the result address including basetimestep info reach the CellResultsData class.
 2019-01-30 15:25:29 +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
Magne Sjaastad
7518a1880a Revert "#4018 Result management : Use ensureReservoirCaseIsOpen instead of open..." 
This reverts commit fde60d1e34.
 2019-01-29 20:28:33 +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
Magne Sjaastad
0a22515a3e #3990 Rename 2019-01-29 11:57:27 +01:00
Magne Sjaastad
c50d75a61f #3990 Flow Diag : Move creation of RigFlowDiagSolverInterface before computeCachedData 
computeCachedData triggers update of UI, and update of curves can require RigFlowDiagSolverInterface
 2019-01-29 11:57:27 +01:00
Gaute Lindkvist
7a50fa12f8 #3953 Extend well completions spec 2019-01-29 10:18:20 +01:00
Magne Sjaastad
fde60d1e34 #4018 Result management : Use ensureReservoirCaseIsOpen instead of open... 2019-01-29 10:06:37 +01:00
Magne Sjaastad
6935ea0688 #4018 Result management : Ensure result file is open 
if no 3D views are present, make sure the result grid case file is open as part of creating a curve.
 2019-01-29 10:06:37 +01:00
Jacob Støren
5fe4a057ce #3958 Fix warning and error from refactoring 2019-01-29 08:35:42 +01:00
Jacob Støren
a3660cd496 #3958 Refactoring: Rename modifiable result access to make it easier to track in the code. The existing overloads made things harder to read. 2019-01-29 08:35:42 +01:00
Jacob Støren
dbb2a564a2 #3958 Refactoring: RigCaseCellResultsData: Remove the final result index based interface 2019-01-28 16:18:28 +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
80c99f452f Set Default unit label on correct field in valve template collection 2019-01-28 15:29:20 +01:00
Jacob Støren
c159dfb763 #3958 Refactor: Simple renaming 2019-01-25 16:19:15 +01:00
Jacob Støren
3e3d3871ed #3958 Refactoring: Remove scalarResultIndex from RigEclipseResultAddress 
and real external use (outside CaseCellResultsData)
Regression tests OK.
 2019-01-25 16:19:15 +01:00
Jacob Støren
98f2b50180 #3958 Refactoring: Remove more direct use of scalarResultIndex related to CellEdge 2019-01-25 16:19:15 +01:00
Jacob Støren
d8eded7d49 #3958 Refactoring: Removed result index from NNC data 2019-01-25 16:19:15 +01:00
Jacob Støren
09011862cd #3958 Refactoreing: Rename 2019-01-25 16:19:14 +01:00
Jacob Støren
1d8e31fe91 #3958 Refactoring: Fix after update from dev 2019-01-25 16:19:14 +01:00
Jacob Støren
42afa063d5 #3958 Refactoring: Rename to findOrLoadKnownScalarResult 
to make it clear that it does not add a result name to the internal structures.
 2019-01-25 16:19:14 +01:00
Jacob Støren
5a01fdb88e #3958 Refactoring: Replaced result info based lookups with result address. 
Replaced access of resultInfo as vector with single access based on address.
Moved RigEclipseResultAddress to a separate new file.
 2019-01-25 16:19:13 +01:00
Jacob Støren
8e16d3ff20 #3958 Refactoring: Moved code into CaseCellResultsData. 
Made methods private
 2019-01-25 16:19:13 +01:00
Jacob Støren
ccfee8f34a #3958 Starting refactoring of eclipse results addressing 
Preparations for time diff results
 2019-01-25 16:19:13 +01:00
Gaute Lindkvist
49a6650e77 Make Valve template units visible 2019-01-23 11:01:48 +01:00
Gaute Lindkvist
3fddca093e Fix compile warning in GeoMechContourMapProjection 2019-01-23 09:45:06 +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
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
Magne Sjaastad
e75362f87e System : Avoid file global variables (cotire) 
When multiple files defines the same variable in global file scope, a name clash happens in cotire. Prefer using static const members instead.
 2019-01-16 15:56:16 +01:00
Magne Sjaastad
bde2c0109c Fix signed/unsigned assignment issue 2019-01-16 15:56:16 +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
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
Magne Sjaastad
791a896be4 #3952 Summary : Create plot if no plot exists when loading summary case 2019-01-14 13:54:19 +01:00
Magne Sjaastad
ce51f40a3f #3952 Summary : Create folders for input data and plots 2019-01-14 11:14:18 +01:00
Magne Sjaastad
22e8eb485f #3810 HoloLens : Tool bar button and scheduler for auto sent to server 2019-01-14 08:42:54 +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
Magne Sjaastad
d460d3d77d #3944 clang-tidy : Apply modernize-deprecated-headers 2019-01-11 08:14:53 +01:00
Magne Sjaastad
81c3ee5df2 #3944 System : Improve code quality using clang-tidy 
Remove redundant virtual and add override
 2019-01-11 08:14:53 +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
Magne Sjaastad
6db80f40b9 #3856 Update copyright headers 2019-01-09 15:29:24 +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
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
Magne Sjaastad
20f9bf4318 #3935 Measurements : Add Esc button to abort measurement mode 2019-01-08 14:55:44 +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
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
Magne Sjaastad
e835e2b32a #3924 Measurements : Improve text in tool tip 2019-01-08 07:11:00 +01:00
Magne Sjaastad
ecb1b83dfa #3927 Measurements : Compute horizontal area of polygon 2019-01-03 11:34:50 +01:00
Magne Sjaastad
8f85e49849 #3924 Measurements : Rename, fix issues with points in multiple views 2019-01-03 07:18:22 +01:00
Magne Sjaastad
31a30f8a94 #3924 Measurements : Hide measurement from project tree 2019-01-03 07:08:25 +01:00
Magne Sjaastad
855e22abb4 #3924 Measurements : Redraw immediately instead of schedule redraw 2019-01-02 15:04:33 +01:00
Magne Sjaastad
218472fe2c Merge branch 'dev' into measurement 2019-01-02 14:32:17 +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
Magne Sjaastad
a9c7773ef7 CppCheck : Fix various minor issues 2018-12-21 12:32:57 +01:00
Magne Sjaastad
be77e4e048 CppCheck : Guard null pointer access 2018-12-21 12:31:42 +01:00
Magne Sjaastad
6b952add64 CppCheck : Make sure all variables are initialized in constructor 2018-12-21 11:30:29 +01:00
Magne Sjaastad
8bc8ac5e58 CppCheck : Remove unused function 2018-12-21 11:29:14 +01:00
Bjørn Erik Jensen
5976298267 Merge branch 'dev' into measurement 2018-12-21 10:08:41 +01:00
Magne Sjaastad
47f50c8195 Remove unused functions/variables 2018-12-21 10:07:26 +01:00
Gaute Lindkvist
6754f837d4 #3876 First label implementation. Not rotated yet. 2018-12-21 09:48:56 +01:00
Bjørn Erik Jensen
21403f4161 #3805 Measurement. Double click in view to reset measurement 2018-12-21 09:23:53 +01:00
Magne Sjaastad
6f3097dd5f Merge remote-tracking branch 'origin/2018.11.01-patch' into dev 2018-12-21 08:46:27 +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
Bjørn Erik Jensen
d6f4962ed7 #3806 Measurement. Display text label at last clicked position 2018-12-20 12:34:17 +01:00
Magne Sjaastad
284e07b967 #3907 Summary : Consider combined curve count when assigning color 2018-12-20 10:46:48 +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
Magne Sjaastad
bc86158ff6 #3914 Source Stepping : Add checkbox for include of ensemble cases 2018-12-20 08:36:35 +01:00
Magne Sjaastad
1ac998973e #3913 Source Case Stepping : Exclude ensemble and observed cases from list 2018-12-20 08:13:49 +01:00
Bjørn Erik Jensen
849a623379 #3804 #3805 Measurement. Add toolbar button and interactive picking 2018-12-19 14:41:17 +01:00
Bjørn Erik Jensen
b30008c5c8 Revert "#3862 Reload case. Reset time step filter during reload to fix issue" 
This reverts commit d202e430d2.
 2018-12-19 13:04:03 +01:00
Magne Sjaastad
b7e569d09a #3904 Summary : Move function 2018-12-19 10:07:33 +01:00
Bjørn Erik Jensen
d202e430d2 #3862 Reload case. Reset time step filter during reload to fix issue 2018-12-19 08:26:35 +01:00
Magne Sjaastad
cad072ba0b #3902 Summary Stepping : Fix issues for well name, region and well group name 2018-12-18 22:55:35 +01:00
Magne Sjaastad
a442ddff04 #3901 Summary Stepping : Improve source case stepping 2018-12-18 22:55:35 +01:00
Jacob Støren
07f8221676 #3898, #3899, #3900 Better source stepping command icons. Combine curve and stepping icons. Improved Clear source curve command enabling 2018-12-18 17:15:54 +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
Bjørn Erik Jensen
4f1f52ec5c Annotations. Hide isActive field in property editor 2018-12-18 15:08:27 +01:00
Bjørn Erik Jensen
4873381176 #3868 Annotations. Fix polyline visualization and property editor 2018-12-18 12:50:21 +01:00
Bjørn Erik Jensen
a2e2907e41 #3883 Annotations. Validate line thickness 2018-12-18 10:48:48 +01:00
Magne Sjaastad
024aa8af51 #3782 StimPlan : Beta value of zero invalidates mean calculation 2018-12-17 16:24:42 +01:00
Magne Sjaastad
6325b9c878 #3782 StimPlan : Beta value of zero invalidates mean calculation 2018-12-17 16:24:02 +01:00
Magne Sjaastad
fb9e5ee210 #3842 : Update icons in project tree 2018-12-17 16:01:15 +01:00
Magne Sjaastad
9af5adf066 #3842 Summary : Commands for set/clear of stepping data source 2018-12-17 16:00:40 +01:00
Magne Sjaastad
ec528108d4 #3842 Summary : Application logic for supporting stepping data source 2018-12-17 15:59:50 +01:00
Magne Sjaastad
b1da83ee33 #3842 Summary : Use one curve as basis for source data stepping 2018-12-17 15:54:23 +01:00
Magne Sjaastad
67d0d5f38d #3891 StimPlan : BETA values for transversal and azimuth 2018-12-17 11:17:41 +01:00
Magne Sjaastad
d40675f222 #3891 StimPlan : BETA values for transversal and azimuth 2018-12-17 10:33:42 +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
Magne Sjaastad
9ef915b0a8 Summary : Guard invalid data 2018-12-17 07:56:29 +01:00
Magne Sjaastad
c488348168 #3835 Ensemble : Improve hos curve visibility is defined 2018-12-17 07:56:24 +01:00
Magne Sjaastad
5e466ed5a9 #3841 Summary : Update stepping toolbar when curve is deleted 2018-12-17 07:56:19 +01:00
Magne Sjaastad
86d801a138 Summary : Guard invalid data 2018-12-17 07:28:27 +01:00
Magne Sjaastad
1654c3cc58 #3835 Ensemble : Improve hos curve visibility is defined 2018-12-17 07:26:22 +01:00
Magne Sjaastad
19df293f12 #3841 Summary : Update stepping toolbar when curve is deleted 2018-12-17 07:25:25 +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
Bjørn Erik Jensen
8401e3d9f0 #3868 Annotations. Draw spheres on polylines + toggles conotrolling visibility 2018-12-14 15:32:32 +01:00
Bjørn Erik Jensen
295da5658e #3793 View auto name. Move ViewNameConfig to 3dView and replace current name field. InitAfterRead update to be backward compatible 2018-12-14 13:43:25 +01:00
Bjørn Erik Jensen
fa55e1b3f5 #3793 Views. Rename RimContourMapNameConfig to RimViewNameConfig 2018-12-14 13:42:07 +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
Magne Sjaastad
529ca6285b #3873 Create LGR : Use isCell instead of isValid 
isCell evaluates the global grid cell index, and must be used before accessing the global cell index.
 2018-12-13 20:08:24 +01:00
Magne Sjaastad
c2ddeb33aa #3873 Create LGR : Use isCell instead of isValid 
isCell evaluates the global grid cell index, and must be used before accessing the global cell index.
 2018-12-13 20:06:05 +01:00
Magne Sjaastad
4ad982ada6 #3872 Summary Plot : Move last activated curve on top within category 2018-12-13 16:14:29 +01:00
Bjørn Erik Jensen
d482d3a4ca #3826 Summary curves. Draw error bars in front of all curves except from observed data curves 2018-12-13 16:14:13 +01:00
Magne Sjaastad
0fa5a5b000 #3871 Summary Plot : Missing assignment of curve z-value 2018-12-13 16:07:17 +01:00
Magne Sjaastad
f36d0eeee7 #3872 Summary Plot : Move last activated curve on top within category 2018-12-13 16:05:58 +01:00
Bjørn Erik Jensen
9c750c5287 #3869 Annotations. Closing polyline support 2018-12-13 15:58:32 +01:00
Magne Sjaastad
a87c4efd93 #3871 Summary Plot : Missing assignment of curve z-value 2018-12-13 15:37:06 +01:00
Bjørn Erik Jensen
8d28e86bce #3867 Anntoations. Remove TextAnnotation's child nodes 2018-12-13 15:14:04 +01:00
Bjørn Erik Jensen
01249ace3a #3860 Z scale label. Do not show in contour map 2018-12-13 13:20:49 +01:00
Gaute Lindkvist
92e4fa9024 #3863 fix default MSW parameters for perforation intervals. 2018-12-12 15:37:10 +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
3dafd06859 #3850 Implement calculation of AICD length 2018-12-11 16:21:17 +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
7c110091d5 #3809 Make Flow diagnostics work with contour maps 2018-12-11 13:39:28 +01:00
Gaute Lindkvist
2ae4e483ed #3783 Guard in case of incomplete project data 2018-12-11 13:14:58 +01:00
Bjørn Erik Jensen
70db2bdd2e #3760 Summary plot. Z ordering different types of summary curves 2018-12-11 13:12:47 +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
Bjørn Erik Jensen
d91e79f247 #3838 Annotations. Add name to user defined polylines 2018-12-11 12:37:11 +01:00
Bjørn Erik Jensen
65390ac6e9 #3836 Annotations. Polyline edit fixes. Default pos 2018-12-11 11:51:09 +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
Bjørn Erik Jensen
81e2132752 #3839 Annotations. Remove 'targets' tree node for user defined polylines 2018-12-10 15:09:41 +01:00
Bjørn Erik Jensen
abdc4957cd #3835 Ensemble curves. Fix visibility bug 2018-12-10 14:05:01 +01:00
Bjørn Erik Jensen
488798c3d8 #3790 Z scale label. Display in upper left corner 2018-12-10 13:04:07 +01:00
Gaute Lindkvist
15576a9ae3 #3779 Preliminary AICD output 2018-12-07 15:48:18 +01:00
Bjørn Erik Jensen
6e1b8adba1 Annotations. Fix. Update view local collections when importing polyline from file 2018-12-07 15:13:51 +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
e677778ddd #3828 Refactor Completion export code by splitting out MSW export into separate files 
* Plus fill in some incomplete functionality regarding MSW export
 2018-12-07 09:46:39 +01:00
Bjørn Erik Jensen
b4482d20b0 #3723 Annotations. User editable polyline, both in in view and in property editor 2018-12-07 09:11:19 +01:00
Gaute Lindkvist
29c3e10617 #3779 Implement AICD ui and settings 2018-12-05 15:47:16 +01:00
Gaute Lindkvist
e67a9ef12a Make sure changes to valves and perforation interval visibility is reflected in track. 2018-12-05 15:47:16 +01:00
Gaute Lindkvist
4591d9f20e #3615 Fix z-order so packers are added after other components 
*  Valves are added last of all
* This way packers are displayed on top of perforation intervals and fishbones.
 2018-12-05 15:47:16 +01:00
Gaute Lindkvist
c1c897d7a4 #3616 Make 1m the default length of packers 2018-12-05 15:47:16 +01:00
Gaute Lindkvist
420944e910 #3442 Improve ICD/ICV export to add a small 0.1 length segment for each segment containing valves. 2018-12-05 15:47:16 +01:00
Bjørn Erik Jensen
9d4bcd457d #3814 Annotations. Multiline text annotation support 2018-12-05 15:27:07 +01:00
Bjørn Erik Jensen
00d767f67c #3789 Annotations. Text appearance settings. New FontCache class 2018-12-05 14:39:07 +01:00
Bjørn Erik Jensen
23148c621e #3824 Annotations. 'Create annotation' context menu item on each annotation group 2018-12-05 10:23:15 +01:00
Bjørn Erik Jensen
6a2484c40e #3826 Summary curves. Draw error bars in front of all curves except from observed data curves 2018-12-05 09:35:05 +01:00
Jacob Støren
c4cc33b624 #3639 Add map projection icon for Contour maps 2018-12-04 15:13:19 +01:00
Magne Sjaastad
af18e30ac6 #3816 Annotations : Assert if resolve of PdmPtrField fails 2018-12-04 14:33:14 +01:00
Magne Sjaastad
687aadcfde #3816 Annotations : PdmPtr not resolved correctly 2018-12-04 12:30:47 +01:00
Magne Sjaastad
1c9da3d33f #3820 System : Delete RiuViewer directly instead of deleteLater() 2018-12-04 11:43:58 +01:00
Magne Sjaastad
6bcdd4e6c4 Remove unused code 2018-12-03 20:25:24 +01:00
Bjørn Erik Jensen
e56090dc92 #3788 Annotations. Set texts and icons 2018-12-03 15:29:23 +01:00
Bjørn Erik Jensen
11e2fe29d4 #3788 Annotations. Mirror global annotations into view annotation collection. Not thorougly testet yet 2018-12-03 13:15:31 +01:00
Gaute Lindkvist
e984b06ea6 Fix build problem on Linux by renaming file to correct case 2018-12-03 10:58:49 +01:00
Gaute Lindkvist
9961b39473 Fix build problem on Linux with missing cvfBase.h 2018-12-03 10:58:49 +01:00
Gaute Lindkvist
45e909fcfa #3783 Guard in case of incomplete project data 2018-12-03 10:58:49 +01:00
Jacob Støren
a9a5eaf604 #3757 New feature to add a text annotation in the 3D view 2018-11-30 14:30:34 +01:00
Jacob Støren
92a45e959e #3757 Rename RiuSelectionManager to Riu3dSelectionManager 2018-11-30 14:30:34 +01:00
Jacob Støren
c2206abca5 #3757 Wip: Add draggers to text annotation points when text is selected 2018-11-30 14:30:34 +01:00
Gaute Lindkvist
20534775d6 #3809 Make Flow diagnostics work with contour maps 2018-11-30 13:47:46 +01:00
Gaute Lindkvist
4d765f19b6 #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-11-30 11:48:52 +01:00
Gaute Lindkvist
8be822c5d7 #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-11-30 11:26:38 +01:00
Gaute Lindkvist
f18884b675 #3752 Fix crash when closing ResInsight 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
f2c7f2ce80 Fix display problems on Linux 2018-11-30 09:47:53 +01:00
Bjørn Erik Jensen
e489d77c81 #3787 Annotations. Folder for each annotation type 2018-11-30 09:06:01 +01:00
Bjørn Erik Jensen
a239923ebc #3786 Annotations. Use slider for annotations plane depth. Move toggle to top 2018-11-30 08:59:22 +01:00
Bjørn Erik Jensen
7f0b05a93b #3760 Summary plot. Z ordering different types of summary curves 2018-11-29 15:29:15 +01:00
Gaute Lindkvist
f14d36ca23 #3442 Implement export of ICD/ICV table for performations 2018-11-29 15:26:22 +01:00
Gaute Lindkvist
f0d3a36374 #3442 Change defaults for ICDs to values suggested in meeting 2018-11-29 15:25:53 +01:00
Gaute Lindkvist
2414865dbe #3442 UI For ICD/ICV parameters 2018-11-29 15:24:39 +01:00
Bjørn Erik Jensen
d3db1a6075 #3777 Annotations. Use Bounding box to decide whether to draw an object or not 2018-11-29 14:28:33 +01:00
Bjørn Erik Jensen
9dc1e8d063 #3778 Annotations. Move z plane settings to in-view collection 2018-11-29 10:13:19 +01:00
Jacob Støren
3cc8ff82d1 #3764 Add annotation related icons 2018-11-28 15:40:28 +01:00
Bjørn Erik Jensen
b6b96e62f6 Annotations. Fix crash 2018-11-28 15:27:32 +01:00
Bjørn Erik Jensen
76e8aa9652 #3773 Annotations. Remove annotation color factory class 2018-11-28 15:15:42 +01:00
Bjørn Erik Jensen
bbec88b5d1 #3773 Annotations. Set default color for line based annotations 2018-11-28 15:00:34 +01:00
Jacob Støren
0148fc2279 #3724 Reload and recreate visualization when changing file 2018-11-28 14:36:17 +01:00
Jacob Støren
04754d394f #3776 Add toggle to text and reach circles annotations 2018-11-28 14:36:17 +01:00
Bjørn Erik Jensen
30b34bbe67 Annotations. Fixed polyline vectors. Use explicit naming 2018-11-28 14:21:40 +01:00
Bjørn Erik Jensen
10aae368d3 #3775 Annotations. Use depth in GUI, not z, for used defined polylines as well 2018-11-28 13:21:59 +01:00
Bjørn Erik Jensen
02eea4bc84 #3775 Annotations. Use depth in GUI, not z 2018-11-28 13:10:11 +01:00
Jacob Støren
0f384cf4f7 #3724 Split the line annotation classes into separate files. Cleaned up includes 2018-11-28 12:10:08 +01:00
Bjørn Erik Jensen
c3dd6a14a7 #3763 Annotations. Define annotation plane Z for global annotations 2018-11-28 11:58:38 +01:00
Bjørn Erik Jensen
aae3665539 #3755 Annotations. Reach circle name field 2018-11-28 07:45:53 +01:00
Bjørn Erik Jensen
4685d5981d Merge branch 'dev' into dev-deeper 2018-11-28 07:10:56 +01:00
Jacob Støren
29e6e08779 #3724 Added cycling default color to polyline import. Set default line thickness to 2. 
Refactored away unneccesary complexity. loadAndUpdate when opening project file. Toggle now working
 2018-11-27 17:54:42 +01:00
Bjørn Erik Jensen
d138770a2a 3767 Annotations. Feature for deleting annotations 2018-11-27 15:44:00 +01:00
Bjørn Erik Jensen
e6685e139a #3758 Annotations. Fix header info. Remove unneccessary includes 2018-11-27 14:43:25 +01:00
Bjørn Erik Jensen
d8142e3c75 #3758 Annotations. Add appearance settings to line based annotations 2018-11-27 14:27:19 +01:00
Gaute Lindkvist
5498c2f466 #3766 Hide blank grid children in GeoMech cases 2018-11-27 13:40:19 +01:00
Jacob Støren
8873cdb1f7 #3757, #3723 Merge cleanup of 3d editor support 2018-11-27 11:45:46 +01:00
Jacob Støren
733324634b #3757, #3723 Split the RicPointTangentManipulator file into the different classes actually contained therein 2018-11-27 11:29:20 +01:00
Bjørn Erik Jensen
e578deb43c #3756 Annotations. Moved files to subdirs 2018-11-27 09:26:30 +01:00
Jacob Støren
fb93ad7ca7 AppFwk: Make PdmUiSelection3dEditorVisualizer generic, ready to be moved to a separate file 2018-11-26 21:50:46 +01:00
Bjørn Erik Jensen
cdaa5e2af6 #3756 Annotation. Refactore features. Add view local text annotations 2018-11-26 15:12:43 +01:00
Jacob Støren
9297c5888c #3724, #3723 Several polyline annotation updates 
Renamed from polyline to polylines.
Split into PolylinesFromFile and UserDefinedPolylines
Add import of polylines from file
 2018-11-26 14:10:20 +01:00
Bjørn Erik Jensen
6286a8729b #3706 Annotations. Simple drilling reach circle 2018-11-26 11:08:38 +01:00
Bjørn Erik Jensen
4dc5c66b03 #3706 Annotations. Working text annotation, no view interaction yet. (and no background transparency) 2018-11-26 09:27:39 +01:00
Bjørn Erik Jensen
35405ebafc #3706 Annotations. First commit. Not tested 2018-11-23 13:33:59 +01:00
Bjørn Erik Jensen
39a838b406 Merge branch 'dev' into dev-deeper 2018-11-23 08:45:28 +01:00
Gaute Lindkvist
56ae4fa5bd Fix Linux Build Problem after FlowDiag 2018-11-23 08:20:05 +01:00
Magne Sjaastad
314c20a04a #3735 Summary plot : Improve stepping for well path name 2018-11-22 15:24:18 +01:00
Bjørn Erik Jensen
15a6bc358b Merge branch 'dev' into dev-deeper 2018-11-22 14:21:00 +01:00
Bjørn Erik Jensen
ceb5fff780 Create Well Path. Add tooltip containing dog leg unit 2018-11-22 14:20:08 +01:00
Gaute Lindkvist
a1b7e694a6 #3727 Give packers a more realistic default length 2018-11-22 14:06:03 +01:00
Gaute Lindkvist
ae8cb9d210 #3741 Make it possible to enable/disable all well path components in plots and 3d view. 
* Add check box to casing design and update of plot
* Add isEnabled() method to component interface which controls plotting.
 2018-11-22 13:39:08 +01:00
Gaute Lindkvist
132408ab6f #3727 Additional packer fixes 2018-11-22 13:39:08 +01:00
Gaute Lindkvist
fcc8ee6e27 #3736 Fix Linking issues related to Contour Maps. 
* They are not allowed to be master views so a few things should be disallowed.
 2018-11-22 13:39:07 +01:00
Gaute Lindkvist
d69153c013 #3489 Fix legend text for flow diagnostics. 2018-11-22 13:39:07 +01:00
Magne Sjaastad
17524f66f8 #3696 Non-Darcy perforation intervals : Set default radius 2018-11-22 09:50:50 +01:00
Magne Sjaastad
a225d1fd1a #3696 Non-Darcy perforation intervals : Remove unit constant from UI 2018-11-22 09:46:40 +01:00
Bjørn Erik Jensen
5e769b337f Merge branch 'dev' into dev-deeper 2018-11-21 14:00:46 +01:00
Bjørn Erik Jensen
b89dcf3eb1 #3690 Missing Summary Data. Fix strange summary vector names in the legend 2018-11-21 12:31:56 +01:00
Gaute Lindkvist
4818a4fd71 #3727 Set packer end when you set packer start and still make it available for edit. 2018-11-21 11:38:56 +01:00
Bjørn Erik Jensen
651084420c #3720 Temp LGR. Hide 'Temporary LGRs' tree node when no temp LGRs exist 2018-11-21 09:58:54 +01:00
Gaute Lindkvist
094ae45dcd Formatted contour map code and renamed some methods. 2018-11-21 09:33:21 +01:00
Gaute Lindkvist
66d5cedb2e #3716 Ensure static results can be shown if there are no dynamic results. 2018-11-20 14:54:30 +01:00