Jacob Støren
cbb626aa31
Merged intersection-box into dev
2016-09-28 14:27:17 +02:00
Jacob Støren
0d4e4508dc
#892 Fixed problem with one element only gray colors
2016-09-28 09:27:28 +02:00
Jacob Støren
3ca53b6103
Fixed some missing update guards on intersections/intersection box
2016-09-28 09:04:21 +02:00
Jacob Støren
db57bc5b28
#817 Single plane visualization (Avoid creating the other planes)
2016-09-27 11:28:39 +02:00
Jacob Støren
4c98ea2283
#815 First working interpolation scheme, so values are not insane
2016-09-27 10:16:16 +02:00
Magne Sjaastad
6b1dd89b2e
#888 Intersection Box: Enable picking on intersection box geometry
2016-09-26 10:35:59 +02:00
Jacob Støren
d9f71ad054
#815 Box is now working with correct clipping. Values are not correct on edges of the box.
2016-09-23 11:13:42 +02:00
Magne Sjaastad
3d83d32055
#815 Fixed issue for use of setFromPointAndNormal
2016-09-22 10:09:03 +02:00
Magne Sjaastad
e3cec5bfec
#815 Wired up infrastructure for intersection box from view to geometry generators
2016-09-22 10:09:03 +02:00
Jacob Støren
8f501d96ea
#815 Reentered Whitespace
2016-09-21 15:05:59 +02:00
Magne Sjaastad
e789694780
#815 : Intersection Box : Added PartManager and SourceInfo
2016-09-21 14:47:02 +02:00
Jacob Støren
33296e4424
#815 Preliminary box calculations lacking some clipping
2016-09-21 14:21:45 +02:00
Magne Sjaastad
531aaaa445
AppFwk : Fixed typo of firstAncestorOrThisOfType
2016-09-21 13:59:41 +02:00
Jacob Støren
08baa5ccc9
#815 Renamed RimCrossSection -> RimIntersection
2016-09-21 10:48:25 +02:00
Jacob Støren
e5cf69a3fe
#815 More Rename CrossSection -> Intersection
2016-09-21 10:40:08 +02:00
Jacob Støren
16ab7fcb72
#815 More renaming CrossSection -> Intersection
2016-09-21 10:36:11 +02:00
Jacob Støren
0083fb068f
#815 More renaming CrossSection -> Intersection
2016-09-21 10:32:29 +02:00
Jacob Støren
1c612030ef
#815 Renamed CrossSection -> Intersection
2016-09-21 10:15:38 +02:00
Magne Sjaastad
c08dce7167
#815 Prototype of interface for RivIntersectionBoxGeometryGenerator
2016-09-21 08:50:55 +02:00
Magne Sjaastad
bb906cdbe2
#815 Moved code to RivHexGridIntersectionTools
2016-09-21 07:57:39 +02:00
Magne Sjaastad
935d49dfdb
#815 Moved files to Intersections folder
2016-09-20 16:09:27 +02:00
Magne Sjaastad
b524abc48d
#815 Moved common geometry code to HexGridIntersectionTools
2016-09-20 15:57:06 +02:00
Magne Sjaastad
91476b43c8
#837 Rename
2016-09-13 14:07:45 +02:00
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
