OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-09 23:16:00 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,075 Commits 28 Branches 61 Tags 289 MiB
3cd14df5b6
Commit Graph

8466 Commits

Author SHA1 Message Date
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