OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-12 00:16:10 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,081 Commits 29 Branches 61 Tags 290 MiB
461e3b87b8
Commit Graph

635 Commits

Author SHA1 Message Date
Magne Sjaastad
3a1147dcdf #2554 Non-Darcy : Add tool for text compare 2018-03-05 15:01:01 +01:00
Bjørn Erik Jensen
2f023f4016 Argument parser. Add ignoreArgs argument for testing purposes 2018-03-05 10:52:24 +01:00
Magne Sjaastad
2d01824ab3 #2560 Unit conversion : Add conversion based on parsing unit text string 2018-03-02 17:03:01 +01:00
Magne Sjaastad
25a1823f35 Merge branch 'dev' into cmake-improvements 2018-02-28 08:47:01 +01:00
Magne Sjaastad
89c090ba24 #2536 Build System : Remove obsolete code for cmake older than "2.8.2" 2018-02-28 08:05:00 +01:00
Rebecca Cox
2d931a81f5 #2523 Mohr circle: Remove colors from circles 2018-02-27 14:09:31 +01:00
Magne Sjaastad
10bc5c92ab #2532 Fracture : Create copy of fracture template if non-matching units is detected 2018-02-27 12:05:41 +01:00
Rebecca Cox
cbbc9c0f26 #2496 Tensor vectors: Two new paletts 2018-02-27 09:39:47 +01:00
Magne Sjaastad
72b5f540e5 #2529 Fracture : Remove all #ifdef USE_PROTOTYPE_FEATURE_FRACTURES 2018-02-26 20:54:45 +01:00
Rebecca Cox
2b368fb0b8 #2523 Mohr Circle: Improve circle appearence 2018-02-26 15:56:23 +01:00
Rebecca Cox
bf1a621332 #2523 Mohr Circle: Improve circle appearence 2018-02-22 18:10:24 +01:00
Rebecca Cox
b69b15145f #2496 Tensor vectors: Use dark magenta for principal 1 and move color code to RiaColorTables 2018-02-20 14:27:10 +01:00
Magne Sjaastad
1ae30ef11a (clang-tidy) : modernize-use-nullptr 2018-02-18 18:56:43 +01:00
Magne Sjaastad
8e1a7b2bbb #2455 Non-Darcy Flow : Compute D-factor and show in UI 2018-02-14 13:35:35 +01:00
Magne Sjaastad
a283a468c2 #2447 Fracture : Show fracture legend when only ellipse fractures are present 2018-02-06 12:42:13 +01:00
Jacob Støren
7dbffd0075 Add error to messages window if a requested regression test is not found. 2018-02-05 17:56:40 +01:00
Bjørn Erik Jensen
c09dd0522b Merge branch '2018.01.01-patch' into dev. #2086 2018-02-05 08:29:24 +01:00
Bjørn Erik Jensen
98a94c0525 #2086 Moved RifStringTools -> RiaStringEncodingTools 2018-02-02 15:44:28 +01:00
Magne Sjaastad
a4eb16883b #2441: Fracture Colors : Make sure conductivity result is set on template for old project files 2018-02-01 15:37:05 +01:00
Rebecca Cox
47d8508196 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-26 10:29:01 +01:00
Magne Sjaastad
889f615d19 #2276 : Source Stepping : Improve region ordering 
Internally, region numbers are stored in a set and then ordered correctly. When converting to strings for UI, the sorting criteria changes, and the order is wrong. If a vector is used to represent the UI strings, the problem is solved.
 2018-01-26 08:16:07 +01:00
