OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,584 Commits 27 Branches 61 Tags 309 MiB
c30721593e
Commit Graph

8889 Commits

Author SHA1 Message Date
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
Magne Sjaastad
5bbde43dad #4007 : Import feature : Use text "Import Eclipse Files" 2019-02-04 14:49:59 +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
Magne Sjaastad
d275b2bf60 #4031 Ensemble : Fix operator< 2019-02-04 11:22:38 +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
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
Magne Sjaastad
bd6bbe9da9 #4020 System : Use ri_apply_cotire() 2019-02-01 06:56:11 +01:00
Magne Sjaastad
ae98ba6c58 System : Silence warning on VS2017 2019-02-01 06:51:01 +01:00
Magne Sjaastad
1a7de264ca #4020 System : Define NOMINMAX before include of windows.h 2019-02-01 06:50:53 +01:00
Gaute Lindkvist
d882261511 #4027 Increase max padding for GeoMech contour maps 2019-01-31 16:05:25 +01:00
Magne Sjaastad
89d55d8354 #3856 Update copyright text in dialogs 2019-01-31 15:17:03 +01:00
Magne Sjaastad
3c0eb02b61 #3952 Summary : Create plot if no plot exists when loading summary case 2019-01-31 14:56:16 +01:00
Magne Sjaastad
061c1d304d #3952 Summary : Expand new summary case 2019-01-31 14:56:04 +01:00
Magne Sjaastad
58651bf15e #3952 Summary : Always create plot main window to allow expanding of items 2019-01-31 14:55:57 +01:00
Magne Sjaastad
e00bbae139 #3952 Summary : Create folders for input data and plots 2019-01-31 14:55:49 +01:00
Magne Sjaastad
baf00eaeab #3968 Ensemble : Not possible to plot two ensembles at the same time 
Due to wrong usage of cached number of curves, curves will not be added in some cases. Multiple checking of check boxes will work as a workaround.
 2019-01-31 14:41:54 +01:00
Magne Sjaastad
bfa7edd1f9 #3937 Summary : Improve robustness for well and lgr name 
A char pointer is communicating the names from libecl, and this pointer must be tested before assigning to a std::string
 2019-01-31 09:22:18 +01:00
Magne Sjaastad
ffc3515b49 #3937 Summary : Improve robustness for well and lgr name 
A char pointer is communicating the names from libecl, and this pointer must be tested before assigning to a std::string
 2019-01-31 09:20:19 +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
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
Jacob Støren
8a5cbf60fd #3958 Refactoring CaseCellResultsData to propagate result address with timelapse info all the way. 2019-01-29 12:44:23 +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
Magne Sjaastad
79701a6233 #3988 Deeper : Zoom all of intersections gives empty view 
Only allow poly line pick handler to respond when the active view is parent of intersection object.
 2019-01-28 22:17:04 +01:00
Jacob Støren
fe53380a36 #3958 Refactoring: RigCaseCellResultsData: Reorder headerfile 
to group the methods sensibly
 2019-01-28 16:31:57 +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
8ee1d1491f #3958 Refactoring: EclipseResultAddress can now be used with type and variable in addition to index (which is to be removed) 2019-01-25 16:19:14 +01:00
Jacob Støren
726f5ee596 Remove compiler warnings 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
d0792d80c3 #3958 Refactoring : Moved formation names calculation into CaseCellResultsData. 
Made one more method private.
 2019-01-25 16:19:14 +01:00
Jacob Støren
70fc63056f #3958 Refactoring: Privatized and renamed findTransmissibilityResults() 
Narrower identification in header of methods needing refactoring attention
 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
accc0768a1 #3958 Refactoring: Reordered the headerfile to outline the index-based methods needing refactorization 2019-01-25 16:19:13 +01:00
Jacob Støren
e21a0da543 #3958 Refactoring: Remove resultIndex in maxTimeStepResult 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
Jacob Støren
b329f3acc7 #3992 Fixed memory overwrite (and arbitrary crashes) due to missing critical section. 
The critical section is needed when doing geometry transfer from libecl in paralell.
Caused arbitrary crashes in completely unrelated code when compiled in release on a 32-core machine on windows
 2019-01-25 12:27:43 +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
