OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-11 07:56:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,056 Commits 29 Branches 61 Tags 290 MiB
c4f5065032
Commit Graph

4403 Commits

Author SHA1 Message Date
Jacob Støren
6ac8c4365f Project tree: Fixed several issues after the reconfiguration 
Missing Icon and text on the Grid Models folder
New cases and Grid Case Groups ended up outside the Grid Model Folder
Old Project files did not show up properly
p4#: 21854
 2013-06-07 14:54:02 +02:00
Vidar Lundberg
cd08fc0356 Add temporary icon for Grid Models in PDM, should create proper icon later. 
p4#: 21850
 2013-06-07 09:32:06 +02:00
Vidar Lundberg
c3cd40d7eb Minor changes, changed logging to standard output when switching frame, e.g. fixed so that current frame number is shown correctly. 
p4#: 21848
 2013-06-06 16:37:35 +02:00
Vidar Lundberg
ceb5dd8470 Minor changes, adjusted so that well paths become thinner and clip well paths only 100 meters above reservoir. 
p4#: 21847
 2013-06-06 16:36:37 +02:00
Vidar Lundberg
6340c4a4a8 Established new PDM structure with RimProject owning RimOilFields owning RimAnalysisModels. 
Moved wellPathCollection into new class RimOilFields.
Moved cases (previously called reservoirs) and caseGroups from RimProject into new class RimAnalysisGroups.
Added support for old project files, move cases and caseGroups from RimProject to RimAnalysisModels. (Do not handle WellPaths for old project files in a similar way, since almost no users have used this functionality yet.)
p4#: 21846
 2013-06-06 15:07:31 +02:00
Vidar Lundberg
691f24e7a7 Added include files because of known include problems related to PDM. 
p4#: 21845
 2013-06-06 15:02:35 +02:00
Magne Sjaastad
0021e2f861 Improved logarithmic color legends for zero and negative values 
p4#: 21804
 2013-06-03 13:08:11 +02:00
Jacob Støren
1d3d13c927 Icons: New App icon based on picture sent from Statoil 
Scaled vertically a bit to work better as an icon.
Still using the old AppIcon as Case Icon, and updated the InputCase icon to match the Case Icon.
p4#: 21793
 2013-06-01 01:29:05 +02:00
Magne Sjaastad
ea4491e987 Added framework used to handle utm area of interest 
p4#: 21775
 2013-05-31 13:57:16 +02:00
Magne Sjaastad
fa161607a1 Added context menu used to execute a script for multiple cases 
For all selected cases, set current case and launch an external Octave process using this current case
p4#: 21742
 2013-05-27 15:38:03 +02:00
Vidar Lundberg
163ce74052 Added visualization of Well Paths in reservoir views. 
Added PDM objects for a list of well paths (RimWellPathCollection) and for individual well paths (RimWellPath).
RimWellPathCollection uses RivWellPathCollectionPartMgr to generate visualization parts for each well path in the collection.
RimWellPath handles geometry defined in RigWellPath, and RivWellPathPartMgr is used to generate visualization parts. The well path visualization parts are generated by reusing RivPipeGeometryGenerator (also used for well pipes).
Added features:
- Select Open Well Paths in File menu to open one or more well path files, file format supported is Statoil JSON format.
- Each well path has a label showing the name, and the PDM window will show additional info (Id, Source System, UTM Zone, Update Date and User, Survey Type, File Path).
- Possible to turn on / off visibility, set thickness, set color for individual well paths.
- List of well paths including specified parameters/settings will be stored in project file.
- Possible to clip all well paths at a specified distance to the reservoir as this is the relevant area to see, and if showing whole well path it may be problematic for auto zoom etc.
Known problems:
- Well paths are not shown in some types of reservoir views, for instance reservoir views showing well pipes. Will look into this later.
p4#: 21658
 2013-05-16 14:10:22 +02:00
Vidar Lundberg
704facc1c1 Added some includes to get well path changes to compile, this is related to PDM include problems. 
p4#: 21657
 2013-05-16 14:02:59 +02:00
Vidar Lundberg
939c6ad156 Added visualization of Well Paths in reservoir views. 
Added PDM objects for a list of well paths (RimWellPathCollection) and for individual well paths (RimWellPath).
RimWellPathCollection uses RivWellPathCollectionPartMgr to generate visualization parts for each well path in the collection.
RimWellPath handles geometry defined in RigWellPath, and RivWellPathPartMgr is used to generate visualization parts. The well path visualization parts are generated by reusing RivPipeGeometryGenerator (also used for well pipes).
Added features:
- Select Open Well Paths in File menu to open one or more well path files, file format supported is Statoil JSON format.
- Each well path has a label showing the name, and the PDM window will show additional info (Id, Source System, UTM Zone, Update Date and User, Survey Type, File Path).
- Possible to turn on / off visibility, set thickness, set color for individual well paths.
- List of well paths including specified parameters/settings will be stored in project file.
- Possible to clip all well paths at a specified distance to the reservoir as this is the relevant area to see, and if showing whole well path it may be problematic for auto zoom etc.
p4#: 21651
 2013-05-16 12:59:35 +02:00
Magne Sjaastad
97c3a330f6 Updated riGetSelectedCases to use a string as type name 
Improved how to get currently selected cases
p4#: 21625
 2013-05-15 12:03:36 +02:00
Magne Sjaastad
b3a15268f6 Added riGetCases 
p4#: 21618
 2013-05-15 10:51:41 +02:00