Magne Sjaastad
001742cbd3 #2402 Fracture : Add support for multiple conductivities on a template 2018-01-25 14:17:10 +01:00
Jacob Støren
d34b3a7c74 #2331 Add 2d Intersection View collection with automatic views. The create command is adjusted into a "Show" command. 2018-01-23 14:37:52 +01:00
Magne Sjaastad
f0554d85af #2402 Fracture Conductivity : Add result name define 2018-01-22 15:07:59 +01:00
Magne Sjaastad
759d46813d #1544 Fracture Perforation Length : Set color to deep green 2018-01-22 13:00:11 +01:00
Magne Sjaastad
348b492cc1 RiaColorTables : Add and use undefinedCellColor() 2018-01-22 11:55:27 +01:00
Magne Sjaastad
828557f71f Whitespace and include cleanup 2018-01-17 09:23:45 +01:00
Jacob Støren
b092565a61 #2331 Introduce new intermediate class RimGridView 2018-01-15 14:53:48 +01:00
Jacob Støren
4b26354b30 #2331 Moved redraw scheduling and completion type recalc out of RiaApplication 2018-01-12 12:01:04 +01:00
Magne Sjaastad
7511e8a243 #2322 New View : Improve default values when creating view 2018-01-12 10:55:00 +01:00
Jacob Støren
cb6d49a611 #2331 Renamed RimView to Rim3dView 2018-01-09 10:11:28 +01:00
Magne Sjaastad
dbc1061a59 #2310 Version compare : Improve interface and add unit test 2018-01-04 12:38:12 +01:00
Rebecca Cox
cffca0f3fb #2310 Add a variety of version numbers 2018-01-03 13:54:00 +01:00
Magne Sjaastad
e7c8667b24 #2310 Add helper files and unit test for project file version queries 2018-01-03 13:17:29 +01:00
Jacob Støren
c27058f2a4 Adjust Completion Type recalculation timer from 0.5 s to 1.5 s 2018-01-02 12:31:20 +01:00
Magne Sjaastad
695978ed95 Regression Test : Use folder selection editor 2018-01-02 10:21:32 +01:00
Bjørn Erik Jensen
6d236c24de #2284 Completion export. Control inclusion of fracture debug info file from preferences 2017-12-22 13:10:35 +01:00
Magne Sjaastad
5ecedb7a30 Fixed typo 2017-12-21 09:44:42 +01:00
Magne Sjaastad
52b377e027 #1770 Current View Changes : Restore original visible view and tree state 2017-12-21 09:44:42 +01:00
Magne Sjaastad
5566acdcda #987 Summary Auto Title : Add support for auto plot title and improve curve names 2017-12-13 07:40:37 +01:00
Bjørn Erik Jensen
9769d391e1 #2199, #2245 Summary plots. Add paste commands for cross plot. Add duplicate summary plots and curves 2017-12-12 13:22:36 +01:00
sigurdp
01ae19ebbc #2235 RelPerm/PVT Plot: Added unit labels to relevant axes 2017-12-11 16:12:31 +01:00
Jacob Støren
84dcc0980e #2237 Progress bar when calculating flooded PV 
Fix errors in progress detected when opening project
 2017-12-08 16:56:42 +01:00
Magne Sjaastad
1a8f4e1829 Linux fix 2017-12-08 16:52:54 +01:00
Magne Sjaastad
e045a42131 #2127 Sim Well Branches : Remove unused includes, white space changes 2017-12-08 12:29:41 +01:00
Magne Sjaastad
46bad03c4a #2127 Clamp sim well branch index to valid range 2017-12-08 10:24:14 +01:00
Magne Sjaastad
0e5e88008a #2127 Sim Well Branches : Move logic related to uiOrdering to RiaSimWellBranchTools 2017-12-08 10:24:14 +01:00
Magne Sjaastad
9c4077a040 #2127 Sim Well Branches : Move logic related to uiOrdering to RiaSimWellBranchTools 2017-12-08 10:24:14 +01:00
Magne Sjaastad
1841379e64 #2127 Sim Well Branches : Major refactor of sim well branch computation 
Remove local branch geometry caches
Add checkbox to control if branch detection should be used
Add RiaSimWllBranchTools and move helper functions from RimProject
 2017-12-08 10:24:14 +01:00
