Commit Graph

362 Commits

Author SHA1 Message Date
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
Jacob Støren
770a81648d Added a new editor to work with text fields.
Supports multiline formatted text
p4#: 21114
2013-04-03 16:06:00 +02:00
Magne Sjaastad
70347c281f Do not use deprecated Octave functions
b5ad0b9170
p4#: 21106
2013-04-03 09:24:33 +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
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
Jacob Støren
ad8cbfa651 Caf::Pdm: Added better Error messages and Recovery when encountering unknown field names and class types
p4#: 21001
2013-03-20 13:56:17 +01:00
Magne Sjaastad
d5b056b078 Load and update views after copy
p4#: 21000
2013-03-20 13:49:32 +01:00
Magne Sjaastad
ddade8a6cf Removed duplicate calls setupBeforeSave and initAfterRead
p4#: 20998
2013-03-20 13:40:26 +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
c9b4376d8c Use -1 as argument when adding children, as they always must be appended to collection
p4#: 20978
2013-03-20 07:04:34 +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
4368a644bf No need to clear before exit as object no longer are deleted in destructor
p4#: 20966
2013-03-19 11:32:30 +01:00
Magne Sjaastad
19e2adc1bf Do not delete objects in destructor
p4#: 20965
2013-03-19 11:27:27 +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