Commit Graph
100 Commits
Author SHA1 Message Date
Gaute Lindkvist 0d3ea8ede1 Add new passthrough module for rips generated_classes and refactor imports 2021-01-21 20:10:14 +01:00
Gaute Lindkvist a2ee4c8fef Add a new pass-through module for resinsight_classes.py to aid documentation 2021-01-21 20:10:14 +01:00
Gaute Lindkvist 861577922a Make CMake-setup for python sources work 2021-01-21 20:10:14 +01:00
Gaute Lindkvist c4c6eb75f2 Hide some fields from the target list 2021-01-20 14:43:44 +01:00
Gaute Lindkvist 5759c6261b Temporarily disable changing of the MD-reference point on laterals
* It doesn't work right without also altering the angles of the targets
2021-01-20 14:43:44 +01:00
Gaute Lindkvist 639fdcc217 #7153 Fix laterals created from modeled well paths 2021-01-20 14:43:44 +01:00
Gaute Lindkvist 953e7bd18e #7236 Rewrite window closing in ResInsight 2021-01-20 10:58:06 +01:00
Gaute Lindkvist 7c42b4ae7b Turn off bundling of testmodels by default" 2021-01-15 15:42:26 +01:00
Gaute Lindkvist ecd6366e88 Update load_case.py and open_project.py to use test model path in install folder 2021-01-15 15:42:26 +01:00
Gaute Lindkvist 746b542dcf #7210 Optionally Copy TestModels in install stage 2021-01-15 15:42:26 +01:00
Gaute Lindkvist 0ee915b598 Another Python example 2021-01-15 15:42:26 +01:00
Gaute Lindkvist ee29349d5e Use libprotobufd.dll for debug windows builds 2021-01-14 10:47:15 +01:00
Gaute Lindkvist 8914ae106c #7199 add protobuf and wheel to rips requirements 2021-01-13 15:38:11 +01:00
Gaute Lindkvist e1a6c4ef65 #7200 Add important Python examples 2021-01-13 15:38:11 +01:00
Gaute Lindkvist 78c4a1568e #7198 Fix crash in new_summary_plot.py 2021-01-13 15:38:11 +01:00
Gaute Lindkvist 493f257e5e Fix wrong use of "is" and "is not" in Python if-statements 2021-01-12 11:23:30 +01:00
Gaute Lindkvist 14f87533fa Fix Centos 7 linker error 2021-01-12 11:05:53 +01:00
Gaute Lindkvist f6113ec38b Remove some status messages from CMakeLists.txt 2021-01-11 15:27:45 +01:00
Gaute Lindkvist 04d5daca67 Create a new ApplicationExe project for the executable 2021-01-11 15:27:45 +01:00
Gaute Lindkvist 2de5c9ce0b Move GrpcInterface into top level 2021-01-11 15:27:45 +01:00
Gaute Lindkvist 81699db187 Rename ApplicationCode to ApplicationLibCode 2021-01-11 15:27:45 +01:00
Gaute Lindkvist 751df1a421 Add library directories when using the RESINSIGHT_GRPC_INSTALL_PREFIX
ResInsight target also need grpc library directories

