Commit Graph

130 Commits

Author SHA1 Message Date
Magne Sjaastad
ccd4cb24c9 #1068 Avoid include of RigMainGrid.h in RigCaseData.h 2017-01-10 09:20:03 +01:00
Magne Sjaastad
0fd3bc8865 #1068 Access mainGrid directly from RimEclipseView 2017-01-09 10:51:06 +01:00
Jacob Støren
ebddaa31e6 #1054 Added sensible information to the Result Info window when picking Flow Diag results.
Also rolled out the use of resultVariableUiName() to places that should use it.
2017-01-04 13:13:06 +01:00
Jacob Støren
5f6468898b #1052 3D info box: Added Flow Diag results statistics etc. 2017-01-03 13:15:27 +01:00
Jacob Støren
7222d50645 #1035 Top level systems now access the Flow Diag data. There are none yet, so rendered gray. 2016-12-16 14:53:56 +01:00
Magne Sjaastad
649c11efcb #924 Cleaned up includes and use RimGeoMechResultDefinition instead of RimGeoMechCellColors 2016-10-18 07:31:02 +02:00
Magne Sjaastad
24abb27674 #748 Added cell property sum to Info box statistics 2016-08-04 14:15:59 +02:00
Jacob Støren
7b9f2b41ed CppCheck fixes, Errors Warnings and performance 2015-11-27 16:37:26 +01:00
Magne Sjaastad
9429458d32 Rename from cells to globalCellArray 2015-11-24 14:21:02 +01:00
Jacob Støren
8283f6665b (#625) Guard against All Timesteps Visible cells statistics when using dyn prop filter 2015-11-12 11:53:22 +01:00
Jacob Støren
a57b27b6c0 (#643) (#642) Overhauled the 3D info panel. New option. Better layout. 2015-11-11 17:44:00 +01:00
Jacob Støren
adc777083d (#642) Date in animation progress.
Not removed from Info text yet
2015-11-11 16:22:44 +01:00
Jacob Støren
4f05c0d6b9 (#606) (#607) Added eclipse stats for visible cells 2015-11-06 13:24:48 +01:00
Jacob Støren
0bd4f4a8f9 (#606) (#607) Calculate visible cells statistics for geomech
Refactored some in 3D info regarding geomech cases.
2015-11-06 13:24:43 +01:00
Jacob Støren
a4d7e369eb (#606)(#607) Added option to show 3D-info statistics pr. time step. 2015-11-04 15:44:09 +01:00
Jacob Støren
738af9c88e (#606)(#607) Added gui for the statistics control. Started refactoring
Refactoring to access pr timestep data from the statistics calculation.
2015-11-04 12:51:55 +01:00
Magne Sjaastad
4730e10319 Created navigationPolicyUpdate to be used from navigation policies 2015-09-01 18:04:35 +02:00
Magne Sjaastad
444500f6cc (#395) Make sure the update() virtual function is called from camera related functions 2015-09-01 11:31:31 +02:00
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
90762d0f0f Use uiCapability/xmlCapability instead of capability<caf::PdmUiFieldHandle>()(capability<caf::PdmXmlFieldHandle>() 2015-08-05 13:27:36 +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
7917a89c65 Renamed source files according to new class names 2015-06-26 10:00:45 +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
2f34b03135 Renamed source files according to new class names 2015-06-26 10:00:41 +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
8773c54f17 #322 Result field name in info box 2015-06-17 16:03:37 +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
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
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
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
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
b111a26f21 Renamed Files: RimCase to RimEclipseCase 2015-05-15 09:16:33 +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
27f6bd9eb5 Start of geomech support
Possible GUI-tree layout
2015-04-20 09:02:33 +02:00
Magne Sjaastad
b4df5419b1 Updated file header for modified files 2014-09-23 15:04:57 +02:00
Magne Sjaastad
323f8d77eb Rename 2014-09-04 09:14:01 +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
f3c7c3017c Info window in 3D: Added fault property name 2014-08-21 12:16:18 +02:00
Jacob Støren
3022a40204 Renamed globalCell to reservoirCell etc. 2014-08-14 10:56:25 +02:00
Magne Sjaastad
b5d1c63966 Renamed to RimFaultResultSlot 2014-08-14 10:56:09 +02:00
Magne Sjaastad
0550f9df8c Improved handling of icon enabled state 2014-08-14 10:56:08 +02:00
Magne Sjaastad
51d4bd6023 Fault result : Moved config from FaultCollection to FaultResultSettings 2014-08-14 10:56:03 +02:00
Magne Sjaastad
f259f21b32 Renamed file to match class name for RimReservoirCellResultStorage 2014-08-14 10:55:51 +02:00
Magne Sjaastad
d21e532c61 Cleaned up includes for ProjectDataModel 2014-08-14 10:55:49 +02:00
Jacob Støren
8f798cd78b Info Box: Shortened Fault result text 2014-07-01 14:28:49 +02:00
Magne Sjaastad
b7377e1873 Adde linebreak if no statistics are present 2014-04-22 11:22:19 +02:00
Magne Sjaastad
79b523522d Show ternary info in result info by picking on cells 2014-04-22 11:22:15 +02:00
Magne Sjaastad
658a513c7f Fault: Show both fault faces in in grid mode to make geometry watertight 2014-01-08 10:47:41 +01:00
Magne Sjaastad
645f824ed0 Info window: Show all result properties mapped on faults 2014-01-07 11:08:38 +01:00
Magne Sjaastad
4391a4ff65 Show fault result mapping in 3D info. Fixed display model update. 2014-01-06 14:02:08 +01:00
Jacob Støren
ea855ceed2 User Doc: Finalized Wells and thereby Views 2013-10-23 18:14:08 +02:00
Jacob Støren
cf664210bf Major cleanup/change in the way things are included.
Needs a Linux compile check.
p4#: 21545
2013-05-06 10:55:00 +02:00
Magne Sjaastad
3ef803af01 Check for NULL before using pointer
p4#: 21465
2013-04-29 08:32:59 +02:00
Magne Sjaastad
0b2e19926d Added updateUiIconFromState() in cafPdmUiItem to create disabled icons based on object state
Use updateUiIconFromState() from collection objects
p4#: 21459
2013-04-26 14:47:34 +02:00
Jacob Støren
99ad86b984 Added Z-Scale to the 3D overlay info text
p4#: 21303
2013-04-16 09:03:40 +02:00
Magne Sjaastad
48d2a6c598 Use model index at drop position when asking user for confirm of drop event causing statistics to be deleted
p4#: 21242
2013-04-11 12:06:38 +02:00
Jacob Støren
e10bd73658 Renamed the final filenames for this time:
RICursors		RiuCursors
RIMainWindow	RiuMainWindow
RIPreferencesDialog	RiuPreferencesDialog
RIProcessMonitor	RiuProcessMonitor
RIResultInfoPanel	RiuResultInfoPanel
RIViewer		RiuViewer
p4#: 21072
2013-03-22 17:30:50 +01:00
Jacob Støren
f0174a02fa More file renaming:
RigEclipseCase		RigCaseData
RigReservoirCellResults	RigCaseCellResultsData
RigWellResults		RigSingleWellResultsData
RigGridCollection	RigGridManager
p4#: 21070
2013-03-22 16:58:44 +01:00
Jacob Støren
6a2cbbcf07 Renamed files:
RimReservoir		RimCase
RimResultReservoir	RimResultCase
RimInputReservoir	RimInputCase
p4#: 21069
2013-03-22 16:40:41 +01:00
Jacob Støren
27647248ea Rename of files:
RIBaseDefs	RiaBaseDefs
RIVersionInfo	RiaVersionInfo
RIMain	RiaMain
RIStdInclude	RiaStdInclude
p4#: 21067
2013-03-22 16:12:00 +01:00
Magne Sjaastad
d85b0d4619 More checking on null pointers
p4#: 21052
2013-03-22 11:46:54 +01:00
Magne Sjaastad
21065176f2 Rename of functions in RigActiveCellInfo
p4#: 21045
2013-03-22 09:32:42 +01:00
Jacob Støren
f7248f3999 Results Storage: A huge refactorisation to make way for storing generated properties to an internal file.
This does not yet compile due to a unfortunate mix of perforce, cmake setup and unit_test project shortcomings.
Need to move RigStatistics into ProjectDataModel and rename it before this is running again.
p4#: 20945
2013-03-18 14:34:29 +01:00
Jacob Støren
ec889920d5 Removed out-commented code from the ActiveCellInfo refactoring
p4#: 20886
2013-03-13 13:41:35 +01:00
Jacob Støren
8a604aca24 Refactored RigActiveCellinfo to only have one set of information.
Fracture and Matrix separated information thus needs two such obejcts.
There still needs to remove some out-commented code
p4#: 20877
2013-03-13 11:50:31 +01:00
Magne Sjaastad
a09dba2670 File rename from RigReservoir to RigEclipseCase
p4#: 20503
2013-02-13 13:33:35 +01:00
Magne Sjaastad
6101209d40 Moved functionality from main grid to active cell info
p4#: 20457
2013-02-12 11:50:23 +01:00
Magne Sjaastad
ce95f13c10 Added reading of fracture model active index
Lots of renaming
p4#: 20302
2013-01-30 14:13:50 +01:00
Magne Sjaastad
4275e67a82 Compute active and fracture cell count for all grids
Renamed numActiveCells on maingrid to globalMatrixActiveCellCount
p4#: 20295
2013-01-30 10:39:45 +01:00
Jacob Støren
a1feaa1acf Put the statistical parameters into a table in the 3D info text
p4#: 19269
2012-10-23 12:40:55 +02:00
Jacob Støren
a8b4d35b4f ResInsight: Added mean value to 3D info text
p4#: 19268
2012-10-23 12:08:46 +02:00
Magne Sjaastad
03fc06e6a4 Changed keyword name as an Xml attribute is not allowed to start with a digit 2012-09-13 15:17:59 +02:00
CeetronResInsight
ad95533d2f Change 18604 on 2012/09/11 by magne@magne_at_MAGNE
Added check for NULL pointer
2012-09-11 10:16:39 +02:00
CeetronResInsight
b3c142cc9a Change 18603 on 2012/09/11 by fredrik@fredrik_MBP-BootCamp
Added glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT); to get proper orientation of textures on point sprites
2012-09-11 09:22:36 +02:00