OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-14 01:13:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,793 Commits 28 Branches 61 Tags 291 MiB
6f3097dd5f
Commit Graph

828 Commits

Author SHA1 Message Date
Magne Sjaastad
9e3a100bcc #3253 OpenMP : Give name to all critical sections 2018-08-27 13:04:29 +02:00
Gaute Lindkvist
92bcae2805 Add not equals operator to PdmDataValueField 2018-08-27 11:33:02 +02:00
Bjørn Erik Jensen
9bff5881a3 #3271 Create Multiple Fractures. Summary field using empty space 2018-08-27 10:47:03 +02:00
Bjørn Erik Jensen
1be8d335fa PdmUiTableViewEditor. Add support for setting column widths 2018-08-24 15:10:10 +02:00
Gaute Lindkvist
208505ee5f Fix Linux build issue with cafSelectionManager 2018-08-22 13:10:18 +02:00
Gaute Lindkvist
12202fe4e6 #3255 Add convenience methods to caf::SelectionManager 2018-08-22 13:04:00 +02:00
Magne Sjaastad
46e42a5489 AppFwk : Remove not required function call 2018-08-22 09:44:18 +02:00
Jacob Støren
37cb3e0ab7 caf: Removed obsolete SelectionManager includes 2018-08-21 16:44:20 +02:00
Jacob Støren
296854d749 caf: Rename of SelectionRole to SelectionLevel and 
CURRENT to FIRST_LEVEL
Replace use of SelectionLevel enum as argument with int
 2018-08-21 16:44:19 +02:00
Jacob Støren
0e92c1d594 caf: Replace selection role with selectionLevel. 
Use std::map for storage of the different selections
Started to remove the SelectionRole Enum
 2018-08-21 16:44:19 +02:00
Jacob Støren
e10754cffb #2607 caf: Add selection level to the "notify selection changed" system 2018-08-21 16:44:19 +02:00
Magne Sjaastad
56bf2ede7d #3222 AppFwk : Improve robustness/maintainability (3) 2018-08-20 08:56:35 +02:00
Magne Sjaastad
26f6eb1dd4 #3222 AppFwk : Improve robustness/maintainability (2) 2018-08-20 08:24:24 +02:00
Magne Sjaastad
cd63332514 #3222 AppFwk : Improve robustness/maintainability 2018-08-20 08:02:36 +02:00
Magne Sjaastad
37369cb0fb AppFwk : Add const 2018-08-20 08:02:36 +02:00
Jacob Støren
096536a341 caf: Use caf::Factory macro for factory registration in field editors. Removed obsolete code 2018-08-17 12:32:40 +02:00
Magne Sjaastad
bc9332f45a AppFwk : Whitespace 2018-08-16 13:59:28 +02:00
Magne Sjaastad
ddf9a6a2d8 AppFwk : Rename to cafPdmuiTableRowEditor 2018-08-16 13:52:36 +02:00
Jacob Støren
e862ef873a #3221 caf: Avoid selectionChanged and updateConnectedEditors when TableView is built (configureAndUpdateUi) 2018-08-16 11:55:28 +02:00
Magne Sjaastad
97c3b9efea #3214 AppFwk : Add function to get referencing objects of specified type 2018-08-15 13:01:11 +02:00
Magne Sjaastad
e21fe9b706 RegTestRunner : Add removeDirectoryAndFilesRecursively 2018-08-10 08:23:08 +02:00
Magne Sjaastad
8425ea96ad #3185 Remove FixedArray 2018-08-07 10:37:52 +02:00
Magne Sjaastad
29dd2cd093 Rename 2018-08-02 13:52:24 +02:00
Magne Sjaastad
b79a340333 AppFwk TableEditor : Add selection of owner object 
If no objects in the table is selected, add the owner object to selection. This makes it possible to access the owner object from features to add new items into empty tables.
 2018-08-02 13:45:46 +02:00
