Commit Graph

4472 Commits

Author SHA1 Message Date
Magne Sjaastad
10f14aee8e Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-02-27 07:13:06 +01:00
Magne Sjaastad
83a1d97f33 #1257 More null pointer guards based on CppCheck 2017-02-24 16:16:58 +01:00
Magne Sjaastad
a29f6abc32 #1257 Added null pointer guarding based on reports from CppCheck 2017-02-24 16:00:56 +01:00
Magne Sjaastad
85228ee39c #1255 Removed includes from RimWellPath 2017-02-24 14:31:06 +01:00
Magne Sjaastad
1af3df6c6c #1255 Removed includes from RimWellLogCurve 2017-02-24 14:14:29 +01:00
Magne Sjaastad
ff99d56ea3 #1255 Removed includes from RimFaultCollection 2017-02-24 14:02:03 +01:00
Magne Sjaastad
1991a3c32d #1255 Removed includes from RimCellRangeFilterCollection 2017-02-24 14:01:42 +01:00
Magne Sjaastad
7349d608bd #1255 Removed includes from RimSummary classes 2017-02-24 13:56:46 +01:00
Magne Sjaastad
1792290ef0 #1255 Removed includes from RivReservoirWellSpheresPartMgr 2017-02-24 13:48:19 +01:00
Magne Sjaastad
6e960e74c3 #1255 Removed includes in Riv classes 2017-02-24 13:34:25 +01:00
Magne Sjaastad
63135a7c79 #1255 Removed include to RimOilRegion 2017-02-24 13:32:25 +01:00
Magne Sjaastad
6ec3e28a21 #1255 Removed includes from RimEclipseWell 2017-02-24 13:18:27 +01:00
Magne Sjaastad
aac42831cf Whitespace 2017-02-24 12:41:09 +01:00
Magne Sjaastad
4ace557892 Added class diagram for rim and rig relationships 2017-02-24 12:41:00 +01:00
Magne Sjaastad
2b4d1e1fac Updated class diagram for view classes 2017-02-24 12:40:34 +01:00
Magne Sjaastad
5c20bff5d1 #1255 Remove includes from header files 2017-02-24 11:07:26 +01:00
Magne Sjaastad
3a98e17163 #1254 Infrastructure for logging including Messages dock widget 2017-02-23 15:02:55 +01:00
Magne Sjaastad
2ce28ffff0 #1251 Use RivObjectSourceInfo for fractures 2017-02-23 11:53:26 +01:00
Magne Sjaastad
555ecba8b3 #1251 Added RivObjectSourceInfo for selecting any pdmObject 2017-02-23 11:52:56 +01:00
Magne Sjaastad
f59c4b4b9e #1242 Do not use transparency on ellipse, default transparency set to 1.0 2017-02-23 11:25:21 +01:00
Magne Sjaastad
7f75f7e509 #1252 Add and use transparent color for both ellipse and stim plan objects 2017-02-23 10:15:56 +01:00
Magne Sjaastad
5ccde99cb3 Guard null pointer access 2017-02-23 10:14:28 +01:00
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
38485fd96d Added caf prefix to virtual methods 2017-02-22 13:02:05 +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
0b806c7664 Fixed #1238 Pie chart not always complete 2017-02-21 14:44:18 +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