Commit Graph

730 Commits

Author SHA1 Message Date
Gaute Lindkvist
772e7ec7e6 Revert "#2873 Delegate deletion of summary cases to separate thread."
This reverts commit 0089e0c218.

Didn't intend this to go into dev now
2018-05-22 09:22:12 +02:00
Gaute Lindkvist
0089e0c218 #2873 Delegate deletion of summary cases to separate thread. 2018-05-22 09:21:40 +02:00
Jacob Støren
ec9e2efef4 Fix cotire build problem 2018-05-22 00:16:03 +02:00
Jacob Støren
9b9f9b2bf1 #2939 ProgressInfo: Reintroduce process envents, to update the progress dialog durig processing on linux/mac.
Introduced isActive and used this info to block sheduled redraw/display model regen when progress bar is active, to avoid unintended recursive behaviour resulting in crashes.
2018-05-21 23:46:35 +02:00
Jacob Støren
d37ed9bb7c #2889 Fix crash when few tick marks in legend.
Set legend title before adding to view to make size calculaltion correct first time.
2018-05-11 14:06:08 +02:00
Gaute Lindkvist
15c2b19f59 Slightly improve naming of epsilon/tolerance variable in plane triangle intersection. 2018-05-09 11:34:04 +02:00
Gaute Lindkvist
9da54a115b Fix crash in cafHexGridIntersectionTools when exporting fracture completions.
* Account for two new triangle plane intersection cases where one vertex is touching the plane.
2018-05-09 10:44:29 +02:00
Bjørn Erik Jensen
d659b8e853 #2856 Context menus. Fix logical error during menu build-up 2018-05-07 12:24:51 +02:00
Bjørn Erik Jensen
0e8eae33db #2818 Selection manager. Add strict method variant 2018-05-07 09:46:45 +02:00
Jacob Støren
d413df0aeb #2730 Category and Scalarmapper Legend: Improve the preferred size 2018-05-04 13:33:06 +02:00
Bjørn Erik Jensen
736277e0ef #2797 Ensemble curves. Slightly increased cateory legend height 2018-05-03 09:53:34 +02:00
Gaute Lindkvist
98af9e00ab Fix build issue on Linux 2018-05-02 12:11:15 +02:00
Gaute Lindkvist
6e3d989b2f #2825 Fix curve stitching issues against 3dwell log curve background. 2018-05-02 11:51:36 +02:00
Gaute Lindkvist
f61512ef94 Add Copyright headers to cafTitledOverlayFrame.h|cpp 2018-04-25 14:38:17 +02:00
Gaute Lindkvist
517a557efe Legends (#2786): Fix Debug-build of Resinsight. 2018-04-23 13:08:35 +02:00
Gaute Lindkvist
c5e58df751 3d Well Log Curves (#2783): Enable picking with the track background switched off.
* Add part to the model, but set the color mask false, depth test/write off.
* Result is an invisible part that is present for picking.
2018-04-23 11:35:55 +02:00
Jacob Støren
22a1448ea6 Fix gcc 6 linux errors 2018-04-20 19:38:21 +02:00
Jacob Støren
3957027b4b #2657 Final cleanup and refactoring of legends size system 2018-04-20 16:59:10 +02:00
Jacob Støren
03ec76c20a #2657 Add a preferredSize method to the legends 2018-04-20 16:59:10 +02:00
Jacob Støren
0192f66a4d More renaming and reformatting of legend code 2018-04-20 16:59:10 +02:00
Jacob Støren
1f8d4437bf Remove the unused, unnecessary "position" from several methods and the overlay layout struct 2018-04-20 16:59:10 +02:00
Jacob Støren
d48c2b7aa9 Rename layout variables in legends to make their intent and use clearer 2018-04-20 09:23:19 +02:00
Gaute Lindkvist
5d89ad3a6d 3D Well Log Curves (#2674): Show what the value axis direction is 2018-04-19 13:43:12 +02:00
Gaute Lindkvist
a73526f85b Remove compile warning for OverlayScalarMapperLegend
* apply explicit unsigned int -> float cast.
2018-04-10 08:36:20 +02:00
Gaute Lindkvist
dd38543dd2 Fix Ubuntu build (#2696)
* std::ceil -> cvf::Math::ceil to avoid header issues.
2018-04-10 08:31:03 +02:00
Gaute Lindkvist
ab736ab46b #2693. Fix overlap of category legend with other legends.
* CategoryLegend should not use the matchedWidth. They have their own columns.
  * Change shifts to using minimumWidth instead.
2018-04-09 14:30:21 +02:00
Gaute Lindkvist
b488d99f81 #2696 Fix ubuntu build after Legend updates.
* Was missing <cmath> to get std::ceil, but cvf::Math also has ceil, so switch
   to that.
2018-04-09 14:19:43 +02:00
Gaute Lindkvist
b6fb60115a Refactored after review 2018-04-09 13:14:19 +02:00
Gaute Lindkvist
e93f79790e Make sure Ternary legends also expand and renamed width method. 2018-04-09 13:14:19 +02:00
Gaute Lindkvist
38aa447dcd Unify the width of all visible legends.
* Calculate the minimum width to fit the content before the render pass.
  * Set the actual width of all the legends to the largest of the minimum widths.
  * This resizes the legends to always be the same size and reduces the size of you remove
     the widest legend.
2018-04-09 13:14:19 +02:00
Gaute Lindkvist
63ffade452 Set background and frame color from the view plus update frame margins. 2018-04-09 13:14:19 +02:00
Gaute Lindkvist
507229f84b Fixed background color setting for legends and refactored Legend class hierarchy
* Added a new cafTitledOverlayFrame as a base-class for all ResInsight legend classes
  * Inherits cvf::OverlayItem
2018-04-09 13:14:19 +02:00
Magne Sjaastad
4377ac2a6b AppFwk : Remove sub menu action if sub menu is empty 2018-04-09 11:36:01 +02:00
Jacob Støren
3b724e07bd #2436 Add cube face tracking through the clipping methods used for intersection calculations 2018-04-05 07:41:29 +02:00
Magne Sjaastad
bffc50b826 Fix typo when generating light NNC colors 2018-03-24 14:44:08 +01:00
Bjørn Erik Jensen
1e8f1bb95e #2589 intersections. Show extrusion line fix 2018-03-12 15:14:22 +01:00
Magne Sjaastad
716bb3184b System : Replace tab with four spaces 2018-03-12 11:12:39 +01:00
Bjørn Erik Jensen
6ae619cc10 Fix Linux build by adding missing include (II) 2018-03-09 08:50:16 +01:00
Jacob Støren
0bdde36aa3 Merge #51 Legend background and #2478 Edge axis top into dev 2018-03-08 16:22:13 +01:00
Jacob Støren
7a9e53bdb1 #51 Avoid that legend background misses frame line on the right 2018-03-08 16:12:40 +01:00
Jacob Støren
7bd08067a9 #52 Add background to category legend 2018-03-08 11:38:51 +01:00
Jacob Støren
c258528dc5 #51 Add background to standard legends. Needed a separate legend implementation, now in caf. Cleaned up CategoryLegend to make it ready for the new background. 2018-03-08 11:20:27 +01:00
Magne Sjaastad
2e122d2ab3 #2554 Regression Test : Move serialization code into RiaRegressionTest 2018-03-07 09:30:15 +01:00
Jacob Støren
b13422d28b Guard against stepsize < 0 in tickMarkGenerator 2018-03-06 16:31:12 +01:00
Magne Sjaastad
ca0087eb55 #2536 Build System VizFwk : Use target_* and remove includes 2018-02-28 07:42:19 +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
3fbce58fa5 #2536 Build System AppFwk : Several updates
Simplified automoc
Use target_include_directories and target_link_libraries
Use CMake 2.8.12
2018-02-27 18:37:11 +01:00
Magne Sjaastad
65c3d6ff12 #2536 Build System AppFwk : Use target_include_directories 2018-02-27 17:19:23 +01:00
Magne Sjaastad
70faea56df AppFwk : Add missing initialization of variables and handling of switch statements 2018-02-23 21:29:54 +01:00
Magne Sjaastad
671818d72e AppFwk : Reorder initialization to match declaration 2018-02-23 19:57:09 +01:00
Magne Sjaastad
8bc3f06acd AppFwk : Add missing default handling in switch statements 2018-02-23 19:56:38 +01:00
Magne Sjaastad
309b1f0749 AppFwk Clang : Reorder initialization order to match declaration order 2018-02-23 19:43:48 +01:00
Magne Sjaastad
f9de64c538 AppFwk : Use freopen_s instead of freopen 2018-02-23 19:34:43 +01:00
Magne Sjaastad
cfb75ecc34 AppFwk (clang-tidy) : modernize-use-nullptr 2018-02-18 18:17:50 +01:00
Magne Sjaastad
3239c66f54 AppFwk (clang-tidy) : modernize-use-nullptr 2018-02-18 18:05:08 +01:00
Magne Sjaastad
950617af96 AppFwk : Fix assignment of float value 2018-02-18 17:42:28 +01:00
Magne Sjaastad
9184ef14ca AppFwk : Use 'g' instead of 'f' to create text from double values 2018-02-16 10:14:08 +01:00
Magne Sjaastad
2ff5842f28 Clang : Avoid special template helper on Windows 2018-02-12 20:12:04 +01:00
Jacob Støren
e76f8cfbcc #2337 Add an improved tick mark generator 2018-02-09 14:08:55 +01:00
Jacob Støren
bb53b926bf #2345 Add + and * operators to the tensor class, to make averaging possible. 2018-02-07 13:10:36 +01:00
Jacob Støren
0db32df1c4 Add comment to describe usage of the weighted blended transparency system 2018-02-03 19:33:27 +01:00
Magne Sjaastad
22c49ebe37 #2414 AppFwk : Cleaned up includes 2018-01-26 15:08:40 +01:00
Magne Sjaastad
7c7a54f5aa #2414 AppFwk : Do not overwrite field double value with UI text representation 2018-01-26 15:08:40 +01:00
Magne Sjaastad
1419865b89 #2411 AppFwk : Increase precision when writing real numbers to XML 2018-01-26 15:08:40 +01:00
Jacob Støren
5640f91b68 #2412 2D Navigation only for Intersectino Views 2018-01-26 14:33:32 +01:00
Jacob Støren
369afcfbbb Caf: Set point of interes when doing "Zoom All" 2018-01-26 11:43:43 +01:00
Jacob Støren
c7185649ce Caf: Guard against crash when point of interest is not set correctly 2018-01-26 11:43:27 +01:00
Magne Sjaastad
76b84cbb17 #2361 AppFwk : Make sure field of FilePath supports space, add more tests 2018-01-17 14:32:47 +01:00
Magne Sjaastad
c0d9ef67fa #2361 AppFwk : Make sure identical strings are separated by semicolon 2018-01-17 14:32:47 +01:00
Magne Sjaastad
bf1b755dc8 #2361 AppFwk : Improve robustness of load and save of FilePath 2018-01-12 14:56:05 +01:00
Jacob Støren
57b521c6d9 AppFwk: Add a guarded interface pointer class 2018-01-12 12:01:04 +01:00
Magne Sjaastad
e99cc66325 #2361 AppFwk : Test application adjustments to allow save and load of project 2018-01-11 13:50:26 +01:00
Magne Sjaastad
97822cbd2c #2361 AppFwk : Template specialization of stream operator for vector of FilePath 2018-01-11 13:50:26 +01:00
Magne Sjaastad
f86b13adc8 #2361 AppFwk : Add cafFilePath and conversion to QVariant 2018-01-11 13:50:26 +01:00
Magne Sjaastad
90f9b63b44 #2361 AppFwk : cafPdmuiListEditor : Refactor setting of strings to field 2018-01-11 13:50:26 +01:00
Magne Sjaastad
98374923b9 #2315 AppFwk : Use fabs 2018-01-05 11:11:48 +01:00
Magne Sjaastad
24aca6edc3 #2304 Property Editor: Box header text not readable
Modify title label palette before modifying the frame palette
2018-01-03 13:17:29 +01:00
Magne Sjaastad
79818cecac #2292 AppFwk : Fixed copyright and improved whitespace 2018-01-02 10:32:04 +01:00
Bjørn Erik Jensen
b4a582f870 #2292. Implement PdmUiDoubleValueEditor 2018-01-02 09:28:41 +01:00
Bjørn Erik Jensen
6028d8fcb3 MenuBuilder. Add query method isCmdFeatureAdded 2017-12-21 14:32:59 +01:00
Bjørn Erik Jensen
506c454059 MenuBuilder. Fix: Menu separator always added to top level menu 2017-12-21 13:17:23 +01:00
Magne Sjaastad
4e021db39a AppFwk : Tree Selection : Add test for switching between two list with same item count 2017-12-21 12:12:40 +01:00
Magne Sjaastad
2ed7d74bbd #2286 AppFwk TreeSelection Editor : Always cache option items, rebuild tree when count changes 2017-12-21 11:58:26 +01:00
sigurdp
8c8970cec0 Made PdmChildArrayField::index() const, #1873 2017-12-19 11:02:27 +01:00
Magne Sjaastad
d15808efe6 AppFwk : Add support for output of object and field keywords 2017-12-15 17:01:33 +01:00
Magne Sjaastad
81129302f3 #2266 AppFwk : Add editor attribute setCurrentIndexWhenItemIsChecked
Fix bug when a selection is active
2017-12-14 16:03:14 +01:00
Magne Sjaastad
3dadef4c76 #2197 AppFwk : Add supporft for placeholder text (taken from Qt 4.7)
PlaceholderLineEdit is a temporary class to be removed when Qt is upgraded
2017-12-11 09:12:31 +01:00
Jacob Støren
7ddd5ca7d7 Add some reference code to help improve the CAF_ASSERT at a later point in time. 2017-12-08 16:56:42 +01:00
Jacob Støren
160b4c263d #2237 AppFwk Progressinfo: Add better error reporting, and avoid asserts when unneccessary 2017-12-08 16:56:42 +01:00
Magne Sjaastad
2c4b1e453d #2197 Rollback : placeholderText was introduced in Qt 4.7 2017-12-08 16:52:31 +01:00
Magne Sjaastad
f5b5b8ff89 #2197 Summary Plot Editor : Add hint to user when a filter field is empty 2017-12-08 14:39:04 +01:00
Magne Sjaastad
c7b3c4bc68 #2200 Summary Plot Editor : Do not select an item when toggling item off 2017-12-08 13:06:49 +01:00
Magne Sjaastad
13ac632350 AppFwk : Show field tooltip info if debug info is available 2017-12-08 12:47:38 +01:00
Magne Sjaastad
c1f8487666 #2148 AppFwk : Move creation of QModelIndex after insertion of new items 2017-12-06 10:47:18 +01:00
Magne Sjaastad
9cbd0973dc #2148 AppFwk : Do not try to update subtree for invalid QModelIndex 2017-12-06 09:38:33 +01:00
Magne Sjaastad
eaa0a1d6fe #2200 AppFwk Tree Selection Editor: Select item when toggling
When toggling the checked state, also select (highlight) the toggled item
2017-12-04 13:25:47 +01:00
Magne Sjaastad
6da6a0abe1 #2212 AppFwk : Allow '[' and ']' in filter field text 2017-12-04 12:58:10 +01:00
Magne Sjaastad
c0109361ef #2170 Summary Cross Plot : Add keyboard modifiers to source stepping 2017-12-04 08:26:26 +01:00
Magne Sjaastad
04a80864b1 AppFwk : Make sure uiOrdering is not called more than once 2017-12-04 08:26:26 +01:00
Magne Sjaastad
eb6b0997c8 #2170 Summary Cross Plot : Improve update and visibility of UI when stepping 2017-12-01 15:15:43 +01:00
Magne Sjaastad
a5b361f8c9 #2170 Summary Cross Plot : Show/hide toolbar based on active view 2017-12-01 13:55:39 +01:00
Magne Sjaastad
a96b65cc7f #2144 Context menu builder : Whitespace cleanup and removed unused includes 2017-12-01 08:33:26 +01:00
Magne Sjaastad
476b96b343 #2144 Context menu : Add support for icons on sub menus 2017-12-01 08:28:41 +01:00
Magne Sjaastad
18f1baea1a AppFwk : Combo box prev/next buttons - Disable icon when relevant 2017-11-30 08:37:49 +01:00
Magne Sjaastad
ead1e2af29 Fix unintended copy in range based for loop 2017-11-30 07:02:30 +01:00
Magne Sjaastad
5efd583390 AppFwk : Whitespace improvements and use modern c++ 2017-11-29 17:09:13 +01:00
Magne Sjaastad
c001a0008f AppFwk : ComboBox : Add previous/next buttons, controlled by attributes 2017-11-29 16:38:29 +01:00
Magne Sjaastad
e388a58fae AppFwk : Add some space between non-button fields 2017-11-29 16:38:29 +01:00
Magne Sjaastad
7fc0632f8d AppFwk : ToolBarEditor - Make clear public 2017-11-29 16:38:29 +01:00
Magne Sjaastad
3f55d4f1f0 AppFwk : ProgressDialog : Add window flags 2017-11-29 16:38:29 +01:00
Magne Sjaastad
1e70551a27 AppFwk : ToolBarEditor : Enable support for all field editor types 2017-11-29 16:38:29 +01:00
Rebecca Cox
66082e2160 AppFwk: Set selectAsCurrentItem argument to const 2017-11-29 14:57:04 +01:00
Rebecca Cox
d2e590875d AppFwk: Always update userData of actions 2017-11-29 08:51:55 +01:00
Magne Sjaastad
0747325b42 AppFwk : TextEditor : Make it possible to disable size hint 2017-11-29 08:20:05 +01:00
Bjørn Erik Jensen
c4fa809e6b Support for setting height hint on TextEdit 2017-11-27 11:01:37 +01:00
Bjørn Erik Jensen
2d221495eb ASCII import dialog. Use monospace font in preview widget 2017-11-27 11:01:37 +01:00
Magne Sjaastad
c9451dde50 QDialog Constructor : Use windows flags to avoid '?' on Windows 2017-11-27 10:47:49 +01:00
Magne Sjaastad
bd2f04c13f Add missing include on Linux 2017-11-23 07:43:41 +01:00
Jacob Støren
41a533b6cd #2173 Push button editor now right aligns and has sensible size in steps 2017-11-22 14:52:23 +01:00
Jacob Støren
dc22f4615f Remove margin in Text editor to align with everything else 2017-11-21 10:19:45 +01:00
Bjørn Erik Jensen
8a1c3b595b PdmUiTextEditor. Add attribute for setting wrap mode 2017-11-21 09:54:37 +01:00
Bjørn Erik Jensen
ebb726ae0c Replace CVF_ASSERT by CAF_ASSERT 2017-11-20 12:46:13 +01:00
Bjørn Erik Jensen
931bc71deb Submenus. Minor refactoring 2017-11-20 09:44:55 +01:00
Bjørn Erik Jensen
e0b6062eca Fix Linux build warning and error 2017-11-20 08:57:20 +01:00
Bjørn Erik Jensen
31a84181e6 #2020 Move LAS files. Support for submenus and command features with custom name and user data 2017-11-20 08:27:38 +01:00
Magne Sjaastad
c24e7659a3 AppFwk : Add default configuration for a push button 2017-11-16 12:51:55 +01:00
Jacob Støren
f1c8c0ebbe AppFwk: Fix crash and memory leak in TreeSelectionEditor system 2017-11-15 11:32:25 +01:00
Magne Sjaastad
4e20723650 #2131 AppFwk : Tree List Selector : Allow header items to be selected 2017-11-14 09:48:01 +01:00
Magne Sjaastad
cebe3009e7 #2131 AppFwk : Wire up custom menu slot once
When this signal is wired up multiple times, the context menu shows up after activating a menu item in the context menu
2017-11-14 09:43:33 +01:00
Magne Sjaastad
733b1b5260 #2142 AppFwk : Guard null pointer access 2017-11-13 22:06:54 +01:00
Jacob Støren
9853c15ec6 Code adjustments 2017-11-13 15:23:38 +01:00
Jacob Støren
9070a97815 #2112 Step two of performance fixing: Avoid unneccessary calls to uiValue from the treeSelectionQMode by caching it temporarily 2017-11-11 02:38:52 +01:00
Jacob Støren
6ee03340a5 #2112 First step in improved performance: When toggling several at once, avoid update for each. 2017-11-10 23:34:22 +01:00
Magne Sjaastad
e6805d947b #2098 AppFwk : Add optional display of field keyword in tooltip text 2017-11-08 11:29:41 +01:00
Magne Sjaastad
bd25c9bc9f AppFwk : Add childObjects() to PdmChildArrayField 2017-11-07 20:20:45 +01:00
Rebecca Cox
7be8227efa AppFwk: Line Editor: Guard for index out of range 2017-11-07 10:00:10 +01:00
Magne Sjaastad
257a5c18d2 #2083 AppFwk : Add notification when widgets are created 2017-11-02 08:50:07 +01:00
Bjørn Erik Jensen
f229ce5c23 PdmStreamOperator. Set timespec to UTC for QDateTime fields during project load 2017-10-27 09:35:38 +02:00
Magne Sjaastad
58b062cbdf #2037 AppFwk : Add support for calling updateUi on all object editors
This function is intended to be called when an object is created or deleted to make sure object editors holds valid data
2017-10-27 08:22:14 +02:00
Magne Sjaastad
22159a1c63 System : Simplify access to selected objects 2017-10-19 10:11:14 +02:00
Magne Sjaastad
215eb58de0 System : Always include Qt using <> and cleaned up some includes/whitespace 2017-10-19 10:11:14 +02:00
Magne Sjaastad
d02274a897 #1969 Curve Calculator : Support single select in tree selection editor 2017-10-13 08:54:06 +02:00
Magne Sjaastad
9dd730f8f6 AppFwk : Add support for push buttons in table editor 2017-10-12 10:52:30 +02:00
Bjørn Erik Jensen
ca56454acb Color table. Fixed bug 2017-10-09 09:01:19 +02:00
Magne Sjaastad
64a8a07f6a AppFwk : Add disableIO() to PdmXmlFieldHandle 2017-10-03 15:23:44 +02:00
Arne Morten Kvarving
ab4619bf74 fixed: add missing cmath include statements
highlighted by building with gcc6
2017-09-29 18:24:28 +02:00
Magne Sjaastad
184e00c5aa #1912 AppFwk : Add support for setting of current item using attributes 2017-09-27 08:08:53 +02:00
Magne Sjaastad
cfaab93b1f AppFwk : Remove unused function 2017-09-27 06:55:50 +02:00
Magne Sjaastad
e8d04618af #1935 AppFwk : Update model indices when configureAndUpdateUI is called 2017-09-26 15:09:27 +02:00
Magne Sjaastad
fa97db4465 #1935 AppFwk : Apply text filter to be applied on leaf nodes only 2017-09-26 14:06:56 +02:00