OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-27 16:57:01 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,218 Commits 31 Branches 61 Tags 287 MiB
492b777040
Commit Graph

353 Commits

Author SHA1 Message Date
Magne Sjaastad
8ae75b5f27 AppFwk : Added concept of isUiTreeHidden and isUiTreeChildrenHidden 2016-10-12 10:08:08 +02:00
Magne Sjaastad
d57db25820 AppFwk : Progress dialog is reset and closed instead of hidden when no longer needed 2016-10-04 11:03:53 +02:00
Jacob Støren
47df6a6122 #884 Fixed occasional crashes using the 3D manipulator 2016-10-04 09:47:09 +02:00
Jacob Støren
c7aae71dbc #884 Made manipulator able to be pulled beyond zero size 2016-10-04 08:40:39 +02:00
Jacob Støren
87e7b5dc80 #884 Changed colors to megenta, and improved interface for manipulator a bit. Adjusted size of handles. 2016-10-03 09:39:18 +02:00
Magne Sjaastad
58acd22afa #884 Improved interface to BoxManipulatorPartManager 2016-09-30 15:10:39 +02:00
Jacob Støren
caf6a5dcf2 #884 Made same size pyramid handles for manipulator 2016-09-30 14:25:06 +02:00
Jacob Støren
d8424feedd Renamed somewhat in BoxManipulator 2016-09-30 13:16:00 +02:00
Magne Sjaastad
d7a69bdae8 Merged intersection box interactive manipulation 2016-09-30 10:01:17 +02:00
Magne Sjaastad
593d72d63b (#884) Refactor and cleanup 2016-09-30 09:34:45 +02:00
Magne Sjaastad
de11836e03 AppFwk : Added DisplayCoordTransform 2016-09-30 09:34:45 +02:00
Magne Sjaastad
d4bdbcb7c8 (#884) Added prototype of event handler for interaction with box 2016-09-30 09:34:39 +02:00
Jacob Støren
ca71b03d80 Linux complie fix 2016-09-29 14:55:56 +02:00
Jacob Støren
8f6744adcb #896 Made the resolution of the slider better 2016-09-29 12:01:25 +02:00
Jacob Støren
c2eff1b733 Linux compile fixes 2016-09-28 15:07:19 +02:00
Jacob Støren
cbb626aa31 Merged intersection-box into dev 2016-09-28 14:27:17 +02:00
Jacob Støren
c84b7ab6d9 Proposed fix for some progressbar related crashes 2016-09-28 12:14:41 +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
120cc8b6dc #887 Category Legend: Limit legend height when having few categories 2016-09-22 15:31:21 +02:00
Jacob Støren
8f501d96ea #815 Reentered Whitespace 2016-09-21 15:05:59 +02:00
Magne Sjaastad
531aaaa445 AppFwk : Fixed typo of firstAncestorOrThisOfType 2016-09-21 13:59:41 +02:00
Magne Sjaastad
59afd14339 AppFwk : Added descendantsIncludingThisOfType 2016-09-21 13:03:55 +02:00
Magne Sjaastad
b524abc48d #815 Moved common geometry code to HexGridIntersectionTools 2016-09-20 15:57:06 +02:00
Magne Sjaastad
8e79a781c9 #827 Fixed issue causing some categories to use uninitialized region of texture 2016-09-14 08:23:50 +02:00
Jacob Støren
e2d200de88 #829 Fixed crash due to color interpolation assert 2016-09-12 14:04:53 +02:00
Jacob Støren
8486889b39 Linux compile fix 2016-09-09 12:31:01 +02:00
Jacob Støren
39d82a28f4 #829 Use interpolated colors in category legend by default 2016-09-09 11:17:08 +02:00
Jacob Støren
ed93db724a #829 Fixed strange category colors in odb intersections 2016-09-09 09:59:35 +02:00
Jacob Støren
78b29fc3a0 Fixed zoom all bounding box issue related to 1209c908e5 
Used explicit mainRendering instead of renderSequence->firstRendering()
 2016-09-07 15:54:12 +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
3e40db6ef0 #827 Refactored CategoryMapper function names and added comments 2016-09-07 08:52:32 +02:00
Jacob Støren
fcace2a92b Merge Formation Names coloring work and FlowDiagnostics integration 2016-09-06 14:17:50 +02:00
Magne Sjaastad
f01e762ef1 #827 Added support for text labels in category legend 2016-09-06 11:15:21 +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
8098578545 #279 Workaround for invalid near plane location detected on Linux 2016-09-01 13:02:33 +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
1a3d8a13af Made uiCapability and xmlCapability const 2016-08-24 15:16:34 +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
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
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
32ded3e05d Added scrollTo() to make sure the expanded item is expanded to root and visibile 2016-08-11 09:15:43 +02:00
Magne Sjaastad
17d37c70d3 #569 Added font with point sizes 8, 12, 16, 24, 32 2016-08-09 13:43:13 +02:00
Magne Sjaastad
5088ae90d9 #805 Linux fixes 2016-08-05 17:53:02 +02:00
Magne Sjaastad
1101db5787 (#805) Added category legend and mapper 2016-08-05 17:23:50 +02:00
Magne Sjaastad
2b588fa35f AppFwk : Function rename 2016-08-05 17:19:47 +02:00
Magne Sjaastad
975f52a78d VizFwk : Added guard for one level only scalar values 2016-08-05 17:19:47 +02:00
Magne Sjaastad
e031f89dcc Merged from maintenance branch 2016-08-05 12:13:13 +02:00
Magne Sjaastad
c5d4519eb1 #282 Added category list if category values are present 2016-08-05 10:26:47 +02:00
Magne Sjaastad
4bfef4ead0 Merged in changes from maintenance branch 2016-08-04 11:12:53 +02:00
Jacob Støren
3bcb7b9f1b #802 Better default dock and toolbar layout. 
Window managment toolbar moved.
Created a Draw Style toolbar
 2016-08-03 13:29:46 +02:00
Magne Sjaastad
512f8904de AppFwk: Do not toggle item when tree item editor widget (QLineEdit) is closed with Enter key 2016-07-25 18:25:14 +02:00
Magne Sjaastad
d5050e96b8 AppFwk : Early exit if no scene is present 2016-07-06 16:59:13 +02:00
Magne Sjaastad
9db44a349a AppFwk : Assert if two fields or groups with same name is present in PdmuiOrdering for cafPdmUiDefaultObjectEditor 2016-06-29 12:48:05 +02:00
Jacob Støren
80cdb9dbaf Caf: Adjusted output of references from PtrArrayField 2016-06-20 16:51:36 +02:00
Jacob Støren
eaf6bb6768 Caf: Improved reference parsing by using regexp for splitting an any whitespace 2016-06-20 16:50:47 +02:00
Jacob Støren
4a19589d36 Caf: Linux compile fixes: Missing includes 2016-06-20 00:04:09 +02:00
Jacob Støren
327e8cf64b Caf: Added PdmPtrArrayField to be used in ResInsight as multi select of summary cases 2016-06-19 21:36:44 +02:00
Jacob Støren
0b7abb0cab Caf: Added specialization for PdmPointer<T>. 
Preparations for PtrArrayField. Made isEqual use QVariant::value<T>()
 2016-06-19 21:36:44 +02:00
Jacob Støren
f2da9bfea1 Caf: Small Adjustments 2016-06-19 21:36:44 +02:00
Jacob Støren
45cf15a941 Caf: PtrFields must not return any childObjects. Fixed Legend definition Object below EclipseCellColor as a consequence. Discovered due to Summary Plot case pointer 2016-06-16 16:55:02 +02:00
Jacob Støren
214f013499 Caf: Fixed issues regarding custom type in fields with multi selection 2016-06-16 16:55:02 +02:00
Jacob Støren
e1fa9aa9f3 Caf: Corrected the spesialization of field of vector and list equality compare, which is supposed to be pr. element 2016-06-16 16:55:02 +02:00
Magne Sjaastad
a7ed8f297f cotire : Added unity build of cafUserInterface 2016-06-10 14:03:22 +02:00
Magne Sjaastad
ef64dc9b62 cotire : Boolean variables are now unique globally in the project 2016-06-10 14:01:41 +02:00
Jacob Støren
7419ad5089 Caf: Added default tab order in the property editor widgets. 2016-06-10 12:18:26 +02:00
Jacob Støren
c2e62c60ba caf: Added an option on ui fields to not add their value to the list of options if the option does not exist. 2016-06-09 11:08:12 +02:00
Magne Sjaastad
c046e52aff cotire : Boolean variables are now unique in the project and not local to file they are defined in 2016-06-08 12:13:49 +02:00
Jacob Støren
286c434d3a caf: Added assert to guard against forgetting to add the fields using the init field macros 2016-05-31 13:48:22 +02:00
Jacob Støren
d90a6041aa caf: Added CAF_PDM_ABSTRACT_SOURCE_INIT alias 2016-05-31 13:48:22 +02:00
Magne Sjaastad
5296add1cb [Fwk] Fix for missing use of command framework for tree view model 2015-12-22 14:10:50 +01:00
Magne Sjaastad
390b04be3b [Fwk] Fixed typo 2015-12-22 13:32:48 +01:00
Magne Sjaastad
33c53830f6 [Fwk] Integrated improvements to command mananger 2015-12-22 13:00:13 +01:00
Magne Sjaastad
ed3951fd0d [AppFwk] Added CMakefile used to test AppFwk 2015-12-22 11:41:11 +01:00
Magne Sjaastad
b9286dcd1d [AppFwk] Updated destructors in unit tests to make sure memory is released correctly 2015-12-22 11:10:50 +01:00
Magne Sjaastad
e8cf78c2af (#710) Clamp currentFrameIndex to available frame indices 2015-12-17 14:40:01 +01:00
Jacob Støren
0650cfdce2 Fixed uninitialized memory read detected by valgrind. 2015-12-14 14:52:00 +01:00
Jacob Støren
891bce069d (#587) Fixed missing initialization. Will probably fix this issue 2015-12-14 14:37:00 +01:00
Jacob Støren
6db74465b6 Removed debug output 2015-12-14 09:53:59 +01:00
Jacob Støren
1d9481f09b (#695) Unintentional picking fixed. 
Fixed in viewer, keeping the concept of the navigation policies to not flag the
the events as handled.
Made this clearer by adding an interface to turn event consumption on or off on the
navigation policies.
 2015-12-10 09:39:55 +01:00
Jacob Støren
f1574bc774 (#168) Consolidated zoom along ray to prepare for handling ortho view 2015-12-10 09:39:49 +01:00
Jacob Støren
f3eb304d66 Caf: Added constructors/destructors to navigation policies 2015-12-10 09:39:35 +01:00
Jacob Støren
8f92dfd0c0 Caf: WIP: Created a base class with trackball related navigation stuff. 
Refactored cad and ceetron plus nav to use the common base
 2015-12-10 09:39:28 +01:00
Jacob Støren
afe84ce75e (#168) Parallel walk navigation working. Still things to fix 2015-12-10 09:39:06 +01:00
Jacob Støren
bbb0a5e993 (#168) Wip: Parallel projection. Basics in place 2015-12-10 09:33:58 +01:00
Magne Sjaastad
a86d24df97 Fwk : Added DEBUG assert to detect when data is present in child fields 
Added assert for ChildArrayField and ChildField
 2015-12-09 13:34:13 +01:00
Magne Sjaastad
a2bfc12c57 (#674) Clicking on items in 3D view selects corresponding item in tree view/property panel 
Clicking on 3D Info box and legends for cell result, separate fault
result and cell edge selects corresponding items in tree view
 2015-12-07 09:59:19 +01:00
Magne Sjaastad
2f6bd07ff0 (#641) Added support for copy / paste of points 2015-12-01 15:25:55 +01:00
Magne Sjaastad
19d156e8ff [Fwk] Fixed missing rename in test app 2015-12-01 15:25:54 +01:00
Magne Sjaastad
709d993cc6 (#641) Use color in QListView to indicate input point mode 2015-12-01 12:34:31 +01:00
Magne Sjaastad
bf5de93113 [Fwk] Improved static initializer naming 2015-11-27 10:38:23 +01:00