Commit Graph

9717 Commits

Author SHA1 Message Date
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
Magne Sjaastad
c6df9eb7e7 Upped to 2018.11-dev.01 2018-11-29 07:06:56 +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
Magne Sjaastad
6d251edf92 Include dev in version info 2018-11-28 12:04:31 +01:00
Magne Sjaastad
4c2d3e0130
Merge pull request #3774 from OPM/master
Merge pull request #3771 from OPM/dev
2018-11-28 12:00:18 +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
Magne Sjaastad
bd44ec8d51
Merge pull request #3771 from OPM/dev
Merge dev into master for Release 2018.11
2018-11-28 09:39:16 +01:00
Bjørn Erik Jensen
1078ccdee6 Merge branch 'dev' into dev-deeper 2018-11-28 09:26:57 +01:00
Magne Sjaastad
5f9a80b438 Upped to 2018.11 2018-11-28 09:25:38 +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
Jacob Støren
08de39f15a AppFwk: Update some plantuml docs 2018-11-27 14:59:30 +01:00
Jacob Støren
7a0fcaa2ec AppFwk: Remove obsolete plantuml documentation stuff 2018-11-27 14:59:30 +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
Magne Sjaastad
5496430de7 Upped version to ResInsight-2018.11.0-RC1 2018-11-27 14:11:55 +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
b4572fd9a2 AppFwk: Remove som unused code 2018-11-26 21:51:05 +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