OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-12 08:25:03 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,220 Commits 58 Branches 85 Tags
155dba5591337cdd4c6d809629472a8ac0e7126d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gaute Lindkvist 155dba5591 #4206 Set new defaults for grid cross plot 2019-03-19 09:08:02 +01:00
Gaute Lindkvist f09f487635 #4143 First implementation of export sector model 2019-03-18 12:56:09 +01:00
Gaute Lindkvist 136f13e145 #4198 Make sure exit application works as expected with both windows open 2019-03-14 15:24:11 +01:00
Gaute Lindkvist 52d2eed98b Fix log axis crash in Grid Cross Plot and refactor log axis range code 2019-03-14 09:58:12 +01:00
Gaute Lindkvist 0ce69d41dd Swap axis settings when swapping Grid Cross Plot axes + fix inverted axes for summary plot 2019-03-14 09:58:11 +01:00
Gaute Lindkvist 925747b9d4 Fix warnings about QStyleFrameOptionsV4 2019-03-14 09:50:58 +01:00
Gaute Lindkvist 117731a24a #4192 Add swap axis and update property editor 2019-03-12 14:34:22 +01:00
Gaute Lindkvist 22f7bf7c21 Update RifReaderEclipseOutput and RimEclipseCase to use new progress tasks 2019-03-12 14:34:22 +01:00
Gaute Lindkvist 749e19a879 Create a simpler task system for handling sub tasks in progress dialog. 
* Remove incrementProgressAndUpdateNextStep() method
 2019-03-12 14:34:22 +01:00
Gaute Lindkvist e72f57072c #4185 Implement data export for Grid Cross Plot 2019-03-12 09:19:01 +01:00
Gaute Lindkvist 8382b5cfdd #4144 Remove grid import buttons from plot window and add ensemble import 2019-03-08 10:41:32 +01:00
Gaute Lindkvist b22ca46dc5 #4187 Make WindowCloseButtonHint part of the default dialog flags 
* Dialogs on the Qt5 build has the close button disabled and this fixes that.
 2019-03-08 10:23:18 +01:00
Gaute Lindkvist e00f983360 #4166 Add feature for swapping cross plot axes + tweaks to legend 
* Also put x and y property side by side in property editor
 2019-03-08 09:59:38 +01:00
Gaute Lindkvist 1dd16948af Make category integer the default legend type for Grid Cross Plots 2019-03-07 19:04:10 +01:00
Gaute Lindkvist 6f1ed595b5 #4184 Resize legend if it becomes larger than plot area. 2019-03-07 19:00:38 +01:00
Gaute Lindkvist 804a196ce3 #4167 Implement option for inverting axes 2019-03-07 14:34:47 +01:00
Gaute Lindkvist d2393cb8a5 #4156 Simplify curve naming code 2019-03-07 14:20:28 +01:00
Gaute Lindkvist 4c5ffffd60 Set all pointers in RiaApplication to null in constructor initialisation list 2019-03-07 10:21:31 +01:00
Gaute Lindkvist 0cc1b256b2 Add back missing whitespace between functions in RiaApplication 2019-03-07 10:21:23 +01:00
Gaute Lindkvist e9e21cf30d #4171 Work around assert failure when closing main window last 2019-03-07 09:13:56 +01:00
Gaute Lindkvist fd01871202 #4173 Fix problems with saving state when closing 3d Window before closing plot window 2019-03-07 09:13:56 +01:00
Gaute Lindkvist 0dbd3e8ad4 #4170 Add Qt version string to ResInsight registry folder 
* Qt version has an impact on whether the strings are compatible.
 2019-03-07 09:13:56 +01:00
Gaute Lindkvist 8845c456bc Grid Cross Plot: Use the term Grouping instead of Categorization 2019-03-05 13:35:35 +01:00
Gaute Lindkvist b6a2bcfa59 #4168 Treat some properties as categories. 2019-03-05 13:12:40 +01:00
Gaute Lindkvist ac7eccee88 #4157 Grid Cross Plot: Make categorisation legend more like ensemble legend 2019-03-05 10:41:41 +01:00
Gaute Lindkvist be95eefd69 Repository wide spelling correction overly -> overlay 
* Impacts CAF and ResInsight
 2019-03-05 10:41:41 +01:00
