OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,044 Commits 27 Branches 61 Tags 309 MiB
cedd8c42d0
Commit Graph

774 Commits

Author SHA1 Message Date
Magne Sjaastad
881ba2986f #1357 Use recently created method 2017-03-24 07:10:02 +01:00
Magne Sjaastad
5530945972 #1323 Show context menu in Result Plot dock widget 2017-03-20 13:16:47 +01:00
Magne Sjaastad
bdf2ea4961 #1323 Added context menu in 3D "Plot Time History for Selected Cells" 2017-03-19 08:59:46 +01:00
Magne Sjaastad
ad90d3f38f #1322 Several refactorings of RimSummaryPlot, added TimeHistoryCurve support 
Removed unique_pointer, as childFields now owns (and deletes) the contained object
Simplified extraction of visible curves
Simplified calculation of zoom range
 2017-03-19 08:45:29 +01:00
Magne Sjaastad
4b7b11e45b Added missing include for Linux 2017-03-16 08:56:53 +01:00
Magne Sjaastad
36728a2a97 #1293 Added context menu to summary plot 2017-03-16 08:38:34 +01:00
Magne Sjaastad
141257c83e #1293 Added "Show Plot Data" to context menu of plots 2017-03-16 08:23:27 +01:00
Magne Sjaastad
10edf44ee3 #1293 Show plot data in text widget 2017-03-15 20:15:04 +01:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
Magne Sjaastad
647b4348eb Renamed to eclipseCaseData 2017-03-15 09:10:16 +01:00
Magne Sjaastad
a81980c235 #1185 Added "Plot Production Rates" for sim well in 3D and project tree 2017-03-08 11:42:08 +01:00
Jacob Støren
bd688f7ce8 #1292 Fixed CppCheck Issues in UserInterface 2017-03-06 11:20:28 +01:00
Jacob Støren
ad517894d3 Fixed possible CppCheck detected bug regarding Result info and result plot for Geomech models. Triangle hit was not propagated properly. 2017-03-03 17:17:41 +01:00
Jacob Støren
4312968124 Removed CppCheck Warnings 2017-03-03 17:09:30 +01:00
Jacob Støren
f15d698342 #1174 Made 3D main window pop up, and set wether to show Max Fractrion Injectors or Producers. Set timestep in 3D view to match plot. 2017-03-02 16:10:18 +01:00
Magne Sjaastad
1b01e98c0e Merged branch dev into pre-proto 2017-02-27 14:03:33 +01:00
Magne Sjaastad
bf1f8fcbaa #1254 Use static methods instead of macros 2017-02-27 13:17:32 +01:00
Magne Sjaastad
10f14aee8e Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-02-27 07:13:06 +01:00
Magne Sjaastad
5c20bff5d1 #1255 Remove includes from header files 2017-02-24 11:07:26 +01:00
Magne Sjaastad
3a98e17163 #1254 Infrastructure for logging including Messages dock widget 2017-02-23 15:02:55 +01:00
Magne Sjaastad
555ecba8b3 #1251 Added RivObjectSourceInfo for selecting any pdmObject 2017-02-23 11:52:56 +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
421dda1042 #1245 Property Editor : Use size hint displaying preferences 2017-02-22 11:58:56 +01:00
Magne Sjaastad
c180e06172 Removed duplicate feature 2017-02-22 09:43:15 +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
7f21582610 Use fontMetrics of widget instead of empty QPainter to get valid values 2017-02-21 10:31:16 +01:00
Magne Sjaastad
b2ec4e055f #1174 Added Show contributing wells from 3D view 2017-02-21 09:49:27 +01:00
Magne Sjaastad
91a962ab21 #1174 Rename 2017-02-21 09:13:33 +01:00
Magne Sjaastad
75f2a6cb9f #1236 Property Editor : Scroll bar for reduced screen area 2017-02-20 14:32:12 +01:00
Magne Sjaastad
a10b96ba3e Merged branch dev into pre-proto 2017-02-17 11:38:32 +01:00
Jacob Støren
590f9995c8 1212 Turned off shadow, changed to radial edge gradient to make the colors more easy to read. 2017-02-16 11:39:02 +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
ad5e18afa6 #1226 Show the complete text in the summary plot tooltip text 2017-02-15 12:29:58 +01:00
Magne Sjaastad
4ff12a4999 #1208 Removed duplicate text generation for one grid cell 2017-02-14 09:52:02 +01:00
Magne Sjaastad
e43f531a0f #1208 Use category text instead of category index 2017-02-14 09:47:19 +01:00
Jacob Støren
df35335744 #1172 Well Alloc plot: Sorted the tracers according to contribution. 2017-02-14 08:10:39 +01:00
Magne Sjaastad
45f3240932 #1174 Added context menu to WellAllocationPlot and added feature 2017-02-13 13:29:31 +01:00
Jacob Støren
edab09823d Whitespace 2017-02-13 10:29:58 +01:00
Jacob Støren
321b9e2d62 #1173 Made the legend a separate hide/show entity, and changed the overall layout of the well allocation plot 2017-02-13 08:44:29 +01:00
Jacob Støren
30ea467f0e Whitespace 2017-02-13 08:44:29 +01:00
Jacob Støren
3e7413831a #1173 Added the possibility to hide the legend in a Well Alloc plots ((including WellLog plot ) 
Also changed the background color to white.
 2017-02-13 08:44:29 +01:00
