OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,877 Commits 27 Branches 61 Tags 309 MiB
0d56ee060e
Commit Graph

1277 Commits

Author SHA1 Message Date
Magne Sjaastad
476387fda4 Block transfer for active cell info 2014-04-15 14:03:41 +02:00
Magne Sjaastad
b4821ed7a3 Use block transfer for data transfer of cell properties 2014-04-15 13:40:53 +02:00
Magne Sjaastad
8ea418272d Fixed invalid assert 2014-04-15 13:04:57 +02:00
Magne Sjaastad
0f01703ac3 Added socket data transfer 
Added one common class used to transfer data using socket. This class is
used both from the Octave plugins and from the socket server code in
ResInsight
 2014-04-14 14:36:47 +02:00
Magne Sjaastad
7b68c3cb6b Fix after merge conflicts take two 2014-04-14 10:24:15 +02:00
Magne Sjaastad
ce33c00219 Files fixed after merge conflicts 2014-04-14 09:25:27 +02:00
Magne Sjaastad
0562f92585 Updated riGetGridProperty 2014-04-14 09:18:26 +02:00
Magne Sjaastad
874b05b119 Added isCoarseningActive 2014-04-14 09:18:25 +02:00
Magne Sjaastad
acc1d732d7 Use socket block read/write for geometry data 2014-04-14 09:18:24 +02:00
Magne Sjaastad
364ea1f937 Added block read from socket 2014-04-14 09:18:22 +02:00
Magne Sjaastad
c1419e53e8 Fixed used on unsigned 2014-04-14 09:18:22 +02:00
Magne Sjaastad
039ba48bed Added block write to socket tools 2014-04-14 09:18:21 +02:00
Magne Sjaastad
3ec22a9221 Added flag to control how to do IO with sockets 2014-04-14 09:18:20 +02:00
Magne Sjaastad
b9b5441bdb Performance: Reduce memory use for riGetPropertyData 2014-04-14 09:16:07 +02:00
Magne Sjaastad
60ff9c5a2b Performance: Added OpenMP to mock models 2014-04-14 09:16:06 +02:00
Magne Sjaastad
4aeac9197b Use caf property dialog and removed obsolete riuPreferencesDialog 2014-04-14 09:16:06 +02:00
Magne Sjaastad
6e3860571e Improved mock model settings and use caf property dialog 2014-04-14 09:16:05 +02:00
Magne Sjaastad
ae9f72912e Added customized mock model to user interface 2014-04-14 09:16:03 +02:00
Magne Sjaastad
7ffe48bff9 Added flag to control adding of well data 2014-04-14 09:14:39 +02:00
Magne Sjaastad
5961b267b6 Added mock model settings 2014-04-14 09:12:39 +02:00
Magne Sjaastad
3e8a206f13 Moved mock model identicators to RimDefines 2014-04-14 09:06:46 +02:00
Magne Sjaastad
770f706803 Updated riGetGridProperty 2014-04-03 11:56:01 +02:00
Magne Sjaastad
9aa32e4a88 Added isCoarseningActive 2014-04-03 10:58:29 +02:00
Magne Sjaastad
05f1c056b7 Use socket block read/write for geometry data 2014-04-03 10:41:27 +02:00
Magne Sjaastad
e748f087a7 Added block read from socket 2014-04-02 08:55:26 +02:00
Magne Sjaastad
f5e1773fde Fixed used on unsigned 2014-04-01 15:36:08 +02:00
Magne Sjaastad
4ab5e28cf7 Added block write to socket tools 2014-04-01 15:31:13 +02:00
Magne Sjaastad
af6d92d64e Added flag to control how to do IO with sockets 2014-04-01 13:02:52 +02:00
Magne Sjaastad
dc040d673a RegressionTest: Improved application configuration 
Disable read of faults (preferences)
Disable faults outside filters
Enable result mapping on faults
 2014-01-23 13:17:49 +01:00
Magne Sjaastad
e0b093d78d Replace space with underline in snapshot generated filenames 2014-01-23 09:25:22 +01:00
Magne Sjaastad
43adffdc83 Use setValueFromUi to update connected editors when pushing toolbuttons 2014-01-23 09:19:04 +01:00
Magne Sjaastad
d1aacfaf1e Improved tool button image 2014-01-23 09:06:56 +01:00
Magne Sjaastad
f8254075cd Result Info: Show fault name only when picking on fault 2014-01-23 08:19:37 +01:00
Magne Sjaastad
8f56fa6ad4 Show fault name in Result Info when picking NNC 2014-01-23 07:53:17 +01:00
Magne Sjaastad
209919c651 Toolbar: Added button control for toolbar labels 2014-01-23 07:31:07 +01:00
Magne Sjaastad
b12e09c86d Updated defaults and modified GUI labels 2014-01-22 14:05:20 +01:00
Magne Sjaastad
ccf689b203 Show combined transmissibility first in list 2014-01-22 14:04:09 +01:00
Magne Sjaastad
6aa586f9f5 NNC: Improved visual effects 
Removed use of depth buffer manipulation as this caused invalid result
color mapping for NNC when combined with other fault geometry.
Use polygon offset on NNC geometry to make sure NNC always wins
 2014-01-22 13:17:05 +01:00
Magne Sjaastad
4f079549f3 Removed trace output 2014-01-08 13:33:57 +01:00
Magne Sjaastad
658a513c7f Fault: Show both fault faces in in grid mode to make geometry watertight 2014-01-08 10:47:41 +01:00
Magne Sjaastad
dbc357eb39 Avoid duplicate filenames containing faults 2014-01-08 10:07:42 +01:00
Magne Sjaastad
271eb755eb Faults: Fixed update of fault colors (missing files from previous commit) 2014-01-08 08:25:46 +01:00
Magne Sjaastad
f477d7ade6 Faults: Fixed update of fault colors 2014-01-08 08:23:56 +01:00
Magne Sjaastad
8133f73d3b Faults: Use cell behind fault as default 2014-01-08 07:34:22 +01:00
Magne Sjaastad
c1f1804770 Faults: Include inactive fault geometry 2014-01-07 15:07:02 +01:00
Magne Sjaastad
7276c2ad31 Faults: Improved forced visibility control of faults. Renaming. 2014-01-07 14:27:43 +01:00
Magne Sjaastad
645f824ed0 Info window: Show all result properties mapped on faults 2014-01-07 11:08:38 +01:00
Magne Sjaastad
4391a4ff65 Show fault result mapping in 3D info. Fixed display model update. 2014-01-06 14:02:08 +01:00
Magne Sjaastad
cea0e37d30 Faults: Only one label per fault when property filter is active 2014-01-06 13:14:25 +01:00
Magne Sjaastad
38aca20b84 Faults: Renaming 2014-01-06 13:03:57 +01:00
Magne Sjaastad
c569b9fac1 Faults: Show faults when filters are active 2014-01-06 12:06:36 +01:00
Magne Sjaastad
78571b0912 Removed apostrophe 2014-01-06 07:11:36 +01:00
Magne Sjaastad
49a43a036e Pick info and result info: Added face type 2014-01-03 14:59:52 +01:00
Jacob Støren
be81dbf711 Faults: Reordering and improving the Properties UI 
Disabled options when not applicable.
Put options into groups.
Renamed to clarify.
 2014-01-03 13:43:00 +01:00
Magne Sjaastad
a7a4102ef7 Pick info: Show NNC cell face 2014-01-03 11:27:06 +01:00
Magne Sjaastad
3e6954d7f5 Read multiple FAULTS keywords 
A list of files are cached in the project file. When reading faults from
these files, make sure multiple FAULTS keywords in the same file is
parsed.
 2014-01-03 09:44:13 +01:00
