Commit Graph

882 Commits

Author SHA1 Message Date
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