OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-26 16:26:48 -06:00
Code Issues Packages Projects Releases Wiki Activity
847 Commits 31 Branches 61 Tags 287 MiB
2372cf86ca
Commit Graph

641 Commits

Author SHA1 Message Date
Magne Sjaastad
d6560d017e Added riGetGridDimensions 
p4#: 21664
 2013-05-16 15:16:51 +02:00
Magne Sjaastad
db18a855db Added GetTimeStepDays 
p4#: 21662
 2013-05-16 14:44:34 +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
Magne Sjaastad
2303f30200 Added RiaSocketCommands as placeholder for new commands 
Moved declaration to RiaSocketServer.h to be able to create new commands in other files
Added riGetTimeStepDates
p4#: 21655
 2013-05-16 13:43:37 +02:00
Jacob Støren
bb0c4c37c1 SocketServer: Moved GetProperty command to new regime. 
p4#: 21654
 2013-05-16 13:29:38 +02:00
Vidar Lundberg
86a53980a4 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#: 21652
 2013-05-16 13:06:00 +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
Vidar Lundberg
4a0c3d7ca9 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:01 +02:00
Jacob Støren
6173381652 SocketServer: GetActiveCellInfo moved to new regime 
p4#: 21649
 2013-05-16 12:44:43 +02:00
Jacob Støren
a63b2caae5 SocketServer: Converted GetMainGridDims to new regime 
p4#: 21648
 2013-05-16 11:47:42 +02:00
Jacob Støren
db168909d7 Fixed Windows compile issue 
p4#: 21647
 2013-05-16 11:27:34 +02:00
Jacob Støren
36d7c46e57 Socket Server: Rolled in separate command handler classes created by factory. 
Translated several commands to the new regime.
p4#: 21645
 2013-05-16 11:15:34 +02:00
Vidar Lundberg
ac832866e6 Add Json parser based on code example found on: 
http://stackoverflow.com/questions/4169988/easiest-way-to-parse-json-in-qt-4-7
p4#: 21634
 2013-05-15 16:00:36 +02:00
Magne Sjaastad
6d8f6307f6 Find case based on caseId instead of case name/case index 
Updated calculateMatrixModelActiveCellInfo()  to include coarse box index and use 1-based index for IJK values
p4#: 21629
 2013-05-15 14:37:03 +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
667a4e6995 Updated riGetCurrentCase with case type 
p4#: 21619
 2013-05-15 11:08:42 +02:00
Magne Sjaastad
b3a15268f6 Added riGetCases 
p4#: 21618
 2013-05-15 10:51:41 +02:00
Magne Sjaastad
22d45bc28f Added riGetSelectedCases based on currently selected cases in the main tree view 
p4#: 21604
 2013-05-13 22:32:01 +02:00
Magne Sjaastad
10b49efae9 Completed riGetCurrentCase 
p4#: 21603
 2013-05-13 21:41:45 +02:00
Magne Sjaastad
65710a8e08 Added riGetCaseGroups 
Added Qt DataStream version to riSettings
VisualStudio: Copy generated *.oct files into Application folder
VisualStudio: ResInsight is dependent on octave_plugin
p4#: 21602
 2013-05-13 21:15:38 +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
Magne Sjaastad
b63306099e Added riGetCurrentCase used to get caseId from current rimCase in ResInsight 
p4#: 21593
 2013-05-10 14:43:03 +02:00
CeetronResInsight
cb1c276e01 Fixed missing include (only needed for RHEL6) 
p4#: 21591
 2013-05-10 11:10:41 +02:00
Jacob Støren
6784a8e596 Fixed Well pipe "peaks". The centerline filtering tolerance was too small. 
p4#: 21580
 2013-05-08 13:14:33 +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
Magne Sjaastad
269f66b0bd Removed obsolete function 
p4#: 21551
 2013-05-06 13:09:47 +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
Magne Sjaastad
8ef10316d8 Make sure grabbed buffer is GL_FRONT 
p4#: 21534
 2013-05-03 10:07:53 +02:00
Jacob Støren
e83fe8a471 CellEdge : Added options to turn off specific directions 
p4#: 21510
 2013-04-30 15:55:12 +02:00
Magne Sjaastad
3ee26b20ea Fixed shader program 
p4#: 21506
 2013-04-30 15:07:38 +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
71187d5bbc Unit test for interpolation 
p4#: 21496
 2013-04-30 13:08:04 +02:00
Magne Sjaastad
6ef5205343 Added interpolation of observed values to statistics computation 
p4#: 21492
 2013-04-30 11:36:50 +02:00
CeetronResInsight
35759e081d Regression test: Fix for window size 
p4#: 21479
 2013-04-29 13:34:36 +02:00
Magne Sjaastad
ca856f7603 Updated ERT to 315ceeee250808ea6a6530233dd5125f9f76f06c 
Support of reading LGR dimensions
Close file handles between access to files, keep ERT file-related cache to speed up reading of many files multiple times
p4#: 21477
 2013-04-29 13:13:42 +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
