OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-20 11:48:35 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,125 Commits 27 Branches 61 Tags 309 MiB
9c4afc52fd
Commit Graph

867 Commits

Author SHA1 Message Date
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
Magne Sjaastad
563aa95abf [Fwk] Static initializer must be placed at file global scope in order to always call the constructor in the cpp file 2015-11-27 10:38:22 +01:00
Magne Sjaastad
eb4fefce7c Removed obsolete file 2015-11-26 18:42:07 +01:00
Magne Sjaastad
147580e342 Linux fix 2015-11-26 05:54:43 -08:00
Magne Sjaastad
8e85c4e8fb [Fwk] Created test project for Cvf specialization 2015-11-26 14:22:53 +01:00
Magne Sjaastad
5093b559d2 [Fwk] Set default editor for std::vector of Vec3d 2015-11-26 14:22:52 +01:00
Magne Sjaastad
3a3d28003b [Fwk] Use PdmValueFieldSpecialization instead of QVariant constructor 2015-11-26 14:22:52 +01:00
Magne Sjaastad
3e9e5779ab [Fwk] Updated headers and added unit tests, fixed minor issues related to text stream operator overload 2015-11-26 14:22:51 +01:00
Magne Sjaastad
1bdb68e3d7 [Fwk] Moved ProjectDataModel unit test 2015-11-26 14:22:50 +01:00
Magne Sjaastad
6cecdf7fc3 [Fwk] Added new top level cmakefile for both AppFwk and VizFwk 2015-11-26 14:22:50 +01:00
Magne Sjaastad
941d117fbf [Fwk] Updated Cvf test application 2015-11-26 14:22:49 +01:00
Magne Sjaastad
469ffdf920 Fwk : Fixed typo 2015-11-23 13:31:28 +01:00
Jacob Støren
c4aed9c487 (#166) Geomech cross sections in place. Refactor of frame/scene/model usage on top level. 2015-11-23 11:25:47 +01:00
Jacob Støren
4d0c1d17b4 cafViewer: Add static model(s) to mainScene as well. 2015-11-23 11:21:58 +01:00
Magne Sjaastad
9a25a71cde Fwk : Added support for more characters in axis labels 
Moved drawing of axis cross slightly closer to left edge of available
viewport
 2015-11-23 09:56:48 +01:00
Magne Sjaastad
1f91405c50 [Fwk] Propagate return value from QFile::open in writeFile() to caller 2015-11-20 10:49:23 +01:00
Magne Sjaastad
13c5dbfbd2 [Fwk] Do not show children if object hides children 2015-11-18 15:55:23 +01:00
Jacob Storen
7d60b8e90d Fix Linux warning 2015-11-18 06:33:54 -08:00
Magne Sjaastad
08c04f5052 (#656) Added text effect to effect generator 2015-11-17 16:26:07 +01:00
Magne Sjaastad
98bdb6ea6e (#266) Move far clipping plane further away 2015-11-17 13:19:32 +01:00
Magne Sjaastad
c6454300d8 (#266) Added static model interface 2015-11-17 13:19:15 +01:00
Magne Sjaastad
6e56ee28c2 (#266) Functions to be called from a constructor cannot be virtual 
Improved immediate mode to be applied on all renderings
 2015-11-17 13:18:30 +01:00
Magne Sjaastad
121ee80295 (#266) Cleaned up access to boundingBox 2015-11-17 13:18:27 +01: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
9eb5c73842 Fwk: Emit data changed for all model indices recursively when executing updateSubTree() 2015-11-02 09:50:44 +01:00
Magne Sjaastad
572601c3db Do not allow changing checked state if an item is read only 2015-11-02 09:50:43 +01:00
Magne Sjaastad
58693f49dc Removed obsolete tree model 2015-10-26 11:25:17 +01:00
Magne Sjaastad
fb55b469a0 System : Replaced tab with four spaces in AppFwk 2015-10-23 15:21:45 +02:00
Magne Sjaastad
e063518460 System : Performance improvements for TableViewModel 2015-10-23 11:25:59 +02:00
Magne Sjaastad
c4f3870cc9 System : Header cleanup 2015-10-23 11:22:36 +02:00
Magne Sjaastad
5a1e244b2a System : Renamed classes and function names relaed to drag and drop 2015-10-23 11:03:23 +02:00
Magne Sjaastad
d2b5d7ae92 System : Added iterators and at() to ChildArrayField 2015-10-23 09:45:32 +02:00
Magne Sjaastad
e378d5637e System : Added support for disable of lighting for surface effect generator 2015-10-23 09:34:47 +02:00
Magne Sjaastad
0383c35be6 System : Improved performance when converting from enum value to ui text 2015-10-23 09:19:17 +02:00
Magne Sjaastad
5b99439ed8 (#573) Added new copy method for PdmObjects 
Added copy method to XmlObjectHandle, and use this method from
PasteEclipseCases
 2015-10-23 09:00:17 +02:00
Pål Hagen
1b83bfb7f0 (#467) Handling drag move events to get the proposed drop action 
The tree view model's drag & drop handle is notified about the proposed
action in drag move events.
 2015-10-22 14:42:05 +02:00
Pål Hagen
f4bbbcb7a2 (#467) Using subclassed treeview to notify the model about drag end 
Using new class PdmUiTreeViewWidget instead of QTreeView in
PdmUiTreeViewEditor. PdmUiTreeViewWidget handles drag leave events and
calls endDrag() on the model.
 2015-10-21 17:20:12 +02:00
Magne Sjaastad
bcb4919f3d Rename and more comments 2015-10-16 10:08:25 +02:00
Magne Sjaastad
91b100b8cc (#566) Make sure layoutChanged signal is emitted only for existing item changes 
If layoutChanged is emitted for new inserted items also, the items below
inserted item is collapsed and the expanded state of the tree is changed
 2015-10-16 09:20:40 +02:00
Magne Sjaastad
aeeb445dae Delete items from existing tree before building the map from pdmUiTreeOrdering to index 2015-10-15 19:19:47 +02:00
Magne Sjaastad
5f92e87070 Fixed issue causing a pdmUiTreeOrdering item having wrong (and deleted) parent 2015-10-15 09:22:49 +02:00
Jacob Storen
10046eed4a Linux fixes 2015-10-14 07:13:45 -07:00
Magne Sjaastad
8698291e7d (#566) Major rewrite of how to build and update PdmUiTreeOrdering items 
Removed findChildItemIndex() which caused performance issues for large
models. Replaced with a new algorithm using std::map. Added unit tests
 2015-10-14 13:32:35 +02:00
Magne Sjaastad
bcc5d636f8 (#566) Performance: Use set to detect if an object already has been inserted in UiTreeOrdering 2015-10-14 13:23:54 +02:00
Magne Sjaastad
8e03c38901 Return root if reference is empty 2015-10-06 16:12:17 +02:00
Magne Sjaastad
edc6e427ec [System] Revert test code 2015-10-06 15:26:22 +02:00
Magne Sjaastad
bbc6fb1511 Minor refactor of ReferenceHelper 
Removed some asserts
Added more unit tests
 2015-10-06 15:03:55 +02:00
Jacob Støren
49ab79219e Fixed crashes regarding general handling of NULL pointers in Child Arrays 2015-09-25 15:24:21 +02:00
Jacob Støren
644a4529d3 Experimental: Avoid QProcessEvent during progress dialog. 
By having a non modal progress dialog and calling repaint directly.
 2015-09-21 18:54:35 +02:00
Magne Sjaastad
53f1765fd7 Fixed wrong index guarding 2015-09-18 19:39:17 +02:00
Magne Sjaastad
a4b57a11a4 Added display of class names to preferences 
Use flag in pdmUiTreeViewEditor to control display of class names
 2015-09-18 19:24:02 +02:00
Magne Sjaastad
dcf9ac9b50 Check if index is valid when resolving child objects 2015-09-18 18:49:53 +02:00
Magne Sjaastad
6be5be4746 Added macro for pure virtual classes 2015-09-18 13:46:17 +02:00
Magne Sjaastad
cc59cb84af Show class name as debug info in project tree 2015-09-18 08:04:13 +02:00
Magne Sjaastad
2807a8d2f8 Added support for icons in combo box editor 2015-09-07 13:51:49 +02:00
Magne Sjaastad
89fa5ecef7 Added possibility to setCurrentFrame without emitting a signal 2015-09-04 11:40:44 +02:00
Magne Sjaastad
1f2a5a8c08 (#395) Fixed missing calls to navigationPolicyUpdate 2015-09-03 13:06:10 +02:00
Magne Sjaastad
4730e10319 Created navigationPolicyUpdate to be used from navigation policies 2015-09-01 18:04:35 +02:00
Jacob Støren
8b5ea1aeb3 Excluded user input events from progressbar process events. 
They are not needed, and might cause problems.
 2015-09-01 17:19:01 +02:00
Magne Sjaastad
33d5b9b63b Early exit if no frames are present 2015-09-01 11:31:32 +02:00
Magne Sjaastad
3086ab10bc (#395) Fixed bug in viewer 2015-09-01 11:31:32 +02:00
Magne Sjaastad
854c47500b Clamp frameindex instead of doing nothing 2015-09-01 11:31:31 +02:00
Magne Sjaastad
e5d5543cd9 Ovveride update() and find all linked views to be updated 2015-08-28 21:32:51 +02:00
Magne Sjaastad
dc7735a67d Fixed missing code changes related to previous commit 2015-08-27 11:56:52 +02:00
Magne Sjaastad
492bf96598 Moved Xml related functions from PdmDocument to XmlObjectHandle 
Moved and renamed initAfterReadRecursively, setupBeforeSaveRecursively
and resolveReferencesRecursively to XmlObjectHandle. Updated unit tests.
Removed resolveReferences() from PdmPtrField.
 2015-08-27 11:43:27 +02:00
Magne Sjaastad
4f5f50fb4f Fixed up unit tests 2015-08-27 11:00:49 +02:00
Magne Sjaastad
792793b6ed Generalized update 2015-08-26 14:52:35 +02:00
Magne Sjaastad
90b6dd44ee Created infrastructure used to resolve references for ptrFields 2015-08-26 14:48:20 +02:00
Magne Sjaastad
08f570f4ed Minor test application mainwindow changes after AppFwk updates 2015-08-24 18:22:16 +02:00
Jacob Støren
f174615098 Replaced use of capability template with convenience 2015-08-20 15:24:49 +02:00
Jacob Støren
0ac86aeff3 Fwk: Added convenience methods to access the ui/xml capabilities in objects 2015-08-20 15:22:43 +02:00
Jacob Støren
0fda6ef6fb (#370) Bugfixes regarding using several project trees 
SelectionManager is now updated whenever focus enters the treeview.
The main project tree now has turned on SelectionManager updates
 2015-08-20 14:49:18 +02:00
Jacob Støren
04368bd8a3 (#349) Removed updateConnectedUIEditors 2015-08-20 10:43:55 +02:00
Jacob Støren
f0ee19d8f7 Some renaming and comments 2015-08-20 09:58:27 +02:00
Jacob Støren
f7ef9c575e Added missing headers to CMake files 2015-08-20 09:57:38 +02:00
Jacob Støren
f8dce724f6 (#370) Wip: NewProjectTreeAndPropertyView command works. 
Missing context menu
 2015-08-20 08:03:38 +02:00
Jacob Støren
302f46b61b (#372) First step in Reimplemented drag and drop support 2015-08-18 11:23:53 +02:00
Jacob Støren
4606a3de8b Fwl: Always update action look when retreiving it. 2015-08-18 10:52:13 +02:00
Jacob Støren
6d7bf0ae9e Made translation between PdmUiItem and QModelIndex available in PdmUiTreeView 
After considering the different options, I concluded that it is important to
support the Qt way of doing things.
If the App programmer wants to do things the Qt way, it should be possible.
 2015-08-16 09:57:57 +02:00
Jacob Støren
e805c893c6 (#378) Added an tree view expansion interface 2015-08-14 18:03:51 +02:00
Jacob Støren
5cd416ce6b (#357) Renamed PdmUiObjectHandle::owner() to objectHandle() 2015-08-14 16:15:49 +02:00
Jacob Støren
fc146bb554 Fix of compiler warning 2015-08-14 15:17:30 +02:00
Jacob Støren
d3b1af3724 firstAnchestorOrThisOfType : Initialize returnvalue to NULL 2015-08-14 15:17:03 +02:00
Jacob Støren
f5d15c19e1 firstAnchestorOfType now considers the object itself as well. 
It is thus renamed to firstAnchestorOrThisOfType
 2015-08-14 14:04:47 +02:00
Magne Sjaastad
d466624e45 Added command features for paste of Eclipse view and Eclipse case 2015-08-14 10:17:32 +02:00
Magne Sjaastad
9cae0e09ff Fixed copyOfTypedObjects 2015-08-14 10:17:32 +02:00
Magne Sjaastad
a1ecc50605 Added CopyReferencesToClipboardFeature 2015-08-14 10:17:31 +02:00
Jacob Støren
0670403c1d Select to Application Global and not Current for SelectionManager 2015-08-14 08:35:57 +02:00
Jacob Støren
8052a1c672 (#369) Added selectAsCurrentItem to the PdmUiTreeView 
Cleaned up the responsibilities between Editor, model and View
Now model exposes translation between QModelIndex and PdmUiItem
Selection inteface implementation is handled by editor, and forwarded to View
Also started renaming of SlectionManager update enabeling
 2015-08-13 23:45:34 +02:00
Jacob Støren
a1774d3b14 (#353) Removed the last MODTODO (except Eclipse View commands impl) 2015-08-13 15:43:17 +02:00
Jacob Storen
47819812bf Fix of Linux compile errors and warnings 2015-08-13 06:23:51 -07: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
b9b7d77fc6 Updates from RPM 2015-08-13 14:16:41 +02:00
Magne Sjaastad
e12a5b62de Renamed to PdmObjectCollection 2015-08-13 13:06:57 +02:00
Magne Sjaastad
2b47793d68 Integrated fix for undo framework. Added virtual destructors. 2015-08-13 13:06:56 +02:00
Magne Sjaastad
82903afa25 Do not assert when a field editor cannot be created 2015-08-13 13:06:55 +02:00
Jacob Støren
8ad3f9b8c3 Fixed missing parent = NULL, if parentField() is NULL 2015-08-13 11:47:04 +02:00
Jacob Støren
f8518037fe cafPdm: Re-Added PdmObjectHandle::firstAncestorOfType() 2015-08-13 11:38:29 +02:00
Magne Sjaastad
fd5bd534f6 Added dummy static class to fix issue with single macro in cpp 
The implementation of this dummy class is put in the file with the
single macro defining the UI editor. This will cause the cpp file to
always be compiled.
 2015-08-12 21:51:02 +02:00
Magne Sjaastad
c2fe5f3a16 Added PdmGuardedObjects and use this container from UiListView 2015-08-12 18:27:59 +02:00
Magne Sjaastad
711cc16da1 Added firstAncestorOfType 2015-08-12 11:10:20 +02:00
Magne Sjaastad
005114cc3e Fixed several todo for RimEclipseStatisticsCaseCollection::parentCaseGroup(), removed comments 2015-08-11 18:42:44 +02:00
Magne Sjaastad
c7fca88bdc Allow invalid PdmUiTreeOrdering objects, and display message in Debug 2015-08-11 11:15:30 +02:00
Magne Sjaastad
e3bfca8174 Revert "Improved default parsing of visible items to establish root items in the tree view" 
This reverts commit 550eccc521.
 2015-08-10 21:44:50 +02:00
Pål Hagen
319d9a1aa7 Added new method index() 2015-08-10 16:57:16 +02:00
Magne Sjaastad
550eccc521 Improved default parsing of visible items to establish root items in the tree view 2015-08-09 10:56:52 +02:00
Magne Sjaastad
28aee8ef0d Reintroduced asserts 2015-08-07 12:41:03 +02:00
Magne Sjaastad
abbe591d7b Added virtual destructor to execute command base class 2015-08-07 09:00:56 +02:00
Magne Sjaastad
ac45fb111b Added missing childObjects() for PtrField and fixed legend tree view visibility for PtrFields 2015-08-06 08:08:15 +02:00
Magne Sjaastad
57e363896f Replaced uiField() and xmlField() with uiCapability() and xmlCapability() 2015-08-05 12:34:07 +02:00
Magne Sjaastad
c09143e706 Intermediate fixes to avoid noise from asserts 2015-08-04 15:57:37 +02:00
Magne Sjaastad
392876dcaa Intermediate fix for fields with multiple parents. Asserts must be reintroduced later. 2015-08-04 14:32:18 +02:00
Magne Sjaastad
7039deed44 Added helper class for read/write to QSettings 2015-08-04 11:46:46 +02:00
Magne Sjaastad
62308340ee Improved comments 2015-08-04 09:26:58 +02:00
Magne Sjaastad
0113d2bd24 Removed obsolete file 2015-08-04 08:42:15 +02:00
Magne Sjaastad
31b3e506e9 Changed container from PdmChildArrayField to std::vector 2015-08-01 23:16:01 +02:00
Magne Sjaastad
92f0d64eaf PdmDocument inherits directly from PdmObject and not PdmObjectGroup 2015-08-01 23:04:04 +02:00
Magne Sjaastad
97c5091d71 Moved static members to public visibility temporarily 2015-07-31 18:48:54 +02:00
Magne Sjaastad
93654de7d7 Added missing include 2015-07-31 18:48:13 +02:00
Magne Sjaastad
58149cbdb9 Copied in RPM/Fwk/AppFwk 
Commented out use of stipple line, as VizFwk is not update yet
 2015-07-29 14:19:43 +02:00
Pål Hagen
c527545e4f (#285) Disabled keyboard tracking for spin boxes 
Disabled keyboard tracking for spin boxes used in slider editors, so
that the valueChanged() signal is not emitted until the user has pressed
ENTER or the spin box loses focus.
 2015-06-30 09:55:40 +02:00
Jacob Storen
3bd9360911 Linux compile fix. 
Needed to move the implementation of copyByType() out of the class definition.
 2015-06-29 03:37:02 -07:00
Jacob Støren
948f4d5d58 Fwk: Added missing "setupBeforeSave" when copying. 
This fixes #110 Copy view function resize/move grid in ResInsight
 2015-06-29 10:48:25 +02:00
Stein Dale
5e93b8ca1f Added option for disabling lighting (#311) 2015-06-18 12:23:26 +02:00
Jacob Storen
2c980e6b1b Linux compile fixes 2015-06-17 05:51:22 -07:00
Jacob Støren
245feea95d cafTensor: Added a library cmake file 2015-06-17 13:07:43 +02:00
Jacob Støren
30d41b9251 Added a Tensor3-class to calculate principal values etc. 2015-06-17 13:06:50 +02:00
Jacob Støren
ebc0475787 cvf::CellRangeFilter: Added hasIncludeRanges() 2015-06-05 15:35:36 +02:00
Jacob Støren
3ba140abde Avoid multiple qt connections anim-control->toolbar 2015-06-03 12:14:34 +02:00
Jacob Støren
a338c6abda Improved documentation of the progressbar class 2015-06-03 12:07:35 +02:00
Jacob Storen
f6e8bb4a1a Fixes of linux compile errors and warnings 2015-05-27 05:50:12 -07:00
Jacob Støren
d82d88d592 Removed a ; 2015-05-21 14:33:10 +02:00
Jacob Støren
33148edef4 VizFwk: Discrete log legend: Added missing clamping 2015-05-16 09:36:03 +02:00
Jacob Støren
7a2640b52f Discrete legend: Fix of discrete texture and end colors 
Added changes from ChList 2078-2081
 2015-05-13 20:51:44 +02:00
Roland Kaufmann
6d38344261 Don't validate shader programs on MacOS X 
If the paint event is called before the view is visible, validation
of the shader program will cause an error on MacOS X 10.8 and forward,
stating that the operation was ignored.
 2015-01-01 19:46:25 +01:00
Roland Kaufmann
e0da9a611f Remove copy ctor of atomic counter on OS X 
This is not present on any of the other platforms so it is not needed,
but it uses a removed method (to receive the value) so it won't compile.
 2015-01-01 19:46:24 +01:00
Roland Kaufmann
90249e1158 Use pthreads on MacOS X too 
MacOS X is POSIXy enough for this to be a suitable choice
 2015-01-01 19:46:24 +01: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
01cfed9ab7 Fixed crash after copy/paste of view and case 2014-08-28 13:37:56 +02:00
Magne Sjaastad
76d6304f79 Pick info : Use IJK instead of XYZ 2014-08-26 13:41:34 +02:00
Magne Sjaastad
786f3bbd9c Fwk: Moved static functions to pdmDocument 2014-08-19 10:57:08 +02:00
Magne Sjaastad
659c90e3e9 Fwk: Created a separate update function for uiIconState 2014-08-19 10:38:35 +02:00
Jacob Støren
7a3d90daa4 Removed fvector and replaced with FixedArray. 
Needs replacing with std::array when we get to c++11
 2014-08-14 10:56:21 +02:00
Jacob Støren
322823754b Replaced dataAccessObject with resultAccessor 2014-08-14 10:56:20 +02:00
Magne Sjaastad
da108bfb03 Fwk: Moved function call out of initAfterRead 2014-08-14 10:56:15 +02:00
Magne Sjaastad
c579c61404 Fwk: Update enabled state for icons based on object toggle field 2014-08-14 10:56:07 +02:00
Magne Sjaastad
86b74e383e Do nothing if no source tree can be created 2014-08-14 10:56:06 +02:00
Magne Sjaastad
d87c3da789 Fwk: Allow label text on check box widget 2014-08-14 10:55:46 +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
Magne Sjaastad
cbc3238180 Do not show progress info when running from unit tests 2014-04-25 09:59:41 +02:00
Magne Sjaastad
19ff7075d3 Added serialization of pdm objects using QSettings 2014-04-22 13:17:27 +02:00
Magne Sjaastad
040dc12e1b Added property dialog 2014-04-22 13:16:25 +02:00
Magne Sjaastad
89fc4629c8 Added default editor for quint64 2014-04-22 13:16:24 +02:00
Magne Sjaastad
b158c0da9d Use polygon offsett to avoid flickering with mesh lines 2014-04-22 11:22:17 +02:00
Magne Sjaastad
bf9ecc7c5f Changed how synchronization functions are detected 2014-04-15 11:50:04 +02:00
Magne Sjaastad
486f383de7 Integrated changes for framework 
Pdm fields can contain a forward declared Pdm object without the include
file
VizFwk: Added VertexColoring shader to be able to use per vertex color
used from drawableGeo::setColorArray()
 2014-04-11 11:06:42 +02:00
Magne Sjaastad
49a43a036e Pick info and result info: Added face type 2014-01-03 14:59:52 +01:00
Magne Sjaastad
3e6954d7f5 Read multiple FAULTS keywords 
A list of files are cached in the project file. When reading faults from
these files, make sure multiple FAULTS keywords in the same file is
parsed.
 2014-01-03 09:44:13 +01:00
Jacob Støren
b52c0fcdd3 NNC: Added face to result info text 2013-12-19 10:50:48 +01:00
Magne Sjaastad
ec181e94f8 Added depth write to effect generator 2013-12-19 09:16:29 +01:00
Magne Sjaastad
f492f0eda2 Renaming 2013-12-19 09:16:29 +01:00
Jacob Støren
49fe3e9f4c EffectGenerator: Renamed faceculling member 2013-12-18 13:53:32 +01:00
sigurdp
0100038db0 Experimental support for offsetting NNCs when drawing 
Utilize polygon offset in conjunction with disabling of depth writes to
layer drawing of NNs on top of other fault drawing.
 2013-12-18 12:13:44 +01:00
Magne Sjaastad
a617c4a430 Added more control of face culling 2013-12-18 09:31:43 +01:00
Jacob Støren
56b7053a15 StructGrid: Added Comment 2013-12-17 13:28:07 +01:00
sigurdp
28d0fbc476 Added support for multi-level polygon offset 
Allow effect generator to tak multiple levels of polygon offsetting.
 2013-12-17 13:11:46 +01:00
Magne Sjaastad
c32cf208f2 Removed redundant call 2013-12-17 11:52:42 +01:00
Jacob Støren
b23490106e Added IntArray6 2013-12-12 22:18:17 +01:00
Jacob Støren
6660614657 Added NO_FACE to the face define 2013-12-12 22:18:09 +01:00
JacobStoren
5ca8911a68 Linux compile fixes 2013-12-09 15:48:55 +01:00
Jacob Støren
776ed7755e Improved FixedArray 2013-12-06 14:22:01 +01:00
Magne Sjaastad
19737aa99a Use const access for FixedArray. Added sorting of faults 2013-12-05 09:59:05 +01:00
sigurdp
477792e89d Refactored naming of cvfqt:Utils member functions 2013-12-04 17:04:05 +01:00
sigurdp
cc72c7b2f6 Merged down changes from Resinsight dev branch 2013-12-04 16:06:48 +01:00
sigurdp
368af75bf2 Refactored ProgramOptions class 2013-12-04 14:56:04 +01:00
Jacob Støren
c7a4b48224 Linux compile fix 2013-12-04 14:37:54 +01:00
Jacob Støren
5f1e7204bf Merge branch 'FwkBBAWUpdates' into dev 2013-12-04 12:09:18 +01:00
sigurdp
192f4bba59 Added conversion of lists/arrays plus renames 
Renamed/deprecated fromQString(), new function is toString()
 2013-12-04 11:51:12 +01:00
sigurdp
4db4e44668 Added member ProgramOptions::firstValue() 2013-12-04 11:49:05 +01:00
Jacob Støren
40b4a98498 Fixed error in comment 2013-12-04 11:24:57 +01:00
Jacob Støren
c608376c4e Added ArrayWrapper and BoundingBoxTree to VizFwk 2013-12-04 11:24:53 +01:00
magnesj
65d9222d97 Fixes for Linux 2013-12-04 07:20:18 +01:00
Magne Sjaastad
12918ec107 Faults: Reading from Eclipse text files and basic visualization 
Added reading of faults directly from Eclipse text files
Added named faults in project tree
Added fault geompetry parts
Added test data
 2013-12-03 20:30:32 +01:00
sigurdp
58412c010c Added cvf::ProgramOptions class to Fwk 
Integrated from CS PF as of changelist 235
 2013-11-29 13:00:09 +01:00
sigurdp
df5f1f85af Integrated from CeeSol Perforce, changelist 203 
AppFwk tests.
Added rotation to locator.
Caf::FrameAnimationControl : Set current frame to 0 if a framecount
change makes the current frame invalid
 2013-11-01 16:54:24 +01:00
sigurdp
bbebebadd5 Added complete VizFwk 
Added the complete VizFwk from the ResInsight branch in Perforce as of
changelist 190.
 2013-11-01 08:49:42 +01:00
sigurdp
fbfbdfca84 Integrate Fwk updates from ResInsight/Perforce 
Integrated Fwk updates in Resinsight branch up to changelist 173.
Summary of changes:
* Rewrite of cvf::OverlayItem to allow fixed user controlled positioning
of the items.
* Removed pure virtual functions OverlayItem::maximumSize() and
OverlayItem::minimumSize().
* Use caf::AboutDialog instead of modified cvfqt::BasicAboutDialog.
* Removed lapack from link line due to fail on Ubuntu 12.04 when lapack
isn't installed.
* Fix in OpenGLContext::saveOpenGLState() to avoid application
corruption when running on RedHat with VMWare.
* Removed unused font manager.
* Console assert handler only calls __debugbreak() if debugger is
present. Otherwise, calls abort(). Done after trouble running gtest
death tests.
* Made component access functions in Color3f, Color3ub, Color4f,
Color4ub inline.
* Added conversion functions between TextureImage and QImage to
cvfqt::Utils class.
* Optimized TextureImage::setPixel() - relies on new inlined
component-wise access functions for Color4ub.
* Added TextureImage::clear() and non-const version of
TextureImage::ptr().
 2013-10-31 14:57:52 +01:00
Magne Sjaastad
785efe55e8 CAF: Delete of object is handled by Qt 
Delete of m_proxyEditor caused memory corruption. Qt will delete the
object, as this is parent to m_proxyEditor
 2013-10-23 10:38:01 +02:00
Jacob Støren
9c1b676f7f Added an improved Ceetron Navigation 2013-10-20 00:41:25 +02:00
Jacob Støren
c537d7179b Caf Field: Comments etc. regarding optionvalues 
Fields with option values implicitly have an index based
seUiValue/uiValue interface. This is commented better. Fields of AppEnum
specialization was not quite in line with the rest of the optionValue
system. That is commented and some ifdeffed code has been added to
highlight what could be done when we dare.
 2013-10-18 10:11:57 +02:00
Jacob Støren
86fe500690 caf AppEnum: Added index() method 2013-10-18 10:05:25 +02:00
Magne Sjaastad
08b970d084 Normalize line endings 2013-10-07 09:07:27 +02:00
Magne Sjaastad
90402c285d VizFramework: Improve the stability of text color in ResInsight. 
The setting for current OpenGL texture engine is not controlled well
enough, causing the wrong texture to be active when rendering text -
hence giving semi-random colors for the text.
 2013-10-04 14:02:14 +02:00
Magne Sjaastad
15eab9b261 Performance: Added Utils::copyFromQImage() in cvfqtUtils. Optimized copy 
for QImage::Format_ARGB32, and use this function from the paint event in
cafViewer.
 2013-09-30 13:17:05 +02:00
Magne Sjaastad
764f564c0c Performance: Access memory directly instead of using access functions. 2013-09-30 07:55:26 +02:00
Magne Sjaastad
6ca5a0c520 Merge remote-tracking branch 'origin/internal' into internal 2013-09-26 12:18:01 +02:00
Magne Sjaastad
2006d10548 Added stretch to list view 2013-09-26 12:17:41 +02:00
Jacob Støren
a4bcbf6115 Merge from origin 2013-09-26 11:48:41 +02:00
Jacob Støren
6f37a731fc Merge remote-tracking branch 'origin/internal' into internal 2013-09-26 11:44:04 +02:00
Magne Sjaastad
1f738a7ac9 Added sorting to tree items by clicking the header 
Added names to header
Renamed buttons to 'Download' and 'Import'
 2013-09-26 10:57:35 +02:00
Jacob Støren
bef1d8ce7e caf: Enabled the Tooltips. Seems to have been forgotten. 2013-09-26 10:41:08 +02:00
Magne Sjaastad
2413c4ac2d Fixed const issues on Linux 2013-09-25 15:21:30 +02:00
Magne Sjaastad
ac02a97c39 Improved tree ordering system 2013-09-25 15:06:44 +02:00
sigurdp
f64d9b7e64 Moved CAF to Fwk/AppFwk and moved/renamed VisualizationModules to Fwk/VizFwk 2013-09-20 16:01:20 +02:00