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
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
Jacob Støren
caf6a5dcf2
#884 Made same size pyramid handles for manipulator
2016-09-30 14:25:06 +02:00
Jacob Støren
d8424feedd
Renamed somewhat in BoxManipulator
2016-09-30 13:16:00 +02:00
Magne Sjaastad
d7a69bdae8
Merged intersection box interactive manipulation
2016-09-30 10:01:17 +02:00
Magne Sjaastad
593d72d63b
( #884 ) Refactor and cleanup
2016-09-30 09:34:45 +02:00
Magne Sjaastad
de11836e03
AppFwk : Added DisplayCoordTransform
2016-09-30 09:34:45 +02:00
Magne Sjaastad
d4bdbcb7c8
( #884 ) Added prototype of event handler for interaction with box
2016-09-30 09:34:39 +02:00
Jacob Støren
ca71b03d80
Linux complie fix
2016-09-29 14:55:56 +02:00
Jacob Støren
8f6744adcb
#896 Made the resolution of the slider better
2016-09-29 12:01:25 +02:00
Jacob Støren
c2eff1b733
Linux compile fixes
2016-09-28 15:07:19 +02:00
Jacob Støren
cbb626aa31
Merged intersection-box into dev
2016-09-28 14:27:17 +02:00
Jacob Støren
c84b7ab6d9
Proposed fix for some progressbar related crashes
2016-09-28 12:14:41 +02:00
Jacob Støren
4c98ea2283
#815 First working interpolation scheme, so values are not insane
2016-09-27 10:16:16 +02:00
Magne Sjaastad
120cc8b6dc
#887 Category Legend: Limit legend height when having few categories
2016-09-22 15:31:21 +02:00
Jacob Støren
8f501d96ea
#815 Reentered Whitespace
2016-09-21 15:05:59 +02:00
Magne Sjaastad
531aaaa445
AppFwk : Fixed typo of firstAncestorOrThisOfType
2016-09-21 13:59:41 +02:00
Magne Sjaastad
59afd14339
AppFwk : Added descendantsIncludingThisOfType
2016-09-21 13:03:55 +02:00
Magne Sjaastad
b524abc48d
#815 Moved common geometry code to HexGridIntersectionTools
2016-09-20 15:57:06 +02:00
Magne Sjaastad
8e79a781c9
#827 Fixed issue causing some categories to use uninitialized region of texture
2016-09-14 08:23:50 +02:00
Jacob Støren
e2d200de88
#829 Fixed crash due to color interpolation assert
2016-09-12 14:04:53 +02:00
Jacob Støren
8486889b39
Linux compile fix
2016-09-09 12:31:01 +02:00
Jacob Støren
39d82a28f4
#829 Use interpolated colors in category legend by default
2016-09-09 11:17:08 +02:00
Jacob Støren
ed93db724a
#829 Fixed strange category colors in odb intersections
2016-09-09 09:59:35 +02:00
Jacob Støren
78b29fc3a0
Fixed zoom all bounding box issue related to 1209c908e5
...
Used explicit mainRendering instead of renderSequence->firstRendering()
2016-09-07 15:54:12 +02:00
Jacob Støren
1209c908e5
Fixed clip plane related assert on linux. Hopefully the final fix of trouble related to : ca6e650a72
and 80985785
and 0128baddff
...
The fundamental problem was that the quad rendering was included in the boundingbox.
2016-09-07 12:52:40 +02:00
Magne Sjaastad
3e40db6ef0
#827 Refactored CategoryMapper function names and added comments
2016-09-07 08:52:32 +02:00
Jacob Støren
fcace2a92b
Merge Formation Names coloring work and FlowDiagnostics integration
2016-09-06 14:17:50 +02:00
Magne Sjaastad
f01e762ef1
#827 Added support for text labels in category legend
2016-09-06 11:15:21 +02:00
Magne Sjaastad
f2f6cfd77c
#279 Access single quad rendering as member of caf::Viewer
2016-09-05 13:43:10 +02:00
Jacob Støren
ca6e650a72
#279 Fixed paralell projection nearplane bug introduced by 8098578545
2016-09-05 11:53:56 +02:00
Magne Sjaastad
8098578545
#279 Workaround for invalid near plane location detected on Linux
2016-09-01 13:02:33 +02:00
Magne Sjaastad
0128baddff
#279 Use frame buffer objects for snapshots when available, otherwise use grabFrameBuffer()
2016-08-31 17:34:31 +02:00
Magne Sjaastad
457c3c732b
#569 Added font sizes 12, 24, and 32
2016-08-29 14:25:50 +02:00
Jacob Støren
1a3d8a13af
Made uiCapability and xmlCapability const
2016-08-24 15:16:34 +02:00
Jacob Støren
c1f5ec5bdf
#168 Finalized. Zoom along ray is now updated to cope with parallel projection. The code in the different navigations are cleaned up a bit, and alligned
2016-08-17 10:54:15 +02:00
Jacob Støren
0f3fe3ac1b
Linux compile warning
2016-08-17 08:52:22 +02:00
Jacob Støren
fbcf9fca11
#168 Merged in parallel projection
2016-08-16 23:20:33 +02:00
Jacob Støren
d13d0775b4
#168 Fixed zoom along ray problem making the camera end up with the scene behind it.
2016-08-16 13:41:10 +02:00
Jacob Støren
0eace5579a
#168 Fixed shader based light in parallel projection
...
Added the light position as a uniform in the standard light model shader snippet in the effect generator.
Set the uniform default value on the shader program where ever it is used.
Added an override global uniform set on the viewer to control the light position, and to set it far behind camera when in parallel projection.
2016-08-16 10:58:07 +02:00
Jacob Støren
a3499152a5
#168 Improved the front and back clipping plane calculation in relation to parallel projection.
...
Added a margin of 20% to account for inaccuracies. Not new for far-plane, but became missing in the first commit regarding parallel projection.
2016-08-15 16:11:38 +02:00
Jacob Støren
c529e18351
#168 Switch to directional Fixed Function light when in parallel mode
2016-08-15 14:27:46 +02:00
Jacob Støren
853e92723b
#168 Added hacklish control over Fixed Function default light.
2016-08-15 14:26:44 +02:00
Jacob Støren
20e7e9ec6e
Removed compiler warning
2016-08-15 14:25:12 +02:00
Jacob Støren
79a025e06f
#168 Zoom All improved to handle parallel projection
2016-08-15 08:57:22 +02:00
Jacob Støren
5cdf307d4e
WIP: Improved support for parallel projection. #168
...
Near plane negative to show everything
ZoomAlongRay now works for parallel projection (only implemented in
ceetron Plus)
2016-08-15 08:55:28 +02:00
Magne Sjaastad
32ded3e05d
Added scrollTo() to make sure the expanded item is expanded to root and visibile
2016-08-11 09:15:43 +02:00
Magne Sjaastad
17d37c70d3
#569 Added font with point sizes 8, 12, 16, 24, 32
2016-08-09 13:43:13 +02:00
Magne Sjaastad
5088ae90d9
#805 Linux fixes
2016-08-05 17:53:02 +02:00
Magne Sjaastad
1101db5787
( #805 ) Added category legend and mapper
2016-08-05 17:23:50 +02:00
Magne Sjaastad
2b588fa35f
AppFwk : Function rename
2016-08-05 17:19:47 +02:00
Magne Sjaastad
975f52a78d
VizFwk : Added guard for one level only scalar values
2016-08-05 17:19:47 +02:00
Magne Sjaastad
e031f89dcc
Merged from maintenance branch
2016-08-05 12:13:13 +02:00
Magne Sjaastad
c5d4519eb1
#282 Added category list if category values are present
2016-08-05 10:26:47 +02:00
Magne Sjaastad
4bfef4ead0
Merged in changes from maintenance branch
2016-08-04 11:12:53 +02:00
Jacob Støren
3bcb7b9f1b
#802 Better default dock and toolbar layout.
...
Window managment toolbar moved.
Created a Draw Style toolbar
2016-08-03 13:29:46 +02:00
Magne Sjaastad
512f8904de
AppFwk: Do not toggle item when tree item editor widget (QLineEdit) is closed with Enter key
2016-07-25 18:25:14 +02:00
Magne Sjaastad
d5050e96b8
AppFwk : Early exit if no scene is present
2016-07-06 16:59:13 +02:00
Magne Sjaastad
9db44a349a
AppFwk : Assert if two fields or groups with same name is present in PdmuiOrdering for cafPdmUiDefaultObjectEditor
2016-06-29 12:48:05 +02:00
Jacob Støren
80cdb9dbaf
Caf: Adjusted output of references from PtrArrayField
2016-06-20 16:51:36 +02:00
Jacob Støren
eaf6bb6768
Caf: Improved reference parsing by using regexp for splitting an any whitespace
2016-06-20 16:50:47 +02:00
Jacob Støren
4a19589d36
Caf: Linux compile fixes: Missing includes
2016-06-20 00:04:09 +02:00
Jacob Støren
327e8cf64b
Caf: Added PdmPtrArrayField to be used in ResInsight as multi select of summary cases
2016-06-19 21:36:44 +02:00
Jacob Støren
0b7abb0cab
Caf: Added specialization for PdmPointer<T>.
...
Preparations for PtrArrayField. Made isEqual use QVariant::value<T>()
2016-06-19 21:36:44 +02:00
Jacob Støren
f2da9bfea1
Caf: Small Adjustments
2016-06-19 21:36:44 +02:00
Jacob Støren
45cf15a941
Caf: PtrFields must not return any childObjects. Fixed Legend definition Object below EclipseCellColor as a consequence. Discovered due to Summary Plot case pointer
2016-06-16 16:55:02 +02:00
Jacob Støren
214f013499
Caf: Fixed issues regarding custom type in fields with multi selection
2016-06-16 16:55:02 +02:00
Jacob Støren
e1fa9aa9f3
Caf: Corrected the spesialization of field of vector and list equality compare, which is supposed to be pr. element
2016-06-16 16:55:02 +02:00
Magne Sjaastad
a7ed8f297f
cotire : Added unity build of cafUserInterface
2016-06-10 14:03:22 +02:00
Magne Sjaastad
ef64dc9b62
cotire : Boolean variables are now unique globally in the project
2016-06-10 14:01:41 +02:00
Jacob Støren
7419ad5089
Caf: Added default tab order in the property editor widgets.
2016-06-10 12:18:26 +02:00
Jacob Støren
c2e62c60ba
caf: Added an option on ui fields to not add their value to the list of options if the option does not exist.
2016-06-09 11:08:12 +02:00
Magne Sjaastad
c046e52aff
cotire : Boolean variables are now unique in the project and not local to file they are defined in
2016-06-08 12:13:49 +02:00
Jacob Støren
286c434d3a
caf: Added assert to guard against forgetting to add the fields using the init field macros
2016-05-31 13:48:22 +02:00
Jacob Støren
d90a6041aa
caf: Added CAF_PDM_ABSTRACT_SOURCE_INIT alias
2016-05-31 13:48:22 +02:00
Magne Sjaastad
5296add1cb
[Fwk] Fix for missing use of command framework for tree view model
2015-12-22 14:10:50 +01:00
Magne Sjaastad
390b04be3b
[Fwk] Fixed typo
2015-12-22 13:32:48 +01:00
Magne Sjaastad
33c53830f6
[Fwk] Integrated improvements to command mananger
2015-12-22 13:00:13 +01:00
Magne Sjaastad
ed3951fd0d
[AppFwk] Added CMakefile used to test AppFwk
2015-12-22 11:41:11 +01:00
Magne Sjaastad
b9286dcd1d
[AppFwk] Updated destructors in unit tests to make sure memory is released correctly
2015-12-22 11:10:50 +01:00
Magne Sjaastad
e8cf78c2af
( #710 ) Clamp currentFrameIndex to available frame indices
2015-12-17 14:40:01 +01:00
Jacob Støren
0650cfdce2
Fixed uninitialized memory read detected by valgrind.
2015-12-14 14:52:00 +01:00
Jacob Støren
891bce069d
( #587 ) Fixed missing initialization. Will probably fix this issue
2015-12-14 14:37:00 +01:00
Jacob Støren
6db74465b6
Removed debug output
2015-12-14 09:53:59 +01:00
Jacob Støren
1d9481f09b
( #695 ) Unintentional picking fixed.
...
Fixed in viewer, keeping the concept of the navigation policies to not flag the
the events as handled.
Made this clearer by adding an interface to turn event consumption on or off on the
navigation policies.
2015-12-10 09:39:55 +01:00
Jacob Støren
f1574bc774
( #168 ) Consolidated zoom along ray to prepare for handling ortho view
2015-12-10 09:39:49 +01:00
Jacob Støren
f3eb304d66
Caf: Added constructors/destructors to navigation policies
2015-12-10 09:39:35 +01:00
Jacob Støren
8f92dfd0c0
Caf: WIP: Created a base class with trackball related navigation stuff.
...
Refactored cad and ceetron plus nav to use the common base
2015-12-10 09:39:28 +01:00
Jacob Støren
afe84ce75e
( #168 ) Parallel walk navigation working. Still things to fix
2015-12-10 09:39:06 +01:00
Jacob Støren
bbb0a5e993
( #168 ) Wip: Parallel projection. Basics in place
2015-12-10 09:33:58 +01:00
Magne Sjaastad
a86d24df97
Fwk : Added DEBUG assert to detect when data is present in child fields
...
Added assert for ChildArrayField and ChildField
2015-12-09 13:34:13 +01:00
Magne Sjaastad
a2bfc12c57
( #674 ) Clicking on items in 3D view selects corresponding item in tree view/property panel
...
Clicking on 3D Info box and legends for cell result, separate fault
result and cell edge selects corresponding items in tree view
2015-12-07 09:59:19 +01:00
Magne Sjaastad
2f6bd07ff0
( #641 ) Added support for copy / paste of points
2015-12-01 15:25:55 +01:00
Magne Sjaastad
19d156e8ff
[Fwk] Fixed missing rename in test app
2015-12-01 15:25:54 +01:00
Magne Sjaastad
709d993cc6
( #641 ) Use color in QListView to indicate input point mode
2015-12-01 12:34:31 +01:00
Magne Sjaastad
bf5de93113
[Fwk] Improved static initializer naming
2015-11-27 10:38:23 +01:00
Magne Sjaastad
563aa95abf
[Fwk] Static initializer must be placed at file global scope in order to always call the constructor in the cpp file
2015-11-27 10:38:22 +01:00
Magne Sjaastad
eb4fefce7c
Removed obsolete file
2015-11-26 18:42:07 +01:00
Magne Sjaastad
147580e342
Linux fix
2015-11-26 05:54:43 -08:00
Magne Sjaastad
8e85c4e8fb
[Fwk] Created test project for Cvf specialization
2015-11-26 14:22:53 +01:00
Magne Sjaastad
5093b559d2
[Fwk] Set default editor for std::vector of Vec3d
2015-11-26 14:22:52 +01:00
Magne Sjaastad
3a3d28003b
[Fwk] Use PdmValueFieldSpecialization instead of QVariant constructor
2015-11-26 14:22:52 +01:00
Magne Sjaastad
3e9e5779ab
[Fwk] Updated headers and added unit tests, fixed minor issues related to text stream operator overload
2015-11-26 14:22:51 +01:00
Magne Sjaastad
1bdb68e3d7
[Fwk] Moved ProjectDataModel unit test
2015-11-26 14:22:50 +01:00
Magne Sjaastad
6cecdf7fc3
[Fwk] Added new top level cmakefile for both AppFwk and VizFwk
2015-11-26 14:22:50 +01:00
Magne Sjaastad
941d117fbf
[Fwk] Updated Cvf test application
2015-11-26 14:22:49 +01:00
Magne Sjaastad
469ffdf920
Fwk : Fixed typo
2015-11-23 13:31:28 +01:00
Jacob Støren
c4aed9c487
( #166 ) Geomech cross sections in place. Refactor of frame/scene/model usage on top level.
2015-11-23 11:25:47 +01:00
Jacob Støren
4d0c1d17b4
cafViewer: Add static model(s) to mainScene as well.
2015-11-23 11:21:58 +01:00
Magne Sjaastad
9a25a71cde
Fwk : Added support for more characters in axis labels
...
Moved drawing of axis cross slightly closer to left edge of available
viewport
2015-11-23 09:56:48 +01:00
Magne Sjaastad
1f91405c50
[Fwk] Propagate return value from QFile::open in writeFile() to caller
2015-11-20 10:49:23 +01:00
Magne Sjaastad
13c5dbfbd2
[Fwk] Do not show children if object hides children
2015-11-18 15:55:23 +01:00
Jacob Storen
7d60b8e90d
Fix Linux warning
2015-11-18 06:33:54 -08:00
Magne Sjaastad
08c04f5052
( #656 ) Added text effect to effect generator
2015-11-17 16:26:07 +01:00
Magne Sjaastad
98bdb6ea6e
( #266 ) Move far clipping plane further away
2015-11-17 13:19:32 +01:00
Magne Sjaastad
c6454300d8
( #266 ) Added static model interface
2015-11-17 13:19:15 +01:00
Magne Sjaastad
6e56ee28c2
( #266 ) Functions to be called from a constructor cannot be virtual
...
Improved immediate mode to be applied on all renderings
2015-11-17 13:18:30 +01:00
Magne Sjaastad
121ee80295
( #266 ) Cleaned up access to boundingBox
2015-11-17 13:18:27 +01:00
Magne Sjaastad
963220dd37
( #632 ) Added support for creation of mesh part from a single cell
2015-11-09 19:05:31 +01:00
Magne Sjaastad
9eb5c73842
Fwk: Emit data changed for all model indices recursively when executing updateSubTree()
2015-11-02 09:50:44 +01:00
Magne Sjaastad
572601c3db
Do not allow changing checked state if an item is read only
2015-11-02 09:50:43 +01:00
Magne Sjaastad
58693f49dc
Removed obsolete tree model
2015-10-26 11:25:17 +01:00
Magne Sjaastad
fb55b469a0
System : Replaced tab with four spaces in AppFwk
2015-10-23 15:21:45 +02:00
Magne Sjaastad
e063518460
System : Performance improvements for TableViewModel
2015-10-23 11:25:59 +02:00
Magne Sjaastad
c4f3870cc9
System : Header cleanup
2015-10-23 11:22:36 +02:00
Magne Sjaastad
5a1e244b2a
System : Renamed classes and function names relaed to drag and drop
2015-10-23 11:03:23 +02:00
Magne Sjaastad
d2b5d7ae92
System : Added iterators and at() to ChildArrayField
2015-10-23 09:45:32 +02:00
Magne Sjaastad
e378d5637e
System : Added support for disable of lighting for surface effect generator
2015-10-23 09:34:47 +02:00
Magne Sjaastad
0383c35be6
System : Improved performance when converting from enum value to ui text
2015-10-23 09:19:17 +02:00
Magne Sjaastad
5b99439ed8
( #573 ) Added new copy method for PdmObjects
...
Added copy method to XmlObjectHandle, and use this method from
PasteEclipseCases
2015-10-23 09:00:17 +02:00
Pål Hagen
1b83bfb7f0
( #467 ) Handling drag move events to get the proposed drop action
...
The tree view model's drag & drop handle is notified about the proposed
action in drag move events.
2015-10-22 14:42:05 +02:00
Pål Hagen
f4bbbcb7a2
( #467 ) Using subclassed treeview to notify the model about drag end
...
Using new class PdmUiTreeViewWidget instead of QTreeView in
PdmUiTreeViewEditor. PdmUiTreeViewWidget handles drag leave events and
calls endDrag() on the model.
2015-10-21 17:20:12 +02:00
Magne Sjaastad
bcb4919f3d
Rename and more comments
2015-10-16 10:08:25 +02:00
Magne Sjaastad
91b100b8cc
( #566 ) Make sure layoutChanged signal is emitted only for existing item changes
...
If layoutChanged is emitted for new inserted items also, the items below
inserted item is collapsed and the expanded state of the tree is changed
2015-10-16 09:20:40 +02:00
Magne Sjaastad
aeeb445dae
Delete items from existing tree before building the map from pdmUiTreeOrdering to index
2015-10-15 19:19:47 +02:00
Magne Sjaastad
5f92e87070
Fixed issue causing a pdmUiTreeOrdering item having wrong (and deleted) parent
2015-10-15 09:22:49 +02:00