Magne Sjaastad
9850e75048 Add missing include 2019-01-18 16:07:50 +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
Magne Sjaastad
5d9ef00067 Fix warning on VS2017 2019-01-17 10:23:22 +01:00
sigurdp
ccff90b1d5 #3948 HoloLens : Support for export of text labels. Also added more detailed debug information. 2019-01-17 10:06:35 +01:00
Magne Sjaastad
64395e8aa3 Remove unused file 2019-01-17 10:01:56 +01:00
Magne Sjaastad
dd004c7051 #3948 HoloLens : Skip labels for annotations and measurements 
No line visualization is present in HoloLens, so for now we skip labels connected by lines
 2019-01-17 09:58:53 +01:00
Magne Sjaastad
3209ad3a7c System : Skip progress bar if no plots are present 2019-01-17 09:43:42 +01:00
Magne Sjaastad
e846e50da4 Whitespace 2019-01-17 07:48:07 +01:00
Magne Sjaastad
84b0a23512 System : Avoid creating unused variable 2019-01-17 07:37:09 +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
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
Magne Sjaastad
aed0de8a2b #3968 Ensemble : Not possible to plot two ensembles at the same time 
Due to wrong usage of cached number of curves, curves will not be added in some cases. Multiple checking of check boxes will work as a workaround.
 2019-01-16 13:51:13 +01:00
