Commit Graph

910 Commits

Author SHA1 Message Date
Jacob Støren
e15a95f8b4 Filtered away all undefined numbers before sending to Qwt, as it did not handle them.
This fixes autoscaling of X-axis
2015-09-03 19:07:26 +02:00
Jacob Støren
11e57b663c Detaching all curves before the plot is deleted. Qwt needed it. 2015-09-03 15:10:45 +02:00
Pål Hagen
ef727b4797 (#396) Adding a curve is now legal also when there's no plot yet 2015-09-03 15:04:48 +02:00
Pål Hagen
f078a589a5 Linux compilation fix 2015-09-03 14:46:13 +02:00
Jacob Støren
7b308e514c Wip: Separated cretion of Qwt classes from Rim construction
This needs to be done because MDI window close window deletes the widgets.
We need to be able to recreate all the widgets/qwt objects when needed.
The QwtPlotCurves still crashes on window close/open
2015-09-03 14:26:49 +02:00
Magne Sjaastad
6a6973f3d4 (#395) Propagate scaleZ to linked views and fixed camera sync issue (offset z must be multiplied by scaleZ) 2015-09-03 13:06:10 +02:00
Pål Hagen
8fa2701415 (#396) Added fields for minimum and maximum X-axis values 2015-09-03 12:12:36 +02:00
Pål Hagen
6b34e8f6c8 (#396) Changed field descriptions 2015-09-03 12:02:13 +02:00
Jacob Støren
5dd726129c (#396) Fixed updatePlotData system. Set curve name from result variable 2015-09-03 11:39:12 +02:00
Pål Hagen
9a6221b7e8 (#396) Setting default curve color on creation 2015-09-03 10:55:54 +02:00
Pål Hagen
bcab7f2248 (#396) Adding a trace when creating a new well log plot
Did some refactoring - moved creation code to command feature.
2015-09-03 09:46:26 +02:00
Jacob Støren
2288130f6a (#396) Several fixes regarding Project with plots.
Plots loads the curve data on project open
Plots are removed on project close
Still missing some updates (curve names ...)
2015-09-03 08:22:06 +02:00
Jacob Støren
2a8533bad0 (#396) Save/Restore of WellLog plots partly in place.
Cleaned up ownership in WellLog plot classes
initAfterRead() is implemented
moved code related to command features from the WellLog classes
Still plots are not redrawn/reloaded when opening a project file.
2015-09-03 08:22:01 +02:00
Jacob Støren
30e2495849 Remove duplicate add/remove/setActive viewer methods from MainWindow.
(#408) Added Save Load of WellLog Plot window geometry also
2015-09-03 08:21:57 +02:00
Magne Sjaastad
1282766427 Update enabled state of sync items in initAfterRead 2015-09-02 17:24:49 +02:00
Magne Sjaastad
d80e64d81d (#395) Added Show All Linked Views as context menu feature of linked views 2015-09-02 17:18:26 +02:00
Magne Sjaastad
3e0423cd0f (#395) Remove already linked views from visibile views when linking visible views 2015-09-02 17:18:24 +02:00
Magne Sjaastad
ccc7703e1f (#395) Hide master view in property view, use view icons in tree view 2015-09-02 17:18:24 +02:00
Magne Sjaastad
3afa94bb3b (#395) Update visibility of options when main view changes 2015-09-02 17:18:23 +02:00
Pål Hagen
8d7bbb85a9 (#396) Scroll wheel now pans the plot in the depth direction 2015-09-02 16:30:37 +02:00
Jacob Støren
3844c0958d Moved RimWellLeogExtractionCurve to a separate file 2015-09-02 12:34:12 +02:00
Jacob Støren
1ba3978a4e Renamed to RimWellLogExtractionCurve 2015-09-02 12:13:38 +02:00
Jacob Støren
5a265b66a6 (#396)(#397)(#398) WIP: First real Well Log extracted data visible 2015-09-02 12:08:38 +02:00
Jacob Støren
7e676ddfed (#396) Replot on data update 2015-09-02 10:52:12 +02:00
Jacob Støren
e44a78cf57 (#396) Added the data (with gui) to curves to define the well log extraction 2015-09-02 09:26:16 +02:00
Magne Sjaastad
b29ad69673 (#408) Save and restore MDI window size and position 2015-09-01 22:11:39 +02:00
Magne Sjaastad
107d3ff65a Fixed crash : Do not search for result index if no results are loaded 2015-09-01 19:55:37 +02:00
Magne Sjaastad
379cf6b228 (#395) Moved code from RiuViewer to RimView and cleaned up includes 2015-09-01 18:21:20 +02:00
Magne Sjaastad
4730e10319 Created navigationPolicyUpdate to be used from navigation policies 2015-09-01 18:04:35 +02:00
Magne Sjaastad
7969e22364 (#395) Moved managed views from RimView to RimProject 2015-09-01 17:34:03 +02:00
Jacob Støren
52281633d6 (#396) untangled Geomech Result Definition from the use of GeoMechView
In order to reuse the RimGeoMechResultDefinition in the curve data.
2015-09-01 17:19:09 +02:00
Jacob Støren
c35e3fceaf Fixed assert on open old projectfiles
The cause was that a case was inserted into a field without removing it from the old obsolete field first.
2015-09-01 17:19:05 +02:00
Jacob Støren
ca0fd4d9fe Fix of obscure crash due to results beeing loaded while results are beeing loaded.
Load GeomResults->progressbar->processEvent->slotActiveViewChanged->
refreshAnimActions->hasResult->loadResults->progressbar->assert ...
2015-09-01 17:18:57 +02:00
Jacob Støren
9df1e48543 (#396) Disconnected EclipseResultDefiniton from EclipseView
So that it can be used in WellLogCurves
2015-09-01 17:18:53 +02:00
Jacob Støren
c9887c26c6 Fixed crash when toggling separate fault result
when no faultresult had been selected.
Crashed due to missing legend definition
2015-09-01 17:18:49 +02:00
Jacob Støren
26eada49e2 (#396) Wip: Adding an Eclipse WellLog Curve with the pointers to the needed data. 2015-09-01 17:18:45 +02:00
Pål Hagen
406d34c411 Linux compilation fix 2015-09-01 15:53:28 +02:00
Pål Hagen
caddfd01ed (#396) Setting the curve's axes explicitly (x bottom is the default x axis in Qwt) 2015-09-01 15:38:26 +02:00
Pål Hagen
51a251f7ef Linux compilation fix 2015-09-01 15:15:54 +02:00
Pål Hagen
2de4d0df29 (#396) Added scrollbar for panning of well trace plots 2015-09-01 14:50:26 +02:00
Magne Sjaastad
444500f6cc (#395) Make sure the update() virtual function is called from camera related functions 2015-09-01 11:31:31 +02:00
Pål Hagen
ba1b2ec110 (#396) Handling scroll wheel event to zoom all well log trace plots 2015-09-01 11:14:58 +02:00
Jacob Støren
8485e76bf5 Added dummy curve data to correct place. Added curve description field. 2015-09-01 09:32:44 +02:00
Jacob Støren
57d195d9d8 Cleaned away dummy data and moved curve creation logic to the command feature 2015-09-01 09:06:02 +02:00
Pål Hagen
0133659e05 (#396) Added fields for min and max depths to the well log plot
Changing those fields will cause all well trace plots to be updated
accordingly.
2015-08-31 17:21:21 +02:00
Pål Hagen
2bac87972f (#396) A well log plot curve is set current when created 2015-08-31 11:27:40 +02:00
Pål Hagen
a23ad04d06 (#396) A well log plot trace is set current when created 2015-08-31 11:25:22 +02:00
Pål Hagen
33c310bba1 (#396) Made sure that a well log plot is the current item when created 2015-08-31 11:19:28 +02:00
Pål Hagen
5e18afd44c (#396) Implemented deletion of well log plots 2015-08-31 11:05:55 +02:00
Pål Hagen
ed432290af (#396) Removed unused methods 2015-08-31 10:52:11 +02:00
Pål Hagen
c2b7305f8e (#396) Using const ref parameters for curve data 2015-08-31 10:50:10 +02:00
Pål Hagen
370764ae50 (#396) Removed toggle field for well log plot collection 2015-08-31 10:31:48 +02:00
Pål Hagen
eaff6f88c4 (#396) Using toggle field of well log plots to toggle visibility 2015-08-31 10:12:45 +02:00
Pål Hagen
d0b6e5466f (#396) Using the checkbox of the plot trace to toggle the visibility of the trace in the plot 2015-08-31 09:57:13 +02:00
Pål Hagen
94f172369e (#396) Using the curve's checkbox to attach the curve to or detach the curve from the plot 2015-08-31 09:50:40 +02:00
Pål Hagen
9d4f9d617f Basic well log plot functionality with dummy data up & running
Traces can be added to and deleted from well log plots, and curves with
dummy data can be added and deleted. TODO: Replace dummy data with real
well log data and data extracted from the model.
2015-08-31 02:06:37 +02:00
Magne Sjaastad
3f09c1bc66 Added LinkVisibleViewsFeature, and added action to draw toolbar 2015-08-30 13:30:46 +02:00
Magne Sjaastad
e5d5543cd9 Ovveride update() and find all linked views to be updated 2015-08-28 21:32:51 +02:00
Magne Sjaastad
905f4df2bf Added function used to find all managed views 2015-08-28 21:05:56 +02:00
Pål Hagen
4e83cff8a2 Well log plots now contain one plot per trace 2015-08-28 14:25:14 +02:00
Pål Hagen
7401160677 Added command feature to the context menu for well path collection 2015-08-28 12:25:48 +02:00
Pål Hagen
46a941348b Hide the main plot collection level in the project tree
"Well Log Plots" will be visible on the top level if there are plots.
2015-08-28 12:10:36 +02:00
Magne Sjaastad
5d576aed14 (#395) Display case name and view name in UI for view config 2015-08-28 11:48:42 +02:00
Pål Hagen
7081e140fd Added command feature for addition of a new curve to a well log plot trace 2015-08-28 11:45:18 +02:00
Pål Hagen
0fdf5292d0 Added command feature for addition of a new trace to a well log plot 2015-08-28 11:32:25 +02:00
Pål Hagen
af9bbfdede Added collection class for well log plots 2015-08-28 10:42:57 +02:00
Magne Sjaastad
75a34e605f (#395) Fixed update issues for managed child views 2015-08-28 10:02:04 +02:00
Magne Sjaastad
17d081c43d Propagate changes to managed views of children 2015-08-28 10:02:04 +02:00
Magne Sjaastad
5fd81b19d8 Added support for geo mech property filters for managed views 2015-08-28 10:02:03 +02:00
Magne Sjaastad
81ce665883 (#395) Added sync of Eclipse property filters 2015-08-28 10:02:03 +02:00
Magne Sjaastad
eaa5cc90a8 (#395) Removed obsolete code from property filter collection 2015-08-28 10:02:02 +02:00
Pål Hagen
609ee78400 WIP - well log plots, added traces to plots and curves to traces 2015-08-27 16:43:54 +02:00
Pål Hagen
4e6bb1ded3 WIP - added project data model files for well log plots
Added command feature for adding new well log plots (right-click "Plots"
in the project tree view). Will create dummy Qwt widget added as an MDI
window.
TODO: Complete the relations between the entities, and add
properties/property editors. Create more advanced viewer widget for
plotting of multiple traces with multiple curves. Harmonize MDI stuff
with 3D viewers.
2015-08-27 16:13:49 +02:00
Magne Sjaastad
b7d04375c8 (#395) Added support for control of geo mech results 2015-08-27 14:57:04 +02:00
Magne Sjaastad
e5f0bdfaab Managed views can use range filters from master view
RangeFilterCollection is now a private field in RimView
2015-08-27 13:44:27 +02:00
Magne Sjaastad
b9a8c0743b Removed unused methods, use updateUiUpdateDisplayModel on RangeFilterCollection 2015-08-26 18:51:55 +02:00
Magne Sjaastad
0513608924 Removed obsolete files 2015-08-26 15:42:46 +02:00
Magne Sjaastad
f6ac177ff2 Added ManagedViews and sync of camera, time step and cell result 2015-08-26 15:42:31 +02:00
Pål Hagen
2b87c8c7d6 Added Qwt library and basic classes for well log viewer 2015-08-26 12:27:29 +02:00
Magne Sjaastad
d79cc50fd5 Never show ternary legend field in project tree 2015-08-26 10:43:51 +02:00
Magne Sjaastad
305380db83 (#392) Fixed filtering of available results in property filter
setOwnerObject was used to trigger filtering of this list. Now manually
called from EclipseResultDefinition
2015-08-25 08:43:20 +02:00
Pål Hagen
0c8600c6dd (#355) Got rid of all RimUiTreeModelPdm includes 2015-08-24 17:42:42 +02:00
Pål Hagen
21691ec7f0 (#355) Removed source code files for old project tree view 2015-08-24 17:31:20 +02:00
Pål Hagen
0704680221 (#355) Renamed geomech property filters and property filter collections
"GeoMech Property Filter" -> "Property Filter"
"GeoMech Property Filters" -> "Property Filters"
2015-08-24 17:26:22 +02:00
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
Pål Hagen
5614f6d33a (#339) Fixed well path related context menu
Made sure that the order of the items in the context menu is the same as
it used to be in the old project tree view. Removed separator.
2015-08-24 16:33:54 +02:00
Jacob Støren
39c50b4f8d Linux Compile Fix 2015-08-24 16:05:39 +02:00
Pål Hagen
42656c45ad (#355) Removed old project tree view
RimUiTreeView and RimUiTreeModelPdm are no longer part of the solution.
TODO: Get rid of the source code files when all testing is done
successfully.
2015-08-24 14:56:09 +02:00
Pål Hagen
16764b5487 Fixed tree view visibility of the parent field of input property collection 2015-08-24 11:35:07 +02:00
Pål Hagen
17465beba8 Added comment about obsolete tree view slot 2015-08-24 11:21:05 +02:00
Pål Hagen
3264358601 Fixed tree view visibility of parent item of input properties 2015-08-24 11:05:22 +02:00
Pål Hagen
5785031697 Added "Delete" to the context menu for input property items 2015-08-24 10:45:43 +02:00
Pål Hagen
7044f3c627 (#383) Added RicAddEclipseInputPropertyFeature 2015-08-24 10:40:47 +02:00
Pål Hagen
28547513c6 (#383) Added RicSaveEclipseInputPropertyFeature 2015-08-24 10:03:21 +02:00
Pål Hagen
756e793519 (#386) Added "Delete" to the grid case group context menu
Note: Used to be "Close" in the old tree view. Using existing feature
for deletion, for now.
2015-08-21 15:44:12 +02:00
Pål Hagen
89ee164c8a Added "Paste" to the context menu of "Derived Statistics" 2015-08-21 15:08:07 +02:00
Pål Hagen
762083a5b6 (#388) Added RicComputeStatisticsFeature 2015-08-21 14:53:45 +02:00
Pål Hagen
afe596aa2a (#388) Added RicNewStatisticsCaseFeature 2015-08-21 11:47:59 +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