Magne Sjaastad
|
ac9f405c96
|
Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
ResInsightVersion.cmake
|
2017-03-02 11:46:25 +01:00 |
|
Magne Sjaastad
|
68ff093c61
|
#1266 If not computed, compute staticWellCellPath when needed
|
2017-03-01 14:23:01 +01:00 |
|
Magne Sjaastad
|
e29c6474bd
|
Minor refactoring
|
2017-02-28 19:17:36 +01:00 |
|
Magne Sjaastad
|
be6a2e0d39
|
#1243 Improved how enclosing polygon is visualized
|
2017-02-28 18:41:58 +01:00 |
|
astridkbjorke
|
c2c3145e5a
|
#1243 - pre-proto - Adding visualization of polygon output for stimplan fractures
|
2017-02-28 14:28:14 +01:00 |
|
Magne Sjaastad
|
8ce430cb25
|
#1242 Hide opacity level and discard transparent fragments
|
2017-02-27 22:21:37 +01:00 |
|
Magne Sjaastad
|
10f14aee8e
|
Merge remote-tracking branch 'refs/remotes/origin/dev'
|
2017-02-27 07:13:06 +01:00 |
|
Magne Sjaastad
|
85228ee39c
|
#1255 Removed includes from RimWellPath
|
2017-02-24 14:31:06 +01:00 |
|
Magne Sjaastad
|
1792290ef0
|
#1255 Removed includes from RivReservoirWellSpheresPartMgr
|
2017-02-24 13:48:19 +01:00 |
|
Magne Sjaastad
|
6e960e74c3
|
#1255 Removed includes in Riv classes
|
2017-02-24 13:34:25 +01:00 |
|
Magne Sjaastad
|
5c20bff5d1
|
#1255 Remove includes from header files
|
2017-02-24 11:07:26 +01:00 |
|
Magne Sjaastad
|
2ce28ffff0
|
#1251 Use RivObjectSourceInfo for fractures
|
2017-02-23 11:53:26 +01:00 |
|
Magne Sjaastad
|
555ecba8b3
|
#1251 Added RivObjectSourceInfo for selecting any pdmObject
|
2017-02-23 11:52:56 +01:00 |
|
Magne Sjaastad
|
f59c4b4b9e
|
#1242 Do not use transparency on ellipse, default transparency set to 1.0
|
2017-02-23 11:25:21 +01:00 |
|
Magne Sjaastad
|
7f75f7e509
|
#1252 Add and use transparent color for both ellipse and stim plan objects
|
2017-02-23 10:15:56 +01:00 |
|
Magne Sjaastad
|
139590760f
|
#1240 Added checbox to StimPlan Colors
|
2017-02-22 15:32:19 +01:00 |
|
Magne Sjaastad
|
73690e6d66
|
#1239 Do not show fracture when fracture is unchecked
|
2017-02-22 13:29:20 +01:00 |
|
astridkbjorke
|
c84f4efbb1
|
#1138 - pre-proto - Adding field in RimStimPlanColors for transparency
|
2017-02-20 13:24:22 +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
|
b7aebbb392
|
#1230 Created StimPlan colors and show lenged in 3D view
|
2017-02-20 09:31:24 +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 |
|
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
|
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 |
|
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 |
|
Magne Sjaastad
|
18f77e16b5
|
#1194 Increased size of arrow head for well head
|
2017-02-16 07:15:01 +01:00 |
|
Magne Sjaastad
|
a29fe1f7c1
|
Fixed #1223, now pipe can also be rendered without lighting
|
2017-02-15 15:55:24 +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 |
|
astridkbjorke
|
bcd3009066
|
#1138 - pre-proto - Showing data from stimPlan-file on fracture
|
2017-02-15 15:14:16 +01:00 |
|
Magne Sjaastad
|
43faf00cfa
|
#1194 Use slightly larger pipe radius for open wells
|
2017-02-15 08:14:29 +01:00 |
|
Magne Sjaastad
|
41836a4930
|
#1138 Added test code for texture scalar mapping
|
2017-02-14 10:29:25 +01:00 |
|
Magne Sjaastad
|
093e02287a
|
Fixed missing include
|
2017-02-13 15:33:42 +01:00 |
|
Magne Sjaastad
|
2ee25c6cf5
|
Use triangleIndices instead of polygonIndices
|
2017-02-10 11:32:18 +01:00 |
|
Magne Sjaastad
|
8fffc53629
|
#1180 Use RiaColorTables and deleted RivColorTableArray
|
2017-02-10 08:36:32 +01:00 |
|
Magne Sjaastad
|
9753e8b242
|
#1194 Use larger geometry for open wells for spheres and well head
|
2017-02-08 14:26:28 +01:00 |
|
Magne Sjaastad
|
9c5f3732b4
|
#1189 Use gray for closed sphere connections
|
2017-02-08 13:45:37 +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
|
76bc449d1f
|
#1161 and #1188 Fixed problems with last MSW segments. Two errors: missing last segment ID, and missing drawing the last pipe segment.
|
2017-02-07 10:53:48 +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
|
0633e6ca39
|
Fixed mix of signed and unsigned value compare
|
2017-02-03 10:14:02 +01:00 |
|
Magne Sjaastad
|
9493a1dfc0
|
Use hasWellResult instead of firstResultTimeStep
|
2017-02-02 12:52:32 +01:00 |
|
Magne Sjaastad
|
49e0709dc6
|
#1158 Fixed position of well path fractures after scale change
|
2017-02-01 14:54:02 +01:00 |
|
Magne Sjaastad
|
a4ce5f532d
|
#1148 Use tristate to indicate visibility of simulation well geometry
|
2017-02-01 09:52:01 +01:00 |
|
Magne Sjaastad
|
ddd72b4866
|
#1148 Added well head scale factor to EclipseWell
|
2017-02-01 09:52:01 +01:00 |
|
Magne Sjaastad
|
301c36d809
|
#1148 Always show connection status color for well spheres
|
2017-01-30 14:50:45 +01:00 |
|
Magne Sjaastad
|
b13ca8bb1c
|
#1135 Compute accumulated length along sim well and added slider
|
2017-01-30 14:28:41 +01:00 |
|