Commit Graph
94 Commits
Author SHA1 Message Date
sigurdp 260ff04b19 Added grouping of small contributions to well distribution plot 2019-12-19 11:09:01 +01:00
sigurdp bf61c76e51 Filter out TOF values greater than 73000 and remove wells with zero aggregated volume 2019-12-19 11:09:01 +01:00
sigurdp 3f36826662 First working version of well distribution plots 2019-12-19 11:09:01 +01:00
sigurdp 4ce07ebb23 Added constructor parameter to RimMultiPlotWindow for hiding contained plots in tree view 2019-12-19 11:09:01 +01:00
sigurdp 3b1b7aafbb Added PhaseType app enum 2019-12-19 11:09:01 +01:00
sigurdp 92bb34197e First cut implementation, very much still a work in progress 2019-12-19 11:09:01 +01:00
sigurdp 349886d73e Skeleton for well distribution plot 2019-12-19 11:09:01 +01:00
sigurdp ccff90b1d5 #3948 HoloLens : Support for export of text labels. Also added more detailed debug information. 2019-01-17 10:06:35 +01:00
sigurdp f2668eae4e HoloLens: Export of cull face mode to JSON 2019-01-15 15:14:06 +01:00
sigurdp 7588c0d2ae HoloLens: Reversed logic for determining face culling mode when exporting meshes 2019-01-15 15:14:06 +01:00
sigurdp 469437f320 HoloLens: RicHoloLensRestClient now has an explicit setter for disabling SSL certificate verification. Removed separate flag for controlling whether debug export to file will be done. Now does the export whenever a folder is specified. 2019-01-15 13:23:31 +01:00
sigurdp db9b225112 VizFwk compiler fixes for VS2010 2019-01-15 11:45:46 +01:00
sigurdp 928a0628cd HoloLens: First cut, optimization of array data communication to sharing server. ResInsight will try and detect changes in its internal arrays, and will only announce changed arrays to the server (through meta data.) Previously, ResInsight would send all array data to the server unconditionally. Now the set of arrays/packets to send is controlled by the sharing server through its response to a post of new meta data. 2018-12-19 12:32:18 +01:00
sigurdp f8a0a0e8bb Reference correct local variable when calling deleteLater() 2018-12-19 12:32:18 +01:00
sigurdp 0e910e7391 HoloLens: Added support for session pin code and bearer authentication. Improved session management and error handling. Added some dignostic timings for sending of array data. 2018-12-18 22:08:57 +01:00
sigurdp 8ca73960f4 #3561 HoloLens: Establish sharing server session and publish visualization data to sharing server 2018-10-25 15:34:48 +02:00
sigurdp 22abc52e7a HoloLens: Fixed erroneous size of array payload for the binary packets. Memory for the actual array data ended up being twice as large as needed. Also fixed incorrect array size for texture coordinates. 2018-10-15 23:19:40 +02:00
sigurdp 54cb35232a #3345 HoloLens: First cut textures, primitive widning and preparations for line primitives 2018-09-20 18:28:38 +02:00
sigurdp 6896367551 Revert "#3345 HoloLens: Added missing member implementation"
This reverts commit 59e8279129.
2018-09-20 18:14:49 +02:00
sigurdp 59e8279129 #3345 HoloLens: Added missing member implementation 2018-09-20 16:53:10 +02:00
sigurdp b6ebdd5a5f #3345 HoloLens: Opacity, refactor and preparations for export of results 2018-09-19 20:02:14 +02:00
sigurdp 7a17bc3cff #3345 HoloLens: Added missing member func implementation. Changed default opacity value 2018-09-19 19:50:03 +02:00
sigurdp c1c87a0370 #3345 HoloLens: Refactor and initial format support for textures/texture coordinates 2018-09-19 12:42:41 +02:00
sigurdp a76d45fa70 #3345 HoloLens: added Uint8 element type to VdeArrayDataPacket 2018-09-19 09:58:24 +02:00
sigurdp 1e320eeae7 #3345 HoloLens: Tweaks to array package format 2018-09-19 09:04:09 +02:00
sigurdp eea5efeffd #3345 HoloLens: Refactor and extensions to VdeArrayDataPacket 2018-09-18 23:32:20 +02:00
sigurdp 7fb25bdbc2 #3345 HoloLens: Experimental reversal of winding 2018-09-18 17:33:32 +02:00
sigurdp 5e9f1b743b #3345 HoloLens: Account for scaling stored in part's transformation 2018-09-18 16:23:58 +02:00
sigurdp f1f234a04a #3345 HoloLens: Started work on exporting HoloLens visualization data from ResInsight 2018-09-18 15:58:54 +02:00
sigurdp 43ac06ca98 #3344 HoloLens export: Allow for more human-readable JSON text output 2018-09-18 15:44:59 +02:00
sigurdp 434d03b9d7 #2318 Added workaround that guards initialization of relative permeability evaluation library since opening of special EGRID file causes exception in library and crash 2018-01-05 11:00:40 +01:00
sigurdp 226b43611e Incremented version to 2-dev.16 2018-01-03 15:30:47 +01:00
sigurdp 9b38e9f9c2 #1880: Fixed visualization so that completions and well paths are visible through transparent cells 2018-01-03 14:27:17 +01:00
sigurdp 5af63f7abd #2295 Guard against null pointer when setting fracture template 2018-01-03 11:50:34 +01:00
sigurdp f940d0a3d5 #1753 Fracture: Reworked visualization of StimPlan fractures to limit surface tesselation to area with actual values instead of relying on transparency. Done to allow picking on items behind the fracture. Refactored and removed obsolete code related to StimPlan fracture visualization. 2018-01-03 11:13:15 +01:00
sigurdp dbd1265f31 #1873: Changed naming scheme when exporting laterals. Make sure fishbone name is exported and be more explicit in the enumeration of the subs and laterals.
Refactored RimFishbonesMultipleSubs so that it is clear that the fishbone instances only have auto generated names based on their current index.
2017-12-19 11:06:28 +01:00
sigurdp 8c8970cec0 Made PdmChildArrayField::index() const, #1873 2017-12-19 11:02:27 +01:00
sigurdp f74dc80838 #1870 For fishbones, clamp values so that start MD and end MD always consitutes a valid range where start MD <= end MD 2017-12-19 09:34:23 +01:00
sigurdp 96b5a02872 #1861 Set default build-angle to 1.83 deg/ft for models with FIELD units 2017-12-15 13:30:13 +01:00
sigurdp 127f5b40b4 PVT Plot: Added header in PVT plot panel containing cell info 2017-12-14 13:56:08 +01:00
sigurdp 8fdb5cd7ba #2256 PVT Plot: Added text label showing the values for the cell value marker 2017-12-14 12:57:11 +01:00
sigurdp 537393311e #2258 Pvt Plot: For the oil phase, connect first point of each curve with a line as a visual aid. 2017-12-14 11:29:23 +01:00
sigurdp 99378cc23a #2194 RelPerm Plot: Added context menu to show ascii text version of current plot data. Refactor of existing RicTextWidget into RiuTextDialog. 2017-12-13 19:03:30 +01:00
sigurdp 9979f49a7f #2257 Reduced font size of plot title for RelPerm and Pvt plots 2017-12-13 15:19:34 +01:00
sigurdp 92d8856647 Fixes for GCC compile 2017-12-13 15:06:49 +01:00
sigurdp f716dacb24 Pvt Plot: Display Rs/Rv values of curve's sample points in tool tip, #2255 2017-12-13 14:56:10 +01:00
sigurdp 64fe9e9a3b Upgraded opm-flowdiagnostics-applications to d76ec747cf22aa4d235f6a6c83c3a814adcf5cb2 2017-12-13 10:06:39 +01:00
sigurdp 01ae19ebbc #2235 RelPerm/PVT Plot: Added unit labels to relevant axes 2017-12-11 16:12:31 +01:00
sigurdp 07b1bbca4b RelPerm Plot: Try and enable handling of invalid scaled saturation end-points by ignoring these, but currently does not seem to give the expected results. 2017-12-11 13:07:35 +01:00
sigurdp 56febb9e92 #2192 RelPerm Plot: Utilize new functionality in opm-flowdiagnostics-applications to show the pressure in case-units 2017-12-11 13:07:35 +01:00
sigurdp 09c09a7386 Upgraded opm-flowdiagnostics-applications to a773bcfc963705679ecc28f58048fc38936fbbc6 2017-12-11 11:15:09 +01:00
sigurdp 8a35a53935 #1827 Manually produce context menu for message window in order to avoid Qt's default entries regarding input methods. 2017-12-06 12:30:37 +01:00
sigurdp a285ae8f61 PVT Plot: Added guarding to prevent access visolations when querying dynamic properties for PVT plots in cases where initialization of PVT curve collection fails. 2017-12-05 16:16:58 +01:00
sigurdp e12a931940 Added calculation of PVT related dynamic properties and display of these in the PVT FVF and Viscosity plots as a point marker. Started using flow diagnostics library's output unit conversion for PVT curves to align output units with the case units. #1990 2017-12-05 14:18:46 +01:00
sigurdp ea6ae75033 RelPerm plot: Added option to show left Kr axis using logarithmic scale. #2193 2017-12-05 10:44:36 +01:00
sigurdp 0af37f3613 Changed name of flag and semantics from removeNegativeValues to includePositiveValuesOnly so that only positive values (zero not included) are included. Makes functions more suitable for usage with plots using logarithmic scale. #2193 2017-12-05 10:44:36 +01:00
sigurdp 9e3868d6d8 First attempt at using unit conversion when getting PVT curve data (commented out due to crash) 2017-12-05 10:43:44 +01:00
sigurdp 636b68cf52 RelPerm Plot: Show SATNUM in plot title, #2189 2017-11-30 11:28:08 +01:00
sigurdp e3a794d898 RelPerm Plot: Adjusted curve colors and added symbols to all curves, #2191, #2190 2017-11-30 11:28:08 +01:00
sigurdp 85832ae0bc PVT Plot: Added warning message if PVT plotting could not be initialized 2017-11-30 11:28:07 +01:00
sigurdp 8fd48b9f0e Added include of cmath 2017-11-30 11:28:07 +01:00
sigurdp 7c9a14f78c Added functionality to update RelPerm and PVT plots when time step changes.
Also added line marker for current cell's pressure in PVT plots.
2017-11-29 14:14:47 +01:00
sigurdp 3b1775ad4d #1994 PVT Plot: Removed water phase from plot, started implementing display of pressure marker, but this is not yet active. 2017-11-28 09:15:11 +01:00
sigurdp aa1bbbe2d9 #1994 First cut implementing PVT plots 2017-11-28 09:15:11 +01:00
sigurdp 61779e5876 Changed margins around plot in RelPerm plot 2017-11-24 09:05:03 +01:00
sigurdp e79816b62e Added missing include for GCC 2017-11-24 08:36:44 +01:00
sigurdp 0872728d17 #2061 Added calculation and display of intersection markers in RelPerm plot to show the selected cell's SWAT SGAS values 2017-11-24 08:36:44 +01:00
sigurdp e83b3a8c02 #2062 Prefix the Saturation title on the x-axis with "Water", "Gas" or "Water/Gas" depending on the curves present in the plot. 2017-11-24 08:36:44 +01:00
sigurdp 65fe3ba902 #2063 Added support for showing RelPerm plot curves without end-point scaling 2017-11-24 08:36:44 +01:00
sigurdp 14c1b5a595 Enabled caclulation and plotting of PCOG and PCOW now that opm-flowdiagnostics-applications have been updated 2017-11-24 08:36:44 +01:00
sigurdp 5f5abdf347 Working on adding SWAT and SGAS markers to RelPerm plot, #2061 2017-11-24 08:36:44 +01:00
sigurdp 44e2d7d403 Workaround for compiler errors in cotire build due to local classes having the same name 2017-10-27 13:50:32 +02:00
sigurdp 8d96e9e35a Renamed RiuEclipseSelectionItem::m_cellIndex to RiuEclipseSelectionItem::m_gridLocalCellIndex 2017-10-16 14:35:43 +02:00
sigurdp 00985b00c3 Testing commit 2017-10-11 13:38:46 +02:00
sigurdp f0c0df2efa Cleaned op help text for command line options.
Also semoved old argument arsing implementation
2013-12-19 10:07:19 +01:00
sigurdp 0100038db0 Experimental support for offsetting NNCs when drawing
Utilize polygon offset in conjunction with disabling of depth writes to
layer drawing of NNs on top of other fault drawing.
2013-12-18 12:13:44 +01:00
sigurdp 28d0fbc476 Added support for multi-level polygon offset
Allow effect generator to tak multiple levels of polygon offsetting.
2013-12-17 13:11:46 +01:00
sigurdp 477792e89d Refactored naming of cvfqt:Utils member functions 2013-12-04 17:04:05 +01:00
sigurdp cc72c7b2f6 Merged down changes from Resinsight dev branch 2013-12-04 16:06:48 +01:00
sigurdp 368af75bf2 Refactored ProgramOptions class 2013-12-04 14:56:04 +01:00
sigurdp 0656b5254f First cut, command line options for batch processing
First cut implementation of command line oprions for batch proccessing.
Added support for the follwoing new command line options:
size, replacecase, replaceSourceCase and multiCaseSnapshots
Reworked the entire command line processing code.
2013-12-04 12:04:42 +01:00
sigurdp 192f4bba59 Added conversion of lists/arrays plus renames
Renamed/deprecated fromQString(), new function is toString()
2013-12-04 11:51:12 +01:00
sigurdp 4db4e44668 Added member ProgramOptions::firstValue() 2013-12-04 11:49:05 +01:00
sigurdp f2821cf9be Added member to recompute all statistics
Added member function
RimAnalysisModels::recomputeStatisticsForAllCaseGroups().
2013-12-02 08:56:42 +01:00
sigurdp 498918e050 Added RimResultCase::setGridFileName() 2013-12-02 08:55:13 +01:00
sigurdp 58412c010c Added cvf::ProgramOptions class to Fwk
Integrated from CS PF as of changelist 235
2013-11-29 13:00:09 +01:00
sigurdp a9140ca894 Merge pull request #124 from OPM/FwkManualUpdate
Update of Framework (CVC)
2013-11-20 02:42:25 -08:00
sigurdp c4c2a83c7b Merge remote-tracking branch 'origin/dev' into FwkManualUpdate 2013-11-20 11:21:40 +01:00
sigurdp df5f1f85af Integrated from CeeSol Perforce, changelist 203
AppFwk tests.
Added rotation to locator.
Caf::FrameAnimationControl : Set current frame to 0 if a framecount
change makes the current frame invalid
2013-11-01 16:54:24 +01:00
sigurdp bbebebadd5 Added complete VizFwk
Added the complete VizFwk from the ResInsight branch in Perforce as of
changelist 190.
2013-11-01 08:49:42 +01:00
sigurdp fbfbdfca84 Integrate Fwk updates from ResInsight/Perforce
Integrated Fwk updates in Resinsight branch up to changelist 173.
Summary of changes:
* Rewrite of cvf::OverlayItem to allow fixed user controlled positioning
of the items.
* Removed pure virtual functions OverlayItem::maximumSize() and
OverlayItem::minimumSize().
* Use caf::AboutDialog instead of modified cvfqt::BasicAboutDialog.
* Removed lapack from link line due to fail on Ubuntu 12.04 when lapack
isn't installed.
* Fix in OpenGLContext::saveOpenGLState() to avoid application
corruption when running on RedHat with VMWare.
* Removed unused font manager.
* Console assert handler only calls __debugbreak() if debugger is
present. Otherwise, calls abort(). Done after trouble running gtest
death tests.
* Made component access functions in Color3f, Color3ub, Color4f,
Color4ub inline.
* Added conversion functions between TextureImage and QImage to
cvfqt::Utils class.
* Optimized TextureImage::setPixel() - relies on new inlined
component-wise access functions for Color4ub.
* Added TextureImage::clear() and non-const version of
TextureImage::ptr().
2013-10-31 14:57:52 +01:00
sigurdp bcc33397a3 Adapted cmake files to new directory structure 2013-09-20 16:21:46 +02:00
sigurdp f64d9b7e64 Moved CAF to Fwk/AppFwk and moved/renamed VisualizationModules to Fwk/VizFwk 2013-09-20 16:01:20 +02:00
sigurdp 7ea10201ec Changed file headers to include LGPL licensing. 2013-09-20 15:22:29 +02:00