Rename RicSummaryCurveCreator to RicSummaryPlotEditorUi

This commit is contained in:
Jacob Støren
2020-02-18 13:36:07 +01:00
parent 5af6b9f001
commit dacd84a289
13 changed files with 56 additions and 56 deletions

View File

@@ -24,7 +24,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicPasteTimeHistoryCurveFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicPasteAsciiDataCurveFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicPasteAsciiDataCurveFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryPlotFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryPlotFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCrossPlotFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCrossPlotFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreator.h ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorUi.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorWidgetCreator.h ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorWidgetCreator.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.h ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.h
${CMAKE_CURRENT_LIST_DIR}/RicShowSummaryCurveCalculatorFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicShowSummaryCurveCalculatorFeature.h
@@ -70,7 +70,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicPasteTimeHistoryCurveFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicPasteAsciiDataCurveFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicPasteAsciiDataCurveFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryPlotFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryPlotFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCrossPlotFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCrossPlotFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreator.cpp ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorUi.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorWidgetCreator.cpp ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorWidgetCreator.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.cpp ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.cpp
${CMAKE_CURRENT_LIST_DIR}/RicShowSummaryCurveCalculatorFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicShowSummaryCurveCalculatorFeature.cpp

View File

@@ -21,8 +21,8 @@
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaPreferences.h" #include "RiaPreferences.h"
#include "RicSummaryCurveCreator.h"
#include "RicSummaryPlotEditorDialog.h" #include "RicSummaryPlotEditorDialog.h"
#include "RicSummaryPlotEditorUi.h"
#include "cafPdmUiPropertyViewDialog.h" #include "cafPdmUiPropertyViewDialog.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"

View File

@@ -22,8 +22,8 @@
#include "RiaPreferences.h" #include "RiaPreferences.h"
#include "RiaSummaryTools.h" #include "RiaSummaryTools.h"
#include "RicSummaryCurveCreator.h"
#include "RicSummaryPlotEditorDialog.h" #include "RicSummaryPlotEditorDialog.h"
#include "RicSummaryPlotEditorUi.h"
#include "RimSummaryPlot.h" #include "RimSummaryPlot.h"

View File

@@ -23,8 +23,8 @@
#include "RiaSummaryTools.h" #include "RiaSummaryTools.h"
#include "RicEditSummaryPlotFeature.h" #include "RicEditSummaryPlotFeature.h"
#include "RicSummaryCurveCreator.h"
#include "RicSummaryPlotEditorDialog.h" #include "RicSummaryPlotEditorDialog.h"
#include "RicSummaryPlotEditorUi.h"
#include "RimMainPlotCollection.h" #include "RimMainPlotCollection.h"
#include "RimProject.h" #include "RimProject.h"

View File

@@ -24,8 +24,8 @@
#include "RicEditSummaryPlotFeature.h" #include "RicEditSummaryPlotFeature.h"
#include "RicNewSummaryEnsembleCurveSetFeature.h" #include "RicNewSummaryEnsembleCurveSetFeature.h"
#include "RicSummaryCurveCreator.h"
#include "RicSummaryPlotEditorDialog.h" #include "RicSummaryPlotEditorDialog.h"
#include "RicSummaryPlotEditorUi.h"
#include "RimEnsembleCurveFilter.h" #include "RimEnsembleCurveFilter.h"
#include "RimEnsembleCurveFilterCollection.h" #include "RimEnsembleCurveFilterCollection.h"

View File

@@ -20,7 +20,7 @@
#include "RiaGuiApplication.h" #include "RiaGuiApplication.h"
#include "RicSummaryCurveCreator.h" #include "RicSummaryPlotEditorUi.h"
#include "RicSummaryPlotEditorWidgetCreator.h" #include "RicSummaryPlotEditorWidgetCreator.h"
#include "RifReaderEclipseSummary.h" #include "RifReaderEclipseSummary.h"

View File

