Commit Graph

3444 Commits

Author SHA1 Message Date
Magne Sjaastad
45f56b9fab #829 Use HUGE_VAL for k-layers not covered by formation definitions 2016-09-07 13:31:49 +02:00
Jacob Støren
1209c908e5 Fixed clip plane related assert on linux. Hopefully the final fix of trouble related to : ca6e650a72 and 80985785 and 0128baddff
The fundamental problem was that the quad rendering was included in the boundingbox.
2016-09-07 12:52:40 +02:00
Magne Sjaastad
cf8190cbf1 #829 Eclipse: Set default legend mapping and color range when selecting a category result 2016-09-07 11:41:02 +02:00
Magne Sjaastad
f404299702 (#829) Moved RimLegendConfig as a private field to be able to switch between standard and single var result color 2016-09-07 11:12:45 +02:00
Magne Sjaastad
f1c214c1d7 (#829) Use std::vector instead of std::set for categories. Added categoryNames to RimLegendConfig 2016-09-07 11:12:31 +02:00
Magne Sjaastad
3e40db6ef0 #827 Refactored CategoryMapper function names and added comments 2016-09-07 08:52:32 +02:00
Jacob Støren
8c67ee0a0d Upped to 1.6.3-dev concluding Sprint 1 of Geom Well Related 2016-09-06 15:54:37 +02:00
Magne Sjaastad
3ddec2c65a Allow grids with varying number of active cells to be part of same grid group 2016-09-06 15:11:39 +02:00
Magne Sjaastad
9281156d4d Fixed missing clear of statistics data cache 2016-09-06 15:11:39 +02:00
Jacob Støren
fcace2a92b Merge Formation Names coloring work and FlowDiagnostics integration 2016-09-06 14:17:50 +02:00
Jacob Støren
e4e3c37f89 #811 Setting default legend type for category results 2016-09-06 14:03:02 +02:00
Jacob Støren
3e8873c870 #812 and related to #272 Formation and Category for Cell edge 2016-09-06 12:17:02 +02:00
Magne Sjaastad
f01e762ef1 #827 Added support for text labels in category legend 2016-09-06 11:15:21 +02:00
Jacob Støren
c903e87dfd #811, #812 WIP, Formation names coloring of cells. First shot. Works but needs refinment. 2016-09-06 10:27:30 +02:00
Magne Sjaastad
5420960b22 #826 Added opm-flowdiagnostics libary with a basic test 2016-09-05 15:23:24 +02:00
Magne Sjaastad
8b16c036fd Commented out local file path usage 2016-09-05 15:22:22 +02:00
Magne Sjaastad
f2f6cfd77c #279 Access single quad rendering as member of caf::Viewer 2016-09-05 13:43:10 +02:00
Jacob Støren
ca6e650a72 #279 Fixed paralell projection nearplane bug introduced by 8098578545 2016-09-05 11:53:56 +02:00
Magne Sjaastad
a83e797e63 Fixed missing grid box geometry when a hidden view was activated 2016-09-02 14:19:20 +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
Magne Sjaastad
c9be561937 #722 Grid Case Group Statistics: Include in-active cells for ACTNUM statistics 2016-09-01 18:34:59 +02:00
Magne Sjaastad
f1451a1126 #724 Grid Case Group Statistics: Add option to include in-active cell value as zero 2016-09-01 18:08:51 +02:00
Magne Sjaastad
8098578545 #279 Workaround for invalid near plane location detected on Linux 2016-09-01 13:02:33 +02:00
Magne Sjaastad
1b38326d83 #279 Include cleanup 2016-09-01 13:01:17 +02:00
Magne Sjaastad
0128baddff #279 Use frame buffer objects for snapshots when available, otherwise use grabFrameBuffer() 2016-08-31 17:34:31 +02:00
Magne Sjaastad
457c3c732b #569 Added font sizes 12, 24, and 32 2016-08-29 14:25:50 +02:00
Jacob Støren
f3e4a6edea #819 Added reload formation names command 2016-08-26 16:12:55 +02:00
Jacob Støren
f03e6de1f2 #810, #813, #808 Display formation name when picking 2016-08-24 15:19:39 +02:00
Jacob Støren
1a3d8a13af Made uiCapability and xmlCapability const 2016-08-24 15:16:34 +02:00
Jacob Støren
b46c6ebcf8 #809 Created Formation Names project items.
#819 Added delete command to Formation names
#808 Added an import Formation Names command
2016-08-24 08:30:12 +02:00
Jacob Støren
5260a3f870 #478 Allowed static results (INIT-file) to not have values for LGRs 2016-08-22 17:00:57 +02:00
Jacob Støren
b305202a35 #478 Made access function const in ActiveCellInfo 2016-08-22 16:59:22 +02:00
Jacob Støren
cf93a67b5e #273 Undefined grid faults between cells where one or both are inactive is now sorted into a seaparate predefined fault section. 2016-08-22 13:24:46 +02:00
Jacob Støren
37099929d6 #273 Added some comments 2016-08-22 10:48:40 +02:00
Jacob Støren
5d0c0cdc67 Fixed assert due to two fields in uiordering in GeoMechPropertyFilter 2016-08-22 10:39:44 +02:00
Jacob Støren
c1f5ec5bdf #168 Finalized. Zoom along ray is now updated to cope with parallel projection. The code in the different navigations are cleaned up a bit, and alligned 2016-08-17 10:54:15 +02:00
Jacob Støren
0f3fe3ac1b Linux compile warning 2016-08-17 08:52:22 +02:00
Jacob Støren
fbcf9fca11 #168 Merged in parallel projection 2016-08-16 23:20:33 +02:00
Jacob Støren
27830dcbeb #168 Added Perspective/parallel view tool button 2016-08-16 22:43:22 +02:00
Jacob Støren
4eddcc859a #168 Save and restore of parallel projection 2016-08-16 14:34:37 +02:00
Jacob Støren
d13d0775b4 #168 Fixed zoom along ray problem making the camera end up with the scene behind it. 2016-08-16 13:41:10 +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
a3499152a5 #168 Improved the front and back clipping plane calculation in relation to parallel projection.
Added a margin of 20% to account for inaccuracies. Not new for far-plane, but became missing in the first commit regarding parallel projection.
2016-08-15 16:11:38 +02:00
Jacob Støren
c529e18351 #168 Switch to directional Fixed Function light when in parallel mode 2016-08-15 14:27:46 +02:00
Jacob Støren
853e92723b #168 Added hacklish control over Fixed Function default light. 2016-08-15 14:26:44 +02:00
Jacob Støren
20e7e9ec6e Removed compiler warning 2016-08-15 14:25:12 +02:00
Jacob Støren
79a025e06f #168 Zoom All improved to handle parallel projection 2016-08-15 08:57:22 +02:00
Jacob Støren
742ee46f78 #168 Grid box side visibility now handles parallel projection 2016-08-15 08:57:20 +02:00
Jacob Støren
5cdf307d4e WIP: Improved support for parallel projection. #168
Near plane negative to show everything
ZoomAlongRay now works for parallel projection (only implemented in
ceetron Plus)
2016-08-15 08:55:28 +02:00
Magne Sjaastad
cea77a4299 Merged in changes from maintenace branch 2016-08-12 14:53:04 +02:00