Magne Sjaastad
1a83008e39 Show fault count in fault collection tooltip 2014-01-03 09:40:39 +01:00
Jacob Støren
465e67ba64 Faults: Fixed mixed option names 2014-01-03 08:58:26 +01:00
Jacob Støren
9aa70640a3 Faults: Use "Cell behind" when showing grid cells 
When any grid cell visualization we need to set the Faults face mode to
the cell behind, to match the needs of the normal grid cell
visualization.
The face culling option is grayed out, but is not altered yet.
 2014-01-03 08:50:15 +01:00
Magne Sjaastad
202f6b799e Renamed to Result property 2014-01-03 07:24:19 +01:00
Magne Sjaastad
34ed2d7e9f Option: Renamed to Fault results 2014-01-02 15:24:07 +01:00
Magne Sjaastad
088df79245 Option: Renamed to Show result on faults 2014-01-02 15:20:08 +01:00
Magne Sjaastad
b2376b4a77 Renamed to Show faults outside filters 2014-01-02 15:15:50 +01:00
Magne Sjaastad
183203344b Option: Read fault data 2014-01-02 15:10:33 +01:00
Magne Sjaastad
de7dddc25e Add a folder to global path for Octave environment on Windows 2014-01-02 14:31:10 +01:00
Magne Sjaastad
ae95d44315 NNC: Improved readability of cell IJK listing 2014-01-02 11:46:17 +01:00
Magne Sjaastad
508334fcb0 Faults: Always show fault color option 2014-01-02 11:21:35 +01:00
Magne Sjaastad
1ea31f61ba Do not include CombinedTransmissibility in variable lists 2014-01-02 10:24:37 +01:00
Magne Sjaastad
9c7c8f1969 NNC: Use smaller depth distance for pick threshold 2013-12-20 14:53:48 +01:00
Jacob Støren
ff361b39ef Batch: Fixed crash related to statistics calculations 2013-12-20 14:46:21 +01:00
Magne Sjaastad
8abfbd3730 Faults: Hide labels by default, set fault collection selected 2013-12-20 14:34:38 +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
59eeb0894f Faults: Eclipse input case use preferences to control import of faults 2013-12-20 09:18:52 +01:00
Magne Sjaastad
b7141dde50 Preferences: Read faults on import and fault default visibility 2013-12-20 08:48:54 +01:00
Magne Sjaastad
d165d6ce38 Fixed rename on Linux 2013-12-19 11:07:33 +01:00
Jacob Støren
909831ad34 NNC: Removed some debug output 2013-12-19 10:50:51 +01:00
Jacob Støren
b52c0fcdd3 NNC: Added face to result info text 2013-12-19 10:50:48 +01:00
Jacob Støren
cf7de9d588 Removed Geometry faults toggle, and disabled calculation 2013-12-19 10:50:45 +01:00
Magne Sjaastad
f13f91d74d Show updated help text from menu Help -> Command line help 2013-12-19 10:45:15 +01:00
Magne Sjaastad
c3cd245ffa Hide fault labels when fault collection is disabled 2013-12-19 10:37:16 +01: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
Magne Sjaastad
abc89ec7e7 Rename 2013-12-19 09:54:50 +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
Magne Sjaastad
01e0bf4999 Added source info to communicate both cell indices and face indices 2013-12-19 09:16:30 +01:00
Magne Sjaastad
f492f0eda2 Renaming 2013-12-19 09:16:29 +01:00
Jacob Støren
b7f305b142 Faults: Face culling handles flipaxis 2013-12-19 08:48:36 +01:00
Jacob Støren
a20e08237b Toolbar - Gridlines - Faults only option #74 2013-12-18 23:37:30 +01:00
Jacob Støren
ee135b5949 Faults: Set default faceculling to show inside 
And aligned some code
 2013-12-18 19:02:07 +01:00
Jacob Støren
2171b1bde4 Faults: First shot on getting the face culling right 
Still needs to handle flipaxis
 2013-12-18 15:49:03 +01:00
Jacob Støren
12e818b3b2 Updated cell topology comments 2013-12-18 15:36:28 +01:00
Jacob Støren
a2dd688df1 Fixed cell coordinate debug output 2013-12-18 15:35:23 +01:00
Jacob Støren
a6ef98772a Faults: Override backface culling from Grid mode 
When in grid mode, backface culling must always be off, when we do not
have results.
 2013-12-18 13:36:29 +01:00
Jacob Støren
13c387e787 Fixed missing update when toggling Fault mode 2013-12-18 13:36:26 +01:00
Magne Sjaastad
bc4ef17409 Create only one label per fault 
Use a separate code path for fault labels to avoid multiple labels on
different sub parts of a fault
 2013-12-18 12:49:41 +01:00
Magne Sjaastad
ae4175dd15 Always connect label line to native fault 2013-12-18 12:49:41 +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
Jacob Støren
6d1db22cd8 NNC: Made nnc's folllow cell filters 2013-12-18 10:16:14 +01:00
Magne Sjaastad
55fe73c3b2 Control face culling when mapping results 2013-12-18 09:31:45 +01:00
Magne Sjaastad
d826c79a73 Added face culling in fault part color mode 2013-12-18 09:31:44 +01:00
Magne Sjaastad
b2f31b8045 Added face culling control 2013-12-18 09:31:43 +01:00
Magne Sjaastad
a617c4a430 Added more control of face culling 2013-12-18 09:31:43 +01:00
Jacob Støren
473a49f83d Faults: Always show faults when showing Grid 
Always show the faults parts when showing the grid in the "normal" way.
If we do not, there will be holes in the model.
 2013-12-18 09:26:06 +01:00
Jacob Støren
8b52a43360 NNC: Typo in message 2013-12-18 09:20:53 +01:00
Jacob Støren
1639240240 Faults: Readded geometry fault generation 2013-12-17 13:28:13 +01:00
Jacob Støren
344ac7a146 Faults Guarded Fault neighbour calculation 2013-12-17 13:28:10 +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
Magne Sjaastad
decb0a756e Initialize cell scalar value 2013-12-17 12:19:29 +01:00
Magne Sjaastad
f6510210b0 Fix for null pointer 2013-12-17 11:52:53 +01:00
Magne Sjaastad
b53e21a61d Store filenames for files with faults in project file 2013-12-17 11:52:53 +01:00
Magne Sjaastad
40a4e0d0ab Added combined transmissibility to faults 2013-12-17 11:52:50 +01:00
Magne Sjaastad
a8497bec85 Created static method for update of texture coordinates 2013-12-17 11:52:48 +01:00
Magne Sjaastad
78699d52eb Added pick info on combined transmissibility 2013-12-17 11:52:45 +01:00
Magne Sjaastad
3cf1a0f32a Use helper function to get transmissibility scalar results 2013-12-17 11:52:44 +01:00
Magne Sjaastad
c32cf208f2 Removed redundant call 2013-12-17 11:52:42 +01:00
Magne Sjaastad
e824b8f7b0 Added special handling of combined transmissibility 2013-12-17 11:52:40 +01:00
Jacob Støren
57e136d50a NNC: Added some progress info 2013-12-16 15:57:15 +01:00
Jacob Støren
a39fe493f2 NNC: Fixed assert oposite face of NO_FACE 2013-12-16 15:56:57 +01:00
Jacob Støren
2a31035fb4 NNC: Added som diagnostics output 2013-12-16 14:26:07 +01:00
JacobStoren
880ab554f9 Linux compile fixes. Had to pull out the unused NNC search map. 2013-12-16 13:48:51 +01:00
Jacob Støren
7e2d860bba NNC: Tried to fix Linux typename compile issue 2013-12-16 11:40:50 +01:00
Jacob Støren
b6437d370c NNC: Fixed crash and made colorupdate work 2013-12-16 11:31:06 +01:00
Jacob Støren
56616097d3 NNC: Added preliminary Gui control 2013-12-16 11:29:48 +01:00
Jacob Støren
440499fbfd NNC: Add connection to both faults if different 2013-12-16 11:26:29 +01:00
Jacob Støren
925d5b5dd6 NNC: Added NNC parts to the FaultPartMgr 2013-12-14 09:48:13 +01:00
Jacob Støren
e75bd8adfb NNC: Distribute the NNC on the correct faults 
Making the NNC search map obsolete
 2013-12-14 09:48:10 +01:00