Jacob Støren
cad25bcd59 Caf:PdmUiTree: Rewrote rebuildUiSubTree to become updateUiSubTree 
Now the UI state is preserved when refreshing the tree, making it suitable
to use this method more extensively. This paves the way to make changes to the Pdm data structure without considering the ui at all, until a  call to updateUiSubTree gets the ui gracefully into sync.
p4#: 21599
 2013-05-13 12:00:52 +02:00
Magne Sjaastad
06d32ae97e Added groupId to case groups 
p4#: 21594
 2013-05-10 15:35:33 +02:00
CeetronResInsight
cb1c276e01 Fixed missing include (only needed for RHEL6) 
p4#: 21591
 2013-05-10 11:10:41 +02:00
Magne Sjaastad
eecd069b0a Introduced caseId to RimCase. Project keeps track of largest used ID, and is responsible for assigning ID to cases. 
p4#: 21576
 2013-05-08 10:41:56 +02:00
Jacob Støren
5c0e55e7c1 Linux compile fixes 
p4#: 21550
 2013-05-06 12:02:32 +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
Jacob Støren
e83fe8a471 CellEdge : Added options to turn off specific directions 
p4#: 21510
 2013-04-30 15:55:12 +02:00
Jacob Støren
1db5d3f03d Set default WellPipe visibility mode to "Visible Cells Filtered" 
p4#: 21505
 2013-04-30 14:55:59 +02:00
Jacob Støren
be0a2ec728 Legend: Added tick number formatting control 
Auto, Fixed and Scientific. Fixed and Scientific respects the precision set.
p4#: 21504
 2013-04-30 14:48:53 +02:00
Jacob Støren
60f86cfc3f Result Selection: Result is not changed before user actively selects in the list. 
Changig type or porosity model only changes what variables are shown as accessible.
This is also applied to property filters.
Dual porosity support is also added to property filtered. Forgotten before.
p4#: 21499
 2013-04-30 13:41:53 +02:00
Magne Sjaastad
445b6edfbd Fixed bug for missing result value during picking for static results 
p4#: 21498
 2013-04-30 13:34:49 +02:00
Magne Sjaastad
6ef5205343 Added interpolation of observed values to statistics computation 
p4#: 21492
 2013-04-30 11:36:50 +02:00
Magne Sjaastad
fad4761bc4 Update well information when creating a 3D window on a case 
p4#: 21468
 2013-04-29 11:08:31 +02:00
Magne Sjaastad
9367a3cb65 Context menu and selection toggle actions 
Add toggle menu when all selected items are checkable
p4#: 21466
 2013-04-29 08:52:43 +02:00
Magne Sjaastad
3ef803af01 Check for NULL before using pointer 
p4#: 21465
 2013-04-29 08:32:59 +02:00
Magne Sjaastad
ab8dfb4aad In RimProject, encode/decode into a string the currentIndex from QTreeView. 
This will also make sure the active view is restored when opening a project
p4#: 21463
 2013-04-26 19:05:35 +02:00
Jacob Støren
3806ff9baf Well cell transparency: Turned off well cell transparency when no well pipe is visible. 
For results visulaization, cell edge and faults faces.
Not yet done for visualization without result colors.
p4#: 21462
 2013-04-26 16:46:38 +02:00
Magne Sjaastad
2e2212d7ea Add and delete of script directory from context menu 
p4#: 21461
 2013-04-26 16:17:36 +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
Magne Sjaastad
4b8e30e649 Added flip X/Y-axis on RimCase, will invert the sign of coordinates for the given flip axis. 
p4#: 21453
 2013-04-26 13:19:34 +02:00
Magne Sjaastad
8ccd89d3d1 Added scale to toolbar 
p4#: 21452
 2013-04-26 11:49:37 +02:00
Jacob Støren
b14b138dae Range Filter: Added option to not propagate rangefilter onto the subgrids 
p4#: 21445
 2013-04-26 08:53:40 +02:00
Magne Sjaastad
a5b3c233d2 Update icon state for well collection when toggled off 
p4#: 21430
 2013-04-25 11:09:34 +02:00
Magne Sjaastad
47eb6c7589 Added toggle state to property filter collection 
p4#: 21429
 2013-04-25 10:57:52 +02:00
Magne Sjaastad
7b2ec05383 Added toggle option for range filter collection 
p4#: 21428
 2013-04-25 10:48:44 +02:00
Magne Sjaastad
f730707448 Update animation toolbar when changing well data source case 
p4#: 21424
 2013-04-25 09:54:41 +02:00
Magne Sjaastad
8fc9d06edb Toggle on off visibility of wells in well collection 
p4#: 21419
 2013-04-25 09:07:29 +02:00
Magne Sjaastad
c0bfc9bbe1 Call display update once after setting toggle state for a selection of wells 
p4#: 21417
 2013-04-25 08:47:01 +02:00
Magne Sjaastad
884dd46551 Moved well label into well head group 
p4#: 21415
 2013-04-25 06:33:37 +02:00
Jacob Støren
10e6fbc5bd Range filter: Add grid type drop-down list to enable LGR-grid range filtering 
TP#3995
p4#: 21408
 2013-04-24 12:00:45 +02:00
Magne Sjaastad
4ad0a05822 Improved ordering and grouping of parameters for wells and well collection 
p4#: 21404
 2013-04-24 10:38:50 +02:00