Magne Sjaastad
7f31c245ae #2170 Summary Cross Plot : Improve computation of summary case set 2017-12-01 13:55:39 +01:00
Magne Sjaastad
3276e46e49 #2170 Summary Cross Plot : Basis for source steppint in x, y and union 2017-12-01 13:55:39 +01:00
Bjørn Erik Jensen
da11a32862 #1942 HDF5 reader. Using RiaQDateTimeTools for parts of the reading. See issue comment for more info 2017-12-01 09:13:42 +01:00
Rebecca Cox
6fc888d718 Capitalize ui name in PDM fields 2017-11-30 13:44:18 +01:00
Bjørn Erik Jensen
1eb4c4d3e6 #1929. Remove all parts of summary curve filter which is not needed for backward compatibility 2017-11-30 11:05:30 +01:00
Rebecca Cox
8c57fdf22a #2122 Formation/Well Path: Set formations path and key on RimWellPath 2017-11-27 10:33:41 +01:00
Magne Sjaastad
1bd0de318f Summary Plot : Move building of auto plot name to SummaryCurveCollection 2017-11-27 09:16:18 +01:00
Magne Sjaastad
a04c42313f #2168 Summary Plot : Improve identifier stepping 2017-11-24 15:34:02 +01:00
Magne Sjaastad
5e3467a5f6 (#861) Summary Plot : Add support for autogenerated plot name 2017-11-24 15:33:50 +01:00
Magne Sjaastad
b46c19d90f (#2168) Summary Plot : Add support for modifying identifier for curves 2017-11-24 15:32:51 +01:00
Unknown
e80cd8de7c #2122 Formation/Well Path: Use reader in WellPath classes 2017-11-24 15:18:25 +01:00
Bjørn Erik Jensen
28db4c6e22 #2018 CSV import. Fix decimal point/locale 2017-11-24 13:54:01 +01:00
Bjørn Erik Jensen
c959dbb850 RiaStdStringTools. Minor refactoring 2017-11-24 13:54:01 +01:00
Bjørn Erik Jensen
fb24a9f29b #2018 CSV data. First working version of CSV import 2017-11-23 08:02:27 +01:00
Rebecca Cox
2e63ae0b30 #2146 Num Flooded PV: Add MOBPV to RiaDefines 2017-11-16 10:50:55 +01:00
Magne Sjaastad
3b31c4800f #2091 Cross Plot : Rename to using X or Y as postfix to interface 2017-11-15 13:53:32 +01:00
Magne Sjaastad
f14eb44efd #2089 Cross Plot : Make sure context menu items works as expected 2017-11-15 07:07:46 +01:00
Magne Sjaastad
65e076ab31 #2092 Cross Plot : Load and show cross plot when project is loaded 2017-11-14 14:01:19 +01:00
Magne Sjaastad
57d9ab83a2 #2092 Cross Plot : Update bottom axis based on cross plot values 2017-11-14 13:55:50 +01:00
Jacob Støren
c02538b8bd Rename of RifWellRftAddress to RifDataSourceForRftPlt 2017-11-13 15:23:38 +01:00
Jacob Støren
9853c15ec6 Code adjustments 2017-11-13 15:23:38 +01:00
Magne Sjaastad
5db08c7b76 #2097 Reservoir Phase Detection : Find available phases from result files 2017-11-10 09:43:51 +01:00
Jacob Støren
dfa0ade9fe #2116 Convert the PLT plot gas rate from RFT file to oil equivalents 2017-11-09 15:20:15 +01:00
Bjørn Erik Jensen
89e5c04aef #2100 RFT plot. Add RftPltCurveDefinition. Use that in RFT plot 2017-11-09 10:04:17 +01:00
Magne Sjaastad
9ce06a9084 #2098 Add optional display of tooltip in preferences 2017-11-08 11:29:41 +01:00
Magne Sjaastad
7104064937 #2089 Cross Plot : Add cross plot collection 2017-11-07 20:40:45 +01:00
Rebecca Cox
765f752c96 Add include (for linux) 2017-11-07 15:19:54 +01:00
Rebecca Cox
f3b7f0abd6 #1392 Improve Dark 3D-View background support 2017-11-07 15:08:32 +01:00
Magne Sjaastad
45d3fe5eaa Skip empty tokens 2017-11-07 11:16:33 +01:00
Magne Sjaastad
6444b9f32e #2066 Observed Data : Split string by delimiter 2017-11-07 11:16:33 +01:00
Magne Sjaastad
50b2717ed2 #2003 Move conversion from string to double into RiaStdStringTools 2017-11-03 17:42:16 +01:00
Magne Sjaastad
713998fb38 #2003 Move conversion from string to integer into RiaStdStringTools 2017-11-03 17:42:16 +01:00
Magne Sjaastad
3fa48d175f #2003 Observed Data : Add RiaStdStringTools 2017-11-03 17:42:16 +01:00
Magne Sjaastad
02cd42aa54 #2066 Add std::string to date parser 2017-11-02 18:56:58 +01:00
Bjørn Erik Jensen
1abc5e0e27 #2042 Well import. Match wells, well paths and sim wells. Set 'master' well path name 2017-10-27 15:02:21 +02:00
Magne Sjaastad
f83df13394 #2045 Summary : Update object editors when case is created or closed 2017-10-27 08:22:14 +02:00
Rebecca Cox
89cedb350a #2038 RFT Plot: Add formation names 2017-10-25 16:00:46 +02:00
Bjørn Erik Jensen
3cd9333fd5 DateStringParser. Handle month-first when date is bigger than 12 2017-10-25 14:36:18 +02:00
Bjørn Erik Jensen
a35329555b #1948 PLT plot. Initial version, RFT plot copy 2017-10-25 14:36:18 +02:00
Magne Sjaastad
605d3c25d6 #2031 Curve Calculator : Consolidate generation of address text 2017-10-24 09:58:04 +02:00
Magne Sjaastad
035e2ccaf9 #2031 Curve Calculator : Add display of curve address 2017-10-24 09:58:04 +02:00
Magne Sjaastad
58cd4d112a RegTest : Add support for execution of a subset of tests 2017-10-20 15:48:12 +02:00
Rebecca Cox
53912c4152 #2027 Select well log on well log import 2017-10-20 14:05:42 +02:00
Magne Sjaastad
07b3778a75 #2028 Summary : Use SummaryTools to access summary objects 2017-10-20 10:54:48 +02:00
Magne Sjaastad
84440c0ca5 #1977 Curve Calculator : Add RiaSummaryTools 2017-10-20 10:20:58 +02:00
Magne Sjaastad
6015b99df9 #2022 Curve Calculator : Make sure calculated summary case is always present 2017-10-18 12:47:10 +02:00
Magne Sjaastad
244916c0ed #2022 Curve Calculator : Calculated summary case is now available 2017-10-18 12:47:10 +02:00
Rebecca Cox
781200afc2 #1906 Preferences: Set default 3D navigation mode to RMS 2017-10-17 09:52:31 +02:00
Rebecca Cox
9bd556a1b9 #1996 Remane RimFieldCollection -> RimFaultInViewCollection 2017-10-17 09:52:31 +02:00
Rebecca Cox
6674f6087a #1984 Ensure QDateTime spec set to UTC 2017-10-17 09:52:31 +02:00
Magne Sjaastad
9449bbff20 #1977 Curve Calculator : Get summary values from summary reader 2017-10-16 22:04:00 +02:00
Magne Sjaastad
ae915a7898 #1967 Curve Calculator : Add RiaSummaryCurveDefinition 2017-10-12 10:52:30 +02:00
Bjørn Erik Jensen
35c70fc2a2 DateStringParser. Get time spec from DateTime tools 2017-10-09 13:40:29 +02:00
Bjørn Erik Jensen
60c40832fd DateTime tools. Fix Linux build error (II) 2017-10-09 13:33:56 +02:00
Bjørn Erik Jensen
f5a387af73 DateTime tools. Replaced enum forward decl by include due to Linux build failure 2017-10-09 13:20:27 +02:00
Bjørn Erik Jensen
daf791d068 DateTime tools. Implement current TimeSpec getter and some QDateTime factory methods 2017-10-09 13:03:42 +02:00
Rebecca Cox
a01dd00d62 Add default return value for RiaDefines depthUnit 2017-10-06 13:35:56 +02:00
Bjørn Erik Jensen
a6e2a00122 Date string parser. Fix build error. Set UTC time spec 2017-10-05 16:27:39 +02:00
Bjørn Erik Jensen
d090f8ac2d #1842 RFT Plot. First visible RFT curve 2017-10-05 16:26:39 +02:00
Bjørn Erik Jensen
282d8ef080 Date string parser. Move statement 2017-10-05 16:26:39 +02:00
Bjørn Erik Jensen
1a5c63af39 #1842 RFT Plot. Handle selections 2017-10-05 16:26:39 +02:00
Unknown
3ce1acb29f Derive depth unit from unit system h 2017-10-05 10:48:41 +02:00
Unknown
94c743b9ab Derive depth unit from unit system cpp 2017-10-05 10:48:35 +02:00
Magne Sjaastad
4016681286 Convert to lower case before compare 2017-10-05 10:11:30 +02:00
Bjørn Erik Jensen
41713816ee Date string parser. Support dot as date separator as well 2017-10-04 14:50:06 +02:00
Magne Sjaastad
b36fcb5f09 #1954 Observed Data : Display imported variables as text in property editor 2017-10-03 15:31:45 +02:00
Magne Sjaastad
6ca1ef6653 Reorganized includes 2017-10-03 14:50:06 +02:00
Magne Sjaastad
db981e2eee #1962 : Observed Data : Add helper class for QDateTime and use from parsers 2017-10-03 14:14:16 +02:00
Bjørn Erik Jensen
5375da3fc8 Date string parser. Add missing include to fix Linux build 2017-10-03 11:17:43 +02:00
Bjørn Erik Jensen
0516330b4d Tools. Implement RiaDateStringParser. Parses various date string formats into a QDate 2017-10-03 11:05:23 +02:00
Rebecca Cox
05e3774d36 #1915 Curve creator: Remove option to make default curve filter in preferences 2017-09-29 13:23:23 +02:00
Magne Sjaastad
8bae516af7 #1941 : Obseved Data : Add support for parsing of start date 2017-09-28 09:06:40 +02:00
Magne Sjaastad
9364efa4b7 #1941 Observed Data : Add RiaDateTimeTools 2017-09-28 08:04:27 +02:00
Jacob Støren
0bb47cba88 #1923 Add no-plot-update versions of update methods in curve system. onLoadDataAndUpdate is improved for summary curve but not always called with the "no update" flag set 2017-09-23 08:47:04 +02:00
Magne Sjaastad
eb744f381d #1816 : Observed Data : Add mock data to RifReaderObservedData 2017-09-22 15:02:15 +02:00
Magne Sjaastad
aba74bcdfd #1918 Observed Data : Remove RigSummaryCaseData 2017-09-22 15:02:14 +02:00
Bjørn Erik Jensen
00fc2a2eaa #1853 Summary curve filter. Remove unused includes and friend declarations 2017-09-21 15:18:28 +02:00
Magne Sjaastad
3157346292 Preferences : Show Class Names is now available in Release 2017-09-21 12:05:45 +02:00
Rebecca Cox
e1263888b4 #1813 Observed data: Observed data folder as an oilfield child 2017-09-19 14:19:44 +02:00
Rebecca Cox
0044fb9e50 #1887 Curve Creator: Make the new SummaryCurveCollection operational 2017-09-14 13:57:27 +02:00
Rebecca Cox
c60465b380 #1840 Summary case: Delete a summary collection with or without its contents 2017-09-11 10:45:26 +02:00
Magne Sjaastad
9815cbe1ff CppCheck : Remove unused function and added whitespace 2017-09-07 22:26:27 +02:00
Magne Sjaastad
e634ff664e #1866 AppFwk : Rename to QTreeViewStateSerializer 2017-09-07 09:34:06 +02:00
Rebecca Cox
dd845e3dc7 #1751 Rename RimSummaryCaseCollection to RimSummaryCaseMainCollection 2017-09-06 16:32:52 +02:00
Bjørnar Grip Fjær
a335fd0f21 #1788 Create preliminary user interface to show Flooded PV 2017-08-31 16:23:39 +02:00
Magne Sjaastad
609bf4037b #1768 Move RifReaderSettings to private member of RiaPreferences 2017-08-29 11:03:45 +02:00
Bjørnar Grip Fjær
a6c526c5ba Fix Linux build error in argument parser 2017-08-29 10:40:10 +02:00
Bjørnar Grip Fjær
869f4c8b75 #1793 Add looping of list of case filenames when executing command file 2017-08-29 09:39:53 +02:00
Magne Sjaastad
cb506cf86d #1769 Add time step filtering when importing model 
Move import code from RiaApplication to command feature
Show time step selection UI when importing Eclipse data
Support time step reading of HDF data
 2017-08-25 06:51:56 +02:00
Magne Sjaastad
86365357f4 #1794 Add missing #ifdefs for USE_PROTOTYPE_FEATURE_FRACTURES 2017-08-22 11:38:31 +02:00
Magne Sjaastad
56a04de2ff Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-22 09:36:05 +02:00
Magne Sjaastad
553b3bf63e #1794 Add flag RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 15:24:20 +02:00
Bjørnar Grip Fjær
6c0f4fa0c0 #1806 Ensure time steps are calculated when opening project with saved flow characteristics plot 2017-08-21 13:09:06 +02:00
Magne Sjaastad
51c30448e9 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-21 10:42:11 +02:00
Magne Sjaastad
7dfcfde1d1 #1744 Load and update data for fractures when loading project file 2017-08-14 22:16:03 +02:00
Magne Sjaastad
5eb4eafb6e Merge branch 'dev' into hdf-prototype 2017-08-14 10:47:44 +02:00
Magne Sjaastad
0ba1746755 Merge branch 'dev' into pre-proto 2017-08-11 16:14:00 +02:00
Magne Sjaastad
839e3e1d00 #1755 Use namespace instead of class to encapsulate structures 2017-08-11 14:28:43 +02:00
Magne Sjaastad
89684c243f #1755 Use namespace RiaDefines instead of class 2017-08-11 14:28:42 +02:00
Magne Sjaastad
c4aa625d33 #1755 Move porosity model enum to separate file 2017-08-11 14:27:56 +02:00
Bjørnar Grip Fjær
eee4a65497 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-08 14:24:42 +02:00
Bjørnar Grip Fjær
37456bfa9b #1730 Include more information in snapshot filenames 2017-08-04 11:25:42 +02:00
Magne Sjaastad
c481a275ee Merge branch 'dev' into pre-proto 2017-08-04 10:37:35 +02:00
Bjørnar Grip Fjær
a59735de87 #1730 Move snapshot features to separate files 2017-08-03 16:22:02 +02:00
Magne Sjaastad
9cd7dcdd91 #1665 Add processEvents() when waiting for external octave process 2017-08-03 11:31:15 +02:00
Bjørnar Grip Fjær
7179aaeac9 Merge branch 'dev' into pre-proto 2017-08-01 12:44:11 +02:00
Bjørnar Grip Fjær
3dad356d7d #1710 Use usleep on Linux and Sleep on windows 2017-07-31 11:26:21 +02:00
Bjørnar Grip Fjær
48401d5a85 #1710 #1665 Wait for octave process to finish when executing through command file interface 2017-07-31 11:10:43 +02:00
Bjørnar Grip Fjær
94703d72c2 #1665 Send any log-output during argument parsing to console 2017-07-31 11:10:42 +02:00
Bjørnar Grip Fjær
c02c39d59d #1665 Add replaceCase command to command file interface 2017-07-28 11:28:55 +02:00
Bjørnar Grip Fjær
bbb4c80b1b #1665 Add setStartDir command to command file interface 2017-07-26 16:57:43 +02:00
Bjørnar Grip Fjær
bf23529b55 #1665 Add parameter and basic framework for executing command file 2017-07-26 16:41:17 +02:00
Magne Sjaastad
d265f79242 #1670 Fix wrong include path 2017-06-29 22:41:34 +02:00
Bjørnar Grip Fjær
6dac618af0 #1642 Batch : Replace folder for input files 2017-06-28 20:36:11 +02:00
Bjørnar Grip Fjær
a9d64edd57 #1643 Allow filename including extension for --case command line parameter 2017-06-27 14:49:33 +02:00
Bjørnar Grip Fjær
17593fba92 #1602 Include sim well fractures when calculating completion type results 2017-06-21 11:06:38 +02:00
Bjørnar Grip Fjær
78c948ea89 #1623 Schedule invalidation of completion type results instead of immediate calculation 2017-06-20 16:40:50 +02:00
Bjørnar Grip Fjær
7c99a2573a Merge branch 'dev' into pre-proto 2017-06-20 13:26:52 +02:00
Bjørnar Grip Fjær
d3f512f783 #1593 Use well path unit system for completions on well path 2017-06-20 10:51:01 +02:00
Jacob Støren
bd3d060c96 #1567 Fix on patch branch 2017-06-16 17:03:25 +02:00
Bjørnar Grip Fjær
31a64e50ac #1602 Completion Type : Add fracture category 2017-06-16 09:44:39 +02:00
Jacob Støren
1911092cb7 Merge dev into pre-proto 2017-06-14 23:25:55 +02:00
Jacob Støren
cb72a4bfa4 Fix linux compile error 2017-06-14 14:16:20 +02:00
Jacob Støren
84597a992d Add condictivity conversion method 
From pre-proto branch, to delete it there. Unused for now
 2017-06-14 11:15:59 +02:00
Magne Sjaastad
a8b8e061d7 #1596 Merge dev into pre-proto 2017-06-14 07:25:34 +02:00
Magne Sjaastad
5a6c3638ee #1596 Move RiaDefines to Application 2017-06-13 15:46:27 +02:00
Magne Sjaastad
cf859e7c16 #1596 Rename from RimDefines to RiaDefines 2017-06-13 15:41:52 +02:00
Magne Sjaastad
3ca22692b9 #1596 Move RiaEclipseUnitTools to Application/Tools 2017-06-13 15:28:58 +02:00
Magne Sjaastad
263015cdff #1596 Move several files from Application to Application/Tools 2017-06-13 15:15:40 +02:00
Magne Sjaastad
dd912b4f97 Merge branch 'dev' into pre-proto 2017-06-08 14:09:03 +02:00
Magne Sjaastad
ce6acaf20e #1567 Fix issue for command line option '--case' 2017-06-07 07:18:44 +02:00
Magne Sjaastad
a45aee0cc2 Merge branch 'fishbones' into pre-proto 2017-05-23 10:28:42 +02:00
Magne Sjaastad
84b922ba82 #1476 Include isFile() when checking if a file exists 2017-05-11 09:23:13 +02:00
Bjørnar Grip Fjær
a08dbc91ba #1446 Ensure batch execution does not crash when closing ResInsight 2017-05-04 14:28:32 +02:00
Bjørnar Grip Fjær
c845eefb96 #1447 Moved Default Z Scale Factor to Default Settings 2017-05-03 13:44:37 +02:00
Bjørnar Grip Fjær
0c07493dc1 #1414 New eclipse tab and fixed capitalization in preferences 2017-04-27 13:16:44 +02:00
Magne Sjaastad
63b07b1152 #1430 When closing top level windows, do not close project if other is visible 2017-04-25 15:01:31 +02:00
Bjørnar Grip Fjær
63cd817b85 #964 Improve code robustness in defineEditorAttribute 2017-04-25 10:31:56 +02:00
Magne Sjaastad
7efe0a996a #1384 Add missing population of view windows 2017-04-24 21:40:46 +02:00
Magne Sjaastad
c23ac3c8ae #1384 Regression test : Add resize of plot windows 2017-04-24 09:39:54 +02:00
Magne Sjaastad
c75a79a260 #1384 Make regression functions tests private 2017-04-24 09:24:34 +02:00
Magne Sjaastad
117126bce2 #1384 Regression Test : Add static method for default widget size 2017-04-24 09:23:32 +02:00
Magne Sjaastad
ed2010c0b7 Regression tests : Add basic timing with reporting by logging 2017-04-20 22:34:15 +02:00
Magne Sjaastad
9d5fcaf5a1 Regression tests : Add support for 'rsp' project file extension 2017-04-20 21:21:19 +02:00
Bjørnar Grip Fjær
327fb31cb0 #1030 Don't automatically create summary plots of preference is turned off 2017-04-20 15:59:39 +02:00
Magne Sjaastad
c35e79c3b5 Merge branch 'dev' into pre-proto 2017-04-20 13:40:56 +02:00
Magne Sjaastad
4ec6dc3796 #1401 Move serialization of tree view state to a single location 2017-04-20 11:02:05 +02:00
Magne Sjaastad
d7d80bc53e #1401 Ask user to save modified project before project close 2017-04-20 10:02:25 +02:00
Bjørnar Grip Fjær
b2d3a84862 #171 Add support for absolute UNIX paths for fault include files on Windows 2017-04-18 11:32:31 +02:00
Magne Sjaastad
8255a3aaa3 Merge branch 'dev' into pre-proto 2017-04-03 07:34:56 +02:00
Jacob Støren
442d9d2e41 #1380 Major refactor of the management of views to fix the active view problem. Expect some trouble following this. 2017-03-31 15:13:50 +02:00