Jacob Støren
1e65a9db11 NNC: Added NNCGeometryGenerator 2013-12-14 09:48:06 +01:00
JacobStoren
d4f5dd6803 Fix of linux Compile warnings 2013-12-14 09:38:55 +01:00
Jacob Støren
bf6fba191e Moved Faluts to MainGrid. New fault calculation 
Now finding the uncovered geometrical faults and adds them to a separate
generated fault.
 2013-12-12 22:18:20 +01:00
Jacob Støren
e175a5c96f Refactored to use Cell::faceIndices 2013-12-12 22:18:14 +01:00
Jacob Støren
e171aa66ac NNC processing first cut 2013-12-12 22:18:11 +01:00
Jacob Støren
1be9f1996f Moved GeometryTools w tests to ReservoirDataModel 2013-12-12 22:18:06 +01:00
Jacob Støren
04ccadd2f1 NNC import started 2013-12-12 22:18:03 +01:00
Jacob Støren
81176258bc RigCell: Added faceIndices and faceNormal methods 2013-12-12 22:18:00 +01:00
Jacob Støren
df411efe3f Geometry tools: Made edgeIntersectStorage optional 2013-12-12 22:17:57 +01:00
Magne Sjaastad
e3135e8d08 Use back face culling on faults to avoid z-fighting issues 2013-12-10 11:31:10 +01:00
Magne Sjaastad
0a87811263 Show fault name in ResultInfo when picking 2013-12-10 08:26:49 +01:00
Magne Sjaastad
48d63495e5 Renamed to RivFaultPartMgr 2013-12-10 07:56:58 +01:00
Magne Sjaastad
07cac1367c Completed fault label color 2013-12-10 07:44:52 +01:00
Magne Sjaastad
98b9bdac03 Cleaned up fault viz config 2013-12-10 07:44:51 +01:00
Magne Sjaastad
1f210e36c1 Added handling of faults on higher level structures 2013-12-10 07:44:51 +01:00
Magne Sjaastad
9a958f3c95 Renamed fault part managers 2013-12-10 07:44:50 +01:00
Magne Sjaastad
d53e9aa9c1 Added global cell indices to faults and added optimalizations 2013-12-10 07:44:49 +01:00
Magne Sjaastad
5edcb1c161 Added label and label anchor line. Setting to control fault outside filter. 2013-12-10 07:44:49 +01:00
Magne Sjaastad
c8a4db6571 Added faults to mock models 2013-12-10 07:44:48 +01:00
Magne Sjaastad
30cc4b0194 Show gridlines for both native and opposite faults always 2013-12-10 07:44:48 +01:00
Magne Sjaastad
58c4a87c49 Added concept of native and opposite fault faces 2013-12-10 07:44:47 +01:00
Magne Sjaastad
1f208e3f53 Renaming 2013-12-10 07:44:46 +01:00
Magne Sjaastad
363d624d38 Use global cell indices instead of cell ranges 2013-12-10 07:44:46 +01:00
Magne Sjaastad
d515d0342b Added control flags to fault collection 2013-12-10 07:44:45 +01:00
Magne Sjaastad
6179d84b87 Use cell indices in RigBase 2013-12-10 07:44:45 +01:00
JacobStoren
5ca8911a68 Linux compile fixes 2013-12-09 15:48:55 +01:00
Jacob Støren
63e945fedf Fixed error in test 2013-12-09 09:40:05 +01:00
Jacob Støren
d80611a61c Geometry tools update finalizing with Unit tests 2013-12-06 14:23:51 +01:00
Jacob Støren
776ed7755e Improved FixedArray 2013-12-06 14:22:01 +01:00
Jacob Støren
819a2ab93e Wip 2013-12-05 11:02:05 +01:00
Jacob Støren
f92ca7fba7 Templatized some geometry tools 2013-12-05 11:02:02 +01:00
Jacob Støren
286bae9e85 Preparations for Templateification 2013-12-05 11:01:59 +01:00
Jacob Støren
d4345bef7d Preparations for Templatification 2013-12-05 11:01:57 +01:00
Jacob Støren
acef0c441d CMakeList error 2013-12-05 11:01:54 +01:00
Jacob Støren
05200fe01f Added MSVC ignores to .gitignore Start point of geometry fixes 2013-12-05 11:01:52 +01:00
JacobStoren
741debebd2 Fixed Linux compile issues 2013-12-05 10:48:57 +01:00
Magne Sjaastad
19737aa99a Use const access for FixedArray. Added sorting of faults 2013-12-05 09:59:05 +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
Jacob Støren
32da41faee Fixed compile errors in debug 2013-12-04 13:20:16 +01:00
Magne Sjaastad
2d22d31e12 Use several colors for faults to be able to separate them 2013-12-04 12:13:01 +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
Magne Sjaastad
3189437d5a Added color table array 2013-12-04 11:32:33 +01:00
Magne Sjaastad
f85b8aad08 Updated header 2013-12-04 09:39:50 +01:00
magnesj
65d9222d97 Fixes for Linux 2013-12-04 07:20:18 +01:00
Magne Sjaastad
12918ec107 Faults: Reading from Eclipse text files and basic visualization 
Added reading of faults directly from Eclipse text files
Added named faults in project tree
Added fault geompetry parts
Added test data
 2013-12-03 20:30:32 +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
Magne Sjaastad
4d46744783 Performance: Reduce memory use for riGetPropertyData 2013-11-08 14:27:21 +01:00
Magne Sjaastad
e47f2e6317 Performance: Added OpenMP to mock models 2013-11-08 10:34:05 +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
c0c78c8ada Use caf property dialog and removed obsolete riuPreferencesDialog 2013-10-28 12:50:39 +01:00
Magne Sjaastad
ae38128969 Improved mock model settings and use caf property dialog 2013-10-28 12:05:06 +01:00
Magne Sjaastad
93ba02c7db Added customized mock model to user interface 2013-10-28 10:32:24 +01:00
Magne Sjaastad
2315ab9014 Added flag to control adding of well data 2013-10-28 10:31:46 +01:00
Magne Sjaastad
e43bcd56b9 Added mock model settings 2013-10-28 10:30:58 +01:00
Magne Sjaastad
797e9df01d Moved mock model identicators to RimDefines 2013-10-28 07:30:00 +01:00
Magne Sjaastad
72b7936247 Updated copyright year and link to online documentation 2013-10-25 10:38:47 +02:00
Magne Sjaastad
7318780122 Renamed label in Regression Test dialog 
Updated doc for regression test and new dialog image
 2013-10-24 13:40:29 +02:00
Magne Sjaastad
3996f6442d Moved Debug menu to File->Testing 2013-10-24 13:08:19 +02:00
Magne Sjaastad
de476c38ce Added context menu for add case group 2013-10-24 11:10:33 +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
f6cb4baf7e Delete child object to fix memory leak 2013-10-24 09:53:27 +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
f145302206 SSIHUB: Copy cache well paths using setupBeforeSave() 2013-10-24 07:28:45 +02:00
Jacob Støren
538efff651 Grid Case Group: Relabeled "Cases" to "Source Cases" 2013-10-23 22:13:01 +02:00
Jacob Støren
ea855ceed2 User Doc: Finalized Wells and thereby Views 2013-10-23 18:14:08 +02:00
Jacob Støren
a5f4f2c7fd Added a better info box icon 2013-10-23 16:17:05 +02:00
Magne Sjaastad
f61731da74 Renaming to Info Box 2013-10-23 16:04:12 +02:00
Magne Sjaastad
8e32b8f770 Renaming 
Renamed simulated wells from Wells to Simulation Wells
Renamed group name for Well range filter
 2013-10-23 15:51:30 +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