Gaute Lindkvist 89a68d099a #4156 Don't show the common part of Grid Cross Plout curve names in legend 2019-03-05 10:41:41 +01:00
Gaute Lindkvist 3d145464c1 #4145 #4146 Add Create Grid Cross plot command to view and rename filter view 2019-03-01 15:49:02 +01:00
Gaute Lindkvist b4d8dc7819 Update Curve Names when changing parameters 2019-02-28 18:30:07 +01:00
Gaute Lindkvist d1c14f9729 #4118 Limit data points in grid cross plot by cells visible in view 2019-02-27 14:34:18 +01:00
Gaute Lindkvist 618369d7a8 Only allow eclipse cases for Grid Cross Plots 2019-02-27 13:47:10 +01:00
Gaute Lindkvist 27f9e95e51 #4105 Remove sum from info box for Contour Maps 
* The sum is misleading and isn't showing a value that makes any sense to the user.
 2019-02-27 13:34:09 +01:00
Gaute Lindkvist e1dbbbaf51 #4117 Grid Cross Plot Reliability and UI improvements 2019-02-27 12:47:00 +01:00
Gaute Lindkvist 1e994ac8b8 #4117 Improve time step names for Grid Cross plot categorisation 2019-02-27 11:38:35 +01:00
Gaute Lindkvist 1b9a0fe5a7 #4117 Refactor Grid Cross plot result extraction and categorisation 2019-02-27 10:57:17 +01:00
Gaute Lindkvist b6348b8374 #4117 Categorization by any Eclipse result 2019-02-27 09:25:08 +01:00
Gaute Lindkvist 41b6cd55f2 #4117 Implement formation categorisation 2019-02-26 16:22:01 +01:00
Gaute Lindkvist aa5935d5db Fix some issues related to legends in Grid Cross Plots 2019-02-26 15:42:58 +01:00
Gaute Lindkvist 7fa174807e #4139 Ensure property editor is in sync with Qwt range 2019-02-26 11:44:26 +01:00
Gaute Lindkvist 4c026952a1 #4134 #4124 Refactor RiuSummaryQwtPlot on top of a base RiuQwtPlot class and use this for Cross Plots 
* Get a lot of functionality included: zoom, panning, etc.
 2019-02-26 11:44:26 +01:00
