OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
11,525 Commits 27 Branches 61 Tags 309 MiB
28c77d4b67
Commit Graph

9660 Commits

Author SHA1 Message Date
Magne Sjaastad
28c77d4b67 #82 Import Ascii-data : Minor code adjustments 2019-11-06 10:54:42 +01:00
Magne Sjaastad
309e4f9f31 #4993 Fix import property from text file when LGR is present 2019-11-06 09:39:27 +01:00
Magne Sjaastad
791de201b3 #82 Import Ascii-data : Add icon and move item in context menu 2019-11-06 09:38:32 +01:00
Kristian Bendiksen
31e0a0349f Add more comments. 2019-11-05 14:10:14 +01:00
Kristian Bendiksen
44b9e52e1b #4965 Fix crash when importing Eclipse input case. 
Added guard to avoid importing faults from the input property files when
faults already exists in the eclipse case. Faults can theoretically appear
in any of the files, but reading and appending them to the existing fault
collection is not currently supported.
 2019-11-05 13:32:13 +01:00
Kristian Bendiksen
ed59f0b618 Fix "Export Property To File" for RimEclipseResultCase. 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
470fab787d Hide InputPropertyCollection until it has some items. 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
8f085fead8 Make "Import Property" menu item available on RimEclipseInputCase. 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
f1e987f0b9 Extract method for reading input property data for remaing keywords. 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
9c53cfb44f Extract more methods from RifEclipseInputPropertyLoader::loadAndSyncronizeInputProperties. 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
c3dc8376be Extract two utility methods to make loadAndSyncronizeInputProperties smaller. 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
22a5a1fe0f #82 Import ascii grdecl input properties into simulation case. 
This allows data from text files to be imported into a binary Eclipse case
imported based on *.EGRID.
 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
357b07506f Move RimEclipseInputPropertyCollection to make it available in RimEclipseResultCase. 
Ref #82.
 2019-11-05 12:21:29 +01:00
Kristian Bendiksen
ce15aa1b5e Extract utility for loading input properties from file. 2019-11-05 12:21:29 +01:00
Gaute Lindkvist
f222f73718 #4984 Grid Cross Plot: Make sure pick point information is on top of highlighted curve 2019-11-05 11:09:18 +01:00
Gaute Lindkvist
c7b5957571 #4983 Fix drag zoom on Summary and Grid cross plots 2019-11-05 11:09:18 +01:00
Kristian Bendiksen
7d817d0277
Merge pull request #4967 from OPM/improve-export-filedialog-behaviour 
Improve export filedialog behaviour
 2019-11-05 10:39:50 +01:00
Kristian Bendiksen
37615f1bc8 Fix file filter for RicImportPolylinesAnnotationFeature. 2019-11-04 20:56:26 +01:00
Magne Sjaastad
57cab2457e clang-format : Set PenaltyBreakAssignment to 130 2019-11-04 15:08:09 +01:00
Magne Sjaastad
7c8cf60dba clang-format : Set AllowAllParametersOfDeclarationOnNextLine to false 2019-11-04 14:35:41 +01:00
Magne Sjaastad
96a26662fc Janitor : Apply clang-format fixes on codebase in ApplicationCode 2019-11-04 11:34:34 +01:00
Magne Sjaastad
e8cdf1a8ef Janitor : Remove boolean function always returning true 2019-11-04 10:16:29 +01:00
Magne Sjaastad
9ae07c838a #4919 Summary Plot : Improve colors of history curve symbols 2019-11-04 10:15:57 +01:00
Jacob Støren
5044784201
Merge pull request #4968 from OPM/feaure-fix-point-picking-in-comparison-view 
Fixes several issues from #4857
#4956 Fix List editor background setting
#4880 Fix annotations missing in comparison view
 2019-11-04 09:44:56 +01:00
