Commit Graph

694 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
72b7936247 Updated copyright year and link to online documentation 2013-10-25 10:38:47 +02:00
Magne Sjaastad
7318780122 Renamed label in Regression Test dialog
Updated doc for regression test and new dialog image
2013-10-24 13:40:29 +02:00
Magne Sjaastad
3996f6442d Moved Debug menu to File->Testing 2013-10-24 13:08:19 +02:00
Magne Sjaastad
de476c38ce Added context menu for add case group 2013-10-24 11:10:33 +02:00
Magne Sjaastad
cd686990f0 Improved context menu for well collection and analysis model 2013-10-24 11:06:26 +02:00
Magne Sjaastad
a74be74792 Open Users Guide url from Help menu 2013-10-24 10:47:02 +02:00
Magne Sjaastad
f6cb4baf7e Delete child object to fix memory leak 2013-10-24 09:53:27 +02:00
Magne Sjaastad
40092b0d62 SSIHUB: Update file paths for and well path cache
Consolidated cache creation in RimTools
2013-10-24 09:50:21 +02:00
Magne Sjaastad
f145302206 SSIHUB: Copy cache well paths using setupBeforeSave() 2013-10-24 07:28:45 +02:00
Jacob Støren
538efff651 Grid Case Group: Relabeled "Cases" to "Source Cases" 2013-10-23 22:13:01 +02:00
Jacob Støren
ea855ceed2 User Doc: Finalized Wells and thereby Views 2013-10-23 18:14:08 +02:00
Jacob Støren
a5f4f2c7fd Added a better info box icon 2013-10-23 16:17:05 +02:00
Magne Sjaastad
f61731da74 Renaming to Info Box 2013-10-23 16:04:12 +02:00
Magne Sjaastad
8e32b8f770 Renaming
Renamed simulated wells from Wells to Simulation Wells
Renamed group name for Well range filter
2013-10-23 15:51:30 +02:00
Magne Sjaastad
cbe9110c8a SSIHUB: Fixed memory leak
Delete copy of RimWellPathImport object and added destructor to related
objects
2013-10-23 10:42:34 +02:00
Magne Sjaastad
bcc1482532 SSIHUB: Test if well path is selected before import 2013-10-23 08:30:48 +02:00
Magne Sjaastad
76ffd7e937 Well paths: Update display model after delete 2013-10-23 08:07:11 +02:00
Magne Sjaastad
9abc3387aa SSIHUB: Added visibility checkbox next to well path collection 2013-10-22 15:30:12 +02:00
Magne Sjaastad
89cd331489 Linux: QVariant has no overload for size_t 2013-10-22 11:28:14 +02:00
Magne Sjaastad
631353cf97 SSIHUB: Regions and well paths unselected by default 2013-10-22 08:54:48 +02:00
Magne Sjaastad
e2663d7db6 Removed obsolete command line parameter 2013-10-21 14:41:42 +02:00
Jacob Støren
9eb4b19384 Use the improved Ceetron Navigation 2013-10-20 00:42:14 +02:00
Magne Sjaastad
74f6b544ce Renaming related to import actions 2013-10-18 16:23:31 +02:00
Jacob Støren
1cce11f7f9 Add possible support for AllCell result in Result Cases
See issue #99 and #100
2013-10-18 14:27:37 +02:00
Jacob Støren
5a745b7f3b Tool button to add well cells to range filter
Issue #73
2013-10-18 11:19:49 +02:00
Jacob Støren
f7869f9a5c Ui brush-up of View property panel 2013-10-17 13:38:53 +02:00
Jacob Støren
63177ef234 Ui Brushup of Well property panels 2013-10-17 13:38:52 +02:00
Magne Sjaastad
4459fe0c71 Added ResInsightVersion.cmake to list of files. Removed redundant
includes.
2013-10-09 08:54:51 +02:00
Magne Sjaastad
3f7bdbb5ec Use filename from file containing the grid as InputCase case description. Fixed Input Case Mock model. 2013-10-08 14:30:42 +02:00
Jacob Støren
606a14f9f7 Octave Interface: Tentative Fix of lockup of Resinsight
Added a timer to call back if a signal from the socket has to be
ignored.
This way we should not loose signals and state.
Needs to be experienced over some time to be verified.
2013-10-08 14:21:18 +02:00
Jacob Støren
d5fe84bfbb Octave Interface: Moved debug output macro to socket tools
To make it available to all the SocketServer related classes.
2013-10-08 14:18:23 +02:00
Jacob Støren
230561573e Merge branch 'internal' of https://github.com/OPM/ResInsight into internal 2013-10-08 13:51:48 +02:00
Jacob Støren
7701cef865 Octave interfance: GetActiveCellCenters GetActiveCellCorners Fixed wrong CaseId addressing
Fixed Wrong CaseId addressing
2013-10-08 13:41:30 +02:00
Magne Sjaastad
1d160d4f8a Use date function from ERT, as ecl_rsthead_date() can handle time step
defined before 1970. This type of typesteps are often used in synthetic
cases.
2013-10-08 13:33:02 +02:00
Magne Sjaastad
ab31222efa Octave: Use 1-based IJK for riGetWellCells 2013-10-08 13:07:14 +02:00
Magne Sjaastad
d1f8f383c4 ERT: Use 1-based ids for well branches and segments. Removed adding of 1
in picking text info in RimReservoirView.

