mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-24 22:27:55 -05:00
Kristian Bendiksen
4977941896
- Return std::expected from RimSurfaceCollection::importSurfacesFromFiles with a message naming the files that could not be imported - Return specific errors from ImportSurface and NewSurface scripting methods instead of nullptr - Import before deleting the surface to overwrite, so a failed overwrite keeps the existing surface - Catch surfio exceptions in RifSurfio to avoid a crash on corrupt files - Include the method name in the generic "no result" gRPC error - Add Python tests for import_surface error handling
101 lines
3.5 KiB
C++
101 lines
3.5 KiB
C++
/////////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Copyright (C) 2020- 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.
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////////////
|
|
|
|
#include "RicImportSurfacesFeature.h"
|
|
|
|
#include "RicNewGenericDataViewFeature.h"
|
|
|
|
#include "RiaApplication.h"
|
|
|
|
#include "RimSurface.h"
|
|
#include "RimSurfaceCollection.h"
|
|
#include "RimTools.h"
|
|
|
|
#include "Riu3DMainWindowTools.h"
|
|
#include "RiuFileDialogTools.h"
|
|
|
|
#include "cafSelectionManagerTools.h"
|
|
#include "cafUtils.h"
|
|
|
|
#include <QAction>
|
|
#include <QFileInfo>
|
|
|
|
CAF_CMD_SOURCE_INIT( RicImportSurfacesFeature, "RicImportSurfacesFeature" );
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
void RicImportSurfacesFeature::onActionTriggered( bool isChecked )
|
|
{
|
|
RiaApplication* app = RiaApplication::instance();
|
|
QString defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" );
|
|
|
|
QString generalExtensions = "*.ptl *.ts *.dat *.xyz";
|
|
QString irapExtensions = "*.irap *.gri";
|
|
QString vtkExtensions = "*.vtu *.pvd";
|
|
QString allExtensions = generalExtensions + " " + irapExtensions + " " + vtkExtensions;
|
|
|
|
QString dialogFilter = QString( "Surface files (%1);;VTK files (%2);;IRAP GRI files (%3);;All Files (*.*)" )
|
|
.arg( allExtensions )
|
|
.arg( vtkExtensions )
|
|
.arg( irapExtensions );
|
|
|
|
QStringList fileNames =
|
|
RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(), "Import Surfaces", defaultDir, dialogFilter );
|
|
|
|
if ( fileNames.isEmpty() ) return;
|
|
|
|
// Remember the path to next time
|
|
app->setLastUsedDialogDirectory( "BINARY_GRID", QFileInfo( fileNames.last() ).absolutePath() );
|
|
|
|
// Find the selected SurfaceCollection
|
|
RimSurfaceCollection* surfColl = nullptr;
|
|
{
|
|
std::vector<RimSurfaceCollection*> colls = caf::selectedObjectsByTypeStrict<RimSurfaceCollection*>();
|
|
if ( !colls.empty() )
|
|
{
|
|
surfColl = colls.front();
|
|
}
|
|
}
|
|
|
|
if ( !surfColl )
|
|
{
|
|
surfColl = RimTools::surfaceCollection();
|
|
}
|
|
|
|
if ( !surfColl ) return;
|
|
|
|
auto lastCreatedOrUpdated = surfColl->importSurfacesFromFiles( fileNames );
|
|
|
|
if ( lastCreatedOrUpdated )
|
|
{
|
|
RicNewGenericDataViewFeature::createInitialViewIfNeeded();
|
|
|
|
Riu3DMainWindowTools::selectAsCurrentItem( lastCreatedOrUpdated.value() );
|
|
}
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
void RicImportSurfacesFeature::setupActionLook( QAction* actionToSetup )
|
|
{
|
|
actionToSetup->setIcon( QIcon( ":/ReservoirSurfaces16x16.png" ) );
|
|
actionToSetup->setText( "Import Surfaces" );
|
|
}
|