Magne Sjaastad
586908b9be Refresh animation toolbar using createDisplayModelAndRedraw() 
p4#: 21394
 2013-04-24 07:57:31 +02:00
Magne Sjaastad
b3c30c1b21 Added support for setting multiple script directories 
p4#: 21393
 2013-04-24 07:35:31 +02:00
Magne Sjaastad
fc405f0fb8 Implemented copy of view using context menu and keyboard shortcuts 
p4#: 21377
 2013-04-23 11:24:54 +02:00
Magne Sjaastad
de5542976c Avoid to rebuild the complete project tree view when importing a grid case group 
Set cell results as current item in tree view when importing a case
p4#: 21368
 2013-04-23 08:11:52 +02:00
Magne Sjaastad
290f8d4e58 Removed obsolete code 
p4#: 21363
 2013-04-22 14:44:43 +02:00
Magne Sjaastad
b20be8ad25 Check if directory is readable before creating a script collection item 
p4#: 21362
 2013-04-22 14:37:33 +02:00
Magne Sjaastad
d825b0654c Check for valid pointer before accessing cell result data 
p4#: 21359
 2013-04-22 13:25:32 +02:00
Magne Sjaastad
8c28e8ff6c Create UI tree items and insert in parent when opening new cases from file. Avoid building the complete tree using onProjectOpenedOrClosed() 
p4#: 21357
 2013-04-22 11:54:41 +02:00
Jacob Støren
d034717460 Removed unused code 
p4#: 21354
 2013-04-22 10:11:37 +02:00
Magne Sjaastad
79e7d3604c Expand up to root when creating a view. Removed use of expandAll() 
p4#: 21353
 2013-04-22 10:04:37 +02:00
Magne Sjaastad
a9e0554635 Use semicolon as string list separator. Fixed bug in tree view state parameter passing. 
p4#: 21350
 2013-04-22 09:20:57 +02:00
Jacob Støren
6cac031fff Added well pipe visibility filter based on cell visibility. 
Only show pipes with wells with open connections in visible cells
p4#: 21349
 2013-04-22 09:13:37 +02:00
Magne Sjaastad
638e82d24c Store tree view state in project file 
p4#: 21342
 2013-04-19 13:20:46 +02:00
Magne Sjaastad
b5b9a736e2 As creation of a font is time consuming, create one application font instance 
p4#: 21338
 2013-04-19 08:02:36 +02:00
Magne Sjaastad
fc84fce67f Hide active field from property view as this is now handled by checkbox in tree view 
p4#: 21337
 2013-04-19 07:50:49 +02:00
Magne Sjaastad
acbe59d9c1 Use showWindow as objectToggleField for reservoir views 
p4#: 21336
 2013-04-19 07:43:37 +02:00
Jacob Støren
cd24e77557 Drawstyle and Faults control Toolbuttons 
p4#: 21335
 2013-04-18 15:10:57 +02:00
Magne Sjaastad
759a17337b Show checkbox in treeview for range and property filters 
p4#: 21332
 2013-04-18 08:29:41 +02:00
Magne Sjaastad
78dac434d9 Rename 
p4#: 21331
 2013-04-18 07:41:00 +02:00
Magne Sjaastad
f9985af7e9 Added source groups in CMake to improve file organization in generated projects 
p4#: 21330
 2013-04-18 07:33:45 +02:00
Magne Sjaastad
5a79a41da8 Toggle on/off multiple selection using keyboard (space, enter, return) 
p4#: 21327
 2013-04-17 11:06:47 +02:00
Magne Sjaastad
ec2754ce30 Added checkbox for wells in treeview 
p4#: 21325
 2013-04-17 08:25:32 +02:00
Magne Sjaastad
9f07daefad Moved MimeData into RimMimeData 
p4#: 21317
 2013-04-16 11:19:37 +02:00
Jacob Støren
427bf5a2dd Linux compile warning fix 
p4#: 21316
 2013-04-16 10:46:29 +02:00
Magne Sjaastad
da82770e5f Moved file list from ApplicationCode to ProjectDataModel 
p4#: 21315
 2013-04-16 10:27:36 +02:00
Magne Sjaastad
8750bfde81 Whitespace 
p4#: 21309
 2013-04-16 09:53:31 +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
Jacob Støren
d89ea1e385 Legend default number precision set to 2 
p4#: 21301
 2013-04-16 08:50:31 +02:00
Jacob Støren
d65ce7957b Added viewer background color to preferences 
p4#: 21284
 2013-04-15 13:13:41 +02:00
Magne Sjaastad
e0654c9891 Added progress info when reading well data for statistics case 
p4#: 21274
 2013-04-12 15:53:37 +02:00
Magne Sjaastad
9b0378f8e0 Added support for selected well data in a statistics case 
Now possible to show well data from selected source case for a statistics case
Added state to RimResultCase to monitor data actually read from disk
p4#: 21258
 2013-04-12 12:03:04 +02:00
Magne Sjaastad
aea13e1810 Whitespace 
p4#: 21256
 2013-04-12 11:12:53 +02:00
Jacob Støren
432106c9c5 External file references: Fixed the relocation in the advanced cases 
p4#: 21253
 2013-04-12 09:43:40 +02:00
Jacob Støren
462bc16ace Rewrite of the searchpath system for external file references 
The Relocation code is not yet completely working for the advanced cases
p4#: 21251
 2013-04-12 08:31:59 +02:00
Magne Sjaastad
464565f1bf List all grid case groups where statistics data will be deleted based on a drop action 
p4#: 21247
 2013-04-11 14:14:52 +02:00
