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,611 Commits 29 Branches 61 Tags 286 MiB
3d67946976
Commit Graph

396 Commits

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