Commit Graph

244 Commits

Author SHA1 Message Date
Pål Hagen
479b2083ef (#486) Renamed "trace" to "track" 2015-09-18 12:29:23 +02:00
Pål Hagen
58609ac9de Renamed class/flies 2015-09-18 09:16:59 +02:00
Magne Sjaastad
0f5fed1768 (#492) Created folder for well log commands, added "New Well Log LAS Curve" feature 2015-09-18 09:07:38 +02:00
Pål Hagen
06f73bc359 (#436) Enabled addition of multiple well log curves to plot 2015-09-16 16:16:02 +02:00
Magne Sjaastad
f1e11780ce (#446) Added feature "Set master view" to context menu in 3D and in project tree 2015-09-16 15:13:56 +02:00
Magne Sjaastad
4c781b12be (#446) Added feature "Delete all linked views" 2015-09-16 14:40:50 +02:00
Magne Sjaastad
36f5f628f3 (#446) Changed from list of ViewLinkers to one single ViewLinker 2015-09-16 14:26:25 +02:00
Pål Hagen
e4212a1135 (#436) Added feature that creates a plot with a given LAS file log 2015-09-15 15:23:25 +02:00
Pål Hagen
095d974e38 (#435) WIP - Reading metadata from LAS files 2015-09-14 16:33:28 +02:00
Jacob Støren
238c783b26 More renaming LikedView -> ViewLink 2015-09-14 09:53:16 +02:00
Jacob Støren
8b26726672 Renamed file LinkedView->ViewLink 2015-09-11 14:17:21 +02:00
Jacob Støren
733b3603db Rename of LinkedView -> ViewLink 2015-09-11 14:17:16 +02:00
Magne Sjaastad
5ce0f6988d (#417) Added togglebutton controls to View group 2015-09-08 10:17:50 +02:00
Magne Sjaastad
f16b2af600 Rename of class names and files related to linked views 2015-09-07 14:35:26 +02:00
Pål Hagen
7d73d9fcf1 (#421) Showing linked views first in the tree view, if any 2015-09-07 14:01:26 +02:00
Magne Sjaastad
a884d79aff (#419) Removed the inapplicable views from the view drop down 2015-09-07 13:51:51 +02:00
Pål Hagen
8acab71742 (#422) Moved well log plots before scripts and after wells in the tree view 2015-09-07 13:07:10 +02:00
Pål Hagen
27f8f34538 (#396) Create main plot collection and well log plot collection if needed
Reading old project files may give projects without main plot collection
and well plot collection. Those are now created in the command feature
for adding a new well log plot, if needed.
2015-09-07 10:44:48 +02:00
Magne Sjaastad
c86dc45fd6 Delete linked views when project is closed 2015-09-04 11:22:44 +02:00
Jacob Støren
1e6baed1dc Placed WellLogExtractors in the RimWellLogPlotCollection and cached them 2015-09-03 20:13:08 +02:00
Jacob Støren
2288130f6a (#396) Several fixes regarding Project with plots.
Plots loads the curve data on project open
Plots are removed on project close
Still missing some updates (curve names ...)
2015-09-03 08:22:06 +02:00
Magne Sjaastad
d80e64d81d (#395) Added Show All Linked Views as context menu feature of linked views 2015-09-02 17:18:26 +02:00
Magne Sjaastad
7969e22364 (#395) Moved managed views from RimView to RimProject 2015-09-01 17:34:03 +02:00
Jacob Støren
c35e3fceaf Fixed assert on open old projectfiles
The cause was that a case was inserted into a field without removing it from the old obsolete field first.
2015-09-01 17:19:05 +02:00
Magne Sjaastad
444500f6cc (#395) Make sure the update() virtual function is called from camera related functions 2015-09-01 11:31:31 +02:00
Pål Hagen
5e18afd44c (#396) Implemented deletion of well log plots 2015-08-31 11:05:55 +02:00
Pål Hagen
9d4f9d617f Basic well log plot functionality with dummy data up & running
Traces can be added to and deleted from well log plots, and curves with
dummy data can be added and deleted. TODO: Replace dummy data with real
well log data and data extracted from the model.
2015-08-31 02:06:37 +02:00
Magne Sjaastad
3f09c1bc66 Added LinkVisibleViewsFeature, and added action to draw toolbar 2015-08-30 13:30:46 +02:00
Pål Hagen
7401160677 Added command feature to the context menu for well path collection 2015-08-28 12:25:48 +02:00
Pål Hagen
46a941348b Hide the main plot collection level in the project tree
"Well Log Plots" will be visible on the top level if there are plots.
2015-08-28 12:10:36 +02:00
Pål Hagen
7081e140fd Added command feature for addition of a new curve to a well log plot trace 2015-08-28 11:45:18 +02:00
Pål Hagen
0fdf5292d0 Added command feature for addition of a new trace to a well log plot 2015-08-28 11:32:25 +02:00
Pål Hagen
af9bbfdede Added collection class for well log plots 2015-08-28 10:42:57 +02:00
Pål Hagen
4e6bb1ded3 WIP - added project data model files for well log plots
Added command feature for adding new well log plots (right-click "Plots"
in the project tree view). Will create dummy Qwt widget added as an MDI
window.
TODO: Complete the relations between the entities, and add
properties/property editors. Create more advanced viewer widget for
plotting of multiple traces with multiple curves. Harmonize MDI stuff
with 3D viewers.
2015-08-27 16:13:49 +02:00
Magne Sjaastad
f6ac177ff2 Added ManagedViews and sync of camera, time step and cell result 2015-08-26 15:42:31 +02:00
Pål Hagen
5614f6d33a (#339) Fixed well path related context menu
Made sure that the order of the items in the context menu is the same as
it used to be in the old project tree view. Removed separator.
2015-08-24 16:33:54 +02:00
Jacob Støren
39c50b4f8d Linux Compile Fix 2015-08-24 16:05:39 +02:00
Pål Hagen
5785031697 Added "Delete" to the context menu for input property items 2015-08-24 10:45:43 +02:00
Pål Hagen
7044f3c627 (#383) Added RicAddEclipseInputPropertyFeature 2015-08-24 10:40:47 +02:00
Pål Hagen
28547513c6 (#383) Added RicSaveEclipseInputPropertyFeature 2015-08-24 10:03:21 +02:00
Pål Hagen
756e793519 (#386) Added "Delete" to the grid case group context menu
Note: Used to be "Close" in the old tree view. Using existing feature
for deletion, for now.
2015-08-21 15:44:12 +02:00
Pål Hagen
89ee164c8a Added "Paste" to the context menu of "Derived Statistics" 2015-08-21 15:08:07 +02:00
Pål Hagen
762083a5b6 (#388) Added RicComputeStatisticsFeature 2015-08-21 14:53:45 +02:00
Pål Hagen
afe596aa2a (#388) Added RicNewStatisticsCaseFeature 2015-08-21 11:47:59 +02:00
Jacob Støren
2e1a542749 Some context menu cleanup 2015-08-20 17:19:38 +02:00
Jacob Støren
a6c59f4160 (#384) Fixed Script tree in the new project tree 2015-08-20 15:48:37 +02:00
Pål Hagen
c5606a46aa (#339) Added "New Grid Case Group" to the context menu of "Grid Models" 2015-08-20 14:20:13 +02:00
Pål Hagen
fb6baee197 (#339) Added RicCreateGridCaseGroupFeature 2015-08-20 14:11:21 +02:00
Pål Hagen
6e48e036c1 (#339) Added RicImportEclipseCaseFeature 2015-08-20 13:54:20 +02:00
Pål Hagen
cd1e04d6e8 (#339) Added RicImportEclipseCaseFeature 2015-08-20 13:44:45 +02:00
Pål Hagen
4d1f98c138 (#339) Added RicAddScriptPathFeature and RicDeleteScriptPathFeature
Did some additional refactoring - added code common to script related
features to RicScriptFeatureImpl.
2015-08-20 11:59:07 +02:00
Pål Hagen
ac529b77da (#339) Added RicNewScriptFeature 2015-08-20 10:32:03 +02:00
Pål Hagen
a01618cc8e (#339) Added RicEditScriptFeature 2015-08-19 18:17:45 +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
Pål Hagen
d466d58164 (#339) Added RicExecuteScriptFeature 2015-08-18 15:07:00 +02:00
Pål Hagen
c52c029045 (#339) Using generic deletion feature to delete views
Note: Old version used to say "Delete" in the context menu, now it says
"Delete object".
2015-08-18 14:10:34 +02:00
Pål Hagen
9c4766a262 (#339) Added RicCloseCaseFeature 2015-08-18 13:41:53 +02:00
Jacob Storen
5defe45209 Linux compile fix 2015-08-18 03:42:51 -07:00
Jacob Støren
c3db342474 (#361) Toggle commands now implemented in new tree 2015-08-18 12:08:46 +02:00
Jacob Støren
eadf1ca300 (#361) Refactored "On" as a start on the toggle commands 2015-08-18 10:52:18 +02:00
Pål Hagen
67fedfd699 (#339) Added RicNewViewFeature
TODO: Expand new view in treeview when inserted
2015-08-18 10:36:23 +02:00
Pål Hagen
5b4de5dae1 (#366) Made sure that feature names correspond to the class names 2015-08-17 15:09:01 +02:00
Pål Hagen
03fcd1ad9d Commented out command ids that are not implemented yet 2015-08-17 14:27:21 +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
Magne Sjaastad
6a28ea2070 Show only paste command if selection contains multiple objects 2015-08-14 12:08:56 +02:00
Magne Sjaastad
15f3e793f8 Added paste of geo mech views feature 2015-08-14 10:50:08 +02:00
Magne Sjaastad
d466624e45 Added command features for paste of Eclipse view and Eclipse case 2015-08-14 10:17:32 +02:00
Magne Sjaastad
a1ecc50605 Added CopyReferencesToClipboardFeature 2015-08-14 10:17:31 +02:00
Magne Sjaastad
ee78d3c148 Use a string list to represent commands for context menu 2015-08-12 21:19:06 +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
bcf1109412 Use general delete on property filters, and deleted obsolete files 2015-08-12 11:10:20 +02:00
Jacob Støren
fb88414fec Reset textfields in Project storing TreeView selection and expansion state
This avoids an assert, and that selection stat bleeds through from one project to next.
2015-08-12 10:51:52 +02:00
Magne Sjaastad
232d44b58c Added general delete feature and use from cell range filter 2015-08-11 20:59:05 +02:00
Pål Hagen
b18cd87727 Renamed command 2015-08-11 15:38:20 +02:00
Pål Hagen
b0aac08827 Removed unused action 2015-08-11 15:35:53 +02:00
Pål Hagen
45ec9543c7 Added "new" and "insert" commands for geomech property filters 2015-08-11 15:33:17 +02:00
Jacob Støren
3d599542f4 Fixed the top levels of the new tree
Including Scripts and Well Paths
2015-08-11 15:22:49 +02:00
Pål Hagen
198da4d553 Using variable for first selected UI item 2015-08-11 10:55:53 +02:00
Pål Hagen
9ab60b1477 Added command features for "insert" and "delete" for property filters
Made sure that only "new" is available for property filter collections,
while "insert" and "delete" are available for property filters in the
tree view. TODO: Implement execution for insert and delete
2015-08-10 13:35:57 +02:00
Magne Sjaastad
111509e52a Set uiHidden states in order to make the new tree view identical to previous 2015-08-09 11:16:52 +02:00
Pål Hagen
cf1cda6fb0 Added some new command features for the treeview context menu (WIP) 2015-08-07 15:08:17 +02:00
Pål Hagen
566f2c4cd7 Added some commands for eclipse views (WIP) 2015-08-06 16:24:33 +02:00
Magne Sjaastad
d041f27416 Added uiTreeViewOrdering to RimProject 2015-08-06 16:05:32 +02:00
Pål Hagen
a9e7a8f461 WIP - command for adding property filters 2015-08-06 14:54:18 +02:00
Pål Hagen
ad800bc594 WIP - commands for adding range filters
TODO: Implement actions when commands are triggered, and update project
treeview
2015-08-06 14:01:23 +02:00
Magne Sjaastad
f748b68e0c Prototyped commands for new treeview 2015-08-06 11:00:21 +02:00
Magne Sjaastad
90762d0f0f Use uiCapability/xmlCapability instead of capability<caf::PdmUiFieldHandle>()(capability<caf::PdmXmlFieldHandle>() 2015-08-05 13:27:36 +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
Pål Hagen
fd03a02645 Renamed source files according to new class names 2015-06-26 10:00:44 +02:00
Pål Hagen
ca7428ca4a Renamed class RimAnalysisModels to RimEclipseCaseCollection 2015-06-26 10:00:40 +02:00
Jacob Støren
2c7a741805 Renamed the files of RimReservoirView to RimEclipseView 2015-05-21 10:34:38 +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
Magne Sjaastad
b4df5419b1 Updated file header for modified files 2014-09-23 15:04:57 +02:00
Magne Sjaastad
d21e532c61 Cleaned up includes for ProjectDataModel 2014-08-14 10:55:49 +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
227e3e6353 Hide all items for well path import in ResInsight project workspace 2013-09-27 07:29:01 +02:00
Magne Sjaastad
5160c9bf86 Delete command objects in destructor
p4#: 22402
2013-09-13 10:42:27 +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
5dbc15998f Fixed several compiler warning on Linux
p4#: 22370
2013-09-10 08:47:28 +02:00
Jacob Støren
f0ddf37301 Started to use Update-display-model-And-Redraw scheduling system.
First mainly for object toggle fields on well related objects, to avoid recreating the displaymode for each object toggeled by a multiselect command.
p4#: 22355
2013-09-08 22:59:46 +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
Jacob Støren
03ad142261 Removed debug output
p4#: 21887
2013-06-12 10:52:46 +02:00
Jacob Støren
a9d2baf117 Project/OilField: Made sure one and always one oilfield exists in a project.
p4#: 21884
2013-06-12 09:36:50 +02:00
Jacob Støren
6ac8c4365f Project tree: Fixed several issues after the reconfiguration
Missing Icon and text on the Grid Models folder
New cases and Grid Case Groups ended up outside the Grid Model Folder
Old Project files did not show up properly
p4#: 21854
2013-06-07 14:54:02 +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
Magne Sjaastad
ea4491e987 Added framework used to handle utm area of interest
p4#: 21775
2013-05-31 13:57:16 +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
06d32ae97e Added groupId to case groups
p4#: 21594
2013-05-10 15:35:33 +02:00
Magne Sjaastad
eecd069b0a Introduced caseId to RimCase. Project keeps track of largest used ID, and is responsible for assigning ID to cases.
p4#: 21576
2013-05-08 10:41:56 +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
b3c30c1b21 Added support for setting multiple script directories
p4#: 21393
2013-04-24 07:35:31 +02:00
Magne Sjaastad
de5542976c Avoid to rebuild the complete project tree view when importing a grid case group
Set cell results as current item in tree view when importing a case
p4#: 21368
2013-04-23 08:11:52 +02:00
Magne Sjaastad
b20be8ad25 Check if directory is readable before creating a script collection item
p4#: 21362
2013-04-22 14:37:33 +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
462bc16ace Rewrite of the searchpath system for external file references
The Relocation code is not yet completely working for the advanced cases
p4#: 21251
2013-04-12 08:31:59 +02:00
Magne Sjaastad
64899f62c2 Detect when project path has changed, and do a explicit update of file path for RimCases.
Do not use initAfterRead
p4#: 21165
2013-04-08 12:01:40 +02:00
Magne Sjaastad
4ae9182fc6 Extract path from document file name in RimProject
p4#: 21160
2013-04-08 08:44:33 +02:00
Jacob Støren
f0174a02fa More file renaming:
RigEclipseCase		RigCaseData
RigReservoirCellResults	RigCaseCellResultsData
RigWellResults		RigSingleWellResultsData
RigGridCollection	RigGridManager
p4#: 21070
2013-03-22 16:58:44 +01:00
Jacob Støren
6a2cbbcf07 Renamed files:
RimReservoir		RimCase
RimResultReservoir	RimResultCase
RimInputReservoir	RimInputCase
p4#: 21069
2013-03-22 16:40:41 +01:00
Jacob Støren
b903c7f8c2 Renamed files:
RIApplication	RiaApplication
RIPreferences	RiaPreferences
p4#: 21068
2013-03-22 16:24:42 +01:00
Jacob Støren
27647248ea Rename of files:
RIBaseDefs	RiaBaseDefs
RIVersionInfo	RiaVersionInfo
RIMain	RiaMain
RIStdInclude	RiaStdInclude
p4#: 21067
2013-03-22 16:12:00 +01:00
Jacob Støren
949084784e More class renaming. File names not done yet.
RIApplication	RiaApplication
RIPreferences	RiaPreferences
p4#: 21065
2013-03-22 15:50:44 +01:00
Jacob Støren
e493db37d0 Major renaming of classes. Filenames not done yet.
RimReservoir		RimCase
RimResultReservoir	RimResultCase
RimInputReservoir	RimInputCase
RigEclipseCase		RigCaseData
RigReservoirCellResults	RigCaseCellResultsData
RigWellResults		RigSingleWellResultsData
RigGridCollection	RigGridManager
p4#: 21064
2013-03-22 15:43:42 +01:00
Magne Sjaastad
9abe7a3b13 Improved handling when deleting all cases and adding new case to case group
p4#: 20990
2013-03-20 11:35:27 +01:00
Magne Sjaastad
22aee27333 Improved paste of pdm objects
p4#: 20980
2013-03-20 07:42:26 +01:00
Magne Sjaastad
051710b82f Prototype of copy/paste of reservoir case
p4#: 20962
2013-03-19 09:55:17 +01:00
Magne Sjaastad
9605a1eec9 Added clear method to make sure all objects are destroyed.
p4#: 20828
2013-03-08 08:36:30 +01:00
Magne Sjaastad
0dc492da75 Added casecollection in grid case group
p4#: 20602
2013-02-21 15:37:51 +01:00
Magne Sjaastad
e82aef5850 Imroved lifespan handling for reservoirs
p4#: 20526
2013-02-15 10:01:41 +01:00
Magne Sjaastad
3490d07dd1 Added IdenticalGridCaseGroup, now displayed in tree view
p4#: 20518
2013-02-14 14:30:01 +01:00
Magne Sjaastad
8f50b90216 Added grid collection and reuse of MainGrid if the grids are equal
p4#: 20517
2013-02-14 13:16:56 +01:00
unknown
2c9695e594 Updated to version 0.8.0 2012-06-26 16:10:41 +02:00
Alf B. Rustad
dfe97efb1b Initial commit of ResInsight version 0.4.8 2012-05-18 09:45:23 +02:00