Magne Sjaastad
67535b648c Add default name/number to new grid cases 
p4#: 21246
 2013-04-11 14:08:06 +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
Magne Sjaastad
db1dd5dd0d Do not create statistics case in constructor 
p4#: 21237
 2013-04-11 11:18:40 +02:00
Magne Sjaastad
94a4d83885 Made adding of grid group more robust 
p4#: 21236
 2013-04-11 11:03:52 +02:00
Magne Sjaastad
e70615d02a Check for valid pointer 
p4#: 21235
 2013-04-11 10:42:35 +02:00
Magne Sjaastad
dbc9869f61 Fix missing display of wells in tree view 
p4#: 21234
 2013-04-11 10:35:33 +02:00
Magne Sjaastad
04a987d99b Show context menu when selection is empty 
p4#: 21233
 2013-04-11 10:11:57 +02:00
Magne Sjaastad
807c6de823 Moved adding of one statistics case to contstructor to make sure the statistics case UI is displayed when creating a new grid case group 
p4#: 21232
 2013-04-11 08:45:56 +02:00
Magne Sjaastad
665c2ace8b Handle when it is not possible to read cases from disk in a grid group 
p4#: 21230
 2013-04-10 15:33:34 +02:00
Magne Sjaastad
687bc8aecf Return true when a dynamic result has only one time step 
p4#: 21226
 2013-04-10 14:55:50 +02:00
Magne Sjaastad
33729d5ed4 Removed invalid assert 
p4#: 21222
 2013-04-10 13:22:43 +02:00
Magne Sjaastad
927fa6c5e7 Fixed issue related to computation of SOIL. Mark metadata for derived SOIL with mustBeCalculated. 
p4#: 21220
 2013-04-10 11:37:34 +02:00
Jacob Støren
d0eebb92a8 Removed PERMY as default statistics property 
p4#: 21204
 2013-04-09 14:36:38 +02:00
Magne Sjaastad
812aee9be4 Text changes 
p4#: 21187
 2013-04-09 07:52:34 +02:00
Jacob Støren
12294ca853 Statistics Ui: Added default selected properties 
p4#: 21185
 2013-04-08 17:02:07 +02:00
Magne Sjaastad
bd563df02e Use setter instead of overloaded constructor 
p4#: 21177
 2013-04-08 14:29:43 +02:00
Jacob Støren
fd67c9dc18 Statistics ui: Replaced status and unlock button with a Calculate/Edit button. 
Made Summary description complete and more compact
p4#: 21176
 2013-04-08 14:17:39 +02:00
Jacob Støren
1c65fe7e2c Statistics case User interface and behaviour working. 
p4#: 21171
 2013-04-08 12:16:38 +02:00
Magne Sjaastad
64899f62c2 Detect when project path has changed, and do a explicit update of file path for RimCases. 
Do not use initAfterRead
p4#: 21165
 2013-04-08 12:01:40 +02:00
Magne Sjaastad
775b9e5bee Update file paths if project file is moved on disk 
p4#: 21162
 2013-04-08 09:57:40 +02:00
Magne Sjaastad
4ae9182fc6 Extract path from document file name in RimProject 
p4#: 21160
 2013-04-08 08:44:33 +02:00
Magne Sjaastad
b9ed45af2c If project is moved on disk, execute initAfterRead() to propagate project file name changes to underlying objects 
p4#: 21159
 2013-04-08 08:36:34 +02:00
Magne Sjaastad
e89b88e47e Added NULL pointer guarding 
p4#: 21157
 2013-04-08 08:23:06 +02:00
Magne Sjaastad
95d1c98bee Read grid dimensions and verify equality before adding a result case 
Harmonized and refactored creation of RimResultCases
p4#: 21156
 2013-04-07 17:27:45 +02:00
Magne Sjaastad
da8480a91b Added constructor with three parameters 
Added reading of grid dimensions
p4#: 21155
 2013-04-07 17:20:58 +02:00
Magne Sjaastad
c7d83893e0 Fixed bug causing function to always return true 
p4#: 21149
 2013-04-05 14:46:35 +02:00
Magne Sjaastad
ae812a2bbf Implemented check for any results of statistics cases 
p4#: 21148
 2013-04-05 14:39:34 +02:00
Magne Sjaastad
593a53a5a6 Added delete of a case not part of a case group 
p4#: 21144
 2013-04-05 14:18:34 +02:00
Jacob Støren
d07783ebaa Start of calculation status/unlocking of Statistics results 
p4#: 21143
 2013-04-05 13:29:47 +02:00
Magne Sjaastad
700f18391b Added GUI for asking user to confirm change for grid case group 
p4#: 21142
 2013-04-05 13:22:36 +02:00
Jacob Støren
0fed66deb2 Moved the statistical calculation algorithm code into a separate file. 
Added unit test to these calculations, and fixed a calculation error.
p4#: 21140
 2013-04-05 10:49:39 +02:00
Jacob Støren
75f089d0d4 Statistics UI is now functional, together with two percentile evaluation methods 
Refurbished the calculation algorithm code somewhat
p4#: 21134
 2013-04-04 16:53:34 +02:00
Jacob Støren
ef6ee4a26c Statistics case now has a prototype datamodel and Ui. 
The data is not yet used to control the calculations.
p4#: 21116
 2013-04-03 16:13:49 +02:00
