Commit Graph
100 Commits
Author SHA1 Message Date
Jacob Støren e5cf69a3fe #815 More Rename CrossSection -> Intersection 2016-09-21 10:40:08 +02:00
Jacob Støren 16ab7fcb72 #815 More renaming CrossSection -> Intersection 2016-09-21 10:36:11 +02:00
Jacob Støren 0083fb068f #815 More renaming CrossSection -> Intersection 2016-09-21 10:32:29 +02:00
Jacob Støren 1c612030ef #815 Renamed CrossSection -> Intersection 2016-09-21 10:15:38 +02:00
Jacob Støren 0dfb68babf #838 Turned "Undefined Grid Faults With Inactive" off by default 2016-09-16 12:04:20 +02:00
Jacob Støren 4d005bdfc8 #836 Fixed missing data load when toggling on a curve
This bug would also cause wrong data to be displayed, if a curve had been toggled off, then changed, and toggled on again.
2016-09-15 08:19:37 +02:00
Jacob Støren 5e9308f7b3 #821 Implemented a method to do resampling of the well log data. Untested. 2016-09-14 16:33:07 +02:00
Jacob Støren cdfec7a04f #876 Avoid empty lines in LAS export file 2016-09-13 11:47:42 +02:00
Jacob Støren ba0a3b53f5 #820 Use TVDMSL as channel name for TVD 2016-09-13 11:19:27 +02:00
Jacob Støren 9041e4a582 #836 Fixed missing/wrong zoom update for well log plots when opening project.
Refactored the zoom update method names
2016-09-13 09:59:34 +02:00
Jacob Støren 2ea167337f #820 Export of TVD along with MD to LAS file
Now the tvd data is always put into the RigWellLogCurveData
Existing tvd data is written to LAS file.
2016-09-12 16:43:31 +02:00
Jacob Støren 382bf84036 #875 Fixed wrong number of digits after punctation for numbers < 1000 2016-09-12 15:57:55 +02:00
Jacob Støren a4fb6a37ae #829 Improved category colors slightly 2016-09-12 14:29:00 +02:00
Jacob Støren e2d200de88 #829 Fixed crash due to color interpolation assert 2016-09-12 14:04:53 +02:00
Jacob Støren 0b4a0fef4c #852 Set default summary curve line thickness to 2 2016-09-12 13:15:39 +02:00
Jacob Støren 88af194702 #829 Update display and pick information when reloading / selecting a formation names file 2016-09-12 13:15:39 +02:00
Jacob Støren 25d5a500f0 #829 improved category palette 2016-09-09 14:59:20 +02:00
Jacob Støren 8486889b39 Linux compile fix 2016-09-09 12:31:01 +02:00
Jacob Støren 38c0b29b84 #829 Ordered the legend for formation names in the natural top to bottom order 2016-09-09 12:11:00 +02:00
Jacob Støren 39d82a28f4 #829 Use interpolated colors in category legend by default 2016-09-09 11:17:08 +02:00
Jacob Støren ed93db724a #829 Fixed strange category colors in odb intersections 2016-09-09 09:59:35 +02:00
Jacob Støren c360040213 #829 Added a comment on link to color info 2016-09-09 09:59:35 +02:00
Jacob Støren f057f684b1 #829 Sorted category colors by hue 2016-09-08 08:19:26 +02:00
Jacob Støren 78b29fc3a0 Fixed zoom all bounding box issue related to 1209c908e5
Used explicit mainRendering instead of renderSequence->firstRendering()
2016-09-07 15:54:12 +02:00
Jacob Støren 1209c908e5 Fixed clip plane related assert on linux. Hopefully the final fix of trouble related to : ca6e650a72 and 80985785 and 0128baddff
The fundamental problem was that the quad rendering was included in the boundingbox.
2016-09-07 12:52:40 +02:00
Jacob Støren 8c67ee0a0d Upped to 1.6.3-dev concluding Sprint 1 of Geom Well Related 2016-09-06 15:54:37 +02:00
Jacob Støren fcace2a92b Merge Formation Names coloring work and FlowDiagnostics integration 2016-09-06 14:17:50 +02:00
Jacob Støren e4e3c37f89 #811 Setting default legend type for category results 2016-09-06 14:03:02 +02:00
Jacob Støren 3e8873c870 #812 and related to #272 Formation and Category for Cell edge 2016-09-06 12:17:02 +02:00
Jacob Støren c903e87dfd #811, #812 WIP, Formation names coloring of cells. First shot. Works but needs refinment. 2016-09-06 10:27:30 +02:00
Jacob Støren ca6e650a72 #279 Fixed paralell projection nearplane bug introduced by 8098578545 2016-09-05 11:53:56 +02:00
Jacob Støren f3e4a6edea #819 Added reload formation names command 2016-08-26 16:12:55 +02:00
Jacob Støren f03e6de1f2 #810, #813, #808 Display formation name when picking 2016-08-24 15:19:39 +02:00
Jacob Støren 1a3d8a13af Made uiCapability and xmlCapability const 2016-08-24 15:16:34 +02:00
Jacob Støren b46c6ebcf8 #809 Created Formation Names project items.
#819 Added delete command to Formation names
#808 Added an import Formation Names command
2016-08-24 08:30:12 +02:00
Jacob Støren 5260a3f870 #478 Allowed static results (INIT-file) to not have values for LGRs 2016-08-22 17:00:57 +02:00
Jacob Støren b305202a35 #478 Made access function const in ActiveCellInfo 2016-08-22 16:59:22 +02:00
Jacob Støren cf93a67b5e #273 Undefined grid faults between cells where one or both are inactive is now sorted into a seaparate predefined fault section. 2016-08-22 13:24:46 +02:00
Jacob Støren 37099929d6 #273 Added some comments 2016-08-22 10:48:40 +02:00
Jacob Støren 5d0c0cdc67 Fixed assert due to two fields in uiordering in GeoMechPropertyFilter 2016-08-22 10:39:44 +02:00
Jacob Støren c1f5ec5bdf #168 Finalized. Zoom along ray is now updated to cope with parallel projection. The code in the different navigations are cleaned up a bit, and alligned 2016-08-17 10:54:15 +02:00
Jacob Støren 0f3fe3ac1b Linux compile warning 2016-08-17 08:52:22 +02:00
Jacob Støren fbcf9fca11 #168 Merged in parallel projection 2016-08-16 23:20:33 +02:00
Jacob Støren 27830dcbeb #168 Added Perspective/parallel view tool button 2016-08-16 22:43:22 +02:00
Jacob Støren 4eddcc859a #168 Save and restore of parallel projection 2016-08-16 14:34:37 +02:00
Jacob Støren d13d0775b4 #168 Fixed zoom along ray problem making the camera end up with the scene behind it. 2016-08-16 13:41:10 +02:00
Jacob Støren 0eace5579a #168 Fixed shader based light in parallel projection
Added the light position as a uniform in the standard light model shader snippet in the effect generator.
Set the uniform default value on the shader program where ever it is used.
Added an override global uniform set on the viewer to control the light position, and to set it far behind camera when in parallel projection.
2016-08-16 10:58:07 +02:00
Jacob Støren a3499152a5 #168 Improved the front and back clipping plane calculation in relation to parallel projection.
Added a margin of 20% to account for inaccuracies. Not new for far-plane, but became missing in the first commit regarding parallel projection.
2016-08-15 16:11:38 +02:00
Jacob Støren c529e18351 #168 Switch to directional Fixed Function light when in parallel mode 2016-08-15 14:27:46 +02:00
Jacob Støren 853e92723b #168 Added hacklish control over Fixed Function default light. 2016-08-15 14:26:44 +02:00
Jacob Støren 20e7e9ec6e Removed compiler warning 2016-08-15 14:25:12 +02:00
Jacob Støren 79a025e06f #168 Zoom All improved to handle parallel projection 2016-08-15 08:57:22 +02:00
Jacob Støren 742ee46f78 #168 Grid box side visibility now handles parallel projection 2016-08-15 08:57:20 +02:00
Jacob Støren 5cdf307d4e WIP: Improved support for parallel projection. #168
Near plane negative to show everything
ZoomAlongRay now works for parallel projection (only implemented in
ceetron Plus)
2016-08-15 08:55:28 +02:00
Jacob Støren 23bfb46c4c #780 Made Gui and a crude auto assignment of appearance.
Renamed
2016-08-09 11:35:48 +02:00
Jacob Støren 43a1f4dbbe Linux compile fixes 2016-08-09 07:41:08 +02:00
Jacob Støren 1e9e6d8541 #780 Cleanup and alignment 2016-08-08 15:33:20 +02:00
Jacob Støren 10d5da6ef5 #780 A major step towards a flexible assignment of curve appearance based on the properties of the curve data 2016-08-08 15:16:08 +02:00
Jacob Støren 9746bf7ccb Fixed linux compile error 2016-08-05 12:36:49 +02:00
Jacob Støren ff6b198966 #775 Short name for summary cases refurbished 2016-08-05 11:05:58 +02:00
Jacob Støren 0d7a1e8bd7 #770 Fixed Ailien curves bug 2016-08-04 11:23:26 +02:00
Jacob Støren 71dce565c5 #803 Added version number to dock/toolbar layout registry settings 2016-08-03 14:05:55 +02:00
Jacob Støren 3bcb7b9f1b #802 Better default dock and toolbar layout.
Window managment toolbar moved.
Created a Draw Style toolbar
2016-08-03 13:29:46 +02:00
Jacob Støren 12e9768939 Fixed a crash if the summary header file is not available 2016-08-03 10:43:45 +02:00
Jacob Støren 7c0f81d050 Added more summary curve related context commands, and added some separators. 2016-08-03 10:37:26 +02:00
Jacob Støren 27f6b980fe #778 Display unit on Y-Axis. Added unit to legend. Cosmetics on Curve Filter Prop-panel 2016-06-22 14:34:56 +02:00
Jacob Støren 6aa5ba9e2d Linux include compile fixes 2016-06-22 12:38:29 +02:00
Jacob Støren eec539b793 #786 Picking curves selects the curve 2016-06-22 11:34:26 +02:00
Jacob Støren 58391efef1 Whitespace 2016-06-22 11:28:19 +02:00
Jacob Støren 28fc415231 Summary Filter: Renamed Any to All (Advanced) 2016-06-22 10:58:29 +02:00
Jacob Støren bb4e2c7f45 #785 Symbol skip distance implemented 2016-06-22 10:42:45 +02:00
Jacob Støren 12e1e47bf1 Summary curves: Turned on anti-aliasing, Showing complete curve appearance in legend. Added Symbol skipping as feature. 2016-06-22 10:38:04 +02:00
Jacob Støren d4bb4011bd Upped version to 1.6.2-dev after sprint 2 (and some) 2016-06-21 19:37:20 +02:00
Jacob Støren 268d8dda68 #780 A prototype of linetype pr case color pr var mode 2016-06-21 17:29:23 +02:00
Jacob Støren f581c172f6 #783 Summary: Make legend show all aspects of the curve 2016-06-21 16:49:07 +02:00
Jacob Støren 5c09935ac5 #782 Avoid creating curves for none existing data. 2016-06-21 15:56:09 +02:00
Jacob Støren 833de65df6 #781 Icons for Summary plot items 2016-06-21 14:17:50 +02:00
Jacob Støren c510a57566 #771 Changed names in the Plot Curve Curve Filter proximity 2016-06-20 17:55:11 +02:00
Jacob Støren 53e5562738 #764 Disable xml IO of selected cases. We rely on the curves. 2016-06-20 16:54:20 +02:00
Jacob Støren 80cdb9dbaf Caf: Adjusted output of references from PtrArrayField 2016-06-20 16:51:36 +02:00
Jacob Støren eaf6bb6768 Caf: Improved reference parsing by using regexp for splitting an any whitespace 2016-06-20 16:50:47 +02:00
Jacob Støren 26191fd54d #764 Re-apply multi-case selection on project load 2016-06-20 12:12:00 +02:00
Jacob Støren 4a19589d36 Caf: Linux compile fixes: Missing includes 2016-06-20 00:04:09 +02:00
Jacob Støren b0e8800bb8 #764 Removed "None" option from summary case list in Curve Filter
Made case field none-auto-add-option
2016-06-19 21:52:42 +02:00
Jacob Støren f60a0619e7 #764 Summary: Added multi select of summary cases 2016-06-19 21:36:44 +02:00
Jacob Støren 327e8cf64b Caf: Added PdmPtrArrayField to be used in ResInsight as multi select of summary cases 2016-06-19 21:36:44 +02:00
Jacob Støren 0b7abb0cab Caf: Added specialization for PdmPointer<T>.
Preparations for PtrArrayField. Made isEqual use QVariant::value<T>()
2016-06-19 21:36:44 +02:00
Jacob Støren f2da9bfea1 Caf: Small Adjustments 2016-06-19 21:36:44 +02:00
Jacob Støren 9f54d74c7f Summary: Whitespace, rename method and hide unused variables display field 2016-06-19 21:36:44 +02:00
Jacob Støren 8f12eb9a19 #768, #767, #766 2016-06-17 13:07:26 +02:00
Jacob Støren 7378472ac9 #756 Syncronize from curves to gui selection. Removed "None" option 2016-06-16 16:55:02 +02:00
Jacob Støren cf287160df #756 Curve creation and syncronization with filter and selection. 2016-06-16 16:55:02 +02:00
Jacob Støren 45cf15a941 Caf: PtrFields must not return any childObjects. Fixed Legend definition Object below EclipseCellColor as a consequence. Discovered due to Summary Plot case pointer 2016-06-16 16:55:02 +02:00
Jacob Støren 6f7432c0e7 #756 Cleaned up after refactoring. 2016-06-16 16:55:02 +02:00
Jacob Støren 214f013499 Caf: Fixed issues regarding custom type in fields with multi selection 2016-06-16 16:55:02 +02:00
Jacob Støren ce2112fbc6 #756 Refactoring the filter data into a separate object as a PdmChild 2016-06-16 16:55:02 +02:00
Jacob Støren e1fa9aa9f3 Caf: Corrected the spesialization of field of vector and list equality compare, which is supposed to be pr. element 2016-06-16 16:55:02 +02:00
Jacob Støren 8d15fa1b84 #756 WIP: Curve Filter beeing created 2016-06-16 16:55:02 +02:00
Jacob Støren a37449d99d Used the new Ert support to retreive the summary lgr names and ijk values 2016-06-16 16:55:02 +02:00
Jacob Støren cb81fc1aaa #756 Startingpoint for Curve Filter in place, with command to create 2016-06-16 16:55:02 +02:00