Magne Sjaastad
722492b5c1 #1180 Use RiaColorTables for selection colors in 3D view 2017-02-10 08:27:20 +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
a736d41eb7 #1169 Added text on the x-axis 2017-02-08 13:23:52 +01:00
Magne Sjaastad
93954fece0 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/Commands/RicDeleteItemFeature.cpp
 2017-02-08 07:35:20 +01:00
Magne Sjaastad
7652009fe7 #1190 Disabled drrop of items into well allocation objects 2017-02-07 09:39:40 +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
Jacob Støren
01864aee09 Well Alloc Plot: Added case and timestep to title, Adjusted font. 2017-02-03 08:51:43 +01:00
Jacob Støren
45dc7a1c08 #1165 Reduced size and spacing. 2017-02-02 16:03:39 +01:00
Magne Sjaastad
40dbf78aa9 #1165 Added title to well allocation plot 2017-02-02 14:17:36 +01:00
Magne Sjaastad
9493a1dfc0 Use hasWellResult instead of firstResultTimeStep 2017-02-02 12:52:32 +01:00
Magne Sjaastad
fad0974b3f #1148 Use tristate for well cell visibility 2017-02-02 09:59:26 +01:00
Magne Sjaastad
b13ca8bb1c #1135 Compute accumulated length along sim well and added slider 2017-01-30 14:28:41 +01:00
Magne Sjaastad
8f4fa4592a #1078 Improved well cells and well cell fence settings 2017-01-26 17:41:34 +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
Magne Sjaastad
055315085e #1108 Created settings object for "Well Allocation Factors" pie chart 2017-01-23 13:29:06 +01:00
Magne Sjaastad
2511a59f8a #1116 Added RiuNightchartsWidget 2017-01-23 12:59:24 +01:00
Jacob Støren
c025c2a3d7 Renaming in the aftermath of the MDI window control refactorization. Aligned fieldChangedByUi in that respact as well. 2017-01-20 11:38:18 +01:00
Jacob Støren
a1aec0b5e0 Fixed compile error not catched by cotire compilation 2017-01-20 10:32:01 +01:00
Jacob Støren
6bd8a4d51a #1106, #1107, #1009, #1113 Started using WellLog plot for the Accumulated Well Flow plot 2017-01-19 17:58:07 +01:00
Jacob Støren
43249f7af8 Refactor related to #1106, #1107, #1109, #1113. Refactored the MDI control 
of windows. This might introduce problems.
 2017-01-19 17:54:01 +01:00
Magne Sjaastad
da371c099b Merged branch dev into pre-proto 2017-01-19 10:45:22 +01:00
Magne Sjaastad
2edc090c89 Restored previous behaviour related to result accessor creation 2017-01-19 10:39:08 +01:00
Magne Sjaastad
9b42f1ca8c Reverted 4ec7c97a77 
Access of RimEclipseCase was done by firstAncestorOf from, and in several cases RimEclipseCase is not parent of RimEclipseCellColors. RimEclipseCase must be explicitly specified.
 2017-01-19 10:37:59 +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
e0ba009e34 Cleaned up includes 
Removed includes to cvfLibCore and friends. Removed several includes from header files.
 2017-01-17 15:11:02 +01:00