Jacob Støren
51c4b6a38d Start of the ui working for setting up statistics calculations 
p4#: 21100
 2013-04-02 16:59:55 +02:00
Jacob Støren
c16db0640b First start of statistics control data model 
p4#: 21097
 2013-04-02 15:20:55 +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
c8da0f4179 Aligning prefix of class names with standard: 
RICursors		RiuCursors
RIMainWindow	RiuMainWindow
RIPreferencesDialog	RiuPreferencesDialog
RIProcessMonitor	RiuProcessMonitor
RIResultInfoPanel	RiuResultInfoPanel
RIViewer		RiuViewer
p4#: 21071
 2013-03-22 17:17:56 +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
b903c7f8c2 Renamed files: 
RIApplication	RiaApplication
RIPreferences	RiaPreferences
p4#: 21068
 2013-03-22 16:24:42 +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
Jacob Støren
949084784e More class renaming. File names not done yet. 
RIApplication	RiaApplication
RIPreferences	RiaPreferences
p4#: 21065
 2013-03-22 15:50:44 +01:00
Jacob Støren
e493db37d0 Major renaming of classes. Filenames not done yet. 
RimReservoir		RimCase
RimResultReservoir	RimResultCase
RimInputReservoir	RimInputCase
RigEclipseCase		RigCaseData
RigReservoirCellResults	RigCaseCellResultsData
RigWellResults		RigSingleWellResultsData
RigGridCollection	RigGridManager
p4#: 21064
 2013-03-22 15:43:42 +01:00
Jacob Støren
6d24c6b541 Renamed files corresponding to the already renamed statistics related classes 
p4#: 21060
 2013-03-22 14:24:41 +01:00
Jacob Støren
0d2ad04c3e Moved "internal" class to cpp file 
p4#: 21057
 2013-03-22 13:35:43 +01:00
Magne Sjaastad
d1cc482355 Use same collection type for source cases and statistics cases in RimIdenticalGridCaseGroup 
p4#: 21053
 2013-03-22 11:47:46 +01:00
Magne Sjaastad
d85b0d4619 More checking on null pointers 
p4#: 21052
 2013-03-22 11:46:54 +01:00
Magne Sjaastad
6c8d5ff631 Rename of statistics related classes and method names 
p4#: 21047
 2013-03-22 10:03:51 +01:00
Magne Sjaastad
21065176f2 Rename of functions in RigActiveCellInfo 
p4#: 21045
 2013-03-22 09:32:42 +01:00
Magne Sjaastad
0bb4d5ddc3 Set selected results to None and rebuild display geometry 
p4#: 21043
 2013-03-22 09:16:50 +01:00
Jacob Støren
326cd79754 Result Storage: Finally things have come together, and seems to behave. 
Refactored the loadProject system to make loading of statistical cases work as they should.
Got the update of references regarding grid and unionActive cells work
Introduced a bool to keep track of what cell results to store.
Introduced a clear method in ActiveCellInfo.
Renamed a bit
p4#: 21036
 2013-03-21 15:31:47 +01:00
Magne Sjaastad
d0d96ba145 Fixed layout 
p4#: 21031
 2013-03-21 14:03:37 +01:00
Magne Sjaastad
7548e9c1bb Do not add same case more than once in a grid case group 
p4#: 21030
 2013-03-21 13:56:50 +01:00
Magne Sjaastad
b0503cabba Added drag and drop support. 
Implemented our own insertRows/deleteRows to avoid bug caused by default drag and drop behaviour of Qt

https://bugreports.qt-project.org/browse/QTBUG-26229
https://bugreports.qt-project.org/browse/QTBUG-6679
p4#: 21028
 2013-03-21 13:41:44 +01:00
Magne Sjaastad
1e8d5236d1 Disable paste if no available clipboard data 
p4#: 21025
 2013-03-21 11:04:47 +01:00
Magne Sjaastad
359964092d Added new grid case group on case context menu 
p4#: 21024
 2013-03-21 10:48:46 +01:00
Magne Sjaastad
a5fb1e1764 One shared active cell info for all statistical cases 
Invalidate existing statisticsCases when adding/removing source cases
Moved computation of active cell union from RigStatistics to RimIdenticalGridCaseGroup
Recompute active cell union when opening project file
p4#: 21023
 2013-03-21 10:31:58 +01:00
Magne Sjaastad
53d7d62759 Made adding of objects more robust 
p4#: 21009
 2013-03-20 15:11:27 +01:00
Magne Sjaastad
1a113b83d3 As QModelIndex is stored on clipboard, clear after move/delete operations 
Added support for multiple delete of reservoir cases
p4#: 21007
 2013-03-20 15:04:28 +01:00
Magne Sjaastad
d5b056b078 Load and update views after copy 
p4#: 21000
 2013-03-20 13:49:32 +01:00
Magne Sjaastad
06a2f7e17f Added general function used to remove(and delete) pdmObject from pdmPointersField 
Used when closing a grid group
p4#: 20992
 2013-03-20 12:08:40 +01:00
Magne Sjaastad
9abe7a3b13 Improved handling when deleting all cases and adding new case to case group 
p4#: 20990
 2013-03-20 11:35:27 +01:00
Magne Sjaastad
22aee27333 Improved paste of pdm objects 
p4#: 20980
 2013-03-20 07:42:26 +01:00
Magne Sjaastad
45ce4097e1 Use buildViewItems instead of rebuildUiSubTree 
p4#: 20979
 2013-03-20 07:14:27 +01:00
