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

#3450 LGR Export. Rename classes. Move command to completions tree node. One file per well

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-10-09 09:47:01 +02:00
parent c0bf63ea95
commit b0b366c243
8 changed files with 68 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/Commands/ExportCommands/CMakeLists_files.cmake
View File

@ -19,8 +19,8 @@ ${CMAKE_CURRENT_LIST_DIR}/RicSnapshotViewToFileFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicExportSelectedWellPathsFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicExportVisibleWellPathsFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicExportWellPathsUi.h
${CMAKE_CURRENT_LIST_DIR}/RicExportCarfinForCompletionsFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicExportCarfinForCompletionsUi.h
${CMAKE_CURRENT_LIST_DIR}/RicExportLgrFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicExportLgrUi.h
)
set (SOURCE_GROUP_SOURCE_FILES
@ -44,8 +44,8 @@ ${CMAKE_CURRENT_LIST_DIR}/RicSnapshotViewToFileFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicExportSelectedWellPathsFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicExportVisibleWellPathsFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicExportWellPathsUi.cpp
${CMAKE_CURRENT_LIST_DIR}/RicExportCarfinForCompletionsFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicExportCarfinForCompletionsUi.cpp
${CMAKE_CURRENT_LIST_DIR}/RicExportLgrFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicExportLgrUi.cpp
)
list(APPEND CODE_HEADER_FILES

61
ApplicationCode/Commands/ExportCommands/RicExportCarfinForCompletionsFeature.cpp → ApplicationCode/Commands/ExportCommands/RicExportLgrFeature.cpp
View File

@ -16,13 +16,13 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicExportCarfinForCompletionsFeature.h"
#include "RicExportLgrFeature.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "CompletionExportCommands/RicWellPathExportCompletionDataFeature.h"
#include "RicExportCarfinForCompletionsUi.h"
#include "RicExportLgrUi.h"
#include "RifEclipseDataTableFormatter.h"
@ -37,27 +37,29 @@
#include "RimWellPath.h"
#include "RimProject.h"
#include "RimWellPathCollection.h"
#include "RimWellPathCompletions.h"
#include "RiuPlotMainWindow.h"
#include <cafPdmUiPropertyViewDialog.h>
#include <cafSelectionManager.h>
#include <cafSelectionManagerTools.h>
#include <cafVecIjk.h>
#include <QAction>
#include <QFileInfo>
#include <QDir>
#include <QFile>
#include <QTextStream>
#include <cafPdmUiPropertyViewDialog.h>
#include <cafSelectionManager.h>
#include <cafSelectionManagerTools.h>
#include <cafVecIjk.h>
#include <cafUtils.h>
CAF_CMD_SOURCE_INIT(RicExportCarfinForCompletionsFeature, "RicExportCarfinForCompletionsFeature");
CAF_CMD_SOURCE_INIT(RicExportLgrFeature, "RicExportLgrFeature");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicExportCarfinForCompletionsUi* RicExportCarfinForCompletionsFeature::openDialog()
RicExportLgrUi* RicExportLgrFeature::openDialog()
{
RiaApplication* app = RiaApplication::instance();
RimProject* proj = app->project();
@ -69,7 +71,7 @@ RicExportCarfinForCompletionsUi* RicExportCarfinForCompletionsFeature::openDialo
startPath = fi.absolutePath();
}
RicExportCarfinForCompletionsUi* featureUi = app->project()->dialogData()->exportCarfinForCompletionsData();
RicExportLgrUi* featureUi = app->project()->dialogData()->exportLgrData();
if (featureUi->exportFolder().isEmpty())
{
featureUi->setExportFolder(startPath);
@ -104,7 +106,7 @@ RicExportCarfinForCompletionsUi* RicExportCarfinForCompletionsFeature::openDialo
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicExportCarfinForCompletionsFeature::openFileForExport(const QString& folderName, const QString& fileName, QFile* exportFile)
bool RicExportLgrFeature::openFileForExport(const QString& folderName, const QString& fileName, QFile* exportFile)
{
QDir exportFolder = QDir(folderName);
if (!exportFolder.exists())
@ -128,7 +130,7 @@ bool RicExportCarfinForCompletionsFeature::openFileForExport(const QString& fold
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportCarfinForCompletionsFeature::exportCarfin(QTextStream& stream, const std::map<RigCompletionDataGridCell, LgrInfo>& lgrInfos)
void RicExportLgrFeature::exportCarfin(QTextStream& stream, const std::map<RigCompletionDataGridCell, LgrInfo>& lgrInfos)
{
int count = 0;
for (auto lgr : lgrInfos)
@ -182,23 +184,23 @@ void RicExportCarfinForCompletionsFeature::exportCarfin(QTextStream& stream, con
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicExportCarfinForCompletionsFeature::isCommandEnabled()
bool RicExportLgrFeature::isCommandEnabled()
{
std::vector<RimWellPath*> wellPaths = caf::selectedObjectsByTypeStrict<RimWellPath*>();
std::vector<RimWellPathCompletions*> completions = caf::selectedObjectsByTypeStrict<RimWellPathCompletions*>();
return !wellPaths.empty();
return !completions.empty();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportCarfinForCompletionsFeature::onActionTriggered(bool isChecked)
void RicExportLgrFeature::onActionTriggered(bool isChecked)
{
std::vector<RimWellPath*> wellPaths = visibleWellPaths();
CVF_ASSERT(wellPaths.size() > 0);
std::vector<RimSimWellInView*> simWells;
QString dialogTitle = "Export Carfin";
QString dialogTitle = "LGR Export";
auto dialogData = openDialog();
if (dialogData)
@ -248,32 +250,33 @@ void RicExportCarfinForCompletionsFeature::onActionTriggered(bool isChecked)
lgrInfo.values = lgrValues;
lgrs.insert(std::make_pair(completionsForWell.first, lgrInfo));
}
// Export
QFile file;
QString fileName = caf::Utils::makeValidFileBasename(QString("LGR_%1.dat").arg(wellPath->name()));
openFileForExport(dialogData->exportFolder(), fileName, &file);
QTextStream stream(&file);
stream.setRealNumberNotation(QTextStream::FixedNotation);
stream.setRealNumberPrecision(2);
exportCarfin(stream, lgrs);
file.close();
}
}
// Export
QFile file;
openFileForExport(dialogData->exportFolder(), "CARFIN.dat", &file);
QTextStream stream(&file);
stream.setRealNumberNotation(QTextStream::FixedNotation);
stream.setRealNumberPrecision(2);
exportCarfin(stream, lgrs);
file.close();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportCarfinForCompletionsFeature::setupActionLook(QAction* actionToSetup)
void RicExportLgrFeature::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setText("Export Carfin");
actionToSetup->setText("LGR Export");
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimWellPath*> RicExportCarfinForCompletionsFeature::visibleWellPaths()
std::vector<RimWellPath*> RicExportLgrFeature::visibleWellPaths()
{
std::vector<RimWellPath*> wellPaths;

6
ApplicationCode/Commands/ExportCommands/RicExportCarfinForCompletionsFeature.h → ApplicationCode/Commands/ExportCommands/RicExportLgrFeature.h
View File

@ -25,7 +25,7 @@
class RimSimWellInView;
class RimWellPath;
class RicExportCarfinForCompletionsUi;
class RicExportLgrUi;
class QFile;
class QTextStream;
@ -48,11 +48,11 @@ public:
//==================================================================================================
///
//==================================================================================================
class RicExportCarfinForCompletionsFeature : public caf::CmdFeature
class RicExportLgrFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;
static RicExportCarfinForCompletionsUi* openDialog();
static RicExportLgrUi* openDialog();
static bool openFileForExport(const QString& folderName, const QString& fileName, QFile* exportFile);
static void exportCarfin(QTextStream& stream, const std::map<RigCompletionDataGridCell, LgrInfo>& lgrInfos);

36
ApplicationCode/Commands/ExportCommands/RicExportCarfinForCompletionsUi.cpp → ApplicationCode/Commands/ExportCommands/RicExportLgrUi.cpp
View File

@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicExportCarfinForCompletionsUi.h"
#include "RicExportLgrUi.h"
#include "RicCellRangeUi.h"
@ -27,7 +27,7 @@
#include "cafVecIjk.h"
CAF_PDM_SOURCE_INIT(RicExportCarfinForCompletionsUi, "RicExportCarfinForCompletionsUi");
CAF_PDM_SOURCE_INIT(RicExportLgrUi, "RicExportLgrUi");
//--------------------------------------------------------------------------------------------------
///
@ -35,19 +35,19 @@ CAF_PDM_SOURCE_INIT(RicExportCarfinForCompletionsUi, "RicExportCarfinForCompleti
namespace caf
{
template<>
void RicExportCarfinForCompletionsUi::LgrSplitTypeEnum::setUp()
void RicExportLgrUi::LgrSplitTypeEnum::setUp()
{
addItem(RicExportCarfinForCompletionsUi::PER_CELL_LGR, "PER_CELL_LGR", "LGR Per Cell");
addItem(RicExportCarfinForCompletionsUi::SINGLE_LGR, "SINGLE_LGR", "Single LGR");
addItem(RicExportLgrUi::PER_CELL_LGR, "PER_CELL_LGR", "LGR Per Cell");
addItem(RicExportLgrUi::SINGLE_LGR, "SINGLE_LGR", "Single LGR");
setDefault(RicExportCarfinForCompletionsUi::PER_CELL_LGR);
setDefault(RicExportLgrUi::PER_CELL_LGR);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicExportCarfinForCompletionsUi::RicExportCarfinForCompletionsUi()
RicExportLgrUi::RicExportLgrUi()
{
CAF_PDM_InitObject("Export CARFIN", "", "", "");
@ -66,7 +66,7 @@ RicExportCarfinForCompletionsUi::RicExportCarfinForCompletionsUi()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportCarfinForCompletionsUi::setCase(RimEclipseCase* rimCase)
void RicExportLgrUi::setCase(RimEclipseCase* rimCase)
{
bool isDifferent = (rimCase != m_caseToApply);
@ -80,7 +80,7 @@ void RicExportCarfinForCompletionsUi::setCase(RimEclipseCase* rimCase)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::VecIjk RicExportCarfinForCompletionsUi::lgrCellCount() const
caf::VecIjk RicExportLgrUi::lgrCellCount() const
{
return caf::VecIjk (m_cellCountI, m_cellCountJ, m_cellCountK);
}
@ -88,7 +88,7 @@ caf::VecIjk RicExportCarfinForCompletionsUi::lgrCellCount() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RicExportCarfinForCompletionsUi::exportFolder() const
QString RicExportLgrUi::exportFolder() const
{
return m_exportFolder();
}
@ -96,7 +96,7 @@ QString RicExportCarfinForCompletionsUi::exportFolder() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipseCase* RicExportCarfinForCompletionsUi::caseToApply() const
RimEclipseCase* RicExportLgrUi::caseToApply() const
{
return m_caseToApply();
}
@ -104,7 +104,7 @@ RimEclipseCase* RicExportCarfinForCompletionsUi::caseToApply() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicExportCarfinForCompletionsUi::singleLgrSplit() const
bool RicExportLgrUi::singleLgrSplit() const
{
return m_splitType == SINGLE_LGR;
}
@ -112,7 +112,7 @@ bool RicExportCarfinForCompletionsUi::singleLgrSplit() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportCarfinForCompletionsUi::setExportFolder(const QString& folder)
void RicExportLgrUi::setExportFolder(const QString& folder)
{
m_exportFolder = folder;
}
@ -120,7 +120,7 @@ void RicExportCarfinForCompletionsUi::setExportFolder(const QString& folder)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportCarfinForCompletionsUi::setDefaultValuesFromCase()
void RicExportLgrUi::setDefaultValuesFromCase()
{
if (m_caseToApply)
{
@ -136,7 +136,7 @@ void RicExportCarfinForCompletionsUi::setDefaultValuesFromCase()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RicExportCarfinForCompletionsUi::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
QList<caf::PdmOptionItemInfo> RicExportLgrUi::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
{
QList<caf::PdmOptionItemInfo> options;
@ -151,7 +151,7 @@ QList<caf::PdmOptionItemInfo> RicExportCarfinForCompletionsUi::calculateValueOpt
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportCarfinForCompletionsUi::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RicExportLgrUi::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if (changedField == &m_caseToApply)
{
@ -162,7 +162,7 @@ void RicExportCarfinForCompletionsUi::fieldChangedByUi(const caf::PdmFieldHandle
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportCarfinForCompletionsUi::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RicExportLgrUi::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
uiOrdering.add(&m_caseToApply);
uiOrdering.add(&m_exportFolder);
@ -176,7 +176,7 @@ void RicExportCarfinForCompletionsUi::defineUiOrdering(QString uiConfigName, caf
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportCarfinForCompletionsUi::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
void RicExportLgrUi::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
{
if (field == &m_exportFolder)
{

4
ApplicationCode/Commands/ExportCommands/RicExportCarfinForCompletionsUi.h → ApplicationCode/Commands/ExportCommands/RicExportLgrUi.h
View File

@ -33,7 +33,7 @@ namespace caf {
//==================================================================================================
///
//==================================================================================================
class RicExportCarfinForCompletionsUi : public caf::PdmObject
class RicExportLgrUi : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
@ -41,7 +41,7 @@ public:
enum LgrSplitType { PER_CELL_LGR, SINGLE_LGR};
typedef caf::AppEnum<LgrSplitType> LgrSplitTypeEnum;
RicExportCarfinForCompletionsUi();
RicExportLgrUi();
void setCase(RimEclipseCase* rimCase);

9
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -302,13 +302,6 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicWellPathExportCompletionDataFeature";
menuBuilder.subMenuEnd();
menuBuilder.subMenuStart("Export Well Paths");
menuBuilder << "RicExportSelectedWellPathsFeature";
menuBuilder << "RicExportVisibleWellPathsFeature";
menuBuilder.subMenuEnd();
menuBuilder << "RicExportCarfinForCompletionsFeature";
if ( dynamic_cast<RimModeledWellPath*>(uiItem) )
{
menuBuilder << "RicShowWellPlanFeature";
@ -769,7 +762,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder.subMenuEnd();
}
menuBuilder << "RicExportCarfinForCompletionsFeature";
menuBuilder << "RicExportLgrFeature";
}
menuBuilder << "RicCreateMultipleFracturesFeature";

10
ApplicationCode/ProjectDataModel/RimDialogData.cpp
View File

@ -23,7 +23,7 @@
#include "FractureCommands/RicCreateMultipleFracturesUi.h"
#include "HoloLensCommands/RicHoloLensExportToFolderUi.h"
#include "ExportCommands/RicExportWellPathsUi.h"
#include "ExportCommands/RicExportCarfinForCompletionsUi.h"
#include "ExportCommands/RicExportLgrUi.h"
CAF_PDM_SOURCE_INIT(RimDialogData, "RimDialogData");
@ -49,8 +49,8 @@ RimDialogData::RimDialogData()
CAF_PDM_InitFieldNoDefault(&m_exportWellPathsData, "ExportwellPathsData", "Export Well Paths Data", "", "", "");
m_exportWellPathsData = new RicExportWellPathsUi();
CAF_PDM_InitFieldNoDefault(&m_exportCarfinForCompletionsData, "ExportCarfinForCompletions", "Export Carfin", "", "", "");
m_exportCarfinForCompletionsData = new RicExportCarfinForCompletionsUi();
CAF_PDM_InitFieldNoDefault(&m_exportLgrData, "ExportLgr", "LGR Export", "", "", "");
m_exportLgrData = new RicExportLgrUi();
}
//--------------------------------------------------------------------------------------------------
@ -121,8 +121,8 @@ RicExportWellPathsUi* RimDialogData::wellPathsExportData() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicExportCarfinForCompletionsUi* RimDialogData::exportCarfinForCompletionsData() const
RicExportLgrUi* RimDialogData::exportLgrData() const
{
return m_exportCarfinForCompletionsData;
return m_exportLgrData;
}

6
ApplicationCode/ProjectDataModel/RimDialogData.h
View File

@ -26,7 +26,7 @@ class RicExportCompletionDataSettingsUi;
class RiuCreateMultipleFractionsUi;
class RicHoloLensExportToFolderUi;
class RicExportWellPathsUi;
class RicExportCarfinForCompletionsUi;
class RicExportLgrUi;
//==================================================================================================
///
@ -56,7 +56,7 @@ public:
RiuCreateMultipleFractionsUi* multipleFractionsData() const;
RicHoloLensExportToFolderUi* holoLensExportToFolderData() const;
RicExportWellPathsUi* wellPathsExportData() const;
RicExportCarfinForCompletionsUi* exportCarfinForCompletionsData() const;
RicExportLgrUi* exportLgrData() const;
private:
caf::PdmChildField<RicExportCarfinUi*> m_exportCarfin;
@ -64,5 +64,5 @@ private:
caf::PdmChildField<RiuCreateMultipleFractionsUi*> m_multipleFractionsData;
caf::PdmChildField<RicHoloLensExportToFolderUi*> m_holoLenseExportToFolderData;
caf::PdmChildField<RicExportWellPathsUi*> m_exportWellPathsData;
caf::PdmChildField<RicExportCarfinForCompletionsUi*> m_exportCarfinForCompletionsData;
caf::PdmChildField<RicExportLgrUi*> m_exportLgrData;
};