Magne Sjaastad
da371c099b
Merged branch dev into pre-proto
2017-01-19 10:45:22 +01:00
Magne Sjaastad
9b42f1ca8c
Reverted 4ec7c97a77
...
Access of RimEclipseCase was done by firstAncestorOf from, and in several cases RimEclipseCase is not parent of RimEclipseCellColors. RimEclipseCase must be explicitly specified.
2017-01-19 10:37:59 +01:00
Magne Sjaastad
74fc8458ed
Refactored visualization : One part manager for each fracture
2017-01-19 07:28:04 +01:00
Magne Sjaastad
36bcdab426
Merge remote-tracking branch 'refs/remotes/origin/dev'
...
Conflicts:
ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
ApplicationCode/ProjectDataModel/RimEclipseWell.h
ApplicationCode/UserInterface/RiuViewerCommands.cpp
2017-01-18 12:19:07 +01:00
Magne Sjaastad
539db3cc52
#1128m Cleaned up includes
2017-01-18 09:56:42 +01:00
Magne Sjaastad
8786b863dd
#1128 Use well color along pipe in undefined sections
2017-01-18 09:44:48 +01:00
Magne Sjaastad
f5000766c4
#1077 Added option to draw simulation well pipes from center to center
2017-01-18 08:06:03 +01:00
Magne Sjaastad
e0ba009e34
Cleaned up includes
...
Removed includes to cvfLibCore and friends. Removed several includes from header files.
2017-01-17 15:11:02 +01:00
Magne Sjaastad
bdeb2b5584
Cleaned up includes
2017-01-17 14:27:30 +01:00
Magne Sjaastad
c11daf88fa
#1127 Now possible to select well by clicking on well head geometry
2017-01-17 14:18:03 +01:00
Magne Sjaastad
a91636ac8b
#1127 Select sim well when clicking on well head
2017-01-17 13:33:24 +01:00
astridkbjorke
63e975f6ff
pre-proto - Rename (and adding todo-s for further work)
2017-01-12 10:24:01 +01:00
Magne Sjaastad
4ec7c97a77
#1056 Removed obsolete code
2017-01-11 21:41:22 +01:00
Magne Sjaastad
f16228ecc5
#1056 Added support for flow data for cell edge in 3D view
2017-01-11 15:03:39 +01:00
Magne Sjaastad
6dd3db4d97
#1101 Compute surface normals
2017-01-11 08:02:23 +01:00
Magne Sjaastad
866fb92d5f
#1101 Do not use transparency on fracture
2017-01-11 07:08:18 +01:00
Magne Sjaastad
bb89994dbc
#1101 Added azimuth
2017-01-10 10:53:54 +01:00
Magne Sjaastad
9cd17ec508
Merge dev into pre-proto
...
Conflicts:
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
ApplicationCode/ProjectDataModel/RimEclipseView.h
2017-01-10 10:09:44 +01:00
Magne Sjaastad
8970d93a4d
#1068 Renamed to RigEclipseCaseData
2017-01-10 09:51:39 +01:00
Magne Sjaastad
f70806e056
#1068 Avoid include of RigCell.h and RigSingleWellResultsData in RigCaseData.h
2017-01-10 09:20:03 +01:00
Magne Sjaastad
93032a23eb
#1068 Avoid include of RigActiveCellInfo.h in RigCaseData.h
2017-01-10 09:20:03 +01:00
Magne Sjaastad
ccd4cb24c9
#1068 Avoid include of RigMainGrid.h in RigCaseData.h
2017-01-10 09:20:03 +01:00
Magne Sjaastad
0fd3bc8865
#1068 Access mainGrid directly from RimEclipseView
2017-01-09 10:51:06 +01:00
astridkbjorke
3f052976f5
#1040 - pre-proto - Converting facture coordinates to display coordinates for visualization. Fractures not yet shown at correct possition.
2017-01-06 15:55:53 +01:00
astridkbjorke
a5e8001745
#1044 - pre-proto - Fixed eternal loop
2017-01-04 09:28:10 +01:00
astridkbjorke
fe9ac8f908
#1044 - pre-proto - Updates in infrastructure for finding i,j,k for simulation well
2017-01-04 09:28:10 +01:00
Magne Sjaastad
a64c1dd447
Fixed missing includes
2017-01-04 09:26:39 +01:00
Magne Sjaastad
d1bf189154
#1040 Established basis for fracture visualization
2017-01-04 08:10:02 +01:00
Magne Sjaastad
51e8cae11b
Added branch index to source info as basis for more work on #1044
2017-01-03 11:11:36 +01:00
Magne Sjaastad
276eaf0f33
Rename
2017-01-03 10:09:57 +01:00
Jacob Støren
fd604f844b
#1035 Removed obsolete code, and used the createFromResultDefinition method in CellEdge and property filter
2016-12-15 07:47:54 +01:00
Jacob Støren
ec5ad417f3
#1035 Renamed overloaded methods in result accessor to make it easier to see where the flow interception must come.
2016-12-14 14:51:53 +01:00
Magne Sjaastad
860b51931c
#1025 Removed unsused code and renamed to isWellPipe/SpheresVisible
2016-12-14 07:15:44 +01:00
Magne Sjaastad
5aeb737795
#1025 Refactored visibility to handle both well cell pipes and well cell spheres
2016-12-13 09:35:01 +01:00
astridkbjorke
8e81c53520
#1025 Code cean-up. Removed obsolete scaletransform for cell center spheres.
2016-12-12 11:03:37 +01:00
astridkbjorke
21a8acdb76
#1025 Replaced check-box with enum for showing cell center spheres
2016-12-12 11:03:37 +01:00
astridkbjorke
829c775f63
#1025 Added Show well spheres check-box option for each well
2016-12-12 11:03:37 +01:00
Magne Sjaastad
9e6575633f
#1025 Avoid mix of shader based rendering and fixed function rendering for DrawableVectors, this causes artifacts
2016-12-08 15:11:35 +01:00
astridkbjorke
fa47587f71
#1025 Updated so that cell center spheres are visible also with well visibility set to all off
2016-12-08 14:06:36 +01:00
astridkbjorke
bb2fb88858
#1025 Updated drawing of cell center spheres to use DrawableVectors (one part for all spheres)
2016-12-08 13:32:19 +01:00
astridkbjorke
cd6494cc0c
#1025 Created well cell center spheres group box and added sphere radius controls
2016-12-08 09:59:45 +01:00
astridkbjorke
916ab51df4
#1025 Only showing cell center sphere if well is visible
2016-12-08 09:59:45 +01:00
Magne Sjaastad
374b44060d
#1025 Guard against invalid grid index and invalid cell index
2016-12-08 09:54:51 +01:00
astridkbjorke
a485c23773
#1025 Fixes after merge conflict
2016-12-07 15:26:01 +01:00
astridkbjorke
df46e626c9
#1025 Setting colour of cell center spheres based on well type
2016-12-07 15:18:48 +01:00
Magne Sjaastad
3922d51790
#1025 Use DisplayCoordTransform for coordinate transformations
2016-12-07 14:41:48 +01:00
astridkbjorke
600f3da30a
#1025 Established geometry for all well cell centers
2016-12-07 12:06:24 +01:00
astridkbjorke
1801e49105
#1025 Establish base code structure
2016-12-07 12:06:24 +01:00
Magne Sjaastad
f688a89262
#945 Do not use Inactive to show fault label parts
2016-11-21 13:29:07 +01:00
Magne Sjaastad
7d52242285
#945 Use visible grid parts to force watertight faults
2016-11-21 13:13:53 +01:00