Magne Sjaastad
50206b9dc4 Various linux fixes and missing includes 
p4#: 20976
 2013-03-20 06:11:45 +01:00
Magne Sjaastad
27dee4d4e2 Added paste on gridcollection, case collection and cases 
Moved creation of objects into rimUiTreeModelPdm
p4#: 20968
 2013-03-19 12:47:38 +01:00
Magne Sjaastad
414172cf78 Insert new case group before script item 
p4#: 20964
 2013-03-19 11:14:32 +01:00
Jacob Støren
75fc89e67a Rename of ...ResultsCacher to ...ResultsStorage. Hide Cacher from UI tree 
p4#: 20963
 2013-03-19 10:29:34 +01:00
Magne Sjaastad
051710b82f Prototype of copy/paste of reservoir case 
p4#: 20962
 2013-03-19 09:55:17 +01:00
Jacob Støren
5860cb2e49 Results Storage: Removed obsolete field. Stored the filename. 
p4#: 20959
 2013-03-19 09:48:30 +01:00
Jacob Støren
516c642cc4 Results Storage: Refined the output format. Think it is ok now 
p4#: 20956
 2013-03-19 09:08:37 +01:00
Magne Sjaastad
a411a8ae59 Removed obsolete code from interface 
Use time steps from source case with largest time step count
p4#: 20954
 2013-03-19 08:21:55 +01:00
Magne Sjaastad
da3486f881 Use size_t instead of int 
p4#: 20953
 2013-03-19 08:15:27 +01:00
Jacob Støren
9da6b0a10b Results Storage: Fixed the Previous build error by moving the RigStatistics class. 
Cleaned up a bit in the ApplicationCode/CMakeList.txt
p4#: 20946
 2013-03-18 14:51:31 +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
Magne Sjaastad
62e4cac4b0 Added inherited object of MimeData to carry model index list 
p4#: 20926
 2013-03-18 11:40:39 +01:00
Magne Sjaastad
e92ed43fc3 Added context menu for adding new case group 
p4#: 20905
 2013-03-14 09:50:40 +01:00
Magne Sjaastad
469c5a9657 Added initAfterRead for case group 
p4#: 20904
 2013-03-14 09:28:49 +01:00
Magne Sjaastad
99159cb12d Fixed missing initialization 
p4#: 20903
 2013-03-14 08:47:42 +01:00
Magne Sjaastad
422c4ca54b Use raw pointer instead of smart pointer 
p4#: 20892
 2013-03-13 14:58:36 +01:00
Magne Sjaastad
973eb5c8f7 Use concept of parentObjectsOfType to avoid dynamic cast in application code. 
p4#: 20887
 2013-03-13 13:51:26 +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
4358d87c09 If no views are created for RimReservoird, delete the current RigEclipseCase. 
Then all data will be read from file as if the case was opened as a stand alone case.
p4#: 20876
 2013-03-13 11:42:26 +01:00
Magne Sjaastad
766996a9fd Include static properties when computing statistics 
p4#: 20870
 2013-03-13 07:58:49 +01:00
Magne Sjaastad
086262a4b6 Fixed how to compute number of views in a collection 
p4#: 20842
 2013-03-11 08:24:45 +01:00
Jacob Støren
85f0d8b195 Fixed "New View" command tree refresh behaviour. Still the expand icon is missing sometimes... 
p4#: 20833
 2013-03-08 11:14:27 +01:00
Jacob Støren
0a5102894b Calculate statistics for all available properties in main case by default 
p4#: 20832
 2013-03-08 10:49:33 +01:00
Magne Sjaastad
9605a1eec9 Added clear method to make sure all objects are destroyed. 
p4#: 20828
 2013-03-08 08:36:30 +01:00
Magne Sjaastad
0a02805a8f Added assert on ref count of referenced object, as this object is assumed to be released in the destructor 
p4#: 20827
 2013-03-08 08:35:27 +01:00
Jacob Støren
d4a28126d1 Added several new icons, including zoom all 
p4#: 20823
 2013-03-07 16:47:42 +01:00
Magne Sjaastad
208e904f57 Rebuild geometry after computing new active cell info, and update views 
p4#: 20821
 2013-03-07 14:57:28 +01:00
Jacob Støren
78f2c359cb Renamed the multicase command to "Create Grid Case Group From Files" 
p4#: 20814
 2013-03-07 12:32:19 +01:00
Magne Sjaastad
6bf3776a5d Add one statistical case object when creating a case group 
p4#: 20808
 2013-03-07 10:06:31 +01:00
Magne Sjaastad
868c90dd03 Removed checkbox selections for statistical configuration 
p4#: 20805
 2013-03-07 09:49:33 +01:00
Jacob Støren
705bb185e0 Fixed assert regarding wrong clamping of current timestep 
p4#: 20802
 2013-03-07 09:42:34 +01:00
Magne Sjaastad
86696d85e5 Delete child objects when object is deleted 
p4#: 20799
 2013-03-07 09:21:29 +01:00
Magne Sjaastad
e94264a39f Added support for building of metadata from existing time steps 
Improved statistics calculation for opening single time step files
Close all dynamic access files when a time step statistics is complete
p4#: 20756
 2013-03-05 13:10:26 +01:00
Magne Sjaastad
4c955ece4a Improved statistical data infrastructure 
p4#: 20694
 2013-03-02 15:32:38 +01:00
