Commit Graph

531 Commits

Author SHA1 Message Date
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
5ba0a37f34 Added missing include 2017-02-22 15:08:26 +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
ac48b31e24 #1239 Add checkbox to control visibility of fractures 2017-02-22 13:24:07 +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
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
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
astridkbjorke
9f156f9e5f pre-proto - Setting azimuth angle correctly when new fractures are created. 2017-02-20 14:44:03 +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
astridkbjorke
fa638243ab #1087 - pre-proto - Moving enum for unit system to RimDefines, and establishing default unit system for fracture template collection (used when creating new templates). 2017-02-17 10:11:32 +01:00
Magne Sjaastad
f9d8ab8bad Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ApplicationCode/Resources/ResInsight.qrc
2017-02-16 10:18:39 +01:00
Magne Sjaastad
b6b544f13f #1174 Rename to loadDataAndUpdate 2017-02-15 10:40:32 +01:00
Magne Sjaastad
e8c5a43e1a #1174 Update legend after result definition has changed 2017-02-15 10:26:52 +01:00
Magne Sjaastad
758ac9ef8c #1214 Generalized export of snapshot images for all plot window types 2017-02-14 15:03:54 +01:00
astridkbjorke
3023ddcd78 #1087 - pre-proto - Adding units to fracture template and adding command feature for converting length values in ellipseFractureDefinition. 2017-02-14 09:49:14 +01:00
Jacob Støren
61e82c37b5 #1210 Using defult flow diag results if available when creating Well Alloc Plots 2017-02-14 08:30:52 +01:00
Jacob Støren
a25bfd4513 #1213 Well allocation plot is now only created when requested.
Also made the fields in FlowPlotCollection private.
2017-02-14 08:10:39 +01:00
Magne Sjaastad
73053b0bb7 #1174 Create TOF property filter with selected tracer 2017-02-13 15:00:49 +01:00
Magne Sjaastad
45f3240932 #1174 Added context menu to WellAllocationPlot and added feature 2017-02-13 13:29:31 +01:00
Magne Sjaastad
9fa772a7bc Fixed #1177 Well Alloc plots: Store command does not add an actual window 2017-02-10 12:31:35 +01:00
astridkbjorke
517c53a069 (#1139) - pre-proto - Reading in stimplan XMLfile. Not tested for multiple properties / timesteps. (Also some code clean-up) 2017-02-10 10:03:46 +01:00
astridkbjorke
22ee6250bd (#1137) - pre-proto - Adding delete/new command for stimplan fracture templates. Removing RimStimPlanFractureDefinition, functionality moved into RimStimPlanFractureTemplate. Renaming RimFractureDefinitionCollection to RimFractureTemplateCollection. 2017-02-10 09:54:37 +01:00
astridkbjorke
d52cfc0f0b (#1136, #1137) - pre-proto - Adding base class RimFractureTemplte, and classes for stimPlan fractureTemplate and data structures. Also adding features for creating new stimPlan Fracture templates. 2017-02-10 09:52:18 +01:00
Magne Sjaastad
652df8854d #1180 Use RiaColorTables for several features (well log, summary, flow rates) 2017-02-10 08:39:25 +01:00
Magne Sjaastad
5df94a1e18 #1181 Do not automatically update track names when adding new tracks 2017-02-09 08:35:33 +01:00
Magne Sjaastad
6e901cdb12 #1190 Do not show delete features for well allocation plot objects 2017-02-09 08:34:28 +01:00
Magne Sjaastad
c215bbcbbc Fixed missing include after merge 2017-02-08 07:35:48 +01:00
Magne Sjaastad
93954fece0 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/Commands/RicDeleteItemFeature.cpp
2017-02-08 07:35:20 +01:00
Jacob Støren
ec7e892395 Fixed #1175 schedule geometry regeneration when creating a property filter. 2017-02-07 15:11:47 +01:00
Magne Sjaastad
4313409c57 #1190 Make sure well log features are disabled for well allocation objects 2017-02-07 09:34:11 +01:00
Magne Sjaastad
b8e838614c #1190 Avoid delete action of RimWellFlowRateCurve 2017-02-07 09:28:43 +01:00
Magne Sjaastad
8bc1a3ee3d #1190 Improved copy command feature 2017-02-06 13:33:56 +01:00
Magne Sjaastad
6dc0a7ff59 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ResInsightVersion.cmake
2017-02-03 10:51:46 +01:00
Magne Sjaastad
e2e689e591 Fixed compile issue on Linux 2017-02-03 10:13:08 +01:00
Magne Sjaastad
e8ee077501 #1164 Added feature "Add Stored Well Allocation Plot" 2017-02-02 12:32:01 +01:00
astridkbjorke
64684f6bec #1145 - pre-proto - Export of fracture data for selected wells (either SimWells or WellPaths) 2017-02-02 11:38:55 +01:00
astridkbjorke
30304a5f8a #1157 - pre-proto - Updating how the eclipseCase is handled for transmissibility calculation. Should now avoid segfault when calculating transmissibilities for well path fractures. 2017-02-02 08:50:54 +01:00
astridkbjorke
871146ba68 pre-proto - Updating fracture position from location when creating new fracture in project tree (bugfix) 2017-02-02 08:50:54 +01:00
Magne Sjaastad
57a1cd0c64 Fixed missing regeneration of geometry when deleting all well path fractures 2017-02-02 07:48:58 +01:00
Magne Sjaastad
6d95d00863 #1159 Fixed inaccurate position of new fracture when clicking in 3D view 2017-02-02 07:36:22 +01:00
Magne Sjaastad
bd732d9564 #1148 Always show context menus 2017-02-01 09:52:01 +01:00
astridkbjorke
4c1f7776b9 pre-proto - Sorting includes 2017-01-31 15:58:13 +01:00