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

#8310 Summary Plot Manager : Add data source filtering

Browse Source
This commit is contained in:
Magne Sjaastad
2021-11-19 14:53:01 +01:00
parent c945166e81
commit 5fcb81980d
17 changed files with 611 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/UserInterface/RiuDockWidgetTools.cpp
View File

@@ -103,9 +103,9 @@ QString RiuDockWidgetTools::undoStackName()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiuDockWidgetTools::summaryCurveManagerName()
QString RiuDockWidgetTools::summaryPlotManagerName()
{
return "dockSummaryCurveManager";
return "dockSummaryPlotManager";
}
//--------------------------------------------------------------------------------------------------

6
ApplicationLibCode/UserInterface/RiuDockWidgetTools.h
View File

@@ -46,7 +46,7 @@ public:
static QString messagesName();
static QString mohrsCirclePlotName();
static QString undoStackName();
static QString summaryCurveManagerName();
static QString summaryPlotManagerName();
static QString plotMainWindowProjectTreeName();
static QString plotMainWindowPropertyEditorName();
@@ -66,9 +66,9 @@ public:
static void setDockWidgetVisibility( const QObject* parent, const QString& dockWidgetName, bool isVisible );
static void applyDockWidgetVisibilities( const QObject* parent, const QMap<QString, QVariant>& visibilityMap );
static QDockWidget* findDockWidget( const QObject* parent, const QString& dockWidgetName );
private:
static QMap<QString, QVariant> widgetVisibilitiesForEclipse();
static QMap<QString, QVariant> widgetVisibilitiesForGeoMech();
static QDockWidget* findDockWidget( const QObject* parent, const QString& dockWidgetName );
};

36
ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp
View File

@@ -106,7 +106,7 @@ RiuPlotMainWindow::RiuPlotMainWindow()
//--------------------------------------------------------------------------------------------------
RiuPlotMainWindow::~RiuPlotMainWindow()
{
m_summaryCurveManagerView->showProperties( nullptr );
m_summaryPlotManagerView->showProperties( nullptr );
setPdmRoot( nullptr );
}
@@ -502,17 +502,17 @@ void RiuPlotMainWindow::createDockPanels()
}
{
QDockWidget* dockWidget = new QDockWidget( "Curve Manager", this );
dockWidget->setObjectName( RiuDockWidgetTools::summaryCurveManagerName() );
QDockWidget* dockWidget = new QDockWidget( "Plot Manager", this );
dockWidget->setObjectName( RiuDockWidgetTools::summaryPlotManagerName() );
m_summaryCurveManagerView = new caf::PdmUiPropertyView( dockWidget );
m_summaryPlotManagerView = new caf::PdmUiPropertyView( dockWidget );
auto curveManager = std::make_unique<RimSummaryPlotManager>();
m_summaryCurveManagerView->showProperties( curveManager.get() );
m_summaryCurveManagerView->installEventFilter( curveManager.get() );
m_summaryCurveManager = std::move( curveManager );
auto plotManager = std::make_unique<RimSummaryPlotManager>();
m_summaryPlotManagerView->showProperties( plotManager.get() );
m_summaryPlotManagerView->installEventFilter( plotManager.get() );
m_summaryPlotManager = std::move( plotManager );
dockWidget->setWidget( m_summaryCurveManagerView );
dockWidget->setWidget( m_summaryPlotManagerView );
addDockWidget( Qt::BottomDockWidgetArea, dockWidget );
dockWidget->hide();
}
@@ -751,6 +751,24 @@ RiuMessagePanel* RiuPlotMainWindow::messagePanel()
return m_messagePanel;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuPlotMainWindow::showAndSetKeyboardFocusToSummaryPlotManager()
{
auto dockWidget = RiuDockWidgetTools::findDockWidget( this, RiuDockWidgetTools::summaryPlotManagerName() );
if ( dockWidget )
{
dockWidget->setVisible( true );
auto sumPlotManager = dynamic_cast<RimSummaryPlotManager*>( m_summaryPlotManager.get() );
if ( sumPlotManager )
{
sumPlotManager->setFocusToFilterText();
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

6
ApplicationLibCode/UserInterface/RiuPlotMainWindow.h
View File

@@ -94,6 +94,8 @@ public:
RiuMessagePanel* messagePanel();
void showAndSetKeyboardFocusToSummaryPlotManager();
protected:
void closeEvent( QCloseEvent* event ) override;
void keyPressEvent( QKeyEvent* ) override;
@@ -137,11 +139,11 @@ private:
std::unique_ptr<caf::PdmUiDragDropInterface> m_dragDropInterface;
caf::PdmUiPropertyView* m_pdmUiPropertyView;
caf::PdmUiPropertyView* m_summaryCurveManagerView;
caf::PdmUiPropertyView* m_summaryPlotManagerView;
QPointer<RicSummaryPlotEditorDialog> m_summaryCurveCreatorDialog;
QPointer<RicSummaryCurveCalculatorDialog> m_summaryCurveCalculatorDialog;
std::unique_ptr<caf::PdmObject> m_summaryCurveManager;
std::unique_ptr<caf::PdmObject> m_summaryPlotManager;
std::vector<QWidget*> m_temporaryWidgets;
};