Magne Sjaastad
488d62522b #3967 Use empty() and const ref 2019-01-16 12:53:30 +01:00
Magne Sjaastad
8e307399c0 #3967 Summary command line parameters : Open summary case 2019-01-16 12:50:57 +01:00
Magne Sjaastad
fd133b0d36 Whitespace 2019-01-16 11:52:06 +01:00
Magne Sjaastad
4e6add0c37 #3967 Summary : Add simulation file name helper 2019-01-16 11:21:44 +01:00
Jacob Støren
190b88547e #3963 Simplify Plot Window toolbar icon 2019-01-16 10:15:49 +01:00
Jacob Støren
49292cd2ef #3956 Improve ruler icon 2019-01-16 09:32:59 +01:00
Jacob Støren
d158a3c3bb #3946 Improve HoloLens icons 2019-01-15 18:23:25 +01:00
Gaute Lindkvist
314a5747db #3957 Restore UI-order in Well Path Valve property editor 2019-01-15 17:13:23 +01:00
sigurdp
f2668eae4e HoloLens: Export of cull face mode to JSON 2019-01-15 15:14:06 +01:00
sigurdp
7588c0d2ae HoloLens: Reversed logic for determining face culling mode when exporting meshes 2019-01-15 15:14:06 +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
a32ebe4dff #3948 HoloLens : Add labels 2019-01-15 14:07:41 +01:00
sigurdp
469437f320 HoloLens: RicHoloLensRestClient now has an explicit setter for disabling SSL certificate verification. Removed separate flag for controlling whether debug export to file will be done. Now does the export whenever a folder is specified. 2019-01-15 13:23:31 +01:00
Magne Sjaastad
9cbbde3f74 HoloLens : Add missing parent to create session dialog 2019-01-15 13:01:09 +01:00
Magne Sjaastad
17f42df110 #3810 HoloLens : Fix update of checkable toolbar button 2019-01-15 12:52:14 +01:00
Magne Sjaastad
9bb4cb3e1a Measurements : Move setCheckable into feature 2019-01-15 12:13:00 +01:00
Magne Sjaastad
5014c86a3f #3947 HoloLens : Add face culling to VdeExportPart 2019-01-15 11:51:21 +01:00
Magne Sjaastad
5222950476 #3948 HoloLens labels : Add text label source info 2019-01-15 11:51:21 +01:00
Magne Sjaastad
6695cf2a39 #3965 HoloLens : Add flag in preferences to disable ssl verification 2019-01-15 11:51:21 +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
9124610020 #3952 Summary : Expand new summary case 2019-01-14 11:15:04 +01:00
Magne Sjaastad
f545c44422 #3952 Summary : Always create plot main window to allow expanding of items 2019-01-14 11:14:48 +01:00
Magne Sjaastad
ce51f40a3f #3952 Summary : Create folders for input data and plots 2019-01-14 11:14:18 +01:00
Magne Sjaastad
32f780f558 #3949 Summary : Hide snapshot toolbar by default 2019-01-14 09:49:10 +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
Magne Sjaastad
af0c169bca #3952 Summary : Always show FOPT for new plots 2019-01-14 07:08:05 +01:00
Magne Sjaastad
240e146a1b #3951 Summary : Improve Windows menu 2019-01-14 07:08:05 +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
Magne Sjaastad
6cc2740a74 #3960 Measurements : Add feature activation from context menu, and write Esc as shortcut 2019-01-11 15:49:30 +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
cee966a6d1 #3944 clang-tidy : Apply changes on geomech and ssihub 2019-01-11 08:14:53 +01:00
Magne Sjaastad
d460d3d77d #3944 clang-tidy : Apply modernize-deprecated-headers 2019-01-11 08:14:53 +01:00
Magne Sjaastad
63c675d6e2 System : Add clang-tidy 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
67d0b44c1e #3856 Update copyright text in dialogs 2019-01-09 15:29:37 +01:00
Magne Sjaastad
6db80f40b9 #3856 Update copyright headers 2019-01-09 15:29:24 +01:00
Magne Sjaastad
fb4529731a #3856 Update copyright headers 2019-01-09 15:15:34 +01:00
Magne Sjaastad
32e611f710 Qt5 : Install dependencies on Windows 2019-01-09 13:59:29 +01:00
Magne Sjaastad
4557514622 Whitespace 2019-01-09 12:48:56 +01:00
Magne Sjaastad
c27d935fc4 Contour map : Disable simulation wells and faults when creating from 3D view 2019-01-09 12:48:42 +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
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
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
Magne Sjaastad
e835e2b32a #3924 Measurements : Improve text in tool tip 2019-01-08 07:11:00 +01:00
Magne Sjaastad
53ef8dbed9 #3932 System : Add FindOctave 2019-01-07 12:44:36 +01:00
Magne Sjaastad
f727a6c4ee #3929 System : Always lock mutex before unlocking 2019-01-07 12:38:53 +01:00
Magne Sjaastad
f09fa727fa #3928 Coordinate transform : Add convert of vector of points 2019-01-03 13:16:26 +01:00
Magne Sjaastad
ecb1b83dfa #3927 Measurements : Compute horizontal area of polygon 2019-01-03 11:34:50 +01:00
Magne Sjaastad
5bf13140e3 #3927 Measurements : Add unit test for area computations 2019-01-03 09:47:45 +01:00
Magne Sjaastad
3543ba7cf3 #3924 Measurements : Remove double mouse click event handling 2019-01-03 07:33:54 +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
7f24edaebf #3924 Measurements : Set object name for toolbar 2019-01-03 07:06:11 +01:00
Magne Sjaastad
855e22abb4 #3924 Measurements : Redraw immediately instead of schedule redraw 2019-01-02 15:04:33 +01:00
Magne Sjaastad
ee9721a338 #3924 Measurements : Use CTRL key to append poly line points 2019-01-02 15:04:05 +01:00
Magne Sjaastad
8709734697 Whitespace 2019-01-02 14:41:17 +01:00
Magne Sjaastad
fe75265053 Annotations : Remove check on priority 
For performance reasons, priority was checked before dyncast. This does not work now for unknown reasons.
 2019-01-02 14:39:39 +01:00
