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
|
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 |
|
astridkbjorke
|
407f3734c3
|
#1244 - pre-proto - Improving text for fractures / fracture templates
|
2017-02-22 11:52:06 +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
|
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
|
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
|
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
|
6c5410f41a
|
#1230 Removed obsolete legend structures
|
2017-02-20 10:05:11 +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 |
|
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 |
|
astridkbjorke
|
359f8f9726
|
#1138 - pre-proto - Code cleanup and adding slider for well depth in stimplan file
|
2017-02-17 15:10:04 +01:00 |
|
astridkbjorke
|
1b99c25297
|
#1138 - pre-proto - Added possibility to visualize all properties in input XML stimPlan file
|
2017-02-17 14:14:49 +01:00 |
|
astridkbjorke
|
e971c5276d
|
#1139 - pre-proto - Reading in all parameters available in StimPlan file.
|
2017-02-17 14:14:48 +01:00 |
|
Magne Sjaastad
|
a10b96ba3e
|
Merged branch dev into pre-proto
|
2017-02-17 11:38:32 +01:00 |
|
Magne Sjaastad
|
a4a3a22cdf
|
Added missing include
|
2017-02-17 11:03:20 +01:00 |
|
astridkbjorke
|
1fbc11acc9
|
#1139 - pre-proto - Starting reading in units from XML file
|
2017-02-17 10:11:33 +01:00 |
|
astridkbjorke
|
ab7b86111e
|
pre-proto - Added handling of case where fracture templates have been deleted.
|
2017-02-17 10:11:32 +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 |
|
astridkbjorke
|
86bd033fa8
|
#1087 - pre-proto - Adding enum for units-system, and adding conversion functions between feet/inch and meter
|
2017-02-17 10:10:21 +01:00 |
|
Magne Sjaastad
|
81c92d2781
|
#1230 Added infrastructure for loadAndUpdate of StimPlan data
|
2017-02-17 09:29:46 +01:00 |
|
Magne Sjaastad
|
aef913739c
|
#1230 Added StimPlan legend configuration object
|
2017-02-17 09:28:46 +01:00 |
|
astridkbjorke
|
65498e5aec
|
#1138 - pre-proto - Fixing symmetry issue
|
2017-02-16 13:05:55 +01:00 |
|
Jacob Støren
|
41fada4d1f
|
#1212 Added a subtle gradient in the flow plots
|
2017-02-16 11:40:02 +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 |
|
astridkbjorke
|
8a603c7f73
|
#1138 - pre-proto - Using legend config for controlling colors of stimPlan fracture
|
2017-02-16 09:15:23 +01:00 |
|
Jacob Støren
|
afb628d8bc
|
#1207 Added icons for the different aspects of Flow Diag plots. Also adjusted some of the other icons to have a better and more consistent look
|
2017-02-15 18:29:01 +01:00 |
|
astridkbjorke
|
3ae816a9aa
|
#1138 - pre-proto - Re-reading data from files when opening stored project. Re-generating geometry when updating values for time-step / parameter to show from stimPlan-file.
|
2017-02-15 15:49:53 +01:00 |
|
Magne Sjaastad
|
037c7c1f73
|
#1174 Use well ordering when creating category legend colors max tracer
|
2017-02-15 15:21:13 +01:00 |
|
astridkbjorke
|
bcd3009066
|
#1138 - pre-proto - Showing data from stimPlan-file on fracture
|
2017-02-15 15:14:16 +01:00 |
|
Magne Sjaastad
|
9a7f187765
|
#1222 Interpolate category colors and assign well color based on sorted order
|
2017-02-15 13:26:59 +01:00 |
|
Jacob Støren
|
4fc0839a33
|
#1211 Disabled tracer allocation for wells with inconsistent flow.
|
2017-02-15 12:29:58 +01:00 |
|