bcc1482532 SSIHUB: Test if well path is selected before import 2013-10-23 08:30:48 +02:00
Magne Sjaastad
76ffd7e937 Well paths: Update display model after delete 2013-10-23 08:07:11 +02:00
Magne Sjaastad
9abc3387aa SSIHUB: Added visibility checkbox next to well path collection 2013-10-22 15:30:12 +02:00
Magne Sjaastad
89cd331489 Linux: QVariant has no overload for size_t 2013-10-22 11:28:14 +02:00
Magne Sjaastad
631353cf97 SSIHUB: Regions and well paths unselected by default 2013-10-22 08:54:48 +02:00
Magne Sjaastad
e2663d7db6 Removed obsolete command line parameter 2013-10-21 14:41:42 +02:00
Jacob Støren
9eb4b19384 Use the improved Ceetron Navigation 2013-10-20 00:42:14 +02:00
Magne Sjaastad
74f6b544ce Renaming related to import actions 2013-10-18 16:23:31 +02:00
Jacob Støren
1cce11f7f9 Add possible support for AllCell result in Result Cases 
See issue #99 and #100
 2013-10-18 14:27:37 +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
Jacob Støren
f7869f9a5c Ui brush-up of View property panel 2013-10-17 13:38:53 +02:00
Jacob Støren
63177ef234 Ui Brushup of Well property panels 2013-10-17 13:38:52 +02:00
Magne Sjaastad
4459fe0c71 Added ResInsightVersion.cmake to list of files. Removed redundant 
includes.
 2013-10-09 08:54:51 +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
606a14f9f7 Octave Interface: Tentative Fix of lockup of Resinsight 
Added a timer to call back if a signal from the socket has to be
ignored.
This way we should not loose signals and state.
Needs to be experienced over some time to be verified.
 2013-10-08 14:21:18 +02:00
Jacob Støren
d5fe84bfbb Octave Interface: Moved debug output macro to socket tools 
To make it available to all the SocketServer related classes.
 2013-10-08 14:18:23 +02:00
Jacob Støren
230561573e Merge branch 'internal' of https://github.com/OPM/ResInsight into internal 2013-10-08 13:51:48 +02:00
Jacob Støren
7701cef865 Octave interfance: GetActiveCellCenters GetActiveCellCorners Fixed wrong CaseId addressing 
Fixed Wrong CaseId addressing
 2013-10-08 13:41:30 +02:00
Magne Sjaastad
1d160d4f8a Use date function from ERT, as ecl_rsthead_date() can handle time step 
defined before 1970. This type of typesteps are often used in synthetic
cases.
 2013-10-08 13:33:02 +02:00
Magne Sjaastad
ab31222efa Octave: Use 1-based IJK for riGetWellCells 2013-10-08 13:07:14 +02:00
Magne Sjaastad
d1f8f383c4 ERT: Use 1-based ids for well branches and segments. Removed adding of 1 
in picking text info in RimReservoirView.

Integraded ERT from
0f9e820554
 2013-10-08 12:31:15 +02:00
Jacob Støren
12f3986d5f Octave interface: SocketServer Major review 
Simplified and made more readable. Hopefully more stable and robust.
 2013-10-07 11:47:09 +02:00
JacobStoren
3264520619 File paths: Convert native Win paths to use "/" 
On linux we need to convert filepaths produced on windows manually
before trying to find the relatively placed files referenced by the
project.
 2013-10-07 11:46:28 +02:00
Magne Sjaastad
3faa9d65a4 Set numeric locale to make sure parsing of text in ResInsight and 
dependant libraries (ERT) are robust to different userdefined system
locales.
 2013-10-07 11:28:57 +02:00
Magne Sjaastad
08b970d084 Normalize line endings 2013-10-07 09:07:27 +02:00
Jacob Støren
ca55d44884 Octave Interface: Fixed bugs riSetGridProperties riSetActiveCellProperty 
SetGridProp did not read all data (if -> while)
Both returned not finished while they could have been finished
 2013-10-04 14:36:34 +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
Magne Sjaastad
483b1a0fd9 RegressionTests: Open HTML report in browser 2013-10-04 08:11:22 +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
Jacob Støren
35f7b7db2f Added some comments on getting rid of QModelIndex based commands 2013-10-03 14:43:02 +02:00
Magne Sjaastad
0a3ce268ac Increased default number of significant digits to 4 2013-10-03 11:07:52 +02:00
Jacob Støren
56590a8c55 New Case groups is now correctly positioned in the tree. 
The context command was not quite up to speed.
 2013-10-02 15:51:25 +02:00
Jacob Støren
77285785fb Default file open dir on linux set to cwd 2013-10-01 12:04:36 +02:00
Jacob Støren
5e51ded9a9 Well Label Color: Added label color setting on Well Paths 2013-10-01 11:47:57 +02:00
Jacob Støren
2c546ea1e9 Linux/Win Line ending harmonization 2013-10-01 11:47:56 +02:00
Jacob Støren
a8f9851896 Well Label Color: Preferences for new views and color setting on well 
collection.
 2013-10-01 11:13:23 +02:00
Jacob Støren
567f16ad43 Removed Wellhead cell visualization if cell is not active 
Issue #63
 2013-09-30 15:22:48 +02:00
Magne Sjaastad
e02d2f2300 Performance: Recompute legend only when required 2013-09-30 13:29:29 +02:00
Jacob Støren
a5a1dfe701 Fixed Win Compile error. Missing include 2013-09-30 11:02:17 +02:00
Magne Sjaastad
af232d8c31 Debug: Added paint performance reporting from 'Debug->Paint Event 
Performance Test'
 2013-09-30 07:56:47 +02:00
Ceetron
7e4c793da5 Octave Interface: Yet more fix on multicase octave script exec. 2013-09-27 17:06:20 +02:00
Ceetron
6a7181e1d9 Octave Interface: Current Case is now interpreted correctly by Resinsight 
The method returning the current case had not been updated to do so.
Some debug output is also removed.
 2013-09-27 16:25:40 +02:00
Ceetron
26d5a7c5b0 Legend: Fixed legend numbers being completely wrong. 
The abs() function is only integer on linux RH5.
Caused legend numbers to be truncated (0 typically)
 2013-09-27 14:43:11 +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
227e3e6353 Hide all items for well path import in ResInsight project workspace 2013-09-27 07:29:01 +02:00
Jacob Støren
07f7ad82de Merge remote-tracking branch 'origin/internal' into internal 2013-09-26 15:43:22 +02:00
Jacob Støren
3f2fb1aadc Fixed Empty Environment Bug for Subprocesses 
QProcessEnvironment was used wrong
 2013-09-26 15:34:40 +02:00
Magne Sjaastad
517047c330 Added progress info when reading well path files 2013-09-26 14:49:28 +02:00
Magne Sjaastad
c30d3bb27e Use lowercase in 'utmzone' when asking for wells in area 
Show one progress dialog when downloading well paths
 2013-09-26 13:54:57 +02:00
Magne Sjaastad
24822a611e Show only selected items from field selection page in well selection 
page
 2013-09-26 12:21:15 +02:00