Magne Sjaastad
c5dc9da4bd #3924 Measurement : Clean up includes 2019-01-02 14:37:59 +01:00
Magne Sjaastad
218472fe2c Merge branch 'dev' into measurement 2019-01-02 14:32:17 +01:00
Magne Sjaastad
4e6d7d3c40 #3922 Scale bar : Update legend layout when dependent data changes 2019-01-02 11:22:25 +01:00
Magne Sjaastad
98c0406926 Whitespace 2019-01-02 09:45:48 +01:00
Magne Sjaastad
1cfedd7ff8 System : Qt5 : Copy DLLs into destination folder 2019-01-02 07:09:12 +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
Bård Skaflestad
6839c1cf77 ECLFluxCalc: Remove Unused 'useEPS' Constructor Parameter 
Recent developments have rendered this parameter unused.  Remove
it to make API simpler.  The library now always loads arrays as
if the caller requests end-point scaling behaviour and we defer
effects of actual end-point scaling until client code queries
the flux calculator at run time.
 2018-12-21 13:14:45 +01:00
Magne Sjaastad
a9c7773ef7 CppCheck : Fix various minor issues 2018-12-21 12:32:57 +01:00
Magne Sjaastad
e514a77a80 CppCheck : Add missing assignment to isOk 2018-12-21 12:32:25 +01:00
Magne Sjaastad
be77e4e048 CppCheck : Guard null pointer access 2018-12-21 12:31:42 +01:00
Magne Sjaastad
d2431a40a9 CppCheck : Remove unused variable, use range based for 2018-12-21 12:17:07 +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
Gaute Lindkvist
128208d35a Fix type in RiaColorTools contrastColor 2018-12-21 10:12:58 +01:00
Magne Sjaastad
d54c509b35 Add missing include 2018-12-21 10:10:11 +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
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
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
Magne Sjaastad
935efc66e1 cotire : Adjustments for Qt5 2018-12-20 20:59:19 +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
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
Magne Sjaastad
755e1405db #3909 Ensemble : Sort files alphabetically in find dialog 2018-12-20 09:05:35 +01:00
Magne Sjaastad
f7a7a943d7 #3911 Ensemble import : Remember separate file path for ensemble 2018-12-20 08:50:21 +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
deec4c16e9 #3804 Measurement. Set checkable toolbutton (still changing icon) 2018-12-19 14:49:35 +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
sigurdp
928a0628cd HoloLens: First cut, optimization of array data communication to sharing server. ResInsight will try and detect changes in its internal arrays, and will only announce changed arrays to the server (through meta data.) Previously, ResInsight would send all array data to the server unconditionally. Now the set of arrays/packets to send is controlled by the sharing server through its response to a post of new meta data. 2018-12-19 12:32:18 +01:00
sigurdp
f8a0a0e8bb Reference correct local variable when calling deleteLater() 2018-12-19 12:32:18 +01:00
Magne Sjaastad
6a340c5b99 #3905 Summary Stepping : Avoid updateUI when not required 2018-12-19 11:21:18 +01:00
Magne Sjaastad
8011c9994d #3904 Summary : Always insert summary curve without H when match is found 2018-12-19 10:08:10 +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
sigurdp
0e910e7391 HoloLens: Added support for session pin code and bearer authentication. Improved session management and error handling. Added some dignostic timings for sending of array data. 2018-12-18 22:08:57 +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
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
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
0d1a4cf0a6 #3842 Summary : Update source stepping based on selection 2018-12-17 16:14:32 +01:00
Magne Sjaastad
b3c3631cc4 #3842 : Update toolbar based on selection 2018-12-17 16:05:23 +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
aaff5d33e5 #3841 Summary : Detect summary curves and corresponding history curves 2018-12-17 15:45:37 +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
560549a5cb #3841 Add compare to RiaStdStringTools 2018-12-17 07:55:20 +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
c575e1d29e #3868 Annotations. Remove commented code 2018-12-14 15:34:18 +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
Magne Sjaastad
75a0a01952 #3841 Add compare to RiaStdStringTools 2018-12-14 12:25:14 +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
543b8fc1cc Completion export : Remove early return to be able to compute WPIMULT correct 2018-12-13 22:29:56 +01:00
Magne Sjaastad
dc70c1f8e0 Completion export : Remove early return to be able to compute WPIMULT correct 2018-12-13 22:28:56 +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
Magne Sjaastad
74b4828219 #3870 Abort when creating contour map : Remove assert 2018-12-13 14:28:14 +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
8821a37b90 #3853 Remove zero padding and unnecessary space at beginning and end of row for WSEGAICD 2018-12-12 15:07:04 +01:00
Magne Sjaastad
d90c5f07bd Use size_t instead of int 2018-12-12 15:05:36 +01:00
Magne Sjaastad
6665ac9cc6 #3796 Summary Plot Stepping toolbar : Update on plot editor close 2018-12-12 11:22:59 +01:00
Magne Sjaastad
a85b958a0f #3796 Summary Plot Stepping toolbar : Update on plot editor close 2018-12-12 11:21:21 +01:00
Gaute Lindkvist
b2d178e584 #3857 Fix split on well and completion for MSW export. 2018-12-12 11:04:55 +01:00
Magne Sjaastad
e58941a423 Remove duplicate line 2018-12-12 10:45:11 +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
Magne Sjaastad
eaa0592a9d Add missing initialization 2018-12-11 15:09:19 +01:00
Gaute Lindkvist
7c110091d5 #3809 Make Flow diagnostics work with contour maps 2018-12-11 13:39:28 +01:00
Magne Sjaastad
33a8f773ae #3827 Fishbone Laterals : Whole well is exported instead of lateral only 2018-12-11 13:22:50 +01:00
Bjørn Erik Jensen
97aad76c23 #3791 Contour map. Remove IJ cell ref from info text 2018-12-11 13:21:48 +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
2ae4e483ed #3783 Guard in case of incomplete project data 2018-12-11 13:14:58 +01:00
Magne Sjaastad
3a31199365 #3784 Completion Export : Use isCompletionWellPathEqual() 2018-12-11 13:14:09 +01:00
Magne Sjaastad
fe17e9e0c0 #3784 Completion Export : Split on well name instead of well name for export 2018-12-11 13:14:04 +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
Bjørn Erik Jensen
deb2755285 #3781 Carfin export. Correct NX, NY and NZ values 2018-12-11 13:10:54 +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
a996019a76 #3837 Annotations. Fix non working create text annotation command 2018-12-11 12:21:47 +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
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
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
1c1680ef63 #3781 Carfin export. Correct NX, NY and NZ values 2018-12-10 14:40:21 +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
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
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
Bjørn Erik Jensen
a6e9d463f4 #3723 Annotations. Remove commented code. Minor code fixes 2018-12-07 09:52:29 +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
55f980eeb7 Restructure RicMswExportInfo code into multiple files. 2018-12-06 11:32:59 +01:00
Gaute Lindkvist
73be6b6b19 #3779 Split RicMswCompletions into subclasses and move ICD-area and flow coefficient from segment to the icd completion class 2018-12-06 10:55:23 +01:00
Gaute Lindkvist
8fbc1d0953 #3779 Make sure we always have a super valve for segments that overlap with valves. 2018-12-06 10:11:06 +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
Gaute Lindkvist
1bab754b26 Reintroduce CDEStyle to progress bar in 3D view 
* Only works for Qt4
 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
