OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,336 Commits 27 Branches 61 Tags 309 MiB
0133659e05
Commit Graph

1675 Commits

Author SHA1 Message Date
Jacob Støren
6786894adb Fixed Cmake generation error. 
wrap_qt cant be run in an included sub-cmake-file
 2015-08-20 09:57:09 +02:00
Jacob Støren
f8dce724f6 (#370) Wip: NewProjectTreeAndPropertyView command works. 
Missing context menu
 2015-08-20 08:03:38 +02:00
Jacob Støren
c1b971e4d4 Added OBSOLETE to the old toggle commands 2015-08-20 08:03:32 +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
302f46b61b (#372) First step in Reimplemented drag and drop support 2015-08-18 11:23:53 +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
f8c5bbc481 (#339) Removed unused feature files 2015-08-18 10:41:50 +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
ff10df4b4b (#366) Renamed command classes and files 2015-08-17 15:00:45 +02:00
Pål Hagen
e0e87910e4 Removed obsolete files 2015-08-17 14:52:24 +02:00
Pål Hagen
e4e7c0fa71 Removed obsolete source file 2015-08-17 14:35:30 +02:00
Pål Hagen
03fcd1ad9d Commented out command ids that are not implemented yet 2015-08-17 14:27:21 +02:00
Pål Hagen
fc959c94ae (#366) Renamed command classes and files 2015-08-17 13:32:50 +02:00
Pål Hagen
b5726e1051 Added comments for obsolete treeview slots (added to new project tree) 2015-08-17 11:45:37 +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
6244cf98bf Fixed bug discovered by doing (#357) 2015-08-14 16:19:31 +02:00
Jacob Støren
5cd416ce6b (#357) Renamed PdmUiObjectHandle::owner() to objectHandle() 2015-08-14 16:15:49 +02:00
Jacob Storen
f3810640ca Fixed Linux compile issues 2015-08-14 06:42:12 -07:00
Jacob Støren
15917d0044 Fix of update on Delete All Well Paths 2015-08-14 15:22:09 +02:00
Jacob Støren
a8a1b61646 (#373) Fixed update after delete. 
Removed the editors used to update after delete, and did all the updating from
the command directly.
Less code easier to follow, not as generic.
 2015-08-14 15:20:50 +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
Jacob Støren
1719a10954 Fixed crash when deleting Geomech Range filters 2015-08-14 13:27:31 +02:00
Jacob Støren
85ea085c4e (#371) RiuViewerCommands: Used the new exec commands 2015-08-14 13:27:26 +02:00
Jacob Støren
930760eb47 Removed wrong usage of owner() 2015-08-14 13:27:21 +02:00
Jacob Støren
d371da246f Renamed uiPdmModel() to uiPdmModel_OBSOLETE() 
To make it easier to see what code is using the obsolete stuff.
 2015-08-14 13:27:17 +02:00
Magne Sjaastad
d0e1bedd8c Removed obsolete command features 2015-08-14 12:57:36 +02:00
Magne Sjaastad
6a28ea2070 Show only paste command if selection contains multiple objects 2015-08-14 12:08:56 +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
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
Jacob Støren
69243076b2 Fixing wrong headers on new files 2015-08-14 09:45:57 +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
7e3b8c87dd Fixed update of 3D view after delete of all wells 2015-08-13 15:13:09 +02:00
Magne Sjaastad
412c07ae33 Include well name in summary page 2015-08-13 15:09:43 +02:00
Magne Sjaastad
2162a67b4a Hide children of wells to avoid dispaly of wells when selecting oil fields 2015-08-13 14:51:21 +02:00
Magne Sjaastad
fa622acb72 Renamed functions in effect generator and use cached effects instead of uncached 2015-08-13 14:35:30 +02:00
Magne Sjaastad
e12a5b62de Renamed to PdmObjectCollection 2015-08-13 13:06:57 +02:00
Magne Sjaastad
fdcee2dd42 Delete object before notifying editors 2015-08-13 13:06:56 +02:00
Jacob Støren
369797b3d8 Re-introduced firstAnchestorOfType 2015-08-13 11:38:32 +02:00
Magne Sjaastad
fd5bd534f6 Added dummy static class to fix issue with single macro in cpp 
The implementation of this dummy class is put in the file with the
single macro defining the UI editor. This will cause the cpp file to
always be compiled.
 2015-08-12 21:51:02 +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
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
beb291e1ce Fixed visibility of items in tree view 2015-08-12 17:46:22 +02:00
Magne Sjaastad
8f051e6a72 Added UI editor handle to update 3D view 2015-08-12 11:30:27 +02:00
Magne Sjaastad
bcf1109412 Use general delete on property filters, and deleted obsolete files 2015-08-12 11:10:20 +02:00
Magne Sjaastad
f9df484974 Added a property filter UI editor handle 
A UI editor handle is attache to the "propertyFilters" field used to
update 3D view and other UI editors
 2015-08-12 11:10:20 +02:00
Magne Sjaastad
fb5fb51fc1 Added initAfterRead() 2015-08-12 11:10:19 +02:00
Magne Sjaastad
eefa1c0ca8 Simplified property filters and removed m_parentContainer 2015-08-12 11:10:19 +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
Jacob Støren
3e1ff60c82 Fixed new tree view regarding Statisics Cases 2015-08-12 10:51:48 +02:00
Magne Sjaastad
232d44b58c Added general delete feature and use from cell range filter 2015-08-11 20:59:05 +02:00
Magne Sjaastad
250a2f6a93 Find parent container instead of having a member pointer 2015-08-11 20:58:10 +02:00
Magne Sjaastad
005114cc3e Fixed several todo for RimEclipseStatisticsCaseCollection::parentCaseGroup(), removed comments 2015-08-11 18:42:44 +02:00
Pål Hagen
89a45c41c0 Added command for "New Grid Case Group" 
TODO: Consider renaming and global availability in the treeview
 2015-08-11 16:18:27 +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
8bc9c734a2 Fixed the GeoMech part of the tree. 2015-08-11 15:23:57 +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
0e50a0bac5 Renamed some command classes 2015-08-11 13:55:31 +02:00
Pål Hagen
61b43c426a Removed unused command feature files 2015-08-11 13:48:17 +02:00
Pål Hagen
41d321b8b8 Added command exec class for saving of Eclipse result as input property 2015-08-11 13:48:16 +02:00
Magne Sjaastad
421c2e3685 Added guarding of missing legendConfig 2015-08-11 11:15:31 +02:00
Pål Hagen
198da4d553 Using variable for first selected UI item 2015-08-11 10:55:53 +02:00
Magne Sjaastad
5610bf5a10 Fixed visibility and rebuild of child items for filters 2015-08-10 23:23:41 +02:00
Magne Sjaastad
56907a5c6e Fixed typo 2015-08-10 21:59:07 +02:00
Magne Sjaastad
7956269fe4 Fixed missing updateConnectedEditors() as part of opening a new Eclipse case 2015-08-10 18:22:54 +02:00
Jacob Støren
b35e37bde2 Alligned the GeoMechResultDefinition to the EclipseResultDefinition way of updating the PropertyFilter 2015-08-10 17:28:32 +02:00
Jacob Støren
df0b4164c5 Got rid of the "ownership"-changes in EclipseResultDefinition with friends. 
Updating is now done more explicitly.
 2015-08-10 17:28:29 +02:00
Pål Hagen
8ee3e12335 Fixed returned names of command exec classes for "new" and "insert" 2015-08-10 17:07:10 +02:00
Pål Hagen
c4ab24db9c Refactored property filter commands, moved code to helper class 2015-08-10 17:00:12 +02:00
Pål Hagen
b36ce378d7 Added helper class for property filter commands and exec command for insert 2015-08-10 16:58:55 +02:00
Pål Hagen
6941db21af Changed command text 2015-08-10 14:48:33 +02:00
Pål Hagen
94375267bd Added command exec for "delete property filter" 2015-08-10 14:33:43 +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
Pål Hagen
8f29553b27 Setting parent container as soon as property filter is created 2015-08-10 13:16:30 +02:00
Pål Hagen
7636136627 Added command exec for "new property filter" 2015-08-10 13:11:48 +02:00
Magne Sjaastad
e889fc6308 Moved duplicate code into RicRangeFilterHelper 2015-08-10 11:13:27 +02:00
Magne Sjaastad
8fe6831355 Fixed visibility of even more items in tree view 2015-08-10 08:00:16 +02:00
Magne Sjaastad
65d372dd70 Fixed visibility of more items in tree view 2015-08-09 14:12:09 +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
Magne Sjaastad
8035b46d29 Expand all items in new treeview 2015-08-07 21:57:27 +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
Magne Sjaastad
322866b929 Removed comment 2015-08-07 12:41:18 +02:00
Magne Sjaastad
767defd90f Set pointer to NULL before insterting into ChildArray 2015-08-07 12:40:47 +02:00
Jacob Støren
78323e2299 Fixed crash due to missing LegendConfig 2015-08-07 11:09:05 +02:00
Magne Sjaastad
6669e6f005 Improved construction of range cell execute command 2015-08-07 09:13:22 +02:00
Magne Sjaastad
2fbecb613d Improved Ui filter names 2015-08-07 08:37:29 +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
dc1bbe0bab Completed IJK-slice commands 2015-08-06 20:54:29 +02:00
Magne Sjaastad
1f60ef76c9 Added undo view and activated undo framework 2015-08-06 20:39:59 +02:00
Pål Hagen
566f2c4cd7 Added some commands for eclipse views (WIP) 2015-08-06 16:24:33 +02:00
Magne Sjaastad
30b510fe3a Improved capabilities for new filter execute command 2015-08-06 16:17:23 +02:00
Magne Sjaastad
d606f60c1c Added prototype for adding range filters 2015-08-06 16:05:33 +02:00
Magne Sjaastad
d041f27416 Added uiTreeViewOrdering to RimProject 2015-08-06 16:05:32 +02:00
Magne Sjaastad
86f062ad7e Fixed coordinates for menu 2015-08-06 16:05:31 +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
f8871e9808 Use PtrField as placeholder for current legend config 
Set previous current legend to obsolete
When reading a file < 1.3.7.-dev, copy current legend config into legend
list
 2015-08-06 08:08:16 +02:00
Magne Sjaastad
cb6564e381 Removed unused function setPosition. Access legendConfig as pointer instead of field 2015-08-06 08:08:16 +02:00
Pål Hagen
f45c50fb43 Bugfix - getting correct pointer for parent case group 
Getting the parent field's owner object instead of the owner of this.
Removed some out-commented TODO code/comments.
 2015-08-05 14:55:16 +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
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
05ebf92e62 Fixed includes for linux 2015-08-04 13:40:57 +02:00
Magne Sjaastad
690a264c81 Use helper class to read/write using QSettings 2015-08-04 11:47:06 +02:00
Magne Sjaastad
0ca0f1a0e8 Fixed includes for unit tests 2015-08-04 09:19:52 +02:00
Magne Sjaastad
31b3e506e9 Changed container from PdmChildArrayField to std::vector 2015-08-01 23:16:01 +02:00
Magne Sjaastad
92f0d64eaf PdmDocument inherits directly from PdmObject and not PdmObjectGroup 2015-08-01 23:04:04 +02:00
Magne Sjaastad
453ee2e4ea Updated macro 2015-07-31 19:02:11 +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
Magne Sjaastad
d56cde087f Added missing include 2015-07-31 18:49:33 +02:00
Magne Sjaastad
60c08272ef Modularization fixes from WellPathImportSsihub 2015-07-29 14:41:36 +02:00
Magne Sjaastad
57b005cdf2 Build system changes to be able to build using modularization fwk 2015-07-29 14:20:15 +02:00
Pål Hagen
81cf711036 (#80) Modified GeoQuest navigation 
Switched the direction of scroll wheel zoom. Left mouse button + drag =
rotation, instead of right mouse button.
 2015-07-03 11:03:28 +02:00
Pål Hagen
610553644e (#115) Drawing the anchor line even if the fault name is empty 2015-07-02 16:20:29 +02:00
Pål Hagen
1cf2c03f78 (#115) Stopped creating text drawables for empty strings 
Note: Adding empty strings to cvf::TextDrawer will cause asserts.
 2015-07-02 16:11:34 +02:00
Pål Hagen
a9ecbd9899 (#80) Fix for CAD navigation mode 
Made sure that left mouse button + drag is panning. The view is still
picked when clicking the left mouse button, unless there have been mouse
moves/navigations that led to redrawing of the view.
 2015-07-02 14:53:37 +02:00
Pål Hagen
9a3fbfe0d5 (#80) "RMS" is now the default navigation mode 2015-07-02 14:53:36 +02:00
Pål Hagen
22c0c812af (#80) Refactored navigation mode related code 
Made sure that navigation policies are created only one place, in the
new member function RiuViewer::updateNavigationPolicy().
 2015-07-02 14:53:35 +02:00
Pål Hagen
c863d087f0 (#80) Added navigation modes 
New navigation modes: GeoQuest and RMS. In addition, right mouse button
can now be used for panning in CAD navigation mode.
 2015-07-02 14:53:34 +02:00
Jacob Støren
1a3a2f1ff5 (#119) Improved naming of Property Filters 
Finalized.
 2015-07-02 12:50:38 +02:00
Jacob Støren
34a88c0215 (#119) New property filter gets name from the active result 2015-07-01 15:26:00 +02:00
Jacob Støren
dad1520948 (#226) Cell Edge defaults for new views: Off and MULT 2015-07-01 14:46:44 +02:00
Jacob Støren
46bca827aa (#226) CellEdge Result: Check box in tree. 
The MULT result is not yet set as default property.
 2015-07-01 14:46:44 +02:00
Pål Hagen
dccfe9afb3 Bugfix: Correct handling of deletion of geo mech property filters 2015-07-01 12:07:01 +02:00
Pål Hagen
bf570ed1e1 (#343) Made sure that principal stress calculation is correct 2015-07-01 11:43:21 +02:00
Pål Hagen
6c54b1ad49 (#337) Renamed S to SE 
SE is set to undefined where pore pressure is undefined.
 2015-07-01 11:35:17 +02:00
Pål Hagen
02e5ba79cb (#287) Renamed method with name conflicting with virtual method 2015-07-01 10:05:12 +02:00