Jacob Støren
6f37a731fc Merge remote-tracking branch 'origin/internal' into internal 2013-09-26 11:44:04 +02:00
Magne Sjaastad
1f738a7ac9 Added sorting to tree items by clicking the header 
Added names to header
Renamed buttons to 'Download' and 'Import'
 2013-09-26 10:57:35 +02:00
Jacob Støren
a283d6ac23 Legend: Now number format is really based on number of Significant 
digits.
Brushed up the labels and organized the ui into two groups. Added some
tooltips as well.
 2013-09-26 10:44:20 +02:00
Magne Sjaastad
ee71af320f Show wells expanded 
Update enabled/disabled state for fields based on check state of parent
region
 2013-09-26 07:54:57 +02:00
Jacob Støren
a3d964e4eb Legend: Made number of digits after point be adjusted to show the number 
of significant digits defined by the user.
Not quite complete the solutions is. There are cornercases not covered
well yet.
* Fixed rounding error.
 2013-09-26 01:05:09 +02:00
Jacob Støren
1dcca6a6ed Added Blue white red, Red whit blue legends 2013-09-25 15:43:06 +02:00
Magne Sjaastad
f72c382a8d Merge branch 'internal' of https://magnesj@github.com/OPM/ResInsight.git into internal 2013-09-25 11:35:27 +02:00
Magne Sjaastad
854b588ca3 Updated CMakeLists and set region default unselected 2013-09-25 11:33:16 +02:00
Magne Sjaastad
5e6af679ba Changed project file extension to RSP 2013-09-25 09:36:01 +02:00
sigurdp
bcc33397a3 Adapted cmake files to new directory structure 2013-09-20 16:21:46 +02:00
sigurdp
7ea10201ec Changed file headers to include LGPL licensing. 2013-09-20 15:22:29 +02:00
Jacob Støren
0c19d50582 ResInsight: Move cafUiTreeItem.h 
p4#: 22497
 2013-09-20 09:28:36 +02:00
Magne Sjaastad
659bf3d6dc Added basic statistics case, will compute statistics on load 
p4#: 22419
 2013-09-16 07:55:35 +02:00
Magne Sjaastad
91adbe79bf Added support for asyncronous commands 
Implemented command to issue a recompute of statistics for a statistics case on project loading
p4#: 22417
 2013-09-16 07:42:30 +02:00
Jacob Støren
39178578de Octave Interface: Setting LD_LIBRARY_PATH on the octave process to make the oct files find the (possibly) embedded Qt libraries 
This should be the final adjustment to get rid of the resinsight startupscript
p4#: 22415
 2013-09-15 10:53:36 +02:00
Magne Sjaastad
4329d6de0f Process events to make active view set before executing Octave scripts 
p4#: 22404
 2013-09-13 11:01:29 +02:00
Magne Sjaastad
92408c7ec8 Make sure onProjectOpenedOrClosed() to set active view as Octave scripts depend on active view 
p4#: 22403
 2013-09-13 10:43:25 +02:00
Magne Sjaastad
5160c9bf86 Delete command objects in destructor 
p4#: 22402
 2013-09-13 10:42:27 +02:00
Magne Sjaastad
74b6b858d3 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:33 +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
7eac8f26d5 Changed visibility to public 
p4#: 22398
 2013-09-13 09:18:29 +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
18a05b7bff Fixed compiler warning 
p4#: 22392
 2013-09-12 13:56:01 +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
5cfd4bfe01 Only set preferences variables affecting the production of snapshots 
p4#: 22389
 2013-09-12 08:56:38 +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
f928ef87e8 Fixed bug in riGetPropertyData only returning values for the first time step 
https://github.com/OPM/ResInsight/issues/56
p4#: 22379
 2013-09-11 10:26:53 +02:00
Magne Sjaastad
5dbc15998f Fixed several compiler warning on Linux 
p4#: 22370
 2013-09-10 08:47:28 +02:00
Magne Sjaastad
7a9c488cdc Added Id to mock model 
p4#: 22367
 2013-09-10 07:15:45 +02:00
Magne Sjaastad
1a8f3d2555 Fixed segmentation fault for SetGridProperty with selected timestep 
See TP#4179
p4#: 22364
 2013-09-09 14:33:37 +02:00
Magne Sjaastad
303f832fac Fixed duplicate use of variable i 
p4#: 22361
 2013-09-09 11:48:23 +02:00
Jacob Støren
dbeabc3240 TP #4177: Context Toggle commands now toggles children if one parent is selected. 
THe command names are renamed as well, to make it more clear what is going on.
p4#: 22360
 2013-09-09 11:16:36 +02:00
Magne Sjaastad
4f70139dd4 Hide evaluation region from property filter, as this functionality is not implemented in application code 
p4#: 22356
 2013-09-09 09:13:45 +02:00
Jacob Støren
f0ddf37301 Started to use Update-display-model-And-Redraw scheduling system. 
First mainly for object toggle fields on well related objects, to avoid recreating the displaymode for each object toggeled by a multiselect command.
p4#: 22355
 2013-09-08 22:59:46 +02:00
Magne Sjaastad
3a77390b0a Context menu 'Delete All Well Paths' 
p4#: 22354
 2013-09-08 12:11:22 +02:00
Magne Sjaastad
7edac904d3 Test application updates 
p4#: 22353
 2013-09-08 11:53:22 +02:00
Magne Sjaastad
f0777bb8ac Set text edit in summary page to read only 
p4#: 22352
 2013-09-08 10:54:29 +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
00d9560885 Improved summary page 
p4#: 22350
 2013-09-08 10:05:24 +02:00
Magne Sjaastad
8bf263f1be Hide unselected regions on well selection page 
p4#: 22349
 2013-09-08 09:52:25 +02:00
Magne Sjaastad
8d1b5b7414 Moved parsing of well response from oil field object into wizard 
Fixed issue related to parsing of well plans
p4#: 22348
 2013-09-08 09:05:26 +02:00
Magne Sjaastad
e6386255e6 Use same pdm objects for field selection and well selection 
p4#: 22346
 2013-09-07 20:43:29 +02:00
Magne Sjaastad
76e2afb846 Remove regions/fields present on project file but not present on SSIHUB 
Set UTM input fields enabled/disabled based on UTM mode
p4#: 22344
 2013-09-07 19:38:52 +02:00
Jacob Støren
bb2af8269e Sceduled Update-display-model-And-Redraw system 
p4#: 22343
 2013-09-07 10:27:22 +02:00
Jacob Støren
c3c50ae62e Tree view Toggle Cmmands: Reimplemented to use PDM. Fixed missing update. 
p4#: 22342
 2013-09-07 10:18:28 +02:00
Magne Sjaastad
55337bd1b1 Updated link order to fix compile issues on Linuz 
p4#: 22339
 2013-09-06 16:07:09 +02:00
Magne Sjaastad
ca3fee6c34 Removed obsolete prototype code 
Cleaned up unused functions
p4#: 22338
 2013-09-06 15:59:25 +02:00
Jacob Støren
b0b24edeb9 Range/Property/Well Toggle fixes 
* Well cells are now toggled along with pipe geometry by the Well toggle in the tree view.
* TP# 4156 Range filter collection toggle does not work
This last one was really a huge error on several places in the overall logig of what is shown when.
p4#: 22337
 2013-09-06 15:45:21 +02:00
Jacob Støren
46f02f9384 Renaming and comments 
p4#: 22333
 2013-09-06 15:05:41 +02:00
Magne Sjaastad
86f5e6017d Integrated well import wizard in project file 
p4#: 22331
 2013-09-06 13:06:39 +02:00
Magne Sjaastad
3ee6d0838f Renamed to WellPathImportSsihub, and updated folder names 
p4#: 22329
 2013-09-06 11:34:24 +02:00
