Commit Graph

1634 Commits

Author SHA1 Message Date
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
Jacob Støren
b2fb9ae2c8 Fixed wrong CaseTypeId in octave GetCases. Introduced by the GeoMech Case.
(#325)
2015-07-01 07:44:50 +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
Pål Hagen
320b0c62c4 (#260) Displaying NNC info and intersection point for picked faults when there's no cell index 2015-06-30 13:25:11 +02:00
Pål Hagen
04d70a9204 (#260) Fixed problem with picking faults in some rare cases
Made sure that we handle the case when an item has been hit which is not
a non-NNC item.
2015-06-30 12:05:24 +02:00
Jacob Støren
2b1e2bb157 Fix of #321 and #284 Crash when setting data from octave into an input case 2015-06-29 17:06:55 +02:00
Pål Hagen
08741150c7 (#287) Bugfix - only selected cases are removed from the list
Made sure that only selected cases are removed from the list of cases in
the "Create Grid Case Group From Files" dialog when "Remove" is clicked.
2015-06-29 16:14:00 +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
00f8743cef Fixed an assert and wrong behavior:
When selecting a result field "heading", after selecting one of its components.
2015-06-29 12:17:30 +02:00
Jacob Støren
985afce261 #329 "Copy/Paste View" added for Geomechanics 2015-06-29 10:48:17 +02:00
Jacob Støren
55c1d5de71 Made help menu entry point directly to documentation, not the home-page 2015-06-29 10:48:10 +02:00
Pål Hagen
fb195dbd4b (#335) Showing field name and component name in progress bar
Showing field name and component name in progress bar when loading
results.
2015-06-29 10:24:44 +02:00
Pål Hagen
e5bb58b269 (#335) Showing progress bar when loading geo mech results 2015-06-26 15:43:43 +02:00
Pål Hagen
24a84184d8 Revert "Showing progress bar when loading geo mech results"
This reverts commit 798a6c2fcb.
2015-06-26 15:41:46 +02:00
Pål Hagen
798a6c2fcb Showing progress bar when loading geo mech results 2015-06-26 15:38:33 +02:00
Pål Hagen
7a3d43d29d Setting specific font size in the overlay items during regression tests
Made sure that we always use the same bitmap size for the fonts of the
overlay items when running regression tests, to avoid differences from
reference runs.
2015-06-26 13:47:33 +02:00
Pål Hagen
91adc80f90 Setting a flag in the application class while running regression tests 2015-06-26 13:44:16 +02:00
Pål Hagen
0af13d4e13 (#331) Fix for undefined nodal results when coloring the elements
The entire element is drawn with undefined color if one or more nodal
value is undefined.
2015-06-26 12:12:40 +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
fa75a46ecb Moved geo mech related source files to different folder
Moved RivGeoMechVizLogic.h/cpp RivGeoMechPartMgrCache.h/cpp to
GeoMech/GeoMechVisualization.
2015-06-26 10:00:45 +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
Pål Hagen
d43c5d4dae Adding ODB dll files to the distribution zip file on Windows 2015-06-25 11:27:11 +02:00
Jacob Støren
1cdd5262f8 Cleaned up PropertyFilter classes. 2015-06-24 15:03:55 +02:00
Jacob Støren
5b17c27b51 Fixed errors in 2b881f2cb8.
Statistics were not calculated properly for early timesteps when directly accessing a late timestep.
2015-06-24 14:13:00 +02:00
Pål Hagen
38b40423d8 Added version info label in the lower right corner 2015-06-24 13:45:39 +02:00
Jacob Støren
fddef6d32c Turned on parallell GeoMech prop. filter visibility calculation 2015-06-24 13:15:34 +02:00
Jacob Støren
4fabc509a0 Missing updates of property filtered cells
1. When Rangefilters changed
2. When the rangefilter collection was turned off
2015-06-24 12:05:07 +02:00
Jacob Støren
2b881f2cb8 Avoid repeatedly recalculation of statistics of HUGE_VAL-only results 2015-06-24 12:05:01 +02:00
Jacob Støren
7d075999af Removed obsolete ifdefs 2015-06-24 12:04: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
Jacob Storen
eb2515b8c2 Linux compile fixes 2015-06-23 04:34:25 -07: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
e740bdc618 #324, 323 -E and GammaNN derived results 2015-06-19 14:05:33 +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
Jacob Støren
09152ad363 Made internal enum private 2015-06-18 14:16:53 +02:00
Jacob Støren
919f2b61f3 Renaming and cleaning as preparations for GeoMech property filters
#314
2015-06-18 14:16:48 +02:00
Jacob Støren
2136c1b64c New DisableLightning icon 2015-06-18 14:12:44 +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
0ea699484c Changed tooltip for toolbar button (#311)
"Disable Lighting" -> "Disable Results Lighting"
2015-06-18 13:28:27 +02:00
Stein Dale
720de6c30c "Disable Lighting" toolbar button is always enabled if there's an active view (#311) 2015-06-18 13:26:50 +02:00
Stein Dale
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
3eff3708ed Added action and toolbar button for "Disable Lighting" (#311) 2015-06-18 12:23:28 +02:00
Stein Dale
04ad7ae44c Added icon for "Disable Lighting" (#311) 2015-06-18 12:23:28 +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
Stein Dale
5e93b8ca1f Added option for disabling lighting (#311) 2015-06-18 12:23:26 +02:00
Jacob Støren
5443582fec #313 Added Stress Path: Gamma 1,2,3 2015-06-17 16:03:42 +02:00
Jacob Støren
8773c54f17 #322 Result field name in info box 2015-06-17 16:03:37 +02:00
Jacob Storen
2c980e6b1b Linux compile fixes 2015-06-17 05:51:22 -07:00
Jacob Støren
422a682b27 Added the missing ST-components,
Added calculation of principal ST,
Used POR = 0 when undefined in calculation of ST
#320, #319
2015-06-17 14:22:14 +02:00
Jacob Støren
ff79f1a8ba Added calculation of S1, S2 and S3 of Geomechanical stress tensor
See #320
2015-06-17 13:07:48 +02:00
Jacob Støren
2cef1b8e3c Removed obsolete code 2015-06-16 14:48:51 +02:00
Jacob Støren
33614b30bc Added calculation of Total Stress (ST)
Seems to work ok, but the nubers are not yet verified.
2015-06-15 12:15:00 +02:00
Jacob Støren
e10bc01532 Added a "NS" field result variable
#318 Geomechanical sign on stress components
The NS name can be changed in the GUI, but we need to distinguish S from NS in the reader/calculation system
2015-06-15 10:33:28 +02:00
Jacob Støren
b99b334fc8 Removed the obsolete code from odb reader etc. 2015-06-15 09:21:26 +02:00
Jacob Støren
406379e544 Results are now loaded pr field, and not pr component
To increase speed, and to pave way for derived results.
New methods in OdbReader fixed, and is now operational.
Must delete obsolete stuff now.
2015-06-15 08:25:23 +02:00
Jacob Støren
bd67047f57 Some small refactoring. Preparing for Derived results 2015-06-15 08:10:07 +02:00
Stein Dale
c22119e6a3 Now allocating the correct amount of memory for results data
The data size was multiplied by the number of components, which is wrong
for the current interface.
2015-06-12 20:02:35 +02:00
Jacob Storen
5f1b7f2fad Temporal linux compile fix 2015-06-12 06:32:29 -07:00
Stein Dale
0899824694 WIP - added functions that return all result components in one call
Addded 3 new functions to the geo mech interface and the ODB reader.
Work in progress. Not tested yet.
2015-06-12 14:34:08 +02:00
Jacob Støren
3226254d4b Merge branch 'dev' of https://github.com/OPM/ResInsight into dev 2015-06-12 10:41:39 +02:00
Jacob Støren
d3adea34c2 Added a Tensor class skeleton 2015-06-12 10:38:57 +02:00
Stein Dale
58c2e60d48 Got rid of potential memory leak
Made sure that it is safe to call RifOdbBulkDataGetter::data() multiple
times.
2015-06-12 09:38:20 +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
a520a4322a Removed debug output from some well path code 2015-06-12 09:05:55 +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
3d0e0ace7a Linux compile fix 2015-06-11 13:15:59 +02:00
Jacob Støren
2c186a4972 Added method to calculate characteristic element size in Fem parts
Needed for well path pipe radius #312
2015-06-11 13:15:36 +02:00
Jacob Støren
385fa55cdc Fixed one linux compile error and cleaned out some compiler warnings 2015-06-11 13:05:59 +02:00
Jacob Støren
4f77afe43c Implemented #310 Result info when picking
This included some refactorization to remove the command stuff out of
RiuViewer,
and to communicate the grid index via the source info struct, and not as
a cvfPart::id
2015-06-11 11:38:51 +02:00
Jacob Støren
24fb7ac584 Hack to be able to read synthetic odb related Eclipse cases 2015-06-10 10:34:05 +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
05315bc7a9 OdbReader: Made sure metadata are available before using them
Fix of #308,
Also avoid loading any results when selecting an empty/none-existing
result (Partial fix of #316)
2015-06-09 11:23:24 +02:00
Jacob Støren
7201e3330b GeoMech result textures: Handle empty results 2015-06-09 11:09:11 +02:00
Jacob Storen
dc28fd81b9 Linux compile fixes 2015-06-05 06:47:30 -07: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
0130a01ca2 IJK-Slice context menu commands for GeoMech
#306
Added picking source data to the viz model
Generalized the picking methods in RiuViewer, but there is more serious
refactoring needed.
2015-06-05 15:17:02 +02:00
Jacob Støren
ba633bd847 Moved rangeFilterCollection to RimView 2015-06-05 10:05:40 +02:00
Jacob Støren
b74364087a Refactored IJKslot commands
Preparations to create IJK slice commands in 3Dview
2015-06-05 09:58:29 +02:00
Jacob Storen
3e06028690 Linux compile fixes 2015-06-04 07:46:33 -07:00
Jacob Støren
adb6d965de Missing non const access function 2015-06-04 16:36:48 +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
e6231c0601 Histogram: Added float data input 2015-06-04 16:25:22 +02:00
Jacob Støren
273e91d38d Moved the new resultCollection class to new files
Also removed obsolete file, and added missing header files to the
CMakeLists file
2015-06-04 16:25:16 +02:00
Jacob Støren
a3fa27d2ec Created RigFemPartResultsCollection
Refactored the results stuff from GeoMechCaseData into the new class
preparing to extend the statistics calculation
2015-06-04 16:25:11 +02:00
Jacob Støren
60c9b72671 Avoid exposing RigFemScalarResultFrames
Preparations to handle statistics across all parts better
2015-06-04 16:25:05 +02:00
Stein Dale
ac700e0c54 Added functions for element sets
The geomech interface and the ODB reader now have functions that return
element set names for a given part, and that return a vector of element
indexes for a given element set.
2015-06-04 16:16:35 +02:00
Stein Dale
e5e36f43b9 Converting ODB bulk data from double to float if needed
Added helper class RifOdbBulkDataGetter, which is now used when getting
bulk data from the ODB API. Converting from double to float if needed.
2015-06-04 14:20:16 +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
Stein Dale
bd6e6acc53 Changed interface of openFile()
The error message string pointer does now not have a default value any
more (NULL).
2015-06-04 13:05:36 +02:00
Stein Dale
fcfd2603e0 Disabled warnings from compilation of ODB API
Disabled a couple of more warnings from compilation of ODB API.
Pushing/popping pragmas before and after inclusion of ODB API headers.
2015-06-04 13:02:49 +02:00
Stein Dale
be1759835e Refactored ODB results metadata
Added private class RifOdbResultKey which is now used as a map key and
as a parameter in results related methods.
2015-06-04 11:14:12 +02:00
Jacob Støren
e347249526 3DInfo : Made max and min values work 2015-06-03 15:24:28 +02:00
Jacob Støren
db13843276 Removed obsolete code 2015-06-03 15:23:19 +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 Storen
9f87011ddd Linux compile fixes 2015-06-03 04:22:34 -07:00
Jacob Støren
da5a1d8ff1 Geom Anim: Fixed missing setting of current timestep in anim toolbar 2015-06-03 12:14:42 +02:00
Jacob Støren
6e8692121d Varible rename 2015-06-03 12:14:38 +02:00
Jacob Støren
9582c27e97 Regression test system: Added 0.4% compare fuzzyness
To reduce differences introduced by hardware differences.
[RegTest Small+Large OK]
2015-06-03 12:14:30 +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
842e3d385f Picking results metadata from the second frame
Picking results metadata from the second frame of the first step.
2015-06-03 12:02:34 +02:00
Stein Dale
9eebcb1899 Optimized building of results metadata
Reading results metadata from the first frame of the first step only,
assuming that the results metadata are the same for all steps/frames.
2015-06-03 11:37:13 +02:00
Stein Dale
fd571091b4 Changed return value of RifOdbReader::stepFrame()
Made sure that RifOdbReader::stepFrame() returns a const reference to
the given frame.
2015-06-03 11:15:05 +02:00
Stein Dale
4e61f0774b Removed unused function
Removed static function which has now been replaced by
RifOdbReader::resultsMetaData().
2015-06-03 10:58:29 +02:00
Stein Dale
82afb3bd04 ODB API usage optimizations
Using const references to avoid unnecessary copying of memory. Also
releasing each frame when not needed any more when building results
metadata.
2015-06-03 10:51:00 +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