Commit Graph

25 Commits

Author SHA1 Message Date
Jon Jenssen
42ab0485bd Make sure we refresh the scene after setting a new color legend, not before 2020-08-28 08:48:02 +02:00
Magne Sjaastad
6bd99fcbea Merge remote-tracking branch 'origin/2020.04-patch-02' into dev 2020-08-24 08:33:16 +02:00
Magne Sjaastad
afa8804e5b #6345 Use wrapper class instead of QFileDialog 2020-08-24 08:26:39 +02:00
Magne Sjaastad
665b475e9f #6345 Use wrapper class instead of QFileDialog 2020-08-24 08:10:49 +02:00
Magne Sjaastad
860e6d54a9 Make Linux happy
Use correct type
Remove unused variable
Fix placement of local variable
2020-08-06 11:20:17 +02:00
Magne Sjaastad
058573b391 #5961 Color Legend : Set legend only when required 2020-08-06 11:20:17 +02:00
Magne Sjaastad
e069dfe9cc #5961 Color Legend : Creation custom color legend only when required 2020-08-06 11:20:17 +02:00
Stein Inge Dale
0424202461 WIP: Color legend: import of lyr file with colors should generate custom color legend #5961
Work in progress:
- lacks support of views other than Eclipse views
- signature of RicImportFormationNamesFeature::importFormationFiles()
- reconsideration of variable names
2020-08-06 11:20:17 +02:00
Kristian Bendiksen
c016c02e40 Replace RiaApplication::instance()->project() with RimProject::current().
Also remove uneccessary includes of RiaApplication.h.
2020-05-12 12:01:44 +02:00
Magne Sjaastad
c82df63e10 #5101 clang-format: Adjusted penalties
Use lower absolute values to improve control of behavior
2020-02-12 13:35:31 +01:00
Magne Sjaastad
7d05a8bd0a #5300 Formations : Fix update issues 2020-01-06 14:33:54 +01:00
Magne Sjaastad
6d7b29bb29 #4893 Formations : Make sure "layer_zone_table.txt" is defined once 2019-10-18 14:45:12 +02:00
Gaute Lindkvist
79da8ba5b5 #4773 Ensemble RFT: load formation file when loading observed data 2019-09-26 15:43:13 +02:00
Magne Sjaastad
fe9e567825 #4683 clang-format on all files in ApplicationCode 2019-09-06 10:57:22 +02:00
Gaute Lindkvist
b095ac7226 #4480 Add code for import of layer_zone_table.txt and enable manual import. 2019-07-26 10:40:12 +02:00
Magne Sjaastad
dbdac69cff #4273 Plot Main Window : Avoid project tree is collapsed when formations are imported 2019-04-03 08:38:21 +02:00
Gaute Lindkvist
2e0cd60fc4 #2466 Fix the one occurence of non-guarded activeReservoirView access found. 2018-05-15 11:31:23 +02:00
Jacob Støren
267e3ef59d #2535 Use the MainWindowTools class instead of MainWindow directly (part 4) 2018-02-27 16:46:53 +01:00
Jacob Støren
cb6d49a611 #2331 Renamed RimView to Rim3dView 2018-01-09 10:11:28 +01:00
Rebecca Cox
a5300032e9 #2213 Formations: Select formation on a case, only if a single file is imported 2017-12-01 15:39:54 +01:00
Rebecca Cox
a2a7155d1c #2213 Formations: On import, set formation on active case 2017-12-01 13:31:12 +01:00
Rebecca Cox
3eaeba8f67 #2025 Formations : Use imported formation names by default when sensible 2017-10-20 16:10:48 +02:00
Rebecca Cox
9bd60ebec2 #2027 Select formation name on formation name import 2017-10-20 14:34:56 +02:00
Magne Sjaastad
33abbed1fd #882 RiaApplication : Renamed to lastUsedDialogDirectory and added currentProjectPath. Use project path as fallback path for LAS export 2016-09-21 09:46:17 +02:00
Jacob Støren
b46c6ebcf8 #809 Created Formation Names project items.
#819 Added delete command to Formation names
#808 Added an import Formation Names command
2016-08-24 08:30:12 +02:00