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
a1f5d44f56
Moved Link visible views toolbar icon
2015-09-01 17:40:57 +02:00
Magne Sjaastad
7969e22364
( #395 ) Moved managed views from RimView to RimProject
2015-09-01 17:34:03 +02:00
Pål Hagen
b5684b5255
( #396 ) Made sure that the plot canvas is aligned to the scales
2015-09-01 15:48:53 +02:00
Pål Hagen
36c05c2108
( #396 ) Removed Qwt-based panning
2015-09-01 15:00:22 +02:00
Pål Hagen
9b4a74cc33
Linux compilation fix
2015-09-01 14:58:21 +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
7103b196e3
( #406 ) Added label Property Editor
2015-09-01 13:05:21 +02:00
Magne Sjaastad
bd396b7ff4
( #406 ) Changed name of additional property editor and removed margins
2015-09-01 11:49:43 +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
Magne Sjaastad
c269e57d6d
Removed obsolete code
2015-09-01 11:31:31 +02:00
Pål Hagen
eee14d790b
( #396 ) Stopped using Qwt-based magnifier
2015-09-01 11:16:59 +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
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
65f0c5fb42
( #396 ) Showing default legend on top of the plot
2015-08-31 15:23:20 +02:00
Pål Hagen
adba5ba6fc
( #396 ) Added panning of the depth axis (left mouse button + move)
2015-08-31 14:54:48 +02:00
Pål Hagen
f186e07742
( #396 ) Added simple zoom functionality for the depth axis
...
Ctrl + scroll wheel = zoom around center. Consider making a more
specialized zoom functionality for zooming around mouse cursor, and with
synchronization with other trace plots.
2015-08-31 14:47:34 +02:00
Pål Hagen
b3d58ed0a0
( #396 ) Inverted the direction of the depth axis, using top left as origin
2015-08-31 12:45:28 +02:00
Pål Hagen
991f31a44f
( #396 ) Using axes on the top and left side
2015-08-31 12:34:08 +02:00
Pål Hagen
513e9d9075
( #396 ) Added grid to well log trace plot. Using light gray solid lines.
2015-08-31 11:39:59 +02:00
Pål Hagen
5635df8dd4
( #396 ) Got rid of frame around plot canvas
2015-08-31 09:42:29 +02:00
Pål Hagen
65d158a6ad
( #396 ) Using margin size 0 for well log plot's layout
2015-08-31 09:38:44 +02:00
Pål Hagen
6362ffa311
( #396 ) Using white background color in plot widget and plot canvas
2015-08-31 09:34:41 +02:00
Magne Sjaastad
c065b8350c
( #406 ) Created a combined docking widget for additional project trees and property views
2015-08-31 07:53:52 +02:00
Magne Sjaastad
ca06e8a307
( #406 ) Update additional project trees and property editors
2015-08-31 07:53:51 +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
Pål Hagen
4e83cff8a2
Well log plots now contain one plot per trace
2015-08-28 14:25:14 +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
3ef65ab8f9
Added keyboard shortcuts for copy/paste of geo views/ geo cases
2015-08-27 14:06:50 +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
20c1e609b8
Added tile and cascade of MDI windows
2015-08-26 10:46:38 +02:00
Magne Sjaastad
d0ab927161
Disable undo command system
2015-08-25 08:41:26 +02:00
Magne Sjaastad
556e3f375c
Hide undo docking widget
2015-08-24 18:26:12 +02:00
Pål Hagen
0c8600c6dd
( #355 ) Got rid of all RimUiTreeModelPdm includes
2015-08-24 17:42:42 +02:00
Pål Hagen
cdea637af8
( #355 ) Set correct title of the new project tree
2015-08-24 17:39:46 +02:00
Pål Hagen
0bd54ba98a
( #355 ) Removed out-ifdef'ed obsolete code related to the old project tree view
2015-08-24 16:06:20 +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
bef4fe453f
( #364 ) Using actions from command features
...
Removed actions and slots that have already been refactored as command
features. Now picking the corresponding actions from the command feature
manager instead.
2015-08-24 13:38:43 +02:00
Jacob Støren
0fda6ef6fb
( #370 ) Bugfixes regarding using several project trees
...
SelectionManager is now updated whenever focus enters the treeview.
The main project tree now has turned on SelectionManager updates
2015-08-20 14:49:18 +02:00
Jacob Støren
69a46e0b45
( #370 ) Added contaxt menu and key-event handling to extra TreeViews
2015-08-20 14:49:11 +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
Jacob Støren
35a37a5e07
( #370 ) Treeview event filter adjustment for multiple treeviews
...
and Linux compile fix
2015-08-20 11:49:58 +02:00
Jacob Støren
c75d09e3df
( #381 ) Handle key press events in new tree view
2015-08-20 11:16:19 +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
Jacob Støren
f0ee19d8f7
Some renaming and comments
2015-08-20 09:58:27 +02:00
Jacob Støren
f8dce724f6
( #370 ) Wip: NewProjectTreeAndPropertyView command works.
...
Missing context menu
2015-08-20 08:03:38 +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
Jacob Støren
302f46b61b
( #372 ) First step in Reimplemented drag and drop support
2015-08-18 11:23:53 +02:00
Jacob Støren
eadf1ca300
( #361 ) Refactored "On" as a start on the toggle commands
2015-08-18 10:52:18 +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
48cef84069
Added some OBSOLETE comments
2015-08-17 10:01:39 +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
2f49415d3f
( #376 ) Made new treeview follow window selection
2015-08-16 10:06:10 +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
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
85ea085c4e
( #371 ) RiuViewerCommands: Used the new exec commands
2015-08-14 13:27:26 +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
50ea7a0808
Removed header from tree view and added support for ExtendedSelection
2015-08-14 12:08:30 +02:00
Magne Sjaastad
a1ecc50605
Added CopyReferencesToClipboardFeature
2015-08-14 10:17:31 +02:00
Jacob Støren
3e3b1a2480
( #369 ) Refix updating of propertyview on selection of none-object
2015-08-14 08:38:17 +02:00
Jacob Støren
343e4dcc1c
( #369 ) Started to use the new selection method in PdmUiTreeView
2015-08-13 23:47:04 +02:00
Jacob Støren
235e024533
( #354 ) Called updateConnectedEditors everywhere updateUiSubTree is called
2015-08-13 21:28:09 +02:00
Jacob Støren
3d47e5795b
( #368 ) Made current view change when changing the selection in the new tree view
2015-08-13 17:05:41 +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
3c9e1bab5c
Several refactoring of well import wizard
...
Keep original copy of RimWellPathImport object as Xml instead of copy
using PdmObjectGroup
Added destructor for cleanup of wizard pages
Simplified info communication between pages
2015-08-12 18:44:03 +02:00
Magne Sjaastad
005114cc3e
Fixed several todo for RimEclipseStatisticsCaseCollection::parentCaseGroup(), removed comments
2015-08-11 18:42:44 +02:00
Magne Sjaastad
8035b46d29
Expand all items in new treeview
2015-08-07 21:57:27 +02:00
Magne Sjaastad
fb84d7825d
Clear undo stack on project close. Show selected obj in property view
2015-08-07 08:36:53 +02:00
Magne Sjaastad
1f60ef76c9
Added undo view and activated undo framework
2015-08-06 20:39:59 +02:00
Magne Sjaastad
86f062ad7e
Fixed coordinates for menu
2015-08-06 16:05:31 +02:00
Magne Sjaastad
f748b68e0c
Prototyped commands for new treeview
2015-08-06 11:00:21 +02:00
Magne Sjaastad
57e363896f
Replaced uiField() and xmlField() with uiCapability() and xmlCapability()
2015-08-05 12:34:07 +02:00
Magne Sjaastad
a88b3cac83
Added new project tree dock widget
2015-08-04 15:57:58 +02:00
Magne Sjaastad
a225d3abff
Prefix treeview / tree view model to be replaced with OBSOLETE
2015-08-04 15:19:32 +02:00
Magne Sjaastad
690a264c81
Use helper class to read/write using QSettings
2015-08-04 11:47:06 +02:00
Magne Sjaastad
92f0d64eaf
PdmDocument inherits directly from PdmObject and not PdmObjectGroup
2015-08-01 23:04:04 +02:00
Magne Sjaastad
737936d846
Major modularization adjustments
...
Use uiField() when issuing setUi....() commands
Use PdmChildArrayField instead of PdmPointersFielc
Use PdmChildField instead of PdmField to pdm pointer objects
Use PdmChildArrayField instead of PdmField< std::list< caf::PdmPointer<
type > > >
Use PdmObjectHandle instead of PdmObject
Replaced parentFields(std::vector) with parentField()
Use PdmUiPropertyViewDialog instead of PdmUiPropertyDialog
2015-07-31 18:58:23 +02:00
Pål Hagen
81cf711036
( #80 ) Modified GeoQuest navigation
...
Switched the direction of scroll wheel zoom. Left mouse button + drag =
rotation, instead of right mouse button.
2015-07-03 11:03:28 +02:00
Pål Hagen
a9ecbd9899
( #80 ) Fix for CAD navigation mode
...
Made sure that left mouse button + drag is panning. The view is still
picked when clicking the left mouse button, unless there have been mouse
moves/navigations that led to redrawing of the view.
2015-07-02 14:53:37 +02:00
Pål Hagen
22c0c812af
( #80 ) Refactored navigation mode related code
...
Made sure that navigation policies are created only one place, in the
new member function RiuViewer::updateNavigationPolicy().
2015-07-02 14:53:35 +02:00
Pål Hagen
c863d087f0
( #80 ) Added navigation modes
...
New navigation modes: GeoQuest and RMS. In addition, right mouse button
can now be used for panning in CAD navigation mode.
2015-07-02 14:53:34 +02:00
Jacob Støren
1a3a2f1ff5
( #119 ) Improved naming of Property Filters
...
Finalized.
2015-07-02 12:50:38 +02:00
Pål Hagen
02e5ba79cb
( #287 ) Renamed method with name conflicting with virtual method
2015-07-01 10:05:12 +02:00
Pål Hagen
68a7993105
( #342 ) Added "Add property filter" to the 3D view's context menu
2015-06-30 15:37:53 +02:00
Pål Hagen
320b0c62c4
( #260 ) Displaying NNC info and intersection point for picked faults when there's no cell index
2015-06-30 13:25:11 +02:00
Pål Hagen
04d70a9204
( #260 ) Fixed problem with picking faults in some rare cases
...
Made sure that we handle the case when an item has been hit which is not
a non-NNC item.
2015-06-30 12:05:24 +02:00
Pål Hagen
08741150c7
( #287 ) Bugfix - only selected cases are removed from the list
...
Made sure that only selected cases are removed from the list of cases in
the "Create Grid Case Group From Files" dialog when "Remove" is clicked.
2015-06-29 16:14:00 +02:00
Jacob Støren
55c1d5de71
Made help menu entry point directly to documentation, not the home-page
2015-06-29 10:48:10 +02:00
Pål Hagen
7a3d43d29d
Setting specific font size in the overlay items during regression tests
...
Made sure that we always use the same bitmap size for the fonts of the
overlay items when running regression tests, to avoid differences from
reference runs.
2015-06-26 13:47:33 +02:00
Pål Hagen
7315dd5318
Renamed variables according to newly renamed class names
...
"Result slot" -> "Result colors"
2015-06-26 10:00:46 +02:00
Pål Hagen
7917a89c65
Renamed source files according to new class names
2015-06-26 10:00:45 +02:00
Pål Hagen
fd03a02645
Renamed source files according to new class names
2015-06-26 10:00:44 +02:00
Pål Hagen
cd662dc7d1
Renamed source files according to new class names
2015-06-26 10:00:43 +02:00
Pål Hagen
2f34b03135
Renamed source files according to new class names
2015-06-26 10:00:41 +02:00
Pål Hagen
ca7428ca4a
Renamed class RimAnalysisModels to RimEclipseCaseCollection
2015-06-26 10:00:40 +02:00
Pål Hagen
f6ab965ea1
Renamed class RimWellCollection to RimEclipseWellCollection
2015-06-26 10:00:40 +02:00
Pål Hagen
87744fb8c4
Renamed class RimResultSlot to RimEclipseCellColors
2015-06-26 10:00:38 +02:00
Pål Hagen
5eb673410e
Renamed class RimGeoMechResultSlot to RimGeoMechCellColors
2015-06-26 10:00:37 +02:00
Pål Hagen
38b40423d8
Added version info label in the lower right corner
2015-06-24 13:45:39 +02:00
Jacob Støren
0377461da0
#323 , #318 Geomechanical sign on Stress/Strain
...
Now they are presented as S and E, and the native Abaqus values are hidden.
2015-06-19 14:38:31 +02:00
Jacob Støren
cfb0bfeb55
Moved RivCellSetEnum to a separate file.
...
Preparations for property filtering
2015-06-18 14:17:03 +02:00
Stein Dale
0ea699484c
Changed tooltip for toolbar button ( #311 )
...
"Disable Lighting" -> "Disable Results Lighting"
2015-06-18 13:28:27 +02:00
Stein Dale
720de6c30c
"Disable Lighting" toolbar button is always enabled if there's an active view ( #311 )
2015-06-18 13:26:50 +02:00
Stein Dale
3eff3708ed
Added action and toolbar button for "Disable Lighting" ( #311 )
2015-06-18 12:23:28 +02:00
Jacob Støren
3d0e0ace7a
Linux compile fix
2015-06-11 13:15:59 +02:00
Jacob Støren
385fa55cdc
Fixed one linux compile error and cleaned out some compiler warnings
2015-06-11 13:05:59 +02:00
Jacob Støren
4f77afe43c
Implemented #310 Result info when picking
...
This included some refactorization to remove the command stuff out of
RiuViewer,
and to communicate the grid index via the source info struct, and not as
a cvfPart::id
2015-06-11 11:38:51 +02:00
Jacob Storen
dc28fd81b9
Linux compile fixes
2015-06-05 06:47:30 -07:00
Jacob Støren
0130a01ca2
IJK-Slice context menu commands for GeoMech
...
#306
Added picking source data to the viz model
Generalized the picking methods in RiuViewer, but there is more serious
refactoring needed.
2015-06-05 15:17:02 +02:00
Jacob Støren
b74364087a
Refactored IJKslot commands
...
Preparations to create IJK slice commands in 3Dview
2015-06-05 09:58:29 +02:00
Jacob Støren
273e91d38d
Moved the new resultCollection class to new files
...
Also removed obsolete file, and added missing header files to the
CMakeLists file
2015-06-04 16:25:16 +02:00
Jacob Støren
a3fa27d2ec
Created RigFemPartResultsCollection
...
Refactored the results stuff from GeoMechCaseData into the new class
preparing to extend the statistics calculation
2015-06-04 16:25:11 +02:00
Jacob Støren
da5a1d8ff1
Geom Anim: Fixed missing setting of current timestep in anim toolbar
2015-06-03 12:14:42 +02:00
Jacob Støren
6e8692121d
Varible rename
2015-06-03 12:14:38 +02:00
Jacob Støren
96329793f3
Use odb "Steps" as animation steps
...
Issue #293
This is only tested with one step yet.
2015-06-03 12:14:25 +02:00
Jacob Storen
f6e8bb4a1a
Fixes of linux compile errors and warnings
2015-05-27 05:50:12 -07:00
Jacob Støren
2c7a741805
Renamed the files of RimReservoirView to RimEclipseView
2015-05-21 10:34:38 +02:00
Jacob Støren
ed74116376
Rename of RimReservoirView to RimEclipseView
...
To make the separation to geomech clearer, and alligning it to the
RigCaseNaming
2015-05-21 10:05:33 +02:00
Jacob Støren
3c8bac9f2a
Fixed crash in regressiontest of statistics case
...
Destructor chain deleting view fired off getting all cases, which
accessed case during its destruction.
2015-05-18 15:23:51 +02:00
Jacob Støren
969a181897
RimCase reintroduced as baseclass for all cases
...
Refactored to handle cases generically in a lot of places.
Mostly complete regarding all these issues, but not tested yet:
Assigning caseId
Update relative path to the case data
RimProject::createDisplayModelAndRedrawAllViews
RimProject::computeUtmAreaOfInterest
Load case data on project open
save snapshots for all views
RegressionTest viewer size
Finding case based on caseId
Giving case information to octave
2015-05-15 18:51:49 +02:00
Jacob Støren
b111a26f21
Renamed Files: RimCase to RimEclipseCase
2015-05-15 09:16:33 +02:00
Jacob Støren
223f8385d2
Renamed base class RimCase to RimEclipseCase
...
To make room for a RimCase base class that can be used as base class for
RimGeoMechCase as well.
This commit is only the class rename not the file rename.
2015-05-15 08:40:27 +02:00
Jacob Støren
750fc5182c
Refactor : Use allCases method instead of traversing
...
Preparations to allign Geomech and Eclipse cases
2015-05-15 08:18:11 +02:00
Jacob Støren
d6643d9d35
RimView etc: More aligning GeoMech/Eclipse
...
Now Animation drawstyle works fairly well.
2015-05-08 14:13:26 +02:00
Jacob Støren
3dac8807c7
Refactoring more general stuff into RimView
...
updateViewerWidget
scheduleUpdateDisplayModelAndRedraw
2015-04-30 10:34:15 +02:00
Jacob Støren
a7e38bcda1
Now handling compilation both with and without ODB api
2015-04-29 09:26:29 +02:00
Jacob Støren
c0217a68a4
First odb file read and displayed
2015-04-27 14:06:42 +02:00
Jacob Støren
1f2bea106f
Small guard RiuViewer
2015-04-21 08:37:32 +02:00
Jacob Støren
27f6bd9eb5
Start of geomech support
...
Possible GUI-tree layout
2015-04-20 09:02:33 +02:00
Magne Sjaastad
cff0313519
Bugfix: Do not change mesh mode when adding a range filter
2014-10-29 08:13:37 +01:00
Magne Sjaastad
2d36af4f06
Updated file header for new files
2014-09-24 07:14:52 +02:00
Magne Sjaastad
b4df5419b1
Updated file header for modified files
2014-09-23 15:04:57 +02:00
Magne Sjaastad
57ade584b2
Updated about dialog
2014-09-23 14:34:03 +02:00
Jacob Støren
4befec7897
Result Info: Always show the grid cell results
2014-09-09 10:58:41 +02:00
Magne Sjaastad
078ae992bf
Result info : Always show fault result details
2014-09-09 07:26:28 +02:00
Magne Sjaastad
980207f4a7
Rename : Removed s from TRANS to TRAN to be in line with Eclipse naming
2014-09-09 07:12:43 +02:00
Magne Sjaastad
e2a5c449ce
Impoved result info text presentation
...
Display Cell result, Fault result, NNC result, and Cell edge result as a
section with a linefeed above
Always show value for intersection point at top with details below.
2014-09-08 07:35:23 +02:00
Magne Sjaastad
787d44e446
Added class used to build text strings from picked objects in 3D scene
2014-09-05 08:25:38 +02:00
Magne Sjaastad
6857bd3122
Updated link to help web pages
2014-09-03 07:08:44 +02:00
Magne Sjaastad
473a701bf5
Result info : Improved display of text
2014-08-26 13:41:34 +02:00
Magne Sjaastad
07b25a2f60
Added special handling to expand an item in tree view
2014-08-14 10:56:02 +02:00
Magne Sjaastad
73f29bb115
Recent files : Show full path in tooltip
2014-08-14 10:56:02 +02:00
Magne Sjaastad
fe712222ce
Recent files : Set last opened file first, remove file if load fails
2014-08-14 10:56:01 +02:00
Magne Sjaastad
0d14436b97
Fault result: Added fault result legend
2014-08-14 10:55:59 +02:00
Magne Sjaastad
0d6c6f2785
Improved management of multiple legend overlay items
2014-08-14 10:55:57 +02:00
Magne Sjaastad
23d44a0747
Make sure grid view is active after a range filter is added
2014-08-14 10:55:55 +02:00
Magne Sjaastad
9925556579
Added hide fault to context menu in 3D view
2014-08-14 10:55:54 +02:00
Magne Sjaastad
f259f21b32
Renamed file to match class name for RimReservoirCellResultStorage
2014-08-14 10:55:51 +02:00
Magne Sjaastad
d21e532c61
Cleaned up includes for ProjectDataModel
2014-08-14 10:55:49 +02:00
Magne Sjaastad
7db9b83c45
Added recent file list
2014-08-14 10:55:48 +02:00
Jacob Støren
710395bb85
Created StructGrid...ToCellFaceMapper
...
Done to start refactoring to pave way for many new combined result
properties
2014-08-14 10:55:42 +02:00
Magne Sjaastad
e5712e9809
Cleanup after merge
2014-04-22 14:39:09 +02:00
Magne Sjaastad
0fbcc57473
Use caf property dialog and removed obsolete riuPreferencesDialog
2014-04-22 13:16:31 +02:00
Magne Sjaastad
b958d01540
Added missing test for ternary saturation result
2014-04-22 11:22:17 +02:00
Magne Sjaastad
0e92bc5d3f
Added ternary saturation overlay item
2014-04-22 11:22:16 +02:00
Magne Sjaastad
4aeac9197b
Use caf property dialog and removed obsolete riuPreferencesDialog
2014-04-14 09:16:06 +02:00
Magne Sjaastad
ae9f72912e
Added customized mock model to user interface
2014-04-14 09:16:03 +02:00
Magne Sjaastad
3e8a206f13
Moved mock model identicators to RimDefines
2014-04-14 09:06:46 +02:00
Magne Sjaastad
f8254075cd
Result Info: Show fault name only when picking on fault
2014-01-23 08:19:37 +01:00
Magne Sjaastad
209919c651
Toolbar: Added button control for toolbar labels
2014-01-23 07:31:07 +01:00
Magne Sjaastad
49a43a036e
Pick info and result info: Added face type
2014-01-03 14:59:52 +01:00
Magne Sjaastad
9c7c8f1969
NNC: Use smaller depth distance for pick threshold
2013-12-20 14:53:48 +01:00
Magne Sjaastad
e8137ff78a
NNC: Show IJK values in Result Info
2013-12-20 14:29:08 +01:00
Magne Sjaastad
1c80a9dbe8
NNC: Prioritize NNC parts when picking in 3D scene
2013-12-20 10:57:53 +01:00
Magne Sjaastad
75225b7519
NNC: Picking and result mapping
...
Show NNC info in Result Info
Show NNC result mapping for combined transmissibility
2013-12-19 09:24:35 +01:00
Jacob Støren
a20e08237b
Toolbar - Gridlines - Faults only option #74
2013-12-18 23:37:30 +01:00
Jacob Støren
a2dd688df1
Fixed cell coordinate debug output
2013-12-18 15:35:23 +01:00
Magne Sjaastad
0a87811263
Show fault name in ResultInfo when picking
2013-12-10 08:26:49 +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
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
Magne Sjaastad
72b7936247
Updated copyright year and link to online documentation
2013-10-25 10:38:47 +02:00
Magne Sjaastad
3996f6442d
Moved Debug menu to File->Testing
2013-10-24 13:08:19 +02:00
Magne Sjaastad
cd686990f0
Improved context menu for well collection and analysis model
2013-10-24 11:06:26 +02:00
Magne Sjaastad
a74be74792
Open Users Guide url from Help menu
2013-10-24 10:47:02 +02:00
Magne Sjaastad
40092b0d62
SSIHUB: Update file paths for and well path cache
...
Consolidated cache creation in RimTools
2013-10-24 09:50:21 +02:00
Magne Sjaastad
cbe9110c8a
SSIHUB: Fixed memory leak
...
Delete copy of RimWellPathImport object and added destructor to related
objects
2013-10-23 10:42:34 +02:00
Magne Sjaastad
89cd331489
Linux: QVariant has no overload for size_t
2013-10-22 11:28:14 +02:00
Magne Sjaastad
74f6b544ce
Renaming related to import actions
2013-10-18 16:23:31 +02:00
Jacob Støren
5a745b7f3b
Tool button to add well cells to range filter
...
Issue #73
2013-10-18 11:19:49 +02:00
Magne Sjaastad
3f7bdbb5ec
Use filename from file containing the grid as InputCase case description. Fixed Input Case Mock model.
2013-10-08 14:30:42 +02:00
Jacob Støren
4efeba4a51
Socket Interface: Comments and debug message possibilities
2013-10-04 14:36:26 +02:00
Magne Sjaastad
cf439fbf96
RegressionTest: Fixes to regression testing system to make it run
...
correctly on Ubuntu 12.04 - fixed size of grabbed image. Side effect is
that the default window size for ResInsight is increased slightly.
Removed parameter to image comparison tool to allow running regression
tests on RedHat 5
2013-10-04 10:22:17 +02:00
Jacob Støren
5367460462
Process Monitor: Removed border, and switched to courier font.
...
ResultinfoPanel: Removed border
2013-10-03 14:43:03 +02:00
Magne Sjaastad
af232d8c31
Debug: Added paint performance reporting from 'Debug->Paint Event
...
Performance Test'
2013-09-30 07:56:47 +02:00
Magne Sjaastad
b0761d0612
Added dialog for configuration and execution of regression test from
...
Debug->Regression Test Dialog
Generalized read/write of pdm object fields using QSettings
2013-09-27 10:04:10 +02:00
Magne Sjaastad
5e6af679ba
Changed project file extension to RSP
2013-09-25 09:36:01 +02:00
Magne Sjaastad
1543f05794
Use a mutex to make sure all command objects have completed before issuing snapshots in the regression tests.
...
p4#: 22400
2013-09-13 09:23:13 +02:00
Magne Sjaastad
32b148ee0e
Added enabled state and button to be able to execute a command object
...
p4#: 22397
2013-09-13 09:17:57 +02:00
Magne Sjaastad
1c2e2f86c5
Restore window layout when regression tests have completed
...
p4#: 22390
2013-09-12 09:07:29 +02:00
Magne Sjaastad
72d65976d7
Fixed Linux compiler issues
...
p4#: 22388
2013-09-12 08:29:37 +02:00
Magne Sjaastad
c3adfb7cb0
Prototyped command object infrastructure to be used in regression tests of Octave scripts
...
p4#: 22387
2013-09-12 08:11:56 +02:00
Magne Sjaastad
5dbc15998f
Fixed several compiler warning on Linux
...
p4#: 22370
2013-09-10 08:47:28 +02:00
Magne Sjaastad
f9112c458c
Store username/password in session cache
...
Compute UTM region before import wizard is displayed
p4#: 22351
2013-09-08 10:53:25 +02:00
Magne Sjaastad
ca3fee6c34
Removed obsolete prototype code
...
Cleaned up unused functions
p4#: 22338
2013-09-06 15:59:25 +02:00
Magne Sjaastad
86f5e6017d
Integrated well import wizard in project file
...
p4#: 22331
2013-09-06 13:06:39 +02:00
Magne Sjaastad
3208a74fbf
Removed obsolete code to read data from ssihub
...
p4#: 22328
2013-09-06 11:25:55 +02:00
Magne Sjaastad
ff45f6885e
Simplified file selection filter for well path import
...
p4#: 22142
2013-08-08 17:23:31 +02:00
Magne Sjaastad
69f3f98f5a
Hide console on Windows
...
Show command line help text in dialog, accessible from About menu
Show command line help dialog instead of console output on Windows
p4#: 22130
2013-08-08 11:09:18 +02:00
Magne Sjaastad
9910480538
Added *.dev and *.* to file filter for well path import
...
p4#: 22099
2013-08-06 11:56:07 +02:00
Jacob Støren
524e8d8375
Added a left margin in the property window.
...
p4#: 22002
2013-06-26 09:02:37 +02:00
Jacob Støren
172c2d8b21
Fixed context menu blocking Ceetron navigation on linux.
...
p4#: 21981
2013-06-24 22:23:33 +02:00
Jacob Støren
5db88f4e03
Ascii import of Well Paths
...
p4#: 21956
2013-06-18 11:56:51 +02:00
Jacob Støren
29afd9cc8a
Cleaned up a bit
...
p4#: 21924
2013-06-14 12:08:05 +02:00
Jacob Støren
edcba5a471
Animation (and other commands) refreshed on selection in the tree view
...
p4#: 21923
2013-06-14 11:59:56 +02:00
Vidar Lundberg
6340c4a4a8
Established new PDM structure with RimProject owning RimOilFields owning RimAnalysisModels.
...
Moved wellPathCollection into new class RimOilFields.
Moved cases (previously called reservoirs) and caseGroups from RimProject into new class RimAnalysisGroups.
Added support for old project files, move cases and caseGroups from RimProject to RimAnalysisModels. (Do not handle WellPaths for old project files in a similar way, since almost no users have used this functionality yet.)
p4#: 21846
2013-06-06 15:07:31 +02:00
Jacob Støren
1d3d13c927
Icons: New App icon based on picture sent from Statoil
...
Scaled vertically a bit to work better as an icon.
Still using the old AppIcon as Case Icon, and updated the InputCase icon to match the Case Icon.
p4#: 21793
2013-06-01 01:29:05 +02:00
Magne Sjaastad
ea4491e987
Added framework used to handle utm area of interest
...
p4#: 21775
2013-05-31 13:57:16 +02:00
Magne Sjaastad
261301ad4a
Added ssihub test application
...
Improved ssihub dialog and tested authentication
p4#: 21768
2013-05-30 15:33:12 +02:00
Magne Sjaastad
5e3bb1f6a9
Added Qt example HttpWindow for network access
...
Added import of well paths to File->Import
p4#: 21764
2013-05-29 14:49:04 +02:00
Magne Sjaastad
ada9819870
Added ssihubInterface library and framework files
...
p4#: 21763
2013-05-29 12:59:08 +02:00
Magne Sjaastad
fa161607a1
Added context menu used to execute a script for multiple cases
...
For all selected cases, set current case and launch an external Octave process using this current case
p4#: 21742
2013-05-27 15:38:03 +02:00
Vidar Lundberg
163ce74052
Added visualization of Well Paths in reservoir views.
...
Added PDM objects for a list of well paths (RimWellPathCollection) and for individual well paths (RimWellPath).
RimWellPathCollection uses RivWellPathCollectionPartMgr to generate visualization parts for each well path in the collection.
RimWellPath handles geometry defined in RigWellPath, and RivWellPathPartMgr is used to generate visualization parts. The well path visualization parts are generated by reusing RivPipeGeometryGenerator (also used for well pipes).
Added features:
- Select Open Well Paths in File menu to open one or more well path files, file format supported is Statoil JSON format.
- Each well path has a label showing the name, and the PDM window will show additional info (Id, Source System, UTM Zone, Update Date and User, Survey Type, File Path).
- Possible to turn on / off visibility, set thickness, set color for individual well paths.
- List of well paths including specified parameters/settings will be stored in project file.
- Possible to clip all well paths at a specified distance to the reservoir as this is the relevant area to see, and if showing whole well path it may be problematic for auto zoom etc.
Known problems:
- Well paths are not shown in some types of reservoir views, for instance reservoir views showing well pipes. Will look into this later.
p4#: 21658
2013-05-16 14:10:22 +02:00
Magne Sjaastad
97c3a330f6
Updated riGetSelectedCases to use a string as type name
...
Improved how to get currently selected cases
p4#: 21625
2013-05-15 12:03:36 +02:00
Magne Sjaastad
22d45bc28f
Added riGetSelectedCases based on currently selected cases in the main tree view
...
p4#: 21604
2013-05-13 22:32:01 +02:00
Jacob Støren
5c0e55e7c1
Linux compile fixes
...
p4#: 21550
2013-05-06 12:02:32 +02:00
Jacob Støren
cf664210bf
Major cleanup/change in the way things are included.
...
Needs a Linux compile check.
p4#: 21545
2013-05-06 10:55:00 +02:00
Magne Sjaastad
ab8dfb4aad
In RimProject, encode/decode into a string the currentIndex from QTreeView.
...
This will also make sure the active view is restored when opening a project
p4#: 21463
2013-04-26 19:05:35 +02:00
Magne Sjaastad
8ccd89d3d1
Added scale to toolbar
...
p4#: 21452
2013-04-26 11:49:37 +02:00
Magne Sjaastad
d3fa2d5af5
Added creation of IJK-slices from context menu in 3D scene.
...
p4#: 21367
2013-04-23 07:29:37 +02:00
Magne Sjaastad
a326fac204
Renaming related to tree item root
...
p4#: 21355
2013-04-22 10:49:31 +02:00
Magne Sjaastad
79e7d3604c
Expand up to root when creating a view. Removed use of expandAll()
...
p4#: 21353
2013-04-22 10:04:37 +02:00
Magne Sjaastad
a9e0554635
Use semicolon as string list separator. Fixed bug in tree view state parameter passing.
...
p4#: 21350
2013-04-22 09:20:57 +02:00
Magne Sjaastad
638e82d24c
Store tree view state in project file
...
p4#: 21342
2013-04-19 13:20:46 +02:00
Magne Sjaastad
b5b9a736e2
As creation of a font is time consuming, create one application font instance
...
p4#: 21338
2013-04-19 08:02:36 +02:00
Jacob Støren
cd24e77557
Drawstyle and Faults control Toolbuttons
...
p4#: 21335
2013-04-18 15:10:57 +02:00
Magne Sjaastad
f23c9d7b4d
Removed obsolete code
...
p4#: 21328
2013-04-17 11:48:32 +02:00
Jacob Støren
2280a8cbfa
Toolbar and menu refinements
...
Added Snapshot actions to a new toolbar.
Moved the snapshot file actions from debug menu to File->Export
Moved the Snapshot to Clip board to Edit menu.
Moved create new Project tree and Property editor action to Windows menu
Added a separator in the Windwsmenu after the "fixed Docks"
Set unique names on the additional Prop and Project doc windows
p4#: 21326
2013-04-17 10:59:34 +02:00
Magne Sjaastad
a20640f25f
Only enable animation control when there are more than one time step string available
...
p4#: 21229
2013-04-10 15:09:41 +02:00
Jacob Støren
ff1dcd8c8d
Overlay info: Adjusted colors and transparency
...
To reclaim the transparent feeling lost, and to increase readability
p4#: 21225
2013-04-10 14:24:35 +02:00
Jacob Støren
7da5520207
Reverted an accidental checkin regarding generating of test projects
...
p4#: 21098
2013-04-02 16:34:13 +02:00
Jacob Støren
e10bd73658
Renamed the final filenames for this time:
...
RICursors RiuCursors
RIMainWindow RiuMainWindow
RIPreferencesDialog RiuPreferencesDialog
RIProcessMonitor RiuProcessMonitor
RIResultInfoPanel RiuResultInfoPanel
RIViewer RiuViewer
p4#: 21072
2013-03-22 17:30:50 +01:00
Jacob Støren
c8da0f4179
Aligning prefix of class names with standard:
...
RICursors RiuCursors
RIMainWindow RiuMainWindow
RIPreferencesDialog RiuPreferencesDialog
RIProcessMonitor RiuProcessMonitor
RIResultInfoPanel RiuResultInfoPanel
RIViewer RiuViewer
p4#: 21071
2013-03-22 17:17:56 +01:00
Jacob Støren
f0174a02fa
More file renaming:
...
RigEclipseCase RigCaseData
RigReservoirCellResults RigCaseCellResultsData
RigWellResults RigSingleWellResultsData
RigGridCollection RigGridManager
p4#: 21070
2013-03-22 16:58:44 +01:00
Jacob Støren
6a2cbbcf07
Renamed files:
...
RimReservoir RimCase
RimResultReservoir RimResultCase
RimInputReservoir RimInputCase
p4#: 21069
2013-03-22 16:40:41 +01:00
Jacob Støren
b903c7f8c2
Renamed files:
...
RIApplication RiaApplication
RIPreferences RiaPreferences
p4#: 21068
2013-03-22 16:24:42 +01:00
Jacob Støren
27647248ea
Rename of files:
...
RIBaseDefs RiaBaseDefs
RIVersionInfo RiaVersionInfo
RIMain RiaMain
RIStdInclude RiaStdInclude
p4#: 21067
2013-03-22 16:12:00 +01:00
Jacob Støren
949084784e
More class renaming. File names not done yet.
...
RIApplication RiaApplication
RIPreferences RiaPreferences
p4#: 21065
2013-03-22 15:50:44 +01:00
Jacob Støren
e493db37d0
Major renaming of classes. Filenames not done yet.
...
RimReservoir RimCase
RimResultReservoir RimResultCase
RimInputReservoir RimInputCase
RigEclipseCase RigCaseData
RigReservoirCellResults RigCaseCellResultsData
RigWellResults RigSingleWellResultsData
RigGridCollection RigGridManager
p4#: 21064
2013-03-22 15:43:42 +01:00
Magne Sjaastad
21065176f2
Rename of functions in RigActiveCellInfo
...
p4#: 21045
2013-03-22 09:32:42 +01:00
Magne Sjaastad
b0503cabba
Added drag and drop support.
...
Implemented our own insertRows/deleteRows to avoid bug caused by default drag and drop behaviour of Qt
https://bugreports.qt-project.org/browse/QTBUG-26229
https://bugreports.qt-project.org/browse/QTBUG-6679
p4#: 21028
2013-03-21 13:41:44 +01:00
Magne Sjaastad
53d7d62759
Made adding of objects more robust
...
p4#: 21009
2013-03-20 15:11:27 +01:00
Magne Sjaastad
50206b9dc4
Various linux fixes and missing includes
...
p4#: 20976
2013-03-20 06:11:45 +01:00
Jacob Støren
f7248f3999
Results Storage: A huge refactorisation to make way for storing generated properties to an internal file.
...
This does not yet compile due to a unfortunate mix of perforce, cmake setup and unit_test project shortcomings.
Need to move RigStatistics into ProjectDataModel and rename it before this is running again.
p4#: 20945
2013-03-18 14:34:29 +01:00
Magne Sjaastad
62e4cac4b0
Added inherited object of MimeData to carry model index list
...
p4#: 20926
2013-03-18 11:40:39 +01:00
Jacob Støren
8a604aca24
Refactored RigActiveCellinfo to only have one set of information.
...
Fracture and Matrix separated information thus needs two such obejcts.
There still needs to remove some out-commented code
p4#: 20877
2013-03-13 11:50:31 +01:00
Jacob Støren
d4a28126d1
Added several new icons, including zoom all
...
p4#: 20823
2013-03-07 16:47:42 +01:00
Jacob Støren
78f2c359cb
Renamed the multicase command to "Create Grid Case Group From Files"
...
p4#: 20814
2013-03-07 12:32:19 +01:00
Jacob Støren
466eb906aa
Multi Case Dialog now remebers the Add Search Folder path
...
p4#: 20770
2013-03-05 15:22:19 +01:00
Jacob Støren
2c19c8010c
MultiCase import dialog: Fixed errors in remove search folders and cases
...
p4#: 20765
2013-03-05 14:45:29 +01:00
Jacob Støren
e0688008ca
Added a multi case import dialog
...
p4#: 20758
2013-03-05 13:26:28 +01:00
Jacob Støren
cd0b40ef20
3D info is now using a different rendereing method more compatible with software rendering
...
p4#: 20669
2013-02-28 11:58:31 +01:00
Magne Sjaastad
3dbc8a9d57
Improved multi case initial reading
...
When creating a multi case group from multiple files, read grid from first file.
The main grid from the first case is reused for the other cases.
NOTE: Metadata and well information is not read for the other cases
p4#: 20655
2013-02-27 15:27:33 +01:00
Magne Sjaastad
49236839a3
Added menu item for multiple case import
...
Find EGRID files recursively in subfolders
p4#: 20603
2013-02-21 16:46:34 +01:00
Magne Sjaastad
a09dba2670
File rename from RigReservoir to RigEclipseCase
...
p4#: 20503
2013-02-13 13:33:35 +01:00
Magne Sjaastad
e343dc73b4
Added hide all dockwidgets, used before executing regression tests
...
p4#: 20442
2013-02-11 11:47:45 +01:00
Jacob Støren
0c437a0121
Added a regression test system to ResInsight.
...
Based on image comparison. Command line invocation.
p4#: 20433
2013-02-08 17:04:35 +01:00
Magne Sjaastad
3906298cb6
Added support for reading more than one timestep per day. If this is detected, show hours and minutes in animation toolbar.
...
p4#: 20399
2013-02-07 08:35:04 +01:00
Magne Sjaastad
7648a63f02
Added functions used to create 2D images from 3D views
...
p4#: 20385
2013-02-06 11:43:26 +01:00
Jacob Støren
32b5af2033
Added code to output cell corner coordinates when picking. Disabled by default.
...
p4#: 20305
2013-01-30 14:51:31 +01:00
Magne Sjaastad
571da22931
Removed obsolete USE_ECL_LIB, as ERT is now part of the source code tree
...
p4#: 20253
2013-01-25 14:28:42 +01:00
Jacob Støren
b938b14b5b
Removed a lot of size_t/uint/int related compiler warnings. Still more to go.
...
p4#: 20215
2013-01-22 11:34:47 +01:00
Magne Sjaastad
54dc3a5d37
Style object must follow lifespan of RIViewer
...
p4#: 19288
2012-10-24 11:01:41 +02:00
CeetronResInsight
59afd98167
Added missing initialization
...
p4#: 19276
2012-10-23 13:36:48 +02:00
Jacob Støren
a8b4d35b4f
ResInsight: Added mean value to 3D info text
...
p4#: 19268
2012-10-23 12:08:46 +02:00
Magne Sjaastad
f4a328b4cb
Fixed memory leak
...
p4#: 19265
2012-10-23 10:42:46 +02:00
Jacob Støren
875d7b7d12
Resinsight: Made Home path the default path for file dialog browsing, and added remembering of the last opened path.
...
Added -startdir command line argument to override the default file browse path
p4#: 19263
2012-10-23 09:59:57 +02:00
Magne Sjaastad
ac26fd8e0c
Moved menu item New Property View to View menu
...
p4#: 19262
2012-10-23 08:34:06 +02:00
Magne Sjaastad
8957a92830
Disable rendering of overlay items in software rendering (no shaders supported reported by OpenGL context)
...
p4#: 19222
2012-10-19 08:35:04 +02:00
Magne Sjaastad
9c1ce7591e
Upgraded visualization libraries
...
Major refactoring of color legend framework
Added discrete log color legend
p4#: 18989
2012-10-02 10:17:52 +02:00
Jacob Støren
7c63cccc8d
ResInsight: Linux compile fixes
...
p4#: 18783
2012-09-18 15:34:50 +02:00
CeetronResInsight
b3c142cc9a
Change 18603 on 2012/09/11 by fredrik@fredrik_MBP-BootCamp
...
Added glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT); to get proper orientation of textures on point sprites
2012-09-11 09:22:36 +02:00
Magne Sjaastad
27d8808c5c
Version 0.8.6
2012-08-31 19:12:47 +02:00
unknown
2c9695e594
Updated to version 0.8.0
2012-06-26 16:10:41 +02:00
Alf B. Rustad
dfe97efb1b
Initial commit of ResInsight version 0.4.8
2012-05-18 09:45:23 +02:00