OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-03 12:10:57 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,700 Commits 25 Branches 61 Tags 288 MiB
c93c7e41df
Commit Graph

231 Commits

Author SHA1 Message Date
Jacob Støren
f0ee19d8f7 Some renaming and comments 2015-08-20 09:58:27 +02:00
Jacob Støren
f8dce724f6 (#370) Wip: NewProjectTreeAndPropertyView command works. 
Missing context menu
 2015-08-20 08:03:38 +02:00
Pål Hagen
28e7c8b19c (#339) Refactored execution of scripts for selected cases 
Moved slotExecuteScriptForSelectedCases() from RiuMainWindow to
RicExecuteScriptForCasesFeature.
 2015-08-19 13:23:26 +02:00
Pål Hagen
ea87fc0746 (#339) Added RicExecuteScriptForCasesFeature 2015-08-18 16:36:37 +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
b9343fd21e Made the menu builder in RimProject handle separators. 
Also rigging for Script commands and generic toggle
 2015-08-17 10:51:13 +02:00
Jacob Støren
48cef84069 Added some OBSOLETE comments 2015-08-17 10:01:39 +02:00
Jacob Støren
bb2eda3e73 (#379)(#377) Moved store/restore of tree view state to new tree 
Also refactored slotCreateCommandObject
 2015-08-17 09:38:27 +02:00
Jacob Støren
2f49415d3f (#376) Made new treeview follow window selection 2015-08-16 10:06:10 +02:00
Jacob Støren
6ca74621ef (#378) Refactored Expansion in MainWindow, 
Removed some use of the obsolete tree view model
 2015-08-14 18:06:22 +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
50ea7a0808 Removed header from tree view and added support for ExtendedSelection 2015-08-14 12:08:30 +02:00
Magne Sjaastad
a1ecc50605 Added CopyReferencesToClipboardFeature 2015-08-14 10:17:31 +02:00
Jacob Støren
3e3b1a2480 (#369) Refix updating of propertyview on selection of none-object 2015-08-14 08:38:17 +02:00
Jacob Støren
343e4dcc1c (#369) Started to use the new selection method in PdmUiTreeView 2015-08-13 23:47:04 +02:00
Jacob Støren
235e024533 (#354) Called updateConnectedEditors everywhere updateUiSubTree is called 2015-08-13 21:28:09 +02:00
Jacob Støren
3d47e5795b (#368) Made current view change when changing the selection in the new tree view 2015-08-13 17:05:41 +02:00
Magne Sjaastad
bf5dae4887 Renamed files 2015-08-12 21:09:03 +02:00
Magne Sjaastad
9bee1b81fc Added commands for well path features 2015-08-12 20:59:38 +02:00
Magne Sjaastad
9f16c859c6 Added command feature for SSIHUB import 2015-08-12 20:12:50 +02:00
Magne Sjaastad
3c9e1bab5c Several refactoring of well import wizard 
Keep original copy of RimWellPathImport object as Xml instead of copy
using PdmObjectGroup
Added destructor for cleanup of wizard pages
Simplified info communication between pages
 2015-08-12 18:44:03 +02:00
Magne Sjaastad
005114cc3e Fixed several todo for RimEclipseStatisticsCaseCollection::parentCaseGroup(), removed comments 2015-08-11 18:42:44 +02:00
Magne Sjaastad
8035b46d29 Expand all items in new treeview 2015-08-07 21:57:27 +02:00
Magne Sjaastad
fb84d7825d Clear undo stack on project close. Show selected obj in property view 2015-08-07 08:36:53 +02:00
Magne Sjaastad
1f60ef76c9 Added undo view and activated undo framework 2015-08-06 20:39:59 +02:00
Magne Sjaastad
86f062ad7e Fixed coordinates for menu 2015-08-06 16:05:31 +02:00
Magne Sjaastad
f748b68e0c Prototyped commands for new treeview 2015-08-06 11:00:21 +02:00
Magne Sjaastad
57e363896f Replaced uiField() and xmlField() with uiCapability() and xmlCapability() 2015-08-05 12:34:07 +02:00
Magne Sjaastad
a88b3cac83 Added new project tree dock widget 2015-08-04 15:57:58 +02:00
Magne Sjaastad
a225d3abff Prefix treeview / tree view model to be replaced with OBSOLETE 2015-08-04 15:19:32 +02:00
Magne Sjaastad
690a264c81 Use helper class to read/write using QSettings 2015-08-04 11:47:06 +02:00
Magne Sjaastad
92f0d64eaf PdmDocument inherits directly from PdmObject and not PdmObjectGroup 2015-08-01 23:04:04 +02:00
Magne Sjaastad
737936d846 Major modularization adjustments 
Use uiField() when issuing setUi....() commands
Use PdmChildArrayField instead of PdmPointersFielc
Use PdmChildField instead of PdmField to pdm pointer objects
Use PdmChildArrayField instead of PdmField< std::list< caf::PdmPointer<
type > > >
Use PdmObjectHandle instead of PdmObject
Replaced parentFields(std::vector)  with parentField()
Use PdmUiPropertyViewDialog instead of PdmUiPropertyDialog
 2015-07-31 18:58:23 +02:00
Jacob Støren
1a3a2f1ff5 (#119) Improved naming of Property Filters 
Finalized.
 2015-07-02 12:50:38 +02:00
Jacob Støren
55c1d5de71 Made help menu entry point directly to documentation, not the home-page 2015-06-29 10:48:10 +02:00
Pål Hagen
fd03a02645 Renamed source files according to new class names 2015-06-26 10:00:44 +02:00
Pål Hagen
cd662dc7d1 Renamed source files according to new class names 2015-06-26 10:00:43 +02:00
Pål Hagen
2f34b03135 Renamed source files according to new class names 2015-06-26 10:00:41 +02:00
Pål Hagen
ca7428ca4a Renamed class RimAnalysisModels to RimEclipseCaseCollection 2015-06-26 10:00:40 +02:00
Pål Hagen
f6ab965ea1 Renamed class RimWellCollection to RimEclipseWellCollection 2015-06-26 10:00:40 +02:00
Stein Dale
0ea699484c Changed tooltip for toolbar button (#311) 
"Disable Lighting" -> "Disable Results Lighting"
 2015-06-18 13:28:27 +02:00
Stein Dale
720de6c30c "Disable Lighting" toolbar button is always enabled if there's an active view (#311) 2015-06-18 13:26:50 +02:00
Stein Dale
3eff3708ed Added action and toolbar button for "Disable Lighting" (#311) 2015-06-18 12:23:28 +02:00
Jacob Støren
273e91d38d Moved the new resultCollection class to new files 
Also removed obsolete file, and added missing header files to the
CMakeLists file
 2015-06-04 16:25:16 +02:00
Jacob Støren
a3fa27d2ec Created RigFemPartResultsCollection 
Refactored the results stuff from GeoMechCaseData into the new class
preparing to extend the statistics calculation
 2015-06-04 16:25:11 +02:00
Jacob Støren
da5a1d8ff1 Geom Anim: Fixed missing setting of current timestep in anim toolbar 2015-06-03 12:14:42 +02:00
Jacob Støren
6e8692121d Varible rename 2015-06-03 12:14:38 +02:00
Jacob Støren
96329793f3 Use odb "Steps" as animation steps 
Issue #293
This is only tested with one step yet.
 2015-06-03 12:14:25 +02:00
Jacob Støren
2c7a741805 Renamed the files of RimReservoirView to RimEclipseView 2015-05-21 10:34:38 +02:00
Jacob Støren
ed74116376 Rename of RimReservoirView to RimEclipseView 
To make the separation to geomech clearer, and alligning it to the
RigCaseNaming
 2015-05-21 10:05:33 +02:00
Jacob Støren
3c8bac9f2a Fixed crash in regressiontest of statistics case 
Destructor chain deleting view fired off getting all cases, which
accessed case during its destruction.
 2015-05-18 15:23:51 +02:00
Jacob Støren
969a181897 RimCase reintroduced as baseclass for all cases 
Refactored to handle cases generically in  a lot of places.
Mostly complete regarding all these issues, but not tested yet:
Assigning caseId
Update relative path to the case data
RimProject::createDisplayModelAndRedrawAllViews
RimProject::computeUtmAreaOfInterest
Load case data on project open
save snapshots for all views
RegressionTest viewer size
Finding case based on caseId
Giving case information to octave
 2015-05-15 18:51:49 +02:00
Jacob Støren
b111a26f21 Renamed Files: RimCase to RimEclipseCase 2015-05-15 09:16:33 +02:00
Jacob Støren
223f8385d2 Renamed base class RimCase to RimEclipseCase 
To make room for a RimCase base class that can be used as base class for
RimGeoMechCase as well.
This commit is only the class rename not the file rename.
 2015-05-15 08:40:27 +02:00
Jacob Støren
750fc5182c Refactor : Use allCases method instead of traversing 
Preparations to allign Geomech and Eclipse cases
 2015-05-15 08:18:11 +02:00
Jacob Støren
d6643d9d35 RimView etc: More aligning GeoMech/Eclipse 
Now Animation drawstyle works fairly well.
 2015-05-08 14:13:26 +02:00
Jacob Støren
a7e38bcda1 Now handling compilation both with and without ODB api 2015-04-29 09:26:29 +02:00
Jacob Støren
27f6bd9eb5 Start of geomech support 
Possible GUI-tree layout
 2015-04-20 09:02:33 +02:00
Magne Sjaastad
b4df5419b1 Updated file header for modified files 2014-09-23 15:04:57 +02:00
Magne Sjaastad
57ade584b2 Updated about dialog 2014-09-23 14:34:03 +02:00
Magne Sjaastad
6857bd3122 Updated link to help web pages 2014-09-03 07:08:44 +02:00
Magne Sjaastad
07b25a2f60 Added special handling to expand an item in tree view 2014-08-14 10:56:02 +02:00
Magne Sjaastad
73f29bb115 Recent files : Show full path in tooltip 2014-08-14 10:56:02 +02:00
Magne Sjaastad
fe712222ce Recent files : Set last opened file first, remove file if load fails 2014-08-14 10:56:01 +02:00
Magne Sjaastad
0d14436b97 Fault result: Added fault result legend 2014-08-14 10:55:59 +02:00
Magne Sjaastad
f259f21b32 Renamed file to match class name for RimReservoirCellResultStorage 2014-08-14 10:55:51 +02:00
Magne Sjaastad
d21e532c61 Cleaned up includes for ProjectDataModel 2014-08-14 10:55:49 +02:00
Magne Sjaastad
7db9b83c45 Added recent file list 2014-08-14 10:55:48 +02:00
Magne Sjaastad
e5712e9809 Cleanup after merge 2014-04-22 14:39:09 +02:00
Magne Sjaastad
0fbcc57473 Use caf property dialog and removed obsolete riuPreferencesDialog 2014-04-22 13:16:31 +02:00
Magne Sjaastad
b958d01540 Added missing test for ternary saturation result 2014-04-22 11:22:17 +02:00
Magne Sjaastad
4aeac9197b Use caf property dialog and removed obsolete riuPreferencesDialog 2014-04-14 09:16:06 +02:00
Magne Sjaastad
ae9f72912e Added customized mock model to user interface 2014-04-14 09:16:03 +02:00
Magne Sjaastad
3e8a206f13 Moved mock model identicators to RimDefines 2014-04-14 09:06:46 +02:00
Magne Sjaastad
209919c651 Toolbar: Added button control for toolbar labels 2014-01-23 07:31:07 +01:00
Jacob Støren
a20e08237b Toolbar - Gridlines - Faults only option #74 2013-12-18 23:37:30 +01:00
sigurdp
0656b5254f First cut, command line options for batch processing 
First cut implementation of command line oprions for batch proccessing.
Added support for the follwoing new command line options:
size, replacecase, replaceSourceCase and multiCaseSnapshots
Reworked the entire command line processing code.
 2013-12-04 12:04: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
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
Jacob Støren
2280a8cbfa Toolbar and menu refinements 
Added Snapshot actions to a new toolbar.
Moved the snapshot file actions from debug menu to File->Export
Moved the Snapshot to Clip board to Edit menu.
Moved create new Project tree and Property editor action to Windows menu
Added a separator in the Windwsmenu after the "fixed Docks"
Set unique names on the additional Prop and Project doc windows
p4#: 21326
 2013-04-17 10:59:34 +02:00
Magne Sjaastad
a20640f25f Only enable animation control when there are more than one time step string available 
p4#: 21229
 2013-04-10 15:09:41 +02:00
Jacob Støren
7da5520207 Reverted an accidental checkin regarding generating of test projects 
p4#: 21098
 2013-04-02 16:34:13 +02:00
Jacob Støren
e10bd73658 Renamed the final filenames for this time: 
RICursors		RiuCursors
RIMainWindow	RiuMainWindow
RIPreferencesDialog	RiuPreferencesDialog
RIProcessMonitor	RiuProcessMonitor
RIResultInfoPanel	RiuResultInfoPanel
RIViewer		RiuViewer
p4#: 21072
 2013-03-22 17:30:50 +01:00