mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-26 23:20:29 -05:00
#13889: Import zone colors from stratigraphy.json and zones from yaml
Import zone colors from an FMU stratigraphy.json file located next to the formation files, and import formation zones from a yaml file. - Add RifFormationNamesFileParser and move the layer zone table, yaml and stratigraphy.json parsers there from RifFormationNamesReader. - Return std::expected from convertStringToColor. - Prefer zonation_ecl_map yaml when several yaml files are present, and ignore other yaml files. - Document the FMU location of the formation files. - Add unit tests and test data for fmu, malformed and missing-color inputs. Issues: #13889, #13888
This commit is contained in:
1 parent
c04edc9d39
commit
fd0ec10d6b
18 files changed
+742
-235
No files matched your search
@@ -0,0 +1,46 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) Equinor ASA
|
||||
//
|
||||
// ResInsight is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
// FITNESS FOR A PARTICULAR PURPOSE.
|
||||
//
|
||||
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
||||
// for more details.
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
#pragma once
|
||||
|
||||
#include "RigFormationNames.h"
|
||||
|
||||
#include "cvfColor3.h"
|
||||
|
||||
#include <expected>
|
||||
#include <map>
|
||||
|
||||
#include <QString>
|
||||
|
||||
//==================================================================================================
|
||||
/// Parsers for the individual formation name file formats. Use RifFormationNamesReader to read a
|
||||
/// file based on its name.
|
||||
//==================================================================================================
|
||||
class RifFormationNamesFileParser
|
||||
{
|
||||
public:
|
||||
// Reads zone/subzone colors from a stratigraphy.json file. Subzone colors take precedence over zone colors.
|
||||
[[nodiscard]] static std::expected<std::map<QString, cvf::Color3f>, QString> readStratigraphyColors( const QString& fileName );
|
||||
|
||||
[[nodiscard]] static std::expected<RigFormationNames, QString> readLyrFormationNameFile( const QString& fileName );
|
||||
[[nodiscard]] static std::expected<RigFormationNames, QString>
|
||||
readFmuFormationNameFile( const QString& fileName, const std::map<QString, cvf::Color3f>& colors = {} );
|
||||
[[nodiscard]] static std::expected<RigFormationNames, QString>
|
||||
readYamlFormationNameFile( const QString& fileName, const std::map<QString, cvf::Color3f>& colors = {} );
|
||||
|
||||
[[nodiscard]] static std::expected<cvf::Color3f, QString> convertStringToColor( const QString& word );
|
||||
};
|
||||
Reference in new issue
Block a user