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 |
|
Magne Sjaastad
|
55895fb8d8
|
AppFwk : Added static method used to create field editors. Always create comboBox for PdmPtrFields
|
2016-12-14 14:52:49 +01:00 |
|
Magne Sjaastad
|
87f595a047
|
AppFwk : Set content margins to zero
|
2016-12-14 12:31:19 +01:00 |
|
Jacob Støren
|
8562d0e98b
|
Merge with Flow Gui additions
|
2016-12-14 11:16:08 +01:00 |
|
Jacob Støren
|
c555f77a71
|
AppFwk: Added a convenince constructor to PdmOptionItemInfo to make it easier to use PdmPtrField
|
2016-12-14 09:12:27 +01:00 |
|
Magne Sjaastad
|
0f630c1f22
|
System : Added const to functions related to write of field data
|
2016-12-09 21:17:06 +01:00 |
|
Magne Sjaastad
|
58caac451c
|
AppFwk : Added CmdExecCommandSystemActivator
|
2016-12-09 14:37:30 +01:00 |
|
Jacob Støren
|
af19a36555
|
Intersection Box : Doubled the size of the manipulator handles
|
2016-11-28 10:12:50 +01:00 |
|
Magne Sjaastad
|
a70939f1b6
|
#1000 System : Prepare for handling of copy/paste actions
|
2016-11-24 08:21:59 +01:00 |
|
Magne Sjaastad
|
87492726ce
|
#879 Fixed issue not being able to clear selection in multiselect list
|
2016-11-11 16:15:02 +01:00 |
|
Magne Sjaastad
|
c830afbdc1
|
#879 AppFwk : Workaround for navigation with arrow keys during single selection in multi selection lists
|
2016-11-10 11:57:51 +01:00 |
|
Magne Sjaastad
|
c486a7b855
|
#879 AppFwk : Workaround for navigation with arrow keys in selection lists seen on Linux
|
2016-11-10 11:10:20 +01:00 |
|
Magne Sjaastad
|
07a38b6eaf
|
#967 AppFwk : Improved performance of PdmOptionItemInfo::findValues
|
2016-11-10 08:46:54 +01:00 |
|
Magne Sjaastad
|
2e8a411df8
|
VizFwk : Added support for optional multiple arguments to a command line option
|
2016-11-09 11:30:11 +01:00 |
|
Jacob Støren
|
296dac48d3
|
Removed a call to uiValue() that was not preceeded with valueOptions().
Understood that this is an inherent problem with those two methods, and made a comment on that.
|
2016-11-04 08:03:22 +01:00 |
|
Magne Sjaastad
|
cae5c42f68
|
#279 Bind offscreen frame buffer before reading pixel data
|
2016-11-01 10:12:11 +01:00 |
|
Magne Sjaastad
|
5f484abc2d
|
#279 Create QImage from offscreen frame buffer object
|
2016-11-01 09:34:51 +01:00 |
|
Jacob Støren
|
193193d35f
|
caf::ProgressInfo: Added some more descriptions and warnings on misuse. Added debug helper variables.
|
2016-10-31 08:43:36 +01:00 |
|
Magne Sjaastad
|
c09e22c1df
|
#932 AppFwk : Improved double slider
|
2016-10-25 13:10:24 +02:00 |
|
Jacob Støren
|
26accc9e9a
|
Merged with dev
|
2016-10-20 16:19:30 +02:00 |
|
Magne Sjaastad
|
454805b9de
|
#922 AppFwk : Introduced PdmUiFieldHandleInterface and made setValueFromUiEditor private
|
2016-10-20 11:31:11 +02:00 |
|
Jacob Støren
|
d8247c2ac6
|
#914 Added calculation of element face aligned stress
|
2016-10-20 10:50:29 +02:00 |
|
Magne Sjaastad
|
96e532696e
|
#922 AppFwk : Added setValueWithFieldChanged
|
2016-10-19 15:04:30 +02:00 |
|
Jacob Støren
|
941eed6625
|
#914 Created stress tensor rotation method, including tests
|
2016-10-17 15:15:27 +02:00 |
|
Magne Sjaastad
|
929c1d1633
|
AppFwk : Use field handle as key to support multiple fields with same keyword in object editor
|
2016-10-14 13:23:14 +02:00 |
|
Jacob Støren
|
c3eb692afe
|
Merge with branch 'dev'
|
2016-10-13 12:44:44 +02:00 |
|
Jacob Støren
|
eb066a71b0
|
caf: Finally removed the enum-index-based communication used in the optionValueLists for AppEnums. Now custom option menues based on AppEnums can use the enum values naturally instead of the enum index.
|
2016-10-13 12:11:32 +02:00 |
|
Magne Sjaastad
|
b8f1099d32
|
AppFwk : Clear internal structures when object changes
|
2016-10-12 10:08:08 +02:00 |
|
Magne Sjaastad
|
8ae75b5f27
|
AppFwk : Added concept of isUiTreeHidden and isUiTreeChildrenHidden
|
2016-10-12 10:08:08 +02:00 |
|
Magne Sjaastad
|
d57db25820
|
AppFwk : Progress dialog is reset and closed instead of hidden when no longer needed
|
2016-10-04 11:03:53 +02:00 |
|
Jacob Støren
|
47df6a6122
|
#884 Fixed occasional crashes using the 3D manipulator
|
2016-10-04 09:47:09 +02:00 |
|
Jacob Støren
|
c7aae71dbc
|
#884 Made manipulator able to be pulled beyond zero size
|
2016-10-04 08:40:39 +02:00 |
|
Jacob Støren
|
87e7b5dc80
|
#884 Changed colors to megenta, and improved interface for manipulator a bit. Adjusted size of handles.
|
2016-10-03 09:39:18 +02:00 |
|
Magne Sjaastad
|
58acd22afa
|
#884 Improved interface to BoxManipulatorPartManager
|
2016-09-30 15:10:39 +02:00 |
|