7b9520a8cc Application. Use the new FontCache for applicationwide font creation 2018-12-05 14:53:08 +01:00
Bjørn Erik Jensen
00d767f67c #3789 Annotations. Text appearance settings. New FontCache class 2018-12-05 14:39:07 +01:00
Magne Sjaastad
069d434584 #3827 Fishbone Laterals : Whole well is exported instead of lateral only 2018-12-05 12:47:11 +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
Magne Sjaastad
968da84051 #3816 Annotations : Guard assert with debug ifdef 2018-12-05 07:36:57 +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
920467e1f3 Fix signed/unsigned compare 2018-12-04 11:49:29 +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
Magne Sjaastad
4026f21a00 Cotire : Fix duplicate global variables 2018-12-03 15:22:09 +01:00
Magne Sjaastad
0371a1962e Add missing include 2018-12-03 14:50:12 +01:00
Magne Sjaastad
68bc466830 #3792 Use font 10 and 14 2018-12-03 14:19:49 +01:00
Magne Sjaastad
a860adb1fb Fix compare of wrong enum type 2018-12-03 14:03:34 +01:00
Magne Sjaastad
8d0926dd53 Fix Linux build issue 2018-12-03 13:55:48 +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
Jacob Støren
918efd3a27 #3757 Enable Z-buffer testing for text annotations 2018-12-03 11:05:12 +01:00
Jacob Støren
f3c0345d3a #3757 Improve position of labels when creating them in 3D view 2018-12-03 11:05:12 +01:00
Jacob Støren
a13201e42e #3757 Add selection of text annotations by picking 2018-12-03 11:05:12 +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
Magne Sjaastad
0ae2dcaccf #3784 Completion Export : Use isCompletionWellPathEqual() 2018-12-03 10:40:15 +01:00
Magne Sjaastad
bbadf3918e #3784 Completion Export : Split on well name instead of well name for export 2018-12-03 10:31:56 +01:00
Magne Sjaastad
52b02a6056 Whitespace 2018-12-03 08:57:28 +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
c60e6b8140 #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-11-30 14:01:29 +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
Gaute Lindkvist
6f9cac7201 Fix Progress bar alignment on Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
afbe84997e Fix MDI window placement after Qt5 upgrade 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
6cee9eb9e6 #3752 Upgrade ResInsight CMake-system to support both Qt5 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
5c66b901c3 #3752 ResInsight code changes to build on both Qt4 and Qt5 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
Bjørn Erik Jensen
b5f0459843 #3772 Annotations. Draw reach circle center symbol 2018-11-29 08:48:28 +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
Magne Sjaastad
3b5011d573 Merge remote-tracking branch 'origin/dev' into dev-deeper 2018-11-28 13:56:36 +01:00
Magne Sjaastad
2aa838ee6b Update of keywords 2018-11-28 13:54:46 +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
0083618dd2 #3770 Import perforations. Add RifPerforationIntervalReaderTest 2018-11-28 09:50:22 +01:00
Bjørn Erik Jensen
1078ccdee6 Merge branch 'dev' into dev-deeper 2018-11-28 09:26:57 +01:00
Bjørn Erik Jensen
4c9f3cff0f #3770 Import perforations. Fix spaces in well name issue 2018-11-28 09:23:09 +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
Gaute Lindkvist
70eca210bf #3765 Support Eclipse cases in Memory Management case list 2018-11-27 13:40:08 +01:00
Jacob Støren
8873cdb1f7 #3757, #3723 Merge cleanup of 3d editor support 2018-11-27 11:45:46 +01:00
Gaute Lindkvist
d743602b81 #2396 Set better fixed y-axis range for logarithmic scaling 2018-11-27 11:29:55 +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
Gaute Lindkvist
49b5b60352 #2396 Add support for locking axes in Cell RelPerm plot 
* Also put curves in a grid layout and
shortened logarithmic label to fit better
 2018-11-27 10:53:14 +01:00
