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
Magne Sjaastad
7276c2ad31
Faults: Improved forced visibility control of faults. Renaming.
2014-01-07 14:27:43 +01:00
Magne Sjaastad
4391a4ff65
Show fault result mapping in 3D info. Fixed display model update.
2014-01-06 14:02:08 +01:00
Magne Sjaastad
38aca20b84
Faults: Renaming
2014-01-06 13:03:57 +01:00
Magne Sjaastad
c569b9fac1
Faults: Show faults when filters are active
2014-01-06 12:06:36 +01:00
Magne Sjaastad
49a43a036e
Pick info and result info: Added face type
2014-01-03 14:59:52 +01:00