Jacob Støren
1181d62b75 Reviewed and simplified DataAccess classes. 
Includes some const changes and some renaming
p4#: 20687
 2013-03-01 16:00:34 +01:00
Magne Sjaastad
839a617916 Do not store scripts in project file 
p4#: 20665
 2013-02-28 10:15:28 +01:00
Magne Sjaastad
3dbc8a9d57 Improved multi case initial reading 
When creating a multi case group from multiple files, read grid from first file.
The main grid from the first case is reused for the other cases.
NOTE: Metadata and well information is not read for the other cases
p4#: 20655
 2013-02-27 15:27:33 +01:00
Jacob Støren
ab02afabcf Legend config: Removed obsolete min value threshold 
p4#: 20626
 2013-02-26 12:45:41 +01:00
Magne Sjaastad
1a235529ac Removed active cell info from RigCell 
Set all cells active for mock models
p4#: 20614
 2013-02-25 14:07:59 +01:00
Magne Sjaastad
edda92182b Use active cell info struct instead of RigCell member function 
p4#: 20613
 2013-02-25 14:01:40 +01:00
Jacob Støren
459f2a033b Added background color setting to a view. 
Requested by Statoil at 19.02.2013
p4#: 20611
 2013-02-25 11:52:28 +01:00
Jacob Støren
7f01481393 Refurbished the RimReservoirView header file, to make it more readable 
p4#: 20610
 2013-02-25 09:44:26 +01:00
Jacob Støren
49f2c42c3e Renamed to Grid Case Group in the UI 
p4#: 20609
 2013-02-25 09:43:42 +01:00
Magne Sjaastad
f00152823f Consolidated cache data computations 
Removed automatic insertion of grids into identical grid groups
p4#: 20607
 2013-02-22 10:12:06 +01:00
Magne Sjaastad
0dc492da75 Added casecollection in grid case group 
p4#: 20602
 2013-02-21 15:37:51 +01:00
Magne Sjaastad
4a3bde5baa Moved statistical cases into statistics case collection 
p4#: 20599
 2013-02-21 12:00:49 +01:00
Magne Sjaastad
f45c581dbc Added name to group case 
p4#: 20595
 2013-02-21 10:38:28 +01:00
Magne Sjaastad
a0b2be3dee Added framework for statistical calculation reader 
p4#: 20591
 2013-02-21 08:48:26 +01:00
Magne Sjaastad
9ad5ec5449 Add view from context menu of case 
p4#: 20589
 2013-02-21 08:39:50 +01:00
Magne Sjaastad
e82aef5850 Imroved lifespan handling for reservoirs 
p4#: 20526
 2013-02-15 10:01:41 +01:00
Magne Sjaastad
73c9459276 Simplified adding of view 
p4#: 20524
 2013-02-15 09:21:28 +01:00
Magne Sjaastad
c92e822f3f Added context menu items for adding new statistical case 
p4#: 20523
 2013-02-15 08:44:45 +01:00
Magne Sjaastad
67cab9448e Added statistical calculation framework 
p4#: 20521
 2013-02-14 15:27:35 +01:00
Magne Sjaastad
3490d07dd1 Added IdenticalGridCaseGroup, now displayed in tree view 
p4#: 20518
 2013-02-14 14:30:01 +01:00
Magne Sjaastad
8f50b90216 Added grid collection and reuse of MainGrid if the grids are equal 
p4#: 20517
 2013-02-14 13:16:56 +01:00
Magne Sjaastad
46cb61e859 Rename 
p4#: 20515
 2013-02-14 10:19:27 +01:00
Magne Sjaastad
f344466037 Always use smart pointers 
p4#: 20513
 2013-02-14 10:02:49 +01:00
Magne Sjaastad
a09dba2670 File rename from RigReservoir to RigEclipseCase 
p4#: 20503
 2013-02-13 13:33:35 +01:00
Magne Sjaastad
ec8817e207 Renamed RigReservoir to RigEclipseCase 
p4#: 20500
 2013-02-13 13:24:39 +01:00
Magne Sjaastad
b1cb8a6716 Moved result value vectors from MainGrid to Reservoir 
p4#: 20499
 2013-02-13 13:10:54 +01:00
Magne Sjaastad
a0d6890aa3 Removed obsolete code 
p4#: 20492
 2013-02-13 11:24:36 +01:00
Magne Sjaastad
1a17875dc1 Restructured data access objects, added factory method 
p4#: 20471
 2013-02-12 14:46:45 +01:00
Magne Sjaastad
d45aded7f7 Removed more functions from MainGrid 
p4#: 20468
 2013-02-12 14:00:39 +01:00
Magne Sjaastad
6c7dc10791 Removed functions from MainGrid 
p4#: 20459
 2013-02-12 12:55:58 +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
2b4edf39d1 Use active cell info structure 
p4#: 20455
 2013-02-12 11:15:36 +01:00
Magne Sjaastad
942cccfdcb Search for Eclipse data in project file folder in addition to the given case folder. 
This allows for copy of a folder containing a project file and related Eclipse data
p4#: 20437
 2013-02-11 08:16:51 +01:00
Jacob Støren
baeba974bf Fixed compiler warning 
p4#: 20432
 2013-02-08 16:57:54 +01:00
Magne Sjaastad
6017e6db35 Build new well pipe geometry when radius is changed 
p4#: 20431
 2013-02-08 14:59:27 +01:00
Magne Sjaastad
defc91ba08 As display of wells is dependent on timestep, do not reset timestep when no results are present. 
This fix was reverted unintentionally.
p4#: 20423
 2013-02-07 15:49:36 +01:00
