OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
487 Commits 27 Branches 61 Tags 309 MiB
8c28e8ff6c
Commit Graph

367 Commits

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