Commit Graph

2464 Commits

Author SHA1 Message Date
Magne Sjaastad
470410b4a7 Linux fix 2016-06-16 18:16:38 +02:00
Jacob Støren
7378472ac9 #756 Syncronize from curves to gui selection. Removed "None" option 2016-06-16 16:55:02 +02:00
Jacob Støren
cf287160df #756 Curve creation and syncronization with filter and selection. 2016-06-16 16:55:02 +02:00
Jacob Støren
45cf15a941 Caf: PtrFields must not return any childObjects. Fixed Legend definition Object below EclipseCellColor as a consequence. Discovered due to Summary Plot case pointer 2016-06-16 16:55:02 +02:00
Jacob Støren
6f7432c0e7 #756 Cleaned up after refactoring. 2016-06-16 16:55:02 +02:00
Jacob Støren
ce2112fbc6 #756 Refactoring the filter data into a separate object as a PdmChild 2016-06-16 16:55:02 +02:00
Jacob Støren
8d15fa1b84 #756 WIP: Curve Filter beeing created 2016-06-16 16:55:02 +02:00
Jacob Støren
a37449d99d Used the new Ert support to retreive the summary lgr names and ijk values 2016-06-16 16:55:02 +02:00
Jacob Støren
cb81fc1aaa #756 Startingpoint for Curve Filter in place, with command to create 2016-06-16 16:55:02 +02:00
Jacob Støren
3167f97394 #756 WIP: Added class stubs for the CurveFilter 2016-06-16 16:55:02 +02:00
Magne Sjaastad
6a8ffb7c6b Commented out local file path in unit test 2016-06-13 13:02:12 +02:00
Magne Sjaastad
7adaa4b45c Integrated opmjson directly in opm-parser, removed dependency to opm-common 2016-06-13 12:27:28 +02:00
Magne Sjaastad
718e724760 Include JSON files directly in opm-parser, opm-parser has now no dependencies 2016-06-13 10:39:57 +02:00
Magne Sjaastad
7bde4db3c2 Added list of test files 2016-06-13 10:14:13 +02:00
Jacob Støren
64aea7285d Fixed BUILD_SHARED_LIBS related build sytem problems on linux. Now working with both on and off. 2016-06-12 02:03:48 +02:00
Jacob Støren
b714882a16 Cotire: Added support for dll copying on MSVC 2016-06-10 15:10:10 +02:00
Jacob Støren
2bb2758523 #755 Used the same order as ERT on the display, - and search strings for Summary Variables 2016-06-10 14:11:22 +02:00
Magne Sjaastad
cdc6bbeab5 cotire : Exclude main project from build when unity build is present 2016-06-10 12:49:36 +02:00
Jacob Støren
80d7ae7262 #755 Curve Gui adjusted according to input from CFB. Now working as intended. 2016-06-10 12:30:20 +02:00
Jacob Støren
e21ddfe74a #755 First simple version of the proposed GUI. Type and Quantity name filter working. 2016-06-09 11:08:12 +02:00
Jacob Støren
336828e48d #755 WIP: Started to adapt to using the smspec node from eclipse. Established Rim prototype of "filter" concept for summary variables 2016-06-09 11:08:12 +02:00
Magne Sjaastad
a4ff316941 cotire : Disabled precompiled headers and made sure the unity build compiles 2016-06-08 12:18:36 +02:00
Magne Sjaastad
7742fbe325 Encapsulate the JSON code in a namespace to avoid issues with JSON classes used in opm-parser 2016-06-06 10:43:36 +02:00
Magne Sjaastad
4fd8e2503c Added cotire to speed up build times 2016-06-06 09:56:45 +02:00
Magne Sjaastad
e603773417 Added missing pragma once 2016-06-06 07:13:53 +02:00
Magne Sjaastad
5c9e8a8075 #734 Always compile ERT as shared library on Linux 2016-06-02 12:50:42 +02:00
Magne Sjaastad
a08a4eb5ef Added custom wrapper for json files to control install features of json 2016-06-02 11:31:41 +02:00
Magne Sjaastad
cecd942989 Several Linux fixes 2016-06-02 09:57:25 +02:00
Magne Sjaastad
024b730803 Fixed typo 2016-06-02 09:38:22 +02:00
Magne Sjaastad
9b6e422d0c #742 Integrated opm-parser and added basic unit test 2016-06-01 15:53:21 +02:00
Magne Sjaastad
2892653298 #742 Added custom-opm-parser, compiles on Windows 2016-06-01 15:53:21 +02:00
Magne Sjaastad
758b4a452b #742 Added custom-opm-common to ThirdParty 2016-06-01 15:53:21 +02:00
Magne Sjaastad
54c98ca9f8 #742 NRLib now uses Boost from CMake 2016-06-01 15:53:21 +02:00
Jacob Støren
40388b308b #739 Added summary case classes. Use those from the summary curves. Made save/restore work again for the summary plots. File format for Summary stuff are changed. 2016-05-31 13:48:22 +02:00
Jacob Støren
5732b5008f Cached result variables in the summary reader
Fixed late field initialization
Additional cleanup and rename
2016-05-31 13:48:22 +02:00
Magne Sjaastad
e3fd05145f #734 Fixed issue on Linux when compiling in-source ERT 2016-05-26 21:40:19 +02:00
Magne Sjaastad
31cb06089d #734 Added support for linking with both custom and system installed external ERT library 2016-05-26 21:23:16 +02:00
Magne Sjaastad
d4dfdc9754 Fixed unit tests 2016-05-26 15:17:49 +02:00
Magne Sjaastad
1929798532 Moved include_directory from main to ApplicationCode. Include of Eclipse hearder files must now be prefixed with ert/<module_name> 2016-05-26 14:55:59 +02:00
Jacob Støren
f0dc0abada #739 Cleaned up RimSummaryCurve.h a bit. 2016-05-26 14:23:29 +02:00
Jacob Støren
ae615901b8 #739 Moved windowsGeometry data to the RimViewWindow base class
Introduced an interface for setting and getting mdiWindow Geometry
Changed file keywords from GraphPlot etc to SummaryPlot
Added a summary plot QwtPlot descendant
Added handling of delete of the MDI window
2016-05-26 13:17:26 +02:00
Jacob Støren
38c15f57f2 #739 Show sum plot on creation. Load when opening project. Delete on close project 2016-05-25 14:05:31 +02:00
Jacob Støren
f8729a035c Rename variable 2016-05-25 13:54:06 +02:00
Jacob Støren
31e8009a6e #739 First crude but working version of Summary plotting 2016-05-25 13:15:17 +02:00
Jacob Støren
c32bad52ff #739 Added a common base class to represent and handle ViewWindows 2016-05-24 11:06:42 +02:00
Jacob Støren
cb8f2e47f5 #739 Aligned more to the way of the RimPlotCurve 2016-05-24 11:06:42 +02:00
Jacob Støren
e469eb1483 #739 Moved code creating curve from datetime and double data 2016-05-24 11:06:42 +02:00
Jacob Støren
c98f9af4dc #739 Moved the new RimPlotCurve class to a separate set of files 2016-05-23 17:33:44 +02:00
Jacob Støren
c2759e47b2 #739 Renamed and trimmed inside RimPlotCurve 2016-05-23 17:13:03 +02:00
Jacob Støren
a2ed19c687 #739 Splitted RimWellLogCurve into a RimPlotCurve base class for use with summary plot curves 2016-05-23 15:44:15 +02:00