Magne Sjaastad
3208a74fbf Removed obsolete code to read data from ssihub 
p4#: 22328
 2013-09-06 11:25:55 +02:00
Jacob Støren
97bb848b1d Fix of GH#43 Assertion Fail for localGridIndex 
The grid number associated with an ert grid was an ID and not an index.
In addition: Fixed unrobustness handling wells with no data.
Now the /Troll/MSW_LGR/2BRANCHES-CCEWELLPATH-NEW-SCH-TUNED-AR3.EGRID file loads( Have tested only two timesteps ).
p4#: 22321
 2013-09-05 13:03:53 +02:00
Magne Sjaastad
3cf18d91fd If authentication fails, redirect to first wizard page 
Improved error handling
p4#: 22319
 2013-09-05 08:45:24 +02:00
Magne Sjaastad
d494a0b9c0 Added tree view editor to test project 
p4#: 22318
 2013-09-05 07:34:04 +02:00
Jacob Støren
e72318f348 Octave Interface: Added riGetWellCells 
p4#: 22310
 2013-09-04 12:57:36 +02:00
Magne Sjaastad
c396299810 Added testapplication 
p4#: 22308
 2013-09-04 12:20:41 +02:00
Jacob Støren
cac9d9d3f9 Octave Interface: Added riGetWellStatus 
p4#: 22301
 2013-09-04 08:03:11 +02:00
Magne Sjaastad
bc282106da Added data model for well import wizard 
Updated test application
p4#: 22265
 2013-09-02 08:39:29 +02:00
Jacob Støren
1e7c4a385a Buildsystem: Prefixed the resinsight vars to make them groupend and more accessible from the cmake gui. 
Also introduced an option to turn openmp on and off
p4#: 22257
 2013-08-30 15:37:29 +02:00
Jacob Støren
e0f5b15499 Octave interface: Added the path to ResInsight binary as search path for oct files in octave. 
p4#: 22256
 2013-08-30 15:35:28 +02:00
Jacob Støren
336eb56e3f Octave interface: Added riGetPropertyNames 
Not yet included in build system
p4#: 22253
 2013-08-30 15:26:35 +02:00
Jacob Støren
79c016b6b6 Wells: Improved output in Result info window when picking a well-cell 
p4#: 22241
 2013-08-28 15:36:29 +02:00
Jacob Støren
5e629795e4 MSW: Now using a stable offset for the small branches start point. 
Pulling the split point towards the first cell corner.
p4#: 22238
 2013-08-28 10:22:30 +02:00
Jacob Støren
2c985a1c2b MSW: Now using a stable offset for the small branches start point. 
Pulling the split point towards the first cell corner.
p4#: 22238
 2013-08-28 10:21:33 +02:00
Jacob Støren
dbb72475e5 MswRollUp: Final commit: Reapplying changes and bugfixes from trunk in conflicting files. 
The changes are from changelist numbers: 22190, 22189, 22154, 22151, 22141, 22124, 22010
Now It is supposed to compile again.
p4#: 22231
 2013-08-26 21:56:40 +02:00
Jacob Støren
6ca3afa609 MswRollUp: Use only closest connection above and below 
Added a lot of info to the positionContributions
Finally found a fairly ok method to calculate the positions, namely to
use only the closest connection above and below. Did also offset split
point positions somewhat, to make the small branches visible.

This is an intermediate commit and does not compile
p4#: 22230
 2013-08-26 15:28:34 +02:00
Jacob Støren
3f2037b783 MswRollUp: Handle previous well result points that is inside current cell 
This is an intermediate commit and does not compile
p4#: 22229
 2013-08-26 15:22:55 +02:00
Jacob Støren
1a285cebe0 MswRollUp: Guarded the interpolation against undefined pos 
This is an intermediate commit and does not compile
p4#: 22227
 2013-08-26 15:16:20 +02:00
Jacob Støren
d5aa8e4f30 MswRollUp: Principal fixes to the MSW algorithms 
Add point contributions even when it is undefined to store the segment below id, which is needed for the traversal.
The undefined positions comes from bottom end segments without connections.
Also cleaned up the the static well calculation
This is an intermediate commit and does not compile
p4#: 22226
 2013-08-26 15:10:34 +02:00
Jacob Støren
6ecfbdb8ee MswRollUp: Finally implemented through all the interpolation and segment position calculation. Completely untested 
This is an intermediate commit and does not compile
p4#: 22225
 2013-08-26 14:56:34 +02:00
Jacob Støren
d7d5d2942b MswRollUp: Updated Ert to commit 1fea6b00f3 master Fixed an Api change 
This is an intermediate commit and does not compile
p4#: 22222
 2013-08-26 14:44:03 +02:00
Jacob Støren
441ac1e3d9 MswRollUp: Start of fix of static well calculation 
This is an intermediate commit and does not compile
p4#: 22221
 2013-08-26 14:34:22 +02:00
Jacob Støren
b807a0e0ee MswRollUp: Removed obsolete code 
This is an intermediate commit and does not compile
p4#: 22220
 2013-08-26 14:27:39 +02:00
Jacob Støren
9f2bc4f1d0 MswRollUp: Made neighbour calculations handle cells on edge 
This is an intermediate commit and does not compile
p4#: 22219
 2013-08-26 14:22:20 +02:00
Jacob Støren
42408eda74 MswRollUp: Added some guarding to get the Troll_MSW case through. Needs some assert disabling in RigGridBase as well, but it is not included yet 
This is an intermediate commit and does not compile
p4#: 22218
 2013-08-26 14:21:21 +02:00
Jacob Støren
544d98b37e MswRollUp: Adding Branch start cell to start of branch 
This is an intermediate commit and does not compile
p4#: 22217
 2013-08-26 14:16:07 +02:00
Jacob Støren
e6dce28fa3 MswRollUp: Started to clean up the MSW code. 
This is an intermediate commit and does not compile
p4#: 22216
 2013-08-26 14:15:27 +02:00
Jacob Støren
27cac28b74 MswRollUp: Centerline calculation restoring and improvement 
This is an intermediate commit and does not compile
p4#: 22215
 2013-08-26 14:09:25 +02:00
Jacob Støren
f392f4457d MswRollUp: Splitted normal well and MSW handling. Got the Normal path to work fairly well. Some strangeties at the end of the pipes though 
This is an intermediate commit and does not compile
p4#: 22214
 2013-08-26 14:03:01 +02:00
Jacob Støren
b63f51921d MswRollUp: Updated Ert to experimental MSW branch. Updated ResInsight code to handle API changes 
067fa99faa
This is an intermediate commit and does not compile
p4#: 22212
 2013-08-26 13:56:42 +02:00
Magne Sjaastad
b31953eb4c Hide console window on Windows using a workaround described here 
http://public.kitware.com/Bug/view.php?id=14326
p4#: 22191
 2013-08-22 08:03:27 +02:00
Magne Sjaastad
627211685d Wellcollection can control if well head label is positioned at top active cell for IJ column or top Z of active cells bounding box 
p4#: 22190
 2013-08-22 07:55:21 +02:00
Magne Sjaastad
cbbc5ae80b Added ACTNUM to static results for binary Eclipse files 
p4#: 22189
 2013-08-22 07:45:28 +02:00
Magne Sjaastad
5580145bf9 Add keyword Name as identifier for a well in addition to well name given in quotes 
p4#: 22184
 2013-08-19 09:46:31 +02:00
Magne Sjaastad
744bbe9c2c Disable use of ecl_grid_cell_invalid 
p4#: 22154
 2013-08-13 11:20:31 +02:00
Magne Sjaastad
7d3ca2fb25 Avoid modifying x and y when computing z-value for well head pipe 
p4#: 22153
 2013-08-13 10:02:19 +02:00
