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,662 Commits 27 Branches 61 Tags 309 MiB
03c788db6a
Commit Graph

1005 Commits

Author SHA1 Message Date
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
Jacob Støren
c599fd39f8 (#372) Drag Drop Move implemented. 
User question on closing/moving a statistics source case
 2015-08-20 10:43:49 +02:00
Pål Hagen
ac529b77da (#339) Added RicNewScriptFeature 2015-08-20 10:32:03 +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
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
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
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
6ca74621ef (#378) Refactored Expansion in MainWindow, 
Removed some use of the obsolete tree view model
 2015-08-14 18:06:22 +02:00
Jacob Storen
f3810640ca Fixed Linux compile issues 2015-08-14 06:42:12 -07: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
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
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
Jacob Støren
235e024533 (#354) Called updateConnectedEditors everywhere updateUiSubTree is called 2015-08-13 21:28:09 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
c804a5d8b3 (#337) Displaying "S" as "SE" in the GUI 2015-06-30 15:53:51 +02:00
Pål Hagen
68a7993105 (#342) Added "Add property filter" to the 3D view's context menu 2015-06-30 15:37:53 +02:00
Jacob Støren
e33caeab36 Fix of #301 Missing riTRANS/MULTXYZ when NTG is missing 2015-06-29 14:45:30 +02:00
Pål Hagen
80d50e2676 (#328) Range type renamed ("All Timesteps"/"Current Timestep") 
Range type renamed to "All Timesteps"/"Current Timestep" instead of
"Global/Local".
 2015-06-29 13:07:42 +02:00
Jacob Støren
985afce261 #329 "Copy/Paste View" added for Geomechanics 2015-06-29 10:48:17 +02:00
Pål Hagen
14d66f2d06 Renamed member variable 2015-06-26 10:00:47 +02:00
Pål Hagen
7315dd5318 Renamed variables according to newly renamed class names 
"Result slot" -> "Result colors"
 2015-06-26 10:00:46 +02:00
Pål Hagen
7917a89c65 Renamed source files according to new class names 2015-06-26 10:00:45 +02:00
Pål Hagen
8e994914f5 Renamed class "RimCellEdgeResultSlot" to "RimCellEdgeColors" 2015-06-26 10:00:44 +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
29f4b6eb31 Renamed source files according to new class names 2015-06-26 10:00:42 +02:00
Pål Hagen
c2561eb287 Renamed source files according to new class names 2015-06-26 10:00:42 +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
Pål Hagen
7f516172cf Renamed class RimWell to RimEclipseWell 2015-06-26 10:00:39 +02:00
Pål Hagen
b8d425a010 Renamed class RimFaultResultSlot to RimEclipseFaultColors 2015-06-26 10:00:39 +02:00
Pål Hagen
87744fb8c4 Renamed class RimResultSlot to RimEclipseCellColors 2015-06-26 10:00:38 +02:00
Pål Hagen
5eb673410e Renamed class RimGeoMechResultSlot to RimGeoMechCellColors 2015-06-26 10:00:37 +02:00
Pål Hagen
5e050d3c38 Renamed class RimStatisticsCaseEvaluator to RimEclipseStatisticsCaseEvaluator 2015-06-26 10:00:37 +02:00
Pål Hagen
bb915985c6 Renamed class RimStatisticsCaseCollection to RimEclipseStatisticsCaseCollection 2015-06-26 10:00:36 +02:00
Pål Hagen
486a36529a Renamed class RimStatisticsCase to RimEclipseStatisticsCase 2015-06-26 10:00:36 +02:00
Pål Hagen
051ab1ea24 Renamed class RimResultCase to RimEclipseResultCase 2015-06-26 10:00:35 +02:00
Pål Hagen
9049a47871 Renamed class RimInputPropertyCollection to RimEclipseInputPropertyCollection 2015-06-26 10:00:35 +02:00
Pål Hagen
33684d32c3 Renamed class RimInputProperty to RimEclipseInputProperty 2015-06-26 10:00:34 +02:00
Pål Hagen
dec6791027 Renamed class RimInputCase to RimEclipseInputCase 2015-06-26 10:00:33 +02:00
Pål Hagen
9458c818b4 Renamed class RimCellPropertyFilterCollection to RimEclipsePropertyFilterCollection 2015-06-26 10:00:33 +02:00
Pål Hagen
1883116c59 Renamed class RimCellPropertyFilter to RimEclipsePropertyFilter 2015-06-26 10:00:32 +02:00
Pål Hagen
f7a2582805 Renamed class RimResultDefinition to RimEclipseResultDefinition 2015-06-26 10:00:31 +02:00
Jacob Støren
1cdd5262f8 Cleaned up PropertyFilter classes. 2015-06-24 15:03:55 +02:00
Pål Hagen
355cef2ea4 Fix for setting the current frame when generating the display model 
Made sure that current frame is set when animation/multiple frames has
been requested. The old conditions for this were not sufficient.
 2015-06-24 10:07:27 +02:00
Pål Hagen
3c408f4ee8 (#314) Regenerating the display model when changing results in property filter 
Max and min values would be updated in the GUI for the newly selected
result, but the display model wasn't updated. This has now been fixed.
 2015-06-23 11:18:37 +02:00
Jacob Støren
515fb8b8d7 #314 Connected the Property filter code together. 
Now working !
 2015-06-22 21:57:52 +02:00
Pål Hagen
6191422103 Property filters for geo mech (#314) 
Added GUI objects for property filters for geo mech models.
 2015-06-22 15:27:37 +02:00
Jacob Støren
8f2090eccf Refactored GeoMechView createDisplayModel 
Made adding well paths less obfuscated
Preparing for #314 Property Filter
 2015-06-22 14:04:36 +02:00
Jacob Støren
088bc12459 Preparing for property filter. #314 
Prototype code for property filter visibility
Refactoring the VizLogic class to make the responsibilities clearer
 2015-06-22 08:18:54 +02:00
Jacob Støren
e9fe03f63a Moved Fem visibility calculator to a separate file 
Preparing for GeoMech Property filter
 2015-06-22 08:18:48 +02:00
Jacob Støren
74efc8da1a Use the new RigCellSetEnum instead of unsigned char 
Preparing for property filter
 2015-06-22 08:18:42 +02:00
Jacob Støren
0377461da0 #323, #318 Geomechanical sign on Stress/Strain 
Now they are presented as S and E, and the native Abaqus values are hidden.
 2015-06-19 14:38:31 +02:00
Jacob Støren
cfb0bfeb55 Moved RivCellSetEnum to a separate file. 
Preparations for property filtering
 2015-06-18 14:17:03 +02:00
Jacob Støren
8bf90ec27c Renamed enum type for Cell Sets (previously called ReservoirGeometryType) 2015-06-18 14:16:58 +02:00
Stein Dale
b4759ca06e Refactored cell property filter collection 
Using caf::PdmPointersField as container.
 2015-06-18 14:00:16 +02:00
Stein Dale
f55b6d2519 Removed ui update code that is not needed (#311) 2015-06-18 13:22:13 +02:00
Stein Dale
2ca5151c6c "Disable Results Lighting" field is always enabled (not read only) in a view (#311) 2015-06-18 13:20:54 +02:00
Stein Dale
8bdb957c8c Handling new field "Disable Lighting" in the view (#311) 2015-06-18 12:23:27 +02:00
Stein Dale
4b1a71fd91 Added new field "Disable Lighting" (#311) 2015-06-18 12:23:26 +02:00
Jacob Støren
8773c54f17 #322 Result field name in info box 2015-06-17 16:03:37 +02:00
Jacob Støren
b5cfa8ab53 Renaming and improved some readability around well paths 2015-06-12 09:25:09 +02:00
Jacob Støren
ceeb38d13a Added bbox calculation on the fem part for #312 
This concludes #312 for now. Wellpaths are now shown in the Geomech
views
 2015-06-11 19:13:04 +02:00
Stein Dale
b59695f352 Refactored addition of well path models 
Well path models can now be added to geo mech models. Moved code that
adds well path models to a scene from RimEclipseView to
RimView::addWellPathsToScene(). This new function is now used by both
RimEclipseView and RimGeoMechView. Made sure that it is not needed to
load a result before well paths appear. TODO: Compute characteristic hex
element size for geo mech models.
 2015-06-11 13:44:21 +02:00
Jacob Støren
30fcbebc8e Deep fix of #316 and also implements #317 
#316 Do not show wrong results ...
#317 Avoid stopping animation when switching results
This commit cleans up some of the inconsistencies etc in the top of the
display model generation logic.
 2015-06-09 16:18:11 +02:00
Jacob Støren
0d8bfb0403 Fixed #307 Nothing is shown if using only exclude range filters for Geomech models 2015-06-05 15:36:38 +02:00
Jacob Støren
ba633bd847 Moved rangeFilterCollection to RimView 2015-06-05 10:05:40 +02:00
Jacob Støren
00796b3fb4 3D view info box is up to speed. 
This completes #291 feature wise
Statistics is now pr result address and not pr. Part-result Address
 2015-06-04 16:25:27 +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
Stein Dale
43f50dac41 Displaying error messages from ODB API on file open 
Made sure that the error messages from the ODB API are picked if file
open fails, and then displayed in an error messsage box.
 2015-06-04 13:08:21 +02:00
Jacob Støren
e347249526 3DInfo : Made max and min values work 2015-06-03 15:24:28 +02:00
Stein Dale
189e5dca40 Added retrieval of mean value 
Added RigGeoMechCaseData::meanCellScalarValues(). Using this method to
retrieve the mean value for display in the info box. ToDo: Make sure
that the mean values this methods needs have been computed.
 2015-06-03 14:37:51 +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
ca6d9d364d Improved progress bar a bit, for geomech cases 2015-06-03 12:14:21 +02:00
Stein Dale
d325342940 Additional geomech case info (#291) 
Displaying time step, step name, and Z scaling factor. Prepared display
of statistics and histograms, when implemented. For now, we show zeros
and an empty histogram.
 2015-06-02 10:37:05 +02:00
Stein Dale
f88343a122 Geomech case info (#291) 
Displaying result info and the number of cells in the 3D view's info box
for geomech cases.
 2015-06-01 16:37:22 +02:00
Jacob Støren
51fd1b4de2 Geomech Range filters working 
The algorithm for the IJK assignment now works on the simple test
example.
 2015-05-29 07:53:03 +02:00
Jacob Storen
95557dcfba Yet another linux compile warning 2015-05-27 06:23:08 -07:00
Jacob Storen
f6e8bb4a1a Fixes of linux compile errors and warnings 2015-05-27 05:50:12 -07:00
Jacob Støren
f32fc130fc Prep Geom range: Neighbor calculation 
A checkpoint before starting to use the neighbor calculations
 2015-05-26 08:57:53 +02:00
Jacob Støren
b280196b7c Prep for Geomech range: Introduced VizLogic 
Refactored to use the new RivVizLogic class, together with the
partMgrCache
Works.
 2015-05-22 17:01:59 +02:00
Jacob Støren
49fafbf47f Cleaned up RimEclipseView.h 2015-05-22 13:19:42 +02:00
Jacob Støren
68caed93b4 Prep for Gromech range filters: 
* Generalized RangeFilter vs view
* Added stub implememntation of a StructGridInterface implementation for
Fem parts
 2015-05-21 15:39:44 +02:00
Jacob Støren
038c578f97 Preps for Geomech RangeFilters: Small refactorings 2015-05-21 11:46:04 +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
caa835331f Added progress bar when loading Geomech cases 
Introduces Qt dependency in OdbReader
 2015-05-20 15:22:10 +02:00
Jacob Støren
249823c970 Added a "Close" command on Geomech cases 
See issue #292
 2015-05-20 13:45:46 +02:00
Jacob Støren
10388ea3dc Rewrote Add and Delete View for GeoMech 
See issue #292
 2015-05-20 12:33:06 +02:00
Jacob Støren
6a9555a196 Add general ownercase access method 
Preparations for #292
 2015-05-20 12:29:01 +02:00
Jacob Støren
b280c2287e Case Groups: Added error message on missing maincase 
When loading a project file, there were no error messages if the grid
file could not be found.
 2015-05-20 09:40:00 +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
f544528aee GeoMechView: Added missing include 2015-05-16 09:35:15 +02:00
Jacob Støren
d38aae29b6 GeoMech results loaded before animation setup 
Now Geomech projects seems to open fine.
 2015-05-16 09:12:43 +02:00
Jacob Støren
9596f6c0a4 Added init after read for GeoMechView/Case 
And finalized moving the caseUserDescription field
All in order to get project load to work. Nearly there. Animation frame
is not restored though.
 2015-05-16 08:45:50 +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
2aae86073b GeoMechView Toggle On/Off now works 2015-05-13 22:55:07 +02:00
Jacob Støren
af2699d362 Z-Scale working for geomech views 
Alligned GeoMech and Reservoir views through RimView
 2015-05-13 22:42:11 +02:00
Jacob Støren
04c9639b0b Performance: Avoid regeneration of geometry on result change 2015-05-13 13:03:41 +02:00
Stein Dale
aaa4ff3b41 RedHat build fix: Fixed case in include filename 
"RigGeomechCaseData.h" -> "RigGeoMechCaseData.h"
 2015-05-13 11:45:09 +02:00
Jacob Støren
091fe2551e Fixed missing step information on first click 2015-05-12 14:59:51 +02:00
Jacob Støren
2e3fbaf7ce Fixed missing update of ComponentName 
When selecting a field only variable
 2015-05-12 14:47:45 +02:00
Stein Dale
da7035517f Added include - RedHat compilation fix 
Added #include <limits.h>.
 2015-05-11 09:48:55 +02:00
Stein Dale
54dac07c36 RedHat compilation fixes 
Removed a couple of auto types and started writing the types explicitly,
to be able to compile on RedHat.
 2015-05-08 15:51:17 +02:00
Jacob Støren
a05c186d34 Now result colors are correct at first selection 2015-05-08 15:16:29 +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
86b058cdbe RimView etc: Refactored and alligned 
To implement geomechView features alligned with ReservoirView
Now geomech results are shown with correct legend, and updated fairly
well.
 2015-05-08 10:38:10 +02:00
Jacob Støren
55512db6a0 Introduced RigFemResultAddress 
Breaks build, possibly. Intermediate chek-in
 2015-05-08 10:34:57 +02:00
Jacob Støren
27dcd80bfd Creating a fem-results caching system 
Needed specifically for statistics
Work in progress brakes build
 2015-05-07 10:12:37 +02:00
Jacob Støren
20a8527607 Noderesults are now read and displayed 
The legend is not updated etc, but this is a start
 2015-05-04 18:16:57 +02:00
Jacob Støren
6ff5f406d5 GeoMech result selection Gui working 2015-05-04 13:33:25 +02:00
Jacob Støren
1522fe2514 Start on getting the Metadata into the GUI 2015-04-30 17:06:01 +02:00
Jacob Støren
791a25e6e9 Preparing for result visualization 
Calculated mapping vx to node nad elmnode reults
 2015-04-30 14:28:13 +02:00
Jacob Støren
f13f05709f Update legend and 3D info on display model gen 2015-04-30 14:27:57 +02:00
Jacob Støren
3dac8807c7 Refactoring more general stuff into RimView 
updateViewerWidget
scheduleUpdateDisplayModelAndRedraw
 2015-04-30 10:34:15 +02:00
Jacob Støren
4b7d593b3c Refactored general view stuff into RimView 
Removing it from RimReservoirView and RimGeoMechView
 2015-04-29 22:19:49 +02:00
Jacob Støren
4a21bb4a30 Added RimView, and sorted the libs in folders 2015-04-29 10:50:25 +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
c0217a68a4 First odb file read and displayed 2015-04-27 14:06:42 +02:00
Jacob Støren
0f3d9ffa60 Now reading Odb-file and creating display model 
Nothing shows up yet, but we're getting there
 2015-04-27 13:51:22 +02:00
Jacob Støren
2b967d9ca1 Created FemPartCollection 
Used that instead against reader to make a "results free" interface
regarding reading the element models.
 2015-04-27 10:25:04 +02:00
Jacob Støren
b94ba6ca0b Added nodal results reading to Femreader interface 
Adjusted interface
Started to add control code to fire reader and visualization generation
 2015-04-25 08:57:34 +02:00
Jacob Støren
27c2c040fe Added the 3D view to the geomech stuff 2015-04-20 16:56:26 +02:00
Jacob Støren
27f6bd9eb5 Start of geomech support 
Possible GUI-tree layout
 2015-04-20 09:02:33 +02:00
Magne Sjaastad
cff0313519 Bugfix: Do not change mesh mode when adding a range filter 2014-10-29 08:13:37 +01:00
Magne Sjaastad
5bb0b99ace Rename 2014-10-28 10:17:02 +01:00
Magne Sjaastad
79b45e7008 Create placeholder results for main case in case group 2014-10-28 10:15:20 +01:00
Magne Sjaastad
31261a800f Removed obsolete code and added comments 2014-10-27 07:19:04 +01:00
Magne Sjaastad
3b7919a913 Fix for executing a script on result cases with no view 2014-10-27 06:53:50 +01:00
Magne Sjaastad
a8ce90e404 Always compute grid faults 2014-09-26 08:15:22 +02:00
Magne Sjaastad
2d36af4f06 Updated file header for new files 2014-09-24 07:14:52 +02:00
Magne Sjaastad
b4df5419b1 Updated file header for modified files 2014-09-23 15:04:57 +02:00
Jacob Støren
6e55ca82e2 Fixed Problem regarding negative riTrans values 
The reason was a bit sloppy detection of whether the surface normals was
pointing outwards or inwards in a cell.
The cells can be turned inside out due to depth/Z or mapaxis conditions.
 2014-09-23 12:26:08 +02:00
Magne Sjaastad
b58862ad93 Do not try to set combined transmissibility if no nnc data is present 2014-09-23 11:41:27 +02:00
Magne Sjaastad
c7888bc2d3 Fixed missing cell result color for static cell results 2014-09-23 10:43:38 +02:00
Jacob Støren
74f927e13f riTRAN/MULT :Improved handling of invalid operations 0/0 etc. 2014-09-09 15:21:09 +02:00
Jacob Støren
fff8f0c89b Changed gui name of Fault Result to Separate Fault Result 2014-09-09 13:07:40 +02:00
Jacob Støren
2f22624228 Fixed problems in auto nnc on/off 
Consolidated Gui into Fault
 2014-09-09 13:07:01 +02:00
Jacob Støren
5ff55b4934 riTRAN: Use cell center to cell face center vectors 2014-09-09 10:58:02 +02:00
Magne Sjaastad
980207f4a7 Rename : Removed s from TRANS to TRAN to be in line with Eclipse naming 2014-09-09 07:12:43 +02:00
Magne Sjaastad
7d58e22b0c Reverted clamping of computed SOIL value introduced in b7bc732b32 2014-09-08 08:50:42 +02:00
Magne Sjaastad
6a25f7e8b9 Move per cell face results at bottom of Cell Results 2014-09-08 07:53:49 +02:00
Magne Sjaastad
e2a5c449ce Impoved result info text presentation 
Display Cell result, Fault result, NNC result, and Cell edge result as a
section with a linefeed above
Always show value for intersection point at top with details below.
 2014-09-08 07:35:23 +02:00
Magne Sjaastad
2906027429 Append LGR name for NNCs connected to LGR 2014-09-04 10:37:36 +02:00
Magne Sjaastad
50f6420c15 NNC : Show item count in folder No Common Area Nncs 2014-09-04 09:55:55 +02:00
Magne Sjaastad
5963d75085 Added checkbox for hiding NNC geometry when no NNC data is available 2014-09-04 09:30:00 +02:00
Magne Sjaastad
323f8d77eb Rename 2014-09-04 09:14:01 +02:00
Magne Sjaastad
9873f3cfc6 Do not show fault result legend when fault result is disabled 2014-09-04 08:39:44 +02:00
Magne Sjaastad
7daf170f99 Fixed crash when activating riMULT 2014-09-03 07:35:23 +02:00
magnesj
68831f6e99 Fixed missing celledge visualization: abs/fabs usage error. Not detected on Windows 2014-08-31 14:37:25 +02:00
Jacob Støren
01cfed9ab7 Fixed crash after copy/paste of view and case 2014-08-28 13:37:56 +02:00
Jacob Støren
b61d582112 Completed the CDARCHY constant table 2014-08-28 11:35:32 +02:00
Jacob Støren
edd7a671d9 riMULTXYZ: Added tolerances for CellEdge and Calculations 2014-08-28 11:25:21 +02:00
Magne Sjaastad
b7bc732b32 Bugfix : Do not compute SOIL if present on disk 2014-08-28 10:35:05 +02:00
Magne Sjaastad
ffbfb8bdf0 Read units type from file and set CDARCHY value based on units type 2014-08-27 14:05:35 +02:00
Jacob Støren
d76dd6a588 Added riTRANSXYZbyArea (and X, Y, Z ) 2014-08-27 11:41:40 +02:00
Magne Sjaastad
27b25443a1 Use 1-based indices for text to be displayed to user 2014-08-27 09:29:15 +02:00
Jacob Støren
0c1588435a CellEdge: Fixed trouble with mixup of MULT and riMULT 2014-08-26 16:50:11 +02:00
Jacob Støren
03a9bf459d Added riMULTXYZ and X,Y,Z 2014-08-26 15:39:21 +02:00
Jacob Støren
1e59e050e6 Moved methods 2014-08-26 15:34:14 +02:00
Magne Sjaastad
473a701bf5 Result info : Improved display of text 2014-08-26 13:41:34 +02:00
Jacob Støren
28f5639607 riTRANSXYZ: Removed unused code 2014-08-26 13:36:38 +02:00
Jacob Støren
670ca4ced5 riTRANSXYZ: nnc calculations in place 
Making this feaure complete.
Had to add the concept of several results sets to the nnc data
 2014-08-26 12:16:22 +02:00
Magne Sjaastad
56b1f78f2f Faults : Show NNCs moved from fault result to fault collection 2014-08-26 11:55:26 +02:00
Magne Sjaastad
f69413087a Custom fault result: Reorganized custom fault result selection 
Removed combo box used to specify fault color or custom result color.
Fault colors is used if None is selected in result dialog.
 2014-08-26 11:47:14 +02:00
Magne Sjaastad
8dc2eed3c0 Moved loading of dependent datasets 2014-08-25 13:20:58 +02:00
Magne Sjaastad
4d1d2215c2 Fixed memory allocation issues when computing SOIL 2014-08-25 10:31:36 +02:00
Jacob Støren
11c01af61a riTRANSXYZ: First version working 
Not yet extensively tested, but seems ok for complete match faces
 2014-08-22 13:39:24 +02:00
Jacob Støren
57a049d39f riTRANSXYZ: Moving the calculation to ReservoirCellResultsStorage 
Create stored native riTRANX,Y,Z results instead of doing everyting in
one go.
This makes the statistics calculation work automatically instead of
beeing custoized and require a compplete calculation of its own.
 2014-08-22 13:39:23 +02:00
Jacob Støren
9e22c90a4a Renamed cellindex to gridLocalCellIndex 2014-08-22 13:39:21 +02:00
Magne Sjaastad
03df28282c Show NNCs with no common area in folder below Faults 2014-08-22 09:28:25 +02:00
Magne Sjaastad
ecfea98e20 Fault results: Show fault color if color mode is selected 2014-08-21 13:16:08 +02:00
Magne Sjaastad
f3c7c3017c Info window in 3D: Added fault property name 2014-08-21 12:16:18 +02:00
Magne Sjaastad
f29d3c2876 Result Info: Write out result values for fault in addition to grid 2014-08-21 12:06:18 +02:00
Magne Sjaastad
e4e3cca05f Moved creation of placeholder results to to RimCase 2014-08-21 08:39:19 +02:00
Jacob Støren
9e4c39627d Rename variable 2014-08-20 11:33:03 +02:00
Jacob Støren
b7693f449b Fixed missing result names when auto SOIL is off 2014-08-20 11:32:50 +02:00
Jacob Støren
83965a4f7b riTRANXYZ: Started to add it to the rest of the system 2014-08-20 09:51:55 +02:00
Magne Sjaastad
7e815a8641 Corrected combined mult result name 2014-08-19 14:57:36 +02:00
Magne Sjaastad
2fe63ece50 Use result accessors instead of StructGridScalarDataAccess 2014-08-19 14:30:12 +02:00
Magne Sjaastad
f98a909e51 Removed obsolete code and renamed functions 2014-08-19 14:02:21 +02:00
Magne Sjaastad
72daff665d Added function used to filter out per cell results by result name 2014-08-19 13:56:17 +02:00
Magne Sjaastad
eb96c5a7ed Property filer: Do not show (combined) per face results 2014-08-19 13:35:10 +02:00
Magne Sjaastad
be224149f0 Added riMULTXYZ to result selection UI 2014-08-19 13:20:12 +02:00
Magne Sjaastad
af89f3e45e Use icon update functions from pdmDocument 2014-08-19 10:57:55 +02:00
Magne Sjaastad
8e332366ac Execute initAfterRead when a reservoir view is created 
Updates visibility of application icons
 2014-08-14 11:45:13 +02:00
Magne Sjaastad
7e5c46cf59 Added support for cell edge on faults 2014-08-14 10:56:47 +02:00
Magne Sjaastad
20d70d0565 Bugfix statistics: Trigger loading of dataset before creating a result accessor 2014-08-14 10:56:43 +02:00
Magne Sjaastad
1161ff7c73 Added ternary texture and scalar mappers 2014-08-14 10:56:37 +02:00
Magne Sjaastad
1b3be87074 Moved include from header to cpp 2014-08-14 10:56:33 +02:00
Magne Sjaastad
8451ffc2fb Added include to RigResultAccessor in factory 2014-08-14 10:56:32 +02:00
Magne Sjaastad
0bef6369e1 Deleted unused code 2014-08-14 10:56:32 +02:00
Magne Sjaastad
ee939c8377 Use RigResultAccessor 2014-08-14 10:56:31 +02:00
Magne Sjaastad
24ff71d23e Prefix function to be deleted to easily spot the function in code 2014-08-14 10:56:30 +02:00
Jacob Støren
09313c6caa More Rename of globalCell to reservoirCell 2014-08-14 10:56:25 +02:00
Jacob Støren
3022a40204 Renamed globalCell to reservoirCell etc. 2014-08-14 10:56:25 +02:00
Jacob Støren
6cdd9cfdc5 Renamed globalGridCellIndex to reservoirCellIndex 2014-08-14 10:56:24 +02:00
Jacob Støren
16f762984e Renamed more stuff to gridLocalCellIndex 2014-08-14 10:56:24 +02:00
Jacob Støren
37ef1cf71c Renamed globalCellIndex to reservoirCellIndex 2014-08-14 10:56:23 +02:00
Jacob Støren
0ea794a1a8 Renamed localCellIndex to gridLocalCellIndex 2014-08-14 10:56:23 +02:00
Magne Sjaastad
d9e9a173e4 Added RigResultModifier and use this object for result modifications 2014-08-14 10:56:22 +02:00
Jacob Støren
7a3d90daa4 Removed fvector and replaced with FixedArray. 
Needs replacing with std::array when we get to c++11
 2014-08-14 10:56:21 +02:00
Jacob Støren
322823754b Replaced dataAccessObject with resultAccessor 2014-08-14 10:56:20 +02:00
Magne Sjaastad
3c52137481 Reordered UI 2014-08-14 10:56:14 +02:00
Magne Sjaastad
b5d1c63966 Renamed to RimFaultResultSlot 2014-08-14 10:56:09 +02:00
Magne Sjaastad
39dc1421c4 Fault visibility : Restructured code 2014-08-14 10:56:08 +02:00
Magne Sjaastad
0550f9df8c Improved handling of icon enabled state 2014-08-14 10:56:08 +02:00
Magne Sjaastad
e814246e22 Fault result : Renamed in tree view 2014-08-14 10:56:07 +02:00
Magne Sjaastad
79fbe65686 Fault result: Moved fault result up one level in tree view 2014-08-14 10:56:06 +02:00
Magne Sjaastad
b2f80c7ef9 Fault result : Use checkbox to enable custom fault visualization 
When checkbox is disabled, faults are visualized using current cell
visualization. When checkbox is activated, fault colors or custom fault
result is active
 2014-08-14 10:56:05 +02:00
Magne Sjaastad
8b04e2a2e8 Ternary legend : Added title 2014-08-14 10:56:05 +02:00
Magne Sjaastad
d7f569360c Fault result: Updated icon 2014-08-14 10:56:03 +02:00
Magne Sjaastad
51d4bd6023 Fault result : Moved config from FaultCollection to FaultResultSettings 2014-08-14 10:56:03 +02:00
Magne Sjaastad
cdbc5829ab Fault result : Renamed file and improved interface 2014-08-14 10:56:01 +02:00
Magne Sjaastad
6416a6d71d Fault result: Moved result mapping from collection to fault result 2014-08-14 10:56:00 +02:00
Magne Sjaastad
11967c5161 Preferences : Added support for pdm objects recursively 2014-08-14 10:55:59 +02:00
Magne Sjaastad
0d14436b97 Fault result: Added fault result legend 2014-08-14 10:55:59 +02:00
Magne Sjaastad
710b9392ec Fault result: Added custom result to fault result project model 2014-08-14 10:55:58 +02:00
Magne Sjaastad
0d6c6f2785 Improved management of multiple legend overlay items 2014-08-14 10:55:57 +02:00
Magne Sjaastad
032a263685 Performance: Control how much data to import from file 
User can control if faults, NNCs and simulation wells are to be imported
from file.
 2014-08-14 10:55:56 +02:00