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
3,488 Commits 31 Branches 61 Tags 287 MiB
993a67edb6
Commit Graph

2646 Commits

Author SHA1 Message Date
Magne Sjaastad
eae6012b77 #282 Use value selection to filter cells 2016-08-05 10:27:19 +02:00
Magne Sjaastad
c5d4519eb1 #282 Added category list if category values are present 2016-08-05 10:26:47 +02:00
Magne Sjaastad
261ccd33e5 (#282) Added basic data structures to compute and cache unique integer values 2016-08-05 10:26:21 +02:00
Magne Sjaastad
24abb27674 #748 Added cell property sum to Info box statistics 2016-08-04 14:15:59 +02:00
Jacob Støren
0d7a1e8bd7 #770 Fixed Ailien curves bug 2016-08-04 11:23:26 +02:00
Magne Sjaastad
4bfef4ead0 Merged in changes from maintenance branch 2016-08-04 11:12:53 +02:00
Jacob Støren
71dce565c5 #803 Added version number to dock/toolbar layout registry settings 2016-08-03 14:05:55 +02:00
Jacob Støren
3bcb7b9f1b #802 Better default dock and toolbar layout. 
Window managment toolbar moved.
Created a Draw Style toolbar
 2016-08-03 13:29:46 +02:00
Jacob Støren
12e9768939 Fixed a crash if the summary header file is not available 2016-08-03 10:43:45 +02:00
Jacob Støren
7c0f81d050 Added more summary curve related context commands, and added some separators. 2016-08-03 10:37:26 +02:00
Magne Sjaastad
c3328003d0 #254 Avoid creation of cell face geometry if a fault is present at the face 2016-08-01 21:51:05 +02:00
Magne Sjaastad
5090eddf44 #254 Show fault colors in combination with cell edge colors 2016-08-01 17:16:55 +02:00
Magne Sjaastad
a7d0c0c83e #751 : Well pipes for intersections based on Simulation Wells disappears when a Range Filter is applied 2016-07-27 08:05:44 +02:00
Magne Sjaastad
512f8904de AppFwk: Do not toggle item when tree item editor widget (QLineEdit) is closed with Enter key 2016-07-25 18:25:14 +02:00
Magne Sjaastad
fa19a74dcc #225 Clear Result Info and Result Plot when closing a case 2016-07-18 16:16:10 +02:00
Magne Sjaastad
b0caea9e98 Cleaned up includes 2016-07-18 15:38:33 +02:00
Magne Sjaastad
6e29bfe525 #649 New script feature : Create empty file before opening text editor 2016-07-18 15:36:53 +02:00
Magne Sjaastad
5ec9b9c568 #649 Added 'Refresh' to script collections 2016-07-18 15:01:14 +02:00
Magne Sjaastad
0aababbb12 Linux : Changed order of includes 2016-07-16 18:35:15 +02:00
Magne Sjaastad
686aef821e Cleaned up includes 2016-07-16 16:31:55 +02:00
Magne Sjaastad
68c0d906fb #590 Fault labels are not shown outside filters when faults are 2016-07-16 16:09:03 +02:00
Magne Sjaastad
7444029424 #725 Grid Case Group: SOIL is not computed when loading multiple cases into a group 2016-07-15 14:46:23 +02:00
Magne Sjaastad
52f6b9a635 Give focus to Ok button after adding a folder 2016-07-15 13:56:41 +02:00
Magne Sjaastad
2c96599327 #744 Error message for snapshots in Batch mode 2016-07-15 10:55:20 +02:00
Magne Sjaastad
c6a41cc18f #717 Octave script can not be executed for multiple case in Project Tree 2016-07-15 10:36:17 +02:00
Magne Sjaastad
97232fedd4 #752 Result Info reports "Grid cell" value to be Inf 2016-07-15 09:57:00 +02:00
Magne Sjaastad
09c711da01 (#727) Missing Dynamic parameters not reported for intital time step 2016-07-15 09:07:14 +02:00
Magne Sjaastad
f7117ae0e2 #789 Add properties from standalone files to opm-parser Input Cases 2016-07-12 18:54:55 +02:00
Magne Sjaastad
4cb91128e7 #788 opm-parser: Read faults as part of reading input data 2016-07-12 14:08:05 +02:00
Magne Sjaastad
ab4829b2d9 #775 Added user editable curve display name to summary cases 2016-07-06 13:35:24 +02:00
Magne Sjaastad
adb6c74f3a #788 Opm-parser: Binary eclipse case now uses opm-parser to read fault data 2016-07-06 09:49:31 +02:00
Magne Sjaastad
2e8c4ac211 #792 Summary: Added storing of visible display window based on zoom and pan 2016-07-05 14:58:42 +02:00
Magne Sjaastad
b8615f0ebc #792 Added Window zoom and Zoom All 2016-07-05 10:47:03 +02:00
Magne Sjaastad
2715310782 #776 Possible to add case name to autogenerated curve name 2016-07-01 11:34:37 +02:00
Magne Sjaastad
7584e03883 Added context menu NewSummaryPlot for summary cases 2016-07-01 11:34:37 +02:00
Magne Sjaastad
1a0dc53bd6 Merge pull request #794 from OPM/link-order-fix 
Fix ordering of link libraries
 2016-07-01 07:42:46 +02:00
Magne Sjaastad
b3c31acd20 #795 Use GRDECL in file filter when opening Eclipse input files 2016-06-30 15:28:35 +02:00
Magne Sjaastad
d7493c19ae Make sure commands related to plots update the tree view in the plot window 2016-06-30 15:19:40 +02:00
Magne Sjaastad
fc8116d5fa #790 Fixed ordering of link libraries 2016-06-30 14:53:38 +02:00
Magne Sjaastad
7e89fb4b49 (#777) Show default summary curves when importing an Eclipse case with summary data 2016-06-30 14:01:50 +02:00
Magne Sjaastad
bfc58f3201 #777 Create default curve filter when creating a summary plot 2016-06-30 11:21:04 +02:00
Magne Sjaastad
e730e5bf9f (#791) Update well path filename if project file is relocated 2016-06-30 11:20:41 +02:00
Magne Sjaastad
124585b96a Moved relocateFile to RimTools 2016-06-29 15:45:20 +02:00
Magne Sjaastad
cd27ae2462 Fixed compare between signed / unsigned values 2016-06-29 14:41:18 +02:00
Magne Sjaastad
ac5402ca5a Added updateViewerWidgetWindowTitle for summary plots 2016-06-29 14:41:17 +02:00
Magne Sjaastad
ea6d652a17 Added missing initialization of distance when picking in Qwt plots 2016-06-29 14:41:17 +02:00
Magne Sjaastad
bb18c28cf3 Test for NULL pointer before returning well path name 2016-06-29 14:41:16 +02:00
Magne Sjaastad
9362530666 Excluded some files from cotire 2016-06-29 14:41:15 +02:00
Magne Sjaastad
75c08979c7 Added support for active summary plot 2016-06-29 14:41:15 +02:00
Magne Sjaastad
cac86dcec9 Fixed mouse interaction with well log plots and tracks 2016-06-29 14:41:14 +02:00
Magne Sjaastad
0680e830b4 Added CopyViewToClipboard feature 2016-06-29 14:41:13 +02:00
Magne Sjaastad
2e0553d99c Tile windows feature for plot window 2016-06-29 14:40:37 +02:00
Magne Sjaastad
3b55f98dbd Added ShowPlotWindow feature 2016-06-29 14:40:37 +02:00
Magne Sjaastad
119881dc7d Removed obsolete code related to actions, menus and dock widgets 2016-06-29 14:40:20 +02:00
Magne Sjaastad
0a08e0f545 Added case name and summary header file 2016-06-29 14:39:06 +02:00
Magne Sjaastad
bbf1574feb Wired up application logic related to new RiuMainPlotWindow 2016-06-29 14:38:11 +02:00
Magne Sjaastad
e92624a862 Moved setting for main windows geometry and toolbar state to RiuMainWindowBase 2016-06-29 14:38:06 +02:00
Magne Sjaastad
aef466087d Established RiuMainPlotWindow 2016-06-29 14:37:41 +02:00
Magne Sjaastad
ef86eb0b8e Removed duplicate add of well path field 2016-06-29 12:48:47 +02:00
Magne Sjaastad
94efe9b14c Test for NULL before assigning string 2016-06-29 10:43:36 +02:00
Magne Sjaastad
85fab1e749 Improved text display of messages from opm-parser 2016-06-24 12:19:19 +02:00
Magne Sjaastad
04a12ce592 (#743) Removed input property collection 2016-06-24 11:42:15 +02:00
Magne Sjaastad
6a4ef00c41 (#743) Hide "Add Input Property" 2016-06-23 15:59:47 +02:00
Magne Sjaastad
830db2c6ec (#743) Added import of Input Case using opm-parser 2016-06-23 14:36:33 +02:00
Jacob Støren
27f6b980fe #778 Display unit on Y-Axis. Added unit to legend. Cosmetics on Curve Filter Prop-panel 2016-06-22 14:34:56 +02:00
Jacob Støren
6aa5ba9e2d Linux include compile fixes 2016-06-22 12:38:29 +02:00
Jacob Støren
eec539b793 #786 Picking curves selects the curve 2016-06-22 11:34:26 +02:00
Jacob Støren
58391efef1 Whitespace 2016-06-22 11:28:19 +02:00
Jacob Støren
28fc415231 Summary Filter: Renamed Any to All (Advanced) 2016-06-22 10:58:29 +02:00
Jacob Støren
bb4e2c7f45 #785 Symbol skip distance implemented 2016-06-22 10:42:45 +02:00
Jacob Støren
12e1e47bf1 Summary curves: Turned on anti-aliasing, Showing complete curve appearance in legend. Added Symbol skipping as feature. 2016-06-22 10:38:04 +02:00
Jacob Støren
268d8dda68 #780 A prototype of linetype pr case color pr var mode 2016-06-21 17:29:23 +02:00
Jacob Støren
f581c172f6 #783 Summary: Make legend show all aspects of the curve 2016-06-21 16:49:07 +02:00
Jacob Støren
5c09935ac5 #782 Avoid creating curves for none existing data. 2016-06-21 15:56:09 +02:00
Jacob Støren
833de65df6 #781 Icons for Summary plot items 2016-06-21 14:17:50 +02:00
Jacob Støren
c510a57566 #771 Changed names in the Plot Curve Curve Filter proximity 2016-06-20 17:55:11 +02:00
Jacob Støren
53e5562738 #764 Disable xml IO of selected cases. We rely on the curves. 2016-06-20 16:54:20 +02:00
Jacob Støren
26191fd54d #764 Re-apply multi-case selection on project load 2016-06-20 12:12:00 +02:00
Jacob Støren
b0e8800bb8 #764 Removed "None" option from summary case list in Curve Filter 
Made case field none-auto-add-option
 2016-06-19 21:52:42 +02:00
Jacob Støren
f60a0619e7 #764 Summary: Added multi select of summary cases 2016-06-19 21:36:44 +02:00
Jacob Støren
9f54d74c7f Summary: Whitespace, rename method and hide unused variables display field 2016-06-19 21:36:44 +02:00
Jacob Støren
8f12eb9a19 #768, #767, #766 2016-06-17 13:07:26 +02:00
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
Jacob Støren
24edb0501e WIP: Started to create the summary plot Rim data structures. 2016-05-09 12:16:55 +02:00
Magne Sjaastad
21f8b722b1 Redirect stdout and stderr to console using freopen_s 
Previous redirection code does not work on VS2015, this commit works on
both VS2010 and VS2015
 2016-05-04 15:11:42 +02:00
Magne Sjaastad
8f3b88c798 Commented out unit test with local path 2016-05-04 14:32:28 +02:00
Magne Sjaastad
5640621049 Added EclipseSummaryAddress 2016-05-04 14:11:04 +02:00
Magne Sjaastad
2a24034cc2 Commented out tests including local file path 2016-04-20 08:29:23 +02:00
Magne Sjaastad
2b7a6d546c Added missing include 2016-04-20 08:24:57 +02:00
Magne Sjaastad
4b33c31a0f (#736) Added support for basic metadata and basic value queries 2016-04-20 08:05:35 +02:00
Magne Sjaastad
cb16f3c322 Fixed issues when loading Odb-projects into ResInsight with no Odb support 2016-01-11 10:08:47 +01:00
Magne Sjaastad
5fb04e9526 [System] Added support for display of regression images on top of each other in regression report 
Use a slider concept (using CSS) to switch between generated and base
image
 2016-01-11 08:00:05 +01:00
Jacob Støren
d4ec42e9a2 (#712) Made a possible well cell connection in the wellhead control the connection color of the well pipe. 2016-01-10 21:33:50 +01:00
Jacob Støren
0e8191d6eb (#712) Set well head connection status to closed always as they are no part of the connection table in Eclipse 
This to remedy that ERT returns open as connection status for well heads.
 2016-01-07 14:24:59 +01:00
Magne Sjaastad
1c4c1d254e (#711) Use most recent activated Eclipse view if a well log plot is active 
Octave scripts must have an Eclipse view to communicate with. If a WLP
is active, evaluate recently used views to find the most recently
Eclipse view used.
 2016-01-06 23:01:27 +01:00
Magne Sjaastad
f00ecd9a5a System : Include runtime dlls on Windows 
msvcp/msvcr/vcomp is now included in the install package on Windows
 2015-12-22 15:00:27 +01:00
Magne Sjaastad
0a15ccf577 Fixed missing selection of well path in project tree when clicking on a well path in 3D view 2015-12-16 09:46:08 +01:00
Jacob Støren
7737a713c5 Removed invalid cells from bbox search tree. 
Improving performance on startup and avoid possible stack exhaust error.
 2015-12-15 13:50:59 +01:00
Jacob Støren
cd4c9e6ee0 (#709) Invalid cells destroyed the intersection calculation for well log 
Omit the invalid cells from the calculation.
 2015-12-15 13:41:32 +01:00
Jacob Støren
4d6deef8ab (#708) Fixed simulation well geometry and color mapping. 
Had been sligtly off since 1.5.0.
 2015-12-14 11:25:55 +01:00
Jacob Støren
6db74465b6 Removed debug output 2015-12-14 09:53:59 +01:00