Jacob Støren
e739a95830 AppFwk: Auto resize of columns and rows when new field is displayed. Better Heading label behaviour. 2018-07-04 17:02:19 +02:00
Bjørn Erik Jensen
13e5a3214b #3087 Show plot data. Display tabbed dialog for summary data 2018-07-02 11:45:14 +02:00
Gaute Lindkvist
c33ec790ed Convenience method for cafProgressInfo to increment and set up next step. 2018-07-02 10:29:30 +02:00
Magne Sjaastad
e45ac4d705 AppFwk : Add include 2018-06-29 17:15:28 +02:00
Jacob Støren
99565f62f2 AppFwk: Fix missing type guard in multi select field edit code. Added Assert in updateUI to prevent accidental recursive calling. 2018-06-29 16:23:26 +02:00
Jacob Støren
1c8d5bf942 AppFwk: Color editor no longer calls setValueToField on update GUI 2018-06-29 16:23:26 +02:00
Magne Sjaastad
3b94c06e11 AppFwk : Fix compile issue for test application 2018-06-29 08:05:38 +02:00
Jacob Støren
8e53e2a3cf AppFwk: Remove NotificationCenter from SelectionManager 2018-06-28 09:58:51 +02:00
Jacob Støren
ba9f7720e6 AppFwk: Clean-up of table view after refactoring 2018-06-27 17:24:33 +02:00
Jacob Støren
88297bdb9f AppFwk: Add editor attribute. Object-only SelectionManager use. Use SelectionChangedReceiver. Improve tableview-checkbox selection behaviour and look. 2018-06-27 17:24:32 +02:00
Jacob Støren
08c78471c3 AppFwk: Introduce SelectionChangedReceiver as a slimmer replacement for NotificationCenter 2018-06-27 17:24:05 +02:00
Jacob Støren
66cec70718 AppFwk: Support field changed on multiple objects in general. 
Not only inside the command framework on CURRENT selection
 2018-06-27 13:13:24 +02:00
Jacob Støren
ad709d76a2 AppFwk: Change interface of uiOrder insertion to direct insert 
Instead of find + insert
 2018-06-25 12:57:11 +02:00
Jacob Støren
73a52c4929 AppFwk: Index based uiordering insertion. 2018-06-25 12:57:11 +02:00
Gaute Lindkvist
9e7dd7d4ea #3076 Stop key press event in time step interval causing filtered dialog to close. 2018-06-21 15:39:44 +02:00
Gaute Lindkvist
921c1f606d Set a minimum width for progress dialog 2018-06-20 11:46:19 +02:00
Magne Sjaastad
b0a6b81363 #3066 AppFwk : Add define to avoid min() and max() as macros 2018-06-20 09:56:51 +02:00
Gaute Lindkvist
d13a52a8b4 #3058 Implement a memory cleanup dialog for GeoMech data. 2018-06-19 12:20:21 +02:00
Gaute Lindkvist
e3bffafb46 Make memory critical threshold limits different on Linxu and Windows. 2018-06-19 10:09:51 +02:00
Gaute Lindkvist
8f0fb820a5 #3050 Add memory count to progress dialog. 2018-06-19 10:09:51 +02:00
Magne Sjaastad
cbb467a4a4 #3037 AppFwk : Guard access to field pointer by a PdmPointer to owner 2018-06-18 14:20:50 +02:00
Magne Sjaastad
ab556d786b #3048 AppFwk : Remove custom context menu functions 2018-06-18 14:20:50 +02:00
Magne Sjaastad
18a0a9aa9a #3055 Table Editor : Fix display of date as text 2018-06-18 14:20:50 +02:00
Magne Sjaastad
4fd2f982fd #3037 AppFwk - Table Editor : Update UI for all cells 
This is required when updating the table editor for the first time, and when adding a new row. Will potentially cause performance issues for large tables.
 2018-06-18 14:20:50 +02:00
Magne Sjaastad
17ee25d0b2 AppFwk : Rename to uiField() and setUiField() 2018-06-15 14:22:03 +02:00
Magne Sjaastad
a801fd9cc5 #3048 AppFwk : Add custom context menu to table in test app 2018-06-15 12:53:32 +02:00
Magne Sjaastad
d7037acedf #3048 AppFwk : Wire up functions for custom context menu 
Add PdmUiObjectHandle ::defineCustomContextMenu()
 2018-06-15 12:53:32 +02:00
