 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
|
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 |
|
|
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 |
|
|
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
|
9f156f9e5f
|
pre-proto - Setting azimuth angle correctly when new fractures are created.
|
2017-02-20 14:44:03 +01:00 |
|
|
Magne Sjaastad
|
75f2a6cb9f
|
#1236 Property Editor : Scroll bar for reduced screen area
|
2017-02-20 14:32:12 +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
|
ad3270e513
|
#1230 Use part priority system
|
2017-02-20 11:10:03 +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
|
b510979151
|
#1230 Use transparent on low values
|
2017-02-20 11:03:18 +01:00 |
|
|
Magne Sjaastad
|
6c5410f41a
|
#1230 Removed obsolete legend structures
|
2017-02-20 10:05:11 +01:00 |
|
|
Magne Sjaastad
|
a29f325125
|
Guard time step index
|
2017-02-20 10:04:21 +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 |
|
|
Magne Sjaastad
|
4df861fc9c
|
#1228 Removed bundling of Qt lib files on Linux
A while ago, ResInsight was build using non-system Qt on Linux, and required copy of Qt libs. This is obsolete behaviour and removed.
|
2017-02-19 17:00:46 +01:00 |
|
|
Magne Sjaastad
|
fb93fbbcc8
|
#1233 Improve system for setting part priorities
|
2017-02-18 12:38:15 +01:00 |
|
|
Magne Sjaastad
|
52615de9a3
|
#1194 Add some space between end of pipe and wel head arrow
|
2017-02-18 12:38:15 +01:00 |
|
 Jacob Støren
|
d69a6e1daa
|
Linux compile fix
|
2017-02-17 16:04:16 +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 |
|
|
Jacob Støren
|
590f9995c8
|
1212 Turned off shadow, changed to radial edge gradient to make the colors more easy to read.
|
2017-02-16 11:39:02 +01:00 |
|
|
Magne Sjaastad
|
3b4fec6196
|
Fixed #1229 Handle reading of invalid summary file
|
2017-02-16 11:09:21 +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 |
|
|
Magne Sjaastad
|
f323aa05e4
|
#1194 Well Head : Larger size for pipe part
|
2017-02-16 07:30:18 +01:00 |
|