Jacob Støren
3c32595e25 AppFwk: Moved PdmUi3dObjectEditorHandle and PdmUiSelection3dEditorVisualizer into correct place in PdmUiCore 2018-11-27 10:31:54 +01:00
Jacob Støren
318cd76b64 AppFwk: Split PdmUiObjectEditorHandle into PdmUiWidgetObjectEditorHandle 
making PdmUiObjectEditorHandle  a cleaner interface for PdmUi3dObjectEditorHandle
 2018-11-27 09:31:33 +01:00
Bjørn Erik Jensen
e578deb43c #3756 Annotations. Moved files to subdirs 2018-11-27 09:26:30 +01:00
Jacob Støren
b9b1646576 AppFwk: 3D editor system: Replace pointer to caf::Viewer with generic QWidget, as it is not neccessary to know the viewer explicitly. 2018-11-26 22:37:25 +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
Jacob Støren
bb95daee97 #3724 Fix missing drawing of more than one polyline 2018-11-26 14:08:14 +01:00
Bjørn Erik Jensen
5531504e8e #3706 Annotations. Text annotation border color 2018-11-26 12:49:22 +01:00
Magne Sjaastad
f6572e876d #3704 : Export completions : WELSPECL - one line per well 2018-11-26 12:46:32 +01:00
Bjørn Erik Jensen
6286a8729b #3706 Annotations. Simple drilling reach circle 2018-11-26 11:08:38 +01:00
Magne Sjaastad
243633137a #3753 : Non-Darcy perforations : Use effectiveK and effectiveH 2018-11-26 10:07:35 +01:00
Magne Sjaastad
268fc4f368 #3753 : Non-Darcy perforations : Add calculation of effective height 2018-11-26 10:07:35 +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
Gaute Lindkvist
8b7b110440 Merge branch 'dev' into dev-deeper 2018-11-26 09:21:33 +01:00
Gaute Lindkvist
80d48fd669 Move QString include to cpp file of RiaStatisticsTool 2018-11-26 08:01:44 +01:00
Bjørn Erik Jensen
35405ebafc #3706 Annotations. First commit. Not tested 2018-11-23 13:33:59 +01:00
Magne Sjaastad
4f46a9b3cb #3715 Well connection factor viz : Show fracture well connection factors in cell center 2018-11-23 13:05:34 +01:00
Magne Sjaastad
74dc73adf8 #3750 Completion export header : Extract report items per well 2018-11-23 11:44:57 +01:00
Magne Sjaastad
8d9080d695 #3750 Completion export header : Report only referenced fracture templates 2018-11-23 11:32:50 +01:00
Magne Sjaastad
200e6d229b #3748 Statistics calculators : Improve handling of invalid numbers 2018-11-23 10:13:58 +01:00
Magne Sjaastad
f9a6957fae #3748 Statistics calculator : Add helper functions for (in)valid numbers 2018-11-23 10:12:23 +01:00
Magne Sjaastad
5e7ebcd0f6 #3748 Statistics calculators : Add tests for statistics calculators 
Add negative infinity to input data to trigger failing tests
 2018-11-23 09:12:56 +01:00