37ff2b2b73 When loading a project, also read source cases from a grid case group with one or more attached view(s) 
p4#: 21467
 2013-04-29 11:07:57 +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
b00f455e94 Select statistics case after creating a grid case group 
p4#: 21464
 2013-04-26 19:19:33 +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
Jacob Støren
4ca363cde5 Fixed bug: Missing well cells in lgr when range filtering 
p4#: 21442
 2013-04-25 14:56:46 +02:00
Magne Sjaastad
5c88935a88 Hide console window in release config on Windows 
p4#: 21433
 2013-04-25 12:00:58 +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
d3fa2d5af5 Added creation of IJK-slices from context menu in 3D scene. 
p4#: 21367
 2013-04-23 07:29:37 +02:00
Magne Sjaastad
0d4ad83f6b Fixed bug related to EGRID and INIT-file, no restart file 
p4#: 21364
 2013-04-22 14:51:47 +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
ea45e6f072 Improved robustness in file reader 
p4#: 21358
 2013-04-22 13:24:49 +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
Magne Sjaastad
a326fac204 Renaming related to tree item root 
p4#: 21355
 2013-04-22 10:49:31 +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
f23c9d7b4d Removed obsolete code 
p4#: 21328
 2013-04-17 11:48:32 +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
Jacob Støren
2280a8cbfa Toolbar and menu refinements 
Added Snapshot actions to a new toolbar.
Moved the snapshot file actions from debug menu to File->Export
Moved the Snapshot to Clip board to Edit menu.
Moved create new Project tree and Property editor action to Windows menu
Added a separator in the Windwsmenu after the "fixed Docks"
Set unique names on the additional Prop and Project doc windows
p4#: 21326
 2013-04-17 10:59:34 +02:00
Magne Sjaastad
ec2754ce30 Added checkbox for wells in treeview 
p4#: 21325
 2013-04-17 08:25:32 +02:00
Jacob Støren
df533d0afe Alligning 
p4#: 21321
 2013-04-17 07:41:48 +02:00
Jacob Støren
b38d4313d7 Octave Server: Fix on getting active cellinfo 
p4#: 21318
 2013-04-16 12:08:45 +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
66f0310d55 Added new icons to resource file 
p4#: 21306
 2013-04-16 09:44: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
Magne Sjaastad
e9743257ea Check if file pointer is present before creating a new file pointer 
p4#: 21295
 2013-04-16 08:25:43 +02:00
Jacob Støren
9e588e38c3 Established new base images for regressiontest. Small models. 
p4#: 21290
 2013-04-16 07:34:50 +02:00
Magne Sjaastad
8ed9cee99e Use small font when drawing well head labels 
p4#: 21285
 2013-04-15 13:36:37 +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
e2f02d111f Merge pull request #24 from OPM/dev 
Update internal as prepare of harmonizing pull requests
 2013-04-12 06:25:35 -07:00
Jacob Støren
337e0c3226 Added mesh color as preference, and resetting of preferences before doing regression tests 
p4#: 21263
 2013-04-12 13:15:41 +02:00
Magne Sjaastad
e5b7bbc5af Merge pull request #22 from OPM/internal 
Internal
 2013-04-12 04:06:49 -07: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
Magne Sjaastad
e5f9b41c0f Moved font creation into RivReservoirPipesPartMgr 
Added clearGeometryCache
p4#: 21252
 2013-04-12 09:20: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
a20640f25f Only enable animation control when there are more than one time step string available 
p4#: 21229
 2013-04-10 15:09:41 +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
Jacob Støren
ff1dcd8c8d Overlay info: Adjusted colors and transparency 
To reclaim the transparent feeling lost, and to increase readability
p4#: 21225
 2013-04-10 14:24:35 +02:00
Magne Sjaastad
33729d5ed4 Removed invalid assert 
p4#: 21222
 2013-04-10 13:22:43 +02:00
Magne Sjaastad
be8b627e69 Added application icon on Windows 
p4#: 21221
 2013-04-10 12:01:38 +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
Magne Sjaastad
de56495c13 Always select SOIL as default result 
p4#: 21219
 2013-04-10 11:21:41 +02:00
Jacob Støren
a246e288ba Renamed some methods and variables in the eclipse result file access system 
To make things more readable and understandable
p4#: 21218
 2013-04-10 11:02:10 +02:00
Jacob Støren
09810bf586 Fixed error in path update logic 
p4#: 21209
 2013-04-09 15:38:37 +02:00
Jacob Støren
d0eebb92a8 Removed PERMY as default statistics property 
p4#: 21204
 2013-04-09 14:36:38 +02:00
CeetronResInsight
1cfd103f30 Linux compile warning fixes 
p4#: 21189
 2013-04-09 07:59:41 +02:00
Magne Sjaastad
812aee9be4 Text changes 
p4#: 21187
 2013-04-09 07:52:34 +02:00
Jacob Støren
2a6fce1d64 Added missing include (discovered on Ubuntu 12 build server) 
p4#: 21186
 2013-04-09 07:27:55 +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
6c9f5d1978 Added reading of grid dimensions 
p4#: 21154
 2013-04-07 16:33:45 +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