Magne Sjaastad
e8204465f9 #3048 AppFwk : Add setCustomContextMenuEnabled to PdmUiItem 2018-06-15 12:53:32 +02:00
Gaute Lindkvist
2f0b1cfdb9 #3045 Implement memory display in status bar of the main window 2018-06-15 12:39:54 +02:00
Magne Sjaastad
eb8cba5e31 #3037 AppFwk : Rename to PdmUiTableViewPushButtonEditorAttribute 2018-06-14 09:47:15 +02:00
Magne Sjaastad
a4f11daf0b #3037 AppFwk : Simplify widget creation 2018-06-14 09:47:15 +02:00
Magne Sjaastad
c24a7a13ae #3037 AppFwk : Rename to setChildArrayField() 2018-06-11 15:00:45 +02:00
Magne Sjaastad
c491939713 #3037 AppFwk : Implement and use createLabelWidget() 2018-06-11 14:22:30 +02:00
Magne Sjaastad
acf2f61d25 #3037 AppFwk : Use QPointer 2018-06-11 14:21:24 +02:00
Magne Sjaastad
c486f7963e #3037 AppFwk : Add macros and implement createEditorWidget 2018-06-11 13:36:15 +02:00
Magne Sjaastad
477d6cedd5 #3037 AppFwk : Inherit from FieldEditorHandle instead of EditorHandle 2018-06-11 12:55:26 +02:00
Magne Sjaastad
e814272bea #3037 Guard pointer access 2018-06-11 12:39:26 +02:00
Magne Sjaastad
e370dee3b0 #3037 Rename using Q for table view model and tree view model 2018-06-11 11:16:39 +02:00
Gaute Lindkvist
68f965f6bb Fix Linux build problem with cafAsyncObjectDeleter 2018-06-08 13:18:30 +02:00
Gaute Lindkvist
5f766e5228 #3013 Make sure all existing connections for PdmObjects are removed before async delete 
* Clear all PdmPointer connections (including selection manager)
* Send all threads to the new caf::AsyncWorkerManager which can join the threads
  before program exit if the caller has asked for that.
 2018-06-08 12:58:59 +02:00
Magne Sjaastad
d52c7b4119 AppFwk : Remove unused code and several minor cleanup changes 2018-06-08 12:56:50 +02:00
Gaute Lindkvist
4ddacad385 #2680. First reasonable Fracture Gradient and Shear Failure Gradient estimation. 
Caveats:
* Hard coded poissonRatio = 0.25
* Hard coded UCS to 100 bar (fairly close to average value for shale in literature).
 2018-06-06 12:03:08 +02:00
Magne Sjaastad
d8cc40b8bc #2999 VizFwk : Use IJK and IJK + 1 when adding a single cell 2018-05-31 11:41:59 +02:00
Bjørn Erik Jensen
73c49b4ce9 Fwk. Fix missing config name bug 2018-05-31 10:24:16 +02:00
Gaute Lindkvist
743993718c #2873 New AsyncPointerVectorDeleter-classes to handle memory deletion in separate thread. 2018-05-23 14:38:25 +02:00
Gaute Lindkvist
772e7ec7e6 Revert "#2873 Delegate deletion of summary cases to separate thread." 
This reverts commit 0089e0c218.

Didn't intend this to go into dev now
 2018-05-22 09:22:12 +02:00
Gaute Lindkvist
0089e0c218 #2873 Delegate deletion of summary cases to separate thread. 2018-05-22 09:21:40 +02:00
Jacob Støren
ec9e2efef4 Fix cotire build problem 2018-05-22 00:16:03 +02:00
Jacob Støren
9b9f9b2bf1 #2939 ProgressInfo: Reintroduce process envents, to update the progress dialog durig processing on linux/mac. 
Introduced isActive and used this info to block sheduled redraw/display model regen when progress bar is active, to avoid unintended recursive behaviour resulting in crashes.
 2018-05-21 23:46:35 +02:00