Magne Sjaastad
1b5dc51a7e #1084 Snapshot : Removed header above table 2017-01-17 13:11:09 +01:00
Magne Sjaastad
9c1e9f0970 #1080 Snapshot : Show parameter and case as default 2017-01-17 10:40:38 +01:00
Magne Sjaastad
22f870bff0 #1082 Snapshot : Added four empty rows 2017-01-16 23:21:28 +01:00
Magne Sjaastad
723e0f9286 #1107 #1111 Added update of well allocation plot from 3D view 2017-01-13 13:32:17 +01:00
Magne Sjaastad
0cbdcd587d #1105 Stripped down basic infrastructure code 2017-01-13 13:32:17 +01:00
Magne Sjaastad
894b4468b4 #1125 Limit size of string in legend and info, reordered tracer combo 2017-01-12 15:00:23 +01:00
Magne Sjaastad
8ce8b4e7f1 #1105 Added framework files for Well Allocation plot 2017-01-12 15:00:23 +01:00
Magne Sjaastad
00db484f0c #1056 Do not show time history plots for flow data 2017-01-12 10:42:51 +01:00
Magne Sjaastad
b104b1a97c #1056 Simplified TimeHistoryResultAccessor 
#1056 Simplified TimeHistoryResultAccessor
 2017-01-12 07:22:19 +01:00
Magne Sjaastad
4ec7c97a77 #1056 Removed obsolete code 2017-01-11 21:41:22 +01:00
Magne Sjaastad
4a9fec49bf #1056 Added cell edge picking text info 2017-01-11 21:07:03 +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
8970d93a4d #1068 Renamed to RigEclipseCaseData 2017-01-10 09:51:39 +01:00
Magne Sjaastad
f70806e056 #1068 Avoid include of RigCell.h and RigSingleWellResultsData in RigCaseData.h 2017-01-10 09:20:03 +01:00
Magne Sjaastad
9cacf0db6c #1068 Access mainGrid directly from RimEclipseView 2017-01-10 09:20:03 +01:00
Magne Sjaastad
785a5e9ff8 #1060 Use DisplayCoordTransform in ResultTextBuilder 2017-01-09 07:43:17 +01:00
Jacob Støren
ebddaa31e6 #1054 Added sensible information to the Result Info window when picking Flow Diag results. 
Also rolled out the use of resultVariableUiName() to places that should use it.
 2017-01-04 13:13:06 +01:00
astridkbjorke
6b58adb91b #1044 - pre-proto - Updating indexing for i j and k in SimWellFracture to follow Eclipse indexing (starting with 1) and updating depth of z position at wellpath for WellPathFractures to be displayed as positive 2017-01-04 09:35:35 +01:00
Magne Sjaastad
dc970edf7e Merged in changes from dev 2017-01-03 11:32:00 +01:00
Magne Sjaastad
51e8cae11b Added branch index to source info as basis for more work on #1044 2017-01-03 11:11:36 +01:00
astridkbjorke
b3bc0a9135 #1044 - pre-proto - Added function for creating new sim well fracture, not yet setting correct i j k 2017-01-03 09:37:59 +01:00
astridkbjorke
a45ed4bc19 #1038 - pre-proto - Renaming feature for creating new well path fracture 2017-01-03 09:37:59 +01:00
Magne Sjaastad
66d0bc9488 #1018 Snapshot - set dialog width to 1000 2016-12-22 11:55:26 +01:00
Magne Sjaastad
8d8ef3ddc1 #1018 : Snapshot - Use active view as basis for new snapshot definitions 2016-12-22 08:45:50 +01:00
astridkbjorke
46e4815f9a #1038 - pre-proto - added calculation of measured depth along well path when creating new well path fracture in 3D view 2016-12-21 13:40:53 +01:00
astridkbjorke
7784cad47f Merge branch 'dev' 2016-12-21 08:43:57 +01:00
astridkbjorke
f6221340b1 Merge branch 'dev' 2016-12-21 08:38:52 +01:00
astridkbjorke
2022e2dd3d (#1038) - pre-proto - Added new well path fracture from context menu in 3D view. Measured depth along well path for fracture is not yet updated. 2016-12-21 08:35:44 +01:00
Magne Sjaastad
2e3ba3a644 System : Prepare for temporary selection 2016-12-21 08:22:45 +01:00
Magne Sjaastad
ebb191069f System : Added a temporary selection role to for application specific selection items 2016-12-21 08:05:01 +01:00
Jacob Støren
39ff269e5f Merge branch 'dev' of https://github.com/OPM/ResInsight.git 2016-12-20 14:43:28 +01:00
Jacob Støren
4b64de258e Flow: Avoid crash when picking cells with flow Diag results 2016-12-20 14:42:46 +01:00
astridkbjorke
b6a08700a2 #1044 - pre-proto - Started adding feature for making new simulation well fracture in 3D view, but not finished due to missing infrastructure 2016-12-20 13:10:03 +01:00
astridkbjorke
ff996e75ea Show intersection context menu item when linked view is range filter controlled 2016-12-20 11:25:06 +01:00