OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-23 23:13:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,906 Commits 28 Branches 61 Tags 286 MiB
a72f2ea421
Commit Graph

820 Commits

Author SHA1 Message Date
Magne Sjaastad
f81ef5b2fe #1486 Use RiuWellPathSelectionItem to communicate data to feature 2017-05-16 10:22:16 +02:00
Magne Sjaastad
25e6aec94a Merge branch 'dev' into fishbones 2017-05-15 13:37:09 +02:00
Magne Sjaastad
e38b7329d1 #1469 Use time step strings from case 2017-05-15 09:17:06 +02:00
Bjørnar Grip Fjær
dc4e7e0773 #1451 Add table editor for perforation intervals 2017-05-12 10:02:00 +02:00
Magne Sjaastad
4204d49f30 #1469 Add checkbox for legend visibility 2017-05-11 21:44:44 +02:00
Magne Sjaastad
764a68c032 #1469 Add large symbols for each value in Lorenz plot + legend 2017-05-11 14:04:29 +02:00
Magne Sjaastad
0c0c21e495 #1469 Reorder includes and fix comments and whitespace 2017-05-11 11:43:15 +02:00
Magne Sjaastad
84b922ba82 #1476 Include isFile() when checking if a file exists 2017-05-11 09:23:13 +02:00
Magne Sjaastad
a8cab547a0 1251 Added RivObjectSourceInfo for selecting any pdmObject 2017-05-05 12:18:10 +02:00
Magne Sjaastad
5e14e56609 #1062 Use minimalistic title flags for dialogs 2017-04-27 14:22:47 +02:00
Bjørnar Grip Fjær
700a73ca19 #1012 Do not toggle object when pressing enter after renaming in summary window 2017-04-26 15:43:34 +02:00
Jacob Støren
6f07a3698b #1427 Enable the new Well Log Curve command for Simulation Wells 2017-04-25 16:12:55 +02:00
Jacob Støren
f40cf3a9b7 #1427 Apply specific changes from pre-proto regarding selection in 3D 
To be used for transporting branch index from 3D context menu operation to feature.
 2017-04-25 16:12:55 +02:00
Magne Sjaastad
63b07b1152 #1430 When closing top level windows, do not close project if other is visible 2017-04-25 15:01:31 +02:00
Magne Sjaastad
c35e79c3b5 Merge branch 'dev' into pre-proto 2017-04-20 13:40:56 +02:00
Magne Sjaastad
d7d80bc53e #1401 Ask user to save modified project before project close 2017-04-20 10:02:25 +02:00
Magne Sjaastad
66a42074c3 #1373 Fix missing include 2017-04-19 15:31:06 +02:00
Magne Sjaastad
9caaeac237 #1373 Add feature ShowTotalAllocationData 2017-04-19 13:48:15 +02:00
Magne Sjaastad
4ac35c4e30 #1373 Add context menu launcher and use from well allocation plot 2017-04-19 12:14:01 +02:00
Magne Sjaastad
0292f06aea #1404 Select corresponding object before displaying context menu 2017-04-19 07:46:39 +02:00
Magne Sjaastad
7592137b78 #1373 Use selectAsCurrentItem in MainPlotWindow 2017-04-19 07:36:11 +02:00
Jacob Støren
03ab71f82f #1411 Fixed the window activation bug introduced by 442d9d2e 2017-04-07 18:00:59 +02:00
Magne Sjaastad
947845e7fd #1404 Added plot object picker, and use from Well Allocation plot 2017-04-07 11:25:55 +02:00
Magne Sjaastad
6f5d451c66 #1405 Use left mouse click to select well log track 2017-04-07 11:12:57 +02:00
Bjørnar Grip Fjær
224211f765 #1406 Automatically show process monitor when executing script 2017-04-07 09:21:48 +02:00
Jacob Støren
970595e0f5 Flow Characteristics Plot: Fixed missing replot when changing case to case without any solved flow diag timesteps 2017-04-06 11:00:06 +02:00
Jacob Støren
6c7dfdca7b #1395 Renamed TopologyItem to GeometrySelectionItem including Keywords with friends. 
Changed keyword to GridTimeHistoryCurve (previously missing Grid)
 2017-04-04 16:10:00 +02:00
Magne Sjaastad
e1ca217422 #1371 Removed dependency on opm-parser 2017-04-04 13:53:44 +02:00
Magne Sjaastad
8255a3aaa3 Merge branch 'dev' into pre-proto 2017-04-03 07:34:56 +02:00
Jacob Støren
e5f593db60 #1375 Reduced window zoom limit to 10 decades instead of 4 2017-03-31 16:27:05 +02:00
Jacob Støren
442d9d2e41 #1380 Major refactor of the management of views to fix the active view problem. Expect some trouble following this. 2017-03-31 15:13:50 +02:00
Jacob Støren
a914e38d53 #1380 Wip: Started to allign all the view widgets, preparing to avoid duplicated code when mdi window to RimViewWindow translation. 2017-03-31 15:13:50 +02:00
Bjørnar Grip Fjær
c30afc9ece #895 Ensure property editor is updated after all project data is loaded 2017-03-30 09:29:48 +02:00
Bjørnar Grip Fjær
e998f09250 Fixed typo 2017-03-29 11:22:12 +02:00
Jacob Støren
ba60bf3c13 #1321 Added a comand to show Flow Characteristics plot. Added timestp colors, zoom, mouse tracking, and titles 2017-03-28 23:36:56 +02:00
Magne Sjaastad
a6ce3c9ef4 Fixed missing includes on Linux 2017-03-28 09:47:06 +02:00
Jacob Støren
233c248491 #1366 Wheel works without Ctrl pressed 2017-03-27 18:22:09 +02:00
Jacob Støren
0c834cdc0f Cleaning 2017-03-27 18:13:38 +02:00
Jacob Støren
c0ff734cc7 Preparations for #1321: Aligned default stuff between the plot types. 2017-03-27 18:13:38 +02:00
Jacob Støren
a82677c743 #1366 Added wheel zoom to point. 
Also preparations for #1321
 2017-03-27 18:13:38 +02:00
Jacob Støren
f05a4027aa #1321 Applied new plot marker tracker class to well log plots 2017-03-27 18:13:38 +02:00
Jacob Støren
ba1dfee4e6 #1321 Finalized plot marker refactoring 2017-03-27 18:13:38 +02:00
Jacob Støren
ef8a98d4e1 #1321 Wip: Refactoring plot marker to be used more generally. Eg Flow Characteristics plots 2017-03-27 18:13:38 +02:00
Jacob Støren
76019109f6 Cr Lf cleanup 2017-03-27 18:13:38 +02:00
Jacob Støren
1fefc6124f #1321 Wip: First shot on bringing the flow characteristics curves up into the open. 2017-03-27 18:13:38 +02:00
Magne Sjaastad
03741fd7da CppCheck : Reduced variable scope 2017-03-24 09:30:36 +01:00
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