Commit Graph

1137 Commits

Author SHA1 Message Date
Magne Sjaastad
502b08ea61 Fix AppFwk dependencies 2020-03-15 19:18:22 +01:00
Magne Sjaastad
30eafceef4 Fix generation of Attributes header 2020-03-14 10:13:34 +01:00
Magne Sjaastad
7d3bd85777 Fix AppFwk dependencies 2020-03-13 21:32:18 +01:00
Gaute Lindkvist
ba0ded23c3 #5671 Move caf::PdmFieldScriptability<cvf::Color3f> into cafPdmCvf 2020-03-13 17:12:05 +01:00
Gaute Lindkvist
2853308a4a Python: Create summary plot from string 2020-03-13 14:18:41 +01:00
Magne Sjaastad
40ac705db0
Fix cmake build issues (#5670)
* Fix cmake build issues
* Temporary force linking of external object
2020-03-12 11:24:59 +01:00
Magne Sjaastad
f216bf8d6a
Python doc improvements (#5669)
* Add tests to xml data type inspection
* Add baseline for testing of PdmScripting
* #5631 Generate doc for Python
2020-03-12 07:45:52 +01:00
Gaute Lindkvist
c51aa91c42
#5632 Python method commands (#5649)
* General PdmObjectMethods for scripting.
2020-03-10 14:11:22 +01:00
Magne Sjaastad
f131ad77e1 Merge branch 'dev' into feature-analysis-plots-initial 2020-03-06 08:06:48 +01:00
Gaute Lindkvist
6e2d87b05f Python: Fix child field retrieval 2020-03-05 13:05:04 +01:00
Gaute Lindkvist
b77c057e7d Python fixup after code review 2020-03-05 11:09:07 +01:00
Gaute Lindkvist
bd8e079e24 #5632 Generate PdmChildField and PdmChildArrayField methods 2020-03-05 08:40:46 +01:00
Gaute Lindkvist
2424d79c5d Move some more scriptability to caf 2020-03-05 08:40:46 +01:00
Gaute Lindkvist
17ea69397a Move RicfMessages to CAF and simplify RicfFieldCapability 2020-03-05 08:40:46 +01:00
Gaute Lindkvist
508d8806e6 Rename PdmXmlFieldHandle::childClassKeyword to dataTypeName to reflect that it will contain names for built in types 2020-03-05 08:40:46 +01:00
Gaute Lindkvist
76019e7776 Get rid of Python class_keyword attribute and fix parameter sending for WBS 2020-03-05 08:40:46 +01:00
Gaute Lindkvist
554f9a1758 Translate data types to Python data types for Python generation 2020-03-05 08:40:46 +01:00
Gaute Lindkvist
b2f55a3101 Make scriptability a CAF-feature 2020-03-05 08:40:46 +01:00
Gaute Lindkvist
2cea7c0321 Implement proxy field python methods 2020-03-05 08:40:46 +01:00
Magne Sjaastad
8c485ab81c Fix several warnings and potentially uninitialized data 2020-03-03 20:22:03 +01:00
Jacob Støren
591e5ab503 Caf: Add PdmUiActionPushButtonEditor as a simpler and more intuitive editor for action buttons 2020-03-03 09:52:53 +01:00
Gaute Lindkvist
1353835bd8 CAF: Move keyword aliases from PdmXmlFieldHandle to PdmFieldHandle 2020-02-25 16:04:53 +01:00
Gaute Lindkvist
d95f3a349d Move to use a static registry of scriptable classes 2020-02-25 13:57:51 +01:00
Gaute Lindkvist
c63c7f2eac CAF: Support class keyword aliases and a scriptable feature
* Also store class keyword in fields so they can be assigned to the correct Python object
  even if the class itself is abstract.
2020-02-25 13:57:51 +01:00
Gaute Lindkvist
83a7ceb204 CAF: expose inheritance stack and make sure we can alias class keywords 2020-02-25 13:57:51 +01:00
Gaute Lindkvist
82cf721ae8 CAF: support aliases for keywords in case of renaming 2020-02-25 13:57:51 +01:00
Magne Sjaastad
2b45a9af7f #5553 AppFwk : Add root in PtrField reference string 2020-02-17 09:11:23 +01:00
Magne Sjaastad
c31e4cbaaf #5505 Progress Bar : Control visibility of progress bar in Preferences 2020-02-11 11:43:31 +01:00
Gaute Lindkvist
5fb89f535b CAF: Add support for validators in PdmUiDoubleValueEditor 2020-02-07 08:36:37 +01:00
Kristian Bendiksen
17d0bcb49c #4669 Compute stress gradient. 2020-02-05 09:55:43 +01:00
Gaute Lindkvist
0d67a179ef #5385 Make QShortenedLabel slightly longer 2020-02-03 10:03:34 +01:00
Jacob Støren
c9dbad78de #5429 pre-allocate some more room for triangles after moving to Tet based MC 2020-01-31 15:01:53 +01:00
Jacob Støren
63771dc7ee #5429 Add tolerance in HexInterpolator to quit iterating earlier
Making less jacobi and inverse calls
2020-01-31 15:01:53 +01:00
Jacob Støren
2bca842e1b Fix missing includes 2020-01-30 13:36:00 +01:00
Jacob Støren
35a8a96b97 Increase polygon offset for surfaces to cope with GeoMech models 2020-01-30 12:04:26 +01:00
Jacob Støren
ddb5d0fd30 #5437 Use marching tets instead of marching cubes,
to make the cell border edges consistent
2020-01-30 12:03:35 +01:00
Jacob Støren
f5b59a6bd9 #5429 Improve clipPlanarTrianglesWithInPlaneTriangle performance 2020-01-29 15:45:35 +01:00
Gaute Lindkvist
e4ffa5d7b9 #5388 Add a CAF-feature to get the ancestor of a type (but not this) 2020-01-27 13:50:15 +01:00
Magne Sjaastad
4e3a894464 #5370 Unity Build : Add config for AppFwk 2020-01-23 13:37:29 +01:00
Gaute Lindkvist
954bf1e02e Support setting of child fields from Python and pass in WbsParameters if provided
Also fixes #5354
2020-01-22 09:28:46 +01:00
Magne Sjaastad
170e0ad173 #5273 Struct Grid: Add enum GridAxisType for IJK axis 2020-01-20 22:19:10 +01:00
Jacob Støren
67b47bd07e caf::HexIntersectionTools : Added gtest comparisons. 2020-01-17 13:24:25 +01:00
Jacob Støren
7ee26fa0eb caf::VizExtensions: Added method to clip triangles by a triangle
Added unit test system and a test also
2020-01-17 13:24:25 +01:00
Jacob Støren
cd6860b70f caf::HexInterpolator: Add a method to access vertex weights
Add a Cmake file to make it a library
2020-01-17 13:24:24 +01:00
Jacob Støren
1e2548c96d AppFwk: Hex interpolation: Add Combined test 2020-01-17 13:24:24 +01:00
Jacob Støren
94b6990f19 AppFwk: Add general interpolation in Hex8 elements 2020-01-17 13:24:24 +01:00
Gaute Lindkvist
2044b99818 Add support for stashing and restoring states in caf::UiStyleSheet 2020-01-16 14:33:33 +01:00
Gaute Lindkvist
6082d0dd2f Add a getter in addition to the () operator for caf::AppEnum
* The operator can be awkward to use currently with class enums
2020-01-16 14:33:33 +01:00
Magne Sjaastad
29e6b09ee9 #5339 AppFwk : Fix robustness for serialization of PdmPtrArrayField 2020-01-15 22:47:02 +01:00
Gaute Lindkvist
7391c7acfe #5220 Support setting double number format in the caf::PdmUiDoubleValueEditor 2020-01-13 15:44:37 +01:00
Jacob Støren
b01c4409f1
Merge pull request #5246 from OPM/feature-external-file-reference-list-in-project-file
Feature: #5147 External file reference list in project file
2019-12-18 15:47:50 +01:00
Gaute Lindkvist
47b93dc0d1
Implement pdf rendering (#5250)
* First PDF creation support

* Reimplement info box

* Set title and make overlay frame margins more unified

* Remove a style sheet that was never meant to be applied to Project Tree

* Update RiuDraggableOverlayFrame when changing content

* Default page layout in Preferences

* undo removal of elision

* Remove friend class assignment in cafCategoryMapper

* the required methods have been made public

* Fix up after review

* Remove spurious const on by-value return

* Fix compile errors on Linux

* Fix size adjustment of legends with plot resizing
2019-12-18 12:25:19 +01:00
Jacob Støren
e4eea67a4e Fix error in cafFilePath QVariant isEqual operator 2019-12-12 16:09:20 +01:00
Gaute Lindkvist
9c458ec3ba Fixed typo in comment SFINA -> SFINAE 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
c4951a5a03 Enable the use of the C++11 enum class in caf::AppEnum 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
1d62d3534c Remove use of QFontMetrics width 2019-12-04 15:09:04 +01:00
Magne Sjaastad
1193a9c61e AppFwk : Guard use of front() on empty list 2019-12-02 15:02:10 +01:00
Magne Sjaastad
d68e764a8f Merge pull request #5122 from OPM/timer-improvements
Timer improvements
2019-12-02 10:22:29 +01:00
Gaute Lindkvist
7fd2850c84 Fix misspelling in cafUiStyleSheet.cpp include 2019-11-29 08:06:48 +01:00
Gaute Lindkvist
330f2ea62a Fix widget refresh after stylesheet property clearing 2019-11-28 19:23:41 +01:00
Jacob Støren
95ba482f54
Merge pull request #5118 from OPM/feature-fix-intersection-with-sep-results-picking
Fix picking on intersections with separate results
2019-11-28 15:27:48 +01:00
Jacob Støren
ad25bb89c2 #5112 Add cell highlight on intersections with separate intersection result 2019-11-28 14:09:53 +01:00
Gaute Lindkvist
7a2a0d3f2f Implement stylesheets in caf instead of ResInsight 2019-11-28 08:03:59 +01:00
Gaute Lindkvist
a7aef3f4e7 Make the combo box drop down menus fit the text content even if the widget itself doesn't. 2019-11-26 14:34:34 +01:00
Gaute Lindkvist
85d683634c Further refactoring 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
3dd4cb505b Increase font size of view id tags 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
228810fd05 Refactor view id 2019-11-20 13:14:45 +01:00
Jacob Støren
d312d423e2 #5055 Fix crash when deleting first row in tables views 2019-11-18 09:51:51 +01:00
Jacob Støren
c27c19ce96 caf::Viewer: Add inComparisonView option to isAnimationActive
#4994 preparations
2019-11-08 10:40:37 +01:00
Jacob Støren
277f8c8b7a #4969 Fix Well path and annotation draggers not visible and does not work in comparison view 2019-11-06 14:13:01 +01:00
Jacob Støren
904808394b caf::Viewer: Maintain a flag telling if we have an active comparison view.
Set a custom widget property to communicate it to PdmUiSelection3dEditorVisualizer
Add method to specifically get the Ray intersect speck from each rendering
2019-11-06 14:13:01 +01:00
Magne Sjaastad
be1781fd3b AppFwk : Make sure painter->save always matches painter->restore 2019-11-06 10:36:05 +01:00
Jacob Støren
58c1734334
Merge pull request #4985 from OPM/feature-fix-point-manipulators-in-comparison-view
#4981 Fix well target manipulators not responding
2019-11-05 15:42:02 +01:00
Gaute Lindkvist
03ff43237d Add a view id tag to project tree and tooltip
* Remove it from property editor
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
Jacob Støren
c6e4641725 caf::Viewer: Avoid updating boundingboxes when static models are not removed 2019-11-05 09:30:58 +01:00
Jacob Støren
ed54ccbd01 #4971 Fix Background color in comparison view is always the default color 2019-11-04 10:01:40 +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
Magne Sjaastad
a950852559 #4972 Summary : Add placeholder text to combo box editor 2019-11-03 14:49:08 +01:00
Jacob Støren
720c83d2e3 caf::Viewer: Fixed linux warnings and a bogus comparison 2019-11-01 15:57:03 +01:00
Jacob Støren
e62645341c caf::Viewer: Add method to get correct ray definition when it is inside comparison view 2019-11-01 15:57:03 +01:00
Jacob Støren
11f42fcc7b #4956 caf: Fixed background color change problem in List Editor 2019-11-01 15:57:03 +01:00
Kristian Bendiksen
64ea23fdc6 Use same default filter for both windows and linux. 2019-11-01 14:36:31 +01:00
Magne Sjaastad
23e8db65c2 Merge remote-tracking branch 'origin/dev' into summary-text-edit-in-toolbar 2019-10-28 20:49:29 +01:00
Magne Sjaastad
0af6a1d95d #4775 Summary : Use combo box with history to edit text based curve creation 2019-10-28 20:41:15 +01:00
Magne Sjaastad
7a470587ac #4924 AppFwk ComboBox: Add minimum width 2019-10-28 20:39:01 +01:00
Magne Sjaastad
022d03a287 #4924 AppFwk ComboBox: Add tooltip 2019-10-28 20:37:27 +01:00
Magne Sjaastad
76d196a91a
Merge pull request #4902 from OPM/summary-text-edit-in-toolbar
Summary text editor in toolbar
2019-10-24 21:44:33 +02:00
Magne Sjaastad
32128f0bf3 #4924 AppFwk : Add support for editable combo box 2019-10-24 21:03:17 +02:00
Gaute Lindkvist
c578a43b53 Introduce RimGridPlotWindow and RiuQwtPlotWidget 2019-10-24 14:59:16 +02:00
Gaute Lindkvist
2857a13e7c Columns in well log plots 2019-10-24 14:59:16 +02:00
Magne Sjaastad
1935451242 AppFwk : Add placeholder text to line edit 2019-10-24 09:44:51 +02:00
Jacob Støren
016f26725a #4862 Lock scale Z in comparison view to follow the main view.
#4858 Make timestep independent in comparison view. Make Linked Views timestep linking work
2019-10-22 13:39:18 +02:00
Magne Sjaastad
28ef4166ea #4775 Summary : Improve event handling and add shorcut 2019-10-22 10:39:18 +02:00
Magne Sjaastad
1671fe44b2 #4775 Summary : Add max width to line edit 2019-10-21 16:36:28 +02:00
Magne Sjaastad
7be2cc3031 #4775 Summary : Add text based curve creation to toolbar 2019-10-21 16:19:28 +02:00
Magne Sjaastad
3a174edf0e #4901 AppFwk : Add label editor 2019-10-21 15:47:13 +02:00
Jacob Støren
3f203b808b AppFwk: Viewer: Fix missing nearplane adjustments in comparison view 2019-10-17 15:02:38 +02:00
Jacob Støren
e3dc32bd71 #4857 AppFwk: Add handling of comparison view to the 3d navigation policies 2019-10-17 15:02:38 +02:00
Jacob Støren
d438158691 #4857 AppFwk: Handle picking in the comparison part of the view 2019-10-17 15:02:38 +02:00
Jacob Støren
468cea28bc AppFwk: Add comparison view support to the Viewer.
Add a separate overlay rendering to make rendering of overlay items more flexible and to support the comparison view.
Add control of the Rendering Enable mask
2019-10-11 14:52:49 +02:00
Jacob Støren
f5f8df43a1 caf: Add support for user controlled fixed rotation sensitivity in trackball based navigations 2019-10-09 19:27:13 +02:00
Magne Sjaastad
35004ef7b2 #4843 AppFwk : Remove debug output to avoid noise 2019-10-09 13:07:19 +02:00
Gaute Lindkvist
2961782be1 Renamed caf::PdmXmlObjectHandle::isOfClassKeyword to ::inheritsClassWithKeyword 2019-10-09 09:26:30 +02:00
Gaute Lindkvist
11117383db
#4817 #4830 #4832 #4837 #4839 Python commands for WBS creation, well path import and well log file import (#4838)
* Better minimum width for well log tracks

* Fix alignment of scrollbar in Well log plots

* Better Well Log Plot export

* Hide scroll bar before plotting
* Better borders

* Create plots through Python

* #4817 Create WBS plots with Python

* Rebase Summary and WellLogPlot on top of a new RimPlot

* Also Python: Allow setting folder as a parameter to export_snapshots

* #4832 Prepare for well path import command

* Well Path import WIP

* #4830 #4832 Import well paths and well log files from file using Python.

* #4837 Implement import of formation names in Python

* Fix debug build issue

* Fix RiaLogging build issue

* Fix warnings

* Yet another RiaLogging.h import added

* #4839 Import exporting of las and ascii files from well log plots
2019-10-09 09:21:28 +02:00
Magne Sjaastad
ff3055b961 #4815 Ensemble Curve Set : Make text match case insensitive 2019-10-03 14:36:10 +02:00
Jacob Støren
bfff15568d #4712 Fix stray widgets in Plot Property Panel
Added comments showing that the reason is mainly deleteLater beeing called outside all event loops
2019-09-25 13:09:47 +02:00
Magne Sjaastad
daf4132dec #4744 AppFwk : Auto scroll to first checked item 2019-09-20 14:19:26 +02:00
Magne Sjaastad
a9080e14c3 #4722 AppFwk: Rename 2019-09-20 09:54:10 +02:00
Magne Sjaastad
f4cfc750f1 AppFwk : Apply clang-format 2019-09-20 09:52:12 +02:00
Magne Sjaastad
cba51615d8 #4722 Summary Plot Editor : Update current item in tree view
Make sure the current selected item in the tree view is updated with the value in the underlying field.
2019-09-20 09:44:26 +02:00
Magne Sjaastad
01c615889b AppFwk : Add accessor functions to xml reference string 2019-09-18 14:17:49 +02:00
Magne Sjaastad
60b4078829 AppFwk : Guard for null pointer access 2019-09-18 14:17:44 +02:00
Magne Sjaastad
eb31e9672f AppFwk : Remove clang-format
As we now use clang-format on save in ApplicationCode, we need to remove the clang-format file until we decide to use clang-format for code in AppFwk.
2019-09-18 14:17:39 +02:00
Gaute Lindkvist
baa266f0f9 Improve lines and shading 2019-09-10 16:52:32 +02:00
Magne Sjaastad
03fd2c70fe #4683 System : Do not apply cotire on cafCommandFeatures
This library is used by cmake as an OBJECT library, and this construction is not suported by cotire
2019-09-06 10:52:45 +02:00
Magne Sjaastad
19c93170b3 #4683 System : Exclude QRC files from cotire 2019-09-06 10:52:36 +02:00
Gaute Lindkvist
199e119bbf #4662 Fix erratic behaviour in Tree Selection Editor 2019-09-03 14:42:01 +02:00
Gaute Lindkvist
b93f4fac0f #4661 Python: Fix pip-package generation and add instructions 2019-09-03 12:25:02 +02:00
Magne Sjaastad
68532567f2 AppFwk : Use Qt5 by default 2019-09-02 20:48:11 +02:00
Gaute Lindkvist
7ab9b2a889 #4654 Fix QVariant comparisons with std::vector<T> data types 2019-09-02 15:12:22 +02:00
Jacob Støren
236b0cb3d4 Support cmake version < 3.12 on the OBJECT type library cafCommandFeatures 2019-09-02 13:39:48 +02:00
Jacob Støren
01921a50ab caf: Create a new CommandFeature libary.
Move Add and Delete command features there.
Implement generic Toggle Commands.
Make library an cmake "OBJECT" library to allow "registering by static initialization".
Add the concept of CurrentContextMenuTargetWidget  into CmdFeatureManager to support the toggle commands.
Updated test application to use the new commands
2019-08-29 11:48:43 +02:00
Jacob Støren
6c8feeb60a caf: Made Right upper cross-button (cancle) work in the tabbed property dialog 2019-08-29 11:46:41 +02:00
Jacob Støren
cd1f312c34 #4583 Added Completer functionality to LineEditor 2019-08-28 10:12:54 +02:00
Jacob Støren
2784f5ce11 caf: notifyFieldChange now uses the QVariant content data when checking for equality 2019-08-28 10:12:54 +02:00
Gaute Lindkvist
245d3ad287 Fixed clang-format with proper definition file 2019-08-26 12:33:38 +02:00
Gaute Lindkvist
d93b43afbe Clang-format 2019-08-26 12:26:47 +02:00
Gaute Lindkvist
1009f1ff45 #4629 Fix setting and reading of summary time values 2019-08-26 11:38:41 +02:00
Magne Sjaastad
d065014571 #4599 AppFwk : Do not scroll to item when item is collapsed 2019-08-20 10:35:30 +02:00
Gaute Lindkvist
e58da136e3
#2082 Support custom date time format (#4594)
* #2082 Support custom date time format

* Clang-format
2019-08-19 09:37:42 +02:00
Gaute Lindkvist
3ba962aefb #4471 Implement python script running and editor in ResInsight GUI, same as Octave. 2019-07-26 14:54:54 +02:00
Gaute Lindkvist
439913b7b1 #4423 First implementation of PdmObject exchange 2019-07-15 12:30:31 +02:00
Magne Sjaastad
b70c88330a #4508 Qt5 : Crash when taking snapshot of MDI window 2019-06-28 13:37:37 +02:00
Magne Sjaastad
d108e1f354 AppFwk : Guard use of timestamp() function introduced in Qt5 2019-06-25 18:02:47 +02:00
Jacob Støren
2930d41521 AppFwk: Fix of Qt5 OpenGL related problems: Offset + Context deletion.
Added option to control the direction of the parallel projection headlight
Added optional visualization of point of interest to caf::Viewer
2019-06-25 17:01:38 +02:00
Jacob Støren
936d2e122d AppFwk: Added optional adaptive rotation sensitivity to CAD and Ceetron Plus navigation policies 2019-06-25 16:59:53 +02:00
Jacob Støren
78a705f05c AppFwk: Qt5: Avoid use of an obsolete class 2019-06-25 16:55:03 +02:00
Jacob Støren
b802937657 Fwk: Added the variable CEE_USE_QT5 as an option in pdmCore and LibGuiQt, to make it visible in the Cmake Gui. 2019-06-25 16:51:45 +02:00
Jacob Støren
cc2b19cb57 AppFwk: Added a tabbed property view dialog as convenience until we have a "tab" option in the uiOrdering system 2019-06-25 16:50:46 +02:00
Jacob Støren
ce91cc3cc2 AppFwk: PdmSettings: Added methods that reads and writes (only) valuefields of an object properly 2019-06-25 16:50:03 +02:00
Jacob Støren
183988befd AppFwk: Filepath Editor: Made browse button inactive when field is read only. 2019-06-25 16:47:22 +02:00
Jacob Støren
f1dfab0433 AppFwk: Make push button editor fill the column if Label position is HIDDEN 2019-06-25 16:46:29 +02:00
Jacob Støren
72d4c0b51a AppFwk: Added pdm field of cvf::Mat3d 2019-06-25 16:42:38 +02:00
Jacob Støren
eb258ee742 AppFwk: Added missign guard against nullptr 2019-06-25 16:41:22 +02:00
Gaute Lindkvist
5365f4dd7d Caf build fixes for CEE_USE_QT5 2019-05-31 11:00:32 +02:00
Gaute Lindkvist
10afe4987b #4448 Clean up CAF Qt5-enabling/detection 2019-05-28 15:58:49 +02:00
Gaute Lindkvist
0544b19afe Fix carriage return difference in CafPdmModel_UnitTests 2019-05-28 15:58:48 +02:00
Gaute Lindkvist
8f3eb6a748 Add Qt5 test to AppFwk main CMakeLists.txt and update CAF to use CEE_USE_QT5 2019-05-28 15:58:48 +02:00
Gaute Lindkvist
922386c673
#4416 First implementation of gRPC-based Python interface
First implementation with Asynchronous gRPC server, a few services and some client python code.
2019-05-20 13:21:02 +02:00