Bjørn Erik Jensen
39a838b406 Merge branch 'dev' into dev-deeper 2018-11-23 08:45:28 +01:00
Bjørn Erik Jensen
5fee7b1492 #3733 exportProperty. Remove unused command parameter 2018-11-23 08:37:09 +01:00
Gaute Lindkvist
56ae4fa5bd Fix Linux Build Problem after FlowDiag 2018-11-23 08:20:05 +01:00
Magne Sjaastad
89098705cb Whitespace 2018-11-22 16:02:44 +01:00
Magne Sjaastad
5603fcf21d #3688 Summary Plot : Update of source stepping toolbar fails sometimes 2018-11-22 16:01:27 +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
9dc2452ba1 #3739 Fix crash in Well Bore Stability plots for synt_small.odb 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
Magne Sjaastad
13f8ad5ea8 #3712 Non-Darcy Perforations : Adjust computation of 'kh' 2018-11-22 09:13:56 +01:00
Bjørn Erik Jensen
63d952746d Merge branch 'dev' into dev-deeper 2018-11-21 15:21:49 +01:00
Bjørn Erik Jensen
67ba01f835 #3722 Scale legend. Descrease size 2018-11-21 14:58:47 +01:00
Gaute Lindkvist
428f2b9851 #3728 Move WBHP source into header of table rather than as a column 2018-11-21 14:07:14 +01:00
Bjørn Erik Jensen
5e769b337f Merge branch 'dev' into dev-deeper 2018-11-21 14:00:46 +01:00
Magne Sjaastad
eebab64625 #3713 Fracture header : Compute matrix permeability and create weighted average 2018-11-21 13:44:31 +01:00
Magne Sjaastad
bc12dc44eb #3713 Fracture header : Add computation of matrix permeability 2018-11-21 13:43:15 +01:00
Bjørn Erik Jensen
2912059922 #3730 Plot Editor. Sort numeric identifiers by numeric value and not alphabetically 2018-11-21 12:31:57 +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
Gaute Lindkvist
0eea7d38cf #3728 Put time step into comment table for pressure depletion. 2018-11-21 11:38:56 +01:00
Magne Sjaastad
8a3907e531 #3725 exportSnapshots : Add optional prefix 2018-11-21 10:30:36 +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
Bjørn Erik Jensen
e98b1728f1 #3717 Plot editor. Never plot a default vector 2018-11-21 09:31:52 +01:00
Bjørn Erik Jensen
5354caef13 #3690 Missing Summary Data. Set well name for segment vectors in eclipse summary reader 2018-11-21 09:24:53 +01:00
Magne Sjaastad
1871e558e5 Temporary LGR : Use icon in feature 2018-11-21 08:36:03 +01:00
Gaute Lindkvist
046a2acc67 #3620 Hide the "New Valve" feature if RESINSIGHT_DEVEL is not 1. 2018-11-20 15:38:43 +01:00
Gaute Lindkvist
9763f420a8 #3718 Update 3d View when deleting casing design 2018-11-20 15:32:09 +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
Gaute Lindkvist
d51f66179a #3711 Report only pressure depletion tables when we do scaling. 2018-11-20 13:47:59 +01:00
Bjørn Erik Jensen
939dfe664a #3698 Scale bar. Enable check box for showing/hiding scale bar 2018-11-20 12:07:39 +01:00
Bjørn Erik Jensen
e3c619ddfe Merge remote-tracking branch 'origin/dev' into dev-deeper 2018-11-20 11:37:14 +01:00
Gaute Lindkvist
b41217455f #3689 Change order of result aggregation types 2018-11-20 11:32:02 +01:00
Gaute Lindkvist
58c5f066c3 #3700 Fix bugs related to cell positions and grid extent. 2018-11-20 11:31:22 +01:00
Magne Sjaastad
212f80f92e #3709 Fracture : Mix of both main grid and LGR cells when computing completion data 2018-11-19 21:31:03 +01:00
Gaute Lindkvist
42d3e65416 #3700 Add visual picking marker and improve map results 
* Fix "off by half a cell" errors and improve smoothness using averaging and interpolation
 2018-11-19 15:24:18 +01:00