Jacob Støren
09544f082b Guard against missing well results 
When project file has settings for wells but there are no well results
p4#: 20416
 2013-02-07 13:44:18 +01:00
Magne Sjaastad
f8059880b8 As display of wells is dependent on timestep, do not reset timestep when no results are present. 
p4#: 20411
 2013-02-07 12:28:34 +01:00
Magne Sjaastad
5e38c909cf Early exit when data fails to load 
p4#: 20405
 2013-02-07 10:12:59 +01:00
Jacob Støren
6fef9994db Improved progress bar smoothness. 
Particularily when having many result files
p4#: 20392
 2013-02-06 13:44:27 +01:00
Magne Sjaastad
f9dca273af Added missing computation of active cell count to mock models 
p4#: 20382
 2013-02-06 10:02:50 +01:00
Jacob Støren
487ee03212 Rearranged members a bit in preparations to split out active info 
p4#: 20381
 2013-02-05 16:35:04 +01:00
Magne Sjaastad
3e4b0520d4 Show matrix/fracture selection only for models with fracture results 
p4#: 20376
 2013-02-05 14:45:35 +01:00
Magne Sjaastad
cf5aa3e882 Rewrite of file acces helper class 
RifEcliseOutputFileTools is now a class with only static functions
Moved some application logic from file readers to RifEcliseOutput
Added more tests for extracting metainfo related to results
p4#: 20368
 2013-02-05 10:51:32 +01:00
Magne Sjaastad
644d201b37 Added porosity model to ResultDefinition 
Keep this property hidden from GUI until more testing is done
p4#: 20339
 2013-02-01 14:39:32 +01:00
Magne Sjaastad
e635bb5dbb Removed functions in RigGridBase due to changes in StructGridInterface 
p4#: 20335
 2013-02-01 13:10:31 +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
Magne Sjaastad
76721130eb Added fracture active index 
p4#: 20294
 2013-01-30 09:30:48 +01:00
Magne Sjaastad
1c8bb6e38e Prepare for dual porosity 
Renamed active to matrixActive
p4#: 20286
 2013-01-29 15:09:34 +01:00
Jacob Støren
b938b14b5b Removed a lot of size_t/uint/int related compiler warnings. Still more to go. 
p4#: 20215
 2013-01-22 11:34:47 +01:00
Magne Sjaastad
15044a4db4 Improved menu texts 
p4#: 19299
 2012-10-24 13:53:03 +02:00
Jacob Støren
2b85dbd264 Well visibility is now independent of the surface and mesh visibility, and will be visible even if both mesh and surface are turned off. 
p4#: 19292
 2012-10-24 12:54:57 +02:00
Jacob Støren
6a4f15368c Mesh/Surface style is now made independent so it is possible to show the mesh lines without the surface geometry. 
A new mesh style "Faults only" is also added making it possible to show the mesh lines on the faults only
p4#: 19289
 2012-10-24 11:23:40 +02:00
Magne Sjaastad
ddc555d590 Compute DEPTH, DX, DY, DZ, TOP and BOTTOM if not present. Added flag in Preferences to control if ResInsight automatically computes these values. Improved statistical computations by skipping HUGE_VAL. 
p4#: 19287
 2012-10-24 10:52:44 +02:00
CeetronResInsight
6792ce1f4a Removed wrong assert causing arbitrary crashes 
p4#: 19286
 2012-10-24 10:31:46 +02: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
f833244b68 Added close on context menu for reservoir case 
p4#: 19266
 2012-10-23 11:12:47 +02:00
Magne Sjaastad
f4a328b4cb Fixed memory leak 
p4#: 19265
 2012-10-23 10:42:46 +02:00
Jacob Støren
875d7b7d12 Resinsight: Made Home path the default path for file dialog browsing, and added remembering of the last opened path. 
Added -startdir command line argument to override the default file browse path
p4#: 19263
 2012-10-23 09:59:57 +02:00
Magne Sjaastad
346db45afc Added default Z scale factor and default gridlines on/off when creating a new view 
p4#: 19177
 2012-10-12 15:05:42 +02:00
Magne Sjaastad
b4ae324d9b Added script folder to Octave function search path. This makes it possible to recursively call other functions from an Octave script. 
p4#: 19164
 2012-10-12 12:08:38 +02:00
Magne Sjaastad
5f9de8644e Use slider for property filter range 
p4#: 19096
 2012-10-09 16:19:49 +02:00
Magne Sjaastad
65acad250c Reduced loading time of Eclipse Ascii files by storing filepos for keywords 
QFile is used directly due to a bug with QTextStream fixed in 4.8.0
p4#: 19079
 2012-10-08 19:44:10 +02:00
Magne Sjaastad
9c1ce7591e Upgraded visualization libraries 
Major refactoring of color legend framework
Added discrete log color legend
p4#: 18989
 2012-10-02 10:17:52 +02:00
Magne Sjaastad
01ee943155 Improved integer slider editor 
Use sliders for cell range filter
 2012-09-14 15:48:49 +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
Magne Sjaastad
27d8808c5c Version 0.8.6 2012-08-31 19:12:47 +02:00
unknown
2c9695e594 Updated to version 0.8.0 2012-06-26 16:10:41 +02:00
Alf B. Rustad
dfe97efb1b Initial commit of ResInsight version 0.4.8 2012-05-18 09:45:23 +02:00