Commit Graph

1137 Commits

Author SHA1 Message Date
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
Gaute Lindkvist
af1a5790a2 Fix crash in some unit tests from constructing a QPixmap without a QApplication 2019-05-06 13:35:05 +02:00
Magne Sjaastad
911b69b56f #4388 AppFwk : Make sure context menu policy is set correctly in all use cases 2019-05-06 11:58:06 +02:00
Magne Sjaastad
a852d1a50e #4388 AppFwk : Rename and rewrite of PdmUiFieldHandle::notifyFieldChanged 2019-05-06 11:58:06 +02:00
Magne Sjaastad
50ee79f6c3 #4388 AppFwk : Always mark field as used when editor is created 2019-05-06 11:58:06 +02:00
Magne Sjaastad
9e7467309d #4388 AppFwk : Set parent editor when field editor is created 2019-05-06 11:58:06 +02:00
Jacob Støren
01ac756314 AppFwk: Added a parent editor concept, and adjusted the update regime to make embedded editors trigger update of the containing editor. Removed the update of the fields owner object, which causes trouble for table editors and some derived object editors. 2019-05-06 11:58:06 +02:00
Magne Sjaastad
088b5513a7 #4388 AppFwk : Remove problematic setUiField() calls
setUiField() call used to keep track of which fields that is retained when updating an editor. Replace this workflow with a set of the ones that are used, and use this set to clean up unused editors afterwards.
2019-05-06 11:58:06 +02:00
Gaute Lindkvist
fe0624e304 Fix build problems in cafTestApp following headless changes 2019-05-06 11:48:23 +02:00
Gaute Lindkvist
30769d7f2a Rename caf::PdmUiItem::setUiIcon(QString) to setUiIconFromResourceString 2019-05-06 11:08:59 +02:00
Gaute Lindkvist
57b33b0d4c
First implementation of Headless (#4392)
* Revert "#4377 Octave : Use RiaLogging for error messages instead of QErrorMessage "

This reverts commit f758a8edb2.

* Revert "#4380 Preferences : Changing scene font size when geo mech view is open causes crash"

This reverts commit df62a41397.

* Revert "#4379 Documentation : Update command line parser for import of summary files"

This reverts commit d0b5357ed4.

* Unfinished WIP

* Builds but crashes

* Refactored code now builds and runs

* ResInsight can now run the unittests headless

* Can run some command files successfully

* Build on Linux

* Extra headless hack header

* Moved PdmUiItem hack to cpp file

* Fix headless crash in RimWellAllocationPlot

* Handle error gracefully if ExportSnapshots command is executed from console

* Add caf::QIconProvider and remove some hacks

* Also made the greying out of disabled icons work for a couple of cases where it didn't.

* Linux build fix

* #4380 Reimplement fix df62a41397 by @magnesj on top of Headless code changes

* #4379 Reintroduce kode from d0b5357ed4 by @magnesj

* #4377 Restore f758a8edb2 in new Headless code
2019-05-06 10:36:05 +02:00
Magne Sjaastad
4c46573fc9 Reintroduce "#4308 System : Add virtual function childFieldChangedByUi"
This reverts commit 91022a7535.
2019-05-03 12:13:11 +02:00
Magne Sjaastad
91022a7535 Revert "#4308 System : Add virtual function childFieldChangedByUi"
This reverts commit fbf9308e2b.
2019-05-03 11:16:09 +02:00
Magne Sjaastad
9ae6b79271 #4387 System : Move clang-tidy and clang-format into ApplicationCode
Prepare for format-on-save
2019-05-03 09:15:18 +02:00
Magne Sjaastad
a5a70dd83c #4356 Qt5 : Conversion of float value to text string does not work for all values 2019-04-25 06:52:40 +02:00
Gaute Lindkvist
4b07387a93 Minor tweak to color editor 2019-04-23 08:38:49 +02:00
Magne Sjaastad
d6b5444c51 Add missing includes 2019-04-12 15:33:11 +02:00
Gaute Lindkvist
798e3ff19e #4256 Update fonts in Project and views when changing preferences 2019-04-12 14:47:21 +02:00
Gaute Lindkvist
c82a4a5537 #4316 Fix context menu with multiple selected well paths 2019-04-12 09:09:12 +02:00
Magne Sjaastad
fbf9308e2b #4308 System : Add virtual function childFieldChangedByUi 2019-04-10 13:55:44 +02:00
Gaute Lindkvist
72052377dc #4305 Adjust size of layouts and labels if the sizeHint has changed 2019-04-09 13:53:33 +02:00
Gaute Lindkvist
c0f3258f19 Work in progress 2019-04-09 10:30:15 +02:00
Gaute Lindkvist
02f769fd31 #4299 Make sure the size hint for property view is large enough for the content 2019-04-08 14:24:43 +02:00
Gaute Lindkvist
a6dda48606 Add stylesheet tools to caf 2019-04-08 14:24:43 +02:00
Gaute Lindkvist
4e92a7e44a More consistent naming for Qt-derived classes in CAF 2019-04-08 14:24:43 +02:00
Gaute Lindkvist
22880d511b #4280 Improve animation progress bar 2019-04-08 14:24:43 +02:00
Magne Sjaastad
387d7cf7c2 System : Use appropriate mode when displaying a cmake message 2019-04-08 12:32:14 +02:00
Gaute Lindkvist
a8e14e9f9a Fix copyright header and namespace for cafShortenedQLabel 2019-04-05 17:31:07 +02:00
Gaute Lindkvist
867c541b7b #4282 Improve look of Summary Plot Editor after layout changes
* In particular make the QMinimizePanel title panel fixed in size.
2019-04-05 15:42:20 +02:00
Magne Sjaastad
9edd567d42 AppFwk : Fix missing rename in test application 2019-04-05 13:57:24 +02:00
Gaute Lindkvist
ffaeccf31c Make sure all groups have a new layout inside as well 2019-04-05 13:52:53 +02:00
Gaute Lindkvist
94a8c35311 #4282 Move new Grid Layout creation inside form layout object editor 2019-04-05 13:28:23 +02:00
Gaute Lindkvist
cdc7a12190 #4282 Make minimum size work well for property view 2019-04-05 13:05:48 +02:00
Gaute Lindkvist
fccb363f53 #4282 Remove horizontal scrollbar from result property list 2019-04-05 13:05:48 +02:00
Gaute Lindkvist
0110e9a0c3 #4282 Make Editor labels use preferred size rather than maximum for expansion. 2019-04-05 13:05:48 +02:00
Gaute Lindkvist
8e6ac03c75 #4282 Let ComboBoxEditor be narrowed smaller than full text string by default 2019-04-05 13:05:47 +02:00
Gaute Lindkvist
6a2e81ca4b #4282 Add a new cafShortenedQLabel class that provides a label that shortens itself when space is limited 2019-04-05 13:05:14 +02:00
Gaute Lindkvist
038d7a7676 #4097 Implement stretch factors for editors 2019-04-04 11:19:35 +02:00
Gaute Lindkvist
5e517e47dd Labels on top fixes 2019-04-04 08:47:36 +02:00
Gaute Lindkvist
3d3868e29d Fix up keyboard shorcut on < Qt 5.10 2019-03-27 12:01:49 +01:00
Gaute Lindkvist
9306961df4 #4176 Enable Del keyboard shortcut for delete commands 2019-03-27 11:03:10 +01:00
Gaute Lindkvist
f066829a0f #4176 Add feature to cafCmdFeatureManager to find commands matching a keyboard shortcut 2019-03-27 10:29:26 +01:00
Gaute Lindkvist
7e5bd010c3 Revert non-horizontal Fast/slow icons for cafanimationtoolbar 2019-03-26 17:23:12 +01:00
Gaute Lindkvist
b956e6ed70 #4078 #4094 Improve icons in animation toolbar 2019-03-26 14:19:02 +01:00
Gaute Lindkvist
de2920c7c2 Add ProgressInfoBlocker and add to unit tests 2019-03-22 13:30:18 +01:00
Gaute Lindkvist
f09f487635 #4143 First implementation of export sector model 2019-03-18 12:56:09 +01:00
Gaute Lindkvist
925747b9d4 Fix warnings about QStyleFrameOptionsV4 2019-03-14 09:50:58 +01:00
Gaute Lindkvist
117731a24a #4192 Add swap axis and update property editor 2019-03-12 14:34:22 +01:00
Gaute Lindkvist
22f7bf7c21 Update RifReaderEclipseOutput and RimEclipseCase to use new progress tasks 2019-03-12 14:34:22 +01:00
Gaute Lindkvist
749e19a879 Create a simpler task system for handling sub tasks in progress dialog.
* Remove incrementProgressAndUpdateNextStep() method
2019-03-12 14:34:22 +01:00
Gaute Lindkvist
e00f983360 #4166 Add feature for swapping cross plot axes + tweaks to legend
* Also put x and y property side by side in property editor
2019-03-08 09:59:38 +01:00
Gaute Lindkvist
be95eefd69 Repository wide spelling correction overly -> overlay
* Impacts CAF and ResInsight
2019-03-05 10:41:41 +01:00
Magne Sjaastad
7866122b31 Rename and whitespace 2019-02-22 10:21:25 +01:00
Magne Sjaastad
5a45d37ee1 #4116 PdmUiListView: Use timer and singleShot to trigger scroll to selected item 2019-02-22 10:21:25 +01:00
Gaute Lindkvist
1536645e7c #4132 Temporarily fix contour map crash by commenting out processEvents 2019-02-22 09:06:51 +01:00
Magne Sjaastad
735bd5a4b1 Whitespace 2019-02-22 07:55:57 +01:00
Magne Sjaastad
24bda0fda2 #4116 PdmUiListView: Scroll to the first selected item when activated
This solution does not always work, but scrolls to the first selected item in most cases
2019-02-22 07:52:19 +01:00
Gaute Lindkvist
66e57890dc #4106 Stop trying to do recursive setting tab order widget
* The double pointer was handled wrongly and shift-tab order isn't working anyway.
2019-02-20 09:33:05 +01:00
Magne Sjaastad
08c3c4cb0d #4106 Crash on Linux
Temporary workaround to avoid crash
2019-02-19 09:01:51 +01:00
Magne Sjaastad
b15f58b560 #4083 Summary : Do not change selected summary type when unticking a checkbox 2019-02-17 10:49:47 +01:00
Gaute Lindkvist
a6d29c6f96 #4090 Update fix for crash with no label editors 2019-02-15 13:16:51 +01:00
Magne Sjaastad
44334bcdc6 #4090 Property Editor : Fix crash for no label editors 2019-02-14 12:41:56 +01:00
Gaute Lindkvist
33eea61852 #4054 More toolbar adjustments 2019-02-12 14:36:14 +01:00
Gaute Lindkvist
7e43509f41 First implementation of cafPopupWidget and used for animation speed 2019-02-12 12:21:13 +01:00
Gaute Lindkvist
2b9f6e10bc #4054 Remove play backwards and repeat backwards 2019-02-12 08:42:02 +01:00
Gaute Lindkvist
d9672ad9a1 Simplify pick event system 2019-02-11 15:48:02 +01:00
Gaute Lindkvist
fac9870c76 Rework caf Layout to work better when number of columns isn't fully specified 2019-02-11 15:48:01 +01:00
Gaute Lindkvist
0fd51b2088 #4025 Show delayed action progress bar during contour map generation 2019-02-11 13:10:38 +01:00
Magne Sjaastad
288ee59587 #4066 System : Improve cmake macros for cotire 2019-02-11 07:13:08 +01:00
Magne Sjaastad
75833f491a #4061 AppFwk : Remove obsolete code 2019-02-08 12:10:52 +01:00
Magne Sjaastad
9a88c33de0 #4061 VizFwk : Use variable CAF_USE_QT5 2019-02-08 11:28:14 +01:00
Gaute Lindkvist
4e17b5acfa #4047 Alter mouse cursor in Vec3dPickEventHandler 2019-02-07 16:34:43 +01:00
Gaute Lindkvist
c4f5065032 #4045 Don't accept pick events if the current selected object isn't the object owning the pick handler. 2019-02-06 13:24:26 +01:00
Gaute Lindkvist
4ec8869743 Rename in caf::PdmUiVec3dEditor 2019-02-06 09:39:47 +01:00
Gaute Lindkvist
058b9cfb7a #4014 Implement caf::PdmUiVec3dEditor and a RicVec3dPickEventHandler 2019-02-06 08:21:14 +01:00
Gaute Lindkvist
5d35678d97 Refactor PickEvent Hierarchy to have a basis in Caf 2019-02-06 08:12:30 +01:00
Gaute Lindkvist
ff1cedcc6f #4011 Remove stop button and alter state of buttons depending on animation stage. 2019-02-01 11:05:51 +01:00
Gaute Lindkvist
107a4b9b60 #4012 Always place well target points in real cell geometry 2019-02-01 07:56:05 +01:00
Magne Sjaastad
bd6bbe9da9 #4020 System : Use ri_apply_cotire() 2019-02-01 06:56:11 +01:00
Magne Sjaastad
1a7de264ca #4020 System : Define NOMINMAX before include of windows.h 2019-02-01 06:50:53 +01:00
Magne Sjaastad
fc133c4475 System : Add missing pragma once 2019-02-01 06:50:44 +01:00
Gaute Lindkvist
7a50fa12f8 #3953 Extend well completions spec 2019-01-29 10:18:20 +01:00
Gaute Lindkvist
64c30d00d1 #3994 Fix crash when creating valves and no valve template is present 2019-01-28 15:29:20 +01:00
Gaute Lindkvist
d9f7e68739 Add legend levels field to Contor Map projection and make sliders delay update until release 2019-01-22 15:48:21 +01:00
Gaute Lindkvist
b1ad93f4b9 #3970 Contour Maps: improve edge look
* Remove excess tiny triangles around edges
* Remove labels from contour lines that overlap inner contour lines
2019-01-17 20:18:15 +01:00
Magne Sjaastad
65ee55c96d #3944 clang-tidy : Apply clang-tidy on caf 2019-01-11 08:14:53 +01:00
Magne Sjaastad
fc21dfbbbf Add missing include 2019-01-09 14:03:05 +01:00
Gaute Lindkvist
7fccdf7153 #3934 Implement area threshold for contour polygons 2019-01-09 08:42:20 +01:00
Gaute Lindkvist
7a275be335 #3876 Implement rotated labels on contour maps 2019-01-08 11:07:37 +01:00
Gaute Lindkvist
71cacc550f #3881 Smooth outer contour line and clip geometry 2019-01-08 11:07:37 +01:00
Magne Sjaastad
98da255772 System : Remove TR1 warnings from gtest 2019-01-07 14:32:29 +01:00
Magne Sjaastad
f09fa727fa #3928 Coordinate transform : Add convert of vector of points 2019-01-03 13:16:26 +01:00
Magne Sjaastad
f42aa8bcda Test : Remove file from Qt MOC 2019-01-02 09:34:06 +01:00
Gaute Lindkvist
b1b278fffc #3876 Add reference to Shoelace formula for counter clockwise polygon test. 2018-12-21 09:48:57 +01:00
Magne Sjaastad
6f3097dd5f Merge remote-tracking branch 'origin/2018.11.01-patch' into dev 2018-12-21 08:46:27 +01:00
Gaute Lindkvist
10da90350f #3876 Create Counter Clockwise closed polygons out of the contour line segments 2018-12-20 09:47:25 +01:00
Jacob Støren
db78e07fcf #3797 Use custom icons for up and down stepping of comboboxes 2018-12-18 15:56:46 +01:00
Magne Sjaastad
902473a4a5 #3886 AppFwk ToolBarEditor : Call calculateValueOptions for existing editors 2018-12-17 07:55:25 +01:00
Magne Sjaastad
b383df4ccc #3886 AppFwk ToolBarEditor : Call calculateValueOptions for existing editors 2018-12-14 12:25:21 +01:00
Gaute Lindkvist
4b1feb842d #3885 Include "Cached" memory in available virtual memory on Linux.
* Cached memory is easily available to processes if needed.
2018-12-14 10:47:33 +01:00
Gaute Lindkvist
b43ef3dc0b #3885 Include "Cached" memory in available virtual memory on Linux.
* Cached memory is easily available to processes if needed.
2018-12-14 10:33:51 +01:00
Gaute Lindkvist
914daded6b #3794 Improve wheel zooming 2018-12-12 08:01:13 +01:00
Bjørn Erik Jensen
06b58a2462 #3799 Scale legend. Add minor ticks in first major interval 2018-12-11 15:17:00 +01:00
Gaute Lindkvist
734d76f74a Revert "#3751 Fix keyboard selection in Summary Plot Editor"
This reverts commit ab0fa2fb19.

* This change should never have been merged back into the repo.
2018-12-11 13:12:24 +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
020146bead Cotire : Move macro definition to avoid duplicate symbols 2018-12-10 09:31:10 +01:00
Gaute Lindkvist
c51b938d03 Switch to more robust check for Qt5 for cafUserInterface. This should be applied to other projects 2018-12-07 12:58:03 +01:00
Bjørn Erik Jensen
c0b7b5d87e caf. Make method const 2018-12-07 12:42:42 +01:00
Bjørn Erik Jensen
b4482d20b0 #3723 Annotations. User editable polyline, both in in view and in property editor 2018-12-07 09:11:19 +01:00
Gaute Lindkvist
29c3e10617 #3779 Implement AICD ui and settings 2018-12-05 15:47:16 +01:00
Gaute Lindkvist
2ed41d3158 CMake fixes to cafTestApp 2018-12-05 15:47:16 +01:00
Magne Sjaastad
aa19715c40 #3822 AppFwk : Improve resolve of PtrField, unit test 2018-12-04 14:10:54 +01:00
Magne Sjaastad
90550fe561 #3822 AppFwk : Improve resolve of PtrField 2018-12-04 14:10:18 +01:00
Gaute Lindkvist
b06097862f Fix Linux build of caf unit tests 2018-12-03 15:00:53 +01:00
Gaute Lindkvist
8cd2d37b92 Quieten Qt5 check in caf unittests 2018-12-03 15:00:53 +01:00
Magne Sjaastad
4d25cd0c71 #3792 Add font size 10 and 14 2018-12-03 14:19:49 +01:00
Gaute Lindkvist
7128c58b6c Quiet Qt5 check for cafAppFwk 2018-12-03 14:18:38 +01:00
Gaute Lindkvist
b097c8c9b7 Fix TRUE/true in cafAboutDialog 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
ddb546d877 #3754 Upgrade CAF CMake-system to support both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
cc7269c717 #3752 CAF code changes to build on both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
7fd3dac2ef Revert "#3751 Fix keyboard selection in Summary Plot Editor"
This reverts commit ab0fa2fb19.

* This change should never have been merged back into the repo.
2018-11-30 09:45:50 +01:00
Jacob Støren
08de39f15a AppFwk: Update some plantuml docs 2018-11-27 14:59:30 +01:00
Jacob Støren
7a0fcaa2ec AppFwk: Remove obsolete plantuml documentation stuff 2018-11-27 14:59:30 +01:00
Jacob Støren
3c32595e25 AppFwk: Moved PdmUi3dObjectEditorHandle and PdmUiSelection3dEditorVisualizer into correct place in PdmUiCore 2018-11-27 10:31:54 +01:00
Jacob Støren
318cd76b64 AppFwk: Split PdmUiObjectEditorHandle into PdmUiWidgetObjectEditorHandle
making PdmUiObjectEditorHandle  a cleaner interface for PdmUi3dObjectEditorHandle
2018-11-27 09:31:33 +01:00
Jacob Støren
b4572fd9a2 AppFwk: Remove som unused code 2018-11-26 21:51:05 +01:00
Jacob Støren
fb93ad7ca7 AppFwk: Make PdmUiSelection3dEditorVisualizer generic, ready to be moved to a separate file 2018-11-26 21:50:46 +01:00
Gaute Lindkvist
8b7b110440 Merge branch 'dev' into dev-deeper 2018-11-26 09:21:33 +01:00
Gaute Lindkvist
40f466fb0c #3751 Fix keyboard selection by overriding keyPressEvent and emitting clicked() 2018-11-26 08:01:54 +01:00
Gaute Lindkvist
ab0fa2fb19 #3751 Fix keyboard selection in Summary Plot Editor 2018-11-23 15:36:33 +01:00
Gaute Lindkvist
2cf5357a47 #3738 Active correct item when clicking in Summary Plot Editor 2018-11-23 15:11:23 +01:00
Bjørn Erik Jensen
15a6bc358b Merge branch 'dev' into dev-deeper 2018-11-22 14:21:00 +01:00
Gaute Lindkvist
d69153c013 #3489 Fix legend text for flow diagnostics. 2018-11-22 13:39:07 +01:00
Bjørn Erik Jensen
67ba01f835 #3722 Scale legend. Descrease size 2018-11-21 14:58:47 +01:00
Bjørn Erik Jensen
5e769b337f Merge branch 'dev' into dev-deeper 2018-11-21 14:00:46 +01:00
Magne Sjaastad
11de63a5ef Fix Linux build 2018-11-21 10:55:57 +01:00
Gaute Lindkvist
9145e6011d #3697 Fix zoom issues with ortographic views 2018-11-20 13:49:19 +01:00
Bjørn Erik Jensen
75c923d102 #3698 Scale bar. Support for both horizontal and vertical orientation 2018-11-16 13:52:05 +01:00
Bjørn Erik Jensen
05e04bb588 #3698 Scale bar. Fixed axis length 2018-11-16 13:52:05 +01:00
Bjørn Erik Jensen
d8a466a9ef #3698 Scale bar. Take 1. Only vertical variant implemented so far 2018-11-16 13:52:05 +01:00
Magne Sjaastad
9b41685035 #3662 AppFwk : Allow interaction in second main window 2018-11-12 09:49:35 +01:00
Magne Sjaastad
cfbbcacc23 #3634 Regression Test : Use flag to control OpenMP when building geometry 2018-11-12 07:33:08 +01:00
Gaute Lindkvist
937dacd7df Assert on contourLevel range not being empty for cafContourLines 2018-11-05 14:41:12 +01:00
Gaute Lindkvist
1422403b71 #3596 Add new aggregation for Oil / Water / HC columns and improve speed and reliability.
* Avoid calculating results many times for each change.
* Avoid drawing spurious contour lines when results are undefined.
* Add aggregation type to legend header (#3594).
2018-11-05 14:31:23 +01:00
Magne Sjaastad
2143673aa7 #3583 Property Editor : Set unused grid cells to stretch 0 2018-11-02 14:58:08 +01:00
Magne Sjaastad
a3aeb424b3 Revert "#3564 System : Recreate QGridLayout for each property editor"
This reverts commit f6c92a15a6.
2018-11-02 14:04:29 +01:00
Magne Sjaastad
78505bb44d System : Fix name collision of macro expansion
The macro CAF_PDM_UI_FIELD_EDITOR_SOURCE_INIT expands to a variable name colliding with an identical variable name in a different file. Cotire put the two files into same file, and this causes compilation issues.

Fixed by removing some empty lines in one file, to make sure the two statements are defined at different lines.
2018-11-01 19:56:55 +01:00
Gaute Lindkvist
ee388ca4b0 #3591 Improve edges on contour map. 2018-10-31 16:17:09 +01:00
Gaute Lindkvist
e9de865c1f Rebase conrec code off the Paul D. Bourke C-code and fix copyright.
* Rebased to the C-code by Bourke himself to avoid the sneaky little requirement
added by Nicholas Yue that only allows redistribution with explicit permission.
2018-10-31 11:31:02 +01:00
Gaute Lindkvist
0d3b205dac #3589 Fix regression in column width for table in well path creation. 2018-10-31 09:32:10 +01:00
Gaute Lindkvist
69d079f942 #3505 First go at contour lines 2018-10-30 16:25:33 +01:00
Magne Sjaastad
f6c92a15a6 #3564 System : Recreate QGridLayout for each property editor
If the layout is reused, the rows grow over time. This causes the Cell Result to not fill all available space.
2018-10-26 11:39:58 +02:00
Gaute Lindkvist
f80472ffa6 #3540 Create seperate 2d view with parallel, look down and linked views 2018-10-24 15:21:53 +02:00
Magne Sjaastad
758598df0e clang-tidy : Use nullptr 2018-10-18 16:36:11 +02:00
Magne Sjaastad
764fb65e8e clang-tidy : Remove redundant 'virtual' and add 'override'
clang-tidy : Remove redundant 'virtual' and add 'override'
2018-10-18 16:35:51 +02:00
Gaute Lindkvist
71a1bd98ab #3441 Improve table view to work better with more attribute types. 2018-10-05 15:35:15 +02:00
Jacob Støren
bd79bd89c1 #3449 Improve checkbox column size hint, alignment and "hit" rectanngle 2018-10-03 08:40:28 +02:00
Jacob Støren
979882da03 AppFwk: Read only checkboxes in table view, now is rendered disabled 2018-10-02 16:52:56 +02:00
Gaute Lindkvist
fcda0b9755 Remove padding to the left in TreeSelectionEditor if the tree doesn't have grand children. 2018-10-02 08:46:24 +02:00
Gaute Lindkvist
33a171fbcf #3419 Implement buttons to add communicating tracers to the selected injectors or producers. 2018-09-28 15:46:08 +02:00
Gaute Lindkvist
e91bdece9c Ui Form Layout, simplify comment for label content margin shift. 2018-09-28 15:46:08 +02:00
Magne Sjaastad
b584ab905c AppFwk : Activate more warnings 2018-09-27 21:36:52 +02:00
Gaute Lindkvist
8c5e538f01 Implement a way for editors to fit the label to the field. 2018-09-27 16:07:35 +02:00
Magne Sjaastad
a3d8fc1fb3 #3421 Text File Export : Open file as text file when required 2018-09-27 12:42:28 +02:00
Gaute Lindkvist
15a61f88e0 Fix row stretch issue. 2018-09-26 14:45:56 +02:00
Gaute Lindkvist
e8a1d30f2d #3404 Side by side editors, first implementation. 2018-09-26 14:30:50 +02:00
Jacob Støren
e55fc4990d #3353 AppFwk: TableViewEditor: Support pr cell tooltip.
Use ForegroundRole text color for highlighted cells also.
Use PdmUiItem::uiContentTextColor as ForegroundRoleText
2018-09-24 15:49:16 +02:00
Jacob Støren
10b031fa6d #3353 AppFwk: Add contentTextColor to PdmUiItem 2018-09-24 15:49:16 +02:00
Jacob Støren
3cd9c6123c Remove compiler warning 2018-09-19 10:25:57 +02:00
Gaute Lindkvist
a3f6a8dd3d #3373 Initialize variable so that selection events updates selection manager for table view editor 2018-09-17 13:23:23 +02:00
Magne Sjaastad
deff3ed41b #3365 AppFwk Integer slider editor : Block signals in configureAndUpdate 2018-09-14 09:45:53 +02:00
Magne Sjaastad
6aa234cc9b AppFwk : Fix several warnings 2018-09-13 09:01:05 +02:00
Magne Sjaastad
2d1d9fed95 AppFwk : Fix signed/unsigned issue 2018-09-13 08:55:02 +02:00
Magne Sjaastad
16d3e67de0 AppFwk : Set warning level to W4 for Visual Studio 2018-09-13 08:54:40 +02:00
Jacob Støren
50b10d6078 #3357 Appfwk: Table View Editor : Use deleteLater to avoid crash
due to delegates beeing deleted before the actual widgets. Qt needs the delegates to redraw stuff on the way to the event loop
2018-09-12 14:20:43 +02:00
Magne Sjaastad
cb218965c5 #3340 Do not use same variable name twice 2018-09-10 10:27:54 +02:00
Gaute Lindkvist
8eda5bcbb9 #3313 Implement weighted average of WBS data. 2018-09-07 10:49:00 +02:00
Gaute Lindkvist
ac8a11c813 Make caf::PdmPtrField inherit caf::PdmValueField and make it support QVariant. 2018-09-05 11:03:41 +02:00
Gaute Lindkvist
4c84bbb8a3 #3014 and #3022 Well Bore Stability: LAS and element table input and cleaned up extraction code. 2018-09-04 12:01:07 +02:00
Jacob Støren
26b3065974 #3296 caf: Table View: Force redraw when QSelection changes (Qt bug)
Guard against doing anything if table is hidden
2018-08-31 16:13:46 +02:00
Jacob Støren
e26a57011d #3296 caf::SelectionManager: Refactoring to avoid sending multiple selection changes
Must be considered if using the CmdSelectionGangeExec
2018-08-31 16:13:46 +02:00
Jacob Støren
e93a07b43b Fix missing blocking of selection manager update when updating table selection
Caused crash in the Well Path editing (dragging targets)
2018-08-30 15:43:55 +02:00
Magne Sjaastad
1104c336aa #3294 Selection Manager : Clear selection when editor is activated 2018-08-30 10:42:25 +02:00
Gaute Lindkvist
8e73f132cf #3285 Make context menu on table views work correctly with multiple contexts. 2018-08-30 09:32:28 +02:00
Jacob Støren
015bb1719a #3290 caf: Add force column resize attribute 2018-08-29 17:07:36 +02:00
Jacob Støren
99bdece40e #3249 caf: Add isSelected method to selection manager 2018-08-29 16:04:08 +02:00
Jacob Støren
ed518a94a6 #3249 caf: Add background color control to table view 2018-08-29 16:04:08 +02:00
Magne Sjaastad
6b5f7ed1d9 TestApplication : Renamed the WidgetBasedObjectEditor to FormLayoutObjectEditor 2018-08-28 15:18:22 +02:00
Jacob Støren
8fca7475e9 caf: Renamed the WidgetBasedObjectEditor to FormLayoutObjectEditor 2018-08-27 16:25:26 +02:00
Magne Sjaastad
9e3a100bcc #3253 OpenMP : Give name to all critical sections 2018-08-27 13:04:29 +02:00
Gaute Lindkvist
92bcae2805 Add not equals operator to PdmDataValueField 2018-08-27 11:33:02 +02:00
Bjørn Erik Jensen
9bff5881a3 #3271 Create Multiple Fractures. Summary field using empty space 2018-08-27 10:47:03 +02:00
Bjørn Erik Jensen
1be8d335fa PdmUiTableViewEditor. Add support for setting column widths 2018-08-24 15:10:10 +02:00
Gaute Lindkvist
208505ee5f Fix Linux build issue with cafSelectionManager 2018-08-22 13:10:18 +02:00
Gaute Lindkvist
12202fe4e6 #3255 Add convenience methods to caf::SelectionManager 2018-08-22 13:04:00 +02:00
Magne Sjaastad
46e42a5489 AppFwk : Remove not required function call 2018-08-22 09:44:18 +02:00
Jacob Støren
37cb3e0ab7 caf: Removed obsolete SelectionManager includes 2018-08-21 16:44:20 +02:00
Jacob Støren
296854d749 caf: Rename of SelectionRole to SelectionLevel and
CURRENT to FIRST_LEVEL
Replace use of SelectionLevel enum as argument with int
2018-08-21 16:44:19 +02:00
Jacob Støren
0e92c1d594 caf: Replace selection role with selectionLevel.
Use std::map for storage of the different selections
Started to remove the SelectionRole Enum
2018-08-21 16:44:19 +02:00
Jacob Støren
e10754cffb #2607 caf: Add selection level to the "notify selection changed" system 2018-08-21 16:44:19 +02:00
Magne Sjaastad
56bf2ede7d #3222 AppFwk : Improve robustness/maintainability (3) 2018-08-20 08:56:35 +02:00