@@ -16,7 +16,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RicSummaryCurveCreator.h" #include "RicSummaryPlotEditorUi.h"
#include "RiaColorTables.h" #include "RiaColorTables.h"
#include "RiaCurveSetDefinition.h" #include "RiaCurveSetDefinition.h"
@@ -62,7 +62,7 @@
#include <algorithm> #include <algorithm>
#include <sstream> #include <sstream>
CAF_PDM_SOURCE_INIT( RicSummaryCurveCreator, "RicSummaryCurveCreator" ); CAF_PDM_SOURCE_INIT( RicSummaryPlotEditorUi, "RicSummaryCurveCreator" );
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@@ -72,7 +72,7 @@ const size_t ENSEMBLE_CURVE_COUNT_THRESHOLD = 600;
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const QString RicSummaryCurveCreator::CONFIGURATION_NAME = "CurveCreatorCfg"; const QString RicSummaryPlotEditorUi::CONFIGURATION_NAME = "CurveCreatorCfg";
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Internal functions /// Internal functions
@@ -84,7 +84,7 @@ std::vector<T> toVector( const std::set<T>& set );
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicSummaryCurveCreator::RicSummaryCurveCreator() RicSummaryPlotEditorUi::RicSummaryPlotEditorUi()
{ {
CAF_PDM_InitFieldNoDefault( &m_targetPlot, "TargetPlot", "Target Plot", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_targetPlot, "TargetPlot", "Target Plot", "", "", "" );
@@ -99,8 +99,8 @@ RicSummaryCurveCreator::RicSummaryCurveCreator()
m_previewPlot.reset( new RimSummaryPlot() ); m_previewPlot.reset( new RimSummaryPlot() );
CAF_PDM_InitFieldNoDefault( &m_useAutoPlotTitleProxy, "UseAutoPlotTitle", "Auto Plot Title", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_useAutoPlotTitleProxy, "UseAutoPlotTitle", "Auto Plot Title", "", "", "" );
m_useAutoPlotTitleProxy.registerGetMethod( this, &RicSummaryCurveCreator::proxyPlotAutoTitle ); m_useAutoPlotTitleProxy.registerGetMethod( this, &RicSummaryPlotEditorUi::proxyPlotAutoTitle );
m_useAutoPlotTitleProxy.registerSetMethod( this, &RicSummaryCurveCreator::proxyEnablePlotAutoTitle ); m_useAutoPlotTitleProxy.registerSetMethod( this, &RicSummaryPlotEditorUi::proxyEnablePlotAutoTitle );
CAF_PDM_InitFieldNoDefault( &m_applyButtonField, "ApplySelection", "", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_applyButtonField, "ApplySelection", "", "", "", "" );
m_applyButtonField = false; m_applyButtonField = false;
@@ -136,14 +136,14 @@ RicSummaryCurveCreator::RicSummaryCurveCreator()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicSummaryCurveCreator::~RicSummaryCurveCreator() RicSummaryPlotEditorUi::~RicSummaryPlotEditorUi()
{ {
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryPlot* RicSummaryCurveCreator::previewPlot() const RimSummaryPlot* RicSummaryPlotEditorUi::previewPlot() const
{ {
return m_previewPlot.get(); return m_previewPlot.get();
} }
@@ -151,7 +151,7 @@ RimSummaryPlot* RicSummaryCurveCreator::previewPlot() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::updateFromSummaryPlot( RimSummaryPlot* targetPlot, void RicSummaryPlotEditorUi::updateFromSummaryPlot( RimSummaryPlot* targetPlot,
const std::vector<SummarySource*>& defaultSources ) const std::vector<SummarySource*>& defaultSources )
{ {
if ( targetPlot == nullptr || m_targetPlot != targetPlot ) if ( targetPlot == nullptr || m_targetPlot != targetPlot )
@@ -182,7 +182,7 @@ void RicSummaryCurveCreator::updateFromSummaryPlot( RimSummaryPlot*
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QWidget* RicSummaryCurveCreator::addressSelectionWidget( QWidget* parent ) QWidget* RicSummaryPlotEditorUi::addressSelectionWidget( QWidget* parent )
{ {
return m_summaryCurveSelectionEditor->getOrCreateWidget( parent ); return m_summaryCurveSelectionEditor->getOrCreateWidget( parent );
} }
@@ -190,7 +190,7 @@ QWidget* RicSummaryCurveCreator::addressSelectionWidget( QWidget* parent )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicSummaryCurveCreator::isCloseButtonPressed() const bool RicSummaryPlotEditorUi::isCloseButtonPressed() const
{ {
return m_closeButtonField(); return m_closeButtonField();
} }
@@ -198,7 +198,7 @@ bool RicSummaryCurveCreator::isCloseButtonPressed() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::clearCloseButton() void RicSummaryPlotEditorUi::clearCloseButton()
{ {
m_closeButtonField = false; m_closeButtonField = false;
} }
@@ -206,7 +206,7 @@ void RicSummaryCurveCreator::clearCloseButton()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::fieldChangedByUi( const caf::PdmFieldHandle* changedField, void RicSummaryPlotEditorUi::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue, const QVariant& oldValue,
const QVariant& newValue ) const QVariant& newValue )
{ {
@@ -260,7 +260,7 @@ void RicSummaryCurveCreator::fieldChangedByUi( const caf::PdmFieldHandle* change
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> QList<caf::PdmOptionItemInfo>
RicSummaryCurveCreator::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly ) RicSummaryPlotEditorUi::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly )
{ {
QList<caf::PdmOptionItemInfo> options; QList<caf::PdmOptionItemInfo> options;
@@ -286,7 +286,7 @@ QList<caf::PdmOptionItemInfo>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) void RicSummaryPlotEditorUi::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{ {
// Appearance settings // Appearance settings
caf::PdmUiGroup* appearanceGroup = caf::PdmUiGroup* appearanceGroup =
@@ -338,7 +338,7 @@ void RicSummaryCurveCreator::defineUiOrdering( QString uiConfigName, caf::PdmUiO
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::syncPreviewCurvesFromUiSelection() void RicSummaryPlotEditorUi::syncPreviewCurvesFromUiSelection()
{ {
std::vector<RiaSummaryCurveDefinition> allCurveDefinitionsVector = std::vector<RiaSummaryCurveDefinition> allCurveDefinitionsVector =
m_summaryCurveSelectionEditor->summaryAddressSelection()->allCurveDefinitionsFromSelection(); m_summaryCurveSelectionEditor->summaryAddressSelection()->allCurveDefinitionsFromSelection();
@@ -429,7 +429,7 @@ void RicSummaryCurveCreator::syncPreviewCurvesFromUiSelection()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::updatePreviewCurvesFromCurveDefinitions( void RicSummaryPlotEditorUi::updatePreviewCurvesFromCurveDefinitions(
const std::set<RiaSummaryCurveDefinition>& allCurveDefsToDisplay, const std::set<RiaSummaryCurveDefinition>& allCurveDefsToDisplay,
const std::set<RiaSummaryCurveDefinition>& curveDefsToAdd, const std::set<RiaSummaryCurveDefinition>& curveDefsToAdd,
const std::set<RimSummaryCurve*>& curvesToDelete, const std::set<RimSummaryCurve*>& curvesToDelete,
@@ -536,7 +536,7 @@ void RicSummaryCurveCreator::updatePreviewCurvesFromCurveDefinitions(
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::defineEditorAttribute( const caf::PdmFieldHandle* field, void RicSummaryPlotEditorUi::defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName, QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) caf::PdmUiEditorAttribute* attribute )
{ {
@@ -585,7 +585,7 @@ void RicSummaryCurveCreator::defineEditorAttribute( const caf::PdmFieldHandle* f
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Populate curve creator from the given curve collection /// Populate curve creator from the given curve collection
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::populateCurveCreator( const RimSummaryPlot& sourceSummaryPlot ) void RicSummaryPlotEditorUi::populateCurveCreator( const RimSummaryPlot& sourceSummaryPlot )
{ {
std::vector<RiaSummaryCurveDefinition> curveDefs; std::vector<RiaSummaryCurveDefinition> curveDefs;
@@ -627,7 +627,7 @@ void RicSummaryCurveCreator::populateCurveCreator( const RimSummaryPlot& sourceS
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Copy curves from preview plot to target plot /// Copy curves from preview plot to target plot
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::updateTargetPlot() void RicSummaryPlotEditorUi::updateTargetPlot()
{ {
if ( !m_targetPlot ) return; if ( !m_targetPlot ) return;
@@ -672,7 +672,7 @@ void RicSummaryCurveCreator::updateTargetPlot()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::copyCurveAndAddToPlot( const RimSummaryCurve* curve, RimSummaryPlot* plot, bool forceVisible ) void RicSummaryPlotEditorUi::copyCurveAndAddToPlot( const RimSummaryCurve* curve, RimSummaryPlot* plot, bool forceVisible )
{ {
RimSummaryCurve* curveCopy = dynamic_cast<RimSummaryCurve*>( RimSummaryCurve* curveCopy = dynamic_cast<RimSummaryCurve*>(
curve->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) ); curve->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );
@@ -694,7 +694,7 @@ void RicSummaryCurveCreator::copyCurveAndAddToPlot( const RimSummaryCurve* curve
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::copyEnsembleCurveAndAddToCurveSet( const RimSummaryCurve* curve, void RicSummaryPlotEditorUi::copyEnsembleCurveAndAddToCurveSet( const RimSummaryCurve* curve,
RimEnsembleCurveSet* curveSet, RimEnsembleCurveSet* curveSet,
bool forceVisible ) bool forceVisible )
{ {
@@ -718,7 +718,7 @@ void RicSummaryCurveCreator::copyEnsembleCurveAndAddToCurveSet( const RimSummary
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::setDefaultCurveSelection( const std::vector<SummarySource*>& defaultSources ) void RicSummaryPlotEditorUi::setDefaultCurveSelection( const std::vector<SummarySource*>& defaultSources )
{ {
m_summaryCurveSelectionEditor->summaryAddressSelection()->setDefaultSelection( defaultSources ); m_summaryCurveSelectionEditor->summaryAddressSelection()->setDefaultSelection( defaultSources );
} }
@@ -726,7 +726,7 @@ void RicSummaryCurveCreator::setDefaultCurveSelection( const std::vector<Summary
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::resetAllFields() void RicSummaryPlotEditorUi::resetAllFields()
{ {
std::vector<RiaSummaryCurveDefinition> curveDefinitions; std::vector<RiaSummaryCurveDefinition> curveDefinitions;
m_summaryCurveSelectionEditor->summaryAddressSelection()->setSelectedCurveDefinitions( curveDefinitions ); m_summaryCurveSelectionEditor->summaryAddressSelection()->setSelectedCurveDefinitions( curveDefinitions );
@@ -738,7 +738,7 @@ void RicSummaryCurveCreator::resetAllFields()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::initCurveAppearanceCalculator( RimSummaryCurveAppearanceCalculator& curveAppearanceCalc ) void RicSummaryPlotEditorUi::initCurveAppearanceCalculator( RimSummaryCurveAppearanceCalculator& curveAppearanceCalc )
{ {
if ( !m_useAutoAppearanceAssignment() ) if ( !m_useAutoAppearanceAssignment() )
{ {
@@ -769,7 +769,7 @@ void RicSummaryCurveCreator::initCurveAppearanceCalculator( RimSummaryCurveAppea
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::applyAppearanceToAllPreviewCurves() void RicSummaryPlotEditorUi::applyAppearanceToAllPreviewCurves()
{ {
std::set<RiaSummaryCurveDefinition> allCurveDefs = m_previewPlot->summaryAndEnsembleCurveDefinitions(); std::set<RiaSummaryCurveDefinition> allCurveDefs = m_previewPlot->summaryAndEnsembleCurveDefinitions();
@@ -795,7 +795,7 @@ void RicSummaryCurveCreator::applyAppearanceToAllPreviewCurves()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::updateAppearanceEditor() void RicSummaryPlotEditorUi::updateAppearanceEditor()
{ {
std::set<RiaSummaryCurveDefinition> allCurveDefs = m_previewPlot->summaryAndEnsembleCurveDefinitions(); std::set<RiaSummaryCurveDefinition> allCurveDefs = m_previewPlot->summaryAndEnsembleCurveDefinitions();
@@ -806,7 +806,7 @@ void RicSummaryCurveCreator::updateAppearanceEditor()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::createNewPlot() void RicSummaryPlotEditorUi::createNewPlot()
{ {
RimProject* proj = RiaApplication::instance()->project(); RimProject* proj = RiaApplication::instance()->project();
@@ -862,7 +862,7 @@ void RicSummaryCurveCreator::createNewPlot()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::updateCurveNames() void RicSummaryPlotEditorUi::updateCurveNames()
{ {
for ( RimSummaryCurve* curve : m_previewPlot->summaryCurves() ) for ( RimSummaryCurve* curve : m_previewPlot->summaryCurves() )
{ {
@@ -876,7 +876,7 @@ void RicSummaryCurveCreator::updateCurveNames()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicSummaryCurveCreator::isObservedData( RimSummaryCase* sumCase ) const bool RicSummaryPlotEditorUi::isObservedData( RimSummaryCase* sumCase ) const
{ {
return dynamic_cast<RimObservedSummaryData*>( sumCase ) != nullptr; return dynamic_cast<RimObservedSummaryData*>( sumCase ) != nullptr;
} }
@@ -884,7 +884,7 @@ bool RicSummaryCurveCreator::isObservedData( RimSummaryCase* sumCase ) const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryCase* RicSummaryCurveCreator::calculatedSummaryCase() RimSummaryCase* RicSummaryPlotEditorUi::calculatedSummaryCase()
{ {
RimSummaryCalculationCollection* calcColl = RiaApplication::instance()->project()->calculationCollection(); RimSummaryCalculationCollection* calcColl = RiaApplication::instance()->project()->calculationCollection();
@@ -894,7 +894,7 @@ RimSummaryCase* RicSummaryCurveCreator::calculatedSummaryCase()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::selectionEditorFieldChanged() void RicSummaryPlotEditorUi::selectionEditorFieldChanged()
{ {
syncPreviewCurvesFromUiSelection(); syncPreviewCurvesFromUiSelection();
} }
@@ -902,7 +902,7 @@ void RicSummaryCurveCreator::selectionEditorFieldChanged()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::proxyEnablePlotAutoTitle( const bool& enable ) void RicSummaryPlotEditorUi::proxyEnablePlotAutoTitle( const bool& enable )
{ {
m_previewPlot->enableAutoPlotTitle( enable ); m_previewPlot->enableAutoPlotTitle( enable );
m_previewPlot->setShowPlotTitle( enable ); m_previewPlot->setShowPlotTitle( enable );
@@ -913,7 +913,7 @@ void RicSummaryCurveCreator::proxyEnablePlotAutoTitle( const bool& enable )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicSummaryCurveCreator::proxyPlotAutoTitle() const bool RicSummaryPlotEditorUi::proxyPlotAutoTitle() const
{ {
return m_previewPlot->autoPlotTitle(); return m_previewPlot->autoPlotTitle();
} }
@@ -921,7 +921,7 @@ bool RicSummaryCurveCreator::proxyPlotAutoTitle() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreator::setInitialCurveVisibility( const RimSummaryPlot* targetPlot ) void RicSummaryPlotEditorUi::setInitialCurveVisibility( const RimSummaryPlot* targetPlot )
{ {
// Set visibility for imported curves which were not checked in source plot // Set visibility for imported curves which were not checked in source plot
std::set<std::pair<RimSummaryCase*, RifEclipseSummaryAddress>> sourceCurveDefs; std::set<std::pair<RimSummaryCase*, RifEclipseSummaryAddress>> sourceCurveDefs;

View File

@@ -50,7 +50,7 @@ class RimEnsembleCurveSet;
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RicSummaryCurveCreator : public caf::PdmObject class RicSummaryPlotEditorUi : public caf::PdmObject
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
@@ -61,8 +61,8 @@ private:
typedef caf::AppEnum<RimSummaryCurveAppearanceCalculator::CurveAppearanceType> AppearanceTypeAppEnum; typedef caf::AppEnum<RimSummaryCurveAppearanceCalculator::CurveAppearanceType> AppearanceTypeAppEnum;
public: public:
RicSummaryCurveCreator(); RicSummaryPlotEditorUi();
~RicSummaryCurveCreator() override; ~RicSummaryPlotEditorUi() override;
RimSummaryPlot* previewPlot() const; RimSummaryPlot* previewPlot() const;
void updateFromSummaryPlot( RimSummaryPlot* targetPlot, void updateFromSummaryPlot( RimSummaryPlot* targetPlot,

View File

@@ -18,7 +18,7 @@
#include "RicSummaryPlotEditorWidgetCreator.h" #include "RicSummaryPlotEditorWidgetCreator.h"
#include "RicSummaryCurveCreator.h" #include "RicSummaryPlotEditorUi.h"
#include "RimEnsembleCurveSetCollection.h" #include "RimEnsembleCurveSetCollection.h"
#include "RimSummaryCurveCollection.h" #include "RimSummaryCurveCollection.h"
#include "RimSummaryPlot.h" #include "RimSummaryPlot.h"
@@ -46,7 +46,7 @@ RicSummaryPlotEditorWidgetCreator::RicSummaryPlotEditorWidgetCreator( QWidget* p
{ {
m_parentWidget = parent; m_parentWidget = parent;
m_summaryCurveCreator.reset( new RicSummaryCurveCreator() ); m_summaryCurveCreator.reset( new RicSummaryPlotEditorUi() );
this->setPdmObject( m_summaryCurveCreator.get() ); this->setPdmObject( m_summaryCurveCreator.get() );
} }
@@ -223,7 +223,7 @@ QMinimizePanel* RicSummaryPlotEditorWidgetCreator::getOrCreateCurveTreeGroup()
{ {
RimSummaryPlot* previewPlot = m_summaryCurveCreator->previewPlot(); RimSummaryPlot* previewPlot = m_summaryCurveCreator->previewPlot();
m_curveTreeView->setPdmItem( previewPlot ); m_curveTreeView->setPdmItem( previewPlot );
m_curveTreeView->setUiConfigurationName( RicSummaryCurveCreator::CONFIGURATION_NAME ); m_curveTreeView->setUiConfigurationName( RicSummaryPlotEditorUi::CONFIGURATION_NAME );
m_curveTreeView->setExpanded( previewPlot->summaryCurveCollection(), true ); m_curveTreeView->setExpanded( previewPlot->summaryCurveCollection(), true );
m_curveTreeView->setExpanded( previewPlot->ensembleCurveSetCollection(), true ); m_curveTreeView->setExpanded( previewPlot->ensembleCurveSetCollection(), true );
} }

View File

@@ -25,7 +25,7 @@
class RimSummaryPlot; class RimSummaryPlot;
class RimSummaryCase; class RimSummaryCase;
class RicSummaryCurveCreator; class RicSummaryPlotEditorUi;
class QMinimizePanel; class QMinimizePanel;
class QSplitter; class QSplitter;
@@ -95,5 +95,5 @@ private:
QWidget* m_parentWidget; QWidget* m_parentWidget;
std::unique_ptr<RicSummaryCurveCreator> m_summaryCurveCreator; std::unique_ptr<RicSummaryPlotEditorUi> m_summaryCurveCreator;
}; };

View File

@@ -23,7 +23,7 @@
#include "RiaStatisticsTools.h" #include "RiaStatisticsTools.h"
#include "RiuAbstractLegendFrame.h" #include "RiuAbstractLegendFrame.h"
#include "SummaryPlotCommands/RicSummaryCurveCreator.h" #include "SummaryPlotCommands/RicSummaryPlotEditorUi.h"
#include "RifEnsembleStatisticsReader.h" #include "RifEnsembleStatisticsReader.h"
#include "RifReaderEclipseSummary.h" #include "RifReaderEclipseSummary.h"
@@ -673,7 +673,7 @@ void RimEnsembleCurveSet::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOr
uiTreeOrdering.add( m_legendConfig() ); uiTreeOrdering.add( m_legendConfig() );
} }
if ( uiConfigName != RicSummaryCurveCreator::CONFIGURATION_NAME ) if ( uiConfigName != RicSummaryPlotEditorUi::CONFIGURATION_NAME )
{ {
uiTreeOrdering.add( m_curveFilters ); uiTreeOrdering.add( m_curveFilters );
} }

View File

@@ -32,7 +32,7 @@
#include "RimSummaryCurve.h" #include "RimSummaryCurve.h"
#include "RimSummaryPlotNameHelper.h" #include "RimSummaryPlotNameHelper.h"
#include "SummaryPlotCommands/RicSummaryCurveCreator.h" #include "SummaryPlotCommands/RicSummaryPlotEditorUi.h"
#include "cafPdmUiPushButtonEditor.h" #include "cafPdmUiPushButtonEditor.h"
@@ -401,7 +401,7 @@ void RimSummaryCurveAutoName::fieldChangedByUi( const caf::PdmFieldHandle* chang
return; return;
} }
RicSummaryCurveCreator* curveCreator = dynamic_cast<RicSummaryCurveCreator*>( this->parentField()->ownerObject() ); RicSummaryPlotEditorUi* curveCreator = dynamic_cast<RicSummaryPlotEditorUi*>( this->parentField()->ownerObject() );
if ( curveCreator ) if ( curveCreator )
{ {
curveCreator->updateCurveNames(); curveCreator->updateCurveNames();

View File

@@ -26,7 +26,7 @@
#include "RiaSummaryTools.h" #include "RiaSummaryTools.h"
#include "RiaTimeHistoryCurveResampler.h" #include "RiaTimeHistoryCurveResampler.h"
#include "SummaryPlotCommands/RicSummaryCurveCreator.h" #include "SummaryPlotCommands/RicSummaryPlotEditorUi.h"
#include "PlotTemplates/RimPlotTemplateFileItem.h" #include "PlotTemplates/RimPlotTemplateFileItem.h"
#include "PlotTemplates/RimPlotTemplateFolderItem.h" #include "PlotTemplates/RimPlotTemplateFolderItem.h"
@@ -1380,7 +1380,7 @@ QImage RimSummaryPlot::snapshotWindowContent()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryPlot::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/ ) void RimSummaryPlot::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/ )
{ {
if ( uiConfigName == RicSummaryCurveCreator::CONFIGURATION_NAME ) if ( uiConfigName == RicSummaryPlotEditorUi::CONFIGURATION_NAME )
{ {
uiTreeOrdering.add( &m_summaryCurveCollection ); uiTreeOrdering.add( &m_summaryCurveCollection );
if ( !m_isCrossPlot ) if ( !m_isCrossPlot )