Magne Sjaastad
b3f036fb0e
#837 GeoMech: Added formation property filter. Moved some functionality to RimCellFilter
2016-09-13 13:43:27 +02:00
Magne Sjaastad
191788643c
#719 Extended Grid Box axis to make sure a label coord is present both above max coord and below min coord
2016-09-02 14:04:17 +02:00
Jacob Støren
fbcf9fca11
#168 Merged in parallel projection
2016-08-16 23:20:33 +02:00
Jacob Støren
0eace5579a
#168 Fixed shader based light in parallel projection
...
Added the light position as a uniform in the standard light model shader snippet in the effect generator.
Set the uniform default value on the shader program where ever it is used.
Added an override global uniform set on the viewer to control the light position, and to set it far behind camera when in parallel projection.
2016-08-16 10:58:07 +02:00
Jacob Støren
742ee46f78
#168 Grid box side visibility now handles parallel projection
2016-08-15 08:57:20 +02:00
Magne Sjaastad
cea77a4299
Merged in changes from maintenace branch
2016-08-12 14:53:04 +02:00
Magne Sjaastad
623c07a2f0
Fixed more compiler warnings for variables declared outside an OpenMP loop
2016-08-12 14:48:13 +02:00
Magne Sjaastad
541c770b80
Fixed compiler warnings for variables declared outside an OpenMP loop
2016-08-11 15:30:55 +02:00
Magne Sjaastad
cb4aa45cd3
Merged in changes from maintenance branch
2016-08-11 10:29:14 +02:00
Magne Sjaastad
58047a6509
#569 Added custom font for labels in 3D scene and added font size to preferences
2016-08-09 13:43:13 +02:00
Magne Sjaastad
7890705ccd
Renamed function name
2016-08-06 08:47:55 +02:00
Magne Sjaastad
23bd3c9b0c
( #805 ) Cleaned up includes and generalized access to overlayItemLegend
2016-08-05 17:19:49 +02:00
Magne Sjaastad
eae6012b77
#282 Use value selection to filter cells
2016-08-05 10:27:19 +02:00
Magne Sjaastad
5090eddf44
#254 Show fault colors in combination with cell edge colors
2016-08-01 17:16:55 +02:00
Magne Sjaastad
0aababbb12
Linux : Changed order of includes
2016-07-16 18:35:15 +02:00
Magne Sjaastad
686aef821e
Cleaned up includes
2016-07-16 16:31:55 +02:00
Magne Sjaastad
68c0d906fb
#590 Fault labels are not shown outside filters when faults are
2016-07-16 16:09:03 +02:00
Jacob Støren
2a98f5b116
( #707 ) Renamed to make the use of resultWellIndex more clear
2015-12-11 17:45:09 +01:00
Jacob Støren
856054666d
Fixed error introduced in 28a0e1107c
2015-12-10 10:40:15 +01:00
Magne Sjaastad
5e6fc505d0
( #694 ) Fixed missing assigment
2015-12-09 12:26:32 +01:00
Magne Sjaastad
28a0e1107c
Improved result accessor factory
...
Moved clamping of time step to zero for static results into factory
2015-12-09 11:33:08 +01:00
Jacob Storen
cbe728c9af
( #690 ) Fixed crash on linux when selecting cells with high cell index.
...
Caused by unintentional pointer arithmetics on string literal.
2015-12-09 02:20:33 -08:00
Jacob Storen
4b39ba4508
Remove compile warnings Linux
2015-12-09 02:13:13 -08:00
Magne Sjaastad
c8ecf78c8c
( #694 ) Removed assert when finding projected point on well path segment
2015-12-08 15:33:42 +01:00
Magne Sjaastad
b4e7e27f76
Fixed issued reported by CppDepends
2015-12-07 12:53:36 +01:00
Magne Sjaastad
27206cab3b
( #404 ) Added display of picked well path text in Result Info
2015-12-04 15:15:54 +01:00
Magne Sjaastad
622e49fe69
( #404 ) Compute well segment index from triangle index
2015-12-04 15:15:53 +01:00
Magne Sjaastad
27db48a336
( #404 ) Cleaned up includes and removed collection from constructor
2015-12-04 15:15:52 +01:00
Magne Sjaastad
c4eee507a8
( #404 ) Use only one structure for well path geometry
2015-12-04 15:15:51 +01:00
Magne Sjaastad
a0775fc6ec
( #688 ) Update bounding box for grid box model when camera changes
2015-12-03 14:02:36 +01:00
Magne Sjaastad
71cb7115eb
( #689 ) Do not try to update colors if no intersection geometry is present
2015-12-03 12:54:13 +01:00
Magne Sjaastad
563dd8c04f
( #687 ) Moved tests from ModelVisualization into ApplicationCode/UnitTests
2015-12-03 10:53:12 +01:00
Magne Sjaastad
709fce384a
Fixed value rounding near texture edges
2015-12-03 10:46:50 +01:00
Magne Sjaastad
dc03844a55
( #641 ) Added polyline point visualization
2015-12-01 12:34:30 +01:00
Magne Sjaastad
40c9b711c2
( #641 ) Use large priority to make sure the highlight part is rendered after reservoir parts
2015-12-01 12:34:28 +01:00
Magne Sjaastad
1208c2f468
( #641 ) Show user defined polyline using magenta, also visible when mesh is turned off
2015-12-01 12:34:28 +01:00
Magne Sjaastad
7cd4394102
Guard against polylines with less than two points
2015-11-27 17:18:50 +01:00
Jacob Støren
7b9f2b41ed
CppCheck fixes, Errors Warnings and performance
2015-11-27 16:37:26 +01:00
Jacob Støren
0bda8e9a2f
( #679 ) Inactive cells can be toggled from the intersection
2015-11-27 13:51:39 +01:00
Magne Sjaastad
09c88fb768
( #667 ) Intersection visibility will now follow fault visibility
2015-11-27 13:47:01 +01:00
Magne Sjaastad
cbdf446716
( #670 ) Grid box: Do not use scientific notation on legend
2015-11-27 10:38:23 +01:00
Jacob Støren
c86bb47fa9
( #666 ) Fixed assert reported in comment
2015-11-26 16:12:58 +01:00
Magne Sjaastad
3c4142fc52
( #678 ) Show context menu commands on intersection
...
Added hide intersection
2015-11-26 16:01:23 +01:00
Jacob Støren
3e78eebee3
( #633 ) Cross sections on simulation wells
2015-11-26 11:09:10 +01:00
Jacob Støren
faf35d32c6
( #633 ) Moved well centerline calculation to make it available for cross sections
2015-11-26 11:09:08 +01:00
Magne Sjaastad
9429458d32
Rename from cells to globalCellArray
2015-11-24 14:21:02 +01:00
Magne Sjaastad
1890ff19f9
( #664 ) Picking on intersections for eclipse and geo models
2015-11-24 14:14:39 +01:00
Magne Sjaastad
60df95843c
( #166 ) Improvements to ternary result visualization
...
Show undefined in regions with no results
Always use time step zero for static results
Allow texture coordinate creation without using RigPipeInCellEvaluator
2015-11-24 09:59:25 +01:00
Magne Sjaastad
6cd4e8a0b7
( #166 ) Added support for ternary result mapping
...
Removed obsolete interface RigResultAccessor2d
2015-11-23 15:24:22 +01:00
Magne Sjaastad
ca9b1cf683
( #51 ) Use contrast color for overlay item text and grid colors
2015-11-23 13:31:29 +01:00
Magne Sjaastad
2ae92c6a18
( #266 ) Hide tickmarks at first and last tick mark position
2015-11-23 13:31:28 +01:00
Magne Sjaastad
0907232a7e
( #266 ) Do not show tick marks at start and end of legend
2015-11-23 13:31:27 +01:00
Jacob Støren
40821a05a6
( #166 ) Refactored to improve readability of geomech Intersection texture generation
2015-11-23 13:23:25 +01:00
Jacob Støren
5ec200c4fb
( #166 ) Fixed geomech result addressing when interpolating
2015-11-23 11:22:00 +01:00
Magne Sjaastad
6c58305565
( #266 ) Improved grid color based on background color
2015-11-23 11:17:52 +01:00
Jacob Storen
b77d91b5e1
Linux compile fix
2015-11-21 00:06:20 -08:00
Jacob Støren
f8fa6787e9
( #166 ) WIP: Starting to get geomech cross sections in place
2015-11-20 15:54:22 +01:00
Jacob Støren
fbfd6fd212
( #166 ) More refactoring to support geomech cross sections
2015-11-20 13:26:41 +01:00
Jacob Støren
e593361b91
( #166 ) Refactoring to make way for geomech cross sections
2015-11-20 12:03:37 +01:00
Jacob Støren
919ba80bc6
Improved comments and some renaming
2015-11-20 12:03:36 +01:00
Jacob Støren
94b713d3bf
Removed unused code
2015-11-20 12:03:35 +01:00
Magne Sjaastad
29973bbcf6
( #657 ) Fixed inverted horizontal / vertical mapping
2015-11-19 13:43:01 +01:00
Jacob Støren
227eba0325
( #166 ) Added storage of interpolation metadata
2015-11-19 13:40:44 +01:00
Jacob Støren
74f0251ee9
( #166 ) WIP: Preparing for interpolation
2015-11-19 13:40:43 +01:00
Magne Sjaastad
9c2b1b44a6
( #657 ) Wired up UI to viz model generation for cross sections
2015-11-19 11:41:16 +01:00
Jacob Støren
3f250ab0ff
( #166 ) Final mesh lines fixes for cross section
2015-11-18 21:04:10 +01:00
Magne Sjaastad
69e30dc8bc
( #657 ) Added support for creation of cross section from simulation well context menu
2015-11-18 18:21:22 +01:00
Jacob Storen
cc1a8cf28d
Fixed Linux warnings
2015-11-18 06:50:15 -08:00
Jacob Støren
9946df4071
( #166 ) WIP: Added cell border line code.
2015-11-18 15:29:10 +01:00
Jacob Støren
40713a3c84
( #166 ) Added clipping of the clipped cells, with fixes of errors.
2015-11-18 11:52:27 +01:00
Jacob Støren
5840f165ea
Added an interface to retreive the simulation well centerline
2015-11-18 11:52:23 +01:00
Jacob Støren
57f7c1229a
( #166 ) WIP: First visible section with hacks
2015-11-18 11:52:19 +01:00
Jacob Støren
7845d9bd3c
( #166 ) WIP: Preliminary cross section geometry builder ready for testing
2015-11-18 11:52:16 +01:00
Jacob Støren
cfefddac09
( #166 ) WIP: Preliminary geometry functions starting to get in place
2015-11-18 11:52:12 +01:00
Magne Sjaastad
ecba44d7c8
Use correct type in loop
2015-11-17 17:04:49 +01:00
Magne Sjaastad
cf38d1e6fe
( #266 ) Use application font for performance
2015-11-17 17:00:12 +01:00
Magne Sjaastad
3c1b549064
( #266 ) Fixed issue for labels disappearing for white background
...
DrawableText::labelAnchorVisible hides all labels if the background is
set to white
2015-11-17 16:58:37 +01:00
Magne Sjaastad
08c04f5052
( #656 ) Added text effect to effect generator
2015-11-17 16:26:07 +01:00
Magne Sjaastad
031ca38a53
( #266 ) No depth test for legend lines
2015-11-17 13:19:28 +01:00
Magne Sjaastad
96acc1e75d
( #266 ) Improved label display
2015-11-17 13:19:12 +01:00
Magne Sjaastad
d9044e2e7b
( #266 ) Expand bounding box to get some space between model and grid box
2015-11-17 13:19:07 +01:00
Magne Sjaastad
401cfe81a1
( #266 ) Refactoring
...
Limit usage of RivGridBoxGenerator to only RiuViewer
Update colors of grid box based on background color
Use dark gray instead of pure black
2015-11-17 13:19:04 +01:00
Magne Sjaastad
a7656e2367
( #266 ) Added edge visibility calculation for when to show legend
2015-11-17 13:18:59 +01:00
Magne Sjaastad
bca5720968
( #266 ) Added interface for all/activeCellsBoundingBox and displayModelOffset
2015-11-17 13:18:05 +01:00
Magne Sjaastad
7ff7f42adc
( #266 ) Added geometry for grid box faces
...
Added legend lines and text
2015-11-17 13:11:54 +01:00
Jacob Støren
7b65cb91ce
( #625 ) Added access to the generalized propertyFilterCollection in the view
2015-11-12 10:48:13 +01:00
Magne Sjaastad
6063ca1b54
( #646 ) Show selected cells in geo mech view
2015-11-11 13:38:54 +01:00
Magne Sjaastad
e64f943e4c
Fixed includes on Linux
2015-11-10 01:53:24 -08:00
Magne Sjaastad
963220dd37
( #632 ) Added support for creation of mesh part from a single cell
2015-11-09 19:05:31 +01:00
Magne Sjaastad
01224dd5e6
System : Removed unused variables
2015-10-26 10:18:57 +01:00
Magne Sjaastad
0405584bb6
System : Replaced tab with four spaces in ApplicationCode and subfolders
2015-10-23 15:46:25 +02:00
Magne Sjaastad
67a62f4f02
Renamed RimViewLink to RimViewController
2015-10-13 10:24:39 +02:00
Magne Sjaastad
9b288970c1
( #495 ) Linux fixes
2015-09-25 16:45:46 +02:00
Magne Sjaastad
061288f1c3
( #495 ) Removed use of StdInclude
2015-09-25 15:57:50 +02:00
Magne Sjaastad
4424c110be
Transformed static functions from ViewLinker to dynamic functions in RimView
2015-09-25 11:17:51 +02:00
Jacob Støren
5e0505dfe8
Renaming and cleanup in ViewLinker and friends
2015-09-24 17:43:09 +02:00
Jacob Støren
36bc2f8f69
( #401 ) WIP: Activated the visibility calculation code.
...
Started on mapping calculation.
2015-09-17 16:13:21 +02:00
Jacob Støren
57ff5becbc
( #401 ) WIP: Added skeleton class for cell mapping
2015-09-17 16:13:19 +02:00
Jacob Støren
b6fb85e0a4
( #401 ) WIP: Prototyped total cell visibility calculation and
...
calculation of overridden cell visibility.
2015-09-17 16:13:17 +02:00
Magne Sjaastad
671506f7cc
Fixed Linux compile issue
2015-09-14 13:14:37 +02:00
Jacob Støren
f81cf98580
( #401 ) WIP: Refactoring Linked views update system.
...
Preparing for linking of visible Cells.
2015-09-14 09:53:28 +02:00
Pål Hagen
ea2bb226d5
( #404 ) WIP - Quad to segment mapper to determine well path depth
2015-09-10 14:03:59 +02:00
Pål Hagen
6eaef49996
( #404 ) Using well path pointer instead of index for source info for picking
2015-09-07 16:17:40 +02:00
Pål Hagen
db56283bcd
Linux compilation fix
2015-09-07 12:27:52 +02:00
Pål Hagen
4d4ed88041
( #404 ) Displaying well path name when a well path is picked
...
TODO: Display depth and additional well data
2015-09-07 12:21:22 +02:00
Jacob Støren
6244cf98bf
Fixed bug discovered by doing ( #357 )
2015-08-14 16:19:31 +02:00
Jacob Støren
5cd416ce6b
( #357 ) Renamed PdmUiObjectHandle::owner() to objectHandle()
2015-08-14 16:15:49 +02:00
Magne Sjaastad
fa622acb72
Renamed functions in effect generator and use cached effects instead of uncached
2015-08-13 14:35:30 +02:00
Magne Sjaastad
0ca0f1a0e8
Fixed includes for unit tests
2015-08-04 09:19:52 +02:00
Magne Sjaastad
737936d846
Major modularization adjustments
...
Use uiField() when issuing setUi....() commands
Use PdmChildArrayField instead of PdmPointersFielc
Use PdmChildField instead of PdmField to pdm pointer objects
Use PdmChildArrayField instead of PdmField< std::list< caf::PdmPointer<
type > > >
Use PdmObjectHandle instead of PdmObject
Replaced parentFields(std::vector) with parentField()
Use PdmUiPropertyViewDialog instead of PdmUiPropertyDialog
2015-07-31 18:58:23 +02:00
Pål Hagen
610553644e
( #115 ) Drawing the anchor line even if the fault name is empty
2015-07-02 16:20:29 +02:00
Pål Hagen
1cf2c03f78
( #115 ) Stopped creating text drawables for empty strings
...
Note: Adding empty strings to cvf::TextDrawer will cause asserts.
2015-07-02 16:11:34 +02:00
Pål Hagen
7315dd5318
Renamed variables according to newly renamed class names
...
"Result slot" -> "Result colors"
2015-06-26 10:00:46 +02:00
Pål Hagen
fa75a46ecb
Moved geo mech related source files to different folder
...
Moved RivGeoMechVizLogic.h/cpp RivGeoMechPartMgrCache.h/cpp to
GeoMech/GeoMechVisualization.
2015-06-26 10:00:45 +02:00
Pål Hagen
7917a89c65
Renamed source files according to new class names
2015-06-26 10:00:45 +02:00
Pål Hagen
8e994914f5
Renamed class "RimCellEdgeResultSlot" to "RimCellEdgeColors"
2015-06-26 10:00:44 +02:00
Pål Hagen
fd03a02645
Renamed source files according to new class names
2015-06-26 10:00:44 +02:00
Pål Hagen
cd662dc7d1
Renamed source files according to new class names
2015-06-26 10:00:43 +02:00
Pål Hagen
2f34b03135
Renamed source files according to new class names
2015-06-26 10:00:41 +02:00
Pål Hagen
f6ab965ea1
Renamed class RimWellCollection to RimEclipseWellCollection
2015-06-26 10:00:40 +02:00
Pål Hagen
7f516172cf
Renamed class RimWell to RimEclipseWell
2015-06-26 10:00:39 +02:00
Pål Hagen
b8d425a010
Renamed class RimFaultResultSlot to RimEclipseFaultColors
2015-06-26 10:00:39 +02:00
Pål Hagen
87744fb8c4
Renamed class RimResultSlot to RimEclipseCellColors
2015-06-26 10:00:38 +02:00
Pål Hagen
5eb673410e
Renamed class RimGeoMechResultSlot to RimGeoMechCellColors
2015-06-26 10:00:37 +02:00
Pål Hagen
9458c818b4
Renamed class RimCellPropertyFilterCollection to RimEclipsePropertyFilterCollection
2015-06-26 10:00:33 +02:00
Pål Hagen
1883116c59
Renamed class RimCellPropertyFilter to RimEclipsePropertyFilter
2015-06-26 10:00:32 +02:00
Jacob Støren
4fabc509a0
Missing updates of property filtered cells
...
1. When Rangefilters changed
2. When the rangefilter collection was turned off
2015-06-24 12:05:07 +02:00
Jacob Støren
515fb8b8d7
#314 Connected the Property filter code together.
...
Now working !
2015-06-22 21:57:52 +02:00
Jacob Støren
088bc12459
Preparing for property filter. #314
...
Prototype code for property filter visibility
Refactoring the VizLogic class to make the responsibilities clearer
2015-06-22 08:18:54 +02:00
Jacob Støren
e9fe03f63a
Moved Fem visibility calculator to a separate file
...
Preparing for GeoMech Property filter
2015-06-22 08:18:48 +02:00
Jacob Støren
74efc8da1a
Use the new RigCellSetEnum instead of unsigned char
...
Preparing for property filter
2015-06-22 08:18:42 +02:00
Jacob Støren
cfb0bfeb55
Moved RivCellSetEnum to a separate file.
...
Preparations for property filtering
2015-06-18 14:17:03 +02:00
Jacob Støren
8bf90ec27c
Renamed enum type for Cell Sets (previously called ReservoirGeometryType)
2015-06-18 14:16:58 +02:00
Jacob Støren
09152ad363
Made internal enum private
2015-06-18 14:16:53 +02:00
Jacob Støren
919f2b61f3
Renaming and cleaning as preparations for GeoMech property filters
...
#314
2015-06-18 14:16:48 +02:00
Stein Dale
b4759ca06e
Refactored cell property filter collection
...
Using caf::PdmPointersField as container.
2015-06-18 14:00:16 +02:00
Stein Dale
8bdb957c8c
Handling new field "Disable Lighting" in the view ( #311 )
2015-06-18 12:23:27 +02:00
Stein Dale
5e93b8ca1f
Added option for disabling lighting ( #311 )
2015-06-18 12:23:26 +02:00
Jacob Støren
b5cfa8ab53
Renaming and improved some readability around well paths
2015-06-12 09:25:09 +02:00
Jacob Støren
a520a4322a
Removed debug output from some well path code
2015-06-12 09:05:55 +02:00
Jacob Støren
ceeb38d13a
Added bbox calculation on the fem part for #312
...
This concludes #312 for now. Wellpaths are now shown in the Geomech
views
2015-06-11 19:13:04 +02:00
Jacob Støren
4f77afe43c
Implemented #310 Result info when picking
...
This included some refactorization to remove the command stuff out of
RiuViewer,
and to communicate the grid index via the source info struct, and not as
a cvfPart::id
2015-06-11 11:38:51 +02:00
Jacob Storen
f6e8bb4a1a
Fixes of linux compile errors and warnings
2015-05-27 05:50:12 -07:00
Jacob Støren
b280196b7c
Prep for Geomech range: Introduced VizLogic
...
Refactored to use the new RivVizLogic class, together with the
partMgrCache
Works.
2015-05-22 17:01:59 +02:00
Jacob Støren
038c578f97
Preps for Geomech RangeFilters: Small refactorings
2015-05-21 11:46:04 +02:00
Jacob Støren
2c7a741805
Renamed the files of RimReservoirView to RimEclipseView
2015-05-21 10:34:38 +02:00
Jacob Støren
ed74116376
Rename of RimReservoirView to RimEclipseView
...
To make the separation to geomech clearer, and alligning it to the
RigCaseNaming
2015-05-21 10:05:33 +02:00
Jacob Støren
b111a26f21
Renamed Files: RimCase to RimEclipseCase
2015-05-15 09:16:33 +02:00
Jacob Støren
af2699d362
Z-Scale working for geomech views
...
Alligned GeoMech and Reservoir views through RimView
2015-05-13 22:42:11 +02:00
Jacob Støren
4a21bb4a30
Added RimView, and sorted the libs in folders
2015-04-29 10:50:25 +02:00
Jacob Støren
27ce1852ca
Fix of #281 : Crash while importing - cvfPlane.cpp Aborted
2015-02-24 13:34:03 +01:00
Roland Kaufmann
eac27f149a
Enable in-package substitute of tr1/tuple
...
In clang 6.0 the tr1/tuple header is not present, and this cause a
compilation error inside of the gtest framework. However, if we set a
define, it will use its own substitute of tr1/tuple, which is sufficient
for the unit tests.
2015-01-01 19:46:25 +01:00
Roland Kaufmann
b25290bebd
Complete instantiated types
...
RivReservoirPartMgr uses a Collection of RivGridPartMgr. The Collection
indirectly causes the release() method of the Object base class of
RivGridPartMgr to be called as part of its destructor, but this is not
allowed for incomplete types and RivGridPartMgr is only forward-declared
at the time of the instantiation (in RivReservoirPartMgr).
A similar problem occurs in the use of RigStatisticsDataCache in the
type RigCaseCellResultsData.
2015-01-01 19:46:24 +01:00
Magne Sjaastad
55b5da018c
Ternary : Clamp texture coordinates to avoid texture edge issues
2014-10-28 09:39:26 +01:00
Magne Sjaastad
2d36af4f06
Updated file header for new files
2014-09-24 07:14:52 +02:00
Magne Sjaastad
b4df5419b1
Updated file header for modified files
2014-09-23 15:04:57 +02:00
Jacob Støren
6e55ca82e2
Fixed Problem regarding negative riTrans values
...
The reason was a bit sloppy detection of whether the surface normals was
pointing outwards or inwards in a cell.
The cells can be turned inside out due to depth/Z or mapaxis conditions.
2014-09-23 12:26:08 +02:00
Jacob Støren
2f22624228
Fixed problems in auto nnc on/off
...
Consolidated Gui into Fault
2014-09-09 13:07:01 +02:00
Magne Sjaastad
5963d75085
Added checkbox for hiding NNC geometry when no NNC data is available
2014-09-04 09:30:00 +02:00
Magne Sjaastad
323f8d77eb
Rename
2014-09-04 09:14:01 +02:00
Magne Sjaastad
ca2558bf20
Bugfix: Update NNC colors when Cell Edge is active
2014-09-04 08:35:59 +02:00
magnesj
68831f6e99
Fixed missing celledge visualization: abs/fabs usage error. Not detected on Windows
2014-08-31 14:37:25 +02:00
Jacob Støren
edd7a671d9
riMULTXYZ: Added tolerances for CellEdge and Calculations
2014-08-28 11:25:21 +02:00
Jacob Støren
d76dd6a588
Added riTRANSXYZbyArea (and X, Y, Z )
2014-08-27 11:41:40 +02:00
Jacob Støren
03a9bf459d
Added riMULTXYZ and X,Y,Z
2014-08-26 15:39:21 +02:00
Jacob Støren
670ca4ced5
riTRANSXYZ: nnc calculations in place
...
Making this feaure complete.
Had to add the concept of several results sets to the nnc data
2014-08-26 12:16:22 +02:00
Magne Sjaastad
56b1f78f2f
Faults : Show NNCs moved from fault result to fault collection
2014-08-26 11:55:26 +02:00
Magne Sjaastad
f69413087a
Custom fault result: Reorganized custom fault result selection
...
Removed combo box used to specify fault color or custom result color.
Fault colors is used if None is selected in result dialog.
2014-08-26 11:47:14 +02:00
Magne Sjaastad
b3fd96d72e
Cell edge: Update texture also if none is cell result
2014-08-26 10:13:35 +02:00
Jacob Støren
9e22c90a4a
Renamed cellindex to gridLocalCellIndex
2014-08-22 13:39:21 +02:00
Magne Sjaastad
b9a5d5b743
Bugfix: Apply face culling mode when creating effects
2014-08-21 14:41:03 +02:00
Magne Sjaastad
cdf2b07118
Removed use of cvfStructGridScalarDataAccess
2014-08-19 14:56:20 +02:00
Magne Sjaastad
6418928bd2
Faults: Skip out of range cell index
2014-08-19 10:33:29 +02:00
Magne Sjaastad
2a55b47e9a
Renamed and restructured files and classes
2014-08-14 10:56:48 +02:00
Magne Sjaastad
7e5c46cf59
Added support for cell edge on faults
2014-08-14 10:56:47 +02:00
Magne Sjaastad
2c903a0d18
Cell edge now handles also ternary
2014-08-14 10:56:47 +02:00
Magne Sjaastad
67e12e3f71
Cleaned up includes
2014-08-14 10:56:45 +02:00
Magne Sjaastad
245573e03c
Cell edge visualization can now handle individual per face center values
2014-08-14 10:56:44 +02:00
Magne Sjaastad
debd17a3ab
Removed unused code
2014-08-14 10:56:44 +02:00
Magne Sjaastad
6e2dffc399
Linux include fix
2014-08-14 10:56:42 +02:00
Magne Sjaastad
3582d2e30b
Removed unused code
2014-08-14 10:56:42 +02:00
Magne Sjaastad
301d274eed
Rename
2014-08-14 10:56:41 +02:00
Magne Sjaastad
2069375555
Use shared grid/fault visualization code
2014-08-14 10:56:41 +02:00
Magne Sjaastad
03b68e08c3
Use RivScalarMapperUtils
2014-08-14 10:56:40 +02:00
Magne Sjaastad
eca4276adb
Added scalarMapperUtils for code sharing between grids/faults
2014-08-14 10:56:40 +02:00
Magne Sjaastad
c67b75e992
Fixed transparency for ternary well cells
2014-08-14 10:56:39 +02:00
Magne Sjaastad
4c00a48a25
Fixed viz bug introduced by new texturing method
...
SHA: a9794815c7
2014-08-14 10:56:39 +02:00
Magne Sjaastad
24a464ecf9
Use texture based ternary visualization
2014-08-14 10:56:38 +02:00
Magne Sjaastad
1b69f93a11
Added ternary scalar mapper effect generator
2014-08-14 10:56:38 +02:00
Magne Sjaastad
1161ff7c73
Added ternary texture and scalar mappers
2014-08-14 10:56:37 +02:00
Magne Sjaastad
5e478d8336
Layout cleanup
2014-08-14 10:56:37 +02:00
Magne Sjaastad
b414ba0ee3
Created setter for opacity
2014-08-14 10:56:36 +02:00
Magne Sjaastad
0440e21f27
Created texture and texture coord calculations
2014-08-14 10:56:35 +02:00
Magne Sjaastad
e9b67a9599
Added RivTernaryScalarMapper and unit test
2014-08-14 10:56:34 +02:00
Magne Sjaastad
1b3be87074
Moved include from header to cpp
2014-08-14 10:56:33 +02:00
Magne Sjaastad
897ed240c5
Use RigResultAccessor
2014-08-14 10:56:33 +02:00
Magne Sjaastad
8451ffc2fb
Added include to RigResultAccessor in factory
2014-08-14 10:56:32 +02:00
Magne Sjaastad
2ab2838e88
Removed obsolete code
2014-08-14 10:56:30 +02:00
Magne Sjaastad
24ff71d23e
Prefix function to be deleted to easily spot the function in code
2014-08-14 10:56:30 +02:00
Jacob Støren
419ad87ceb
Used new texturing on faults
2014-08-14 10:56:28 +02:00
Jacob Støren
38d2000e29
Wip: New generalized texturing in play
...
Only on GridParts
2014-08-14 10:56:27 +02:00
Jacob Støren
33ab16f7d7
New classes for the generalized texturing
2014-08-14 10:56:27 +02:00
Jacob Støren
e1b67b15e0
Rename of GlobalCell to ReservoirCell
2014-08-14 10:56:26 +02:00
Jacob Støren
37ef1cf71c
Renamed globalCellIndex to reservoirCellIndex
2014-08-14 10:56:23 +02:00
Jacob Støren
322823754b
Replaced dataAccessObject with resultAccessor
2014-08-14 10:56:20 +02:00
Magne Sjaastad
9288b766e2
Ternary legend: Minor layout tweaks
2014-08-14 10:56:18 +02:00
Jacob Støren
7ebe9b17b9
Renamed files to reflect new classnames
2014-08-14 10:56:18 +02:00
Jacob Støren
aff8d8fd2a
Moved needed code to above "delete" mark
2014-08-14 10:56:14 +02:00
Magne Sjaastad
8a1611c14c
Improved visual appearance of legend
2014-08-14 10:56:13 +02:00
Magne Sjaastad
75541e92fb
Renamed to RigResultAccessObjectFactory
2014-08-14 10:56:10 +02:00
Magne Sjaastad
b5d1c63966
Renamed to RimFaultResultSlot
2014-08-14 10:56:09 +02:00
Magne Sjaastad
39dc1421c4
Fault visibility : Restructured code
2014-08-14 10:56:08 +02:00
Magne Sjaastad
b2f80c7ef9
Fault result : Use checkbox to enable custom fault visualization
...
When checkbox is disabled, faults are visualized using current cell
visualization. When checkbox is activated, fault colors or custom fault
result is active
2014-08-14 10:56:05 +02:00
Magne Sjaastad
8b04e2a2e8
Ternary legend : Added title
2014-08-14 10:56:05 +02:00
Magne Sjaastad
51d4bd6023
Fault result : Moved config from FaultCollection to FaultResultSettings
2014-08-14 10:56:03 +02:00
Magne Sjaastad
cdbc5829ab
Fault result : Renamed file and improved interface
2014-08-14 10:56:01 +02:00
Magne Sjaastad
7f4e5b266b
Added missing pointer check
2014-08-14 10:56:00 +02:00
Magne Sjaastad
6416a6d71d
Fault result: Moved result mapping from collection to fault result
2014-08-14 10:56:00 +02:00
Magne Sjaastad
a5e928dec1
Removed obsolete fault code
2014-08-14 10:55:58 +02:00
Magne Sjaastad
ff674d8eb0
Always show result color when showing grid
2014-08-14 10:55:54 +02:00
Magne Sjaastad
57f1da1675
Map result color on fault if fault is disabled by user
2014-08-14 10:55:53 +02:00
Magne Sjaastad
cf14cc55fd
Create geometry if needed before accessing fault parts
2014-08-14 10:55:52 +02:00
Magne Sjaastad
430f95d52a
Rename and simplified control of fault visibility
2014-08-14 10:55:51 +02:00
Magne Sjaastad
f259f21b32
Renamed file to match class name for RimReservoirCellResultStorage
2014-08-14 10:55:51 +02:00
Magne Sjaastad
b13c2621da
Linux fixes: Added missing includes
2014-08-14 10:55:50 +02:00
Magne Sjaastad
d21e532c61
Cleaned up includes for ProjectDataModel
2014-08-14 10:55:49 +02:00
Jacob Støren
537a6ef7af
Fixed bug/assert introduced after merge
2014-08-14 10:55:45 +02:00
Jacob Støren
34d62964d6
FaultCelledge : Extracted a method from some duplicate code.
2014-08-14 10:55:43 +02:00
Jacob Støren
066a2c5749
First step in refactoring result texture handling
...
In order to support more derived reults properties
more consistently across cell/fault/nnc and celledgevisualizations
2014-08-14 10:55:43 +02:00
Jacob Støren
fc1c7c0b0f
Wip - reactoring result texture handling
2014-08-14 10:55:42 +02:00
Jacob Støren
710395bb85
Created StructGrid...ToCellFaceMapper
...
Done to start refactoring to pave way for many new combined result
properties
2014-08-14 10:55:42 +02:00
Jacob Støren
c96169c62e
Fixed crash in loading Statistics RegTest manually
2014-07-02 14:11:56 +02:00
Jacob Støren
2a61073b26
Fixed missing Well cell transparency on faults
2014-07-01 14:28:06 +02:00
Jacob Støren
076601e0e5
Fault Results: Fix of crash with None as selected result
...
Discovered during regtest
2014-06-30 11:20:27 +02:00
Jacob Støren
7846bb1ac6
Fixed bug in Combined Trans result.
...
Wrong neighbour was used, so the results was actually completely wrong
in any sence for the negative faces.
2014-06-20 12:41:16 +02:00
Magne Sjaastad
a29a388df2
Fixed issue when combining static and dynamic filters
...
Time step index was set to 0 for static results. This was also done for
all other filters, which caused dynamic filters to always evaluate time
step 0
2014-06-12 08:00:28 +02:00
Magne Sjaastad
071abb2c97
Ternary: Improved positioning of SOIL text and range
2014-05-09 07:32:18 +02:00
Magne Sjaastad
bed902d005
Show ternary range on overlay item
2014-05-06 23:29:41 +02:00
Magne Sjaastad
625a6b5f0e
Cleaned up includes
2014-05-06 22:51:17 +02:00
Magne Sjaastad
7c6ff0c533
Added ternary legend config
...
Included user defined ranges for SOIL, SGAS, SWAT
2014-05-06 22:39:53 +02:00
Magne Sjaastad
3b651d7578
Show ternary saturation data on faults
2014-04-29 10:13:19 +02:00
Magne Sjaastad
83a5a34c4b
Ternary: Compute color based on local/global min/max values
2014-04-25 16:32:41 +02:00
Magne Sjaastad
03ab3d0a34
Ternary: Use shader based per vertex coloring effect
2014-04-22 11:22:18 +02:00
Magne Sjaastad
b158c0da9d
Use polygon offsett to avoid flickering with mesh lines
2014-04-22 11:22:17 +02:00
Magne Sjaastad
0e92bc5d3f
Added ternary saturation overlay item
2014-04-22 11:22:16 +02:00
Magne Sjaastad
d10177494e
Added ternary saturation visualization
...
Ternary saturation available on top of dynamic results
Created visualization for ternary based on SOIL, SGAS and SWAT
2014-04-22 11:22:15 +02:00
Magne Sjaastad
6aa586f9f5
NNC: Improved visual effects
...
Removed use of depth buffer manipulation as this caused invalid result
color mapping for NNC when combined with other fault geometry.
Use polygon offset on NNC geometry to make sure NNC always wins
2014-01-22 13:17:05 +01:00
Magne Sjaastad
658a513c7f
Fault: Show both fault faces in in grid mode to make geometry watertight
2014-01-08 10:47:41 +01:00
Magne Sjaastad
271eb755eb
Faults: Fixed update of fault colors (missing files from previous commit)
2014-01-08 08:25:46 +01:00
Magne Sjaastad
f477d7ade6
Faults: Fixed update of fault colors
2014-01-08 08:23:56 +01:00