Jacob Støren
52177994bd Improve readability of 3dView measurement in comparison view fix 2019-11-04 09:09:03 +01:00
Magne Sjaastad
a950852559 #4972 Summary : Add placeholder text to combo box editor 2019-11-03 14:49:08 +01:00
Magne Sjaastad
cd054f2170 Janitor : Use const ref when possible (2) 2019-11-03 14:08:21 +01:00
Magne Sjaastad
b46124efd7 Janitor : Use const ref when possible 2019-11-03 12:19:24 +01:00
Magne Sjaastad
93f6bc8c72 Janitor : Remove invalid conditionals 2019-11-03 11:43:46 +01:00
Magne Sjaastad
4ff56c7751 Janitor : Set copy constructor and assignment operator deleted 2019-11-03 11:14:48 +01:00
Magne Sjaastad
688750dfab Janitor : Make sure normalization of second vector also is verified 2019-11-03 08:54:12 +01:00
Magne Sjaastad
f35edc302f Janitor : Remove double if statement with identical test 2019-11-03 08:50:08 +01:00
Magne Sjaastad
67e7bb0cf3
Fixes detected by cppcheck (#4974) 
* Janitor : Remove obsolete pointer to dialog

* Janitor : Remove unused functions

* Janitor : Remove unused functions

* Janitor : Add explicit to constructors

* Janitor : Remove unused variables

* Janitor : Remove unused functions related to summary plot templates

* clang-tidy : Use nullptr instead of 0

* clang-tidy : Fix usage of virtual and override

* Upped to version 2019.08.2-dev.05

* Janitor : Remove unused variables

* Janitor : Clean up several cppcheck issues

* Janitor : Add cppcheck config files

* Janitor : Use const when possible
 2019-11-03 08:37:03 +01:00
Jacob Støren
6220225cfa #4970 Fix measurement text not visible in comparison view 2019-11-01 16:42:42 +01:00
Jacob Støren
f7fb4caa69 #4880 Fix annotations missing in comparison view 2019-11-01 15:57:04 +01:00
Jacob Støren
8bdb05447c Reordered Rim3dView.h 2019-11-01 15:57:04 +01:00
Jacob Støren
e85cd1b456 #4880 Further renaming of methods in Rim3dView 2019-11-01 15:57:04 +01:00
Jacob Støren
c9af22cf91 #4880 Refactoring in Rim3dView: De-virtualize updateCurrentTimeStepAndRedraw 2019-11-01 15:57:04 +01:00
Jacob Støren
b51e054ffd Renaming of more methods in Rim3dView. 
Removed virtual method from RiuViewerToViewInterface as it was not used from the interface.
 2019-11-01 15:57:03 +01:00
Jacob Støren
7f3f6419ac Rename virtual methods in Rim3dView 
To make it more clear that they are virtual methods to be distinguished from implementations in the base class. Also make their meaning somewhat more expressed.
 2019-11-01 15:57:03 +01:00
Jacob Støren
1ef4d49f14 #4857 Fix Intersection Box 3d manipulator interaction in comparison views 2019-11-01 15:57:03 +01:00
Jacob Støren
ce28f1e858 #4857 Avoid switching active view when creating intersectinos 2019-11-01 15:57:03 +01:00
Jacob Støren
dbd09e97e3 #4857 Fix intersection polyline picking in comparison view 2019-11-01 15:57:03 +01:00
Jacob Støren
99fb39bd68 Rename SubWindowActivated blocking methods 
to clarify their differences
 2019-11-01 15:57:03 +01:00
Kristian Bendiksen
60ac760254 Add txt suffix file pattern to make windows dialog behave better on windows. 2019-11-01 15:07:08 +01:00
Kristian Bendiksen
4c11564838 #4941 Workaround strange file name validation in "Export FLUXNUM/MULTINUM" dialog. 
Having an explicit filter for the default suffix (*.grdecl) removes the
strange complaint about the default file name not being valid.
 2019-11-01 15:07:08 +01:00
Gaute Lindkvist
a6b6411b6b Fix compile warning in RigGeoMechWellLogExtractor.cpp 2019-11-01 08:26:59 +01:00
Gaute Lindkvist
c5f5242f81 Fix compile warning in RifActiveCellsReader-Test.cpp 2019-11-01 08:26:34 +01:00
Magne Sjaastad
a5aa49c705 #4961 Summary : Fix description of some vectors 2019-10-31 18:54:27 +01:00
Gaute Lindkvist
5f72c03d52 Fix warning in RImSummaryCurvesCalculator 2019-10-31 15:37:30 +01:00