Commit Graph

89 Commits

Author SHA1 Message Date
Magne Sjaastad
8077882154 #1342 Removed obsolete code from latest merge from dev 2017-03-21 14:45:28 +01:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
astridkbjorke
4ccdd51ea8 #1294 - When selecting multiple wellLogPlots, they will now be exported to separate files. 2017-03-10 15:12:01 +01:00
astridkbjorke
b89efbf73e #1294 - Renaming and moving ascii export feature, now RicAsciiExportWellLogPlotFeature. Adding functionality for getting data to export (but formatting is still missing) 2017-03-10 15:12:00 +01:00
astridkbjorke
7f511f7004 #1294 - Added command feature for exporting well allocation plot data, and writing empty file 2017-03-10 15:12:00 +01:00
Magne Sjaastad
7e4906fced #1288 Show contributing wells from 3D view without using well alloc plot 2017-03-09 23:01:58 +01:00
astridkbjorke
03af1d5e5f #872 - Fixes in export of multiple summary plots 2017-03-09 10:27:48 +01:00
astridkbjorke
b888e933b5 #872 - Adding command feature for export of summary plots to ascii (and writing empty export file) 2017-03-09 10:27:47 +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
Magne Sjaastad
ac9f405c96 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ResInsightVersion.cmake
2017-03-02 11:46:25 +01:00
Jacob Støren
01b3df863e #1264 Added Well Allocation command to Project tree context menu 2017-02-28 15:46:08 +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
65d71f7106 #1250 Show fractures directly as child objects of wells / well path 2017-02-22 14:40:13 +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
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
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
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
93954fece0 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/Commands/RicDeleteItemFeature.cpp
2017-02-08 07:35:20 +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
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
238b803dce #1145 - pre-proto - Adding command feature for export of fractures only from selected wells. So far only fractures from one well can be exported each time. 2017-01-31 09:56:49 +01:00
Magne Sjaastad
ccc7345706 #1078 Added context menu for well cells and well cell fence 2017-01-26 17:52:13 +01:00
Magne Sjaastad
aedf184d14 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
2017-01-26 14:30:13 +01:00
Magne Sjaastad
6ee54733f4 #1078 Context menu commands for multi select of EclipseWell objects 2017-01-26 07:23:18 +01:00
astridkbjorke
703bdb9669 pre-proto - Rename 2017-01-12 13:29:18 +01:00
astridkbjorke
44aefe6ed7 pre-proto - Rename RimFractureDefinition to RimFractureEllipseDefinition 2017-01-12 10:33:33 +01:00
astridkbjorke
2817e0d34d #1092 - pre-proto - Renaming RicExportFractureWellCompletionFeature to RicExportSimWellFractureWellCompletionFeature 2017-01-11 14:32:42 +01:00
astridkbjorke
9f82319a86 #1092 - pre-proto - Adding feature for exporting COMPDAT file for well path fractures. 2017-01-11 14:32:42 +01:00
astridkbjorke
9bba00999e #1092 - pre-proto - Added feature for exporting fracture data to file. File is written, but not with any useful information yet. 2017-01-11 14:32:42 +01:00
astridkbjorke
a45ed4bc19 #1038 - pre-proto - Renaming feature for creating new well path fracture 2017-01-03 09:37:59 +01:00
astridkbjorke
b6053147df #1037 - pre-proto - Changed RimFracture to RimWellPathFracture (and same for FractureCollection and commands to create / delete fractures) 2017-01-02 11:59:30 +01:00
astridkbjorke
e6ef4fee42 #1037 - pre-proto - added classes RimSimWellFracture and RimSimWellFractureCollection, and functions for creating new / deleting. 2017-01-02 11:10:25 +01:00
astridkbjorke
b0968a2534 #1037 - pre-proto - Added commands for Delete All for Fractures and Fracture Definitions 2017-01-02 10:12:43 +01:00
astridkbjorke
f6221340b1 Merge branch 'dev' 2016-12-21 08:38:52 +01:00
astridkbjorke
b6a08700a2 #1044 - pre-proto - Started adding feature for making new simulation well fracture in 3D view, but not finished due to missing infrastructure 2016-12-20 13:10:03 +01:00
astridkbjorke
ab6e12eb3a #1038 - pre-proto - Added command feature for creating new well log collection fracture from context menu in project tree 2016-12-20 09:53:19 +01:00
astridkbjorke
c6b388873a #1043 - pre-proto - Added command feature for adding a new fracture definition 2016-12-19 11:23:02 +01:00
astridkbjorke
cd3b6da47f #1039 - pre-proto - Added command feature for generating new fracture 2016-12-19 10:30:14 +01:00
Magne Sjaastad
ac4f21318c #1032 Well Log Plot - added Change Data Source feature for extraction curves 2016-12-17 16:45:02 +01:00
Jacob Støren
2288e49c20 #890 Export faults feature created 2016-11-25 15:57:51 +01:00