Magne Sjaastad
cfb81a324b Fixed issue with missing well pipe geometry 
p4#: 22151
 2013-08-12 17:05:03 +02:00
Magne Sjaastad
89c67df963 Fixed issue with missing well pipe geometry 
p4#: 22151
 2013-08-12 17:04:31 +02:00
Magne Sjaastad
ee4e6aeed4 Use data access object for access to data structures in ResInsight 
p4#: 22144
 2013-08-12 10:04:30 +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
562dfb0135 Do not show well cells when wells are turned off 
Renaming
p4#: 22141
 2013-08-08 17:15:17 +02:00
Magne Sjaastad
e747804ef4 Well head arrow is starting at well cell located at top of the K column the well head exists in. 
This way all well heads are visible all the time, even when inactive cells are visible
p4#: 22140
 2013-08-08 17:03:17 +02:00
Magne Sjaastad
a8b7662d2f Rename 
p4#: 22138
 2013-08-08 15:19:16 +02:00
Magne Sjaastad
8f4e6da98b Include well cells in cell range region evaluation 
p4#: 22131
 2013-08-08 11:26:00 +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
ffb3d3e235 Rebuild inactive geometry when invalid state changes 
Show inactive/invalid cells also when using property filter, relevant for exclude filters
p4#: 22124
 2013-08-08 08:57:23 +02:00
Magne Sjaastad
008842a1ee Renamed cell filter field from active to isActive 
Removed the special handling of range filters when only exclude filters are active
p4#: 22123
 2013-08-08 08:49:29 +02:00
Magne Sjaastad
fea95940bf Fixed missing min/max value range for property filters when loading from project file 
p4#: 22105
 2013-08-07 09:00:09 +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
Magne Sjaastad
3f61c26f0b Updated file paths in regression tests 
p4#: 22097
 2013-08-06 09:52:01 +02:00
Magne Sjaastad
f2be4dedaf Fix for range filter exclude behaviour 
Use active cells as range include filter when there are range exclude filters present and no include filters
p4#: 22095
 2013-08-05 12:48:11 +02:00
Magne Sjaastad
ffbb0b6a46 Use a special flag to indicate hidden children of a field. 
Added new method in PdmUiItem called isUiHideChildren()
p4#: 22093
 2013-08-02 13:49:16 +02:00
Magne Sjaastad
50777b3e3f Fixed issue related to missing legend config 
Must hide legend config collection. Revisit when a more robust tree building strategy is in place.
p4#: 22092
 2013-08-02 13:04:25 +02:00
Jacob Støren
7112589e33 Statistics calculation : Paralellized and avoided some memory reallocation 
p4#: 22012
 2013-06-27 00:45:50 +02:00
Jacob Støren
4f7b3e703c Fixed Memory bug regarding statistics calcualtion 
The results memory on each timestep was not freed resulting in all the data from all the cases for all timesteps in memory at the same time ...
In addition, the data was read accidentaly before the timeloop for all the source cases for all timesteps.
So, should perform better now, but there still are some memory allocated in the start, that i cant quite account for.
p4#: 22011
 2013-06-26 23:34:03 +02:00
Jacob Støren
cff0437343 Some comments and indentation 
p4#: 22010
 2013-06-26 23:26:01 +02:00
Magne Sjaastad
390abe0f81 Use compare() because endsWith() does not work as expected on Windows 
p4#: 22005
 2013-06-26 12:01:53 +02:00
Jacob Støren
b5688c5cd9 Hack: Well label now rendered "under" transparent cells to workaround random behaviour (on certain hw ?) 
p4#: 22004
 2013-06-26 10:30:48 +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
094d4dc6c4 Made "Ceetron Navigation" the default navigation type 
p4#: 22000
 2013-06-26 09:01:43 +02:00
Jacob Støren
4be58edf78 MSW code reverted. Regrettfully the work has to be reconsidered. 
Both ERT and the resinsight code is rolled back to before MSW was introduced as refined.
p4#: 21999
 2013-06-25 15:53:19 +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
1ea5a49471 WellPaths: Added support for mulitple paths in one ascii file. 
p4#: 21980
 2013-06-24 22:04:52 +02:00
Magne Sjaastad
636fd39c2f Use branch ID to identify a branch on import 
p4#: 21979
 2013-06-24 16:41:01 +02:00
Jacob Støren
b59ac41509 Test of fix of MSW assert 
p4#: 21978
 2013-06-24 15:15:46 +02:00
Magne Sjaastad
5ea531783a Missed file in last checkin 
p4#: 21975
 2013-06-24 14:07:49 +02:00
Magne Sjaastad
f02d4b160e Use branch index and branch cell index to identify branch head 
Removed obsolete code
p4#: 21974
 2013-06-24 14:02:01 +02:00
Magne Sjaastad
12a0040473 Added well branch number and segment number to result info view 
p4#: 21968
 2013-06-21 16:20:11 +02:00
Jacob Støren
cd6d60d896 Ascii Well path import: Works for one path in one file 
p4#: 21966
 2013-06-21 15:59:04 +02:00
CeetronResInsight
139c80dfa0 Fixed missing newline at end of file 
p4#: 21958
 2013-06-18 13:26:38 +02:00
Magne Sjaastad
c8a537e180 Check for valid index before accessing data 
p4#: 21957
 2013-06-18 12:55:49 +02:00
Jacob Støren
5db88f4e03 Ascii import of Well Paths 
p4#: 21956
 2013-06-18 11:56:51 +02:00
Magne Sjaastad
2a2102837a Fixed missing last coordinate for filetered coords 
p4#: 21955
 2013-06-18 11:26:52 +02:00
Magne Sjaastad
16cd7a04ae Multi Segment Wells: Read in connection between a well branch and the branch head. 
Compute intersection point between branch top well cell and branch head in the main branch.
p4#: 21954
 2013-06-18 09:41:02 +02:00
Jacob Støren
fa410ba8a5 Fixed Animation Control problem on project open 
TP#4088
p4#: 21934
 2013-06-14 13:53:52 +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
Magne Sjaastad
7a24b2664e Updated ERT to handle multi segment wells 
Updated input code in ResInsight accordingly

ERT version on GitHub
067fa99faa
p4#: 21920
 2013-06-13 22:12:02 +02:00
Jacob Støren
6f04f70ade Fixed missing update of the 3D view after deleting statistic results 
p4#: 21894
 2013-06-12 13:42:36 +02:00
Jacob Støren
03ad142261 Removed debug output 
p4#: 21887
 2013-06-12 10:52:46 +02:00
Jacob Støren
a9d2baf117 Project/OilField: Made sure one and always one oilfield exists in a project. 
p4#: 21884
 2013-06-12 09:36:50 +02:00
Magne Sjaastad
12f1400733 Added missing Qt dependencies 
p4#: 21882
 2013-06-12 09:10:42 +02:00
Magne Sjaastad
68edafe5f4 Added checkbox to control import of survey and plan 
p4#: 21863
 2013-06-10 10:10:56 +02:00
Jacob Støren
a2aa9f3e7d Grid Models: Used the "Cases" icon 
p4#: 21855
 2013-06-07 15:01:47 +02:00
Jacob Støren
6ac8c4365f Project tree: Fixed several issues after the reconfiguration 
Missing Icon and text on the Grid Models folder
New cases and Grid Case Groups ended up outside the Grid Model Folder
Old Project files did not show up properly
p4#: 21854
 2013-06-07 14:54:02 +02:00
Jacob Støren
080fc4c094 Fixed some compiler warnings. 
p4#: 21853
 2013-06-07 14:15:13 +02:00
Vidar Lundberg
5cd4b13716 Add temporary icon for Grid Models in PDM, should create proper icon later. 
p4#: 21850
 2013-06-07 09:32:32 +02:00