Jacob Støren
d37ed9bb7c #2889 Fix crash when few tick marks in legend. 
Set legend title before adding to view to make size calculaltion correct first time.
 2018-05-11 14:06:08 +02:00
Gaute Lindkvist
15c2b19f59 Slightly improve naming of epsilon/tolerance variable in plane triangle intersection. 2018-05-09 11:34:04 +02:00
Gaute Lindkvist
9da54a115b Fix crash in cafHexGridIntersectionTools when exporting fracture completions. 
* Account for two new triangle plane intersection cases where one vertex is touching the plane.
 2018-05-09 10:44:29 +02:00
Bjørn Erik Jensen
d659b8e853 #2856 Context menus. Fix logical error during menu build-up 2018-05-07 12:24:51 +02:00
Gaute Lindkvist
88cc6ea3f5 Fix wrong assert in cvfScalarMapperRangeBased::setLevelsFromValues 
* Old code always causes assert failure when calling this method.
 2018-05-07 11:17:51 +02:00
Bjørn Erik Jensen
0e8eae33db #2818 Selection manager. Add strict method variant 2018-05-07 09:46:45 +02:00
Jacob Støren
d413df0aeb #2730 Category and Scalarmapper Legend: Improve the preferred size 2018-05-04 13:33:06 +02:00
Jacob Støren
df6c9f69d1 ScalarMapperRangeBased: Avoid adding duplicate ticks. Typically when max == min value 2018-05-04 13:33:06 +02:00
Bjørn Erik Jensen
736277e0ef #2797 Ensemble curves. Slightly increased cateory legend height 2018-05-03 09:53:34 +02:00
Gaute Lindkvist
98af9e00ab Fix build issue on Linux 2018-05-02 12:11:15 +02:00
Gaute Lindkvist
6e3d989b2f #2825 Fix curve stitching issues against 3dwell log curve background. 2018-05-02 11:51:36 +02:00
Gaute Lindkvist
f61512ef94 Add Copyright headers to cafTitledOverlayFrame.h|cpp 2018-04-25 14:38:17 +02:00
Gaute Lindkvist
517a557efe Legends (#2786): Fix Debug-build of Resinsight. 2018-04-23 13:08:35 +02:00
Gaute Lindkvist
c5e58df751 3d Well Log Curves (#2783): Enable picking with the track background switched off. 
* Add part to the model, but set the color mask false, depth test/write off.
* Result is an invisible part that is present for picking.
 2018-04-23 11:35:55 +02:00
Jacob Støren
22a1448ea6 Fix gcc 6 linux errors 2018-04-20 19:38:21 +02:00
Jacob Støren
3957027b4b #2657 Final cleanup and refactoring of legends size system 2018-04-20 16:59:10 +02:00
Jacob Støren
03ec76c20a #2657 Add a preferredSize method to the legends 2018-04-20 16:59:10 +02:00
Jacob Støren
0192f66a4d More renaming and reformatting of legend code 2018-04-20 16:59:10 +02:00
Jacob Støren
1f8d4437bf Remove the unused, unnecessary "position" from several methods and the overlay layout struct 2018-04-20 16:59:10 +02:00
Jacob Støren
d48c2b7aa9 Rename layout variables in legends to make their intent and use clearer 2018-04-20 09:23:19 +02:00
Gaute Lindkvist
5d89ad3a6d 3D Well Log Curves (#2674): Show what the value axis direction is 2018-04-19 13:43:12 +02:00
Gaute Lindkvist
a73526f85b Remove compile warning for OverlayScalarMapperLegend 
* apply explicit unsigned int -> float cast.
 2018-04-10 08:36:20 +02:00
Gaute Lindkvist
dd38543dd2 Fix Ubuntu build (#2696) 
* std::ceil -> cvf::Math::ceil to avoid header issues.
 2018-04-10 08:31:03 +02:00
Gaute Lindkvist
ab736ab46b #2693. Fix overlap of category legend with other legends. 
* CategoryLegend should not use the matchedWidth. They have their own columns.
  * Change shifts to using minimumWidth instead.
 2018-04-09 14:30:21 +02:00
Gaute Lindkvist
b488d99f81 #2696 Fix ubuntu build after Legend updates. 
* Was missing <cmath> to get std::ceil, but cvf::Math also has ceil, so switch
   to that.
 2018-04-09 14:19:43 +02:00
Gaute Lindkvist
b6fb60115a Refactored after review 2018-04-09 13:14:19 +02:00
Gaute Lindkvist
e93f79790e Make sure Ternary legends also expand and renamed width method. 2018-04-09 13:14:19 +02:00
Gaute Lindkvist
38aa447dcd Unify the width of all visible legends. 
* Calculate the minimum width to fit the content before the render pass.
  * Set the actual width of all the legends to the largest of the minimum widths.
  * This resizes the legends to always be the same size and reduces the size of you remove
     the widest legend.
 2018-04-09 13:14:19 +02:00
Gaute Lindkvist
63ffade452 Set background and frame color from the view plus update frame margins. 2018-04-09 13:14:19 +02:00
Gaute Lindkvist
507229f84b Fixed background color setting for legends and refactored Legend class hierarchy 
* Added a new cafTitledOverlayFrame as a base-class for all ResInsight legend classes
  * Inherits cvf::OverlayItem
 2018-04-09 13:14:19 +02:00
Magne Sjaastad
4377ac2a6b AppFwk : Remove sub menu action if sub menu is empty 2018-04-09 11:36:01 +02:00
Jacob Støren
3b724e07bd #2436 Add cube face tracking through the clipping methods used for intersection calculations 2018-04-05 07:41:29 +02:00
Magne Sjaastad
bffc50b826 Fix typo when generating light NNC colors 2018-03-24 14:44:08 +01:00
Bjørn Erik Jensen
1e8f1bb95e #2589 intersections. Show extrusion line fix 2018-03-12 15:14:22 +01:00
Magne Sjaastad
716bb3184b System : Replace tab with four spaces 2018-03-12 11:12:39 +01:00
Bjørn Erik Jensen
6ae619cc10 Fix Linux build by adding missing include (II) 2018-03-09 08:50:16 +01:00
Bjørn Erik Jensen
9543649858 Revert "Fix Linux build by adding missing include" 
This reverts commit ab8a4f58ab.
 2018-03-09 08:47:43 +01:00
Bjørn Erik Jensen
ab8a4f58ab Fix Linux build by adding missing include 2018-03-09 08:37:53 +01:00
Jacob Støren
0bdde36aa3 Merge #51 Legend background and #2478 Edge axis top into dev 2018-03-08 16:22:13 +01:00
Jacob Støren
7a9e53bdb1 #51 Avoid that legend background misses frame line on the right 2018-03-08 16:12:40 +01:00
Jacob Støren
7bd08067a9 #52 Add background to category legend 2018-03-08 11:38:51 +01:00
Jacob Støren
c258528dc5 #51 Add background to standard legends. Needed a separate legend implementation, now in caf. Cleaned up CategoryLegend to make it ready for the new background. 2018-03-08 11:20:27 +01:00
Magne Sjaastad
2e122d2ab3 #2554 Regression Test : Move serialization code into RiaRegressionTest 2018-03-07 09:30:15 +01:00
Jacob Støren
b13422d28b Guard against stepsize < 0 in tickMarkGenerator 2018-03-06 16:31:12 +01:00
Magne Sjaastad
ca0087eb55 #2536 Build System VizFwk : Use target_* and remove includes 2018-02-28 07:42:19 +01:00
Magne Sjaastad
233df05f68 #2536 Build System : Remove obsolete includes and update depending includes 2018-02-27 20:00:56 +01:00
Magne Sjaastad
3fbce58fa5 #2536 Build System AppFwk : Several updates 
Simplified automoc
Use target_include_directories and target_link_libraries
Use CMake 2.8.12
 2018-02-27 18:37:11 +01:00
Magne Sjaastad
65c3d6ff12 #2536 Build System AppFwk : Use target_include_directories 2018-02-27 17:19:23 +01:00
Magne Sjaastad
70faea56df AppFwk : Add missing initialization of variables and handling of switch statements 2018-02-23 21:29:54 +01:00
Magne Sjaastad
671818d72e AppFwk : Reorder initialization to match declaration 2018-02-23 19:57:09 +01:00
Magne Sjaastad
8bc3f06acd AppFwk : Add missing default handling in switch statements 2018-02-23 19:56:38 +01:00
Magne Sjaastad
309b1f0749 AppFwk Clang : Reorder initialization order to match declaration order 2018-02-23 19:43:48 +01:00
Magne Sjaastad
f9de64c538 AppFwk : Use freopen_s instead of freopen 2018-02-23 19:34:43 +01:00
Magne Sjaastad
cfb75ecc34 AppFwk (clang-tidy) : modernize-use-nullptr 2018-02-18 18:17:50 +01:00
Magne Sjaastad
3239c66f54 AppFwk (clang-tidy) : modernize-use-nullptr 2018-02-18 18:05:08 +01:00
Magne Sjaastad
950617af96 AppFwk : Fix assignment of float value 2018-02-18 17:42:28 +01:00
Magne Sjaastad
9184ef14ca AppFwk : Use 'g' instead of 'f' to create text from double values 2018-02-16 10:14:08 +01:00
Magne Sjaastad
2ff5842f28 Clang : Avoid special template helper on Windows 2018-02-12 20:12:04 +01:00
Magne Sjaastad
13606f0295 Clang : Exclude special code in release() to avoid warning 2018-02-12 20:09:01 +01:00
Magne Sjaastad
c208569fb6 Clang : Remove inline from template function 2018-02-12 20:09:01 +01:00
Jacob Støren
e76f8cfbcc #2337 Add an improved tick mark generator 2018-02-09 14:08:55 +01:00
Jacob Støren
bb53b926bf #2345 Add + and * operators to the tensor class, to make averaging possible. 2018-02-07 13:10:36 +01:00
Jacob Støren
0db32df1c4 Add comment to describe usage of the weighted blended transparency system 2018-02-03 19:33:27 +01:00
Magne Sjaastad
22c49ebe37 #2414 AppFwk : Cleaned up includes 2018-01-26 15:08:40 +01:00
Magne Sjaastad
7c7a54f5aa #2414 AppFwk : Do not overwrite field double value with UI text representation 2018-01-26 15:08:40 +01:00
Magne Sjaastad
1419865b89 #2411 AppFwk : Increase precision when writing real numbers to XML 2018-01-26 15:08:40 +01:00
Jacob Støren
5640f91b68 #2412 2D Navigation only for Intersectino Views 2018-01-26 14:33:32 +01:00
Jacob Støren
369afcfbbb Caf: Set point of interes when doing "Zoom All" 2018-01-26 11:43:43 +01:00
Jacob Støren
c7185649ce Caf: Guard against crash when point of interest is not set correctly 2018-01-26 11:43:27 +01:00
Magne Sjaastad
76b84cbb17 #2361 AppFwk : Make sure field of FilePath supports space, add more tests 2018-01-17 14:32:47 +01:00
Magne Sjaastad
c0d9ef67fa #2361 AppFwk : Make sure identical strings are separated by semicolon 2018-01-17 14:32:47 +01:00
Magne Sjaastad
bf1b755dc8 #2361 AppFwk : Improve robustness of load and save of FilePath 2018-01-12 14:56:05 +01:00
Jacob Støren
57b521c6d9 AppFwk: Add a guarded interface pointer class 2018-01-12 12:01:04 +01:00
Magne Sjaastad
e99cc66325 #2361 AppFwk : Test application adjustments to allow save and load of project 2018-01-11 13:50:26 +01:00
Magne Sjaastad
97822cbd2c #2361 AppFwk : Template specialization of stream operator for vector of FilePath 2018-01-11 13:50:26 +01:00
Magne Sjaastad
f86b13adc8 #2361 AppFwk : Add cafFilePath and conversion to QVariant 2018-01-11 13:50:26 +01:00
Magne Sjaastad
90f9b63b44 #2361 AppFwk : cafPdmuiListEditor : Refactor setting of strings to field 2018-01-11 13:50:26 +01:00