Commit Graph

154 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
3996f6442d Moved Debug menu to File->Testing 2013-10-24 13:08:19 +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
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
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
89cd331489 Linux: QVariant has no overload for size_t 2013-10-22 11:28:14 +02:00
Magne Sjaastad
74f6b544ce Renaming related to import actions 2013-10-18 16:23:31 +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
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
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
af232d8c31 Debug: Added paint performance reporting from 'Debug->Paint Event
Performance Test'
2013-09-30 07:56:47 +02:00
Magne Sjaastad
b0761d0612 Added dialog for configuration and execution of regression test from
Debug->Regression Test Dialog
Generalized read/write of pdm object fields using QSettings
2013-09-27 10:04:10 +02:00
Magne Sjaastad
5e6af679ba Changed project file extension to RSP 2013-09-25 09:36:01 +02:00
Magne Sjaastad
32b148ee0e Added enabled state and button to be able to execute a command object
p4#: 22397
2013-09-13 09:17:57 +02:00
Magne Sjaastad
72d65976d7 Fixed Linux compiler issues
p4#: 22388
2013-09-12 08:29:37 +02:00
Magne Sjaastad
c3adfb7cb0 Prototyped command object infrastructure to be used in regression tests of Octave scripts
p4#: 22387
2013-09-12 08:11:56 +02:00
Magne Sjaastad
f9112c458c Store username/password in session cache
Compute UTM region before import wizard is displayed
p4#: 22351
2013-09-08 10:53:25 +02:00
Magne Sjaastad
ca3fee6c34 Removed obsolete prototype code
Cleaned up unused functions
p4#: 22338
2013-09-06 15:59:25 +02:00
Magne Sjaastad
86f5e6017d Integrated well import wizard in project file
p4#: 22331
2013-09-06 13:06:39 +02:00
Magne Sjaastad
3208a74fbf Removed obsolete code to read data from ssihub
p4#: 22328
2013-09-06 11:25:55 +02:00
Magne Sjaastad
ff45f6885e Simplified file selection filter for well path import
p4#: 22142
2013-08-08 17:23:31 +02:00
Magne Sjaastad
69f3f98f5a Hide console on Windows
Show command line help text in dialog, accessible from About menu
Show command line help dialog instead of console output on Windows
p4#: 22130
2013-08-08 11:09:18 +02:00
Magne Sjaastad
9910480538 Added *.dev and *.* to file filter for well path import
p4#: 22099
2013-08-06 11:56:07 +02:00
Jacob Støren
524e8d8375 Added a left margin in the property window.
p4#: 22002
2013-06-26 09:02:37 +02:00
Jacob Støren
5db88f4e03 Ascii import of Well Paths
p4#: 21956
2013-06-18 11:56:51 +02:00
Jacob Støren
29afd9cc8a Cleaned up a bit
p4#: 21924
2013-06-14 12:08:05 +02:00
Jacob Støren
edcba5a471 Animation (and other commands) refreshed on selection in the tree view
p4#: 21923
2013-06-14 11:59:56 +02:00
Vidar Lundberg
6340c4a4a8 Established new PDM structure with RimProject owning RimOilFields owning RimAnalysisModels.
Moved wellPathCollection into new class RimOilFields.
Moved cases (previously called reservoirs) and caseGroups from RimProject into new class RimAnalysisGroups.
Added support for old project files, move cases and caseGroups from RimProject to RimAnalysisModels. (Do not handle WellPaths for old project files in a similar way, since almost no users have used this functionality yet.)
p4#: 21846
2013-06-06 15:07:31 +02:00
Jacob Støren
1d3d13c927 Icons: New App icon based on picture sent from Statoil
Scaled vertically a bit to work better as an icon.
Still using the old AppIcon as Case Icon, and updated the InputCase icon to match the Case Icon.
p4#: 21793
2013-06-01 01:29:05 +02:00
Magne Sjaastad
ea4491e987 Added framework used to handle utm area of interest
p4#: 21775
2013-05-31 13:57:16 +02:00
Magne Sjaastad
261301ad4a Added ssihub test application
Improved ssihub dialog and tested authentication
p4#: 21768
2013-05-30 15:33:12 +02:00
Magne Sjaastad
5e3bb1f6a9 Added Qt example HttpWindow for network access
Added import of well paths to File->Import
p4#: 21764
2013-05-29 14:49:04 +02:00
Magne Sjaastad
ada9819870 Added ssihubInterface library and framework files
p4#: 21763
2013-05-29 12:59:08 +02:00
Magne Sjaastad
fa161607a1 Added context menu used to execute a script for multiple cases
For all selected cases, set current case and launch an external Octave process using this current case
p4#: 21742
2013-05-27 15:38:03 +02:00
Vidar Lundberg
163ce74052 Added visualization of Well Paths in reservoir views.
Added PDM objects for a list of well paths (RimWellPathCollection) and for individual well paths (RimWellPath).
RimWellPathCollection uses RivWellPathCollectionPartMgr to generate visualization parts for each well path in the collection.
RimWellPath handles geometry defined in RigWellPath, and RivWellPathPartMgr is used to generate visualization parts. The well path visualization parts are generated by reusing RivPipeGeometryGenerator (also used for well pipes).
Added features:
- Select Open Well Paths in File menu to open one or more well path files, file format supported is Statoil JSON format.
- Each well path has a label showing the name, and the PDM window will show additional info (Id, Source System, UTM Zone, Update Date and User, Survey Type, File Path).
- Possible to turn on / off visibility, set thickness, set color for individual well paths.
- List of well paths including specified parameters/settings will be stored in project file.
- Possible to clip all well paths at a specified distance to the reservoir as this is the relevant area to see, and if showing whole well path it may be problematic for auto zoom etc.
Known problems:
- Well paths are not shown in some types of reservoir views, for instance reservoir views showing well pipes. Will look into this later.
p4#: 21658
2013-05-16 14:10:22 +02:00
Magne Sjaastad
97c3a330f6 Updated riGetSelectedCases to use a string as type name
Improved how to get currently selected cases
p4#: 21625
2013-05-15 12:03:36 +02:00
Magne Sjaastad
22d45bc28f Added riGetSelectedCases based on currently selected cases in the main tree view
p4#: 21604
2013-05-13 22:32:01 +02:00
Jacob Støren
5c0e55e7c1 Linux compile fixes
p4#: 21550
2013-05-06 12:02:32 +02:00
Jacob Støren
cf664210bf Major cleanup/change in the way things are included.
Needs a Linux compile check.
p4#: 21545
2013-05-06 10:55:00 +02:00
Magne Sjaastad
ab8dfb4aad In RimProject, encode/decode into a string the currentIndex from QTreeView.
This will also make sure the active view is restored when opening a project
p4#: 21463
2013-04-26 19:05:35 +02:00
Magne Sjaastad
8ccd89d3d1 Added scale to toolbar
p4#: 21452
2013-04-26 11:49:37 +02:00
Magne Sjaastad
d3fa2d5af5 Added creation of IJK-slices from context menu in 3D scene.
p4#: 21367
2013-04-23 07:29:37 +02:00
Magne Sjaastad
a326fac204 Renaming related to tree item root
p4#: 21355
2013-04-22 10:49:31 +02:00
Magne Sjaastad
79e7d3604c Expand up to root when creating a view. Removed use of expandAll()
p4#: 21353
2013-04-22 10:04:37 +02:00
Magne Sjaastad
a9e0554635 Use semicolon as string list separator. Fixed bug in tree view state parameter passing.
p4#: 21350
2013-04-22 09:20:57 +02:00
Magne Sjaastad
638e82d24c Store tree view state in project file
p4#: 21342
2013-04-19 13:20:46 +02:00
Jacob Støren
cd24e77557 Drawstyle and Faults control Toolbuttons
p4#: 21335
2013-04-18 15:10:57 +02:00
Magne Sjaastad
f23c9d7b4d Removed obsolete code
p4#: 21328
2013-04-17 11:48:32 +02:00