Commit Graph
100 Commits
Author SHA1 Message Date
Jacob Støren f0d315c55e Octave Interface: GetActiveCellProperty: Made timestep indices 1-based. Renamed the GetActiveCellProperty command where it was not yet done
p4#: 21690
2013-05-22 09:26:12 +02:00
Jacob Støren 90e61c254b Octave Interface: Rolled out use of common constant for DataStreamVersion
p4#: 21689
2013-05-22 09:18:57 +02:00
Jacob Støren d947f68f83 Octave Interface: GetActiveCellProperty now handles coarsening
p4#: 21683
2013-05-21 14:35:47 +02:00
Jacob Støren 2009838b04 Octave: Updated GetActiveCellProperty to the new specification.
Still missing handling of coarse grids
p4#: 21677
2013-05-21 11:18:28 +02:00
Jacob Støren bb0c4c37c1 SocketServer: Moved GetProperty command to new regime.
p4#: 21654
2013-05-16 13:29:38 +02:00
Jacob Støren 6173381652 SocketServer: GetActiveCellInfo moved to new regime
p4#: 21649
2013-05-16 12:44:43 +02:00
Jacob Støren a63b2caae5 SocketServer: Converted GetMainGridDims to new regime
p4#: 21648
2013-05-16 11:47:42 +02:00
Jacob Støren db168909d7 Fixed Windows compile issue
p4#: 21647
2013-05-16 11:27:34 +02:00
Jacob Støren 36d7c46e57 Socket Server: Rolled in separate command handler classes created by factory.
Translated several commands to the new regime.
p4#: 21645
2013-05-16 11:15:34 +02:00
Jacob Støren 739c530fcf Socket Server: Rolled in separate command handler classes created by factory.
Translated several commands to the new regime.
p4#: 21645
2013-05-16 11:14:57 +02:00
Jacob Støren cad25bcd59 Caf:PdmUiTree: Rewrote rebuildUiSubTree to become updateUiSubTree
Now the UI state is preserved when refreshing the tree, making it suitable
to use this method more extensively. This paves the way to make changes to the Pdm data structure without considering the ui at all, until a  call to updateUiSubTree gets the ui gracefully into sync.
p4#: 21599
2013-05-13 12:00:52 +02:00
Jacob Støren 6784a8e596 Fixed Well pipe "peaks". The centerline filtering tolerance was too small.
p4#: 21580
2013-05-08 13:14:33 +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
Jacob Støren 991cd7198e Caf Pdm: Centered the labels vertically related to their editor widgets
Vertically streching widgets still have their label aligned with the top edge.
p4#: 21512
2013-04-30 17:08:52 +02:00
Jacob Støren e83fe8a471 CellEdge : Added options to turn off specific directions
p4#: 21510
2013-04-30 15:55:12 +02:00
Jacob Støren 1db5d3f03d Set default WellPipe visibility mode to "Visible Cells Filtered"
p4#: 21505
2013-04-30 14:55:59 +02:00
Jacob Støren be0a2ec728 Legend: Added tick number formatting control
Auto, Fixed and Scientific. Fixed and Scientific respects the precision set.
p4#: 21504
2013-04-30 14:48:53 +02:00
Jacob Støren 60f86cfc3f Result Selection: Result is not changed before user actively selects in the list.
Changig type or porosity model only changes what variables are shown as accessible.
This is also applied to property filters.
Dual porosity support is also added to property filtered. Forgotten before.
p4#: 21499
2013-04-30 13:41:53 +02:00
Jacob Støren d84d69ffc2 Caf: Added the possibility of "nothing" selected in a field using option values
p4#: 21490
2013-04-30 11:04:51 +02:00
Jacob Støren 3806ff9baf Well cell transparency: Turned off well cell transparency when no well pipe is visible.
For results visulaization, cell edge and faults faces.
Not yet done for visualization without result colors.
p4#: 21462
2013-04-26 16:46:38 +02:00
Jacob Støren b14b138dae Range Filter: Added option to not propagate rangefilter onto the subgrids
p4#: 21445
2013-04-26 08:53:40 +02:00
Jacob Støren 4ca363cde5 Fixed bug: Missing well cells in lgr when range filtering
p4#: 21442
2013-04-25 14:56:46 +02:00
Jacob Støren 10e6fbc5bd Range filter: Add grid type drop-down list to enable LGR-grid range filtering
TP#3995
p4#: 21408
2013-04-24 12:00:45 +02:00
Jacob Støren d034717460 Removed unused code
p4#: 21354
2013-04-22 10:11:37 +02:00
Jacob Støren 6cac031fff Added well pipe visibility filter based on cell visibility.
Only show pipes with wells with open connections in visible cells
p4#: 21349
2013-04-22 09:13:37 +02:00
Jacob Støren cd24e77557 Drawstyle and Faults control Toolbuttons
p4#: 21335
2013-04-18 15:10:57 +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
Jacob Støren df533d0afe Alligning
p4#: 21321
2013-04-17 07:41:48 +02:00
Jacob Støren b38d4313d7 Octave Server: Fix on getting active cellinfo
p4#: 21318
2013-04-16 12:08:45 +02:00
Jacob Støren 427bf5a2dd Linux compile warning fix
p4#: 21316
2013-04-16 10:46:29 +02:00
Jacob Støren 66f0310d55 Added new icons to resource file
p4#: 21306
2013-04-16 09:44:31 +02:00
Jacob Støren 99ad86b984 Added Z-Scale to the 3D overlay info text
p4#: 21303
2013-04-16 09:03:40 +02:00
Jacob Støren d89ea1e385 Legend default number precision set to 2
p4#: 21301
2013-04-16 08:50:31 +02:00
Jacob Støren 9e588e38c3 Established new base images for regressiontest. Small models.
p4#: 21290
2013-04-16 07:34:50 +02:00
Jacob Støren d65ce7957b Added viewer background color to preferences
p4#: 21284
2013-04-15 13:13:41 +02:00
Jacob Støren 337e0c3226 Added mesh color as preference, and resetting of preferences before doing regression tests
p4#: 21263
2013-04-12 13:15:41 +02:00
Jacob Støren 432106c9c5 External file references: Fixed the relocation in the advanced cases
p4#: 21253
2013-04-12 09:43:40 +02:00
Jacob Støren 462bc16ace Rewrite of the searchpath system for external file references
The Relocation code is not yet completely working for the advanced cases
p4#: 21251
2013-04-12 08:31:59 +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 a246e288ba Renamed some methods and variables in the eclipse result file access system
To make things more readable and understandable
p4#: 21218
2013-04-10 11:02:10 +02:00
Jacob Støren 09810bf586 Fixed error in path update logic
p4#: 21209
2013-04-09 15:38:37 +02:00
Jacob Støren d0eebb92a8 Removed PERMY as default statistics property
p4#: 21204
2013-04-09 14:36:38 +02:00
Jacob Støren 2a6fce1d64 Added missing include (discovered on Ubuntu 12 build server)
p4#: 21186
2013-04-09 07:27:55 +02:00
Jacob Støren 12294ca853 Statistics Ui: Added default selected properties
p4#: 21185
2013-04-08 17:02:07 +02:00
Jacob Støren fd67c9dc18 Statistics ui: Replaced status and unlock button with a Calculate/Edit button.
Made Summary description complete and more compact
p4#: 21176
2013-04-08 14:17:39 +02:00
Jacob Støren 474d00994a Caf: Made groups become hidden if requested in the uiOrdering system
p4#: 21175
2013-04-08 14:10:49 +02:00
Jacob Støren 1c65fe7e2c Statistics case User interface and behaviour working.
p4#: 21171
2013-04-08 12:16:38 +02:00
Jacob Støren c6f2b52216 Caf: Removed the const constrain on defineUiOrdering
To make this be able to change visibility and names etc of fields, and generally be a "make sure you are updated" entry.
p4#: 21168
2013-04-08 12:09:43 +02:00
Jacob Støren d07783ebaa Start of calculation status/unlocking of Statistics results
p4#: 21143
2013-04-05 13:29:47 +02:00
Jacob Støren 0fed66deb2 Moved the statistical calculation algorithm code into a separate file.
Added unit test to these calculations, and fixed a calculation error.
p4#: 21140
2013-04-05 10:49:39 +02:00
Jacob Støren db62f01e0a Differenced the compiler options on Windows and Linux, making a ton of stupid MSVC compiler warnings go away.
p4#: 21138
2013-04-05 10:42:53 +02:00
Jacob Støren 75f089d0d4 Statistics UI is now functional, together with two percentile evaluation methods
Refurbished the calculation algorithm code somewhat
p4#: 21134
2013-04-04 16:53:34 +02:00
Jacob Støren ef6ee4a26c Statistics case now has a prototype datamodel and Ui.
The data is not yet used to control the calculations.
p4#: 21116
2013-04-03 16:13:49 +02:00
Jacob Støren 770a81648d Added a new editor to work with text fields.
Supports multiline formatted text
p4#: 21114
2013-04-03 16:06:00 +02:00
Jacob Støren 51c4b6a38d Start of the ui working for setting up statistics calculations
p4#: 21100
2013-04-02 16:59:55 +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 c16db0640b First start of statistics control data model
p4#: 21097
2013-04-02 15:20:55 +02:00
JacobStoren 3c08fd8abf Merge pull request #20 from OPM/internal
Update dev branch to latest
2013-04-02 06:14:26 -07: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
Jacob Støren bd33a64e84 Added a comment
p4#: 21063
2013-03-22 15:22:50 +01:00
Jacob Støren 6d24c6b541 Renamed files corresponding to the already renamed statistics related classes
p4#: 21060
2013-03-22 14:24:41 +01:00
Jacob Støren 0d2ad04c3e Moved "internal" class to cpp file
p4#: 21057
2013-03-22 13:35:43 +01:00
Jacob Støren 326cd79754 Result Storage: Finally things have come together, and seems to behave.
Refactored the loadProject system to make loading of statistical cases work as they should.
Got the update of references regarding grid and unionActive cells work
Introduced a bool to keep track of what cell results to store.
Introduced a clear method in ActiveCellInfo.
Renamed a bit
p4#: 21036
2013-03-21 15:31:47 +01:00
Jacob Støren 92bd95d683 Added explicit load of data for StatisticsCases.
Still trouble but this removed one obstacle
p4#: 21014
2013-03-20 16:35:36 +01:00
Jacob Støren ad8cbfa651 Caf::Pdm: Added better Error messages and Recovery when encountering unknown field names and class types
p4#: 21001
2013-03-20 13:56:17 +01:00
Jacob Støren 75fc89e67a Rename of ...ResultsCacher to ...ResultsStorage. Hide Cacher from UI tree
p4#: 20963
2013-03-19 10:29:34 +01:00
Jacob Støren 5860cb2e49 Results Storage: Removed obsolete field. Stored the filename.
p4#: 20959
2013-03-19 09:48:30 +01:00
Jacob Støren 516c642cc4 Results Storage: Refined the output format. Think it is ok now
p4#: 20956
2013-03-19 09:08:37 +01:00
Jacob Støren 9da6b0a10b Results Storage: Fixed the Previous build error by moving the RigStatistics class.
Cleaned up a bit in the ApplicationCode/CMakeList.txt
p4#: 20946
2013-03-18 14:51:31 +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
Jacob Støren 3c446c4018 Removed out-commented code from the ActiveCellInfo refactoring
p4#: 20886
2013-03-13 13:42:27 +01:00
Jacob Støren ec889920d5 Removed out-commented code from the ActiveCellInfo refactoring
p4#: 20886
2013-03-13 13:41:35 +01:00
Jacob Støren 3013992518 Fixed error regarding missing well cells in property filtered views
p4#: 20882
2013-03-13 13:06:37 +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 9ab0a397ef Removed the m_isWellCell member from RigCell, to make the grid data completely independent of case / result data
p4#: 20859
2013-03-12 10:03:25 +01:00
Jacob Støren 85f0d8b195 Fixed "New View" command tree refresh behaviour. Still the expand icon is missing sometimes...
p4#: 20833
2013-03-08 11:14:27 +01:00
Jacob Støren 0a5102894b Calculate statistics for all available properties in main case by default
p4#: 20832
2013-03-08 10:49:33 +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 aab18ba0a0 Set root as default start directory for grid case group import
p4#: 20811
2013-03-07 12:25:27 +01:00
Jacob Støren fcdf14c0fa Improved progress information when reading large projects
p4#: 20803
2013-03-07 09:43:25 +01:00
Jacob Støren 705bb185e0 Fixed assert regarding wrong clamping of current timestep
p4#: 20802
2013-03-07 09:42:34 +01:00
Jacob Støren 77d5b810ca Fixed errror regarding LGC and missing results
p4#: 20794
2013-03-06 15:13:37 +01:00
Jacob Støren 5247d6687d Integrating Visualization Modules
from ChangeList 20718 Due to updates in the overlay image
p4#: 20781
2013-03-06 09:25:33 +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 1181d62b75 Reviewed and simplified DataAccess classes.
Includes some const changes and some renaming
p4#: 20687
2013-03-01 16:00:34 +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
Jacob Støren 5a84a12864 Integrated new version of the Visualization modules:
From change List number 20662.
p4#: 20667
2013-02-28 11:37:32 +01:00
Jacob Støren ad082254af Well pipe size now is based on min characteristic I, J cell size
p4#: 20628
2013-02-26 14:08:30 +01:00
Jacob Støren dc02b1ae91 Well pipe size now is based on min characteristic I, J cell size
p4#: 20628
2013-02-26 14:07:30 +01:00