Magne Sjaastad
|
8f85e49849
|
#3924 Measurements : Rename, fix issues with points in multiple views
|
2019-01-03 07:18:22 +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
|
218472fe2c
|
Merge branch 'dev' into measurement
|
2019-01-02 14:32:17 +01:00 |
|
Magne Sjaastad
|
a9c7773ef7
|
CppCheck : Fix various minor issues
|
2018-12-21 12:32:57 +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 |
|
Bjørn Erik Jensen
|
5976298267
|
Merge branch 'dev' into measurement
|
2018-12-21 10:08:41 +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 |
|
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
|
708f24943b
|
Hide Unit Test Feature if USE_UNIT_TESTS is not defined
|
2018-12-20 09:50:05 +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 |
|
Bjørn Erik Jensen
|
849a623379
|
#3804 #3805 Measurement. Add toolbar button and interactive picking
|
2018-12-19 14:41:17 +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 |
|
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
|
394c84efef
|
#3854 Add MSW reference depth to Perforations
|
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 |
|
Magne Sjaastad
|
9af5adf066
|
#3842 Summary : Commands for set/clear of stepping data source
|
2018-12-17 16:00:40 +01:00 |
|
Gaute Lindkvist
|
3adb1cc4bd
|
#3884 Implemented Valve Templates for MSW parameters
|
2018-12-14 16:03:04 +01:00 |
|
Bjørn Erik Jensen
|
8401e3d9f0
|
#3868 Annotations. Draw spheres on polylines + toggles conotrolling visibility
|
2018-12-14 15:32:32 +01:00 |
|
Bjørn Erik Jensen
|
295da5658e
|
#3793 View auto name. Move ViewNameConfig to 3dView and replace current name field. InitAfterRead update to be backward compatible
|
2018-12-14 13:43:25 +01:00 |
|
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
|
74b4828219
|
#3870 Abort when creating contour map : Remove assert
|
2018-12-13 14:28:14 +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 |
|
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
|
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
|
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 |
|
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 |
|
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
|
deb2755285
|
#3781 Carfin export. Correct NX, NY and NZ values
|
2018-12-11 13:10:54 +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
|
37b5d10c49
|
#3829 Remove spaces in Export Completion file names: Patch fix
|
2018-12-11 11:46:40 +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
|
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
|
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
|
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 |
|
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 |
|
Magne Sjaastad
|
968da84051
|
#3816 Annotations : Guard assert with debug ifdef
|
2018-12-05 07:36:57 +01:00 |
|
Magne Sjaastad
|
af18e30ac6
|
#3816 Annotations : Assert if resolve of PdmPtrField fails
|
2018-12-04 14:33:14 +01:00 |
|
Magne Sjaastad
|
0371a1962e
|
Add missing include
|
2018-12-03 14:50: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 |
|
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
|
5c66b901c3
|
#3752 ResInsight code changes to build on both Qt4 and Qt5
|
2018-11-30 09:47:53 +01:00 |
|
Gaute Lindkvist
|
f14d36ca23
|
#3442 Implement export of ICD/ICV table for performations
|
2018-11-29 15:26:22 +01:00 |
|
Jacob Støren
|
3cc8ff82d1
|
#3764 Add annotation related icons
|
2018-11-28 15:40:28 +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
|
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
|
4685d5981d
|
Merge branch 'dev' into dev-deeper
|
2018-11-28 07:10:56 +01:00 |
|
Bjørn Erik Jensen
|
d138770a2a
|
3767 Annotations. Feature for deleting annotations
|
2018-11-27 15:44:00 +01:00 |
|
Jacob Støren
|
8873cdb1f7
|
#3757, #3723 Merge cleanup of 3d editor support
|
2018-11-27 11:45:46 +01:00 |
|
Jacob Støren
|
733324634b
|
#3757, #3723 Split the RicPointTangentManipulator file into the different classes actually contained therein
|
2018-11-27 11:29:20 +01:00 |
|
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 |
|
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 |
|
Gaute Lindkvist
|
8b7b110440
|
Merge branch 'dev' into dev-deeper
|
2018-11-26 09:21:33 +01:00 |
|