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
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