Commit Graph

998 Commits

Author SHA1 Message Date
Magne Sjaastad
fc5a44bf3a #1305 Removed excess function 2017-03-09 08:11:01 +01:00
Magne Sjaastad
84f76e5242 #1306 Use general delete sub items for well path collection 2017-03-08 12:20:35 +01:00
Magne Sjaastad
d547079847 #1306 Added general "Delete Sub Items" feature 2017-03-08 12:06:05 +01:00
Magne Sjaastad
a81980c235 #1185 Added "Plot Production Rates" for sim well in 3D and project tree 2017-03-08 11:42:08 +01:00
astridkbjorke
81c243297a #1302 - pre-proto - Setting fracture unit system based on case when sim-well fracture is created. Unit-system for field is now read-only for simwell fractures. 2017-03-07 10:09:19 +01:00
Magne Sjaastad
d3faf4ef96 Fixed #1289 Well Alloc Plot: Rename command to "Plot Well Allocation" 2017-03-06 20:08:25 +01:00
Magne Sjaastad
b19fe2bc4b #1292 Fixed several style issues reported by CppCheck 2017-03-06 09:27:42 +01:00
Jacob Støren
f15d698342 #1174 Made 3D main window pop up, and set wether to show Max Fractrion Injectors or Producers. Set timestep in 3D view to match plot. 2017-03-02 16:10:18 +01:00
Magne Sjaastad
f7521ad12f Merged branch pre-proto into pre-proto 2017-03-02 11:48:35 +01:00
Magne Sjaastad
ac9f405c96 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ResInsightVersion.cmake
2017-03-02 11:46:25 +01:00
astridkbjorke
6019ff4586 #1275 - pre-proto - Setting default values for stimplan fracture template polygon based on content in file 2017-03-02 11:43:42 +01:00
Magne Sjaastad
4559b9f31a #1263 Flow : Command : Show Contributing Wells command present when applicable 2017-03-01 13:23:16 +01:00
astridkbjorke
de8dc2db3c pre-proto - Reading XML when creating new StimPlan fracture template 2017-02-27 10:49:46 +01:00
Magne Sjaastad
10f14aee8e Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-02-27 07:13:06 +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
1af3df6c6c #1255 Removed includes from RimWellLogCurve 2017-02-24 14:14:29 +01:00
Magne Sjaastad
5c20bff5d1 #1255 Remove includes from header files 2017-02-24 11:07:26 +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
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