Gaute Lindkvist 2582e98961 #4135 Fix oversized legend icon for the first cross plot entry 2019-02-25 08:32:01 +01:00
Gaute Lindkvist 39a0c3f4d0 #4128 Show Qwt symbol and color as icon in project tree 2019-02-22 11:37:17 +01:00
Gaute Lindkvist 26f4577803 #4129 Don't recreate all curves when toggling curve set 2019-02-22 10:15:07 +01:00
Gaute Lindkvist 0aa7dc1777 #4121 Set default case and parameters when creating Cross Plot 2019-02-22 09:48:56 +01:00
Gaute Lindkvist 1536645e7c #4132 Temporarily fix contour map crash by commenting out processEvents 2019-02-22 09:06:51 +01:00
Gaute Lindkvist 64949011b3 Remove an async delete child objects operation 2019-02-22 08:44:10 +01:00
Gaute Lindkvist 760fcaef43 #4130 3D Cross Plot: Improve window management 2019-02-21 15:42:40 +01:00
Gaute Lindkvist 7e57ec39ea 3D Cross Plot: Improve colors and symbols in legend 2019-02-21 15:42:40 +01:00
Gaute Lindkvist a010fc03d7 3d Cross Plot: First implementation (#4127) 
* First cross plot commit

* Made cross plot deal with "all time steps" and categorise curves based on time step

* Support STATIC vs DYNAMIC plotting

* #4115 Avoid updating plots in RimEclipseCase::computeCachedData()

* Make sure loading of Cross plot from file works

* Show Legend in Cross Plot

* Uncheck / Check curves to disable/enable

* Axis titles and checkable data set

* Name config and setting of common plot look

* Fix category indentation in GeoMech results

* Support name configuration for Grid Cross Plot

* Support adding new curve sets

* Improve colors and symbols with better cycling

* Moved GridCrossPlot files to sub directory in ProjectDataModel and Commands

* #4111 3D calculations : Always show difference options

* Whitespace

* #4111 Move resultDefinition field to private

* Whitespace

* #4087 Ensemble : When importing and ensemble, show by default an ensemble plot

* #4085 3D view: Improve overlay item colors

* #4106 Crash on Linux

Temporary workaround to avoid crash

* #4106 Stop trying to do recursive setting tab order widget

* The double pointer was handled wrongly and shift-tab order isn't working anyway.

* #4114 Regression Test : Remove cached pointer to eclipse case

* Revert "#4114 Regression Test : Remove cached pointer to eclipse case"

This reverts commit f2146c6007.

* #4114 Regression Test : Missing data for flow diag property filter

* #4085 3D view: Add check box for version info text

* Whtespace

* Improve labelling of static results

* Fix update of result property when changing type
 2019-02-21 12:52:23 +01:00
Gaute Lindkvist 8182421fb5 Fix category indentation in GeoMech results 2019-02-21 08:10:35 +01:00
Gaute Lindkvist 90b189f490 #4115 Avoid updating plots in RimEclipseCase::computeCachedData() 2019-02-20 11:51:39 +01:00
Gaute Lindkvist 66e57890dc #4106 Stop trying to do recursive setting tab order widget 
* The double pointer was handled wrongly and shift-tab order isn't working anyway.
 2019-02-20 09:33:05 +01:00
Gaute Lindkvist 6bdd4b8178 #4088 Update View names in Window Title when changing the custom name part 2019-02-15 13:36:20 +01:00
Gaute Lindkvist aeb964a89a #4096 Make sure the base time steps are taken from the base case 
* Also clear time lapse option when changing base case. We don't know if the currently
  selected time step exists in the new case.
 2019-02-15 13:16:51 +01:00
Gaute Lindkvist e0913d8a21 #4096 Reorder case / time diff to put case diff first 2019-02-15 13:16:51 +01:00
Gaute Lindkvist eb0c2e4737 #4096 Simplify code for loading case and time diff to use same method 2019-02-15 13:16:51 +01:00
Gaute Lindkvist fbd1486a4c #4096 Fix combination of case and time diff for identical cases 2019-02-15 13:16:51 +01:00
Gaute Lindkvist a6d29c6f96 #4090 Update fix for crash with no label editors 2019-02-15 13:16:51 +01:00
Gaute Lindkvist 833a29c3c2 #4062 #4081 Make time and case diff apply immediately and don't change variable name 
* Instead show the change in the Result label, legend and info box.
 2019-02-15 13:16:51 +01:00
Gaute Lindkvist d9da9a7752 #4053 Add ensemble input to import toolbar + geomech import toolbar 2019-02-12 17:00:55 +01:00
Gaute Lindkvist f61a4bcdb1 #4052 Seperate EGRID and GRID file filters 2019-02-12 16:44:37 +01:00
Gaute Lindkvist 72b667a5e3 #4072 Fix well path creation on intersections in 3d View 2019-02-12 16:33:03 +01:00
Gaute Lindkvist 33eea61852 #4054 More toolbar adjustments 2019-02-12 14:36:14 +01:00
Gaute Lindkvist 7e43509f41 First implementation of cafPopupWidget and used for animation speed 2019-02-12 12:21:13 +01:00
Gaute Lindkvist 2b9f6e10bc #4054 Remove play backwards and repeat backwards 2019-02-12 08:42:02 +01:00
Gaute Lindkvist 8c130bbc6e #4070 Add pick cursor to measurements 2019-02-12 08:21:01 +01:00
Gaute Lindkvist d9672ad9a1 Simplify pick event system 2019-02-11 15:48:02 +01:00
Gaute Lindkvist fac9870c76 Rework caf Layout to work better when number of columns isn't fully specified 2019-02-11 15:48:01 +01:00
Gaute Lindkvist 0fd51b2088 #4025 Show delayed action progress bar during contour map generation 2019-02-11 13:10:38 +01:00
Gaute Lindkvist 4e17b5acfa #4047 Alter mouse cursor in Vec3dPickEventHandler 2019-02-07 16:34:43 +01:00
Gaute Lindkvist 5379d692df Fix crash when adding new Stim Plan Templates and clicking cancel in file dialog 2019-02-07 10:10:06 +01:00
Gaute Lindkvist c9419b41e2 #4042 Add class diagram structure for caf::PickEventHandler 2019-02-06 14:15:24 +01:00
Gaute Lindkvist c4f5065032 #4045 Don't accept pick events if the current selected object isn't the object owning the pick handler. 2019-02-06 13:24:26 +01:00
Gaute Lindkvist dbe21b7809 Renames in RicPickEventHandler hierarchy 2019-02-06 09:45:30 +01:00
Gaute Lindkvist 4ec8869743 Rename in caf::PdmUiVec3dEditor 2019-02-06 09:39:47 +01:00
Gaute Lindkvist e4fa4b9994 Set a default Radius=100 for reach circles so they show up as soon as you pick 2019-02-06 08:21:14 +01:00
Gaute Lindkvist 8400e4ea02 Renames in RicPickEvent 2019-02-06 08:21:14 +01:00
Gaute Lindkvist 0e52426071 #4014 Use Vec3d Editor for Text and ReachCircle Annotations 2019-02-06 08:21:14 +01:00
Gaute Lindkvist 058b9cfb7a #4014 Implement caf::PdmUiVec3dEditor and a RicVec3dPickEventHandler 2019-02-06 08:21:14 +01:00
Gaute Lindkvist 5d35678d97 Refactor PickEvent Hierarchy to have a basis in Caf 2019-02-06 08:12:30 +01:00
Gaute Lindkvist d70e94ca85 #3996 Shift Measurement text box to not overlap with current segment 
* Check if line is tending left or tending right and shift box if it is tending left.
 2019-02-04 15:29:07 +01:00
Gaute Lindkvist f15d6dd385 #3997 Use AppEnum for font size in preferences as well so it is more easily shared. 2019-02-04 15:20:56 +01:00
Gaute Lindkvist 08cdd73148 #4024 Always report that a time step dependent result is visible in GeoMech contour maps 
* However, if a result is not a valid time step result, we instead show a dummy 0-result across the reservoir.
* This way we show something even if a valid result is not chosen.
* Also make this more obvious by reporting it in info box and legend.
 2019-02-04 12:02:12 +01:00
Gaute Lindkvist 956c973d17 #4032 Fix SFG-values in Well bore stability plots 2019-02-04 11:37:15 +01:00
Gaute Lindkvist 9bc6a4bc21 #4034 Make it optional to GeoMech Contour Map boundaries vertically 
* Map boundaries rather than grid boundaries.
* Does not limit height by default, but make it possible.
* Make sure we don't try to apply filters if the filter collection is inactive

Boundaries
 2019-02-04 11:06:07 +01:00
Gaute Lindkvist 1171884c1b #4033 Fix glitch with large padding for GeoMech 
* Off by one error in distance transform
* Need a larger bounding box to allow for full padding.
 2019-02-04 10:13:42 +01:00
Gaute Lindkvist 78b31db3b8 #4032 Fix SFG-values in Well bore stability plots 2019-02-04 09:27:02 +01:00
Gaute Lindkvist 653b0eb856 #4026 Contour Maps: Set +infinity (invalid) as max value if no valid max value was found 2019-02-04 08:17:02 +01:00
Gaute Lindkvist 9b90799e4c #3986 Fix a CMake warning and remove debug output for Qt5 
* Stop trying to copy the MSVC runtime with windeployqt. It isn't needed for private installs and for full installs it is already handled (removes warning about VCINSTALLDIR).
* Don't copy translations and QtQuick-import.
* Set verbosity to 0. This removes some useful messages about which libraries are copied, but also removes many useless warnings. The default verbosity of 1 leaves them all in. It doesn't appear very fine grained.
 2019-02-01 12:45:10 +01:00
Gaute Lindkvist ff1cedcc6f #4011 Remove stop button and alter state of buttons depending on animation stage. 2019-02-01 11:05:51 +01:00
Gaute Lindkvist 22b60d4cff Remove unused variables from Well Target Pick Event Handler 2019-02-01 07:56:48 +01:00
Gaute Lindkvist b4231775ef #4012 Add assert to the well path element intersections 2019-02-01 07:56:05 +01:00
Gaute Lindkvist e689b7ceaf Updates to make well path creation intersection work better with GeoMech 2019-02-01 07:56:05 +01:00
Gaute Lindkvist 107a4b9b60 #4012 Always place well target points in real cell geometry 2019-02-01 07:56:05 +01:00
Gaute Lindkvist d882261511 #4027 Increase max padding for GeoMech contour maps 2019-01-31 16:05:25 +01:00
Gaute Lindkvist 4019f1f981 Remove initialization list use for QStringList 2019-01-31 09:16:35 +01:00
Gaute Lindkvist 69b20a2aa9 #4007 Create new combined import button and move the others to an opt… (#4021) 
* #4007 Create new combined import button and move the others to an optional "Import"-toolbar

* #4007 Make sure we check that fileName vector isn't empty before accessing it
 2019-01-31 09:02:09 +01:00
Gaute Lindkvist d61a18ee6e Fix Linux build by removing unused EnsembleParameter::range 2019-01-30 09:19:17 +01:00
Gaute Lindkvist 54b5dc33f4 #4013 Create variation bins for ensemble parameters based on current data 
* Rather than having a fixed index.
* This way the variation is more or less always normal distributed.
 2019-01-30 09:07:52 +01:00
Gaute Lindkvist 4c5e277ebf std::fabs fix for Linux 2019-01-29 16:08:24 +01:00