OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-11 07:56:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move export to frk command from model plot to model.

Browse Source
This commit is contained in:
Kristian Bendiksen 2020-10-19 09:41:05 +02:00
parent 7d456f1cbb
commit 390dbe5cc5
8 changed files with 28 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/CMakeLists_files.cmake
View File

@ -88,7 +88,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicDeleteTemporaryLgrsFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicExportContourMapToTextFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicExportContourMapToTextUi.h
${CMAKE_CURRENT_LIST_DIR}/RicNewMultiPlotFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicExportFractureModelPlotToFileFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicExportFractureModelToFileFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicStackSelectedCurvesFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicUnstackSelectedCurvesFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicThemeColorEditorFeature.h
@ -184,7 +184,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicDeleteTemporaryLgrsFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicExportContourMapToTextFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicExportContourMapToTextUi.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewMultiPlotFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicExportFractureModelPlotToFileFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicExportFractureModelToFileFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicStackSelectedCurvesFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicUnstackSelectedCurvesFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicThemeColorEditorFeature.cpp

28
ApplicationCode/Commands/RicExportFractureModelPlotToFileFeature.cpp → ApplicationCode/Commands/RicExportFractureModelToFileFeature.cpp
View File

@ -16,28 +16,27 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicExportFractureModelPlotToFileFeature.h"
#include "RicExportFractureModelToFileFeature.h"
#include "RiaApplication.h"
#include "RimFractureModel.h"
#include "RimFractureModelPlot.h"
#include "RiuFileDialogTools.h"
#include "RifFractureModelPlotExporter.h"
#include "RifFractureModelExporter.h"
#include "cafSelectionManager.h"
#include "cafUtils.h"
#include <QAction>
CAF_CMD_SOURCE_INIT( RicExportFractureModelPlotToFileFeature, "RicExportFractureModelPlotToFileFeature" );
CAF_CMD_SOURCE_INIT( RicExportFractureModelToFileFeature, "RicExportFractureModelToFileFeature" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicExportFractureModelPlotToFileFeature::isCommandEnabled()
bool RicExportFractureModelToFileFeature::isCommandEnabled()
{
return true;
}
@ -45,32 +44,29 @@ bool RicExportFractureModelPlotToFileFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportFractureModelPlotToFileFeature::onActionTriggered( bool isChecked )
void RicExportFractureModelToFileFeature::onActionTriggered( bool isChecked )
{
RimFractureModelPlot* fractureModelPlot =
caf::SelectionManager::instance()->selectedItemOfType<RimFractureModelPlot>();
if ( !fractureModelPlot ) return;
RimFractureModel* fractureModel = caf::SelectionManager::instance()->selectedItemOfType<RimFractureModel>();
if ( !fractureModel ) return;
RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory( "FRACTURE_MODEL_PLOT" );
QString defaultDir = app->lastUsedDialogDirectory( "FRACTURE_MODEL_EXPORT" );
QString directoryPath =
RiuFileDialogTools::getExistingDirectory( nullptr, "Select Directory for Fracture Model Plot Export", defaultDir );
RiuFileDialogTools::getExistingDirectory( nullptr, "Select Directory for Fracture Model Export", defaultDir );
if ( directoryPath.isEmpty() ) return;
RifFractureModelPlotExporter::writeToDirectory( fractureModelPlot->fractureModel(),
fractureModelPlot->fractureModel()->useDetailedFluidLoss(),
directoryPath );
RifFractureModelExporter::writeToDirectory( fractureModel, fractureModel->useDetailedFluidLoss(), directoryPath );
// Remember the path to next time
app->setLastUsedDialogDirectory( "FRACTURE_MODEL_PLOT", directoryPath );
app->setLastUsedDialogDirectory( "FRACTURE_MODEL_EXPORT", directoryPath );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportFractureModelPlotToFileFeature::setupActionLook( QAction* actionToSetup )
void RicExportFractureModelToFileFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Export Fracture Model to File" );
actionToSetup->setIcon( QIcon( ":/Save.svg" ) );

2
ApplicationCode/Commands/RicExportFractureModelPlotToFileFeature.h → ApplicationCode/Commands/RicExportFractureModelToFileFeature.h
View File

@ -23,7 +23,7 @@
//==================================================================================================
///
//==================================================================================================
class RicExportFractureModelPlotToFileFeature : public caf::CmdFeature
class RicExportFractureModelToFileFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;

4
ApplicationCode/FileInterface/CMakeLists_files.cmake
View File

@ -54,7 +54,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RifSurfaceImporter.h
${CMAKE_CURRENT_LIST_DIR}/RifRoffReader.h
${CMAKE_CURRENT_LIST_DIR}/RifColorLegendData.h
${CMAKE_CURRENT_LIST_DIR}/RifElasticPropertiesReader.h
${CMAKE_CURRENT_LIST_DIR}/RifFractureModelPlotExporter.h
${CMAKE_CURRENT_LIST_DIR}/RifFractureModelExporter.h
${CMAKE_CURRENT_LIST_DIR}/RifFractureModelGeologicalFrkExporter.h
${CMAKE_CURRENT_LIST_DIR}/RifFractureModelDeviationFrkExporter.h
${CMAKE_CURRENT_LIST_DIR}/RifFractureModelPerfsFrkExporter.h
@ -119,7 +119,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RifSurfaceImporter.cpp
${CMAKE_CURRENT_LIST_DIR}/RifRoffReader.cpp
${CMAKE_CURRENT_LIST_DIR}/RifColorLegendData.cpp
${CMAKE_CURRENT_LIST_DIR}/RifElasticPropertiesReader.cpp
${CMAKE_CURRENT_LIST_DIR}/RifFractureModelPlotExporter.cpp
${CMAKE_CURRENT_LIST_DIR}/RifFractureModelExporter.cpp
${CMAKE_CURRENT_LIST_DIR}/RifFractureModelGeologicalFrkExporter.cpp
${CMAKE_CURRENT_LIST_DIR}/RifFractureModelDeviationFrkExporter.cpp
${CMAKE_CURRENT_LIST_DIR}/RifFractureModelPerfsFrkExporter.cpp

10
ApplicationCode/FileInterface/RifFractureModelPlotExporter.cpp → ApplicationCode/FileInterface/RifFractureModelExporter.cpp
View File

@ -16,21 +16,21 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RifFractureModelPlotExporter.h"
#include "RifFractureModelExporter.h"
#include "RifFractureModelAsymmetricFrkExporter.h"
#include "RifFractureModelDeviationFrkExporter.h"
#include "RifFractureModelGeologicalFrkExporter.h"
#include "RifFractureModelPerfsFrkExporter.h"
#include "RimFractureModelPlot.h"
#include "RimFractureModel.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifFractureModelPlotExporter::writeToDirectory( RimFractureModel* fractureModel,
bool useDetailedFluidLoss,
const QString& directoryPath )
bool RifFractureModelExporter::writeToDirectory( RimFractureModel* fractureModel,
bool useDetailedFluidLoss,
const QString& directoryPath )
{
return RifFractureModelGeologicalFrkExporter::writeToFile( fractureModel,
useDetailedFluidLoss,

2
ApplicationCode/FileInterface/RifFractureModelPlotExporter.h → ApplicationCode/FileInterface/RifFractureModelExporter.h
View File

@ -27,7 +27,7 @@ class QTextStream;
//==================================================================================================
//
//==================================================================================================
class RifFractureModelPlotExporter
class RifFractureModelExporter
{
public:
static bool writeToDirectory( RimFractureModel* fractureModel, bool useDetailedFluidLoss, const QString& directoryPath );

8
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -445,6 +445,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
{
menuBuilder << "RicNewFractureModelFeature";
menuBuilder << "RicNewFractureModelPlotFeature";
menuBuilder << "RicExportFractureModelToFileFeature";
}
}
else if ( dynamic_cast<RimFractureModelCollection*>( firstUiItem ) )
@ -454,13 +455,6 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicNewFractureModelFeature";
}
}
else if ( dynamic_cast<RimFractureModelPlot*>( firstUiItem ) )
{
if ( RiaApplication::enableDevelopmentFeatures() )
{
menuBuilder << "RicExportFractureModelPlotToFileFeature";
}
}
else if ( dynamic_cast<Rim3dWellLogCurveCollection*>( firstUiItem ) ||
dynamic_cast<Rim3dWellLogExtractionCurve*>( firstUiItem ) ||
dynamic_cast<Rim3dWellLogFileCurve*>( firstUiItem ) ||

8
ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlot.cpp
View File

@ -17,7 +17,7 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RimcFractureModelPlot.h"
#include "RifFractureModelPlotExporter.h"
#include "RifFractureModelExporter.h"
#include "RimFractureModel.h"
#include "RimFractureModelPlot.h"
@ -44,9 +44,9 @@ caf::PdmObjectHandle* RimcFractureModelPlot_exportToFile::execute()
{
RimFractureModelPlot* fractureModelPlot = self<RimFractureModelPlot>();
RifFractureModelPlotExporter::writeToDirectory( fractureModelPlot->fractureModel(),
fractureModelPlot->fractureModel()->useDetailedFluidLoss(),
m_directoryPath() );
RifFractureModelExporter::writeToDirectory( fractureModelPlot->fractureModel(),
fractureModelPlot->fractureModel()->useDetailedFluidLoss(),
m_directoryPath() );
return nullptr;
}