OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-21 22:13:25 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,487 Commits 29 Branches 61 Tags 286 MiB
a2e2c99167
Commit Graph

373 Commits

Author SHA1 Message Date
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