Commit Graph

134 Commits

Author SHA1 Message Date
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