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

Merge pull request #5236 from OPM/cherrypick-from-release

Browse Source 
Cherrypick several fixes from release branch
This commit is contained in:
Magne Sjaastad 2019-12-17 12:05:14 +01:00 committed by GitHub
commit d65c84049d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 69 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/Application/Tools/RiaImportEclipseCaseTools.cpp
View File

@ -158,6 +158,15 @@ bool RiaImportEclipseCaseTools::openEclipseCasesFromFile( const QStringList& fil
{
if ( summaryCurve )
{
if ( summaryCurve->summaryCaseX() == existingSummaryCase )
{
summaryCurve->setSummaryCaseX( newSumCase );
}
if ( summaryCurve->summaryCaseY() == existingSummaryCase )
{
summaryCurve->setSummaryCaseY( newSumCase );
}
RimSummaryCurveCollection* parentCollection = nullptr;
summaryCurve->firstAncestorOrThisOfType( parentCollection );
if ( parentCollection )

5
ApplicationCode/Commands/PlotTemplateCommands/RicSelectPlotTemplateUi.cpp
View File

@ -55,7 +55,10 @@ std::vector<RimPlotTemplateFileItem*> RicSelectPlotTemplateUi::selectedPlotTempl
for ( const auto& a : m_selectedPlotTemplates() )
{
objs.push_back( a );
if ( a )
{
objs.push_back( a );
}
}
return objs;

10
ApplicationCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp
View File

@ -330,15 +330,15 @@ QString RicSummaryPlotTemplateTools::htmlTextFromCount( const QString& itemText,
//--------------------------------------------------------------------------------------------------
QString RicSummaryPlotTemplateTools::selectPlotTemplatePath()
{
RiuPlotMainWindow* plotwindow = RiaGuiApplication::instance()->mainPlotWindow();
RicSelectPlotTemplateUi* ui = RiaGuiApplication::instance()->project()->dialogData()->selectPlotTemplateUi();
RiuPlotMainWindow* plotwindow = RiaGuiApplication::instance()->mainPlotWindow();
RicSelectPlotTemplateUi ui;
caf::PdmUiPropertyViewDialog propertyDialog( plotwindow, ui, "Select Plot Template", "" );
caf::PdmUiPropertyViewDialog propertyDialog( plotwindow, &ui, "Select Plot Template", "" );
propertyDialog.resize( QSize( 400, 600 ) );
if ( propertyDialog.exec() == QDialog::Accepted && !ui->selectedPlotTemplates().empty() )
if ( propertyDialog.exec() == QDialog::Accepted && !ui.selectedPlotTemplates().empty() )
{
QString fileName = ui->selectedPlotTemplates().front()->absoluteFilePath();
QString fileName = ui.selectedPlotTemplates().front()->absoluteFilePath();
RiaApplication::instance()->preferences()->setDefaultPlotTemplatePath( fileName );
RiaApplication::instance()->preferences()->writePreferencesToApplicationStore();

3
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp
View File

@ -22,6 +22,7 @@
#include "RiaGuiApplication.h"
#include "RiaSummaryTools.h"
#include "RimEnsembleCurveFilterCollection.h"
#include "RimEnsembleCurveSet.h"
#include "RimEnsembleCurveSetCollection.h"
#include "RimEnsembleCurveSetColorManager.h"
@ -67,6 +68,8 @@ RimEnsembleCurveSet* RicNewSummaryEnsembleCurveSetFeature::addDefaultCurveSet( R
curveSet->setSummaryCaseCollection( ensemble );
curveSet->setSummaryAddress( RifEclipseSummaryAddress::fieldAddress( "FOPT" ) );
curveSet->filterCollection()->addFilter();
plot->ensembleCurveSetCollection()->addCurveSet( curveSet );
return curveSet;

2
ApplicationCode/GrpcInterface/Python/rips/project.py
View File

@ -223,7 +223,7 @@ class Project(PdmObject):
"""
return self._execute_command(
exportSnapshots=Cmd.ExportSnapshotsRequest(
type=snapshot_type, prefix=prefix, caseId=-1))
type=snapshot_type, prefix=prefix, caseId=-1, viewId=-1))
def export_well_paths(self, well_paths=None, md_step_size=5.0):
""" Export a set of well paths

12
ApplicationCode/ProjectDataModel/RimDialogData.cpp
View File

@ -27,7 +27,6 @@
#include "ExportCommands/RicExportWellPathsUi.h"
#include "FractureCommands/RicCreateMultipleFracturesUi.h"
#include "HoloLensCommands/RicHoloLensExportToFolderUi.h"
#include "PlotTemplateCommands/RicSelectPlotTemplateUi.h"
CAF_PDM_SOURCE_INIT( RimDialogData, "RimDialogData" );
@ -66,9 +65,6 @@ RimDialogData::RimDialogData()
CAF_PDM_InitFieldNoDefault( &m_mockModelSettings, "MockModelSettings", "Mock Model Settings", "", "", "" );
m_mockModelSettings = new RimMockModelSettings();
CAF_PDM_InitFieldNoDefault( &m_selectPlotTemplateUi, "SelectPlotTemplateUi", "Select Plot Template", "", "", "" );
m_selectPlotTemplateUi = new RicSelectPlotTemplateUi();
}
//--------------------------------------------------------------------------------------------------
@ -159,11 +155,3 @@ RimMockModelSettings* RimDialogData::mockModelSettings() const
{
return m_mockModelSettings;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSelectPlotTemplateUi* RimDialogData::selectPlotTemplateUi() const
{
return m_selectPlotTemplateUi;
}

4
ApplicationCode/ProjectDataModel/RimDialogData.h
View File

@ -29,7 +29,6 @@ class RicHoloLensExportToFolderUi;
class RicExportWellPathsUi;
class RicExportLgrUi;
class RimMockModelSettings;
class RicSelectPlotTemplateUi;
//==================================================================================================
///
@ -63,8 +62,6 @@ public:
RicExportEclipseSectorModelUi* exportSectorModelUi() const;
RimMockModelSettings* mockModelSettings() const;
RicSelectPlotTemplateUi* selectPlotTemplateUi() const;
private:
caf::PdmChildField<RicExportCarfinUi*> m_exportCarfin;
caf::PdmChildField<RicExportCompletionDataSettingsUi*> m_exportCompletionData;
@ -74,5 +71,4 @@ private:
caf::PdmChildField<RicExportLgrUi*> m_exportLgrData;
caf::PdmChildField<RicExportEclipseSectorModelUi*> m_exportSectorModelData;
caf::PdmChildField<RimMockModelSettings*> m_mockModelSettings;
caf::PdmChildField<RicSelectPlotTemplateUi*> m_selectPlotTemplateUi;
};

105
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.cpp
View File

@ -142,71 +142,60 @@ void RimEnsembleCurveFilterCollection::fieldChangedByUi( const caf::PdmFieldHand
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveFilterCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
RimEnsembleCurveSet* curveSet = nullptr;
this->firstAncestorOrThisOfType( curveSet );
if ( curveSet )
caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Filters" );
group->add( &m_newFilterButton );
for ( auto& filter : m_filters )
{
// Show the color control group
curveSet->appendColorGroup( uiOrdering );
}
{
caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Filters" );
group->add( &m_newFilterButton );
for ( auto& filter : m_filters )
QString groupTitle;
auto selEnsembleParam = filter->selectedEnsembleParameter();
if ( selEnsembleParam.isNumeric() )
{
QString groupTitle;
auto selEnsembleParam = filter->selectedEnsembleParameter();
if ( selEnsembleParam.isNumeric() )
groupTitle = filter->ensembleParameterName();
if ( !filter->isActive() )
{
groupTitle = filter->ensembleParameterName();
if ( !filter->isActive() )
{
groupTitle += " - [Disabled]";
}
else
{
groupTitle += QString( " [%2 .. %3]" )
.arg( QString::number( filter->minValue() ) )
.arg( QString::number( filter->maxValue() ) );
}
groupTitle += " - [Disabled]";
}
else if ( selEnsembleParam.isText() )
else
{
groupTitle = filter->ensembleParameterName();
if ( !filter->isActive() )
{
groupTitle += " - [Disabled]";
}
else
{
groupTitle += " { ";
bool first = true;
for ( const auto& cat : filter->categories() )
{
if ( !first ) groupTitle += ", ";
groupTitle += cat;
first = false;
}
groupTitle += " }";
if ( groupTitle.size() > 45 )
{
groupTitle = groupTitle.left( 40 ) + "... }";
}
}
groupTitle += QString( " [%2 .. %3]" )
.arg( QString::number( filter->minValue() ) )
.arg( QString::number( filter->maxValue() ) );
}
caf::PdmUiGroup* filterGroup = group->addNewGroupWithKeyword( groupTitle,
QString( "EnsembleFilter_" ) +
filter->filterId() );
filter->defineUiOrdering( uiConfigName, *filterGroup );
}
else if ( selEnsembleParam.isText() )
{
groupTitle = filter->ensembleParameterName();
if ( !filter->isActive() )
{
groupTitle += " - [Disabled]";
}
else
{
groupTitle += " { ";
bool first = true;
for ( const auto& cat : filter->categories() )
{
if ( !first ) groupTitle += ", ";
groupTitle += cat;
first = false;
}
groupTitle += " }";
if ( groupTitle.size() > 45 )
{
groupTitle = groupTitle.left( 40 ) + "... }";
}
}
}
caf::PdmUiGroup* filterGroup = group->addNewGroupWithKeyword( groupTitle,
QString( "EnsembleFilter_" ) + filter->filterId() );
filter->defineUiOrdering( uiConfigName, *filterGroup );
}
uiOrdering.skipRemainingFields( true );