Vidar Lundberg
cd08fc0356 Add temporary icon for Grid Models in PDM, should create proper icon later. 
p4#: 21850
 2013-06-07 09:32:06 +02:00
Vidar Lundberg
c3cd40d7eb Minor changes, changed logging to standard output when switching frame, e.g. fixed so that current frame number is shown correctly. 
p4#: 21848
 2013-06-06 16:37:35 +02:00
Vidar Lundberg
ceb5dd8470 Minor changes, adjusted so that well paths become thinner and clip well paths only 100 meters above reservoir. 
p4#: 21847
 2013-06-06 16:36:37 +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
Vidar Lundberg
691f24e7a7 Added include files because of known include problems related to PDM. 
p4#: 21845
 2013-06-06 15:02:35 +02:00
Magne Sjaastad
ec98af4354 Extract well path links from reply from request wells. 
Major code refactoring and cleanup
p4#: 21833
 2013-06-06 08:38:43 +02:00
Magne Sjaastad
1c02a392cd Hide characters from password field 
p4#: 21827
 2013-06-04 14:22:45 +02:00
Magne Sjaastad
0021e2f861 Improved logarithmic color legends for zero and negative values 
p4#: 21804
 2013-06-03 13:08:11 +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
724d283565 Added prototype of UTM area filtering 
p4#: 21788
 2013-05-31 15:37:52 +02:00
Magne Sjaastad
d371c58772 Missing include on Linux 
p4#: 21778
 2013-05-31 14:02:48 +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
ead2eac08b Read and display name when reading well paths 
p4#: 21770
 2013-05-31 08:47:03 +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
73f1b4052b Fix invalid case 
p4#: 21765
 2013-05-29 14:51:34 +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
1519ad0ad1 Fix for correct handling of pending socket connection requests 
p4#: 21759
 2013-05-29 10:07:35 +02:00
Magne Sjaastad
389247c17e Read command header in interpretCommand() 
p4#: 21756
 2013-05-28 16:02:00 +02:00
Magne Sjaastad
408795c0fc Test for ijk dimention match before reading data 
Whitespace fixup
p4#: 21749
 2013-05-28 11:11:32 +02:00
Magne Sjaastad
5bca9b28c1 Added riSetGridProperty 
Some known issues related to parsing of the Octave arguments
p4#: 21747
 2013-05-28 10:43:32 +02:00
Magne Sjaastad
1cfdb0ddb1 Write all double values in one go. Fixed argument parsing. 
p4#: 21746
 2013-05-28 09:20:09 +02:00
Magne Sjaastad
a7c49c0a31 Use ECLIPSE corner ordering 
p4#: 21743
 2013-05-27 15:38:33 +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
Jacob Støren
fe8c155b44 Octave interface: Compiling complete, but completely untested GetGridProperty. 
p4#: 21740
 2013-05-27 12:22:05 +02:00
Magne Sjaastad
2afca2bd5d Added current case to socket server. 
Fixed includes on Windows
p4#: 21725
 2013-05-26 21:55:05 +02:00
Jacob Støren
fbc02e79b0 Octave Interface: SetActiveCellProperty: Prettifying 
p4#: 21724
 2013-05-26 12:16:32 +02:00
Jacob Støren
1aa8857f4d Octave interface: SetActiveCellProperty: Now working according to spec. 
Not tested for Coarce Cells yet.
p4#: 21723
 2013-05-26 12:07:42 +02:00
Jacob Støren
f509e1803f Active CellInfo: Added concept of Cell Result Count 
p4#: 21721
 2013-05-26 11:59:59 +02:00
Jacob Støren
33bfb287d6 Octave Interface: Cleaned up code, and moved SetActiveCellProperties to the correct file 
p4#: 21716
 2013-05-24 12:02:52 +02:00
Jacob Støren
767c1d2409 Octave interface: Rebuilt the riSetActiveCellProperties command. 
Accept the new arguments, refactored to new framework, improved error handling.
Still needs to support specified timesteps and Grid Coarsening
p4#: 21713
 2013-05-24 11:36:59 +02:00
Magne Sjaastad
7ba9cef84b Moved socket commands into files grouped by case info, geometry, project info and property data 
p4#: 21712
 2013-05-24 11:07:59 +02:00
Magne Sjaastad
d9750b2dd4 Produce geometry for all cells, not per grid 
p4#: 21710
 2013-05-24 09:54:32 +02:00
Magne Sjaastad
5d2249aaea Produce geometry for all cells, not per grid 
p4#: 21710
 2013-05-24 09:54:00 +02:00
Magne Sjaastad
e5b1921bdf Reorganized data so ijk are the first three indexes in the receiving Octave arrays. 
Fixed a typo
p4#: 21708
 2013-05-24 08:48:36 +02:00
Magne Sjaastad
f556171bec Use read/write functions of the stream to increase performance 
p4#: 21699
 2013-05-23 11:55:33 +02:00
Magne Sjaastad
511ea74d4e Use read/write functions of the stream to increase performance 
p4#: 21698
 2013-05-23 11:29:34 +02:00
Magne Sjaastad
d5fd09f658 Added riGetCellCorners/riGetActiveCellCorners 
Updated how matrix is allocated in Octave for riGetCellCenters
p4#: 21697
 2013-05-23 11:02:10 +02:00
Magne Sjaastad
e4bc6c9339 Added riGetActiveCellCenters 
p4#: 21691
 2013-05-22 09:54:39 +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
Magne Sjaastad
4b7ff209f6 Added getCellCenters 
p4#: 21688
 2013-05-22 08:11:39 +02:00
Magne Sjaastad
8a6234690c Added GetCoarseningInfo 
Added coarse cells to mock model with results
p4#: 21686
 2013-05-21 21:03:05 +02:00
Magne Sjaastad
9df895ddc7 FIxed missing return statement 
p4#: 21685
 2013-05-21 20:43:03 +02:00
Magne Sjaastad
1d2e1dcce1 Cleanup of includes 
p4#: 21684
 2013-05-21 15:27:42 +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
Magne Sjaastad
eff924c630 Store coarsening boxes in RigGridBase 
Assign index to coarse cells back to coarse box they are a part of
p4#: 21675
 2013-05-21 11:10:59 +02:00
Magne Sjaastad
d6560d017e Added riGetGridDimensions 
p4#: 21664
 2013-05-16 15:16:51 +02:00
Magne Sjaastad
db18a855db Added GetTimeStepDays 
p4#: 21662
 2013-05-16 14:44:34 +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
Vidar Lundberg
704facc1c1 Added some includes to get well path changes to compile, this is related to PDM include problems. 
p4#: 21657
 2013-05-16 14:02:59 +02:00
Magne Sjaastad
2303f30200 Added RiaSocketCommands as placeholder for new commands 
Moved declaration to RiaSocketServer.h to be able to create new commands in other files
Added riGetTimeStepDates
p4#: 21655
 2013-05-16 13:43:37 +02:00
Jacob Støren
bb0c4c37c1 SocketServer: Moved GetProperty command to new regime. 
p4#: 21654
 2013-05-16 13:29:38 +02:00
Vidar Lundberg
86a53980a4 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.
p4#: 21652
 2013-05-16 13:06:00 +02:00
Vidar Lundberg
939c6ad156 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.
p4#: 21651
 2013-05-16 12:59:35 +02:00
Vidar Lundberg
4a0c3d7ca9 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.
p4#: 21651
 2013-05-16 12:59:01 +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
Vidar Lundberg
ac832866e6 Add Json parser based on code example found on: 
http://stackoverflow.com/questions/4169988/easiest-way-to-parse-json-in-qt-4-7
p4#: 21634
 2013-05-15 16:00:36 +02:00