OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-01 03:37:15 -06:00
Code Issues Packages Projects Releases Wiki Activity
477 Commits 25 Branches 60 Tags 288 MiB
a9bde4032b
Commit Graph

477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
99fcb435ed Merge pull request #17 from hegge/build-system-fixes 
Minor build system fixes, gitignore and compiler warning
 2013-04-03 00:17:39 -07:00
Magne Sjaastad
e49895ea65 Updated file headers 
p4#: 21104
 2013-04-03 09:09:53 +02:00
Magne Sjaastad
83d23fb7c0 Merge pull request #18 from alfbr/master 
Updated README
 2013-04-02 23:46:02 -07:00
Torstein Hegge
b5ad0b9170 octave: Avoid deprecated single argument dim_vector constructor 
The single argument constructor to dim_vector was deprecated in liboctave 3.4
[1], and gives a compile time warning when compiling with gcc and using a
recent version of liboctave. The two argument constructor is safe to use with
older versions of liboctave.

[1] http://hg.savannah.gnu.org/hgweb/octave/rev/12884915a8e4
 2013-04-02 19:01:09 +02:00
Torstein Hegge
7b0b923d80 gitignore: Ignore more build system products 
Ignore static libraries, cmake products, generated code and unit test
binaries.

Some extra care must be taken not to ignore more than intended when ignoring
the *_UnitTests. There is no way to directly express a path-neutral "only
ignore files with this pattern, not directories" in a single gitignore
pattern, but it can be expressed as "ignore everything containing this pattern
except directories".
 2013-04-02 19:01:09 +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
alfbr
f22042c5d3 Updated Ubuntu 12.10 dependencies and standardized build directory. 2013-03-31 12:34:48 +02:00
Alf Birger Rustad
74a1cdd889 Merge pull request #15 from rolk/instdir 
Enable installation of ResInsight with a package manager through an option
 2013-03-31 03:04:30 -07:00
Roland Kaufmann
20f00f4a3a Put launcher for ResInsight in desktop environment 2013-03-27 00:43:13 +01:00
Roland Kaufmann
f6dd430b87 Path to Octave plugins is taken from conf. program 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
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