OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,288 Commits 53 Branches 83 Tags
0513608924f2f731c900e447d3d93078c87a1727
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Støren 627b3c2292 Merge branch 'dev' into modularization-prototype 
Set version to 1.3.101-dev
 2015-08-24 16:54:15 +02:00
Jacob Støren 39c50b4f8d Linux Compile Fix 2015-08-24 16:05:39 +02:00
Jacob Støren ac37cd8049 Version number set to 1.4.0 for release 2015-08-21 10:05:23 +02:00
Jacob Støren f0c09a49a6 Upped to 1.3.8-dev 2015-08-20 18:02:33 +02:00
Jacob Støren bbde32af26 (#374) Fixed property filter not working when no color results was active 2015-08-20 17:50:07 +02:00
Jacob Støren 2e1a542749 Some context menu cleanup 2015-08-20 17:19:38 +02:00
Jacob Støren a6c59f4160 (#384) Fixed Script tree in the new project tree 2015-08-20 15:48:37 +02:00
Jacob Støren f174615098 Replaced use of capability template with convenience 2015-08-20 15:24:49 +02:00
Jacob Støren 0ac86aeff3 Fwk: Added convenience methods to access the ui/xml capabilities in objects 2015-08-20 15:22:43 +02:00
Jacob Støren 0fda6ef6fb (#370) Bugfixes regarding using several project trees 
SelectionManager is now updated whenever focus enters the treeview.
The main project tree now has turned on SelectionManager updates
 2015-08-20 14:49:18 +02:00
Jacob Støren 69a46e0b45 (#370) Added contaxt menu and key-event handling to extra TreeViews 2015-08-20 14:49:11 +02:00
Jacob Støren 35a37a5e07 (#370) Treeview event filter adjustment for multiple treeviews 
and Linux compile fix
 2015-08-20 11:49:58 +02:00
Jacob Støren c75d09e3df (#381) Handle key press events in new tree view 2015-08-20 11:16:19 +02:00
Jacob Støren 04368bd8a3 (#349) Removed updateConnectedUIEditors 2015-08-20 10:43:55 +02:00
Jacob Støren c599fd39f8 (#372) Drag Drop Move implemented. 
User question on closing/moving a statistics source case
 2015-08-20 10:43:49 +02:00
Jacob Støren f0ee19d8f7 Some renaming and comments 2015-08-20 09:58:27 +02:00
Jacob Støren f7ef9c575e Added missing headers to CMake files 2015-08-20 09:57:38 +02:00
Jacob Støren 6786894adb Fixed Cmake generation error. 
wrap_qt cant be run in an included sub-cmake-file
 2015-08-20 09:57:09 +02:00
Jacob Støren f8dce724f6 (#370) Wip: NewProjectTreeAndPropertyView command works. 
Missing context menu
 2015-08-20 08:03:38 +02:00
Jacob Støren c1b971e4d4 Added OBSOLETE to the old toggle commands 2015-08-20 08:03:32 +02:00
Jacob Storen 5defe45209 Linux compile fix 2015-08-18 03:42:51 -07:00
Jacob Støren c3db342474 (#361) Toggle commands now implemented in new tree 2015-08-18 12:08:46 +02:00
Jacob Støren 302f46b61b (#372) First step in Reimplemented drag and drop support 2015-08-18 11:23:53 +02:00
Jacob Støren eadf1ca300 (#361) Refactored "On" as a start on the toggle commands 2015-08-18 10:52:18 +02:00
Jacob Støren 4606a3de8b Fwl: Always update action look when retreiving it. 2015-08-18 10:52:13 +02:00
Jacob Støren b9343fd21e Made the menu builder in RimProject handle separators. 
Also rigging for Script commands and generic toggle
 2015-08-17 10:51:13 +02:00
Jacob Støren 48cef84069 Added some OBSOLETE comments 2015-08-17 10:01:39 +02:00
Jacob Støren bb2eda3e73 (#379)(#377) Moved store/restore of tree view state to new tree 
Also refactored slotCreateCommandObject
 2015-08-17 09:38:27 +02:00
Jacob Støren 2f49415d3f (#376) Made new treeview follow window selection 2015-08-16 10:06:10 +02:00
Jacob Støren 6d7bf0ae9e Made translation between PdmUiItem and QModelIndex available in PdmUiTreeView 
After considering the different options, I concluded that it is important to
support the Qt way of doing things.
If the App programmer wants to do things the Qt way, it should be possible.
 2015-08-16 09:57:57 +02:00
Jacob Støren 6ca74621ef (#378) Refactored Expansion in MainWindow, 
Removed some use of the obsolete tree view model
 2015-08-14 18:06:22 +02:00
Jacob Støren e805c893c6 (#378) Added an tree view expansion interface 2015-08-14 18:03:51 +02:00
Jacob Støren 6244cf98bf Fixed bug discovered by doing (#357) 2015-08-14 16:19:31 +02:00
Jacob Støren 5cd416ce6b (#357) Renamed PdmUiObjectHandle::owner() to objectHandle() 2015-08-14 16:15:49 +02:00
Jacob Storen f3810640ca Fixed Linux compile issues 2015-08-14 06:42:12 -07:00
Jacob Støren 15917d0044 Fix of update on Delete All Well Paths 2015-08-14 15:22:09 +02:00
Jacob Støren a8a1b61646 (#373) Fixed update after delete. 
Removed the editors used to update after delete, and did all the updating from
the command directly.
Less code easier to follow, not as generic.
 2015-08-14 15:20:50 +02:00
Jacob Støren fc146bb554 Fix of compiler warning 2015-08-14 15:17:30 +02:00
Jacob Støren d3b1af3724 firstAnchestorOrThisOfType : Initialize returnvalue to NULL 2015-08-14 15:17:03 +02:00
Jacob Støren f5d15c19e1 firstAnchestorOfType now considers the object itself as well. 
It is thus renamed to firstAnchestorOrThisOfType
 2015-08-14 14:04:47 +02:00
Jacob Støren 1719a10954 Fixed crash when deleting Geomech Range filters 2015-08-14 13:27:31 +02:00
Jacob Støren 85ea085c4e (#371) RiuViewerCommands: Used the new exec commands 2015-08-14 13:27:26 +02:00
Jacob Støren 930760eb47 Removed wrong usage of owner() 2015-08-14 13:27:21 +02:00
Jacob Støren d371da246f Renamed uiPdmModel() to uiPdmModel_OBSOLETE() 
To make it easier to see what code is using the obsolete stuff.
 2015-08-14 13:27:17 +02:00
Jacob Støren 69243076b2 Fixing wrong headers on new files 2015-08-14 09:45:57 +02:00
Jacob Støren 3e3b1a2480 (#369) Refix updating of propertyview on selection of none-object 2015-08-14 08:38:17 +02:00
Jacob Støren 0670403c1d Select to Application Global and not Current for SelectionManager 2015-08-14 08:35:57 +02:00
Jacob Støren 343e4dcc1c (#369) Started to use the new selection method in PdmUiTreeView 2015-08-13 23:47:04 +02:00
Jacob Støren 8052a1c672 (#369) Added selectAsCurrentItem to the PdmUiTreeView 
Cleaned up the responsibilities between Editor, model and View
Now model exposes translation between QModelIndex and PdmUiItem
Selection inteface implementation is handled by editor, and forwarded to View
Also started renaming of SlectionManager update enabeling
 2015-08-13 23:45:34 +02:00
Jacob Støren 235e024533 (#354) Called updateConnectedEditors everywhere updateUiSubTree is called 2015-08-13 21:28:09 +02:00
Jacob Støren 3d47e5795b (#368) Made current view change when changing the selection in the new tree view 2015-08-13 17:05:41 +02:00
Jacob Støren a1774d3b14 (#353) Removed the last MODTODO (except Eclipse View commands impl) 2015-08-13 15:43:17 +02:00
Jacob Storen 47819812bf Fix of Linux compile errors and warnings 2015-08-13 06:23:51 -07:00
Jacob Støren 8ad3f9b8c3 Fixed missing parent = NULL, if parentField() is NULL 2015-08-13 11:47:04 +02:00
Jacob Støren 369797b3d8 Re-introduced firstAnchestorOfType 2015-08-13 11:38:32 +02:00
Jacob Støren f8518037fe cafPdm: Re-Added PdmObjectHandle::firstAncestorOfType() 2015-08-13 11:38:29 +02:00
Jacob Støren fb88414fec Reset textfields in Project storing TreeView selection and expansion state 
This avoids an assert, and that selection stat bleeds through from one project to next.
 2015-08-12 10:51:52 +02:00
Jacob Støren 3e1ff60c82 Fixed new tree view regarding Statisics Cases 2015-08-12 10:51:48 +02:00
Jacob Støren 8bc9c734a2 Fixed the GeoMech part of the tree. 2015-08-11 15:23:57 +02:00
Jacob Støren 3d599542f4 Fixed the top levels of the new tree 
Including Scripts and Well Paths
 2015-08-11 15:22:49 +02:00
Jacob Støren 85a76f591f Upped version number to 1.3.100-dev for ResInsight in refactoring 2015-08-11 12:13:32 +02:00
Jacob Støren b35e37bde2 Alligned the GeoMechResultDefinition to the EclipseResultDefinition way of updating the PropertyFilter 2015-08-10 17:28:32 +02:00
Jacob Støren df0b4164c5 Got rid of the "ownership"-changes in EclipseResultDefinition with friends. 
Updating is now done more explicitly.
 2015-08-10 17:28:29 +02:00
Jacob Støren 78323e2299 Fixed crash due to missing LegendConfig 2015-08-07 11:09:05 +02:00
Jacob Støren 1a3a2f1ff5 (#119) Improved naming of Property Filters 
Finalized.
 2015-07-02 12:50:38 +02:00
Jacob Støren 34a88c0215 (#119) New property filter gets name from the active result 2015-07-01 15:26:00 +02:00
Jacob Støren dad1520948 (#226) Cell Edge defaults for new views: Off and MULT 2015-07-01 14:46:44 +02:00
Jacob Støren 46bca827aa (#226) CellEdge Result: Check box in tree. 
The MULT result is not yet set as default property.
 2015-07-01 14:46:44 +02:00
Jacob Støren 349b2b2cd5 Set version to 1.3.6-dev to flag the octave change 2015-07-01 09:04:50 +02:00
Jacob Støren f28c18d76a Removed two dubious test lines from the Octave Unit test (#325) 
they did not pass in Octave-4.0.0, and I can't see their actual
testing value.
 2015-07-01 07:44:52 +02:00
Jacob Støren 09d14c8ee2 Support Octave-4.0.0 on windows.(#325) 
The modifications is also working in the old 3.6.1 version of octave,
so they should be good in the versions between too.
 2015-07-01 07:44:51 +02:00
Jacob Støren b2fb9ae2c8 Fixed wrong CaseTypeId in octave GetCases. Introduced by the GeoMech Case. 
(#325)
 2015-07-01 07:44:50 +02:00
Jacob Støren 70b84957f9 Changed the oct-file build system to also handle octave-4.0.0 (#325) 2015-07-01 07:44:50 +02:00
Jacob Støren 2b1e2bb157 Fix of #321 and #284 Crash when setting data from octave into an input case 2015-06-29 17:06:55 +02:00
Jacob Støren e33caeab36 Fix of #301 Missing riTRANS/MULTXYZ when NTG is missing 2015-06-29 14:45:30 +02:00
Jacob Storen 3bd9360911 Linux compile fix. 
Needed to move the implementation of copyByType() out of the class definition.
 2015-06-29 03:37:02 -07:00
Jacob Støren 00f8743cef Fixed an assert and wrong behavior: 
When selecting a result field "heading", after selecting one of its components.
 2015-06-29 12:17:30 +02:00
Jacob Støren 948f4d5d58 Fwk: Added missing "setupBeforeSave" when copying. 
This fixes #110 Copy view function resize/move grid in ResInsight
 2015-06-29 10:48:25 +02:00
Jacob Støren 985afce261 #329 "Copy/Paste View" added for Geomechanics 2015-06-29 10:48:17 +02:00
Jacob Støren 55c1d5de71 Made help menu entry point directly to documentation, not the home-page 2015-06-29 10:48:10 +02:00
Jacob Støren 9269950263 Set version number to 1.3.5-dev 2015-06-25 08:10:04 +02:00
Jacob Støren 1cdd5262f8 Cleaned up PropertyFilter classes. 2015-06-24 15:03:55 +02:00
Jacob Støren 5b17c27b51 Fixed errors in 2b881f2cb8. 
Statistics were not calculated properly for early timesteps when directly accessing a late timestep.
 2015-06-24 14:13:00 +02:00
Jacob Støren fddef6d32c Turned on parallell GeoMech prop. filter visibility calculation 2015-06-24 13:15:34 +02:00
Jacob Støren 4fabc509a0 Missing updates of property filtered cells 
1. When Rangefilters changed
2. When the rangefilter collection was turned off
 2015-06-24 12:05:07 +02:00
Jacob Støren 2b881f2cb8 Avoid repeatedly recalculation of statistics of HUGE_VAL-only results 2015-06-24 12:05:01 +02:00
Jacob Støren 7d075999af Removed obsolete ifdefs 2015-06-24 12:04:55 +02:00
Jacob Storen eb2515b8c2 Linux compile fixes 2015-06-23 04:34:25 -07:00
Jacob Støren 515fb8b8d7 #314 Connected the Property filter code together. 
Now working !
 2015-06-22 21:57:52 +02:00
Jacob Støren 8f2090eccf Refactored GeoMechView createDisplayModel 
Made adding well paths less obfuscated
Preparing for #314 Property Filter
 2015-06-22 14:04:36 +02:00
Jacob Støren 088bc12459 Preparing for property filter. #314 
Prototype code for property filter visibility
Refactoring the VizLogic class to make the responsibilities clearer
 2015-06-22 08:18:54 +02:00
Jacob Støren e9fe03f63a Moved Fem visibility calculator to a separate file 
Preparing for GeoMech Property filter
 2015-06-22 08:18:48 +02:00
Jacob Støren 74efc8da1a Use the new RigCellSetEnum instead of unsigned char 
Preparing for property filter
 2015-06-22 08:18:42 +02:00
Jacob Støren 0377461da0 #323, #318 Geomechanical sign on Stress/Strain 
Now they are presented as S and E, and the native Abaqus values are hidden.
 2015-06-19 14:38:31 +02:00
Jacob Støren e740bdc618 #324, 323 -E and GammaNN derived results 2015-06-19 14:05:33 +02:00
Jacob Støren cfb0bfeb55 Moved RivCellSetEnum to a separate file. 
Preparations for property filtering
 2015-06-18 14:17:03 +02:00
Jacob Støren 8bf90ec27c Renamed enum type for Cell Sets (previously called ReservoirGeometryType) 2015-06-18 14:16:58 +02:00
Jacob Støren 09152ad363 Made internal enum private 2015-06-18 14:16:53 +02:00
Jacob Støren 919f2b61f3 Renaming and cleaning as preparations for GeoMech property filters 
#314
 2015-06-18 14:16:48 +02:00
Jacob Støren 2136c1b64c New DisableLightning icon 2015-06-18 14:12:44 +02:00