Magne Sjaastad
cc8568cca6 Fixed inverted test for null pointer 
p4#: 21127
 2013-04-04 12:08:36 +02:00
Magne Sjaastad
32d67d9978 Updated ERT from https://github.com/Ensembles/ert/commits/master to version 
4a78d88f1dc7bbc86f173c5adb825bbca29fa116
p4#: 21120
 2013-04-04 08:24:40 +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
Magne Sjaastad
e49895ea65 Updated file headers 
p4#: 21104
 2013-04-03 09:09:53 +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
7da5520207 Reverted an accidental checkin regarding generating of test projects 
p4#: 21098
 2013-04-02 16:34:13 +02:00
Jacob Støren
c16db0640b First start of statistics control data model 
p4#: 21097
 2013-04-02 15:20:55 +02:00
JacobStoren
3c08fd8abf Merge pull request #20 from OPM/internal 
Update dev branch to latest
 2013-04-02 06:14:26 -07:00
Roland Kaufmann
20f00f4a3a Put launcher for ResInsight in desktop environment 2013-03-27 00:43:13 +01:00
Roland Kaufmann
e7613fe9ee Optionally enable system installation of binaries 
If the option PRIVATE_INSTALL is set to OFF, LSB-compliant paths are
used for the `install' target.
 2013-03-27 00:43:01 +01:00
Roland Kaufmann
3fcd05e838 Refactor variable containing filenames for license 
These will be used in several scenarios later.
 2013-03-27 00:39:06 +01:00
Roland Kaufmann
e63c609111 Use $ORIGIN to load libs from program directory 
The RPATH attribute won't expand relative directories (such as ".")
neither can it be a semi-colon separated list; the old way of setting
it was wrong and would lead to libraries being loaded from system
directories instead.
 2013-03-27 00:38:59 +01: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
bd33a64e84 Added a comment 
p4#: 21063
 2013-03-22 15:22:50 +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
4101c3cd85 Removed obsolete file 
p4#: 21048
 2013-03-22 10:10:34 +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
3cd92973af Missed one file in previous rename 
p4#: 21046
 2013-03-22 09:44:41 +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
Jacob Støren
92bd95d683 Added explicit load of data for StatisticsCases. 
Still trouble but this removed one obstacle
p4#: 21014
 2013-03-20 16:35:36 +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
f0fa445f7a Set main grid on eclipse case and cell results 
p4#: 20955
 2013-03-19 08:28:25 +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
Magne Sjaastad
5db5c14230 Added possibility to read out scalar result index having most time steps 
p4#: 20952
 2013-03-19 08:14:35 +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
160456106a Use raw pointers instead of ref count 
Added more asserts and cleanup
p4#: 20891
 2013-03-13 14:43:27 +01:00
Magne Sjaastad
d33a27a082 Fixed ref counts 
p4#: 20890
 2013-03-13 14:41:54 +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
3c446c4018 Removed out-commented code from the ActiveCellInfo refactoring 
p4#: 20886
 2013-03-13 13:42:27 +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
3013992518 Fixed error regarding missing well cells in property filtered views 
p4#: 20882
 2013-03-13 13:06:37 +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
449b22c681 Do not use smart pointer in this class 
p4#: 20875
 2013-03-13 11:39:27 +01:00
Magne Sjaastad
99917c60ad Compute SOIL for each time step 
Added support for computing statistics for derived SOIL
p4#: 20873
 2013-03-13 10:29:47 +01:00
Magne Sjaastad
06460424af Check for empty source cases 
p4#: 20871
 2013-03-13 08:03:26 +01:00
Magne Sjaastad
766996a9fd Include static properties when computing statistics 
p4#: 20870
 2013-03-13 07:58:49 +01:00
Jacob Støren
9ab0a397ef Removed the m_isWellCell member from RigCell, to make the grid data completely independent of case / result data 
p4#: 20859
 2013-03-12 10:03:25 +01:00
Magne Sjaastad
94065f29ed Removed obsolete code 
p4#: 20857
 2013-03-12 09:59:33 +01:00
Magne Sjaastad
61e8115141 Fixed indentation issues 
Renamed and added asserts
p4#: 20846
 2013-03-11 14:04:48 +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
Magne Sjaastad
f6fa801607 Use raw pointers in file readers to avoid circular references 
p4#: 20826
 2013-03-08 08:24:40 +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
Magne Sjaastad
1bf1d5a7cf Rebuild geometry after computing new active cell info, and update views 
p4#: 20821
 2013-03-07 14:56:52 +01:00
Magne Sjaastad
05b6c1ad18 Compute active cell info grid by grid 
p4#: 20817
 2013-03-07 13:20:15 +01:00
Magne Sjaastad
ec825145df Fixed invalid active global index 
p4#: 20816
 2013-03-07 13:13:34 +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
Jacob Støren
aab18ba0a0 Set root as default start directory for grid case group import 
p4#: 20811
 2013-03-07 12:25:27 +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
fcdf14c0fa Improved progress information when reading large projects 
p4#: 20803
 2013-03-07 09:43:25 +01:00