Magne Sjaastad
71f90b1337 #3692 Export completions : Use 'Mean' and move text to first column header line 2018-11-19 11:37:25 +01:00
Magne Sjaastad
bab90456c7 #3694 Stimplan : Add support for effective width using unit mm 2018-11-19 10:39:15 +01:00
Magne Sjaastad
8c521b1775 #3703 Do not resize dialog 2018-11-19 10:12:54 +01:00
Gaute Lindkvist
86f40ed8a9 #3580 Fix Linux build problem related to fault appearance 2018-11-19 08:28:45 +01:00
Bjørn Erik Jensen
75c923d102 #3698 Scale bar. Support for both horizontal and vertical orientation 2018-11-16 13:52:05 +01:00
Bjørn Erik Jensen
d8a466a9ef #3698 Scale bar. Take 1. Only vertical variant implemented so far 2018-11-16 13:52:05 +01:00
Magne Sjaastad
76abf0fe01 Whitespace 2018-11-16 11:38:35 +01:00
Magne Sjaastad
3c3bb153ac #3685 Well Path Creation: Set MDRKB at first target when starting from an existing wellpath 2018-11-16 11:35:13 +01:00
Magne Sjaastad
9cd695278e #3695 Well path creation : Crash when creating a vertical well 
Caused by two identical reference points next to each other
 2018-11-16 08:43:19 +01:00
Gaute Lindkvist
e2cc7fb423 #3699 Show global east west position when picking on Contour Maps. 2018-11-15 15:19:19 +01:00
Gaute Lindkvist
a1e094625a #3701 Add axis line option to 2d intersection view as well. 2018-11-15 15:02:07 +01:00
Gaute Lindkvist
b20e801ae1 #3701 Larger margins around axis text 2018-11-15 15:02:07 +01:00