Commit Graph
9 Commits
Author SHA1 Message Date
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
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
sigurdp f64d9b7e64 Moved CAF to Fwk/AppFwk and moved/renamed VisualizationModules to Fwk/VizFwk 2013-09-20 16:01:20 +02:00