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

Rename RicSummaryCurveCalculator to RicSummaryCurveCalculatorUi

Browse Source
This commit is contained in:
Jacob Støren 2020-02-18 14:14:50 +01:00
parent 31f79f24a6
commit 69e37f3f09
9 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake
View File

@ -31,7 +31,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicShowSummaryCurveCalculatorFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCurveCalculationFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorWidgetCreator.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculator.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorUi.h
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryCrossPlotCurveFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryEnsembleCurveSetFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicPasteEnsembleCurveSetFeature.h
@ -77,7 +77,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicShowSummaryCurveCalculatorFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCurveCalculationFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorWidgetCreator.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculator.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorUi.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryCrossPlotCurveFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryEnsembleCurveSetFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicPasteEnsembleCurveSetFeature.cpp

2
ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurveCalculationFeature.cpp
View File

@ -21,8 +21,8 @@
#include "RiaApplication.h"
#include "RicShowSummaryCurveCalculatorFeature.h"
#include "RicSummaryCurveCalculator.h"
#include "RicSummaryCurveCalculatorDialog.h"
#include "RicSummaryCurveCalculatorUi.h"
#include "RifEclipseSummaryAddress.h"

6
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.cpp
View File

@ -18,7 +18,7 @@
#include "RicSummaryCurveCalculatorDialog.h"
#include "RicSummaryCurveCalculator.h"
#include "RicSummaryCurveCalculatorUi.h"
#include "RicSummaryCurveCalculatorWidgetCreator.h"
#include "RimSummaryCalculation.h"
@ -64,7 +64,7 @@ void RicSummaryCurveCalculatorDialog::setCalculationAndUpdateUi( RimSummaryCalcu
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCalculatorDialog::slotTryCloseDialog()
{
RimSummaryCalculationCollection* calculationCollection = RicSummaryCurveCalculator::calculationCollection();
RimSummaryCalculationCollection* calculationCollection = RicSummaryCurveCalculatorUi::calculationCollection();
if ( dirtyCount() > 0 )
{
@ -134,7 +134,7 @@ size_t RicSummaryCurveCalculatorDialog::dirtyCount() const
{
size_t count = 0;
RimSummaryCalculationCollection* calculationCollection = RicSummaryCurveCalculator::calculationCollection();
RimSummaryCalculationCollection* calculationCollection = RicSummaryCurveCalculatorUi::calculationCollection();
for ( auto c : calculationCollection->calculations() )
{
if ( c->isDirty() )

54
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp → ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorUi.cpp
View File

@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicSummaryCurveCalculator.h"
#include "RicSummaryCurveCalculatorUi.h"
#include "RiaApplication.h"
#include "RiaSummaryTools.h"
@ -30,12 +30,12 @@
#include "cafPdmUiPushButtonEditor.h"
#include "cafPdmUiTreeSelectionEditor.h"
CAF_PDM_SOURCE_INIT( RicSummaryCurveCalculator, "RicSummaryCurveCalculator" );
CAF_PDM_SOURCE_INIT( RicSummaryCurveCalculatorUi, "RicSummaryCurveCalculator" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSummaryCurveCalculator::RicSummaryCurveCalculator()
RicSummaryCurveCalculatorUi::RicSummaryCurveCalculatorUi()
{
CAF_PDM_InitObject( "RicSummaryCurveCalculator", "", "", "" );
@ -45,10 +45,10 @@ RicSummaryCurveCalculator::RicSummaryCurveCalculator()
m_currentCalculation.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() );
CAF_PDM_InitFieldNoDefault( &m_newCalculation, "NewCalculation", "New Calculation", "", "", "" );
RicSummaryCurveCalculator::assignPushButtonEditor( &m_newCalculation );
RicSummaryCurveCalculatorUi::assignPushButtonEditor( &m_newCalculation );
CAF_PDM_InitFieldNoDefault( &m_deleteCalculation, "DeleteCalculation", "Delete Calculation", "", "", "" );
RicSummaryCurveCalculator::assignPushButtonEditor( &m_deleteCalculation );
RicSummaryCurveCalculatorUi::assignPushButtonEditor( &m_deleteCalculation );
m_calcContextMenuMgr = std::unique_ptr<RiuCalculationsContextMenuManager>( new RiuCalculationsContextMenuManager() );
}
@ -56,7 +56,7 @@ RicSummaryCurveCalculator::RicSummaryCurveCalculator()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RicSummaryCurveCalculator::calculatedSummariesGroupName()
QString RicSummaryCurveCalculatorUi::calculatedSummariesGroupName()
{
return "CalculatedSummariesGroupName";
}
@ -64,7 +64,7 @@ QString RicSummaryCurveCalculator::calculatedSummariesGroupName()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RicSummaryCurveCalculator::calulationGroupName()
QString RicSummaryCurveCalculatorUi::calulationGroupName()
{
return "CalulationGroupName";
}
@ -72,7 +72,7 @@ QString RicSummaryCurveCalculator::calulationGroupName()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCalculation* RicSummaryCurveCalculator::currentCalculation() const
RimSummaryCalculation* RicSummaryCurveCalculatorUi::currentCalculation() const
{
return m_currentCalculation();
}
@ -80,7 +80,7 @@ RimSummaryCalculation* RicSummaryCurveCalculator::currentCalculation() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCalculator::setCurrentCalculation( RimSummaryCalculation* calculation )
void RicSummaryCurveCalculatorUi::setCurrentCalculation( RimSummaryCalculation* calculation )
{
m_currentCalculation = calculation;
}
@ -88,7 +88,7 @@ void RicSummaryCurveCalculator::setCurrentCalculation( RimSummaryCalculation* ca
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicSummaryCurveCalculator::parseExpression() const
bool RicSummaryCurveCalculatorUi::parseExpression() const
{
if ( m_currentCalculation() )
{
@ -113,9 +113,9 @@ bool RicSummaryCurveCalculator::parseExpression() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCalculator::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue )
void RicSummaryCurveCalculatorUi::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue )
{
if ( changedField == &m_newCalculation )
{
@ -143,7 +143,7 @@ void RicSummaryCurveCalculator::fieldChangedByUi( const caf::PdmFieldHandle* cha
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCalculator::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
void RicSummaryCurveCalculatorUi::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
if ( !m_currentCalculation() )
{
@ -156,7 +156,7 @@ void RicSummaryCurveCalculator::defineUiOrdering( QString uiConfigName, caf::Pdm
{
caf::PdmUiGroup* group =
uiOrdering.addNewGroupWithKeyword( "Calculated Summaries",
RicSummaryCurveCalculator::calculatedSummariesGroupName() );
RicSummaryCurveCalculatorUi::calculatedSummariesGroupName() );
group->add( &m_currentCalculation );
group->add( &m_newCalculation );
group->add( &m_deleteCalculation );
@ -164,7 +164,7 @@ void RicSummaryCurveCalculator::defineUiOrdering( QString uiConfigName, caf::Pdm
{
caf::PdmUiGroup* group = uiOrdering.addNewGroupWithKeyword( "Calculation Settings",
RicSummaryCurveCalculator::calulationGroupName() );
RicSummaryCurveCalculatorUi::calulationGroupName() );
if ( m_currentCalculation() )
{
m_currentCalculation->uiOrdering( uiConfigName, *group );
@ -176,7 +176,7 @@ void RicSummaryCurveCalculator::defineUiOrdering( QString uiConfigName, caf::Pdm
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo>
RicSummaryCurveCalculator::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly )
RicSummaryCurveCalculatorUi::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly )
{
QList<caf::PdmOptionItemInfo> options;
if ( fieldNeedingOptions == &m_currentCalculation )
@ -193,7 +193,7 @@ QList<caf::PdmOptionItemInfo>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCalculationCollection* RicSummaryCurveCalculator::calculationCollection()
RimSummaryCalculationCollection* RicSummaryCurveCalculatorUi::calculationCollection()
{
RimProject* proj = RiaApplication::instance()->project();
if ( proj )
@ -207,7 +207,7 @@ RimSummaryCalculationCollection* RicSummaryCurveCalculator::calculationCollectio
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCalculator::assignPushButtonEditor( caf::PdmFieldHandle* fieldHandle )
void RicSummaryCurveCalculatorUi::assignPushButtonEditor( caf::PdmFieldHandle* fieldHandle )
{
CVF_ASSERT( fieldHandle );
CVF_ASSERT( fieldHandle->uiCapability() );
@ -219,7 +219,7 @@ void RicSummaryCurveCalculator::assignPushButtonEditor( caf::PdmFieldHandle* fie
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCalculator::assignPushButtonEditorText( caf::PdmUiEditorAttribute* attribute, const QString& text )
void RicSummaryCurveCalculatorUi::assignPushButtonEditorText( caf::PdmUiEditorAttribute* attribute, const QString& text )
{
caf::PdmUiPushButtonEditorAttribute* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute );
if ( attrib )
@ -231,7 +231,7 @@ void RicSummaryCurveCalculator::assignPushButtonEditorText( caf::PdmUiEditorAttr
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicSummaryCurveCalculator::calculate() const
bool RicSummaryCurveCalculatorUi::calculate() const
{
if ( m_currentCalculation() )
{
@ -262,24 +262,24 @@ bool RicSummaryCurveCalculator::calculate() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCalculator::defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute )
void RicSummaryCurveCalculatorUi::defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute )
{
if ( &m_newCalculation == field )
{
RicSummaryCurveCalculator::assignPushButtonEditorText( attribute, "New Calculation" );
RicSummaryCurveCalculatorUi::assignPushButtonEditorText( attribute, "New Calculation" );
}
else if ( &m_deleteCalculation == field )
{
RicSummaryCurveCalculator::assignPushButtonEditorText( attribute, "Delete Calculation" );
RicSummaryCurveCalculatorUi::assignPushButtonEditorText( attribute, "Delete Calculation" );
}
}
//--------------------------------------------------------------------------------------------------
/// f
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCalculator::onEditorWidgetsCreated()
void RicSummaryCurveCalculatorUi::onEditorWidgetsCreated()
{
if ( m_currentCalculation() != nullptr )
{

4
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.h → ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorUi.h
View File

@ -30,12 +30,12 @@ class RimSummaryCalculation;
//==================================================================================================
///
//==================================================================================================
class RicSummaryCurveCalculator : public caf::PdmObject
class RicSummaryCurveCalculatorUi : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RicSummaryCurveCalculator();
RicSummaryCurveCalculatorUi();
static QString calculatedSummariesGroupName();
static QString calulationGroupName();

10
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorWidgetCreator.cpp
View File

@ -18,7 +18,7 @@
#include "RicSummaryCurveCalculatorWidgetCreator.h"
#include "RicSummaryCurveCalculator.h"
#include "RicSummaryCurveCalculatorUi.h"
#include "RimSummaryCalculation.h"
#include "cafPdmUiTableView.h"
@ -37,7 +37,7 @@
RicSummaryCurveCalculatorWidgetCreator::RicSummaryCurveCalculatorWidgetCreator()
: m_pdmTableView( nullptr )
{
m_calculator = std::unique_ptr<RicSummaryCurveCalculator>( new RicSummaryCurveCalculator );
m_calculator = std::unique_ptr<RicSummaryCurveCalculatorUi>( new RicSummaryCurveCalculatorUi );
this->setPdmObject( m_calculator.get() );
}
@ -79,11 +79,11 @@ void RicSummaryCurveCalculatorWidgetCreator::recursivelyConfigureAndUpdateTopLev
caf::PdmUiGroup* group = static_cast<caf::PdmUiGroup*>( topLevelUiItems[i] );
auto groupBox = updateGroupBoxWithContent( group, uiConfigName );
if ( group->keyword() == RicSummaryCurveCalculator::calculatedSummariesGroupName() )
if ( group->keyword() == RicSummaryCurveCalculatorUi::calculatedSummariesGroupName() )
{
m_firstRowLeftLayout->addWidget( groupBox );
}
else if ( group->keyword() == RicSummaryCurveCalculator::calulationGroupName() )
else if ( group->keyword() == RicSummaryCurveCalculatorUi::calulationGroupName() )
{
m_firstRowRightLayout->insertWidget( layoutItemIndex++, groupBox );
}
@ -198,7 +198,7 @@ QMinimizePanel* RicSummaryCurveCalculatorWidgetCreator::updateGroupBoxWithConten
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSummaryCurveCalculator* RicSummaryCurveCalculatorWidgetCreator::calculator() const
RicSummaryCurveCalculatorUi* RicSummaryCurveCalculatorWidgetCreator::calculator() const
{
return m_calculator.get();
}

6
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorWidgetCreator.h
View File

@ -23,7 +23,7 @@
#include <memory>
#include <vector>
class RicSummaryCurveCalculator;
class RicSummaryCurveCalculatorUi;
class QMinimizePanel;
class QString;
@ -49,7 +49,7 @@ public:
RicSummaryCurveCalculatorWidgetCreator();
~RicSummaryCurveCalculatorWidgetCreator() override;
RicSummaryCurveCalculator* calculator() const;
RicSummaryCurveCalculatorUi* calculator() const;
private:
void recursivelyConfigureAndUpdateTopLevelUiOrdering( const caf::PdmUiOrdering& topLevelUiItems,
@ -72,5 +72,5 @@ private:
caf::PdmUiTableView* m_pdmTableView;
std::unique_ptr<RicSummaryCurveCalculator> m_calculator;
std::unique_ptr<RicSummaryCurveCalculatorUi> m_calculator;
};

6
ApplicationCode/UserInterface/RiuCalculationsContextMenuManager.cpp
View File

@ -18,13 +18,13 @@
#include "RiuCalculationsContextMenuManager.h"
#include "RimSummaryCalculationCollection.h"
#include "SummaryPlotCommands/RicSummaryCurveCalculator.h"
#include "SummaryPlotCommands/RicSummaryCurveCalculatorUi.h"
#include <QMenu>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuCalculationsContextMenuManager::attachWidget( QWidget* widget, RicSummaryCurveCalculator* curveCalc )
void RiuCalculationsContextMenuManager::attachWidget( QWidget* widget, RicSummaryCurveCalculatorUi* curveCalc )
{
if ( m_widget != widget )
{
@ -67,7 +67,7 @@ void RiuCalculationsContextMenuManager::slotCreateCalculationCopy()
if ( m_widget != nullptr && currCalculation != nullptr )
{
RimSummaryCalculationCollection* coll = RicSummaryCurveCalculator::calculationCollection();
RimSummaryCalculationCollection* coll = RicSummaryCurveCalculatorUi::calculationCollection();
RimSummaryCalculation* calcCopy = coll->addCalculationCopy( currCalculation );
m_curveCalc->setCurrentCalculation( calcCopy );
m_curveCalc->updateConnectedEditors();

6
ApplicationCode/UserInterface/RiuCalculationsContextMenuManager.h
View File

@ -28,7 +28,7 @@
#include <memory>
class RimSummaryCalculationVariable;
class RicSummaryCurveCalculator;
class RicSummaryCurveCalculatorUi;
//==================================================================================================
///
@ -47,7 +47,7 @@ public:
{
}
void attachWidget( QWidget* widget, RicSummaryCurveCalculator* curveCalc );
void attachWidget( QWidget* widget, RicSummaryCurveCalculatorUi* curveCalc );
public slots:
void slotMenuItems( QPoint point );
@ -57,7 +57,7 @@ private slots:
private:
QPointer<QWidget> m_widget;
RicSummaryCurveCalculator* m_curveCalc;
RicSummaryCurveCalculatorUi* m_curveCalc;
int m_textPosition;
std::map<QString, std::unique_ptr<QAction>> m_actionCache;
};