Commit Graph

1230 Commits

Author SHA1 Message Date
Pål Hagen
3938e65c7b (#511) Updating well log plot icon when toggling visibility 2015-09-22 16:09:25 +02:00
Pål Hagen
f745e483c7 (#507) Updating curve name only if "auto name" is set 2015-09-22 15:45:58 +02:00
Magne Sjaastad
2c8ac1541d (#500) Use space to indent auto name properties 2015-09-22 15:36:14 +02:00
Magne Sjaastad
b481699cc2 (#500) Improved curve data property panel
Show curve data group first
Hide auto name properties when custom name is defined
2015-09-22 15:24:11 +02:00
Pål Hagen
81b973a74c (#507) Picking unit name from LAS file in curve's update method 2015-09-22 15:12:33 +02:00
Pål Hagen
239d682956 (#514) Added missing "view link" command features to context menu in project tree view 2015-09-22 14:34:26 +02:00
Pål Hagen
430ea86962 (#505) Added context menu item for creation of well log extraction curve 2015-09-22 12:29:14 +02:00
Magne Sjaastad
b45e571888 (#504) Do not use autoscale for x-axis - simplified track/plot update code 2015-09-22 11:55:21 +02:00
Magne Sjaastad
7ded798055 (#504) Move common code to base class 2015-09-22 11:55:21 +02:00
Pål Hagen
f49c7fc983 (#505) Added context menu item for creation of cure from LAS data for well paths 2015-09-22 10:52:28 +02:00
Jacob Støren
a0dabca6ed (#401) Updated sensitivity and GUI of ViewLink to reflect the visible cells possibilities 2015-09-21 18:54:41 +02:00
Jacob Støren
7cf61eb636 Added update of icon when changing master view 2015-09-21 18:54:39 +02:00
Jacob Støren
eb3cf20263 Avoid repeatedly resetting the view 2015-09-21 18:54:37 +02:00
Jacob Støren
31b5b2e568 Moved setting of default view to after we know the geometry is generated. 2015-09-21 18:54:33 +02:00
Jacob Støren
a2dc6628ad (#401) Fixed result coloring of cells/fault geometry part of cells.
And visibility of fault part of overridden visible cells
2015-09-21 18:54:31 +02:00
Jacob Støren
7abfd51b91 Fix: Schedule Property filter regen. and not Range filtered.
when asked to do Property filter.
2015-09-21 18:54:27 +02:00
Jacob Støren
fa5be6a5e4 Guard against updating geomech legend when no data is loaded. 2015-09-21 18:54:24 +02:00
Magne Sjaastad
2b7d7be3f1 (#499) Added a custom track delete feature
Added infrastructure needed to delete track from plot and plot
collection
2015-09-21 15:55:55 +02:00
Pål Hagen
5e58cb141e (#468) Added context menu item in 3D view for plotting of well log extraction curves 2015-09-21 14:24:29 +02:00
Magne Sjaastad
e8079783cb (#497) Moved per cell filter code from property filter to result definition 2015-09-21 11:43:22 +02:00
Magne Sjaastad
b85e254983 (#457) Show time step string instead of index in UI 2015-09-21 11:22:03 +02:00
Magne Sjaastad
06e8bc2ec5 Moved building of time step names for UI to case 2015-09-21 11:22:03 +02:00
Pål Hagen
c32f4cabfe (#493) Correct handling of MDI sub window activation.
Setting bool member variable that blocks sub window activation slot
temporarily at the correct places - the main window methods that sets
active viewer and removes a viewer.
2015-09-21 11:01:00 +02:00
Pål Hagen
5e8a6d90cd (#498) Picking and displaying well log channel unit from LAS files 2015-09-21 10:10:25 +02:00
Jacob Støren
22d033669d (#401) Result colors now updated on "Visible cells"-overridden Eclipse cases 2015-09-21 09:10:50 +02:00
Jacob Støren
2604e01ddc (#401) Fixed missing update (Inactive cells) 2015-09-21 08:37:49 +02:00
Magne Sjaastad
d4d0ac4842 (#455) Added customizable generated curve name for Extraction Curves 2015-09-20 12:12:15 +02:00
Magne Sjaastad
850c7804b4 Use group for curve name properties 2015-09-18 19:42:54 +02:00
Pål Hagen
fef1d93a9e (#436) Renamed class/files 2015-09-18 17:29:17 +02:00
Pål Hagen
e3e574fb90 (#493) Blocking MDI window activation handler when toggling off well log plot 2015-09-18 17:06:26 +02:00
Pål Hagen
9ee13911b3 (#459) Don't call code finding valid intervals if we have no points 2015-09-18 16:12:39 +02:00
Magne Sjaastad
4ea3387e79 (#455) Improved use of Custom Curve Name 2015-09-18 13:46:18 +02:00
Magne Sjaastad
842363eebd WIP resolved conflicts 2015-09-18 13:46:18 +02:00
Pål Hagen
479b2083ef (#486) Renamed "trace" to "track" 2015-09-18 12:29:23 +02:00
Pål Hagen
ecf0d19110 Added group for visible depth range. Renamed fields. 2015-09-18 11:47:17 +02:00
Pål Hagen
efc62a65f9 (#490) Added group for visible X axis range. Renamed fields. 2015-09-18 11:41:14 +02:00
Pål Hagen
59efb31523 (#490) Added user description field to well log plot tracks 2015-09-18 11:07:21 +02:00
Pål Hagen
2653bcf1a9 (#491) Updating X-range fields according to changes in plots 2015-09-18 10:50:01 +02:00
Pål Hagen
1df537627d Linux compilation fix 2015-09-18 10:33:56 +02:00
Pål Hagen
58609ac9de Renamed class/flies 2015-09-18 09:16:59 +02:00
Magne Sjaastad
0f5fed1768 (#492) Created folder for well log commands, added "New Well Log LAS Curve" feature 2015-09-18 09:07:38 +02:00
Magne Sjaastad
b3620355de Handle no data gracefully 2015-09-18 09:07:37 +02:00
Pål Hagen
2ebb60e468 (#459) Fixed bug in extraction of valid intervals for plotting 2015-09-18 08:54:11 +02:00
Pål Hagen
ffbc4f13e7 (#459) Added support for plotting of discontinuous curves 2015-09-17 18:42:35 +02:00
Jacob Støren
14b740c8ab Fixed crash when opening project file with a hidden well log plot 2015-09-17 16:13:24 +02:00
Jacob Støren
7a6c7149e1 (#401) WIP: First cell filtering Eclipse Geomec grid visible.
Not working very well. BB matching is not good enough.
2015-09-17 16:13:22 +02:00
Jacob Støren
f092c4daef (#401) WIP: CaseToCase mapper creation.
Now only the mapping generation is missing
2015-09-17 16:13:20 +02:00
Jacob Støren
b6fb85e0a4 (#401) WIP: Prototyped total cell visibility calculation and
calculation of overridden cell visibility.
2015-09-17 16:13:17 +02:00
Pål Hagen
ca375d90ea (#466) Clicking a plot curve selects the item in the project tree view 2015-09-17 11:34:03 +02:00
Pål Hagen
1dc7bbe667 (#436) Renamed a method and a member variable 2015-09-16 16:20:07 +02:00
Pål Hagen
06f73bc359 (#436) Enabled addition of multiple well log curves to plot 2015-09-16 16:16:02 +02:00
Pål Hagen
6d41aa0b18 (#436) Renamed some classes/files, methods and variables 2015-09-16 16:06:06 +02:00
Pål Hagen
8ed9945ccf (#436) Showing user name field. Default value is log channel name. 2015-09-16 15:43:14 +02:00
Pål Hagen
c88bdfd823 (#436) Added property fields. Handling project file read/write, 2015-09-16 15:31:04 +02:00
Magne Sjaastad
f1e11780ce (#446) Added feature "Set master view" to context menu in 3D and in project tree 2015-09-16 15:13:56 +02:00
Magne Sjaastad
4c781b12be (#446) Added feature "Delete all linked views" 2015-09-16 14:40:50 +02:00
Magne Sjaastad
36f5f628f3 (#446) Changed from list of ViewLinkers to one single ViewLinker 2015-09-16 14:26:25 +02:00
Magne Sjaastad
66333e0367 (#475) Make sure MDI window pos and size is restored 2015-09-16 12:56:48 +02:00
Pål Hagen
a79bce6ea4 (#436) Moved LAS file related code to new class RigWellLogFile 2015-09-15 18:07:53 +02:00
Magne Sjaastad
cfc8c72137 Completed more robust check for commit 7c8fe47683 2015-09-15 16:33:40 +02:00
Pål Hagen
e4212a1135 (#436) Added feature that creates a plot with a given LAS file log 2015-09-15 15:23:25 +02:00
Pål Hagen
9cd4c1efb8 (#436) Added methods that read depth and other log data 2015-09-15 15:18:28 +02:00
Pål Hagen
03e4b89508 (#435) Renamed class 2015-09-15 13:21:30 +02:00
Magne Sjaastad
7c8fe47683 Made cell visibility check more robust 2015-09-15 12:17:10 +02:00
Pål Hagen
2b068676c5 (#435) Handling metadata for both continuous and discrete log data 2015-09-15 12:05:20 +02:00
Pål Hagen
a6cb14244d (#435) Fixed reading well path files for existing well logs with the same well name 2015-09-15 11:49:09 +02:00
Pål Hagen
7efd3daa8b (#435) Bugfix - made sure that correct pointer is assigned 2015-09-15 11:01:19 +02:00
Magne Sjaastad
08e266c2f3 (#449) Minor fixes related to isActive 2015-09-15 10:45:39 +02:00
Magne Sjaastad
9aeb949b06 (#449) Added toggle on dependent views and removed toggle from master 2015-09-15 09:47:59 +02:00
Magne Sjaastad
4cf3d9ff5f Check for valid bounding boxes before testing for intersection 2015-09-15 09:46:32 +02:00
Pål Hagen
7f2aa1c389 (#435) Adding well log to existing well if well names are the same 2015-09-14 17:05:28 +02:00
Pål Hagen
095d974e38 (#435) WIP - Reading metadata from LAS files 2015-09-14 16:33:28 +02:00
Jacob Støren
7296be4dde Tempoarily hide the SyncVisibleCells options for pushing to dev 2015-09-14 09:53:39 +02:00
Jacob Støren
1e232c23c5 (#477) Fixed missing updates after toggle or delete of ViewLinker
Fixed missing delete of ViewLinker child objects
2015-09-14 09:53:33 +02:00
Jacob Støren
f81cf98580 (#401) WIP: Refactoring Linked views update system.
Preparing for linking of visible Cells.
2015-09-14 09:53:28 +02:00
Jacob Støren
238c783b26 More renaming LikedView -> ViewLink 2015-09-14 09:53:16 +02:00
Jacob Støren
984656cbfa (#401) Added access to the ViewLinker from the main view 2015-09-14 09:53:10 +02:00
Jacob Støren
187ebf114d Added A SyncVisibleCells field 2015-09-14 09:53:05 +02:00
Jacob Støren
379cce41f4 (#443) Linked views default is to not link the result color
Did some cosmetics as well.
2015-09-11 14:17:27 +02:00
Jacob Støren
8b26726672 Renamed file LinkedView->ViewLink 2015-09-11 14:17:21 +02:00
Jacob Støren
733b3603db Rename of LinkedView -> ViewLink 2015-09-11 14:17:16 +02:00
Pål Hagen
dce0361660 (#438) Added unit to depth axis title. Did some refactoring. 2015-09-11 13:22:33 +02:00
Pål Hagen
7901c3c4bd (#438) Showing "MD" or "TVD" on top of Y-axis according to depth type 2015-09-11 12:35:59 +02:00
Pål Hagen
fa8f6108c7 Using different handling for toggling on and off visibility of well log plot 2015-09-11 10:58:30 +02:00
Pål Hagen
d3909c5d27 (#437) Using MD or TVD depth values for well log extraction curves
Also renamed some methods for clarity, and fixed a bug in
RimWellLogPlot::updateViewerWidget(). Using this method instead of
loadDataAndUpdate() when toggling visibility of the plot.
2015-09-11 10:44:10 +02:00
Pål Hagen
7ba23a7f18 (#438) Added depth type enum field to well log plot 2015-09-10 15:29:50 +02:00
Pål Hagen
615ac05970 (#433) Reading measured depth from JSON well path files 2015-09-10 14:37:05 +02:00
Pål Hagen
5e4f3cfbb9 (#433) Reading measured depth from ascii well path files 2015-09-10 14:21:08 +02:00
Pål Hagen
b1b428971e (#396) Improved code related to well log plot name field 2015-09-08 13:28:08 +02:00
Pål Hagen
d1437ba849 (#396) Applying well log plot user name in tree view when loading project from file 2015-09-08 12:25:22 +02:00
Pål Hagen
4d8198657a (#396) Showing the well log plot name in the tree view 2015-09-08 11:47:25 +02:00
Pål Hagen
dbe4daa533 (#396) Showing only the well log plot name in the title bar (no prefix) 2015-09-08 11:40:37 +02:00
Pål Hagen
77c22e4562 (#431) Handling viewer deletion by upper right X in window gracefully 2015-09-08 11:11:42 +02:00
Pål Hagen
1000c96c3e (#431) Turning toggle field off when removing well log plot viewer widget 2015-09-08 10:21:33 +02:00
Magne Sjaastad
5ce0f6988d (#417) Added togglebutton controls to View group 2015-09-08 10:17:50 +02:00
Magne Sjaastad
3ca5406bb4 (#417) Added togglebutton control to Linked View Group 2015-09-08 10:17:50 +02:00
Jacob Støren
f26fa65d98 (#430) Added name to GeoMech WellLog curves in the form of Field.Component 2015-09-08 10:04:02 +02:00
Pål Hagen
c1d2a32f6e (#428) Selecting well log plot in tree view when its viewer is activated 2015-09-07 19:22:11 +02:00
Pål Hagen
eda2ce27d6 (#396) Fixed updating of plot traces when adding curves
Made sure that plot traces are updated as expected when adding curves to
plot traces with index > 0.
2015-09-07 18:00:04 +02:00
Jacob Støren
6440215d21 (#399) WellLog extraction from GeoMech cases works.
Needs more testing, and performance must be fixed see (#415)
2015-09-07 16:24:40 +02:00
Pål Hagen
98efbf863f (#425) Resetting X-axis range to default when all curves are removed 2015-09-07 15:36:50 +02:00
Magne Sjaastad
f16b2af600 Rename of class names and files related to linked views 2015-09-07 14:35:26 +02:00
Pål Hagen
7d73d9fcf1 (#421) Showing linked views first in the tree view, if any 2015-09-07 14:01:26 +02:00
Magne Sjaastad
7d69c42adb (#418) Created a group around the on/off options in Linked Views 2015-09-07 13:51:51 +02:00
Magne Sjaastad
a884d79aff (#419) Removed the inapplicable views from the view drop down 2015-09-07 13:51:51 +02:00
Magne Sjaastad
64bda31cfb (#416) Improved Linked views
Removed list of available views
Renamed dialog to "Select Master View"
Use case icons for master view and linked views
2015-09-07 13:51:50 +02:00
Pål Hagen
8acab71742 (#422) Moved well log plots before scripts and after wells in the tree view 2015-09-07 13:07:10 +02:00
Pål Hagen
27f8f34538 (#396) Create main plot collection and well log plot collection if needed
Reading old project files may give projects without main plot collection
and well plot collection. Those are now created in the command feature
for adding a new well log plot, if needed.
2015-09-07 10:44:48 +02:00
Pål Hagen
469bcb63d9 (#411) Setting well log plot title in the viewer's window title bar 2015-09-04 17:01:33 +02:00
Pål Hagen
15d34498e3 (#411) Added description/name field to well log plot
Setting default name when adding through command feature.
2015-09-04 16:45:09 +02:00
Pål Hagen
752c4071b9 (#412) Improved scroll wheel zooming (zoom around mouse Y position)
Moved scroll wheel handling to well log trace plot viewer, using event
filter for the plot canvas to get the mouse Y position, which is
transformed to the corresponding plot depth value and used as center for
zooming.
2015-09-04 15:57:34 +02:00
Jacob Støren
8d57bbe77b (#399) WIP: First commit of experimental geomech WellLog extractor
Not yet enabled in any way
2015-09-04 15:35:20 +02:00
Pål Hagen
a1d95f2b8a (#396) Reset the zoom to show the entire depth range only when the first curve is added
Additional additions or changed parameters (by the user) will not change
the visible depth settings. Did some code cleanup.
2015-09-04 14:14:56 +02:00
Pål Hagen
94095a16f0 (#396) Set visible depth range from all available data when there's only 1 trace with 1 curve 2015-09-04 12:21:41 +02:00
Pål Hagen
dfdfdc3efc (#396) Use 0-1000 as default depth range when there's no data yet 2015-09-04 11:53:23 +02:00
Magne Sjaastad
06ab096e72 (#414) Fixed update of frame index in linked view 2015-09-04 11:42:45 +02:00
Magne Sjaastad
c86dc45fd6 Delete linked views when project is closed 2015-09-04 11:22:44 +02:00
Magne Sjaastad
8a954acca1 (#413) Update camera with global coordinates if model bounding box overlap or are close
If the bounding boxes are located far from each other, use the camera
vectors directly without using displayModelOffset() This will ensure
that models will be visible even if they are located far away when views
are linked.
2015-09-04 10:47:17 +02:00
Jacob Støren
8547370b4d Removed children of curve that should not be visible in the tree. 2015-09-03 20:54:15 +02:00
Jacob Støren
1e6baed1dc Placed WellLogExtractors in the RimWellLogPlotCollection and cached them 2015-09-03 20:13:08 +02:00
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
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
Pål Hagen
c5606a46aa (#339) Added "New Grid Case Group" to the context menu of "Grid Models" 2015-08-20 14:20:13 +02:00
Pål Hagen
fb6baee197 (#339) Added RicCreateGridCaseGroupFeature 2015-08-20 14:11:21 +02:00
Pål Hagen
6e48e036c1 (#339) Added RicImportEclipseCaseFeature 2015-08-20 13:54:20 +02:00
Pål Hagen
cd1e04d6e8 (#339) Added RicImportEclipseCaseFeature 2015-08-20 13:44:45 +02:00
Pål Hagen
4d1f98c138 (#339) Added RicAddScriptPathFeature and RicDeleteScriptPathFeature
Did some additional refactoring - added code common to script related
features to RicScriptFeatureImpl.
2015-08-20 11:59:07 +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
Pål Hagen
ac529b77da (#339) Added RicNewScriptFeature 2015-08-20 10:32:03 +02:00
Jacob Støren
c1b971e4d4 Added OBSOLETE to the old toggle commands 2015-08-20 08:03:32 +02:00
Pål Hagen
a01618cc8e (#339) Added RicEditScriptFeature 2015-08-19 18:17:45 +02:00
Pål Hagen
28e7c8b19c (#339) Refactored execution of scripts for selected cases
Moved slotExecuteScriptForSelectedCases() from RiuMainWindow to
RicExecuteScriptForCasesFeature.
2015-08-19 13:23:26 +02:00
Pål Hagen
ea87fc0746 (#339) Added RicExecuteScriptForCasesFeature 2015-08-18 16:36:37 +02:00
Pål Hagen
d466d58164 (#339) Added RicExecuteScriptFeature 2015-08-18 15:07:00 +02:00
Pål Hagen
c52c029045 (#339) Using generic deletion feature to delete views
Note: Old version used to say "Delete" in the context menu, now it says
"Delete object".
2015-08-18 14:10:34 +02:00
Pål Hagen
9c4766a262 (#339) Added RicCloseCaseFeature 2015-08-18 13:41:53 +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
eadf1ca300 (#361) Refactored "On" as a start on the toggle commands 2015-08-18 10:52:18 +02:00
Pål Hagen
67fedfd699 (#339) Added RicNewViewFeature
TODO: Expand new view in treeview when inserted
2015-08-18 10:36:23 +02:00
Pål Hagen
5b4de5dae1 (#366) Made sure that feature names correspond to the class names 2015-08-17 15:09:01 +02:00
Pål Hagen
03fcd1ad9d Commented out command ids that are not implemented yet 2015-08-17 14:27:21 +02:00
Pål Hagen
b5726e1051 Added comments for obsolete treeview slots (added to new project tree) 2015-08-17 11:45:37 +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
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
6ca74621ef (#378) Refactored Expansion in MainWindow,
Removed some use of the obsolete tree view model
2015-08-14 18:06:22 +02:00
Jacob Storen
f3810640ca Fixed Linux compile issues 2015-08-14 06:42:12 -07: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
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
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
Magne Sjaastad
6a28ea2070 Show only paste command if selection contains multiple objects 2015-08-14 12:08:56 +02:00
Magne Sjaastad
15f3e793f8 Added paste of geo mech views feature 2015-08-14 10:50:08 +02:00
Magne Sjaastad
d466624e45 Added command features for paste of Eclipse view and Eclipse case 2015-08-14 10:17:32 +02:00
Magne Sjaastad
a1ecc50605 Added CopyReferencesToClipboardFeature 2015-08-14 10:17:31 +02:00
Jacob Støren
235e024533 (#354) Called updateConnectedEditors everywhere updateUiSubTree is called 2015-08-13 21:28:09 +02:00
Jacob Støren
369797b3d8 Re-introduced firstAnchestorOfType 2015-08-13 11:38:32 +02:00
Magne Sjaastad
fd5bd534f6 Added dummy static class to fix issue with single macro in cpp
The implementation of this dummy class is put in the file with the
single macro defining the UI editor. This will cause the cpp file to
always be compiled.
2015-08-12 21:51:02 +02:00
Magne Sjaastad
ee78d3c148 Use a string list to represent commands for context menu 2015-08-12 21:19:06 +02:00
Magne Sjaastad
bf5dae4887 Renamed files 2015-08-12 21:09:03 +02:00
Magne Sjaastad
9bee1b81fc Added commands for well path features 2015-08-12 20:59:38 +02:00
Magne Sjaastad
9f16c859c6 Added command feature for SSIHUB import 2015-08-12 20:12:50 +02:00
Magne Sjaastad
8f051e6a72 Added UI editor handle to update 3D view 2015-08-12 11:30:27 +02:00
Magne Sjaastad
bcf1109412 Use general delete on property filters, and deleted obsolete files 2015-08-12 11:10:20 +02:00
Magne Sjaastad
f9df484974 Added a property filter UI editor handle
A UI editor handle is attache to the "propertyFilters" field used to
update 3D view and other UI editors
2015-08-12 11:10:20 +02:00
Magne Sjaastad
fb5fb51fc1 Added initAfterRead() 2015-08-12 11:10:19 +02:00
Magne Sjaastad
eefa1c0ca8 Simplified property filters and removed m_parentContainer 2015-08-12 11:10:19 +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
Magne Sjaastad
232d44b58c Added general delete feature and use from cell range filter 2015-08-11 20:59:05 +02:00
Magne Sjaastad
250a2f6a93 Find parent container instead of having a member pointer 2015-08-11 20:58:10 +02:00
Magne Sjaastad
005114cc3e Fixed several todo for RimEclipseStatisticsCaseCollection::parentCaseGroup(), removed comments 2015-08-11 18:42:44 +02:00
Pål Hagen
b18cd87727 Renamed command 2015-08-11 15:38:20 +02:00
Pål Hagen
b0aac08827 Removed unused action 2015-08-11 15:35:53 +02:00
Pål Hagen
45ec9543c7 Added "new" and "insert" commands for geomech property filters 2015-08-11 15:33:17 +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
Magne Sjaastad
421c2e3685 Added guarding of missing legendConfig 2015-08-11 11:15:31 +02:00
Pål Hagen
198da4d553 Using variable for first selected UI item 2015-08-11 10:55:53 +02:00
Magne Sjaastad
5610bf5a10 Fixed visibility and rebuild of child items for filters 2015-08-10 23:23:41 +02:00
Magne Sjaastad
56907a5c6e Fixed typo 2015-08-10 21:59:07 +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
Pål Hagen
9ab60b1477 Added command features for "insert" and "delete" for property filters
Made sure that only "new" is available for property filter collections,
while "insert" and "delete" are available for property filters in the
tree view. TODO: Implement execution for insert and delete
2015-08-10 13:35:57 +02:00
Magne Sjaastad
8fe6831355 Fixed visibility of even more items in tree view 2015-08-10 08:00:16 +02:00
Magne Sjaastad
65d372dd70 Fixed visibility of more items in tree view 2015-08-09 14:12:09 +02:00
Magne Sjaastad
111509e52a Set uiHidden states in order to make the new tree view identical to previous 2015-08-09 11:16:52 +02:00
Pål Hagen
cf1cda6fb0 Added some new command features for the treeview context menu (WIP) 2015-08-07 15:08:17 +02:00
Magne Sjaastad
322866b929 Removed comment 2015-08-07 12:41:18 +02:00
Magne Sjaastad
767defd90f Set pointer to NULL before insterting into ChildArray 2015-08-07 12:40:47 +02:00
Jacob Støren
78323e2299 Fixed crash due to missing LegendConfig 2015-08-07 11:09:05 +02:00
Pål Hagen
566f2c4cd7 Added some commands for eclipse views (WIP) 2015-08-06 16:24:33 +02:00
Magne Sjaastad
d041f27416 Added uiTreeViewOrdering to RimProject 2015-08-06 16:05:32 +02:00
Pål Hagen
a9e7a8f461 WIP - command for adding property filters 2015-08-06 14:54:18 +02:00
Pål Hagen
ad800bc594 WIP - commands for adding range filters
TODO: Implement actions when commands are triggered, and update project
treeview
2015-08-06 14:01:23 +02:00
Magne Sjaastad
f748b68e0c Prototyped commands for new treeview 2015-08-06 11:00:21 +02:00
Magne Sjaastad
f8871e9808 Use PtrField as placeholder for current legend config
Set previous current legend to obsolete
When reading a file < 1.3.7.-dev, copy current legend config into legend
list
2015-08-06 08:08:16 +02:00
Magne Sjaastad
cb6564e381 Removed unused function setPosition. Access legendConfig as pointer instead of field 2015-08-06 08:08:16 +02:00
Pål Hagen
f45c50fb43 Bugfix - getting correct pointer for parent case group
Getting the parent field's owner object instead of the owner of this.
Removed some out-commented TODO code/comments.
2015-08-05 14:55:16 +02:00
Magne Sjaastad
90762d0f0f Use uiCapability/xmlCapability instead of capability<caf::PdmUiFieldHandle>()(capability<caf::PdmXmlFieldHandle>() 2015-08-05 13:27:36 +02:00