Commit Graph
9804 Commits
Author SHA1 Message Date
Bjørn Erik Jensen 5976298267 Merge branch 'dev' into measurement 2018-12-21 10:08:41 +01:00
Gaute Lindkvist b1b278fffc #3876 Add reference to Shoelace formula for counter clockwise polygon test. 2018-12-21 09:48:57 +01:00
Gaute Lindkvist 9fdec77c94 #3919 Contrast colors for contour lines 2018-12-21 09:48:57 +01:00
Gaute Lindkvist 22f054c6b9 #3919 Apply contrast colours to contour lines as well. 2018-12-21 09:48:57 +01:00
Gaute Lindkvist 68fb72311e #3919 Implement a better threshold check for contrast colors 2018-12-21 09:48:56 +01:00
Gaute Lindkvist 6754f837d4 #3876 First label implementation. Not rotated yet. 2018-12-21 09:48:56 +01:00
Gaute Lindkvist 37a3342db5 Fix unit test on Linux due to empty QRegExpValidator constructor (doesn't build on Qt 4.6) 2018-12-21 09:48:56 +01:00
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 66d923a0ef Set version to ResInsight 2018.11.1-patch_RC02 2018-12-21 08:30:36 +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
Magne Sjaastad 648250290e System : Add AppFwk unit tests using RESINSIGHT_INCLUDE_APPFWK_TESTS 2018-12-20 10:42:16 +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
Jacob Støren db78e07fcf #3797 Use custom icons for up and down stepping of comboboxes 2018-12-18 15:56:46 +01:00
Bjørn Erik Jensen 4f1f52ec5c Annotations. Hide isActive field in property editor 2018-12-18 15:08:27 +01:00