Commit Graph

252 Commits

Author SHA1 Message Date
Magne Sjaastad
63c675d6e2 System : Add clang-tidy 2019-01-11 08:14:53 +01:00
Magne Sjaastad
32e611f710 Qt5 : Install dependencies on Windows 2019-01-09 13:59:29 +01:00
Magne Sjaastad
53ef8dbed9 #3932 System : Add FindOctave 2019-01-07 12:44:36 +01:00
Magne Sjaastad
218472fe2c Merge branch 'dev' into measurement 2019-01-02 14:32:17 +01:00
Magne Sjaastad
1cfedd7ff8 System : Qt5 : Copy DLLs into destination folder 2019-01-02 07:09:12 +01:00
Bjørn Erik Jensen
5976298267 Merge branch 'dev' into measurement 2018-12-21 10:08:41 +01:00
Magne Sjaastad
935efc66e1 cotire : Adjustments for Qt5 2018-12-20 20:59:19 +01:00
Bjørn Erik Jensen
849a623379 #3804 #3805 Measurement. Add toolbar button and interactive picking 2018-12-19 14:41:17 +01:00
Gaute Lindkvist
17e12a92a0 Update CMake to only look for Qt5 if RESINSIGHT_BUILD_WITH_QT5 is set 2018-12-10 15:10:46 +01:00
Magne Sjaastad
4026f21a00 Cotire : Fix duplicate global variables 2018-12-03 15:22:09 +01:00
Gaute Lindkvist
6cee9eb9e6 #3752 Upgrade ResInsight CMake-system to support both Qt5 and Qt5 2018-11-30 09:47:53 +01:00
Bjørn Erik Jensen
e578deb43c #3756 Annotations. Moved files to subdirs 2018-11-27 09:26:30 +01:00
Jacob Støren
9297c5888c #3724, #3723 Several polyline annotation updates
Renamed from polyline to polylines.
Split into PolylinesFromFile and UserDefinedPolylines
Add import of polylines from file
2018-11-26 14:10:20 +01:00
Gaute Lindkvist
30f5a76ee4 Silence C4505 warning for Visual Studio 2017 CL 19.13 2018-11-08 12:52:28 +01:00
Jacob Støren
d25d8a3fe4 #3506 Move well path geometry classes to a separate folder 2018-10-16 09:53:00 +02:00
Magne Sjaastad
66dd318d67 Display more warnings 2018-09-27 21:08:49 +02:00
Magne Sjaastad
f61b82dd35 System : System : Introduce compiler warning 4456 with fixes 2018-09-25 07:37:40 +02:00
Magne Sjaastad
b2d055db63 System : Introduce compiler warning C4458 with fixes 2018-09-24 21:32:58 +02:00
Magne Sjaastad
4009d4d63b System : Introduce compiler warning C4457 with fixes 2018-09-24 21:20:35 +02:00
Magne Sjaastad
f1dd707561 Holo Lens : Create menu and UI for export of data to folder 2018-09-12 10:34:01 +02:00
Jacob Støren
dd4c359f6e Build System: Supress MSVC warning C4505 2018-09-11 07:54:15 +02:00
Magne Sjaastad
7e3cd5d3f4 #3340 Temporarily hide some warnings to reduce build noise 2018-09-10 10:27:54 +02:00
Magne Sjaastad
44a07ad596 #3340 Increase warning level to improve quality 2018-09-10 10:27:54 +02:00
Magne Sjaastad
a7b6f0ea9d Cotire : Exclude RiaSCurveCalculator (remove double . ) 2018-07-09 13:37:11 +02:00
Magne Sjaastad
b8c3ea82d5 Cotire : Exclude RiaSCurveCalculator 2018-07-09 13:29:26 +02:00
Bjørn Erik Jensen
e4ef9bd014 Fix cotire build errors 2018-04-09 10:08:50 +02:00
Magne Sjaastad
716bb3184b System : Replace tab with four spaces 2018-03-12 11:12:39 +01:00
Magne Sjaastad
8e8c168405 #2546 Well Connection Factors : Several changes related to data access
Moved rig classes from command feature into ReservoirDataModel\Completions\
2018-03-12 11:07:46 +01:00
Magne Sjaastad
26884d97b6 #2536 Merge branch 'cmake-improvements' into dev 2018-02-28 11:05:12 +01:00
Magne Sjaastad
7b5963d75c #2536 Build System : Add list of internal ResInsight libraries 2018-02-28 10:54:53 +01:00
Magne Sjaastad
25a1823f35 Merge branch 'dev' into cmake-improvements 2018-02-28 08:47:01 +01:00
Magne Sjaastad
233df05f68 #2536 Build System : Remove obsolete includes and update depending includes 2018-02-27 20:00:56 +01:00
Magne Sjaastad
f4bae6f796 #2529 Fracture : Remove RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES from CMake files 2018-02-26 21:11:14 +01:00
Magne Sjaastad
ad97b19c30 #2509 Fracture : Exclude files when fracture config is not active 2018-02-21 10:41:11 +01:00
Magne Sjaastad
fb95d896ef #2509 Fracture : Add copy / paste of ellipse fracture template 2018-02-20 07:20:25 +01:00
Jacob Støren
911571e267 #2337 Window Edge axis overlay item working. 2018-02-09 14:08:55 +01:00
Magne Sjaastad
d208f63255 Add .clang-format to cmakelist 2018-02-07 08:54:53 +01:00
Magne Sjaastad
20652a0597 #2423 Export Completions : Move folder one level up 2018-01-31 10:20:47 +01:00
Magne Sjaastad
f0f7c954cc #2423 Export Completions : Move files to separate folder 2018-01-31 10:20:47 +01:00
Magne Sjaastad
03de2aba5b #2332 2D Intersection View: Command to create view 2018-01-17 11:05:31 +01:00
Magne Sjaastad
1df20d1b10 #2313 Improve cmake tooltip text and mark as advanced 2018-01-05 14:21:02 +01:00
Magne Sjaastad
ecdc4b10ba System : VS2017 add definition _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
https://github.com/google/googletest/issues/1036
2017-12-18 08:38:46 +01: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
7da886db11 #1794 System : Move packaging config to ResInsight project 2017-08-23 07:21:00 +02:00
Magne Sjaastad
f5ffbc1f1a #1810 Improve copy and install of DLLs on Windows 2017-08-22 22:31:13 +02:00
Magne Sjaastad
553b3bf63e #1794 Add flag RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 15:24:20 +02:00
Magne Sjaastad
51c30448e9 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-21 10:42:11 +02:00
Magne Sjaastad
4eed4b4261 #1794 Exclude some files to be able to use Cotire 2017-08-21 10:01:07 +02:00
Magne Sjaastad
4d0dde088b #1795 Fix copy of Qt DLLS
Use one list of all DLLs to copy (both Qt and Odb). For some reason, the Qt copy did not work
2017-08-18 15:29:19 +02:00
Magne Sjaastad
34f3a0686d System : Exclude ResInsight.qrc 2017-08-18 13:21:39 +02:00