Integraded ERT from
0f9e820554
2013-10-08 12:31:15 +02:00
Jacob Støren
12f3986d5f Octave interface: SocketServer Major review
Simplified and made more readable. Hopefully more stable and robust.
2013-10-07 11:47:09 +02:00
JacobStoren
3264520619 File paths: Convert native Win paths to use "/"
On linux we need to convert filepaths produced on windows manually
before trying to find the relatively placed files referenced by the
project.
2013-10-07 11:46:28 +02:00
Magne Sjaastad
3faa9d65a4 Set numeric locale to make sure parsing of text in ResInsight and
dependant libraries (ERT) are robust to different userdefined system
locales.
2013-10-07 11:28:57 +02:00
Magne Sjaastad
08b970d084 Normalize line endings 2013-10-07 09:07:27 +02:00
Jacob Støren
ca55d44884 Octave Interface: Fixed bugs riSetGridProperties riSetActiveCellProperty
SetGridProp did not read all data (if -> while)
Both returned not finished while they could have been finished
2013-10-04 14:36:34 +02:00
Jacob Støren
4efeba4a51 Socket Interface: Comments and debug message possibilities 2013-10-04 14:36:26 +02:00
Magne Sjaastad
cf439fbf96 RegressionTest: Fixes to regression testing system to make it run
correctly on Ubuntu 12.04 - fixed size of grabbed image. Side effect is
that the default window size for ResInsight is increased slightly.
Removed parameter to image comparison tool to allow running regression
tests on RedHat 5
2013-10-04 10:22:17 +02:00
Magne Sjaastad
483b1a0fd9 RegressionTests: Open HTML report in browser 2013-10-04 08:11:22 +02:00
Jacob Støren
5367460462 Process Monitor: Removed border, and switched to courier font.
ResultinfoPanel: Removed border
2013-10-03 14:43:03 +02:00
Jacob Støren
35f7b7db2f Added some comments on getting rid of QModelIndex based commands 2013-10-03 14:43:02 +02:00
Magne Sjaastad
0a3ce268ac Increased default number of significant digits to 4 2013-10-03 11:07:52 +02:00
Jacob Støren
56590a8c55 New Case groups is now correctly positioned in the tree.
The context command was not quite up to speed.
2013-10-02 15:51:25 +02:00
Jacob Støren
77285785fb Default file open dir on linux set to cwd 2013-10-01 12:04:36 +02:00