OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,413 Commits 53 Branches 83 Tags
b305202a35d01d81514ff7df5ada2adeec38ae8a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Støren b305202a35 #478 Made access function const in ActiveCellInfo 2016-08-22 16:59:22 +02:00
Jacob Støren cf93a67b5e #273 Undefined grid faults between cells where one or both are inactive is now sorted into a seaparate predefined fault section. 2016-08-22 13:24:46 +02:00
Jacob Støren 37099929d6 #273 Added some comments 2016-08-22 10:48:40 +02:00
Jacob Støren 5d0c0cdc67 Fixed assert due to two fields in uiordering in GeoMechPropertyFilter 2016-08-22 10:39:44 +02:00
Jacob Støren c1f5ec5bdf #168 Finalized. Zoom along ray is now updated to cope with parallel projection. The code in the different navigations are cleaned up a bit, and alligned 2016-08-17 10:54:15 +02:00
Jacob Støren 0f3fe3ac1b Linux compile warning 2016-08-17 08:52:22 +02:00
Jacob Støren fbcf9fca11 #168 Merged in parallel projection 2016-08-16 23:20:33 +02:00
Jacob Støren 27830dcbeb #168 Added Perspective/parallel view tool button 2016-08-16 22:43:22 +02:00
Jacob Støren 4eddcc859a #168 Save and restore of parallel projection 2016-08-16 14:34:37 +02:00
Jacob Støren d13d0775b4 #168 Fixed zoom along ray problem making the camera end up with the scene behind it. 2016-08-16 13:41:10 +02:00
Jacob Støren 0eace5579a #168 Fixed shader based light in parallel projection 
Added the light position as a uniform in the standard light model shader snippet in the effect generator.
Set the uniform default value on the shader program where ever it is used.
Added an override global uniform set on the viewer to control the light position, and to set it far behind camera when in parallel projection.
 2016-08-16 10:58:07 +02:00
Jacob Støren a3499152a5 #168 Improved the front and back clipping plane calculation in relation to parallel projection. 
Added a margin of 20% to account for inaccuracies. Not new for far-plane, but became missing in the first commit regarding parallel projection.
 2016-08-15 16:11:38 +02:00
Jacob Støren c529e18351 #168 Switch to directional Fixed Function light when in parallel mode 2016-08-15 14:27:46 +02:00
Jacob Støren 853e92723b #168 Added hacklish control over Fixed Function default light. 2016-08-15 14:26:44 +02:00
Jacob Støren 20e7e9ec6e Removed compiler warning 2016-08-15 14:25:12 +02:00
Jacob Støren 79a025e06f #168 Zoom All improved to handle parallel projection 2016-08-15 08:57:22 +02:00
Jacob Støren 742ee46f78 #168 Grid box side visibility now handles parallel projection 2016-08-15 08:57:20 +02:00
Jacob Støren 5cdf307d4e WIP: Improved support for parallel projection. #168 
Near plane negative to show everything
ZoomAlongRay now works for parallel projection (only implemented in
ceetron Plus)
 2016-08-15 08:55:28 +02:00
Jacob Støren 23bfb46c4c #780 Made Gui and a crude auto assignment of appearance. 
Renamed
 2016-08-09 11:35:48 +02:00
Jacob Støren 43a1f4dbbe Linux compile fixes 2016-08-09 07:41:08 +02:00
Jacob Støren 1e9e6d8541 #780 Cleanup and alignment 2016-08-08 15:33:20 +02:00
Jacob Støren 10d5da6ef5 #780 A major step towards a flexible assignment of curve appearance based on the properties of the curve data 2016-08-08 15:16:08 +02:00
Jacob Støren 9746bf7ccb Fixed linux compile error 2016-08-05 12:36:49 +02:00
Jacob Støren ff6b198966 #775 Short name for summary cases refurbished 2016-08-05 11:05:58 +02:00
Jacob Støren 0d7a1e8bd7 #770 Fixed Ailien curves bug 2016-08-04 11:23:26 +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
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 d4bb4011bd Upped version to 1.6.2-dev after sprint 2 (and some) 2016-06-21 19:37:20 +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 80cdb9dbaf Caf: Adjusted output of references from PtrArrayField 2016-06-20 16:51:36 +02:00
Jacob Støren eaf6bb6768 Caf: Improved reference parsing by using regexp for splitting an any whitespace 2016-06-20 16:50:47 +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 4a19589d36 Caf: Linux compile fixes: Missing includes 2016-06-20 00:04:09 +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 327e8cf64b Caf: Added PdmPtrArrayField to be used in ResInsight as multi select of summary cases 2016-06-19 21:36:44 +02:00
Jacob Støren 0b7abb0cab Caf: Added specialization for PdmPointer<T>. 
Preparations for PtrArrayField. Made isEqual use QVariant::value<T>()
 2016-06-19 21:36:44 +02:00
Jacob Støren f2da9bfea1 Caf: Small Adjustments 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
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 214f013499 Caf: Fixed issues regarding custom type in fields with multi selection 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 e1fa9aa9f3 Caf: Corrected the spesialization of field of vector and list equality compare, which is supposed to be pr. element 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
Jacob Støren 2687a794fd Merge pull request #763 from OPM/summary-plot 
Merging the new Summary Plot and OPM-Parser integration into dev
 2016-06-14 15:27:51 +02:00
Jacob Støren 73e72623d2 Set to compile internal libraries statically by default 2016-06-12 15:47:41 +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
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 7419ad5089 Caf: Added default tab order in the property editor widgets. 2016-06-10 12:18:26 +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 c2e62c60ba caf: Added an option on ui fields to not add their value to the list of options if the option does not exist. 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
Jacob Støren 94bf950278 Boost is set to be staticly linked on MSVC and dynamic on linux 
On MSVC force user to add the paths to the boost directories
 2016-06-03 16:25:48 +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
Jacob Støren 286c434d3a caf: Added assert to guard against forgetting to add the fields using the init field macros 2016-05-31 13:48:22 +02:00
Jacob Støren d90a6041aa caf: Added CAF_PDM_ABSTRACT_SOURCE_INIT alias 2016-05-31 13:48:22 +02:00
Jacob Støren f0dc0abada #739 Cleaned up RimSummaryCurve.h a bit. 2016-05-26 14:23:29 +02:00
Jacob Støren e8c70e7047 Updated the simple test project 2016-05-26 13:19:23 +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 a33929505d Updated the plantuml of the plot related classes 2016-05-25 11:56:39 +02:00
Jacob Støren bb6454126a Added a test project with some well log extraction curves 2016-05-24 14:07:01 +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
Jacob Støren f7d5d92029 Upped to version 1.5.111-RC after fixing #712 2016-01-10 21:39:30 +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 cc9f20e912 Upped to version 1.5.110-RC 2016-01-07 14:25:40 +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
Jacob Støren fc7721dc20 Upped to 1.5.108-RC after fixing #709 2015-12-15 14:02:27 +01:00