Commit Graph

758 Commits

Author SHA1 Message Date
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
Jacob Støren
f4eadc5cef AppFwk: Addjust default implementation of equal comparisons for QVariant encapsuled field content types that are not directly supported by Qt.
Should now work in most cases, where as it always returned "false" before this fix
2017-09-23 08:26:21 +02:00
Bjørn Erik Jensen
f4148dfe7a #1920 Curve creator. Adjust target plot combobox width to contents 2017-09-22 11:49:00 +02:00
Magne Sjaastad
f2d32a5833 #1925 Tree Selection Editor : Do not change toggle state if list is empty 2017-09-21 20:10:52 +02:00
Magne Sjaastad
cfa0bee252 #1925 Tree Selection Editor : Disable auto default for expand/collapse buttons in groups 2017-09-21 20:10:04 +02:00
Magne Sjaastad
78b4fc6fe8 Documentation : Update to v 1.8.13, exclude *test* from input 2017-09-20 21:16:21 +02:00
Magne Sjaastad
47a531909a Fix missing rename 2017-09-20 12:56:29 +02:00
Magne Sjaastad
b3b0a7ba9b #1895 Curve Creator : Use PdmFieldHandle instead of PdmUiFieldHandle 2017-09-20 10:43:19 +02:00
Magne Sjaastad
f61122ce0e #1895 Curve Creator : Added documentation 2017-09-20 10:06:57 +02:00
Magne Sjaastad
5ddb796059 AppFwk : Add multiselect field of AppEnum including highlight field 2017-09-20 10:06:57 +02:00
Magne Sjaastad
f45d065ac2 AppFwk : Add documentation for how do define OptionItemInfos 2017-09-20 10:06:57 +02:00
Magne Sjaastad
7ebc922541 AppFwk : Return reference to QTextStream for << and >> operator overloads 2017-09-20 10:06:57 +02:00
Magne Sjaastad
1bb1c87058 #1895 Curve Creator : Add support for single value fields 2017-09-20 10:06:57 +02:00
Magne Sjaastad
b222561a81 AppFwk : Remove setFocus, as signals from the QModel triggers update 2017-09-19 12:37:55 +02:00
Magne Sjaastad
31cbd35862 Added more tests and guard for null pointer access 2017-09-19 12:01:16 +02:00
Magne Sjaastad
b078feb736 AppFwk : Add missing include 2017-09-19 11:14:08 +02:00
Magne Sjaastad
e8d515670d #1896 Curve Creator : Set margins to zero for TreeSelectionEditor 2017-09-19 10:52:33 +02:00
Magne Sjaastad
b60758a0f3 #1896 Curve Creator : Add editor attributes to control search and toggle 2017-09-19 10:40:22 +02:00
Magne Sjaastad
32b9b6d1b0 #1898 Curve Creator: Add basic search fields above all the lists 2017-09-19 10:29:13 +02:00
Magne Sjaastad
df6262c043 #1896 Curve Creator : Show On/Off toggle at top of TreeSelectionEditors 2017-09-19 10:27:04 +02:00
Magne Sjaastad
424c4b18a3 #1898 Curve Creator: Use tree structure internally in QModel 2017-09-19 10:08:32 +02:00
Magne Sjaastad
6989f69b64 Guard for null pointer access 2017-09-15 10:49:01 +02:00
Magne Sjaastad
913d6ec6ab Fix missing include detected on Linux 2017-09-13 07:30:06 +02:00
Magne Sjaastad
9d7dcefc78 (#1883) AppFwk : Refactor of WidgetBasedObjectEditor and friends 2017-09-13 07:16:18 +02:00
Magne Sjaastad
7f72dcbb4a #1883 AppFwk : Use UiWidgetBAsedObjectEditor from CustomObjectEditor 2017-09-13 07:16:09 +02:00
Magne Sjaastad
408b825497 #1883 AppFwk : Move recursiveSetupFieldsAndGroups to UiWidgetBasedObjectEditor 2017-09-13 07:16:03 +02:00
Magne Sjaastad
7e43c4e666 #1883 AppFwk : Move UiFieldEditorHelper to separate file 2017-09-13 07:09:16 +02:00
Magne Sjaastad
cb7d0ada8e #1883 AppFwk : Add WidgetBasedObjectEditor 2017-09-13 07:09:11 +02:00
Magne Sjaastad
d40a7f11c6 #1883 AppFwk : Add const access functions 2017-09-13 07:08:58 +02:00
Magne Sjaastad
13ef8fe076 #1875 Custom Object Editor : Add image from file to cell in grid layout 2017-09-13 07:08:52 +02:00
Magne Sjaastad
52ca5d5ddd #1875 Custom Object Editor : Add CustomObjectEditor to MainWindow 2017-09-13 07:08:46 +02:00
Magne Sjaastad
443e5625a6 #1875 Custom Object Editor : Add test object with many top level groups 2017-09-13 07:08:40 +02:00
Magne Sjaastad
59e818f2b8 AppFwk : Guard against null pointer access 2017-09-13 07:08:06 +02:00
Magne Sjaastad
4aefb59f69 #1830 AppFwk : Use large height in sizeHint() to use more of available height 2017-09-12 11:15:11 +02:00
Bjørn Erik Jensen
f1948c9ce6 AppFwk: Fix index out of bounds error 2017-09-11 12:46:44 +02:00
Magne Sjaastad
33e94c447b #1830 AppFwk : Rename to isReadOnly and disable these items in tree view 2017-09-08 07:47:23 +02:00
Magne Sjaastad
8e8c735fe6 #1830 AppFwk : Use bold on header items 2017-09-08 07:31:32 +02:00
Magne Sjaastad
5079171647 #1830 AppFwk : Remove unused variable 2017-09-08 07:03:33 +02:00
Magne Sjaastad
ffb7e42b0f #1830 :: AppFwk : Added missing include on Linux 2017-09-07 15:21:02 +02:00
Magne Sjaastad
de7c4617d8 #1830 AppFwk : Add support for icons 2017-09-07 14:56:11 +02:00
Magne Sjaastad
5994ef1393 #1830 AppFwk : Add context menu to control state for multiple items 2017-09-07 14:56:10 +02:00
Magne Sjaastad
a0a28fee36 #1867 AppFwk : Use updateLabelFromField from field editors 2017-09-07 14:56:10 +02:00
Magne Sjaastad
2f22f82ba1 #1867 AppFwk : Add PdmUiFieldEditorHandle::updateLabelFromField 2017-09-07 14:56:10 +02:00
Magne Sjaastad
72a1a69547 #1830 AppFwk : Show text in label 2017-09-07 14:56:10 +02:00
Magne Sjaastad
3633474dc2 #1830 AppFwk : Expand tree if item count has changed 2017-09-07 14:56:10 +02:00
Magne Sjaastad
aef886a26e #1830 AppFwk : Add heading concept 2017-09-07 14:56:09 +02:00
Magne Sjaastad
71db603e11 #1830 AppFwk : Invalidate only relevant QModelIndex when selecting items 2017-09-07 14:56:09 +02:00
Magne Sjaastad
d3a37aa1d8 #1830 AppFwk : Hide QTreeView header 2017-09-07 14:56:09 +02:00
Magne Sjaastad
55bdf4701e #1830 AppFwk : Cache data to speed up model queries 2017-09-07 14:56:09 +02:00
Magne Sjaastad
e7351179c3 #1830 AppFwk : Add unit test for tree selection QModel 2017-09-07 14:56:09 +02:00
Magne Sjaastad
841faf022b #1830 AppFwk : Add TreeSelectionEditor and TreeSelectionQModel 2017-09-07 14:56:09 +02:00
Magne Sjaastad
9eab559272 #1830 AppFwk : Add level to PdmOptionItemInfo 2017-09-07 14:56:09 +02:00
Magne Sjaastad
4be32969f1 AppFwk : Linux fix : Add linking of thread library 2017-09-07 10:48:04 +02:00
Magne Sjaastad
beea898dc6 #1866 AppFwk : Move QTreeView state serializer to cafUserInterface 2017-09-07 09:34:14 +02:00
Magne Sjaastad
9d5f5b32fc #1830 AppFwk: Include user interface unit tests 2017-09-07 09:33:44 +02:00
Magne Sjaastad
f6f3ef93bc #1830 AppFwk : Use /MP for MSVC 2017-09-07 09:33:39 +02:00
Magne Sjaastad
5e6547c0c5 #1830 AppFwk : Move members to private and use getter functions 2017-09-07 09:33:33 +02:00
Magne Sjaastad
7181584657 #1830 AppFwk : Add const to constructors 2017-09-07 09:33:05 +02:00
Jacob Støren
0af879d20e Add simplified UML diagrams for Pdm 2017-09-05 12:31:16 +02:00
Magne Sjaastad
c18e9c1293 #1833 AppFwk: Add support for dynamic labels on group-boxes 2017-08-28 15:14:15 +02:00
Magne Sjaastad
5f790273e9 AppFwk : Add isFolderWritable() 2017-08-25 15:08:35 +02:00
Magne Sjaastad
51c30448e9 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-21 10:42:11 +02:00
Magne Sjaastad
83e663ae13 System : Add caf namespace prefix 2017-08-17 14:06:57 +02:00
Bjørnar Grip Fjær
65ce0d3788 #1377 Flow Characteristics Plot: Calculate for a defined set of cells 2017-08-17 11:25:13 +02:00
Magne Sjaastad
5eb4eafb6e Merge branch 'dev' into hdf-prototype 2017-08-14 10:47:44 +02:00
Bjørnar Grip Fjær
e6fda31255 #1761 Use eclipse case directory as default path when selecting SourSim file 2017-08-11 16:08:21 +02:00
Bjørnar Grip Fjær
7179aaeac9 Merge branch 'dev' into pre-proto 2017-08-01 12:44:11 +02:00
Magne Sjaastad
3bbc1c9885 System - Add pthread to unit test link parameters 2017-07-19 16:28:17 +02:00
Magne Sjaastad
ac3abc78da System - Add missing include on Linux 2017-07-19 16:26:11 +02:00
Magne Sjaastad
5a7755fe0c System : PdmPtrField - Remove PdmPointer interface and add operator() 2017-06-30 15:06:01 +02:00
Magne Sjaastad
803c0f7ab0 #1670 Add VecIjk to AppFwk 2017-06-29 22:37:00 +02:00
Magne Sjaastad
70d3c501a4 #1668 Use "Export" instead of "OK" in export dialogs 2017-06-28 10:13:59 +02:00
Bjørnar Grip Fjær
a9d64edd57 #1643 Allow filename including extension for --case command line parameter 2017-06-27 14:49:33 +02:00
Bjørnar Grip Fjær
7c99a2573a Merge branch 'dev' into pre-proto 2017-06-20 13:26:52 +02:00
Magne Sjaastad
42dc881cec #1620 Fix copyright text and reorder includes 2017-06-16 15:47:46 +02:00
Bjørnar Grip Fjær
e5772d15f9 Add support for specifying date format for UI date fields 2017-06-16 13:46:08 +02:00
Bjørnar Grip Fjær
938fbc3670 Add UI date editor 2017-06-16 13:34:19 +02:00
Bjørnar Grip Fjær
935299b3df Merge branch 'fishbones' into pre-proto 2017-06-01 12:32:36 +02:00
Bjørnar Grip Fjær
45f5b5a80a Make more const accessors available 2017-05-29 12:56:40 +02:00
Magne Sjaastad
a45aee0cc2 Merge branch 'fishbones' into pre-proto 2017-05-23 10:28:42 +02:00
Magne Sjaastad
25e6aec94a Merge branch 'dev' into fishbones 2017-05-15 13:37:09 +02:00
Magne Sjaastad
e1e75a4fad #1476 Add helper method fileExists() which includes isFile() 2017-05-11 07:45:55 +02:00
Magne Sjaastad
a8e9cdbd17 AppFwk : Make sure edit flag is updated in PdmUiListEditor 2017-05-05 12:16:06 +02:00
Bjørnar Grip Fjær
d05049af53 #1414 Adjust margin for property view 2017-05-01 08:38:00 +02:00
Magne Sjaastad
5e14e56609 #1062 Use minimalistic title flags for dialogs 2017-04-27 14:22:47 +02:00
Bjørnar Grip Fjær
76f55c211f #1031 Fix parallel projection for linked Eclipse and GeoMech cases 2017-04-26 15:18:14 +02:00
Magne Sjaastad
c35e79c3b5 Merge branch 'dev' into pre-proto 2017-04-20 13:40:56 +02:00
Magne Sjaastad
bd47826608 Fix compiler warning 2017-04-20 12:33:18 +02:00
Magne Sjaastad
530400fb28 #1401 Notify model change when feature is activated 2017-04-20 10:17:05 +02:00
Magne Sjaastad
82b6e4b8f2 #1401 Add ModelChangeDetector 2017-04-19 22:25:31 +02:00
Bjørnar Grip Fjær
f7d72c2f60 #1073 Stable coloring of cases and wells in summary 2017-04-19 16:41:12 +02:00
Magne Sjaastad
edd4726cf5 #1408 Initialize custom combo box with StrongFocus 2017-04-18 14:57:16 +02:00
Magne Sjaastad
c6c1af06e3 #1408 Disable wheel zooom when QComboBox does not have focus 2017-04-18 14:05:48 +02:00
Magne Sjaastad
8255a3aaa3 Merge branch 'dev' into pre-proto 2017-04-03 07:34:56 +02:00
Bjørnar Grip Fjær
9f336ab16f Fix crash when changing result name when exporting multiple snapshots 2017-03-31 17:14:49 +02:00
Magne Sjaastad
3007a62238 System : Improved control of cotire 2017-03-29 08:13:45 +02:00
Magne Sjaastad
c257c52944 #1367 Fixed regression related to edit of items in ListView 2017-03-29 07:47:17 +02:00
Magne Sjaastad
6e6e884ab3 #1365 Whitespace and comment headers 2017-03-27 22:57:23 +02:00
Magne Sjaastad
bf9d65d249 #1365 Added sizeHint to QMinimizePanel 2017-03-27 22:57:23 +02:00
Magne Sjaastad
dc493b0b68 #1365 AppFwk : Allow list widgets to fill available height 2017-03-27 22:57:23 +02:00
Magne Sjaastad
7a89aee0bb #1296 Multiselect in property panel lists using ctrl-click is vulnerable to mouse drag 2017-03-24 22:40:57 +01:00
Jacob Støren
cde71ef07a #1344 AppFwk: Renamed methods in uiTreeOrdering to align with uiOrdering 2017-03-22 15:57:04 +01:00
Jacob Støren
c77e674601 #1344 AppFwk: Cleaning up in PdmUiOrdering 2017-03-22 15:02:06 +01:00
Magne Sjaastad
7095e80696 #1343 Property Editor : Use vertical scroll bar only 2017-03-21 15:32:07 +01:00
Magne Sjaastad
df3ef7106d #1340 AppFwk : Improve how defineUiOrdering handles remaining fields 2017-03-21 13:47:53 +01:00
Jacob Støren
888db49d6c #1337 Caf: Preserve the user collapse settings for each object type within session.
Provide means to set groups collapsed by default in the defineUiOrdering method, and to force the setting disregrding the user actions
2017-03-20 22:12:07 +01:00
Jacob Støren
a1d14dc8a3 #1337 Changed the GroupBoxes to MinimizePanels to increase readability and allow collapsing of the groups. 2017-03-20 14:56:03 +01:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
Magne Sjaastad
f5c03e7518 AppFwk : Added field used to test multi selection 2017-03-13 07:39:36 +01:00
Magne Sjaastad
866350756c #1260 Fixed typo in AppFwk 2017-03-13 06:59:42 +01:00
astridkbjorke
0a945155c5 #872 When exporting several summary plots the data from different plots are stored to different files, and adding extension .csv to files files exported for wellLogPlots and summaryPlots. 2017-03-10 15:12:01 +01:00
astridkbjorke
04c9616abc #1294 - Adding function for getting save directory from dialog, checking if files already exsist in dir and if so ask in dialog if they should be overwritten. 2017-03-10 15:12:01 +01:00
Magne Sjaastad
a87ad2e56e Avoid use of CAF_ASSERT in application code 2017-03-10 14:44:00 +01:00
Magne Sjaastad
c3bf064661 #1260 Use std::abort instead of assert for release asserts 2017-03-10 14:28:22 +01:00
Magne Sjaastad
6c6049a317 #1282 Mesh lines : Use LEQUAL for depth test to make sure highest pri is visible 2017-03-08 14:27:02 +01:00
Magne Sjaastad
6791600d03 #1260 Replaced assert() with CAF_ASSERT() in AppFwk 2017-03-08 08:19:51 +01:00
Magne Sjaastad
a16a0a3bb5 #1260 Added assert that will display message in release (in addition to debug) 2017-03-07 15:45:34 +01:00
Magne Sjaastad
914b1fcab6 Replaced tab with four spaces 2017-03-07 15:43:29 +01:00
Magne Sjaastad
6a3f3e3670 Revert "#1292 Fixed CppCheck Issues in ProjectDataModel : Added assert"
This reverts commit cff588f166.
2017-03-07 12:24:35 +01:00
Magne Sjaastad
cff588f166 #1292 Fixed CppCheck Issues in ProjectDataModel : Added assert
Access the variable to silence CppCheck
2017-03-07 12:09:26 +01:00
Magne Sjaastad
811f63219c #1292 Fixed CppCheck Issues in AppFwk : Use QPointer 2017-03-07 11:36:29 +01:00
Magne Sjaastad
b365834923 #1292 Fixed CppCheck Issues in AppFwk : Removed assign/copy operators 2017-03-07 11:14:29 +01:00
Magne Sjaastad
b2e9d3fe11 #1292 Fixed CppCheck Issues in AppFwk viewer/vizExtensions/CommonCode 2017-03-06 19:22:32 +01:00
Magne Sjaastad
749ce8e8af #1292 Fixed CppCheck Issues in AppFwk/cafUserInterface 2017-03-06 19:15:33 +01:00
Magne Sjaastad
63baebc698 #1292 Fixed CppCheck Issues in AppFwk/cafProjectDataModel 2017-03-06 19:03:31 +01:00
Magne Sjaastad
9179ae2a14 #1292 Fixed CppCheck Issues in AppFwk/cafCommands 2017-03-06 18:33:03 +01:00
Magne Sjaastad
a5ed533c00 Improved unit test so they run correctly in debug 2017-03-06 18:33:03 +01:00
Magne Sjaastad
2b029cbc11 #1280 Use nullptr instead of NULL 2017-03-02 18:30:33 +01:00
Magne Sjaastad
3089abc83d #1280 Added firstAncestorOrThisOfTypeAsserted 2017-03-02 18:30:33 +01:00
Magne Sjaastad
e41979563b #1243 AppFwk : Added line width to mesh line effect 2017-02-28 19:00:26 +01:00
Magne Sjaastad
a2e2c99167 #1243 AppFwk : Fixed typo in mesh line effect 2017-02-28 18:48:33 +01:00
Magne Sjaastad
61f94d90d9 #1243 AppFwk : Added line width to mesh line effect 2017-02-28 18:41:16 +01:00
Magne Sjaastad
28b87a1700 #1242 AppFwk : Effect Generator : Discard transparent fragments 2017-02-27 22:20:06 +01:00
Magne Sjaastad
cc5f5eddd0 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
2017-02-22 13:12:23 +01:00
Magne Sjaastad
38485fd96d Added caf prefix to virtual methods 2017-02-22 13:02:05 +01:00
Magne Sjaastad
421dda1042 #1245 Property Editor : Use size hint displaying preferences 2017-02-22 11:58:56 +01:00
Magne Sjaastad
1753449772 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
2017-02-22 09:42:51 +01:00
Magne Sjaastad
23ec61192c #1093 Enable copy of text from read only fields 2017-02-20 15:32:23 +01:00
Magne Sjaastad
75f2a6cb9f #1236 Property Editor : Scroll bar for reduced screen area 2017-02-20 14:32:12 +01:00
Magne Sjaastad
820e574a61 Added const access 2017-02-20 09:26:11 +01:00
Magne Sjaastad
a10b96ba3e Merged branch dev into pre-proto 2017-02-17 11:38:32 +01:00
Magne Sjaastad
03adf8f759 #1232 Delete child objects in destructor of ChildField and ChildArrayField 2017-02-17 11:37:26 +01:00
Magne Sjaastad
f9d8ab8bad Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ApplicationCode/Resources/ResInsight.qrc
2017-02-16 10:18:39 +01:00
Jacob Støren
392dfac190 AppFwk: Made updateUiIconFromState handle dynamically assigned icons, and become uiConfigName aware. 2017-02-15 18:29:01 +01:00
Magne Sjaastad
9a7f187765 #1222 Interpolate category colors and assign well color based on sorted order 2017-02-15 13:26:59 +01:00
Magne Sjaastad
3c3e0d96ff #1180 Added color table framework files and color tables 2017-02-10 08:22:26 +01:00
Jacob Støren
af551284c0 Linux Compile Fix 2017-02-09 14:40:40 +01:00
Jacob Støren
2ccabc4589 Caf: Added asserts to make it clearer that "useOptionsOnly" == false is unsupported yet. 2017-02-09 13:31:25 +01:00
Magne Sjaastad
6dc0a7ff59 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ResInsightVersion.cmake
2017-02-03 10:51:46 +01:00
Magne Sjaastad
8c01c23e5e #1156 Added tristate class and checkbox editor with tristate support 2017-02-01 09:52:01 +01:00
Magne Sjaastad
aedf184d14 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
2017-01-26 14:30:13 +01:00
Magne Sjaastad
a95adf4167 AppFwk : Fixed invalid else statement 2017-01-26 12:13:03 +01:00
Magne Sjaastad
6528d243fe AppFwk : Use namespace prefix for parameters
When using Visual Assist for automatic implementation of virtual functions, the namespace must be included to be able to compile the generated code without any changes.
2017-01-26 11:51:52 +01:00
Magne Sjaastad
0a00f15e5d Removed whitespace 2017-01-26 11:31:04 +01:00
Magne Sjaastad
e845ae1ed8 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/CMakeLists.txt
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
2017-01-24 15:23:02 +01:00
Jacob Støren
8004e766ea AppFwk: Improved the message when forgetting to delete a child object 2017-01-19 17:58:00 +01:00
Magne Sjaastad
36bcdab426 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
2017-01-18 12:19:07 +01:00
Magne Sjaastad
0cda0a4071 AppFwk : Added flag to control visibility of header text above table editor 2017-01-17 13:10:37 +01:00
Magne Sjaastad
d8114decec AppFwk : TableEditor - Show text in lightGray when field is readonly 2017-01-17 12:55:13 +01:00
Magne Sjaastad
7ee5fe321b #1081 Snapshot : Row numbering starts at 1 2017-01-16 23:07:22 +01:00
Magne Sjaastad
239322ba50 AppFwk : Removed assert guard, to prepare for delete of contained object 2017-01-13 13:32:17 +01:00
Magne Sjaastad
9cd17ec508 Merge dev into pre-proto
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseView.cpp
	ApplicationCode/ProjectDataModel/RimEclipseView.h
2017-01-10 10:09:44 +01:00
Magne Sjaastad
95b7ce73ee #1075 Fixed toggle of single item when two items are selected 2017-01-09 14:14:06 +01:00
Magne Sjaastad
785a5e9ff8 #1060 Use DisplayCoordTransform in ResultTextBuilder 2017-01-09 07:43:17 +01:00
Magne Sjaastad
5d9fd5ddeb #1064 Use constexpr to verify keywords for pdmObject and pdmFields 2017-01-07 08:59:19 +01:00
Jacob Støren
03cf09d90a System: Created a general basename cleanup function, and applied that when creating filenames from userdescription etc. Related to #1054 preparations 2017-01-04 10:45:04 +01:00
Magne Sjaastad
dc970edf7e Merged in changes from dev 2017-01-03 11:32:00 +01:00
Magne Sjaastad
8ff4b3d4f9 AppFwk : Use list of variants to produce display text for lists fields 2016-12-22 08:45:50 +01:00
astridkbjorke
f6221340b1 Merge branch 'dev' 2016-12-21 08:38:52 +01:00
Magne Sjaastad
30ac0841dd AppFwk : Table View - Added support for PdmPtrArrayFieldHandle 2016-12-19 14:58:46 +01:00
Magne Sjaastad
e002658dbd AppFwk : Changed accessability from public to private for functions related to PdmUiTableViewDelegate 2016-12-19 14:34:43 +01:00
Magne Sjaastad
d542537113 AppFwk : Table view - Show row numbers to be able to adjust row height interactively 2016-12-19 12:06:50 +01:00
astridkbjorke
6e25fe2569 AppFwk: Added comments 2016-12-19 10:05:57 +01:00