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,213 Commits 27 Branches 61 Tags 309 MiB
eadf1ca300
Commit Graph

742 Commits

Author SHA1 Message Date
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