3498 Commits

Author	SHA1	Message	Date
Magne Sjaastad	7717bf925f	Rename and moved azimuth updates to RimFracture	2017-02-23 09:47:30 +01:00
Magne Sjaastad	855960287d	#1240 Use last stimplan time step as default, improved UI updates	2017-02-23 09:22:19 +01:00
Magne Sjaastad	36b4238f13	Merge remote-tracking branch 'refs/remotes/origin/dev' ... Conflicts: ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp	2017-02-23 08:44:53 +01:00
Magne Sjaastad	dc886b7e9c	Well path delete command supports multi selection	2017-02-23 08:42:27 +01:00
Magne Sjaastad	47f207998a	#1240 Adjustments to icons and command texts	2017-02-23 08:21:45 +01:00
Magne Sjaastad	c8cc667fa1	#1240 Use fracture icon for StimPlan colors	2017-02-23 07:07:57 +01:00
Magne Sjaastad	139590760f	#1240 Added checbox to StimPlan Colors	2017-02-22 15:32:19 +01:00
Magne Sjaastad	5ba0a37f34	Added missing include	2017-02-22 15:08:26 +01:00
Magne Sjaastad	6e5404d943	Use *.xml as file filter when opening a StimPlan file	2017-02-22 14:46:28 +01:00
Magne Sjaastad	65d71f7106	#1250 Show fractures directly as child objects of wells / well path	2017-02-22 14:40:13 +01:00
Magne Sjaastad	73690e6d66	#1239 Do not show fracture when fracture is unchecked	2017-02-22 13:29:20 +01:00
Magne Sjaastad	ac48b31e24	#1239 Add checkbox to control visibility of fractures	2017-02-22 13:24:07 +01:00
Magne Sjaastad	e67b9e4f59	Set visibility to protected to allow for inclusion in derived classes	2017-02-22 13:22:32 +01:00
Magne Sjaastad	cc5f5eddd0	Merge remote-tracking branch 'refs/remotes/origin/dev' ... Conflicts: ApplicationCode/ProjectDataModel/CMakeLists_files.cmake	2017-02-22 13:12:23 +01:00
Magne Sjaastad	8eb8a6fd3b	#1248 Add namedObject and checkableNamedObject	2017-02-22 13:09:31 +01:00
Magne Sjaastad	421dda1042	#1245 Property Editor : Use size hint displaying preferences	2017-02-22 11:58:56 +01:00
astridkbjorke	407f3734c3	#1244 - pre-proto - Improving text for fractures / fracture templates	2017-02-22 11:52:06 +01:00
Magne Sjaastad	c180e06172	Removed duplicate feature	2017-02-22 09:43:15 +01:00
Magne Sjaastad	1753449772	Merge remote-tracking branch 'refs/remotes/origin/dev' ... Conflicts: ApplicationCode/ProjectDataModel/CMakeLists_files.cmake ApplicationCode/UserInterface/RiuViewerCommands.cpp	2017-02-22 09:42:51 +01:00
astridkbjorke	1a3d695763	#1087 - pre-proto - Setting default unit system for fracture templates when reading in a new case.	2017-02-22 09:31:10 +01:00
Magne Sjaastad	03932f59c3	#1183 Property Filter: Context command : Apply As Cell Result - GeoMech	2017-02-21 15:37:56 +01:00
Magne Sjaastad	738e44ed46	#1183 Property Filter: Context command : Apply As Cell Result - Eclipse	2017-02-21 15:25:36 +01:00
Magne Sjaastad	c76078bd6b	Select and expand stored well alloc plot	2017-02-21 12:52:33 +01:00
Magne Sjaastad	eb1d8fac1d	#1227 Added delete to context menu for stored well alloc plots	2017-02-21 12:51:55 +01:00
Magne Sjaastad	0b0055b635	#1174 Added icon	2017-02-21 10:31:39 +01:00
Magne Sjaastad	7f21582610	Use fontMetrics of widget instead of empty QPainter to get valid values	2017-02-21 10:31:16 +01:00
Magne Sjaastad	b2ec4e055f	#1174 Added Show contributing wells from 3D view	2017-02-21 09:49:27 +01:00
Magne Sjaastad	91a962ab21	#1174 Rename	2017-02-21 09:13:33 +01:00
Magne Sjaastad	401918910a	#1231 Moved category handling to new class RimPropertyFilter	2017-02-21 08:57:40 +01:00
astridkbjorke	c8460e874f	pre-proto - Setting azimuth correctly when changing fracture template	2017-02-20 15:39:48 +01:00
astridkbjorke	be49cb2766	#1138 - pre-proto - Updating stimPlan legends after reading in xml file	2017-02-20 15:39:15 +01:00
astridkbjorke	9f156f9e5f	pre-proto - Setting azimuth angle correctly when new fractures are created.	2017-02-20 14:44:03 +01:00
Magne Sjaastad	75f2a6cb9f	#1236 Property Editor : Scroll bar for reduced screen area	2017-02-20 14:32:12 +01:00
astridkbjorke	c84f4efbb1	#1138 - pre-proto - Adding field in RimStimPlanColors for transparency	2017-02-20 13:24:22 +01:00
astridkbjorke	0a801635dd	#1138 - pre-proto - Adding stimPlan color palette (for plotting fracture data)	2017-02-20 12:30:26 +01:00
Magne Sjaastad	ad3270e513	#1230 Use part priority system	2017-02-20 11:10:03 +01:00
Magne Sjaastad	bdbb110ca4	Merge remote-tracking branch 'refs/remotes/origin/dev' ... Conflicts: ApplicationCode/ModelVisualization/CMakeLists_files.cmake ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp	2017-02-20 11:07:46 +01:00
Magne Sjaastad	b510979151	#1230 Use transparent on low values	2017-02-20 11:03:18 +01:00
Magne Sjaastad	6c5410f41a	#1230 Removed obsolete legend structures	2017-02-20 10:05:11 +01:00
Magne Sjaastad	a29f325125	Guard time step index	2017-02-20 10:04:21 +01:00
Magne Sjaastad	b7aebbb392	#1230 Created StimPlan colors and show lenged in 3D view	2017-02-20 09:31:24 +01:00
astridkbjorke	d2142c5724	#1234 - pre-proto - Adding commands for converting units for all ellipse fracture templates (metric <--> field)	2017-02-20 09:13:44 +01:00
Magne Sjaastad	4df861fc9c	#1228 Removed bundling of Qt lib files on Linux ... A while ago, ResInsight was build using non-system Qt on Linux, and required copy of Qt libs. This is obsolete behaviour and removed.	2017-02-19 17:00:46 +01:00
Magne Sjaastad	fb93fbbcc8	#1233 Improve system for setting part priorities	2017-02-18 12:38:15 +01:00
Magne Sjaastad	52615de9a3	#1194 Add some space between end of pipe and wel head arrow	2017-02-18 12:38:15 +01:00
Jacob Støren	d69a6e1daa	Linux compile fix	2017-02-17 16:04:16 +01:00
Jacob Støren	070d9c893b	#1209 Added calculation of none-accumulated flows as preparation for #1171 and #1120. Missing handling of wells with inconsistent flow.	2017-02-17 15:49:14 +01:00
Jacob Støren	492b777040	More refactoring as preparations for #1171, #1120, and #1209	2017-02-17 15:49:14 +01:00
Jacob Støren	b7b31f6c03	Well Alloc plots: Differentiated gray colors for "Total", "Reservoir" and "Others"	2017-02-17 15:49:14 +01:00
Jacob Støren	b00fe21726	Refactoring as preparations for #1171, #1120, and #1209	2017-02-17 15:49:14 +01:00