Attempt to fix link errors
2021-01-11 15:27:45 +01:00
Gaute Lindkvist 5bf3bfde33 Look for protoc and grpc_cpp_plugin in two places. 2021-01-11 15:27:45 +01:00
Gaute Lindkvist c57f2d8b4a Add step for installing pip modules in manual gRPC paths action 2021-01-11 15:27:45 +01:00
Gaute Lindkvist 2a2598e503 Add a GitHub action to test manual build paths (no VCPKG toolchain) 2021-01-11 15:27:45 +01:00
Gaute Lindkvist 72614b0c00 Create Well Path Laterals from existing well paths
* Add cmakebuild/ to .gitignore
* Create Well Path Laterals from existing well paths
* Move ValidRegExpValidator to RiaValidRegExpValidator.h|cpp
* Minor code review fixups
* More minor code review fixups
* Another set of minor code review fixups
2021-01-04 11:09:01 +01:00
Gaute Lindkvist e847ce7cd3 Use PdmPointers for command queue in RiaApplication 2020-12-11 10:56:25 +01:00
Gaute Lindkvist 49ffe9b53a Removal of new/delete from RiaApplication 2020-12-11 10:56:25 +01:00
Gaute Lindkvist 69c21df6a3 A couple of example uses of cvf::make_ref 2020-12-11 10:56:25 +01:00
Gaute Lindkvist 558bee72af New functions for creating cvf::refs to avoid "naked new" in App code 2020-12-11 10:56:25 +01:00
Gaute Lindkvist 755612a04c Trigger update of contour maps following legend changes 2020-12-08 21:45:26 +01:00
Gaute Lindkvist 0972a952c3 #5641 Avoid unnecessary regeneration of contour map
* Move clearGeometry to a scheduleGeometryRegen override
2020-12-08 21:45:26 +01:00
Gaute Lindkvist c30f930886 Explicitly remove default constructor for caf::Signal 2020-12-08 09:27:29 +01:00
Gaute Lindkvist 194f4bc993 Remove pip upgrade step 2020-12-08 09:26:07 +01:00
Gaute Lindkvist 72e170ac2b Make legend config changed signal more fine grained for Contour Maps 2020-12-07 15:00:59 +01:00
Gaute Lindkvist 02298d81b1 Trigger update of contour maps following legend changes 2020-12-07 15:00:59 +01:00
Gaute Lindkvist a7dd6f893d #5641 Avoid unnecessary regeneration of contour map
* Move clearGeometry to a scheduleGeometryRegen override
2020-12-07 15:00:59 +01:00
Gaute Lindkvist 931c66ff2e Contour Maps: Use different data structures for kLayer-cell sorting 2020-12-07 15:00:59 +01:00
Gaute Lindkvist 307f9e94b1 Simplify contour lines more for really large models 2020-12-07 15:00:59 +01:00
Gaute Lindkvist 4dff9e2ca5 Avoid regenerating contour map grid mapping when changing result 2020-12-07 15:00:59 +01:00
Gaute Lindkvist 1d823fa983 Avoid parent searches for active cell info in contour map projection 2020-12-07 15:00:59 +01:00
Gaute Lindkvist c3c451f0f4 Slightly improve speed of Contour Map volume intersection + renames 2020-12-07 15:00:59 +01:00
Gaute Lindkvist 6a2baf9c45 Upgrade to Clipper 6.4.2 2020-12-07 15:00:59 +01:00
Gaute Lindkvist 9760dd1926 Add missing PRIVATE keyword in GrpcInterface\CMakeLists.txt 2020-11-03 10:31:12 +01:00
Gaute Lindkvist 71a0d88e26 Cross platform way of looking for CMake-versions of gRPC/Protobuf first
* Then use PKG_CONFIG to try to find them,
2020-11-03 10:31:12 +01:00
Gaute Lindkvist 71b191f8c5 Support non-cmake builds of gRPC 2020-11-03 10:31:12 +01:00
Gaute Lindkvist 265f820531 Update Centos7 action to use an absolute path for RESINSIGHT_GRPC_PYTHON_EXECUTABLE 2020-11-02 11:33:43 +01:00
Gaute LindkvistandRuben Thoms 787dae4044 Automatic installation of vcpkg dependencies (#6848)
* Added AutoVcpkg files to cmake directory.
* Add auto install of vcpkg packages
* Add grpc install to GrpcInterface module
* Set VCPKG_ROOT in GitHub actions

Co-authored-by: Ruben Thoms <ruben.thoms@ceetronsolutions.com>
2020-10-30 12:29:57 +01:00
Gaute Lindkvist 3cd3b319d4 Add a github action and config file for running CMake-format (#6849)
* Add a github action and config file for running CMake-format
2020-10-30 11:51:13 +01:00
Gaute Lindkvist 514cca5f95 Simplify the CMake GRPC setup (#6852)
* Simplify GRPC CMake setup.
* Move pip install code to CMake rather than github action to ensure the same Python version
* Remove redunant NO_MODULE in GRPC cmakefiles
* Use old CMP0077 policy (changed in Cmake 3.13) because our base line is 3.12.
* Make GrpcInterface a separate Object Library
* Update pip command to include --user and setuptools
* Update grpc python generation
* Remove unity build from GrpcInterface library
* Update github action to explictly set up Python
2020-10-30 10:11:58 +01:00
Gaute Lindkvist 5bc5f5ddb7 Allow arguments to findOrCreateWellLogExtractor methods to be nullptr
It is a valid pattern for the methods and it should return nullptr in this case.
2020-10-27 14:55:25 +01:00
Gaute Lindkvist 6d8eb4ccfa #6797 Add option (on by default) to force legacy OpenGL ABIon Linux 2020-10-27 12:38:50 +01:00
Gaute Lindkvist cc2531a551 Fix build issues due to not linking Eigen 2020-10-26 11:50:22 +01:00
Gaute Lindkvist 1482fdebf9 Add explicit constructor calls to parent class in RigWellPath 2020-10-26 10:43:14 +01:00
Gaute Lindkvist f30ad36c82 Remove some structured bindings to avoid unused variable warnings 2020-10-26 10:43:14 +01:00
Gaute Lindkvist 0b6254bfb4 Fix build issues following merge from dev 2020-10-26 10:43:14 +01:00
Gaute Lindkvist 0fc5e033f5 Add automatic well path grouping 2020-10-26 10:43:14 +01:00
Gaute Lindkvist 9401a81097 Higher tolerances 2020-10-26 10:43:14 +01:00
Gaute Lindkvist f569d6872b Group only with selected paths 2020-10-26 10:43:14 +01:00
Gaute Lindkvist 19a8aece0e Almost right 2020-10-26 10:43:14 +01:00
Gaute Lindkvist 362dcb4dd1 Remove redundant part of hierarchical well paths 2020-10-26 10:43:14 +01:00
Gaute Lindkvist 7684596829 Well Path Groups 2020-10-26 10:43:14 +01:00
Gaute Lindkvist 195bcf2817 Skeleton for toggling grouping of well paths 2020-10-26 10:43:14 +01:00
Gaute Lindkvist 395398587a Create a separate menu entry for importing "Grouped Well Paths" 2020-10-26 10:43:14 +01:00
Gaute Lindkvist 7650d0bde8 Fix Linux build issue due to unused variable in unit test 2020-10-26 10:43:14 +01:00
Gaute Lindkvist 90d4c2f9d3 More hierarchical work 2020-10-26 10:43:14 +01:00
Gaute Lindkvist 0b19307be0 Support loading hierarchical well paths 2020-10-26 10:43:14 +01:00
Gaute Lindkvist 52e3214b0e Add Well paths to other well paths 2020-10-26 10:43:14 +01:00
Gaute Lindkvist 2a06f74076 Fix well log extraction not_null failure. 2020-10-26 10:43:14 +01:00
Gaute Lindkvist 8e8534d61e Go via RimWellPathCollection::addWellPath for any well path addition 2020-10-26 10:43:14 +01:00
Gaute Lindkvist 6622328622 Remove direct access to the well path field in RimWellPathCollection 2020-10-26 10:43:14 +01:00
Gaute Lindkvist aceac43652 Refactor RimWellPath and RigWellPath 2020-10-26 10:43:14 +01:00
Gaute Lindkvist c29cf315d2 Remove SILENCE_TR1_NAMESPACE warnings. We use a new gtest version now. 2020-10-26 10:43:14 +01:00
Gaute Lindkvist 1614dfa9b8 Remove "using namespace std" (a C++17 MSVC bug) 2020-10-26 10:43:14 +01:00
Gaute Lindkvist 17ba1e49b6 Simplify some code with C++17 2020-10-26 10:43:14 +01:00
Gaute Lindkvist 56d8da1419 Fix snapshot icons to be same height 2020-10-22 16:49:34 +02:00
Gaute Lindkvist 19a2e92a0a Make new code follow new C++17 guidelines 2020-10-22 10:36:30 +02:00
Gaute Lindkvist 90df4b8b54 Reduce number of warnings in the well log extractor
* Suitable for patch.
2020-10-22 10:36:30 +02:00
Gaute Lindkvist 825a9bb531 Fix centos7 action following move of vcpkg 2020-10-20 11:05:27 +02:00
Gaute Lindkvist 43186453e5 Fix action following move of vcpkg 2020-10-20 11:05:27 +02:00
Gaute Lindkvist 18d250ebf1 Moved VCPKG into ThirdParty 2020-10-20 11:05:27 +02:00
Gaute Lindkvist 069b427d10 Require CMake 3.12 2020-10-20 11:05:10 +02:00
Gaute Lindkvist 54273fff39 Remove "using namespace std" (a C++17 MSVC bug) 2020-10-20 11:05:10 +02:00
Gaute Lindkvist 97bd2fc67f Workaround for byte / std::byte ambiguity on MSVC 2020-10-20 11:05:10 +02:00
Gaute Lindkvist b1d9d17ddb Simplify some code with C++17 2020-10-20 11:05:10 +02:00
Gaute Lindkvist 6220ff160c Fix a Qt warning for getContentsMargins 2020-10-20 11:05:10 +02:00
Gaute Lindkvist 8f5c38cb8e Remove use of QString::sprintf 2020-10-20 11:05:10 +02:00
Gaute Lindkvist 6dd3bd8c01 Remove Qt build warnings due to macro redefinitions 2020-10-20 11:05:10 +02:00
Gaute Lindkvist 78ba28e916 Update Boost-subSet to 1.74.0 to fix C++17 incompatibility issues 2020-10-20 11:05:10 +02:00
Gaute Lindkvist e8368327da Use GSL::not_null a few places as a test/example. 2020-10-20 11:05:10 +02:00
Gaute Lindkvist e797c5ccdf Add GSL headers as third party library (header only) 2020-10-20 11:05:10 +02:00
Gaute Lindkvist 0354664b8f Get rid of warning of CMake policy CMP0042 by copying in new libecl code 2020-10-20 11:05:10 +02:00
Gaute Lindkvist 2110323be7 Swap use of deprecated auto_ptr for unique_ptr in cvfMutex.h 2020-10-20 11:05:10 +02:00
Gaute Lindkvist 61809b6e22 Require C++17 2020-10-20 11:05:10 +02:00
Gaute Lindkvist f7aed637f8 Require CMake 3.6 2020-10-20 11:05:10 +02:00
Gaute Lindkvist ef242e44ae Avoid outputting invalid aicd segments 2020-10-20 03:53:55 -04:00
Gaute Lindkvist 2e0d972761 Fix MOC-warnings by move RiuQssSyntaxHighlighter.h line in CMakefile 2020-10-19 10:58:31 +02:00
Gaute Lindkvist 3834fdb382 Revert "Move RiuQssSyntaxHighlighter.h from MOC-headers to regular headers"
This reverts commit 2064ec6bf0.
2020-10-19 10:48:17 +02:00
Gaute Lindkvist 2064ec6bf0 Move RiuQssSyntaxHighlighter.h from MOC-headers to regular headers 2020-10-19 10:30:34 +02:00
Gaute Lindkvist 6f3af3c52f #6788 Fix MSW WSEGVALVE areas 2020-10-19 10:25:02 +02:00